Force all Renderables to declare an 'isReady' function to circumvent assertion triggers when a crucial element of initialization fails

Fix velocity in RenderableStars
This commit is contained in:
Alexander Bock
2014-11-28 01:41:26 +01:00
parent 2c3723a778
commit 4de8071efe
27 changed files with 89 additions and 35 deletions
+7 -5
View File
@@ -82,11 +82,9 @@ RenderablePlanet::RenderablePlanet(const ghoul::Dictionary& dictionary)
_colorTexturePath.onChange(std::bind(&RenderablePlanet::loadTexture, this));
}
RenderablePlanet::~RenderablePlanet(){
deinitialize();
}
RenderablePlanet::~RenderablePlanet() {}
bool RenderablePlanet::initialize(){
bool RenderablePlanet::initialize() {
bool completeSuccess = true;
if (_programObject == nullptr)
completeSuccess
@@ -99,7 +97,7 @@ bool RenderablePlanet::initialize(){
return completeSuccess;
}
bool RenderablePlanet::deinitialize(){
bool RenderablePlanet::deinitialize() {
_geometry->deinitialize();
delete _geometry;
_geometry = nullptr;
@@ -108,6 +106,10 @@ bool RenderablePlanet::deinitialize(){
return true;
}
bool RenderablePlanet::isReady() const {
return (_geometry != nullptr);
}
void RenderablePlanet::render(const RenderData& data)
{
if (!_programObject) return;