diff --git a/assets/foliage/Textures/colormap.png b/assets/foliage/Textures/colormap.png new file mode 100644 index 0000000..a20ad94 Binary files /dev/null and b/assets/foliage/Textures/colormap.png differ diff --git a/assets/foliage/Textures/colormap.png.import b/assets/foliage/Textures/colormap.png.import new file mode 100644 index 0000000..9edf241 --- /dev/null +++ b/assets/foliage/Textures/colormap.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://f72a3xfidpms" +path.s3tc="res://.godot/imported/colormap.png-08a7d61e658f89289085c66cadb1bc2d.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/foliage/Textures/colormap.png" +dest_files=["res://.godot/imported/colormap.png-08a7d61e658f89289085c66cadb1bc2d.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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=0 diff --git a/assets/foliage/tree-high.glb b/assets/foliage/tree-high.glb new file mode 100644 index 0000000..91c97d4 Binary files /dev/null and b/assets/foliage/tree-high.glb differ diff --git a/assets/foliage/tree-high.glb.import b/assets/foliage/tree-high.glb.import new file mode 100644 index 0000000..fbb7887 --- /dev/null +++ b/assets/foliage/tree-high.glb.import @@ -0,0 +1,42 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dyu3r0cl0judq" +path="res://.godot/imported/tree-high.glb-7b56684fc38d48b551f6a2589ecabd53.scn" + +[deps] + +source_file="res://assets/foliage/tree-high.glb" +dest_files=["res://.godot/imported/tree-high.glb-7b56684fc38d48b551f6a2589ecabd53.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +gltf/naming_version=2 +gltf/embedded_image_handling=1 diff --git a/assets/foliage/tree.glb b/assets/foliage/tree.glb new file mode 100644 index 0000000..3dbe65b Binary files /dev/null and b/assets/foliage/tree.glb differ diff --git a/assets/foliage/tree.glb.import b/assets/foliage/tree.glb.import new file mode 100644 index 0000000..a7df8f4 --- /dev/null +++ b/assets/foliage/tree.glb.import @@ -0,0 +1,42 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://q0w3en4bfk42" +path="res://.godot/imported/tree.glb-5e87a640dbd9ffc2053ff1705fe52b99.scn" + +[deps] + +source_file="res://assets/foliage/tree.glb" +dest_files=["res://.godot/imported/tree.glb-5e87a640dbd9ffc2053ff1705fe52b99.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +gltf/naming_version=2 +gltf/embedded_image_handling=1 diff --git a/main.tscn b/main.tscn index 256d08c..b73435d 100644 --- a/main.tscn +++ b/main.tscn @@ -1,11 +1,13 @@ -[gd_scene load_steps=15 format=3 uid="uid://rs3hv73svbpa"] +[gd_scene load_steps=23 format=3 uid="uid://rs3hv73svbpa"] [ext_resource type="Script" uid="uid://4mg67crlim53" path="res://player/player.gd" id="1_h2yge"] [ext_resource type="Script" uid="uid://ii8ai801jur2" path="res://player/camera_rig.gd" id="2_1bvp3"] [ext_resource type="Script" uid="uid://dbb25ttlyogqr" path="res://simulation/SimulationManager.gd" id="3_lquwl"] [ext_resource type="Script" uid="uid://c1f3b26n4yntf" path="res://world/world_view_manager.gd" id="4_1bvp3"] [ext_resource type="PackedScene" uid="uid://dhxxyprqflotq" path="res://player/npc/NpcVisual.tscn" id="5_lquwl"] +[ext_resource type="PackedScene" uid="uid://q0w3en4bfk42" path="res://assets/foliage/tree.glb" id="6_5vw27"] [ext_resource type="Script" uid="uid://cjvbgqx8rao0t" path="res://world/ui/ui.gd" id="6_7mycd"] +[ext_resource type="PackedScene" uid="uid://dyu3r0cl0judq" path="res://assets/foliage/tree-high.glb" id="7_kek77"] [sub_resource type="NavigationMesh" id="NavigationMesh_lquwl"] vertices = PackedVector3Array(-14.5, 0.5, 0, -1, 0.5, 0, -1, 0.5, -0.75, 0, 0.5, -1, 0, 0.5, -14.5, -14.5, 0.5, -14.5, 0.75, 0.5, -1, 0.75, 0.75, -0.5, 14.5, 0.5, -0.5, 14.5, 0.5, -14.5, 0.75, 0.75, 0, 0, 1, 0, 0, 0.75, 0.75, -0.5, 0.75, 0.75, -0.5, 0.5, 14.5, 14.5, 0.5, 14.5, -1, 0.5, 0.75, -14.5, 0.5, 14.5) @@ -34,6 +36,22 @@ ambient_light_source = 2 ambient_light_color = Color(1, 1, 1, 1) ambient_light_energy = 0.5 +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5vw27"] +albedo_color = Color(0.5328383, 0.4215183, 0.18649894, 1) + +[sub_resource type="BoxMesh" id="BoxMesh_5vw27"] +material = SubResource("StandardMaterial3D_5vw27") + +[sub_resource type="CylinderMesh" id="CylinderMesh_5vw27"] +top_radius = 1.129 +height = 5.774 + +[sub_resource type="BoxMesh" id="BoxMesh_kek77"] + +[sub_resource type="PrismMesh" id="PrismMesh_5vw27"] + +[sub_resource type="BoxMesh" id="BoxMesh_4c57u"] + [node name="Main" type="Node3D"] [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] @@ -113,21 +131,47 @@ environment = SubResource("Environment_o5qli") [node name="FarmZone" type="Marker3D" parent="TaskZone"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8, 0, -6) +[node name="MeshInstance3D" type="MeshInstance3D" parent="TaskZone/FarmZone"] +transform = Transform3D(2.0639582, 0, 0, 0, 0.2, 0, 0, 0, 2.211021, -0.47271156, 0.47702956, -0.02484417) +mesh = SubResource("BoxMesh_5vw27") + [node name="ForestZone" type="Marker3D" parent="TaskZone"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 0, -6) +[node name="smallTree" parent="TaskZone/ForestZone" instance=ExtResource("6_5vw27")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.13034248, 0.23380828, -0.6683569) + +[node name="highTree" parent="TaskZone/ForestZone" instance=ExtResource("7_kek77")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.78092957, 0.23380828, 0.17081833) + [node name="GuardZone" type="Marker3D" parent="TaskZone"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 8) +[node name="MeshInstance3D" type="MeshInstance3D" parent="TaskZone/GuardZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 0) +mesh = SubResource("CylinderMesh_5vw27") + [node name="StudyZone" type="Marker3D" parent="TaskZone"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6, 0, 6) +[node name="MeshInstance3D" type="MeshInstance3D" parent="TaskZone/StudyZone"] +transform = Transform3D(1, 0, 0, 0, 10, 0, 0, 0, 1, 0, 5, 0) +mesh = SubResource("BoxMesh_kek77") + [node name="RestZone" type="Marker3D" parent="TaskZone"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 0, 5) +[node name="MeshInstance3D" type="MeshInstance3D" parent="TaskZone/RestZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) +mesh = SubResource("PrismMesh_5vw27") + [node name="FoodZone" type="Marker3D" parent="TaskZone"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -8) +[node name="MeshInstance3D" type="MeshInstance3D" parent="TaskZone/FoodZone"] +transform = Transform3D(4, 0, 0, 0, 3, 0, 0, 0, 4, 0, 1.5, 0) +mesh = SubResource("BoxMesh_4c57u") + [node name="UI" type="CanvasLayer" parent="." node_paths=PackedStringArray("simulation_manager")] script = ExtResource("6_7mycd") simulation_manager = NodePath("../SimulationManager")