- Timestamp:
- Aug 20, 2013 5:52:39 PM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/nanovis/VelocityArrowsSlice.cpp
r3630 r3875 65 65 _queryVelocityFP.loadFragmentProgram("queryvelocity.cg"); 66 66 67 _particleShader.loadVertexProgram("velocityslicevp.cg"); 68 _particleShader.loadFragmentProgram("velocityslicefp.cg"); 67 // Delay loading of shaders only required for glyph style rendering 68 if (_renderMode == GLYPHS) { 69 _particleShader.loadVertexProgram("velocityslicevp.cg"); 70 _particleShader.loadFragmentProgram("velocityslicefp.cg"); 71 } 69 72 70 73 createRenderTarget(); … … 362 365 continue; 363 366 } 364 if (length > 1.0e-6) {367 if (length > 0.0) { 365 368 Vector3f vnorm = vel.normalize(); 366 369 Vector3f rotationAxis = refVec.cross(vnorm); … … 414 417 glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); 415 418 419 // FIXME: This vertex shader won't compile with ARB_vertex_program, 420 // so it should use GLSL 421 if (!_particleShader.isVertexProgramLoaded()) { 422 _particleShader.loadVertexProgram("velocityslicevp.cg"); 423 } 424 if (!_particleShader.isFragmentProgramLoaded()) { 425 _particleShader.loadFragmentProgram("velocityslicefp.cg"); 426 } 427 416 428 _particleShader.bind(); 417 429 _particleShader.setVPTextureParameter("vfield", _vectorFieldGraphicsID); … … 458 470 Vector3f bmin, bmax; 459 471 volume->getBounds(bmin, bmax); 460 _origin = bmin;472 _origin.set(bmin.x, bmin.y, bmin.z); 461 473 _scale.set(bmax.x-bmin.x, bmax.y-bmin.y, bmax.z-bmin.z); 462 474
Note: See TracChangeset
for help on using the changeset viewer.