Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9760 in orxonox.OLD for branches


Ignore:
Timestamp:
Sep 19, 2006, 3:44:38 PM (18 years ago)
Author:
bensch
Message:

moved around the weather effecs

Location:
branches/new_class_id/src
Files:
8 edited
22 copied
1 moved

Legend:

Unmodified
Added
Removed

  • branches/new_class_id/src/Makefile.am

    r9758 r9760  
    3636                lib/shell/some_shell_commands.cc \
    3737                orxonox.cc \
    38                 \
    39                 lib/graphics/effects/fog_effect.cc \
    40                 lib/graphics/effects/volfog_effect.cc \
    41                 lib/graphics/effects/rain_effect.cc \
    42                 lib/graphics/effects/snow_effect.cc \
    43                 lib/graphics/effects/cloud_effect.cc \
    44                 lib/graphics/effects/lightning_effect.cc \
    45                 lib/graphics/effects/lense_flare.cc \
    4638                \
    4739                util/multiplayer_team_deathmatch.cc \

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

    r9006 r9760  
    1818                text_engine/limited_width_text.cc \
    1919                text_engine/font.cc \
    20                 text_engine/font_data.cc \
    21                 \
    22                 effects/graphics_effect.cc \
    23                 effects/atmospheric_engine.cc \
    24                 effects/weather_effect.cc \
    25                 effects/sun_effect.cc \
    26                 effects/fog_effect.cc \
    27                 effects/volfog_effect.cc \
    28                 effects/rain_effect.cc \
    29                 effects/snow_effect.cc \
    30                 effects/cloud_effect.cc \
    31                 effects/lightning_effect.cc \
    32                 effects/lense_flare.cc
     20                text_engine/font_data.cc
    3321
    3422noinst_HEADERS =\
    … …  
    4735                text_engine/font.h \
    4836                text_engine/font_data.h \
    49                 text_engine/default_font.xpm \
    50                 \
    51                 effects/graphics_effect.h \
    52                 effects/atmospheric_engine.h \
    53                 effects/weather_effect.h \
    54                 effects/sun_effect.h \
    55                 effects/fog_effect.h \
    56                 effects/volfog_effect.h \
    57                 effects/rain_effect.h \
    58                 effects/snow_effect.h \
    59                 effects/cloud_effect.h \
    60                 effects/lightning_effect.h \
    61                 effects/lense_flare.h
     37                text_engine/default_font.xpm
    6238
    6339

  • branches/new_class_id/src/lib/graphics/graphics_engine.cc

    r9727 r9760  
    3535#include "texture.h"
    3636
    37 #include "effects/graphics_effect.h"
    38 #include "effects/fog_effect.h"
    39 #include "effects/lense_flare.h"
     37#include "weather_effects/graphics_effect.h"
    4038
    4139#include "shell_command.h"

  • branches/new_class_id/src/story_entities/game_world.cc

    r9757 r9760  
    4343
    4444#include "graphics_engine.h"
    45 #include "effects/atmospheric_engine.h"
     45#include "weather_effects/atmospheric_engine.h"
    4646#include "event_handler.h"
    4747#include "sound_engine.h"

  • branches/new_class_id/src/story_entities/game_world_data.cc

    r9757 r9760  
    4444
    4545#include "graphics_engine.h"
    46 #include "effects/graphics_effect.h"
    47 #include "effects/atmospheric_engine.h"
     46#include "weather_effects/graphics_effect.h"
     47#include "weather_effects/atmospheric_engine.h"
    4848#include "event_handler.h"
    4949#include "sound_engine.h"

  • branches/new_class_id/src/world_entities/WorldEntities.am

    r9758 r9760  
    8686                world_entities/particles/dot_particles.cc \
    8787                \
    88                 world_entities/particles/quick_animation.cc
     88                world_entities/particles/quick_animation.cc \
     89                \
     90                \
     91                world_entities/weather_effects/graphics_effect.cc \
     92                world_entities/weather_effects/atmospheric_engine.cc \
     93                world_entities/weather_effects/weather_effect.cc \
     94                world_entities/weather_effects/sun_effect.cc \
     95                world_entities/weather_effects/fog_effect.cc \
     96                world_entities/weather_effects/volfog_effect.cc \
     97                world_entities/weather_effects/rain_effect.cc \
     98                world_entities/weather_effects/snow_effect.cc \
     99                world_entities/weather_effects/cloud_effect.cc \
     100                world_entities/weather_effects/lightning_effect.cc \
     101                world_entities/weather_effects/lense_flare.cc
     102
    89103
    90104
    … …  
    175189                particles/dot_particles.h \
    176190                \
    177                 particles/quick_animation.h
    178 
     191                particles/quick_animation.h \
     192                \
     193                \
     194                weather_effects/graphics_effect.h \
     195                weather_effects/atmospheric_engine.h \
     196                weather_effects/weather_effect.h \
     197                weather_effects/sun_effect.h \
     198                weather_effects/fog_effect.h \
     199                weather_effects/volfog_effect.h \
     200                weather_effects/rain_effect.h \
     201                weather_effects/snow_effect.h \
     202                weather_effects/cloud_effect.h \
     203                weather_effects/lightning_effect.h \
     204                weather_effects/lense_flare.h
     205

  • branches/new_class_id/src/world_entities/particles/dot_particles.cc

    r9716 r9760  
    2222#include "material.h"
    2323#include "state.h"
    24 #include "shell_command.h"
    2524
    2625#include "class_id_DEPRECATED.h"
    … …  
    2827ObjectListDefinitionID(DotParticles, CL_DOT_PARTICLES);
    2928CREATE_FACTORY(DotParticles);
    30 
    31 SHELL_COMMAND(texture, DotParticles, setMaterialTexture)
    32     ->defaultValues("maps/evil-flower.png");
    33 
    3429
    3530
    … …  
    8075{
    8176  ParticleSystem::loadParams(root);
    82 
    83   LoadParam(root, "texture", this, DotParticles, setMaterialTexture);
    8477}
    8578

  • branches/new_class_id/src/world_entities/particles/dot_particles.h

    r9715 r9760  
    2222  virtual void loadParams(const TiXmlElement* root);
    2323
    24   void setMaterialTexture(const std::string& textureFile);
    25 
    2624  /** @returns the Material that lies on this particles */
    2725  inline const Material* getMaterial() const { return &this->material; };

  • branches/new_class_id/src/world_entities/weather_effects/atmospheric_engine.cc

    r9759 r9760  
    1818#include "util/loading/resource_manager.h"
    1919
    20 #include "effects/fog_effect.h"
     20#include "weather_effects/fog_effect.h"
    2121
    2222#include "util/loading/load_param_xml.h"
Note: See TracChangeset for help on using the changeset viewer.