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

Timestamp:

06/22/08 05:24:22 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -20 +20 @@
         mAlphaTestEnabled = false;
 
-        mAmbientColor = RgbaColor(.2f, .2f, .2f, 1.0f);
+        mAmbientColor = RgbaColor(0.2f, 0.2f, 0.2f, 1.0f);
         mDiffuseColor = RgbaColor(1.0f, 1.0f, 1.0f, 1.0f);
-        //mSpecularColor = RgbaColor(0.0f, 0.0f, 0.0f, 1.0f);
+        //mSpecularColor = RgbaColor(.0f, .0f, .0f, 1.0f);
         mSpecularColor = RgbaColor(0.5f, 0.5f, 0.5f, 1.0f);
+        mEmmisiveColor = RgbaColor(.0f, .0f, .0f, 1.0f);
 }
 
 
-Material::Material(): mId(0)
-{
-        InitMaterial();
-}
-
-
-Material::Material(int id): 
-mId(id)
+Material::Material()
 {
         InitMaterial();
@@ -43 +37 @@
 mDiffuseColor(color),
 mAmbientColor(color),
-mSpecularColor(0, 0, 0, 1), 
-mId(0),
+mSpecularColor(0, 0, 0, 1),
 mTexture(NULL)
 {
-}
-
-
-int Material::GetId() const
-{
-        return mId;
 }
 
@@ -80 +67 @@
         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);
 }