Changeset 5587 for nanovis


Ignore:
Timestamp:
May 21, 2015, 5:30:27 AM (4 years ago)
Author:
ldelgass
Message:

Some fixes from release branch

Location:
nanovis/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • nanovis/trunk/Flow.h

    r4899 r5587  
    121121    }
    122122
    123     FlowSliceAxis getAxis()
     123    FlowSliceAxis getSliceAxis()
    124124    {
    125125        return _sv.slicePos.axis;
  • nanovis/trunk/Makefile.in

    r5484 r5587  
    355355ParticleAdvectionShader.o: ParticleAdvectionShader.cpp ParticleAdvectionShader.h Shader.h
    356356ParticleEmitter.o: ParticleEmitter.cpp ParticleEmitter.h
    357 ParticleRenderer.o: ParticleRenderer.cpp ParticleRenderer.h FlowTypes.h define.h
     357ParticleRenderer.o: ParticleRenderer.cpp ParticleRenderer.h ParticleAdvectionShader.h FlowTypes.h define.h
    358358ParticleSystem.o: ParticleSystem.cpp ParticleSystem.h
    359359ParticleSystemFactory.o: ParticleSystemFactory.cpp ParticleSystemFactory.h
  • nanovis/trunk/ParticleRenderer.cpp

    r5483 r5587  
    1717
    1818#include "ParticleRenderer.h"
     19#include "ParticleAdvectionShader.h"
    1920#include "Volume.h"
    2021#include "define.h"
  • nanovis/trunk/ParticleRenderer.h

    r3631 r5587  
    118118    bool _flip;
    119119
    120     float _maxLife;
     120    unsigned int _maxLife;
    121121
    122122    /// Size of the particle: default is 1.2
  • nanovis/trunk/VelocityArrowsSlice.cpp

    r4903 r5587  
    469469    Vector3f bmin, bmax;
    470470    volume->getBounds(bmin, bmax);
    471     _origin.set(bmin.x, bmin.y, bmin.z);
     471    _origin = bmin;
    472472    _scale.set(bmax.x-bmin.x, bmax.y-bmin.y, bmax.z-bmin.z);
    473473
  • nanovis/trunk/dxReader.cpp

    r5549 r5587  
    5959nv::load_dx_volume_stream(const char *tag, std::iostream& fin)
    6060{
    61     TRACE("Enter tag:%s", tag);
     61    TRACE("Enter tag: %s", tag);
    6262
    6363    Rappture::MeshTri2D xymesh;
  • nanovis/trunk/shaders/update_pos.cg

    r3630 r5587  
    2424    float time = pos.w;
    2525
    26     //reconstruct negative value
    2726    if (max > 0) {
    2827#ifdef EXPIRE
     
    3433        }
    3534#endif
     35        //reconstruct negative value
    3636        float4 vel = float4(tex3D(vel_tex, pos.xyz).yzw, 0.0) * 2.0 - float4(1.0, 1.0, 1.0, 0.0);
    3737        vel = vel * max;
Note: See TracChangeset for help on using the changeset viewer.