Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7836 in orxonox.OLD


Ignore:
Timestamp:
May 24, 2006, 10:05:32 PM (18 years ago)
Author:
bensch
Message:

trunk: merged the Atmos back again, because a ClassID was wrong

Location:
trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/defs/class_id.h

    r7819 r7836  
    290290
    291291  CL_GRAPHICS_EFFECT            =    0x00a01000,
    292   CL_SUN_EFFECT                 =    0x00a02000,
    293   CL_WEATHER_EFFECT             =    0x00a04000,
     292  CL_WEATHER_EFFECT             =    0x00a10000,
    294293  CL_FOG_EFFECT                 =    0x00000a10,
    295294  CL_VOLFOG_EFFECT              =    0x00000a11,

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

    r7810 r7836  
    126126    std::list<BaseObject*>::const_iterator it;
    127127    for (it = weatherEffects->begin(); it != weatherEffects->end(); it++)
     128    {
     129      printf("%s::%s \n", (*it)->getClassName(), (*it)->getName());
    128130      dynamic_cast<WeatherEffect*>(*it)->tick(dt);
     131    }
    129132  }
    130133}

  • trunk/src/lib/graphics/effects/sun_effect.cc

    r7810 r7836  
    3030SunEffect::SunEffect(const TiXmlElement* root)
    3131{
    32   this->setClassID(CL_SUN_EFFECT, "SunEffect");
     32//  this->setClassID(CL_SUN_EFFECT, "SunEffect");
    3333  this->bActivated = false;
    3434}

  • trunk/src/util/object_manager.cc

    r7785 r7836  
    210210    "environ-notick",
    211211    "environ",
     212    "background",
    212213    "common",
    213214

  • trunk/src/util/object_manager.h

    r7785 r7836  
    1818  OM_ENVIRON_NOTICK,
    1919  OM_ENVIRON,
     20  OM_BACKGROUND,
    2021  OM_COMMON,
    2122
Note: See TracChangeset for help on using the changeset viewer.