Changeset 3053 for code/trunk/src/orxonox/objects/worldentities/Billboard.h
- Timestamp:
- May 25, 2009, 4:19:14 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/weapons (added) merged: 2898,2901,2912,2914-2915,2918-2924,2969,2979,2981,2983,2987,3012
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/worldentities/Billboard.h
r2826 r3053 61 61 inline const ColourValue& getColour() const 62 62 { return this->colour_; } 63 63 /* 64 inline void setRotation(const Radian& rotation) 65 { this->rotation_ = rotation; this->changedRotation(); } 66 inline const Radian& getRotation() const 67 { return this->rotation_; } 68 */ 64 69 virtual void setTeamColour(const ColourValue& colour) 65 70 { this->setColour(colour); } … … 73 78 private: 74 79 void changedMaterial(); 80 // void changedRotation(); 75 81 76 82 BillboardSet billboard_; 77 83 std::string material_; 78 84 ColourValue colour_; 85 // Radian rotation_; 79 86 }; 80 87 }
Note: See TracChangeset
for help on using the changeset viewer.