Solve merge conflict and add properties for friction and interaction parameters.

include/openspace/util/camera.h

@@ -38,9 +38,9 @@
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/gtc/quaternion.hpp>
 
-#include <iostream>
-
 namespace openspace {
+    class SyncBuffer;
+
     /**
     This class still needs some more love. Suggested improvements:
     - Remove psc from the camera class interface.

include/openspace/util/histogram.h

@@ -71,7 +71,7 @@ public:
     float equalize (float);
     float entropy();
 
-    float highestBinValue(bool equalized);
+    float highestBinValue(bool equalized, int overBins=0);
     float binWidth();
 
     void changeRange(float minValue, float maxValue);

include/openspace/util/keys.h

@@ -68,6 +68,8 @@ enum class KeyAction : int {
     Repeat = 2
 };
 
+bool hasKeyAction(KeyAction lhs, KeyAction rhs);
+
 KeyAction operator|(KeyAction lhs, KeyAction rhs);
 KeyAction operator|=(KeyAction& lhs, KeyAction rhs);
 
@@ -79,6 +81,8 @@ enum class KeyModifier : int {
     Super = 0x0008
 };
 
+bool hasKeyModifier(KeyModifier lhs, KeyModifier rhs);
+
 KeyModifier operator|(KeyModifier lhs, KeyModifier rhs);
 KeyModifier operator|=(KeyModifier& lhs, KeyModifier rhs);
 

include/openspace/util/powerscaledscalar.h

@@ -42,9 +42,9 @@ public:
     PowerScaledScalar(float f1, float f2);
     static PowerScaledScalar CreatePSS(double d1);
 
-	const glm::vec2& vec2() const;
-	float lengthf() const;
-	double lengthd() const;
+    const glm::vec2& vec2() const;
+    float lengthf() const;
+    double lengthd() const;
 
 
     // operator overloading

include/openspace/util/syncbuffer.h

@@ -27,6 +27,7 @@
 
 #include <vector>
 #include <ghoul/opengl/ghoul_gl.h>
+
 #include <sgct.h>
 #include <stdint.h>
 

include/openspace/util/transformationmanager.h

@@ -50,6 +50,8 @@ public:
 	glm::dmat3 frameTransformationMatrix(std::string from, std::string to, double ephemerisTime) const;
 
 private:
+	glm::dmat3 kameleonTransformationMatrix(std::string from, std::string to, double ephemerisTime) const;
+
 #ifdef OPENSPACE_MODULE_KAMELEON_ENABLED
     std::shared_ptr<ccmc::Kameleon> _kameleon;
 #endif