diff --git a/assets/fonts/FfMoon-V4Oz6.ttf.import b/assets/fonts/FfMoon-V4Oz6.ttf.import index 7037920..f39e2f1 100644 --- a/assets/fonts/FfMoon-V4Oz6.ttf.import +++ b/assets/fonts/FfMoon-V4Oz6.ttf.import @@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/FfMoon-V4Oz6.ttf-eb6eb0f742e26fdd30326f2816f0 [params] Rendering=null -antialiasing=1 +antialiasing=0 generate_mipmaps=false multichannel_signed_distance_field=false msdf_pixel_range=8 @@ -27,7 +27,12 @@ Fallbacks=null fallbacks=[] Compress=null compress=true -preload=[] +preload=[{ +"chars": [], +"glyphs": [], +"name": "New Configuration", +"size": Vector2i(16, 0) +}] language_support={} script_support={} opentype_features={} diff --git a/assets/models/bipedal_mech/mech.tscn b/assets/models/bipedal_mech/mech.tscn index b8a77e0..2ced897 100644 --- a/assets/models/bipedal_mech/mech.tscn +++ b/assets/models/bipedal_mech/mech.tscn @@ -865,7 +865,6 @@ fadeout_time = 0.1 [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_q4ale"] animation = &"jump_start" -play_mode = 1 [sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_spueh"] @@ -919,7 +918,7 @@ blend_point_4/pos = Vector2(-1, 0) sync = true [sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_u1qtb"] -graph_offset = Vector2(83.0129, 20.129) +graph_offset = Vector2(-12.9811, 214.809) nodes/air_anim/node = SubResource("AnimationNodeAnimation_512j7") nodes/air_anim/position = Vector2(780, 640) nodes/air_scale/node = SubResource("AnimationNodeTimeScale_o8qjb") @@ -977,43 +976,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.30965) +bones/1/position = Vector3(0, 0, 6.21168) 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.652367, 0.67201, 0.244274, 0.251294) +bones/3/rotation = Quaternion(0.650526, 0.670343, 0.248814, 0.256023) bones/3/scale = Vector3(1, 1, 1) -bones/4/rotation = Quaternion(0.724228, 0.0544998, 0.0749423, 0.683306) +bones/4/rotation = Quaternion(0.739681, 0.0534223, 0.0766771, 0.666437) bones/4/scale = Vector3(1, 1, 1) -bones/5/rotation = Quaternion(-0.641974, -0.00112317, -0.104355, 0.759591) +bones/5/rotation = Quaternion(-0.655148, -0.000934633, -0.106279, 0.747987) bones/5/scale = Vector3(1, 1, 1) -bones/6/rotation = Quaternion(-0.431643, 0.0117232, -0.0625202, 0.899799) -bones/7/rotation = Quaternion(-0.846737, 0.0355634, -0.175468, 0.500982) +bones/6/rotation = Quaternion(-0.430088, 0.0119082, -0.0624195, 0.900548) +bones/7/rotation = Quaternion(-0.851057, 0.034794, -0.176668, 0.493234) bones/7/scale = Vector3(1, 1, 1) bones/9/rotation = Quaternion(-0.577893, -0.0977404, -0.0868737, 0.805568) -bones/11/rotation = Quaternion(-0.843264, 0.0421208, -0.170997, 0.50783) +bones/11/rotation = Quaternion(-0.847699, 0.0412657, -0.172258, 0.50003) 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.751537, 0.016959, 0.659159, 0.0203588) +bones/17/rotation = Quaternion(0.751247, 0.0222504, 0.659032, 0.0284619) 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.881155, 0.00323519, 0.14553, 0.449862) +bones/23/rotation = Quaternion(0.866271, 0.00313438, 0.143094, 0.478632) 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.583306, -0.00526912, -0.107153, 0.805136) +bones/27/rotation = Quaternion(-0.601809, -0.00495145, -0.10974, 0.791049) 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.575728, -0.00934441, -0.112159, 0.809858) -bones/35/rotation = Quaternion(-0.662964, 0.00401885, -0.107476, 0.740886) +bones/33/rotation = Quaternion(-0.594466, -0.00898174, -0.114731, 0.795843) +bones/35/rotation = Quaternion(-0.682026, 0.00418788, -0.11025, 0.722958) 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.0149778, 0.939266, 0.34265, 0.0120816) +bones/41/rotation = Quaternion(-0.0150815, 0.942671, 0.33316, 0.0121521) 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) @@ -1036,37 +1035,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.652367, 0.67201, 0.244274, -0.251295) +bones/74/rotation = Quaternion(-0.650526, 0.670343, 0.248814, -0.256023) bones/74/scale = Vector3(1, 1, 1) -bones/75/rotation = Quaternion(0.724229, -0.0544997, -0.0749423, 0.683306) +bones/75/rotation = Quaternion(0.739681, -0.0534223, -0.0766771, 0.666437) bones/75/scale = Vector3(1, 1, 1) -bones/76/rotation = Quaternion(-0.641974, 0.00112316, 0.104355, 0.759591) +bones/76/rotation = Quaternion(-0.655148, 0.000934632, 0.106279, 0.747987) bones/76/scale = Vector3(1, 1, 1) -bones/77/rotation = Quaternion(-0.431643, -0.0117232, 0.0625202, 0.899799) +bones/77/rotation = Quaternion(-0.430088, -0.0119082, 0.0624194, 0.900548) bones/77/scale = Vector3(1, 1, 1) -bones/78/rotation = Quaternion(-0.846737, -0.0355635, 0.175467, 0.500982) +bones/78/rotation = Quaternion(-0.851056, -0.0348391, 0.176673, 0.49323) bones/78/scale = Vector3(1, 1, 1) -bones/82/rotation = Quaternion(-0.843278, -0.0421232, 0.170999, 0.507807) +bones/82/rotation = Quaternion(-0.847699, -0.0412658, 0.172258, 0.50003) 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.751537, -0.0169589, -0.659158, 0.0203589) +bones/88/rotation = Quaternion(0.751247, -0.0222503, -0.659032, 0.028462) bones/92/rotation = Quaternion(0.855906, 0.0322478, -0.0593455, 0.512701) bones/92/scale = Vector3(1, 1, 1) -bones/94/rotation = Quaternion(0.881155, -0.00323529, -0.14553, 0.449862) +bones/94/rotation = Quaternion(0.866272, -0.00315382, -0.143083, 0.478633) bones/94/scale = Vector3(1, 1, 1) bones/96/rotation = Quaternion(-0.715396, 0.0713076, 0.0634679, 0.692168) -bones/98/rotation = Quaternion(-0.583306, 0.00526915, 0.107153, 0.805136) +bones/98/rotation = Quaternion(-0.601809, 0.00495132, 0.10974, 0.791049) bones/100/rotation = Quaternion(0.808854, 0.0303333, -0.0651724, 0.583599) -bones/102/rotation = Quaternion(-0.575728, 0.0093444, 0.112159, 0.809858) +bones/102/rotation = Quaternion(-0.594466, 0.00898174, 0.114731, 0.795843) bones/102/scale = Vector3(1, 1, 1) bones/104/rotation = Quaternion(0.803479, 0.0249214, -0.0691385, 0.590779) -bones/106/rotation = Quaternion(-0.662964, -0.0040188, 0.107476, 0.740886) +bones/106/rotation = Quaternion(-0.682026, -0.00418019, 0.110257, 0.722957) 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.0149778, 0.939266, 0.34265, -0.0120816) +bones/112/rotation = Quaternion(0.0150815, 0.942671, 0.33316, -0.0121521) 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) @@ -1082,106 +1081,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.999998, 0.000492066, 0.00214469, -0.000555307, 0.999564, 0.0295491, -0.00212933, -0.0295503, 0.999561, -0.00916982, -0.0220667, 0.0369061) +transform = Transform3D(0.999992, 0.000782803, 0.00391419, -0.000967741, 0.998873, 0.0474751, -0.00387266, -0.0474786, 0.998865, -0.0152667, -0.023532, 0.0591475) [node name="Plane_012_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="1"] -transform = Transform3D(0.999997, 0.000768811, 0.00232133, -0.000837579, 0.999557, 0.0297385, -0.0022976, -0.0297403, 0.999555, -0.00959325, -0.0219766, 0.0368453) +transform = Transform3D(0.99999, 0.00125472, 0.00421797, -0.00145532, 0.998852, 0.0478853, -0.00415307, -0.0478909, 0.998844, -0.0159919, -0.0233788, 0.0590869) [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.000257852, 0.00105718, 0.000257794, 1, -2.16067e-06, -0.00105734, 2.48849e-06, 0.999999, -0.00751305, -0.000531077, 0.00322863) +transform = Transform3D(0.999998, -0.000351552, 0.00199263, 0.000351585, 1, -5.33462e-06, -0.00199269, 6.03497e-06, 0.999998, -0.0125394, 0.0105973, 0.004123) [node name="Plane_004_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="3"] -transform = Transform3D(0.999998, -0.000347093, 0.00151866, 0.00029245, 0.99936, 0.0357676, -0.00153017, -0.035767, 0.999359, -0.0072608, -0.0389265, 0.0101446) +transform = Transform3D(0.999995, -0.000721827, 0.00282856, 0.000554785, 0.998284, 0.0585532, -0.00286593, -0.0585513, 0.99828, -0.0123019, -0.055366, 0.0180107) [node name="Cube_013_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="4"] -transform = Transform3D(0.999998, -0.000261046, 0.0019374, 0.000241578, 0.99995, 0.0100254, -0.00194004, -0.0100249, 0.999948, -0.00784779, -0.00435364, 0.00398684) +transform = Transform3D(0.999995, -0.000357039, 0.00330256, 0.000312522, 0.99991, 0.0134719, -0.00330711, -0.0134707, 0.999904, -0.0130334, 0.00550973, 0.00555682) [node name="Plane_011_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="5"] -transform = Transform3D(0.999999, -0.00118595, -0.000923851, 0.00123121, 0.998713, 0.0507104, 0.000862394, -0.0507113, 0.998713, 0.00670314, -0.305107, -0.0106182) +transform = Transform3D(0.999998, -0.00185008, -0.00116052, 0.00194076, 0.99649, 0.0836936, 0.00100155, -0.0836955, 0.996491, 0.00962019, -0.495558, -0.0102711) [node name="Plane_002_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="6"] -transform = Transform3D(0.999997, 0.000837341, 0.00214903, -0.000905618, 0.999489, 0.03195, -0.00212129, -0.0319518, 0.999487, -0.0101366, -0.0140275, 0.0630953) +transform = Transform3D(0.999992, 0.00127658, 0.00370017, -0.00144857, 0.998901, 0.0468599, -0.0036363, -0.0468651, 0.998895, -0.0165613, -0.00746477, 0.0986981) [node name="Plane_013_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="7"] -transform = Transform3D(0.999997, 0.000837341, 0.00214903, -0.000905618, 0.999489, 0.03195, -0.00212129, -0.0319518, 0.999487, -0.0101366, -0.0140275, 0.0630953) +transform = Transform3D(0.999992, 0.00127658, 0.00370017, -0.00144857, 0.998901, 0.0468599, -0.0036363, -0.0468651, 0.998895, -0.0165613, -0.00746477, 0.0986981) [node name="Cube_007_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="8"] -transform = Transform3D(0.999999, -0.000366934, 0.00164937, 0.000300921, 0.999207, 0.039803, -0.00166278, -0.0398024, 0.999206, -0.00743294, -0.0437782, 0.0127041) +transform = Transform3D(0.999995, -0.000823796, 0.00301909, 0.000639543, 0.998166, 0.0605309, -0.00306344, -0.0605286, 0.998162, -0.012569, -0.0567249, 0.0217268) [node name="Plane_015_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="9"] -transform = Transform3D(0.999997, -0.000165671, 0.00258759, 0.000296064, 0.998724, -0.050491, -0.00257605, 0.0504917, 0.998721, -0.00962901, 0.15409, -0.0502563) +transform = Transform3D(0.999991, -4.11347e-05, 0.00432598, 0.000397034, 0.996608, -0.082295, -0.00430794, 0.0822959, 0.996599, -0.0159943, 0.257589, -0.0767522) [node name="Cube_010_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="10"] -transform = Transform3D(1, -3.8838e-05, -0.00060342, 6.8225e-05, 0.998807, 0.0488326, 0.000600694, -0.0488325, 0.998807, 0.00391459, -0.294952, -0.124627) +transform = Transform3D(1, -0.000153581, -0.00114117, 0.000247724, 0.996555, 0.0829372, 0.00112446, -0.0829373, 0.996554, 0.00726271, -0.496052, -0.19026) [node name="Cube_012_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="11"] -transform = Transform3D(1, -0.000240944, -0.000511086, 0.000254773, 0.999627, 0.0273132, 0.000504209, -0.0273132, 0.999627, 0.00349736, -0.176578, -0.138892) +transform = Transform3D(1, -0.000409801, -0.000787077, 0.000441997, 0.999146, 0.0413211, 0.000769432, -0.0413214, 0.999146, 0.0054183, -0.267071, -0.222888) [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.162547) +transform = Transform3D(1, -1.77636e-15, 0, -1.77636e-15, 1, -4.37113e-08, 0, 4.37113e-08, 1, 0, 0, -0.260523) [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.162547) +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.260524) [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.162549) +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.260526) [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.162549) +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.260526) [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.162549) +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.260526) [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.162547) +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.260523) [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.162547) +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.260523) [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.162547) +transform = Transform3D(1, -2.64698e-23, 9.95068e-31, 2.64698e-23, 1, 0, -9.95068e-31, 0, 1, -1.90621e-29, 0, -0.260523) [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.162547) +transform = Transform3D(1, -2.64698e-23, 9.95068e-31, 2.64698e-23, 1, 0, -9.95068e-31, 0, 1, -1.90621e-29, 0, -0.260523) [node name="Plane_006_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="21"] -transform = Transform3D(0.999998, -0.000493154, -0.00214341, 0.000556186, 0.999565, 0.0295495, 0.0021278, -0.0295507, 0.999561, 0.00917196, -0.0220603, 0.0369015) +transform = Transform3D(0.999992, -0.000709087, -0.00386128, 0.000891581, 0.998873, 0.0474806, 0.00382324, -0.0474837, 0.998865, 0.0151503, -0.023803, 0.0589789) [node name="Plane_008_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="22"] -transform = Transform3D(0.999997, -0.000766248, -0.00231493, 0.000834718, 0.999557, 0.0297911, 0.002291, -0.0297932, 0.999554, 0.00958753, -0.0220249, 0.036881) +transform = Transform3D(0.99999, -0.00125484, -0.00421807, 0.00145546, 0.998853, 0.0478853, 0.00415321, -0.0478909, 0.998844, 0.0159926, -0.0233787, 0.0590869) [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.000257961, -0.00105745, -0.000258103, 1, -2.39909e-06, 0.00105736, 2.5183e-06, 1, 0.00751424, -0.000528976, 0.00322941) +transform = Transform3D(0.999998, 0.000351453, -0.00199275, -0.000351457, 1, -5.36442e-06, 0.00199278, 6.12438e-06, 0.999998, 0.0125394, 0.0105976, 0.00412315) [node name="Plane_005_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="24"] -transform = Transform3D(0.999999, 0.000346988, -0.00151797, -0.000292003, 0.999361, 0.0357664, 0.0015289, -0.0357663, 0.999359, 0.00726628, -0.0389227, 0.0101442) +transform = Transform3D(0.999996, 0.000721812, -0.00282776, -0.000554293, 0.998285, 0.058553, 0.00286475, -0.0585514, 0.99828, 0.012306, -0.0553654, 0.0180098) [node name="Cube_003_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="25"] -transform = Transform3D(0.999998, 0.000261255, -0.00193757, -0.000241973, 0.99995, 0.0100245, 0.00194001, -0.0100242, 0.999948, 0.0078485, -0.00435126, 0.00398731) +transform = Transform3D(0.999994, 0.000357114, -0.00330256, -0.000312589, 0.999909, 0.0134719, 0.00330711, -0.0134707, 0.999904, 0.0130329, 0.00550973, 0.00555658) [node name="Plane_007_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="26"] -transform = Transform3D(0.999999, 0.00118631, 0.000923263, -0.00123169, 0.998713, 0.0507092, -0.000862018, -0.0507103, 0.998713, -0.00669885, -0.305104, -0.0106158) +transform = Transform3D(0.999998, 0.00185093, 0.00111565, -0.00193781, 0.99649, 0.0836973, -0.000956799, -0.0836993, 0.996491, -0.00941706, -0.495565, -0.0101275) [node name="Plane_014_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="27"] -transform = Transform3D(0.999997, -0.000837207, -0.00214925, 0.000905335, 0.999489, 0.0319487, 0.00212132, -0.0319507, 0.999487, 0.0101385, -0.0140243, 0.0630975) +transform = Transform3D(0.999992, -0.00127691, -0.00370032, 0.00144893, 0.998901, 0.0468598, 0.00363643, -0.0468648, 0.998895, 0.0165627, -0.00746334, 0.0986991) [node name="Plane_010_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="28"] -transform = Transform3D(0.999997, -0.00149003, -0.00223048, 0.00156097, 0.999481, 0.0321939, 0.00218127, -0.0321974, 0.999479, 0.0111895, -0.0138416, 0.0621254) +transform = Transform3D(0.99999, -0.00230812, -0.00382458, 0.00248677, 0.998874, 0.0473846, 0.00371092, -0.0473938, 0.99887, 0.0182171, -0.00737321, 0.0973148) [node name="Cube_014_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="29"] -transform = Transform3D(0.999999, 0.000367112, -0.00164969, -0.000301264, 0.999208, 0.039802, 0.00166286, -0.0398016, 0.999206, 0.00743461, -0.0437751, 0.0127051) +transform = Transform3D(0.999995, 0.000835329, -0.00300208, -0.00065206, 0.998166, 0.0605336, 0.00304714, -0.0605313, 0.998162, 0.0125234, -0.05677, 0.0216775) [node name="Plane_001_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="30"] -transform = Transform3D(0.999997, 0.000165902, -0.00258761, -0.000296436, 0.998725, -0.0504924, 0.00257585, 0.0504929, 0.998721, 0.0096302, 0.154093, -0.0502553) +transform = Transform3D(0.999991, 4.12017e-05, -0.00432585, -0.000397071, 0.996608, -0.0822952, 0.00430781, 0.0822961, 0.996599, 0.0159938, 0.257589, -0.0767527) [node name="Cube_015_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="31"] -transform = Transform3D(1, 3.87654e-05, 0.000602996, -6.82492e-05, 0.998807, 0.0488329, -0.000600482, -0.0488329, 0.998807, -0.0039115, -0.294954, -0.124627) +transform = Transform3D(1, 0.000153393, 0.00114093, -0.000247493, 0.996555, 0.0829372, -0.00112423, -0.0829373, 0.996554, -0.00726128, -0.496052, -0.190259) [node name="Cube_001_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="32"] -transform = Transform3D(1, 0.000241077, 0.000510905, -0.000255023, 0.999627, 0.0273135, -0.000504234, -0.0273136, 0.999627, -0.00349641, -0.17658, -0.138893) +transform = Transform3D(1, 0.000409877, 0.000787105, -0.000442048, 0.999146, 0.0413211, -0.000769452, -0.0413214, 0.999146, -0.00541878, -0.26707, -0.222888) [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.162547) +transform = Transform3D(1, 1.77636e-15, 0, 1.77636e-15, 1, -4.37113e-08, 0, 4.37113e-08, 1, 0, 0, -0.260523) diff --git a/assets/textures/structure.png b/assets/textures/structure.png new file mode 100644 index 0000000..22cff13 --- /dev/null +++ b/assets/textures/structure.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff75650ed4ff94f393101679e522bd06f4165ba20558782a190540010c991d9b +size 722 diff --git a/assets/textures/structure.png.import b/assets/textures/structure.png.import new file mode 100644 index 0000000..8e7fb9f --- /dev/null +++ b/assets/textures/structure.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bgujaq21oq2mm" +path="res://.godot/imported/structure.png-1da0741ae9ee6b29c29901970c5806e8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/textures/structure.png" +dest_files=["res://.godot/imported/structure.png-1da0741ae9ee6b29c29901970c5806e8.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/src/HUD_theme.tres b/src/HUD_theme.tres new file mode 100644 index 0000000..74419a6 --- /dev/null +++ b/src/HUD_theme.tres @@ -0,0 +1,24 @@ +[gd_resource type="Theme" load_steps=4 format=3 uid="uid://cq6k0lttfws5w"] + +[ext_resource type="FontFile" uid="uid://bis7frbd8pbqk" path="res://assets/fonts/FfMoon-V4Oz6.ttf" id="1_i0o8h"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_e31i6"] +bg_color = Color(0, 0, 0, 0) +draw_center = false +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +border_color = Color(1, 1, 1, 1) +anti_aliasing = false + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_8fg7e"] +bg_color = Color(1, 1, 1, 1) +corner_detail = 1 +anti_aliasing = false + +[resource] +default_font = ExtResource("1_i0o8h") +default_font_size = 10 +ProgressBar/styles/background = SubResource("StyleBoxFlat_e31i6") +ProgressBar/styles/fill = SubResource("StyleBoxFlat_8fg7e") diff --git a/src/main.tscn b/src/main.tscn index d49f851..ef46848 100644 --- a/src/main.tscn +++ b/src/main.tscn @@ -1,15 +1,18 @@ -[gd_scene load_steps=21 format=3 uid="uid://d75odchj18u1"] +[gd_scene load_steps=28 format=3 uid="uid://d75odchj18u1"] -[ext_resource type="Script" path="res://src/crosshair.gd" id="1_8vuwf"] +[ext_resource type="Script" path="res://src/ui/crosshair.gd" id="1_8vuwf"] [ext_resource type="Shader" path="res://src/shaders/threshold.gdshader" id="1_bg1gg"] [ext_resource type="PackedScene" uid="uid://drbiyuustse8b" path="res://src/maps/arena_map/arena_map.tscn" id="1_bvhtq"] [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"] -[ext_resource type="Script" path="res://src/overlay_effects.gd" id="7_o2wgd"] +[ext_resource type="Script" path="res://src/ui/compass.gd" id="5_ovssf"] +[ext_resource type="Script" path="res://src/ui/overlay_effects.gd" id="7_o2wgd"] [ext_resource type="Shader" path="res://src/shaders/speed_lines.gdshader" id="7_sbbkm"] +[ext_resource type="Theme" uid="uid://cq6k0lttfws5w" path="res://src/HUD_theme.tres" id="9_ph71t"] +[ext_resource type="Texture2D" uid="uid://bgujaq21oq2mm" path="res://assets/textures/structure.png" id="10_e82wu"] +[ext_resource type="Script" path="res://src/ui/structure_meter.gd" id="10_w8rja"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_ag8l2"] shader = ExtResource("1_rg2hr") @@ -37,6 +40,18 @@ shader_parameter/mask_edge = 1.0 shader_parameter/animation_speed = 20.0 shader_parameter/noise = SubResource("NoiseTexture2D_jnd2r") +[sub_resource type="ShaderMaterial" id="ShaderMaterial_3nxtv"] +shader = ExtResource("1_rg2hr") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_r85sm"] +shader = ExtResource("1_rg2hr") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_say15"] +shader = ExtResource("1_rg2hr") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_klw0t"] +shader = ExtResource("1_rg2hr") + [sub_resource type="ShaderMaterial" id="ShaderMaterial_ubp15"] shader = ExtResource("1_bg1gg") shader_parameter/color_low = Color(0, 0, 0, 1) @@ -45,21 +60,6 @@ shader_parameter/threshold = 0.455 shader_parameter/contrast = 1.0 shader_parameter/offset = 0.0 -[sub_resource type="Animation" id="Animation_vu38v"] -resource_name = "boost_lines" -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("UI/OverlayEffects/SpeedLinesOverlay:material:shader_parameter/line_density") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 1), -"transitions": PackedFloat32Array(1, 1.4, 1), -"update": 0, -"values": [0.0, 0.4, 0.0] -} - [sub_resource type="Animation" id="Animation_g25ja"] length = 0.001 tracks/0/type = "value" @@ -75,6 +75,21 @@ tracks/0/keys = { "values": [0.0] } +[sub_resource type="Animation" id="Animation_vu38v"] +resource_name = "boost_lines" +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("UI/OverlayEffects/SpeedLinesOverlay:material:shader_parameter/line_density") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 1), +"transitions": PackedFloat32Array(1, 1.4, 1), +"update": 0, +"values": [0.0, 0.4, 0.0] +} + [sub_resource type="AnimationLibrary" id="AnimationLibrary_qjn7a"] _data = { "RESET": SubResource("Animation_g25ja"), @@ -147,6 +162,118 @@ layout_mode = 0 offset_right = 1900.0 offset_bottom = 768.0 +[node name="MarginContainer" type="MarginContainer" parent="UI"] +layout_mode = 0 +offset_right = 160.0 +offset_bottom = 768.0 +theme_override_constants/margin_left = 32 +theme_override_constants/margin_top = 32 +theme_override_constants/margin_right = 32 +theme_override_constants/margin_bottom = 32 + +[node name="HBoxContainer" type="HBoxContainer" parent="UI/MarginContainer"] +layout_mode = 2 +theme_override_constants/separation = 32 + +[node name="HeatContainer" type="VBoxContainer" parent="UI/MarginContainer/HBoxContainer"] +custom_minimum_size = Vector2(48, 0) +layout_mode = 2 +size_flags_horizontal = 4 + +[node name="HeatMeter" type="ProgressBar" parent="UI/MarginContainer/HBoxContainer/HeatContainer" groups=["HeatMeterGroup"]] +material = SubResource("ShaderMaterial_3nxtv") +layout_mode = 2 +size_flags_vertical = 3 +theme = ExtResource("9_ph71t") +fill_mode = 3 +show_percentage = false + +[node name="CenterContainer" type="CenterContainer" parent="UI/MarginContainer/HBoxContainer/HeatContainer"] +layout_mode = 2 + +[node name="Label" type="Label" parent="UI/MarginContainer/HBoxContainer/HeatContainer/CenterContainer"] +material = SubResource("ShaderMaterial_r85sm") +layout_mode = 2 +size_flags_horizontal = 0 +theme = ExtResource("9_ph71t") +text = "heat" + +[node name="VBoxContainer" type="VBoxContainer" parent="UI/MarginContainer/HBoxContainer"] +custom_minimum_size = Vector2(48, 0) +layout_mode = 2 +size_flags_horizontal = 4 + +[node name="StructureContainer" type="HBoxContainer" parent="UI/MarginContainer/HBoxContainer/VBoxContainer"] +layout_mode = 2 +size_flags_vertical = 10 + +[node name="LabelRotation" type="Control" parent="UI/MarginContainer/HBoxContainer/VBoxContainer/StructureContainer"] +custom_minimum_size = Vector2(11, 90) +layout_mode = 2 +size_flags_vertical = 8 + +[node name="Label" type="Label" parent="UI/MarginContainer/HBoxContainer/VBoxContainer/StructureContainer/LabelRotation"] +material = SubResource("ShaderMaterial_say15") +layout_mode = 2 +offset_right = 90.0 +offset_bottom = 11.0 +rotation = 1.5708 +pivot_offset = Vector2(4, 4) +theme = ExtResource("9_ph71t") +text = "structure" + +[node name="StructureMeter" type="VBoxContainer" parent="UI/MarginContainer/HBoxContainer/VBoxContainer/StructureContainer" groups=["StructureMeterGroup"]] +layout_mode = 2 +alignment = 2 +script = ExtResource("10_w8rja") + +[node name="StructureIcon1" type="TextureRect" parent="UI/MarginContainer/HBoxContainer/VBoxContainer/StructureContainer/StructureMeter"] +material = SubResource("ShaderMaterial_klw0t") +layout_mode = 2 +texture = ExtResource("10_e82wu") + +[node name="StructureIcon2" type="TextureRect" parent="UI/MarginContainer/HBoxContainer/VBoxContainer/StructureContainer/StructureMeter"] +material = SubResource("ShaderMaterial_klw0t") +layout_mode = 2 +texture = ExtResource("10_e82wu") + +[node name="StructureIcon3" type="TextureRect" parent="UI/MarginContainer/HBoxContainer/VBoxContainer/StructureContainer/StructureMeter"] +material = SubResource("ShaderMaterial_klw0t") +layout_mode = 2 +texture = ExtResource("10_e82wu") + +[node name="StructureIcon4" type="TextureRect" parent="UI/MarginContainer/HBoxContainer/VBoxContainer/StructureContainer/StructureMeter"] +material = SubResource("ShaderMaterial_klw0t") +layout_mode = 2 +texture = ExtResource("10_e82wu") + +[node name="StructureIcon5" type="TextureRect" parent="UI/MarginContainer/HBoxContainer/VBoxContainer/StructureContainer/StructureMeter"] +material = SubResource("ShaderMaterial_klw0t") +layout_mode = 2 +texture = ExtResource("10_e82wu") + +[node name="DamageContainer" type="VBoxContainer" parent="UI/MarginContainer/HBoxContainer/VBoxContainer"] +custom_minimum_size = Vector2(0, 256) +layout_mode = 2 + +[node name="DamageMeter" type="ProgressBar" parent="UI/MarginContainer/HBoxContainer/VBoxContainer/DamageContainer" groups=["DamageMeterGroup"]] +material = SubResource("ShaderMaterial_3nxtv") +layout_mode = 2 +size_flags_vertical = 3 +theme = ExtResource("9_ph71t") +fill_mode = 3 +show_percentage = false + +[node name="CenterContainer" type="CenterContainer" parent="UI/MarginContainer/HBoxContainer/VBoxContainer/DamageContainer"] +layout_mode = 2 + +[node name="Label" type="Label" parent="UI/MarginContainer/HBoxContainer/VBoxContainer/DamageContainer/CenterContainer"] +material = SubResource("ShaderMaterial_r85sm") +layout_mode = 2 +size_flags_horizontal = 4 +theme = ExtResource("9_ph71t") +text = "dmg" + [node name="ViewportContainer" type="SubViewportContainer" parent="."] material = SubResource("ShaderMaterial_ubp15") layout_mode = 0 diff --git a/src/player/player.gd b/src/player/player.gd index 2d74daa..c4b861f 100644 --- a/src/player/player.gd +++ b/src/player/player.gd @@ -19,6 +19,10 @@ var gravity: float = ProjectSettings.get_setting("physics/3d/default_gravity") @onready var _crosshair: Crosshair = get_tree().get_first_node_in_group("CrosshairGroup") @onready var _overlay: OverlayEffects = get_tree().get_first_node_in_group("OverlayEffectsGroup") +@onready var _heat_meter: ProgressBar = get_tree().get_first_node_in_group("HeatMeterGroup") +@onready var _damage_meter: ProgressBar = get_tree().get_first_node_in_group("DamageMeterGroup") +@onready +var _structure_meter: StructureMeter = get_tree().get_first_node_in_group("StructureMeterGroup") func is_boosting() -> bool: @@ -28,6 +32,22 @@ func is_boosting() -> bool: func _physics_process(delta: float) -> void: var delta_factor: float = delta * TARGET_FPS + # DEBUG BLOCK {{{ + if Input.is_action_just_pressed("ui_left"): + _structure_meter.structure_count -= 1 + + if Input.is_action_just_pressed("ui_right"): + _structure_meter.structure_count += 1 + + if Input.is_action_just_pressed("ui_up"): + _heat_meter.value += 1 + _damage_meter.value -= 1 + + if Input.is_action_just_pressed("ui_down"): + _heat_meter.value -= 1 + _damage_meter.value += 1 + # DEBUG BLOCK }}} + if is_boosting(): _crosshair.jostle(Vector2(randf_range(-3, 3), randf_range(-3, 3))) else: diff --git a/src/compass.gd b/src/ui/compass.gd similarity index 100% rename from src/compass.gd rename to src/ui/compass.gd diff --git a/src/crosshair.gd b/src/ui/crosshair.gd similarity index 100% rename from src/crosshair.gd rename to src/ui/crosshair.gd diff --git a/src/overlay_effects.gd b/src/ui/overlay_effects.gd similarity index 100% rename from src/overlay_effects.gd rename to src/ui/overlay_effects.gd diff --git a/src/ui/structure_meter.gd b/src/ui/structure_meter.gd new file mode 100644 index 0000000..5dbdd88 --- /dev/null +++ b/src/ui/structure_meter.gd @@ -0,0 +1,19 @@ +class_name StructureMeter +extends VBoxContainer + +var structure_count: int: + set = _set_structure_count, + get = _get_structure_count + +@onready var _structure_nodes: Array[Control] = [ + $StructureIcon5, $StructureIcon4, $StructureIcon3, $StructureIcon2, $StructureIcon1 +] + + +func _set_structure_count(value: int) -> void: + for node_idx: int in _structure_nodes.size(): + _structure_nodes[node_idx].visible = node_idx < value + + +func _get_structure_count() -> int: + return _structure_nodes.filter(func(n: Control) -> bool: return n.visible).size()