Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 25, 2009, 4:19:14 AM (15 years ago)
Author:
landauf
Message:

merged weapons branch back to trunk

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/src/orxonox/objects/worldentities/Billboard.h

    r2826 r3053  
    6161            inline const ColourValue& getColour() const
    6262                { 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*/
    6469            virtual void setTeamColour(const ColourValue& colour)
    6570                { this->setColour(colour); }
     
    7378        private:
    7479            void changedMaterial();
     80//            void changedRotation();
    7581
    7682            BillboardSet billboard_;
    7783            std::string material_;
    7884            ColourValue colour_;
     85//            Radian rotation_;
    7986    };
    8087}
Note: See TracChangeset for help on using the changeset viewer.