mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-26 14:08:53 -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:
@@ -76,8 +76,7 @@ public:
|
||||
void postRaycast(const RaycasterTask& raycasterTask);
|
||||
|
||||
void update() override;
|
||||
void render(Scene* scene, Camera* camera, float blackoutFactor,
|
||||
bool doPerformanceMeasurements) override;
|
||||
void render(Scene* scene, Camera* camera, float blackoutFactor) override;
|
||||
|
||||
/**
|
||||
* Update render data
|
||||
|
||||
@@ -41,6 +41,7 @@ class DashboardItem;
|
||||
class Dashboard : public properties::PropertyOwner {
|
||||
public:
|
||||
Dashboard();
|
||||
~Dashboard();
|
||||
|
||||
void render(glm::vec2& penPosition);
|
||||
|
||||
|
||||
@@ -92,8 +92,7 @@ public:
|
||||
void update() override;
|
||||
void performRaycasterTasks(const std::vector<RaycasterTask>& tasks);
|
||||
void performDeferredTasks(const std::vector<DeferredcasterTask>& tasks);
|
||||
void render(Scene* scene, Camera* camera, float blackoutFactor,
|
||||
bool doPerformanceMeasurements) override;
|
||||
void render(Scene* scene, Camera* camera, float blackoutFactor) override;
|
||||
|
||||
/**
|
||||
* Update render data
|
||||
|
||||
@@ -42,7 +42,6 @@ namespace ghoul::opengl { class ProgramObject; }
|
||||
|
||||
namespace openspace {
|
||||
|
||||
namespace performance { class PerformanceManager; }
|
||||
namespace scripting { struct LuaLibrary; }
|
||||
|
||||
class Camera;
|
||||
@@ -70,7 +69,6 @@ public:
|
||||
|
||||
void initialize();
|
||||
void initializeGL();
|
||||
void deinitialize();
|
||||
void deinitializeGL();
|
||||
|
||||
void setScene(Scene* scene);
|
||||
@@ -79,9 +77,6 @@ public:
|
||||
|
||||
const Renderer& renderer() const;
|
||||
RendererImplementation rendererImplementation() const;
|
||||
RaycasterManager& raycasterManager();
|
||||
DeferredcasterManager& deferredcasterManager();
|
||||
|
||||
|
||||
void updateShaderPrograms();
|
||||
void updateFade();
|
||||
@@ -96,10 +91,6 @@ public:
|
||||
void renderEndscreen();
|
||||
void postDraw();
|
||||
|
||||
// Performance measurements
|
||||
bool doesPerformanceMeasurements() const;
|
||||
std::shared_ptr<performance::PerformanceManager> performanceManager();
|
||||
|
||||
float globalBlackOutFactor();
|
||||
void setGlobalBlackOutFactor(float opacity);
|
||||
|
||||
@@ -161,8 +152,6 @@ public:
|
||||
glm::ivec2 renderingResolution() const;
|
||||
glm::ivec2 fontResolution() const;
|
||||
|
||||
properties::PropertyOwner& screenSpaceOwner();
|
||||
|
||||
private:
|
||||
void setRenderer(std::unique_ptr<Renderer> renderer);
|
||||
RendererImplementation rendererFromString(const std::string& renderingMethod) const;
|
||||
@@ -173,14 +162,10 @@ private:
|
||||
void renderShutdownInformation(float timer, float fullTime);
|
||||
void renderDashboard();
|
||||
|
||||
|
||||
Camera* _camera = nullptr;
|
||||
Scene* _scene = nullptr;
|
||||
std::unique_ptr<RaycasterManager> _raycasterManager;
|
||||
std::unique_ptr<DeferredcasterManager> _deferredcasterManager;
|
||||
|
||||
properties::BoolProperty _doPerformanceMeasurements;
|
||||
std::shared_ptr<performance::PerformanceManager> _performanceManager;
|
||||
|
||||
std::unique_ptr<Renderer> _renderer;
|
||||
RendererImplementation _rendererImplementation = RendererImplementation::Invalid;
|
||||
@@ -212,8 +197,6 @@ private:
|
||||
uint64_t _frameNumber = 0;
|
||||
|
||||
std::vector<ghoul::opengl::ProgramObject*> _programs;
|
||||
properties::PropertyOwner _screenSpaceOwner;
|
||||
std::vector<std::unique_ptr<ScreenSpaceRenderable>> _screenSpaceRenderables;
|
||||
|
||||
std::shared_ptr<ghoul::fontrendering::Font> _fontBig;
|
||||
std::shared_ptr<ghoul::fontrendering::Font> _fontInfo;
|
||||
|
||||
@@ -71,8 +71,7 @@ public:
|
||||
|
||||
virtual void update() = 0;
|
||||
|
||||
virtual void render(Scene* scene, Camera* camera, float blackoutFactor,
|
||||
bool doPerformanceMeasurements) = 0;
|
||||
virtual void render(Scene* scene, Camera* camera, float blackoutFactor) = 0;
|
||||
/**
|
||||
* Update render data
|
||||
* Responsible for calling renderEngine::setRenderData
|
||||
|
||||
Reference in New Issue
Block a user