diff --git a/ext/ghoul b/ext/ghoul index df7b448dd5..da6c15e7f9 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit df7b448dd574ff1afd0f96fae47687cab87858bf +Subproject commit da6c15e7f944be2741d521270f35539440f5e5ec diff --git a/include/openspace/util/powerscaledcoordinate.h b/include/openspace/util/powerscaledcoordinate.h index 7ab7719bdd..19c2dd1b8d 100644 --- a/include/openspace/util/powerscaledcoordinate.h +++ b/include/openspace/util/powerscaledcoordinate.h @@ -72,8 +72,8 @@ public: PowerScaledCoordinate operator-(const PowerScaledCoordinate& rhs) const; float& operator[](unsigned int idx); float operator[](unsigned int idx) const; - const double dot(const PowerScaledCoordinate& rhs) const; - const double angle(const PowerScaledCoordinate& rhs) const; + double dot(const PowerScaledCoordinate& rhs) const; + double angle(const PowerScaledCoordinate& rhs) const; // scalar operators PowerScaledCoordinate operator*(const double& rhs) const; diff --git a/include/openspace/util/powerscaledscalar.h b/include/openspace/util/powerscaledscalar.h index de6803bbaf..60810d922a 100644 --- a/include/openspace/util/powerscaledscalar.h +++ b/include/openspace/util/powerscaledscalar.h @@ -32,15 +32,10 @@ #include -namespace openspace -{ - -// forward declare the power scaled coordinates -//class psc; +namespace openspace { class pss { public: - // constructors pss(); pss(const glm::vec2 &v); diff --git a/src/util/powerscaledcoordinate.cpp b/src/util/powerscaledcoordinate.cpp index c51ea3e80b..9c674b4da2 100644 --- a/src/util/powerscaledcoordinate.cpp +++ b/src/util/powerscaledcoordinate.cpp @@ -238,7 +238,7 @@ float PowerScaledCoordinate::operator[](unsigned int idx) const return _vec[idx]; } -const double PowerScaledCoordinate::dot(const PowerScaledCoordinate& rhs) const +double PowerScaledCoordinate::dot(const PowerScaledCoordinate& rhs) const { double ds = _vec[3] - rhs._vec[3]; if (ds >= 0) { @@ -255,7 +255,7 @@ const double PowerScaledCoordinate::dot(const PowerScaledCoordinate& rhs) const } } -const double PowerScaledCoordinate::angle(const PowerScaledCoordinate& rhs) const +double PowerScaledCoordinate::angle(const PowerScaledCoordinate& rhs) const { glm::dvec3 uPowerScaledCoordinatealed(rhs._vec[0], rhs._vec[1], rhs._vec[2]); glm::dvec3 shortened(_vec[0], _vec[1], _vec[2]);