Changeset 5702
- Timestamp:
- Jun 16, 2015, 1:33:25 PM (9 years ago)
- Location:
- nanovis/branches/1.2
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
nanovis/branches/1.2
- Property svn:mergeinfo changed
/nanovis/trunk merged: 5613
- Property svn:mergeinfo changed
-
nanovis/branches/1.2/Flow.cpp
r5701 r5702 333 333 } 334 334 } 335 } 336 337 void 338 Flow::data(Unirect3d *unirect) 339 { 340 float *vdata = getScaledVector(unirect); 341 _volume = makeVolume(unirect, vdata); 342 delete [] vdata; 343 delete unirect; 344 initVolume(); 345 scaleVectorField(); 346 } 347 348 void 349 Flow::data(Volume *volume) 350 { 351 _volume = volume; 352 initVolume(); 353 scaleVectorField(); 335 354 } 336 355 -
nanovis/branches/1.2/Flow.h
r5588 r5702 26 26 #include "LIC.h" 27 27 #include "VelocityArrowsSlice.h" 28 #include "Unirect.h"29 28 #include "Volume.h" 30 29 #include "TransferFunction.h" 31 30 32 31 namespace nv { 32 33 class Unirect3d; 33 34 34 35 struct FlowValues { … … 104 105 } 105 106 106 void data(Unirect3d *unirect) 107 { 108 float *vdata = getScaledVector(unirect); 109 _volume = makeVolume(unirect, vdata); 110 delete [] vdata; 111 delete unirect; 112 initVolume(); 113 scaleVectorField(); 114 } 115 116 void data(Volume *volume) 117 { 118 _volume = volume; 119 initVolume(); 120 scaleVectorField(); 121 } 107 void data(Unirect3d *unirect); 108 109 void data(Volume *volume); 122 110 123 111 FlowSliceAxis getSliceAxis() -
nanovis/branches/1.2/Makefile.in
r5588 r5702 389 389 ZincBlendeVolume.o: ZincBlendeVolume.cpp ZincBlendeVolume.h config.h define.h 390 390 ZincBlendeVolumeShader.o: ZincBlendeVolumeShader.cpp ZincBlendeVolumeShader.h VolumeShader.h Shader.h 391 dxReader.o: dxReader.cpp ReaderCommon.h config.h nanovis.h Unirect.hZincBlendeVolume.h ZincBlendeReconstructor.h391 dxReader.o: dxReader.cpp ReaderCommon.h config.h nanovis.h ZincBlendeVolume.h ZincBlendeReconstructor.h 392 392 md5.o: md5.h 393 nanovis.o: nanovis.cpp nanovis.h nanovisServer.h config.h define.h Command.h Flow.h Grid.h HeightMap.h Camera.h LIC.h ZincBlendeReconstructor.h OrientationIndicator.h PerfQuery.h PlaneRenderer.h PointSetRenderer.h PointSet.h Switch.h Trace.h Unirect.hVelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h $(UTIL_DIR)/Fonts.h393 nanovis.o: nanovis.cpp nanovis.h nanovisServer.h config.h define.h Command.h Flow.h Grid.h HeightMap.h Camera.h LIC.h ZincBlendeReconstructor.h OrientationIndicator.h PerfQuery.h PlaneRenderer.h PointSetRenderer.h PointSet.h Switch.h Trace.h VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h $(UTIL_DIR)/Fonts.h 394 394 nanovisServer.o: nanovisServer.cpp nanovisServer.h config.h nanovis.h define.h Command.h PPMWriter.h ReadBuffer.h Shader.h ResponseQueue.h Trace.h -
nanovis/branches/1.2/dxReader.cpp
r5588 r5702 39 39 #include "nanovis.h" 40 40 #include "dxReader.h" 41 #include "Unirect.h"42 41 #include "Volume.h" 43 42 -
nanovis/branches/1.2/nanovis.cpp
r5701 r5702 20 20 #include <cstdio> 21 21 #include <cmath> // for fmod() 22 #include <cfloat> 22 23 23 24 #include <GL/glew.h> … … 51 52 #include "Trace.h" 52 53 #include "TransferFunction.h" 53 #include "Unirect.h"54 54 #include "VelocityArrowsSlice.h" 55 55 #include "Volume.h"
Note: See TracChangeset
for help on using the changeset viewer.