diff --git a/assets/sky/sky.tscn b/assets/sky/sky.tscn index 1347512..f97572b 100644 --- a/assets/sky/sky.tscn +++ b/assets/sky/sky.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=8 format=3 uid="uid://sl6jnd1ojlbr"] +[gd_scene load_steps=8 format=3 uid="uid://c8di31x8aviu7"] [ext_resource type="Shader" path="res://assets/sky/sky.gdshader" id="1_f4l2q"] -[ext_resource type="CompressedTexture3D" uid="uid://1ipprqexqp8s" path="res://assets/sky/perlworlnoise.tga" id="2_i0qs4"] -[ext_resource type="Texture2D" uid="uid://dgv0vc1dtamig" path="res://assets/sky/weather.bmp" id="3_mx7f8"] -[ext_resource type="CompressedTexture3D" uid="uid://b8fh4icku58vx" path="res://assets/sky/worlnoise.bmp" id="4_6opjy"] +[ext_resource type="CompressedTexture3D" path="res://assets/sky/perlworlnoise.tga" id="2_i0qs4"] +[ext_resource type="Texture2D" path="res://assets/sky/weather.bmp" id="3_mx7f8"] +[ext_resource type="CompressedTexture3D" path="res://assets/sky/worlnoise.bmp" id="4_6opjy"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_vo7n6"] shader = ExtResource("1_f4l2q") diff --git a/game/start_scene/start_scene.tscn b/game/start_scene/start_scene.tscn index e17801c..1746ff0 100644 --- a/game/start_scene/start_scene.tscn +++ b/game/start_scene/start_scene.tscn @@ -6,23 +6,23 @@ [ext_resource type="PackedScene" uid="uid://clujaf3u776a3" path="res://addons/godot-xr-tools/objects/viewport_2d_in_3d.tscn" id="4_7pgy0"] [ext_resource type="PackedScene" uid="uid://l2n30mpbkdyw" path="res://addons/godot-xr-tools/hands/scenes/lowpoly/right_hand_low.tscn" id="5_5cr7c"] [ext_resource type="PackedScene" uid="uid://cl8q8f32imusk" path="res://game/start_scene/start_ui.tscn" id="5_grt1o"] -[ext_resource type="PackedScene" uid="uid://sl6jnd1ojlbr" path="res://assets/sky/sky.tscn" id="7_qhfch"] +[ext_resource type="PackedScene" path="res://assets/sky/sky.tscn" id="7_qhfch"] [ext_resource type="Terrain3DStorage" uid="uid://rcl1w41wf0td" path="res://start_terrain_3d_storage.res" id="8_48y7q"] -[ext_resource type="Terrain3DMaterial" uid="uid://dipe1uw7nxnob" path="res://start_terrain_3d_material.tres" id="9_alip0"] +[ext_resource type="Terrain3DMaterial" uid="uid://xr3fb0gocoex" path="res://start_terrain_3d_material.tres" id="9_alip0"] [ext_resource type="Terrain3DTextureList" uid="uid://cgq4iftxm46is" path="res://new_terrain_3d_texture_list.tres" id="10_h37ye"] [sub_resource type="QuadMesh" id="QuadMesh_44p7b"] resource_local_to_scene = true size = Vector2(3, 2) -[sub_resource type="ViewportTexture" id="ViewportTexture_vf1kv"] +[sub_resource type="ViewportTexture" id="ViewportTexture_hxicd"] viewport_path = NodePath("Viewport") -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_utl5i"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a2yhk"] transparency = 1 cull_mode = 2 shading_mode = 0 -albedo_texture = SubResource("ViewportTexture_vf1kv") +albedo_texture = SubResource("ViewportTexture_hxicd") texture_filter = 1 [sub_resource type="BoxShape3D" id="BoxShape3D_iru2p"] @@ -59,7 +59,7 @@ unshaded = true [node name="Screen" parent="Screen" index="1"] mesh = SubResource("QuadMesh_44p7b") -surface_material_override/0 = SubResource("StandardMaterial3D_utl5i") +surface_material_override/0 = SubResource("StandardMaterial3D_a2yhk") [node name="CollisionShape3D" parent="Screen/StaticBody3D" index="0"] shape = SubResource("BoxShape3D_iru2p") diff --git a/game/zones/outside/outside_zone.tscn b/game/zones/outside/outside_zone.tscn index 744ba0a..72a3454 100644 --- a/game/zones/outside/outside_zone.tscn +++ b/game/zones/outside/outside_zone.tscn @@ -74,7 +74,7 @@ [ext_resource type="Animation" uid="uid://d3h36bkauutoq" path="res://addons/godot-xr-tools/hands/animations/right/Straight.res" id="70_nvkks"] [ext_resource type="Animation" uid="uid://bq7cjxdn28jcv" path="res://addons/godot-xr-tools/hands/animations/right/Surfer.res" id="71_23ljh"] [ext_resource type="Animation" uid="uid://d2ukhr3n2r1u8" path="res://addons/godot-xr-tools/hands/animations/right/Thumb.res" id="72_vpdgb"] -[ext_resource type="PackedScene" uid="uid://sl6jnd1ojlbr" path="res://assets/sky/sky.tscn" id="74_oxnep"] +[ext_resource type="PackedScene" uid="uid://c8di31x8aviu7" path="res://assets/sky/sky.tscn" id="74_oxnep"] [ext_resource type="Terrain3DStorage" uid="uid://d4n4oxjw8hxo7" path="res://new_terrain_3d_storage.res" id="76_lrjdy"] [ext_resource type="Terrain3DMaterial" uid="uid://c4m48gihf1oxn" path="res://new_terrain_3d_material.tres" id="77_4wak6"] [ext_resource type="Terrain3DTextureList" uid="uid://cgq4iftxm46is" path="res://new_terrain_3d_texture_list.tres" id="78_wkllm"] @@ -118,34 +118,34 @@ _data = { "Thumb": ExtResource("37_kpb8w") } -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_fp2y5"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ivm5v"] animation = &"Grip" -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ej4an"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_npjc5"] animation = &"Grip" -[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_ydclt"] +[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_gvrcj"] filter_enabled = true filters = ["Armature/Skeleton3D:Little_Distal_L", "Armature/Skeleton3D:Little_Intermediate_L", "Armature/Skeleton3D:Little_Metacarpal_L", "Armature/Skeleton3D:Little_Proximal_L", "Armature/Skeleton3D:Middle_Distal_L", "Armature/Skeleton3D:Middle_Intermediate_L", "Armature/Skeleton3D:Middle_Metacarpal_L", "Armature/Skeleton3D:Middle_Proximal_L", "Armature/Skeleton3D:Ring_Distal_L", "Armature/Skeleton3D:Ring_Intermediate_L", "Armature/Skeleton3D:Ring_Metacarpal_L", "Armature/Skeleton3D:Ring_Proximal_L", "Armature/Skeleton3D:Thumb_Distal_L", "Armature/Skeleton3D:Thumb_Metacarpal_L", "Armature/Skeleton3D:Thumb_Proximal_L", "Armature/Skeleton:Little_Distal_L", "Armature/Skeleton:Little_Intermediate_L", "Armature/Skeleton:Little_Proximal_L", "Armature/Skeleton:Middle_Distal_L", "Armature/Skeleton:Middle_Intermediate_L", "Armature/Skeleton:Middle_Proximal_L", "Armature/Skeleton:Ring_Distal_L", "Armature/Skeleton:Ring_Intermediate_L", "Armature/Skeleton:Ring_Proximal_L", "Armature/Skeleton:Thumb_Distal_L", "Armature/Skeleton:Thumb_Proximal_L"] -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_y860o"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_rm8ml"] animation = &"Grip 5" -[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_dukv4"] +[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_duaea"] filter_enabled = true filters = ["Armature/Skeleton3D:Index_Distal_L", "Armature/Skeleton3D:Index_Intermediate_L", "Armature/Skeleton3D:Index_Metacarpal_L", "Armature/Skeleton3D:Index_Proximal_L", "Armature/Skeleton:Index_Distal_L", "Armature/Skeleton:Index_Intermediate_L", "Armature/Skeleton:Index_Proximal_L"] -[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_6y0qa"] +[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_3uicp"] graph_offset = Vector2(-536, 11) -nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_fp2y5") +nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_ivm5v") nodes/ClosedHand1/position = Vector2(-600, 300) -nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_ej4an") +nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_npjc5") nodes/ClosedHand2/position = Vector2(-360, 300) -nodes/Grip/node = SubResource("AnimationNodeBlend2_ydclt") +nodes/Grip/node = SubResource("AnimationNodeBlend2_gvrcj") nodes/Grip/position = Vector2(0, 20) -nodes/OpenHand/node = SubResource("AnimationNodeAnimation_y860o") +nodes/OpenHand/node = SubResource("AnimationNodeAnimation_rm8ml") nodes/OpenHand/position = Vector2(-600, 100) -nodes/Trigger/node = SubResource("AnimationNodeBlend2_dukv4") +nodes/Trigger/node = SubResource("AnimationNodeBlend2_duaea") nodes/Trigger/position = Vector2(-360, 20) node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] @@ -188,34 +188,34 @@ _data = { "Thumb": ExtResource("72_vpdgb") } -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_d0eir"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_i4po1"] animation = &"Grip" -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_h34xi"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ek5or"] animation = &"Grip" -[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_ppbmq"] +[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_74cg8"] filter_enabled = true filters = ["Armature/Skeleton3D:Little_Distal_R", "Armature/Skeleton3D:Little_Intermediate_R", "Armature/Skeleton3D:Little_Metacarpal_R", "Armature/Skeleton3D:Little_Proximal_R", "Armature/Skeleton3D:Middle_Distal_R", "Armature/Skeleton3D:Middle_Intermediate_R", "Armature/Skeleton3D:Middle_Metacarpal_R", "Armature/Skeleton3D:Middle_Proximal_R", "Armature/Skeleton3D:Ring_Distal_R", "Armature/Skeleton3D:Ring_Intermediate_R", "Armature/Skeleton3D:Ring_Metacarpal_R", "Armature/Skeleton3D:Ring_Proximal_R", "Armature/Skeleton3D:Thumb_Distal_R", "Armature/Skeleton3D:Thumb_Metacarpal_R", "Armature/Skeleton3D:Thumb_Proximal_R", "Armature/Skeleton:Little_Distal_R", "Armature/Skeleton:Little_Intermediate_R", "Armature/Skeleton:Little_Proximal_R", "Armature/Skeleton:Middle_Distal_R", "Armature/Skeleton:Middle_Intermediate_R", "Armature/Skeleton:Middle_Proximal_R", "Armature/Skeleton:Ring_Distal_R", "Armature/Skeleton:Ring_Intermediate_R", "Armature/Skeleton:Ring_Proximal_R", "Armature/Skeleton:Thumb_Distal_R", "Armature/Skeleton:Thumb_Proximal_R"] -[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_n14v1"] +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_jf55q"] animation = &"Grip 5" -[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_fvcql"] +[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_ljixc"] filter_enabled = true filters = ["Armature/Skeleton3D:Index_Distal_R", "Armature/Skeleton3D:Index_Intermediate_R", "Armature/Skeleton3D:Index_Metacarpal_R", "Armature/Skeleton3D:Index_Proximal_R", "Armature/Skeleton:Index_Distal_R", "Armature/Skeleton:Index_Intermediate_R", "Armature/Skeleton:Index_Proximal_R"] -[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_hspoh"] +[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_wk60b"] graph_offset = Vector2(-552.664, 107.301) -nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_d0eir") +nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_i4po1") nodes/ClosedHand1/position = Vector2(-600, 300) -nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_h34xi") +nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_ek5or") nodes/ClosedHand2/position = Vector2(-360, 300) -nodes/Grip/node = SubResource("AnimationNodeBlend2_ppbmq") +nodes/Grip/node = SubResource("AnimationNodeBlend2_74cg8") nodes/Grip/position = Vector2(0, 40) -nodes/OpenHand/node = SubResource("AnimationNodeAnimation_n14v1") +nodes/OpenHand/node = SubResource("AnimationNodeAnimation_jf55q") nodes/OpenHand/position = Vector2(-600, 100) -nodes/Trigger/node = SubResource("AnimationNodeBlend2_fvcql") +nodes/Trigger/node = SubResource("AnimationNodeBlend2_ljixc") nodes/Trigger/position = Vector2(-360, 40) node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] @@ -264,7 +264,7 @@ visible = false libraries = { "": SubResource("AnimationLibrary_kw48d") } -tree_root = SubResource("AnimationNodeBlendTree_6y0qa") +tree_root = SubResource("AnimationNodeBlendTree_3uicp") [node name="WristUI" parent="XROrigin3D/LeftHand/CollisionHandLeft" index="7"] visible = false @@ -300,7 +300,7 @@ visible = false libraries = { "": SubResource("AnimationLibrary_reqae") } -tree_root = SubResource("AnimationNodeBlendTree_hspoh") +tree_root = SubResource("AnimationNodeBlendTree_wk60b") [node name="LeftPocket" parent="XROrigin3D/PlayerBody" index="0"] visible = false @@ -349,8 +349,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20, 1.03959, -2.5) [node name="DirectionalLight3D" type="DirectionalLight3D" parent="World" index="9"] transform = Transform3D(1, 0, 0, 0, 1.19249e-08, 1, 0, -1, 1.19249e-08, 0, 8, 0) -[node name="WorldEnvironment" parent="World" index="9" instance=ExtResource("74_boxlq")] - [node name="StaticBody3D" type="StaticBody3D" parent="World" index="10"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.976021, 0) diff --git a/sky.tscn b/sky.tscn deleted file mode 100644 index 98ca8d5..0000000 --- a/sky.tscn +++ /dev/null @@ -1,38 +0,0 @@ -[gd_scene load_steps=8 format=3 uid="uid://dkerhxkudxw0y"] - -[ext_resource type="Shader" path="res://assets/sky/sky.gdshader" id="1_adt24"] -[ext_resource type="CompressedTexture3D" path="res://assets/sky/perlworlnoise.tga" id="2_3ywih"] -[ext_resource type="Texture2D" path="res://assets/sky/weather.bmp" id="3_eojix"] -[ext_resource type="CompressedTexture3D" path="res://assets/sky/worlnoise.bmp" id="4_c32hi"] - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_vo7n6"] -shader = ExtResource("1_adt24") -shader_parameter/wind_direction = Vector2(1, 0) -shader_parameter/wind_speed = 8.0 -shader_parameter/_density = 0.022 -shader_parameter/cloud_coverage = 0.13 -shader_parameter/_time_offset = 447.0 -shader_parameter/rayleigh = 2.0 -shader_parameter/rayleigh_color = Color(0, 0.1995, 0.57, 1) -shader_parameter/mie = 0.005 -shader_parameter/mie_eccentricity = 0.8 -shader_parameter/mie_color = Color(0.63, 0.77, 0.92, 1) -shader_parameter/turbidity = 10.0 -shader_parameter/sun_disk_scale = 4.0 -shader_parameter/ground_color = Color(0, 0.6, 1, 1) -shader_parameter/exposure = 0.12 -shader_parameter/worlnoise = ExtResource("4_c32hi") -shader_parameter/perlworlnoise = ExtResource("2_3ywih") -shader_parameter/weathermap = ExtResource("3_eojix") - -[sub_resource type="Sky" id="Sky_y574f"] -sky_material = SubResource("ShaderMaterial_vo7n6") - -[sub_resource type="Environment" id="Environment_ubvtl"] -background_mode = 2 -sky = SubResource("Sky_y574f") -ambient_light_source = 3 -reflected_light_source = 2 - -[node name="WorldEnvironment" type="WorldEnvironment"] -environment = SubResource("Environment_ubvtl") diff --git a/start_terrain_3d_material.tres b/start_terrain_3d_material.tres index db0c79a..2ea087b 100644 --- a/start_terrain_3d_material.tres +++ b/start_terrain_3d_material.tres @@ -1,4 +1,4 @@ -[gd_resource type="Terrain3DMaterial" load_steps=4 format=3 uid="uid://dipe1uw7nxnob"] +[gd_resource type="Terrain3DMaterial" load_steps=4 format=3 uid="uid://xr3fb0gocoex"] [sub_resource type="Gradient" id="Gradient_i65xr"] offsets = PackedFloat32Array(0.2, 1)