Changeset 7161 for code/branches/presentation3/src/orxonox

Timestamp:

Jul 28, 2010, 8:29:32 PM (15 years ago)

Author:

scheusso

Message:

some new features:
-Orxonox servers announce themselves now inside a LAN (and can provide some information (e.g. server name, etc.) to the client )
-Orxonox clients discover the servers inside the LAN and list them in the menu

Location:

code/branches/presentation3/src/orxonox

Files:

• CameraManager.cc (modified) (1 diff)
• Main.cc (modified) (2 diffs)
• gamestates/GSClient.cc (modified) (3 diffs)
• gamestates/GSClient.h (modified) (1 diff)

code/branches/presentation3/src/orxonox/CameraManager.cc

@@ -68 +68 @@
     void CameraManager::requestFocus(Camera* camera)
     {
+      COUT(0) << "bliub" << endl;
         // notify old camera (if it exists)
         if (!this->cameraList_.empty())

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

@@ -40 +40 @@
 #include "core/LuaState.h"
 #include "ToluaBindOrxonox.h"
+#include "ToluaBindNetwork.h"
 #include "Main.h"
 
@@ -51 +52 @@
 
 DeclareToluaInterface(Orxonox);
+DeclareToluaInterface(Network);
 
 namespace orxonox

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

@@ -44 +44 @@
     GSClient::GSClient(const GameStateInfo& info)
         : GameState(info)
-        , client_(0)
     {
     }
@@ -56 +55 @@
         GameMode::setIsClient(true);
 
-        this->client_ = new Client(CommandLineParser::getValue("dest").getString(), CommandLineParser::getValue("port"));
+//         this->client_ = new Client();
+//         this->client_->setDestination(CommandLineParser::getValue("dest").getString(), CommandLineParser::getValue("port") );
 
-        if(!client_->establishConnection())
+        if( !Client::getInstance()->establishConnection() )
         {
-            delete this->client_;
             ThrowException(InitialisationFailed, "Could not establish connection with server.");
         }
 
-        client_->update(Game::getInstance().getGameClock());
+        Client::getInstance()->update(Game::getInstance().getGameClock());
     }
 
     void GSClient::deactivate()
     {
-        client_->closeConnection();
+        Client::getInstance()->closeConnection();
 
         // destroy client
-        delete this->client_;
+//         delete this->client_;
 
         GameMode::setIsClient(false);
@@ -79 +78 @@
     void GSClient::update(const Clock& time)
     {
-        client_->update(time);
+        Client::getInstance()->update(time);
     }
 }

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

@@ -46 +46 @@
         void deactivate();
         void update(const Clock& time);
-
-    private:
-        Client* client_;
     };
 }