Changeset 10212 in orxonox.OLD

Timestamp:

Jan 10, 2007, 2:37:52 PM (17 years ago)

Author:

gfilip

Message:

blackscreen troubles

Location:

branches/camera/src/world_entities

Files:

• blackscreen.cc (modified) (2 diffs)
• blackscreen.h (modified) (1 diff)
• test_entity.cc (modified) (5 diffs)

branches/camera/src/world_entities/blackscreen.cc

@@ -28 +28 @@
 CREATE_FACTORY(blackscreen);
 
-float i=0;
-bool state=1;
+
 
 /**
@@ -37 +36 @@
 {
   this->init();
+  i=0;
+  state=1;
 }
 

branches/camera/src/world_entities/blackscreen.h

@@ -13 +13 @@
 
   private:
-
+    float i;
+    bool state;
     Material*       material;
 

branches/camera/src/world_entities/test_entity.cc

@@ -74 +74 @@
   this->toList(OM_GROUP_00);
 
-  this->material = new Material();
+  /*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");
+  this->material->setDiffuseMap("maps/TE2.tga");*/
 }
 
@@ -97 +97 @@
 //     false;
 
-  glPushAttrib(GL_ENABLE_BIT);
-  glDisable(GL_LIGHTING);
+//  glPushAttrib(GL_ENABLE_BIT);
+//  glDisable(GL_LIGHTING);
 //   glDisable(GL_BLEND);
 //
@@ -104 +104 @@
 //   glBindTexture(GL_TEXTURE_2D, media_container->getFrameTexture(counter));
 
-  glPushMatrix();
+//  glPushMatrix();
  /* glTranslatef (this->getAbsCoor ().x,
                 this->getAbsCoor ().y,
@@ -110 +110 @@
   glRotatef(axis, 0.0f, 1.0f, 0.0f);*/
 //PRINTF(0)("axis: %f\n", axis);
-glEnable(GL_BLEND);     // Turn Blending On
+//glEnable(GL_BLEND);   // Turn Blending On
 
 
 
-glColor4f(0, 0, 0, i);
+//glColor4f(0, 0, 0, i);
 
-  glBegin(GL_QUADS);
-    glVertex3f(-1.0f, -100.0f, -100.0f);
+//  glBegin(GL_QUADS);
+//    glVertex3f(-1.0f, -100.0f, -100.0f);
 //     glTexCoord2f(1.0f, 1.0f);
-    glVertex3f(-1.0f, -100.0f, 100.0f);
+//    glVertex3f(-1.0f, -100.0f, 100.0f);
 //     glTexCoord2f(0.0f, 1.0f);
-    glVertex3f(-1.0f, 100.0f, 100.0f);
+//    glVertex3f(-1.0f, 100.0f, 100.0f);
 //     glTexCoord2f(0.0f, 0.0f);
-    glVertex3f(-1.0f, 100.0f, -100.0f);
+//    glVertex3f(-1.0f, 100.0f, -100.0f);
 //     glTexCoord2f(1.0f, 0.0f);
 
-  glEnd();
+//  glEnd();
 
-  glPopMatrix();
-  glPopAttrib();
+//  glPopMatrix();
+//  glPopAttrib();
 }
 
@@ -137 +137 @@
 void TestEntity::tick (float time)
 {
-  if (state==0 && i==1)
-    i=0;
-  if (state==1 && i<=1)
-    i=i+0.005;
+//  if (state==0 && i==1)
+//    i=0;
+//  if (state==1 && i<=1)
+//    i=i+0.005;
 }