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

Timestamp:

Apr 7, 2005, 7:37:25 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: made some sattelite object just for fun and to show on the convention tomarrow

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (2 diffs)
• satellite.cc (added)
• satellite.h (added)
• test_gun.cc (modified) (2 diffs)

orxonox/trunk/src/world_entities/player.cc

@@ -46 +46 @@
   */
   this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
+  //this->model = (Model*)ResourceManager::getInstance()->load("models/weapon_packet.obj", OBJ, RP_CAMPAIGN);
   travelSpeed = 15.0;
   velocity = new Vector();
@@ -147 +148 @@
   this->model->draw();
   glPopMatrix();
+
+  this->activeWeapon->draw();
 }
 

orxonox/trunk/src/world_entities/test_gun.cc

@@ -42 +42 @@
   :  Weapon (parent, coordinate, direction) 
 {
+  this->model = (Model*)ResourceManager::getInstance()->load("models/weapon_packet.obj", OBJ, RP_CAMPAIGN);
   this->idleTime = 0.2f;
 }
@@ -146 +147 @@
 */
 void TestGun::draw () 
-{}
+{
+  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(2);
+  glPopMatrix();
+}