General cleanup

Adapt to changes in Ghoul
Make use of TextureManager
Jenkins compile fix
This commit is contained in:
Alexander Bock
2018-07-19 14:43:53 -04:00
parent dbdc5dfd28
commit 0774348fc2
26 changed files with 142 additions and 138 deletions
+2 -2
View File
@@ -247,7 +247,7 @@ void RenderableModel::initialize() {
}
void RenderableModel::initializeGL() {
_programObject = BaseModule::ProgramObjectManager.requestProgramObject(
_programObject = BaseModule::ProgramObjectManager.request(
ProgramName,
[]() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
return OsEng.renderEngine().buildRenderProgram(
@@ -271,7 +271,7 @@ void RenderableModel::deinitializeGL() {
}
_texture = nullptr;
BaseModule::ProgramObjectManager.releaseProgramObject(
BaseModule::ProgramObjectManager.release(
ProgramName,
[](ghoul::opengl::ProgramObject* p) {
OsEng.renderEngine().removeRenderProgram(p);