fix: player animation tracks no longer cut them down by 1 head's size
This commit is contained in:
parent
9fae245381
commit
1dca96614e
Binary file not shown.
|
|
@ -208,8 +208,11 @@ unique_name_in_owner = true
|
||||||
transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 2.2023005, 0, 0.7319784)
|
transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 2.2023005, 0, 0.7319784)
|
||||||
initial_pitch = 0.0
|
initial_pitch = 0.0
|
||||||
|
|
||||||
|
[node name="Yaw" parent="PlayerController" index="1"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0)
|
||||||
|
|
||||||
[node name="Camera3D" parent="PlayerController/Yaw/Pitch/Mount" index="0"]
|
[node name="Camera3D" parent="PlayerController/Yaw/Pitch/Mount" index="0"]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1.0000006, 0, 0, 0, 1.0000006, 0, 0.38172483, -0.05718814)
|
transform = Transform3D(1, 0, 0, 0, 1.0000006, 0, 0, 0, 1.0000006, 0, 0.202, 0.157)
|
||||||
|
|
||||||
[node name="volunteer_room" parent="." instance=ExtResource("1_ln5pp")]
|
[node name="volunteer_room" parent="." instance=ExtResource("1_ln5pp")]
|
||||||
|
|
||||||
|
|
@ -280,9 +283,8 @@ billboard = false
|
||||||
unique_name_in_owner = true
|
unique_name_in_owner = true
|
||||||
|
|
||||||
[node name="VoxelGI" type="VoxelGI" parent="."]
|
[node name="VoxelGI" type="VoxelGI" parent="."]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.08276367, 1.3269348, 0.05317688)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.08276367, 1.3269348, 0.09955597)
|
||||||
subdiv = 3
|
size = Vector3(6.132324, 2.9212036, 12.147232)
|
||||||
size = Vector3(6.132324, 2.9212036, 12.054474)
|
|
||||||
data = ExtResource("8_fli74")
|
data = ExtResource("8_fli74")
|
||||||
|
|
||||||
[node name="Collision" type="Node3D" parent="."]
|
[node name="Collision" type="Node3D" parent="."]
|
||||||
|
|
|
||||||
|
|
@ -404,6 +404,12 @@ id = 1
|
||||||
unique_name_in_owner = true
|
unique_name_in_owner = true
|
||||||
transform = Transform3D(0.686123, 0, 0.727485, 0, 1, 0, -0.727485, 0, 0.686123, 0.63, 0, 0.925)
|
transform = Transform3D(0.686123, 0, 0.727485, 0, 1, 0, -0.727485, 0, 0.686123, 0.63, 0, 0.925)
|
||||||
|
|
||||||
|
[node name="Yaw" parent="logic/PlayerController" index="1"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.25, 0)
|
||||||
|
|
||||||
|
[node name="Pitch" parent="logic/PlayerController/Yaw" index="0"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 0.64278716, -0.7660439, 0, 0.7660439, 0.64278716, 0, 0, 0)
|
||||||
|
|
||||||
[node name="Collision" type="Node3D" parent="logic"]
|
[node name="Collision" type="Node3D" parent="logic"]
|
||||||
|
|
||||||
[node name="Desk_Colission" type="StaticBody3D" parent="logic/Collision"]
|
[node name="Desk_Colission" type="StaticBody3D" parent="logic/Collision"]
|
||||||
|
|
@ -1028,6 +1034,7 @@ data = ExtResource("40_ea6x8")
|
||||||
[connection signal="body_entered" from="logic/Bed and Ladders/bed_enter" to="logic/PlayerController" method="_on_bed_enter"]
|
[connection signal="body_entered" from="logic/Bed and Ladders/bed_enter" to="logic/PlayerController" method="_on_bed_enter"]
|
||||||
[connection signal="body_exited" from="logic/Bed and Ladders/reset_failover" to="logic/PlayerController" method="_on_bed_exit"]
|
[connection signal="body_exited" from="logic/Bed and Ladders/reset_failover" to="logic/PlayerController" method="_on_bed_exit"]
|
||||||
|
|
||||||
|
[editable path="logic/PlayerController"]
|
||||||
[editable path="logic/MindBoardInteractable"]
|
[editable path="logic/MindBoardInteractable"]
|
||||||
[editable path="logic/ClothesInteractable"]
|
[editable path="logic/ClothesInteractable"]
|
||||||
[editable path="logic/DoorInteractable"]
|
[editable path="logic/DoorInteractable"]
|
||||||
|
|
|
||||||
|
|
@ -37,8 +37,6 @@ func _apply_enabled_state() -> void:
|
||||||
|
|
||||||
@export var mouse_sensitivity: Vector2 = Vector2(6, 5)
|
@export var mouse_sensitivity: Vector2 = Vector2(6, 5)
|
||||||
|
|
||||||
@export var initial_pitch: float = 50
|
|
||||||
|
|
||||||
@export_range (0.0, 10.0) var max_speed: float = 3
|
@export_range (0.0, 10.0) var max_speed: float = 3
|
||||||
@export_range (0.0, 10.0) var max_acceleration: float = 5
|
@export_range (0.0, 10.0) var max_acceleration: float = 5
|
||||||
@export_range (0.0, 20.0) var damp: float = 10
|
@export_range (0.0, 20.0) var damp: float = 10
|
||||||
|
|
@ -121,8 +119,6 @@ func _ready():
|
||||||
|
|
||||||
_handle_jitter(0)
|
_handle_jitter(0)
|
||||||
|
|
||||||
pitch.rotation_degrees.x = initial_pitch
|
|
||||||
|
|
||||||
ui_prober.area_entered.connect(_on_ray_entered)
|
ui_prober.area_entered.connect(_on_ray_entered)
|
||||||
ui_prober.area_exited.connect(_on_ray_exited)
|
ui_prober.area_exited.connect(_on_ray_exited)
|
||||||
|
|
||||||
|
|
@ -147,12 +143,10 @@ func _setup_hand_cursor() -> void:
|
||||||
|
|
||||||
## Restores player position and camera rotation from save game
|
## Restores player position and camera rotation from save game
|
||||||
func restore_from_save(save: SaveGame) -> void:
|
func restore_from_save(save: SaveGame) -> void:
|
||||||
if save.player_position != Vector3.ZERO:
|
prints("player_controller.gd", restore_from_save, save.player_position, save.player_yaw, save.player_pitch)
|
||||||
global_position = save.player_position
|
global_position = save.player_position
|
||||||
if save.player_yaw != 0:
|
yaw.rotation.y = save.player_yaw
|
||||||
yaw.rotation.y = save.player_yaw
|
pitch.rotation.x = save.player_pitch
|
||||||
if save.player_pitch != 0:
|
|
||||||
pitch.rotation.x = save.player_pitch
|
|
||||||
|
|
||||||
func _process(_delta) -> void:
|
func _process(_delta) -> void:
|
||||||
if not enabled:
|
if not enabled:
|
||||||
|
|
@ -244,7 +238,8 @@ func _handle_rotation(delta:float):
|
||||||
func _handle_jitter(delta):
|
func _handle_jitter(delta):
|
||||||
loc_noise_spot += Vector3(delta * camera_jitter_speed * location_jitter_speed)
|
loc_noise_spot += Vector3(delta * camera_jitter_speed * location_jitter_speed)
|
||||||
rot_noise_spot += Vector3(delta * camera_jitter_speed * angular_jitter_speed)
|
rot_noise_spot += Vector3(delta * camera_jitter_speed * angular_jitter_speed)
|
||||||
pitch.position = Vector3(
|
|
||||||
|
mount.position = Vector3(
|
||||||
noise.get_noise_1d(loc_noise_spot.x),
|
noise.get_noise_1d(loc_noise_spot.x),
|
||||||
noise.get_noise_1d(loc_noise_spot.y),
|
noise.get_noise_1d(loc_noise_spot.y),
|
||||||
noise.get_noise_1d(loc_noise_spot.z)
|
noise.get_noise_1d(loc_noise_spot.z)
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ length = 0.001
|
||||||
tracks/0/type = "value"
|
tracks/0/type = "value"
|
||||||
tracks/0/imported = false
|
tracks/0/imported = false
|
||||||
tracks/0/enabled = true
|
tracks/0/enabled = true
|
||||||
tracks/0/path = NodePath("Yaw:position")
|
tracks/0/path = NodePath("Mount:position")
|
||||||
tracks/0/interp = 1
|
tracks/0/interp = 1
|
||||||
tracks/0/loop_wrap = true
|
tracks/0/loop_wrap = true
|
||||||
tracks/0/keys = {
|
tracks/0/keys = {
|
||||||
|
|
@ -147,7 +147,7 @@ length = 2.0
|
||||||
tracks/0/type = "value"
|
tracks/0/type = "value"
|
||||||
tracks/0/imported = false
|
tracks/0/imported = false
|
||||||
tracks/0/enabled = true
|
tracks/0/enabled = true
|
||||||
tracks/0/path = NodePath("Yaw:position")
|
tracks/0/path = NodePath("Mount:position")
|
||||||
tracks/0/interp = 2
|
tracks/0/interp = 2
|
||||||
tracks/0/loop_wrap = true
|
tracks/0/loop_wrap = true
|
||||||
tracks/0/keys = {
|
tracks/0/keys = {
|
||||||
|
|
@ -210,7 +210,7 @@ resource_name = "fast_crouch"
|
||||||
tracks/0/type = "value"
|
tracks/0/type = "value"
|
||||||
tracks/0/imported = false
|
tracks/0/imported = false
|
||||||
tracks/0/enabled = true
|
tracks/0/enabled = true
|
||||||
tracks/0/path = NodePath("Yaw:position")
|
tracks/0/path = NodePath("Mount:position")
|
||||||
tracks/0/interp = 2
|
tracks/0/interp = 2
|
||||||
tracks/0/loop_wrap = true
|
tracks/0/loop_wrap = true
|
||||||
tracks/0/keys = {
|
tracks/0/keys = {
|
||||||
|
|
@ -274,7 +274,7 @@ length = 1.2
|
||||||
tracks/0/type = "value"
|
tracks/0/type = "value"
|
||||||
tracks/0/imported = false
|
tracks/0/imported = false
|
||||||
tracks/0/enabled = true
|
tracks/0/enabled = true
|
||||||
tracks/0/path = NodePath("Yaw:position")
|
tracks/0/path = NodePath("Mount:position")
|
||||||
tracks/0/interp = 2
|
tracks/0/interp = 2
|
||||||
tracks/0/loop_wrap = true
|
tracks/0/loop_wrap = true
|
||||||
tracks/0/keys = {
|
tracks/0/keys = {
|
||||||
|
|
@ -338,7 +338,7 @@ length = 2.0
|
||||||
tracks/0/type = "value"
|
tracks/0/type = "value"
|
||||||
tracks/0/imported = false
|
tracks/0/imported = false
|
||||||
tracks/0/enabled = true
|
tracks/0/enabled = true
|
||||||
tracks/0/path = NodePath("Yaw:position")
|
tracks/0/path = NodePath("Mount:position")
|
||||||
tracks/0/interp = 2
|
tracks/0/interp = 2
|
||||||
tracks/0/loop_wrap = true
|
tracks/0/loop_wrap = true
|
||||||
tracks/0/keys = {
|
tracks/0/keys = {
|
||||||
|
|
@ -438,7 +438,7 @@ length = 2.0
|
||||||
tracks/0/type = "value"
|
tracks/0/type = "value"
|
||||||
tracks/0/imported = false
|
tracks/0/imported = false
|
||||||
tracks/0/enabled = true
|
tracks/0/enabled = true
|
||||||
tracks/0/path = NodePath("Yaw:position")
|
tracks/0/path = NodePath("Mount:position")
|
||||||
tracks/0/interp = 2
|
tracks/0/interp = 2
|
||||||
tracks/0/loop_wrap = true
|
tracks/0/loop_wrap = true
|
||||||
tracks/0/keys = {
|
tracks/0/keys = {
|
||||||
|
|
@ -538,7 +538,7 @@ length = 2.5
|
||||||
tracks/0/type = "value"
|
tracks/0/type = "value"
|
||||||
tracks/0/imported = false
|
tracks/0/imported = false
|
||||||
tracks/0/enabled = true
|
tracks/0/enabled = true
|
||||||
tracks/0/path = NodePath("Yaw:position")
|
tracks/0/path = NodePath("Mount:position")
|
||||||
tracks/0/interp = 2
|
tracks/0/interp = 2
|
||||||
tracks/0/loop_wrap = true
|
tracks/0/loop_wrap = true
|
||||||
tracks/0/keys = {
|
tracks/0/keys = {
|
||||||
|
|
@ -629,10 +629,10 @@ gi_mode = 2
|
||||||
mesh = SubResource("CapsuleMesh_x6v75")
|
mesh = SubResource("CapsuleMesh_x6v75")
|
||||||
|
|
||||||
[node name="Yaw" type="Node3D" parent="."]
|
[node name="Yaw" type="Node3D" parent="."]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.22534, 0)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4, 0)
|
||||||
|
|
||||||
[node name="Pitch" type="Node3D" parent="Yaw"]
|
[node name="Pitch" type="Node3D" parent="Yaw"]
|
||||||
transform = Transform3D(1, 0, 0, 0, 0.642787, -0.766044, 0, 0.766044, 0.642787, 0, 0.256493, 0)
|
transform = Transform3D(1, 0, 0, 0, 0.9999993, 0, 0, 0, 0.9999993, 0, 0, 0)
|
||||||
|
|
||||||
[node name="Mount" type="Node3D" parent="Yaw/Pitch"]
|
[node name="Mount" type="Node3D" parent="Yaw/Pitch"]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -87,6 +87,7 @@ gi_mode = 0
|
||||||
light_color = Color(0.87, 0.667, 0.435, 1)
|
light_color = Color(0.87, 0.667, 0.435, 1)
|
||||||
light_energy = 2.0
|
light_energy = 2.0
|
||||||
light_size = 0.25
|
light_size = 0.25
|
||||||
|
light_bake_mode = 1
|
||||||
shadow_enabled = true
|
shadow_enabled = true
|
||||||
shadow_bias = 0.01
|
shadow_bias = 0.01
|
||||||
omni_range = 3.7482672
|
omni_range = 3.7482672
|
||||||
|
|
@ -149,6 +150,7 @@ transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, -2.1
|
||||||
light_color = Color(1, 0.97333336, 0.84000003, 1)
|
light_color = Color(1, 0.97333336, 0.84000003, 1)
|
||||||
light_energy = 2.0
|
light_energy = 2.0
|
||||||
light_size = 0.1
|
light_size = 0.1
|
||||||
|
light_bake_mode = 1
|
||||||
shadow_enabled = true
|
shadow_enabled = true
|
||||||
spot_angle = 63.74
|
spot_angle = 63.74
|
||||||
|
|
||||||
|
|
@ -158,6 +160,7 @@ light_color = Color(0.8425, 1, 0.79, 1)
|
||||||
light_energy = 2.0
|
light_energy = 2.0
|
||||||
light_size = 0.2
|
light_size = 0.2
|
||||||
light_specular = 0.2
|
light_specular = 0.2
|
||||||
|
light_bake_mode = 1
|
||||||
shadow_enabled = true
|
shadow_enabled = true
|
||||||
spot_angle = 80.24
|
spot_angle = 80.24
|
||||||
|
|
||||||
|
|
@ -165,6 +168,7 @@ spot_angle = 80.24
|
||||||
transform = Transform3D(-0.9659258, 1.1313344e-08, -0.25881913, 0.25881913, 4.222196e-08, -0.9659258, 0, -1, -4.3711392e-08, -2.1502504, 0.8125906, -4.596785)
|
transform = Transform3D(-0.9659258, 1.1313344e-08, -0.25881913, 0.25881913, 4.222196e-08, -0.9659258, 0, -1, -4.3711392e-08, -2.1502504, 0.8125906, -4.596785)
|
||||||
light_color = Color(1, 0.97333336, 0.84000003, 1)
|
light_color = Color(1, 0.97333336, 0.84000003, 1)
|
||||||
light_size = 0.3
|
light_size = 0.3
|
||||||
|
light_bake_mode = 1
|
||||||
shadow_enabled = true
|
shadow_enabled = true
|
||||||
shadow_blur = 0.1
|
shadow_blur = 0.1
|
||||||
spot_angle = 80.0
|
spot_angle = 80.0
|
||||||
|
|
@ -179,6 +183,7 @@ skeleton = NodePath("../SpotLight3D")
|
||||||
[node name="DirectionalLight3D" type="OmniLight3D" parent="VoxelGI" index="4"]
|
[node name="DirectionalLight3D" type="OmniLight3D" parent="VoxelGI" index="4"]
|
||||||
transform = Transform3D(-0.9659258, 1.1313344e-08, -0.25881913, 0.25881913, 4.222196e-08, -0.9659258, 0, -1, -4.3711392e-08, 1.4147159, 1.0391436, -3.846341)
|
transform = Transform3D(-0.9659258, 1.1313344e-08, -0.25881913, 0.25881913, 4.222196e-08, -0.9659258, 0, -1, -4.3711392e-08, 1.4147159, 1.0391436, -3.846341)
|
||||||
light_color = Color(0.9328333, 1, 0.87, 1)
|
light_color = Color(0.9328333, 1, 0.87, 1)
|
||||||
|
light_bake_mode = 1
|
||||||
shadow_enabled = true
|
shadow_enabled = true
|
||||||
shadow_blur = 2.0
|
shadow_blur = 2.0
|
||||||
|
|
||||||
|
|
@ -242,3 +247,4 @@ omni_range = 2.0
|
||||||
material_override = ExtResource("15_00e8l")
|
material_override = ExtResource("15_00e8l")
|
||||||
|
|
||||||
[node name="Camera3D" type="Camera3D" parent="." index="175"]
|
[node name="Camera3D" type="Camera3D" parent="." index="175"]
|
||||||
|
visible = false
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue