mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-01 16:29:43 -05:00
Feature/globals (#690)
* Move global objects out of OpenSpaceEngine * General cleanup of main.cpp * Add default_joystick asset to all scenes * No longer suppress mouse interaction on slave nodes * Window delegate uses function pointers rather than subclassing * Fix for false overwriting of ImGUI configuration file * Change default color and tilt angle of fisheye rendering * Restructured performance manager * Simplify screenshot handling
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
|
||||
#include <modules/iswa/rendering/textureplane.h>
|
||||
|
||||
#include <openspace/engine/openspaceengine.h>
|
||||
#include <openspace/engine/globals.h>
|
||||
#include <openspace/rendering/renderengine.h>
|
||||
#include <ghoul/filesystem/filesystem.h>
|
||||
#include <ghoul/opengl/texture.h>
|
||||
@@ -39,7 +39,7 @@ TexturePlane::TexturePlane(const ghoul::Dictionary& dictionary)
|
||||
|
||||
void TexturePlane::initializeGL() {
|
||||
if (!_shader) {
|
||||
_shader = OsEng.renderEngine().buildRenderProgram(
|
||||
_shader = global::renderEngine.buildRenderProgram(
|
||||
"PlaneProgram",
|
||||
absPath("${MODULE_ISWA}/shaders/textureplane_vs.glsl"),
|
||||
absPath("${MODULE_ISWA}/shaders/textureplane_fs.glsl")
|
||||
|
||||
Reference in New Issue
Block a user