Merge pull request #17 from rickgaiser/for-ps2dev

Improve defaults for lighting and per-vertex colors

Author: rickgaiser

examples/nehe/lesson03/lesson3.cpp

@@ -23,8 +23,13 @@ void init(GLvoid) // Create Some Everyday Functions
     glClearDepth(1.0f);                   // Depth Buffer Setup
     glEnable(GL_DEPTH_TEST);              // Enables Depth Testing
     glDepthFunc(GL_LEQUAL);               // The Type Of Depth Testing To Do
-    //glEnable(GL_COLOR_MATERIAL);
     glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+
+    // ps2gl needs lighting + color_material for per-vertex colors
+    glEnable(GL_COLOR_MATERIAL);
+    glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
+    glEnable(GL_LIGHTING);
+    glEnable(GL_LIGHT0);
 }
 
 void display(void)                                      // Create The Display Function

examples/nehe/lesson04/lesson4.cpp

@@ -26,8 +26,13 @@ void init(GLvoid) // Create Some Everyday Functions
     glClearDepth(1.0f);                   // Depth Buffer Setup
     glEnable(GL_DEPTH_TEST);              // Enables Depth Testing
     glDepthFunc(GL_LEQUAL);               // The Type Of Depth Testing To Do
-    //glEnable(GL_COLOR_MATERIAL);
     glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+
+    // ps2gl needs lighting + color_material for per-vertex colors
+    glEnable(GL_COLOR_MATERIAL);
+    glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
+    glEnable(GL_LIGHTING);
+    glEnable(GL_LIGHT0);
 }
 
 void display(void)                                      // Create The Display Function

examples/nehe/lesson05/lesson5.cpp

@@ -26,8 +26,13 @@ void InitGL(GLvoid) // Create Some Everyday Functions
     glClearDepth(1.0f);                   // Depth Buffer Setup
     glEnable(GL_DEPTH_TEST);              // Enables Depth Testing
     glDepthFunc(GL_LEQUAL);               // The Type Of Depth Testing To Do
-    //glEnable(GL_COLOR_MATERIAL);
     glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+
+    // ps2gl needs lighting + color_material for per-vertex colors
+    glEnable(GL_COLOR_MATERIAL);
+    glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
+    glEnable(GL_LIGHTING);
+    glEnable(GL_LIGHT0);
 }
 
 void display(void)                                      // Create The Display Function

src/gmanager.cpp

@@ -46,7 +46,7 @@ bool CGeomManager::DoNormalize = false;
 
 CGeomManager::CGeomManager(CGLContext& context)
     : GLContext(context)
-    , CurNormal(0.0f, 0.0f, 0.0f)
+    , CurNormal(0.0f, 0.0f, 1.0f)
     , Prim(GL_INVALID_VALUE)
     , InsideBeginEnd(false)
     , LastArrayAccessWasIndexed(false)

src/lighting.cpp

@@ -33,6 +33,11 @@ CImmLight::CImmLight(CGLContext& context, int lightNum)
     , bIsEnabled(false)
     , Type(kDirectional)
 {
+    if (lightNum == 0) {
+        // Light0 has different initial values
+        Diffuse  = cpu_vec_xyzw(1.0f, 1.0f, 1.0f, 1.0f);
+        Specular = cpu_vec_xyzw(1.0f, 1.0f, 1.0f, 1.0f);
+    }
 }
 
 void CImmLight::CheckTypeChange(tLightType oldType)