Changeset 5740

Timestamp:

Sep 1, 2009, 5:35:16 PM (15 years ago)

Author:

landauf

Message:

merged ggz into ggz2

Location:

code/branches/ggz2

Files:

• . (modified) (1 prop)
• bin/ggz (copied) (copied from code/branches/ggz/bin/ggz)
• bin/ggz/module.dsc (copied) (copied from code/branches/ggz/bin/ggz/module.dsc) (1 prop)
• bin/ggz/orxonox.dsc (copied) (copied from code/branches/ggz/bin/ggz/orxonox.dsc) (1 prop)
• bin/ggz/orxonox.room (copied) (copied from code/branches/ggz/bin/ggz/orxonox.room) (1 prop)
• cmake/FindGGZ.cmake (copied) (copied from code/branches/ggz/cmake/FindGGZ.cmake) (1 prop)
• cmake/LibraryConfig.cmake (modified) (1 diff)
• src/SpecialConfig.h.in (modified) (1 diff)
• src/modules/gamestates/GSClient.cc (modified) (6 diffs)
• src/modules/gamestates/GSClient.h (modified) (3 diffs)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/GGZClient.cc (copied) (copied from code/branches/ggz/src/orxonox/GGZClient.cc) (1 prop)
• src/orxonox/GGZClient.h (copied) (copied from code/branches/ggz/src/orxonox/GGZClient.h) (1 prop)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)

code/branches/ggz2/cmake/LibraryConfig.cmake

@@ -91 +91 @@
 FIND_PACKAGE(ALUT            REQUIRED)
 FIND_PACKAGE(ZLIB            REQUIRED)
+FIND_PACKAGE(GGZ                     )
+IF(NOT GGZMOD_FOUND)
+  MESSAGE(STATUS "GGZMOD not found, disabling GGZ support")
+ENDIF(NOT GGZMOD_FOUND)
 IF(WIN32)
   FIND_PACKAGE(DirectX       REQUIRED)

code/branches/ggz2/src/SpecialConfig.h.in

@@ -69 +69 @@
 #cmakedefine CMAKE_CONFIGURATION_TYPES
 
+/**
+@def GGZMOD_FOUND
+    Macro for availability of the ggzmod library
+*/
+#cmakedefine GGZMOD_FOUND
+
 // Handle default ConfigValues
 namespace orxonox { namespace specialConfig

code/branches/ggz2/src/modules/gamestates/GSClient.cc

@@ -24 +24 @@
  *   Co-authors:
  *      Fabian 'x3n' Landau
+ *      Adrian Friedli
  *
  */
 
 #include "GSClient.h"
+#include "SpecialConfig.h"
 
 #include "util/Exception.h"
@@ -35 +37 @@
 #include "core/GameMode.h"
 #include "network/Client.h"
+#ifdef GGZMOD_FOUND
+#include "GGZClient.h"
+#endif /* GGZMOD_FOUND */
 
 namespace orxonox
@@ -45 +50 @@
         : GameState(info)
         , client_(0)
+        , ggzClient(0)
     {
     }
@@ -56 +62 @@
         GameMode::setIsClient(true);
 
-        this->client_ = new Client(CommandLine::getValue("ip").getString(), CommandLine::getValue("port"));
+#ifdef GGZMOD_FOUND
+        if (GGZClient::isActive())
+        {
+            this->ggzClient = new GGZClient(this);
+            return;
+        }
+#endif /* GGZMOD_FOUND */
+
+        this->connect(CommandLine::getValue("ip").getString(), CommandLine::getValue("port"));
+    }
+
+    void GSClient::connect(const std::string& address, int port)
+    {
+        this->client_ = new Client(address, port);
 
         if(!client_->establishConnection())
@@ -68 +87 @@
         client_->closeConnection();
 
+#ifdef GGZMOD_FOUND
+        if (ggzClient)
+        {
+            delete ggzClient;
+        }
+#endif /* GGZMOD_FOUND */
+
         // destroy client
         delete this->client_;
@@ -76 +102 @@
     void GSClient::update(const Clock& time)
     {
-        client_->update(time);
+        if (client_)
+        {
+            client_->update(time);
+        }
     }
 }

code/branches/ggz2/src/modules/gamestates/GSClient.h

@@ -23 +23 @@
  *      Reto Grieder
  *   Co-authors:
- *      ...
+ *      Adrian Friedli
  *
  */
@@ -42 +42 @@
         GSClient(const GameStateInfo& info);
         ~GSClient();
+        void connect(const std::string& address, int port);
 
         void activate();
@@ -49 +50 @@
     private:
         Client* client_;
+        GGZClient* ggzClient;
     };
 }

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

@@ -30 +30 @@
   Scene.cc
 )
+
+IF(GGZMOD_FOUND)
+  ADD_SOURCE_FILES(ORXONOX_SRC_FILES GGZClient.cc)
+ENDIF(GGZMOD_FOUND)
 
 ADD_SUBDIRECTORY(collisionshapes)
@@ -65 +69 @@
     ${VORBIS_LIBRARY}
     ${OGG_LIBRARY}
+    ${GGZMOD_LIBRARIES}
     tinyxml++_orxonox
     tolua++_orxonox

code/branches/ggz2/src/orxonox/OrxonoxPrereqs.h

@@ -193 +193 @@
     class SoundManager;
     class SoundMainMenu;
+
+    // GGZ
+    class GGZClient;
 }