Changeset 2831 for trunk/packages/vizservers/nanovis/Texture3D.h

Timestamp:

Mar 9, 2012, 10:12:14 AM (13 years ago)

Author:

ldelgass

Message:

Refactor texture classes, misc. cleanups, cut down on header pollution -- still
need to fix header deps in Makefile.in

File:

• trunk/packages/vizservers/nanovis/Texture3D.h (modified) (1 diff)

trunk/packages/vizservers/nanovis/Texture3D.h

@@ -14 +14 @@
  * ======================================================================
  */
-#ifndef _TEXTURE_3D_H_
-#define _TEXTURE_3D_H_
+#ifndef TEXTURE3D_H
+#define TEXTURE3D_H
 
 #include <GL/glew.h>
-#include "config.h"
 
-class Texture3D{
-        
+class Texture3D
+{
+public:
+    Texture3D();
 
-public:
-        int width;
-        int height;
-        int depth;
+    Texture3D(int width, int height, int depth,
+              GLuint type = GL_FLOAT,
+              GLuint interp = GL_LINEAR,
+              int numComponents = 4,
+              void *data = NULL);
 
-        double aspect_ratio_width;
-        double aspect_ratio_height;
-        double aspect_ratio_depth;
+    ~Texture3D();
 
-        GLuint type;
-        GLuint interp_type;
-        int n_components;
-        bool gl_resource_allocated;
+    GLuint initialize(void *data);
 
-        GLuint id;
-        GLuint tex_unit;
+    void update(void *data);
 
-        Texture3D();
-        Texture3D(int width, int height, int depth, GLuint type, GLuint interp, int n);
-        ~Texture3D();
-        
-        void activate();
-        void deactivate();
-        GLuint initialize(float* data);
-        static void check_max_size();
-        static void check_max_unit();
+    void activate();
 
-    void update(float* data);
+    void deactivate();
 
+    static void check_max_size();
+
+    static void check_max_unit();
+
+    int width;
+    int height;
+    int depth;
+
+    double aspect_ratio_width;
+    double aspect_ratio_height;
+    double aspect_ratio_depth;
+
+    int n_components;
+
+    bool gl_resource_allocated;
+    GLuint id;
+    GLuint type;
+    GLuint interp_type;
+    //GLuint tex_unit;
 };