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

include/openspace/engine/openspaceengine.h

@@ -59,7 +59,8 @@ public:
 
     static bool isInitialized();
     bool initialize();
-
+	bool isMaster();
+	void setMaster(bool master);
     static bool findConfiguration(std::string& filename);
 
     // Guaranteed to return a valid pointer
@@ -110,6 +111,7 @@ private:
 	LuaConsole* _console;
     gui::GUI* _gui;
 	double _dt;
+	bool _isMaster;
 
 	SyncBuffer* _syncBuffer;
 };

include/openspace/gui/guipropertycomponent.h

@@ -86,9 +86,9 @@ protected:
     std::set<properties::Property*> _vec3Properties;
     std::set<properties::Property*> _vec4Properties;
     std::set<properties::Property*> _stringProperties;
-    std::set<properties::Property*> _optionProperty;
-    std::set<properties::Property*> _selectionProperty;
-    std::set<properties::Property*> _triggerProperty;
+    std::set<properties::Property*> _optionProperties;
+    std::set<properties::Property*> _selectionProperties;
+    std::set<properties::Property*> _triggerProperties;
     std::map<std::string, std::vector<properties::Property*>> _propertiesByOwner;
 
 	//std::vector<Property> _properties;

include/openspace/rendering/renderengine.h

@@ -73,6 +73,9 @@ public:
 
 	void serialize(SyncBuffer* syncBuffer);
 	void deserialize(SyncBuffer* syncBuffer);
+
+	float globalOpacity();
+	void setGlobalOpacity(float opacity);
 	
 	/**
 	 * Returns the Lua library that contains all Lua functions available to affect the
@@ -84,6 +87,12 @@ public:
 	 */
 	static scripting::ScriptEngine::LuaLibrary luaLibrary();
 
+    // This is a temporary method to change the origin of the coordinate system ---abock
+    void changeViewPoint(std::string origin);
+
+	//temporaray fade functionality
+	void startFading(int direction, float fadeDuration);
+
 private:
 	void storePerformanceMeasurements();
 
@@ -101,6 +110,11 @@ private:
 
 	void generateGlslConfig();
 
+	float _globalOpactity;
+	float _fadeDuration;
+	float _currentFadeTime;
+	int _fadeDirection;
+
 	bool _visualizeABuffer;
 	ABufferVisualizer* _visualizer;
 };

include/openspace/scenegraph/scenegraphnode.h

@@ -85,6 +85,12 @@ public:
     const Renderable* renderable() const;
     Renderable* renderable();
 
+    // @TODO Remove once the scalegraph is in effect ---abock
+    void setEphemeris(Ephemeris* eph) {
+        delete _ephemeris;
+        _ephemeris = eph;
+    }
+
 private:
     bool sphereInsideFrustum(const psc& s_pos, const PowerScaledScalar& s_rad, const Camera* camera);