mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Enable both strings and numbers to lua ra dec conversion function

Browse Source
This commit is contained in:
Malin Ejdbo
2021-06-28 12:05:21 +02:00
parent cd7bd0fc4b
commit d5a12f813e
3 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/space/spacemodule_lua.inl
View File

@@ -32,16 +32,32 @@
namespace openspace::space::luascriptfunctions {
int convertFromRaDec(lua_State* L) {
ghoul::lua::checkArgumentsAndThrow(L, 3, "lua::convertFromRaDec");
ghoul::lua::checkArgumentsAndThrow(L, { 3, 4 }, "lua::convertFromRaDec");
glm::dvec2 degrees = glm::dvec2(0.0);
bool isDegrees = true;
if (lua_type(L, 1) == LUA_TSTRING && lua_type(L, 2) == LUA_TSTRING) {
std::string s_ra = ghoul::lua::value<std::string>(L, 1);
std::string s_dec = ghoul::lua::value<std::string>(L, 2);
degrees = icrsToDecimalDegrees(s_ra, s_dec);
}
else if (lua_type(L, 1) == LUA_TNUMBER && lua_type(L, 2) == LUA_TNUMBER) {
degrees.x = ghoul::lua::value<double>(L, 1);
degrees.y = ghoul::lua::value<double>(L, 2);
if (lua_gettop(L) >= 4) {
isDegrees = ghoul::lua::value<bool>(L, 4);
}
}
else {
throw ghoul::lua::LuaRuntimeException("lua::convertFromRaDec: Ra and Dec have to "
"be of the same type, either String or Number"
);
}
std::string ra = ghoul::lua::value<std::string>(L, 1);
std::string dec = ghoul::lua::value<std::string>(L, 2);
double distance = ghoul::lua::value<double>(L, 3);
lua_settop(L, 0);
glm::dvec2 degrees = icrsToDecimalDegrees(ra, dec);
glm::dvec3 pos = icrsToGalacticCartesian(degrees.x, degrees.y, distance);
glm::dvec3 pos = icrsToGalacticCartesian(degrees.x, degrees.y, distance, isDegrees);
ghoul::lua::push(L, pos);
ghoul_assert(lua_gettop(L) == 1, "Incorrect number of items left on stack");
@@ -57,7 +73,8 @@ int convertToRaDec(lua_State* L) {
lua_settop(L, 0);
glm::dvec3 degrees = galacticCartesianToIcrs(x, y, z);
std::pair<std::string, std::string> raDecPair = decimalDegreesToIcrs(degrees.x, degrees.y);
std::pair<std::string, std::string> raDecPair
= decimalDegreesToIcrs(degrees.x, degrees.y);
ghoul::lua::push(L, raDecPair.first); // Ra
ghoul::lua::push(L, raDecPair.second); // Dec