Changeset 8710 for code/branches/presentation/src/orxonox/graphics

Timestamp:

Jun 18, 2011, 1:11:04 PM (13 years ago)

Author:

FelixSchulthess

Message:

space boundary billboard is now animated. test run with myTestLevel.oxw

Location:

code/branches/presentation/src/orxonox/graphics

Files:

• Billboard.cc (modified) (1 diff)
• Billboard.h (modified) (3 diffs)

code/branches/presentation/src/orxonox/graphics/Billboard.cc

@@ -145 +145 @@
         }
     }
-    
-    void Billboard::setCommonDirection(Vector3 vec)
-    {
-        Ogre::BillboardSet* bSet = this->billboard_.getBillboardSet();
-        if( bSet != NULL )
-        {
-            bSet->setCommonDirection( vec );
-        }
-    }
-            
-    void Billboard::setCommonUpVector(Vector3 vec)
-    {
-        Ogre::BillboardSet* bSet = this->billboard_.getBillboardSet();
-        if( bSet != NULL )
-        {
-            bSet->setCommonUpVector( vec );
-        }
-    }
-    
-    void Billboard::setDefaultDimensions(float width, float height)
-    {
-        Ogre::BillboardSet* bSet = this->billboard_.getBillboardSet();
-        if( bSet != NULL )
-        {
-            bSet->setDefaultDimensions(width, height);
-        }
-    }
 }

code/branches/presentation/src/orxonox/graphics/Billboard.h

@@ -65 +65 @@
                 { return this->colour_; }
 
-
             inline void setRotation(const Radian& rotation)
                 { this->rotation_ = rotation; this->changedRotation(); }
@@ -71 +70 @@
                 { return this->rotation_; }
 
+            /// use normalised vector as argument
+            inline void setCommonDirection(const Vector3 vec)
+                { if(this->billboard_.getBillboardSet())
+                    this->billboard_.getBillboardSet()->setCommonDirection(vec); }
+            inline const Vector3 getCommonDirection()
+                { if(this->billboard_.getBillboardSet())
+                    return this->billboard_.getBillboardSet()->getCommonDirection(); }
+
+            /// use normalised vector as argument
+            inline void setCommonUpVector(const Vector3 vec)
+                { if(this->billboard_.getBillboardSet())
+                    this->billboard_.getBillboardSet()->setCommonUpVector( vec ); }
+            inline const Vector3 getCommonUpVector()
+                { if(this->billboard_.getBillboardSet())
+                    return this->billboard_.getBillboardSet()->getCommonUpVector(); }
 
             virtual void setTeamColour(const ColourValue& colour)
@@ -77 +91 @@
             void setBillboardType(Ogre::BillboardType bbt);
             
-            void setCommonDirection(Vector3 vec); //!< normalised Vector vec as argument
-            
-            void setCommonUpVector(Vector3 vec); //!< normalised Vector vec as argument
-            
-            void setDefaultDimensions(float width, float height);
+            inline void setDefaultDimensions(float width, float height)
+                { if(this->billboard_.getBillboardSet())
+                    this->billboard_.getBillboardSet()->setDefaultDimensions(width, height); }
 
+            inline void setTextureCoords(const Ogre::FloatRect* coords, unsigned int numCoords)
+                { if(this->billboard_.getBillboardSet())
+                    this->billboard_.getBillboardSet()->setTextureCoords(coords, numCoords); }
 
         protected: