diff --git a/project/assets/test_materials/materials/bricks.tres b/project/assets/environment/triplanar_materials/bricks.tres similarity index 100% rename from project/assets/test_materials/materials/bricks.tres rename to project/assets/environment/triplanar_materials/bricks.tres diff --git a/project/assets/test_materials/materials/gray_concrete.tres b/project/assets/environment/triplanar_materials/gray_concrete.tres similarity index 100% rename from project/assets/test_materials/materials/gray_concrete.tres rename to project/assets/environment/triplanar_materials/gray_concrete.tres diff --git a/project/assets/test_materials/materials/tiles.tres b/project/assets/environment/triplanar_materials/tiles.tres similarity index 100% rename from project/assets/test_materials/materials/tiles.tres rename to project/assets/environment/triplanar_materials/tiles.tres diff --git a/project/levels/core.tscn b/project/levels/core.tscn index f3e1a3b0..f85582c4 100644 --- a/project/levels/core.tscn +++ b/project/levels/core.tscn @@ -1,8 +1,8 @@ [gd_scene format=3 uid="uid://c8lrrlkhctu75"] -[ext_resource type="Material" uid="uid://q6ixu2q8qaw1" path="res://assets/test_materials/materials/bricks.tres" id="1_64s6k"] +[ext_resource type="Material" uid="uid://q6ixu2q8qaw1" path="res://assets/environment/triplanar_materials/bricks.tres" id="1_64s6k"] [ext_resource type="PackedScene" uid="uid://bc3sb3m1igspj" path="res://objects/effects/world_environment.tscn" id="1_x2n25"] -[ext_resource type="Material" uid="uid://c6uf0ckexrkxk" path="res://assets/test_materials/materials/gray_concrete.tres" id="2_mrdo8"] +[ext_resource type="Material" uid="uid://c6uf0ckexrkxk" path="res://assets/environment/triplanar_materials/gray_concrete.tres" id="2_mrdo8"] [ext_resource type="Texture2D" uid="uid://ddaso2y8ooove" path="res://assets/materials/kaleidoscope_mosaic_albedo.png" id="4_x2n25"] [sub_resource type="GDScript" id="GDScript_4vq5b"] diff --git a/project/levels/station.tscn b/project/levels/station.tscn index 0c366786..37c1ccfc 100644 --- a/project/levels/station.tscn +++ b/project/levels/station.tscn @@ -1,11 +1,11 @@ [gd_scene format=3 uid="uid://bfp1mwjt0cvo8"] [ext_resource type="PackedScene" uid="uid://bc3sb3m1igspj" path="res://objects/effects/world_environment.tscn" id="1_eb8x3"] -[ext_resource type="Material" uid="uid://diprpexdcxpja" path="res://assets/test_materials/materials/tiles.tres" id="1_skip2"] -[ext_resource type="Material" uid="uid://c6uf0ckexrkxk" path="res://assets/test_materials/materials/gray_concrete.tres" id="2_mo284"] +[ext_resource type="Material" uid="uid://diprpexdcxpja" path="res://assets/environment/triplanar_materials/tiles.tres" id="1_skip2"] +[ext_resource type="Material" uid="uid://c6uf0ckexrkxk" path="res://assets/environment/triplanar_materials/gray_concrete.tres" id="2_mo284"] [ext_resource type="PackedScene" uid="uid://8t87iy0t0igo" path="res://objects/player.tscn" id="3_mo284"] [ext_resource type="PackedScene" uid="uid://ckyx3uv0ttjbl" path="res://assets/environment/walls/metro_back.blend" id="4_ue8rc"] -[ext_resource type="Material" uid="uid://q6ixu2q8qaw1" path="res://assets/test_materials/materials/bricks.tres" id="4_w6a6e"] +[ext_resource type="Material" uid="uid://q6ixu2q8qaw1" path="res://assets/environment/triplanar_materials/bricks.tres" id="4_w6a6e"] [ext_resource type="PackedScene" uid="uid://b6vnp6u3i5u47" path="res://objects/effects/kaleidoscope_omni_projector.tscn" id="5_s6lbc"] [ext_resource type="PackedScene" uid="uid://bl7tlfjeo0bq4" path="res://assets/environment/props/metro/escalator.blend" id="6_b5kel"] diff --git a/project/levels/test_room.tscn b/project/levels/test_room.tscn index 1144f48b..76a662d0 100644 --- a/project/levels/test_room.tscn +++ b/project/levels/test_room.tscn @@ -1,9 +1,9 @@ [gd_scene format=3 uid="uid://d38nedywn8cfc"] [ext_resource type="PackedScene" uid="uid://8t87iy0t0igo" path="res://objects/player.tscn" id="1_ctiq7"] -[ext_resource type="Material" uid="uid://diprpexdcxpja" path="res://assets/test_materials/materials/tiles.tres" id="1_nlfnm"] -[ext_resource type="Material" path="res://assets/materials/kaleidoscope_mosaic.tres" id="2_hw6vf"] -[ext_resource type="Material" uid="uid://c6uf0ckexrkxk" path="res://assets/test_materials/materials/gray_concrete.tres" id="2_x4mbn"] +[ext_resource type="Material" uid="uid://diprpexdcxpja" path="res://assets/environment/triplanar_materials/tiles.tres" id="1_nlfnm"] +[ext_resource type="Material" uid="uid://dui8cejorbv0l" path="res://assets/materials/kaleidoscope_mosaic.tres" id="2_hw6vf"] +[ext_resource type="Material" uid="uid://c6uf0ckexrkxk" path="res://assets/environment/triplanar_materials/gray_concrete.tres" id="2_x4mbn"] [sub_resource type="GDScript" id="GDScript_x4mbn"] resource_name = "TestRoom"