Changeset 995 for GTP/trunk/Lib/Geom/shared/GeoTool/src

Timestamp:

05/30/06 14:07:05 (18 years ago)

Author:

gumbau

Message:

 

Location:

GTP/trunk/Lib/Geom/shared/GeoTool/src

Files:

• GeoMeshView.cpp (modified) (4 diffs)
• GeoMeshViewUI.cpp (modified) (2 diffs)

GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshView.cpp

@@ -985 +985 @@
         Index                                   position;
         Vector3                         vector3;
+        Vector2                         vector2;
         float                                   x,y,z;
         float                                   r,g,b;
@@ -993 +994 @@
         current_strip   =       0;
 
-
+        glEnable(GL_ALPHA_TEST);
+//      glEnable(GL_BLEND);
         // DRAW THE TRUNK AS A LODSTRIP OBJECT
 
@@ -999 +1001 @@
         for (int submesh = 0; submesh < geoMesh->mSubMeshCount; submesh++)
         {
-                
+                // bind current texture to use
+                GLuint usetex = 0;
+                if (use_texture_mapping)
+                {
+                        if (current_texture_submesh[submesh])
+                                usetex=current_texture_submesh[submesh];
+                        else if (current_texture)
+                                usetex=current_texture;
+                }
+                glBindTexture(GL_TEXTURE_2D,usetex);            
+
                 color_index     =       0;
 
@@ -1039 +1051 @@
                                 //      Sets the vertex normal.
                                 glNormal3f(x,y,z);
+
+                                // set the texture coordinates if needed
+                                if (usetex)
+                                {
+                                        vector2 = geosubmesh->mVertexBuffer->mTexCoords[position];
+                                        x                               =       vector2[0];
+                                        y                               =       vector2[1];
+                                        glTexCoord2f(x,y);
+                                }
 
                                 //      Gets the vertex coordinates.

GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshViewUI.cpp

@@ -34 +34 @@
 inline void GeoMeshViewUI::cb_menuFileLoadTexture_i(fltk::Item*, void*)
 {
-        fltk::FileChooser       *fcho = new fltk::FileChooser("","*.jpg",fltk::FileChooser::CREATE,"Open image file");
+        static char pattern[] = "*.{jpg|tga|png|bmp}";
+
+        fltk::FileChooser       *fcho = new fltk::FileChooser("",pattern,fltk::FileChooser::CREATE,"Open image file");
         fcho->exec();
         char filename[256]="";  
@@ -53 +55 @@
 inline void GeoMeshViewUI::cb_menuFileLoadTextureSubMesh_i(fltk::Item *item, void *)
 {
+        static char pattern[] = "*.{jpg|tga|png|bmp}";
+
         const char * label = item->label();
         int isubmesh = label[strlen(label)-1]-48;
 
-        fltk::FileChooser       *fcho = new fltk::FileChooser("","*.jpg",fltk::FileChooser::CREATE,"Open image file");
+        fltk::FileChooser       *fcho = new fltk::FileChooser("",pattern,fltk::FileChooser::CREATE,"Open image file");
         fcho->exec();
         char filename[256]="";