Changeset 918

Timestamp:

Mar 22, 2008, 9:17:34 PM (17 years ago)

Author:

rgrieder

Message:

• created basic construct for the InputHandler (mere copy of InputManager but without the Listeners)
• some msvc related fixes with winsocks.h and winsocks2.h
• fix in Tickable.h (due to lazy displacement to new folder)

Location:

code/branches/network

Files:

• src/network/Client.h (modified) (1 diff)
• src/network/Server.cc (modified) (2 diffs)
• src/network/Server.h (modified) (1 diff)
• src/orxonox/InputHandler.cc (added)
• src/orxonox/InputHandler.h (added)
• src/orxonox/Main.cc (modified) (1 diff)
• src/orxonox/Orxonox.cc (modified) (3 diffs)
• src/orxonox/Orxonox.h (modified) (1 diff)
• src/orxonox/OrxonoxStableHeaders.h (modified) (3 diffs)
• src/orxonox/PrecompiledHeaderFiles.cc (modified) (1 diff)
• src/orxonox/core/BaseObject.cc (modified) (1 diff)
• src/orxonox/core/Tickable.cc (modified) (1 diff)
• src/orxonox/core/Tickable.h (modified) (1 diff)
• visual_studio/network_properties.vsprops (modified) (1 diff)
• visual_studio/vc8/orxonox.vcproj (modified) (2 diffs)

code/branches/network/src/network/Client.h

@@ -16 +16 @@
 #include <string>
 
+#include "NetworkPrereqs.h"
+
 #include "core/Tickable.h"
-
-#include "NetworkPrereqs.h"
 #include "ClientConnection.h"
 #include "PacketManager.h"

code/branches/network/src/network/Server.cc

@@ -13 +13 @@
 #include <iostream>
 
-#include "util/Sleep.h"
 #include "ConnectionManager.h"
 #include "PacketTypes.h"
@@ -19 +18 @@
 #include "ClientInformation.h"
 //#include "NetworkFrameListener.h"
+#include "util/Sleep.h"
 #include "Server.h"
 

code/branches/network/src/network/Server.h

@@ -16 +16 @@
 #include <string>
 
+#include "NetworkPrereqs.h"
+
 #include "core/Tickable.h"
-
 #include "PacketManager.h"
-#include "NetworkPrereqs.h"
 
 

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

@@ -76 +76 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
-#include "windows.h"
+#include <windows.h>
   INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
   {

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

@@ -64 +64 @@
 #include "network/Server.h"
 #include "network/Client.h"
-#include "network/NetworkPrereqs.h"
 network::Client *client_g;
 network::Server *server_g;
@@ -79 +78 @@
 #include "hud/HUD.h"
 #include "objects/weapon/BulletManager.h"
-#include "GraphicsEngine.h"
 
 #include "Orxonox.h"
@@ -434 +432 @@
   /**
     Main loop of the orxonox game.
-    This is a new solution, using the ogre engine instead of beeing used by it.
+    This is a new solution, using the ogre engine instead of being used by it.
     An alternative solution would be to simply use the timer of the Root object,
     but that implies using Ogre in any case. There would be no way to test

code/branches/network/src/orxonox/Orxonox.h

@@ -15 +15 @@
 
 #include "OrxonoxPrereqs.h"
-//#include "loader/LoaderPrereqs.h"
 #include "audio/AudioPrereqs.h"
 

code/branches/network/src/orxonox/OrxonoxStableHeaders.h

@@ -41 +41 @@
 
 // not including the entire Ogre.h doesn't exceed the default heap size for pch
+#ifndef WIN32_LEAN_AND_MEAN
+// prevent Ogre from including winsock.h that messes with winsock2.h from enet
+#  define WIN32_LEAN_AND_MEAN
+#endif
 //#include <Ogre.h>
-#include <OgreBillboardSet.h>
-#include <OgreCamera.h>
-#include <OgreConfigFile.h>
+//#include <OgreBillboardSet.h>
+//#include <OgreCamera.h>
+//#include <OgreConfigFile.h>
 #include <OgreEntity.h>
 #include <OgreException.h>
-#include <OgreFrameListener.h>
+//#include <OgreFrameListener.h>
 #include <OgreLight.h>
-#include <OgreOverlay.h>
-#include <OgreOverlayElement.h>
-#include <OgreOverlayManager.h>
+//#include <OgreOverlay.h>
+//#include <OgreOverlayElement.h>
+//#include <OgreOverlayManager.h>
 #include <OgreParticleEmitter.h>
 #include <OgreParticleSystem.h>
 #include <OgrePlatform.h>
 #include <OgrePrerequisites.h>
-#include <OgreRenderWindow.h>
-#include <OgreRoot.h>
+//#include <OgreRenderWindow.h>
+//#include <OgreRoot.h>
 #include <OgreSceneManager.h>
 #include <OgreSceneNode.h>
 #include <OgreStringConverter.h>
-#include <OgreTextureManager.h>
-#include <OgreViewport.h>
+//#include <OgreTextureManager.h>
+//#include <OgreViewport.h>
 
 #include <OIS/OIS.h>
@@ -68 +72 @@
 /**
 * Some of the not so stable header files.
-* But it's not very useful to include them anyway..
+* It's not very useful to include them anyway..
 **/
-
-//#include "audio/AudioManager.h"
 
 #include "core/CoreIncludes.h"
 #include "core/BaseObject.h"
-//#include "core/ArgReader.h"
+#include "core/Tickable.h"
 #include "core/Error.h"
 #include "core/Loader.h"
 #include "core/XMLPort.h"
-#include "core/Tickable.h"
 
 #include "network/Synchronisable.h"
@@ -100 +101 @@
 #include "util/tinyxml/tinyxml.h"
 
-//#include "hud/HUD.h"
-//#include "loader/LevelLoader.h"
-//#include "objects/weapon/AmmunitionDump.h"
-//#include "objects/weapon/BarrelGun.h"
-//#include "objects/weapon/Bullet.h"
-//#include "objects/weapon/BulletManager.h"
-//#include "objects/weapon/WeaponStation.h"
-//#include "objects/Ambient.h"
-//#include "objects/Camera.h"
-//#include "objects/Explosion.h"
-//#include "objects/Fighter.h"
 #include "objects/Model.h"
-//#include "objects/NPC.h"
-//#include "objects/Projectile.h"
-//#include "objects/Skybox.h"
-//#include "objects/SpaceShipSteeringObject.h"
 #include "objects/WorldEntity.h"
-//#include "particle/ParticleInterface.h"
-//#include "tools/BillboardSet.h"
-//#include "tools/Light.h"
-//#include "tools/Mesh.h"
-//#include "tools/Timer.h"
-//#include "GraphicsEngine.h"
-//#include "InputManager.h"
-//#include "Orxonox.h"
-//#include "SpaceshipSteering.h"
 
 #endif

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

@@ -27 +27 @@
 
 /**
- @file  PrecompiledHeaderFiles.cc
+ @file
  @brief This file actually generates the precompiled header file
  */

code/branches/network/src/orxonox/core/BaseObject.cc

@@ -27 +27 @@
 
 /**
-    @file BaseObject.cc
+    @file
     @brief Implementation of the BaseObject class.
 */

code/branches/network/src/orxonox/core/Tickable.cc

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

code/branches/network/src/orxonox/core/Tickable.h

@@ -41 +41 @@
 #define _Tickable_H__
 
-#include "../OrxonoxPrereqs.h"
+#include "CorePrereqs.h"
 #include "core/OrxonoxClass.h"
 

code/branches/network/visual_studio/network_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
-                PreprocessorDefinitions="NETWORK_SHARED_BUILD; WIN32_LEAN_AND_MEAN; ZLIB_WINAPI "
+                PreprocessorDefinitions="NETWORK_SHARED_BUILD; ZLIB_WINAPI;WIN32_LEAN_AND_MEAN"
         />
         <Tool

code/branches/network/visual_studio/vc8/orxonox.vcproj

@@ -285 +285 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\InputHandler.cc"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\InputManager.cc"
                                 >
@@ -655 +659 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\InputHandler.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\InputManager.h"
                                 >