Changeset 373 for trunk/gui/vizservers

Timestamp:

Mar 23, 2006, 8:28:56 AM (19 years ago)

Author:

qiaow

Message:

buildable code with Color and Sphere classes

Location:

trunk/gui/vizservers/nanovis

Files:

• Color.h (modified) (1 diff)
• Makefile (modified) (4 diffs)
• Sphere.cpp (modified) (3 diffs)
• Sphere.h (modified) (2 diffs)
• Volume.cpp (modified) (1 diff)
• nanovis.cpp (modified) (4 diffs)
• nanovis.h (modified) (1 diff)
• shaders/one_volume.cg (modified) (1 diff)

trunk/gui/vizservers/nanovis/Color.h

@@ -16 +16 @@
 #define _COLOR_H_
 
-#include "Vector4.h"
-
 class Color  
 {

trunk/gui/vizservers/nanovis/Makefile

@@ -1 +1 @@
 OBJ_NANOVIS = nanovis.o Socket.o RenderVertexArray.o Plane.o ConvexPolygon.o Vector4.o Vector3.o Mat4x4.o \
-                Texture1D.o Texture3D.o ColorMap.o Volume.o Texture2D.o ParticleSystem.o
+                Texture1D.o Texture3D.o ColorMap.o Volume.o Texture2D.o ParticleSystem.o Sphere.o Color.o
 
 AUXSRC = config.h define.h global.h
@@ -7 +7 @@
 SORTSRC = ./sort
 
-LIB_NANOVIS = -ltcl8.4 -lGL -lglut -lGLEW -lCg -lCgGL -pthread
+LIB_NANOVIS = -ltcl8.4 -lGL -lglut -lGLEW -lCg -lCgGL -pthread -lstdc++
 LIB_CLIENT = -lGL -lglut -pthread
-CFLAG = -g -c -Wall -I../../../src2/core
+CFLAG = -g -c -Wall -I../src2/core
 
 all: nanovis 
@@ -17 +17 @@
 
 nanovis: $(OBJ_NANOVIS)
-        gcc -g -o nanovis $(OBJ_NANOVIS) $(LIB_NANOVIS) ../../../src2/core/*.o
+        gcc -g -o nanovis $(OBJ_NANOVIS) $(LIB_NANOVIS) ../src2/core/*.o
 
 Socket.o: $(SOCKETSRC)/Socket.h $(SOCKETSRC)/Socket.cpp
@@ -27 +27 @@
 #qdclient: $(OBJ_CLIENT) 
 #       gcc -g -o qdclient $(OBJ_CLIENT) $(LIB_CLIENT)
+
+Color.o: Color.cpp
+        gcc $(CFLAG) Color.cpp
+
+Sphere.o: Vector3.o Color.o
+        gcc $(CFLAG) Sphere.cpp
 
 ColorMap.o: ColorMap.cpp

trunk/gui/vizservers/nanovis/Sphere.cpp

@@ -16 +16 @@
 #include "Sphere.h"
 #include <stdio.h>
-#include <GL/glut.h>
 
 Sphere::Sphere(float x, float y, float z, 
@@ -23 +22 @@
                 int _stack,
                 int _slice):
-        center(Vector3(x,y,z)),
-        color(Color(r,g,b,a)),
         radius(_radius),
         stack(_stack),
-        slice(_slice)
+        slice(_slice),
+        center(Vector3(x,y,z)),
+        color(Color(r,g,b,a))
 { }
 
 
-Sphere::draw(GLUquadric* quad){
+void Sphere::draw(GLUquadric* quad){
   glColor4f(color.r, color.g, color.b, color.a);
 
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
-  glTranslate(center.x, center.y, center.z);
+  glTranslatef(center.x, center.y, center.z);
 
   //draw it
@@ -43 +42 @@
 }
 
-Sphere::set_horizontal_res(int _slice):slice(_slice){}
-Sphere::set_vertical_res(int _stack):stack(_stack){}
+void Sphere::set_horizontal_res(int _slice) {slice=_slice;}
+void Sphere::set_vertical_res(int _stack) {stack=_stack;}
 

trunk/gui/vizservers/nanovis/Sphere.h

@@ -16 +16 @@
 #define _SPHERE_H_
 
+#include <GL/glut.h>
 #include "Color.h"
+#include "Vector3.h"
 
 class Sphere{
@@ -30 +32 @@
         ~Sphere(){};
         Sphere(float x, float y, float z, float r, float g, float b, float a, float r, int _stack, int _slice);
-        set_vertical_res(int _stack);
-        set_horizontal_res(int _slice);
+        void set_vertical_res(int _stack);
+        void set_horizontal_res(int _slice);
         
         //display the sphere
-        draw();
+        void draw(GLUquadric* q);
 };
 

trunk/gui/vizservers/nanovis/Volume.cpp

@@ -17 +17 @@
 
 
-Volume::Volume(int x, int y, int z,
+Volume::Volume(float x, float y, float z,
                 int w, int h, int d, 
                 NVISdatatype t, NVISinterptype interp, int n, float* data):

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -273 +273 @@
 
             nx = (int)ceil(dx/dmin);
+            ny = (int)ceil(dy/dmin);
+            nz = (int)ceil(dz/dmin);
+
+#ifndef NV40
             nx = pow(2.0, ceil(log10((double)nx)/log10(2.0)));  // must be an even power of 2
-            ny = (int)ceil(dy/dmin);
             ny = pow(2.0, ceil(log10((double)ny)/log10(2.0)));
-            nz = (int)ceil(dz/dmin);
             nz = pow(2.0, ceil(log10((double)nz)/log10(2.0)));
+#endif
+
             float *data = new float[4*nx*ny*nz];
 
@@ -385 +389 @@
   }
 
-  volume[index] = new Volume(width, height, depth, NVIS_FLOAT, NVIS_LINEAR_INTERP, n_component, data);
+  volume[index] = new Volume(0., 0., 0., width, height, depth, NVIS_FLOAT, NVIS_LINEAR_INTERP, n_component, data);
   assert(volume[index]!=0);
 }
@@ -1395 +1399 @@
    */
 
+   /*
    glBegin(GL_QUADS);
-   /*
-   glTexCoord2f(0, 0); glVertex3f(-1, -1, slice_z);
-   glTexCoord2f(1, 0); glVertex3f(1, -1, slice_z);
-   glTexCoord2f(1, 1); glVertex3f(1, 1, slice_z);
-   glTexCoord2f(0, 1); glVertex3f(-1, 1, slice_z);
-   */
    glTexCoord2f(0, 0); glVertex3f(0, 0, slice_z);
    glTexCoord2f(1, 0); glVertex3f(1, 0, slice_z);
@@ -1407 +1406 @@
    glTexCoord2f(0, 1); glVertex3f(0, 1, slice_z);
    glEnd();
+   */
 
    //soft_display_verts();

trunk/gui/vizservers/nanovis/nanovis.h

@@ -107 +107 @@
 float  tmax   = NPIX/(SCALE*NPN);
 float  dmax   = SCALE/NPIX;
+
+
+//currently active shader
+int cur_shader = 0;

trunk/gui/vizservers/nanovis/shaders/one_volume.cg

@@ -27 +27 @@
   //float3 sample = tex3D(volume, tex_coord.xyz).xyz;
   float sample = tex3D(volume, tex_coord.xyz);
-  //float sample = 1; 
 
-  //OUT.Color = float4(sample, 10*sqrt(sample.x*sample.x + sample.y*sample.y + sample.z*sample.z)/renderParameters.x);
   if (sample < 0.) {
       OUT.Color = float4(0.0, 0.0, 0.0, 0.0);
   } else {
-      OUT.Color = float4(sample, sample, sample, sample*0.1);
+      OUT.Color = float4(sample, sample, sample, sample/renderParameters.x);
   }
+
   return OUT;
 }