Changeset 9977 in orxonox.OLD

Timestamp:

Nov 29, 2006, 5:24:18 PM (17 years ago)

Author:

nicolasc

Message:

bump

File:

• branches/playability/src/world_entities/test_entity2.cc (modified) (1 diff)

branches/playability/src/world_entities/test_entity2.cc

@@ -114 +114 @@
 //PRINTF(0)("axis: %f\n", axis);
 
-<<<<<<< .mine
-  glColor3f(1.0, 0.0, 0.0);
-=======
     this->material->select();
->>>>>>> .r9974
 
   glColor3f(0.0, 1.0, 0.0);
 
   glBegin(GL_QUADS);
-<<<<<<< .mine
-    glVertex3f( 0.0f, 10.0f, 0.0f);
-    //glNormal3f(0.0, 1.0, 0.0);
-=======
+
     glVertex3f( 0.0f, -10.0f, 0.0f);
     glNormal3f(1.0, 0.0, 0.0);
->>>>>>> .r9974
 //     glTexCoord2f(1.0f, 1.0f);
-<<<<<<< .mine
-    glVertex3f( 0.0f,  10.0f , 10.0f);
-    //glNormal3f(0.0, 1.0, 0.0);
-=======
+
     glVertex3f( 0.0f,  -10.0f , 20.0f);
     glNormal3f(1.0, 0.0, 0.0);
->>>>>>> .r9974
+
 
 //     glTexCoord2f(0.0f, 1.0f);
-<<<<<<< .mine
-    glVertex3f( 0.0f,  0.0f , 10.0f );
-    //glNormal3f(0.0, 1.0, 0.0);
-=======
+
     glVertex3f( 0.0,  10.0f , 20.0f );
     glNormal3f(1.0, 0.0, 0.0);
->>>>>>> .r9974
+
 
 //     glTexCoord2f(0.0f, 0.0f);
-<<<<<<< .mine
-    glVertex3f( 0.0f, 0.0f, 0.0f );
-    //glNormal3f(1.0, 0.0, 0.0);
-=======
+
     glVertex3f( 0.0, 10.0f, 0.0f );
     glNormal3f(1.0, 0.0, 0.0);
->>>>>>> .r9974
+
 
 //     glTexCoord2f(1.0f, 0.0f);
-<<<<<<< .mine
-=======
 
->>>>>>> .r9974
   glEnd();