Changeset 251

Timestamp:

Mar 1, 2006, 8:08:27 PM (19 years ago)

Author:

qiaow

Message:

Added config.h. It contains global configuration variables.

One configuration variable is added: "NV40"

-- Use 6 series hardware (NV40). Comment its define will enable compatibility to 5xxx series cards (NV30). NV30

only supports 8-bit per component textures with linear filtering. Whereas NV40 supports 16bit per
component texture with linear filtering, thus can store negative values.

Location:

trunk/gui/vizservers/nanovis

Files:

• Makefile (modified) (2 diffs)
• Texture3D.h (modified) (1 diff)
• config.h (added)
• nanovis.cpp (modified) (7 diffs)
• nanovis.h (modified) (2 diffs)

trunk/gui/vizservers/nanovis/Makefile

@@ -1 @@
-OBJ_NANOVIS = nanovis.o Socket.o RenderVertexArray.o GLSLShader.o Plane.o ConvexPolygon.o Vector4.o Vector3.o Mat4x4.o \
+OBJ_NANOVIS = nanovis.o Socket.o RenderVertexArray.o Plane.o ConvexPolygon.o Vector4.o Vector3.o Mat4x4.o \
                 Texture1D.o Texture3D.o
 
@@ -22 +22 @@
 RenderVertexArray.o: RenderVertexArray.h RenderVertexArray.cpp
         gcc $(CFLAG) RenderVertexArray.cpp
-
-GLSLShader.o: $(SORTSRC)/GLSLShader.cpp
-        gcc $(CFLAG) $(SORTSRC)/GLSLShader.cpp
 
 #qdclient: $(OBJ_CLIENT) 

trunk/gui/vizservers/nanovis/Texture3D.h

@@ -17 +17 @@
 
 #include <GL/glew.h>
+#include "config.h"
 
 class Texture3D{

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -16 +16 @@
 
 #include "socket/Socket.h"
-#include "sort/GLSLShader.h"
 #include "RenderVertexArray.h"
 #include "ConvexPolygon.h"
@@ -134 +133 @@
 //GPU sorting related stuff
 //GLSL shaders
-GLSLShader oddevenMergeSort;
+//GLSLShader oddevenMergeSort;
 //sorting related vars
 // field size to sort
@@ -558 +557 @@
 
 
+#if 0
 void init_sort(){
 
@@ -563 +563 @@
   assert(ret);
 }
+#endif 
 
 
@@ -619 +620 @@
    init_cg();           //init cg shaders
    init_vbo();          //init vertex buffer object
-   init_sort();         //init oddeven sort
+   //init_sort();               //init oddeven sort
 
    get_slice_vectors();
@@ -1197 +1198 @@
 
 
+#if 0
+
 //oddeven sort on GPU
 void sortstep()
@@ -1263 +1266 @@
 }
 
+#endif
 
 void get_near_far_z(Mat4x4 mv, double &zNear, double &zFar)

trunk/gui/vizservers/nanovis/nanovis.h

@@ -25 +25 @@
 #include <float.h>
 
+#include "config.h"
+
 
 //defines for the image based flow visualization
@@ -34 +36 @@
 #define MAX_N_VOLUMES 10 //maximum of volumes the application can handle
 
-#define NV40            //the Nvidia 6 series card