Merge branch 'timeadjustments' of openspace.itn.liu.se:/openspace into timeadjustments

include/openspace/engine/openspaceengine.h

@@ -40,6 +40,7 @@ namespace openspace {
 
 class ConfigurationManager;
 class LuaConsole;
+class NetworkEngine;
 class GUI;
 class RenderEngine;
 class SyncBuffer;
@@ -111,6 +112,7 @@ private:
     interaction::InteractionHandler* _interactionHandler;
     RenderEngine* _renderEngine;
 	scripting::ScriptEngine* _scriptEngine;
+    NetworkEngine* _networkEngine;
 	ghoul::cmdparser::CommandlineParser* _commandlineParser;
 	LuaConsole* _console;
     gui::GUI* _gui;

include/openspace/network/networkengine.h

@@ -0,0 +1,43 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2015                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __NETWORKENGINE_H__
+#define __NETWORKENGINE_H__
+
+#include <string>
+
+namespace openspace {
+
+class NetworkEngine {
+public:
+    NetworkEngine() = default;
+
+    bool handleMessage(const std::string& message);
+
+    void sendStatusMessage();
+};
+
+} // namespace openspace
+
+#endif // __NETWORKENGINE_H__

include/openspace/util/time.h

@@ -51,7 +51,7 @@ namespace openspace {
  * equal to the frame time.
  */
 
-	class SyncBuffer;
+class SyncBuffer;
 
 class Time {
 public: