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

Timestamp:

May 28, 2006, 3:48:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the gui branche back
merged with command:
​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

Location:

trunk/src/world_entities

Files:

• planet.cc (modified) (1 diff)
• skybox.cc (modified) (1 diff)

trunk/src/world_entities/planet.cc

@@ -109 +109 @@
 void Planet::draw() const
 {
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-
-  glShadeModel(GL_SMOOTH);
-
-  /* translate */
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  Vector tmpRot = this->getAbsDir().getSpacialAxis();
-  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-
   this->material.select();
 
-//   /WorldEntity::draw();
-  this->getModel(0)->draw();
- // static_cast<VertexArrayModel*>(this->getModel(0))->debug();
-
-  glPopMatrix();
+  WorldEntity::draw();
 }
 

trunk/src/world_entities/skybox.cc

@@ -227 +227 @@
   glDisable(GL_LIGHTING);
 
-  glPushAttrib(GL_ENABLE_BIT);
   glDisable(GL_FOG);
 
   WorldEntity::draw();
 
-  glPopAttrib();
   glPopAttrib();