Inner wood material. (#166)

edisonlee0212 · Jan 16, 2025 · 28b048c · 28b048c
1 parent 2aaf147
commit 28b048c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/...rnals/EcoSysLabResources/Shaders/Graphics/Fragment/DynamicStrands/Rendering/Branches.frag b/...rnals/EcoSysLabResources/Shaders/Graphics/Fragment/DynamicStrands/Rendering/Branches.frag
@@ -42,7 +42,7 @@ void main(){
 	uint material_index = instance.material_index;
 	if(fs_in.Color.x > 1e-6f){
 		material_index = uint(snow_material_index);
-	}else if(fs_in.Color.y > 1e-6f){
+	}else if(fs_in.Color.y > 0.5f){
 		material_index = uint(inner_wood_material_index);
 	}
 

diff --git a/...EcoSysLabResources/Shaders/Graphics/Mesh/DynamicStrands/Rendering/Branches/Rendering.mesh b/...EcoSysLabResources/Shaders/Graphics/Mesh/DynamicStrands/Rendering/Branches/Rendering.mesh
@@ -90,7 +90,12 @@ void SetUpTriangleVertex(uint vertex_index, vec3 vertex_normal, uint particle_in
 	}
 	float tex_y = float(uniform_particle.segment_index) * v_multiplier;
 	ms_v_out[vertex_index].TexCoord = vec2(tex_x, tex_y);
-	ms_v_out[vertex_index].Color = uniform_particle.override_color;
+	vec4 vertex_color = uniform_particle.override_color;
+	if(is_bark == 0){
+		vertex_color.y = 1.f;
+	}
+	ms_v_out[vertex_index].Color = vertex_color;
+
 	if(vertex_colors == 0){
 
 	} else if(vertex_colors == 1){

diff --git a/EvoEngine_Plugins/EcoSysLab/src/DynamicTreeStrands.cpp b/EvoEngine_Plugins/EcoSysLab/src/DynamicTreeStrands.cpp
@@ -316,21 +316,21 @@ void DynamicTreeStrands::OnCreate() {
     bark_material_ref = material;
     material->material_properties.roughness = 0.5f;
     material->material_properties.metallic = 0.1f;
-    material->material_properties.albedo_color = glm::vec3(0.6f, 0.3f, 0.0f);
+    material->material_properties.albedo_color = glm::vec3(0.4f, 0.3f, 0.2f);
   }
   if (!inner_wood_material_ref.Get<Material>()) {
     const auto material = ProjectManager::CreateTemporaryAsset<Material>();
     inner_wood_material_ref = material;
     material->material_properties.roughness = 0.5f;
     material->material_properties.metallic = 0.0f;
-    material->material_properties.albedo_color = glm::vec3(0.6f, 0.3f, 0.0f);
+    material->material_properties.albedo_color = glm::vec3(1.f, 0.6f, 0.3f);
   }
   if (!splinter_material_ref.Get<Material>()) {
     const auto material = ProjectManager::CreateTemporaryAsset<Material>();
     splinter_material_ref = material;
     material->material_properties.roughness = 0.5f;
     material->material_properties.metallic = 0.0f;
-    material->material_properties.albedo_color = glm::vec3(0.6f, 0.3f, 0.0f);
+    material->material_properties.albedo_color = glm::vec3(1.f, 0.6f, 0.3f);
   }
   if (!leaf_material_ref.Get<Material>()) {
     const auto material = ProjectManager::CreateTemporaryAsset<Material>();