Merge branch 'develop' into solarsystem2

Conflicts:
	scripts/default_startup.lua
	src/rendering/renderablewavefrontobject.cpp

include/openspace/rendering/renderablewavefrontobject.h

@@ -78,8 +78,8 @@ private:
 	GLenum _mode;
 	unsigned int _isize;
 	unsigned int _vsize;
-	Vertex *_varray;
-	int *_iarray;
+	Vertex* _varray;
+	int* _iarray;
 
 	glm::dmat3 _stateMatrix; // might need this
 

include/openspace/rendering/renderengine.h

@@ -25,18 +25,19 @@
 #ifndef __RENDERENGINE_H__
 #define __RENDERENGINE_H__
 
-#include <openspace/scenegraph/scenegraph.h>
-
 #include <openspace/scripting/scriptengine.h>
 
 #include <memory>
 #include <string>
 
-#include <openspace/abuffer/abuffer.h>
-
 namespace openspace {
 
+// Forward declare to minimize dependencies
 class Camera;
+class SyncBuffer;
+class SceneGraph;
+class ABuffer;
+class ScreenLog;
 
 class RenderEngine {
 public:
@@ -57,13 +58,15 @@ public:
     void render();
     void postDraw();
 
-	void serialize(std::vector<char>& dataStream, size_t& offset);
-	void deserialize(const std::vector<char>& dataStream, size_t& offset);
+	void takeScreenshot();
+
+	void serialize(SyncBuffer* syncBuffer);
+	void deserialize(SyncBuffer* syncBuffer);
 	
 	/**
 	 * Returns the Lua library that contains all Lua functions available to affect the
 	 * rendering. The functions contained are
-	 * - openspace::luascriptfunctions::printScreen
+	 * - openspace::luascriptfunctions::printImage
 	 * \return The Lua library that contains all Lua functions available to affect the
 	 * rendering
 	 */
@@ -74,6 +77,11 @@ private:
 	Camera* _mainCamera;
 	SceneGraph* _sceneGraph;
 	ABuffer* _abuffer;
+	ScreenLog* _log;
+
+	bool _showInfo;
+	bool _showScreenLog;
+	bool _takeScreenshot;
 
 	void generateGlslConfig();
 };