Changeset 3238 in orxonox.OLD for orxonox/branches/nico/src/environment.cc

Timestamp:

Dec 20, 2004, 2:42:54 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

File:

• orxonox/branches/nico/src/environment.cc (modified) (2 diffs)

orxonox/branches/nico/src/environment.cc

@@ -67 +67 @@
 void Environment::draw () 
 {
-  printf("Environment::draw()");
-
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
   float matrix[4][4];
   
-  glTranslatef(get_placement()->r.x,get_placement()->r.y,get_placement()->r.z);
-  get_placement()->w.matrix (matrix);
+  glTranslatef(getPlacement()->r.x,getPlacement()->r.y,getPlacement()->r.z);
+  getPlacement()->w.matrix (matrix);
   glMultMatrixf ((float*)matrix);
 
   glBegin(GL_TRIANGLES);
-  glColor3f(1,1,1);
+  glColor3f(1,0,1);
   glVertex3f(0,0,0.5);
   glVertex3f(-0.5,0,-1);
@@ -89 +87 @@
     
   glBegin(GL_QUADS);
-  glColor3f(0,0,1);
+  glColor3f(1,0,1);
   glVertex3f(0.5,0.5,-1);
   glVertex3f(0.5,-0.5,-1);