Changeset 10065 in orxonox.OLD for branches/camera/src/world_entities/test_entity.cc

Timestamp:

Dec 13, 2006, 3:23:05 PM (18 years ago)

Author:

gfilip

Message:

little update

File:

• branches/camera/src/world_entities/test_entity.cc (modified) (6 diffs)

branches/camera/src/world_entities/test_entity.cc

@@ -25 +25 @@
 
 
-
+#include "material.h"
 
 #include "state.h"
@@ -73 +73 @@
   this->registerObject(this, TestEntity::_objectList);
   this->toList(OM_GROUP_00);
+
+  this->material = new Material();
+  this->material->setIllum(3);
+  this->material->setDiffuse(1.0,1.0,1.0);
+  this->material->setSpecular(0.0,0.0,0.0);
+  this->material->setAmbient(1.0, 1.0, 1.0);
+  this->material->setDiffuseMap("maps/TE2.tga");
 }
 
@@ -93 +100 @@
   glDisable(GL_LIGHTING);
 //   glDisable(GL_BLEND);
-// 
+//
 //   glEnable(GL_TEXTURE_2D);
 //   glBindTexture(GL_TEXTURE_2D, media_container->getFrameTexture(counter));
@@ -104 +111 @@
 //PRINTF(0)("axis: %f\n", axis);
 glEnable(GL_BLEND);     // Turn Blending On
-  
+
 
 
@@ -121 +128 @@
   glEnd();
 
- // glPopMatrix();
- // glPopAttrib();
+  glPopMatrix();
+  glPopAttrib();
 }
 
@@ -130 +137 @@
 void TestEntity::tick (float time)
 {
-if (state==0)
-i=0;
-else
-i=i+0.005;
-
-
-
-
+  if (state==0 && i==1)
+    i=0;
+  if (state==1 && i<=1)
+    i=i+0.005;
 }
 
 
-//void TestEntity::changeState (bool sta)
-//{
-//state=sta;
-//}
+void  TestEntity::changeState (bool sta)
+{
+  state=sta;
+}