diff --git a/materials/decors/rocks/rock_moss.material b/materials/decors/rocks/rock_moss.material index e92988d..4a95716 100644 --- a/materials/decors/rocks/rock_moss.material +++ b/materials/decors/rocks/rock_moss.material @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13b6655bd4472f57480ec3ebeb9e58dd0be3354ab9faaf776cb2c388b43d3972 -size 4453 +oid sha256:45127be7850f1401bb895bbffbba7974ce6009d32e75375ec6046308df33b56d +size 4446 diff --git a/materials/tilables/base_plastic_hard_shiny.material b/materials/tilables/base_plastic_hard_shiny.material index 4da5732..afdc854 100644 --- a/materials/tilables/base_plastic_hard_shiny.material +++ b/materials/tilables/base_plastic_hard_shiny.material @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d53f023d921a188f87e5a5335d232471186142d58c6a6bac72eab516e322eed9 -size 829 +oid sha256:a535585c3aa283fdd2a1da447eea8c977d5fe524a14e3b7e3603e297a485a3f6 +size 837 diff --git a/materials/tilables/base_plastic_soft.material b/materials/tilables/base_plastic_soft.material index f24701c..71de852 100644 --- a/materials/tilables/base_plastic_soft.material +++ b/materials/tilables/base_plastic_soft.material @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:caddafd32d861e62e814a07183cec097d7a4fdceb734aa7e06a6c9f831b11de2 -size 800 +oid sha256:0f545dae0ed980cc4753e9ad6440a2af489e79a5b1ca9a6706bd87fa228a95d7 +size 807 diff --git a/materials/tilables/base_steel_glossy.material b/materials/tilables/base_steel_glossy.material index 7bc2865..2529346 100644 --- a/materials/tilables/base_steel_glossy.material +++ b/materials/tilables/base_steel_glossy.material @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5318da2510ea6ccbf560e586efb23dd0f0157863c9c04bb0a5b30117d0d839b0 -size 790 +oid sha256:e20b998af62774dededb301ab567ed1794c6b0e2694d73681a3cc3dff9f9c2e0 +size 796 diff --git a/materials/tilables/suzahna_base.tres b/materials/tilables/suzahna_base.tres index f052e8f..667cfde 100644 --- a/materials/tilables/suzahna_base.tres +++ b/materials/tilables/suzahna_base.tres @@ -1,9 +1,10 @@ [gd_resource type="SpatialMaterial" load_steps=5 format=2] -[ext_resource path="res://materials/tilables/textures/Base_suzanha_rock_baseColor.png" type="Texture" id=1] -[ext_resource path="res://materials/tilables/textures/Base_suzanha_rock_height.png" type="Texture" id=2] -[ext_resource path="res://materials/tilables/textures/Base_suzanha_rock_normal.png" type="Texture" id=3] -[ext_resource path="res://materials/tilables/textures/Base_suzanha_rock_roughness.png" type="Texture" id=4] +[ext_resource path="res://textures/tilables/stone/Base_suzanha_rock_baseColor.png" type="Texture" id=1] +[ext_resource path="res://textures/tilables/stone/Base_suzanha_rock_height.png" type="Texture" id=2] +[ext_resource path="res://textures/tilables/stone/Base_suzanha_rock_normal.png" type="Texture" id=3] +[ext_resource path="res://textures/tilables/stone/Base_suzanha_rock_roughness.png" type="Texture" id=4] + [resource] albedo_texture = ExtResource( 1 ) @@ -21,4 +22,3 @@ uv1_scale = Vector3( 0.4, 0.4, 0.4 ) uv1_offset = Vector3( 0.12, 0.3, 0.14 ) uv1_triplanar = true uv2_scale = Vector3( 0.7, 0.7, 0.7 ) - diff --git a/materials/tilables/suzahna_bricks.tres b/materials/tilables/suzahna_bricks.tres index beec96a..80a4dd5 100644 --- a/materials/tilables/suzahna_bricks.tres +++ b/materials/tilables/suzahna_bricks.tres @@ -1,9 +1,10 @@ [gd_resource type="SpatialMaterial" load_steps=5 format=2] -[ext_resource path="res://materials/tilables/textures/Suzahna_bricks_basecolor.png" type="Texture" id=1] -[ext_resource path="res://materials/tilables/textures/Suzahna_bricks_height.png" type="Texture" id=2] -[ext_resource path="res://materials/tilables/textures/Suzahna_bricks_normal.png" type="Texture" id=3] -[ext_resource path="res://materials/tilables/textures/Suzahna_bricks_roughness.png" type="Texture" id=4] +[ext_resource path="res://textures/tilables/brick/Suzahna_bricks_basecolor.png" type="Texture" id=1] +[ext_resource path="res://textures/tilables/brick/Suzahna_bricks_height.png" type="Texture" id=2] +[ext_resource path="res://textures/tilables/brick/Suzahna_bricks_normal.png" type="Texture" id=3] +[ext_resource path="res://textures/tilables/brick/Suzahna_bricks_roughness.png" type="Texture" id=4] + [resource] albedo_texture = ExtResource( 1 ) @@ -20,4 +21,3 @@ depth_texture = ExtResource( 2 ) uv1_scale = Vector3( 0.7, 0.7, 0.7 ) uv1_offset = Vector3( 0.13, 0, 0 ) uv1_triplanar = true - diff --git a/materials/tilables/suzahna_bricks_wide.tres b/materials/tilables/suzahna_bricks_wide.tres index c7c9be6..163024d 100644 --- a/materials/tilables/suzahna_bricks_wide.tres +++ b/materials/tilables/suzahna_bricks_wide.tres @@ -1,9 +1,10 @@ [gd_resource type="SpatialMaterial" load_steps=5 format=2] -[ext_resource path="res://materials/tilables/textures/Suzahna_bricks_wide_basecolor.png" type="Texture" id=1] -[ext_resource path="res://materials/tilables/textures/Suzahna_bricks_wide_height.png" type="Texture" id=2] -[ext_resource path="res://materials/tilables/textures/Suzahna_bricks_wide_normal.png" type="Texture" id=3] -[ext_resource path="res://materials/tilables/textures/Suzahna_bricks_wide_roughness.png" type="Texture" id=4] +[ext_resource path="res://textures/tilables/brick/Suzahna_bricks_wide_basecolor.png" type="Texture" id=1] +[ext_resource path="res://textures/tilables/brick/Suzahna_bricks_wide_height.png" type="Texture" id=2] +[ext_resource path="res://textures/tilables/brick/Suzahna_bricks_wide_normal.png" type="Texture" id=3] +[ext_resource path="res://textures/tilables/brick/Suzahna_bricks_wide_roughness.png" type="Texture" id=4] + [resource] albedo_texture = ExtResource( 1 ) @@ -20,4 +21,3 @@ depth_texture = ExtResource( 2 ) uv1_scale = Vector3( 0.7, 0.7, 0.7 ) uv1_offset = Vector3( 0, 0, 0.24 ) uv1_triplanar = true - diff --git a/meshes/props/travel_box/container_bottom.tscn b/meshes/props/travel_box/container_bottom.tscn index c07ea35..308b1e8 100644 --- a/meshes/props/travel_box/container_bottom.tscn +++ b/meshes/props/travel_box/container_bottom.tscn @@ -1,15 +1,18 @@ [gd_scene load_steps=14 format=2] [ext_resource path="res://meshes/props/travel_box/travel_box_bottom.escn" type="PackedScene" id=1] -[ext_resource path="res://materials/tilables/textures/base_plastic_soft_roughness.png" type="Texture" id=2] -[ext_resource path="res://materials/tilables/textures/base_plastic_soft_colorRange.png" type="Texture" id=3] -[ext_resource path="res://materials/tilables/textures/base_plastic_soft_normal.png" type="Texture" id=4] -[ext_resource path="res://materials/tilables/textures/base_steel_glossy_roughness.png" type="Texture" id=5] -[ext_resource path="res://materials/tilables/textures/base_plastic_hard_shiny_colorRange.png" type="Texture" id=6] -[ext_resource path="res://materials/tilables/textures/base_plastic_hard_shiny_roughness.png" type="Texture" id=7] -[ext_resource path="res://materials/tilables/textures/base_plastic_hard_shiny_normal.png" type="Texture" id=8] -[ext_resource path="res://materials/tilables/textures/base_steel_glossy_basecolor.png" type="Texture" id=9] -[ext_resource path="res://materials/tilables/textures/base_steel_glossy_normal.png" type="Texture" id=10] +[ext_resource path="res://textures/tilables/plastic/base_plastic_soft_roughness.png" type="Texture" id=2] +[ext_resource path="res://textures/tilables/plastic/base_plastic_soft_colorRange.png" type="Texture" id=3] +[ext_resource path="res://textures/tilables/plastic/base_plastic_soft_normal.png" type="Texture" id=4] +[ext_resource path="res://textures/tilables/steel/base_steel_glossy_roughness.png" type="Texture" id=5] +[ext_resource path="res://textures/tilables/plastic/base_plastic_hard_shiny_colorRange.png" type="Texture" id=6] +[ext_resource path="res://textures/tilables/plastic/base_plastic_hard_shiny_roughness.png" type="Texture" id=7] +[ext_resource path="res://textures/tilables/plastic/base_plastic_hard_shiny_normal.png" type="Texture" id=8] +[ext_resource path="res://textures/tilables/steel/base_steel_glossy_basecolor.png" type="Texture" id=9] +[ext_resource path="res://textures/tilables/steel/base_steel_glossy_normal.png" type="Texture" id=10] + + + [sub_resource type="SpatialMaterial" id=1] resource_local_to_scene = true diff --git a/previewer/previewer.tscn b/previewer/previewer.tscn index 1693af4..290b080 100644 --- a/previewer/previewer.tscn +++ b/previewer/previewer.tscn @@ -2,13 +2,15 @@ [ext_resource path="res://previewer/previewer.gd" type="Script" id=1] [ext_resource path="res://previewer/dummy/dummy.tscn" type="PackedScene" id=2] -[ext_resource path="res://materials/tilables/textures/base_UV_check_big.png" type="Texture" id=3] +[ext_resource path="res://textures/tilables/basic_texture_1024.png" type="Texture" id=3] [ext_resource path="res://meshes/decors/rocks/cliff_001.tscn" type="PackedScene" id=4] [ext_resource path="res://meshes/props/pendo_teddy/pendo_teddy.tscn" type="PackedScene" id=5] [ext_resource path="res://meshes/props/travel_box/container.tscn" type="PackedScene" id=6] [ext_resource path="res://meshes/props/reference_box/reference_box.tscn" type="PackedScene" id=7] [ext_resource path="res://meshes/props/fountain_suzanha/Fountain_suzanha.tscn" type="PackedScene" id=8] + + [sub_resource type="ProceduralSky" id=1] [sub_resource type="Environment" id=2] @@ -18,9 +20,10 @@ background_energy = 0.1 ambient_light_energy = 3.82 [sub_resource type="SpatialMaterial" id=3] +flags_unshaded = true +flags_world_triplanar = true albedo_texture = ExtResource( 3 ) -uv1_scale = Vector3( 7.6, 7.6, 7.6 ) -uv1_offset = Vector3( 0.2, 0.2, 0 ) +uv1_scale = Vector3( 122, 122, 122 ) [sub_resource type="PlaneMesh" id=4] material = SubResource( 3 ) @@ -75,9 +78,8 @@ color = Color( 0.360784, 1, 0, 1 ) lid_angle = 12.0 [node name="container_4" parent="props" instance=ExtResource( 6 )] -transform = Transform( 0.457191, 0, 0.889369, 0, 1, 0, -0.889369, 0, 0.457191, -3.94754, 4.76837e-007, -4.27729 ) +transform = Transform( 0.457191, 0, 0.889369, 0, 1, 0, -0.889369, 0, 0.457191, -3.94754, 4.76837e-07, -4.27729 ) color = Color( 0.972549, 0.196078, 0.0431373, 1 ) -lid_angle = 0.0 [node name="reference_box" parent="props" instance=ExtResource( 7 )] diff --git a/materials/decors/rocks/textures/cliffs_grunges_mask.png b/textures/atlas/cliffs_grunges_mask.png similarity index 100% rename from materials/decors/rocks/textures/cliffs_grunges_mask.png rename to textures/atlas/cliffs_grunges_mask.png diff --git a/materials/decors/rocks/textures/clouds_mask.png b/textures/atlas/clouds_mask.png similarity index 100% rename from materials/decors/rocks/textures/clouds_mask.png rename to textures/atlas/clouds_mask.png diff --git a/materials/tilables/textures/base_UV_check_big.png b/textures/tilables/base_UV_check_big.png similarity index 100% rename from materials/tilables/textures/base_UV_check_big.png rename to textures/tilables/base_UV_check_big.png diff --git a/materials/tilables/textures/Suzahna_bricks_basecolor.png b/textures/tilables/brick/Suzahna_bricks_basecolor.png similarity index 100% rename from materials/tilables/textures/Suzahna_bricks_basecolor.png rename to textures/tilables/brick/Suzahna_bricks_basecolor.png diff --git a/materials/tilables/textures/Suzahna_bricks_height.png b/textures/tilables/brick/Suzahna_bricks_height.png similarity index 100% rename from materials/tilables/textures/Suzahna_bricks_height.png rename to textures/tilables/brick/Suzahna_bricks_height.png diff --git a/materials/tilables/textures/Suzahna_bricks_normal.png b/textures/tilables/brick/Suzahna_bricks_normal.png similarity index 100% rename from materials/tilables/textures/Suzahna_bricks_normal.png rename to textures/tilables/brick/Suzahna_bricks_normal.png diff --git a/materials/tilables/textures/Suzahna_bricks_roughness.png b/textures/tilables/brick/Suzahna_bricks_roughness.png similarity index 100% rename from materials/tilables/textures/Suzahna_bricks_roughness.png rename to textures/tilables/brick/Suzahna_bricks_roughness.png diff --git a/materials/tilables/textures/Suzahna_bricks_wide_basecolor.png b/textures/tilables/brick/Suzahna_bricks_wide_basecolor.png similarity index 100% rename from materials/tilables/textures/Suzahna_bricks_wide_basecolor.png rename to textures/tilables/brick/Suzahna_bricks_wide_basecolor.png diff --git a/materials/tilables/textures/Suzahna_bricks_wide_height.png b/textures/tilables/brick/Suzahna_bricks_wide_height.png similarity index 100% rename from materials/tilables/textures/Suzahna_bricks_wide_height.png rename to textures/tilables/brick/Suzahna_bricks_wide_height.png diff --git a/materials/tilables/textures/Suzahna_bricks_wide_normal.png b/textures/tilables/brick/Suzahna_bricks_wide_normal.png similarity index 100% rename from materials/tilables/textures/Suzahna_bricks_wide_normal.png rename to textures/tilables/brick/Suzahna_bricks_wide_normal.png diff --git a/materials/tilables/textures/Suzahna_bricks_wide_roughness.png b/textures/tilables/brick/Suzahna_bricks_wide_roughness.png similarity index 100% rename from materials/tilables/textures/Suzahna_bricks_wide_roughness.png rename to textures/tilables/brick/Suzahna_bricks_wide_roughness.png diff --git a/materials/decors/rocks/textures/dust_baseColor.png b/textures/tilables/dust/dust_baseColor.png similarity index 100% rename from materials/decors/rocks/textures/dust_baseColor.png rename to textures/tilables/dust/dust_baseColor.png diff --git a/materials/decors/rocks/textures/dust_height.png b/textures/tilables/dust/dust_height.png similarity index 100% rename from materials/decors/rocks/textures/dust_height.png rename to textures/tilables/dust/dust_height.png diff --git a/materials/decors/rocks/textures/dust_normal.png b/textures/tilables/dust/dust_normal.png similarity index 100% rename from materials/decors/rocks/textures/dust_normal.png rename to textures/tilables/dust/dust_normal.png diff --git a/materials/decors/rocks/textures/dust_roughness.png b/textures/tilables/dust/dust_roughness.png similarity index 100% rename from materials/decors/rocks/textures/dust_roughness.png rename to textures/tilables/dust/dust_roughness.png diff --git a/materials/decors/rocks/textures/moss_AO.png b/textures/tilables/moss/moss_AO.png similarity index 100% rename from materials/decors/rocks/textures/moss_AO.png rename to textures/tilables/moss/moss_AO.png diff --git a/materials/decors/rocks/textures/moss_basecolor.png b/textures/tilables/moss/moss_basecolor.png similarity index 100% rename from materials/decors/rocks/textures/moss_basecolor.png rename to textures/tilables/moss/moss_basecolor.png diff --git a/materials/decors/rocks/textures/moss_height.png b/textures/tilables/moss/moss_height.png similarity index 100% rename from materials/decors/rocks/textures/moss_height.png rename to textures/tilables/moss/moss_height.png diff --git a/materials/decors/rocks/textures/moss_normal.png b/textures/tilables/moss/moss_normal.png similarity index 100% rename from materials/decors/rocks/textures/moss_normal.png rename to textures/tilables/moss/moss_normal.png diff --git a/materials/decors/rocks/textures/moss_roughness.png b/textures/tilables/moss/moss_roughness.png similarity index 100% rename from materials/decors/rocks/textures/moss_roughness.png rename to textures/tilables/moss/moss_roughness.png diff --git a/materials/tilables/textures/base_plastic_hard_shiny_colorRange.png b/textures/tilables/plastic/base_plastic_hard_shiny_colorRange.png similarity index 100% rename from materials/tilables/textures/base_plastic_hard_shiny_colorRange.png rename to textures/tilables/plastic/base_plastic_hard_shiny_colorRange.png diff --git a/materials/tilables/textures/base_plastic_hard_shiny_height.png b/textures/tilables/plastic/base_plastic_hard_shiny_height.png similarity index 100% rename from materials/tilables/textures/base_plastic_hard_shiny_height.png rename to textures/tilables/plastic/base_plastic_hard_shiny_height.png diff --git a/materials/tilables/textures/base_plastic_hard_shiny_normal.png b/textures/tilables/plastic/base_plastic_hard_shiny_normal.png similarity index 100% rename from materials/tilables/textures/base_plastic_hard_shiny_normal.png rename to textures/tilables/plastic/base_plastic_hard_shiny_normal.png diff --git a/materials/tilables/textures/base_plastic_hard_shiny_roughness.png b/textures/tilables/plastic/base_plastic_hard_shiny_roughness.png similarity index 100% rename from materials/tilables/textures/base_plastic_hard_shiny_roughness.png rename to textures/tilables/plastic/base_plastic_hard_shiny_roughness.png diff --git a/materials/tilables/textures/base_plastic_soft_colorRange.png b/textures/tilables/plastic/base_plastic_soft_colorRange.png similarity index 100% rename from materials/tilables/textures/base_plastic_soft_colorRange.png rename to textures/tilables/plastic/base_plastic_soft_colorRange.png diff --git a/materials/tilables/textures/base_plastic_soft_height.png b/textures/tilables/plastic/base_plastic_soft_height.png similarity index 100% rename from materials/tilables/textures/base_plastic_soft_height.png rename to textures/tilables/plastic/base_plastic_soft_height.png diff --git a/materials/tilables/textures/base_plastic_soft_normal.png b/textures/tilables/plastic/base_plastic_soft_normal.png similarity index 100% rename from materials/tilables/textures/base_plastic_soft_normal.png rename to textures/tilables/plastic/base_plastic_soft_normal.png diff --git a/materials/tilables/textures/base_plastic_soft_roughness.png b/textures/tilables/plastic/base_plastic_soft_roughness.png similarity index 100% rename from materials/tilables/textures/base_plastic_soft_roughness.png rename to textures/tilables/plastic/base_plastic_soft_roughness.png diff --git a/materials/tilables/textures/base_steel_glossy_basecolor.png b/textures/tilables/steel/base_steel_glossy_basecolor.png similarity index 100% rename from materials/tilables/textures/base_steel_glossy_basecolor.png rename to textures/tilables/steel/base_steel_glossy_basecolor.png diff --git a/materials/tilables/textures/base_steel_glossy_height.png b/textures/tilables/steel/base_steel_glossy_height.png similarity index 100% rename from materials/tilables/textures/base_steel_glossy_height.png rename to textures/tilables/steel/base_steel_glossy_height.png diff --git a/materials/tilables/textures/base_steel_glossy_normal.png b/textures/tilables/steel/base_steel_glossy_normal.png similarity index 100% rename from materials/tilables/textures/base_steel_glossy_normal.png rename to textures/tilables/steel/base_steel_glossy_normal.png diff --git a/materials/tilables/textures/base_steel_glossy_roughness.png b/textures/tilables/steel/base_steel_glossy_roughness.png similarity index 100% rename from materials/tilables/textures/base_steel_glossy_roughness.png rename to textures/tilables/steel/base_steel_glossy_roughness.png diff --git a/materials/tilables/textures/Base_suzanha_rock_baseColor.png b/textures/tilables/stone/Base_suzanha_rock_baseColor.png similarity index 100% rename from materials/tilables/textures/Base_suzanha_rock_baseColor.png rename to textures/tilables/stone/Base_suzanha_rock_baseColor.png diff --git a/materials/tilables/textures/Base_suzanha_rock_height.png b/textures/tilables/stone/Base_suzanha_rock_height.png similarity index 100% rename from materials/tilables/textures/Base_suzanha_rock_height.png rename to textures/tilables/stone/Base_suzanha_rock_height.png diff --git a/materials/tilables/textures/Base_suzanha_rock_normal.png b/textures/tilables/stone/Base_suzanha_rock_normal.png similarity index 100% rename from materials/tilables/textures/Base_suzanha_rock_normal.png rename to textures/tilables/stone/Base_suzanha_rock_normal.png diff --git a/materials/tilables/textures/Base_suzanha_rock_roughness.png b/textures/tilables/stone/Base_suzanha_rock_roughness.png similarity index 100% rename from materials/tilables/textures/Base_suzanha_rock_roughness.png rename to textures/tilables/stone/Base_suzanha_rock_roughness.png diff --git a/materials/decors/rocks/textures/stone_cliff_ambientOcclusion.png b/textures/tilables/stone/stone_cliff_ambientOcclusion.png similarity index 100% rename from materials/decors/rocks/textures/stone_cliff_ambientOcclusion.png rename to textures/tilables/stone/stone_cliff_ambientOcclusion.png diff --git a/materials/decors/rocks/textures/stone_cliff_basecolor.png b/textures/tilables/stone/stone_cliff_basecolor.png similarity index 100% rename from materials/decors/rocks/textures/stone_cliff_basecolor.png rename to textures/tilables/stone/stone_cliff_basecolor.png diff --git a/materials/decors/rocks/textures/stone_cliff_height.png b/textures/tilables/stone/stone_cliff_height.png similarity index 100% rename from materials/decors/rocks/textures/stone_cliff_height.png rename to textures/tilables/stone/stone_cliff_height.png diff --git a/materials/decors/rocks/textures/stone_cliff_normal.png b/textures/tilables/stone/stone_cliff_normal.png similarity index 100% rename from materials/decors/rocks/textures/stone_cliff_normal.png rename to textures/tilables/stone/stone_cliff_normal.png diff --git a/materials/decors/rocks/textures/stone_cliff_roughness.png b/textures/tilables/stone/stone_cliff_roughness.png similarity index 100% rename from materials/decors/rocks/textures/stone_cliff_roughness.png rename to textures/tilables/stone/stone_cliff_roughness.png