From 7cbe8acf305f3b3b79963707d5136feb5c8edef8 Mon Sep 17 00:00:00 2001 From: elipzer Date: Thu, 11 Oct 2018 01:26:24 -0400 Subject: [PATCH] Libraries Work! Now the code is being compiled through .lib files! --- .gitignore | 8 +- CharcoalBuiltin/AutoPrerenderingScene.h | 6 +- CharcoalBuiltin/BasicScene.cpp | 4 +- CharcoalBuiltin/BasicScene.h | 8 +- CharcoalBuiltin/BasicShaderProgram.h | 2 +- CharcoalBuiltin/BuiltinBatch.h | 4 +- CharcoalBuiltin/BuiltinCamera2D.h | 4 +- CharcoalBuiltin/BuiltinCamera3D.h | 4 +- CharcoalBuiltin/BuiltinTypes.h | 8 +- CharcoalBuiltin/CharcoalBuiltin.vcxproj | 76 ++- .../CharcoalBuiltin.vcxproj.filters | 139 ++++++ CharcoalBuiltin/GLUtil.cpp | 2 +- CharcoalBuiltin/ImageScene.cpp | 4 +- CharcoalBuiltin/ImageShaderProgram.h | 2 +- CharcoalBuiltin/LitScene.cpp | 6 +- CharcoalBuiltin/LitScene.h | 3 +- CharcoalBuiltin/LitShaderProgram.h | 2 +- CharcoalBuiltin/LitShadowedScene.cpp | 6 +- CharcoalBuiltin/LitShadowedScene.h | 3 +- CharcoalBuiltin/LitShadowedShaderProgram.h | 2 +- CharcoalBuiltin/MeshGenerator.h | 5 +- CharcoalBuiltin/Poseable2DBatch.h | 7 +- CharcoalBuiltin/PoseableBatch.h | 6 +- CharcoalBuiltin/SpriteBatch.h | 5 +- CharcoalBuiltin/TextureGenerator.cpp | 2 +- CharcoalBuiltin/TextureGenerator.h | 4 +- CharcoalBuiltin/TexturedScene.cpp | 4 +- CharcoalBuiltin/TexturedScene.h | 4 +- CharcoalBuiltin/TexturedShaderProgram.h | 2 +- CharcoalBuiltin/TexturedTypes.h | 3 +- CharcoalBuiltin/WithCamera.h | 2 +- Example/Example.vcxproj | 42 +- Example/Example.vcxproj.filters | 79 +++ Example/MyApplication.h | 4 +- Example/MyBasicScene.h | 2 +- Example/MyBasicShaderProgram.h | 8 +- Example/MyBatch.h | 5 +- Example/MyBuiltinCubeScene.cpp | 4 +- Example/MyBuiltinCubeScene.h | 4 +- Example/MyBuiltinImageScene.cpp | 10 +- Example/MyBuiltinImageScene.h | 7 +- Example/MyBuiltinLitScene.cpp | 5 +- Example/MyBuiltinLitScene.h | 4 +- Example/MyBuiltinLitShadowedScene.cpp | 5 +- Example/MyBuiltinLitShadowedScene.h | 4 +- Example/MyBuiltinTexturedScene.cpp | 7 +- Example/MyBuiltinTexturedScene.h | 4 +- Example/MySimple2DScene.cpp | 10 +- Example/MySimple2DScene.h | 5 +- Example/MySimple3DScene.cpp | 10 +- Example/MySimple3DScene.h | 5 +- Example/MySimpleCubeScene.cpp | 7 +- Example/MySimpleCubeScene.h | 5 +- Example/MySimpleShaderProgram.h | 8 +- Example/main.cpp | 8 +- OpenGLEngine.sln | 7 + OpenGLEngine/OpenGLEngine.vcxproj | 114 +---- OpenGLEngine/OpenGLEngine.vcxproj.filters | 468 +++--------------- {CharcoalBuiltin => OpenGLEngine}/lodepng.cpp | 0 {CharcoalBuiltin => OpenGLEngine}/lodepng.h | 0 {CharcoalBuiltin => shaders}/BasicFS.glsl | 0 {CharcoalBuiltin => shaders}/BasicVS.glsl | 0 {CharcoalBuiltin => shaders}/ImageFS.glsl | 0 {CharcoalBuiltin => shaders}/ImageVS.glsl | 0 {CharcoalBuiltin => shaders}/LitFS.glsl | 0 .../LitShadowedFS.glsl | 0 .../LitShadowedVS.glsl | 0 {CharcoalBuiltin => shaders}/LitVS.glsl | 0 {Example => shaders}/MyBasicFS.glsl | 0 {Example => shaders}/MyBasicVS.glsl | 0 {Example => shaders}/MySimpleFS.glsl | 0 {Example => shaders}/MySimpleVS.glsl | 0 {CharcoalBuiltin => shaders}/TexturedFS.glsl | 0 {CharcoalBuiltin => shaders}/TexturedVS.glsl | 0 74 files changed, 540 insertions(+), 638 deletions(-) rename {CharcoalBuiltin => OpenGLEngine}/lodepng.cpp (100%) rename {CharcoalBuiltin => OpenGLEngine}/lodepng.h (100%) rename {CharcoalBuiltin => shaders}/BasicFS.glsl (100%) rename {CharcoalBuiltin => shaders}/BasicVS.glsl (100%) rename {CharcoalBuiltin => shaders}/ImageFS.glsl (100%) rename {CharcoalBuiltin => shaders}/ImageVS.glsl (100%) rename {CharcoalBuiltin => shaders}/LitFS.glsl (100%) rename {CharcoalBuiltin => shaders}/LitShadowedFS.glsl (100%) rename {CharcoalBuiltin => shaders}/LitShadowedVS.glsl (100%) rename {CharcoalBuiltin => shaders}/LitVS.glsl (100%) rename {Example => shaders}/MyBasicFS.glsl (100%) rename {Example => shaders}/MyBasicVS.glsl (100%) rename {Example => shaders}/MySimpleFS.glsl (100%) rename {Example => shaders}/MySimpleVS.glsl (100%) rename {CharcoalBuiltin => shaders}/TexturedFS.glsl (100%) rename {CharcoalBuiltin => shaders}/TexturedVS.glsl (100%) diff --git a/.gitignore b/.gitignore index 535cd80..7510e4a 100644 --- a/.gitignore +++ b/.gitignore @@ -329,4 +329,10 @@ ASALocalRun/ .mfractor/ # Local History for Visual Studio -.localhistory/ \ No newline at end of file +.localhistory/ + +# Generated Files/Directories +include/charcoal-builtin/ +include/charcoal/ +lib/charcoal-builtin.lib +lib/charcoal.lib \ No newline at end of file diff --git a/CharcoalBuiltin/AutoPrerenderingScene.h b/CharcoalBuiltin/AutoPrerenderingScene.h index 48d6b6f..dc30268 100644 --- a/CharcoalBuiltin/AutoPrerenderingScene.h +++ b/CharcoalBuiltin/AutoPrerenderingScene.h @@ -2,9 +2,9 @@ #include -#include "Application.h" -#include "Scene.h" -#include "Prerenderable.h" +#include +#include +#include namespace charcoal { diff --git a/CharcoalBuiltin/BasicScene.cpp b/CharcoalBuiltin/BasicScene.cpp index 5713be5..573f07e 100644 --- a/CharcoalBuiltin/BasicScene.cpp +++ b/CharcoalBuiltin/BasicScene.cpp @@ -1,9 +1,9 @@ #include "BasicScene.h" -#include "deps.h" +#include +#include #include "GLUtil.h" -#include "MeshFactory.h" namespace charcoal { diff --git a/CharcoalBuiltin/BasicScene.h b/CharcoalBuiltin/BasicScene.h index 28ad936..db255c4 100644 --- a/CharcoalBuiltin/BasicScene.h +++ b/CharcoalBuiltin/BasicScene.h @@ -2,17 +2,17 @@ #include -#include "Application.h" +#include +#include +#include + #include "AutoPrerenderingScene.h" #include "BasicShaderProgram.h" #include "BasicTypes.h" -#include "Camera.h" #include "Batched.h" #include "BasicBatch.h" -#include "constants.h" - namespace charcoal { namespace builtin diff --git a/CharcoalBuiltin/BasicShaderProgram.h b/CharcoalBuiltin/BasicShaderProgram.h index 82ee15b..33abe04 100644 --- a/CharcoalBuiltin/BasicShaderProgram.h +++ b/CharcoalBuiltin/BasicShaderProgram.h @@ -1,6 +1,6 @@ #pragma once -#include "VertexFragmentShaderProgram.h" +#include namespace charcoal { diff --git a/CharcoalBuiltin/BuiltinBatch.h b/CharcoalBuiltin/BuiltinBatch.h index b2c170c..278d2a3 100644 --- a/CharcoalBuiltin/BuiltinBatch.h +++ b/CharcoalBuiltin/BuiltinBatch.h @@ -1,7 +1,7 @@ #pragma once -#include "Prerenderable.h" -#include "Batch.h" +#include +#include namespace charcoal { diff --git a/CharcoalBuiltin/BuiltinCamera2D.h b/CharcoalBuiltin/BuiltinCamera2D.h index 41ab0fa..1944d1b 100644 --- a/CharcoalBuiltin/BuiltinCamera2D.h +++ b/CharcoalBuiltin/BuiltinCamera2D.h @@ -1,7 +1,7 @@ #pragma once -#include "Prerenderable.h" -#include "Camera2D.h" +#include +#include namespace charcoal { diff --git a/CharcoalBuiltin/BuiltinCamera3D.h b/CharcoalBuiltin/BuiltinCamera3D.h index c3ecff9..0ae3ff4 100644 --- a/CharcoalBuiltin/BuiltinCamera3D.h +++ b/CharcoalBuiltin/BuiltinCamera3D.h @@ -1,7 +1,7 @@ #pragma once -#include "Prerenderable.h" -#include "Camera3D.h" +#include +#include namespace charcoal { diff --git a/CharcoalBuiltin/BuiltinTypes.h b/CharcoalBuiltin/BuiltinTypes.h index 76d65e3..5630de2 100644 --- a/CharcoalBuiltin/BuiltinTypes.h +++ b/CharcoalBuiltin/BuiltinTypes.h @@ -1,10 +1,12 @@ #pragma once #include -#include "Renderable.h" + +#include +#include +#include + #include "PoseableBatch.h" -#include "VertexFragmentShaderProgram.h" -#include "TextureRenderable.h" namespace charcoal { diff --git a/CharcoalBuiltin/CharcoalBuiltin.vcxproj b/CharcoalBuiltin/CharcoalBuiltin.vcxproj index cb6f9fd..9664fd3 100644 --- a/CharcoalBuiltin/CharcoalBuiltin.vcxproj +++ b/CharcoalBuiltin/CharcoalBuiltin.vcxproj @@ -39,13 +39,13 @@ MultiByte - Application + StaticLibrary true v141 MultiByte - Application + StaticLibrary false v141 true @@ -69,14 +69,30 @@ - + + $(SolutionDir)lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64 + + + $(SolutionDir)lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64 + Level3 Disabled true true + $(SolutionDir)include;%(AdditionalIncludeDirectories) + SHADER_PATH=R"($(SolutionDir)shaders\)";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions) + + + + + + copy "$(TargetPath)" "$(SolutionDir)lib\charcoal-builtin.lib" +copy "$(ProjectDir)*.h" "$(SolutionDir)include\charcoal-builtin\" + Output LIB Setup + @@ -108,13 +124,67 @@ true true true + $(SolutionDir)include;%(AdditionalIncludeDirectories) + SHADER_PATH=R"($(SolutionDir)shaders\)";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions) true true + + copy "$(TargetPath)" "$(SolutionDir)lib\charcoal-builtin.lib" +copy "$(ProjectDir)*.h" "$(SolutionDir)include\charcoal-builtin\" + Output LIB Setup + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CharcoalBuiltin/CharcoalBuiltin.vcxproj.filters b/CharcoalBuiltin/CharcoalBuiltin.vcxproj.filters index 4863ddb..361191a 100644 --- a/CharcoalBuiltin/CharcoalBuiltin.vcxproj.filters +++ b/CharcoalBuiltin/CharcoalBuiltin.vcxproj.filters @@ -14,4 +14,143 @@ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/CharcoalBuiltin/GLUtil.cpp b/CharcoalBuiltin/GLUtil.cpp index 7db3649..be3de61 100644 --- a/CharcoalBuiltin/GLUtil.cpp +++ b/CharcoalBuiltin/GLUtil.cpp @@ -1,6 +1,6 @@ #include "GLUtil.h" -#include "deps.h" +#include namespace charcoal { diff --git a/CharcoalBuiltin/ImageScene.cpp b/CharcoalBuiltin/ImageScene.cpp index f3da497..f9e091e 100644 --- a/CharcoalBuiltin/ImageScene.cpp +++ b/CharcoalBuiltin/ImageScene.cpp @@ -1,9 +1,9 @@ #include "ImageScene.h" -#include "deps.h" +#include +#include #include "GLUtil.h" -#include "MeshFactory.h" namespace charcoal { diff --git a/CharcoalBuiltin/ImageShaderProgram.h b/CharcoalBuiltin/ImageShaderProgram.h index 67f9c3d..16675dc 100644 --- a/CharcoalBuiltin/ImageShaderProgram.h +++ b/CharcoalBuiltin/ImageShaderProgram.h @@ -1,6 +1,6 @@ #pragma once -#include "VertexFragmentShaderProgram.h" +#include namespace charcoal { diff --git a/CharcoalBuiltin/LitScene.cpp b/CharcoalBuiltin/LitScene.cpp index 367c13f..41d910b 100644 --- a/CharcoalBuiltin/LitScene.cpp +++ b/CharcoalBuiltin/LitScene.cpp @@ -1,10 +1,10 @@ #include "LitScene.h" -#include "deps.h" +#include +#include +#include -#include "Util.h" #include "GLUtil.h" -#include "MeshFactory.h" namespace charcoal { diff --git a/CharcoalBuiltin/LitScene.h b/CharcoalBuiltin/LitScene.h index f464b3b..c232558 100644 --- a/CharcoalBuiltin/LitScene.h +++ b/CharcoalBuiltin/LitScene.h @@ -2,9 +2,10 @@ #include +#include + #include "AutoPrerenderingScene.h" #include "LitTypes.h" -#include "Camera.h" #include "Batched.h" #include "LitBatch.h" #include "LitShaderProgram.h" diff --git a/CharcoalBuiltin/LitShaderProgram.h b/CharcoalBuiltin/LitShaderProgram.h index 1c8b589..bb8b4f4 100644 --- a/CharcoalBuiltin/LitShaderProgram.h +++ b/CharcoalBuiltin/LitShaderProgram.h @@ -1,6 +1,6 @@ #pragma once -#include "VertexFragmentShaderProgram.h" +#include namespace charcoal { diff --git a/CharcoalBuiltin/LitShadowedScene.cpp b/CharcoalBuiltin/LitShadowedScene.cpp index 316469f..fcf4583 100644 --- a/CharcoalBuiltin/LitShadowedScene.cpp +++ b/CharcoalBuiltin/LitShadowedScene.cpp @@ -1,10 +1,10 @@ #include "LitShadowedScene.h" -#include "deps.h" +#include +#include +#include -#include "Util.h" #include "GLUtil.h" -#include "MeshFactory.h" namespace charcoal { diff --git a/CharcoalBuiltin/LitShadowedScene.h b/CharcoalBuiltin/LitShadowedScene.h index aad3a6f..7b52d1c 100644 --- a/CharcoalBuiltin/LitShadowedScene.h +++ b/CharcoalBuiltin/LitShadowedScene.h @@ -2,9 +2,10 @@ #include +#include + #include "AutoPrerenderingScene.h" #include "LitShadowedTypes.h" -#include "Camera.h" #include "Batched.h" #include "LitShadowedBatch.h" #include "LitShadowedShaderProgram.h" diff --git a/CharcoalBuiltin/LitShadowedShaderProgram.h b/CharcoalBuiltin/LitShadowedShaderProgram.h index 15c8429..5758951 100644 --- a/CharcoalBuiltin/LitShadowedShaderProgram.h +++ b/CharcoalBuiltin/LitShadowedShaderProgram.h @@ -1,6 +1,6 @@ #pragma once -#include "VertexFragmentShaderProgram.h" +#include namespace charcoal { diff --git a/CharcoalBuiltin/MeshGenerator.h b/CharcoalBuiltin/MeshGenerator.h index d343071..1f4eed4 100644 --- a/CharcoalBuiltin/MeshGenerator.h +++ b/CharcoalBuiltin/MeshGenerator.h @@ -4,8 +4,9 @@ #include -#include "MeshFactory.h" -#include "Mesh.h" +#include +#include + #include "BuiltinTypes.h" // TODO: Consider a mesh generator for every render type (i.e. basic::meshgenerator, lit::meshgenerator, etc.) diff --git a/CharcoalBuiltin/Poseable2DBatch.h b/CharcoalBuiltin/Poseable2DBatch.h index 432700c..6970909 100644 --- a/CharcoalBuiltin/Poseable2DBatch.h +++ b/CharcoalBuiltin/Poseable2DBatch.h @@ -1,9 +1,10 @@ #pragma once -#include "Batch.h" +#include +#include +#include + #include "BuiltinBatch.h" -#include "Renderable.h" -#include "Poseable2D.h" namespace charcoal { diff --git a/CharcoalBuiltin/PoseableBatch.h b/CharcoalBuiltin/PoseableBatch.h index b3e84bc..523fab4 100644 --- a/CharcoalBuiltin/PoseableBatch.h +++ b/CharcoalBuiltin/PoseableBatch.h @@ -1,9 +1,9 @@ #pragma once -#include "Batch.h" +#include +#include +#include #include "BuiltinBatch.h" -#include "Renderable.h" -#include "Poseable.h" namespace charcoal { diff --git a/CharcoalBuiltin/SpriteBatch.h b/CharcoalBuiltin/SpriteBatch.h index 03213a6..f06d4fa 100644 --- a/CharcoalBuiltin/SpriteBatch.h +++ b/CharcoalBuiltin/SpriteBatch.h @@ -1,7 +1,8 @@ #pragma once -#include "Poseable2D.h" -#include "TextureRenderable.h" +#include +#include + #include "Poseable2DBatch.h" namespace charcoal diff --git a/CharcoalBuiltin/TextureGenerator.cpp b/CharcoalBuiltin/TextureGenerator.cpp index eb717ff..c9619e4 100644 --- a/CharcoalBuiltin/TextureGenerator.cpp +++ b/CharcoalBuiltin/TextureGenerator.cpp @@ -1,6 +1,6 @@ #include "TextureGenerator.h" -#include "TextureFactory.h" +#include namespace charcoal { diff --git a/CharcoalBuiltin/TextureGenerator.h b/CharcoalBuiltin/TextureGenerator.h index 6362f8c..a0119e5 100644 --- a/CharcoalBuiltin/TextureGenerator.h +++ b/CharcoalBuiltin/TextureGenerator.h @@ -2,8 +2,8 @@ #include -#include "Texture.h" -#include "Sampler.h" +#include +#include namespace charcoal { diff --git a/CharcoalBuiltin/TexturedScene.cpp b/CharcoalBuiltin/TexturedScene.cpp index 9e426f0..b02588b 100644 --- a/CharcoalBuiltin/TexturedScene.cpp +++ b/CharcoalBuiltin/TexturedScene.cpp @@ -1,9 +1,9 @@ #include "TexturedScene.h" -#include "deps.h" +#include +#include #include "GLUtil.h" -#include "MeshFactory.h" namespace charcoal { diff --git a/CharcoalBuiltin/TexturedScene.h b/CharcoalBuiltin/TexturedScene.h index 98456d0..cdb64d5 100644 --- a/CharcoalBuiltin/TexturedScene.h +++ b/CharcoalBuiltin/TexturedScene.h @@ -2,9 +2,9 @@ #include -#include "AutoPrerenderingScene.h" +#include -#include "Camera.h" +#include "AutoPrerenderingScene.h" #include "Batched.h" #include "TexturedBatch.h" #include "TexturedShaderProgram.h" diff --git a/CharcoalBuiltin/TexturedShaderProgram.h b/CharcoalBuiltin/TexturedShaderProgram.h index 7f014a4..00d6ef5 100644 --- a/CharcoalBuiltin/TexturedShaderProgram.h +++ b/CharcoalBuiltin/TexturedShaderProgram.h @@ -1,6 +1,6 @@ #pragma once -#include "VertexFragmentShaderProgram.h" +#include namespace charcoal { diff --git a/CharcoalBuiltin/TexturedTypes.h b/CharcoalBuiltin/TexturedTypes.h index 2bdeb59..ff65d70 100644 --- a/CharcoalBuiltin/TexturedTypes.h +++ b/CharcoalBuiltin/TexturedTypes.h @@ -1,6 +1,7 @@ #pragma once -#include "TextureRenderable.h" +#include + #include "BuiltinTypes.h" namespace charcoal diff --git a/CharcoalBuiltin/WithCamera.h b/CharcoalBuiltin/WithCamera.h index a8916ee..11e5e3d 100644 --- a/CharcoalBuiltin/WithCamera.h +++ b/CharcoalBuiltin/WithCamera.h @@ -1,6 +1,6 @@ #pragma once -#include "Camera.h" +#include namespace charcoal { diff --git a/Example/Example.vcxproj b/Example/Example.vcxproj index 9b0c330..f10a66a 100644 --- a/Example/Example.vcxproj +++ b/Example/Example.vcxproj @@ -18,6 +18,35 @@ x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 15.0 {2713E882-5224-490A-A056-F6AD20C42B12} @@ -69,13 +98,20 @@ - + + $(SolutionDir)lib;$(LibraryPath) + + + $(SolutionDir)lib;$(LibraryPath) + Level3 Disabled true true + SHADER_PATH=R"($(SolutionDir)shaders\)";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions) + $(SolutionDir)include;%(AdditionalIncludeDirectories) @@ -108,14 +144,14 @@ true true true + SHADER_PATH=R"($(SolutionDir)shaders\)";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions) + $(SolutionDir)include;%(AdditionalIncludeDirectories) true true - - diff --git a/Example/Example.vcxproj.filters b/Example/Example.vcxproj.filters index 4863ddb..5c90522 100644 --- a/Example/Example.vcxproj.filters +++ b/Example/Example.vcxproj.filters @@ -14,4 +14,83 @@ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/Example/MyApplication.h b/Example/MyApplication.h index 54e5a8e..32fce1c 100644 --- a/Example/MyApplication.h +++ b/Example/MyApplication.h @@ -1,5 +1,7 @@ #pragma once -#include "Application.h" + +#include +#include #include "MyBasicScene.h" #include "MySimple2DScene.h" diff --git a/Example/MyBasicScene.h b/Example/MyBasicScene.h index b9f4c0d..c87ce0f 100644 --- a/Example/MyBasicScene.h +++ b/Example/MyBasicScene.h @@ -1,6 +1,6 @@ #pragma once -#include "Scene.h" +#include #include "MyBasicShaderProgram.h" diff --git a/Example/MyBasicShaderProgram.h b/Example/MyBasicShaderProgram.h index 2a62625..f156f3a 100644 --- a/Example/MyBasicShaderProgram.h +++ b/Example/MyBasicShaderProgram.h @@ -1,9 +1,9 @@ #pragma once -#include "VertexFragmentShaderProgram.h" -#include "Shader.h" -#include "Mesh.h" -#include "Renderable.h" +#include +#include +#include +#include using namespace charcoal; diff --git a/Example/MyBatch.h b/Example/MyBatch.h index 5504445..120198c 100644 --- a/Example/MyBatch.h +++ b/Example/MyBatch.h @@ -1,8 +1,7 @@ #pragma once -#include "Batch.h" - -#include "Poseable.h" +#include +#include #include "MySimpleShaderProgram.h" diff --git a/Example/MyBuiltinCubeScene.cpp b/Example/MyBuiltinCubeScene.cpp index 72d799c..5939924 100644 --- a/Example/MyBuiltinCubeScene.cpp +++ b/Example/MyBuiltinCubeScene.cpp @@ -1,8 +1,8 @@ #include "MyBuiltinCubeScene.h" -#include "MeshGenerator.h" +#include -#include "constants.h" +#include MyBuiltinCubeScene::MyBuiltinCubeScene(Application& application) : basic::Scene(application), diff --git a/Example/MyBuiltinCubeScene.h b/Example/MyBuiltinCubeScene.h index f9ffa2d..931a2f7 100644 --- a/Example/MyBuiltinCubeScene.h +++ b/Example/MyBuiltinCubeScene.h @@ -1,7 +1,7 @@ #pragma once -#include "BasicScene.h" -#include "BuiltinCamera3D.h" +#include +#include using namespace charcoal; using namespace charcoal::builtin; diff --git a/Example/MyBuiltinImageScene.cpp b/Example/MyBuiltinImageScene.cpp index 1564cec..814cc3f 100644 --- a/Example/MyBuiltinImageScene.cpp +++ b/Example/MyBuiltinImageScene.cpp @@ -1,11 +1,9 @@ #include "MyBuiltinImageScene.h" -#include "TextureFactory.h" - -#include "MeshGenerator.h" -#include "TextureGenerator.h" - -#include "constants.h" +#include +#include +#include +#include MyBuiltinImageScene::MyBuiltinImageScene(Application& application) : image::Scene(application), diff --git a/Example/MyBuiltinImageScene.h b/Example/MyBuiltinImageScene.h index 212c759..2a6d922 100644 --- a/Example/MyBuiltinImageScene.h +++ b/Example/MyBuiltinImageScene.h @@ -1,9 +1,8 @@ #pragma once -#include "ImageLoader.h" - -#include "ImageScene.h" -#include "BuiltinCamera2D.h" +#include +#include +#include using namespace charcoal; using namespace charcoal::builtin; diff --git a/Example/MyBuiltinLitScene.cpp b/Example/MyBuiltinLitScene.cpp index a3a2f61..d0bb353 100644 --- a/Example/MyBuiltinLitScene.cpp +++ b/Example/MyBuiltinLitScene.cpp @@ -1,8 +1,7 @@ #include "MyBuiltinLitScene.h" -#include "MeshGenerator.h" - -#include "constants.h" +#include +#include MyBuiltinLitScene::MyBuiltinLitScene(Application& application) : lit::Scene(application), diff --git a/Example/MyBuiltinLitScene.h b/Example/MyBuiltinLitScene.h index c23436d..283056e 100644 --- a/Example/MyBuiltinLitScene.h +++ b/Example/MyBuiltinLitScene.h @@ -1,7 +1,7 @@ #pragma once -#include "LitScene.h" -#include "BuiltinCamera3D.h" +#include +#include using namespace charcoal; using namespace charcoal::builtin; diff --git a/Example/MyBuiltinLitShadowedScene.cpp b/Example/MyBuiltinLitShadowedScene.cpp index d5ea760..25aaa81 100644 --- a/Example/MyBuiltinLitShadowedScene.cpp +++ b/Example/MyBuiltinLitShadowedScene.cpp @@ -1,8 +1,7 @@ #include "MyBuiltinLitShadowedScene.h" -#include "MeshGenerator.h" - -#include "constants.h" +#include +#include MyBuiltinLitShadowedScene::MyBuiltinLitShadowedScene(Application& application) : litshadowed::Scene(application), diff --git a/Example/MyBuiltinLitShadowedScene.h b/Example/MyBuiltinLitShadowedScene.h index fced45d..226b651 100644 --- a/Example/MyBuiltinLitShadowedScene.h +++ b/Example/MyBuiltinLitShadowedScene.h @@ -1,7 +1,7 @@ #pragma once -#include "LitShadowedScene.h" -#include "BuiltinCamera3D.h" +#include +#include using namespace charcoal; using namespace charcoal::builtin; diff --git a/Example/MyBuiltinTexturedScene.cpp b/Example/MyBuiltinTexturedScene.cpp index 52eea9c..6920691 100644 --- a/Example/MyBuiltinTexturedScene.cpp +++ b/Example/MyBuiltinTexturedScene.cpp @@ -1,9 +1,8 @@ #include "MyBuiltinTexturedScene.h" -#include "MeshGenerator.h" -#include "TextureGenerator.h" - -#include "constants.h" +#include +#include +#include MyBuiltinTexturedScene::MyBuiltinTexturedScene(Application& application) : textured::Scene(application), diff --git a/Example/MyBuiltinTexturedScene.h b/Example/MyBuiltinTexturedScene.h index 74402c6..72a123d 100644 --- a/Example/MyBuiltinTexturedScene.h +++ b/Example/MyBuiltinTexturedScene.h @@ -1,7 +1,7 @@ #pragma once -#include "TexturedScene.h" -#include "BuiltinCamera3D.h" +#include +#include using namespace charcoal; using namespace charcoal::builtin; diff --git a/Example/MySimple2DScene.cpp b/Example/MySimple2DScene.cpp index d30d21d..3e52d66 100644 --- a/Example/MySimple2DScene.cpp +++ b/Example/MySimple2DScene.cpp @@ -1,15 +1,13 @@ #include "MySimple2DScene.h" -#include "deps.h" +#include +#include +#include +#include #include #include -#include "constants.h" - -#include "DrawMode.h" -#include "MeshFactory.h" - MySimple2DScene::MySimple2DScene(Application& application) : Scene(application), m_shape(MeshFactory::gen( diff --git a/Example/MySimple2DScene.h b/Example/MySimple2DScene.h index 4b8842e..c2d4132 100644 --- a/Example/MySimple2DScene.h +++ b/Example/MySimple2DScene.h @@ -1,8 +1,7 @@ #pragma once -#include "Scene.h" - -#include "Camera2D.h" +#include +#include #include "MyBatch.h" #include "MySimpleShaderProgram.h" diff --git a/Example/MySimple3DScene.cpp b/Example/MySimple3DScene.cpp index 8f8adba..1ce0234 100644 --- a/Example/MySimple3DScene.cpp +++ b/Example/MySimple3DScene.cpp @@ -1,15 +1,13 @@ #include "MySimple3DScene.h" -#include "deps.h" +#include +#include +#include +#include #include #include -#include "constants.h" - -#include "DrawMode.h" -#include "MeshFactory.h" - MySimple3DScene::MySimple3DScene(Application& application) : Scene(application), m_shape(MeshFactory::gen( diff --git a/Example/MySimple3DScene.h b/Example/MySimple3DScene.h index 107f417..c85f839 100644 --- a/Example/MySimple3DScene.h +++ b/Example/MySimple3DScene.h @@ -1,8 +1,7 @@ #pragma once -#include "Scene.h" - -#include "Camera3D.h" +#include +#include #include "MyBatch.h" #include "MySimpleShaderProgram.h" diff --git a/Example/MySimpleCubeScene.cpp b/Example/MySimpleCubeScene.cpp index a8b984f..9bb1203 100644 --- a/Example/MySimpleCubeScene.cpp +++ b/Example/MySimpleCubeScene.cpp @@ -1,9 +1,8 @@ #include "MySimpleCubeScene.h" -#include "constants.h" - -#include "MeshFactory.h" -#include "DrawMode.h" +#include +#include +#include MySimpleCubeScene::MySimpleCubeScene(Application& application) : Scene(application), diff --git a/Example/MySimpleCubeScene.h b/Example/MySimpleCubeScene.h index d8420cc..785b519 100644 --- a/Example/MySimpleCubeScene.h +++ b/Example/MySimpleCubeScene.h @@ -1,8 +1,7 @@ #pragma once -#include "Scene.h" - -#include "Camera3D.h" +#include +#include #include "MyBatch.h" #include "MySimpleShaderProgram.h" diff --git a/Example/MySimpleShaderProgram.h b/Example/MySimpleShaderProgram.h index 2be1a33..4eb2fb9 100644 --- a/Example/MySimpleShaderProgram.h +++ b/Example/MySimpleShaderProgram.h @@ -1,9 +1,9 @@ #pragma once -#include "VertexFragmentShaderProgram.h" -#include "Shader.h" -#include "Mesh.h" -#include "Renderable.h" +#include +#include +#include +#include using namespace charcoal; diff --git a/Example/main.cpp b/Example/main.cpp index 70bc7b8..8aaa5bb 100644 --- a/Example/main.cpp +++ b/Example/main.cpp @@ -1,9 +1,11 @@ -#include "deps.h" +#pragma comment(lib, "charcoal.lib") +#pragma comment(lib, "charcoal-builtin.lib") + +#include +#include #include -#include "Exception.h" - #include "MyApplication.h" int main(int argc, char** argv) diff --git a/OpenGLEngine.sln b/OpenGLEngine.sln index f531c0e..cfaabaa 100644 --- a/OpenGLEngine.sln +++ b/OpenGLEngine.sln @@ -6,8 +6,15 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenGLEngine", "OpenGLEngine\OpenGLEngine.vcxproj", "{C03B666E-F3CE-4223-977D-9D6E2952F22E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Example", "Example\Example.vcxproj", "{2713E882-5224-490A-A056-F6AD20C42B12}" + ProjectSection(ProjectDependencies) = postProject + {29E6293C-506A-4FDD-8E3D-36674AD8163D} = {29E6293C-506A-4FDD-8E3D-36674AD8163D} + {C03B666E-F3CE-4223-977D-9D6E2952F22E} = {C03B666E-F3CE-4223-977D-9D6E2952F22E} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CharcoalBuiltin", "CharcoalBuiltin\CharcoalBuiltin.vcxproj", "{29E6293C-506A-4FDD-8E3D-36674AD8163D}" + ProjectSection(ProjectDependencies) = postProject + {C03B666E-F3CE-4223-977D-9D6E2952F22E} = {C03B666E-F3CE-4223-977D-9D6E2952F22E} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/OpenGLEngine/OpenGLEngine.vcxproj b/OpenGLEngine/OpenGLEngine.vcxproj index 9db144f..87b05a3 100644 --- a/OpenGLEngine/OpenGLEngine.vcxproj +++ b/OpenGLEngine/OpenGLEngine.vcxproj @@ -39,7 +39,7 @@ MultiByte - Application + StaticLibrary true v141 MultiByte @@ -70,10 +70,10 @@ - $(ProjectDir)..\lib;$(LibraryPath) + $(SolutionDir)lib;$(LibraryPath) - $(ProjectDir)..\lib;$(LibraryPath) + $(SolutionDir)lib;$(LibraryPath) @@ -91,17 +91,16 @@ true $(ProjectDir)..\include;%(AdditionalIncludeDirectories) NotUsing - SHADER_PATH=R"($(ProjectDir))";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions) + SHADER_PATH=R"($(SolutionDir)shaders\)";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions) - - - - + Prepare LIB Information + copy "$(TargetPath)" "$(SolutionDir)lib\charcoal.lib" +copy "$(ProjectDir)*.h" "$(SolutionDir)include\charcoal\" - copy "$(ProjectDir)..\dll\*" "$(OutDir)" + copy "$(SolutionDir)dll\*" "$(OutDir)" Copy DLLs @@ -131,20 +130,19 @@ true $(ProjectDir)..\include;%(AdditionalIncludeDirectories) NotUsing - SHADER_PATH=R"($(ProjectDir))";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions) + SHADER_PATH=R"($(SolutionDir)shaders\)";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions) true true - - - - + Prepare LIB Information + copy "$(TargetPath)" "$(SolutionDir)lib\charcoal.lib" +copy "$(ProjectDir)*.h" "$(SolutionDir)include\charcoal\" - copy "$(ProjectDir)..\dll\*" "$(OutDir)" + copy "$(SolutionDir)dll\*" "$(OutDir)" Copy DLLs @@ -152,58 +150,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -212,52 +177,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -265,24 +195,6 @@ - - - - - - - - - - - - - - - - - - diff --git a/OpenGLEngine/OpenGLEngine.vcxproj.filters b/OpenGLEngine/OpenGLEngine.vcxproj.filters index 798854d..f275ca7 100644 --- a/OpenGLEngine/OpenGLEngine.vcxproj.filters +++ b/OpenGLEngine/OpenGLEngine.vcxproj.filters @@ -13,521 +13,177 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - {6a527248-fa21-4720-8864-49088116987e} - - - {6f8b9833-6eed-478e-a52d-38bdb2573b92} - - - {053be292-7a70-4d73-8b07-dcb85d3d6ace} - - - {c38724ea-6e5b-4561-bb97-74da2a031319} - - - {3f9911e0-108f-4258-99c4-3f56e80ac27e} - - - {fd515372-39af-44d2-af2c-634b28e91878} - - - {dab3e00b-75ef-4281-b922-5ca6576c2dee} - - - {3361920b-2846-44ef-a1d1-5f867859bbbf} - - - {0c68fb1a-eaef-450c-ab9e-56bcfd75fdff} - - - {65489d6f-e0f8-4530-8e9b-769234deea85} - - - {233b4bce-fc64-4ad1-994e-c986befa7ff2} - - - {c67a5bf1-f6fb-4148-904d-9f96a3c34c88} - - - {51327f54-6f84-477f-8db8-883b91ebc5c2} - - - {2d1806dc-3a5d-4237-b7e3-4fe6d6576dc2} - - + {5c0adf5c-83f0-46f0-89c8-83cdf8f0090d} - + {1bb31cb4-7b36-47b6-b9ee-3d5de57f8f0c} - + {e8ae51e5-5508-47c6-804c-6d13408b8d13} - - {9cd2885f-9d3b-439c-b206-e3d53f6d7191} - - - {b3bc2383-d099-4fac-a51c-d2d4a8e7dea3} - - - {a9e42739-f380-4358-83e5-f994cab7e55c} - - - {f9faae2c-4381-4a2e-a0be-27920a52dc4d} - - - {ca004137-6425-4863-b91a-cf32988855be} - - - {ca80863e-8d81-4a1d-96e2-47fc58c65ed4} - - + {7627441b-5417-427d-a082-9413952614b4} - - {bb1d7dfe-7df9-4d4a-a110-de57a7f79f3a} - - - {b7246e93-9a5b-4c40-9539-0edd785cdcde} - - + {1efd8145-fcba-4c08-8267-7180c458a942} - + {b8357bff-b6be-4ee1-b45e-2f1e0fee90e1} - - {32da6379-79e0-4266-9f92-896845c98850} + + {c67a5bf1-f6fb-4148-904d-9f96a3c34c88} - - {e9fecf63-116f-4e49-a6a0-aee4bdb9c09a} + + {51327f54-6f84-477f-8db8-883b91ebc5c2} - - {2f2c0657-4ba3-4314-86dd-a600f533f746} + + {2d1806dc-3a5d-4237-b7e3-4fe6d6576dc2} - - {fa76cc6e-e866-4987-8263-85abac1ac2c6} + + {ca80863e-8d81-4a1d-96e2-47fc58c65ed4} - - {2e0e6381-fca9-42aa-87a9-04495a753104} + + {bb1d7dfe-7df9-4d4a-a110-de57a7f79f3a} - - {af291666-8e83-495d-979d-8eaa9aacc295} - - - {6b8de3ed-e727-4558-8522-07d2b397c6c8} - - - {da4a1131-4c15-462b-91c9-625d59096f73} - - - {ca87b30d-8b69-4c09-90a5-1fe317322c4c} - - - {283b2135-b031-48f0-b3cc-564a864e13bd} - - - {a67acfda-71a8-46cf-8207-bfdece4228ac} - - - {4c6497d4-160a-45a1-a23b-7bf905de0824} - - - {492583f7-cffd-4d22-82c6-88be804e2f2f} - - - {f3f94b58-31cf-4a57-bc2a-0c3a33a6b9ee} + + {b7246e93-9a5b-4c40-9539-0edd785cdcde} - - Source Files\Example - - Source Files\Engine\Baseline\Application + Source Files\Baseline\Application - Source Files\Engine\Baseline\Application + Source Files\Baseline\Application - Source Files\Engine\Baseline\Application + Source Files\Baseline\Application - Source Files\Engine\Baseline\Application + Source Files\Baseline\Application - Source Files\Engine\Baseline\Rendering + Source Files\Baseline\Rendering - Source Files\Engine\Baseline\Rendering - - - Source Files\Example\Rendering - - - Source Files\Example\Application + Source Files\Baseline\Rendering - Source Files\Engine\Baseline\Rendering + Source Files\Baseline\Rendering - Source Files\Engine\Baseline\Rendering - - - Source Files\Example\Application - - - Source Files\Example\Application - - - Source Files\Example\Application - - - Source Files\Example\Application - - - Source Files\Example\Application - - - Source Files\Example\Application + Source Files\Baseline\Rendering - Source Files\Engine\Baseline\Rendering - - - Source Files\Engine\builtin\Scenes\3D\Basic - - - Source Files\Engine\builtin\Scenes\3D\Basic - - - Source Files\Engine\builtin\Scenes\3D\Lit - - - Source Files\Engine\builtin\Scenes\3D\Lit - - - Source Files\Engine\builtin\Scenes\3D\Textured - - - Source Files\Engine\builtin\Scenes\3D\Textured - - - Source Files\Example\Application - - - Source Files\Engine\builtin\Scenes\3D\LitShadowed - - - Source Files\Engine\builtin\Scenes\3D\LitShadowed - - - Source Files\Example\Application + Source Files\Baseline\Rendering - Source Files\Engine\Baseline + Source Files\Baseline - Source Files\Engine\Baseline + Source Files\Baseline - Source Files\Engine\Baseline - - - Source Files\Engine\builtin\General - - - Source Files\Engine\builtin\General + Source Files\Baseline - Source Files\Engine\Baseline\ImageLoader + Source Files\Baseline\ImageLoader - Source Files\Engine\Plugins\LodePNG + Source Files\Plugins\LodePNG - Source Files\Engine\Baseline - - - Source Files\Engine\builtin\Scenes\2D\Image - - - Source Files\Example\Application - - - Source Files\Engine\builtin\General + Source Files\Baseline - Source Files\Engine\Baseline + Source Files\Baseline - Header Files\Engine\Baseline\Application + Header Files\Baseline\Application - Header Files\Engine\Baseline\Application + Header Files\Baseline\Application - Header Files\Engine\Baseline\Application + Header Files\Baseline\Application - Header Files\Engine\Baseline\Application + Header Files\Baseline\Application - Header Files\Engine\Baseline\Application + Header Files\Baseline\Application - Header Files\Engine\Baseline\Rendering + Header Files\Baseline\Rendering - Header Files\Engine\Baseline\Rendering + Header Files\Baseline\Rendering - Header Files\Engine\Baseline\Rendering - - - Header Files\Example\Rendering - - - Header Files\Example\Application + Header Files\Baseline\Rendering - Header Files\Engine\Baseline\Rendering + Header Files\Baseline\Rendering - Header Files\Engine\Baseline\Rendering - - - Header Files\Example\Application - - - Header Files\Example\Application - - - Header Files\Example\Application - - - Header Files\Example\Rendering - - - Header Files\Example\Rendering - - - Header Files\Example\Application + Header Files\Baseline\Rendering - Header Files\Engine\Baseline\Rendering - - - Header Files\Example\Application - - - Header Files\Example\Application - - - Header Files\Engine\builtin\Scenes\3D\Basic - - - Header Files\Engine\builtin\Scenes\3D\Basic - - - Header Files\Engine\builtin\Scenes\3D\Basic - - - Header Files\Engine\builtin\Scenes\3D\Lit - - - Header Files\Engine\builtin\Scenes\3D\Lit - - - Header Files\Engine\builtin\Scenes\3D\Lit - - - Header Files\Engine\builtin\Scenes\3D\Textured - - - Header Files\Engine\builtin\Scenes\3D\Textured - - - Header Files\Engine\builtin\Scenes\3D\Textured - - - Header Files\Example\Application + Header Files\Baseline\Rendering - Header Files\Engine\Baseline\Rendering - - - Header Files\Engine\builtin\Scenes\3D\LitShadowed - - - Header Files\Engine\builtin\Scenes\3D\LitShadowed - - - Header Files\Engine\builtin\Scenes\3D\LitShadowed - - - Header Files\Example\Application - - - Header Files\Engine\builtin\Scenes\3D\Basic - - - Header Files\Engine\builtin\Scenes\3D\Lit - - - Header Files\Engine\builtin\Scenes\3D\Textured - - - Header Files\Engine\builtin\Scenes\3D\LitShadowed + Header Files\Baseline\Rendering - Header Files\Engine\Baseline + Header Files\Baseline - Header Files\Engine\Baseline + Header Files\Baseline - Header Files\Engine\Baseline + Header Files\Baseline - Header Files\Engine\Baseline + Header Files\Baseline - Header Files\Engine\Baseline + Header Files\Baseline - Header Files\Engine\Baseline + Header Files\Baseline - Header Files\Engine\Baseline + Header Files\Baseline - Header Files\Engine\Baseline + Header Files\Baseline - Header Files\Engine\Baseline + Header Files\Baseline - Header Files\Engine\Baseline + Header Files\Baseline - Header Files\Engine\Baseline + Header Files\Baseline - Header Files\Engine\Baseline - - - Header Files\Engine\builtin\General - - - Header Files\Engine\builtin\General - - - Header Files\Engine\builtin\General - - - Header Files\Engine\builtin\General - - - Header Files\Engine\builtin\General - - - Header Files\Engine\builtin\General - - - Header Files\Engine\builtin\General - - - Header Files\Engine\builtin\General - - - Header Files\Engine\builtin\General - - - Header Files\Engine\builtin\General - - - Header Files\Engine\builtin\General + Header Files\Baseline - Header Files\Engine\Baseline\ImageLoader + Header Files\Baseline\ImageLoader - Header Files\Engine\Plugins\LodePNG - - - Header Files\Engine\builtin\General + Header Files\Plugins\LodePNG - Header Files\Engine\Baseline - - - Header Files\Engine\builtin\General - - - Header Files\Engine\builtin\Scenes\2D\Image - - - Header Files\Engine\builtin\Scenes\2D\Image - - - Header Files\Engine\builtin\General - - - Header Files\Engine\builtin\Scenes\2D\Image - - - Header Files\Example\Application + Header Files\Baseline - Header Files\Engine\Baseline + Header Files\Baseline - - - Source Files\Example\Rendering\Shader Code - - - Source Files\Example\Rendering\Shader Code - - - Source Files\Example\Rendering\Shader Code - - - Source Files\Example\Rendering\Shader Code - - - Source Files\Engine\builtin\Scenes\Shaders - - - Source Files\Engine\builtin\Scenes\Shaders - - - Source Files\Engine\builtin\Scenes\Shaders - - - Source Files\Engine\builtin\Scenes\Shaders - - - Source Files\Engine\builtin\Scenes\Shaders - - - Source Files\Engine\builtin\Scenes\Shaders - - - Source Files\Engine\builtin\Scenes\Shaders - - - Source Files\Engine\builtin\Scenes\Shaders - - - Source Files\Engine\builtin\Scenes\Shaders - - - Source Files\Engine\builtin\Scenes\Shaders - - \ No newline at end of file diff --git a/CharcoalBuiltin/lodepng.cpp b/OpenGLEngine/lodepng.cpp similarity index 100% rename from CharcoalBuiltin/lodepng.cpp rename to OpenGLEngine/lodepng.cpp diff --git a/CharcoalBuiltin/lodepng.h b/OpenGLEngine/lodepng.h similarity index 100% rename from CharcoalBuiltin/lodepng.h rename to OpenGLEngine/lodepng.h diff --git a/CharcoalBuiltin/BasicFS.glsl b/shaders/BasicFS.glsl similarity index 100% rename from CharcoalBuiltin/BasicFS.glsl rename to shaders/BasicFS.glsl diff --git a/CharcoalBuiltin/BasicVS.glsl b/shaders/BasicVS.glsl similarity index 100% rename from CharcoalBuiltin/BasicVS.glsl rename to shaders/BasicVS.glsl diff --git a/CharcoalBuiltin/ImageFS.glsl b/shaders/ImageFS.glsl similarity index 100% rename from CharcoalBuiltin/ImageFS.glsl rename to shaders/ImageFS.glsl diff --git a/CharcoalBuiltin/ImageVS.glsl b/shaders/ImageVS.glsl similarity index 100% rename from CharcoalBuiltin/ImageVS.glsl rename to shaders/ImageVS.glsl diff --git a/CharcoalBuiltin/LitFS.glsl b/shaders/LitFS.glsl similarity index 100% rename from CharcoalBuiltin/LitFS.glsl rename to shaders/LitFS.glsl diff --git a/CharcoalBuiltin/LitShadowedFS.glsl b/shaders/LitShadowedFS.glsl similarity index 100% rename from CharcoalBuiltin/LitShadowedFS.glsl rename to shaders/LitShadowedFS.glsl diff --git a/CharcoalBuiltin/LitShadowedVS.glsl b/shaders/LitShadowedVS.glsl similarity index 100% rename from CharcoalBuiltin/LitShadowedVS.glsl rename to shaders/LitShadowedVS.glsl diff --git a/CharcoalBuiltin/LitVS.glsl b/shaders/LitVS.glsl similarity index 100% rename from CharcoalBuiltin/LitVS.glsl rename to shaders/LitVS.glsl diff --git a/Example/MyBasicFS.glsl b/shaders/MyBasicFS.glsl similarity index 100% rename from Example/MyBasicFS.glsl rename to shaders/MyBasicFS.glsl diff --git a/Example/MyBasicVS.glsl b/shaders/MyBasicVS.glsl similarity index 100% rename from Example/MyBasicVS.glsl rename to shaders/MyBasicVS.glsl diff --git a/Example/MySimpleFS.glsl b/shaders/MySimpleFS.glsl similarity index 100% rename from Example/MySimpleFS.glsl rename to shaders/MySimpleFS.glsl diff --git a/Example/MySimpleVS.glsl b/shaders/MySimpleVS.glsl similarity index 100% rename from Example/MySimpleVS.glsl rename to shaders/MySimpleVS.glsl diff --git a/CharcoalBuiltin/TexturedFS.glsl b/shaders/TexturedFS.glsl similarity index 100% rename from CharcoalBuiltin/TexturedFS.glsl rename to shaders/TexturedFS.glsl diff --git a/CharcoalBuiltin/TexturedVS.glsl b/shaders/TexturedVS.glsl similarity index 100% rename from CharcoalBuiltin/TexturedVS.glsl rename to shaders/TexturedVS.glsl