- 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.cc
r2896 r3053 47 47 this->material_ = ""; 48 48 this->colour_ = ColourValue::White; 49 // this->rotation_ = 0; 49 50 50 51 this->registerVariables(); … … 66 67 XMLPortParam(Billboard, "material", setMaterial, getMaterial, xmlelement, mode); 67 68 XMLPortParam(Billboard, "colour", setColour, getColour, xmlelement, mode).defaultValues(ColourValue::White); 69 // XMLPortParam(Billboard, "rotation", setRotation, getRotation, xmlelement, mode).defaultValues(0); 68 70 } 69 71 … … 72 74 registerVariable(this->material_, variableDirection::toclient, new NetworkCallback<Billboard>(this, &Billboard::changedMaterial)); 73 75 registerVariable(this->colour_, variableDirection::toclient, new NetworkCallback<Billboard>(this, &Billboard::changedColour)); 76 // registerVariable(this->rotation_, variableDirection::toclient, new NetworkCallback<Billboard>(this, &Billboard::changedRotation)); 74 77 } 75 78 … … 87 90 this->attachOgreObject(this->billboard_.getBillboardSet()); 88 91 this->billboard_.setVisible(this->isVisible()); 92 // this->changedRotation(); 89 93 } 90 94 } … … 110 114 this->billboard_.setColour(this->colour_); 111 115 } 116 117 /* 118 void Billboard::changedRotation() 119 { 120 if (this->billboard_.getBillboardSet()) 121 this->billboard_.getBillboardSet()->setRotation(this->rotation_); 122 } 123 */ 112 124 113 125 void Billboard::changedVisibility()
Note: See TracChangeset
for help on using the changeset viewer.