Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10591 in orxonox.OLD


Ignore:
Timestamp:
Feb 13, 2007, 4:42:33 PM (17 years ago)
Author:
bensch
Message:

moved the we's to a more senseable location.

Location:
branches/cleanup/src
Files:
1 added
7 deleted
26 edited
35 moved

Legend:

Unmodified
Added
Removed

  • branches/cleanup/src/lib/collision_detection/cd_engine.cc

    r10033 r10591  
    2222#include "model.h"
    2323#include "world_entity.h"
    24 #include "terrain.h"
     24#include "environments/terrain.h"
    2525// #include "player.h"
    2626
    … …  
    3030
    3131#include "bsp/bsp_manager.h"
    32 #include "bsp_entity.h"
     32#include "environments/bsp_entity.h"
    3333
    3434

  • branches/cleanup/src/lib/graphics/importer/bsp/bsp_manager.cc

    r10519 r10591  
    3030#include "debug.h"
    3131#include "material.h"
    32 #include "camera.h"
     32#include "tools/camera.h"
    3333#include "vertex_array_model.h"
    3434#include "world_entities/player.h"

  • branches/cleanup/src/lib/graphics/render2D/element_2d.cc

    r9869 r10591  
    2424#include "state.h"
    2525#include "p_node.h"
    26 #include "camera.h"
     26#include "tools/camera.h"
    2727///////////////////////////
    2828

  • branches/cleanup/src/lib/script_engine/script_manager.cc

    r9869 r10591  
    2525
    2626#include "script.h"
    27 #include "script_trigger.h"
     27#include "tools/script_trigger.h"
    2828#include "luaincl.h"
    2929#include "loading/load_param_xml.h"

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

    r10585 r10591  
    2727
    2828#include "player.h"
    29 #include "camera.h"
    30 #include "environment.h"
    31 #include "terrain.h"
    32 #include "test_entity.h"
    33 #include "terrain.h"
     29#include "tools/camera.h"
     30#include "tools/cameraman.h"
     31#include "environments/environment.h"
     32#include "environments/terrain.h"
    3433#include "playable.h"
    3534#include "environments/mapped_water.h"

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

    r10513 r10591  
    2929#include "world_entity.h"
    3030#include "player.h"
    31 #include "camera.h"
    32 #include "cameraman.h"
    33 #include "terrain.h"
    34 #include "skybox.h"
     31#include "tools/camera.h"
     32#include "tools/cameraman.h"
     33#include "environments/terrain.h"
     34#include "environments/skybox.h"
    3535#include "md2/md2Model.h"
    3636#include "world_entities/projectiles/projectile.h"

  • branches/cleanup/src/story_entities/menu/game_menu.cc

    r10403 r10591  
    2727
    2828#include "graphics_engine.h"
    29 #include "camera.h"
     29#include "tools/camera.h"
    3030#include "sound_engine.h"
    3131

  • branches/cleanup/src/story_entities/multi_player_world_data.cc

    r10114 r10591  
    2727#include "world_entity.h"
    2828#include "player.h"
    29 #include "camera.h"
    30 #include "environment.h"
    31 #include "terrain.h"
    32 #include "test_entity.h"
    33 #include "terrain.h"
    34 #include "md2/md2Model.h"
     29#include "tools/camera.h"
     30#include "environments/environment.h"
     31#include "environments/terrain.h"
    3532#include "world_entities/projectiles/projectile.h"
    3633#include "npcs/npc_test1.h"

  • branches/cleanup/src/util/multiplayer_team_deathmatch.cc

    r10114 r10591  
    3131
    3232#include "shared_network_data.h"
    33 #include "terrain.h"
     33#include "environments/terrain.h"
    3434#include "space_ships/space_ship.h"
    3535
    … …  
    4444#include "shell_command.h"
    4545
    46 #include "spawning_point.h"
     46#include "tools/spawning_point.h"
    4747
    4848#include "creatures/fps_player.h"

  • branches/cleanup/src/util/state.cc

    r10379 r10591  
    1919
    2020
    21 #include "camera.h"
    22 #include "cameraman.h"
     21#include "tools/camera.h"
     22#include "tools/cameraman.h"
    2323
    2424#ifndef NULL

  • branches/cleanup/src/world_entities/Makefile.am

    r10437 r10591  
    77## THESE ARE THE BASE CLASSES OF ALL WORLD_ENTITIES
    88libORXwe_a_SOURCES = world_entity.cc \
    9                      cameraman.cc \
     9                     tools/cameraman.cc \
    1010                     playable.cc\
    1111                     player.cc \
    … …  
    1818                     projectiles/projectile.cc \
    1919                     extendable.cc\
    20                      power_ups/power_up.cc \
    21                      power_ups/param_power_up.cc \
    22                      power_ups/weapon_power_up.cc\
    23                      spawning_point.cc\
     20                     items/power_ups/power_up.cc \
     21                     items/power_ups/param_power_up.cc \
     22                     items/power_ups/weapon_power_up.cc\
     23                     tools/spawning_point.cc\
    2424                     effects/explosion.cc\
    2525                     effects/billboard.cc\
    … …  
    3131
    3232noinst_HEADERS = world_entity.h\
    33                  cameraman.h\
     33                 tools/cameraman.h\
    3434                 extendable.h\
    3535                 playable.h \
    … …  
    4242                 weapons/ammo_container.h\
    4343                 projectiles/projectile.h \
    44                  power_ups/power_up.h\
    45                  power_ups/param_power_up.h\
    46                  power_ups/weapon_power_up.h \
    47                  spawning_point.h\
     44                 items/power_ups/power_up.h\
     45                 items/power_ups/param_power_up.h\
     46                 items/power_ups/weapon_power_up.h \
     47                 tools/spawning_point.h\
    4848                 effects/explosion.h\
    4949                 effects/billboard.h\

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

    r10583 r10591  
    1414                world_entities/npcs/mover.cc \
    1515                \
    16                 world_entities/environment.cc \
    17                 world_entities/skysphere.cc \
    18                 world_entities/skybox.cc \
    19                 world_entities/skydome.cc \
    20                 world_entities/terrain.cc \
    21                 world_entities/satellite.cc \
    22                 world_entities/movie_entity.cc \
    23                 world_entities/recorder.cc \
    24                 world_entities/character_attributes.cc \
    25                 world_entities/test_entity.cc \
    26                 world_entities/test_entity2.cc \
    27                 world_entities/blackscreen.cc \
    28                 world_entities/scrolling_screen.cc \
    29                 world_entities/planet.cc \
    30                 world_entities/bsp_entity.cc \
    31                 world_entities/mount_point.cc \
    32                 world_entities/sound_entity.cc \
    33                 world_entities/camera.cc \
    34                 \
    35                 world_entities/questGUI/quest_gui.cc \
    36                 world_entities/questGUI/quest.cc \
    3716                \
    3817                world_entities/weapons/weapon_slot.cc \
    … …  
    7352                world_entities/projectiles/spike_ball.cc \
    7453                \
    75                 world_entities/power_ups/turret_power_up.cc \
    76                 world_entities/power_ups/laser_power_up.cc \
     54                world_entities/items/power_ups/turret_power_up.cc \
     55                world_entities/items/power_ups/laser_power_up.cc \
    7756                \
    7857                world_entities/space_ships/space_ship.cc \
    … …  
    9170                world_entities/environments/model_entity.cc \
    9271                world_entities/environments/building.cc \
    93                 world_entities/environments/rotor.cc \
     72                world_entities/environments/rotor.cc \
    9473                world_entities/environments/mapped_water.cc \
    95                 \
    96                 world_entities/elements/image_entity.cc \
    97                 world_entities/elements/text_element.cc \
    98                 world_entities/elements/glgui_radar.cc \
    99                 \
    100                 world_entities/effects/lightning_bolt.cc \
    101                 world_entities/effects/blink.cc \
    102                 \
    103                 world_entities/script_trigger.cc \
    104                 \
    105                 \
    106                 world_entities/particles/particle_emitter.cc \
    107                 world_entities/particles/dot_emitter.cc \
    108                 world_entities/particles/box_emitter.cc \
    109                 world_entities/particles/plane_emitter.cc \
    110         world_entities/particles/emitter_node.cc \
    111                 \
    112                 world_entities/particles/particle_system.cc \
    113                 world_entities/particles/sprite_particles.cc \
    114                 world_entities/particles/spark_particles.cc \
    115                 world_entities/particles/model_particles.cc \
    116                 world_entities/particles/dot_particles.cc \
    117                 \
    118                 world_entities/particles/quick_animation.cc \
     74                world_entities/environments/environment.cc \
     75                world_entities/environments/skysphere.cc \
     76                world_entities/environments/skybox.cc \
     77                world_entities/environments/skydome.cc \
     78                world_entities/environments/terrain.cc \
     79                world_entities/environments/planet.cc \
     80                world_entities/environments/bsp_entity.cc \
    11981                \
    12082                \
    … …  
    12890                world_entities/weather_effects/snow_effect.cc \
    12991                world_entities/weather_effects/lightning_effect.cc \
    130                 world_entities/weather_effects/lense_flare.cc
     92                world_entities/weather_effects/lense_flare.cc \
     93                world_entities/elements/image_entity.cc \
     94                \
     95                world_entities/elements/text_element.cc \
     96                world_entities/elements/glgui_radar.cc \
     97                \
     98                world_entities/effects/lightning_bolt.cc \
     99                world_entities/effects/blink.cc \
     100                \
     101                world_entities/tools/movie_entity.cc \
     102                world_entities/tools/recorder.cc \
     103                world_entities/tools/blackscreen.cc \
     104                world_entities/tools/scrolling_screen.cc \
     105                world_entities/tools/mount_point.cc \
     106                world_entities/tools/sound_entity.cc \
     107                world_entities/tools/camera.cc \
     108                world_entities/tools/script_trigger.cc \
     109                \
     110                \
     111                world_entities/particles/particle_emitter.cc \
     112                world_entities/particles/dot_emitter.cc \
     113                world_entities/particles/box_emitter.cc \
     114                world_entities/particles/plane_emitter.cc \
     115                world_entities/particles/emitter_node.cc \
     116                world_entities/particles/particle_system.cc \
     117                world_entities/particles/sprite_particles.cc \
     118                world_entities/particles/spark_particles.cc \
     119                world_entities/particles/model_particles.cc \
     120                world_entities/particles/dot_particles.cc \
     121                world_entities/particles/quick_animation.cc \
     122                \
     123                \
     124                \
     125                world_entities/questGUI/quest_gui.cc \
     126                world_entities/questGUI/quest.cc
     127
    131128
    132129
    … …  
    146143                npcs/mover.h \
    147144                \
    148                 environment.h \
    149                 skysphere.h \
    150                 skybox.h \
    151                 skydome.h \
    152                 terrain.h \
    153                 satellite.h \
    154                 movie_entity.h \
    155                 recorder.h \
     145                environments/environment.h \
     146                environments/skysphere.h \
     147                environments/skybox.h \
     148                environments/skydome.h \
     149                environments/terrain.h \
     150                tools/movie_entity.h \
     151                tools/recorder.h \
    156152                character_attributes.h \
    157                 test_entity.h \
    158                 test_entity2.h \
    159                 blackscreen.h \
    160                 scrolling_screen.h \
    161                 planet.h \
    162                 bsp_entity.h \
    163                 mount_point.h \
    164                 sound_entity.h \
    165                 camera.h \
     153                tools/blackscreen.h \
     154                tools/scrolling_screen.h \
     155                environments/planet.h \
     156                environments/bsp_entity.h \
     157                tools/mount_point.h \
     158                tools/sound_entity.h \
     159                tools/camera.h \
    166160                \
    167161                questGUI/quest_gui.h \
    … …  
    206200                projectiles/spike_ball.h \
    207201                \
    208                 power_ups/turret_power_up.h \
    209                 power_ups/laser_power_up.h \
     202                items/power_ups/turret_power_up.h \
     203                items/power_ups/laser_power_up.h \
    210204                \
    211205                space_ships/space_ship.h \

  • branches/cleanup/src/world_entities/creatures/fps_player.cc

    r10567 r10591  
    3232
    3333#include "aabb.h"
    34 #include "bsp_entity.h"
     34#include "environments/bsp_entity.h"
    3535
    3636#include "key_mapper.h"

  • branches/cleanup/src/world_entities/effects/billboard.cc

    r10501 r10591  
    2222#include "glincl.h"
    2323#include "state.h"
    24 #include "cameraman.h"
    25 #include "camera.h"
     24#include "tools/cameraman.h"
     25#include "tools/camera.h"
    2626
    2727#include "debug.h"

  • branches/cleanup/src/world_entities/effects/wobblegrid.cc

    r10557 r10591  
    2424#include "grid.h"
    2525
    26 #include "cameraman.h"
    27 #include "camera.h"
    28 
    29 #include <assert.h>
     26#include "tools/cameraman.h"
     27#include "tools/camera.h"
     28
     29#include <cassert>
    3030#include "debug.h"
    3131

  • branches/cleanup/src/world_entities/extendable.h

    r9869 r10591  
    1313
    1414
    15 #include "power_ups/power_up.h"
     15#include "items/power_ups/power_up.h"
    1616//! A class for Extendable Entities
    1717class Extendable : virtual public BaseObject {

  • branches/cleanup/src/world_entities/npcs/generic_npc.cc

    r10511 r10591  
    3131#include "sound/resource_sound_buffer.h"
    3232
    33 #include "bsp_entity.h"
     33#include "environments/bsp_entity.h"
    3434
    3535

  • branches/cleanup/src/world_entities/npcs/mover.cc

    r10519 r10591  
    2121#include "mover.h"
    2222#include "state.h"
    23 #include "camera.h"
     23#include "tools/camera.h"
    2424
    2525

  • branches/cleanup/src/world_entities/npcs/npc.cc

    r10588 r10591  
    5252#include "weapons/cannon.h"
    5353
    54 #include "mount_point.h"
     54#include "tools/mount_point.h"
    5555#include "weapons/weapon_slot.h"
    5656

  • branches/cleanup/src/world_entities/npcs/npc_test1.cc

    r9869 r10591  
    2222
    2323#include "state.h"
    24 #include "power_ups/turret_power_up.h"
    25 #include "power_ups/laser_power_up.h"
     24#include "items/power_ups/turret_power_up.h"
     25#include "items/power_ups/laser_power_up.h"
    2626
    2727ObjectListDefinition(NPCTest1);

  • branches/cleanup/src/world_entities/particles/sprite_particles.cc

    r10532 r10591  
    2323#include "state.h"
    2424#include "shell_command.h"
    25 #include "camera.h"
    26 #include "cameraman.h"
     25#include "tools/camera.h"
     26#include "tools/cameraman.h"
    2727
    2828

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

    r10368 r10591  
    2121#include "player.h"
    2222#include "state.h"
    23 #include "camera.h"
     23#include "tools/camera.h"
    2424
    2525#include "util/loading/load_param.h"
    2626
    27 #include "power_ups/weapon_power_up.h"
    28 #include "power_ups/param_power_up.h"
     27#include "items/power_ups/weapon_power_up.h"
     28#include "items/power_ups/param_power_up.h"
    2929
    3030#include "game_rules.h"

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

    r10588 r10591  
    4949#include "shared_network_data.h"
    5050
    51 #include "power_ups/weapon_power_up.h"
    52 #include "power_ups/param_power_up.h"
     51#include "items/power_ups/weapon_power_up.h"
     52#include "items/power_ups/param_power_up.h"
    5353
    5454#include "graphics_engine.h"
    … …  
    5858#include "state.h"
    5959#include "player.h"
    60 #include "camera.h"
    61 #include "cameraman.h"
     60#include "tools/camera.h"
     61#include "tools/cameraman.h"
    6262
    6363
    … …  
    6666
    6767#include "track/track.h"
    68 #include "math.h"
    6968
    7069

  • branches/cleanup/src/world_entities/weather_effects/cloud_effect.h

    r9869 r10591  
    1212#include "sound_source.h"
    1313
    14 #include "skydome.h"
     14#include "environments/skydome.h"
    1515#include "material.h"
    1616#include "shader.h"

  • branches/cleanup/src/world_entities/weather_effects/lense_flare.cc

    r10114 r10591  
    3232
    3333#include "light.h"
    34 #include "camera.h"
     34#include "tools/camera.h"
    3535
    3636

  • branches/cleanup/src/world_entities/world_entity.cc

    r10588 r10591  
    2727
    2828#include "oif/object_information_file.h"
    29 #include "mount_point.h"
     29#include "tools/mount_point.h"
    3030
    3131#include "aabb_tree_node.h"
    … …  
    4141
    4242#include "state.h"
    43 #include "camera.h"
     43#include "tools/camera.h"
    4444
    4545#include "collision_filter.h"
Note: See TracChangeset for help on using the changeset viewer.