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

Timestamp:

02/05/07 13:29:55 (17 years ago)

Author:

gumbau

Message:

 

File:

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

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

@@ -6 +6 @@
 
 //---------------------------------------------------------------------------
-//      Hanle events.
+//      Handle events.
 //---------------------------------------------------------------------------
 int     GeoMeshView::handle(int event)
@@ -46 +46 @@
                                                 if (mPan)
                                                 {
-                                                        xshift  =       xshift  +       (x      -       mMouseX);
+                                                        xshift  =       xshift  +       0.01;
                                                 }
                                                 else
@@ -59 +59 @@
                                                         if (mPan)
                                                         {
-                                                                xshift  =       xshift  -       (mMouseX        -       x);
+                                                                xshift  =       xshift  -       0.01;
                                                         }
                                                         else
@@ -72 +72 @@
                                                 if (mPan)
                                                 {
-                                                        yshift  =       yshift  -       (y - mMouseY);
+                                                        yshift  =       yshift  -       0.01;
                                                 }
                                                 else
@@ -85 +85 @@
                                                         if (mPan)
                                                         {
-                                                                yshift  =       yshift  +       (mMouseY        -       y);
+                                                                yshift  =       yshift  +       0.01;
                                                         }
                                                         else
@@ -884 +884 @@
                         geosubmesh->mIndexCount,
                         GL_UNSIGNED_INT,
+
                         mIndexArray[submesh]);
 
@@ -1146 +1147 @@
         glLoadIdentity();
 
-        glEnable(GL_LIGHTING);
-
         //      Frustrum.
         glViewport(0,0,w(),h());
@@ -1213 +1212 @@
         {
                 enableColorStrips();
-                //glDisable(GL_LIGHTING);
                 glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
                 drawGeoMesh(false);
         }
+
+        if (mLighting)
+        {
+                glEnable(GL_LIGHTING);
+        }
         else
         {
-                glEnable(GL_LIGHTING);
+                glDisable(GL_LIGHTING);
         }
 
@@ -1225 +1228 @@
         {
                 disableColorStrips();
-
-                //glDisable(GL_LIGHTING);
 
                 GLfloat color[4];
@@ -1257 +1258 @@
                 {
                         disableColorStrips();
-                        //glEnable(GL_LIGHTING);
                         glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
                         drawGeoMesh(false);
@@ -1279 +1279 @@
         current_texture = ilutGLLoadImage((const ILstring)imgfile);
 
-        if (!current_texture)
-        {
-                fltk::alert("Error loading texture!");
-        }
+//      if (!current_texture)
+//      {
+//              fltk::alert("Error loading texture!");
+//      }
 
         ilShutDown();
@@ -1295 +1295 @@
         current_texture_submesh[isubmesh] = ilutGLLoadImage((const ILstring)imgfile);
 
-        if (!current_texture_submesh[isubmesh])
-        {
-                fltk::alert("Error loading texture!");
-        }
+//      if (!current_texture_submesh[isubmesh])
+//      {
+//              fltk::alert("Error loading texture!");
+//      }
 
         ilShutDown();