Ignore:
Timestamp:
Dec 20, 2014, 1:00:34 AM (5 years ago)
Author:
ldelgass
Message:

Merge r3611:3618 from trunk

Location:
nanovis/branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1

  • nanovis/branches/1.1/nanovis.h

    r4886 r4889  
    4040    class Fonts;
    4141}
    42 }
    4342
    44 class NvCamera;
     43class Camera;
    4544class Flow;
    4645class Grid;
    4746class HeightMap;
    48 class NvLIC;
    49 class NvParticleRenderer;
     47class LIC;
    5048class PlaneRenderer;
    5149class Texture2D;
     
    9189    static void removeAllData();
    9290
    93     static const NvCamera *getCamera()
     91    static const Camera *getCamera()
    9492    {
    9593        return cam;
     
    156154    static unsigned char *screenBuffer;
    157155    static Texture2D *legendTexture;
    158     static nv::util::Fonts *fonts;
     156    static util::Fonts *fonts;
    159157    static int updir;
    160     static NvCamera *cam;
    161     static nv::graphics::RenderContext *renderContext;
     158    static Camera *cam;
     159    static graphics::RenderContext *renderContext;
    162160
    163161    static TransferFunctionHashmap tfTable; ///< maps transfunc name to TransferFunction object
     
    172170    static VolumeRenderer *volRenderer;
    173171    static VelocityArrowsSlice *velocityArrowsSlice;
    174     static NvLIC *licRenderer;
     172    static LIC *licRenderer;
    175173    static PlaneRenderer *planeRenderer;
    176174    static Grid *grid;
     
    186184};
    187185
     186}
     187
    188188#endif
Note: See TracChangeset for help on using the changeset viewer.