Changeset 10770 in orxonox.OLD

Timestamp:

Jun 21, 2007, 8:14:29 PM (17 years ago)

Author:

nicolasc

Message:

MP removal algo 'works'

Location:

branches/presentation/src

Files:

• lib/graphics/importer/static_model.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (2 diffs)

branches/presentation/src/lib/graphics/importer/static_model.cc

@@ -215 +215 @@
       // remove the group from the model list (mount points do not need to be drawn) 
 //      std::vector<StaticModelData::Group>::iterator tmpIt =  groupIt; 
-     groupIt++; 
-//      this->data->getGroups().erase(tmpIt); 
+//      groupIt++; 
+     this->data->getGroups().erase(groupIt); 
   }
 }

branches/presentation/src/world_entities/world_entity.cc

@@ -360 +360 @@
   // extract the mount points
   // Patrick: they get extracted automaticaly now within the model finalization process
-  
-
+  // Nicolas: Does not work! this need to be here
   if(model != NULL)
     model->extractMountPoints();
@@ -1198 +1197 @@
 void WorldEntity::regen(float time){
   
-  printf("regen: %f, %f, %f ****************** ", time, this->healthRegen, this->shieldRegen);
+//   printf("regen: %f, %f, %f ****************** ", time, this->healthRegen, this->shieldRegen);
   float tmp;
   this->increaseHealth(time * this->healthRegen);