Changeset 7491

Timestamp:

Sep 26, 2010, 9:48:42 PM (14 years ago)

Author:

dafrick

Message:

Implemented Billboard rotation. If there is a reason why it wasn't implemented, yet and that reason is because it doesn't work, in some instances, then please feel free to revert the changes.
For me it works, though.

Location:

code/trunk/src/orxonox/graphics

Files:

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

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

@@ -29 +29 @@
 #include "Billboard.h"
 
+#include "OgreBillboard.h"
+#include "OgreBillboardSet.h"
+
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
@@ -43 +46 @@
 
         this->colour_ = ColourValue::White;
-//        this->rotation_ = 0;
+        this->rotation_ = 0;
 
         this->registerVariables();
@@ -63 +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);
     }
 
@@ -70 +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));
     }
 
@@ -86 +89 @@
                      this->attachOgreObject(this->billboard_.getBillboardSet());
                 this->billboard_.setVisible(this->isVisible());
-//                this->changedRotation();
+                this->changedRotation();
             }
         }
@@ -111 +114 @@
     }
 
-/*
     void Billboard::changedRotation()
     {
         if (this->billboard_.getBillboardSet())
-            this->billboard_.getBillboardSet()->setRotation(this->rotation_);
+        {
+            Ogre::BillboardSet* set = this->billboard_.getBillboardSet();
+            set->setBillboardRotationType(Ogre::BBR_VERTEX);
+            unsigned int size = set->getPoolSize();
+            for(unsigned int i = 0; i < size; i++)
+            {
+                set->getBillboard(i)->setRotation(this->rotation_);
+            }
+        }
     }
-*/
 
     void Billboard::changedVisibility()

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

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