Merge pull request #1458 from iaomw/fallback

Fallback material
zenustech · Oct 10, 2023 · 02e7cae · 02e7cae
2 parents 3c27d3a + 32f4f3f
commit 02e7cae
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 7 deletions.
diff --git a/zenovis/src/optx/RenderEngineOptx.cpp b/zenovis/src/optx/RenderEngineOptx.cpp
@@ -928,8 +928,8 @@ struct RenderEngineOptx : RenderEngine, zeno::disable_copy {
 
                 tmp->mark = ShaderMaker::Mesh;
                 tmp->matid = "Default";
-                tmp->source = _light_shader_template.shadtmpl;
-                tmp->fallback = std::make_shared<std::string>("");
+                tmp->source = _default_shader_template.shadtmpl;
+                tmp->fallback = _default_shader_fallback;
 
                 _mesh_shader_list.push_back(tmp);
             }
@@ -939,8 +939,8 @@ struct RenderEngineOptx : RenderEngine, zeno::disable_copy {
 
                 tmp->mark = ShaderMaker::Sphere;
                 tmp->matid = "Default";
-                tmp->source = _light_shader_template.shadtmpl;
-                tmp->fallback = std::make_shared<std::string>("");
+                tmp->source = _default_shader_template.shadtmpl;
+                tmp->fallback = _default_shader_fallback;
 
                 _sphere_shader_list.push_back(tmp);
             }
@@ -1083,6 +1083,28 @@ struct RenderEngineOptx : RenderEngine, zeno::disable_copy {
                     }
             }
 
+            {
+                auto tmp = std::make_shared<ShaderPrepared>();
+
+                tmp->mark = ShaderMaker::Mesh;
+                tmp->matid = "Light";
+                tmp->source = _light_shader_template.shadtmpl;
+                tmp->fallback = _default_shader_fallback;
+
+                _mesh_shader_list.push_back(tmp);
+            }
+
+            {
+                auto tmp = std::make_shared<ShaderPrepared>();
+
+                tmp->mark = ShaderMaker::Sphere;
+                tmp->matid = "Light";
+                tmp->source = _light_shader_template.shadtmpl;
+                tmp->fallback = _default_shader_fallback;
+
+                _sphere_shader_list.push_back(tmp);
+            }
+
             std::vector<std::shared_ptr<ShaderPrepared>> allShaders{};
             allShaders.reserve(_mesh_shader_list.size()+_sphere_shader_list.size()+_volume_shader_list.size());            
 

diff --git a/zenovis/xinxinoptix/optixPathTracer.cpp b/zenovis/xinxinoptix/optixPathTracer.cpp
@@ -992,9 +992,12 @@ void buildRootIAS()
             ++optix_instance_idx;
             OptixInstance opinstance {};
 
+            auto combinedID = std::string("Light") + ":" + std::to_string(ShaderMaker::Mesh);
+            auto shader_index = OptixUtil::matIDtoShaderIndex[combinedID];
+
             opinstance.flags = OPTIX_INSTANCE_FLAG_NONE;
             opinstance.instanceId = OPTIX_DEVICE_PROPERTY_LIMIT_MAX_INSTANCE_ID-1;
-            opinstance.sbtOffset = 0;
+            opinstance.sbtOffset = shader_index * RAY_TYPE_COUNT;
             opinstance.visibilityMask = LightMatMask;
             opinstance.traversableHandle = lightsWrapper.lightPlanesGas;
             memcpy(opinstance.transform, mat3r4c, sizeof(float) * 12);
@@ -1007,12 +1010,12 @@ void buildRootIAS()
             ++optix_instance_idx;
             OptixInstance opinstance {};
 
-            auto combinedID = std::string("Default") + ":" + std::to_string(ShaderMaker::Sphere);
+            auto combinedID = std::string("Light") + ":" + std::to_string(ShaderMaker::Sphere);
             auto shader_index = OptixUtil::matIDtoShaderIndex[combinedID];
 
             opinstance.flags = OPTIX_INSTANCE_FLAG_NONE;
             opinstance.instanceId = OPTIX_DEVICE_PROPERTY_LIMIT_MAX_INSTANCE_ID;
-            opinstance.sbtOffset = shader_index * RAY_TYPE_COUNT;;
+            opinstance.sbtOffset = shader_index * RAY_TYPE_COUNT;
             opinstance.visibilityMask = LightMatMask;
             opinstance.traversableHandle = lightsWrapper.lightSpheresGas;
             memcpy(opinstance.transform, mat3r4c, sizeof(float) * 12);