Changeset 252 for trunk/gui/vizservers

Timestamp:

Mar 1, 2006 8:29:54 PM (18 years ago)

Author:

qiaow

Message:

 

Location:

trunk/gui/vizservers/nanovis

Files:

• Makefile (modified) (2 diffs)
• Texture3D.cpp (modified) (3 diffs)

trunk/gui/vizservers/nanovis/Makefile

@@ -29 +29 @@
         gcc $(CFLAG) Texture1D.cpp
 
-Texture3D.o: Texture3D.cpp
+Texture3D.o: Texture3D.cpp config.h
         gcc $(CFLAG) Texture3D.cpp
 
@@ -47 +47 @@
         gcc $(CFLAG) ConvexPolygon.cpp
 
-nanovis.o: nanovis.h nanovis.cpp
+nanovis.o: nanovis.h nanovis.cpp config.h
         gcc $(CFLAG) nanovis.cpp
 

trunk/gui/vizservers/nanovis/Texture3D.cpp

@@ -22 +22 @@
 #include <math.h>
 
+#include "config.h"
 
 Texture3D::Texture3D(){ id=-1; gl_resource_allocated = false; }
@@ -73 +74 @@
 
         switch(n_components){
+        #ifdef NV40
                 case 1:
                         glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE16F_ARB, width, height, depth, 0, GL_LUMINANCE, GL_FLOAT, data);
@@ -85 +87 @@
                         glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA16F_ARB, width, height, depth, 0, GL_RGBA, GL_FLOAT, data);
                         break;
+        #else
+                case 1:
+                        glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE, width, height, depth, 0, GL_LUMINANCE, GL_FLOAT, data);
+                        break;
+                case 2:
+                        glTexImage3D(GL_TEXTURE_3D, 0, GL_LUMINANCE_ALPHA, width, height, depth, 0, GL_LUMINANCE_ALPHA, GL_FLOAT, data);
+                        break;
+                case 3:
+                        glTexImage3D(GL_TEXTURE_3D, 0, GL_RGB, width, height, depth, 0, GL_RGB, GL_FLOAT, data);
+                        break;
+                case 4:
+                        glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, width, height, depth, 0, GL_RGBA, GL_FLOAT, data);
+                        break;
+        #endif
                 default:
                         break;