resources: fixed material name collisions and broken tree material

Author: PanosK92

data/shaders/common_terrain.hlsl

@@ -942,8 +942,7 @@ float terrain_macro_variation(float3 position_world)
     return clamp(a * b * c * 8.0f, 0.4f, 1.6f);
 }
 
-// resolve an already selected layer set, split out from terrain_shade so the g buffer can run its
-// parallax march against the dominant layer before the surface is sampled
+// resolve an already selected layer set
 TerrainSurface terrain_evaluate(
     MaterialParameters surface,
     TerrainLayerPick   pick,

source/editor/widgets/TerrainEditor.cpp

@@ -1011,7 +1011,6 @@ void TerrainEditor::DrawGroundLayer(Terrain* terrain, const uint32_t index)
         };
 
         flag_toggle("Biplanar",  TerrainLayerFlags_Biplanar, "project on the two dominant axes, this is what stops cliff faces from smearing");
-        flag_toggle("Parallax",  TerrainLayerFlags_Pom,      "march the height map when this layer dominates up close");
         flag_toggle("Snow",      TerrainLayerFlags_Snow,     "weight comes from the snow accumulation model instead of the slope and altitude bands");
         flag_toggle("Below Sea", TerrainLayerFlags_BelowSea, "the altitude band is measured against sea level rather than absolute world y");
 

source/rendering/Material.cpp

@@ -641,11 +641,6 @@ namespace spartan
         // before this property existed loads without the attribute and keeps this value
         SetProperty(MaterialProperty::TerrainBlend,          1.0f);
         SetProperty(MaterialProperty::TerrainBlendSharpness, 0.5f);
-
-        const char* project_dir = ResourceCache::GetProjectDirectory();
-        char file_path[512];
-        snprintf(file_path, sizeof(file_path), "%smaterials\\empty.xml", project_dir);
-        SetResourceFilePath(file_path);
     }
 
     void Material::ApplyPaintPreset(MaterialPaintPreset preset, const Color& color, bool save)

source/resource/IResource.h

@@ -66,8 +66,13 @@ namespace spartan
 
         void SetResourceName(const std::string& name)
         {
-            m_object_name        = name;
-            m_resource_file_path = FileSystem::GetDirectoryFromFilePath(m_resource_file_path) + name;
+            m_object_name = name;
+            std::string directory = FileSystem::GetDirectoryFromFilePath(m_resource_file_path);
+            if (directory.empty())
+            {
+                directory = "project/materials/";
+            }
+            m_resource_file_path = directory + name;
         }
 
         ResourceType GetResourceType()           const { return m_resource_type; }