Changeset 10760 in orxonox.OLD for branches

Timestamp:

Jun 21, 2007, 2:29:46 AM (18 years ago)

Author:

nicolasc

Message:

Widget Improvements

Location:

branches/presentation/src

Files:

• lib/graphics/importer/static_model.cc (modified) (4 diffs)
• world_entities/projectiles/hbolt.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (3 diffs)
• world_entities/world_entity.cc (modified) (5 diffs)
• world_entities/world_entity.h (modified) (1 diff)

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

@@ -103 +103 @@
   // go through all groups and check if they are mounts
   std::vector<StaticModelData::Group>::iterator groupIt = this->data->getGroups().begin();
-  for( ; groupIt != this->data->getGroups().end(); groupIt++)
+  for( ; groupIt != this->data->getGroups().end();)
   {
     //PRINTF(0)("Found a MountPoint: %s\n", groupName.c_str());
@@ -113 +113 @@
     // check if the name has a "MP" prefix or else it won't work
     if( groupName.find("MP.", 0) == std::string::npos){
+      groupIt++;
       continue;
     }
@@ -125 +126 @@
       PRINTF(4)("the face count of %s is wrong, perhaps you missnamed this object or used the wrong mount point object (got %i faces)\n",
                 groupName.c_str(), (*groupIt)._faces.size());
+      groupIt++;
       continue;
     }
@@ -211 +213 @@
 //     printf("adding MP\n");
      this->addMountPoint( zAxis, yAxis, center, groupName);
-
+      // 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); 
   }
 }

branches/presentation/src/world_entities/projectiles/hbolt.cc

@@ -182 +182 @@
 //     float matrix[4][4];
     glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+    glPushAttrib(GL_ENABLE_BIT);
+    glEnable( GL_ALPHA_TEST);
+    glAlphaFunc( GL_GEQUAL, .5);
     this->halo->draw();
+    glPopAttrib();
 
     Vector tmpRot = this->getAbsDir().getSpacialAxis();

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

@@ -305 +305 @@
 
 
-  dynamic_cast<WorldEntity*>(this)->createHealthWidget();
-  dynamic_cast<WorldEntity*>(this)->createShieldWidget();
-  dynamic_cast<WorldEntity*>(this)->createElectronicWidget();
+  this->createHealthWidget();
+  this->createShieldWidget();
+  this->createElectronicWidget();
 
   if ( this->hasPlayer() ){
@@ -428 +428 @@
 void SpaceShip::tick (float time)
 {
-  
-  printf("Ship Status: %f, %f\n", this->getHealth(), this->getShield());
-  
+
   if(caminit)
   {
@@ -1084 +1082 @@
 void SpaceShip::hit( float damage, WorldEntity * killer )
 {
-  printf("SS HIT: %f, %f \n", this->getHealth() , this->getShield());
+  PRINTF(4)("SS HIT: %f, %f \n", this->getHealth(), this->getShield());
   Playable::hit( damage, killer );
-  PRINTF(4)("SS HIT: %f\n", this->getHealth());
+  PRINTF(4)("SS HIT: %f, %f \n", this->getHealth(), this->getShield());
 }
 

branches/presentation/src/world_entities/world_entity.cc

@@ -272 +272 @@
     {
       PRINTF(4)("fetching OBJ file: %s\n", fileName.c_str());
-      // creating the model and loading it
+      // creating the model and loading it  OrxGui::GLGuiEnergyWidgetVertical* implantWidget;
       StaticModel* model = new StaticModel();
       *model = ResourceOBJ(fileName, this->scaling);
@@ -831 +831 @@
     float retShield = this->shieldMax - this->shield;
     this->shield = this->shieldMax;
-//     this->updateShieldWidget();
+    this->updateShieldWidget();
     return retShield;
   }
-//   this->updateShieldWidget();
+  this->updateShieldWidget();
   return 0.0;
 }
@@ -849 +849 @@
   {
     float retShield = -this->shield;
-//     this->updateShieldWidget();
+    this->updateShieldWidget();
     this->bShieldActive = false;
     return retShield;
   }
-//   this->updateShieldWidget();
+  this->updateShieldWidget();
   return 0.0;
 }
@@ -944 +944 @@
 OrxGui::GLGuiWidget* WorldEntity::getImplantWidget()
 {
-  this->createImplantWidget();
+  if(this->implantWidget == NULL)
+    this->createImplantWidget();
   return this->implantWidget;
 }
@@ -1083 +1084 @@
     this->shieldWidget = new OrxGui::GLGuiEnergyWidgetVertical();
     this->shieldWidget->getBarWidget()->setChangedValueColor(Color(1,0,0,1));
-    //this->shieldWidget->setDisplayedName("Shield:");
-    //his->shieldWidget->setSize2D(100,20);
-    //this->shieldWidget->setAbsCoor2D(200,200);
+//     this->shieldWidget->setDisplayedName("Shield:");
+//     his->shieldWidget->setSize2D(100,20);
+//     this->shieldWidget->setAbsCoor2D(200,200);
     this->updateShieldWidget();
 //     if (dynamic_cast<SpaceShip*>(this)->hasPlayer())

branches/presentation/src/world_entities/world_entity.h

@@ -272 +272 @@
   float                   healthRegen;            //!< Regeneration Rate of Health, mesured in units per second
   OrxGui::GLGuiEnergyWidgetVertical* healthWidget;    //!< The Slider (if wanted).
+
   OrxGui::GLGuiEnergyWidgetVertical* implantWidget;