- Timestamp:
- May 21, 2015, 2:30:27 AM (9 years ago)
- Location:
- nanovis/trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
nanovis/trunk/Flow.h
r4899 r5587 121 121 } 122 122 123 FlowSliceAxis get Axis()123 FlowSliceAxis getSliceAxis() 124 124 { 125 125 return _sv.slicePos.axis; -
nanovis/trunk/Makefile.in
r5484 r5587 355 355 ParticleAdvectionShader.o: ParticleAdvectionShader.cpp ParticleAdvectionShader.h Shader.h 356 356 ParticleEmitter.o: ParticleEmitter.cpp ParticleEmitter.h 357 ParticleRenderer.o: ParticleRenderer.cpp ParticleRenderer.h FlowTypes.h define.h357 ParticleRenderer.o: ParticleRenderer.cpp ParticleRenderer.h ParticleAdvectionShader.h FlowTypes.h define.h 358 358 ParticleSystem.o: ParticleSystem.cpp ParticleSystem.h 359 359 ParticleSystemFactory.o: ParticleSystemFactory.cpp ParticleSystemFactory.h -
nanovis/trunk/ParticleRenderer.cpp
r5483 r5587 17 17 18 18 #include "ParticleRenderer.h" 19 #include "ParticleAdvectionShader.h" 19 20 #include "Volume.h" 20 21 #include "define.h" -
nanovis/trunk/ParticleRenderer.h
r3631 r5587 118 118 bool _flip; 119 119 120 float _maxLife;120 unsigned int _maxLife; 121 121 122 122 /// Size of the particle: default is 1.2 -
nanovis/trunk/VelocityArrowsSlice.cpp
r4903 r5587 469 469 Vector3f bmin, bmax; 470 470 volume->getBounds(bmin, bmax); 471 _origin .set(bmin.x, bmin.y, bmin.z);471 _origin = bmin; 472 472 _scale.set(bmax.x-bmin.x, bmax.y-bmin.y, bmax.z-bmin.z); 473 473 -
nanovis/trunk/dxReader.cpp
r5549 r5587 59 59 nv::load_dx_volume_stream(const char *tag, std::iostream& fin) 60 60 { 61 TRACE("Enter tag: %s", tag);61 TRACE("Enter tag: %s", tag); 62 62 63 63 Rappture::MeshTri2D xymesh; -
nanovis/trunk/shaders/update_pos.cg
r3630 r5587 24 24 float time = pos.w; 25 25 26 //reconstruct negative value27 26 if (max > 0) { 28 27 #ifdef EXPIRE … … 34 33 } 35 34 #endif 35 //reconstruct negative value 36 36 float4 vel = float4(tex3D(vel_tex, pos.xyz).yzw, 0.0) * 2.0 - float4(1.0, 1.0, 1.0, 0.0); 37 37 vel = vel * max;
Note: See TracChangeset
for help on using the changeset viewer.