Changeset 4167 for trunk/packages/vizservers/nanovis/VelocityArrowsSlice.cpp

Timestamp:

Feb 2, 2014, 2:38:35 AM (6 years ago)

Author:

ldelgass

Message:

Texture environment is not part of texture object stored state, so don't set
environment mode before loading textures, should be done at render time.

File:

• trunk/packages/vizservers/nanovis/VelocityArrowsSlice.cpp (modified) (3 diffs)

trunk/packages/vizservers/nanovis/VelocityArrowsSlice.cpp

@@ -408 +408 @@
         _arrowsTex->activate();
         glEnable(GL_TEXTURE_2D);
-        glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+        glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 
         GLfloat atten[] = {1, 0, 0};
@@ -415 +415 @@
         glPointParameterfARB(GL_POINT_SIZE_MIN_ARB, 1.0f);
         glPointParameterfARB(GL_POINT_SIZE_MAX_ARB, _maxPointSize);
-        glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE);
+        glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE);
 
         // FIXME: This vertex shader won't compile with ARB_vertex_program,
@@ -456 +456 @@
 
         glActiveTexture(GL_TEXTURE0);
-        glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_FALSE);
+        glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_FALSE);
         _arrowsTex->deactivate();
     }