mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-09 13:12:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

updated to_string for ghoul namespace

Browse Source
This commit is contained in:
Micah Acinapura
2019-05-04 15:42:25 +02:00
parent b9a2cbff01
commit 939210465e
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/exoplanets/discoverymethods/discoverymethods.cpp
View File

@@ -37,6 +37,9 @@
#include <openspace/util/camera.h>
#include <openspace/scene/scene.h>
#include <ghoul/glm.h>
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) + ","
"}"
"},"
"}";

12
modules/exoplanets/exoplanetsmodule_lua.inl
View File

@@ -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) + ","
"}"
"},"
"}";