Changeset 5718 for nanovis/branches/1.2/nanovis.h

Timestamp:

Jun 17, 2015, 2:23:37 AM (9 years ago)

Author:

ldelgass

Message:

Merge from trunk

Location:

nanovis/branches/1.2

Files:

• . (modified) (1 prop)
• nanovis.h (modified) (2 diffs)

nanovis/branches/1.2/nanovis.h

@@ -94 +94 @@
 
     static int renderLegend(TransferFunction *tf, double min, double max, 
-                            int width, int height, const char *volArg);
+                            int width, int height, const char *tag);
 
     static Volume *loadVolume(const char *tag, int width, int height, int depth,
@@ -139 +139 @@
     static util::Fonts *fonts;
     static graphics::RenderContext *renderContext;
+    static GLint max3dTextureSize;
 
     static TransferFunctionHashmap tfTable; ///< maps transfunc name to TransferFunction object