several changes

Makes `MaskRenderingStage` render directly to output framebuffer if `renderBorders` is not set (produces depth-consistent renderings). Also renamed `roleMask` to `maskRole` which more consistent with other role-related attributes.
kostrykin · Jun 14, 2021 · 77d25d1 · 77d25d1
1 parent 07bef6e
commit 77d25d1
Show file tree

Hide file tree

Showing 17 changed files with 101 additions and 98 deletions.
diff --git a/docs/html/MaskRenderingStage_8h_source.html b/docs/html/MaskRenderingStage_8h_source.html
diff --git a/docs/html/classCarna_1_1presets_1_1MaskRenderingStage-members.html b/docs/html/classCarna_1_1presets_1_1MaskRenderingStage-members.html
@@ -96,19 +96,19 @@
   <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html#ab0d94798371265efb80ba9312fd75717">isInitialized</a>() const</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html">Carna::base::RenderStage</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html#a2a116a4ac99e4538d35f39807f35b308">isViewTransformFixed</a>() const</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html">Carna::base::RenderStage</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html#aa18f319517ebce8784337a84762c8261">loadVideoResources</a>() override</td><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html">Carna::presets::MaskRenderingStage</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html#abcc15788b4b3866b6a70690fb67d3327">MaskRenderingStage</a>(unsigned int geometryType, unsigned int roleMask=DEFAULT_ROLE_MASK)</td><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html">Carna::presets::MaskRenderingStage</a></td><td class="entry"><span class="mlabel">explicit</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1GeometryStage.html#a23b7b4eba3731b69041b17c8131190e1">prepareFrame</a>(Node &amp;root) override</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1GeometryStage.html">Carna::base::GeometryStage&lt; base::Renderable::BackToFront &gt;</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html#ace81efe8e397cfeeef66235281d6f163">removeRenderStageListener</a>(RenderStageListener &amp;listener)</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html">Carna::base::RenderStage</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1presets_1_1VolumeRenderingStage.html#a99b98bea311d6e87f0bfbbf04c66c0ea">render</a>(const base::Renderable &amp;) override</td><td class="entry"><a class="el" href="classCarna_1_1presets_1_1VolumeRenderingStage.html">Carna::presets::VolumeRenderingStage</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html#a6aca4f2ab42b8e34bf3f95b858a808ea">renderBorders</a>() const</td><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html">Carna::presets::MaskRenderingStage</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1GeometryStage.html#ad5162e45a98c86b5cf63ec39e6352bac">renderedPassesCount</a>() const</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1GeometryStage.html">Carna::base::GeometryStage&lt; base::Renderable::BackToFront &gt;</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html#aa6bb1002b162542d1495981098322f1d">renderer</a>()</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html">Carna::base::RenderStage</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html#a565d8062404a8f2d8ddca5bff82a7863">renderer</a>() const</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html">Carna::base::RenderStage</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html#a395ade03ad627313d06de3ea0417a720">renderPass</a>(const base::math::Matrix4f &amp;viewTransform, base::RenderTask &amp;rt, const base::Viewport &amp;vp) override</td><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html">Carna::presets::MaskRenderingStage</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html#a9273873378498ab5258d10121285978a">RenderStage</a>()</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html">Carna::base::RenderStage</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html#aa974ee321da9b6b2aff3ba9398d48fbc">reshape</a>(base::FrameRenderer &amp;fr, unsigned int width, unsigned int height) override</td><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html">Carna::presets::MaskRenderingStage</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1GeometryStage.html#a78ba5c71c663ea7f93501b22ba692ae1">rewindRenderQueues</a>()</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1GeometryStage.html">Carna::base::GeometryStage&lt; base::Renderable::BackToFront &gt;</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html#a2e28c47e1885b8f6a5f042ca92bf4c09">roleMask</a></td><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html">Carna::presets::MaskRenderingStage</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html#a9833b3d645a4b133ba3b631b94b70317">MaskRenderingStage</a>(unsigned int geometryType, unsigned int maskRole=DEFAULT_ROLE_MASK)</td><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html">Carna::presets::MaskRenderingStage</a></td><td class="entry"><span class="mlabel">explicit</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html#acf1c393bf132bf0af4cf09be9fb6a52f">maskRole</a></td><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html">Carna::presets::MaskRenderingStage</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1GeometryStage.html#a23b7b4eba3731b69041b17c8131190e1">prepareFrame</a>(Node &amp;root) override</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1GeometryStage.html">Carna::base::GeometryStage&lt; base::Renderable::BackToFront &gt;</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html#ace81efe8e397cfeeef66235281d6f163">removeRenderStageListener</a>(RenderStageListener &amp;listener)</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html">Carna::base::RenderStage</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classCarna_1_1presets_1_1VolumeRenderingStage.html#a99b98bea311d6e87f0bfbbf04c66c0ea">render</a>(const base::Renderable &amp;) override</td><td class="entry"><a class="el" href="classCarna_1_1presets_1_1VolumeRenderingStage.html">Carna::presets::VolumeRenderingStage</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html#a6aca4f2ab42b8e34bf3f95b858a808ea">renderBorders</a>() const</td><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html">Carna::presets::MaskRenderingStage</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1GeometryStage.html#ad5162e45a98c86b5cf63ec39e6352bac">renderedPassesCount</a>() const</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1GeometryStage.html">Carna::base::GeometryStage&lt; base::Renderable::BackToFront &gt;</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html#aa6bb1002b162542d1495981098322f1d">renderer</a>()</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html">Carna::base::RenderStage</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html#a565d8062404a8f2d8ddca5bff82a7863">renderer</a>() const</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html">Carna::base::RenderStage</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html#a395ade03ad627313d06de3ea0417a720">renderPass</a>(const base::math::Matrix4f &amp;viewTransform, base::RenderTask &amp;rt, const base::Viewport &amp;vp) override</td><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html">Carna::presets::MaskRenderingStage</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html#a9273873378498ab5258d10121285978a">RenderStage</a>()</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1RenderStage.html">Carna::base::RenderStage</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html#aa974ee321da9b6b2aff3ba9398d48fbc">reshape</a>(base::FrameRenderer &amp;fr, unsigned int width, unsigned int height) override</td><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html">Carna::presets::MaskRenderingStage</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1GeometryStage.html#a78ba5c71c663ea7f93501b22ba692ae1">rewindRenderQueues</a>()</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1GeometryStage.html">Carna::base::GeometryStage&lt; base::Renderable::BackToFront &gt;</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1GeometryStage.html#a19f72e739017069d2280801be2e5b20f">rq</a></td><td class="entry"><a class="el" href="classCarna_1_1base_1_1GeometryStage.html">Carna::base::GeometryStage&lt; base::Renderable::BackToFront &gt;</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr><td class="entry"><a class="el" href="classCarna_1_1presets_1_1VolumeRenderingStage.html#a2e10a2e04334272c8ef7e4e415c6264e">sampleRate</a>() const</td><td class="entry"><a class="el" href="classCarna_1_1presets_1_1VolumeRenderingStage.html">Carna::presets::VolumeRenderingStage</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html#a966d50749f8477017ff6b4e38c5a472e">setColor</a>(const base::Color &amp;color)</td><td class="entry"><a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html">Carna::presets::MaskRenderingStage</a></td><td class="entry"></td></tr>