- Timestamp:
- Jun 16, 2009, 2:25:05 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pch/src/orxonox/objects/worldentities/Light.cc
r3110 r3186 29 29 #include "Light.h" 30 30 31 #include <sstream>32 #include <cassert>33 34 31 #include <OgreSceneManager.h> 32 #include <OgreLight.h> 33 #include <boost/static_assert.hpp> 35 34 36 35 #include "util/String.h" 37 36 #include "util/Exception.h" 37 #include "core/CoreIncludes.h" 38 38 #include "core/GameMode.h" 39 #include "core/CoreIncludes.h"40 39 #include "core/XMLPort.h" 41 40 #include "objects/Scene.h" … … 44 43 { 45 44 CreateFactory(Light); 45 46 // Be sure we don't do bad conversions 47 BOOST_STATIC_ASSERT((int)Ogre::Light::LT_POINT == (int)Light::LT_POINT); 48 BOOST_STATIC_ASSERT((int)Ogre::Light::LT_DIRECTIONAL == (int)Light::LT_DIRECTIONAL); 49 BOOST_STATIC_ASSERT((int)Ogre::Light::LT_SPOTLIGHT == (int)Light::LT_SPOTLIGHT); 46 50 47 51 Light::Light(BaseObject* creator) : StaticEntity(creator) … … 52 56 this->diffuse_ = ColourValue::White; 53 57 this->specular_ = ColourValue::White; 54 this->type_ = Ogre::Light::LT_POINT;58 this->type_ = Light::LT_POINT; 55 59 this->attenuation_ = Vector4(100000, 1, 0, 0); 56 60 this->spotlightRange_ = Vector3(40.0f, 30.0f, 1.0f); … … 136 140 { 137 141 if (type == "point") 138 this->setType( Ogre::Light::LT_POINT);142 this->setType(Light::LT_POINT); 139 143 else if (type == "directional") 140 this->setType( Ogre::Light::LT_DIRECTIONAL);144 this->setType(Light::LT_DIRECTIONAL); 141 145 else if (type == "spotlight") 142 this->setType( Ogre::Light::LT_SPOTLIGHT);146 this->setType(Light::LT_SPOTLIGHT); 143 147 else 144 this->setType( Ogre::Light::LT_POINT);148 this->setType(Light::LT_POINT); 145 149 } 146 150 … … 149 153 switch (this->type_) 150 154 { 151 case Ogre::Light::LT_DIRECTIONAL:155 case Light::LT_DIRECTIONAL: 152 156 return "directional"; 153 case Ogre::Light::LT_SPOTLIGHT:157 case Light::LT_SPOTLIGHT: 154 158 return "spotlight"; 155 case Ogre::Light::LT_POINT:159 case Light::LT_POINT: 156 160 default: 157 161 return "point"; … … 163 167 if (this->light_) 164 168 { 165 this->light_->setType( this->type_);169 this->light_->setType(static_cast<Ogre::Light::LightTypes>(this->type_)); 166 170 167 171 if (this->type_ != Ogre::Light::LT_DIRECTIONAL)
Note: See TracChangeset
for help on using the changeset viewer.