Changeset 1497 for code/branches

Timestamp:

Jun 1, 2008, 11:32:56 AM (16 years ago)

Author:

rgrieder

Message:

• forgot to remove the hack part in GraphicsEngine.h
• removed presentation folder. If anyone needs it again, the svn history will help you kindly.

Location:

code/branches/network

Files:

• presentation (deleted)
• src/core/InputManager.cc (modified) (1 diff)
• src/network/ConnectionManager.cc (modified) (1 diff)
• src/orxonox/GraphicsEngine.h (modified) (1 diff)

code/branches/network/src/core/InputManager.cc

@@ -139 +139 @@
       if (mouse_)
       {
-        //// hack the mouse position
-        //((OIS::MouseState&)mouse_->getMouseState()).X.abs = windowWidth/2;
-        //((OIS::MouseState&)mouse_->getMouseState()).Y.abs = windowHeight/2;
         setWindowExtents(windowWidth, windowHeight);
       }

code/branches/network/src/network/ConnectionManager.cc

@@ -354 +354 @@
     syncClassid(temp->getID());
     COUT(4) << "creating spaceship for clientid: " << temp->getID() << std::endl;
-    // TODO: this is only a hack, untill we have a possibility to define default player-join actions
+    // TODO: this is only a hack, until we have a possibility to define default player-join actions
     if(!createShip(temp))
       COUT(2) << "Con.Man. could not create ship for clientid: " << clientID << std::endl;

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

@@ -85 +85 @@
 
             //HACK!!!
-            void static CompositorBloomOn();
-            void static CompositorBloomOff();
-            void static CompositorMotionBlurOn();
-            void static CompositorMotionBlurOff();
+            //void static CompositorBloomOn();
+            //void static CompositorBloomOff();
+            //void static CompositorMotionBlurOn();
+            //void static CompositorMotionBlurOff();