Changeset 993 for GTP/trunk/Lib/Geom/shared/GeoTool/include

Timestamp:

05/30/06 10:47:05 (19 years ago)

Author:

gumbau

Message:

 

Location:

GTP/trunk/Lib/Geom/shared/GeoTool/include

Files:

• GeoMeshView.h (modified) (4 diffs)
• GeoMeshViewUI.h (modified) (3 diffs)

GTP/trunk/Lib/Geom/shared/GeoTool/include/GeoMeshView.h

@@ -192 +192 @@
         void    GoToLod_LodStrip(unsigned int lod);
         void    GoToLod_LodTree(unsigned int lod);
+        
+        // load a image file as a texture
+        void    LoadTexture(const char *);
 
         private:
@@ -231 +234 @@
         //      Mesh to show.
         Geometry::Mesh  *geoMesh;
+
+        // Current texture handle (OpenGL handle: 0=no texture)
+        GLuint current_texture;
+        bool use_texture_mapping; // this flag enables texture mapping when a texture is loaded
 
         virtual int     handle(int event);
@@ -242 +249 @@
         void    enableColorStrips();
         void    disableColorStrips();
+        void    enableTextureMapping(){ use_texture_mapping=true; }
+        void    disableTextureMapping(){ use_texture_mapping=false; }
+        bool    isTextureMappingEnabled(){ return use_texture_mapping; }
         bool    getColorStrips();
 
@@ -259 +269 @@
         GLfloat **mPosArray;
         GLfloat **mNorArray;
+        GLfloat **mTexCoordArray;
         GLfloat *mSharedPosArray;
         GLfloat *mSharedNorArray;
+        GLfloat *mSharedTexCoordArray;
         GLuint  **mIndexArray;
 

GTP/trunk/Lib/Geom/shared/GeoTool/include/GeoMeshViewUI.h

@@ -52 +52 @@
 #include        "../resource.h"
 
+//#include <IL/IL.h>
+
 //      State of the button process.
 enum    ProcessState
@@ -124 +126 @@
         inline void cb_menuFileSaveAs_i(fltk::Item*, void*);
         static void cb_menuFileSaveAs(fltk::Item*, void*);
+        inline void cb_menuFileLoadTexture_i(fltk::Item*, void*);
+        static void cb_menuFileLoadTexture(fltk::Item*, void*);
 
         inline void cb_menuMeshInfo_i(fltk::Item*, void*);
@@ -292 +296 @@
         fltk::Item                                      *menuMeshExportOBJ;
         fltk::Item                                      *menuFileTransformSharedVertex;
+        fltk::Item                                      *menuFileLoadTexture;
 
         fltk::Item                                      *menuFileQuit;