Changeset 7492 for code/trunk

Timestamp:

Sep 26, 2010, 10:38:57 PM (14 years ago)

Author:

dafrick

Message:

Reverting changes to Billboard. Apparently Ogre 1.4 doesn't support rotations, so this is out for now…

Location:

code/trunk/src/orxonox/graphics

Files:

• Billboard.cc (modified) (6 diffs)
• Billboard.h (modified) (2 diffs)

code/trunk/src/orxonox/graphics/Billboard.cc

@@ -46 +46 @@
 
         this->colour_ = ColourValue::White;
-        this->rotation_ = 0;
+        //this->rotation_ = 0;
 
         this->registerVariables();
@@ -66 +66 @@
         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);
     }
 
@@ -73 +73 @@
         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));
     }
 
@@ -89 +89 @@
                      this->attachOgreObject(this->billboard_.getBillboardSet());
                 this->billboard_.setVisible(this->isVisible());
-                this->changedRotation();
+                //this->changedRotation();
             }
         }
@@ -114 +114 @@
     }
 
+/*
     void Billboard::changedRotation()
     {
@@ -127 +128 @@
         }
     }
+*/
 
     void Billboard::changedVisibility()

code/trunk/src/orxonox/graphics/Billboard.h

@@ -62 +62 @@
                 { 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)
@@ -79 +81 @@
             void registerVariables();
             void changedMaterial();
-            void changedRotation();
+            //void changedRotation();
 
             BillboardSet billboard_;
             std::string material_;
             ColourValue colour_;
-            Radian rotation_;
+            //Radian rotation_;
     };
 }