Changeset 8301

Timestamp:

Apr 22, 2011, 6:42:42 PM (13 years ago)

Author:

kmaurus

Message:

several billboards that represent the boundary can be displayed now

Location:

code/branches/spaceboundaries/src/orxonox/worldentities

Files:

• SpaceBoundaries.cc (modified) (9 diffs)
• SpaceBoundaries.h (modified) (5 diffs)

code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.cc

@@ -38 +38 @@
 #include "graphics/Billboard.h"
 
-
-//#include <OgreTextAreaOverlayElement.h>
-#include <OgreOverlayManager.h>
-//#include <overlays/OverlayText.h>
-
 namespace orxonox
 {
@@ -62 +57 @@
         this->centerRadar_->setRadarObjectShape(RadarViewable::Dot);
         this->centerRadar_->setRadarVisibility(false);
-        
-//         m_pColoredTextAreaOverlayElementFactory = new ColoredTextAreaOverlayElementFactory();
     }
     SpaceBoundaries::~SpaceBoundaries()
@@ -76 +69 @@
         this->pawnsIn_.clear();
         
-//        delete pColoredTextAreaOverlayElementFactory;
+        for( std::vector<billboardAdministration>::iterator current = this->billboards_.begin(); current != this->billboards_.end(); current++)
+        {
+            if( current->billy != NULL)
+            {
+                delete current->billy;
+            }
+        }
+        this->billboards_.clear();
     }
     
@@ -93 +93 @@
     }
     
+    void SpaceBoundaries::positionBillboard(const Vector3 position)
+    {
+        std::vector<billboardAdministration>::iterator current;
+        for( current = this->billboards_.begin(); current != this->billboards_.end(); current++)
+        {
+            if(!current->usedYet)
+            {
+                break;
+            }
+        }
+        if( current == this->billboards_.end() )
+        {
+            Billboard *tmp = new Billboard(this);
+            setBillboardOptions( tmp );
+            tmp->setPosition(position);
+            billboardAdministration tmp2 = { true, tmp };
+            this->billboards_.push_back( tmp2 );
+            
+        } else {
+            current->billy->setPosition(position);
+            current->billy->setVisible(true);
+            current->usedYet = true;
+        }
+    }
+    
+    void SpaceBoundaries::setBillboardOptions(Billboard *billy)
+    {
+        if(billy != NULL)
+        {
+            billy->setMaterial("Shield");
+            billy->setVisible(true);
+        }
+    }
+    
+    void SpaceBoundaries::removeAllBillboards()
+    {
+        for( std::vector<billboardAdministration>::iterator current = this->billboards_.begin(); current != this->billboards_.end(); current++ )
+        {
+            current->usedYet = false;
+            current->billy->setVisible(false);
+        }
+    }
+    
     void SpaceBoundaries::setMaxDistance(float r)
     {
@@ -140 +183 @@
     void SpaceBoundaries::tick(float dt)
     {
-        
+        this->removeAllBillboards();
         COUT(0) << "Groesse der Liste: " << (int) pawnsIn_.size() << std::endl;
         
-        //for(ObjectListIterator<Pawn> current = ObjectList<Pawn>::begin(); current != ObjectList<Pawn>::end(); ++current)
+        float distance;
+        bool humanItem;
         for( std::list<Pawn*>::iterator current = pawnsIn_.begin(); current != pawnsIn_.end(); current++ )
         {
             Pawn* currentPawn = *current;
-            float distance = this->computeDistance(currentPawn);
-            bool humanItem = this->isHumanPlayer(currentPawn);
-            COUT(0) << "Distanz:" << distance << std::endl; //!< message for debugging
+            distance = this->computeDistance(currentPawn);
+            humanItem = this->isHumanPlayer(currentPawn);
+            COUT(0) << "Distanz:" << distance << std::endl; // message for debugging
             if(distance > this->warnDistance_ && distance < this->maxDistance_) // Zeige Warnung an!
             {
-                COUT(0) << "You are leaving the area" << std::endl; //!< message for debugging
+                COUT(0) << "You are leaving the area" << std::endl; // message for debugging
                 if(humanItem)
                 {
@@ -185 +229 @@
     float SpaceBoundaries::computeDistance(WorldEntity *item)
     {
-        Vector3 itemPosition = item->getPosition();
-        return (itemPosition.distance(this->getPosition()));
+        if(item != NULL)
+        {
+            Vector3 itemPosition = item->getPosition();
+            return (itemPosition.distance(this->getPosition()));
+        } else {
+            return -1;
+        }
     }
     
     void SpaceBoundaries::displayWarning(const std::string warnText)
-    {   /*
-        Ogre::TextAreaOverlayElement *pTextArea;
-        Ogre::OverlayManager manager = Ogre::OverlayManager();
-        Ogre::OverlayElement temp = manager.createOverlayElement("TextArea", "MyTextArea");
-        //pTextArea = (Ogre::TextAreaOverlayElement *) 
-       // pTextArea->setCaption("Some plain text");
-    
-        Ogre::TextAreaOverlayElement warning(warnText);
-        warning.initialise();
-        //warning.setPosition(0.2, 0.2);
-        
-
-        COUT(0) << "Breite des Warntextes: " << warning.getWidth() << std::endl;
-        COUT(0) << "Hoehe des Warntextes: " << warning.getHeight() << std::endl;
-        
-        warning.show();*/
-        // Register the overlay element
-/*         OverlayManager::getSingleton().addOverlayElementFactory(pColoredTextAreaOverlayElementFactory);
-         
-        Ogre::TextAreaOverlayElement *pTextArea =
-                (Ogre::TextAreaOverlayElement*)Ogre::OverlayManager.createOverlayElement("TextArea", "MyTextArea");
-        pTextArea->setCaption("Some plain text");
-*/
+    {   
         
     }
@@ -224 +251 @@
         Vector3 boundaryPosition = this->getPosition() + direction * this->maxDistance_;
         
-        if(this->boundary_ == NULL)
-        {
-            this->boundary_ = new Billboard(this);
-            this->boundary_->setMaterial("Examples/Flare");
-            this->boundary_->setVisible(true);
-        }
-        
-        this->boundary_->setPosition(boundaryPosition);
+        this->positionBillboard(boundaryPosition);
     }
     
@@ -237 +257 @@
     {
         Vector3 normal = item->getPosition() - this->getPosition();
-        if( item->getVelocity().dotProduct(normal) > 0 ) // greife nur ein, falls 
+        if( item->getVelocity().dotProduct(normal) > 0 ) // Greife nur ein, falls sich das Pawn nach Aussen bewegt.
         {
             float dampingFactor = 0.5;
@@ -246 +266 @@
             Vector3 acceleration = item->getAcceleration();
             acceleration = acceleration.reflect(normal);
-            /*
-            Vector3 rotationAxis = velocity.crossProduct(normal);
-            Ogre::Radian angle = 2 * velocity.angleBetween(normal);
-            item->setOrientation(Ogre::Quaternion::Quaternion(angle, rotationAxis));
-            */
-            /*
-            Ogre::Quaternion orientation = item->getOrientation();
-            orientation = -1.0 * orientation;
-            item->setOrientation(orientation);
-            */
-            //item->setOrientation(item->getOrientation().UnitInverse() );
             
             item->lookAt( velocity + this->getPosition() );

code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.h

@@ -27 +27 @@
  */
  
- /* TODO:   - Mehrere SpaceBoundaries-Instanzen pro Level ermoeglichen
-            - Pro Pawn ein Billboard verwenden
+ /* TODO:   - Sobald Bots im Spiel sind, stürzt das Programm relativ bald ab!!!
  */
  
@@ -52 +51 @@
 #include "worldentities/WorldEntity.h"
 
-//#include <ColoredTextAreaOverlayElementFactory.h>
-
 #include <string>
 #include <list>
+#include <map>
+#include <vector>
 
 /**
@@ -78 +77 @@
             ~SpaceBoundaries();
             
-            void checkWhoIsIn();
+            void checkWhoIsIn(); //!< Update the list 'pawnsIn_'.
+            
+            void positionBillboard(const Vector3 position);
+            void setBillboardOptions(Billboard *billy);
+            void removeAllBillboards();
             
             void setMaxDistance(float r);
@@ -97 +100 @@
 
         private:
-            std::list<Pawn*> pawnsIn_;
+            struct billboardAdministration{ bool usedYet; Billboard* billy; };
+            
+            std::list<Pawn*> pawnsIn_; //!< List of the pawns that this instance of SpaceBoundaries has to handle.
+            
+            std::vector<billboardAdministration> billboards_;
         
             float maxDistance_; //!< maximal zulaessige Entfernung von 'this->getPosition()'.
@@ -116 +123 @@
             bool isHumanPlayer(Pawn *item);
             
- //           ColoredTextAreaOverlayElementFactory* pColoredTextAreaOverlayElementFactory;
     };
 }