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

Adapt to new Ghoul change with luaError

Browse Source
This commit is contained in:
Alexander Bock
2018-06-11 16:33:32 +02:00
parent 4952f8f977
commit 8d16611e9a
16 changed files with 75 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/base/rendering/screenspacedashboard.cpp
View File

@@ -58,7 +58,7 @@ int addDashboardItemToScreenSpace(lua_State* L) {
const std::string& name = ghoul::lua::value<std::string>(L, 1);
const int type = lua_type(L, 2);
if (type != LUA_TTABLE) {
return luaL_error(L, "Expected argument of type 'table'"); // NOLINT
return ghoul::lua::luaError(L, "Expected argument of type 'table'");
}
ghoul::Dictionary d;
@@ -73,13 +73,15 @@ int addDashboardItemToScreenSpace(lua_State* L) {
ScreenSpaceRenderable* ssr = OsEng.renderEngine().screenSpaceRenderable(name);
if (!ssr) {
return luaL_error(L, "Provided name is not a ScreenSpace item"); // NOLINT
return ghoul::lua::luaError(L, "Provided name is not a ScreenSpace item");
}
ScreenSpaceDashboard* dash = dynamic_cast<ScreenSpaceDashboard*>(ssr);
if (!dash) {
// NOLINTNEXTLINE
return luaL_error(L, "Provided name is a ScreenSpace item but not a dashboard");
return ghoul::lua::luaError(
L,
"Provided name is a ScreenSpace item but not a dashboard"
);
}
dash->dashboard().addDashboardItem(DashboardItem::createFromDictionary(d));
@@ -99,13 +101,15 @@ int removeDashboardItemsFromScreenSpace(lua_State* L) {
ScreenSpaceRenderable* ssr = OsEng.renderEngine().screenSpaceRenderable(name);
if (!ssr) {
return luaL_error(L, "Provided name is not a ScreenSpace item"); // NOLINT
return ghoul::lua::luaError(L, "Provided name is not a ScreenSpace item");
}
ScreenSpaceDashboard* dash = dynamic_cast<ScreenSpaceDashboard*>(ssr);
if (!dash) {
// NOLINTNEXTLINE
return luaL_error(L, "Provided name is a ScreenSpace item but not a dashboard");
return ghoul::lua::luaError(
L,
"Provided name is a ScreenSpace item but not a dashboard"
);
}
dash->dashboard().clearDashboardItems();