Changeset 10234 in orxonox.OLD for branches/playability/src/util

Timestamp:

Jan 12, 2007, 11:24:37 PM (17 years ago)

Author:

muellmic

Message:

several interface changes and workarounds later… (yes there that crappy little flower at the op-left edge says hello again..)

File:

• branches/playability/src/util/hud.cc (modified) (9 diffs)

branches/playability/src/util/hud.cc

@@ -57 +57 @@
   this->resY = 1;
 
-  this->overlayPercentage = 5;
+  this->overlayPercentage = 40;
   this->overlayActive = false;
-  this->rightRect = NULL;
-  this->leftRect = NULL;
+  this->rightRect = new OrxGui::GLGuiImage();
+  this->leftRect = new OrxGui::GLGuiImage();
 
   this->inputLine = new OrxGui::GLGuiInputLine();
@@ -126 +126 @@
     //this->shipValuesBox->pack(this->energyWidget);
     //dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->energyWidget)->setStandardSettings();
+    this->energyWidget->setParent2D(this->leftRect);
     this->energyWidget->show();
     /*    this->energyWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
@@ -153 +154 @@
     //this->shipValuesBox->pack(this->shieldWidget);
     //dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->shieldWidget)->setStandardSettings();
+    this->shieldWidget->setParent2D(this->leftRect);
     this->shieldWidget->show();
     /*    this->shieldWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
@@ -182 +184 @@
     //this->shipValuesBox->pack(this->armorWidget);
     //dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->armorWidget)->setStandardSettings();
+    this->armorWidget->setParent2D(this->leftRect);
     this->armorWidget->show();
     /*    this->armorWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
@@ -249 +252 @@
       {
         //PRINTF(0)("WEAPON %s::%s in Slots\n", weapon->getClassCName(), weapon->getName());
+        weapon->getEnergyWidget()->setParent2D(this->rightRect);
         weapon->getEnergyWidget()->show();
         weapon->getEnergyWidget()->setBackgroundColor(Color(.8,.2,.11, 0.1));
         weapon->getEnergyWidget()->setFrontColor(Color( .2,.5,.7,.6));
+        weapon->getEnergyWidget()->setWidgetSize(120,30);
         //weapon->getEnergyWidget()->frontMaterial().setTransparency(.6);
         this->weaponsWidgetsPrim.push_back(dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (weapon->getEnergyWidget()));
@@ -264 +269 @@
       {
         //PRINTF(0)("WEAPON %s::%s in Slots\n", weapon->getClassCName(), weapon->getName());
+        weapon->getEnergyWidget()->setParent2D(this->rightRect);
         weapon->getEnergyWidget()->show();
         weapon->getEnergyWidget()->setBackgroundColor(Color(.8,.2,.11, 0.1));
@@ -291 +297 @@
   this->notifier->setWidgetSize(0.25 * this->resX, 0.6 * this->resY);
 
+  int overlayWidth = this->resX * (overlayPercentage)/(200);
+  this->rightRect->hide();
+  this->leftRect->hide();
+
+  this->leftRect->setParent2D(this);
+  this->leftRect->setWidgetSize(float(overlayWidth), float(this->resY));
+  this->leftRect->setAbsCoor2D(0,0);
+  this->leftRect->setBackgroundTexture(Texture());
+  this->leftRect->setBackgroundColor(Color(0,0,0.7,0.2));
+  this->leftRect->setForegroundTexture(Texture());
+  this->leftRect->setForegroundColor(Color(0,0,0,0));
+
+  this->rightRect->setParent2D(this);
+  this->rightRect->setWidgetSize(float(overlayWidth), float(this->resY));
+  this->rightRect->setAbsCoor2D(this->resX - overlayWidth,0);
+  this->rightRect->setBackgroundTexture(Texture());
+  this->rightRect->setBackgroundColor(Color(0,0,0.7,0.2));
+  this->rightRect->setForegroundTexture(Texture());
+  this->rightRect->setForegroundColor(Color(0,0,0,0));
+
+
   if (this->overlayActive == true)
   {
-    if (this->rightRect == NULL)
-      this->rightRect = new OrxGui::GLGuiWidget();
-    //if (this->leftRect == NULL)
-      //this->leftRect = new OrxGui::GLGuiWidget();
-    
-    int overlayWidth = this->resX * (100-overlayPercentage)/(200);
-    this->rightRect->hide();
-    /*
-    this->leftRect->setWidgetSize(float(overlayWidth), float(this->resY));
-    this->leftRect->setAbsCoor2D(0,0);
-    this->leftRect->setBackgroundTexture(Texture());
-    this->leftRect->setBackgroundColor(Color(0,0,0.7,0.2));
+    this->rightRect->show();
     this->leftRect->show();
-    */
-    
-    
-    this->rightRect->setParent2D(this);
-    this->rightRect->setWidgetSize(float(overlayWidth), float(this->resY));
-    this->rightRect->setAbsCoor2D(this->resX - overlayWidth,this->resY);
-    this->rightRect->setBackgroundTexture(Texture());
-    this->rightRect->setBackgroundColor(Color(0,0,0.7,0.2));
-    //this->rightRect->setForegroundTexture(Texture());
-    //this->rightRect->setForegroundColor(Color(1,1,1,1));
-    this->rightRect->show();
-    
   }
 
@@ -324 +328 @@
   {
     PRINTF(4)("UPDATING RADAR\n");
+    this->_radar->setParent2D(this->leftRect);
     this->_radar->setCenterNode(State::getPlayer()->getPlayable());
     //this->_radar->addEntityList(&State::getObjectManager()->getEntityList((OM_LIST)(State::getPlayer()->getPlayable()->getOMListNumber()+1)), Color(.4, .4, 1.0));
@@ -354 +359 @@
 
   std::list<OrxGui::GLGuiEnergyWidgetVertical*>::iterator weaponWidget;
-  Vector2D pos(this->resX, 0.5*this->resY);
+  Vector2D pos(overlayWidth, 0.5*this->resY);
+
+  // out of reasons i can't get behind, this version is segfaulting when calling getSizeX2D or getSizeY2D. the other
+  // element2D- related function works tough.. :s
+
   for (weaponWidget = this->weaponsWidgetsPrim.begin(); weaponWidget != this->weaponsWidgetsPrim.end(); weaponWidget++)
   {
-    if (pos.x < 0.9*resX)
-    {
-      pos.x = this->resX;
-      pos.y += 150;
-    }
-    pos.x -= 40;
+    if (pos.x < overlayWidth*0.2)
+    {
+      pos.x = overlayWidth;
+      pos.y += (*weaponWidget)->getSizeX2D();
+    }
+    pos.x -= (*weaponWidget)->getSizeY2D();
     (*weaponWidget)->setAbsCoor2D(pos.x, pos.y);
+    //(*weaponWidget)->setAbsCoor2D(0,100);
     (*weaponWidget)->show();
     //printf("update thing %s::%s\n", (*weaponWidget)->getClassCName(), (*weaponWidget)->getName());
   }
 
-  pos.y += 150;
-  pos.x = this->resX;
+  pos.y += 160;
+  pos.x = overlayWidth;
   for (weaponWidget = this->weaponsWidgetsSec.begin(); weaponWidget != this->weaponsWidgetsSec.end(); weaponWidget++)
   {
-    if (pos.x < 0.9*resX)
-    {
-      pos.x = this->resX;
-      pos.y += 150;
-    }
-    pos.x -= 40;
+    if (pos.x < overlayWidth*0.2)
+    {
+      pos.x = overlayWidth;
+      pos.y += (*weaponWidget)->getSizeX2D();
+    }
+    pos.x -= (*weaponWidget)->getSizeY2D();
     (*weaponWidget)->setAbsCoor2D(pos.x, pos.y);
     (*weaponWidget)->show();