Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9758 in orxonox.OLD


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

orxonox/new_class_id: moved the Particle-engine

Location:
branches/new_class_id
Files:
26 edited
1 moved

Legend:

Unmodified
Added
Removed

  • branches/new_class_id/configure.ac

    r9668 r9758  
    624624                 src/lib/event/Makefile
    625625                 src/lib/physics/Makefile
    626                  src/lib/particles/Makefile
    627626                 src/lib/collision_detection/Makefile
    628627                 src/lib/collision_reaction/Makefile

  • branches/new_class_id/src/Makefile.am

    r9716 r9758  
    3737                orxonox.cc \
    3838                \
    39                 lib/particles/model_particles.cc \
    40                 lib/particles/spark_particles.cc \
    41                 lib/particles/sprite_particles.cc \
    42                 lib/particles/plane_emitter.cc \
    4339                lib/graphics/effects/fog_effect.cc \
    4440                lib/graphics/effects/volfog_effect.cc \

  • branches/new_class_id/src/defs/include_paths.am

    r8490 r9758  
    1313AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/spatial_separation
    1414AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/render2D
    15 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/particles
    1615AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl
    1716AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl/glmenu

  • branches/new_class_id/src/lib/BuildLibs.am

    r9709 r9758  
    66                $(LIB_PREFIX)/gui/libORXbasegui.a \
    77                $(LIB_PREFIX)/graphics/libORXgraphics.a \
    8                 $(LIB_PREFIX)/particles/libORXparticles.a \
    98                $(LIB_PREFIX)/collision_detection/libORXcd.a \
    109                $(LIB_PREFIX)/collision_reaction/libORXcr.a \

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

    r9709 r9758  
    2525        event \
    2626        physics \
    27         particles \
    2827        collision_detection \
    2928        collision_reaction \

  • branches/new_class_id/src/lib/graphics/effects/rain_effect.cc

    r9757 r9758  
    2424#include "p_node.h"
    2525#include "state.h"
    26 #include "spark_particles.h"
    27 #include "plane_emitter.h"
     26#include "particles/spark_particles.h"
     27#include "particles/plane_emitter.h"
    2828#include "shell_command.h"
    2929#include "light.h"

  • branches/new_class_id/src/lib/graphics/effects/rain_effect.h

    r9715 r9758  
    1313#include <string>
    1414
    15 #include "particle_system.h"
     15#include "particles/particle_system.h"
    1616
    1717class SparkParticles;

  • branches/new_class_id/src/lib/graphics/effects/snow_effect.cc

    r9757 r9758  
    2424#include "p_node.h"
    2525#include "state.h"
    26 #include "sprite_particles.h"
    27 #include "plane_emitter.h"
     26#include "particles/sprite_particles.h"
     27#include "particles/plane_emitter.h"
    2828#include "shell_command.h"
    2929#include "script_class.h"

  • branches/new_class_id/src/lib/graphics/effects/snow_effect.h

    r9715 r9758  
    77
    88#include "vector.h"
    9 #include "particle_system.h"
     9#include "particles/particle_system.h"
    1010#include "material.h"
    1111#include "vector2D.h"

  • branches/new_class_id/src/lib/physics/physics_connection.cc

    r9727 r9758  
    2222
    2323#include "field.h"
    24 #include "particle_system.h"
     24#include "particles/particle_system.h"
    2525#include "physics_interface.h"
    2626

  • branches/new_class_id/src/lib/util/loading/resource.h

    r9718 r9758  
    4949  };
    5050
     51
     52
    5153public:
    5254  Resource(const std::string& fileName);

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

    r9656 r9758  
    7272                world_entities/effects/lightning_bolt.cc \
    7373                \
    74                 world_entities/script_trigger.cc
     74                world_entities/script_trigger.cc \
     75                \
     76                \
     77                world_entities/particles/particle_emitter.cc \
     78                world_entities/particles/dot_emitter.cc \
     79                world_entities/particles/box_emitter.cc \
     80                world_entities/particles/plane_emitter.cc \
     81                \
     82                world_entities/particles/particle_system.cc \
     83                world_entities/particles/sprite_particles.cc \
     84                world_entities/particles/spark_particles.cc \
     85                world_entities/particles/model_particles.cc \
     86                world_entities/particles/dot_particles.cc \
     87                \
     88                world_entities/particles/quick_animation.cc
     89
     90
     91
    7592
    7693
    … …  
    144161                effects/lightning_bolt.h \
    145162                \
    146                 script_trigger.h
     163                script_trigger.h \
     164                \
     165                \
     166                particles/particle_emitter.h \
     167                particles/dot_emitter.h \
     168                particles/box_emitter.h \
     169                particles/plane_emitter.h \
     170                \
     171                particles/particle_system.h \
     172                particles/sprite_particles.h \
     173                particles/spark_particles.h \
     174                particles/model_particles.h \
     175                particles/dot_particles.h \
     176                \
     177                particles/quick_animation.h
     178

  • branches/new_class_id/src/world_entities/effects/explosion.cc

    r9716 r9758  
    2222#include "state.h"
    2323
    24 #include "box_emitter.h"
    25 #include "sprite_particles.h"
     24#include "particles/box_emitter.h"
     25#include "particles/sprite_particles.h"
    2626
    2727

  • branches/new_class_id/src/world_entities/playable.cc

    r9757 r9758  
    3030#include "game_rules.h"
    3131
    32 #include "dot_emitter.h"
    33 #include "sprite_particles.h"
     32#include "particles/dot_emitter.h"
     33#include "particles/sprite_particles.h"
    3434
    3535#include "shared_network_data.h"

  • branches/new_class_id/src/world_entities/projectiles/bomb.cc

    r9716 r9758  
    2020#include "primitive_model.h"
    2121
    22 #include "dot_emitter.h"
    23 #include "particle_system.h"
     22#include "particles/dot_emitter.h"
     23#include "particles/particle_system.h"
    2424
    2525#include "debug.h"

  • branches/new_class_id/src/world_entities/projectiles/boomerang_projectile.cc

    r9716 r9758  
    2121#include "state.h"
    2222
    23 #include "dot_emitter.h"
    24 #include "sprite_particles.h"
     23#include "particles/dot_emitter.h"
     24#include "particles/sprite_particles.h"
    2525
    2626#include "debug.h"

  • branches/new_class_id/src/world_entities/projectiles/guided_missile.cc

    r9716 r9758  
    2020#include "state.h"
    2121
    22 #include "dot_emitter.h"
    23 #include "sprite_particles.h"
     22#include "particles/dot_emitter.h"
     23#include "particles/sprite_particles.h"
    2424
    2525#include "debug.h"

  • branches/new_class_id/src/world_entities/projectiles/hyperblast.cc

    r9716 r9758  
    2020#include "state.h"
    2121
    22 #include "box_emitter.h"
    23 #include "spark_particles.h"
     22#include "particles/box_emitter.h"
     23#include "particles/spark_particles.h"
    2424
    2525#include "debug.h"

  • branches/new_class_id/src/world_entities/projectiles/laser.cc

    r9716 r9758  
    2121#include "model.h"
    2222
    23 #include "dot_emitter.h"
    24 #include "sprite_particles.h"
     23#include "particles/dot_emitter.h"
     24#include "particles/sprite_particles.h"
    2525
    2626#include <cassert>

  • branches/new_class_id/src/world_entities/projectiles/rail_projectile.cc

    r9716 r9758  
    2121#include "model.h"
    2222
    23 #include "dot_emitter.h"
    24 #include "sprite_particles.h"
     23#include "particles/dot_emitter.h"
     24#include "particles/sprite_particles.h"
    2525
    2626#include <cassert>

  • branches/new_class_id/src/world_entities/projectiles/rocket.cc

    r9716 r9758  
    2020#include "state.h"
    2121
    22 #include "dot_emitter.h"
    23 #include "sprite_particles.h"
     22#include "particles/dot_emitter.h"
     23#include "particles/sprite_particles.h"
    2424
    2525#include "debug.h"

  • branches/new_class_id/src/world_entities/projectiles/test_bullet.cc

    r9716 r9758  
    2020#include "state.h"
    2121
    22 #include "dot_emitter.h"
    23 #include "sprite_particles.h"
     22#include "particles/dot_emitter.h"
     23#include "particles/sprite_particles.h"
    2424#include "debug.h"
    2525

  • branches/new_class_id/src/world_entities/space_ships/cruizer.cc

    r9716 r9758  
    2929
    3030#include "graphics_engine.h"
    31 #include "dot_emitter.h"
    32 #include "sprite_particles.h"
     31#include "particles/dot_emitter.h"
     32#include "particles/sprite_particles.h"
    3333
    3434#include "debug.h"

  • branches/new_class_id/src/world_entities/space_ships/space_ship.cc

    r9757 r9758  
    2626#include "weapons/cannon.h"
    2727
    28 #include "dot_emitter.h"
    29 #include "sprite_particles.h"
     28#include "particles/dot_emitter.h"
     29#include "particles/sprite_particles.h"
    3030
    3131#include "util/loading/factory.h"

  • branches/new_class_id/src/world_entities/space_ships/spacecraft_2d.cc

    r9757 r9758  
    3030
    3131#include "graphics_engine.h"
    32 #include "dot_emitter.h"
    33 #include "sprite_particles.h"
     32#include "particles/dot_emitter.h"
     33#include "particles/sprite_particles.h"
    3434
    3535#include "debug.h"

  • branches/new_class_id/src/world_entities/space_ships/turbine_hover.cc

    r9716 r9758  
    2929
    3030#include "graphics_engine.h"
    31 #include "dot_emitter.h"
    32 #include "sprite_particles.h"
     31#include "particles/dot_emitter.h"
     32#include "particles/sprite_particles.h"
    3333
    3434#include "debug.h"
Note: See TracChangeset for help on using the changeset viewer.