Changeset 5994 in orxonox.OLD for trunk/src/world_entities/satellite.cc

Timestamp:

Dec 9, 2005, 10:43:31 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: much cleaner Model Loading unloading, model is now private to WorldEntity (not protected)

File:

• trunk/src/world_entities/satellite.cc (modified) (2 diffs)

trunk/src/world_entities/satellite.cc

@@ -34 +34 @@
   this->setClassID(CL_SATELLITE, "Satellite");
 
-  this->model = (Model*) ResourceManager::getInstance()->load("cube", RP_LEVEL);
+  this->loadModel("cube");
   this->speed = speed;
   this->axis = new Vector();
@@ -64 +64 @@
 }
 
-
-/**
- *  the entity is drawn onto the screen with this function
-
-   This is a central function of an entity: call it to let the entity painted to the screen. Just override this function with whatever you want to be drawn.
-*/
-void Satellite::draw() const
-{
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  float matrix[4][4];
-
-  /* translate */
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  /* rotate */
-  this->getAbsDir ().matrix (matrix);
-  glMultMatrixf((float*)matrix);
-
-  this->model->draw();
-  glPopMatrix();
-
-}
-