Changeset 786

Timestamp:

Jan 2, 2008, 7:41:46 PM (16 years ago)

Author:

rgrieder

Message:

• renamed StableHeaders.h to OrxonoxStableHeaders.h

Location:

code/branches/FICN

Files:

• src/loader/LevelLoader.cc (modified) (1 diff)
• src/orxonox/GraphicsEngine.cc (modified) (1 diff)
• src/orxonox/InputManager.cc (modified) (1 diff)
• src/orxonox/Main.cc (modified) (3 diffs)
• src/orxonox/Orxonox.cc (modified) (1 diff)
• src/orxonox/OrxonoxStableHeaders.h (added)
• src/orxonox/PrecompiledHeaderFiles.cc (modified) (1 diff)
• src/orxonox/SpaceshipSteering.cc (modified) (1 diff)
• src/orxonox/StableHeaders.h (deleted)
• src/orxonox/hud/HUD.cc (modified) (1 diff)
• src/orxonox/objects/Ambient.cc (modified) (1 diff)
• src/orxonox/objects/Camera.cc (modified) (1 diff)
• src/orxonox/objects/Explosion.cc (modified) (1 diff)
• src/orxonox/objects/Fighter.cc (modified) (1 diff)
• src/orxonox/objects/Model.cc (modified) (1 diff)
• src/orxonox/objects/NPC.cc (modified) (1 diff)
• src/orxonox/objects/Projectile.cc (modified) (1 diff)
• src/orxonox/objects/Skybox.cc (modified) (1 diff)
• src/orxonox/objects/SpaceShip.cc (modified) (2 diffs)
• src/orxonox/objects/SpaceShip.h (modified) (1 diff)
• src/orxonox/objects/SpaceshipSteeringObject.cc (modified) (1 diff)
• src/orxonox/objects/WorldEntity.cc (modified) (1 diff)
• src/orxonox/objects/weapon/AmmunitionDump.cc (modified) (1 diff)
• src/orxonox/objects/weapon/BarrelGun.cc (modified) (1 diff)
• src/orxonox/objects/weapon/BaseWeapon.cc (modified) (1 diff)
• src/orxonox/objects/weapon/Bullet.cc (modified) (1 diff)
• src/orxonox/objects/weapon/BulletManager.cc (modified) (1 diff)
• src/orxonox/objects/weapon/WeaponStation.cc (modified) (1 diff)
• src/orxonox/particle/ParticleInterface.cc (modified) (1 diff)
• src/orxonox/tools/BillboardSet.cc (modified) (1 diff)
• src/orxonox/tools/Light.cc (modified) (1 diff)
• src/orxonox/tools/Mesh.cc (modified) (1 diff)
• visual_studio/orxonox.vcproj (modified) (3 diffs)

code/branches/FICN/src/loader/LevelLoader.cc

@@ -26 +26 @@
 */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <OgreOverlay.h>

code/branches/FICN/src/orxonox/GraphicsEngine.cc

@@ -30 +30 @@
   */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include "GraphicsEngine.h"

code/branches/FICN/src/orxonox/InputManager.cc

@@ -1 @@
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include "InputManager.h"

code/branches/FICN/src/orxonox/Main.cc

@@ -31 +31 @@
   */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <OgrePlatform.h>
@@ -86 +86 @@
     int argc = 2;
     int i;
+    int j;
     for(i = 0; cmd[i] != NULL; i++)
     {
@@ -91 +92 @@
     }
     char **argv = new char*[argc];
-    for (int j = 0; j < argc; j++)
+    for (j = 0; j < argc; j++)
     {
       argv[j] = new char[i];
     }
-    int j = 1;
+    j = 1;
     int k = 0;
     for(int i = 0; cmd[i] != NULL; i++)

code/branches/FICN/src/orxonox/Orxonox.cc

@@ -32 +32 @@
 
 // Precompiled Headers
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 //****** OGRE ******

code/branches/FICN/src/orxonox/PrecompiledHeaderFiles.cc

@@ -31 +31 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"

code/branches/FICN/src/orxonox/SpaceshipSteering.cc

@@ -26 +26 @@
 */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <OgreNode.h>

code/branches/FICN/src/orxonox/hud/HUD.cc

@@ -26 +26 @@
 */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <OgreOverlayManager.h>

code/branches/FICN/src/orxonox/objects/Ambient.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <vector>

code/branches/FICN/src/orxonox/objects/Camera.cc

@@ -1 +1 @@
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <string>

code/branches/FICN/src/orxonox/objects/Explosion.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <OgreParticleSystem.h>

code/branches/FICN/src/orxonox/objects/Fighter.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <string>

code/branches/FICN/src/orxonox/objects/Model.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include "util/tinyxml/tinyxml.h"

code/branches/FICN/src/orxonox/objects/NPC.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include "../core/CoreIncludes.h"

code/branches/FICN/src/orxonox/objects/Projectile.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include "../core/CoreIncludes.h"

code/branches/FICN/src/orxonox/objects/Skybox.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <string>

code/branches/FICN/src/orxonox/objects/SpaceShip.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <string>
@@ -136 +136 @@
         SetConfigValue(bInvertYAxis_, false).description("Set this to true for joystick-like mouse behaviour (mouse up = ship down).");
         SetConfigValue(reloadTime_, 0.125).description("The reload time of the weapon in seconds");
+        SetConfigValue(testvector_, Vector3()).description("asdfblah");
     }
 

code/branches/FICN/src/orxonox/objects/SpaceShip.h

@@ -31 +31 @@
 
         private:
+            Vector3 testvector_;
             bool bInvertYAxis_;
             bool setMouseEventCallback_;

code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <OgreSceneManager.h>

code/branches/FICN/src/orxonox/objects/WorldEntity.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <string>

code/branches/FICN/src/orxonox/objects/weapon/AmmunitionDump.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include "orxonox/Orxonox.h"

code/branches/FICN/src/orxonox/objects/weapon/BarrelGun.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <OgreStringConverter.h>

code/branches/FICN/src/orxonox/objects/weapon/BaseWeapon.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <OgreStringConverter.h>

code/branches/FICN/src/orxonox/objects/weapon/Bullet.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include "Bullet.h"

code/branches/FICN/src/orxonox/objects/weapon/BulletManager.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include "BulletManager.h"

code/branches/FICN/src/orxonox/objects/weapon/WeaponStation.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include "BaseWeapon.h"

code/branches/FICN/src/orxonox/particle/ParticleInterface.cc

@@ -31 +31 @@
 */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include "ParticleInterface.h"

code/branches/FICN/src/orxonox/tools/BillboardSet.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <sstream>

code/branches/FICN/src/orxonox/tools/Light.cc

@@ -1 @@
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <sstream>

code/branches/FICN/src/orxonox/tools/Mesh.cc

@@ -26 +26 @@
  */
 
-#include "StableHeaders.h"
+#include "OrxonoxStableHeaders.h"
 
 #include <sstream>

code/branches/FICN/visual_studio/orxonox.vcproj

@@ -43 +43 @@
                                 PreprocessorDefinitions="ORXONOX_SHARED_BUILD; LOADER_STATIC_BUILD"
                                 UsePrecompiledHeader="2"
-                                PrecompiledHeaderThrough="StableHeaders.h"
+                                PrecompiledHeaderThrough="OrxonoxStableHeaders.h"
                         />
                         <Tool
@@ -114 +114 @@
                                 PreprocessorDefinitions="ORXONOX_SHARED_BUILD; LOADER_STATIC_BUILD"
                                 UsePrecompiledHeader="2"
-                                PrecompiledHeaderThrough="StableHeaders.h"
+                                PrecompiledHeaderThrough="OrxonoxStableHeaders.h"
                         />
                         <Tool
@@ -447 +447 @@
                         </File>
                         <File
+                                RelativePath="..\src\orxonox\OrxonoxStableHeaders.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\orxonox\SpaceshipSteering.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\orxonox\StableHeaders.h"
                                 >
                         </File>