Changeset 531

Timestamp:

Dec 15, 2007, 6:37:35 AM (16 years ago)

Author:

scheusso

Message:

started implementing presentation

Location:

code/branches/FICN

Files:

• bin/run-script (modified) (1 diff)
• run (modified) (1 diff)
• src/network/PacketDecoder.cc (modified) (1 diff)
• src/network/PacketManager.h (modified) (1 diff)
• src/network/Synchronisable.cc (modified) (2 diffs)
• src/orxonox/core/CoreIncludes.h (modified) (1 diff)
• src/orxonox/objects/Entity.cc (modified) (1 diff)
• src/orxonox/objects/Entity.h (modified) (2 diffs)
• src/orxonox/orxonox.cc (modified) (3 diffs)
• src/orxonox/orxonox.h (modified) (1 diff)
• src/orxonox/spaceship_steering.cc (modified) (1 diff)

code/branches/FICN/bin/run-script

@@ -22 +22 @@
         fi
 fi
-exec ./main
+exec ./main $1

code/branches/FICN/run

@@ -1 +1 @@
 #!/bin/bash
 cd bin
-./run-script
+./run-script $1
 cd ..

code/branches/FICN/src/network/PacketDecoder.cc

@@ -42 +42 @@
 
 PacketDecoder::PacketDecoder(){}
+
+PacketDecoder::~PacketDecoder(){}
 
 //call this function out of an instance of PacketDecoder

code/branches/FICN/src/network/PacketManager.h

@@ -45 +45 @@
 public:
         PacketDecoder();
+  virtual ~PacketDecoder();
         //call this function to decode, it calls the right decoding function below
         bool elaborate( ENetPacket* packet, int clientId );

code/branches/FICN/src/network/Synchronisable.cc

@@ -11 +11 @@
 
 #include "Synchronisable.h"
+#include "orxonox/core/CoreIncludes.h"
+
 
 namespace network {
@@ -20 +22 @@
 Synchronisable::Synchronisable()
 {
+  RegisterRootObject(Synchronisable);
   static int idCounter=0;
   datasize=0;

code/branches/FICN/src/orxonox/core/CoreIncludes.h

@@ -57 +57 @@
 #define InternRegisterRootObject(ClassName) \
     if (orxonox::Identifier::isCreatingHierarchy() && !this->getParents()) \
-        this->setParents(new IdentifierList()); \
+        this->setParents(new orxonox::IdentifierList()); \
     InternRegisterObject(ClassName, true)
 

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

@@ -40 +40 @@
         }       
    }
+   
 }

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

@@ -4 +4 @@
 #include "BaseObject.h"
 #include "../../tinyxml/tinyxml.h"
+#include "network/Synchronisable.h"
 
 namespace orxonox
@@ -17 +18 @@
 
         private:
-            
 
     };

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

@@ -217 +217 @@
     //TODO: read config file
     //TODO: give config file to Ogre
+    
     if(argc >=2 && strcmp(argv[1], "server")==0)
     {
@@ -224 +225 @@
     {
       clientInit(path);
-    }
-    standalone(path);
+    } else if(argc >=2 && strcmp(argv[1], "presentation")==0)
+    {
+      playableServer(path);
+    } else
+      standalone(path);
   }
 
@@ -272 +276 @@
     createFrameListener();
     Factory::createClassHierarchy();
+    startRenderLoop();
+  }
+  
+  void Orxonox::playableServer(std::string path)
+  {
+    ogre_->setConfigPath(path);
+    ogre_->setup();
+    root_ = ogre_->getRoot();
+    defineResources();
+    setupRenderSystem();
+    createRenderWindow();
+    initializeResourceGroups();
+    createScene();
+    setupScene();
+    setupInputSystem();
+    Factory::createClassHierarchy();
+    createFrameListener();
+    try{
+    server_g = new network::Server(); // add port and bindadress
+    server_g->open(); // open server and create listener thread
+    if(ogre_ && ogre_->getRoot())
+      ogre_->getRoot()->addFrameListener(new network::ServerFrameListener()); // adds a framelistener for the server
+    std::cout << "network framelistener added" << std::endl;
+    } 
+    catch(exception &e)
+    {
+      std::cout << "There was a problem initialising the server :(" << std::endl;
+    }
     startRenderLoop();
   }

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

@@ -42 +42 @@
       void clientInit(std::string path);
       void standalone(std::string path);
+      void playableServer(std::string path);
       void defineResources();
       void setupRenderSystem();

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

@@ -35 +35 @@
 maxSpeedLoopRightLeft) {
         
-        std::cout << "Steering was loaded"; 
+        std::cout << "Steering was loaded" << std::endl; 
   moveForward_ = 0;
   rotateUp_ = 0;