Changeset 6417 in orxonox.OLD

Timestamp:

Jan 6, 2006, 4:00:21 PM (18 years ago)

Author:

bensch

Message:

network: scale to ALLWAY 1

Location:

branches/network/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (1 diff)
• weapons/ground_turret.cc (modified) (1 diff)
• world_entity.cc (modified) (2 diffs)
• world_entity.h (modified) (1 diff)

branches/network/src/world_entities/space_ships/space_ship.cc

@@ -121 +121 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  //  EventHandler::getInstance()->grabEvents(true);
+    EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;

branches/network/src/world_entities/weapons/ground_turret.cc

@@ -119 +119 @@
 void GroundTurret::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);
-
-  if (this->getModel())
-    this->getModel()->draw();
-
-  glPopMatrix();
+  WorldEntity::draw();
+
   if (this->left != NULL)
     this->left->draw();

branches/network/src/world_entities/world_entity.cc

@@ -128 +128 @@
     {
       PRINTF(4)("fetching OBJ file: %s\n", fileName);
-      if (scaling == 1.0)
+      if (true/*scaling == 1.0*/)
         this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN), modelNumber);
       else
@@ -348 +348 @@
  * Debug the WorldEntity
  */
-void WorldEntity::debugWE()
+void WorldEntity::debugEntity() const
 {
   PRINT(0)("WorldEntity %s::%s  (DEBUG)\n", this->getClassName(), this->getName());
-  PRINT(0)("ModelCount %d - ", this->models.size());
+  this->debugNode();
+  PRINT(0)("List: %s ; ModelCount %d - ", ObjectManager::OMListToString(this->objectListNumber) , this->models.size());
   for (unsigned int i = 0; i < this->models.size(); i++)
   {

branches/network/src/world_entities/world_entity.h

@@ -61 +61 @@
 
 
-  void debugWE();
+  void debugWE() { this->debugEntity(); };  ///FIXME
+  void debugEntity() const;
+
 
   /* @returns the Count of Faces on this WorldEntity */