Changeset 3000 for code/branches

Timestamp:

May 20, 2009, 8:47:08 PM (16 years ago)

Author:

adrfried

Message:

some ggz things

Location:

code/branches/ggz

Files:

• bin/ggz (added)
• bin/ggz/module.dsc (added)
• bin/ggz/orxonox.dsc (added)
• bin/ggz/orxonox.room (added)
• cmake/FindGGZ.cmake (modified) (1 diff)
• cmake/LibraryConfig.cmake (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/GGZClient.cc (modified) (6 diffs)
• src/orxonox/GGZClient.h (modified) (2 diffs)
• src/orxonox/gamestates/GSClient.cc (modified) (3 diffs)
• src/orxonox/gamestates/GSClient.h (modified) (3 diffs)

code/branches/ggz/cmake/FindGGZ.cmake

@@ -5 +5 @@
 FIND_LIBRARY(GGZMOD_LIBRARY NAMES ggzmod)
 
-# handle the QUIETLY and REQUIRED arguments and set GGZ_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set GGZMOD_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)

code/branches/ggz/cmake/LibraryConfig.cmake

@@ -116 +116 @@
 FIND_PACKAGE(ZLIB            REQUIRED)
 FIND_PACKAGE(GGZ                     )
+IF(GGZMOD_FOUND)
+        ADD_COMPILER_FLAGS("-DHAS_GGZ")
+ELSE(GGZMOD_FOUND)
+        MESSAGE("GGZMOD not found, disabling GGZ support")
+ENDIF(GGZMOD_FOUND)
 IF(WIN32)
   FIND_PACKAGE(DirectX       REQUIRED)

code/branches/ggz/src/orxonox/CMakeLists.txt

@@ -20 +20 @@
 SET_SOURCE_FILES(ORXONOX_SRC_FILES
   CameraManager.cc
-  GGZClient.cc
   GraphicsEngine.cc
   LevelManager.cc
@@ -27 +26 @@
   PlayerManager.cc
 )
+IF(GGZMOD_FOUND)
+        ADD_SOURCE_FILES(ORXONOX_SRC_FILES GGZClient.cc)
+ENDIF(GGZMOD_FOUND)
 ADD_SUBDIRECTORY(gamestates)
 ADD_SUBDIRECTORY(gui)

code/branches/ggz/src/orxonox/GGZClient.cc

@@ -2 +2 @@
 
 #include <cassert>
+#include <boost/bind.hpp>
 
 namespace orxonox
@@ -13 +14 @@
         singletonRef_s = this;
 
-        boost::asio::ip::tcp::socket::non_blocking_io non_blocking_io(true);
-        ggzSocket.io_control(non_blocking_io);
-        gameSocket.io_control(non_blocking_io);
-
-        active = ggzmod_is_ggz_mode();
-        if (active) {
-            initGGZ();
-        }
+        initGGZ();
     }
 
     GGZClient::~GGZClient()
     {
-        if (active) {
-            deinitGGZ();
-        }
+        deinitGGZ();
 
         assert(singletonRef_s);
@@ -37 +29 @@
         assert(singletonRef_s);
         return *singletonRef_s;
+    }
+
+    bool GGZClient::isActive()
+    {
+        return ggzmod_is_ggz_mode();
     }
 
@@ -61 +58 @@
         }
         /* TODO: Error */
-        ggzSocket.assign(boost::asio::ip::tcp::v4(), fd);
-        ggzSocket.async_read_some(boost::asio::null_buffers(), handleGGZ);
+        ggzSocket.assign(boost::asio::local::stream_protocol(), fd);
+        ggzSocket.async_read_some(boost::asio::null_buffers(), boost::bind(&handleGGZ, boost::asio::placeholders::error));
     }
 
@@ -72 +69 @@
 
     /* Got data from game server */
-    void handleGame(const boost::system::error_code& /*e*/)
+    void GGZClient::handleGame(const boost::system::error_code& /*e*/)
     {
         /* TODO: read from gameSocket */
@@ -88 +85 @@
     {
         ggzmod_set_state(ggzmod, GGZMOD_STATE_PLAYING);
-        gameSocket.assign(boost::asio::ip::tcp::v4(), *(int*)data);
-        gameSocket.async_read_some(boost::asio::null_buffers(), handleGame);
+        getInstance().gameSocket.assign(boost::asio::local::stream_protocol(), *(int*)data);
+        getInstance().gameSocket.async_read_some(boost::asio::null_buffers(), boost::bind(&handleGame, boost::asio::placeholders::error));
     }
 }

code/branches/ggz/src/orxonox/GGZClient.h

@@ -17 +17 @@
 
             static GGZClient& getInstance();
+            static bool isActive();
             virtual void tick(const float dt);
 
@@ -22 +23 @@
             static GGZClient* singletonRef_s;
 
-            bool active;
             GGZMod * ggzmod;
             boost::asio::io_service io;
-            boost::asio::ip::tcp::socket ggzSocket;
-            boost::asio::ip::tcp::socket gameSocket;
+            boost::asio::local::stream_protocol::socket ggzSocket;
+            boost::asio::local::stream_protocol::socket gameSocket;
 
             void initGGZ();
             void deinitGGZ();
-            void handleGame(const boost::system::error_code& e);
-            void handleGGZ(const boost::system::error_code& e);
+            static void handleGame(const boost::system::error_code& e);
+            static void handleGGZ(const boost::system::error_code& e);
             static void handleGGZModServer(GGZMod * ggzmod, GGZModEvent e,
                     const void *data);

code/branches/ggz/src/orxonox/gamestates/GSClient.cc

@@ -24 +24 @@
  *   Co-authors:
  *      Fabian 'x3n' Landau
+ *      Adrian Friedli
  *
  */
@@ -53 +54 @@
         Core::setIsClient(true);
 
+#ifdef HAS_GGZ
+        ggzClient = NULL;
+        if (GGZClient::isActive()) {
+            COUT(3) << "Initializing GGZ\n";
+            ggzClient = new GGZClient;
+        }
+        else {
+            COUT(3) << "Not using GGZ\n";
+        }
+#else  /* HAS_GGZ */
+        COUT(3) << "GGZ support disabled\n";
+#endif /* HAS_GGZ */
+
         this->client_ = new Client(CommandLine::getValue("ip").getString(), CommandLine::getValue("port"));
 
@@ -69 +83 @@
         client_->closeConnection();
 
+#ifdef HAS_GGZ
+        if (ggzClient)
+        {
+            delete ggzClient;
+        }
+#endif /* HAS_GGZ */
+
         // destroy client
         delete this->client_;

code/branches/ggz/src/orxonox/gamestates/GSClient.h

@@ -23 +23 @@
  *      Reto Grieder
  *   Co-authors:
- *      ...
+ *      Adrian Friedli
  *
  */
@@ -34 +34 @@
 #include "GSLevel.h"
 #include "GSGraphics.h"
+#ifdef HAS_GGZ
+#include "GGZClient.h"
+#endif /* HAS_GGZ */
 
 namespace orxonox
@@ -50 +53 @@
 
         Client* client_;
+#ifdef HAS_GGZ
+        GGZClient* ggzClient;
+#endif /* HAS_GGZ */
+
     };
 }