From 13360856f997889d7a27a2b369a151cca5cf5cdb Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Tue, 6 Oct 2015 19:11:19 +0200 Subject: [PATCH] Separated OpenGL specific code into its own "compilation unit" --- CMakeLists.txt | 5 +- include/Core/BGFXRenderer.h | 102 --------- include/Core/Engine.h | 10 +- include/Core/RenderQueue.h | 18 +- include/GUI/Frame.h | 6 +- include/GUI/TextureFrame.h | 2 +- include/Rendering/CPointLight.h | 2 +- include/{Core => Rendering}/Camera.h | 0 include/{Core => Rendering}/Color.h | 0 include/{Core => Rendering}/Image.h | 0 include/{Core => Rendering}/OBJ.h | 2 +- .../OpenGL/Rendering}/Model.h | 4 +- .../OpenGL/Rendering}/Renderer.h | 8 +- .../OpenGL/Rendering}/ShaderProgram.h | 2 +- .../OpenGL/Rendering}/Texture.h | 4 +- include/{Core => Rendering}/PNG.h | 0 include/Rendering/RenderQueue.h | 210 ++++++++++++++++++ include/{Core => Rendering}/Skeleton.h | 0 src/game/CMakeLists.txt | 16 +- src/game/Core/BGFXRenderer.cpp | 3 - src/game/{Core => Rendering}/Camera.cpp | 2 +- src/game/{Core => Rendering}/OBJ.cpp | 2 +- src/game/{Core => Rendering/OpenGL}/Model.cpp | 2 +- .../{Core => Rendering/OpenGL}/Renderer.cpp | 2 +- .../OpenGL}/ShaderProgram.cpp | 2 +- .../{Core => Rendering/OpenGL}/Texture.cpp | 2 +- src/game/{Core => Rendering}/PNG.cpp | 2 +- src/game/{Core => Rendering}/Skeleton.cpp | 2 +- 28 files changed, 258 insertions(+), 152 deletions(-) delete mode 100755 include/Core/BGFXRenderer.h rename include/{Core => Rendering}/Camera.h (100%) rename include/{Core => Rendering}/Color.h (100%) rename include/{Core => Rendering}/Image.h (100%) mode change 100755 => 100644 rename include/{Core => Rendering}/OBJ.h (99%) rename include/{Core => Rendering/OpenGL/Rendering}/Model.h (97%) rename include/{Core => Rendering/OpenGL/Rendering}/Renderer.h (96%) rename include/{Core => Rendering/OpenGL/Rendering}/ShaderProgram.h (98%) rename include/{Core => Rendering/OpenGL/Rendering}/Texture.h (95%) rename include/{Core => Rendering}/PNG.h (100%) create mode 100644 include/Rendering/RenderQueue.h rename include/{Core => Rendering}/Skeleton.h (100%) delete mode 100644 src/game/Core/BGFXRenderer.cpp rename src/game/{Core => Rendering}/Camera.cpp (98%) mode change 100755 => 100644 rename src/game/{Core => Rendering}/OBJ.cpp (99%) rename src/game/{Core => Rendering/OpenGL}/Model.cpp (99%) mode change 100755 => 100644 rename src/game/{Core => Rendering/OpenGL}/Renderer.cpp (99%) mode change 100755 => 100644 rename src/game/{Core => Rendering/OpenGL}/ShaderProgram.cpp (99%) rename src/game/{Core => Rendering/OpenGL}/Texture.cpp (98%) mode change 100755 => 100644 rename src/game/{Core => Rendering}/PNG.cpp (99%) mode change 100755 => 100644 rename src/game/{Core => Rendering}/Skeleton.cpp (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0db10d3..91e68d7 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.0) project(daydream) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${PROJECT_SOURCE_DIR}/deps/include") @@ -24,6 +23,10 @@ endif() set(BUILD_SHARED_LIBS FALSE) include_directories(${PROJECT_SOURCE_DIR}/include) +# Compiling for OpenGL target +include_directories(${PROJECT_SOURCE_DIR}/include/Rendering/OpenGL) +# Compiling for DirectX target +#include_directories(${PROJECT_SOURCE_DIR}/include/Rendering/DirectX) #set(GLEW_INCLUDE_DIR ${daydream_SOURCE_DIR}/libs/glew-1.11.0/include) #set(GLEW_LIBRARY ${daydream_SOURCE_DIR}/libs/glew-1.11.0/lib/Release/glew32.lib) diff --git a/include/Core/BGFXRenderer.h b/include/Core/BGFXRenderer.h deleted file mode 100755 index aa61bf2..0000000 --- a/include/Core/BGFXRenderer.h +++ /dev/null @@ -1,102 +0,0 @@ -#ifndef BGFXRenderer_h__ -#define BGFXRenderer_h__ - -#include -#include - -#include "Util/Rectangle.h" -#include "Core/Camera.h" -#include "Core/RenderQueue.h" - -namespace dd -{ - -class BGFXRenderer -{ -public: - GLFWwindow* Window() const { return m_Window; } - Rectangle Resolution() const { return m_Resolution; } - void SetResolution(const Rectangle& resolution) { m_Resolution = resolution; } - bool Fullscreen() { return m_Fullscreen; } - void SetFullscreen(bool fullscreen) { m_Fullscreen = fullscreen; } - bool VSYNC() const { return m_VSYNC; } - void SetVSYNC(bool vsync) { m_VSYNC = vsync; } - //void SetViewport(const Rectangle& viewport) { m_Viewport = viewport; } - //void SetScissor(const Rectangle& scissor) { m_Scissor = scissor; } - const dd::Camera* Camera() const { return m_Camera; } - void SetCamera(const dd::Camera* camera) - { - if (camera == nullptr) { - m_Camera = m_DefaultCamera.get(); - } else { - m_Camera = camera; - } - } - - void Initialize() - { - // Initialize GLFW - if (!glfwInit()) { - LOG_ERROR("GLFW: Initialization failed"); - exit(EXIT_FAILURE); - } - - // Create a window - GLFWmonitor* monitor = nullptr; - if (m_Fullscreen) { - monitor = glfwGetPrimaryMonitor(); - } - glfwWindowHint(GLFW_SAMPLES, 8); - m_Window = glfwCreateWindow(m_Resolution.Width, m_Resolution.Height, "daydream", monitor, nullptr); - if (!m_Window) { - LOG_ERROR("GLFW: Failed to create window"); - exit(EXIT_FAILURE); - } - //glfwMakeContextCurrent(m_Window); - - // Initialize GLEW -// if (glewInit() != GLEW_OK) { -// LOG_ERROR("GLEW: Initialization failed"); -// exit(EXIT_FAILURE); -// } - //LOG_ERROR("STUFF"); - - // Initialize bgfx - bgfx::glfwSetWindow(m_Window); - bgfx::init(bgfx::RendererType::OpenGL, BGFX_PCI_ID_NONE, 0, nullptr, nullptr); - bgfx::reset(m_Resolution.Width, m_Resolution.Height, BGFX_RESET_NONE); - bgfx::setDebug(BGFX_DEBUG_TEXT); - bgfx::setViewClear(0, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x303030ff, 1.0f, 0); - - std::stringstream ss; - ss << bgfx::getRendererName(bgfx::getRendererType()); -#ifdef DEBUG - ss << " DEBUG"; -#endif - LOG_INFO(ss.str().c_str()); - glfwSetWindowTitle(m_Window, ss.str().c_str()); - } - - void Draw(RenderQueueCollection& rq) - { - bgfx::touch(0); - - bgfx::dbgTextClear(); - bgfx::dbgTextPrintf(0, 1, 0x4f, "daydream"); - - bgfx::frame(); - } - -private: - Rectangle m_Resolution = Rectangle(1280, 720); - bool m_Fullscreen = false; - bool m_VSYNC = false; - std::unique_ptr m_DefaultCamera = nullptr; - const dd::Camera* m_Camera = nullptr; - - GLFWwindow* m_Window = nullptr; -}; - -} - -#endif diff --git a/include/Core/Engine.h b/include/Core/Engine.h index c28b30c..3d7153f 100755 --- a/include/Core/Engine.h +++ b/include/Core/Engine.h @@ -21,12 +21,12 @@ #include #include "ResourceManager.h" -#include "OBJ.h" -#include "Model.h" -#include "Texture.h" +#include "Rendering/OBJ.h" +#include "Rendering/Model.h" +#include "Rendering/Texture.h" #include "EventBroker.h" -#include "RenderQueue.h" -#include "Renderer.h" +#include "Rendering/RenderQueue.h" +#include "Rendering/Renderer.h" #include "InputManager.h" //TODO: Remove includes that are only here for the temporary draw solution. #include "World.h" diff --git a/include/Core/RenderQueue.h b/include/Core/RenderQueue.h index 3bdf0c7..b2c1df1 100755 --- a/include/Core/RenderQueue.h +++ b/include/Core/RenderQueue.h @@ -23,8 +23,8 @@ #include #include "Core/Util/Rectangle.h" -#include "Core/Texture.h" -#include "Core/Model.h" +#include "Rendering/Texture.h" +#include "Rendering/Model.h" namespace dd { @@ -78,20 +78,6 @@ struct ModelJob : RenderJob } }; -struct BlendMapModelJob : ModelJob -{ - GLuint BlendMapTextureRed; - GLuint BlendMapTextureRedNormal; - GLuint BlendMapTextureRedSpecular; - GLuint BlendMapTextureGreen; - GLuint BlendMapTextureGreenNormal; - GLuint BlendMapTextureGreenSpecular; - GLuint BlendMapTextureBlue; - GLuint BlendMapTextureBlueNormal; - GLuint BlendMapTextureBlueSpecular; - float TextureRepeat; -}; - struct SpriteJob : RenderJob { unsigned int ShaderID; diff --git a/include/GUI/Frame.h b/include/GUI/Frame.h index 8eaedb9..28a94d7 100644 --- a/include/GUI/Frame.h +++ b/include/GUI/Frame.h @@ -9,9 +9,9 @@ #include "Core/EKeyDown.h" #include "Core/EKeyUp.h" #include "Core/ResourceManager.h" -#include "Core/Renderer.h" -#include "Core/RenderQueue.h" -#include "Core/Texture.h" +#include "Rendering/Renderer.h" +#include "Rendering/RenderQueue.h" +#include "Rendering/Texture.h" #include "Input/EInputCommand.h" namespace dd diff --git a/include/GUI/TextureFrame.h b/include/GUI/TextureFrame.h index 5db574c..ddb0d87 100644 --- a/include/GUI/TextureFrame.h +++ b/include/GUI/TextureFrame.h @@ -2,7 +2,7 @@ #define GUI_TextureFrame_h__ #include "GUI/Frame.h" -#include "Core/Texture.h" +#include "Rendering/Texture.h" namespace dd { diff --git a/include/Rendering/CPointLight.h b/include/Rendering/CPointLight.h index a44afd7..c473f5f 100644 --- a/include/Rendering/CPointLight.h +++ b/include/Rendering/CPointLight.h @@ -20,7 +20,7 @@ #define Components_PointLight_h__ #include "Core/Component.h" -#include "Core/Color.h" +#include "Rendering/Color.h" namespace dd { diff --git a/include/Core/Camera.h b/include/Rendering/Camera.h similarity index 100% rename from include/Core/Camera.h rename to include/Rendering/Camera.h diff --git a/include/Core/Color.h b/include/Rendering/Color.h similarity index 100% rename from include/Core/Color.h rename to include/Rendering/Color.h diff --git a/include/Core/Image.h b/include/Rendering/Image.h old mode 100755 new mode 100644 similarity index 100% rename from include/Core/Image.h rename to include/Rendering/Image.h diff --git a/include/Core/OBJ.h b/include/Rendering/OBJ.h similarity index 99% rename from include/Core/OBJ.h rename to include/Rendering/OBJ.h index 955dc5d..130a2bd 100644 --- a/include/Core/OBJ.h +++ b/include/Rendering/OBJ.h @@ -30,7 +30,7 @@ #include #include -#include "ResourceManager.h" +#include "Core/ResourceManager.h" namespace dd { diff --git a/include/Core/Model.h b/include/Rendering/OpenGL/Rendering/Model.h similarity index 97% rename from include/Core/Model.h rename to include/Rendering/OpenGL/Rendering/Model.h index 4de5d91..67d1ddb 100644 --- a/include/Core/Model.h +++ b/include/Rendering/OpenGL/Rendering/Model.h @@ -34,8 +34,8 @@ #include #include "Core/ResourceManager.h" -#include "Core/Texture.h" -#include "Core/Skeleton.h" +#include "Rendering/Texture.h" +#include "Rendering/Skeleton.h" namespace dd { diff --git a/include/Core/Renderer.h b/include/Rendering/OpenGL/Rendering/Renderer.h similarity index 96% rename from include/Core/Renderer.h rename to include/Rendering/OpenGL/Rendering/Renderer.h index b02928a..36a78da 100755 --- a/include/Core/Renderer.h +++ b/include/Rendering/OpenGL/Rendering/Renderer.h @@ -19,16 +19,16 @@ #ifndef DD_RENDERER_H__ #define DD_RENDERER_H__ -#include "Util/Rectangle.h" +#include "Core/Util/Rectangle.h" +#include "Rendering/Camera.h" +#include "Rendering/RenderQueue.h" +#include "Rendering/ShaderProgram.h" #include "Core/System.h" #include "Core/CTransform.h" #include "Core/CTemplate.h" #include "Core/EventBroker.h" #include "Core/World.h" #include "Game/EScreenShake.h" -#include "Camera.h" -#include "RenderQueue.h" -#include "ShaderProgram.h" namespace dd { diff --git a/include/Core/ShaderProgram.h b/include/Rendering/OpenGL/Rendering/ShaderProgram.h similarity index 98% rename from include/Core/ShaderProgram.h rename to include/Rendering/OpenGL/Rendering/ShaderProgram.h index 6eaa220..758b5d4 100644 --- a/include/Core/ShaderProgram.h +++ b/include/Rendering/OpenGL/Rendering/ShaderProgram.h @@ -27,7 +27,7 @@ #include #include -#include "ResourceManager.h" +#include "Core/ResourceManager.h" namespace dd { diff --git a/include/Core/Texture.h b/include/Rendering/OpenGL/Rendering/Texture.h similarity index 95% rename from include/Core/Texture.h rename to include/Rendering/OpenGL/Rendering/Texture.h index f7cfd69..b620a4f 100644 --- a/include/Core/Texture.h +++ b/include/Rendering/OpenGL/Rendering/Texture.h @@ -23,8 +23,8 @@ #include #include -#include "ResourceManager.h" -#include "PNG.h" +#include "Core/ResourceManager.h" +#include "Rendering/PNG.h" namespace dd { diff --git a/include/Core/PNG.h b/include/Rendering/PNG.h similarity index 100% rename from include/Core/PNG.h rename to include/Rendering/PNG.h diff --git a/include/Rendering/RenderQueue.h b/include/Rendering/RenderQueue.h new file mode 100644 index 0000000..cc868f3 --- /dev/null +++ b/include/Rendering/RenderQueue.h @@ -0,0 +1,210 @@ +/* + This file is part of Daydream Engine. + Copyright 2014 Adam Byléhn, Tobias Dahl, Simon Holmberg, Viktor Ljung + + Daydream Engine is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Daydream Engine is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with Daydream Engine. If not, see . +*/ + +#ifndef RenderQueue_h__ +#define RenderQueue_h__ + +#include +#include + +#include "Core/Util/Rectangle.h" +#include "Rendering/Texture.h" +#include "Rendering/Model.h" + +namespace dd +{ + +class RenderQueue; + +struct RenderJob +{ + friend class RenderQueue; + + float Depth; + +protected: + uint64_t Hash; + + virtual void CalculateHash() = 0; + + bool operator<(const RenderJob& rhs) + { + return this->Hash < rhs.Hash; + } +}; + +struct ModelJob : RenderJob +{ + unsigned int ShaderID; + unsigned int TextureID; + + glm::mat4 ProjectionMatrix; + glm::mat4 ViewMatrix; + glm::mat4 ModelMatrix; + GLuint DiffuseTexture; + GLuint NormalTexture; + GLuint SpecularTexture; + float Shininess; + glm::vec4 Color; + GLuint VAO; + GLuint ElementBuffer; + unsigned int StartIndex; + unsigned int EndIndex; + + void CalculateHash() override + { + Hash = TextureID; + } +}; + +struct BlendMapModelJob : ModelJob +{ + GLuint BlendMapTextureRed; + GLuint BlendMapTextureRedNormal; + GLuint BlendMapTextureRedSpecular; + GLuint BlendMapTextureGreen; + GLuint BlendMapTextureGreenNormal; + GLuint BlendMapTextureGreenSpecular; + GLuint BlendMapTextureBlue; + GLuint BlendMapTextureBlueNormal; + GLuint BlendMapTextureBlueSpecular; + float TextureRepeat; +}; + +struct SpriteJob : RenderJob +{ + unsigned int ShaderID; + unsigned int TextureID; + + glm::mat4 ProjectionMatrix; + glm::mat4 ViewMatrix; + glm::mat4 ModelMatrix; + GLuint DiffuseTexture; + GLuint NormalTexture; + GLuint SpecularTexture; + glm::vec4 Color; + + void CalculateHash() override + { + Hash = TextureID; + } +}; + +struct PointLightJob : RenderJob +{ + glm::vec3 Position; + glm::vec3 SpecularColor = glm::vec3(1, 1, 1); + glm::vec3 DiffuseColor = glm::vec3(1, 1, 1); + float Radius = 1.f; + + void CalculateHash() override + { + Hash = 0; + } +}; + +struct FrameJob : SpriteJob +{ + Rectangle Scissor; + Rectangle Viewport; + std::string Name; + + void CalculateHash() override + { + Hash = 0; + } +}; + +struct WaterParticleJob : RenderJob +{ + glm::vec3 Position; + glm::vec4 Color; + glm::mat4 ModelMatrix; + + void CalculateHash() override + { + Hash = 0; + } +}; + +class RenderQueue +{ +public: + template + void Add(T &job) + { + job.CalculateHash(); + Jobs.push_back(std::shared_ptr(new T(job))); + m_Size++; + } + + void Sort() + { + Jobs.sort(); + } + + void Clear() + { + Jobs.clear(); + m_Size = 0; + } + + int Size() const { return m_Size; } + std::list>::const_iterator begin() + { + return Jobs.begin(); + } + + std::list>::const_iterator end() + { + return Jobs.end(); + } + + std::list> Jobs; + +private: + int m_Size = 0; +}; + +struct RenderQueueCollection +{ + RenderQueue Deferred; + RenderQueue Forward; + RenderQueue Lights; + RenderQueue GUI; + + void Clear() + { + Deferred.Clear(); + Forward.Clear(); + Lights.Clear(); + GUI.Clear(); + } + + void Sort() + { + Deferred.Sort(); + Forward.Sort(); + Lights.Sort(); + GUI.Sort(); + } +}; + +} + +#endif // RenderQueue_h__ \ No newline at end of file diff --git a/include/Core/Skeleton.h b/include/Rendering/Skeleton.h similarity index 100% rename from include/Core/Skeleton.h rename to include/Rendering/Skeleton.h diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt index 6b87e9b..b5ec20e 100755 --- a/src/game/CMakeLists.txt +++ b/src/game/CMakeLists.txt @@ -53,6 +53,16 @@ file(GLOB SOURCE_FILES_Rendering "Rendering/*.cpp" ) source_group(Rendering FILES ${SOURCE_FILES_Rendering}) +file(GLOB SOURCE_FILES_Rendering_OpenGL + "${INCLUDE_PATH}/Rendering/OpenGL/Rendering/*.h" + "Rendering/OpenGL/*.cpp" +) +source_group(Rendering\\OpenGL FILES ${SOURCE_FILES_Rendering_OpenGL}) +file(GLOB SOURCE_FILES_Rendering_DirectX + "${INCLUDE_PATH}/Rendering/DirectX/Rendering/*.h" + "Rendering/DirectX/*.cpp" +) +source_group(Rendering\\DirectX FILES ${SOURCE_FILES_Rendering_DirectX}) file(GLOB SOURCE_FILES_Transform "${INCLUDE_PATH}/Transform/*.h" @@ -61,8 +71,8 @@ file(GLOB SOURCE_FILES_Transform source_group(Transform FILES ${SOURCE_FILES_Transform}) file(GLOB SOURCE_FILES_Physics - "${INCLUDE_PATH}/Physics/*.h" - "Physics/*.cpp" + "${INCLUDE_PATH}/Physics/*.h" + "Physics/*.cpp" ) source_group(Physics FILES ${SOURCE_FILES_Physics}) @@ -94,6 +104,8 @@ set(SOURCE_FILES ${SOURCE_FILES_Core_Util} ${SOURCE_FILES_Input} ${SOURCE_FILES_Rendering} + ${SOURCE_FILES_Rendering_OpenGL} + ${SOURCE_FILES_Rendering_DirectX} ${SOURCE_FILES_Transform} ${SOURCE_FILES_Physics} ${SOURCE_FILES_Game} diff --git a/src/game/Core/BGFXRenderer.cpp b/src/game/Core/BGFXRenderer.cpp deleted file mode 100644 index 411ec42..0000000 --- a/src/game/Core/BGFXRenderer.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "PrecompiledHeader.h" -#include "Core/BGFXRenderer.h" - diff --git a/src/game/Core/Camera.cpp b/src/game/Rendering/Camera.cpp old mode 100755 new mode 100644 similarity index 98% rename from src/game/Core/Camera.cpp rename to src/game/Rendering/Camera.cpp index 4c1577d..3958ff4 --- a/src/game/Core/Camera.cpp +++ b/src/game/Rendering/Camera.cpp @@ -17,7 +17,7 @@ */ #include "PrecompiledHeader.h" -#include "Core/Camera.h" +#include "Rendering/Camera.h" dd::Camera::Camera(float aspectRatio, float yFOV, float nearClip, float farClip) { diff --git a/src/game/Core/OBJ.cpp b/src/game/Rendering/OBJ.cpp similarity index 99% rename from src/game/Core/OBJ.cpp rename to src/game/Rendering/OBJ.cpp index 0dd75a5..795b202 100644 --- a/src/game/Core/OBJ.cpp +++ b/src/game/Rendering/OBJ.cpp @@ -17,7 +17,7 @@ */ #include "PrecompiledHeader.h" -#include "Core/OBJ.h" +#include "Rendering/OBJ.h" bool dd::OBJ::LoadFromFile(std::string filename) { diff --git a/src/game/Core/Model.cpp b/src/game/Rendering/OpenGL/Model.cpp old mode 100755 new mode 100644 similarity index 99% rename from src/game/Core/Model.cpp rename to src/game/Rendering/OpenGL/Model.cpp index 84b4261..3c682bb --- a/src/game/Core/Model.cpp +++ b/src/game/Rendering/OpenGL/Model.cpp @@ -17,7 +17,7 @@ */ #include "PrecompiledHeader.h" -#include "Core/Model.h" +#include "Rendering/Model.h" dd::Model::Model(std::string fileName) { diff --git a/src/game/Core/Renderer.cpp b/src/game/Rendering/OpenGL/Renderer.cpp old mode 100755 new mode 100644 similarity index 99% rename from src/game/Core/Renderer.cpp rename to src/game/Rendering/OpenGL/Renderer.cpp index 29bedab..5d9182b --- a/src/game/Core/Renderer.cpp +++ b/src/game/Rendering/OpenGL/Renderer.cpp @@ -17,7 +17,7 @@ */ #include "PrecompiledHeader.h" -#include "Core/Renderer.h" +#include "Rendering/Renderer.h" void dd::Renderer::Initialize() { diff --git a/src/game/Core/ShaderProgram.cpp b/src/game/Rendering/OpenGL/ShaderProgram.cpp similarity index 99% rename from src/game/Core/ShaderProgram.cpp rename to src/game/Rendering/OpenGL/ShaderProgram.cpp index 853c367..3ae5627 100644 --- a/src/game/Core/ShaderProgram.cpp +++ b/src/game/Rendering/OpenGL/ShaderProgram.cpp @@ -17,7 +17,7 @@ */ #include "PrecompiledHeader.h" -#include "Core/ShaderProgram.h" +#include "Rendering/ShaderProgram.h" void dd::Shader::Compile() { diff --git a/src/game/Core/Texture.cpp b/src/game/Rendering/OpenGL/Texture.cpp old mode 100755 new mode 100644 similarity index 98% rename from src/game/Core/Texture.cpp rename to src/game/Rendering/OpenGL/Texture.cpp index 2dd9f49..ee33ed1 --- a/src/game/Core/Texture.cpp +++ b/src/game/Rendering/OpenGL/Texture.cpp @@ -17,7 +17,7 @@ */ #include "PrecompiledHeader.h" -#include "Core/Texture.h" +#include "Rendering/Texture.h" dd::Texture::Texture(std::string path) { diff --git a/src/game/Core/PNG.cpp b/src/game/Rendering/PNG.cpp old mode 100755 new mode 100644 similarity index 99% rename from src/game/Core/PNG.cpp rename to src/game/Rendering/PNG.cpp index a35be44..75ea402 --- a/src/game/Core/PNG.cpp +++ b/src/game/Rendering/PNG.cpp @@ -17,7 +17,7 @@ */ #include "PrecompiledHeader.h" -#include "Core/PNG.h" +#include "Rendering/PNG.h" dd::PNG::PNG(std::string path) { diff --git a/src/game/Core/Skeleton.cpp b/src/game/Rendering/Skeleton.cpp similarity index 99% rename from src/game/Core/Skeleton.cpp rename to src/game/Rendering/Skeleton.cpp index 5b2895c..69e9651 100644 --- a/src/game/Core/Skeleton.cpp +++ b/src/game/Rendering/Skeleton.cpp @@ -17,7 +17,7 @@ */ #include "PrecompiledHeader.h" -#include "Core/Skeleton.h" +#include "Rendering/Skeleton.h" int dd::Skeleton::CreateBone(int ID, int parentID, std::string name, glm::mat4 offsetMatrix) {