From 8f94ae2a0ff590213fc0170316e07506d5c5905e Mon Sep 17 00:00:00 2001 From: anyreso Date: Tue, 10 Dec 2024 16:28:52 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20rename=20dummy=20target=20export?= =?UTF-8?q?ed=20model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/{player_mesh.glb => dummy.glb} | Bin ...layer_mesh.glb.import => dummy.glb.import} | 6 +- entities/dummy_target/dummy_target.tscn | 72 +++++++++++++++--- types/singleplayer/demo.tscn | 4 +- 4 files changed, 67 insertions(+), 15 deletions(-) rename entities/dummy_target/assets/{player_mesh.glb => dummy.glb} (100%) rename entities/dummy_target/assets/{player_mesh.glb.import => dummy.glb.import} (73%) diff --git a/entities/dummy_target/assets/player_mesh.glb b/entities/dummy_target/assets/dummy.glb similarity index 100% rename from entities/dummy_target/assets/player_mesh.glb rename to entities/dummy_target/assets/dummy.glb diff --git a/entities/dummy_target/assets/player_mesh.glb.import b/entities/dummy_target/assets/dummy.glb.import similarity index 73% rename from entities/dummy_target/assets/player_mesh.glb.import rename to entities/dummy_target/assets/dummy.glb.import index 3239e19..9f1ec44 100644 --- a/entities/dummy_target/assets/player_mesh.glb.import +++ b/entities/dummy_target/assets/dummy.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://chuein4frnvwt" -path="res://.godot/imported/player_mesh.glb-8a1e1c6070971fc6184d85747185f28c.scn" +path="res://.godot/imported/dummy.glb-5efec2949c867071a509a1dcad1bc519.scn" [deps] -source_file="res://entities/dummy_target/assets/player_mesh.glb" -dest_files=["res://.godot/imported/player_mesh.glb-8a1e1c6070971fc6184d85747185f28c.scn"] +source_file="res://entities/dummy_target/assets/dummy.glb" +dest_files=["res://.godot/imported/dummy.glb-5efec2949c867071a509a1dcad1bc519.scn"] [params] diff --git a/entities/dummy_target/dummy_target.tscn b/entities/dummy_target/dummy_target.tscn index 54dc3f3..2087c56 100644 --- a/entities/dummy_target/dummy_target.tscn +++ b/entities/dummy_target/dummy_target.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://entities/dummy_target/dummy_target.gd" id="1_iup5v"] [ext_resource type="Shape3D" uid="uid://cb8esdlnottdn" path="res://entities/player/resources/collider.tres" id="2_i5k5j"] -[ext_resource type="PackedScene" uid="uid://chuein4frnvwt" path="res://entities/dummy_target/assets/player_mesh.glb" id="4_fuync"] +[ext_resource type="PackedScene" uid="uid://chuein4frnvwt" path="res://entities/dummy_target/assets/dummy.glb" id="4_fuync"] [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_b0142"] friction = 0.5 @@ -32,32 +32,84 @@ transform = Transform3D(0.75, 0, 0, 0, 0.75, 0, 0, 0, 0.75, 0, 0, 0) transform = Transform3D(2.56873e-07, 0, 1.31928, 0, 1.31928, 0, -1.31928, 0, 2.56873e-07, 0, 0, 0) [node name="Skeleton3D" parent="TargetMesh/playerrig" index="0"] -bones/6/rotation = Quaternion(-0.605155, -0.345862, -0.356135, 0.622363) +bones/0/position = Vector3(0, 1.0099, -0.0552) +bones/0/scale = Vector3(1, 1, 1) +bones/1/rotation = Quaternion(-0.0644764, 5.29396e-23, -5.29947e-23, 0.997919) +bones/5/rotation = Quaternion(-0.16559, 0, -1.65436e-23, 0.986195) +bones/6/rotation = Quaternion(-0.605155, -0.345862, -0.356134, 0.622363) +bones/7/position = Vector3(0.0170569, 0.214097, -0.0587266) bones/7/rotation = Quaternion(0.18188, 0.221628, -0.929157, 0.233384) bones/8/rotation = Quaternion(0.128862, -0.709864, -0.133277, 0.679504) -bones/9/rotation = Quaternion(0.126866, -0.0346058, -0.00662176, 0.991294) +bones/8/scale = Vector3(1, 1, 1) +bones/9/rotation = Quaternion(0.126866, -0.0346058, -0.00662178, 0.991294) +bones/9/scale = Vector3(1, 1, 1) +bones/10/rotation = Quaternion(0.0557877, -0.312038, -0.196665, 0.927816) bones/11/rotation = Quaternion(-0.0630718, -0.16283, 0.0971492, 0.979832) -bones/13/rotation = Quaternion(0.0299552, -0.545663, -0.00259936, 0.837465) +bones/12/rotation = Quaternion(0.0237033, -0.0123211, 0.0433656, 0.998702) +bones/13/position = Vector3(-0.00420077, 0.0987895, 0.0277967) +bones/13/rotation = Quaternion(0.0299552, -0.545663, -0.00259937, 0.837465) +bones/13/scale = Vector3(1, 1, 1) bones/14/rotation = Quaternion(-0.0636278, -0.0624373, 0.0299354, 0.995569) -bones/17/rotation = Quaternion(0.0486079, -0.0407852, 0.014286, 0.997883) +bones/15/rotation = Quaternion(0.01399, 0.0251671, 0.0278526, 0.999197) +bones/16/position = Vector3(-0.011858, 0.0987964, 0.000921253) +bones/16/rotation = Quaternion(-0.1, -0.561252, 0.0324573, 0.82094) +bones/17/rotation = Quaternion(0.048608, -0.0407852, 0.014286, 0.997883) +bones/18/rotation = Quaternion(-0.0568169, 0.0249822, 0.0364248, 0.997407) +bones/19/position = Vector3(-0.00156325, 0.0941323, -0.0270346) bones/19/rotation = Quaternion(-0.12453, -0.526036, 0.129609, 0.831252) -bones/20/rotation = Quaternion(-0.0225172, -0.0668488, 0.0231689, 0.99724) -bones/21/rotation = Quaternion(-0.00114936, 0.0252308, -0.0174874, 0.999528) +bones/19/scale = Vector3(1, 1, 1) +bones/20/rotation = Quaternion(-0.0225171, -0.0668488, 0.0231689, 0.99724) +bones/20/scale = Vector3(1, 1, 1) +bones/21/rotation = Quaternion(-0.00114938, 0.0252308, -0.0174874, 0.999528) +bones/21/scale = Vector3(1, 1, 1) +bones/22/position = Vector3(-0.00339956, 0.0845645, -0.0510466) +bones/22/rotation = Quaternion(-0.192536, -0.535774, 0.0761884, 0.818579) +bones/22/scale = Vector3(1, 1, 1) +bones/23/rotation = Quaternion(0.0104723, -0.0704384, 0.0293146, 0.99703) +bones/23/scale = Vector3(1, 1, 1) +bones/24/rotation = Quaternion(0.0334518, 0.0259883, -0.0178538, 0.998943) bones/25/rotation = Quaternion(-0.608395, 0.196282, 0.258426, 0.724254) +bones/25/scale = Vector3(1, 1, 1) +bones/26/position = Vector3(-0.017057, 0.214097, -0.0587264) bones/26/rotation = Quaternion(0.161981, -0.321612, 0.619315, 0.697694) +bones/26/scale = Vector3(1, 1, 1) bones/27/rotation = Quaternion(0.426391, 0.0868582, 0.53013, 0.727742) +bones/27/scale = Vector3(1, 1, 1) bones/28/rotation = Quaternion(-0.217102, 0.0422089, 0.0230506, 0.974963) -bones/33/rotation = Quaternion(-0.0636278, 0.0624373, -0.0299354, 0.995569) +bones/28/scale = Vector3(1, 1, 1) +bones/29/rotation = Quaternion(0.296043, 0.246211, 0.290544, 0.87597) +bones/30/rotation = Quaternion(-0.0630717, 0.16283, -0.0971492, 0.979832) +bones/31/rotation = Quaternion(0.0237032, 0.0123211, -0.0433656, 0.998702) +bones/31/scale = Vector3(1, 1, 1) +bones/32/rotation = Quaternion(0.243143, 0.523041, 0.164477, 0.800161) +bones/32/scale = Vector3(1, 1, 1) +bones/33/rotation = Quaternion(-0.0636278, 0.0624373, -0.0299353, 0.995569) +bones/34/rotation = Quaternion(0.01399, -0.0251671, -0.0278526, 0.999197) bones/36/rotation = Quaternion(-0.4266, 0.0977703, 0.332942, 0.835226) bones/37/rotation = Quaternion(-0.632018, -0.129105, 0.241206, 0.725055) bones/39/rotation = Quaternion(-0.479327, 0.030236, 0.338389, 0.809212) bones/40/rotation = Quaternion(-0.540176, -0.0581251, 0.395197, 0.740709) +bones/40/scale = Vector3(1, 1, 1) +bones/41/rotation = Quaternion(0.0241847, 0.530538, 0.0849425, 0.843048) +bones/41/scale = Vector3(1, 1, 1) bones/42/rotation = Quaternion(-0.451682, -0.0170105, 0.326969, 0.829931) bones/43/rotation = Quaternion(-0.512965, -0.0942157, 0.391943, 0.757873) -bones/44/rotation = Quaternion(0.986515, -3.3762e-16, 1.34771e-25, 0.163672) +bones/44/rotation = Quaternion(0.986515, 0, 1.35686e-25, 0.163672) +bones/44/scale = Vector3(1, 1, 0.999997) +bones/45/rotation = Quaternion(0.143207, -4.28623e-07, 5.19845e-06, 0.989693) +bones/45/scale = Vector3(1, 1, 1) bones/46/rotation = Quaternion(-0.574131, 2.92207e-06, -4.58343e-06, 0.818763) -bones/49/rotation = Quaternion(0.986515, -3.3762e-16, 1.34771e-25, 0.163672) +bones/47/rotation = Quaternion(1.99048e-05, 0.961249, -0.27568, 4.3124e-06) +bones/47/scale = Vector3(1, 1, 1) +bones/48/rotation = Quaternion(0.679706, 0.679706, -0.194936, 0.194936) +bones/49/rotation = Quaternion(0.986515, 0, 1.35686e-25, 0.163672) +bones/49/scale = Vector3(1, 1, 0.999997) +bones/50/rotation = Quaternion(0.143207, 4.28623e-07, -5.19845e-06, 0.989693) +bones/50/scale = Vector3(1, 1, 1) bones/51/rotation = Quaternion(-0.574131, -2.92207e-06, 4.58343e-06, 0.818763) +bones/52/rotation = Quaternion(-1.99048e-05, 0.961249, -0.27568, -4.3124e-06) +bones/52/scale = Vector3(1, 1, 1) +bones/53/rotation = Quaternion(0.679706, -0.679706, 0.194936, 0.194936) [node name="AnimationPlayer" parent="TargetMesh" index="4"] autoplay = "gunTwoHanded" diff --git a/types/singleplayer/demo.tscn b/types/singleplayer/demo.tscn index 5deac28..e167a91 100644 --- a/types/singleplayer/demo.tscn +++ b/types/singleplayer/demo.tscn @@ -14,7 +14,7 @@ bounce = 0.1 script = ExtResource("1_kkjqs") [node name="Player" parent="." instance=ExtResource("2_6wbjq")] -transform = Transform3D(-0.533747, 0, -0.845644, 0, 1, 0, 0.845644, 0, -0.533747, -3.01833, 100, 4.7821) +transform = Transform3D(-0.533747, 0, -0.845644, 0, 1, 0, 0.845644, 0, -0.533747, -3.01833, 60.6758, 4.7821) physics_material_override = SubResource("PhysicsMaterial_c5jqv") [node name="Flag" parent="." instance=ExtResource("4_1j2pw")] @@ -23,5 +23,5 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 895.356, 145.367, 888.261) [node name="Blaze" parent="." instance=ExtResource("6_8mg0m")] [node name="DummyTarget" parent="." instance=ExtResource("5_euor2")] -transform = Transform3D(-0.997996, 0, -0.0632782, 0, 1, 0, 0.0632782, 0, -0.997996, 25, 100, 25) +transform = Transform3D(-0.997996, 0, -0.0632782, 0, 1, 0, 0.0632782, 0, -0.997996, 25, 65.9981, 25) collision_layer = 1