diff --git a/Scenes/main.tscn b/Scenes/main.tscn index e84d58b..40fb964 100644 --- a/Scenes/main.tscn +++ b/Scenes/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=3 uid="uid://bj7y7q2qkpnci"] +[gd_scene load_steps=17 format=3 uid="uid://bj7y7q2qkpnci"] [ext_resource type="Shader" uid="uid://c5e2qqpg6h4lw" path="res://Shaders/road.gdshader" id="2_6bp64"] [ext_resource type="ArrayMesh" uid="uid://622ethh2pdfa" path="res://Blends/road/road.obj" id="4_jjvhh"] @@ -7,9 +7,6 @@ [ext_resource type="PackedScene" uid="uid://dim2geqhn6d35" path="res://Scenes/Prefabs/cart.tscn" id="6_21xkr"] [ext_resource type="PackedScene" uid="uid://dy03tqug33fep" path="res://Blends/ground.blend" id="6_344ge"] [ext_resource type="Script" uid="uid://drrp1k2q71hq2" path="res://Scripts/camera_3d.gd" id="7_6bp64"] -[ext_resource type="ArrayMesh" uid="uid://k2k1ppv3ycsv" path="res://Blends/Shelf/Shelf.obj" id="8_344ge"] -[ext_resource type="Texture2D" uid="uid://5gmmgg4cmefr" path="res://Blends/Shelf/color.png" id="9_hptm8"] -[ext_resource type="Texture2D" uid="uid://q0duenho1u2x" path="res://Blends/Shelf/normal.png" id="10_d1ilt"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_jjvhh"] sky_top_color = Color(0.654771, 0.60129, 0.578102, 1) @@ -50,11 +47,8 @@ size = Vector2(0.5, 0.5) [sub_resource type="BoxShape3D" id="BoxShape3D_21xkr"] -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6iyac"] -albedo_texture = ExtResource("9_hptm8") -normal_enabled = true -normal_scale = -1.88 -normal_texture = ExtResource("10_d1ilt") +[sub_resource type="BoxShape3D" id="BoxShape3D_6bp64"] +size = Vector3(156.989, 1, 161.434) [node name="Main" type="Node3D"] @@ -72,7 +66,7 @@ skeleton = NodePath("../Road") surface_material_override/0 = SubResource("ShaderMaterial_6bp64") [node name="Road" type="MeshInstance3D" parent="."] -transform = Transform3D(10.9512, 0, 0, 0, 1, 0, 0, 0, 1, -54.4288, 0.584906, -61.8752) +transform = Transform3D(10.9512, 0, 0, 0, 1, 0, 0, 0, 1, -54.4288, 0.58491, -61.8752) mesh = ExtResource("4_jjvhh") surface_material_override/0 = SubResource("ShaderMaterial_344ge") @@ -93,7 +87,7 @@ spot_range = 23.417 spot_angle = 89.99 [node name="Cart" parent="." node_paths=PackedStringArray("mainCamera") instance=ExtResource("6_21xkr")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.31428, 3.18503, -60.2323) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.31428, 3.18503, -60.0041) mainCamera = NodePath("../RigidBody3D/Camera3D") [node name="RigidBody3D" type="RigidBody3D" parent="."] @@ -131,6 +125,12 @@ debug_color = Color(0.895552, 0, 0.381247, 1) [node name="ground" parent="." instance=ExtResource("6_344ge")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20.321, 0.384693, -59.426) +[node name="StaticBody3D" type="StaticBody3D" parent="ground"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="ground/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.149445, -0.621046, 1.07111) +shape = SubResource("BoxShape3D_6bp64") + [node name="ground2" parent="." instance=ExtResource("6_344ge")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 180.354, 0.385, -59.426) @@ -147,8 +147,3 @@ mouse_filter = 2 [node name="Marker3D" type="Marker3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.90278, -57.5436) - -[node name="Shelf" type="MeshInstance3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.99485, 0.659399, -45.3142) -mesh = ExtResource("8_344ge") -surface_material_override/0 = SubResource("StandardMaterial3D_6iyac")