From e06bd06a9988b98f5f9cfedd5d4273c1891322cc Mon Sep 17 00:00:00 2001 From: Ben Kyd Date: Thu, 25 Jul 2019 03:18:40 +0100 Subject: [PATCH] smh --- src/core/progressiveRenderer.cpp | 5 +++++ src/core/progressiveRenderer.hpp | 9 +++++++++ src/core/renderer.cpp | 31 ++++++++++++++++++++++++++++++- src/core/renderer.hpp | 14 ++++++++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 src/core/progressiveRenderer.cpp create mode 100644 src/core/progressiveRenderer.hpp diff --git a/src/core/progressiveRenderer.cpp b/src/core/progressiveRenderer.cpp new file mode 100644 index 0000000..2540b10 --- /dev/null +++ b/src/core/progressiveRenderer.cpp @@ -0,0 +1,5 @@ +#include "./progressiveRenderer.hpp" + +ProgressiveRenderer::ProgressiveRenderer() { + +} diff --git a/src/core/progressiveRenderer.hpp b/src/core/progressiveRenderer.hpp new file mode 100644 index 0000000..4c9f2f8 --- /dev/null +++ b/src/core/progressiveRenderer.hpp @@ -0,0 +1,9 @@ +#ifndef INFERNO_CORE_PROGRESSIVERENDERER_H_ +#define INFERNO_CORE_PROGRESSIVERENDERER_H_ + +class ProgressiveRenderer { +public: + ProgressiveRenderer(); +}; + +#endif diff --git a/src/core/renderer.cpp b/src/core/renderer.cpp index cbecd4c..61f23e3 100644 --- a/src/core/renderer.cpp +++ b/src/core/renderer.cpp @@ -1,9 +1,38 @@ #include "./renderer.hpp" Renderer::Renderer(OperationMode mode) { + m_mode = mode; +} +void Renderer::SetMode(OperationMode mode, int samples) { + m_mode = mode; + m_samples = samples; } void Renderer::Render() { - + if (m_mode == MODE_PROGRESSIVE_GUI || m_mode == MODE_PROGRESSIVE_IMG) { + RenderProgressive(); + } else if (m_mode == MODE_SAMPLES_IMG) { + RenderSamples(); + } else { + // Add an error & return + } +} + +void Renderer::Init() { + +} + +void Renderer::Init(Display* display) { + // Add warning + if (!display) return; + m_display = display; +} + +void Renderer::RenderProgressive() { + +} + +void Renderer::RenderSamples() { + } diff --git a/src/core/renderer.hpp b/src/core/renderer.hpp index 09f48c9..17b7fae 100644 --- a/src/core/renderer.hpp +++ b/src/core/renderer.hpp @@ -3,15 +3,29 @@ #include "../common.hpp" +class Display; + // Function initProgressive or whatever takes a pointer to the display class Renderer { public: Renderer(OperationMode mode); + void SetMode(OperationMode mode, int samples = -1); + + void Init(); + void Init(Display* display); + void Render(); private: + int m_samples = -1; OperationMode m_mode = MODE_DEFAULT; + + Display* m_display = nullptr; + + void RenderProgressive(); + void RenderSamples(); + }; #endif