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

Timestamp:

05/30/06 12:53:21 (19 years ago)

Author:

gumbau

Message:

Added support for texture mapping to the GeoTool?

Location:

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

Files:

• GeoMeshView.h (modified) (2 diffs)
• GeoMeshViewUI.h (modified) (5 diffs)

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

@@ -195 +195 @@
         // load a image file as a texture
         void    LoadTexture(const char *);
+        void    LoadTextureSubMesh(int isubmesh, const char *);
+
+        int getSubMeshCount(void) const { return mSubMeshCount; }
+        void resetTextures(void);
 
         private:
@@ -237 +241 @@
         // Current texture handle (OpenGL handle: 0=no texture)
         GLuint current_texture;
+        GLuint *current_texture_submesh;
         bool use_texture_mapping; // this flag enables texture mapping when a texture is loaded
 

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
@@ -117 +115 @@
 
         MeshSimplificationSequence      *oMeshSimpSequence;
-        LodStripsConstructor                            *oLodStrip;
-        GeoMeshLoader                                                           *geoMeshLoader;
+        LodStripsConstructor            *oLodStrip;
+        GeoMeshLoader                           *geoMeshLoader;
 
         inline void cb_menuFileOpen_i(fltk::Item*, void*);
@@ -128 +126 @@
         inline void cb_menuFileLoadTexture_i(fltk::Item*, void*);
         static void cb_menuFileLoadTexture(fltk::Item*, void*);
+        inline void cb_menuFileLoadTextureSubMesh_i(fltk::Item*, void*);
+        static void cb_menuFileLoadTextureSubMesh(fltk::Item*, void*);
 
         inline void cb_menuMeshInfo_i(fltk::Item*, void*);
@@ -296 +296 @@
         fltk::Item                                      *menuMeshExportOBJ;
         fltk::Item                                      *menuFileTransformSharedVertex;
-        fltk::Item                                      *menuFileLoadTexture;
+        fltk::ItemGroup                         *menuLoadTextures;
+        fltk::Item                                              *menuFileLoadTexture;
 
         fltk::Item                                      *menuFileQuit;
@@ -380 +381 @@
         float updateProgressBar(float);
 
+        void BuildLoadTextureSubMeshMenu(void);
+        int numSubMeshNames;
+        char **SubMeshNames;
+
 };