From 939210465ec30cd576cd080dde49aacba7502e5b Mon Sep 17 00:00:00 2001 From: Micah Acinapura Date: Sat, 4 May 2019 15:42:25 +0200 Subject: [PATCH] updated to_string for ghoul namespace --- .../exoplanets/discoverymethods/discoverymethods.cpp | 9 ++++++--- modules/exoplanets/exoplanetsmodule_lua.inl | 12 ++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/modules/exoplanets/discoverymethods/discoverymethods.cpp b/modules/exoplanets/discoverymethods/discoverymethods.cpp index dc94b983e2..bb59cbb367 100644 --- a/modules/exoplanets/discoverymethods/discoverymethods.cpp +++ b/modules/exoplanets/discoverymethods/discoverymethods.cpp @@ -37,6 +37,9 @@ #include #include +#include + + namespace { constexpr const char* _loggerCat = "DiscoveryMethods"; @@ -87,7 +90,7 @@ namespace openspace::exoplanets{ "Transform = {" "Translation = {" "Type = 'StaticTranslation'," - "Position = " + std::to_string(viewDirecionPos) + "," + "Position = " + ghoul::to_string(viewDirecionPos) + "," "}," "}," "}"; @@ -120,7 +123,7 @@ namespace openspace::exoplanets{ "Transform = {" "Translation = {" "Type = 'StaticTranslation'," - "Position = " + std::to_string(northDirectionPos) + "," + "Position = " + ghoul::to_string(northDirectionPos) + "," "}," "}," "}"; @@ -521,7 +524,7 @@ namespace openspace::exoplanets{ "Transform = {" "Rotation = {" "Type = 'StaticRotation'," - "Rotation = " + std::to_string(rotation) + "," + "Rotation = " + ghoul::to_string(rotation) + "," "}" "}," "}"; diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl index 07957189b4..e2e81fb21e 100644 --- a/modules/exoplanets/exoplanetsmodule_lua.inl +++ b/modules/exoplanets/exoplanetsmodule_lua.inl @@ -408,7 +408,7 @@ int addExoplanetSystem(lua_State* L) { glm::dvec3 beta = normalize(cross(starToSunVec, northProjected)); - glm::dmat3 exoplanetSystemRot = glm::dmat3(northProjected.x, northProjected.y, northProjected.z, + const glm::dmat3 exoplanetSystemRot = glm::dmat3(northProjected.x, northProjected.y, northProjected.z, beta.x, beta.y, beta.z, starToSunVec.x, starToSunVec.y, starToSunVec.z); @@ -421,11 +421,11 @@ int addExoplanetSystem(lua_State* L) { "Transform = {" "Rotation = {" "Type = 'StaticRotation'," - "Rotation = " + std::to_string(exoplanetSystemRot) + "," + "Rotation = " + ghoul::to_string(exoplanetSystemRot) + "," "}," "Translation = {" "Type = 'StaticTranslation'," - "Position = " + std::to_string(position) + "," + "Position = " + ghoul::to_string(position) + "," "}," "}" "}"; @@ -683,7 +683,7 @@ int addExoplanetSystem(lua_State* L) { "Transform = {" "Rotation = {" "Type = 'StaticRotation'," - "Rotation = " + std::to_string(rot) + "," + "Rotation = " + ghoul::to_string(rot) + "," "}" "}," "}"; @@ -715,7 +715,7 @@ int addExoplanetSystem(lua_State* L) { "Transform = {" "Rotation = {" "Type = 'StaticRotation'," - "Rotation = " + std::to_string(rot) + "," + "Rotation = " + ghoul::to_string(rot) + "," "}" "}," "}"; @@ -746,7 +746,7 @@ int addExoplanetSystem(lua_State* L) { "Transform = {" "Rotation = {" "Type = 'StaticRotation'," - "Rotation = " + std::to_string(rot) + "," + "Rotation = " + ghoul::to_string(rot) + "," "}" "}," "}";