mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-27 23:39:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove return values from initialize and deinitialize functions

Browse Source
This commit is contained in:
Alexander Bock
2017-07-28 17:51:25 -04:00
parent acd95b05ab
commit 31377466ba
66 changed files with 198 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/newhorizons/rendering/renderablefov.cpp
View File

@@ -297,7 +297,7 @@ RenderableFov::RenderableFov(const ghoul::Dictionary& dictionary)
addProperty(_colors.square);
}
bool RenderableFov::initialize() {
void RenderableFov::initialize() {
RenderEngine& renderEngine = OsEng.renderEngine();
_programObject = renderEngine.buildRenderProgram(
"FovProgram",
@@ -314,8 +314,10 @@ bool RenderableFov::initialize() {
res.shape == SpiceManager::FieldOfViewResult::Shape::Polygon ||
res.shape == SpiceManager::FieldOfViewResult::Shape::Rectangle;
if (!supportedShape) {
LWARNINGC("RenderableFov", "'" << _instrument.name << "' has unsupported shape");
return false;
throw ghoul::RuntimeError(
"'" + _instrument.name + "' has unsupported shape",
"RenderableFov"
);
}
_instrument.bounds = std::move(res.bounds);
@@ -405,11 +407,9 @@ bool RenderableFov::initialize() {
);
glBindVertexArray(0);
return true;
}
bool RenderableFov::deinitialize() {
void RenderableFov::deinitialize() {
OsEng.renderEngine().removeRenderProgram(_programObject);
_programObject = nullptr;
@@ -418,8 +418,6 @@ bool RenderableFov::deinitialize() {
glDeleteBuffers(1, &_fieldOfViewBounds.vbo);
glDeleteVertexArrays(1, &_fieldOfViewBounds.vao);
return true;
}
bool RenderableFov::isReady() const {