mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 19:29:04 -05: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
modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+4 -7
View File
@@ -25,17 +25,15 @@
#include <modules/spacecraftinstruments/rendering/renderablemodelprojection.h>
#include <modules/base/rendering/modelgeometry.h>
#include <openspace/documentation/documentation.h>
#include <openspace/documentation/verifier.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/globals.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/scene/scenegraphnode.h>
#include <openspace/scene/scene.h>
#include <openspace/util/spicemanager.h>
#include <openspace/util/time.h>
#include <openspace/util/updatestructures.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/io/texture/texturereader.h>
#include <ghoul/logging/logmanager.h>
@@ -182,8 +180,7 @@ bool RenderableModelProjection::isReady() const {
}
void RenderableModelProjection::initializeGL() {
RenderEngine& renderEngine = OsEng.renderEngine();
_programObject = renderEngine.buildRenderProgram(
_programObject = global::renderEngine.buildRenderProgram(
"ModelShader",
absPath("${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderableModel_vs.glsl"),
absPath("${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderableModel_fs.glsl")
@@ -241,7 +238,7 @@ void RenderableModelProjection::deinitializeGL() {
_projectionComponent.deinitialize();
OsEng.renderEngine().removeRenderProgram(_programObject.get());
global::renderEngine.removeRenderProgram(_programObject.get());
_programObject = nullptr;
}
@@ -377,7 +374,7 @@ void RenderableModelProjection::update(const UpdateData& data) {
// @TODO: Change this to remove PSC
glm::dvec3 p =
OsEng.renderEngine().scene()->sceneGraphNode("Sun")->worldPosition() -
global::renderEngine.scene()->sceneGraphNode("Sun")->worldPosition() -
data.modelTransform.translation;
_sunPosition =