Changeset 2825 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Material.cpp

Timestamp:

07/09/08 03:05:23 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Material.cpp (modified) (2 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Material.cpp

@@ -60 +60 @@
 
 
-//void Material::Render(RenderState *state)
 void Material::Render(RenderState *state)
 {
@@ -68 +67 @@
         {
                 mTexture->Bind();
-
-                cgGLSetParameter4f(sAmbientTexParam, 
-                                                   mEmmisiveColor.r, 
-                                                   mEmmisiveColor.g, 
-                                                   mEmmisiveColor.b, 
-                                                   mEmmisiveColor.a);
-
-                cgGLSetParameter4f(sDiffuseTexParam, mDiffuseColor.r, mDiffuseColor.g, mDiffuseColor.b, mDiffuseColor.a);
         }
         else
         {
-                cgGLSetParameter4f(sAmbientParam, 
-                                                   mEmmisiveColor.r, 
-                                                   mEmmisiveColor.g, 
-                                                   mEmmisiveColor.b, 
-                                                   mEmmisiveColor.a);
-
-                cgGLSetParameter4f(sDiffuseParam, mDiffuseColor.r, mDiffuseColor.g, mDiffuseColor.b, mDiffuseColor.a);
-                
                 glBindTexture(GL_TEXTURE_2D, 0);
         }
 
-        glMaterialfv(GL_FRONT, GL_AMBIENT, (float *)&mAmbientColor.r);
-        glMaterialfv(GL_FRONT, GL_DIFFUSE, (float *)&mDiffuseColor.r);
-        glMaterialfv(GL_FRONT, GL_EMISSION, (float *)&mEmmisiveColor.r);
-        glMaterialfv(GL_FRONT, GL_SPECULAR, (float *)&mSpecularColor.r);
+        if (state->GetRenderType() == RenderState::DEFERRED)
+        {
+                if (mTexture)
+                {
+                        cgGLSetParameter4f(sAmbientTexParam, mEmmisiveColor.r, mEmmisiveColor.g, mEmmisiveColor.b, mEmmisiveColor.a);
+                        cgGLSetParameter4f(sDiffuseTexParam, mDiffuseColor.r, mDiffuseColor.g, mDiffuseColor.b, mDiffuseColor.a);
+                }
+                else
+                {
+                        cgGLSetParameter4f(sAmbientParam, mEmmisiveColor.r, mEmmisiveColor.g, mEmmisiveColor.b, mEmmisiveColor.a);
+                        cgGLSetParameter4f(sDiffuseParam, mDiffuseColor.r, mDiffuseColor.g, mDiffuseColor.b, mDiffuseColor.a);
+                }
+        }
+        else if (state->GetRenderType() == RenderState::FIXED)
+        {
+                glMaterialfv(GL_FRONT, GL_AMBIENT, (float *)&mAmbientColor.r);
+                glMaterialfv(GL_FRONT, GL_DIFFUSE, (float *)&mDiffuseColor.r);
+                glMaterialfv(GL_FRONT, GL_EMISSION, (float *)&mEmmisiveColor.r);
+                glMaterialfv(GL_FRONT, GL_SPECULAR, (float *)&mSpecularColor.r);
+        }
 }