Changeset 10760 in orxonox.OLD for branches/presentation/src/world_entities/world_entity.cc

Timestamp:

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

Author:

nicolasc

Message:

Widget Improvements

File:

• branches/presentation/src/world_entities/world_entity.cc (modified) (5 diffs)

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())