mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-02 08:49:20 -05:00
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:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user