diff --git a/assets/models/bipedal_mech/mech.tscn b/assets/models/bipedal_mech/mech.tscn index 50f261f..3d09295 100644 --- a/assets/models/bipedal_mech/mech.tscn +++ b/assets/models/bipedal_mech/mech.tscn @@ -909,6 +909,7 @@ blend_point_4/pos = Vector2(-1, 0) sync = true [sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_u1qtb"] +graph_offset = Vector2(355, 11) nodes/air_anim/node = SubResource("AnimationNodeAnimation_512j7") nodes/air_anim/position = Vector2(780, 640) nodes/air_scale/node = SubResource("AnimationNodeTimeScale_o8qjb") @@ -956,43 +957,43 @@ parameters/walk_scale/scale = 1.0 parameters/walk_space/blend_position = Vector2(0, 0) [node name="Skeleton3D" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5" index="0"] -bones/1/position = Vector3(0, 0, 6.25956) +bones/1/position = Vector3(0, 0, 6.30014) bones/1/rotation = Quaternion(0.707107, 0, 0, 0.707107) bones/2/rotation = Quaternion(1.54543e-08, 1.54543e-08, -0.707107, 0.707107) -bones/3/rotation = Quaternion(0.651302, 0.671041, 0.246924, 0.254043) +bones/3/rotation = Quaternion(0.652164, 0.671825, 0.244784, 0.251823) bones/3/scale = Vector3(1, 1, 1) -bones/4/rotation = Quaternion(0.732212, 0.0539352, 0.0758248, 0.67469) +bones/4/rotation = Quaternion(0.725761, 0.0543238, 0.0750463, 0.68168) bones/4/scale = Vector3(1, 1, 1) -bones/5/rotation = Quaternion(-0.648777, -0.00101797, -0.105351, 0.75365) +bones/5/rotation = Quaternion(-0.643275, -0.00110192, -0.104547, 0.758463) bones/5/scale = Vector3(1, 1, 1) -bones/6/rotation = Quaternion(-0.430424, 0.0118608, -0.0624292, 0.900387) -bones/7/rotation = Quaternion(-0.848977, 0.0351785, -0.176063, 0.496994) +bones/6/rotation = Quaternion(-0.431399, 0.0117786, -0.0625626, 0.899912) +bones/7/rotation = Quaternion(-0.848314, 0.0352934, -0.175886, 0.498178) bones/7/scale = Vector3(1, 1, 1) bones/9/rotation = Quaternion(-0.577893, -0.0977404, -0.0868737, 0.805568) -bones/11/rotation = Quaternion(-0.845569, 0.0417023, -0.171629, 0.503803) +bones/11/rotation = Quaternion(-0.844877, 0.0418286, -0.171439, 0.505017) bones/11/scale = Vector3(1, 1, 1) bones/13/rotation = Quaternion(-0.583833, -0.0928994, -0.0936977, 0.80108) bones/13/scale = Vector3(1, 1, 1) bones/15/rotation = Quaternion(0.993231, -0.0067672, 0.0811647, 0.0828119) bones/15/scale = Vector3(1, 1, 1) -bones/17/rotation = Quaternion(0.751422, 0.0195417, 0.659084, 0.0243246) +bones/17/rotation = Quaternion(0.751423, 0.0197084, 0.659077, 0.0243283) bones/17/scale = Vector3(1, 1, 1) bones/19/rotation = Quaternion(-0.399104, -0.525183, -0.304683, 0.687072) bones/19/scale = Vector3(0.999999, 1, 1) bones/21/rotation = Quaternion(0.855906, -0.0322478, 0.0593455, 0.512701) -bones/23/rotation = Quaternion(0.873777, 0.00316782, 0.144331, 0.464406) +bones/23/rotation = Quaternion(0.880638, 0.00347096, 0.145334, 0.450935) bones/23/scale = Vector3(1, 1, 1) bones/25/rotation = Quaternion(-0.715396, -0.0713077, -0.0634678, 0.692168) bones/25/scale = Vector3(1, 1, 1) -bones/27/rotation = Quaternion(-0.592901, -0.00509832, -0.108508, 0.797915) +bones/27/rotation = Quaternion(-0.585151, -0.00523809, -0.107411, 0.803762) bones/29/rotation = Quaternion(0.808854, -0.0303334, 0.0651724, 0.583599) bones/31/rotation = Quaternion(0.808854, -0.0303334, 0.0651724, 0.583599) -bones/33/rotation = Quaternion(-0.58542, -0.00915627, -0.113493, 0.802695) -bones/35/rotation = Quaternion(-0.672817, 0.00415657, -0.108967, 0.731728) +bones/33/rotation = Quaternion(-0.577591, -0.00930922, -0.112415, 0.808495) +bones/35/rotation = Quaternion(-0.664853, 0.00404164, -0.107758, 0.73915) bones/35/scale = Vector3(1, 1, 1) bones/37/scale = Vector3(1, 1, 1) bones/39/scale = Vector3(1, 1, 1) -bones/41/rotation = Quaternion(-0.0150352, 0.940883, 0.33818, 0.0121114) +bones/41/rotation = Quaternion(-0.0149888, 0.93956, 0.341843, 0.0120867) bones/41/scale = Vector3(1, 1, 1) bones/43/rotation = Quaternion(-0.015884, 0.718179, -0.69565, -0.00621676) bones/43/scale = Vector3(1, 1, 1) @@ -1015,37 +1016,37 @@ bones/66/rotation = Quaternion(-0.000385918, -2.26638e-14, 0.000401128, 1) bones/68/rotation = Quaternion(-0.706834, 0.000283644, -0.000283644, 0.70738) bones/70/rotation = Quaternion(-0.707107, 4.67924e-24, 4.67924e-24, 0.707107) bones/73/rotation = Quaternion(1.54543e-08, -1.54543e-08, 0.707107, 0.707107) -bones/74/rotation = Quaternion(-0.651302, 0.671041, 0.246924, -0.254043) +bones/74/rotation = Quaternion(-0.652164, 0.671825, 0.244784, -0.251823) bones/74/scale = Vector3(1, 1, 1) -bones/75/rotation = Quaternion(0.732212, -0.0539352, -0.0758248, 0.67469) +bones/75/rotation = Quaternion(0.725761, -0.0543238, -0.0750463, 0.68168) bones/75/scale = Vector3(1, 1, 1) -bones/76/rotation = Quaternion(-0.648777, 0.00101796, 0.105351, 0.75365) +bones/76/rotation = Quaternion(-0.643275, 0.00110192, 0.104547, 0.758463) bones/76/scale = Vector3(1, 1, 1) -bones/77/rotation = Quaternion(-0.430424, -0.0118608, 0.0624292, 0.900387) +bones/77/rotation = Quaternion(-0.431399, -0.0117786, 0.0625625, 0.899912) bones/77/scale = Vector3(1, 1, 1) -bones/78/rotation = Quaternion(-0.848976, -0.0351782, 0.176064, 0.496994) +bones/78/rotation = Quaternion(-0.848314, -0.0352934, 0.175886, 0.498178) bones/78/scale = Vector3(1, 1, 1) -bones/82/rotation = Quaternion(-0.845569, -0.0417017, 0.171629, 0.503803) +bones/82/rotation = Quaternion(-0.844891, -0.0418192, 0.171445, 0.504991) bones/82/scale = Vector3(1, 1, 1) bones/84/rotation = Quaternion(-0.583833, 0.0928994, 0.0936978, 0.80108) bones/86/rotation = Quaternion(0.993231, 0.0067672, -0.0811647, 0.0828119) bones/86/scale = Vector3(1, 1, 1) -bones/88/rotation = Quaternion(0.751422, -0.019542, -0.659084, 0.0243245) +bones/88/rotation = Quaternion(0.751421, -0.0197197, -0.659079, 0.0243455) bones/92/rotation = Quaternion(0.855906, 0.0322478, -0.0593455, 0.512701) bones/92/scale = Vector3(1, 1, 1) -bones/94/rotation = Quaternion(0.873777, -0.00316781, -0.144331, 0.464406) +bones/94/rotation = Quaternion(0.880652, -0.00346978, -0.145337, 0.450907) bones/94/scale = Vector3(1, 1, 1) bones/96/rotation = Quaternion(-0.715396, 0.0713076, 0.0634679, 0.692168) -bones/98/rotation = Quaternion(-0.592901, 0.00509827, 0.108508, 0.797915) +bones/98/rotation = Quaternion(-0.58515, 0.00523798, 0.107411, 0.803763) bones/100/rotation = Quaternion(0.808854, 0.0303333, -0.0651724, 0.583599) -bones/102/rotation = Quaternion(-0.585419, 0.00915622, 0.113493, 0.802695) +bones/102/rotation = Quaternion(-0.577591, 0.00930921, 0.112415, 0.808495) bones/102/scale = Vector3(1, 1, 1) bones/104/rotation = Quaternion(0.803479, 0.0249214, -0.0691385, 0.590779) -bones/106/rotation = Quaternion(-0.672818, -0.00415663, 0.108966, 0.731728) +bones/106/rotation = Quaternion(-0.664852, -0.00404163, 0.107758, 0.739151) bones/106/scale = Vector3(1, 1, 1) bones/108/scale = Vector3(1, 1, 1) bones/110/rotation = Quaternion(0.346017, 0.0755612, -0.0156624, 0.935049) -bones/112/rotation = Quaternion(0.0150356, 0.940889, 0.338166, -0.0121113) +bones/112/rotation = Quaternion(0.0149892, 0.939556, 0.341854, -0.0120864) bones/112/scale = Vector3(1, 1, 1) bones/114/rotation = Quaternion(0.015884, 0.718179, -0.69565, 0.00621692) bones/114/scale = Vector3(1, 1, 1) @@ -1061,106 +1062,106 @@ bones/126/rotation = Quaternion(0.993232, 0.00676712, -0.0811637, -0.0828125) bones/126/scale = Vector3(1, 1, 0.999988) [node name="Plane_009_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="0"] -transform = Transform3D(0.999996, 0.000676498, 0.00286262, -0.000787154, 0.999246, 0.0388463, -0.00283416, -0.0388485, 0.999241, -0.0120866, -0.0283278, 0.0486985) +transform = Transform3D(0.999998, 0.000474542, 0.00220294, -0.000553727, 0.99935, 0.0360751, -0.00218444, -0.0360763, 0.999347, -0.00951695, -0.0272682, 0.0438293) [node name="Plane_012_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="1"] -transform = Transform3D(0.999995, 0.00103264, 0.00309617, -0.00115313, 0.999232, 0.0391765, -0.0030533, -0.0391798, 0.999228, -0.0126374, -0.0282995, 0.048681) +transform = Transform3D(0.999997, 0.000805989, 0.00241873, -0.00089331, 0.99934, 0.036321, -0.0023879, -0.0363231, 0.999337, -0.0100281, -0.0271918, 0.0437539) [node name="Cube_016_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="2"] -transform = Transform3D(0.999999, -0.00030021, 0.00139831, 0.000300173, 1, 5.5626e-05, -0.00139827, -5.52088e-05, 0.999999, -0.00989199, -0.000311255, 0.00423729) +transform = Transform3D(1, -0.000451606, 0.000857875, 0.0004516, 1, 2.40505e-05, -0.000857919, -2.37077e-05, 1, -0.00746894, -0.00116129, 0.00258005) [node name="Plane_004_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="3"] -transform = Transform3D(0.999997, -0.000482321, 0.00210897, 0.000380501, 0.998848, 0.047992, -0.00212961, -0.0479912, 0.998846, -0.00965333, -0.0524758, 0.0145226) +transform = Transform3D(0.999998, -0.000399187, 0.00166725, 0.000322089, 0.998943, 0.0459651, -0.00168382, -0.0459647, 0.998942, -0.00752044, -0.0520916, 0.0135581) [node name="Cube_013_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="4"] -transform = Transform3D(0.999997, -0.000310071, 0.00258977, 0.00027696, 0.999919, 0.0127915, -0.00259348, -0.0127908, 0.999915, -0.0103452, -0.00516152, 0.0054419) +transform = Transform3D(0.999998, -0.000389121, 0.00191401, 0.000368886, 0.999945, 0.0105723, -0.00191803, -0.0105716, 0.999942, -0.00785756, -0.0049752, 0.00379515) [node name="Plane_011_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="5"] -transform = Transform3D(0.999998, -0.00153418, -0.00110752, 0.00160588, 0.997687, 0.0679595, 0.00100075, -0.0679611, 0.997688, 0.00845337, -0.405975, -0.010396) +transform = Transform3D(0.999999, -0.00137137, -0.000459265, 0.00139278, 0.998738, 0.0502089, 0.000389839, -0.0502094, 0.998739, 0.00461245, -0.307657, -0.0118656) [node name="Plane_002_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="6"] -transform = Transform3D(0.999995, 0.0010758, 0.00287483, -0.00119193, 0.999171, 0.0407078, -0.0028286, -0.0407111, 0.999167, -0.0132585, -0.0166031, 0.0820234) +transform = Transform3D(0.999998, 0.000760898, 0.00214268, -0.000832543, 0.999433, 0.0336593, -0.00211582, -0.033661, 0.999431, -0.0102794, -0.0150487, 0.0662665) [node name="Plane_013_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="7"] -transform = Transform3D(0.999995, 0.0010758, 0.00287483, -0.00119193, 0.999171, 0.0407078, -0.0028286, -0.0407111, 0.999167, -0.0132585, -0.0166031, 0.0820234) +transform = Transform3D(0.999998, 0.000760898, 0.00214268, -0.000832543, 0.999433, 0.0336593, -0.00211582, -0.033661, 0.999431, -0.0102794, -0.0150487, 0.0662665) [node name="Cube_007_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="8"] -transform = Transform3D(0.999997, -0.000486307, 0.00222186, 0.000371352, 0.998675, 0.0514536, -0.00224388, -0.0514526, 0.998673, -0.00980353, -0.0560383, 0.0175886) +transform = Transform3D(0.999999, -0.0005145, 0.00161587, 0.000446156, 0.999116, 0.0420445, -0.00163604, -0.0420437, 0.999114, -0.00742579, -0.0466312, 0.0131674) [node name="Plane_015_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="9"] -transform = Transform3D(0.999994, -0.000135668, 0.00343373, 0.000361606, 0.997828, -0.0658715, -0.00341727, 0.0658723, 0.997822, -0.0127041, 0.201238, -0.0637798) +transform = Transform3D(0.999997, -0.000292815, 0.00261192, 0.000431947, 0.998573, -0.0534056, -0.00259252, 0.0534064, 0.99857, -0.00976324, 0.162588, -0.0533457) [node name="Cube_010_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="10"] -transform = Transform3D(1, -8.38228e-05, -0.000872246, 0.000141652, 0.997789, 0.066468, 0.000864799, -0.0664681, 0.997788, 0.00560045, -0.399766, -0.158443) +transform = Transform3D(1, -4.57633e-05, -0.00065242, 7.97603e-05, 0.998641, 0.0521135, 0.000649153, -0.0521133, 0.998641, 0.00422239, -0.314503, -0.131224) [node name="Cube_012_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="11"] -transform = Transform3D(1, -0.000322304, -0.000670722, 0.000345937, 0.999371, 0.0354678, 0.000658918, -0.035468, 0.999371, 0.00459433, -0.229222, -0.181004) +transform = Transform3D(1, -0.000255194, -0.000541524, 0.000270794, 0.999583, 0.028881, 0.000533936, -0.028881, 0.999583, 0.00370526, -0.186699, -0.146902) [node name="Cylinder_002_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="12"] -transform = Transform3D(1, -1.77636e-15, 0, -1.77636e-15, 1, -4.37113e-08, 0, 4.37113e-08, 1, 0, 0, -0.212643) +transform = Transform3D(1, -1.77636e-15, 0, -1.77636e-15, 1, -4.37113e-08, 0, 4.37113e-08, 1, 0, 0, -0.172059) [node name="Cube_006_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="13"] -transform = Transform3D(1, 7.18899e-10, -2.01781e-08, -7.60139e-10, 1, -1.49128e-07, 2.01603e-08, 1.78756e-07, 1, -1.19209e-07, -1.43051e-06, -0.212644) +transform = Transform3D(1, 7.18899e-10, -2.01781e-08, -7.60139e-10, 1, -1.49128e-07, 2.01603e-08, 1.78756e-07, 1, -1.19209e-07, -1.43051e-06, -0.172059) [node name="Cube_017_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="14"] -transform = Transform3D(1, 3.15225e-10, 2.16325e-08, -3.11474e-10, 1, -1.19326e-07, -2.16737e-08, 1.78814e-07, 1, 1.19209e-07, -1.90735e-06, -0.212645) +transform = Transform3D(1, 3.15225e-10, 2.16325e-08, -3.11474e-10, 1, -1.19326e-07, -2.16737e-08, 1.78814e-07, 1, 1.19209e-07, -1.90735e-06, -0.172061) [node name="Cube_005_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="15"] -transform = Transform3D(1, -1.7053e-13, -3.41061e-13, 2.84217e-13, 1, -9.23872e-07, 3.41061e-13, 9.23872e-07, 1, -9.09153e-13, 4.52995e-06, -0.212645) +transform = Transform3D(1, -1.7053e-13, -3.41061e-13, 2.84217e-13, 1, -9.23872e-07, 3.41061e-13, 9.23872e-07, 1, -9.09153e-13, 4.52995e-06, -0.172061) [node name="Cube_005_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D/Cube_005_Material_0" index="0"] surface_material_override/0 = ExtResource("8_dt6e4") [node name="Cube_005_Inside_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="16"] -transform = Transform3D(1, -1.7053e-13, -3.41061e-13, 2.84217e-13, 1, -9.23872e-07, 3.41061e-13, 9.23872e-07, 1, -9.09153e-13, 4.52995e-06, -0.212645) +transform = Transform3D(1, -1.7053e-13, -3.41061e-13, 2.84217e-13, 1, -9.23872e-07, 3.41061e-13, 9.23872e-07, 1, -9.09153e-13, 4.52995e-06, -0.172061) [node name="Plane_003_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="17"] -transform = Transform3D(1, 1.08827e-10, -1.00637e-08, -1.10077e-10, 1, -2.82656e-07, 1.00761e-08, 2.82598e-07, 1, -2.38419e-07, 0, -0.212643) +transform = Transform3D(1, 1.08827e-10, -1.00637e-08, -1.10077e-10, 1, -2.82656e-07, 1.00761e-08, 2.82598e-07, 1, -2.38419e-07, 0, -0.172059) [node name="Plane_016_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="18"] -transform = Transform3D(1, -1.08827e-10, 1.00637e-08, 1.10077e-10, 1, -2.82656e-07, -1.00761e-08, 2.82598e-07, 1, 2.38419e-07, 0, -0.212643) +transform = Transform3D(1, -1.08827e-10, 1.00637e-08, 1.10077e-10, 1, -2.82656e-07, -1.00761e-08, 2.82598e-07, 1, 2.38419e-07, 0, -0.172059) [node name="Cube_008_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="19"] -transform = Transform3D(1, -2.64698e-23, 9.95068e-31, 2.64698e-23, 1, 0, -9.95068e-31, 0, 1, -1.90621e-29, 0, -0.212643) +transform = Transform3D(1, -2.64698e-23, 9.95068e-31, 2.64698e-23, 1, 0, -9.95068e-31, 0, 1, -1.90621e-29, 0, -0.172059) [node name="Cube_008_Inside_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="20"] -transform = Transform3D(1, -2.64698e-23, 9.95068e-31, 2.64698e-23, 1, 0, -9.95068e-31, 0, 1, -1.90621e-29, 0, -0.212643) +transform = Transform3D(1, -2.64698e-23, 9.95068e-31, 2.64698e-23, 1, 0, -9.95068e-31, 0, 1, -1.90621e-29, 0, -0.172059) [node name="Plane_006_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="21"] -transform = Transform3D(0.999996, -0.000676036, -0.00286453, 0.000786722, 0.999246, 0.0388484, 0.00283602, -0.0388503, 0.999241, 0.0120888, -0.02833, 0.0487061) +transform = Transform3D(0.999998, -0.000474811, -0.00220297, 0.000554025, 0.99935, 0.0360758, 0.00218437, -0.0360769, 0.999347, 0.00951743, -0.0272651, 0.0438303) [node name="Plane_008_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="22"] -transform = Transform3D(0.999995, -0.00103359, -0.00309755, 0.00115408, 0.999233, 0.0391774, 0.00305459, -0.0391807, 0.999228, 0.01264, -0.0282973, 0.0486844) +transform = Transform3D(0.999997, -0.000815392, -0.00243404, 0.000903428, 0.999339, 0.036381, 0.00240278, -0.0363831, 0.999336, 0.0100498, -0.0272098, 0.0438582) [node name="Cube_004_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="23"] -transform = Transform3D(0.999999, 0.000300003, -0.00139847, -0.000299988, 1, 5.64307e-05, 0.00139841, -5.58496e-05, 0.999999, 0.00989199, -0.000310972, 0.00423768) +transform = Transform3D(1, 0.000451466, -0.000857905, -0.000451414, 1, 2.36183e-05, 0.000857919, -2.32309e-05, 1, 0.00746775, -0.00115849, 0.00258034) [node name="Plane_005_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="24"] -transform = Transform3D(0.999998, 0.000481904, -0.00210907, -0.000379503, 0.998848, 0.047992, 0.00212923, -0.0479911, 0.998846, 0.00965858, -0.0524739, 0.0145243) +transform = Transform3D(0.999999, 0.000404149, -0.00166931, -0.000326425, 0.998942, 0.0460055, 0.00168578, -0.0460054, 0.99894, 0.0075264, -0.0521585, 0.0135807) [node name="Cube_003_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="25"] -transform = Transform3D(0.999997, 0.000310034, -0.00258979, -0.000276968, 0.999918, 0.0127916, 0.00259348, -0.0127907, 0.999915, 0.0103447, -0.00516117, 0.00544214) +transform = Transform3D(0.999998, 0.000389181, -0.00191398, -0.000368901, 0.999944, 0.0105719, 0.00191795, -0.0105712, 0.999942, 0.00785661, -0.00497282, 0.00379491) [node name="Plane_007_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="26"] -transform = Transform3D(0.999998, 0.00153416, 0.00110728, -0.00160593, 0.997687, 0.0679595, -0.00100052, -0.0679611, 0.997688, -0.00845122, -0.405975, -0.0103951) +transform = Transform3D(0.999999, 0.00137085, 0.000460021, -0.00139216, 0.998741, 0.0501453, -0.000390749, -0.0501458, 0.998742, -0.00461483, -0.307369, -0.0119133) [node name="Plane_014_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="27"] -transform = Transform3D(0.999995, -0.00107604, -0.00287502, 0.00119212, 0.999171, 0.0407079, 0.00282877, -0.0407111, 0.999167, 0.0132596, -0.0166022, 0.0820253) +transform = Transform3D(0.999998, -0.000761285, -0.00214255, 0.000833005, 0.999433, 0.0336574, 0.00211566, -0.0336591, 0.999431, 0.0102799, -0.0150417, 0.0662646) [node name="Plane_010_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="28"] -transform = Transform3D(0.999994, -0.00190684, -0.00299408, 0.00202805, 0.999156, 0.0410292, 0.00291327, -0.0410351, 0.999154, 0.0146291, -0.0163962, 0.0808012) +transform = Transform3D(0.999997, -0.00145058, -0.00222847, 0.00152536, 0.999424, 0.0339202, 0.00217795, -0.0339237, 0.999422, 0.0113895, -0.0148526, 0.0652399) [node name="Cube_014_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="29"] -transform = Transform3D(0.999997, 0.000486463, -0.00222396, -0.000371471, 0.998675, 0.0514538, 0.00224598, -0.0514528, 0.998673, 0.00980759, -0.0560388, 0.0175948) +transform = Transform3D(0.999999, 0.000514388, -0.00161576, -0.000445955, 0.999116, 0.042043, 0.00163589, -0.0420421, 0.999115, 0.00742507, -0.0466251, 0.0131657) [node name="Plane_001_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="30"] -transform = Transform3D(0.999994, 0.000135668, -0.00343358, -0.000361614, 0.997828, -0.0658717, 0.00341713, 0.0658726, 0.997822, 0.0127041, 0.201239, -0.0637798) +transform = Transform3D(0.999997, 0.00029289, -0.00261169, -0.000431925, 0.998573, -0.0534061, 0.0025923, 0.053407, 0.99857, 0.00976229, 0.162591, -0.0533462) [node name="Cube_015_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="31"] -transform = Transform3D(1, 8.30274e-05, 0.000871937, -0.000140907, 0.997787, 0.0664992, -0.000864538, -0.0664994, 0.997786, -0.00559831, -0.399936, -0.158416) +transform = Transform3D(1, 4.49531e-05, 0.000651134, -7.88048e-05, 0.998643, 0.0520901, -0.000647941, -0.0520901, 0.998642, -0.00421453, -0.314371, -0.131238) [node name="Cube_001_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="32"] -transform = Transform3D(1, 0.000322295, 0.000670741, -0.000345959, 0.999371, 0.0354678, -0.000658938, -0.0354679, 0.999371, -0.0045948, -0.229222, -0.181005) +transform = Transform3D(1, 0.000255261, 0.000541636, -0.000270793, 0.999583, 0.0288806, -0.000534069, -0.0288807, 0.999583, -0.00370669, -0.186696, -0.146903) [node name="Cylinder_001_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="33"] -transform = Transform3D(1, 1.77636e-15, 0, 1.77636e-15, 1, -4.37113e-08, 0, 4.37113e-08, 1, 0, 0, -0.212643) +transform = Transform3D(1, 1.77636e-15, 0, 1.77636e-15, 1, -4.37113e-08, 0, 4.37113e-08, 1, 0, 0, -0.172059) diff --git a/assets/textures/compass.png b/assets/textures/compass.png new file mode 100644 index 0000000..02603e9 --- /dev/null +++ b/assets/textures/compass.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d6f78598b3489b61467955af3a0b04701e422fb2c7c66252440d0630e3a9d49 +size 1171 diff --git a/assets/textures/compass.png.import b/assets/textures/compass.png.import new file mode 100644 index 0000000..27ac3a5 --- /dev/null +++ b/assets/textures/compass.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://mmit1txxkbvb" +path="res://.godot/imported/compass.png-6198215e2d0921f37e6f10f849e573e5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/textures/compass.png" +dest_files=["res://.godot/imported/compass.png-6198215e2d0921f37e6f10f849e573e5.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/textures/compass.xcf b/assets/textures/compass.xcf new file mode 100644 index 0000000..83e0678 Binary files /dev/null and b/assets/textures/compass.xcf differ diff --git a/src/compass.gd b/src/compass.gd new file mode 100644 index 0000000..513253d --- /dev/null +++ b/src/compass.gd @@ -0,0 +1,17 @@ +class_name Compass +extends Control + +const TEX_WIDTH: int = 1152 +const TEX_OFFSET: int = -936 +const COMPASS_SPEED: float = 10.0 + +var target: float = 0 + +var _offset: float = TEX_OFFSET + +@onready var compass_texture: TextureRect = $CompassTexture + + +func _process(delta: float) -> void: + _offset = lerp_angle(_offset, target, delta * COMPASS_SPEED) + compass_texture.position.x = int(_offset * TEX_WIDTH / (2 * PI)) % TEX_WIDTH diff --git a/src/main.tscn b/src/main.tscn index fd422cb..9dab36f 100644 --- a/src/main.tscn +++ b/src/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=3 uid="uid://d75odchj18u1"] +[gd_scene load_steps=13 format=3 uid="uid://d75odchj18u1"] [ext_resource type="Script" path="res://src/crosshair.gd" id="1_8vuwf"] [ext_resource type="Shader" path="res://src/shaders/threshold.gdshader" id="1_bg1gg"] @@ -6,6 +6,8 @@ [ext_resource type="Shader" path="res://src/shaders/invert.gdshader" id="1_rg2hr"] [ext_resource type="Texture2D" uid="uid://bepxfquua1v6" path="res://assets/textures/crosshair_circle.png" id="3_1ycfj"] [ext_resource type="Texture2D" uid="uid://hmt7s15m7eto" path="res://assets/textures/crosshair_dot.png" id="3_3u7nt"] +[ext_resource type="Texture2D" uid="uid://mmit1txxkbvb" path="res://assets/textures/compass.png" id="5_6lb45"] +[ext_resource type="Script" path="res://src/compass.gd" id="5_ovssf"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_ag8l2"] shader = ExtResource("1_rg2hr") @@ -13,11 +15,14 @@ shader = ExtResource("1_rg2hr") [sub_resource type="ShaderMaterial" id="ShaderMaterial_csvvm"] shader = ExtResource("1_rg2hr") +[sub_resource type="ShaderMaterial" id="ShaderMaterial_hre76"] +shader = ExtResource("1_rg2hr") + [sub_resource type="ShaderMaterial" id="ShaderMaterial_ubp15"] shader = ExtResource("1_bg1gg") shader_parameter/color_low = Color(0, 0, 0, 1) shader_parameter/color_hi = Color(1, 1, 1, 1) -shader_parameter/threshold = 0.506 +shader_parameter/threshold = 0.455 shader_parameter/contrast = 1.0 shader_parameter/offset = 0.0 @@ -26,18 +31,23 @@ custom_minimum_size = Vector2(1900, 768) layout_mode = 3 anchors_preset = 0 -[node name="Crosshair" type="CenterContainer" parent="." groups=["CrosshairGroup"]] +[node name="UI" type="Control" parent="."] z_index = 1 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 + +[node name="Crosshair" type="CenterContainer" parent="UI" groups=["CrosshairGroup"]] layout_mode = 0 offset_right = 1900.0 offset_bottom = 768.0 script = ExtResource("1_8vuwf") -[node name="CrosshairContainer" type="Control" parent="Crosshair"] +[node name="CrosshairContainer" type="Control" parent="UI/Crosshair"] custom_minimum_size = Vector2(32, 32) layout_mode = 2 -[node name="CrosshairCircle" type="TextureRect" parent="Crosshair/CrosshairContainer"] +[node name="CrosshairCircle" type="TextureRect" parent="UI/Crosshair/CrosshairContainer"] material = SubResource("ShaderMaterial_ag8l2") layout_mode = 2 offset_right = 32.0 @@ -45,13 +55,31 @@ offset_bottom = 32.0 texture = ExtResource("3_1ycfj") stretch_mode = 2 -[node name="CrosshairDot" type="TextureRect" parent="Crosshair/CrosshairContainer"] +[node name="CrosshairDot" type="TextureRect" parent="UI/Crosshair/CrosshairContainer"] material = SubResource("ShaderMaterial_csvvm") layout_mode = 2 offset_right = 32.0 offset_bottom = 32.0 texture = ExtResource("3_3u7nt") +[node name="Compass" type="Control" parent="UI" groups=["CompassGroup"]] +clip_contents = true +anchors_preset = 0 +offset_left = 760.0 +offset_top = 20.0 +offset_right = 1140.0 +offset_bottom = 52.0 +script = ExtResource("5_ovssf") + +[node name="CompassTexture" type="TextureRect" parent="UI/Compass"] +material = SubResource("ShaderMaterial_hre76") +custom_minimum_size = Vector2(2304, 32) +layout_mode = 0 +offset_right = 2304.0 +offset_bottom = 32.0 +texture = ExtResource("5_6lb45") +stretch_mode = 1 + [node name="ViewportContainer" type="SubViewportContainer" parent="."] material = SubResource("ShaderMaterial_ubp15") layout_mode = 0 diff --git a/src/maps/arena_map/arena_map.tscn b/src/maps/arena_map/arena_map.tscn index e6017e7..339fb98 100644 --- a/src/maps/arena_map/arena_map.tscn +++ b/src/maps/arena_map/arena_map.tscn @@ -11,7 +11,7 @@ [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_e4ffr"] sky_top_color = Color(1, 1, 1, 1) sky_horizon_color = Color(0, 0, 0, 1) -sky_curve = 0.344609 +sky_curve = 0.599999 ground_bottom_color = Color(0, 0, 0, 1) ground_horizon_color = Color(0, 0, 0, 1) sun_angle_max = 0.0 diff --git a/src/player/player.gd b/src/player/player.gd index 577ef5e..6dda218 100644 --- a/src/player/player.gd +++ b/src/player/player.gd @@ -24,14 +24,14 @@ func _physics_process(delta: float) -> void: # Add the gravity. if not is_on_floor(): velocity.y -= gravity * delta + animation_tree["parameters/jump_state/transition_request"] = "in_air" + animation_tree["parameters/anim_state/transition_request"] = "air" elif animation_tree["parameters/anim_state/current_state"] == "air": animation_tree["parameters/jump_state/transition_request"] = "end" # Handle jump. if Input.is_action_just_pressed("jump") and is_on_floor(): velocity.y = JUMP_FORCE - animation_tree["parameters/jump_state/transition_request"] = "in_air" - animation_tree["parameters/anim_state/transition_request"] = "air" # Get the input direction and handle the movement/deceleration. var input_dir: Vector2 = Input.get_vector("left", "right", "forward", "backward") @@ -66,5 +66,5 @@ func _physics_process(delta: float) -> void: func _on_mech_stomp() -> void: - _crosshair.jostle(Vector2(randf_range(-5, 5), randf_range(-15, 5))) + _crosshair.jostle(Vector2(randf_range(-1, 1), randf_range(-1, 5))) # camera_root.jostle(randf_range(-2, 2)) diff --git a/src/player/third_person_camera.gd b/src/player/third_person_camera.gd index c3c68dd..0ce1899 100644 --- a/src/player/third_person_camera.gd +++ b/src/player/third_person_camera.gd @@ -17,6 +17,8 @@ const CORRECTION_SPEED: float = 10 @onready var _crosshair: Crosshair = get_tree().get_first_node_in_group("CrosshairGroup") +@onready var _compass: Compass = get_tree().get_first_node_in_group("CompassGroup") + func _ready() -> void: Input.mouse_mode = Input.MOUSE_MODE_CAPTURED @@ -35,7 +37,8 @@ func _unhandled_input(event: InputEvent) -> void: pitch_min, pitch_max ) - _crosshair.jostle(motion * CROSSHAIR_MOUSE_JOSTLE) + if _crosshair: + _crosshair.jostle(motion * CROSSHAIR_MOUSE_JOSTLE) func _physics_process(delta: float) -> void: @@ -43,3 +46,5 @@ func _physics_process(delta: float) -> void: rotation_degrees.x = lerpf(rotation_degrees.x, _target.x, delta * pitch_acceleration) rotation_degrees.z = lerpf(rotation_degrees.z, 0.0, delta * CORRECTION_SPEED) + + _compass.target = rotation.y