diff --git a/Assets/Editor/Project.gdshader.uid b/Assets/Editor/Project.gdshader.uid new file mode 100644 index 0000000..7b7a389 --- /dev/null +++ b/Assets/Editor/Project.gdshader.uid @@ -0,0 +1 @@ +uid://b61071o0wfswh diff --git a/Assets/Placeholders/3D/BrickWall.obj.import b/Assets/Placeholders/3D/BrickWall.obj.import index 0101925..6cee21e 100644 --- a/Assets/Placeholders/3D/BrickWall.obj.import +++ b/Assets/Placeholders/3D/BrickWall.obj.import @@ -16,7 +16,10 @@ dest_files=["res://.godot/imported/BrickWall.obj-1a38e41ad82f0ba533a96b5993c728f [params] generate_tangents=true +generate_lods=true +generate_shadow_mesh=true +generate_lightmap_uv2=false +generate_lightmap_uv2_texel_size=0.2 scale_mesh=Vector3(1, 1, 1) offset_mesh=Vector3(0, 0, 0) -optimize_mesh=true force_disable_mesh_compression=false diff --git a/Assets/Placeholders/3D/BrickWallTop.obj.import b/Assets/Placeholders/3D/BrickWallTop.obj.import index 3c67ebe..d7f712f 100644 --- a/Assets/Placeholders/3D/BrickWallTop.obj.import +++ b/Assets/Placeholders/3D/BrickWallTop.obj.import @@ -16,7 +16,10 @@ dest_files=["res://.godot/imported/BrickWallTop.obj-e5a23c0e2a2ae0409fc8cf8b584e [params] generate_tangents=true +generate_lods=true +generate_shadow_mesh=true +generate_lightmap_uv2=false +generate_lightmap_uv2_texel_size=0.2 scale_mesh=Vector3(1, 1, 1) offset_mesh=Vector3(0, 0, 0) -optimize_mesh=true force_disable_mesh_compression=false diff --git a/Maps/Debugging/test.tscn b/Maps/Debugging/test.tscn index 0e957fc..7245ef9 100644 --- a/Maps/Debugging/test.tscn +++ b/Maps/Debugging/test.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=8 format=4 uid="uid://cr454erswain0"] [ext_resource type="TileSet" uid="uid://coub5ioem1v7o" path="res://Assets/tileset.tres" id="1_fso1u"] -[ext_resource type="Shader" path="res://Assets/Editor/Project.gdshader" id="2_ntdhd"] +[ext_resource type="Shader" uid="uid://b61071o0wfswh" path="res://Assets/Editor/Project.gdshader" id="2_ntdhd"] [ext_resource type="Texture2D" uid="uid://773fvksy2hdp" path="res://Assets/Editor/voronoi-cube.png" id="3_fq7sb"] [sub_resource type="ViewportTexture" id="ViewportTexture_vj67s"] @@ -10,9 +10,9 @@ viewport_path = NodePath("ProjectionViewport") [sub_resource type="ShaderMaterial" id="ShaderMaterial_igsij"] render_priority = 0 shader = ExtResource("2_ntdhd") +shader_parameter/tilemap_camera = SubResource("ViewportTexture_vj67s") shader_parameter/scale = Vector2(5, 5) shader_parameter/offset = Vector2(2, 2) -shader_parameter/tilemap_camera = SubResource("ViewportTexture_vj67s") [sub_resource type="BoxMesh" id="BoxMesh_5lobg"] material = SubResource("ShaderMaterial_igsij") @@ -21,6 +21,7 @@ material = SubResource("ShaderMaterial_igsij") item/0/name = "Full Cube" item/0/mesh = SubResource("BoxMesh_5lobg") item/0/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) +item/0/mesh_cast_shadow = 1 item/0/shapes = [] item/0/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) item/0/navigation_layers = 1 diff --git a/Scenes/Debugging/Old/Square.tscn b/Scenes/Debugging/Old/Square.tscn index 439bfd8..a6dd33d 100644 --- a/Scenes/Debugging/Old/Square.tscn +++ b/Scenes/Debugging/Old/Square.tscn @@ -2,7 +2,7 @@ [ext_resource type="TileSet" uid="uid://coub5ioem1v7o" path="res://Assets/tileset.tres" id="1_v8tdb"] [ext_resource type="MeshLibrary" uid="uid://ctek5p2fwk8gc" path="res://Assets/Placeholders/3D/mesh_library.tres" id="2_hkfg0"] -[ext_resource type="Shader" path="res://Assets/Editor/Project.gdshader" id="3_8af8g"] +[ext_resource type="Shader" uid="uid://b61071o0wfswh" path="res://Assets/Editor/Project.gdshader" id="3_8af8g"] [sub_resource type="ViewportTexture" id="ViewportTexture_6xjcl"] viewport_path = NodePath("SubViewport") @@ -11,8 +11,9 @@ viewport_path = NodePath("SubViewport") resource_local_to_scene = true render_priority = 0 shader = ExtResource("3_8af8g") -shader_parameter/scale = 8.0 shader_parameter/tilemap_camera = SubResource("ViewportTexture_6xjcl") +shader_parameter/scale = Vector2(8, 8) +shader_parameter/offset = Vector2(0, 0) [sub_resource type="BoxMesh" id="BoxMesh_03j8n"] material = SubResource("ShaderMaterial_e3oir") @@ -21,6 +22,7 @@ material = SubResource("ShaderMaterial_e3oir") item/0/name = "" item/0/mesh = SubResource("BoxMesh_03j8n") item/0/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) +item/0/mesh_cast_shadow = 1 item/0/shapes = [] item/0/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) item/0/navigation_layers = 1 diff --git a/Scenes/Debugging/Old/node_3d.tscn b/Scenes/Debugging/Old/node_3d.tscn index 928b257..9a5f3fc 100644 --- a/Scenes/Debugging/Old/node_3d.tscn +++ b/Scenes/Debugging/Old/node_3d.tscn @@ -14,6 +14,7 @@ material = SubResource("StandardMaterial3D_d56em") item/0/name = "" item/0/mesh = SubResource("BoxMesh_7xuuy") item/0/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) +item/0/mesh_cast_shadow = 1 item/0/shapes = [] item/0/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) item/0/navigation_layers = 1 diff --git a/addons/editor_helper/dock.gd.uid b/addons/editor_helper/dock.gd.uid new file mode 100644 index 0000000..38ae8c1 --- /dev/null +++ b/addons/editor_helper/dock.gd.uid @@ -0,0 +1 @@ +uid://batbf5olp1pkb diff --git a/addons/editor_helper/dock.tscn b/addons/editor_helper/dock.tscn index db9b18e..33d091d 100644 --- a/addons/editor_helper/dock.tscn +++ b/addons/editor_helper/dock.tscn @@ -2,7 +2,7 @@ [ext_resource type="Texture2D" uid="uid://d21g7jrsdyc8p" path="res://addons/editor_helper/Up.svg" id="1_pbfaa"] [ext_resource type="Texture2D" uid="uid://djvtp1nbp5ib5" path="res://addons/editor_helper/New.svg" id="1_py207"] -[ext_resource type="Script" path="res://addons/editor_helper/dock.gd" id="1_t1280"] +[ext_resource type="Script" uid="uid://batbf5olp1pkb" path="res://addons/editor_helper/dock.gd" id="1_t1280"] [ext_resource type="Texture2D" uid="uid://d3dtusyl30nq0" path="res://addons/editor_helper/Collapse.svg" id="2_d6cq4"] [ext_resource type="Texture2D" uid="uid://bqmald1jy1a2c" path="res://addons/editor_helper/Down.svg" id="2_ek7b6"] [ext_resource type="Texture2D" uid="uid://cg40j0yoi1sq0" path="res://addons/editor_helper/Expand.svg" id="3_73lev"] diff --git a/addons/editor_helper/editor_helper.gd.uid b/addons/editor_helper/editor_helper.gd.uid new file mode 100644 index 0000000..d62690c --- /dev/null +++ b/addons/editor_helper/editor_helper.gd.uid @@ -0,0 +1 @@ +uid://cd2lhwxesrgcd diff --git a/addons/editor_helper/template.tscn b/addons/editor_helper/template.tscn index 4e4cb30..91503e0 100644 --- a/addons/editor_helper/template.tscn +++ b/addons/editor_helper/template.tscn @@ -2,7 +2,7 @@ [ext_resource type="TileSet" uid="uid://coub5ioem1v7o" path="res://Assets/tileset.tres" id="1_0y2ly"] [ext_resource type="Texture2D" uid="uid://773fvksy2hdp" path="res://Assets/Editor/voronoi-cube.png" id="2_7oxkx"] -[ext_resource type="Shader" path="res://Assets/Editor/Project.gdshader" id="2_e7bie"] +[ext_resource type="Shader" uid="uid://b61071o0wfswh" path="res://Assets/Editor/Project.gdshader" id="2_e7bie"] [sub_resource type="ViewportTexture" id="ViewportTexture_qgw6l"] viewport_path = NodePath("ProjectionViewport") @@ -10,9 +10,9 @@ viewport_path = NodePath("ProjectionViewport") [sub_resource type="ShaderMaterial" id="ShaderMaterial_op0ta"] render_priority = 0 shader = ExtResource("2_e7bie") +shader_parameter/tilemap_camera = SubResource("ViewportTexture_qgw6l") shader_parameter/scale = Vector2(0, 0) shader_parameter/offset = Vector2(0, 0) -shader_parameter/tilemap_camera = SubResource("ViewportTexture_qgw6l") [sub_resource type="BoxMesh" id="BoxMesh_qpep1"] material = SubResource("ShaderMaterial_op0ta") @@ -21,6 +21,7 @@ material = SubResource("ShaderMaterial_op0ta") item/0/name = "Full Cube" item/0/mesh = SubResource("BoxMesh_qpep1") item/0/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) +item/0/mesh_cast_shadow = 1 item/0/shapes = [] item/0/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) item/0/navigation_layers = 1 diff --git a/project.godot b/project.godot index de7cdad..62ffe34 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="Land Grifter" -config/features=PackedStringArray("4.3", "Forward Plus") +config/features=PackedStringArray("4.4", "Forward Plus") config/icon="res://icon.svg" [editor_plugins]