Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 11, 2010, 12:34:00 AM (14 years ago)
Author:
landauf
Message:

merged doc branch back to trunk

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc

    r7284 r7401  
    126126        BaseObject::XMLPort()
    127127    */
    128     void OrxonoxOverlay::XMLPort(Element& xmlElement, XMLPort::Mode mode)
    129     {
    130         SUPER(OrxonoxOverlay, XMLPort, xmlElement, mode);
    131 
    132         XMLPortParam(OrxonoxOverlay, "size",      setSize,      getSize,      xmlElement, mode);
    133         XMLPortParam(OrxonoxOverlay, "pickpoint", setPickPoint, getPickPoint, xmlElement, mode);
    134         XMLPortParam(OrxonoxOverlay, "position",  setPosition,  getPosition,  xmlElement, mode);
    135         XMLPortParam(OrxonoxOverlay, "rotation",  setRotation,  getRotation,  xmlElement, mode);
    136         XMLPortParam(OrxonoxOverlay, "correctaspect", setAspectCorrection,   getAspectCorrection,   xmlElement, mode);
    137         XMLPortParam(OrxonoxOverlay, "background",    setBackgroundMaterial, getBackgroundMaterial, xmlElement, mode);
     128    void OrxonoxOverlay::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     129    {
     130        SUPER(OrxonoxOverlay, XMLPort, xmlelement, mode);
     131
     132        XMLPortParam(OrxonoxOverlay, "size",      setSize,      getSize,      xmlelement, mode);
     133        XMLPortParam(OrxonoxOverlay, "pickpoint", setPickPoint, getPickPoint, xmlelement, mode);
     134        XMLPortParam(OrxonoxOverlay, "position",  setPosition,  getPosition,  xmlelement, mode);
     135        XMLPortParam(OrxonoxOverlay, "rotation",  setRotation,  getRotation,  xmlelement, mode);
     136        XMLPortParam(OrxonoxOverlay, "correctaspect", setAspectCorrection,   getAspectCorrection,   xmlelement, mode);
     137        XMLPortParam(OrxonoxOverlay, "background",    setBackgroundMaterial, getBackgroundMaterial, xmlelement, mode);
    138138    }
    139139
     
    306306        The name of the overlay defined BaseObject::setName() (usually done with the "name"
    307307        attribute in the xml file).
     308    @param scale
     309        The scaling factor
    308310    */
    309311    /*static*/ void OrxonoxOverlay::scaleOverlay(const std::string& name, float scale)
     
    346348        The name of the overlay defined BaseObject::setName() (usually done with the "name"
    347349        attribute in the xml file).
     350    @param scroll
     351        The relative translation of the overlay
    348352    */
    349353    /*static*/ void OrxonoxOverlay::scrollOverlay(const std::string& name, const Vector2& scroll)
     
    360364        The name of the overlay defined BaseObject::setName() (usually done with the "name"
    361365        attribute in the xml file).
     366    @param angle
     367        The rotation angle in degree
    362368    */
    363369    /*static*/ void OrxonoxOverlay::rotateOverlay(const std::string& name, const Degree& angle)
Note: See TracChangeset for help on using the changeset viewer.