Merge pull request #221 from favreau/master

Renamed exposure to mainExposure. Name conflict with OptiX tone mapper
BlueBrain · Apr 25, 2023 · 75a1f9d · 75a1f9d
2 parents 4d560e3 + 84278c6
commit 75a1f9d
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/bioexplorer/core/module/ispc/render/DensityRenderer.cpp b/bioexplorer/core/module/ispc/render/DensityRenderer.cpp
@@ -38,7 +38,7 @@ void DensityRenderer::commit()
 
     _bgMaterial = (AdvancedMaterial*)getParamObject("bgMaterial", nullptr);
 
-    _exposure = getParam1f("exposure", 1.f);
+    _exposure = getParam1f("mainExposure", 1.f);
     _timestamp = getParam1f("timestamp", 0.f);
 
     // Sampling

diff --git a/bioexplorer/core/module/ispc/render/FieldsRenderer.cpp b/bioexplorer/core/module/ispc/render/FieldsRenderer.cpp
@@ -50,7 +50,7 @@ void FieldsRenderer::commit()
 
     _useHardwareRandomizer = getParam("useHardwareRandomizer", 0);
 
-    _exposure = getParam1f("exposure", 1.f);
+    _exposure = getParam1f("mainExposure", 1.f);
     _randomNumber = getParam1i("randomNumber", 0);
     _timestamp = getParam1f("timestamp", 0.f);
 

diff --git a/bioexplorer/core/module/ispc/render/PathTracingRenderer.cpp b/bioexplorer/core/module/ispc/render/PathTracingRenderer.cpp
@@ -48,7 +48,7 @@ void PathTracingRenderer::commit()
     _lightPtr = _lightArray.empty() ? nullptr : &_lightArray[0];
 
     _bgMaterial = (AdvancedMaterial*)getParamObject("bgMaterial", nullptr);
-    _exposure = getParam1f("exposure", 1.f);
+    _exposure = getParam1f("mainExposure", 1.f);
     _useHardwareRandomizer = getParam("useHardwareRandomizer", 0);
     _showBackground = getParam("showBackground", 0);
     _aoStrength = getParam1f("aoStrength", 1.f);

diff --git a/bioexplorer/core/module/ispc/render/utils/SimulationRenderer.cpp b/bioexplorer/core/module/ispc/render/utils/SimulationRenderer.cpp
@@ -72,7 +72,7 @@ void SimulationRenderer::commit()
     _fogThickness = getParam1f("fogThickness", 1e6f);
     _fogStart = getParam1f("fogStart", 0.f);
 
-    _exposure = getParam1f("exposure", 1.f);
+    _exposure = getParam1f("mainExposure", 1.f);
     _timestamp = getParam1f("timestamp", 0.f);
     _epsilonFactor = getParam1f("epsilonFactor", 1.f);
 

diff --git a/bioexplorer/core/plugin/BioExplorerPlugin.cpp b/bioexplorer/core/plugin/BioExplorerPlugin.cpp
@@ -134,7 +134,7 @@ void _addBioExplorerRenderer(Engine &engine)
     properties.setProperty({"softShadows", 0.0, 0.0, 1.0, {"Shadow softness"}});
     properties.setProperty(
         {"softShadowsSamples", 1, 1, 64, {"Soft shadow samples"}});
-    properties.setProperty({"exposure", 1.0, 0.01, 10.0, {"Exposure"}});
+    properties.setProperty({"mainExposure", 1.0, 0.01, 10.0, {"Exposure"}});
     properties.setProperty(
         {"epsilonFactor", 1.0, 1.0, 1000.0, {"Epsilon factor"}});
     properties.setProperty({"fogStart", 0.0, 0.0, 1e6, {"Fog start"}});
@@ -157,7 +157,7 @@ void _addBioExplorerVoxelRenderer(Engine &engine)
         {"alphaCorrection", 0.5, 0.001, 1., {"Alpha correction"}});
     properties.setProperty(
         {"simulationThreshold", 0., 0., 1., {"Simulation threshold"}});
-    properties.setProperty({"exposure", 1.0, 0.01, 10.0, {"Exposure"}});
+    properties.setProperty({"mainExposure", 1.0, 0.01, 10.0, {"Exposure"}});
     properties.setProperty(
         {"epsilonFactor", 1.0, 1.0, 1000.0, {"Epsilon factor"}});
     properties.setProperty(
@@ -171,7 +171,7 @@ void _addBioExplorerFieldsRenderer(Engine &engine)
 {
     PLUGIN_INFO(2, "Registering 'bio_explorer_fields' renderer");
     PropertyMap properties;
-    properties.setProperty({"exposure", 1., 1., 10., {"Exposure"}});
+    properties.setProperty({"mainExposure", 1., 1., 10., {"Exposure"}});
     properties.setProperty({"useHardwareRandomizer",
                             false,
                             {"Use hardware accelerated randomizer"}});
@@ -194,7 +194,7 @@ void _addBioExplorerDensityRenderer(Engine &engine)
 {
     PLUGIN_INFO(2, "Registering 'bio_explorer_density' renderer");
     PropertyMap properties;
-    properties.setProperty({"exposure", 1.5, 1., 10., {"Exposure"}});
+    properties.setProperty({"mainExposure", 1.5, 1., 10., {"Exposure"}});
     properties.setProperty({"rayStep", 2.0, 1.0, 1024.0, {"Ray marchingstep"}});
     properties.setProperty(
         {"sampleCount", 4, 1, 2048, {"Number of ray marching samples"}});
@@ -210,7 +210,7 @@ void _addBioExplorerPathTracingRenderer(Engine &engine)
 {
     PLUGIN_INFO(2, "Registering 'bio_explorer_path_tracing' renderer");
     PropertyMap properties;
-    properties.setProperty({"exposure", 1., 0.1, 10., {"Exposure"}});
+    properties.setProperty({"mainExposure", 1., 0.1, 10., {"Exposure"}});
     properties.setProperty({"useHardwareRandomizer",
                             false,
                             {"Use hardware accelerated randomizer"}});

diff --git a/bioexplorer/pythonsdk/notebooks/vasculature/BioExplorer_ngv.ipynb b/bioexplorer/pythonsdk/notebooks/vasculature/BioExplorer_ngv.ipynb
@@ -280,7 +280,7 @@
             "name": "python",
             "nbconvert_exporter": "python",
             "pygments_lexer": "ipython3",
-            "version": "3.8.10"
+            "version": "3.10.6"
         }
     },
     "nbformat": 4,

diff --git a/extras/MediaMaker/plugin/MediaMakerPlugin.cpp b/extras/MediaMaker/plugin/MediaMakerPlugin.cpp
@@ -314,7 +314,7 @@ void MediaMakerPlugin::_exportDepthBuffer() const
 {
     auto &frameBuffer = _api->getEngine().getFrameBuffer();
     frameBuffer.map();
-    const auto depthBuffer = frameBuffer.getDepthBuffer();
+    const auto depthBuffer = frameBuffer.getFloatBuffer();
     const auto &size = frameBuffer.getSize();
 
     const auto filename = _getFileName("tiff");

diff --git a/extras/Metabolism/module/ispc/render/MetabolismRenderer.cpp b/extras/Metabolism/module/ispc/render/MetabolismRenderer.cpp
@@ -47,7 +47,7 @@ void MetabolismRenderer::commit()
 
     _bgMaterial = (Material*)getParamObject("bgMaterial", nullptr);
 
-    _exposure = getParam1f("exposure", 1.f);
+    _exposure = getParam1f("mainExposure", 1.f);
 
     // Sampling
     _nearPlane = getParam1f("nearPlane", 0.f);

diff --git a/extras/Metabolism/plugin/MetabolismPlugin.cpp b/extras/Metabolism/plugin/MetabolismPlugin.cpp
@@ -54,7 +54,7 @@ void _addMetabolismRenderer(Engine &engine)
 {
     PLUGIN_INFO("Registering 'metabolism' renderer");
     PropertyMap properties;
-    properties.setProperty({"exposure", 1., 1., 10., {"Exposure"}});
+    properties.setProperty({"mainExposure", 1., 1., 10., {"Exposure"}});
     properties.setProperty({"rayStep", 0.1, 0.01, 10., {"Ray marching step"}});
     properties.setProperty({"nearPlane", 10., 0.01, 1e6, {"Near plane"}});
     properties.setProperty({"farPlane", 50., 0.01, 1e6, {"Far plane"}});