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

Timestamp:

05/31/06 10:20:15 (19 years ago)

Author:

gumbau

Message:

 

Location:

GTP/trunk/Lib/Geom/shared

Files:

• . (modified) (1 prop)
• GeoTool/src/GeoMeshView.cpp (modified) (13 diffs)
• GeoTool/src/GeoMeshViewUI.cpp (modified) (3 diffs)

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

@@ -671 +671 @@
 
         // 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);
-
+        bool usetex = SetTextureRenderingState(submesh);
 
         //      For each one of the strips.
@@ -797 +788 @@
         geosubmesh      =       &geoMesh->mSubMesh[submesh];
         
+        // bind current texture to use
+        bool usetex = SetTextureRenderingState(submesh);
+
         //      If wire is not selected.
         if (!paintWire)
@@ -817 +811 @@
                         if (submesh == leavesSubMesh)
                         {
-                                glColor3d(0.0,1.0,0.0);
-                                GLfloat green[] =       {0.0f,1.0f,0.0f,1.0f};
-                                glMaterialfv(GL_FRONT_AND_BACK,GL_DIFFUSE,green);
+                                if (!usetex)
+                                {
+                                        glColor3d(0.0,1.0,0.0);
+                                        GLfloat green[] =       {0.0f,1.0f,0.0f,1.0f};
+                                        glMaterialfv(GL_FRONT_AND_BACK,GL_DIFFUSE,green);
+                                }
+                                else
+                                {
+                                        glEnable(GL_ALPHA_TEST);
+                                        glAlphaFunc(GL_GREATER,0.5f);
+                                        glLightModeli(GL_LIGHT_MODEL_TWO_SIDE,1);
+                                }
                         }
                 }
@@ -832 +835 @@
         }
 
-        // 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);
-        
+        if (usetex)
+        {
+                glColor4f(1.0f,1.0f,1.0f,1.0f);
+                GLfloat white[] =       {1.0f,1.0f,1.0f,1.0f};
+                glMaterialfv(GL_FRONT_AND_BACK,GL_DIFFUSE,white);
+        }
+
         //      Enable arrays.
         glEnableClientState(GL_VERTEX_ARRAY);
@@ -871 +870 @@
                         GL_UNSIGNED_INT,
                         mIndexArray[submesh]);
+
+        if (submesh==leavesSubMesh)
+        {
+                glDisable(GL_ALPHA_TEST);
+                glLightModeli(GL_LIGHT_MODEL_TWO_SIDE,0);
+        }
 
 }//End drawTriangleList
@@ -895 +900 @@
         {
                 // 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);            
+                bool usetex = SetTextureRenderingState(submesh);
 
                 color_index     =       0;
@@ -994 +991 @@
         current_strip   =       0;
 
-        glEnable(GL_ALPHA_TEST);
-//      glEnable(GL_BLEND);
         // DRAW THE TRUNK AS A LODSTRIP OBJECT
 
@@ -1001 +996 @@
         for (int submesh = 0; submesh < geoMesh->mSubMeshCount; submesh++)
         {
+                if (submesh==leavesSubMesh)
+                        continue;
+
                 // 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);            
+                bool usetex = SetTextureRenderingState(submesh);
 
                 color_index     =       0;
@@ -1082 +1072 @@
 
         // DRAW THE LEAVES AS A TRIANGLE SOUP
-        glColor3f(0,1,1);
-        glDisable(GL_LIGHTING);
+        // bind current texture to use
+        bool usetex = SetTextureRenderingState(leavesSubMesh);
+
+        glEnable(GL_ALPHA_TEST);
+        glAlphaFunc(GL_GREATER,0.5f);
+        glLightModeli(GL_LIGHT_MODEL_TWO_SIDE,1);
+
         glBegin(GL_TRIANGLES);
         const Geometry::VertexData *foliage_verts = lodTreeLib->Get_Foliage_VertexData();
@@ -1090 +1085 @@
         {
                 float vx,vy,vz;
+                if (usetex)
+                {
+                        foliage_verts->GetVertexTexCoord(foliage_inds->GetIndex(j),vx,vy);
+                        glTexCoord2f(vx,vy);
+                }
+                foliage_verts->GetVertexNormal(foliage_inds->GetIndex(j),vx,vy,vz);
+                glNormal3f(vx,vy,vz);
                 foliage_verts->GetVertexCoord(foliage_inds->GetIndex(j),vx,vy,vz);
                 glVertex3f(vx,vy,vz);
@@ -1095 +1097 @@
         glEnd();
 
-        glEnable(GL_LIGHTING);
         glColor3f(1,1,1);
-        
-}//End drawTriangleStrip.
+        glDisable(GL_ALPHA_TEST);
+        glLightModeli(GL_LIGHT_MODEL_TWO_SIDE,0);       
+}
 
 
@@ -1150 +1152 @@
         glMatrixMode(GL_PROJECTION);
         glLoadIdentity();
-
-        if (current_texture && use_texture_mapping)
-                glEnable(GL_TEXTURE_2D);
-        else
-                glDisable(GL_TEXTURE_2D);
 
         glEnable(GL_LIGHTING);
@@ -1299 +1296 @@
         }
 }
+
+
+bool    GeoMeshView::SetTextureRenderingState(int submesh)
+{
+        GLuint usetex = 0;
+        if (use_texture_mapping)
+        {
+                if (current_texture_submesh[submesh])
+                        usetex=current_texture_submesh[submesh];
+                else if (current_texture)
+                        usetex=current_texture;
+        }
+        if (usetex)
+                glEnable(GL_TEXTURE_2D);
+        else
+                glDisable(GL_TEXTURE_2D);
+
+        glBindTexture(GL_TEXTURE_2D,usetex);
+
+        return (usetex!=0);
+}
+
+
+int             GeoMeshView::findLeavesSubMesh(void)
+{
+        for (int i=0; i<geoMesh->mSubMeshCount; i++)
+                if (geoMesh->mSubMesh[i].mType==GEO_TRIANGLE_LIST)
+                        return i;
+        return -1;
+}

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

@@ -24 +24 @@
         //      Deactive Lod tree visualization.
         geoMeshView->deactiveLodTree();
-
-        geoMeshView->resetTextures();
-        BuildLoadTextureSubMeshMenu();
 
         //      Repaint the window.
@@ -922 +919 @@
                         //      Show title.
                         mProcessTitle->label("Visualize LodTrees");
+
+                        // set the submesh with triangle lists as the leaves submesh
+                        geoMeshView->setLeavesSubMesh(geoMeshView->findLeavesSubMesh());
 
                         //      Show the Visulize LodTree panel.
@@ -2521 +2521 @@
                         //      Restore simplification state.
                         simplificationState     =       NO_SIMPLIFICATION;
+
+                        geoMeshView->resetTextures();
+                        BuildLoadTextureSubMeshMenu();
                 }
         }