renames "intensity volume" to "intensities"

Renamed most occurances of "intensity volume" in attributes/fields/methods to "intensities" to be more consistent with "normals".

docs/html/VersionLog.html

@@ -119,7 +119,8 @@ <h2><a class="anchor" id="v_3_3_0"></a>
 API Version 3.3.0</h2>
 <ul>
 <li>Added <a class="el" href="classCarna_1_1presets_1_1MaskRenderingStage.html">presets::MaskRenderingStage</a>.</li>
-<li>Added <a class="el" href="namespaceCarna_1_1base_1_1math.html#a7df18d41ce2b3b5d488313c9cc3480a9">base::math::computeFastGradient3f</a>. </li>
+<li>Added <a class="el" href="namespaceCarna_1_1base_1_1math.html#a7df18d41ce2b3b5d488313c9cc3480a9">base::math::computeFastGradient3f</a>.</li>
+<li>Renamed most occurances of "intensity volume" in attributes/fields/methods to "intensities" to be more consistent with "normals". </li>
 </ul>
 </div></div><!-- contents -->
 <hr class="footer"/>

docs/html/VolumeGridHelperDetails_8h.html

@@ -138,7 +138,7 @@
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="nested-classes"></a>
 Classes</h2></td></tr>
 <tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structCarna_1_1helpers_1_1details_1_1VolumeGridHelper_1_1IntensityTextureFactory.html">Carna::helpers::details::VolumeGridHelper::IntensityTextureFactory&lt; SegmentIntensityVolumeType, SegmentNormalsVolumeType &gt;</a></td></tr>
-<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">Creates <a class="el" href="classCarna_1_1base_1_1ManagedTexture3D.html">textures</a> that represents <a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#ac705ca1a12e27788af09a1bd4b6bd027">base::VolumeSegment::intensityVolume</a> in video memory.  <a href="structCarna_1_1helpers_1_1details_1_1VolumeGridHelper_1_1IntensityTextureFactory.html#details">More...</a><br /></td></tr>
+<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">Creates <a class="el" href="classCarna_1_1base_1_1ManagedTexture3D.html">textures</a> that represents <a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#af9d70962a88bb5624a23c3187b2f49e9">base::VolumeSegment::intensities</a> in video memory.  <a href="structCarna_1_1helpers_1_1details_1_1VolumeGridHelper_1_1IntensityTextureFactory.html#details">More...</a><br /></td></tr>
 <tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structCarna_1_1helpers_1_1details_1_1VolumeGridHelper_1_1NormalsTextureFactory.html">Carna::helpers::details::VolumeGridHelper::NormalsTextureFactory&lt; SegmentIntensityVolumeType, SegmentNormalsVolumeType &gt;</a></td></tr>
 <tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">Creates <a class="el" href="classCarna_1_1base_1_1ManagedTexture3D.html">textures</a> that represents <a class="el" href="classCarna_1_1base_1_1VolumeSegmentNormalsComponent.html#ab828e5c1a0b09faf814514f7ee83f851">base::VolumeSegmentNormalsComponent::normals</a> in video memory.  <a href="structCarna_1_1helpers_1_1details_1_1VolumeGridHelper_1_1NormalsTextureFactory.html#details">More...</a><br /></td></tr>

docs/html/annotated.html

@@ -196,7 +196,7 @@
 <tr id="row_0_1_0_" style="display:none;"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span id="arr_0_1_0_" class="arrow" onclick="toggleFolder('0_1_0_')">&#9658;</span><span class="icona"><span class="icon">N</span></span><a class="el" href="namespaceCarna_1_1helpers_1_1details.html" target="_self">details</a></td><td class="desc">Holds implementation details </td></tr>
 <tr id="row_0_1_0_0_" style="display:none;"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><span id="arr_0_1_0_0_" class="arrow" onclick="toggleFolder('0_1_0_0_')">&#9658;</span><span class="icona"><span class="icon">N</span></span><a class="el" href="namespaceCarna_1_1helpers_1_1details_1_1VolumeGridHelper.html" target="_self">VolumeGridHelper</a></td><td class="desc">Holds implementation details of <a class="el" href="classCarna_1_1helpers_1_1VolumeGridHelper.html">Carna::helpers::VolumeGridHelper</a> </td></tr>
 <tr id="row_0_1_0_0_0_" style="display:none;"><td class="entry"><span style="width:80px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classCarna_1_1helpers_1_1details_1_1VolumeGridHelper_1_1IntensityComponent.html" target="_self">IntensityComponent</a></td><td class="desc">Defines the <a class="el" href="classCarna_1_1helpers_1_1VolumeGridHelper.html">helpers::VolumeGridHelper</a> component that maintains intensity volume data </td></tr>
-<tr id="row_0_1_0_0_1_" style="display:none;"><td class="entry"><span style="width:80px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="structCarna_1_1helpers_1_1details_1_1VolumeGridHelper_1_1IntensityTextureFactory.html" target="_self">IntensityTextureFactory</a></td><td class="desc">Creates <a class="el" href="classCarna_1_1base_1_1ManagedTexture3D.html">textures</a> that represents <a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#ac705ca1a12e27788af09a1bd4b6bd027">base::VolumeSegment::intensityVolume</a> in video memory </td></tr>
+<tr id="row_0_1_0_0_1_" style="display:none;"><td class="entry"><span style="width:80px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="structCarna_1_1helpers_1_1details_1_1VolumeGridHelper_1_1IntensityTextureFactory.html" target="_self">IntensityTextureFactory</a></td><td class="desc">Creates <a class="el" href="classCarna_1_1base_1_1ManagedTexture3D.html">textures</a> that represents <a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#af9d70962a88bb5624a23c3187b2f49e9">base::VolumeSegment::intensities</a> in video memory </td></tr>
 <tr id="row_0_1_0_0_2_" style="display:none;"><td class="entry"><span style="width:80px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classCarna_1_1helpers_1_1details_1_1VolumeGridHelper_1_1NormalsComponent.html" target="_self">NormalsComponent</a></td><td class="desc">Defines the <a class="el" href="classCarna_1_1helpers_1_1VolumeGridHelper.html">helpers::VolumeGridHelper</a> component that computes and maintains normal maps </td></tr>
 <tr id="row_0_1_0_0_3_" style="display:none;"><td class="entry"><span style="width:80px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classCarna_1_1helpers_1_1details_1_1VolumeGridHelper_1_1NormalsComponent_3_01SegmentIntensityVolumeType_00_01void_01_4.html" target="_self">NormalsComponent&lt; SegmentIntensityVolumeType, void &gt;</a></td><td class="desc">Specializes <a class="el" href="classCarna_1_1helpers_1_1details_1_1VolumeGridHelper_1_1NormalsComponent.html">NormalsComponent</a> when no normals are required </td></tr>
 <tr id="row_0_1_0_0_4_" style="display:none;"><td class="entry"><span style="width:80px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classCarna_1_1helpers_1_1details_1_1VolumeGridHelper_1_1NormalsComponentBase.html" target="_self">NormalsComponentBase</a></td><td class="desc">Defines the <a class="el" href="classCarna_1_1helpers_1_1details_1_1VolumeGridHelper_1_1NormalsComponent.html">NormalsComponent</a> base class that is independent of type arguments </td></tr>

docs/html/classCarna_1_1base_1_1Geometry.html

@@ -256,7 +256,7 @@
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Defines <a class="el" href="index.html#SceneGraph">scene graph</a> leafs. Instances of this class represent visible geometry that can be rendered. The way of rendering is defined by the <a class="el" href="classCarna_1_1base_1_1GeometryStage.html">geometry rendering stage</a> with matching <code>geometryType</code>. </p>
 <p>Usually the corresponding rendering stage will query particular <em>features</em> from this geometry object: Features are like components that make up the geometry object in it's entirety, but the geometry object <em>aggregates</em> them, i.e. does not take their possession. Rendering stages identify features through the <em>roles</em> they take when associated with a geometry object.</p>
-<dl class="section note"><dt>Note</dt><dd>Conventionally, the default role for 3D textures that represent intensity data, such as <a class="el" href="classCarna_1_1presets_1_1DRRStage.html#a338d0fa4488f044de1fb8e036df77aeb">presets::DRRStage::ROLE_INTENSITY_VOLUME</a> or <a class="el" href="classCarna_1_1presets_1_1CuttingPlanesStage.html#ae2ce7da25cb71d49b4d1b22fecc2f74d">presets::CuttingPlanesStage::ROLE_INTENSITY_VOLUME</a>, is 0.</dd></dl>
+<dl class="section note"><dt>Note</dt><dd>Conventionally, the default role for 3D textures that represent intensity data, such as <a class="el" href="classCarna_1_1presets_1_1DRRStage.html#a756d7f4278f72e1b0ecb3951992d9173">presets::DRRStage::ROLE_INTENSITIES</a> or <a class="el" href="classCarna_1_1presets_1_1CuttingPlanesStage.html#a12dc6a142683391ac57ee94d3d9374a2">presets::CuttingPlanesStage::ROLE_INTENSITIES</a>, is 0.</dd></dl>
 <p>What features a geometry object aggregates depends on the <code>geometryType</code> and what the corresponding rendering stage expects. Typical examples are <a class="el" href="classCarna_1_1base_1_1ManagedMesh.html">meshes</a>, <a class="el" href="classCarna_1_1base_1_1Material.html">materials</a> and <a class="el" href="classCarna_1_1base_1_1ManagedTexture3D.html">volume textures</a>.</p>
 <dl class="section author"><dt>Author</dt><dd>Leonid Kostrykin </dd></dl>
 <dl class="section date"><dt>Date</dt><dd>21.2.15 - 6.3.15 </dd></dl>

docs/html/classCarna_1_1base_1_1VolumeSegment-members.html

@@ -79,16 +79,16 @@
 <table class="directory">
   <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#a0cdad7d3214622109e43f0b72168a98f">Grid</a> typedef</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html">Carna::base::VolumeSegment&lt; SegmentIntensityVolumeType, SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#a01b4bcc77a7d7d6a154e9ee272996b1e">grid</a></td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html">Carna::base::VolumeSegment&lt; SegmentIntensityVolumeType, SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#ac88636cd53a3f3e30ca2c3ca3364a615">hasIntensityVolume</a>() const</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html">Carna::base::VolumeSegment&lt; SegmentIntensityVolumeType, SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#ab2d4ede2d9de05ecd0ffaa51a1c14ef4">hasIntensities</a>() const</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html">Carna::base::VolumeSegment&lt; SegmentIntensityVolumeType, SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegmentNormalsComponent.html#a4f309dd5b2865c7084ecb0816fe2e609">hasNormals</a>() const</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegmentNormalsComponent.html">Carna::base::VolumeSegmentNormalsComponent&lt; SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#af9d70962a88bb5624a23c3187b2f49e9">intensities</a>()</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html">Carna::base::VolumeSegment&lt; SegmentIntensityVolumeType, SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#a564d6e48729356adfc128ec19a305501">intensities</a>() const</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html">Carna::base::VolumeSegment&lt; SegmentIntensityVolumeType, SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#a4c4597371aff28d263639641cfc3e3a6">IntensityVolume</a> typedef</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html">Carna::base::VolumeSegment&lt; SegmentIntensityVolumeType, SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#ac705ca1a12e27788af09a1bd4b6bd027">intensityVolume</a>()</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html">Carna::base::VolumeSegment&lt; SegmentIntensityVolumeType, SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#afe0550f36257be77f823a2740efe558c">intensityVolume</a>() const</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html">Carna::base::VolumeSegment&lt; SegmentIntensityVolumeType, SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegmentNormalsComponent.html#ab828e5c1a0b09faf814514f7ee83f851">normals</a>()</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegmentNormalsComponent.html">Carna::base::VolumeSegmentNormalsComponent&lt; SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegmentNormalsComponent.html#a203c9435aaeed815a35efcfaa062c4a4">normals</a>() const</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegmentNormalsComponent.html">Carna::base::VolumeSegmentNormalsComponent&lt; SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#aeab2e97410f68cc20e427d4d813e2f8f">NormalsVolume</a> typedef</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html">Carna::base::VolumeSegment&lt; SegmentIntensityVolumeType, SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#a96ef74307084c983573af0292e7ca209">offset</a></td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html">Carna::base::VolumeSegment&lt; SegmentIntensityVolumeType, SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#a79c122507f2d1eb223467ced147ee9d5">setIntensityVolume</a>(Association&lt; SegmentIntensityVolumeType &gt; *intensityVolume)</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html">Carna::base::VolumeSegment&lt; SegmentIntensityVolumeType, SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#a0871073d645984754718d42de5b0c789">setIntensities</a>(Association&lt; SegmentIntensityVolumeType &gt; *intensities)</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html">Carna::base::VolumeSegment&lt; SegmentIntensityVolumeType, SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegmentNormalsComponent.html#a5623b9b4fa0fbabb40a7df9f2ebfe012">setNormals</a>(Association&lt; SegmentNormalsVolumeType &gt; *volume)</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegmentNormalsComponent.html">Carna::base::VolumeSegmentNormalsComponent&lt; SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html#ad31a78cb1f9f685142dfa921824173de">VolumeSegment</a>(Grid &amp;grid)</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegment.html">Carna::base::VolumeSegment&lt; SegmentIntensityVolumeType, SegmentNormalsVolumeType &gt;</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegmentNormalsComponent.html#a8e3bcc14fd6395f15f1d5ac7d19d53c2">~VolumeSegmentNormalsComponent</a>()</td><td class="entry"><a class="el" href="classCarna_1_1base_1_1VolumeSegmentNormalsComponent.html">Carna::base::VolumeSegmentNormalsComponent&lt; SegmentNormalsVolumeType &gt;</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>