diff --git a/assets/models/bipedal_mech/mech.tscn b/assets/models/bipedal_mech/mech.tscn index ee29672..76b3f3a 100644 --- a/assets/models/bipedal_mech/mech.tscn +++ b/assets/models/bipedal_mech/mech.tscn @@ -1081,64 +1081,64 @@ 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.999995, 0.000384152, 0.00334167, -0.000536546, 0.998954, 0.0457473, -0.00332039, -0.0457491, 0.998948, -0.0128043, -0.0316036, 0.0557469) +transform = Transform3D(0.999994, 0.000384271, 0.00334113, -0.00053671, 0.998954, 0.0457502, -0.00332003, -0.0457518, 0.998947, -0.0128014, -0.0316136, 0.0557479) [node name="Plane_012_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="1"] -transform = Transform3D(0.999993, 0.00100885, 0.00366215, -0.00117661, 0.998936, 0.046096, -0.00361156, -0.0461003, 0.99893, -0.0136957, -0.0307873, 0.0557451) +transform = Transform3D(0.999993, 0.00100869, 0.00366206, -0.00117639, 0.998936, 0.0460989, -0.00361167, -0.0461029, 0.99893, -0.0136926, -0.0307984, 0.0557476) [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.00051507, 0.00157563, 0.000513043, 0.999999, 0.00130963, -0.00157611, -0.00130907, 0.999998, -0.0104373, 0.000997663, 0.00431207) +transform = Transform3D(0.999998, -0.000515072, 0.00157522, 0.000513023, 0.999999, 0.0013123, -0.00157589, -0.00131147, 0.999998, -0.0104342, 0.000987276, 0.00431302) [node name="Plane_004_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="3"] -transform = Transform3D(0.999995, -0.00107045, 0.00257975, 0.000922441, 0.99839, 0.0567248, -0.00263612, -0.0567225, 0.998386, -0.0104854, -0.0630401, 0.0186228) +transform = Transform3D(0.999995, -0.00106992, 0.00257911, 0.000921741, 0.99839, 0.0567273, -0.00263557, -0.0567248, 0.998387, -0.0104828, -0.0630484, 0.0186225) [node name="Cube_013_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="4"] -transform = Transform3D(0.999996, -0.000473596, 0.00274871, 0.00043761, 0.999915, 0.0130945, -0.00275447, -0.0130935, 0.99991, -0.0108719, -0.00332153, 0.00565958) +transform = Transform3D(0.999996, -0.000473648, 0.00274827, 0.000437655, 0.999915, 0.013097, -0.00275425, -0.0130957, 0.99991, -0.010869, -0.00333226, 0.00566053) [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.00171712, -0.000706242, 0.00176229, 0.997559, 0.0698073, 0.000584848, -0.0698085, 0.99756, 0.00680518, -0.420023, -0.0109468) +transform = Transform3D(0.999998, -0.00171669, -0.000706391, 0.00176181, 0.997559, 0.0698083, 0.000584842, -0.0698093, 0.99756, 0.00680661, -0.420027, -0.0109463) [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.00104682, 0.00300799, -0.00117387, 0.999093, 0.042565, -0.0029605, -0.0425684, 0.999089, -0.0138843, -0.0150286, 0.0867176) +transform = Transform3D(0.999995, 0.00104702, 0.00300696, -0.00117406, 0.999093, 0.042566, -0.00295965, -0.0425692, 0.999089, -0.0138805, -0.0150347, 0.0867147) [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.00104682, 0.00300799, -0.00117387, 0.999093, 0.042565, -0.0029605, -0.0425684, 0.999089, -0.0138843, -0.0150286, 0.0867176) +transform = Transform3D(0.999995, 0.00104702, 0.00300696, -0.00117406, 0.999093, 0.042566, -0.00295965, -0.0425692, 0.999089, -0.0138805, -0.0150347, 0.0867147) [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.000788458, 0.00243291, 0.000655793, 0.998536, 0.0540853, -0.0024718, -0.0540838, 0.998533, -0.0103652, -0.0575251, 0.0190063) +transform = Transform3D(0.999997, -0.000788353, 0.00243197, 0.000655666, 0.998536, 0.0540876, -0.00247103, -0.0540858, 0.998533, -0.0103614, -0.0575342, 0.0190055) [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.000205867, 0.00359712, 0.000458524, 0.997521, -0.0703632, -0.00357351, 0.0703642, 0.997515, -0.013334, 0.216048, -0.0674987) +transform = Transform3D(0.999993, -0.000205941, 0.00359671, 0.000458524, 0.997522, -0.0703619, -0.00357329, 0.070363, 0.997515, -0.0133309, 0.21604, -0.0674992) [node name="Cube_010_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="10"] -transform = Transform3D(1, -0.000107693, -0.000943923, 0.000174532, 0.997474, 0.0710428, 0.000934098, -0.0710429, 0.997473, 0.00605249, -0.426658, -0.167238) +transform = Transform3D(1, -0.000107637, -0.000944308, 0.000174461, 0.997473, 0.0710437, 0.000934268, -0.0710437, 0.997473, 0.00605536, -0.426663, -0.167237) [node name="Cube_012_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="11"] -transform = Transform3D(1, -0.000353683, -0.000705599, 0.000379753, 0.999307, 0.0372301, 0.000692161, -0.0372305, 0.999307, 0.00484586, -0.240637, -0.192388) +transform = Transform3D(1, -0.000353629, -0.000705956, 0.000379675, 0.999307, 0.0372312, 0.0006923, -0.0372314, 0.999307, 0.00484848, -0.240643, -0.192388) [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.225809) [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.225808) +transform = Transform3D(1, 7.18785e-10, -2.03527e-08, -7.31035e-10, 1, -1.49128e-07, 2.02767e-08, 1.78756e-07, 1, -1.19209e-07, -1.43051e-06, -0.22581) [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.22581) +transform = Transform3D(1, 3.1531e-10, 2.16907e-08, -3.26025e-10, 1, -1.19326e-07, -2.17319e-08, 1.78814e-07, 1, 1.19209e-07, -1.90735e-06, -0.225811) [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.22581) +transform = Transform3D(1, -1.42109e-13, -3.41061e-13, 2.27374e-13, 1, -9.23872e-07, 3.97904e-13, 9.23872e-07, 1, -9.09153e-13, 4.52995e-06, -0.225811) [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.22581) +transform = Transform3D(1, -1.42109e-13, -3.41061e-13, 2.27374e-13, 1, -9.23872e-07, 3.97904e-13, 9.23872e-07, 1, -9.09153e-13, 4.52995e-06, -0.225811) [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.225809) +transform = Transform3D(1, 1.0877e-10, -1.02383e-08, -1.10134e-10, 1, -2.82831e-07, 1.02508e-08, 2.82773e-07, 1, -2.38419e-07, 0, -0.225809) [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.225809) +transform = Transform3D(1, -1.0877e-10, 1.02383e-08, 1.10134e-10, 1, -2.82831e-07, -1.02508e-08, 2.82773e-07, 1, 2.38419e-07, 0, -0.225809) [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.225809) @@ -1147,40 +1147,40 @@ transform = Transform3D(1, -2.64698e-23, 9.95068e-31, 2.64698e-23, 1, 0, -9.9506 transform = Transform3D(1, -2.64698e-23, 9.95068e-31, 2.64698e-23, 1, 0, -9.95068e-31, 0, 1, -1.90621e-29, 0, -0.225809) [node name="Plane_006_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="21"] -transform = Transform3D(0.999995, -0.00039275, -0.00329445, 0.000543028, 0.998955, 0.0457367, 0.00327275, -0.0457385, 0.998948, 0.0127745, -0.0315721, 0.0555677) +transform = Transform3D(0.999995, -0.000393376, -0.00329355, 0.000543654, 0.998955, 0.0457378, 0.00327206, -0.0457394, 0.998948, 0.0127711, -0.0315787, 0.0555656) [node name="Plane_008_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="22"] -transform = Transform3D(0.999993, -0.00100929, -0.00366235, 0.001177, 0.998937, 0.0460964, 0.0036117, -0.0461006, 0.998931, 0.0136967, -0.030787, 0.0557451) +transform = Transform3D(0.999993, -0.00100917, -0.0036623, 0.00117694, 0.998937, 0.046099, 0.00361188, -0.0461031, 0.99893, 0.0136931, -0.0307968, 0.0557474) [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.0005148, -0.00157575, -0.000512781, 0.999999, 0.00130983, 0.0015762, -0.00130925, 0.999998, 0.010437, 0.000998199, 0.0043121) +transform = Transform3D(0.999999, 0.000514755, -0.00157535, -0.00051266, 0.999999, 0.00131229, 0.00157601, -0.0013115, 0.999998, 0.0104337, 0.000988677, 0.00431287) [node name="Plane_005_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="24"] -transform = Transform3D(0.999997, 0.00107077, -0.00257799, -0.000922233, 0.99839, 0.056725, 0.00263393, -0.0567229, 0.998387, 0.010488, -0.0630413, 0.0186183) +transform = Transform3D(0.999996, 0.00107022, -0.0025773, -0.000921562, 0.99839, 0.0567275, 0.00263336, -0.0567251, 0.998387, 0.0104852, -0.063049, 0.0186181) [node name="Cube_003_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="25"] -transform = Transform3D(0.999996, 0.000473499, -0.00274868, -0.000437543, 0.999914, 0.0130946, 0.00275443, -0.0130935, 0.99991, 0.0108712, -0.00332141, 0.0056591) +transform = Transform3D(0.999996, 0.000473484, -0.0027483, -0.000437453, 0.999914, 0.013097, 0.00275426, -0.0130958, 0.99991, 0.0108681, -0.00333095, 0.0056603) [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.00171705, 0.000705924, -0.00176217, 0.997559, 0.0698071, -0.000584552, -0.0698084, 0.997561, -0.00680256, -0.420021, -0.0109468) +transform = Transform3D(0.999998, 0.00171649, 0.000706062, -0.00176163, 0.997559, 0.0698082, -0.000584542, -0.0698093, 0.99756, -0.00680423, -0.420026, -0.0109448) [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.00104716, -0.00300816, 0.00117421, 0.999093, 0.042565, 0.00296064, -0.0425686, 0.999089, 0.0138857, -0.0150278, 0.0867186) +transform = Transform3D(0.999995, -0.00104743, -0.0030071, 0.00117451, 0.999093, 0.0425659, 0.0029598, -0.0425693, 0.999089, 0.0138812, -0.015033, 0.0867152) [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.00191985, -0.00314114, 0.00205281, 0.999078, 0.0429052, 0.00305567, -0.0429116, 0.999074, 0.0153413, -0.0148145, 0.0854299) +transform = Transform3D(0.999993, -0.00192012, -0.00314011, 0.00205313, 0.999078, 0.042906, 0.00305485, -0.0429124, 0.999075, 0.015337, -0.0148194, 0.0854273) [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.00078816, -0.00243311, -0.00065545, 0.998536, 0.0540856, 0.00247196, -0.0540841, 0.998533, 0.0103657, -0.0575243, 0.019007) +transform = Transform3D(0.999997, 0.000787944, -0.00243221, -0.000655264, 0.998536, 0.0540878, 0.00247127, -0.0540861, 0.998533, 0.0103619, -0.0575324, 0.019006) [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.00020577, -0.00359697, -0.000458412, 0.997522, -0.0703634, 0.00357337, 0.0703644, 0.997515, 0.0133338, 0.216049, -0.0674992) +transform = Transform3D(0.999994, 0.00020574, -0.00359655, -0.0004583, 0.997522, -0.070362, 0.00357316, 0.0703632, 0.997515, 0.0133307, 0.216042, -0.0674996) [node name="Cube_015_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="31"] -transform = Transform3D(1, 0.000107035, 0.000943754, -0.000173885, 0.997471, 0.0710726, -0.000933954, -0.0710726, 0.997471, -0.00605154, -0.42682, -0.167212) +transform = Transform3D(1, 0.00010699, 0.000944049, -0.000173835, 0.997471, 0.0710734, -0.000934053, -0.0710734, 0.997471, -0.00605321, -0.426825, -0.167212) [node name="Cube_001_Material_0" parent="Sketchfab_model/bed584e06fe94e71a7ac484cee9f0a16_fbx/Object_2/RootNode/Armature/Object_5/Skeleton3D" index="32"] -transform = Transform3D(1, 0.000353651, 0.000705635, -0.000379715, 0.999307, 0.0372302, -0.000692182, -0.0372305, 0.999307, -0.0048461, -0.240636, -0.192388) +transform = Transform3D(1, 0.000353619, 0.000705975, -0.000379667, 0.999307, 0.0372312, -0.00069232, -0.0372314, 0.999307, -0.00484896, -0.240642, -0.192388) [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.225809) diff --git a/src/maps/arena_map/arena_map.tscn b/src/maps/arena_map/arena_map.tscn index 6fa8130..dd77688 100644 --- a/src/maps/arena_map/arena_map.tscn +++ b/src/maps/arena_map/arena_map.tscn @@ -1,44 +1,41 @@ -[gd_scene load_steps=22 format=3 uid="uid://drbiyuustse8b"] +[gd_scene load_steps=24 format=3 uid="uid://drbiyuustse8b"] [ext_resource type="PackedScene" uid="uid://bqp5mwyat3asv" path="res://src/player/player.tscn" id="1_tgee4"] [ext_resource type="Material" uid="uid://7a1uvst7oef2" path="res://assets/textures/metal_plate_1k/metal_plate.tres" id="2_ewgwm"] [ext_resource type="Texture2D" uid="uid://csbbhpwfxa6vi" path="res://assets/textures/Metal009_2K-PNG/Metal009_2K-PNG_Color.png" id="2_mbl6s"] +[ext_resource type="Shader" path="res://src/shaders/sunny_sky.gdshader" id="2_x74tl"] [ext_resource type="Texture2D" uid="uid://c4cwawfg0jbdp" path="res://assets/textures/Metal009_2K-PNG/Metal009_2K-PNG_Displacement.png" id="3_gnc2t"] [ext_resource type="Texture2D" uid="uid://hme2odj58vo3" path="res://assets/textures/Metal009_2K-PNG/Metal009_2K-PNG_Metalness.png" id="4_1m41q"] [ext_resource type="Shader" path="res://src/shaders/spatial_threshold.gdshader" id="5_oegrt"] [ext_resource type="Texture2D" uid="uid://b63g40daehul" path="res://assets/textures/Metal009_2K-PNG/Metal009_2K-PNG_NormalGL.png" id="5_sunj5"] [ext_resource type="Texture2D" uid="uid://bjhtlrh1hij8x" path="res://assets/textures/Metal009_2K-PNG/Metal009_2K-PNG_Roughness.png" id="6_4tuln"] -[sub_resource type="Shader" id="Shader_vs56o"] -code = " -// NOTE: Shader automatically converted from Godot Engine 4.2.2.stable's ProceduralSkyMaterial. +[sub_resource type="FastNoiseLite" id="FastNoiseLite_6sfce"] +seed = 2 +frequency = 0.071 +domain_warp_type = 1 -shader_type sky; - -uniform vec3 sun_color : source_color = vec3(1.0, 1.0, 1.0); -uniform vec3 sky_color : source_color = vec3(0.0, 0.0, 0.0); - -uniform float sun_angle: hint_range(0.0,6.283) = 0.5; - -void sky() { - float v_angle = acos(clamp(EYEDIR.y, -1.0, 1.0)); - - COLOR.rgb = v_angle <= sun_angle ? sun_color : sky_color; - -} -" +[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_7f12p"] +width = 32 +height = 32 +depth = 128 +noise = SubResource("FastNoiseLite_6sfce") [sub_resource type="ShaderMaterial" id="ShaderMaterial_jkl68"] -shader = SubResource("Shader_vs56o") +shader = ExtResource("2_x74tl") shader_parameter/sun_color = Color(1, 1, 1, 1) shader_parameter/sky_color = Color(0, 0, 0, 1) -shader_parameter/sun_angle = 1.3 +shader_parameter/threshold = 0.4 +shader_parameter/speed = 0.008 +shader_parameter/rotation = 2.0 +shader_parameter/base_noise = SubResource("NoiseTexture3D_7f12p") [sub_resource type="Sky" id="Sky_7lp20"] sky_material = SubResource("ShaderMaterial_jkl68") [sub_resource type="Environment" id="Environment_0cwcw"] background_mode = 2 +background_energy_multiplier = 2.0 sky = SubResource("Sky_7lp20") [sub_resource type="ShaderMaterial" id="ShaderMaterial_1hfra"] @@ -127,9 +124,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) [node name="WorldEnvironment" type="WorldEnvironment" parent="Environment"] environment = SubResource("Environment_0cwcw") -[node name="DirectionalLight3D" type="DirectionalLight3D" parent="Environment"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 5, 0) - [node name="LightAxis" type="Node3D" parent="Environment"] [node name="OmniLight3D" type="OmniLight3D" parent="Environment/LightAxis"] diff --git a/src/player/player.tscn b/src/player/player.tscn index 6ab9a16..28ab820 100644 --- a/src/player/player.tscn +++ b/src/player/player.tscn @@ -7,21 +7,6 @@ [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_otw5j"] radius = 0.7 -[sub_resource type="Animation" id="Animation_ss43j"] -resource_name = "boost_fov" -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("CameraRoot/SpringArm3D/Camera3D:fov") -tracks/0/interp = 2 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 1), -"transitions": PackedFloat32Array(1, 1, 1), -"update": 0, -"values": [75.0, 80.0, 75.0] -} - [sub_resource type="Animation" id="Animation_ycaf1"] length = 0.001 tracks/0/type = "value" @@ -37,6 +22,21 @@ tracks/0/keys = { "values": [75.0] } +[sub_resource type="Animation" id="Animation_ss43j"] +resource_name = "boost_fov" +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("CameraRoot/SpringArm3D/Camera3D:fov") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 1), +"transitions": PackedFloat32Array(1, 1, 1), +"update": 0, +"values": [75.0, 80.0, 75.0] +} + [sub_resource type="AnimationLibrary" id="AnimationLibrary_pg8yw"] _data = { "RESET": SubResource("Animation_ycaf1"), diff --git a/src/shaders/sunny_sky.gdshader b/src/shaders/sunny_sky.gdshader new file mode 100644 index 0000000..e663893 --- /dev/null +++ b/src/shaders/sunny_sky.gdshader @@ -0,0 +1,93 @@ + +// NOTE: Shader automatically converted from Godot Engine 4.2.2.stable's ProceduralSkyMaterial. + +shader_type sky; + +uniform vec3 sun_color : source_color = vec3(1.0, 1.0, 1.0); +uniform vec3 sky_color : source_color = vec3(0.0, 0.0, 0.0); + +uniform float threshold: hint_range(0.0, 1.0) = 0.3; +uniform float speed = 0.02; +uniform float rotation = 4.0; + +//uniform sampler2D base_noise: repeat_enable; +uniform sampler3D base_noise: repeat_enable; + + +float noise3d(vec3 x) { + return texture(base_noise, x).r; +} + +// Fractal Brownian Noise +// see https://github.com/MaxBittker/glsl-fractal-brownian-noise/blob/master/3d.glsl +float fbm3d(vec3 x, const in int it) { + float v = 0.0; + float a = 0.5; + vec3 shift = vec3(100.0); + + for (int i = 0; i < 32; i++) { + if (i < it) { + v += a * noise3d(x); + x = x * 2.0 + shift; + a *= 0.5; + } + } + + return v; +} + +float luminance(vec3 color) { + return 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b; +} + +void sky() { + if (EYEDIR.y > 0.0) { + float t = TIME * -speed; + + vec2 uv = (EYEDIR.xz * 0.3); + vec2 st = vec2( + length(uv) * 1.5, + atan(uv.y, uv.x) + ); + + st.y += st.x * rotation; + + float x = fbm3d( + vec3( + sin(st.y), + cos(st.y), + pow(st.x, 0.3) + t * 0.1 + ), + 3 + ); + float y = fbm3d( + vec3( + sin(1.0 - st.y), + cos(1.0 - st.y), + pow(st.x, 0.5) + t * 0.1 + ), + 4 + ); + + float r = fbm3d( + vec3( + x, + y, + st.x + t * 0.3 + ), + 5 + ); + + r = fbm3d( + vec3( + r - x, + r - y, + r + t * 0.3 + ), + 6 + ); + + float c = (r + st.x * 5.0) / 6.0; + COLOR.rgb = c < threshold ? sun_color : sky_color; + } +}