mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-12 00:08:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Separate Renderable::initialize into initialize and initializeGL functions

Browse Source 
Handle initialize in a separate thread and display rudimentary loading screen
This commit is contained in:
Alexander Bock
2017-11-02 14:27:35 -04:00
parent ca69408366
commit 78e3320cde
75 changed files with 260 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/base/rendering/renderablemodel.cpp
View File

@@ -156,7 +156,7 @@ bool RenderableModel::isReady() const {
return _programObject && _texture;
}
void RenderableModel::initialize() {
void RenderableModel::initializeGL() {
_programObject = OsEng.renderEngine().buildRenderProgram(
"ModelProgram",
"${MODULE_BASE}/shaders/model_vs.glsl",
@@ -168,7 +168,7 @@ void RenderableModel::initialize() {
_geometry->initialize(this);
}
void RenderableModel::deinitialize() {
void RenderableModel::deinitializeGL() {
if (_geometry) {
_geometry->deinitialize();
_geometry = nullptr;