Changeset 7217 in orxonox.OLD

Timestamp:

Mar 12, 2006, 2:16:24 PM (18 years ago)

Author:

bensch

Message:

orxonox/std:: removed two seg-fault bugs… but strangely some models are not loaded

Location:

branches/std/src/world_entities

Files:

• creatures/md2_creature.cc (modified) (1 diff)
• terrain.cc (modified) (1 diff)
• weapons/aiming_turret.cc (modified) (1 diff)
• world_entity.cc (modified) (2 diffs)

branches/std/src/world_entities/creatures/md2_creature.cc

@@ -255 +255 @@
   this->shiftCoor (move);
 
-  if( this->bJump)
+  if( this->bJump && likely(this->getModel(0) != NULL))
   {
     ((MD2Model*)this->getModel(0))->setAnim(JUMP);
   }
-  else if( this->bFire)
+  else if( this->bFire && likely(this->getModel(0) != NULL))
   {
     if( ((MD2Model*)this->getModel(0))->getAnim() != ATTACK) ((MD2Model*)this->getModel(0))->setAnim(ATTACK);
   }
-  else if( fabs(move.len()) > 0.0f)
+  else if( fabs(move.len()) > 0.0f && likely(this->getModel(0) != NULL))
   {
     if( ((MD2Model*)this->getModel(0))->getAnim() != RUN) ((MD2Model*)this->getModel(0))->setAnim(RUN);
   }
-  else
+  else if (likely(this->getModel(0) != NULL))
   {
     if( ((MD2Model*)this->getModel(0))->getAnim() != STAND) ((MD2Model*)this->getModel(0))->setAnim(STAND);

branches/std/src/world_entities/terrain.cc

@@ -177 +177 @@
 void Terrain::loadVegetation(const std::string& vegetationFile)
 {
-  PRINTF(0)("loadVegetation: %s\n", vegetationFile.c_str());
+  PRINTF(4)("loadVegetation: %s\n", vegetationFile.c_str());
   if (this->vegetation)
     ResourceManager::getInstance()->unload(this->vegetation, RP_LEVEL);

branches/std/src/world_entities/weapons/aiming_turret.cc

@@ -168 +168 @@
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
-  this->getModel()->draw();
+  if (this->getModel())
+    this->getModel()->draw();
   glPopMatrix();
 }

branches/std/src/world_entities/world_entity.cc

@@ -118 +118 @@
  * @param fileName the name of the model to load
  * @param scaling the Scaling of the model
- *
- * @todo fix this, so it only has one loadModel-Function.
-*/
+ */
 void WorldEntity::loadModel(const std::string& fileName, float scaling, unsigned int modelNumber)
 {
@@ -152 +150 @@
       if (loadedModel != NULL)
         this->setModel(dynamic_cast<Model*>(loadedModel), modelNumber);
+      else
+        PRINTF(1)("OBJ-File %s not found.\n", fileName.c_str());
 
       if( modelNumber == 0)