[Orxonox-commit 2789] r7492 - code/trunk/src/orxonox/graphics

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-09-26 22:38:57 +0200 (Sun, 26 Sep 2010)
New Revision: 7492

Modified:
   code/trunk/src/orxonox/graphics/Billboard.cc
   code/trunk/src/orxonox/graphics/Billboard.h
Log:
Reverting changes to Billboard. Apparently Ogre 1.4 doesn't support rotations, so this is out for now...


Modified: code/trunk/src/orxonox/graphics/Billboard.cc
===================================================================
--- code/trunk/src/orxonox/graphics/Billboard.cc	2010-09-26 19:48:42 UTC (rev 7491)
+++ code/trunk/src/orxonox/graphics/Billboard.cc	2010-09-26 20:38:57 UTC (rev 7492)
@@ -45,7 +45,7 @@
         RegisterObject(Billboard);
 
         this->colour_ = ColourValue::White;
-        this->rotation_ = 0;
+        //this->rotation_ = 0;
 
         this->registerVariables();
     }
@@ -65,14 +65,14 @@
 
         XMLPortParam(Billboard, "material", setMaterial, getMaterial, xmlelement, mode);
         XMLPortParam(Billboard, "colour",   setColour,   getColour,   xmlelement, mode).defaultValues(ColourValue::White);
-        XMLPortParam(Billboard, "rotation", setRotation, getRotation, xmlelement, mode).defaultValues(0);
+        //XMLPortParam(Billboard, "rotation", setRotation, getRotation, xmlelement, mode).defaultValues(0);
     }
 
     void Billboard::registerVariables()
     {
         registerVariable(this->material_, VariableDirection::ToClient, new NetworkCallback<Billboard>(this, &Billboard::changedMaterial));
         registerVariable(this->colour_,   VariableDirection::ToClient, new NetworkCallback<Billboard>(this, &Billboard::changedColour));
-        registerVariable(this->rotation_, VariableDirection::ToClient, new NetworkCallback<Billboard>(this, &Billboard::changedRotation));
+        //registerVariable(this->rotation_, VariableDirection::ToClient, new NetworkCallback<Billboard>(this, &Billboard::changedRotation));
     }
 
     void Billboard::changedMaterial()
@@ -88,7 +88,7 @@
                 if (this->billboard_.getBillboardSet())
                      this->attachOgreObject(this->billboard_.getBillboardSet());
                 this->billboard_.setVisible(this->isVisible());
-                this->changedRotation();
+                //this->changedRotation();
             }
         }
         else
@@ -113,6 +113,7 @@
             this->billboard_.setColour(this->colour_);
     }
 
+/*
     void Billboard::changedRotation()
     {
         if (this->billboard_.getBillboardSet())
@@ -126,6 +127,7 @@
             }
         }
     }
+*/
 
     void Billboard::changedVisibility()
     {

Modified: code/trunk/src/orxonox/graphics/Billboard.h
===================================================================
--- code/trunk/src/orxonox/graphics/Billboard.h	2010-09-26 19:48:42 UTC (rev 7491)
+++ code/trunk/src/orxonox/graphics/Billboard.h	2010-09-26 20:38:57 UTC (rev 7492)
@@ -61,10 +61,12 @@
             inline const ColourValue& getColour() const
                 { return this->colour_; }
 
+/*
             inline void setRotation(const Radian& rotation)
                 { this->rotation_ = rotation; this->changedRotation(); }
             inline const Radian& getRotation() const
                 { return this->rotation_; }
+*/
 
             virtual void setTeamColour(const ColourValue& colour)
                 { this->setColour(colour); }
@@ -78,12 +80,12 @@
         private:
             void registerVariables();
             void changedMaterial();
-            void changedRotation();
+            //void changedRotation();
 
             BillboardSet billboard_;
             std::string material_;
             ColourValue colour_;
-            Radian rotation_;
+            //Radian rotation_;
     };
 }