- Timestamp:
- Apr 26, 2006, 4:13:08 PM (19 years ago)
- Location:
- branches/atmospheric_engine/src
- Files:
-
- 4 added
- 4 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/atmospheric_engine/src/defs/class_id.h
r7379 r7381 287 287 288 288 //CL_ATMOSPHERIC_ENGINE = 0x , 289 //CL_SUN_EFFECT S= 0x ,290 //CL_WEATHER_EFFECT S= 0x ,289 //CL_SUN_EFFECT = 0x , 290 //CL_WEATHER_EFFECT = 0x , 291 291 292 292 // Particles -
branches/atmospheric_engine/src/lib/graphics/Makefile.am
r7379 r7381 18 18 effects/graphics_effect.cc \ 19 19 effects/atmospheric_engine.cc \ 20 effects/weather_effect s.cc \21 effects/sun_effect s.cc \20 effects/weather_effect.cc \ 21 effects/sun_effect.cc \ 22 22 effects/fog_effect.cc \ 23 23 effects/lense_flare.cc … … 39 39 effects/graphics_effect.h \ 40 40 effects/atmospheric_engine.h \ 41 effects/weather_effect s.h \42 effects/sun_effect s.h \41 effects/weather_effect.h \ 42 effects/sun_effect.h \ 43 43 effects/fog_effect.h \ 44 44 effects/lense_flare.h -
branches/atmospheric_engine/src/lib/graphics/effects/atmospheric_engine.cc
r7379 r7381 18 18 #include "util/loading/resource_manager.h" 19 19 20 21 20 #include "effects/fog_effect.h" 22 23 24 21 25 22 #include "util/loading/load_param.h" … … 61 58 void AtmosphericEngine::loadParams(const TiXmlElement* root) 62 59 { 63 LoadParamXML(root, "WeatherEffect s", this, AtmosphericEngine, loadWeatherEffects);64 LoadParamXML(root, "SunEffect s", this, AtmosphericEngine, loadSunEffects);60 LoadParamXML(root, "WeatherEffect", this, AtmosphericEngine, loadWeatherEffect); 61 LoadParamXML(root, "SunEffect", this, AtmosphericEngine, loadSunEffect); 65 62 } 66 63 … … 68 65 * @param root The XML-element to load WeatherEffects from 69 66 */ 70 void AtmosphericEngine::loadWeatherEffect s(const TiXmlElement* root)67 void AtmosphericEngine::loadWeatherEffect(const TiXmlElement* root) 71 68 { 72 69 LOAD_PARAM_START_CYCLE(root, element); … … 81 78 * @param root The XML-element to load SunEffects from 82 79 */ 83 void AtmosphericEngine::loadSunEffect s(const TiXmlElement* root)80 void AtmosphericEngine::loadSunEffect(const TiXmlElement* root) 84 81 { 85 82 LOAD_PARAM_START_CYCLE(root, element); -
branches/atmospheric_engine/src/lib/graphics/effects/atmospheric_engine.h
r7379 r7381 32 32 inline bool isActivated() const { return this->bActivated; } 33 33 34 void loadWeatherEffect s(const TiXmlElement* root);35 void loadSunEffect s(const TiXmlElement* root);34 void loadWeatherEffect(const TiXmlElement* root); 35 void loadSunEffect(const TiXmlElement* root); 36 36 37 37 private: -
branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.cc
r7379 r7381 52 52 void FogEffect::loadParams(const TiXmlElement* root) 53 53 { 54 WeatherEffect s::loadParams(root);54 WeatherEffect::loadParams(root); 55 55 56 56 /* -
branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.h
r7379 r7381 6 6 #define _FOG_EFFECT 7 7 8 #include "weather_effect s.h"8 #include "weather_effect.h" 9 9 10 class FogEffect : public WeatherEffect s10 class FogEffect : public WeatherEffect 11 11 { 12 12 public:
Note: See TracChangeset
for help on using the changeset viewer.