Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1039


Ignore:
Timestamp:
Apr 13, 2008, 8:02:38 PM (16 years ago)
Author:
rgrieder
Message:
  • train riding doesn't have to be boring
  • added some license notes
  • removed certain header dependencies in audio
  • changed order of header file inclusion in orxonox and audio (coding style guide will be updated)
Location:
code/trunk
Files:
55 edited

Legend:

Unmodified
Added
Removed

  • code/trunk/src/audio/AudioBuffer.h

    r790 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Nicolas Perrenoud <nicolape@ee.ethz.ch>
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _AudioBuffer_H__
    229#define _AudioBuffer_H__
    330
    4 #include "AudioIncludes.h"
     31#include "AudioPrereqs.h"
    532
    6 #include "AudioPrereqs.h"
     33#include <string>
     34
     35#include <AL/al.h>
    736
    837namespace audio

  • code/trunk/src/audio/AudioIncludes.h

    r790 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Nicolas Perrenoud <nicolape@ee.ethz.ch>
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
     28/**
     29  @file
     30  @brief Various headers used in the audio lib. Avoid including this to
     31         increase accuracy of header file dependencies.
     32*/
     33
     34#include "AudioPrereqs.h"
     35
    136#include <iostream>
    237#include <vector>

  • code/trunk/src/audio/AudioManager.cc

    r1021 r1039  
    2727
    2828#include "AudioManager.h"
     29
     30#include <AL/alut.h>
     31
     32#include "core/Error.h"
    2933#include "core/Debug.h"
    3034

  • code/trunk/src/audio/AudioManager.h

    r1021 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Nicolas Perrenoud <nicolape@ee.ethz.ch>
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _AudioManager_H__
    229#define _AudioManager_H__
    330
    4 #include "AudioIncludes.h"
     31#include "AudioPrereqs.h"
     32
     33#include <vector>
     34#include <string>
    535
    636#include "core/Tickable.h"
    7 
    8 #include "AudioPrereqs.h"
    9 
    1037#include "AudioBuffer.h"
    1138#include "AudioSource.h"

  • code/trunk/src/audio/AudioSource.cc

    r790 r1039  
    2020 *
    2121 *   Author:
    22  *      ...
     22 *      Nicolas Perrenoud <nicolape@ee.ethz.ch>
    2323 *   Co-authors:
    2424 *      ...

  • code/trunk/src/audio/AudioSource.h

    r790 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Nicolas Perrenoud <nicolape@ee.ethz.ch>
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _AudioSource_H__
    229#define _AudioSource_H__
    3 
    4 #include "AudioIncludes.h"
    530
    631#include "AudioPrereqs.h"

  • code/trunk/src/audio/AudioStream.cc

    r790 r1039  
    2020 *
    2121 *   Author:
    22  *      ...
     22 *      Nicolas Perrenoud <nicolape@ee.ethz.ch>
    2323 *   Co-authors:
    2424 *      ...
    2525 *
    2626 */
    27 
    28 #include <string>
    29 
    3027#include "AudioStream.h"
    31 #include "../orxonox/core/Debug.h"
     28
     29#include "core/Debug.h"
     30#include "core/Error.h"
    3231
    3332namespace audio

  • code/trunk/src/audio/AudioStream.h

    r790 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Nicolas Perrenoud <nicolape@ee.ethz.ch>
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _AudioStream_H__
    229#define _AudioStream_H__
    330
    4 #include "AudioIncludes.h"
     31#include "AudioPrereqs.h"
    532
    6 #include "AudioPrereqs.h"
     33#include <string>
     34#include <iostream>
     35
     36#include <AL/al.h>
     37#include <vorbis/vorbisfile.h>
     38#include <vorbis/codec.h>
    739
    840namespace audio

  • code/trunk/src/orxonox/GraphicsEngine.cc

    r1035 r1039  
    3232
    3333#include "OrxonoxStableHeaders.h"
     34#include "GraphicsEngine.h"
    3435
    3536#include <OgreRoot.h>
    … …  
    4243#include "core/CoreIncludes.h"
    4344#include "core/Debug.h"
    44 
    45 #include "GraphicsEngine.h"
    4645
    4746

  • code/trunk/src/orxonox/GraphicsEngine.h

    r1035 r1039  
    3535#define _GraphicsEngine_H__
    3636
     37#include "OrxonoxPrereqs.h"
     38
    3739#include <string>
    3840
    … …  
    4042#include <OgreLog.h>
    4143
    42 #include "OrxonoxPrereqs.h"
    4344#include "core/OrxonoxClass.h"
    4445

  • code/trunk/src/orxonox/Orxonox.cc

    r1038 r1039  
    3333// Precompiled Headers
    3434#include "OrxonoxStableHeaders.h"
     35#include "Orxonox.h"
    3536
    3637//****** STD *******
    … …  
    7172#include "hud/HUD.h"
    7273//#include "objects/weapon/BulletManager.h"
    73 
    74 #include "Orxonox.h"
    7574
    7675// FIXME: is this really file scope?

  • code/trunk/src/orxonox/Orxonox.h

    r1032 r1039  
    88#define _Orxonox_H__
    99
     10#include "OrxonoxPrereqs.h"
     11
    1012#include <string>
    1113
    1214#include <OgrePrerequisites.h>
    13 
    14 #include "OrxonoxPrereqs.h"
    1515#include "audio/AudioPrereqs.h"
    1616

  • code/trunk/src/orxonox/hud/HUD.cc

    r790 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "HUD.h"
    2930
    3031#include <OgreOverlayManager.h>
    3132#include <OgreOverlayElement.h>
    3233#include <OgreStringConverter.h>
    33 
    34 #include "HUD.h"
    3534
    3635

  • code/trunk/src/orxonox/hud/HUD.h

    r790 r1039  
    2929#define _HUD_H__
    3030
     31#include "OrxonoxPrereqs.h"
     32
    3133#include <string>
    3234
    3335#include <OgrePrerequisites.h>
    34 
    35 #include "../OrxonoxPrereqs.h"
    3636
    3737

  • code/trunk/src/orxonox/objects/Ambient.cc

    r1032 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "Ambient.h"
    2930
    3031#include <vector>
    … …  
    4142#include "GraphicsEngine.h"
    4243#include "core/XMLPort.h"
    43 
    44 #include "Ambient.h"
    4544
    4645namespace orxonox

  • code/trunk/src/orxonox/objects/Ambient.h

    r871 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _Ambient_H__
    229#define _Ambient_H__
    330
    4 #include "../OrxonoxPrereqs.h"
     31#include "OrxonoxPrereqs.h"
    532
    633#include "core/BaseObject.h"

  • code/trunk/src/orxonox/objects/Camera.cc

    r1032 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
    127
    228#include "OrxonoxStableHeaders.h"
     29#include "Camera.h"
    330
    431#include <string>
    … …  
    1643#include "core/CoreIncludes.h"
    1744#include "GraphicsEngine.h"
    18 
    19 #include "Camera.h"
    2045
    2146namespace orxonox

  • code/trunk/src/orxonox/objects/Camera.h

    r871 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _Camera_H__
    229#define _Camera_H__
    330
    4 #include "../OrxonoxPrereqs.h"
     31#include "OrxonoxPrereqs.h"
    532
    633#include "core/BaseObject.h"

  • code/trunk/src/orxonox/objects/Explosion.cc

    r1032 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "Explosion.h"
    2930
    3031#include <OgreParticleSystem.h>
    … …  
    3637#include "GraphicsEngine.h"
    3738#include "particle/ParticleInterface.h"
    38 
    39 #include "Explosion.h"
    4039
    4140namespace orxonox

  • code/trunk/src/orxonox/objects/Explosion.h

    r871 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _Explosion_H__
    229#define _Explosion_H__
    330
    4 #include "../OrxonoxPrereqs.h"
     31#include "OrxonoxPrereqs.h"
    532
    633#include "WorldEntity.h"

  • code/trunk/src/orxonox/objects/Model.cc

    r1032 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "Model.h"
    2930
    3031#include "util/tinyxml/tinyxml.h"
    … …  
    3435#include "GraphicsEngine.h"
    3536#include "core/XMLPort.h"
    36 
    37 #include "Model.h"
    3837
    3938namespace orxonox

  • code/trunk/src/orxonox/objects/Model.h

    r1024 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _Model_H__
    229#define _Model_H__
    330
    4 #include "../OrxonoxPrereqs.h"
     31#include "OrxonoxPrereqs.h"
    532
    633#include "WorldEntity.h"

  • code/trunk/src/orxonox/objects/NPC.cc

    r1021 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "NPC.h"
    2930
    3031#include "../core/CoreIncludes.h"
    31 #include "NPC.h"
    3232
    3333namespace orxonox {

  • code/trunk/src/orxonox/objects/NPC.h

    r1024 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128/**
    229  @file NPC.h
    … …  
    835#define _NPC_H__
    936
    10 #include "../OrxonoxPrereqs.h"
     37#include "OrxonoxPrereqs.h"
    1138
    1239#include "Model.h"

  • code/trunk/src/orxonox/objects/Projectile.cc

    r790 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "Projectile.h"
    2930
    3031#include "../core/CoreIncludes.h"
    … …  
    3233#include "Explosion.h"
    3334#include "Model.h"
    34 
    35 #include "Projectile.h"
    3635
    3736namespace orxonox

  • code/trunk/src/orxonox/objects/Projectile.h

    r1024 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _Projectile_H__
    229#define _Projectile_H__
    330
    4 #include "../OrxonoxPrereqs.h"
     31#include "OrxonoxPrereqs.h"
    532
    633#include "WorldEntity.h"

  • code/trunk/src/orxonox/objects/Skybox.cc

    r1032 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "Skybox.h"
    2930
    3031#include <string>
    … …  
    3940#include "core/Debug.h"
    4041#include "core/XMLPort.h"
    41 
    42 #include "Skybox.h"
    4342
    4443namespace orxonox

  • code/trunk/src/orxonox/objects/Skybox.h

    r1024 r1039  
    22#define _Skybox_H__
    33
    4 #include "../OrxonoxPrereqs.h"
     4#include "OrxonoxPrereqs.h"
    55
    66#include "core/BaseObject.h"

  • code/trunk/src/orxonox/objects/SpaceShip.cc

    r1035 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "SpaceShip.h"
    2930
    3031#include <string>
    … …  
    4647#include "Projectile.h"
    4748#include "core/XMLPort.h"
    48 
    49 #include "SpaceShip.h"
    5049
    5150namespace orxonox

  • code/trunk/src/orxonox/objects/SpaceShip.h

    r1037 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _SpaceShip_H__
    229#define _SpaceShip_H__
    330
     31#include "OrxonoxPrereqs.h"
     32
    433#include <OgrePrerequisites.h>
    534#include <OIS/OISMouse.h>
    6 
    7 #include "../OrxonoxPrereqs.h"
    835
    936#include "Model.h"

  • code/trunk/src/orxonox/objects/WorldEntity.cc

    r1032 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "WorldEntity.h"
    2930
    3031#include <string>
    … …  
    3637#include "core/CoreIncludes.h"
    3738#include "GraphicsEngine.h"
    38 #include "WorldEntity.h"
    3939#include "core/XMLPort.h"
    4040

  • code/trunk/src/orxonox/objects/WorldEntity.h

    r1021 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _WorldEntity_H__
    229#define _WorldEntity_H__
    330
     31#include "OrxonoxPrereqs.h"
     32
    433#include <OgreSceneManager.h>
    534#include <OgreSceneNode.h>
    6 
    7 #include "../OrxonoxPrereqs.h"
    835
    936#include "util/Math.h"
    1037#include "util/XMLIncludes.h"
    1138#include "network/Synchronisable.h"
    12 //#include "util/tinyxml/tinyxml.h"
    1339#include "core/BaseObject.h"
    1440#include "core/Tickable.h"

  • code/trunk/src/orxonox/objects/weapon/AmmunitionDump.cc

    r1021 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "AmmunitionDump.h"
    2930
    3031#include "orxonox/Orxonox.h"
    … …  
    3233#include "util/tinyxml/tinyxml.h"
    3334#include "core/CoreIncludes.h"
    34 
    35 #include "AmmunitionDump.h"
    3635
    3736

  • code/trunk/src/orxonox/objects/weapon/AmmunitionDump.h

    r1021 r1039  
    3030#define _AmmunitionDump_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <string>
    3335
    3436#include <OgrePrerequisites.h>
    35 
    36 #include "../../OrxonoxPrereqs.h"
    3737
    3838#include "network/Synchronisable.h"

  • code/trunk/src/orxonox/objects/weapon/BarrelGun.cc

    r871 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "BarrelGun.h"
    2930
    3031#include <OgreStringConverter.h>
    … …  
    3940#include "BaseWeapon.h"
    4041#include "core/CoreIncludes.h"
    41 
    42 #include "BarrelGun.h"
    4342
    4443

  • code/trunk/src/orxonox/objects/weapon/BarrelGun.h

    r871 r1039  
    3030#define _BarrelGun_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <OgrePrerequisites.h>
    33 
    34 #include "../../OrxonoxPrereqs.h"
    3535
    3636#include "BaseWeapon.h"

  • code/trunk/src/orxonox/objects/weapon/BaseWeapon.cc

    r1032 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "BaseWeapon.h"
    2930
    3031#include <OgreStringConverter.h>
    … …  
    3940#include "AmmunitionDump.h"
    4041#include "core/CoreIncludes.h"
    41 
    42 #include "BaseWeapon.h"
    4342
    4443

  • code/trunk/src/orxonox/objects/weapon/BaseWeapon.h

    r871 r1039  
    3030#define _BaseWeapon_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <OgrePrerequisites.h>
    33 
    34 #include "../../OrxonoxPrereqs.h"
    3535
    3636#include "../Model.h"

  • code/trunk/src/orxonox/objects/weapon/Bullet.cc

    r871 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "Bullet.h"
     30
    2931#include "core/CoreIncludes.h"
    3032
    31 #include "Bullet.h"
    3233
    3334namespace orxonox {

  • code/trunk/src/orxonox/objects/weapon/Bullet.h

    r871 r1039  
    3030#define _Bullet_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <OgrePrerequisites.h>
    33 
    34 #include "../../OrxonoxPrereqs.h"
    3535
    3636#include "../Model.h"

  • code/trunk/src/orxonox/objects/weapon/BulletManager.cc

    r1021 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "BulletManager.h"
    2930
    30 #include "BulletManager.h"
    3131#include "Bullet.h"
    3232#include "core/CoreIncludes.h"

  • code/trunk/src/orxonox/objects/weapon/BulletManager.h

    r1021 r1039  
    3030#define _BulletManager_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <string>
    3335
    3436#include <OgrePrerequisites.h>
    35 
    36 #include "../../OrxonoxPrereqs.h"
    3737
    3838#include "network/Synchronisable.h"

  • code/trunk/src/orxonox/objects/weapon/WeaponStation.cc

    r790 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "WeaponStation.h"
    2930
    3031#include "BaseWeapon.h"
    31 #include "WeaponStation.h"
    3232
    3333

  • code/trunk/src/orxonox/objects/weapon/WeaponStation.h

    r790 r1039  
    3232#include <OgrePrerequisites.h>
    3333
    34 #include "../../OrxonoxPrereqs.h"
     34#include "OrxonoxPrereqs.h"
    3535
    3636

  • code/trunk/src/orxonox/particle/ParticleInterface.cc

    r1037 r1039  
    3232
    3333#include "OrxonoxStableHeaders.h"
     34#include "ParticleInterface.h"
    3435
    35 #include "ParticleInterface.h"
    3636// #include <OgreParticleSystem.h>
    3737// #include <Ogre.h>

  • code/trunk/src/orxonox/particle/ParticleInterface.h

    r1037 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _ParticleInterface_H__
    229#define _ParticleInterface_H__
     30
     31#include "OrxonoxPrereqs.h"
    332
    433#include <string>
    … …  
    1241#include <OgreParticleEmitter.h>
    1342#include <OgreSceneManager.h>
    14 
    15 #include "../OrxonoxPrereqs.h"
    1643
    1744#include "util/Math.h"

  • code/trunk/src/orxonox/tools/BillboardSet.cc

    r1032 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "BillboardSet.h"
    2930
    3031#include <sstream>
    … …  
    3435#include "GraphicsEngine.h"
    3536#include "util/Math.h"
    36 
    37 #include "BillboardSet.h"
    3837
    3938namespace orxonox

  • code/trunk/src/orxonox/tools/BillboardSet.h

    r871 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _BillboardSet_H__
    229#define _BillboardSet_H__
     30
     31#include "OrxonoxPrereqs.h"
    332
    433#include <string>
    534
    635#include <OgreBillboardSet.h>
    7 
    8 #include "../OrxonoxPrereqs.h"
    936#include "util/Math.h"
    1037

  • code/trunk/src/orxonox/tools/Light.cc

    r1032 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#include "OrxonoxStableHeaders.h"
     29#include "Light.h"
    230
    331#include <sstream>
    … …  
    634
    735#include "GraphicsEngine.h"
    8 
    9 #include "Light.h"
    1036
    1137namespace orxonox

  • code/trunk/src/orxonox/tools/Light.h

    r790 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _Light_H__
    229#define _Light_H__
     30
     31#include "OrxonoxPrereqs.h"
    332
    433#include <string>
    534
    635#include <OgreLight.h>
    7 
    8 #include "../OrxonoxPrereqs.h"
    936
    1037#include "util/Math.h"

  • code/trunk/src/orxonox/tools/Mesh.cc

    r1032 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "Mesh.h"
    2930
    3031#include <sstream>
    … …  
    3334
    3435#include "GraphicsEngine.h"
    35 
    36 #include "Mesh.h"
    3736
    3837namespace orxonox

  • code/trunk/src/orxonox/tools/Mesh.h

    r790 r1039  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      ...
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _Mesh_H__
    229#define _Mesh_H__
     30
     31#include "OrxonoxPrereqs.h"
    332
    433#include <string>
    534
    635#include <OgreEntity.h>
    7 
    8 #include "../OrxonoxPrereqs.h"
    936
    1037namespace orxonox

  • code/trunk/src/orxonox/tools/Timer.cc

    r1021 r1039  
    2727
    2828#include "OrxonoxStableHeaders.h"
     29#include "Timer.h"
    2930
    3031#include "core/CoreIncludes.h"
    31 #include "Timer.h"
    3232
    3333namespace orxonox

  • code/trunk/src/orxonox/tools/Timer.h

    r1021 r1039  
    5858#define _Timer_H__
    5959
    60 #include "../OrxonoxPrereqs.h"
     60#include "OrxonoxPrereqs.h"
     61
    6162#include "core/Tickable.h"
    6263

  • code/trunk/visual_studio/vc8/tolua++.vcproj

    r1024 r1039  
    131131                        >
    132132                        <File
    133                                 RelativePath="..\..\src\util\tolua\tolua.c"
     133                                RelativePath="..\..\src\orxonox\core\tolua\tolua.c"
    134134                                >
    135135                        </File>
    136136                        <File
    137                                 RelativePath="..\..\src\util\tolua\tolua_bind.cc"
     137                                RelativePath="..\..\src\orxonox\core\tolua\tolua_bind.cc"
    138138                                >
    139139                        </File>
    140140                        <File
    141                                 RelativePath="..\..\src\util\tolua\tolua_event.c"
     141                                RelativePath="..\..\src\orxonox\core\tolua\tolua_event.c"
    142142                                >
    143143                        </File>
    144144                        <File
    145                                 RelativePath="..\..\src\util\tolua\tolua_is.c"
     145                                RelativePath="..\..\src\orxonox\core\tolua\tolua_is.c"
    146146                                >
    147147                        </File>
    148148                        <File
    149                                 RelativePath="..\..\src\util\tolua\tolua_map.c"
     149                                RelativePath="..\..\src\orxonox\core\tolua\tolua_map.c"
    150150                                >
    151151                        </File>
    152152                        <File
    153                                 RelativePath="..\..\src\util\tolua\tolua_push.c"
     153                                RelativePath="..\..\src\orxonox\core\tolua\tolua_push.c"
    154154                                >
    155155                        </File>
    156156                        <File
    157                                 RelativePath="..\..\src\util\tolua\tolua_to.c"
     157                                RelativePath="..\..\src\orxonox\core\tolua\tolua_to.c"
    158158                                >
    159159                        </File>
    160160                        <File
    161                                 RelativePath="..\..\src\util\tolua\toluabind.c"
     161                                RelativePath="..\..\src\orxonox\core\tolua\toluabind.c"
    162162                                >
    163163                        </File>
    … …  
    169169                        >
    170170                        <File
    171                                 RelativePath="..\..\src\util\tolua\tolua++.h"
     171                                RelativePath="..\..\src\orxonox\core\tolua\tolua++.h"
    172172                                >
    173173                        </File>
    174174                        <File
    175                                 RelativePath="..\..\src\util\tolua\tolua_bind.h"
     175                                RelativePath="..\..\src\orxonox\core\tolua\tolua_bind.h"
    176176                                >
    177177                        </File>
    178178                        <File
    179                                 RelativePath="..\..\src\util\tolua\tolua_event.h"
     179                                RelativePath="..\..\src\orxonox\core\tolua\tolua_event.h"
    180180                                >
    181181                        </File>
    182182                        <File
    183                                 RelativePath="..\..\src\util\tolua\toluabind.h"
     183                                RelativePath="..\..\src\orxonox\core\tolua\toluabind.h"
    184184                                >
    185185                        </File>
    186186                        <File
    187                                 RelativePath="..\..\src\util\tolua\toluabind_default.h"
     187                                RelativePath="..\..\src\orxonox\core\tolua\toluabind_default.h"
    188188                                >
    189189                        </File>
Note: See TracChangeset for help on using the changeset viewer.