diff --git a/project/ads33-terrain/Cones_scene_terrain.tscn b/project/ads33-terrain/Cones_scene_terrain.tscn index a641d11..3f2d960 100644 --- a/project/ads33-terrain/Cones_scene_terrain.tscn +++ b/project/ads33-terrain/Cones_scene_terrain.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=207 format=3 uid="uid://bchcr54i3piaw"] +[gd_scene load_steps=204 format=3 uid="uid://bchcr54i3piaw"] [ext_resource type="Texture2D" uid="uid://41mr2bbcbjpo" path="res://ads33-terrain/concrete_moss_diff_4k.jpg" id="1_ong3a"] [ext_resource type="PackedScene" uid="uid://7tddcx4u26w4" path="res://assets/cone/cone.tscn" id="2_hj5f7"] @@ -82,7 +82,7 @@ shading_mode = 0 albedo_color = Color(0.537255, 0.529412, 0.278431, 1) [sub_resource type="BoxMesh" id="BoxMesh_rnkd2"] -size = Vector3(4, 0.3, 4) +size = Vector3(6, 0.3, 6) [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jm3fw"] albedo_texture = ExtResource("3_37lsk") @@ -93,21 +93,9 @@ top_radius = 0.3 bottom_radius = 0.3 height = 15.04 -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_j01qt"] -albedo_texture = ExtResource("4_poywc") -uv1_scale = Vector3(3, 3, 3) - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_futte"] -albedo_texture = ExtResource("4_poywc") -uv1_scale = Vector3(3, 3, 3) - [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ugwq3"] albedo_texture = ExtResource("4_poywc") -uv1_scale = Vector3(3, 3, 3) - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_1ux7j"] -albedo_texture = ExtResource("4_poywc") -uv1_scale = Vector3(3, 3, 3) +uv1_scale = Vector3(3, 36, 3) [sub_resource type="CylinderMesh" id="CylinderMesh_j01qt"] height = 0.001 @@ -709,13 +697,14 @@ custom_globalmap_shader = SubResource("Shader_befda") texture_set = SubResource("Resource_v331k") render_layers = 1 cast_shadow = 1 -shader_params/u_ground_uv_scale_per_texture = null +shader_params/u_ground_uv_scale_per_texture = Vector4(20, 20, 20, 20) shader_params/u_depth_blending = true -shader_params/u_triplanar = null -shader_params/u_tile_reduction = null -shader_params/u_globalmap_blend_start = null -shader_params/u_globalmap_blend_distance = null -shader_params/u_colormap_opacity_per_texture = null +shader_params/u_triplanar = false +shader_params/u_tile_reduction = Vector4(0, 0, 0, 0) +shader_params/u_globalmap_blend_start = 0.0 +shader_params/u_globalmap_blend_distance = 0.0 +shader_params/u_colormap_opacity_per_texture = Vector4(1, 1, 1, 1) +shader_params/u_specular = 0.5 metadata/_custom_type_script = ExtResource("6_1xj3b") metadata/MaterialOverride = false @@ -725,10 +714,10 @@ mesh = SubResource("PlaneMesh_pfic1") surface_material_override/0 = SubResource("StandardMaterial3D_omy3l") [node name="Table" type="Node3D" parent="."] -transform = Transform3D(0.305, 0, 0, 0, 0.305, 0, 0, 0, 0.305, 0, 0, -15) +transform = Transform3D(0.305, 0, 0, 0, 0.305, 0, 0, 0, 0.305, 0, 0, 15) [node name="TargetHeightFeet" type="Node3D" parent="Table"] -transform = Transform3D(3.281, 0, 0, 0, 3.281, 0, 0, 0, 3.281, 0, 15, 0) +transform = Transform3D(3.281, 0, 0, 0, 3.281, 0, 0, 0, 3.281, 0, 25, 0) [node name="boule" type="MeshInstance3D" parent="Table/TargetHeightFeet"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.678, 0) @@ -744,7 +733,7 @@ skeleton = NodePath("") surface_material_override/0 = SubResource("StandardMaterial3D_6b770") [node name="panneau1" type="MeshInstance3D" parent="Table/TargetHeightFeet/boule"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1) mesh = SubResource("BoxMesh_aqqlo") skeleton = NodePath("") surface_material_override/0 = SubResource("StandardMaterial3D_araq8") @@ -767,34 +756,34 @@ skeleton = NodePath("") surface_material_override/0 = SubResource("StandardMaterial3D_ohwyq") [node name="Top" type="MeshInstance3D" parent="Table/TargetHeightFeet"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00289798, -0.157773, 0.0054512) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.15, 0) mesh = SubResource("BoxMesh_rnkd2") skeleton = NodePath("../..") surface_material_override/0 = SubResource("StandardMaterial3D_jm3fw") [node name="Column" type="MeshInstance3D" parent="Table/TargetHeightFeet"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.15, -7.62, 1.15) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.15, -7.62, 2.15) mesh = SubResource("CylinderMesh_ri5lb") skeleton = NodePath("../..") -surface_material_override/0 = SubResource("StandardMaterial3D_j01qt") +surface_material_override/0 = SubResource("StandardMaterial3D_ugwq3") [node name="Column2" type="MeshInstance3D" parent="Table/TargetHeightFeet"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.15, -7.62, 1.15) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.15, -7.62, 2.15) mesh = SubResource("CylinderMesh_ri5lb") skeleton = NodePath("../..") -surface_material_override/0 = SubResource("StandardMaterial3D_futte") +surface_material_override/0 = SubResource("StandardMaterial3D_ugwq3") [node name="Column3" type="MeshInstance3D" parent="Table/TargetHeightFeet"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.15, -7.62, -1.15) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.15, -7.62, -2.15) mesh = SubResource("CylinderMesh_ri5lb") skeleton = NodePath("../..") surface_material_override/0 = SubResource("StandardMaterial3D_ugwq3") [node name="Column4" type="MeshInstance3D" parent="Table/TargetHeightFeet"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.15, -7.62, -1.15) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.15, -7.62, -2.15) mesh = SubResource("CylinderMesh_ri5lb") skeleton = NodePath("../..") -surface_material_override/0 = SubResource("StandardMaterial3D_1ux7j") +surface_material_override/0 = SubResource("StandardMaterial3D_ugwq3") [node name="Cercle" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 100, 0, 100) @@ -939,7 +928,7 @@ transform = Transform3D(1, 0, 0, 0, 0.1, 0, 0, 0, 1, 0, 0, 0) mesh = SubResource("TorusMesh_r6ich") [node name="Accel_decel" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -150, 0, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 50, 0, 0) [node name="Start" type="Node3D" parent="Accel_decel"] @@ -1135,6 +1124,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 12.192) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -12.192) [node name="Sidestep" type="Node3D" parent="."] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) [node name="Cone80cm3" parent="Sidestep" instance=ExtResource("2_hj5f7")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.24, 0, 0) @@ -1324,7 +1314,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -9.144) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -10.668) [node name="Hover_maneuver" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 50) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -50, 0, 50) [node name="Hoverboard" type="Node3D" parent="Hover_maneuver"] transform = Transform3D(0.0592367, 4.36346e-08, 0.998244, -4.36346e-08, 1, -4.11221e-08, -0.998244, -4.11221e-08, 0.0592367, 0, 0, 45.72) diff --git a/project/main.tscn b/project/main.tscn index 795588e..f185af3 100644 --- a/project/main.tscn +++ b/project/main.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=6 format=3 uid="uid://crq3o0eu4y8ya"] +[gd_scene load_steps=7 format=3 uid="uid://crq3o0eu4y8ya"] [ext_resource type="Script" uid="uid://dfcjdxesyn3l0" path="res://start_vr.gd" id="1_ig7tw"] [ext_resource type="PackedScene" uid="uid://bj1s0g7ixjw71" path="res://aircraft/aircraft.tscn" id="2_0xm2m"] +[ext_resource type="PackedScene" uid="uid://bchcr54i3piaw" path="res://ads33-terrain/Cones_scene_terrain.tscn" id="3_h2yge"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_7dm0k"] @@ -14,13 +15,16 @@ sky = SubResource("Sky_ig7tw") [node name="Main" type="Node3D"] +[node name="Aircraft" parent="." instance=ExtResource("2_0xm2m")] + +[node name="Terrain" parent="." instance=ExtResource("3_h2yge")] + [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_0xm2m") [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform3D(0.707107, 0.683013, -0.183013, 0, 0.258819, 0.965926, 0.707107, -0.683013, 0.183013, -3, 3, -3) +transform = Transform3D(0.866025, 0.433013, 0.25, 0, -0.5, 0.866025, 0.5, -0.75, -0.433013, -5, 5, -5) +shadow_enabled = true [node name="StartVR" type="Node3D" parent="."] script = ExtResource("1_ig7tw") - -[node name="Aircraft" parent="." instance=ExtResource("2_0xm2m")]