Changeset 92

Timestamp:

10/16/07 21:49:00 (1 year ago)

Author:

baxissimo

Message:

Got drawing of vertex colors working. Added two-sided lighting toggle and turned it on by default. A lot of models have inconsistent orientation.

Files:

• trunk/OpenMeshD/OpenMesh/Apps/GLViewer/GLViewer.d (modified) (4 diffs)
• trunk/OpenMeshD/OpenMesh/Apps/GLViewer/MeshDrawerT.d (modified) (14 diffs)

trunk/OpenMeshD/OpenMesh/Apps/GLViewer/GLViewer.d

@@ -221 +221 @@
-        }
-    }
+
-    void mouse_down(ref SDL_MouseButtonEvent ev)
-    {
@@ -233 +234 @@
-        last_pos_[1] = ev.y;
-    }
+
-    void mouse_up(ref SDL_MouseButtonEvent ev)
-    {
@@ -245 +247 @@
-        last_pos_[1] = ev.y;
-    }
+
-    void mouse_move(ref SDL_MouseMotionEvent ev)
-    {
@@ -413 +416 @@
-                    g_app.drawer.flip_normals();
-                }
+                else if (key == SDLK_t) {
+                    g_app.drawer.two_sided_lighting = !
+                        g_app.drawer.two_sided_lighting;
+                }
-                else if (key == SDLK_PLUS ||
-                         key == SDLK_EQUALS) {

trunk/OpenMeshD/OpenMesh/Apps/GLViewer/MeshDrawerT.d

@@ -344 +344 @@
-    void show_fnormals(bool fnorm) { show_fnormals_ = fnorm; }
-    bool show_fnormals() { return show_fnormals_; }
+    void use_color(bool use_col) { use_color_ = use_color; }
+    bool use_color() { return use_color_; }
-
-    /// Set scaling for display of normal vectors
@@ -349 +351 @@
-    /// Return current scaling for display of normal vectors
-    float normal_scale() { return normal_scale_; }
+
+    /// Toggle two-sided lighting on and off.  
+    /// Must be called when the GL context is active.
+    void two_sided_lighting(bool onOff) {
+        int ion = onOff;
+        glLightModeliv(GL_LIGHT_MODEL_TWO_SIDE, &ion);
+    }
+
+    bool two_sided_lighting() {
+        GLboolean ion;
+        glGetBooleanv(GL_LIGHT_MODEL_TWO_SIDE, &ion);
+        return ion!=0;
+    }
-
-    void multviewGL() {
@@ -470 +485 @@
-            glShadeModel(GL_SMOOTH);
-            draw_openmesh(_draw_mode);
+
-        }
-
@@ -522 +538 @@
-    void setDefaultMaterial() {
-        GLfloat[] mat_a = [0.2, 0.2, 0.2, 1.0];
-7, 0.7, 0.5
+85, 0.85, 0.7
-        GLfloat[] mat_s = [0.6, 0.6, 0.4, 1.0];
-        GLfloat[] shine = [120.0];
@@ -535 +551 @@
-    {
-        static GLfloat[4] pos1 = [0.1,  0.1,  0.08, 0.0]; // main light
-9,  0.9,  0.7
+7,  0.7,  0.5
-
-        static GLfloat[4] pos2 = [-0.1, -0.1, 0.05, 0.0]; // secondary
-5,  0.6,  0.6
+4,  0.5,  0.55
-
-        static GLfloat[4] pos3 = [ 0.0,  0.03,  0.1,  0.0]; // headlight
@@ -595 +611 @@
-            view_all();
-        }
+
+        // Setup which material properties will track color,
+        // but don't enable GL_COLOR_MATERIAL by default
+        glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
+
+        // Two sided lighting by default because lots of real
+        // models have inconsistent triangle ordering
+        int is_ON = 1;
+        glLightModeliv(GL_LIGHT_MODEL_TWO_SIDE, &is_ON);
-    }
-
@@ -701 +726 @@
-            glNormalPointer(GL_FLOAT, 0, mesh_.vertex_normals().ptr);
-
+            if ( mesh_.has_vertex_colors()  && use_color_)
+            {
+                glEnable(GL_COLOR_MATERIAL);
+                glEnableClientState( GL_COLOR_ARRAY );
+                glColorPointer(3, GL_UNSIGNED_BYTE, 0,mesh_.vertex_colors().ptr);
+            }
+
-            if ( tex_id_ && mesh_.has_vertex_texcoords2D() )
-            {
@@ -724 +756 @@
-            glDisableClientState(GL_VERTEX_ARRAY);
-            glDisableClientState(GL_NORMAL_ARRAY);
+            glDisableClientState(GL_COLOR_ARRAY);
+            glDisable(GL_COLOR_MATERIAL);
-
-            if ( tex_id_ && mesh_.has_vertex_texcoords2D() )
@@ -740 +774 @@
-            glNormalPointer(GL_FLOAT, 0, mesh_.vertex_normals().ptr);
-
-
-
+
+
+
-                glEnableClientState( GL_COLOR_ARRAY );
-                glColorPointer(3, GL_UNSIGNED_BYTE, 0,mesh_.vertex_colors().ptr);
@@ -761 +796 @@
-            glDisableClientState(GL_NORMAL_ARRAY);
-            glDisableClientState(GL_COLOR_ARRAY);
+            glDisable(GL_COLOR_MATERIAL);
-        }  
-
@@ -826 +862 @@
-            glNormalPointer(GL_FLOAT, 0, mesh_.vertex_normals().ptr);
-
+
+            if (mesh_.has_vertex_colors() && use_color_)
+            {
+                glEnable(GL_COLOR_MATERIAL);
+                glEnableClientState(GL_COLOR_ARRAY);
+                glColorPointer(3, GL_UNSIGNED_BYTE, 0, mesh_.vertex_colors().ptr);
+            }
+
-            if ( tex_id_ && mesh_.has_vertex_texcoords2D() )
-            {
@@ -848 +892 @@
-            glDisableClientState(GL_NORMAL_ARRAY);
-            glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+            glDisableClientState(GL_COLOR_ARRAY);
+            glDisable(GL_COLOR_MATERIAL);
+
-        }
-
@@ -892 +939 @@
-            if (mesh_.has_vertex_colors() && use_color_)
-            {
+                glEnable(GL_COLOR_MATERIAL);
-                glEnableClientState(GL_COLOR_ARRAY);
-                glColorPointer(3, GL_UNSIGNED_BYTE, 0, mesh_.vertex_colors().ptr);
+            } else {
+                glColor3f(1,1,1);
-            }
-
@@ -899 +949 @@
-            glDisableClientState(GL_VERTEX_ARRAY);
-            glDisableClientState(GL_COLOR_ARRAY);
+            glDisable(GL_COLOR_MATERIAL);
-        }
-