Changeset 1302 for code/branches/hud3/src/orxonox/hud/HUD.cc

Timestamp:

May 15, 2008, 10:10:47 PM (16 years ago)

Author:

FelixSchulthess

Message:

using vectors instead of integers now

File:

• code/branches/hud3/src/orxonox/hud/HUD.cc (modified) (6 diffs)

code/branches/hud3/src/orxonox/hud/HUD.cc

@@ -30 +30 @@
 #include <OgreOverlay.h>
 #include <OgreOverlayContainer.h>
-#include <OgreOverlayManager.h>ma
+#include <OgreOverlayManager.h>
 #include <OgreSceneNode.h>
 #include <OgreEntity.h>
@@ -50 +50 @@
 
     Ogre::OverlayManager& overlayManager = Ogre::OverlayManager::getSingleton();
-    
+
     BarOverlayElementFactory *barOverlayElementFactory = new BarOverlayElementFactory();
     overlayManager.addOverlayElementFactory(barOverlayElementFactory);
-    
+
     SmartBarOverlayElementFactory *smartBarOverlayElementFactory = new SmartBarOverlayElementFactory();
     overlayManager.addOverlayElementFactory(smartBarOverlayElementFactory);
-    
+
     RadarOverlayElementFactory *radarOverlayElementFactory = new RadarOverlayElementFactory();
     overlayManager.addOverlayElementFactory(radarOverlayElementFactory);
-    
-    Ogre::Overlay* orxonoxOverlay = overlayManager.create("Orxonox/HUD"); 
+
+    Ogre::Overlay* orxonoxOverlay = overlayManager.create("Orxonox/HUD");
 
     Ogre::OverlayContainer* energyCounterPanel = static_cast<Ogre::OverlayContainer*>(overlayManager.createOverlayElement("Panel", "Orxonox/HUD/energyCounterPanel"));
-    
+
     energyCounter = static_cast<SmartBarOverlayElement*>(overlayManager.createOverlayElement("SmartBar", "energyCounter"));
     energyCounter->show();
-    
-    
+
+
     radar = static_cast<RadarOverlayElement*>(overlayManager.createOverlayElement("Radar", "radar"));
     radar->show();
 
-    
+
 /*    TextAreaOverlayElement* test = static_cast<TextAreaOverlayElement*>(overlayManager.createOverlayElement("TextArea", "test"));
-    
+
     int dirX, dirY, dirZ;      //flying direction
     int ortX, ortY, ortZ;      //orthogonal direction
@@ -81 +81 @@
     double beta;               //defines the angle in the radar
     bool right;                //checks whether the object is on the right side (since cos is not bijective)
-    
+
     dirX = 1;
     dirY = 0;
     dirZ = 0;
-    
+
     ortX = 0;
     ortY = 0;
     ortZ = 1;
-    
+
     dX = -2;
     dY = 2;
     dZ = 0;
-    
+
     alpha = acos((dirX*dX+dirY*dY+dirZ*dZ)/(sqrt(pow(dX,2)+pow(dY,2)+pow(dZ,2))*sqrt(pow(dirX,2)+pow(dirY,2)+pow(dirZ,2))));
     beta = acos((ortX*dX+ortY*dY+ortZ*dZ)/(sqrt(pow(dX,2)+pow(dY,2)+pow(dZ,2))*sqrt(pow(ortX,2)+pow(ortY,2)+pow(ortZ,2))));
@@ -99 +99 @@
     vecY = dirZ*ortX - dirX*ortZ;
     vecZ = dirX*ortY - dirY*ortX;
-    
+
     if((vecX*dX+vecY*dY+vecZ*dZ)>0){right=true;}
     else right=false;
-    
+
     test->setCaption("hell");
     test->setPosition(10,10);
     test->setDimensions(20,20);
     test->show();
-    test->setMetricsMode(Ogre::GMM_PIXELS);     
+    test->setMetricsMode(Ogre::GMM_PIXELS);
     energyCounterPanel->addChild(test);
-    
+
     COUT(0)<<alpha<<" "<<beta<<" "<<right<<std::endl;
 */
-    
+
     energyCounterPanel->addChild(energyCounter);
     energyCounterPanel->addChild(radar);
     energyCounterPanel->show();
-    
+
     orxonoxOverlay->add2D(energyCounterPanel);
     orxonoxOverlay->show();
 
-    
-    
+
+
     // important: don't use SceneManager to create the node! but register the creator scene manager.
 /*    ogreNode_ = new Ogre::SceneNode(Orxonox::getSingleton()->getSceneManager(), "hudNoedely");
-    
+
     ogreNode_->setPosition(80,-60,-200);
     ogreNode_->setScale(0.4,0.4,0.4);
@@ -132 +132 @@
 //    orxonoxOverlay->add3D(ogreNode_);
 */
-   
+
     energyCounterPanel->setLeft(-50);
     energyCounterPanel->setTop(10);
@@ -138 +138 @@
     energyCounterPanel->setHeight(20);
     energyCounterPanel->setHorizontalAlignment(Ogre::GHA_CENTER);
-    energyCounterPanel->setMetricsMode(Ogre::GMM_PIXELS);       
-        
+    energyCounterPanel->setMetricsMode(Ogre::GMM_PIXELS);
+
     energyCounter->initSmartBarOverlayElement(-100,0,200,20,BarOverlayElement::LEFT);
     energyCounter->reset(80);
-    
+
     radar->initRadarOverlayElement(10,10,200,energyCounterPanel);
 
-    
+
   }
 
-/*  void HUD::tick(float dt)
+  void HUD::tick(float dt)
   {
-    if (this->ogreNode_)
+      radar->update();
+    /*if (this->ogreNode_)
     {
       this->ogreNode_->roll(Ogre::Degree(dt*200),Ogre::Node::TS_LOCAL);
-      this->ogreNode_->yaw(Ogre::Degree(dt*200),Ogre::Node::TS_LOCAL); 
+      this->ogreNode_->yaw(Ogre::Degree(dt*200),Ogre::Node::TS_LOCAL);
       this->ogreNode_->pitch(Ogre::Degree(dt*200),Ogre::Node::TS_LOCAL);
-    }
+    }*/
   }
-*/
+
   HUD::~HUD(void){}
-
-
 
 }