Changeset 2932 for trunk/packages/vizservers
- Timestamp:
- Apr 2, 2012 9:42:21 AM (12 years ago)
- Location:
- trunk/packages/vizservers/nanovis
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/nanovis/AxisRange.h
r2844 r2932 22 22 } 23 23 24 void SetRange(double min, double max)24 void setRange(double min, double max) 25 25 { 26 26 _min = min; … … 46 46 { 47 47 _max = max; 48 } 49 50 double range() const 51 { 52 return (_max - _min); 48 53 } 49 54 -
trunk/packages/vizservers/nanovis/FlowCmd.cpp
r2930 r2932 660 660 _dataPtr->zNum(), 4, data, 661 661 NanoVis::magMin, NanoVis::magMax, 0); 662 volPtr->xAxis. SetRange(_dataPtr->xMin(), _dataPtr->xMax());663 volPtr->yAxis. SetRange(_dataPtr->yMin(), _dataPtr->yMax());664 volPtr->zAxis. SetRange(_dataPtr->zMin(), _dataPtr->zMax());665 volPtr->wAxis. SetRange(NanoVis::magMin, NanoVis::magMax);662 volPtr->xAxis.setRange(_dataPtr->xMin(), _dataPtr->xMax()); 663 volPtr->yAxis.setRange(_dataPtr->yMin(), _dataPtr->yMax()); 664 volPtr->zAxis.setRange(_dataPtr->zMin(), _dataPtr->zMax()); 665 volPtr->wAxis.setRange(NanoVis::magMin, NanoVis::magMax); 666 666 667 667 Vector3 physicalMin(NanoVis::xMin, NanoVis::yMin, NanoVis::zMin); -
trunk/packages/vizservers/nanovis/Grid.cpp
r2923 r2932 25 25 void Grid::render() 26 26 { 27 glPushMatrix(); 27 glPushAttrib(GL_ENABLE_BIT); 28 28 29 glEnable(GL_DEPTH_TEST); 29 30 glDisable(GL_TEXTURE_2D); 30 31 glEnable(GL_BLEND); 31 32 32 #ifdef notdef 33 33 glEnable(GL_LINE_SMOOTH); 34 34 #endif 35 36 glPushMatrix(); 35 37 #ifdef notdef 36 38 glScalef(xAxis.scale(), … … 38 40 zAxis.range() / xAxis.range()); 39 41 #endif 40 glScalef(1.0, 1.0, 1.0);41 42 42 43 glTranslatef(-0.5f, -0.5f, -0.5f); … … 207 208 _font->end(); 208 209 }; 210 209 211 glPopMatrix(); 210 glDisable(GL_DEPTH_TEST); 211 glDisable(GL_BLEND); 212 #ifdef notdef 213 glDisable(GL_LINE_SMOOTH); 214 #endif 212 glPopAttrib(); 215 213 } 216 214 -
trunk/packages/vizservers/nanovis/HeightMap.cpp
r2927 r2932 285 285 _scale.y = 1.0f; 286 286 287 xAxis. SetRange(0.0, 1.0);288 yAxis. SetRange(0.0, 1.0);289 zAxis. SetRange(0.0, 1.0);290 wAxis. SetRange(min, max);287 xAxis.setRange(0.0, 1.0); 288 yAxis.setRange(0.0, 1.0); 289 zAxis.setRange(0.0, 1.0); 290 wAxis.setRange(min, max); 291 291 updatePending = true; 292 292 … … 366 366 #endif 367 367 368 wAxis.SetRange(min, max); 369 yAxis.SetRange(min, max); 370 xAxis.SetRange(xMin, xMax); 371 zAxis.SetRange(yMin, yMax); 372 373 368 wAxis.setRange(min, max); 369 yAxis.setRange(min, max); 370 xAxis.setRange(xMin, xMax); 371 zAxis.setRange(yMin, yMax); 372 374 373 min = 0.0, max = 1.0; 375 374 xMin = yMin = min = 0.0; -
trunk/packages/vizservers/nanovis/Makefile.in
r2891 r2932 30 30 FF_INC_SPEC = @FF_INC_SPEC@ 31 31 32 GL_INC_SPEC = -I/usr/include/GL32 GL_INC_SPEC = 33 33 GL_LIB_SPEC = -lGL -lglut -lGLEW -lGLU 34 34 IMG_DIR = ./imgLoaders -
trunk/packages/vizservers/nanovis/NvParticleAdvectionShader.h
r2916 r2932 8 8 class NvParticleAdvectionShader : public NvShader 9 9 { 10 public 10 public: 11 11 NvParticleAdvectionShader(); 12 12 … … 41 41 } 42 42 43 private 43 private: 44 44 void init(); 45 45 -
trunk/packages/vizservers/nanovis/Volume.cpp
r2877 r2932 71 71 id = _tex->id(); 72 72 73 wAxis. SetRange(v0, v1);73 wAxis.setRange(v0, v1); 74 74 75 75 // VOLUME -
trunk/packages/vizservers/nanovis/Volume.h
r2877 r2932 53 53 }; 54 54 55 /** 56 * \brief Volume data constructor 57 * 58 * Represents a 3D regular grid with uniform spacing along 59 * each axis. Sample spacing may differ between X, Y and Z 60 * 61 * \param x X location 62 * \param y Y location 63 * \param z Z location 64 * \param width Number of samples in X 65 * \param height Number of samples in Y 66 * \param depth Number of samples in Z 67 * \param size Scale factor 68 * \param numComponents Number of components per sample 69 * \param data width * height * depth * numComponent sample array 70 * \param vmin Scalar value minimum 71 * \param vmax Scalar value maximum 72 * \param nonZeroMin Scalar minimum which is greater than zero 73 */ 55 74 Volume(float x, float y, float z, 56 75 int width, int height, int depth, -
trunk/packages/vizservers/nanovis/VolumeRenderer.cpp
r2906 r2932 135 135 } 136 136 137 glPushAttrib(GL_ENABLE_BIT); 138 137 139 //two dimension pointer array 138 140 ConvexPolygon ***polys = new ConvexPolygon**[volumes.size()]; 139 141 //number of actual slices for each volume 140 size_t *actual_slices = new size_t[volumes.size()]; 142 size_t *actual_slices = new size_t[volumes.size()]; 141 143 142 144 TRACE("start loop %d\n", volumes.size()); … … 216 218 glPushMatrix(); 217 219 glTranslatef(shift_4d.x, shift_4d.y, shift_4d.z); 218 if (volPtr->outline()) {219 //draw _label(i);220 if (volPtr->outline()) { 221 //drawLabel(i); 220 222 } 221 223 glPopMatrix(); … … 383 385 //Now we are ready to render all the slices from back to front 384 386 glEnable(GL_DEPTH_TEST); 387 // Non pre-multiplied alpha 388 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 385 389 glEnable(GL_BLEND); 386 390 … … 413 417 } 414 418 415 glDisable(GL_DEPTH_TEST); 416 glDisable(GL_BLEND); 419 glPopAttrib(); 417 420 418 421 //Deallocate all the memory used … … 436 439 float line_width) 437 440 { 438 glPushMatrix(); 441 glPushAttrib(GL_ENABLE_BIT); 442 439 443 glEnable(GL_DEPTH_TEST); 440 444 glDisable(GL_TEXTURE_2D); 441 445 glEnable(GL_BLEND); 446 447 glMatrixMode(GL_MODELVIEW); 448 glPushMatrix(); 442 449 443 450 glColor4d(r, g, b, 1.0); … … 544 551 #endif 545 552 glPopMatrix(); 546 glDisable(GL_DEPTH_TEST); 547 glDisable(GL_BLEND); 548 glEnable(GL_TEXTURE_2D); 553 glPopAttrib(); 549 554 } 550 555 -
trunk/packages/vizservers/nanovis/dxReader.cpp
r2881 r2932 386 386 volPtr = NanoVis::loadVolume(tag, nx, ny, nz, 4, data, 387 387 vmin, vmax, nzero_min); 388 volPtr->xAxis. SetRange(x0, x0 + lx);389 volPtr->yAxis. SetRange(y0, y0 + ly);390 volPtr->zAxis. SetRange(z0, z0 + lz);391 volPtr->wAxis. SetRange(vmin, vmax);388 volPtr->xAxis.setRange(x0, x0 + lx); 389 volPtr->yAxis.setRange(y0, y0 + ly); 390 volPtr->zAxis.setRange(z0, z0 + lz); 391 volPtr->wAxis.setRange(vmin, vmax); 392 392 volPtr->updatePending = true; 393 393 // TBD.. … … 495 495 volPtr = NanoVis::loadVolume(tag, nx, ny, nz, 4, data, 496 496 vmin, vmax, nzero_min); 497 volPtr->xAxis. SetRange(field.rangeMin(Rappture::xaxis),497 volPtr->xAxis.setRange(field.rangeMin(Rappture::xaxis), 498 498 field.rangeMax(Rappture::xaxis)); 499 volPtr->yAxis. SetRange(field.rangeMin(Rappture::yaxis),499 volPtr->yAxis.setRange(field.rangeMin(Rappture::yaxis), 500 500 field.rangeMax(Rappture::yaxis)); 501 volPtr->zAxis. SetRange(field.rangeMin(Rappture::zaxis),501 volPtr->zAxis.setRange(field.rangeMin(Rappture::zaxis), 502 502 field.rangeMax(Rappture::zaxis)); 503 volPtr->wAxis. SetRange(field.valueMin(), field.valueMax());503 volPtr->wAxis.setRange(field.valueMin(), field.valueMax()); 504 504 volPtr->updatePending = true; 505 505 // TBD..
Note: See TracChangeset
for help on using the changeset viewer.