Changeset 1254

Timestamp:

May 11, 2008, 2:34:01 PM (16 years ago)

Author:

FelixSchulthess

Message:

chais new hud

Location:

code/branches/hud2/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxonoxPlatform.h (modified) (1 diff)
• hud/BarOverlayElement.h (modified) (4 diffs)
• hud/HUD.cc (modified) (4 diffs)
• hud/HUD.h (modified) (2 diffs)
• hud/OverlayElementFactories.h (modified) (2 diffs)
• hud/RadarOverlayElement.cc (modified) (4 diffs)
• hud/RadarOverlayElement.h (modified) (2 diffs)

code/branches/hud2/src/orxonox/CMakeLists.txt

@@ -6 +6 @@
   hud/HUD.cc
   hud/BarOverlayElement.cc
+  hud/RadarOverlayElement.cc
   particle/ParticleInterface.cc
   tools/BillboardSet.cc

code/branches/hud2/src/orxonox/OrxonoxPlatform.h

@@ -175 +175 @@
 //For apple, we always have a custom config.h file
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_APPLE
-#  include "config.h"
+//#  include "config.h"
 #endif
 

code/branches/hud2/src/orxonox/hud/BarOverlayElement.h

@@ -44 +44 @@
   {
   private:
+    
     int percentage_;
     int dir_;   
@@ -50 +51 @@
     int width_;
     int height_;
-        
+
     static Ogre::String& typeName_s;
-        
+
   public:
 
@@ -75 +76 @@
 
   };
-  
+
   
   class _OrxonoxExport SmartBarOverlayElement : public BarOverlayElement
@@ -89 +90 @@
       void initSmartBarOverlayElement(Ogre::Real left, Ogre::Real top, Ogre::Real width, Ogre::Real height, int dir);
       void reset(int percentage);
+      
   };
-
-  
 }
 

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

@@ -33 +33 @@
 #include <OgreSceneNode.h>
 #include <OgreEntity.h>
+#include "core/Debug.h"
 
 #include "HUD.h"
 #include "BarOverlayElement.h"
+#include "RadarOverlayElement.h"
 #include "OverlayElementFactories.h"
 // ugly hack
@@ -55 +57 @@
     overlayManager.addOverlayElementFactory(smartBarOverlayElementFactory);
     
+    RadarOverlayElementFactory *radarOverlayElementFactory = new RadarOverlayElementFactory();
+    overlayManager.addOverlayElementFactory(radarOverlayElementFactory);
+    
     Ogre::Overlay* orxonoxOverlay = overlayManager.create("Orxonox/HUD"); 
 
@@ -62 +67 @@
     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
+    int dX, dY, dZ;            //distance between main ship and the object
+    int vecX, vecY, vecZ;      //vector product dir X ort
+    double alpha;              //defines the radius in the radar
+    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))));
+    vecX = dirY*ortZ - dirZ*ortY;
+    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);     
+    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");
@@ -88 +142 @@
     energyCounter->initSmartBarOverlayElement(-100,0,200,20,BarOverlayElement::LEFT);
     energyCounter->reset(80);
+    
+    radar->initRadarOverlayElement(10,10,200,energyCounterPanel);
 
     

code/branches/hud2/src/orxonox/hud/HUD.h

@@ -39 +39 @@
 #include "core/Tickable.h"
 #include "BarOverlayElement.h"
+#include "RadarOverlayElement.h"
 
 
@@ -54 +55 @@
 
     SmartBarOverlayElement* energyCounter;
+    
+    RadarOverlayElement* radar;
 //    Ogre::SceneNode* ogreNode_;
   };
 }       
 
-
 #endif

code/branches/hud2/src/orxonox/hud/OverlayElementFactories.h

@@ -40 +40 @@
 
   class _OrxonoxExport BarOverlayElementFactory : public Ogre::OverlayElementFactory{
-  public:
+    public:
     Ogre::OverlayElement* createOverlayElement(const Ogre::String& instanceName){
       return new BarOverlayElement(instanceName);
@@ -53 +53 @@
   class _OrxonoxExport SmartBarOverlayElementFactory : public Ogre::OverlayElementFactory{
     public:
+    Ogre::OverlayElement* createOverlayElement(const Ogre::String& instanceName){
+      return new SmartBarOverlayElement(instanceName);
+    }
+    const Ogre::String& getTypeName(void) const{
+      static Ogre::String name = "SmartBar";
+      return name;
+    }
+  };
+
+  class _OrxonoxExport RadarOverlayElementFactory : public Ogre::OverlayElementFactory{
+    public:
       Ogre::OverlayElement* createOverlayElement(const Ogre::String& instanceName){
-        return new SmartBarOverlayElement(instanceName);
+        return new RadarOverlayElement(instanceName);
       }
       const Ogre::String& getTypeName(void) const{
-        static Ogre::String name = "SmartBar";
+        static Ogre::String name = "Radar";
         return name;
       }
   };
-
 }
 

code/branches/hud2/src/orxonox/hud/RadarOverlayElement.cc

@@ -28 +28 @@
 #include <OgreOverlayManager.h>
 #include <OgreOverlayElement.h>
+#include <OgrePanelOverlayElement.h>
+
 #include <OgreStringConverter.h>
 #include <math.h>
@@ -47 +49 @@
   }
   
-  void RadarOverlayElement::initRadarOverlayElement(){
+  void RadarOverlayElement::initRadarOverlayElement(Real left, Real top, int dim, Ogre::OverlayContainer* container){
+    
     int dirX, dirY, dirZ;      //flying direction
     int ortX, ortY, ortZ;      //orthogonal direction
@@ -68 +71 @@
     dZ = 0;
     
-    alpha = acos(((double)(dirX*dX+dirY*dY+dirZ*dZ))/(sqrt((double)(pow(dX,2)+pow(dY,2)+pow(dZ,2)))+sqrt((double)(pow(dirX,2)+pow(dirY,2)+pow(dirZ,2)))));
-    beta = acos(((double)(ortX*dX+ortY*dY+ortZ*dZ))/(sqrt((double)(pow(dX,2)+pow(dY,2)+pow(dZ,2)))+sqrt((double)(pow(ortX,2)+pow(ortY,2)+pow(ortZ,2)))));
+    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))));
     vecX = dirY*ortZ - dirZ*ortY;
     vecY = dirZ*ortX - dirX*ortZ;
@@ -76 +79 @@
     if((vecX*dX+vecY*dY+vecZ*dZ)>0){right=true;}
     else right=false;
+    
+    setMetricsMode(Ogre::GMM_PIXELS);
+    setPosition(left,top);
+    setDimensions(dim,dim);
+    setMaterialName("Orxonox/MapBackGround");
+    
+    Ogre::OverlayManager& overlayManager = Ogre::OverlayManager::getSingleton();
 
+    PanelOverlayElement* point = static_cast<PanelOverlayElement*>(overlayManager.createOverlayElement("Panel", "point"));
+    point->show();
+    
+    container->addChild(point);
+    
+    if (right){
+      point->setPosition(sin(beta)*alpha/3.14*dim/2+dim/2,-cos(beta)*alpha/3.14*dim/2+dim/2);
+      point->setMaterialName("Orxonox/Red");
+      point->setDimensions(5,5);
+      point->setMetricsMode(Ogre::GMM_PIXELS);
+    }
+  
+    else {
+      point->setPosition(-sin(beta)*alpha/3.14*dim/2+dim/2,-cos(beta)*alpha/3.14*dim/2+dim/2);
+      point->setMaterialName("Orxonox/Red");
+      point->setDimensions(5,5);
+      point->setMetricsMode(Ogre::GMM_PIXELS);
+    }
 
+    
+
+    
+  }  
 }
 
 
+

code/branches/hud2/src/orxonox/hud/RadarOverlayElement.h

@@ -32 +32 @@
 #include <string.h>
 #include <OgreOverlayElement.h>
+#include <OgrePanelOverlayElement.h>
+
 #include <OgrePrerequisites.h>
 #include "../OrxonoxPrereqs.h"
@@ -50 +52 @@
     virtual void initialise();
 
-
+    void initRadarOverlayElement(Real left, Real top, int dim, Ogre::OverlayContainer* container);
   };
 }