Changeset 1039 for code/trunk/src/orxonox

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/src/orxonox

Files:

• GraphicsEngine.cc (modified) (2 diffs)
• GraphicsEngine.h (modified) (2 diffs)
• Orxonox.cc (modified) (2 diffs)
• Orxonox.h (modified) (1 diff)
• hud/HUD.cc (modified) (1 diff)
• hud/HUD.h (modified) (1 diff)
• objects/Ambient.cc (modified) (2 diffs)
• objects/Ambient.h (modified) (1 diff)
• objects/Camera.cc (modified) (2 diffs)
• objects/Camera.h (modified) (1 diff)
• objects/Explosion.cc (modified) (2 diffs)
• objects/Explosion.h (modified) (1 diff)
• objects/Model.cc (modified) (2 diffs)
• objects/Model.h (modified) (1 diff)
• objects/NPC.cc (modified) (1 diff)
• objects/NPC.h (modified) (2 diffs)
• objects/Projectile.cc (modified) (2 diffs)
• objects/Projectile.h (modified) (1 diff)
• objects/Skybox.cc (modified) (2 diffs)
• objects/Skybox.h (modified) (1 diff)
• objects/SpaceShip.cc (modified) (2 diffs)
• objects/SpaceShip.h (modified) (1 diff)
• objects/WorldEntity.cc (modified) (2 diffs)
• objects/WorldEntity.h (modified) (1 diff)
• objects/weapon/AmmunitionDump.cc (modified) (2 diffs)
• objects/weapon/AmmunitionDump.h (modified) (1 diff)
• objects/weapon/BarrelGun.cc (modified) (2 diffs)
• objects/weapon/BarrelGun.h (modified) (1 diff)
• objects/weapon/BaseWeapon.cc (modified) (2 diffs)
• objects/weapon/BaseWeapon.h (modified) (1 diff)
• objects/weapon/Bullet.cc (modified) (1 diff)
• objects/weapon/Bullet.h (modified) (1 diff)
• objects/weapon/BulletManager.cc (modified) (1 diff)
• objects/weapon/BulletManager.h (modified) (1 diff)
• objects/weapon/WeaponStation.cc (modified) (1 diff)
• objects/weapon/WeaponStation.h (modified) (1 diff)
• particle/ParticleInterface.cc (modified) (1 diff)
• particle/ParticleInterface.h (modified) (2 diffs)
• tools/BillboardSet.cc (modified) (2 diffs)
• tools/BillboardSet.h (modified) (1 diff)
• tools/Light.cc (modified) (2 diffs)
• tools/Light.h (modified) (1 diff)
• tools/Mesh.cc (modified) (2 diffs)
• tools/Mesh.h (modified) (1 diff)
• tools/Timer.cc (modified) (1 diff)
• tools/Timer.h (modified) (1 diff)

code/trunk/src/orxonox/GraphicsEngine.cc

@@ -32 +32 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "GraphicsEngine.h"
 
 #include <OgreRoot.h>
@@ -42 +43 @@
 #include "core/CoreIncludes.h"
 #include "core/Debug.h"
-
-#include "GraphicsEngine.h"
 
 

code/trunk/src/orxonox/GraphicsEngine.h

@@ -35 +35 @@
 #define _GraphicsEngine_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <string>
 
@@ -40 +42 @@
 #include <OgreLog.h>
 
-#include "OrxonoxPrereqs.h"
 #include "core/OrxonoxClass.h"
 

code/trunk/src/orxonox/Orxonox.cc

@@ -33 +33 @@
 // Precompiled Headers
 #include "OrxonoxStableHeaders.h"
+#include "Orxonox.h"
 
 //****** STD *******
@@ -71 +72 @@
 #include "hud/HUD.h"
 //#include "objects/weapon/BulletManager.h"
-
-#include "Orxonox.h"
 
 // FIXME: is this really file scope?

code/trunk/src/orxonox/Orxonox.h

@@ -8 +8 @@
 #define _Orxonox_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <string>
 
 #include <OgrePrerequisites.h>
-
-#include "OrxonoxPrereqs.h"
 #include "audio/AudioPrereqs.h"
 

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "HUD.h"
 
 #include <OgreOverlayManager.h>
 #include <OgreOverlayElement.h>
 #include <OgreStringConverter.h>
-
-#include "HUD.h"
 
 

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

@@ -29 +29 @@
 #define _HUD_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <string>
 
 #include <OgrePrerequisites.h>
-
-#include "../OrxonoxPrereqs.h"
 
 

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "Ambient.h"
 
 #include <vector>
@@ -41 +42 @@
 #include "GraphicsEngine.h"
 #include "core/XMLPort.h"
-
-#include "Ambient.h"
 
 namespace orxonox

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 #ifndef _Ambient_H__
 #define _Ambient_H__
 
-#include "../OrxonoxPrereqs.h"
+#include "OrxonoxPrereqs.h"
 
 #include "core/BaseObject.h"

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
 
 #include "OrxonoxStableHeaders.h"
+#include "Camera.h"
 
 #include <string>
@@ -16 +43 @@
 #include "core/CoreIncludes.h"
 #include "GraphicsEngine.h"
-
-#include "Camera.h"
 
 namespace orxonox

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 #ifndef _Camera_H__
 #define _Camera_H__
 
-#include "../OrxonoxPrereqs.h"
+#include "OrxonoxPrereqs.h"
 
 #include "core/BaseObject.h"

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "Explosion.h"
 
 #include <OgreParticleSystem.h>
@@ -36 +37 @@
 #include "GraphicsEngine.h"
 #include "particle/ParticleInterface.h"
-
-#include "Explosion.h"
 
 namespace orxonox

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 #ifndef _Explosion_H__
 #define _Explosion_H__
 
-#include "../OrxonoxPrereqs.h"
+#include "OrxonoxPrereqs.h"
 
 #include "WorldEntity.h"

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "Model.h"
 
 #include "util/tinyxml/tinyxml.h"
@@ -34 +35 @@
 #include "GraphicsEngine.h"
 #include "core/XMLPort.h"
-
-#include "Model.h"
 
 namespace orxonox

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 #ifndef _Model_H__
 #define _Model_H__
 
-#include "../OrxonoxPrereqs.h"
+#include "OrxonoxPrereqs.h"
 
 #include "WorldEntity.h"

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "NPC.h"
 
 #include "../core/CoreIncludes.h"
-#include "NPC.h"
 
 namespace orxonox {

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      ...
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 /**
   @file NPC.h
@@ -8 +35 @@
 #define _NPC_H__
 
-#include "../OrxonoxPrereqs.h"
+#include "OrxonoxPrereqs.h"
 
 #include "Model.h"

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "Projectile.h"
 
 #include "../core/CoreIncludes.h"
@@ -32 +33 @@
 #include "Explosion.h"
 #include "Model.h"
-
-#include "Projectile.h"
 
 namespace orxonox

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 #ifndef _Projectile_H__
 #define _Projectile_H__
 
-#include "../OrxonoxPrereqs.h"
+#include "OrxonoxPrereqs.h"
 
 #include "WorldEntity.h"

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "Skybox.h"
 
 #include <string>
@@ -39 +40 @@
 #include "core/Debug.h"
 #include "core/XMLPort.h"
-
-#include "Skybox.h"
 
 namespace orxonox

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

@@ -2 +2 @@
 #define _Skybox_H__
 
-#include "../OrxonoxPrereqs.h"
+#include "OrxonoxPrereqs.h"
 
 #include "core/BaseObject.h"

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "SpaceShip.h"
 
 #include <string>
@@ -46 +47 @@
 #include "Projectile.h"
 #include "core/XMLPort.h"
-
-#include "SpaceShip.h"
 
 namespace orxonox

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 #ifndef _SpaceShip_H__
 #define _SpaceShip_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <OgrePrerequisites.h>
 #include <OIS/OISMouse.h>
-
-#include "../OrxonoxPrereqs.h"
 
 #include "Model.h"

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "WorldEntity.h"
 
 #include <string>
@@ -36 +37 @@
 #include "core/CoreIncludes.h"
 #include "GraphicsEngine.h"
-#include "WorldEntity.h"
 #include "core/XMLPort.h"
 

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 #ifndef _WorldEntity_H__
 #define _WorldEntity_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <OgreSceneManager.h>
 #include <OgreSceneNode.h>
-
-#include "../OrxonoxPrereqs.h"
 
 #include "util/Math.h"
 #include "util/XMLIncludes.h"
 #include "network/Synchronisable.h"
-//#include "util/tinyxml/tinyxml.h"
 #include "core/BaseObject.h"
 #include "core/Tickable.h"

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "AmmunitionDump.h"
 
 #include "orxonox/Orxonox.h"
@@ -32 +33 @@
 #include "util/tinyxml/tinyxml.h"
 #include "core/CoreIncludes.h"
-
-#include "AmmunitionDump.h"
 
 

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

@@ -30 +30 @@
 #define _AmmunitionDump_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <string>
 
 #include <OgrePrerequisites.h>
-
-#include "../../OrxonoxPrereqs.h"
 
 #include "network/Synchronisable.h"

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "BarrelGun.h"
 
 #include <OgreStringConverter.h>
@@ -39 +40 @@
 #include "BaseWeapon.h"
 #include "core/CoreIncludes.h"
-
-#include "BarrelGun.h"
 
 

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

@@ -30 +30 @@
 #define _BarrelGun_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <OgrePrerequisites.h>
-
-#include "../../OrxonoxPrereqs.h"
 
 #include "BaseWeapon.h"

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "BaseWeapon.h"
 
 #include <OgreStringConverter.h>
@@ -39 +40 @@
 #include "AmmunitionDump.h"
 #include "core/CoreIncludes.h"
-
-#include "BaseWeapon.h"
 
 

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

@@ -30 +30 @@
 #define _BaseWeapon_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <OgrePrerequisites.h>
-
-#include "../../OrxonoxPrereqs.h"
 
 #include "../Model.h"

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "Bullet.h"
+
 #include "core/CoreIncludes.h"
 
-#include "Bullet.h"
 
 namespace orxonox {

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

@@ -30 +30 @@
 #define _Bullet_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <OgrePrerequisites.h>
-
-#include "../../OrxonoxPrereqs.h"
 
 #include "../Model.h"

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "BulletManager.h"
 
-#include "BulletManager.h"
 #include "Bullet.h"
 #include "core/CoreIncludes.h"

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

@@ -30 +30 @@
 #define _BulletManager_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <string>
 
 #include <OgrePrerequisites.h>
-
-#include "../../OrxonoxPrereqs.h"
 
 #include "network/Synchronisable.h"

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "WeaponStation.h"
 
 #include "BaseWeapon.h"
-#include "WeaponStation.h"
 
 

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

@@ -32 +32 @@
 #include <OgrePrerequisites.h>
 
-#include "../../OrxonoxPrereqs.h"
+#include "OrxonoxPrereqs.h"
 
 

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

@@ -32 +32 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "ParticleInterface.h"
 
-#include "ParticleInterface.h"
 // #include <OgreParticleSystem.h>
 // #include <Ogre.h>

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 #ifndef _ParticleInterface_H__
 #define _ParticleInterface_H__
+
+#include "OrxonoxPrereqs.h"
 
 #include <string>
@@ -12 +41 @@
 #include <OgreParticleEmitter.h>
 #include <OgreSceneManager.h>
-
-#include "../OrxonoxPrereqs.h"
 
 #include "util/Math.h"

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "BillboardSet.h"
 
 #include <sstream>
@@ -34 +35 @@
 #include "GraphicsEngine.h"
 #include "util/Math.h"
-
-#include "BillboardSet.h"
 
 namespace orxonox

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 #ifndef _BillboardSet_H__
 #define _BillboardSet_H__
+
+#include "OrxonoxPrereqs.h"
 
 #include <string>
 
 #include <OgreBillboardSet.h>
-
-#include "../OrxonoxPrereqs.h"
 #include "util/Math.h"
 

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      ...
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 #include "OrxonoxStableHeaders.h"
+#include "Light.h"
 
 #include <sstream>
@@ -6 +34 @@
 
 #include "GraphicsEngine.h"
-
-#include "Light.h"
 
 namespace orxonox

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      ...
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 #ifndef _Light_H__
 #define _Light_H__
+
+#include "OrxonoxPrereqs.h"
 
 #include <string>
 
 #include <OgreLight.h>
-
-#include "../OrxonoxPrereqs.h"
 
 #include "util/Math.h"

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "Mesh.h"
 
 #include <sstream>
@@ -33 +34 @@
 
 #include "GraphicsEngine.h"
-
-#include "Mesh.h"
 
 namespace orxonox

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      ...
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 #ifndef _Mesh_H__
 #define _Mesh_H__
+
+#include "OrxonoxPrereqs.h"
 
 #include <string>
 
 #include <OgreEntity.h>
-
-#include "../OrxonoxPrereqs.h"
 
 namespace orxonox

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "Timer.h"
 
 #include "core/CoreIncludes.h"
-#include "Timer.h"
 
 namespace orxonox

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

@@ -58 +58 @@
 #define _Timer_H__
 
-#include "../OrxonoxPrereqs.h"
+#include "OrxonoxPrereqs.h"
+
 #include "core/Tickable.h"