Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7381 in orxonox.OLD


Ignore:
Timestamp:
Apr 26, 2006, 4:13:08 PM (18 years ago)
Author:
hdavid
Message:

branches/atmospheric_engine: renamed classes to WeatherEffect and SunEffect

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  
    287287
    288288  //CL_ATMOSPHERIC_ENGINE         =    0x        ,
    289   //CL_SUN_EFFECTS                =    0x        ,
    290   //CL_WEATHER_EFFECTS            =    0x        ,
     289  //CL_SUN_EFFECT                 =    0x        ,
     290  //CL_WEATHER_EFFECT             =    0x        ,
    291291
    292292  // Particles

  • branches/atmospheric_engine/src/lib/graphics/Makefile.am

    r7379 r7381  
    1818                           effects/graphics_effect.cc \
    1919                           effects/atmospheric_engine.cc \
    20                            effects/weather_effects.cc \
    21                            effects/sun_effects.cc \
     20                           effects/weather_effect.cc \
     21                           effects/sun_effect.cc \
    2222                           effects/fog_effect.cc \
    2323                           effects/lense_flare.cc
    … …  
    3939                 effects/graphics_effect.h \
    4040                 effects/atmospheric_engine.h \
    41                  effects/weather_effects.h \
    42                  effects/sun_effects.h \
     41                 effects/weather_effect.h \
     42                 effects/sun_effect.h \
    4343                 effects/fog_effect.h \
    4444                 effects/lense_flare.h

  • branches/atmospheric_engine/src/lib/graphics/effects/atmospheric_engine.cc

    r7379 r7381  
    1818#include "util/loading/resource_manager.h"
    1919
    20 
    2120#include "effects/fog_effect.h"
    22 
    23 
    2421
    2522#include "util/loading/load_param.h"
    … …  
    6158void AtmosphericEngine::loadParams(const TiXmlElement* root)
    6259{
    63   LoadParamXML(root, "WeatherEffects", this, AtmosphericEngine, loadWeatherEffects);
    64   LoadParamXML(root, "SunEffects", this, AtmosphericEngine, loadSunEffects);
     60  LoadParamXML(root, "WeatherEffect", this, AtmosphericEngine, loadWeatherEffect);
     61  LoadParamXML(root, "SunEffect", this, AtmosphericEngine, loadSunEffect);
    6562}
    6663
    … …  
    6865 * @param root The XML-element to load WeatherEffects from
    6966 */
    70 void AtmosphericEngine::loadWeatherEffects(const TiXmlElement* root)
     67void AtmosphericEngine::loadWeatherEffect(const TiXmlElement* root)
    7168{
    7269  LOAD_PARAM_START_CYCLE(root, element);
    … …  
    8178 * @param root The XML-element to load SunEffects from
    8279 */
    83 void AtmosphericEngine::loadSunEffects(const TiXmlElement* root)
     80void AtmosphericEngine::loadSunEffect(const TiXmlElement* root)
    8481{
    8582  LOAD_PARAM_START_CYCLE(root, element);

  • branches/atmospheric_engine/src/lib/graphics/effects/atmospheric_engine.h

    r7379 r7381  
    3232    inline bool isActivated() const { return this->bActivated; }
    3333
    34     void loadWeatherEffects(const TiXmlElement* root);
    35     void loadSunEffects(const TiXmlElement* root);
     34    void loadWeatherEffect(const TiXmlElement* root);
     35    void loadSunEffect(const TiXmlElement* root);
    3636
    3737  private:

  • branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.cc

    r7379 r7381  
    5252void FogEffect::loadParams(const TiXmlElement* root)
    5353{
    54   WeatherEffects::loadParams(root);
     54  WeatherEffect::loadParams(root);
    5555
    5656/*

  • branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.h

    r7379 r7381  
    66#define _FOG_EFFECT
    77
    8 #include "weather_effects.h"
     8#include "weather_effect.h"
    99
    10 class FogEffect : public WeatherEffects
     10class FogEffect : public WeatherEffect
    1111{
    1212  public:
Note: See TracChangeset for help on using the changeset viewer.