Changeset 3526 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Mar 13, 2005, 8:00:25 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better ModelView-matrix transformations

Location:

orxonox/trunk/src/world_entities

Files:

• environment.cc (modified) (2 diffs)
• player.cc (modified) (3 diffs)
• primitive.cc (modified) (2 diffs)
• skysphere.cc (modified) (2 diffs)

orxonox/trunk/src/world_entities/environment.cc

@@ -50 +50 @@
 {
   glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
+  glPushMatrix();
   float matrix[4][4];
   
@@ -59 +59 @@
   
   this->model->draw();
+
+  glPopMatrix();
 }
 

orxonox/trunk/src/world_entities/player.cc

@@ -29 +29 @@
 Player::Player(bool isFree) : WorldEntity(isFree)
 {
-
   this->model = new OBJModel("../data/models/reaplow.obj");
-  /*
-  objectList = glGenLists(1);
-  glNewList (objectList, GL_COMPILE);
-
-  glBegin(GL_TRIANGLES);
-  glColor3f(1,1,1);
-  glVertex3f(0,0,0.5);
-  glVertex3f(-0.5,0,-1);
-  glVertex3f(0.5,0,-1);
-
-  glVertex3f(0,0,0.5);
-  glVertex3f(0,0.5,-1);
-  glVertex3f(0,-0.5,-1);
-  glEnd();
-    
-  glBegin(GL_QUADS);
-  glColor3f(0,0,1);
-  glVertex3f(0.5,0.5,-1);
-  glVertex3f(0.5,-0.5,-1);
-  glVertex3f(-0.5,-0.5,-1);
-  glVertex3f(-0.5,0.5,-1);
-  glEnd();
-  
-  glEndList ();
-  */
 }
 
@@ -137 +111 @@
 { 
   glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
+  glPushMatrix();
   float matrix[4][4];
   
@@ -148 +122 @@
   glMultMatrixf((float*)matrix);
   
-  glMatrixMode(GL_MODELVIEW);
   this->model->draw();
-  // glCallList(objectList);
+  glPopMatrix();
 }
 

orxonox/trunk/src/world_entities/primitive.cc

@@ -55 +55 @@
 {
   glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
+  glPushMatrix();
   float matrix[4][4];
   
@@ -64 +64 @@
   
   this->model->draw();
+  glPopMatrix();
 }
 

orxonox/trunk/src/world_entities/skysphere.cc

@@ -99 +99 @@
 {
   glEnable(GL_TEXTURE_2D);
-  skyMaterial->select();
   glPushMatrix();
+  glMatrixMode(GL_MODELVIEW);
   glTranslatef(this->absCoordinate.x,
                this->absCoordinate.y,
@@ -109 +109 @@
   //glRotatef(-250.0f, 0.0, 1.0f, 0.0f);
   
+  skyMaterial->select();
   gluSphere(sphereObj, sphereRadius, 20, 20);
   glPopMatrix();