From 77d25d1f65b949db80c0bbc2b12674156c3e637a Mon Sep 17 00:00:00 2001 From: Leonid Kostrykin Date: Mon, 14 Jun 2021 20:59:55 +0200 Subject: [PATCH] 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. --- docs/html/MaskRenderingStage_8h_source.html | 6 +- ...presets_1_1MaskRenderingStage-members.html | 26 +++--- ...arna_1_1presets_1_1MaskRenderingStage.html | 28 +++--- docs/html/functions_func_m.html | 2 +- docs/html/functions_m.html | 5 +- docs/html/functions_r.html | 3 - docs/html/functions_vars_m.html | 3 + docs/html/functions_vars_r.html | 3 - docs/html/search/all_10.js | 1 - docs/html/search/all_b.js | 3 +- docs/html/search/functions_a.js | 2 +- docs/html/search/variables_9.js | 1 + docs/html/search/variables_d.js | 1 - include/Carna/presets/MaskRenderingStage.h | 10 +- src/presets/MaskRenderingStage.cpp | 93 ++++++++++--------- .../MaskRenderingStageIntegrationTest.cpp | 8 +- test/ModuleTests/MaskRenderingStageTest.cpp | 4 +- 17 files changed, 101 insertions(+), 98 deletions(-) diff --git a/docs/html/MaskRenderingStage_8h_source.html b/docs/html/MaskRenderingStage_8h_source.html index 31848913..ae246b43 100644 --- a/docs/html/MaskRenderingStage_8h_source.html +++ b/docs/html/MaskRenderingStage_8h_source.html @@ -74,21 +74,21 @@
MaskRenderingStage.h
-Go to the documentation of this file.
1 /*
2  * Copyright (C) 2021 Leonid Kostrykin
3  *
4  */
5 
6 #ifndef MASKRENDERINGSTAGE_H_6014714286
7 #define MASKRENDERINGSTAGE_H_6014714286
8 
9 #include <Carna/presets/VolumeRenderingStage.h>
10 #include <Carna/Carna.h>
11 #include <memory>
12 
17 namespace Carna
18 {
19 
20 namespace presets
21 {
22 
23 
24 
25 // ----------------------------------------------------------------------------------
26 // MaskRenderingStage
27 // ----------------------------------------------------------------------------------
28 
59 class CARNA_LIB MaskRenderingStage : public VolumeRenderingStage
60 {
61 
62  struct Details;
63  const std::unique_ptr< Details > pimpl;
64 
65 public:
66 
67  const static base::Color DEFAULT_COLOR;
68  const static unsigned int DEFAULT_ROLE_MASK;
69 
74  const unsigned int roleMask;
75 
83  explicit MaskRenderingStage( unsigned int geometryType, unsigned int roleMask = DEFAULT_ROLE_MASK );
84 
88  virtual ~MaskRenderingStage();
89 
90  MaskRenderingStage* clone() const override;
91 
92  virtual void reshape( base::FrameRenderer& fr, unsigned int width, unsigned int height ) override;
93 
97  virtual void renderPass
98  ( const base::math::Matrix4f& viewTransform
99  , base::RenderTask& rt
100  , const base::Viewport& vp ) override;
101 
105  const base::Color& color() const;
106 
110  void setColor( const base::Color& color );
111 
115  bool renderBorders() const;
116 
120  void setRenderBorders( bool borders );
121 
122 protected:
123 
124  virtual unsigned int loadVideoResources() override;
125 
126  virtual void createVolumeSamplers( const std::function< void( unsigned int, base::Sampler* ) >& registerSampler ) override;
127 
131  virtual const base::ShaderProgram& acquireShader() override;
132 
136  virtual const std::string& uniformName( unsigned int role ) const override;
137 
141  virtual void configureShader() override;
142 
146  virtual void configureShader( const base::Renderable& ) override;
147 
148 }; // DRRStage
149 
150 
151 
152 } // namespace Carna :: presets
153 
154 } // namespace Carna
155 
156 #endif // MASKRENDERINGSTAGE_H_6014714286
Carna::base::FrameRenderer
Defines logic for rendering frames from given scenes.
Definition: FrameRenderer.h:69
+Go to the documentation of this file.
1 /*
2  * Copyright (C) 2021 Leonid Kostrykin
3  *
4  */
5 
6 #ifndef MASKRENDERINGSTAGE_H_6014714286
7 #define MASKRENDERINGSTAGE_H_6014714286
8 
9 #include <Carna/presets/VolumeRenderingStage.h>
10 #include <Carna/Carna.h>
11 #include <memory>
12 
17 namespace Carna
18 {
19 
20 namespace presets
21 {
22 
23 
24 
25 // ----------------------------------------------------------------------------------
26 // MaskRenderingStage
27 // ----------------------------------------------------------------------------------
28 
59 class CARNA_LIB MaskRenderingStage : public VolumeRenderingStage
60 {
61 
62  struct Details;
63  const std::unique_ptr< Details > pimpl;
64 
65 public:
66 
67  const static base::Color DEFAULT_COLOR;
68  const static unsigned int DEFAULT_ROLE_MASK;
69 
74  const unsigned int maskRole;
75 
83  explicit MaskRenderingStage( unsigned int geometryType, unsigned int maskRole = DEFAULT_ROLE_MASK );
84 
88  virtual ~MaskRenderingStage();
89 
90  MaskRenderingStage* clone() const override;
91 
92  virtual void reshape( base::FrameRenderer& fr, unsigned int width, unsigned int height ) override;
93 
97  virtual void renderPass
98  ( const base::math::Matrix4f& viewTransform
99  , base::RenderTask& rt
100  , const base::Viewport& vp ) override;
101 
105  const base::Color& color() const;
106 
110  void setColor( const base::Color& color );
111 
115  bool renderBorders() const;
116 
120  void setRenderBorders( bool borders );
121 
122 protected:
123 
124  virtual unsigned int loadVideoResources() override;
125 
126  virtual void createVolumeSamplers( const std::function< void( unsigned int, base::Sampler* ) >& registerSampler ) override;
127 
131  virtual const base::ShaderProgram& acquireShader() override;
132 
136  virtual const std::string& uniformName( unsigned int role ) const override;
137 
141  virtual void configureShader() override;
142 
146  virtual void configureShader( const base::Renderable& ) override;
147 
148 }; // DRRStage
149 
150 
151 
152 } // namespace Carna :: presets
153 
154 } // namespace Carna
155 
156 #endif // MASKRENDERINGSTAGE_H_6014714286
Carna::base::FrameRenderer
Defines logic for rendering frames from given scenes.
Definition: FrameRenderer.h:69
Carna::base::ShaderProgram
Maintains an OpenGL shader program. Realizes the RAII-idiom.
Definition: ShaderProgram.h:47
Carna::base::RenderTask
Invokes the rendering stages of the frame renderer successively.
Definition: RenderTask.h:40
Carna::base::Sampler
Maintains an OpenGL texture sampler object. This class realizes the RAII-idiom.
Definition: Sampler.h:44
Carna::presets::VolumeRenderingStage
Defines abstract base class for rendering stages that render volume geometries in the scene...
Definition: VolumeRenderingStage.h:316
-
Carna::presets::MaskRenderingStage::roleMask
const unsigned int roleMask
Holds the role that mask volume data is expected to take when attached to base::Geometry nodes...
Definition: MaskRenderingStage.h:74
Carna::base::Color
Represents a color. Objects from this class are copyable and assignable.
Definition: Color.h:41
Carna::base::math::Matrix4f
Eigen::Matrix< float, 4, 4, Eigen::ColMajor > Matrix4f
Defines matrix.
Definition: math.h:193
Carna::presets::MaskRenderingStage::DEFAULT_COLOR
static const base::Color DEFAULT_COLOR
Holds the default rendering color.
Definition: MaskRenderingStage.h:67
+
Carna::presets::MaskRenderingStage::maskRole
const unsigned int maskRole
Holds the role that mask volume data is expected to take when attached to base::Geometry nodes...
Definition: MaskRenderingStage.h:74
Carna::base::Viewport
Defines a rendering viewport. The viewport is a property of the current OpenGL context.
Definition: Viewport.h:48
Carna::base::Renderable
Represents a Geometry object that has been queued into a RenderQueue. The object&#39;s model-view transfo...
Definition: Renderable.h:45
VolumeRenderingStage.h
Defines Carna::presets::VolumeRenderingStage.
-
Carna::presets::MaskRenderingStage::DEFAULT_ROLE_MASK
static const unsigned int DEFAULT_ROLE_MASK
Holds the default value of roleMask.
Definition: MaskRenderingStage.h:68
+
Carna::presets::MaskRenderingStage::DEFAULT_ROLE_MASK
static const unsigned int DEFAULT_ROLE_MASK
Holds the default value of maskRole.
Definition: MaskRenderingStage.h:68
diff --git a/docs/html/classCarna_1_1presets_1_1MaskRenderingStage-members.html b/docs/html/classCarna_1_1presets_1_1MaskRenderingStage-members.html index 5d817fd2..a49626f3 100644 --- a/docs/html/classCarna_1_1presets_1_1MaskRenderingStage-members.html +++ b/docs/html/classCarna_1_1presets_1_1MaskRenderingStage-members.html @@ -96,19 +96,19 @@ isInitialized() constCarna::base::RenderStage isViewTransformFixed() constCarna::base::RenderStage loadVideoResources() overrideCarna::presets::MaskRenderingStageprotectedvirtual - MaskRenderingStage(unsigned int geometryType, unsigned int roleMask=DEFAULT_ROLE_MASK)Carna::presets::MaskRenderingStageexplicit - prepareFrame(Node &root) overrideCarna::base::GeometryStage< base::Renderable::BackToFront >virtual - removeRenderStageListener(RenderStageListener &listener)Carna::base::RenderStage - render(const base::Renderable &) overrideCarna::presets::VolumeRenderingStageprotectedvirtual - renderBorders() constCarna::presets::MaskRenderingStage - renderedPassesCount() constCarna::base::GeometryStage< base::Renderable::BackToFront > - renderer()Carna::base::RenderStage - renderer() constCarna::base::RenderStage - renderPass(const base::math::Matrix4f &viewTransform, base::RenderTask &rt, const base::Viewport &vp) overrideCarna::presets::MaskRenderingStagevirtual - RenderStage()Carna::base::RenderStage - reshape(base::FrameRenderer &fr, unsigned int width, unsigned int height) overrideCarna::presets::MaskRenderingStagevirtual - rewindRenderQueues()Carna::base::GeometryStage< base::Renderable::BackToFront >protectedvirtual - roleMaskCarna::presets::MaskRenderingStage + MaskRenderingStage(unsigned int geometryType, unsigned int maskRole=DEFAULT_ROLE_MASK)Carna::presets::MaskRenderingStageexplicit + maskRoleCarna::presets::MaskRenderingStage + prepareFrame(Node &root) overrideCarna::base::GeometryStage< base::Renderable::BackToFront >virtual + removeRenderStageListener(RenderStageListener &listener)Carna::base::RenderStage + render(const base::Renderable &) overrideCarna::presets::VolumeRenderingStageprotectedvirtual + renderBorders() constCarna::presets::MaskRenderingStage + renderedPassesCount() constCarna::base::GeometryStage< base::Renderable::BackToFront > + renderer()Carna::base::RenderStage + renderer() constCarna::base::RenderStage + renderPass(const base::math::Matrix4f &viewTransform, base::RenderTask &rt, const base::Viewport &vp) overrideCarna::presets::MaskRenderingStagevirtual + RenderStage()Carna::base::RenderStage + reshape(base::FrameRenderer &fr, unsigned int width, unsigned int height) overrideCarna::presets::MaskRenderingStagevirtual + rewindRenderQueues()Carna::base::GeometryStage< base::Renderable::BackToFront >protectedvirtual rqCarna::base::GeometryStage< base::Renderable::BackToFront >protected sampleRate() constCarna::presets::VolumeRenderingStage setColor(const base::Color &color)Carna::presets::MaskRenderingStage diff --git a/docs/html/classCarna_1_1presets_1_1MaskRenderingStage.html b/docs/html/classCarna_1_1presets_1_1MaskRenderingStage.html index ae18b0db..60f0a6d2 100644 --- a/docs/html/classCarna_1_1presets_1_1MaskRenderingStage.html +++ b/docs/html/classCarna_1_1presets_1_1MaskRenderingStage.html @@ -114,9 +114,9 @@ - - - + + + @@ -227,10 +227,10 @@

Public Member Functions

 MaskRenderingStage (unsigned int geometryType, unsigned int roleMask=DEFAULT_ROLE_MASK)
 Instantiates. More...
 
 MaskRenderingStage (unsigned int geometryType, unsigned int maskRole=DEFAULT_ROLE_MASK)
 Instantiates. More...
 
virtual ~MaskRenderingStage ()
 Deletes.
- - - + + + @@ -249,7 +249,7 @@ - + - + @@ -320,7 +320,7 @@
Note
In the rendering process this stage will usually be inserted as the last stage.

A mask can be produced, for example, by threshold a 3D intensity image:

mask.reset( new base::IntensityVolumeUInt8( scene->volume().size ) );
for( std::size_t pos = 0; pos < mask->buffer().size(); ++pos )
{
mask->buffer()[ pos ] = scene->volume().buffer()[ pos ] > 48000 ? 255 : 0;
}
base::BufferedVectorFieldTexture< base::IntensityVolumeUInt8 >& maskTexture
= base::BufferedVectorFieldTexture< base::IntensityVolumeUInt8 >::create( *mask );

The mask can then be attached to, for example, an already existing geometry node:

-
geometry.putFeature( mr->roleMask, maskTexture );
maskTexture.release();

This will render an image similar to this:

+
geometry.putFeature( mr->maskRole, maskTexture );
maskTexture.release();

This will render an image similar to this:

MaskRenderingStageTest.png
@@ -331,8 +331,8 @@

Definition at line 59 of file MaskRenderingStage.h.

Constructor & Destructor Documentation

- -

◆ MaskRenderingStage()

+ +

◆ MaskRenderingStage()

@@ -350,7 +350,7 @@

- + @@ -366,7 +366,7 @@

Instantiates.

-

The created stage will render such base::Geometry scene graph nodes, whose geometry types equal geometryType. The mask data will be obtained from roleMask.

+

The created stage will render such base::Geometry scene graph nodes, whose geometry types equal geometryType. The mask data will be obtained from maskRole.

diff --git a/docs/html/functions_func_m.html b/docs/html/functions_func_m.html index b2e248e6..a212c8c4 100644 --- a/docs/html/functions_func_m.html +++ b/docs/html/functions_func_m.html @@ -104,7 +104,7 @@

- m -

    : Carna::base::Viewport
  • MaskRenderingStage() -: Carna::presets::MaskRenderingStage +: Carna::presets::MaskRenderingStage
  • Material() : Carna::base::Material diff --git a/docs/html/functions_m.html b/docs/html/functions_m.html index c69c295f..74b63388 100644 --- a/docs/html/functions_m.html +++ b/docs/html/functions_m.html @@ -110,7 +110,10 @@

    - m -

      : Carna::base::Viewport
    • MaskRenderingStage() -: Carna::presets::MaskRenderingStage +: Carna::presets::MaskRenderingStage +
      • +
    • maskRole +: Carna::presets::MaskRenderingStage
    • material : Carna::base::Material::ManagedInterface diff --git a/docs/html/functions_r.html b/docs/html/functions_r.html index 35f2714c..1dd814f9 100644 --- a/docs/html/functions_r.html +++ b/docs/html/functions_r.html @@ -286,9 +286,6 @@

      - r -

      • ROLE_NORMALS : Carna::presets::DVRStage
        • -
      • roleMask -: Carna::presets::MaskRenderingStage -
      • rotateHorizontally() : Carna::base::CameraControl , Carna::presets::CameraNavigationControl diff --git a/docs/html/functions_vars_m.html b/docs/html/functions_vars_m.html index fbdc2ffd..69aa157d 100644 --- a/docs/html/functions_vars_m.html +++ b/docs/html/functions_vars_m.html @@ -73,6 +73,9 @@

        - m -

          : Carna::base::ManagedMeshInterface , Carna::base::ManagedTexture3DInterface +
        • maskRole +: Carna::presets::MaskRenderingStage +
        • material : Carna::base::Material::ManagedInterface
          • diff --git a/docs/html/functions_vars_r.html b/docs/html/functions_vars_r.html index 7a980f1a..0086ac4d 100644 --- a/docs/html/functions_vars_r.html +++ b/docs/html/functions_vars_r.html @@ -107,9 +107,6 @@

          - r -

          • ROLE_NORMALS : Carna::presets::DVRStage
            • -
          • roleMask -: Carna::presets::MaskRenderingStage -
          • rq : Carna::base::GeometryStage< RenderableCompare >
            • diff --git a/docs/html/search/all_10.js b/docs/html/search/all_10.js index 209246f7..0e1f6036 100644 --- a/docs/html/search/all_10.js +++ b/docs/html/search/all_10.js @@ -73,7 +73,6 @@ var searchData= ['role_5fdefault_5fmesh',['ROLE_DEFAULT_MESH',['../classCarna_1_1base_1_1MeshRenderingStageBase.html#a5358a537a3fe04ff0d2a38e9c0da1ebf',1,'Carna::base::MeshRenderingStageBase']]], ['role_5fintensities',['ROLE_INTENSITIES',['../classCarna_1_1presets_1_1CuttingPlanesStage.html#a12dc6a142683391ac57ee94d3d9374a2',1,'Carna::presets::CuttingPlanesStage::ROLE_INTENSITIES()'],['../classCarna_1_1presets_1_1DRRStage.html#a756d7f4278f72e1b0ecb3951992d9173',1,'Carna::presets::DRRStage::ROLE_INTENSITIES()'],['../classCarna_1_1presets_1_1DVRStage.html#a18066a297641d5e032eaa43fa13797ef',1,'Carna::presets::DVRStage::ROLE_INTENSITIES()'],['../classCarna_1_1presets_1_1MIPStage.html#a08958fed6fad19969db558903e98a26f',1,'Carna::presets::MIPStage::ROLE_INTENSITIES()']]], ['role_5fnormals',['ROLE_NORMALS',['../classCarna_1_1presets_1_1DVRStage.html#af20fadb7f7d95b911e26d298273f4792',1,'Carna::presets::DVRStage']]], - ['rolemask',['roleMask',['../classCarna_1_1presets_1_1MaskRenderingStage.html#a2e28c47e1885b8f6a5f042ca92bf4c09',1,'Carna::presets::MaskRenderingStage']]], ['rotatehorizontally',['rotateHorizontally',['../classCarna_1_1base_1_1CameraControl.html#a6a57106709fd05a55f5c6ec1d8e2abac',1,'Carna::base::CameraControl::rotateHorizontally()'],['../classCarna_1_1presets_1_1CameraNavigationControl.html#a54fe15550fa2b803b103f7d85c1811fb',1,'Carna::presets::CameraNavigationControl::rotateHorizontally()'],['../classCarna_1_1presets_1_1CameraShowcaseControl.html#a8dd242e812f9b642cadf1d4edbdb9e38',1,'Carna::presets::CameraShowcaseControl::rotateHorizontally()'],['../classCarna_1_1presets_1_1OrthogonalControl.html#ae294516fb2525185ef293da2aece730c',1,'Carna::presets::OrthogonalControl::rotateHorizontally()']]], ['rotatevertically',['rotateVertically',['../classCarna_1_1base_1_1CameraControl.html#a722eace8bb48405191c8f82ece89eef3',1,'Carna::base::CameraControl::rotateVertically()'],['../classCarna_1_1presets_1_1CameraNavigationControl.html#a7e1adbe79a7bc5c4ff0735f31f1222f6',1,'Carna::presets::CameraNavigationControl::rotateVertically()'],['../classCarna_1_1presets_1_1CameraShowcaseControl.html#a0053fcbf677a1e5e8bc35204f44ef2ae',1,'Carna::presets::CameraShowcaseControl::rotateVertically()'],['../classCarna_1_1presets_1_1OrthogonalControl.html#a47bcc50bbd3a231bcfd7df386a510862',1,'Carna::presets::OrthogonalControl::rotateVertically()']]], ['rotatingcolor',['RotatingColor',['../classCarna_1_1base_1_1RotatingColor.html',1,'Carna::base::RotatingColor'],['../classCarna_1_1base_1_1RotatingColor.html#ae3cbe05101d70f5d8348925d39a1f913',1,'Carna::base::RotatingColor::RotatingColor()']]], diff --git a/docs/html/search/all_b.js b/docs/html/search/all_b.js index 083589b3..ecb5307e 100644 --- a/docs/html/search/all_b.js +++ b/docs/html/search/all_b.js @@ -18,10 +18,11 @@ var searchData= ['marginleft',['marginLeft',['../classCarna_1_1base_1_1Viewport.html#a686f664322df9118a6010bde2720b172',1,'Carna::base::Viewport']]], ['marginright',['marginRight',['../classCarna_1_1base_1_1Viewport.html#a24d4a1bf65dd0304ea77ff8c6d49f9c9',1,'Carna::base::Viewport']]], ['margintop',['marginTop',['../classCarna_1_1base_1_1Viewport.html#a0b6206ff5e96aae4d87ea207ff3bfd8f',1,'Carna::base::Viewport']]], - ['maskrenderingstage',['MaskRenderingStage',['../classCarna_1_1presets_1_1MaskRenderingStage.html',1,'Carna::presets::MaskRenderingStage'],['../classCarna_1_1presets_1_1MaskRenderingStage.html#abcc15788b4b3866b6a70690fb67d3327',1,'Carna::presets::MaskRenderingStage::MaskRenderingStage()']]], + ['maskrenderingstage',['MaskRenderingStage',['../classCarna_1_1presets_1_1MaskRenderingStage.html',1,'Carna::presets::MaskRenderingStage'],['../classCarna_1_1presets_1_1MaskRenderingStage.html#a9833b3d645a4b133ba3b631b94b70317',1,'Carna::presets::MaskRenderingStage::MaskRenderingStage()']]], ['maskrenderingstage_2eh',['MaskRenderingStage.h',['../MaskRenderingStage_8h.html',1,'']]], ['maskrenderingstageintegrationtest',['MaskRenderingStageIntegrationTest',['../classCarna_1_1testing_1_1MaskRenderingStageIntegrationTest.html',1,'Carna::testing']]], ['maskrenderingstagetest',['MaskRenderingStageTest',['../classCarna_1_1testing_1_1MaskRenderingStageTest.html',1,'Carna::testing']]], + ['maskrole',['maskRole',['../classCarna_1_1presets_1_1MaskRenderingStage.html#acf1c393bf132bf0af4cf09be9fb6a52f',1,'Carna::presets::MaskRenderingStage']]], ['material',['Material',['../classCarna_1_1base_1_1Material.html',1,'Carna::base::Material'],['../classCarna_1_1base_1_1Material.html#a0e571bb93cac82234d8de709e45ad5c0',1,'Carna::base::Material::Material()'],['../classCarna_1_1base_1_1Material_1_1ManagedInterface.html#a5b9e08ef0dcab5d5763b2ea7048c125f',1,'Carna::base::Material::ManagedInterface::material()']]], ['material_2eh',['Material.h',['../Material_8h.html',1,'']]], ['materialrole',['materialRole',['../classCarna_1_1helpers_1_1PointMarkerHelper.html#ac8537d5a2dcf06ac5e0794ad886c311a',1,'Carna::helpers::PointMarkerHelper']]], diff --git a/docs/html/search/functions_a.js b/docs/html/search/functions_a.js index 15641dc3..0fb7917c 100644 --- a/docs/html/search/functions_a.js +++ b/docs/html/search/functions_a.js @@ -12,7 +12,7 @@ var searchData= ['marginleft',['marginLeft',['../classCarna_1_1base_1_1Viewport.html#a686f664322df9118a6010bde2720b172',1,'Carna::base::Viewport']]], ['marginright',['marginRight',['../classCarna_1_1base_1_1Viewport.html#a24d4a1bf65dd0304ea77ff8c6d49f9c9',1,'Carna::base::Viewport']]], ['margintop',['marginTop',['../classCarna_1_1base_1_1Viewport.html#a0b6206ff5e96aae4d87ea207ff3bfd8f',1,'Carna::base::Viewport']]], - ['maskrenderingstage',['MaskRenderingStage',['../classCarna_1_1presets_1_1MaskRenderingStage.html#abcc15788b4b3866b6a70690fb67d3327',1,'Carna::presets::MaskRenderingStage']]], + ['maskrenderingstage',['MaskRenderingStage',['../classCarna_1_1presets_1_1MaskRenderingStage.html#a9833b3d645a4b133ba3b631b94b70317',1,'Carna::presets::MaskRenderingStage']]], ['material',['Material',['../classCarna_1_1base_1_1Material.html#a0e571bb93cac82234d8de709e45ad5c0',1,'Carna::base::Material']]], ['maxabselement',['maxAbsElement',['../namespaceCarna_1_1base_1_1math.html#ab6bf23d3a419b8eaf955ab49136b7f77',1,'Carna::base::math']]], ['maxdistance',['maxDistance',['../classCarna_1_1presets_1_1CameraShowcaseControl.html#a4dbaa6848736ba96671961cc503349d7',1,'Carna::presets::CameraShowcaseControl']]], diff --git a/docs/html/search/variables_9.js b/docs/html/search/variables_9.js index 65fcb66e..fba63351 100644 --- a/docs/html/search/variables_9.js +++ b/docs/html/search/variables_9.js @@ -1,6 +1,7 @@ var searchData= [ ['managed',['managed',['../classCarna_1_1base_1_1ManagedMeshInterface.html#a423c284ef2ab303e4de5deca2db127f4',1,'Carna::base::ManagedMeshInterface::managed()'],['../classCarna_1_1base_1_1ManagedTexture3DInterface.html#aa93c7ffafa8896a394a9e1b108968b87',1,'Carna::base::ManagedTexture3DInterface::managed()']]], + ['maskrole',['maskRole',['../classCarna_1_1presets_1_1MaskRenderingStage.html#acf1c393bf132bf0af4cf09be9fb6a52f',1,'Carna::presets::MaskRenderingStage']]], ['material',['material',['../classCarna_1_1base_1_1Material_1_1ManagedInterface.html#a5b9e08ef0dcab5d5763b2ea7048c125f',1,'Carna::base::Material::ManagedInterface']]], ['materialrole',['materialRole',['../classCarna_1_1helpers_1_1PointMarkerHelper.html#ac8537d5a2dcf06ac5e0794ad886c311a',1,'Carna::helpers::PointMarkerHelper']]], ['maximum_5fallowed_5fcolor_5fcomponents',['MAXIMUM_ALLOWED_COLOR_COMPONENTS',['../classCarna_1_1base_1_1Framebuffer.html#a5dcdc1bd369ebf9b140738fe3f52805a',1,'Carna::base::Framebuffer']]], diff --git a/docs/html/search/variables_d.js b/docs/html/search/variables_d.js index 88ae3b02..3b35fb0e 100644 --- a/docs/html/search/variables_d.js +++ b/docs/html/search/variables_d.js @@ -11,6 +11,5 @@ var searchData= ['role_5fdefault_5fmesh',['ROLE_DEFAULT_MESH',['../classCarna_1_1base_1_1MeshRenderingStageBase.html#a5358a537a3fe04ff0d2a38e9c0da1ebf',1,'Carna::base::MeshRenderingStageBase']]], ['role_5fintensities',['ROLE_INTENSITIES',['../classCarna_1_1presets_1_1CuttingPlanesStage.html#a12dc6a142683391ac57ee94d3d9374a2',1,'Carna::presets::CuttingPlanesStage::ROLE_INTENSITIES()'],['../classCarna_1_1presets_1_1DRRStage.html#a756d7f4278f72e1b0ecb3951992d9173',1,'Carna::presets::DRRStage::ROLE_INTENSITIES()'],['../classCarna_1_1presets_1_1DVRStage.html#a18066a297641d5e032eaa43fa13797ef',1,'Carna::presets::DVRStage::ROLE_INTENSITIES()'],['../classCarna_1_1presets_1_1MIPStage.html#a08958fed6fad19969db558903e98a26f',1,'Carna::presets::MIPStage::ROLE_INTENSITIES()']]], ['role_5fnormals',['ROLE_NORMALS',['../classCarna_1_1presets_1_1DVRStage.html#af20fadb7f7d95b911e26d298273f4792',1,'Carna::presets::DVRStage']]], - ['rolemask',['roleMask',['../classCarna_1_1presets_1_1MaskRenderingStage.html#a2e28c47e1885b8f6a5f042ca92bf4c09',1,'Carna::presets::MaskRenderingStage']]], ['rq',['rq',['../classCarna_1_1base_1_1GeometryStage.html#a19f72e739017069d2280801be2e5b20f',1,'Carna::base::GeometryStage']]] ]; diff --git a/include/Carna/presets/MaskRenderingStage.h b/include/Carna/presets/MaskRenderingStage.h index a1b4db2d..eceeca6c 100644 --- a/include/Carna/presets/MaskRenderingStage.h +++ b/include/Carna/presets/MaskRenderingStage.h @@ -65,22 +65,22 @@ class CARNA_LIB MaskRenderingStage : public VolumeRenderingStage public: const static base::Color DEFAULT_COLOR; ///< Holds the default rendering color. - const static unsigned int DEFAULT_ROLE_MASK; ///< Holds the default value of \ref roleMask. + const static unsigned int DEFAULT_ROLE_MASK; ///< Holds the default value of \ref maskRole. /** \brief * Holds the \ref GeometryFeatures "role" that mask volume data is expected to * take when attached to \ref base::Geometry nodes. */ - const unsigned int roleMask; + const unsigned int maskRole; /** \brief * Instantiates. * * The created stage will render such \ref base::Geometry scene graph nodes, * whose \ref GeometryTypes "geometry types" equal \a geometryType. The mask - * data will be obtained from \a roleMask. + * data will be obtained from \a maskRole. */ - explicit MaskRenderingStage( unsigned int geometryType, unsigned int roleMask = DEFAULT_ROLE_MASK ); + explicit MaskRenderingStage( unsigned int geometryType, unsigned int maskRole = DEFAULT_ROLE_MASK ); /** \brief * Deletes. @@ -131,7 +131,7 @@ class CARNA_LIB MaskRenderingStage : public VolumeRenderingStage virtual const base::ShaderProgram& acquireShader() override; /** \brief - * Maps \ref roleMask to `mask`. + * Maps \ref maskRole to `mask`. */ virtual const std::string& uniformName( unsigned int role ) const override; diff --git a/src/presets/MaskRenderingStage.cpp b/src/presets/MaskRenderingStage.cpp index 7fb6540f..250acada 100644 --- a/src/presets/MaskRenderingStage.cpp +++ b/src/presets/MaskRenderingStage.cpp @@ -60,10 +60,10 @@ const base::Color MaskRenderingStage::DEFAULT_COLOR = base::Color::GREEN; const unsigned int MaskRenderingStage::DEFAULT_ROLE_MASK = 2; -MaskRenderingStage::MaskRenderingStage( unsigned int geometryType, unsigned int roleMask ) +MaskRenderingStage::MaskRenderingStage( unsigned int geometryType, unsigned int maskRole ) : VolumeRenderingStage( geometryType ) , pimpl( new Details() ) - , roleMask( roleMask ) + , maskRole( maskRole ) { } @@ -80,7 +80,7 @@ MaskRenderingStage::~MaskRenderingStage() MaskRenderingStage* MaskRenderingStage::clone() const { - MaskRenderingStage* const result = new MaskRenderingStage( geometryType, roleMask ); + MaskRenderingStage* const result = new MaskRenderingStage( geometryType, maskRole ); result->setEnabled( isEnabled() ); return result; } @@ -131,54 +131,57 @@ void MaskRenderingStage::renderPass , base::RenderTask& rt , const base::Viewport& outputViewport ) { - /* Copy depth buffer from output to the accumulation frame buffer. - */ - const base::Viewport framebufferViewport( *pimpl->accumulationFrameBuffer ); - const unsigned int outputFramebufferId = base::Framebuffer::currentId(); - base::Framebuffer::copyDepthAttachment - ( outputFramebufferId - , pimpl->accumulationFrameBuffer->id - , outputViewport - , framebufferViewport ); - - /* First, render the projected mask intensities. - */ - CARNA_RENDER_TO_FRAMEBUFFER( *pimpl->accumulationFrameBuffer, - - /* Configure OpenGL state for accumulation pass. + if( pimpl->renderBorders ) + { + /* First, render the projected mask intensities. */ - base::RenderState rs; - rs.setDepthTest( true ); - rs.setDepthWrite( true ); + const base::Viewport framebufferViewport( *pimpl->accumulationFrameBuffer ); + CARNA_RENDER_TO_FRAMEBUFFER( *pimpl->accumulationFrameBuffer, - glClearColor( 0, 0, 0, 0 ); - rt.renderer.glContext().clearBuffers( GL_COLOR_BUFFER_BIT ); + /* Configure OpenGL state for accumulation pass. + */ + base::RenderState rs; + rs.setDepthTest( true ); + rs.setDepthWrite( true ); - framebufferViewport.makeActive(); - VolumeRenderingStage::renderPass( vt, rt, framebufferViewport ); - framebufferViewport.done(); + glClearColor( 0, 0, 0, 0 ); + rt.renderer.glContext().clearBuffers( GL_COLOR_BUFFER_BIT ); - ); + framebufferViewport.makeActive(); + VolumeRenderingStage::renderPass( vt, rt, framebufferViewport ); + framebufferViewport.done(); - /* Render result to output framebuffer. - */ - base::RenderState rs; - rs.setBlendFunction( base::BlendFunction( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ); - rs.setBlend( true ); + ); - base::FrameRenderer::RenderTextureParams params( 0 ); - if( pimpl->renderBorders ) + /* Render result to output framebuffer. + */ + base::RenderState rs; + rs.setBlendFunction( base::BlendFunction( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ); + rs.setBlend( true ); + + base::FrameRenderer::RenderTextureParams params( 0 ); + if( pimpl->renderBorders ) + { + rs.setDepthTest ( false ); + rs.setDepthWrite( false ); + rt.renderer.glContext().setShader( *pimpl->edgeDetectShader ); + base::ShaderUniform< base::math::Vector4f >( "color", pimpl->color ).upload(); + base::ShaderUniform< base::math::Vector2f >( "steps", pimpl->textureSteps ).upload(); + params.useDefaultShader = false; + params.textureUniformName = "labelMap"; + } + pimpl->accumulationColorBuffer->bind( 0 ); + rt.renderer.renderTexture( params ); + } + else { - rs.setDepthTest ( false ); - rs.setDepthWrite( false ); - rt.renderer.glContext().setShader( *pimpl->edgeDetectShader ); - base::ShaderUniform< base::math::Vector4f >( "color", pimpl->color ).upload(); - base::ShaderUniform< base::math::Vector2f >( "steps", pimpl->textureSteps ).upload(); - params.useDefaultShader = false; - params.textureUniformName = "labelMap"; + /* Render directly to output framebuffer. + */ + base::RenderState rs; + rs.setDepthTest( true ); + rs.setDepthWrite( true ); + VolumeRenderingStage::renderPass( vt, rt, outputViewport ); } - pimpl->accumulationColorBuffer->bind( 0 ); - rt.renderer.renderTexture( params ); } @@ -186,7 +189,7 @@ void MaskRenderingStage::createVolumeSamplers( const std::function< void( unsign { /* Create sampler for the mask texture. */ - registerSampler( roleMask, new base::Sampler + registerSampler( maskRole, new base::Sampler ( base::Sampler::WRAP_MODE_CLAMP, base::Sampler::WRAP_MODE_CLAMP, base::Sampler::WRAP_MODE_CLAMP , base::Sampler::FILTER_NEAREST, base::Sampler::FILTER_NEAREST ) ); } @@ -201,7 +204,7 @@ const base::ShaderProgram& MaskRenderingStage::acquireShader() const std::string& MaskRenderingStage::uniformName( unsigned int role ) const { const static std::string ROLE_MASK_NAME = "mask"; - if( role == roleMask ) + if( role == maskRole ) { return ROLE_MASK_NAME; } diff --git a/test/IntegrationTests/MaskRenderingStageIntegrationTest.cpp b/test/IntegrationTests/MaskRenderingStageIntegrationTest.cpp index ee1399a9..8a9163ff 100644 --- a/test/IntegrationTests/MaskRenderingStageIntegrationTest.cpp +++ b/test/IntegrationTests/MaskRenderingStageIntegrationTest.cpp @@ -83,7 +83,7 @@ void MaskRenderingStageIntegrationTest::test_shared_geometry_node() //! [create_mask] //! [attach_mask] - geometry.putFeature( mr->roleMask, maskTexture ); + geometry.putFeature( mr->maskRole, maskTexture ); maskTexture.release(); //! [attach_mask] @@ -111,7 +111,7 @@ void MaskRenderingStageIntegrationTest::test_dedicated_geometry_node() base::BufferedVectorFieldTexture< base::IntensityVolumeUInt8 >& maskTexture = base::BufferedVectorFieldTexture< base::IntensityVolumeUInt8 >::create( *mask ); base::Geometry* const geometry = new base::Geometry( GEOMETRY_TYPE_MASK ); - geometry->putFeature( mr->roleMask, maskTexture ); + geometry->putFeature( mr->maskRole, maskTexture ); geometry->localTransform = base::math::scaling4f( scene->scale() ); scene->root->attachChild( geometry ); maskTexture.release(); @@ -134,7 +134,7 @@ void MaskRenderingStageIntegrationTest::test_helper_geometry_node() */ typedef helpers::VolumeGridHelper< base::IntensityVolumeUInt8 > UInt8GridHelper; UInt8GridHelper gridHelper( scene.volume().size ); - gridHelper.setIntensitiesRole( mr->roleMask ); + gridHelper.setIntensitiesRole( mr->maskRole ); gridHelper.loadIntensities( [&scene]( const base::math::Vector3ui& voxel ) { return ( scene.volume()( voxel ) + 1024 ) * 16 > 48000 ? 1.f : 0.f; @@ -163,7 +163,7 @@ void MaskRenderingStageIntegrationTest::test_render_borders() */ typedef helpers::VolumeGridHelper< base::IntensityVolumeUInt8 > UInt8GridHelper; UInt8GridHelper gridHelper( scene.volume().size ); - gridHelper.setIntensitiesRole( mr->roleMask ); + gridHelper.setIntensitiesRole( mr->maskRole ); gridHelper.loadIntensities( [&scene]( const base::math::Vector3ui& voxel ) { return ( scene.volume()( voxel ) + 1024 ) * 16 > 10000 ? 1.f : 0.f; diff --git a/test/ModuleTests/MaskRenderingStageTest.cpp b/test/ModuleTests/MaskRenderingStageTest.cpp index 04230ac4..bc659681 100644 --- a/test/ModuleTests/MaskRenderingStageTest.cpp +++ b/test/ModuleTests/MaskRenderingStageTest.cpp @@ -66,7 +66,7 @@ void MaskRenderingStageTest::test_shared_geometry_node() base::BufferedVectorFieldTexture< base::IntensityVolumeUInt8 >& maskTexture = base::BufferedVectorFieldTexture< base::IntensityVolumeUInt8 >::create( *mask ); - geometry.putFeature( mr->roleMask, maskTexture ); + geometry.putFeature( mr->maskRole, maskTexture ); maskTexture.release(); renderer->render( scene->cam(), *scene->root ); @@ -93,7 +93,7 @@ void MaskRenderingStageTest::test_dedicated_geometry_node() base::BufferedVectorFieldTexture< base::IntensityVolumeUInt8 >& maskTexture = base::BufferedVectorFieldTexture< base::IntensityVolumeUInt8 >::create( *mask ); base::Geometry* const geometry = new base::Geometry( GEOMETRY_TYPE_MASK ); - geometry->putFeature( mr->roleMask, maskTexture ); + geometry->putFeature( mr->maskRole, maskTexture ); geometry->localTransform = base::math::scaling4f( scene->scale() ); scene->root->attachChild( geometry ); maskTexture.release();

Public Attributes

-const unsigned int roleMask
 Holds the role that mask volume data is expected to take when attached to base::Geometry nodes.
 
+const unsigned int maskRole
 Holds the role that mask volume data is expected to take when attached to base::Geometry nodes.
 
- Public Attributes inherited from Carna::base::GeometryStage< base::Renderable::BackToFront >
const unsigned int geometryType
 
static const unsigned int DEFAULT_ROLE_MASK
 Holds the default value of roleMask.
 Holds the default value of maskRole.
 
- Static Public Attributes inherited from Carna::presets::VolumeRenderingStage
@@ -272,7 +272,7 @@
 
virtual const std::string & uniformName (unsigned int role) const override
 Maps roleMask to mask.
 Maps maskRole to mask.
 
virtual void configureShader () override
unsigned int roleMask = DEFAULT_ROLE_MASK maskRole = DEFAULT_ROLE_MASK