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

Timestamp:

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

Author:

gumbau

Message:

 

Location:

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

Files:

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

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

@@ -399 +399 @@
             : fltk::GlWindow(x,y,w,h,l)
 {
-                mStripColors                    =       NULL;
+                mStripColors            =       NULL;
                 mSharedPosArray         =       NULL;
                 mSharedNorArray         =       NULL;
-                mPosArray                                       =       NULL;
-                mNorArray                                       =       NULL;
-                mIndexArray                             =       NULL;
-    vAng                                                        = 0.0;
+                mSharedTexCoordArray=   NULL;
+                mPosArray                       =       NULL;
+                mNorArray                       =       NULL;
+                mTexCoordArray          =       NULL;
+                mIndexArray                     =       NULL;
+                vAng                            = 0.0;
                 hAng                                                    =       0.0;
                 size                                                    =       0.0;
@@ -432 +434 @@
                 //      Cross Reference.
                 mGeoMeshViewUI  =       geoMeshViewUI;
+
+                current_texture = 0;
+                use_texture_mapping = true;
 }
 
@@ -474 +479 @@
                         delete  []      mNorArray[submesh];
                         delete  []      mIndexArray[submesh];
+                        delete  []      mTexCoordArray[submesh];
                 }
                 
                 delete  []      mSharedPosArray;
                 delete  []      mSharedNorArray;
+                delete  []      mSharedTexCoordArray;
                 delete  []      mPosArray;
                 delete  []      mNorArray;
@@ -491 +498 @@
                 mSharedPosArray =       new GLfloat[vertex_buffer->mVertexCount * 3];
                 mSharedNorArray =       new GLfloat[vertex_buffer->mVertexCount * 3];
+                mSharedTexCoordArray    =       new GLfloat[vertex_buffer->mVertexCount * 2];
 
                 for (int vertex = 0; vertex < vertex_buffer->mVertexCount; vertex++)
                 {
-                        mSharedPosArray[3 * vertex]                             =       vertex_buffer->mPosition[vertex].x;
+                        mSharedPosArray[3 * vertex]                     =       vertex_buffer->mPosition[vertex].x;
                         mSharedPosArray[(3 * vertex) + 1]       =       vertex_buffer->mPosition[vertex].y;
                         mSharedPosArray[(3 * vertex) + 2]       =       vertex_buffer->mPosition[vertex].z;
 
-                        mSharedNorArray[3 * vertex]                             =       vertex_buffer->mNormal[vertex].x;
+                        mSharedNorArray[3 * vertex]                     =       vertex_buffer->mNormal[vertex].x;
                         mSharedNorArray[(3 * vertex) + 1]       =       vertex_buffer->mNormal[vertex].y;
                         mSharedNorArray[(3 * vertex) + 2]       =       vertex_buffer->mNormal[vertex].z;
+
+                        mSharedTexCoordArray[2 * vertex]                =       vertex_buffer->mTexCoords[vertex].x;
+                        mSharedTexCoordArray[(2 * vertex) + 1]  =       vertex_buffer->mTexCoords[vertex].y;
                 }
         }
@@ -507 +518 @@
         mPosArray               =       new GLfloat*[geomesh->mSubMeshCount];
         mNorArray               =       new GLfloat*[geomesh->mSubMeshCount];
-        mIndexArray     =       new GLuint*[geomesh->mSubMeshCount];
+        mTexCoordArray  =       new GLfloat*[geomesh->mSubMeshCount];
+        mIndexArray             =       new GLuint*[geomesh->mSubMeshCount];
 
         //      For each submesh.
@@ -532 +544 @@
                         mPosArray[submesh]      =       new GLfloat[vertex_buffer->mVertexCount * 3];
                         mNorArray[submesh]      =       new GLfloat[vertex_buffer->mVertexCount * 3];
+                        mTexCoordArray[submesh] =       new GLfloat[vertex_buffer->mVertexCount * 2];
 
                         //      For each one of the vertex.
                         for (int vertex = 0; vertex < vertex_buffer->mVertexCount; vertex++)
                         {
-                                mPosArray[submesh][3 * vertex]                          =       vertex_buffer->mPosition[vertex].x;
+                                mPosArray[submesh][3 * vertex]                  =       vertex_buffer->mPosition[vertex].x;
                                 mPosArray[submesh][(3 * vertex) + 1]    =       vertex_buffer->mPosition[vertex].y;
                                 mPosArray[submesh][(3 * vertex) + 2]    =       vertex_buffer->mPosition[vertex].z;
 
-                                mNorArray[submesh][3 * vertex]                          =       vertex_buffer->mNormal[vertex].x;
+                                mNorArray[submesh][3 * vertex]                  =       vertex_buffer->mNormal[vertex].x;
                                 mNorArray[submesh][(3 * vertex) + 1]    =       vertex_buffer->mNormal[vertex].y;
                                 mNorArray[submesh][(3 * vertex) + 2]    =       vertex_buffer->mNormal[vertex].z;
+
+                                mTexCoordArray[submesh][2 * vertex]             =       vertex_buffer->mTexCoords[vertex].x;
+                                mTexCoordArray[submesh][(2 * vertex) + 1]       =       vertex_buffer->mTexCoords[vertex].y;
                         }//     End for each vertex.
                 }
@@ -550 +566 @@
                         mPosArray[submesh]      =       NULL;
                         mNorArray[submesh]      =       NULL;
+                        mTexCoordArray[submesh] =       NULL;
                 }
 
@@ -633 +650 @@
         Index                                   position;
         Vector3                         vector3;
+        Vector2                         vector2;
         float                                   x,y,z;
         float                                   r,g,b;
@@ -706 +724 @@
                         //      Sets the vertex normal.
                         glNormal3f(x,y,z);
+
+                        // set the texture coordinates if needed
+                        if (current_texture && use_texture_mapping)
+                        {
+                                vector2 = geosubmesh->mVertexBuffer->mTexCoords[position];
+                                x                               =       vector3[0];
+                                y                               =       vector3[1];
+                                glTexCoord2f(x,y);
+                        }
 
                         //      Gets the vertex coordinates.
@@ -789 +816 @@
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_NORMAL_ARRAY);
+        if (current_texture && use_texture_mapping)
+                glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+        else
+                glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
         //      If the submesh is shared vertex.
@@ -795 +826 @@
                 glVertexPointer(3, GL_FLOAT, 0, mSharedPosArray);
                 glNormalPointer(GL_FLOAT, 0, mSharedNorArray);
+                if (current_texture && use_texture_mapping)
+                        glTexCoordPointer(2, GL_FLOAT, 0, mSharedTexCoordArray);
         }
         else
@@ -800 +833 @@
                 glVertexPointer(3, GL_FLOAT, 0, mPosArray[submesh]);
                 glNormalPointer(GL_FLOAT, 0, mNorArray[submesh]);
+                if (current_texture && use_texture_mapping)
+                        glTexCoordPointer(2, GL_FLOAT, 0, mTexCoordArray[submesh]);
         }
 
@@ -1044 +1079 @@
         glMatrixMode(GL_PROJECTION);
         glLoadIdentity();
+
+        if (current_texture && use_texture_mapping)
+                glEnable(GL_TEXTURE_2D);
+        else
+                glDisable(GL_TEXTURE_2D);
 
         glEnable(GL_LIGHTING);
@@ -1144 +1184 @@
 }
 
+
+#include <IL/ILUT.h>
+
+void    GeoMeshView::LoadTexture(const char *imgfile)
+{
+        ilInit();
+        ilutEnable(ILUT_OPENGL_CONV);
+        ilutRenderer(ILUT_OPENGL);
+
+        current_texture = ilutGLLoadImage((const ILstring)imgfile);
+        if (!current_texture)
+                fltk::alert("Error loading texture!");
+
+        ilShutDown();
+}

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

@@ -28 +28 @@
         mMainWindow->redraw();
 }
+
+inline void GeoMeshViewUI::cb_menuFileLoadTexture_i(fltk::Item*, void*)
+{
+        fltk::FileChooser       *fcho = new fltk::FileChooser("","*.jpg",fltk::FileChooser::CREATE,"Open image file");
+        fcho->exec();
+        if (fcho->value())
+                geoMeshView->LoadTexture(fcho->value());
+}
+
+void GeoMeshViewUI::cb_menuFileLoadTexture(fltk::Item *o, void *v)
+{
+        ((GeoMeshViewUI*)       (o->parent()->parent()->parent()->user_data()))
+                                                                                ->
+                                                                                cb_menuFileLoadTexture_i(o,v);
+}
+
 
 //---------------------------------------------------------------------------
@@ -539 +555 @@
         //      Repaint the main window.
         mMainWindow->redraw();
+        if (geoMeshView->isTextureMappingEnabled())
+                geoMeshView->disableTextureMapping();
+        else
+                geoMeshView->enableTextureMapping();
 }
 
@@ -2771 +2791 @@
 
                                 {
+                                        fltk::Item* o = menuFileLoadTexture = new fltk::Item("Load texture");
+                                        o->callback((fltk::Callback*)cb_menuFileLoadTexture);
+                                }
+
+                                {
                                         fltk::Item* o = menuFileQuit = new fltk::Item("Quit");
                                         o->callback((fltk::Callback*)cb_menuFileQuit);
@@ -2880 +2905 @@
                                 }
 
-                                //new fltk::Divider();
-
-                                //{
-                                //      fltk::Item* o = menuRenderTextures = new fltk::Item("Textures");
-                                //      o->callback((fltk::Callback*)cb_menuRenderTextures);
-                                //}
+                                new fltk::Divider();
+
+                                {
+                                        fltk::Item* o = menuRenderTextures = new fltk::Item("Texture mapping");
+                                        o->type(fltk::Item::RADIO);
+                                        o->set_value();
+                                        o->callback((fltk::Callback*)cb_menuRenderTextures);
+                                }
 
                                 o->end();