Changeset 1339

Timestamp:

May 20, 2008, 11:51:33 PM (16 years ago)

Author:

FelixSchulthess

Message:

added full functionality for RadarObjects and two space tomatoes

Location:

code/branches/hud3

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• src/orxonox/hud/HUD.cc (modified) (4 diffs)
• src/orxonox/hud/RadarOverlayElement.cc (modified) (6 diffs)
• src/orxonox/hud/RadarOverlayElement.h (modified) (3 diffs)
• src/orxonox/objects/SpaceShip.cc (modified) (1 diff)

code/branches/hud3/bin/levels/sample.oxw

@@ -14 +14 @@
 <Skybox src="Orxonox/StarSkyBox" />
 <SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="0,0,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
-<Model position="1337,0,0" scale="10" mesh="tomato.mesh" yawpitchroll="0,0,0" />
+<Model position="1500,0,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,30,0" rotationAxis="1,0,0" rotationRate="-20"/>
+<Model position="0,4000,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,30,0" rotationAxis="1,0,0" rotationRate="-20"/>
 <NPC position="0,100,400" scale="1" mesh="razor.mesh"/>
 <NPC position="0,100,400" scale="1" mesh="razor.mesh"/>

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

@@ -46 +46 @@
     HUD::HUD(int zoom){
         om = &Ogre::OverlayManager::getSingleton();
-                
+
                 // create Factories
         BarOverlayElementFactory *barOverlayElementFactory = new BarOverlayElementFactory();
@@ -55 +55 @@
         orxonoxHUD = om->create("Orxonox/HUD");
         container = static_cast<Ogre::OverlayContainer*>(om->createOverlayElement("Panel", "Orxonox/HUD/container"));
-        // create energy bar    
+        // create energy bar
         energyBar = static_cast<BarOverlayElement*>(om->createOverlayElement("Bar", "energyBar"));
         energyBar->show();
@@ -67 +67 @@
                 // set up screen-wide container
         container->show();
-        
+
         orxonoxHUD->add2D(container);
         orxonoxHUD->show();
@@ -79 +79 @@
         speedoBar->init(0.01, 0.90, 0.4, 0.04, container);
         radar->init(0.5, 0.9, 0.2, container);
-        radar->addObject(Vector3(1337.0, 0.0, 0.0));
+        radar->addObject(Vector3(1500.0, 0.0, 0.0));
+        radar->addObject(Vector3(0.0, 4000.0, 0.0));
     }
 

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

@@ -54 +54 @@
 
     void RadarOverlayElement::init(Real leftRel, Real topRel, Real dimRel, Ogre::OverlayContainer* container){
-                om = &Ogre::OverlayManager::getSingleton();        
+        // some initial data
+                om = &Ogre::OverlayManager::getSingleton();
         dimRel_ = dimRel;
         leftRel_ = leftRel;
         topRel_ = topRel;
         container_ = container;
+        firstRadarObject_ = NULL;
+        lastRadarObject_ = NULL;
 
+        // these have to fit the data in the level
         shipPos_ = Vector3(0.0, 0.0, 0.0);
         initialDir_ = Vector3(1.0, 0.0, 0.0);
@@ -69 +73 @@
         setMaterialName("Orxonox/Radar");
         resize();
-        
+
         container_->addChild(this);
     }
@@ -89 +93 @@
                 currentOrth_ = SpaceShip::instance_s->getOrientation()*initialOrth_;
 
-                if(tomato_ == NULL) return;             
-                
-                tomato_->radius_ = acos((currentDir_.dotProduct(tomato_->pos_ - shipPos_))/
-                        ((tomato_->pos_ - shipPos_).length()*currentDir_.length()));
-        tomato_->phi_ = acos((currentOrth_.dotProduct(tomato_->pos_ - shipPos_))/
-                ((tomato_->pos_ - shipPos_).length()*currentOrth_.length()));
-        if((currentDir_.crossProduct(currentOrth_)).dotProduct(tomato_->pos_ - shipPos_) > 0) 
-                tomato_->right_ = true;
-        else tomato_->right_=false;
+        RadarObject* ro = firstRadarObject_;
+        // iterate through all RadarObjects
+                while(ro != NULL){
+            ro->radius_ = calcRadius(ro);
+            ro->phi_ = calcPhi(ro);
+            ro->right_ = calcRight(ro);
+            if (ro->right_){
+                ro->panel_->setPosition(sin(ro->phi_)*ro->radius_/
+                    3.5*dim_/2+dim_/2+left_-2,-cos(ro->phi_)*ro->radius_/3.5*dim_/2+dim_/2+top_-2);
+            }
+            else {
+                ro->panel_->setPosition(-sin(ro->phi_)*ro->radius_/
+                    3.5*dim_/2+dim_/2+left_-2,-cos(ro->phi_)*ro->radius_/3.5*dim_/2+dim_/2+top_-2);
+            }
+            ro = ro->next;
+                }
+    }
 
-        if (tomato_->right_){
-            tomato_->panel_->setPosition(sin(tomato_->phi_)*tomato_->radius_/
-                3.5*dim_/2+dim_/2+left_-2,-cos(tomato_->phi_)*tomato_->radius_/3.5*dim_/2+dim_/2+top_-2);
+    void RadarOverlayElement::addObject(Vector3 pos){
+        if(firstRadarObject_ == NULL){
+            firstRadarObject_ = new RadarObject(container_);
+            firstRadarObject_->pos_ = pos;
+            lastRadarObject_ = firstRadarObject_;
         }
-        else {
-            tomato_->panel_->setPosition(-sin(tomato_->phi_)*tomato_->radius_/
-                3.5*dim_/2+dim_/2+left_-2,-cos(tomato_->phi_)*tomato_->radius_/3.5*dim_/2+dim_/2+top_-2);
+        else{
+            lastRadarObject_->next = new RadarObject(container_);
+            lastRadarObject_->next->pos_ = pos;
+            lastRadarObject_ = lastRadarObject_->next;
         }
-    }
-    
-    void RadarOverlayElement::addObject(Vector3 pos){
-                tomato_ = new RadarObject(container_);
-                tomato_->pos_ = pos;
         }
-        
+
+        void RadarOverlayElement::listObjects(){
+            int i = 0;
+            RadarObject* ro = firstRadarObject_;
+            COUT(3) << "List of RadarObjects:\n";
+            // iterate through all Radar Objects
+            while(ro != NULL) {
+                COUT(3) << i++ << ": " << ro->pos_ << std::endl;
+                ro = ro->next;
+            }
+        }
+
+        float RadarOverlayElement::calcRadius(RadarObject* obj){
+            return(acos((currentDir_.dotProduct(obj->pos_ - shipPos_))/
+                        ((obj->pos_ - shipPos_).length()*currentDir_.length())));
+        }
+
+        float RadarOverlayElement::calcPhi(RadarObject* obj){
+            return(acos((currentOrth_.dotProduct(firstRadarObject_->pos_ - shipPos_))/
+                ((firstRadarObject_->pos_ - shipPos_).length()*currentOrth_.length())));
+        }
+
+        bool RadarOverlayElement::calcRight(RadarObject* obj){
+            if((currentDir_.crossProduct(currentOrth_)).dotProduct(obj->pos_ - shipPos_) > 0)
+                return true;
+        else return false;
+        }
+
         //// RadarObject ////
-        
+
         int RadarObject::count = 0;
-        
+
         RadarObject::RadarObject(Ogre::OverlayContainer* container){
                 container_ = container;
@@ -123 +160 @@
                 init();
         }
-        
+
         RadarObject::RadarObject(Ogre::OverlayContainer* container, Vector3 pos){
                 container_ = container;
@@ -129 +166 @@
                 init();
         }
-        
+
         RadarObject::~RadarObject(){}
-        
+
         void RadarObject::init(){
+            next = NULL;
                 om = &Ogre::OverlayManager::getSingleton();
                 panel_ = static_cast<PanelOverlayElement*>(om->createOverlayElement("Panel",
@@ -146 +184 @@
 /* my local clipboard...
 COUT(3) << "WWWWWWWWWWWWWWWWWWWWWWWWWWWW\n";
-COUT(3) << tomato_->radius_ << "  " << tomato_->phi_ << std::endl;
+COUT(3) << firstRadarObject_->radius_ << "  " << firstRadarObject_->phi_ << std::endl;
 COUT(3) << "WWWWWWWWWWWWWWWWWWWWWWWWWWWW\n";
 */

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

@@ -46 +46 @@
                 Ogre::OverlayManager* om;                               // our one and only overlay manager
                 void init();
-                
+
         public:
                 RadarObject(Ogre::OverlayContainer* container);
                 RadarObject(Ogre::OverlayContainer* container, Vector3 pos);
                 ~RadarObject();
-                
+
+            bool right_;
                 Vector3 pos_;                                                   // position in space
                         Ogre::Real radius_, phi_;                               // position on radar
-                        bool right_;
                         Ogre::OverlayContainer* container_;
                         Ogre::PanelOverlayElement* panel_;              // the panel used to show the dot
-                        
+                        RadarObject* next;                      // next pointer of linked list
+
                 static int count;
         };
@@ -67 +68 @@
             Ogre::OverlayContainer* container_;
             Vector3 initialDir_;                        // direction of nose
-            Vector3 currentDir_;                                        
+            Vector3 currentDir_;
             Vector3 initialOrth_;                   // direction of normal
             Vector3 currentOrth_;
             Vector3 shipPos_;                       // position of ship
-            
-                        RadarObject* tomato_;            
-            
+
+                        RadarObject* firstRadarObject_;         // start of linked list
+                        RadarObject* lastRadarObject_;          // end of linked list
+
             Ogre::Real leftRel_, topRel_, dimRel_;  // relative position/dimension
             int left_, top_, dim_;                  // absolute position/dimension
@@ -82 +84 @@
             ~RadarOverlayElement();
             void init(Real leftRel, Real topRel, Real dimRel, Ogre::OverlayContainer* container);
-                        void resize();            
+                        void resize();
             void update();
             void addObject(Vector3 pos);
+            void listObjects();
+            float calcRadius(RadarObject* obj);
+            float calcPhi(RadarObject* obj);
+            bool calcRight(RadarObject* obj);
         };
 }

code/branches/hud3/src/orxonox/objects/SpaceShip.cc

@@ -283 +283 @@
       this->camNode_ = this->getNode()->createChildSceneNode(camName_);
       COUT(4) << "position: (this)" << this->getNode()->getPosition() << std::endl;
-      this->camNode_->setPosition(/*this->getNode()->getPosition() +*/ Vector3(-40,0,0));
+      this->camNode_->setPosition(/*this->getNode()->getPosition() +*/ Vector3(-40,0,5));
       COUT(4) << "position: (cam)" << this->camNode_->getPosition() << std::endl;
 /*