Revive screen space browser and add example (#932)

* Revive screen space browser and add example
* Add reload triggerproperty and change autoplay policy
This commit is contained in:
Emil Axelsson
2019-07-16 13:29:21 +02:00
committed by Alexander Bock
parent f43bcadee3
commit 6d725a7d50
14 changed files with 85 additions and 23 deletions
+7 -1
View File
@@ -48,7 +48,13 @@ int addDashboardItem(lua_State* L) {
}
lua_settop(L, 0);
global::dashboard.addDashboardItem(DashboardItem::createFromDictionary(d));
try {
global::dashboard.addDashboardItem(DashboardItem::createFromDictionary(d));
}
catch (const ghoul::RuntimeError& e) {
LERRORC("addDashboardItem", e.what());
return ghoul::lua::luaError(L, "Error adding dashboard item");
}
ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
return 0;
+2 -3
View File
@@ -614,9 +614,8 @@ void ScreenSpaceRenderable::draw(glm::mat4 modelTransform) {
unbindTexture();
}
void ScreenSpaceRenderable::bindTexture() {}
void ScreenSpaceRenderable::unbindTexture() {}
void ScreenSpaceRenderable::unbindTexture() {
}
} // namespace openspace