Changeset 8706 for code/trunk/src/orxonox/graphics/Billboard.h
- Timestamp:
- Jun 14, 2011, 8:53:28 PM (13 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/graphics/Billboard.h
r7492 r8706 23 23 * Fabian 'x3n' Landau 24 24 * Co-authors: 25 * ...25 * Maurus Kaufmann 26 26 * 27 27 */ … … 31 31 32 32 #include "OrxonoxPrereqs.h" 33 34 #include "OgreBillboardSet.h" 33 35 34 36 #include "util/Math.h" … … 62 64 { return this->colour_; } 63 65 64 /* 66 65 67 inline void setRotation(const Radian& rotation) 66 68 { this->rotation_ = rotation; this->changedRotation(); } 67 69 inline const Radian& getRotation() const 68 70 { return this->rotation_; } 69 */ 71 70 72 71 73 virtual void setTeamColour(const ColourValue& colour) 72 74 { this->setColour(colour); } 75 76 void setBillboardType(Ogre::BillboardType bbt); 77 78 void setCommonDirection(Vector3 vec); //!< normalised Vector vec as argument 79 80 void setCommonUpVector(Vector3 vec); //!< normalised Vector vec as argument 81 82 void setDefaultDimensions(float width, float height); 83 73 84 74 85 protected: … … 81 92 void registerVariables(); 82 93 void changedMaterial(); 83 //void changedRotation();94 void changedRotation(); 84 95 85 96 BillboardSet billboard_; 86 97 std::string material_; 87 98 ColourValue colour_; 88 //Radian rotation_;99 Radian rotation_; 89 100 }; 90 101 }
Note: See TracChangeset
for help on using the changeset viewer.