Changeset 386 for trunk/gui/vizservers/nanovis/nanovis.cpp

Timestamp:

Mar 29, 2006, 8:33:27 AM (19 years ago)

Author:

qiaow

Message:

Added phone shading in one_volume.cg

File:

• trunk/gui/vizservers/nanovis/nanovis.cpp (modified) (9 diffs)

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -92 +92 @@
 CGparameter m_tf_one_volume_param;
 CGparameter m_mvi_one_volume_param;
+CGparameter m_mv_one_volume_param;
 CGparameter m_render_param_one_volume_param;
 
@@ -508 +509 @@
 
             float *data = new float[4*nx*ny*nz];
-            float *grad = new float[4*nx*ny*nz];
 
             double vmin = field.valueMin();
@@ -528 +528 @@
                         // scale all values [0-1], -1 => out of bounds
                         v = (isnan(v)) ? -1.0 : (v - vmin)/dv;
+                        data[ngen] = v;
 
                         // gradient in x-direction
@@ -533 +534 @@
                         double oldval = ((ngen/4) % nx == 0) ? 0.0 : data[ngen-4];
                         oldval = (oldval < 0) ? 0.0 : oldval;
-                        grad[ngen] = (curval-oldval)/dmin;
-                        data[ngen++] = v;
+                        data[ngen+1] = (curval-oldval)/dmin;
 
                         // gradient in y-direction
-                        oldval = (ngen-1-4*nx >= 0) ? data[ngen-1-4*nx] : 0.0;
+                        oldval = (ngen-4*nx >= 0) ? data[ngen-4*nx] : 0.0;
                         oldval = (oldval < 0) ? 0.0 : oldval;
-                        grad[ngen] = (curval-oldval)/dmin;
-                        data[ngen++] = 0.0;
+                        data[ngen+2] = (curval-oldval)/dmin;
 
                         // gradient in z-direction
-                        oldval = (ngen-2-4*nx*ny >= 0) ? data[ngen-2-4*nx*ny] : 0.0;
+                        oldval = (ngen-4*nx*ny >= 0) ? data[ngen-4*nx*ny] : 0.0;
                         oldval = (oldval < 0) ? 0.0 : oldval;
-                        grad[ngen] = (curval-oldval)/dmin;
-                        data[ngen++] = 0.0;
-
-                        // unused
-                        grad[ngen] = 0.0;
-                        data[ngen++] = 0.0;
+                        data[ngen+3] = (curval-oldval)/dmin;
+                        ngen += 4;
                     }
                 }
@@ -556 +551 @@
             load_volume(index, nx, ny, nz, 4, data);
             delete [] data;
-            delete [] grad;
 
         } else {
@@ -850 +844 @@
       cgGLSetTextureParameter(m_tf_one_volume_param, tf[0]->id);
       m_mvi_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "modelViewInv");
+      m_mv_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "modelView");
       m_render_param_one_volume_param = cgGetNamedParameter(m_one_volume_fprog, "renderParameters");
       break;
@@ -1533 +1528 @@
 
   cgGLSetStateMatrixParameter(m_mvi_one_volume_param, CG_GL_MODELVIEW_MATRIX, CG_GL_MATRIX_INVERSE);
+  cgGLSetStateMatrixParameter(m_mv_one_volume_param, CG_GL_MODELVIEW_MATRIX, CG_GL_MATRIX_IDENTITY);
   cgGLSetTextureParameter(m_vol_one_volume_param, volume[volume_index]->id);
   cgGLEnableTextureParameter(m_vol_one_volume_param);
@@ -1541 +1537 @@
   //if parameter.y == 1 : volume :1
   if(volume_index==0)
-    cgGLSetParameter4f(m_render_param_one_volume_param, n_actual_slices, 0., 0., 0.);
+    cgGLSetParameter4f(m_render_param_one_volume_param, n_actual_slices, 0., live_diffuse, live_specular);
   else if(volume_index==1)
-    cgGLSetParameter4f(m_render_param_one_volume_param, n_actual_slices, 1., 0., 0.);
+    cgGLSetParameter4f(m_render_param_one_volume_param, n_actual_slices, 1., live_diffuse, live_specular);
   cgGLBindProgram(m_one_volume_fprog);
   cgGLEnableProfile(CG_PROFILE_FP30);
@@ -2069 +2065 @@
                 init_particles();
                 break;
+        case 'o':
+                live_specular+=1;
+                fprintf(stderr, "specular: %f\n", live_specular);
+                break;
+        case 'p':
+                live_specular-=1;
+                fprintf(stderr, "specular: %f\n", live_specular);
+                break;
+        case '[':
+                live_diffuse+=0.5;
+                break;
+        case ']':
+                live_diffuse-=0.5;
+                break;
+
         default:
                 break;