Updated head tracking using Area3D specific triggers for NPC and player

diff --git a/player/player.gd b/player/player.gd
index de4387bd24eb8b393de2601fd91b185025e6325f..db5b1ccadad1e0383c65b1b64a2b0d45365e3c19 100644 (file)
--- a/player/player.gd
+++ b/player/player.gd
@@ -342,7 +342,7 @@ func _pick_head_track_target() -> void:
 
 # if we find a head tracking obj, add it to the array unless it's already there
 func _on_head_turn_area_entered(area: Area3D) -> void:
 
 # if we find a head tracking obj, add it to the array unless it's already there
 func _on_head_turn_area_entered(area: Area3D) -> void:

-       for node in area.get_parent().get_children().filter(func(c): return c.is_in_group("player-headTrack")):
+       for node in area.get_children().filter(func(c: Node3D): return c.is_in_group("player-headTrack")):

                var i = _head_track_arr.find(node)
                if i < 0:
                        _head_track_arr.append(node)
                var i = _head_track_arr.find(node)
                if i < 0:
                        _head_track_arr.append(node)


@@ -350,7 +350,7 @@ func _on_head_turn_area_entered(area: Area3D) -> void:
 
 
 func _on_head_turn_area_exited(area: Area3D) -> void:
 
 
 func _on_head_turn_area_exited(area: Area3D) -> void:

-       for node in area.get_parent().get_children().filter(func(c): return c.is_in_group("player-headTrack")):
+       for node in area.get_children().filter(func(c: Node3D): return c.is_in_group("player-headTrack")):

                var i = _head_track_arr.find(node)
                if i >= 0:
                        _head_track_arr.remove_at(i)
                var i = _head_track_arr.find(node)
                if i >= 0:
                        _head_track_arr.remove_at(i)

diff --git a/player/player.tscn b/player/player.tscn
index e070876a49e0e6a54537fe9ed993bdf94f684553..2da16ee05203830918789fcc3d84385f2f742d22 100644 (file)
--- a/player/player.tscn
+++ b/player/player.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=10 format=3 uid="uid://cp6xm8gp6csx"]
+[gd_scene load_steps=11 format=3 uid="uid://cp6xm8gp6csx"]

 
 [ext_resource type="Script" path="res://player/player.gd" id="1_h17j6"]
 [ext_resource type="PackedScene" uid="uid://2tvylmtejq0u" path="res://william.tscn" id="1_sujn1"]
 
 [ext_resource type="Script" path="res://player/player.gd" id="1_h17j6"]
 [ext_resource type="PackedScene" uid="uid://2tvylmtejq0u" path="res://william.tscn" id="1_sujn1"]


@@ -11,6 +11,8 @@
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_ntdse"]
 radius = 4.0
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_ntdse"]
 radius = 4.0
 

+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_sdmc3"]
+

 [sub_resource type="SphereShape3D" id="SphereShape3D_4dtvp"]
 
 [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_frf40"]
 [sub_resource type="SphereShape3D" id="SphereShape3D_4dtvp"]
 
 [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_frf40"]


@@ -36,8 +38,13 @@ transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 0, 0,
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -3.91559)
 shape = SubResource("CylinderShape3D_ntdse")
 
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -3.91559)
 shape = SubResource("CylinderShape3D_ntdse")
 

-[node name="npcTrackPoint" type="Node3D" parent="WilliamSkin" groups=["npc-headTrack"]]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.78197, 0)
+[node name="Area3D" type="Area3D" parent="WilliamSkin"]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="WilliamSkin/Area3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
+shape = SubResource("CapsuleShape3D_sdmc3")
+
+[node name="npcTrackPoint" type="Node3D" parent="WilliamSkin/Area3D" groups=["npc-headTrack"]]

 
 [node name="cameraPivot" type="Node3D" parent="."]
 
 
 [node name="cameraPivot" type="Node3D" parent="."]
 

diff --git a/test/npc.gd b/test/npc.gd
index 3acd29f3c8c27bfd68c56f0e0b65d6228ef61923..b839116f6a7162a58b367a45078f7d36b6325d94 100644 (file)
--- a/test/npc.gd
+++ b/test/npc.gd
@@ -16,7 +16,7 @@ func _pick_head_track_target() -> void:
 
 
 func _on_head_turn_area_entered(area: Area3D) -> void:
 
 
 func _on_head_turn_area_entered(area: Area3D) -> void:

-       for node in area.get_parent().get_children().filter(func(c): return c.is_in_group("npc-headTrack")):
+       for node in area.get_children().filter(func(c: Node3D): return c.is_in_group("npc-headTrack")):

                var i = _head_track_arr.find(node)
                if i < 0:
                        _head_track_arr.append(node)
                var i = _head_track_arr.find(node)
                if i < 0:
                        _head_track_arr.append(node)


@@ -24,7 +24,7 @@ func _on_head_turn_area_entered(area: Area3D) -> void:
 
 
 func _on_head_turn_area_exited(area: Area3D) -> void:
 
 
 func _on_head_turn_area_exited(area: Area3D) -> void:

-       for node in area.get_parent().get_children().filter(func(c): return c.is_in_group("npc-headTrack")):
+       for node in area.get_children().filter(func(c: Node3D): return c.is_in_group("npc-headTrack")):

                var i = _head_track_arr.find(node)
                if i >= 0:
                        _head_track_arr.remove_at(i)
                var i = _head_track_arr.find(node)
                if i >= 0:
                        _head_track_arr.remove_at(i)

diff --git a/test/npc.tscn b/test/npc.tscn
index 57aea154840cc73a944926b5d49f14a1ca2d4a2b..df124d7e0e9d258ed91d13f7942fec34ca6afb88 100644 (file)
--- a/test/npc.tscn
+++ b/test/npc.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=3 uid="uid://bmcw5a71lsldu"]
+[gd_scene load_steps=5 format=3 uid="uid://bmcw5a71lsldu"]

 
 [ext_resource type="PackedScene" uid="uid://2tvylmtejq0u" path="res://william.tscn" id="1_fk6op"]
 [ext_resource type="Script" path="res://test/npc.gd" id="1_tko4h"]
 
 [ext_resource type="PackedScene" uid="uid://2tvylmtejq0u" path="res://william.tscn" id="1_fk6op"]
 [ext_resource type="Script" path="res://test/npc.gd" id="1_tko4h"]


@@ -6,6 +6,8 @@
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_rgxya"]
 radius = 3.27162
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_rgxya"]
 radius = 3.27162
 

+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_75ajl"]
+

 [node name="NonPlayerCharacter" type="Node3D"]
 script = ExtResource("1_tko4h")
 
 [node name="NonPlayerCharacter" type="Node3D"]
 script = ExtResource("1_tko4h")
 


@@ -17,7 +19,13 @@ script = ExtResource("1_tko4h")
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 3.17898)
 shape = SubResource("CylinderShape3D_rgxya")
 
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 3.17898)
 shape = SubResource("CylinderShape3D_rgxya")
 

-[node name="playerTrackPoint" type="Node3D" parent="skin" groups=["player-eyeTrack", "player-headTrack"]]
+[node name="Area3D" type="Area3D" parent="skin"]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="skin/Area3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
+shape = SubResource("CapsuleShape3D_75ajl")
+
+[node name="playerTrackPoint" type="Node3D" parent="skin/Area3D" groups=["player-eyeTrack", "player-headTrack"]]

 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.77777, 0.0828433)
 
 [connection signal="area_entered" from="skin/headTurn" to="." method="_on_head_turn_area_entered"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.77777, 0.0828433)
 
 [connection signal="area_entered" from="skin/headTurn" to="." method="_on_head_turn_area_entered"]

diff --git a/william.tscn b/william.tscn
index f35b7fd40baad3966da7ceefe4de0eafd2e7c37c..df12d2e295ea6885a2d3ce610b3abde0d5177327 100644 (file)
--- a/william.tscn
+++ b/william.tscn
@@ -263,7 +263,6 @@ bones/0/rotation = Quaternion(0.0954857, -0.0670702, -0.0189823, 0.992987)
 bones/1/rotation = Quaternion(-0.0644764, -6.13826e-09, -1.28759e-08, 0.997919)
 bones/1/scale = Vector3(1, 1, 1)
 bones/2/rotation = Quaternion(-0.077464, 3.50653e-08, -6.15945e-08, 0.996995)
 bones/1/rotation = Quaternion(-0.0644764, -6.13826e-09, -1.28759e-08, 0.997919)
 bones/1/scale = Vector3(1, 1, 1)
 bones/2/rotation = Quaternion(-0.077464, 3.50653e-08, -6.15945e-08, 0.996995)

-bones/2/scale = Vector3(1, 1, 1)

 bones/3/rotation = Quaternion(0.00162711, -1.22272e-07, 2.23079e-08, 0.999999)
 bones/3/scale = Vector3(1, 1, 1)
 bones/4/rotation = Quaternion(0.162761, 0.00598545, 0.102777, 0.98128)
 bones/3/rotation = Quaternion(0.00162711, -1.22272e-07, 2.23079e-08, 0.999999)
 bones/3/scale = Vector3(1, 1, 1)
 bones/4/rotation = Quaternion(0.162761, 0.00598545, 0.102777, 0.98128)


@@ -428,7 +427,6 @@ bones/88/position = Vector3(1.62975e-09, 0.0458171, 0.046333)
 bones/88/rotation = Quaternion(0.907364, 1.49678e-07, 3.25313e-07, 0.420345)
 bones/89/position = Vector3(1.83685e-14, -0.0667295, 0.179103)
 bones/89/rotation = Quaternion(0.229327, -1.03392e-07, -7.7942e-08, 0.973349)
 bones/88/rotation = Quaternion(0.907364, 1.49678e-07, 3.25313e-07, 0.420345)
 bones/89/position = Vector3(1.83685e-14, -0.0667295, 0.179103)
 bones/89/rotation = Quaternion(0.229327, -1.03392e-07, -7.7942e-08, 0.973349)

-bones/89/scale = Vector3(1, 1, 1)

 bones/90/rotation = Quaternion(-0.230471, 3.48e-07, -2.74743e-08, 0.973079)
 bones/90/scale = Vector3(1, 1, 1)
 bones/91/position = Vector3(1.86233e-09, -0.0629948, 0.0806333)
 bones/90/rotation = Quaternion(-0.230471, 3.48e-07, -2.74743e-08, 0.973079)
 bones/90/scale = Vector3(1, 1, 1)
 bones/91/position = Vector3(1.86233e-09, -0.0629948, 0.0806333)