Ignore:
Timestamp:
Dec 22, 2014, 7:18:59 AM (5 years ago)
Author:
ldelgass
Message:

Merge serveral changes from trunk. Does not include threading, world space
changes, etc.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1/nanovis.h

    r4889 r4904  
    2828
    2929#include "config.h"
     30#include "Camera.h"
    3031
    3132//defines for the image based flow visualization
     
    4142}
    4243
    43 class Camera;
    4444class Flow;
    4545class Grid;
     
    5656{
    5757public:
    58     enum AxisDirections {
    59         X_POS = 1,
    60         Y_POS = 2,
    61         Z_POS = 3,
    62         X_NEG = -1,
    63         Y_NEG = -2,
    64         Z_NEG = -3
    65     };
    66 
    67     enum NanoVisFlags {
    68         REDRAW_PENDING = (1 << 0),
    69         MAP_FLOWS = (1 << 1)
    70     };
    71 
    7258    typedef std::string TransferFunctionId;
    7359    typedef std::string VolumeId;
     
    9177    static const Camera *getCamera()
    9278    {
    93         return cam;
     79        return _camera;
    9480    }
    95     static void pan(float dx, float dy);
    96     static void zoom(float z);
     81    static void panCamera(float dx, float dy);
     82    static void zoomCamera(float z);
     83    static void rotateCamera(float phi, float theta, float psi);
     84    static void orientCamera(double *quat);
     85    static void setCameraPosition(vrmath::Vector3f pos);
     86    static void setCameraUpdir(Camera::AxisDirection dir);
    9787    static void resetCamera(bool resetOrientation = false);
    9888
    99     static void eventuallyRedraw(unsigned int flag = 0);
     89    static void eventuallyRedraw();
    10090
    10191    static void ppmWrite(const char *prefix);
     
    129119    static void setVolumeRanges();
    130120    static void setHeightmapRanges();
     121    static bool setFlowRanges();
    131122
    132123    static Flow *getFlow(const char *name);
     
    134125    static void deleteFlows(Tcl_Interp *interp);
    135126    static void deleteFlow(const char *name);
    136     static bool mapFlows();
    137127    static void getFlowBounds(vrmath::Vector3f& min,
    138128                              vrmath::Vector3f& max,
     
    145135    static Tcl_Interp *interp;
    146136
    147     static unsigned int flags;
     137    static bool redrawPending;
    148138    static bool debugFlag;
    149139    static bool axisOn;
     
    155145    static Texture2D *legendTexture;
    156146    static util::Fonts *fonts;
    157     static int updir;
    158     static Camera *cam;
    159147    static graphics::RenderContext *renderContext;
    160148
     
    177165    static void collectBounds(bool onlyVisible = false);
    178166
    179     static float _licSlice;  ///< Slice position [0,1]
    180     static int _licAxis;     ///< Slice axis: 0:x, 1:y, 2:z
     167    static Camera *_camera;
    181168
    182169    //frame buffer for final rendering
Note: See TracChangeset for help on using the changeset viewer.