mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-05 10:59:47 -05: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
modules/space/rendering/renderablestars.cpp
+5 -11
View File
@@ -288,25 +288,20 @@ bool RenderableStars::isReady() const {
return (_program != nullptr) && (!_fullData.empty());
}
bool RenderableStars::initialize() {
bool completeSuccess = true;
void RenderableStars::initialize() {
RenderEngine& renderEngine = OsEng.renderEngine();
_program = renderEngine.buildRenderProgram("Star",
"${MODULE_SPACE}/shaders/star_vs.glsl",
"${MODULE_SPACE}/shaders/star_fs.glsl",
"${MODULE_SPACE}/shaders/star_ge.glsl");
if (!_program) {
return false;
bool success = loadData();
if (!success) {
throw ghoul::RuntimeError("Error loading data");
}
completeSuccess &= loadData();
completeSuccess &= (_pointSpreadFunctionTexture != nullptr);
return completeSuccess;
}
bool RenderableStars::deinitialize() {
void RenderableStars::deinitialize() {
glDeleteBuffers(1, &_vbo);
_vbo = 0;
glDeleteVertexArrays(1, &_vao);
@@ -320,7 +315,6 @@ bool RenderableStars::deinitialize() {
renderEngine.removeRenderProgram(_program);
_program = nullptr;
}
return true;
}
void RenderableStars::render(const RenderData& data, RendererTasks&) {