diff --git a/CMakeLists.txt b/CMakeLists.txt index c81757c..967d318 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.7) -project(OpenGLPlayground) +project(Inferno) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} CMakeModules/) cmake_policy(SET CMP0037 OLD) diff --git a/src/common.hpp b/src/common.hpp new file mode 100644 index 0000000..d40ce43 --- /dev/null +++ b/src/common.hpp @@ -0,0 +1,11 @@ +#ifndef INFERNO_COMMON_H_ +#define INFERNO_COMMON_H_ + +enum OperationMode { + MODE_DEFAULT, + MODE_PROGRESSIVE_GUI, + MODE_PROGRESSIVE_IMG, + MODE_SAMPLES_IMG +}; + +#endif diff --git a/src/core/renderer.cpp b/src/core/renderer.cpp index e69de29..cbecd4c 100644 --- a/src/core/renderer.cpp +++ b/src/core/renderer.cpp @@ -0,0 +1,9 @@ +#include "./renderer.hpp" + +Renderer::Renderer(OperationMode mode) { + +} + +void Renderer::Render() { + +} diff --git a/src/core/renderer.hpp b/src/core/renderer.hpp index 0846022..09f48c9 100644 --- a/src/core/renderer.hpp +++ b/src/core/renderer.hpp @@ -1,8 +1,17 @@ #ifndef INFERNO_CORE_RENDERER_H_ #define INFERNO_CORE_RENDERER_H_ +#include "../common.hpp" + +// Function initProgressive or whatever takes a pointer to the display class Renderer { - // Function initProgressive or whatever takes a pointer to the display -} +public: + Renderer(OperationMode mode); + + void Render(); + +private: + OperationMode m_mode = MODE_DEFAULT; +}; #endif diff --git a/src/inferno.hpp b/src/inferno.hpp index ab34f4c..577d3c9 100644 --- a/src/inferno.hpp +++ b/src/inferno.hpp @@ -3,18 +3,13 @@ #include #include -// TODO: this errored for some reason lol -// #include +#include + +#include "./common.hpp" class Display; class Renderer; -enum OperationMode { - MODE_PROGRESSIVE_GUI, - MODE_PROGRESSIVE_IMG, - MODE_SAMPLES_IMG -}; - // General idea is that the rendering stays the same (Other than progressive / sampling) // and the renderer passes a full framebuffer (different depending on mode) to either the // display or an image generator, undecided how this will work but it will make for some