Changeset 11071 for code/trunk/src/orxonox/graphics/Light.h
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/graphics/Light.h
r9667 r11071 42 42 { 43 43 public: 44 enum LightTypes// Copy from the Ogre enum44 enum class Type // Copy from the Ogre enum 45 45 { 46 46 /// Point light sources give off light equally in all directions, so require only position not direction … … 56 56 virtual ~Light(); 57 57 58 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;58 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 59 59 60 virtual void changedVisibility() ;60 virtual void changedVisibility() override; 61 61 62 62 inline Ogre::Light* getLight() 63 63 { return this->light_; } 64 64 65 inline void setType(Light:: LightTypestype)65 inline void setType(Light::Type type) 66 66 { this->type_ = type; this->updateType(); } 67 inline Light:: LightTypesgetType() const67 inline Light::Type getType() const 68 68 { return this->type_; } 69 69 … … 78 78 { return this->specular_; } 79 79 80 virtual void setTeamColour(const ColourValue& colour) 80 virtual void setTeamColour(const ColourValue& colour) override 81 81 { this->setDiffuseColour(colour); this->setSpecularColour(colour); } 82 82 … … 144 144 145 145 Ogre::Light* light_; 146 Light Typestype_;146 Light::Type type_; 147 147 ColourValue diffuse_; 148 148 ColourValue specular_;
Note: See TracChangeset
for help on using the changeset viewer.