mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 18:51:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature/globals (#690)

Browse Source 
* 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:
Alexander Bock
2018-08-30 11:38:47 -04:00
committed by GitHub
parent c287c03fe8
commit 9f1c4e847d
177 changed files with 3103 additions and 3952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/debugging/rendering/debugrenderer.cpp
View File

@@ -24,7 +24,7 @@
#include <modules/debugging/rendering/debugrenderer.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/globals.h>
#include <openspace/rendering/renderengine.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/logging/logmanager.h>
@@ -42,7 +42,7 @@ namespace openspace {
DebugRenderer* DebugRenderer::_reference = nullptr;
DebugRenderer::DebugRenderer() {
_programObject = OsEng.renderEngine().buildRenderProgram(
_programObject = global::renderEngine.buildRenderProgram(
"BasicDebugShader",
absPath("${MODULE_DEBUGGING}/rendering/debugshader_vs.glsl"),
absPath("${MODULE_DEBUGGING}/rendering/debugshader_fs.glsl")