Changeset 4164 for trunk/packages
- Timestamp:
- Feb 1, 2014, 3:22:43 AM (11 years ago)
- Location:
- trunk/packages/vizservers/nanovis
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/nanovis/Grid.cpp
r4039 r4164 201 201 202 202 _font->begin(); 203 204 glColor4f(_axisColor.r, _axisColor.g, _axisColor.b, 205 _axisColor.a); 206 203 207 if (gluProject(1.0 + xTitleOfs, 0.0, 0.0, mv, prjm, viewport, &wx, &wy, &wz) && 204 208 wz >= 0.0 && wz <= 1.0) { … … 234 238 } 235 239 236 glColor4f(1.0f, 1.0f, 0.0f, 1.0f); 240 glColor4f(_majorColor.r, _majorColor.g, _majorColor.b, 241 _majorColor.a); 237 242 238 243 for (result = xAxis.firstMajor(iter); result; result = iter.next()) { -
trunk/packages/vizservers/nanovis/VtkDataSetReader.cpp
r4063 r4164 50 50 reader->ReadAllVectorsOn(); 51 51 //reader->ReadAllTensorsOn(); 52 //reader->ReadAllFieldsOn();52 reader->ReadAllFieldsOn(); 53 53 reader->SetLookupTableName(""); 54 54 reader->Update(); -
trunk/packages/vizservers/nanovis/util/Fonts.cpp
r3935 r4164 82 82 glEnable(GL_TEXTURE_2D); 83 83 glBindTexture(GL_TEXTURE_2D, _fonts[_fontIndex]._fontTextureID); 84 glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 84 85 85 86 glMatrixMode(GL_PROJECTION); … … 221 222 glGenTextures(1, &sFont._fontTextureID); 222 223 glBindTexture(GL_TEXTURE_2D, sFont._fontTextureID); 223 glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA,224 sFont._textureWidth, sFont._textureHeight, 0,225 GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, pTexMap);226 224 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); 227 225 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); 228 226 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); 229 227 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); 230 glTexEnvi(GL_TEXTURE_2D, GL_TEXTURE_ENV_MODE, GL_MODULATE); 228 glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA, 229 sFont._textureWidth, sFont._textureHeight, 0, 230 GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, pTexMap); 231 231 glBindTexture(GL_TEXTURE_2D, 0); 232 232
Note: See TracChangeset
for help on using the changeset viewer.