[Orxonox-commit 3935] r8609 - code/branches/spaceboundaries2/src/orxonox/worldentities

[kmaurus at orxonox.net]

Author: kmaurus
Date: 2011-05-26 17:08:09 +0200 (Thu, 26 May 2011)
New Revision: 8609

Modified:
   code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc
   code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h
Log:
endversion

Modified: code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc
===================================================================
--- code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc	2011-05-26 14:58:18 UTC (rev 8608)
+++ code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc	2011-05-26 15:08:09 UTC (rev 8609)
@@ -57,13 +57,7 @@
         // Show Boundaries on the radar.
         this->centerRadar_ = new RadarViewable(this, this);
         this->centerRadar_->setRadarObjectShape(RadarViewable::Dot);
-        this->centerRadar_->setRadarVisibility(false);\
-        
-        // FOLGENDER BLOCK: TO REMOVE (DEBUGGING)
-        constBilly = new Billboard(this);
-        Vector3 pos = Vector3(-10, -10, -10);
-        constBilly->setPosition(pos);
-        setBillboardOptions(constBilly, pos);
+        this->centerRadar_->setRadarVisibility(false);
     }
     SpaceBoundaries::~SpaceBoundaries()
     {
@@ -79,8 +73,6 @@
             }
         }
         this->billboards_.clear();
-        
-        delete constBilly; // TO REMOVE (DEBUGGING)
     }
     
     void SpaceBoundaries::checkWhoIsIn()
@@ -122,26 +114,28 @@
         {
             Billboard *tmp = new Billboard(this);
             tmp->setPosition(position);
-            this->setBillboardOptions( tmp, position);
+            this->setBillboardOptions( tmp );
+            Vector3 normalisedVec = (position - this->getPosition()).normalisedCopy(); /* Vektor von Kugelmitte nach aussen */
+            tmp->setCommonDirection ( -1.0 * normalisedVec );
+            tmp->setCommonUpVector( Vector3::UNIT_Z );
             billboardAdministration tmp2 = { true, tmp };
             this->billboards_.push_back( tmp2 );
-            
         } else {
             current->billy->setPosition(position);
             current->billy->setVisible(true);
             current->usedYet = true;
+            Vector3 normalisedVec = (position - this->getPosition()).normalisedCopy(); /* Vektor von Kugelmitte nach aussen */
+            current->billy->setCommonDirection ( -1.0 * normalisedVec );
+            current->billy->setCommonUpVector( Vector3::UNIT_Z );
         }
     }
     
-    void SpaceBoundaries::setBillboardOptions(Billboard *billy, Vector3 position)
+    void SpaceBoundaries::setBillboardOptions(Billboard *billy)
     {
         if(billy != NULL)
         {
             billy->setMaterial("Grid");
             billy->setBillboardType(Ogre::BBT_PERPENDICULAR_COMMON);
-            Vector3 normalisedVec = (position - this->getPosition()).normalisedCopy(); /* Vektor von Kugelmitte nach aussen */
-            billy->setCommonDirection ( -1.0 * normalisedVec );
-            billy->setCommonUpVector( Vector3::UNIT_Z ); // (normalisedVec.crossProduct(Vector3::UNIT_X)).normalisedCopy() );
             billy->setDefaultDimensions(150, 150);
             billy->setVisible(true);
         }
@@ -274,7 +268,7 @@
     
     void SpaceBoundaries::displayWarning(const std::string warnText)
     {   
-        
+        // TODO
     }
     
     void SpaceBoundaries::displayBoundaries(Pawn *item)

Modified: code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h
===================================================================
--- code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h	2011-05-26 14:58:18 UTC (rev 8608)
+++ code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h	2011-05-26 15:08:09 UTC (rev 8609)
@@ -120,13 +120,11 @@
             
             
             RadarViewable* centerRadar_; //!< Repraesentation von SpaceBoundaries auf dem Radar.
-            
-            Billboard* constBilly; // TO REMOVE (DEBUGGING)
         
         
             // Funktionen::
             float computeDistance(WorldEntity *item); //!< Auf den Mittelpunkt 'this->getPosition()' bezogen.
-            void displayWarning(const std::string warnText); //!< Einen Warntext auf dem Bildschirm ausgeben. (noch nicht implementiert)
+            void displayWarning(const std::string warnText); //!< Einen Warntext auf dem Bildschirm ausgeben. (noch nicht implementiert, TODO)
             void displayBoundaries(Pawn *item);
             void conditionalBounceBack(Pawn *item, float currentDistance, float dt);
             void bounceBack(Pawn *item, Vector3 *normal, Vector3 *velocity);
@@ -135,7 +133,7 @@
             void checkWhoIsIn(); //!< Update the list 'pawnsIn_'.
             
             void positionBillboard(const Vector3 position); //!< Display a Billboard at the position 'position'.
-            void setBillboardOptions(Billboard *billy, Vector3 position);
+            void setBillboardOptions(Billboard *billy);
             void removeAllBillboards(); //!< Hide all elements of '*billboard_' and set their attribute 'usedYet' to 0.
             
     };