Changeset 980 for GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshView.cpp

Timestamp:

05/24/06 10:47:49 (18 years ago)

Author:

gumbau

Message:

 

File:

• GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshView.cpp (modified) (18 diffs)

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

@@ -200 +200 @@
 //      Set the color to the submesh sumbmeshIndex
 //---------------------------------------------------------------------------
-void    GeoMeshView::setColorSubmeshi(int submeshIndex)
-{
-        colorsubmeshi   =       submeshIndex;
+void    GeoMeshView::setSubMeshSelected(int submeshIndex)
+{
+        mSubMeshSelected        =       submeshIndex;
 }
 
@@ -208 +208 @@
 //      Sets the leaves submesh index.
 //---------------------------------------------------------------------------
-void    GeoMeshView::setLeavesSubmesh(int submeshIndex)
-{
-        leavesSubmesh   =       submeshIndex;
+void    GeoMeshView::setLeavesSubMesh(int submeshIndex)
+{
+        leavesSubMesh   =       submeshIndex;
 }
 
@@ -216 +216 @@
 //      Gets the leaves submesh index.
 //---------------------------------------------------------------------------
-int     GeoMeshView::getLeavesSubmesh()
-{
-        return  leavesSubmesh;
+int     GeoMeshView::getLeavesSubMesh()
+{
+        return  leavesSubMesh;
 }
 
@@ -277 +277 @@
 }
 
+/*
 //---------------------------------------------------------------------------
 //      Get the bounding box of the object.
@@ -386 +387 @@
         return  bounds;
 }
+*/
 
 //---------------------------------------------------------------------------
@@ -446 +448 @@
         GLfloat color_blanco[]  =       {1.0f,1.0f,1.0f,1.0f};
 
-        this->geoMesh   =       geomesh;
-        colorsubmeshi   =       -1;
-        leavesSubmesh   =       -1;
+        this->geoMesh                   =       geomesh;
+        mSubMeshSelected        =       -1;
+        leavesSubMesh                   =       -1;
+        mScaleFactor                    =       geomesh->mMeshBounds.scaleFactor;
         
         //      Refresh vertices to the vertex array.
@@ -577 +580 @@
 //      Repaint the Mesh.
 //---------------------------------------------------------------------------
-void GeoMeshView::drawGeoMesh(int selectedMesh)
+void GeoMeshView::drawGeoMesh(bool      paintWire)
 {
         SubMesh *geosubmesh;
@@ -601 +604 @@
                                 if (geosubmesh->mType   ==      GEO_TRIANGLE_LIST)
                                 {
-                                        if (selectedMesh == submesh)
+                                        if (mSubMeshSelected == submesh)
                                         {
                                                 submesh_selected        = true;
@@ -611 +614 @@
                                         
                                         //      Draw the actual submesh in triangle list.
-                                        drawTriangleList(submesh,submesh_selected);
+                                        drawTriangleList(submesh,submesh_selected,paintWire);
                                 }
                                 else
@@ -618 +621 @@
                                         drawTriangleStrip(submesh);
                                 }
-                        }               
-                }
-                /*
-                //      Choose the render operation.
-                else if (geoMesh->mType == GEO_TRIANGLE_LIST)
-                {
-                        //      Paint vertices.
-                        drawTriangleList(selectedMesh);
-                }
-                else
-                {
-                        //      Paint vertices.
-                        drawTriangleStrip();
-                }
-                */
+                        }
+                }
         }
 }//     End drawGeoMesh.
@@ -743 +733 @@
 //---------------------------------------------------------------------------
 void GeoMeshView::drawTriangleList(     int                     submesh,
-                                                                                                                                                bool            selectedSubMesh)
+                                                                                                                                                bool            selectedSubMesh,
+                                                                                                                                                bool            paintWire)
 {
         SubMesh *geosubmesh;
@@ -761 +752 @@
         geosubmesh      =       &geoMesh->mSubMesh[submesh];
         
-        //      If a mesh is selected.
-        if (selectedSubMesh)
-        {
-                glColor3d(1.0,0.0,0.0);
-                GLfloat red[]   =       {1.0f,0.0f,0.0f,1.0f};
-                glMaterialfv(GL_FRONT_AND_BACK,GL_DIFFUSE,red);
-        }
-        //      If is a tree.
-        else if (leavesSubmesh >= 0)
-        {
-                glColor3d(1.0, 0.5, 0.5);
-                GLfloat brown[] =       {1.0f,0.5f,0.5f,1.0f};
-                glMaterialfv(GL_FRONT_AND_BACK,GL_DIFFUSE,brown);
-
-                //      For each index of the strip.
-                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 is NOT a tree.
-        else
-        {
-                //      Set white color to the object.
-                glColor3d(1.0, 1.0, 1.0);
-                GLfloat white[] =       {1.0f,1.0f,1.0f,1.0f};
-                glMaterialfv(GL_FRONT_AND_BACK,GL_DIFFUSE,white);
-        }
-
-
+        //      If wire is not selected.
+        if (!paintWire)
+        {
+                //      If a mesh is selected.
+                if (selectedSubMesh)
+                {
+                        glColor3d(1.0,0.0,0.0);
+                        GLfloat red[]   =       {1.0f,0.0f,0.0f,1.0f};
+                        glMaterialfv(GL_FRONT_AND_BACK,GL_DIFFUSE,red);
+                }
+                //      If is a tree.
+                else if (leavesSubMesh >= 0)
+                {
+                        glColor3d(1.0, 0.5, 0.5);
+                        GLfloat brown[] =       {1.0f,0.5f,0.5f,1.0f};
+                        glMaterialfv(GL_FRONT_AND_BACK,GL_DIFFUSE,brown);
+
+                        //      For each index of the strip.
+                        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 is NOT a tree.
+                else
+                {
+                        //      Set white color to the object.
+                        glColor3d(1.0, 1.0, 1.0);
+                        GLfloat white[] =       {1.0f,1.0f,1.0f,1.0f};
+                        glMaterialfv(GL_FRONT_AND_BACK,GL_DIFFUSE,white);
+                }
+        }
+        
         //      Enable arrays.
         glEnableClientState(GL_VERTEX_ARRAY);
@@ -1056 +1050 @@
         //      Frustrum.
         glViewport(0,0,w(),h());
-        gluPerspective(60,1,0.1,1000);
+        gluPerspective(60,(float)w()/(float)h(),0.1,1000);
 
         glMatrixMode(GL_MODELVIEW);
@@ -1082 +1076 @@
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-        gluLookAt(0,0,mScaleFactor*2+size, 0,0,0, 0,1,0);
+        gluLookAt(0,0,2/*mScaleFactor*/ + size * 0.25, 0,0,0, 0,1,0);
 
         glTranslatef(xshift,yshift,0);
         glRotatef(hAng,0,1,0);
         glRotatef(vAng,1,0,0);
-        glTranslatef(-xMed,-yMed,-zMed);
+        //glTranslatef(-xMed,-yMed,-zMed);
 
         //      Set white color to the object.
@@ -1094 +1088 @@
         glMaterialfv(GL_FRONT_AND_BACK,GL_DIFFUSE,color_blanco);
 
+        glClearColor(0,0,0,0);
+        
         if (mCW)
         {
@@ -1117 +1113 @@
                 glDisable(GL_LIGHTING);
                 glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
-                drawGeoMesh(colorsubmeshi);
+                drawGeoMesh(false);
         }
         else
@@ -1130 +1126 @@
                 glColor3d(0.0, 0.0, 1.0);
                 glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
-                drawGeoMesh(-1);
+                drawGeoMesh(true);
         }
         else
@@ -1139 +1135 @@
                         glEnable(GL_LIGHTING);
                         glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-                        drawGeoMesh(colorsubmeshi);
+                        drawGeoMesh(false);
                 }
         }