diff options
| author | nokoe <nokoe@mailbox.org> | 2025-10-16 17:37:51 +0200 |
|---|---|---|
| committer | nokoe <nokoe@mailbox.org> | 2025-10-16 17:40:07 +0200 |
| commit | 1e5a05b1e33749ff0a6ecb4b24b992f54f1b0410 (patch) | |
| tree | 0db954f00f2df18c41d5a0a32538e8df920c14c9 /client | |
| parent | 3dfd61cfbf13df0ce86efe70d83093cf14df409d (diff) | |
| download | hurrycurry-1e5a05b1e33749ff0a6ecb4b24b992f54f1b0410.tar hurrycurry-1e5a05b1e33749ff0a6ecb4b24b992f54f1b0410.tar.bz2 hurrycurry-1e5a05b1e33749ff0a6ecb4b24b992f54f1b0410.tar.zst | |
fix cat ears
Diffstat (limited to 'client')
| -rw-r--r-- | client/player/character/headwear/cat_ears.gd | 14 | ||||
| -rw-r--r-- | client/player/character/headwear/cat_ears.res | bin | 4691 -> 4227 bytes | |||
| -rw-r--r-- | client/player/character/headwear/cat_ears.tscn | 12 |
3 files changed, 15 insertions, 11 deletions
diff --git a/client/player/character/headwear/cat_ears.gd b/client/player/character/headwear/cat_ears.gd index e5911005..aa19d554 100644 --- a/client/player/character/headwear/cat_ears.gd +++ b/client/player/character/headwear/cat_ears.gd @@ -16,19 +16,19 @@ class_name CatEars extends Node3D -const EAR_ROTATION := deg_to_rad(20.) +const EAR_ROTATION := deg_to_rad(0.) var ear_target := 0. @onready var character: Character = get_parent().get_parent().get_parent().get_parent() func set_inner_mat(mat: BaseMaterial3D): - $Left.set_surface_override_material(1, mat) - $Right.set_surface_override_material(1, mat) + $Left/Mesh.set_surface_override_material(1, mat) + $Right/Mesh.set_surface_override_material(1, mat) func set_outer_mat(mat: BaseMaterial3D): - $Left.set_surface_override_material(0, mat) - $Right.set_surface_override_material(0, mat) + $Left/Mesh.set_surface_override_material(0, mat) + $Right/Mesh.set_surface_override_material(0, mat) func _ready() -> void: set_inner_mat(character.main.get_active_material(0)) @@ -37,8 +37,8 @@ func _ready() -> void: var t := 0. func _process(delta: float) -> void: if visible: - $Right.rotation.z = G.interpolate_angle($Right.rotation.z, ear_target + EAR_ROTATION, delta * 10.) - $Left.rotation.z = G.interpolate_angle($Left.rotation.z, PI + ear_target + EAR_ROTATION, delta * 10.) + $Right.rotation.z = G.interpolate_angle($Right.rotation.z, ear_target + EAR_ROTATION, delta * 17.5) + $Left.rotation.z = G.interpolate_angle($Left.rotation.z, -ear_target + -EAR_ROTATION, delta * 17.5) if character.walking: t += delta ear_target = sin(t * character.WALK_ANIM_SPEED) * 0.075 if character.walking else 0. diff --git a/client/player/character/headwear/cat_ears.res b/client/player/character/headwear/cat_ears.res Binary files differindex ae31fa69..f0bdbd97 100644 --- a/client/player/character/headwear/cat_ears.res +++ b/client/player/character/headwear/cat_ears.res diff --git a/client/player/character/headwear/cat_ears.tscn b/client/player/character/headwear/cat_ears.tscn index 3d611484..8d762cfe 100644 --- a/client/player/character/headwear/cat_ears.tscn +++ b/client/player/character/headwear/cat_ears.tscn @@ -6,12 +6,16 @@ [node name="CatEars" type="Node3D"] script = ExtResource("1_q747p") -[node name="Left" type="MeshInstance3D" parent="."] -transform = Transform3D(-0.391948, 0.0798526, 2.14072e-08, 0.0798526, 0.391948, 6.34998e-09, 1.97086e-08, -1.04957e-08, 0.4, -0.0100086, 0.361507, 1.20572e-08) +[node name="Right" type="Node3D" parent="."] + +[node name="Mesh" type="MeshInstance3D" parent="Right"] +transform = Transform3D(0.28284273, -0.28284273, 0, 0.28284273, 0.28284273, 0, 0, 0, 0.4, -0.645, 0.7, 0) mesh = ExtResource("1_5c3r8") skeleton = NodePath("") -[node name="Right" type="MeshInstance3D" parent="."] -transform = Transform3D(0.389421, -0.0913844, -2.23025e-08, 0.0913844, 0.389421, 5.89238e-09, 2.03665e-08, -1.08318e-08, 0.4, 0.0104306, 0.370664, 1.26181e-08) +[node name="Left" type="Node3D" parent="."] + +[node name="Mesh" type="MeshInstance3D" parent="Left"] +transform = Transform3D(0.28284273, 0.28284273, 0, -0.28284273, 0.28284273, 0, 0, 0, 0.4, 0.645, 0.7, 0) mesh = ExtResource("1_5c3r8") skeleton = NodePath("") |