Changeset 3526 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: better ModelView-matrix transformations

Location:

orxonox/trunk/src

Files:

• orxonox.cc (modified) (1 diff)
• story_entities/world.cc (modified) (7 diffs)
• story_entities/world.h (modified) (1 diff)
• world_entities/environment.cc (modified) (2 diffs)
• world_entities/player.cc (modified) (3 diffs)
• world_entities/primitive.cc (modified) (2 diffs)
• world_entities/skysphere.cc (modified) (2 diffs)

orxonox/trunk/src/orxonox.cc

@@ -173 +173 @@
   // SDL_WM_SetIcon(SDL_Surface *icon, Uint8 *mask);  
 
-  // OpenGL stuff
-  glClearColor (0.0, 0.0, 0.0, 0.0);
-  glEnable (GL_DEPTH_TEST);
-   
   return 0;
 }

orxonox/trunk/src/story_entities/world.cc

@@ -41 +41 @@
 World::World (char* name)
 {
-  this->setClassName ("World");
-  this->worldName = name;
-  this->debugWorldNr = -1;
-  this->entities = new tList<WorldEntity>();
+  this->init(name, -1);
 }
 
@@ -53 +50 @@
 World::World (int worldID)
 {
-  this->debugWorldNr = worldID;
-  this->worldName = NULL;
-  this->entities = new tList<WorldEntity>();
+  this->init(NULL, worldID);
 }
 
@@ -94 +89 @@
   /* this->localPlayer hasn't to be deleted explicitly, it is 
      contained in entities*/
+}
+
+/**
+   \brief initializes a new World
+*/
+void World::init(char* name, int worldID)
+{
+  this->setClassName ("World");
+
+  this->worldName = name;
+  this->debugWorldNr = worldID;
+  this->entities = new tList<WorldEntity>();
+
+  // Enable default GL stuff
+  glEnable(GL_DEPTH_TEST);
+
 }
 
@@ -289 +300 @@
   objectList = glGenLists(1);
   glNewList (objectList, GL_COMPILE);
-  glLoadIdentity();
+
   glColor3f(1.0,0,0);
-  glBegin(GL_QUADS);
 
   int sizeX = 100;
@@ -338 +348 @@
       }
 
+  glBegin(GL_QUADS);
   int snowheight=3;
   for ( int i = 0; i<sizeX; i+=1)
@@ -410 +421 @@
       }
   glEnd();
-  /*  
-  glBegin(GL_LINES);
-  for( float x = -128.0; x < 128.0; x += 25.0)
-    {
-      for( float y = -128.0; y < 128.0; y += 25.0)
-        {
-          glColor3f(1,0,0);
-          glVertex3f(x,y,-128.0);
-          glVertex3f(x,y,0.0);
-          glColor3f(0.5,0,0);
-          glVertex3f(x,y,0.0);
-          glVertex3f(x,y,128.0);
-        }
-    }
-  for( float y = -128.0; y < 128.0; y += 25.0)
-    {
-      for( float z = -128.0; z < 128.0; z += 25.0)
-        {
-          glColor3f(0,1,0);
-          glVertex3f(-128.0,y,z);
-          glVertex3f(0.0,y,z);
-          glColor3f(0,0.5,0);
-          glVertex3f(0.0,y,z);
-          glVertex3f(128.0,y,z);
-        }
-    }
-  for( float x = -128.0; x < 128.0; x += 25.0)
-    {
-      for( float z = -128.0; z < 128.0; z += 25.0)
-        {
-          glColor3f(0,0,1);
-          glVertex3f(x,-128.0,z);
-          glVertex3f(x,0.0,z);
-          glColor3f(0,0,0.5);
-          glVertex3f(x,0.0,z);
-          glVertex3f(x,128.0,z);
-        }
-      
-    }
-  */  
-  /*
-  glBegin(GL_LINE_STRIP);
-  glColor3f(1.0, 5.0, 1.0);
-  for( int i = 0; i <= 30; i++)
-    {
-      glEvalCoord1f ((GLfloat) i/30.0);
-    }
-  glEnd();
-  */
 
   trackManager->drawGraph(.01);
   trackManager->debug(2);
-  /*  
-  glBegin(GL_LINES);
-  float i;
-  for(i = 0.0; i<1; i+=.01)
-    {
-      printf("%f, %f, %f\n",tmpCurve->calcPos(i).x, tmpCurve->calcPos(i).y, tmpCurve->calcPos(i).z);
-      glVertex3f(tmpCurve->calcPos(i).x, tmpCurve->calcPos(i).y, tmpCurve->calcPos(i).z);
-    }
-  glEnd();
-  */
   glEndList();
+
+
   // LIGHT initialisation
   light = Light::getInstance();
@@ -635 +589 @@
   /* draw entities */
   WorldEntity* entity;
+  glLoadIdentity();
+
   entity = this->entities->enumerate();
   while( entity != NULL ) 

orxonox/trunk/src/story_entities/world.h

@@ -57 +57 @@
 
  private:
+  void init(char* name, int worldID);
+
   Uint32 lastFrame;             //!< last time of frame
   bool bQuitOrxonox;            //!< quit this application

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();