Changeset 4612 for nanovis/branches/1.1/VolumeRenderer.cpp

Timestamp:

Aug 2, 2014 11:06:20 AM (10 years ago)

Author:

ldelgass

Message:

merge r3597 from trunk

Location:

nanovis/branches/1.1

Files:

• . (modified) (1 prop)
• VolumeRenderer.cpp (modified) (10 diffs)

nanovis/branches/1.1/VolumeRenderer.cpp

@@ -132 +132 @@
     TRACE("start loop %d", volumes.size());
     for (size_t i = 0; i < volumes.size(); i++) {
-        Volume *volPtr = volumes[i];
+        Volume *volume = volumes[i];
         polys[i] = NULL;
         actual_slices[i] = 0;
 
-        int n_slices = volPtr->numSlices();
-        if (volPtr->isosurface()) {
+        int n_slices = volume->numSlices();
+        if (volume->isosurface()) {
             // double the number of slices
             n_slices <<= 1;
@@ -143 +143 @@
 
         //volume start location
-        Vector3f volPos = volPtr->location();
-        Vector3f volScaling = volPtr->getPhysicalScaling();
+        Vector3f volPos = volume->location();
+        Vector3f volScaling = volume->getPhysicalScaling();
 
         TRACE("VOL POS: %g %g %g",
@@ -196 +196 @@
         //draw volume bounding box with translation (the correct location in
         //space)
-        if (volPtr->outline()) {
+        if (volume->outline()) {
             float olcolor[3];
-            volPtr->getOutlineColor(olcolor);
+            volume->getOutlineColor(olcolor);
             drawBoundingBox(x0, y0, z0, x0+1, y0+1, z0+1,
                 (double)olcolor[0], (double)olcolor[1], (double)olcolor[2],
@@ -222 +222 @@
         size_t n_actual_slices;
 
-        if (volPtr->dataEnabled()) {
+        if (volume->dataEnabled()) {
             if (z_step == 0.0f)
                 n_actual_slices = 1;
@@ -244 +244 @@
         // vice versa.
 
-        for (int j = 0; j < volPtr->getCutplaneCount(); j++) {
-            if (!volPtr->isCutplaneEnabled(j)) {
+        for (int j = 0; j < volume->getCutplaneCount(); j++) {
+            if (!volume->isCutplaneEnabled(j)) {
                 continue;
             }
-            float offset = volPtr->getCutplane(j)->offset;
-            int axis = volPtr->getCutplane(j)->orient;
+            float offset = volume->getCutplane(j)->offset;
+            int axis = volume->getCutplane(j)->orient;
 
             switch (axis) {
@@ -279 +279 @@
 
             _cutplaneShader->bind();
-            _cutplaneShader->setFPTextureParameter("volume", volPtr->textureID());
-            _cutplaneShader->setFPTextureParameter("tf", volPtr->transferFunction()->id());
+            _cutplaneShader->setFPTextureParameter("volume", volume->textureID());
+            _cutplaneShader->setFPTextureParameter("tf", volume->transferFunction()->id());
 
             glPushMatrix();
@@ -383 +383 @@
 
     for (size_t i = 0; i < total_rendered_slices; i++) {
-        Volume *volPtr = NULL;
+        Volume *volume = NULL;
 
         int volume_index = slices[i].volumeId;
@@ -390 +390 @@
         float z_step = z_steps[volume_index];
 
-        volPtr = volumes[volume_index];
-
-        Vector3f volScaling = volPtr->getPhysicalScaling();
+        volume = volumes[volume_index];
+
+        Vector3f volScaling = volume->getPhysicalScaling();
 
         glPushMatrix();
@@ -398 +398 @@
 
         // FIXME: compute view-dependent volume sample distance
-        double avgSampleDistance = 1.0 / pow(volPtr->width() * volScaling.x * 
-                                             volPtr->height() * volScaling.y * 
-                                             volPtr->depth() * volScaling.z, 1.0/3.0);
+        double avgSampleDistance = 1.0 / pow(volume->width() * volScaling.x * 
+                                             volume->height() * volScaling.y * 
+                                             volume->depth() * volScaling.z, 1.0/3.0);
         float sampleRatio = z_step / avgSampleDistance;
 
 #ifdef notdef
         TRACE("shading slice: volume %s addr=%x slice=%d, volume=%d z_step=%g avgSD=%g", 
-              volPtr->name(), volPtr, slice_index, volume_index, z_step, avgSampleDistance);
+              volume->name(), volume, slice_index, volume_index, z_step, avgSampleDistance);
 #endif
-        activateVolumeShader(volPtr, false, sampleRatio);
+        activateVolumeShader(volume, false, sampleRatio);
         glPopMatrix();
 
@@ -493 +493 @@
 
 void 
-VolumeRenderer::activateVolumeShader(Volume *volPtr, bool sliceMode,
+VolumeRenderer::activateVolumeShader(Volume *volume, bool sliceMode,
                                      float sampleRatio)
 {
     //vertex shader
     _stdVertexShader->bind();
-    TransferFunction *tfPtr  = volPtr->transferFunction();
-    if (volPtr->volumeType() == Volume::CUBIC) {
-        _regularVolumeShader->bind(tfPtr->id(), volPtr, sliceMode, sampleRatio);
-    } else if (volPtr->volumeType() == Volume::ZINCBLENDE) {
-        _zincBlendeShader->bind(tfPtr->id(), volPtr, sliceMode, sampleRatio);
+    TransferFunction *transferFunc  = volume->transferFunction();
+    if (volume->volumeType() == Volume::CUBIC) {
+        _regularVolumeShader->bind(transferFunc->id(), volume, sliceMode, sampleRatio);
+    } else if (volume->volumeType() == Volume::ZINCBLENDE) {
+        _zincBlendeShader->bind(transferFunc->id(), volume, sliceMode, sampleRatio);
     }
 }