Changeset 9974 in orxonox.OLD

Timestamp:

Nov 29, 2006, 5:02:13 PM (17 years ago)

Author:

patrick

Message:

test entit2 working

Location:

branches/playability/src/world_entities

Files:

• test_entity2.cc (modified) (4 diffs)
• test_entity2.h (modified) (2 diffs)

branches/playability/src/world_entities/test_entity2.cc

@@ -29 +29 @@
 #include "player.h"
 #include "playable.h"
+#include "material.h"
 
 
@@ -76 +77 @@
   this->registerObject(this, TestEntity2::_objectList);
   this->toList(OM_GROUP_00);
+
+  this->material = new Material();
+  this->material->setIllum(3);
+  this->material->setDiffuse(0.0,0.0,0.0);
+  this->material->setSpecular(0.0,0.0,0.0);
+  this->material->setAmbient(1.0, 0.0, 1.0);
+
+//   this->material->setDiffuseMap("maps/");
 }
 
@@ -90 +99 @@
 void TestEntity2::draw() const
 {
-//   if(!mediaLoaded)
-//     false;
 
-//   glPushAttrib(GL_ENABLE_BIT);
-//   glDisable(GL_LIGHTING);
-//   glDisable(GL_BLEND);
-// 
-//   glEnable(GL_TEXTURE_2D);
-//   glBindTexture(GL_TEXTURE_2D, media_container->getFrameTexture(counter));
 
+    glPushMatrix();
     glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
+
 
     /* translate */
@@ -112 +114 @@
 //PRINTF(0)("axis: %f\n", axis);
 
-  glColor3f(1.0, 0, 0);
+    this->material->select();
+
+  glColor3f(0.0, 1.0, 0.0);
 
   glBegin(GL_QUADS);
     glVertex3f( 0.0f, -10.0f, 0.0f);
-    glNormal3f(0.0, 1.0, 0.0);
+    glNormal3f(1.0, 0.0, 0.0);
 //     glTexCoord2f(1.0f, 1.0f);
     glVertex3f( 0.0f,  -10.0f , 20.0f);
-    glNormal3f(0.0, 1.0, 0.0);
+    glNormal3f(1.0, 0.0, 0.0);
 
 //     glTexCoord2f(0.0f, 1.0f);
-    glVertex3f( 0,  10.0f , 20.0f );
-    glNormal3f(0.0, 1.0, 0.0);
+    glVertex3f( 0.0,  10.0f , 20.0f );
+    glNormal3f(1.0, 0.0, 0.0);
 
 //     glTexCoord2f(0.0f, 0.0f);
-    glVertex3f( 0, 10.0f, 0.0f );
-    glNormal3f(0.0, 1.0, 0.0);
+    glVertex3f( 0.0, 10.0f, 0.0f );
+    glNormal3f(1.0, 0.0, 0.0);
 
 //     glTexCoord2f(1.0f, 0.0f);
-    
+
   glEnd();
 
   glPopMatrix();
-//   glPopAttrib();
+//    glPopAttrib();
 }
 

branches/playability/src/world_entities/test_entity2.h

@@ -5 +5 @@
 
 class TiXmlElement;
-
+class Material;
 
 class TestEntity2 : public WorldEntity
@@ -23 +23 @@
     virtual void draw() const;
 
+  private:
+    Material*       material;
 };