Ignore:
Timestamp:
Mar 13, 2013, 12:57:03 PM (7 years ago)
Author:
ldelgass
Message:

Fix camera reset for nanovis. Includes refactoring of vector/matrix classes
in nanovis to consolidate into vrmath library. Also add preliminary canonical
view control to clients for testing.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/vizservers/nanovis/NvVectorField.h

    r3362 r3492  
    66#include <map>
    77
     8#include <vrmath/Vector3f.h>
     9#include <vrmath/Vector4f.h>
     10
    811#include "Volume.h"
    9 #include "Vector3.h"
    1012#include "NvParticleRenderer.h"
    1113
     
    1820    }
    1921
    20     Vector3 min;
    21     Vector3 max;
    22     Vector4 color;
     22    vrmath::Vector3f min;
     23    vrmath::Vector3f max;
     24    vrmath::Vector4f color;
    2325    bool visible;
    2426};
     
    3133    ~NvVectorField();
    3234
    33     void setVectorField(Volume *vol, const Vector3& origin,
     35    void setVectorField(Volume *vol, const vrmath::Vector3f& origin,
    3436                        float scaleX, float scaleY, float scaleZ, float max);
    3537
     
    8688    void setParticleColor(const std::string& name, float r, float g, float b, float a);
    8789
    88     void setParticleColor(const std::string& name, const Vector4& color);
     90    void setParticleColor(const std::string& name, const vrmath::Vector4f& color);
    8991
    9092private:
     
    99101    bool _activated;
    100102
    101     Vector3 _origin;
     103    vrmath::Vector3f _origin;
    102104    float _scaleX;
    103105    float _scaleY;
Note: See TracChangeset for help on using the changeset viewer.