mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 04:30:09 -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/base/rendering/renderablemodel.cpp
+3 -8
View File
@@ -156,7 +156,7 @@ bool RenderableModel::isReady() const {
return _programObject && _texture;
}
bool RenderableModel::initialize() {
void RenderableModel::initialize() {
_programObject = OsEng.renderEngine().buildRenderProgram(
"ModelProgram",
"${MODULE_BASE}/shaders/model_vs.glsl",
@@ -165,13 +165,10 @@ bool RenderableModel::initialize() {
loadTexture();
bool completeSuccess = true;
completeSuccess &= (_texture != nullptr);
completeSuccess &= _geometry->initialize(this);
return completeSuccess;
_geometry->initialize(this);
}
bool RenderableModel::deinitialize() {
void RenderableModel::deinitialize() {
if (_geometry) {
_geometry->deinitialize();
_geometry = nullptr;
@@ -182,8 +179,6 @@ bool RenderableModel::deinitialize() {
OsEng.renderEngine().removeRenderProgram(_programObject);
_programObject = nullptr;
}
return true;
}
void RenderableModel::render(const RenderData& data, RendererTasks&) {
modules/base/rendering/renderablemodel.h
+2 -2
View File
@@ -51,8 +51,8 @@ class RenderableModel : public Renderable {
public:
RenderableModel(const ghoul::Dictionary& dictionary);
bool initialize() override;
bool deinitialize() override;
void initialize() override;
void deinitialize() override;
bool isReady() const override;
modules/base/rendering/renderableplane.cpp
+2 -6
View File
@@ -179,7 +179,7 @@ bool RenderablePlane::isReady() const {
return _shader && _texture;
}
bool RenderablePlane::initialize() {
void RenderablePlane::initialize() {
glGenVertexArrays(1, &_quad); // generate array
glGenBuffers(1, &_vertexPositionBuffer); // generate buffer
createPlane();
@@ -190,11 +190,9 @@ bool RenderablePlane::initialize() {
);
loadTexture();
return isReady();
}
bool RenderablePlane::deinitialize() {
void RenderablePlane::deinitialize() {
glDeleteVertexArrays(1, &_quad);
_quad = 0;
@@ -208,8 +206,6 @@ bool RenderablePlane::deinitialize() {
renderEngine.removeRenderProgram(_shader);
_shader = nullptr;
}
return true;
}
void RenderablePlane::render(const RenderData& data, RendererTasks&) {
modules/base/rendering/renderableplane.h
+2 -2
View File
@@ -54,8 +54,8 @@ class RenderablePlane : public Renderable {
public:
RenderablePlane(const ghoul::Dictionary& dictionary);
bool initialize() override;
bool deinitialize() override;
void initialize() override;
void deinitialize() override;
bool isReady() const override;
modules/base/rendering/renderablesphere.cpp
+2 -6
View File
@@ -202,7 +202,7 @@ bool RenderableSphere::isReady() const {
return _shader && _texture;
}
bool RenderableSphere::initialize() {
void RenderableSphere::initialize() {
_sphere = std::make_unique<PowerScaledSphere>(
PowerScaledScalar::CreatePSS(_size), _segments
);
@@ -214,19 +214,15 @@ bool RenderableSphere::initialize() {
"${MODULE_BASE}/shaders/sphere_fs.glsl");
loadTexture();
return isReady();
}
bool RenderableSphere::deinitialize() {
void RenderableSphere::deinitialize() {
_texture = nullptr;
if (_shader) {
OsEng.renderEngine().removeRenderProgram(_shader);
_shader = nullptr;
}
return true;
}
void RenderableSphere::render(const RenderData& data, RendererTasks&) {
modules/base/rendering/renderablesphere.h
+2 -2
View File
@@ -49,8 +49,8 @@ class RenderableSphere : public Renderable {
public:
RenderableSphere(const ghoul::Dictionary& dictionary);
bool initialize() override;
bool deinitialize() override;
void initialize() override;
void deinitialize() override;
bool isReady() const override;
modules/base/rendering/renderablesphericalgrid.cpp
+2 -6
View File
@@ -179,7 +179,7 @@ bool RenderableSphericalGrid::isReady() const {
return ready;
}
bool RenderableSphericalGrid::deinitialize() {
void RenderableSphericalGrid::deinitialize() {
glDeleteVertexArrays(1,&_vaoID);
_vaoID = 0;
@@ -188,11 +188,9 @@ bool RenderableSphericalGrid::deinitialize() {
glDeleteBuffers(1,&_iBufferID);
_iBufferID = 0;
return true;
}
bool RenderableSphericalGrid::initialize() {
void RenderableSphericalGrid::initialize() {
_gridProgram = OsEng.renderEngine().buildRenderProgram(
"GridProgram",
"${MODULE_BASE}/shaders/grid_vs.glsl",
@@ -208,8 +206,6 @@ bool RenderableSphericalGrid::initialize() {
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _iBufferID);
glEnableVertexAttribArray(0);
glBindVertexArray(0);
return true;
}
void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&){
modules/base/rendering/renderablesphericalgrid.h
+2 -2
View File
@@ -48,8 +48,8 @@ public:
RenderableSphericalGrid(const ghoul::Dictionary& dictionary);
~RenderableSphericalGrid();
bool initialize() override;
bool deinitialize() override;
void initialize() override;
void deinitialize() override;
bool isReady() const override;
modules/base/rendering/renderabletrail.cpp
+2 -5
View File
@@ -217,7 +217,7 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
addProperty(_renderingModes);
}
bool RenderableTrail::initialize() {
void RenderableTrail::initialize() {
RenderEngine& renderEngine = OsEng.renderEngine();
_programObject = renderEngine.buildRenderProgram(
"EphemerisProgram",
@@ -226,17 +226,14 @@ bool RenderableTrail::initialize() {
);
setRenderBin(Renderable::RenderBin::Overlay);
return true;
}
bool RenderableTrail::deinitialize() {
void RenderableTrail::deinitialize() {
RenderEngine& renderEngine = OsEng.renderEngine();
if (_programObject) {
renderEngine.removeRenderProgram(_programObject);
_programObject = nullptr;
}
return true;
}
bool RenderableTrail::isReady() const {
modules/base/rendering/renderabletrail.h
+2 -2
View File
@@ -73,8 +73,8 @@ class RenderableTrail : public Renderable {
public:
~RenderableTrail() = default;
bool initialize() override;
bool deinitialize() override;
void initialize() override;
void deinitialize() override;
bool isReady() const override;
modules/base/rendering/renderabletrailorbit.cpp
+4 -6
View File
@@ -169,22 +169,20 @@ RenderableTrailOrbit::RenderableTrailOrbit(const ghoul::Dictionary& dictionary)
_primaryRenderInformation.sorting = RenderInformation::VertexSorting::NewestFirst;
}
bool RenderableTrailOrbit::initialize() {
bool res = RenderableTrail::initialize();
void RenderableTrailOrbit::initialize() {
RenderableTrail::initialize();
glGenVertexArrays(1, &_primaryRenderInformation._vaoID);
glGenBuffers(1, &_primaryRenderInformation._vBufferID);
glGenBuffers(1, &_primaryRenderInformation._iBufferID);
return res;
}
bool RenderableTrailOrbit::deinitialize() {
void RenderableTrailOrbit::deinitialize() {
glDeleteVertexArrays(1, &_primaryRenderInformation._vaoID);
glDeleteBuffers(1, &_primaryRenderInformation._vBufferID);
glDeleteBuffers(1, &_primaryRenderInformation._iBufferID);
return RenderableTrail::deinitialize();
RenderableTrail::deinitialize();
}
void RenderableTrailOrbit::update(const UpdateData& data) {
modules/base/rendering/renderabletrailorbit.h
+2 -2
View File
@@ -48,8 +48,8 @@ class RenderableTrailOrbit : public RenderableTrail {
public:
explicit RenderableTrailOrbit(const ghoul::Dictionary& dictionary);
bool initialize() override;
bool deinitialize() override;
void initialize() override;
void deinitialize() override;
void update(const UpdateData& data) override;
modules/base/rendering/renderabletrailtrajectory.cpp
+4 -6
View File
@@ -189,8 +189,8 @@ RenderableTrailTrajectory::RenderableTrailTrajectory(const ghoul::Dictionary& di
_primaryRenderInformation.sorting = RenderInformation::VertexSorting::OldestFirst;
}
bool RenderableTrailTrajectory::initialize() {
bool res = RenderableTrail::initialize();
void RenderableTrailTrajectory::initialize() {
RenderableTrail::initialize();
// We don't need an index buffer, so we keep it at the default value of 0
glGenVertexArrays(1, &_primaryRenderInformation._vaoID);
@@ -201,18 +201,16 @@ bool RenderableTrailTrajectory::initialize() {
glGenVertexArrays(1, &_floatingRenderInformation._vaoID);
glGenBuffers(1, &_floatingRenderInformation._vBufferID);
_floatingRenderInformation.sorting = RenderInformation::VertexSorting::OldestFirst;
return res;
}
bool RenderableTrailTrajectory::deinitialize() {
void RenderableTrailTrajectory::deinitialize() {
glDeleteVertexArrays(1, &_primaryRenderInformation._vaoID);
glDeleteBuffers(1, &_primaryRenderInformation._vBufferID);
glDeleteVertexArrays(1, &_floatingRenderInformation._vaoID);
glDeleteBuffers(1, &_floatingRenderInformation._vBufferID);
return RenderableTrail::deinitialize();
RenderableTrail::deinitialize();
}
void RenderableTrailTrajectory::update(const UpdateData& data) {
modules/base/rendering/renderabletrailtrajectory.h
+2 -2
View File
@@ -53,8 +53,8 @@ class RenderableTrailTrajectory : public RenderableTrail {
public:
explicit RenderableTrailTrajectory(const ghoul::Dictionary& dictionary);
bool initialize() override;
bool deinitialize() override;
void initialize() override;
void deinitialize() override;
void update(const UpdateData& data) override;