michael/charcoal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Libraries Work!

Browse Source 
Now the code is being compiled through .lib files!
This commit is contained in:
elipzer 2018-10-11 01:26:24 -04:00
parent 5db5ce971c
commit 7cbe8acf30
74 changed files with 540 additions and 638 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@ -329,4 +329,10 @@ ASALocalRun/
.mfractor/ .mfractor/
# Local History for Visual Studio # Local History for Visual Studio
.localhistory/ .localhistory/
# Generated Files/Directories
include/charcoal-builtin/
include/charcoal/
lib/charcoal-builtin.lib
lib/charcoal.lib

6
CharcoalBuiltin/AutoPrerenderingScene.h
View File

@ -2,9 +2,9 @@
#include <vector> #include <vector>
#include "Application.h" #include <charcoal/Application.h>
#include "Scene.h" #include <charcoal/Scene.h>
#include "Prerenderable.h" #include <charcoal/Prerenderable.h>
namespace charcoal namespace charcoal
{ {

4
CharcoalBuiltin/BasicScene.cpp
View File

@ -1,9 +1,9 @@
#include "BasicScene.h" #include "BasicScene.h"
#include "deps.h" #include <charcoal/deps.h>
#include <charcoal/MeshFactory.h>
#include "GLUtil.h" #include "GLUtil.h"
#include "MeshFactory.h"
namespace charcoal namespace charcoal
{ {

8
CharcoalBuiltin/BasicScene.h
View File

@ -2,17 +2,17 @@
#include <vector> #include <vector>
#include "Application.h" #include <charcoal/Application.h>
#include <charcoal/Camera.h>
#include <charcoal/constants.h>
#include "AutoPrerenderingScene.h" #include "AutoPrerenderingScene.h"
#include "BasicShaderProgram.h" #include "BasicShaderProgram.h"
#include "BasicTypes.h" #include "BasicTypes.h"
#include "Camera.h"
#include "Batched.h" #include "Batched.h"
#include "BasicBatch.h" #include "BasicBatch.h"
#include "constants.h"
namespace charcoal namespace charcoal
{ {
namespace builtin namespace builtin

2
CharcoalBuiltin/BasicShaderProgram.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "VertexFragmentShaderProgram.h" #include <charcoal/VertexFragmentShaderProgram.h>
namespace charcoal namespace charcoal
{ {

4
CharcoalBuiltin/BuiltinBatch.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Prerenderable.h" #include <charcoal/Prerenderable.h>
#include "Batch.h" #include <charcoal/Batch.h>
namespace charcoal namespace charcoal
{ {

4
CharcoalBuiltin/BuiltinCamera2D.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Prerenderable.h" #include <charcoal/Prerenderable.h>
#include "Camera2D.h" #include <charcoal/Camera2D.h>
namespace charcoal namespace charcoal
{ {

4
CharcoalBuiltin/BuiltinCamera3D.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Prerenderable.h" #include <charcoal/Prerenderable.h>
#include "Camera3D.h" #include <charcoal/Camera3D.h>
namespace charcoal namespace charcoal
{ {

8
CharcoalBuiltin/BuiltinTypes.h
View File

@ -1,10 +1,12 @@
#pragma once #pragma once
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include "Renderable.h"
#include <charcoal/Renderable.h>
#include <charcoal/VertexFragmentShaderProgram.h>
#include <charcoal/TextureRenderable.h>
#include "PoseableBatch.h" #include "PoseableBatch.h"
#include "VertexFragmentShaderProgram.h"
#include "TextureRenderable.h"
namespace charcoal namespace charcoal
{ {

76
CharcoalBuiltin/CharcoalBuiltin.vcxproj
View File

@ -39,13 +39,13 @@
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
@ -69,14 +69,30 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LibraryPath>$(SolutionDir)lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LibraryPath>$(SolutionDir)lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>SHADER_PATH=R"($(SolutionDir)shaders\)";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
<PostBuildEvent>
<Command>copy "$(TargetPath)" "$(SolutionDir)lib\charcoal-builtin.lib"
copy "$(ProjectDir)*.h" "$(SolutionDir)include\charcoal-builtin\"</Command>
<Message>Output LIB Setup</Message>
</PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
@ -108,13 +124,67 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>SHADER_PATH=R"($(SolutionDir)shaders\)";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
</Link> </Link>
<PostBuildEvent>
<Command>copy "$(TargetPath)" "$(SolutionDir)lib\charcoal-builtin.lib"
copy "$(ProjectDir)*.h" "$(SolutionDir)include\charcoal-builtin\"</Command>
<Message>Output LIB Setup</Message>
</PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="AutoPrerenderingScene.cpp" />
<ClCompile Include="BasicBatch.cpp" />
<ClCompile Include="BasicScene.cpp" />
<ClCompile Include="GLUtil.cpp" />
<ClCompile Include="ImageScene.cpp" />
<ClCompile Include="LitBatch.cpp" />
<ClCompile Include="LitScene.cpp" />
<ClCompile Include="LitShadowedBatch.cpp" />
<ClCompile Include="LitShadowedScene.cpp" />
<ClCompile Include="TexturedBatch.cpp" />
<ClCompile Include="TexturedScene.cpp" />
<ClCompile Include="TextureGenerator.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="AutoPrerenderingScene.h" />
<ClInclude Include="BasicBatch.h" />
<ClInclude Include="BasicScene.h" />
<ClInclude Include="BasicShaderProgram.h" />
<ClInclude Include="BasicTypes.h" />
<ClInclude Include="Batched.h" />
<ClInclude Include="BuiltinBatch.h" />
<ClInclude Include="BuiltinCamera2D.h" />
<ClInclude Include="BuiltinCamera3D.h" />
<ClInclude Include="BuiltinTypes.h" />
<ClInclude Include="FileUtil.h" />
<ClInclude Include="GLUtil.h" />
<ClInclude Include="ImageScene.h" />
<ClInclude Include="ImageShaderProgram.h" />
<ClInclude Include="ImageTypes.h" />
<ClInclude Include="LitBatch.h" />
<ClInclude Include="LitScene.h" />
<ClInclude Include="LitShaderProgram.h" />
<ClInclude Include="LitShadowedBatch.h" />
<ClInclude Include="LitShadowedScene.h" />
<ClInclude Include="LitShadowedShaderProgram.h" />
<ClInclude Include="LitShadowedTypes.h" />
<ClInclude Include="LitTypes.h" />
<ClInclude Include="MeshGenerator.h" />
<ClInclude Include="Poseable2DBatch.h" />
<ClInclude Include="PoseableBatch.h" />
<ClInclude Include="SpriteBatch.h" />
<ClInclude Include="TexturedBatch.h" />
<ClInclude Include="TexturedScene.h" />
<ClInclude Include="TexturedShaderProgram.h" />
<ClInclude Include="TexturedTypes.h" />
<ClInclude Include="TextureGenerator.h" />
<ClInclude Include="WithCamera.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

139
CharcoalBuiltin/CharcoalBuiltin.vcxproj.filters
View File

@ -14,4 +14,143 @@
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClCompile Include="AutoPrerenderingScene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="BasicBatch.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="BasicScene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GLUtil.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ImageScene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="LitBatch.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="LitScene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="LitShadowedBatch.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="LitShadowedScene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TexturedBatch.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TexturedScene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TextureGenerator.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="AutoPrerenderingScene.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="BasicBatch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="BasicScene.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="BasicShaderProgram.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="BasicTypes.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Batched.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="BuiltinBatch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="BuiltinCamera2D.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="BuiltinCamera3D.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="BuiltinTypes.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="FileUtil.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GLUtil.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ImageScene.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ImageShaderProgram.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ImageTypes.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="LitBatch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="LitScene.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="LitShaderProgram.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="LitShadowedBatch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="LitShadowedScene.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="LitShadowedShaderProgram.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="LitShadowedTypes.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="LitTypes.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MeshGenerator.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Poseable2DBatch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PoseableBatch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="SpriteBatch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TexturedBatch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TexturedScene.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TexturedShaderProgram.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TexturedTypes.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TextureGenerator.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="WithCamera.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project> </Project>

2
CharcoalBuiltin/GLUtil.cpp
View File

@ -1,6 +1,6 @@
#include "GLUtil.h" #include "GLUtil.h"
#include "deps.h" #include <charcoal/deps.h>
namespace charcoal namespace charcoal
{ {

4
CharcoalBuiltin/ImageScene.cpp
View File

@ -1,9 +1,9 @@
#include "ImageScene.h" #include "ImageScene.h"
#include "deps.h" #include <charcoal/deps.h>
#include <charcoal/MeshFactory.h>
#include "GLUtil.h" #include "GLUtil.h"
#include "MeshFactory.h"
namespace charcoal namespace charcoal
{ {

2
CharcoalBuiltin/ImageShaderProgram.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "VertexFragmentShaderProgram.h" #include <charcoal/VertexFragmentShaderProgram.h>
namespace charcoal namespace charcoal
{ {

6
CharcoalBuiltin/LitScene.cpp
View File

@ -1,10 +1,10 @@
#include "LitScene.h" #include "LitScene.h"
#include "deps.h" #include <charcoal/deps.h>
#include <charcoal/Util.h>
#include <charcoal/MeshFactory.h>
#include "Util.h"
#include "GLUtil.h" #include "GLUtil.h"
#include "MeshFactory.h"
namespace charcoal namespace charcoal
{ {

3
CharcoalBuiltin/LitScene.h
View File

@ -2,9 +2,10 @@
#include <vector> #include <vector>
#include <charcoal/Camera.h>
#include "AutoPrerenderingScene.h" #include "AutoPrerenderingScene.h"
#include "LitTypes.h" #include "LitTypes.h"
#include "Camera.h"
#include "Batched.h" #include "Batched.h"
#include "LitBatch.h" #include "LitBatch.h"
#include "LitShaderProgram.h" #include "LitShaderProgram.h"

2
CharcoalBuiltin/LitShaderProgram.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "VertexFragmentShaderProgram.h" #include <charcoal/VertexFragmentShaderProgram.h>
namespace charcoal namespace charcoal
{ {

6
CharcoalBuiltin/LitShadowedScene.cpp
View File

@ -1,10 +1,10 @@
#include "LitShadowedScene.h" #include "LitShadowedScene.h"
#include "deps.h" #include <charcoal/deps.h>
#include <charcoal/Util.h>
#include <charcoal/MeshFactory.h>
#include "Util.h"
#include "GLUtil.h" #include "GLUtil.h"
#include "MeshFactory.h"
namespace charcoal namespace charcoal
{ {

3
CharcoalBuiltin/LitShadowedScene.h
View File

@ -2,9 +2,10 @@
#include <vector> #include <vector>
#include <charcoal/Camera.h>
#include "AutoPrerenderingScene.h" #include "AutoPrerenderingScene.h"
#include "LitShadowedTypes.h" #include "LitShadowedTypes.h"
#include "Camera.h"
#include "Batched.h" #include "Batched.h"
#include "LitShadowedBatch.h" #include "LitShadowedBatch.h"
#include "LitShadowedShaderProgram.h" #include "LitShadowedShaderProgram.h"

2
CharcoalBuiltin/LitShadowedShaderProgram.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "VertexFragmentShaderProgram.h" #include <charcoal/VertexFragmentShaderProgram.h>
namespace charcoal namespace charcoal
{ {

5
CharcoalBuiltin/MeshGenerator.h
View File

@ -4,8 +4,9 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include "MeshFactory.h" #include <charcoal/MeshFactory.h>
#include "Mesh.h" #include <charcoal/Mesh.h>
#include "BuiltinTypes.h" #include "BuiltinTypes.h"
// TODO: Consider a mesh generator for every render type (i.e. basic::meshgenerator, lit::meshgenerator, etc.) // TODO: Consider a mesh generator for every render type (i.e. basic::meshgenerator, lit::meshgenerator, etc.)

7
CharcoalBuiltin/Poseable2DBatch.h
View File

@ -1,9 +1,10 @@
#pragma once #pragma once
#include "Batch.h" #include <charcoal/Batch.h>
#include <charcoal/Renderable.h>
#include <charcoal/Poseable2D.h>
#include "BuiltinBatch.h" #include "BuiltinBatch.h"
#include "Renderable.h"
#include "Poseable2D.h"
namespace charcoal namespace charcoal
{ {

6
CharcoalBuiltin/PoseableBatch.h
View File

@ -1,9 +1,9 @@
#pragma once #pragma once
#include "Batch.h" #include <charcoal/Batch.h>
#include <charcoal/Renderable.h>
#include <charcoal/Poseable.h>
#include "BuiltinBatch.h" #include "BuiltinBatch.h"
#include "Renderable.h"
#include "Poseable.h"
namespace charcoal namespace charcoal
{ {

5
CharcoalBuiltin/SpriteBatch.h
View File

@ -1,7 +1,8 @@
#pragma once #pragma once
#include "Poseable2D.h" #include <charcoal/Poseable2D.h>
#include "TextureRenderable.h" #include <charcoal/TextureRenderable.h>
#include "Poseable2DBatch.h" #include "Poseable2DBatch.h"
namespace charcoal namespace charcoal

2
CharcoalBuiltin/TextureGenerator.cpp
View File

@ -1,6 +1,6 @@
#include "TextureGenerator.h" #include "TextureGenerator.h"
#include "TextureFactory.h" #include <charcoal/TextureFactory.h>
namespace charcoal namespace charcoal
{ {

4
CharcoalBuiltin/TextureGenerator.h
View File

@ -2,8 +2,8 @@
#include <vector> #include <vector>
#include "Texture.h" #include <charcoal/Texture.h>
#include "Sampler.h" #include <charcoal/Sampler.h>
namespace charcoal namespace charcoal
{ {

4
CharcoalBuiltin/TexturedScene.cpp
View File

@ -1,9 +1,9 @@
#include "TexturedScene.h" #include "TexturedScene.h"
#include "deps.h" #include <charcoal/deps.h>
#include <charcoal/MeshFactory.h>
#include "GLUtil.h" #include "GLUtil.h"
#include "MeshFactory.h"
namespace charcoal namespace charcoal
{ {

4
CharcoalBuiltin/TexturedScene.h
View File

@ -2,9 +2,9 @@
#include <vector> #include <vector>
#include "AutoPrerenderingScene.h" #include <charcoal/Camera.h>
#include "Camera.h" #include "AutoPrerenderingScene.h"
#include "Batched.h" #include "Batched.h"
#include "TexturedBatch.h" #include "TexturedBatch.h"
#include "TexturedShaderProgram.h" #include "TexturedShaderProgram.h"

2
CharcoalBuiltin/TexturedShaderProgram.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "VertexFragmentShaderProgram.h" #include <charcoal/VertexFragmentShaderProgram.h>
namespace charcoal namespace charcoal
{ {

3
CharcoalBuiltin/TexturedTypes.h
View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "TextureRenderable.h" #include <charcoal/TextureRenderable.h>
#include "BuiltinTypes.h" #include "BuiltinTypes.h"
namespace charcoal namespace charcoal

2
CharcoalBuiltin/WithCamera.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Camera.h" #include <charcoal/Camera.h>
namespace charcoal namespace charcoal
{ {

42
Example/Example.vcxproj
View File

@ -18,6 +18,35 @@
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp" />
<ClCompile Include="MyApplication.cpp" />
<ClCompile Include="MyBasicScene.cpp" />
<ClCompile Include="MyBatch.cpp" />
<ClCompile Include="MyBuiltinCubeScene.cpp" />
<ClCompile Include="MyBuiltinImageScene.cpp" />
<ClCompile Include="MyBuiltinLitScene.cpp" />
<ClCompile Include="MyBuiltinLitShadowedScene.cpp" />
<ClCompile Include="MyBuiltinTexturedScene.cpp" />
<ClCompile Include="MySimple2DScene.cpp" />
<ClCompile Include="MySimple3DScene.cpp" />
<ClCompile Include="MySimpleCubeScene.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="MyApplication.h" />
<ClInclude Include="MyBasicScene.h" />
<ClInclude Include="MyBasicShaderProgram.h" />
<ClInclude Include="MyBatch.h" />
<ClInclude Include="MyBuiltinCubeScene.h" />
<ClInclude Include="MyBuiltinImageScene.h" />
<ClInclude Include="MyBuiltinLitScene.h" />
<ClInclude Include="MyBuiltinLitShadowedScene.h" />
<ClInclude Include="MyBuiltinTexturedScene.h" />
<ClInclude Include="MySimple2DScene.h" />
<ClInclude Include="MySimple3DScene.h" />
<ClInclude Include="MySimpleCubeScene.h" />
<ClInclude Include="MySimpleShaderProgram.h" />
</ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<VCProjectVersion>15.0</VCProjectVersion> <VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{2713E882-5224-490A-A056-F6AD20C42B12}</ProjectGuid> <ProjectGuid>{2713E882-5224-490A-A056-F6AD20C42B12}</ProjectGuid>
@ -69,13 +98,20 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LibraryPath>$(SolutionDir)lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LibraryPath>$(SolutionDir)lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<PreprocessorDefinitions>SHADER_PATH=R"($(SolutionDir)shaders\)";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -108,14 +144,14 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<PreprocessorDefinitions>SHADER_PATH=R"($(SolutionDir)shaders\)";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

79
Example/Example.vcxproj.filters
View File

@ -14,4 +14,83 @@
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClCompile Include="MyApplication.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MyBasicScene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MyBatch.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MyBuiltinCubeScene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MyBuiltinImageScene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MyBuiltinLitScene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MyBuiltinLitShadowedScene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MyBuiltinTexturedScene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MySimple2DScene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MySimple3DScene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MySimpleCubeScene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="MyApplication.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MyBasicScene.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MyBasicShaderProgram.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MyBatch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MyBuiltinCubeScene.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MyBuiltinImageScene.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MyBuiltinLitScene.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MyBuiltinLitShadowedScene.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MyBuiltinTexturedScene.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MySimple2DScene.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MySimple3DScene.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MySimpleCubeScene.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MySimpleShaderProgram.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project> </Project>

4
Example/MyApplication.h
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include "Application.h"
#include <charcoal/Application.h>
#include <charcoal/Scene.h>
#include "MyBasicScene.h" #include "MyBasicScene.h"
#include "MySimple2DScene.h" #include "MySimple2DScene.h"

2
Example/MyBasicScene.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Scene.h" #include <charcoal/Scene.h>
#include "MyBasicShaderProgram.h" #include "MyBasicShaderProgram.h"

8
Example/MyBasicShaderProgram.h
View File

@ -1,9 +1,9 @@
#pragma once #pragma once
#include "VertexFragmentShaderProgram.h" #include <charcoal/Shader.h>
#include "Shader.h" #include <charcoal/Mesh.h>
#include "Mesh.h" #include <charcoal/Renderable.h>
#include "Renderable.h" #include <charcoal/VertexFragmentShaderProgram.h>
using namespace charcoal; using namespace charcoal;

5
Example/MyBatch.h
View File

@ -1,8 +1,7 @@
#pragma once #pragma once
#include "Batch.h" #include <charcoal/Batch.h>
#include <charcoal/Poseable.h>
#include "Poseable.h"
#include "MySimpleShaderProgram.h" #include "MySimpleShaderProgram.h"

4
Example/MyBuiltinCubeScene.cpp
View File

@ -1,8 +1,8 @@
#include "MyBuiltinCubeScene.h" #include "MyBuiltinCubeScene.h"
#include "MeshGenerator.h" #include <charcoal/constants.h>
#include "constants.h" #include <charcoal-builtin/MeshGenerator.h>
MyBuiltinCubeScene::MyBuiltinCubeScene(Application& application) MyBuiltinCubeScene::MyBuiltinCubeScene(Application& application)
: basic::Scene(application), : basic::Scene(application),

4
Example/MyBuiltinCubeScene.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "BasicScene.h" #include <charcoal-builtin/BasicScene.h>
#include "BuiltinCamera3D.h" #include <charcoal-builtin/BuiltinCamera3D.h>
using namespace charcoal; using namespace charcoal;
using namespace charcoal::builtin; using namespace charcoal::builtin;

10
Example/MyBuiltinImageScene.cpp
View File

@ -1,11 +1,9 @@
#include "MyBuiltinImageScene.h" #include "MyBuiltinImageScene.h"
#include "TextureFactory.h" #include <charcoal/constants.h>
#include <charcoal/TextureFactory.h>
#include "MeshGenerator.h" #include <charcoal-builtin/MeshGenerator.h>
#include "TextureGenerator.h" #include <charcoal-builtin/TextureGenerator.h>
#include "constants.h"
MyBuiltinImageScene::MyBuiltinImageScene(Application& application) MyBuiltinImageScene::MyBuiltinImageScene(Application& application)
: image::Scene(application), : image::Scene(application),

7
Example/MyBuiltinImageScene.h
View File

@ -1,9 +1,8 @@
#pragma once #pragma once
#include "ImageLoader.h" #include <charcoal/ImageLoader.h>
#include <charcoal-builtin/ImageScene.h>
#include "ImageScene.h" #include <charcoal-builtin/BuiltinCamera2D.h>
#include "BuiltinCamera2D.h"
using namespace charcoal; using namespace charcoal;
using namespace charcoal::builtin; using namespace charcoal::builtin;

5
Example/MyBuiltinLitScene.cpp
View File

@ -1,8 +1,7 @@
#include "MyBuiltinLitScene.h" #include "MyBuiltinLitScene.h"
#include "MeshGenerator.h" #include <charcoal/constants.h>
#include <charcoal-builtin/MeshGenerator.h>
#include "constants.h"
MyBuiltinLitScene::MyBuiltinLitScene(Application& application) MyBuiltinLitScene::MyBuiltinLitScene(Application& application)
: lit::Scene(application), : lit::Scene(application),

4
Example/MyBuiltinLitScene.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "LitScene.h" #include <charcoal-builtin/LitScene.h>
#include "BuiltinCamera3D.h" #include <charcoal-builtin/BuiltinCamera3D.h>
using namespace charcoal; using namespace charcoal;
using namespace charcoal::builtin; using namespace charcoal::builtin;

5
Example/MyBuiltinLitShadowedScene.cpp
View File

@ -1,8 +1,7 @@
#include "MyBuiltinLitShadowedScene.h" #include "MyBuiltinLitShadowedScene.h"
#include "MeshGenerator.h" #include <charcoal/constants.h>
#include <charcoal-builtin/MeshGenerator.h>
#include "constants.h"
MyBuiltinLitShadowedScene::MyBuiltinLitShadowedScene(Application& application) MyBuiltinLitShadowedScene::MyBuiltinLitShadowedScene(Application& application)
: litshadowed::Scene(application), : litshadowed::Scene(application),

4
Example/MyBuiltinLitShadowedScene.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "LitShadowedScene.h" #include <charcoal-builtin/LitShadowedScene.h>
#include "BuiltinCamera3D.h" #include <charcoal-builtin/BuiltinCamera3D.h>
using namespace charcoal; using namespace charcoal;
using namespace charcoal::builtin; using namespace charcoal::builtin;

7
Example/MyBuiltinTexturedScene.cpp
View File

@ -1,9 +1,8 @@
#include "MyBuiltinTexturedScene.h" #include "MyBuiltinTexturedScene.h"
#include "MeshGenerator.h" #include <charcoal/constants.h>
#include "TextureGenerator.h" #include <charcoal-builtin/MeshGenerator.h>
#include <charcoal-builtin/TextureGenerator.h>
#include "constants.h"
MyBuiltinTexturedScene::MyBuiltinTexturedScene(Application& application) MyBuiltinTexturedScene::MyBuiltinTexturedScene(Application& application)
: textured::Scene(application), : textured::Scene(application),

4
Example/MyBuiltinTexturedScene.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "TexturedScene.h" #include <charcoal-builtin/TexturedScene.h>
#include "BuiltinCamera3D.h" #include <charcoal-builtin/BuiltinCamera3D.h>
using namespace charcoal; using namespace charcoal;
using namespace charcoal::builtin; using namespace charcoal::builtin;

10
Example/MySimple2DScene.cpp
View File

@ -1,15 +1,13 @@
#include "MySimple2DScene.h" #include "MySimple2DScene.h"
#include "deps.h" #include <charcoal/deps.h>
#include <charcoal/constants.h>
#include <charcoal/DrawMode.h>
#include <charcoal/MeshFactory.h>
#include <cmath> #include <cmath>
#include <iostream> #include <iostream>
#include "constants.h"
#include "DrawMode.h"
#include "MeshFactory.h"
MySimple2DScene::MySimple2DScene(Application& application) MySimple2DScene::MySimple2DScene(Application& application)
: Scene(application), : Scene(application),
m_shape(MeshFactory<MySimpleShaderProgram::Vertex, MySimpleShaderProgram::Index>::gen( m_shape(MeshFactory<MySimpleShaderProgram::Vertex, MySimpleShaderProgram::Index>::gen(

5
Example/MySimple2DScene.h
View File

@ -1,8 +1,7 @@
#pragma once #pragma once
#include "Scene.h" #include <charcoal/Scene.h>
#include <charcoal/Camera2D.h>
#include "Camera2D.h"
#include "MyBatch.h" #include "MyBatch.h"
#include "MySimpleShaderProgram.h" #include "MySimpleShaderProgram.h"

10
Example/MySimple3DScene.cpp
View File

@ -1,15 +1,13 @@
#include "MySimple3DScene.h" #include "MySimple3DScene.h"
#include "deps.h" #include <charcoal/deps.h>
#include <charcoal/constants.h>
#include <charcoal/DrawMode.h>
#include <charcoal/MeshFactory.h>
#include <cmath> #include <cmath>
#include <iostream> #include <iostream>
#include "constants.h"
#include "DrawMode.h"
#include "MeshFactory.h"
MySimple3DScene::MySimple3DScene(Application& application) MySimple3DScene::MySimple3DScene(Application& application)
: Scene(application), : Scene(application),
m_shape(MeshFactory<MySimpleShaderProgram::Vertex, MySimpleShaderProgram::Index>::gen( m_shape(MeshFactory<MySimpleShaderProgram::Vertex, MySimpleShaderProgram::Index>::gen(

5
Example/MySimple3DScene.h
View File

@ -1,8 +1,7 @@
#pragma once #pragma once
#include "Scene.h" #include <charcoal/Scene.h>
#include <charcoal/Camera3D.h>
#include "Camera3D.h"
#include "MyBatch.h" #include "MyBatch.h"
#include "MySimpleShaderProgram.h" #include "MySimpleShaderProgram.h"

7
Example/MySimpleCubeScene.cpp
View File

@ -1,9 +1,8 @@
#include "MySimpleCubeScene.h" #include "MySimpleCubeScene.h"
#include "constants.h" #include <charcoal/constants.h>
#include <charcoal/MeshFactory.h>
#include "MeshFactory.h" #include <charcoal/DrawMode.h>
#include "DrawMode.h"
MySimpleCubeScene::MySimpleCubeScene(Application& application) MySimpleCubeScene::MySimpleCubeScene(Application& application)
: Scene(application), : Scene(application),

5
Example/MySimpleCubeScene.h
View File

@ -1,8 +1,7 @@
#pragma once #pragma once
#include "Scene.h" #include <charcoal/Scene.h>
#include <charcoal/Camera3D.h>
#include "Camera3D.h"
#include "MyBatch.h" #include "MyBatch.h"
#include "MySimpleShaderProgram.h" #include "MySimpleShaderProgram.h"

8
Example/MySimpleShaderProgram.h
View File

@ -1,9 +1,9 @@
#pragma once #pragma once
#include "VertexFragmentShaderProgram.h" #include <charcoal/VertexFragmentShaderProgram.h>
#include "Shader.h" #include <charcoal/Shader.h>
#include "Mesh.h" #include <charcoal/Mesh.h>
#include "Renderable.h" #include <charcoal/Renderable.h>
using namespace charcoal; using namespace charcoal;

8
Example/main.cpp
View File

@ -1,9 +1,11 @@
#include "deps.h" #pragma comment(lib, "charcoal.lib")
#pragma comment(lib, "charcoal-builtin.lib")
#include <charcoal/deps.h>
#include <charcoal/Exception.h>
#include <string> #include <string>
#include "Exception.h"
#include "MyApplication.h" #include "MyApplication.h"
int main(int argc, char** argv) int main(int argc, char** argv)

7
OpenGLEngine.sln
View File

@ -6,8 +6,15 @@ MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenGLEngine", "OpenGLEngine\OpenGLEngine.vcxproj", "{C03B666E-F3CE-4223-977D-9D6E2952F22E}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenGLEngine", "OpenGLEngine\OpenGLEngine.vcxproj", "{C03B666E-F3CE-4223-977D-9D6E2952F22E}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Example", "Example\Example.vcxproj", "{2713E882-5224-490A-A056-F6AD20C42B12}" 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 EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CharcoalBuiltin", "CharcoalBuiltin\CharcoalBuiltin.vcxproj", "{29E6293C-506A-4FDD-8E3D-36674AD8163D}" 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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

114
OpenGLEngine/OpenGLEngine.vcxproj
View File

@ -39,7 +39,7 @@
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
@ -70,10 +70,10 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LibraryPath>$(ProjectDir)..\lib;$(LibraryPath)</LibraryPath> <LibraryPath>$(SolutionDir)lib;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LibraryPath>$(ProjectDir)..\lib;$(LibraryPath)</LibraryPath> <LibraryPath>$(SolutionDir)lib;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
@ -91,17 +91,16 @@
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(ProjectDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<PreprocessorDefinitions>SHADER_PATH=R"($(ProjectDir))";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>SHADER_PATH=R"($(SolutionDir)shaders\)";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link /> <Link />
<PostBuildEvent> <PostBuildEvent>
<Message> <Message>Prepare LIB Information</Message>
</Message> <Command>copy "$(TargetPath)" "$(SolutionDir)lib\charcoal.lib"
<Command> copy "$(ProjectDir)*.h" "$(SolutionDir)include\charcoal\"</Command>
</Command>
</PostBuildEvent> </PostBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Command>copy "$(ProjectDir)..\dll\*" "$(OutDir)"</Command> <Command>copy "$(SolutionDir)dll\*" "$(OutDir)"</Command>
</PreBuildEvent> </PreBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Message>Copy DLLs</Message> <Message>Copy DLLs</Message>
@ -131,20 +130,19 @@
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(ProjectDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<PreprocessorDefinitions>SHADER_PATH=R"($(ProjectDir))";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>SHADER_PATH=R"($(SolutionDir)shaders\)";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Message> <Message>Prepare LIB Information</Message>
</Message> <Command>copy "$(TargetPath)" "$(SolutionDir)lib\charcoal.lib"
<Command> copy "$(ProjectDir)*.h" "$(SolutionDir)include\charcoal\"</Command>
</Command>
</PostBuildEvent> </PostBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Command>copy "$(ProjectDir)..\dll\*" "$(OutDir)"</Command> <Command>copy "$(SolutionDir)dll\*" "$(OutDir)"</Command>
</PreBuildEvent> </PreBuildEvent>
<PreBuildEvent> <PreBuildEvent>
<Message>Copy DLLs</Message> <Message>Copy DLLs</Message>
@ -152,58 +150,25 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="Application.cpp" /> <ClCompile Include="Application.cpp" />
<ClCompile Include="AutoPrerenderingScene.cpp" />
<ClCompile Include="BasicBatch.cpp" />
<ClCompile Include="BasicScene.cpp" />
<ClCompile Include="Camera2D.cpp" /> <ClCompile Include="Camera2D.cpp" />
<ClCompile Include="Camera3D.cpp" /> <ClCompile Include="Camera3D.cpp" />
<ClCompile Include="FPS.cpp" /> <ClCompile Include="FPS.cpp" />
<ClCompile Include="ImageLoader.cpp" /> <ClCompile Include="ImageLoader.cpp" />
<ClCompile Include="ImageScene.cpp" />
<ClCompile Include="LitBatch.cpp" />
<ClCompile Include="LitScene.cpp" />
<ClCompile Include="LitShadowedBatch.cpp" />
<ClCompile Include="LitShadowedScene.cpp" />
<ClCompile Include="lodepng.cpp" /> <ClCompile Include="lodepng.cpp" />
<ClCompile Include="MyBuiltinCubeScene.cpp" />
<ClCompile Include="GLFWInputManager.cpp" /> <ClCompile Include="GLFWInputManager.cpp" />
<ClCompile Include="GLUtil.cpp" />
<ClCompile Include="InputManager.cpp" /> <ClCompile Include="InputManager.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="MyBuiltinImageScene.cpp" />
<ClCompile Include="MyBuiltinLitScene.cpp" />
<ClCompile Include="MyBuiltinLitShadowedScene.cpp" />
<ClCompile Include="MyBuiltinTexturedScene.cpp" />
<ClCompile Include="MySimpleCubeScene.cpp" />
<ClCompile Include="MySimple3DScene.cpp" />
<ClCompile Include="MyApplication.cpp" />
<ClCompile Include="MyBatch.cpp" />
<ClCompile Include="MySimple2DScene.cpp" />
<ClCompile Include="MyBasicScene.cpp" />
<ClCompile Include="Poseable.cpp" /> <ClCompile Include="Poseable.cpp" />
<ClCompile Include="Poseable2D.cpp" /> <ClCompile Include="Poseable2D.cpp" />
<ClCompile Include="Shader.cpp" /> <ClCompile Include="Shader.cpp" />
<ClCompile Include="ShaderProgram.cpp" /> <ClCompile Include="ShaderProgram.cpp" />
<ClCompile Include="Sampler.cpp" /> <ClCompile Include="Sampler.cpp" />
<ClCompile Include="TexturedBatch.cpp" />
<ClCompile Include="TexturedScene.cpp" />
<ClCompile Include="TextureFactory.cpp" /> <ClCompile Include="TextureFactory.cpp" />
<ClCompile Include="TextureGenerator.cpp" />
<ClCompile Include="Util.cpp" /> <ClCompile Include="Util.cpp" />
<ClCompile Include="VertexFragmentShaderProgram.cpp" /> <ClCompile Include="VertexFragmentShaderProgram.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Application.h" /> <ClInclude Include="Application.h" />
<ClInclude Include="AutoPrerenderingScene.h" />
<ClInclude Include="BasicBatch.h" />
<ClInclude Include="BasicScene.h" />
<ClInclude Include="BasicShaderProgram.h" />
<ClInclude Include="BasicTypes.h" />
<ClInclude Include="Batch.h" /> <ClInclude Include="Batch.h" />
<ClInclude Include="Batched.h" />
<ClInclude Include="BuiltinBatch.h" />
<ClInclude Include="BuiltinCamera3D.h" />
<ClInclude Include="BuiltinCamera2D.h" />
<ClInclude Include="Camera.h" /> <ClInclude Include="Camera.h" />
<ClInclude Include="Camera2D.h" /> <ClInclude Include="Camera2D.h" />
<ClInclude Include="Camera3D.h" /> <ClInclude Include="Camera3D.h" />
@ -212,52 +177,17 @@
<ClInclude Include="Exception.h" /> <ClInclude Include="Exception.h" />
<ClInclude Include="FPS.h" /> <ClInclude Include="FPS.h" />
<ClInclude Include="ImageLoader.h" /> <ClInclude Include="ImageLoader.h" />
<ClInclude Include="ImageScene.h" />
<ClInclude Include="ImageShaderProgram.h" />
<ClInclude Include="ImageTypes.h" />
<ClInclude Include="LitBatch.h" />
<ClInclude Include="LitScene.h" />
<ClInclude Include="LitShaderProgram.h" />
<ClInclude Include="LitShadowedBatch.h" />
<ClInclude Include="LitShadowedScene.h" />
<ClInclude Include="LitShadowedShaderProgram.h" />
<ClInclude Include="LitShadowedTypes.h" />
<ClInclude Include="LitTypes.h" />
<ClInclude Include="lodepng.h" /> <ClInclude Include="lodepng.h" />
<ClInclude Include="MyBuiltinCubeScene.h" />
<ClInclude Include="MyBuiltinImageScene.h" />
<ClInclude Include="MyBuiltinLitScene.h" />
<ClInclude Include="MyBuiltinLitShadowedScene.h" />
<ClInclude Include="MyBuiltinTexturedScene.h" />
<ClInclude Include="Poseable2DBatch.h" />
<ClInclude Include="PoseableBatch.h" />
<ClInclude Include="Prerenderable.h" />
<ClInclude Include="Sampler.h" /> <ClInclude Include="Sampler.h" />
<ClInclude Include="Poseable2D.h" /> <ClInclude Include="Poseable2D.h" />
<ClInclude Include="SpriteBatch.h" />
<ClInclude Include="Texture.h" /> <ClInclude Include="Texture.h" />
<ClInclude Include="TexturedBatch.h" />
<ClInclude Include="TexturedTypes.h" />
<ClInclude Include="TextureFactory.h" /> <ClInclude Include="TextureFactory.h" />
<ClInclude Include="TextureGenerator.h" />
<ClInclude Include="TextureRenderable.h" /> <ClInclude Include="TextureRenderable.h" />
<ClInclude Include="TexturedScene.h" />
<ClInclude Include="TexturedShaderProgram.h" />
<ClInclude Include="VertexFragmentShaderProgram.h" /> <ClInclude Include="VertexFragmentShaderProgram.h" />
<ClInclude Include="GLFWInputManager.h" /> <ClInclude Include="GLFWInputManager.h" />
<ClInclude Include="GLUtil.h" />
<ClInclude Include="InputManager.h" /> <ClInclude Include="InputManager.h" />
<ClInclude Include="Mesh.h" /> <ClInclude Include="Mesh.h" />
<ClInclude Include="MeshFactory.h" /> <ClInclude Include="MeshFactory.h" />
<ClInclude Include="MeshGenerator.h" />
<ClInclude Include="MySimpleCubeScene.h" />
<ClInclude Include="MySimple3DScene.h" />
<ClInclude Include="MyApplication.h" />
<ClInclude Include="MyBatch.h" />
<ClInclude Include="MySimpleShaderProgram.h" />
<ClInclude Include="MySimple2DScene.h" />
<ClInclude Include="MyBasicShaderProgram.h" />
<ClInclude Include="MyBasicScene.h" />
<ClInclude Include="Poseable.h" /> <ClInclude Include="Poseable.h" />
<ClInclude Include="Renderable.h" /> <ClInclude Include="Renderable.h" />
<ClInclude Include="Scene.h" /> <ClInclude Include="Scene.h" />
@ -265,24 +195,6 @@
<ClInclude Include="ShaderProgram.h" /> <ClInclude Include="ShaderProgram.h" />
<ClInclude Include="deps.h" /> <ClInclude Include="deps.h" />
<ClInclude Include="Util.h" /> <ClInclude Include="Util.h" />
<ClInclude Include="BuiltinTypes.h" />
<ClInclude Include="WithCamera.h" />
</ItemGroup>
<ItemGroup>
<None Include="BasicFS.glsl" />
<None Include="BasicVS.glsl" />
<None Include="ImageFS.glsl" />
<None Include="ImageVS.glsl" />
<None Include="LitShadowedFS.glsl" />
<None Include="LitShadowedVS.glsl" />
<None Include="MySimpleFS.glsl" />
<None Include="MySimpleVS.glsl" />
<None Include="MyBasicFS.glsl" />
<None Include="MyBasicVS.glsl" />
<None Include="LitVS.glsl" />
<None Include="LitFS.glsl" />
<None Include="TexturedFS.glsl" />
<None Include="TexturedVS.glsl" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

468
OpenGLEngine/OpenGLEngine.vcxproj.filters
View File

@ -13,521 +13,177 @@
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter> </Filter>
<Filter Include="Header Files\Example"> <Filter Include="Source Files\Baseline">
<UniqueIdentifier>{6a527248-fa21-4720-8864-49088116987e}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Example">
<UniqueIdentifier>{6f8b9833-6eed-478e-a52d-38bdb2573b92}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Engine">
<UniqueIdentifier>{053be292-7a70-4d73-8b07-dcb85d3d6ace}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Engine">
<UniqueIdentifier>{c38724ea-6e5b-4561-bb97-74da2a031319}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Example\Application">
<UniqueIdentifier>{3f9911e0-108f-4258-99c4-3f56e80ac27e}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Example\Rendering">
<UniqueIdentifier>{fd515372-39af-44d2-af2c-634b28e91878}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Example\Application">
<UniqueIdentifier>{dab3e00b-75ef-4281-b922-5ca6576c2dee}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Example\Rendering">
<UniqueIdentifier>{3361920b-2846-44ef-a1d1-5f867859bbbf}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Example\Rendering\Shader Code">
<UniqueIdentifier>{0c68fb1a-eaef-450c-ab9e-56bcfd75fdff}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Engine\builtin">
<UniqueIdentifier>{65489d6f-e0f8-4530-8e9b-769234deea85}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Engine\builtin">
<UniqueIdentifier>{233b4bce-fc64-4ad1-994e-c986befa7ff2}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Engine\Baseline">
<UniqueIdentifier>{c67a5bf1-f6fb-4148-904d-9f96a3c34c88}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Engine\Baseline\Rendering">
<UniqueIdentifier>{51327f54-6f84-477f-8db8-883b91ebc5c2}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Engine\Baseline\Application">
<UniqueIdentifier>{2d1806dc-3a5d-4237-b7e3-4fe6d6576dc2}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Engine\Baseline">
<UniqueIdentifier>{5c0adf5c-83f0-46f0-89c8-83cdf8f0090d}</UniqueIdentifier> <UniqueIdentifier>{5c0adf5c-83f0-46f0-89c8-83cdf8f0090d}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files\Engine\Baseline\Rendering"> <Filter Include="Source Files\Baseline\Rendering">
<UniqueIdentifier>{1bb31cb4-7b36-47b6-b9ee-3d5de57f8f0c}</UniqueIdentifier> <UniqueIdentifier>{1bb31cb4-7b36-47b6-b9ee-3d5de57f8f0c}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files\Engine\Baseline\Application"> <Filter Include="Source Files\Baseline\Application">
<UniqueIdentifier>{e8ae51e5-5508-47c6-804c-6d13408b8d13}</UniqueIdentifier> <UniqueIdentifier>{e8ae51e5-5508-47c6-804c-6d13408b8d13}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header Files\Engine\builtin\General"> <Filter Include="Source Files\Baseline\ImageLoader">
<UniqueIdentifier>{9cd2885f-9d3b-439c-b206-e3d53f6d7191}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Engine\builtin\Scenes">
<UniqueIdentifier>{b3bc2383-d099-4fac-a51c-d2d4a8e7dea3}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Engine\builtin\General">
<UniqueIdentifier>{a9e42739-f380-4358-83e5-f994cab7e55c}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Engine\builtin\Scenes">
<UniqueIdentifier>{f9faae2c-4381-4a2e-a0be-27920a52dc4d}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Engine\builtin\Scenes\Shaders">
<UniqueIdentifier>{ca004137-6425-4863-b91a-cf32988855be}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Engine\Baseline\ImageLoader">
<UniqueIdentifier>{ca80863e-8d81-4a1d-96e2-47fc58c65ed4}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Engine\Baseline\ImageLoader">
<UniqueIdentifier>{7627441b-5417-427d-a082-9413952614b4}</UniqueIdentifier> <UniqueIdentifier>{7627441b-5417-427d-a082-9413952614b4}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header Files\Engine\Plugins"> <Filter Include="Source Files\Plugins">
<UniqueIdentifier>{bb1d7dfe-7df9-4d4a-a110-de57a7f79f3a}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Engine\Plugins\LodePNG">
<UniqueIdentifier>{b7246e93-9a5b-4c40-9539-0edd785cdcde}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Engine\Plugins">
<UniqueIdentifier>{1efd8145-fcba-4c08-8267-7180c458a942}</UniqueIdentifier> <UniqueIdentifier>{1efd8145-fcba-4c08-8267-7180c458a942}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files\Engine\Plugins\LodePNG"> <Filter Include="Source Files\Plugins\LodePNG">
<UniqueIdentifier>{b8357bff-b6be-4ee1-b45e-2f1e0fee90e1}</UniqueIdentifier> <UniqueIdentifier>{b8357bff-b6be-4ee1-b45e-2f1e0fee90e1}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header Files\Engine\builtin\Scenes\3D"> <Filter Include="Header Files\Baseline">
<UniqueIdentifier>{32da6379-79e0-4266-9f92-896845c98850}</UniqueIdentifier> <UniqueIdentifier>{c67a5bf1-f6fb-4148-904d-9f96a3c34c88}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header Files\Engine\builtin\Scenes\2D"> <Filter Include="Header Files\Baseline\Rendering">
<UniqueIdentifier>{e9fecf63-116f-4e49-a6a0-aee4bdb9c09a}</UniqueIdentifier> <UniqueIdentifier>{51327f54-6f84-477f-8db8-883b91ebc5c2}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header Files\Engine\builtin\Scenes\3D\LitShadowed"> <Filter Include="Header Files\Baseline\Application">
<UniqueIdentifier>{2f2c0657-4ba3-4314-86dd-a600f533f746}</UniqueIdentifier> <UniqueIdentifier>{2d1806dc-3a5d-4237-b7e3-4fe6d6576dc2}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header Files\Engine\builtin\Scenes\3D\Lit"> <Filter Include="Header Files\Baseline\ImageLoader">
<UniqueIdentifier>{fa76cc6e-e866-4987-8263-85abac1ac2c6}</UniqueIdentifier> <UniqueIdentifier>{ca80863e-8d81-4a1d-96e2-47fc58c65ed4}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header Files\Engine\builtin\Scenes\3D\Textured"> <Filter Include="Header Files\Plugins">
<UniqueIdentifier>{2e0e6381-fca9-42aa-87a9-04495a753104}</UniqueIdentifier> <UniqueIdentifier>{bb1d7dfe-7df9-4d4a-a110-de57a7f79f3a}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header Files\Engine\builtin\Scenes\2D\Image"> <Filter Include="Header Files\Plugins\LodePNG">
<UniqueIdentifier>{af291666-8e83-495d-979d-8eaa9aacc295}</UniqueIdentifier> <UniqueIdentifier>{b7246e93-9a5b-4c40-9539-0edd785cdcde}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Engine\builtin\Scenes\2D">
<UniqueIdentifier>{6b8de3ed-e727-4558-8522-07d2b397c6c8}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Engine\builtin\Scenes\3D">
<UniqueIdentifier>{da4a1131-4c15-462b-91c9-625d59096f73}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Engine\builtin\Scenes\3D\LitShadowed">
<UniqueIdentifier>{ca87b30d-8b69-4c09-90a5-1fe317322c4c}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Engine\builtin\Scenes\3D\Basic">
<UniqueIdentifier>{283b2135-b031-48f0-b3cc-564a864e13bd}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Engine\builtin\Scenes\3D\Lit">
<UniqueIdentifier>{a67acfda-71a8-46cf-8207-bfdece4228ac}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Engine\builtin\Scenes\3D\Textured">
<UniqueIdentifier>{4c6497d4-160a-45a1-a23b-7bf905de0824}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Engine\builtin\Scenes\2D\Image">
<UniqueIdentifier>{492583f7-cffd-4d22-82c6-88be804e2f2f}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Engine\builtin\Scenes\3D\Basic">
<UniqueIdentifier>{f3f94b58-31cf-4a57-bc2a-0c3a33a6b9ee}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="main.cpp">
<Filter>Source Files\Example</Filter>
</ClCompile>
<ClCompile Include="Application.cpp"> <ClCompile Include="Application.cpp">
<Filter>Source Files\Engine\Baseline\Application</Filter> <Filter>Source Files\Baseline\Application</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="FPS.cpp"> <ClCompile Include="FPS.cpp">
<Filter>Source Files\Engine\Baseline\Application</Filter> <Filter>Source Files\Baseline\Application</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GLFWInputManager.cpp"> <ClCompile Include="GLFWInputManager.cpp">
<Filter>Source Files\Engine\Baseline\Application</Filter> <Filter>Source Files\Baseline\Application</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="InputManager.cpp"> <ClCompile Include="InputManager.cpp">
<Filter>Source Files\Engine\Baseline\Application</Filter> <Filter>Source Files\Baseline\Application</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="ShaderProgram.cpp"> <ClCompile Include="ShaderProgram.cpp">
<Filter>Source Files\Engine\Baseline\Rendering</Filter> <Filter>Source Files\Baseline\Rendering</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Shader.cpp"> <ClCompile Include="Shader.cpp">
<Filter>Source Files\Engine\Baseline\Rendering</Filter> <Filter>Source Files\Baseline\Rendering</Filter>
</ClCompile>
<ClCompile Include="MyBatch.cpp">
<Filter>Source Files\Example\Rendering</Filter>
</ClCompile>
<ClCompile Include="MyApplication.cpp">
<Filter>Source Files\Example\Application</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Camera2D.cpp"> <ClCompile Include="Camera2D.cpp">
<Filter>Source Files\Engine\Baseline\Rendering</Filter> <Filter>Source Files\Baseline\Rendering</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Camera3D.cpp"> <ClCompile Include="Camera3D.cpp">
<Filter>Source Files\Engine\Baseline\Rendering</Filter> <Filter>Source Files\Baseline\Rendering</Filter>
</ClCompile>
<ClCompile Include="MySimple2DScene.cpp">
<Filter>Source Files\Example\Application</Filter>
</ClCompile>
<ClCompile Include="MySimple3DScene.cpp">
<Filter>Source Files\Example\Application</Filter>
</ClCompile>
<ClCompile Include="MyBasicScene.cpp">
<Filter>Source Files\Example\Application</Filter>
</ClCompile>
<ClCompile Include="MySimpleCubeScene.cpp">
<Filter>Source Files\Example\Application</Filter>
</ClCompile>
<ClCompile Include="MyBuiltinCubeScene.cpp">
<Filter>Source Files\Example\Application</Filter>
</ClCompile>
<ClCompile Include="MyBuiltinLitScene.cpp">
<Filter>Source Files\Example\Application</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="VertexFragmentShaderProgram.cpp"> <ClCompile Include="VertexFragmentShaderProgram.cpp">
<Filter>Source Files\Engine\Baseline\Rendering</Filter> <Filter>Source Files\Baseline\Rendering</Filter>
</ClCompile>
<ClCompile Include="BasicBatch.cpp">
<Filter>Source Files\Engine\builtin\Scenes\3D\Basic</Filter>
</ClCompile>
<ClCompile Include="BasicScene.cpp">
<Filter>Source Files\Engine\builtin\Scenes\3D\Basic</Filter>
</ClCompile>
<ClCompile Include="LitBatch.cpp">
<Filter>Source Files\Engine\builtin\Scenes\3D\Lit</Filter>
</ClCompile>
<ClCompile Include="LitScene.cpp">
<Filter>Source Files\Engine\builtin\Scenes\3D\Lit</Filter>
</ClCompile>
<ClCompile Include="TexturedBatch.cpp">
<Filter>Source Files\Engine\builtin\Scenes\3D\Textured</Filter>
</ClCompile>
<ClCompile Include="TexturedScene.cpp">
<Filter>Source Files\Engine\builtin\Scenes\3D\Textured</Filter>
</ClCompile>
<ClCompile Include="MyBuiltinTexturedScene.cpp">
<Filter>Source Files\Example\Application</Filter>
</ClCompile>
<ClCompile Include="LitShadowedBatch.cpp">
<Filter>Source Files\Engine\builtin\Scenes\3D\LitShadowed</Filter>
</ClCompile>
<ClCompile Include="LitShadowedScene.cpp">
<Filter>Source Files\Engine\builtin\Scenes\3D\LitShadowed</Filter>
</ClCompile>
<ClCompile Include="MyBuiltinLitShadowedScene.cpp">
<Filter>Source Files\Example\Application</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Poseable.cpp"> <ClCompile Include="Poseable.cpp">
<Filter>Source Files\Engine\Baseline</Filter> <Filter>Source Files\Baseline</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Sampler.cpp"> <ClCompile Include="Sampler.cpp">
<Filter>Source Files\Engine\Baseline</Filter> <Filter>Source Files\Baseline</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Util.cpp"> <ClCompile Include="Util.cpp">
<Filter>Source Files\Engine\Baseline</Filter> <Filter>Source Files\Baseline</Filter>
</ClCompile>
<ClCompile Include="AutoPrerenderingScene.cpp">
<Filter>Source Files\Engine\builtin\General</Filter>
</ClCompile>
<ClCompile Include="GLUtil.cpp">
<Filter>Source Files\Engine\builtin\General</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="ImageLoader.cpp"> <ClCompile Include="ImageLoader.cpp">
<Filter>Source Files\Engine\Baseline\ImageLoader</Filter> <Filter>Source Files\Baseline\ImageLoader</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="lodepng.cpp"> <ClCompile Include="lodepng.cpp">
<Filter>Source Files\Engine\Plugins\LodePNG</Filter> <Filter>Source Files\Plugins\LodePNG</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Poseable2D.cpp"> <ClCompile Include="Poseable2D.cpp">
<Filter>Source Files\Engine\Baseline</Filter> <Filter>Source Files\Baseline</Filter>
</ClCompile>
<ClCompile Include="ImageScene.cpp">
<Filter>Source Files\Engine\builtin\Scenes\2D\Image</Filter>
</ClCompile>
<ClCompile Include="MyBuiltinImageScene.cpp">
<Filter>Source Files\Example\Application</Filter>
</ClCompile>
<ClCompile Include="TextureGenerator.cpp">
<Filter>Source Files\Engine\builtin\General</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="TextureFactory.cpp"> <ClCompile Include="TextureFactory.cpp">
<Filter>Source Files\Engine\Baseline</Filter> <Filter>Source Files\Baseline</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Application.h"> <ClInclude Include="Application.h">
<Filter>Header Files\Engine\Baseline\Application</Filter> <Filter>Header Files\Baseline\Application</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="FPS.h"> <ClInclude Include="FPS.h">
<Filter>Header Files\Engine\Baseline\Application</Filter> <Filter>Header Files\Baseline\Application</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="GLFWInputManager.h"> <ClInclude Include="GLFWInputManager.h">
<Filter>Header Files\Engine\Baseline\Application</Filter> <Filter>Header Files\Baseline\Application</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="InputManager.h"> <ClInclude Include="InputManager.h">
<Filter>Header Files\Engine\Baseline\Application</Filter> <Filter>Header Files\Baseline\Application</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Scene.h"> <ClInclude Include="Scene.h">
<Filter>Header Files\Engine\Baseline\Application</Filter> <Filter>Header Files\Baseline\Application</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="ShaderProgram.h"> <ClInclude Include="ShaderProgram.h">
<Filter>Header Files\Engine\Baseline\Rendering</Filter> <Filter>Header Files\Baseline\Rendering</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Camera.h"> <ClInclude Include="Camera.h">
<Filter>Header Files\Engine\Baseline\Rendering</Filter> <Filter>Header Files\Baseline\Rendering</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Batch.h"> <ClInclude Include="Batch.h">
<Filter>Header Files\Engine\Baseline\Rendering</Filter> <Filter>Header Files\Baseline\Rendering</Filter>
</ClInclude>
<ClInclude Include="MyBatch.h">
<Filter>Header Files\Example\Rendering</Filter>
</ClInclude>
<ClInclude Include="MyApplication.h">
<Filter>Header Files\Example\Application</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Camera2D.h"> <ClInclude Include="Camera2D.h">
<Filter>Header Files\Engine\Baseline\Rendering</Filter> <Filter>Header Files\Baseline\Rendering</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Camera3D.h"> <ClInclude Include="Camera3D.h">
<Filter>Header Files\Engine\Baseline\Rendering</Filter> <Filter>Header Files\Baseline\Rendering</Filter>
</ClInclude>
<ClInclude Include="MySimple2DScene.h">
<Filter>Header Files\Example\Application</Filter>
</ClInclude>
<ClInclude Include="MySimple3DScene.h">
<Filter>Header Files\Example\Application</Filter>
</ClInclude>
<ClInclude Include="MyBasicScene.h">
<Filter>Header Files\Example\Application</Filter>
</ClInclude>
<ClInclude Include="MySimpleShaderProgram.h">
<Filter>Header Files\Example\Rendering</Filter>
</ClInclude>
<ClInclude Include="MyBasicShaderProgram.h">
<Filter>Header Files\Example\Rendering</Filter>
</ClInclude>
<ClInclude Include="MySimpleCubeScene.h">
<Filter>Header Files\Example\Application</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="VertexFragmentShaderProgram.h"> <ClInclude Include="VertexFragmentShaderProgram.h">
<Filter>Header Files\Engine\Baseline\Rendering</Filter> <Filter>Header Files\Baseline\Rendering</Filter>
</ClInclude>
<ClInclude Include="MyBuiltinCubeScene.h">
<Filter>Header Files\Example\Application</Filter>
</ClInclude>
<ClInclude Include="MyBuiltinLitScene.h">
<Filter>Header Files\Example\Application</Filter>
</ClInclude>
<ClInclude Include="BasicBatch.h">
<Filter>Header Files\Engine\builtin\Scenes\3D\Basic</Filter>
</ClInclude>
<ClInclude Include="BasicScene.h">
<Filter>Header Files\Engine\builtin\Scenes\3D\Basic</Filter>
</ClInclude>
<ClInclude Include="BasicShaderProgram.h">
<Filter>Header Files\Engine\builtin\Scenes\3D\Basic</Filter>
</ClInclude>
<ClInclude Include="LitBatch.h">
<Filter>Header Files\Engine\builtin\Scenes\3D\Lit</Filter>
</ClInclude>
<ClInclude Include="LitScene.h">
<Filter>Header Files\Engine\builtin\Scenes\3D\Lit</Filter>
</ClInclude>
<ClInclude Include="LitShaderProgram.h">
<Filter>Header Files\Engine\builtin\Scenes\3D\Lit</Filter>
</ClInclude>
<ClInclude Include="TexturedBatch.h">
<Filter>Header Files\Engine\builtin\Scenes\3D\Textured</Filter>
</ClInclude>
<ClInclude Include="TexturedScene.h">
<Filter>Header Files\Engine\builtin\Scenes\3D\Textured</Filter>
</ClInclude>
<ClInclude Include="TexturedShaderProgram.h">
<Filter>Header Files\Engine\builtin\Scenes\3D\Textured</Filter>
</ClInclude>
<ClInclude Include="MyBuiltinTexturedScene.h">
<Filter>Header Files\Example\Application</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Shader.h"> <ClInclude Include="Shader.h">
<Filter>Header Files\Engine\Baseline\Rendering</Filter> <Filter>Header Files\Baseline\Rendering</Filter>
</ClInclude>
<ClInclude Include="LitShadowedBatch.h">
<Filter>Header Files\Engine\builtin\Scenes\3D\LitShadowed</Filter>
</ClInclude>
<ClInclude Include="LitShadowedScene.h">
<Filter>Header Files\Engine\builtin\Scenes\3D\LitShadowed</Filter>
</ClInclude>
<ClInclude Include="LitShadowedShaderProgram.h">
<Filter>Header Files\Engine\builtin\Scenes\3D\LitShadowed</Filter>
</ClInclude>
<ClInclude Include="MyBuiltinLitShadowedScene.h">
<Filter>Header Files\Example\Application</Filter>
</ClInclude>
<ClInclude Include="BasicTypes.h">
<Filter>Header Files\Engine\builtin\Scenes\3D\Basic</Filter>
</ClInclude>
<ClInclude Include="LitTypes.h">
<Filter>Header Files\Engine\builtin\Scenes\3D\Lit</Filter>
</ClInclude>
<ClInclude Include="TexturedTypes.h">
<Filter>Header Files\Engine\builtin\Scenes\3D\Textured</Filter>
</ClInclude>
<ClInclude Include="LitShadowedTypes.h">
<Filter>Header Files\Engine\builtin\Scenes\3D\LitShadowed</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="constants.h"> <ClInclude Include="constants.h">
<Filter>Header Files\Engine\Baseline</Filter> <Filter>Header Files\Baseline</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="DrawMode.h"> <ClInclude Include="DrawMode.h">
<Filter>Header Files\Engine\Baseline</Filter> <Filter>Header Files\Baseline</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Exception.h"> <ClInclude Include="Exception.h">
<Filter>Header Files\Engine\Baseline</Filter> <Filter>Header Files\Baseline</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Mesh.h"> <ClInclude Include="Mesh.h">
<Filter>Header Files\Engine\Baseline</Filter> <Filter>Header Files\Baseline</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="MeshFactory.h"> <ClInclude Include="MeshFactory.h">
<Filter>Header Files\Engine\Baseline</Filter> <Filter>Header Files\Baseline</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Poseable.h"> <ClInclude Include="Poseable.h">
<Filter>Header Files\Engine\Baseline</Filter> <Filter>Header Files\Baseline</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Renderable.h"> <ClInclude Include="Renderable.h">
<Filter>Header Files\Engine\Baseline</Filter> <Filter>Header Files\Baseline</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Sampler.h"> <ClInclude Include="Sampler.h">
<Filter>Header Files\Engine\Baseline</Filter> <Filter>Header Files\Baseline</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Texture.h"> <ClInclude Include="Texture.h">
<Filter>Header Files\Engine\Baseline</Filter> <Filter>Header Files\Baseline</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="TextureFactory.h"> <ClInclude Include="TextureFactory.h">
<Filter>Header Files\Engine\Baseline</Filter> <Filter>Header Files\Baseline</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="TextureRenderable.h"> <ClInclude Include="TextureRenderable.h">
<Filter>Header Files\Engine\Baseline</Filter> <Filter>Header Files\Baseline</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Util.h"> <ClInclude Include="Util.h">
<Filter>Header Files\Engine\Baseline</Filter> <Filter>Header Files\Baseline</Filter>
</ClInclude>
<ClInclude Include="AutoPrerenderingScene.h">
<Filter>Header Files\Engine\builtin\General</Filter>
</ClInclude>
<ClInclude Include="Batched.h">
<Filter>Header Files\Engine\builtin\General</Filter>
</ClInclude>
<ClInclude Include="BuiltinBatch.h">
<Filter>Header Files\Engine\builtin\General</Filter>
</ClInclude>
<ClInclude Include="BuiltinCamera2D.h">
<Filter>Header Files\Engine\builtin\General</Filter>
</ClInclude>
<ClInclude Include="BuiltinCamera3D.h">
<Filter>Header Files\Engine\builtin\General</Filter>
</ClInclude>
<ClInclude Include="BuiltinTypes.h">
<Filter>Header Files\Engine\builtin\General</Filter>
</ClInclude>
<ClInclude Include="GLUtil.h">
<Filter>Header Files\Engine\builtin\General</Filter>
</ClInclude>
<ClInclude Include="MeshGenerator.h">
<Filter>Header Files\Engine\builtin\General</Filter>
</ClInclude>
<ClInclude Include="PoseableBatch.h">
<Filter>Header Files\Engine\builtin\General</Filter>
</ClInclude>
<ClInclude Include="Prerenderable.h">
<Filter>Header Files\Engine\builtin\General</Filter>
</ClInclude>
<ClInclude Include="TextureGenerator.h">
<Filter>Header Files\Engine\builtin\General</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="ImageLoader.h"> <ClInclude Include="ImageLoader.h">
<Filter>Header Files\Engine\Baseline\ImageLoader</Filter> <Filter>Header Files\Baseline\ImageLoader</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="lodepng.h"> <ClInclude Include="lodepng.h">
<Filter>Header Files\Engine\Plugins\LodePNG</Filter> <Filter>Header Files\Plugins\LodePNG</Filter>
</ClInclude>
<ClInclude Include="SpriteBatch.h">
<Filter>Header Files\Engine\builtin\General</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Poseable2D.h"> <ClInclude Include="Poseable2D.h">
<Filter>Header Files\Engine\Baseline</Filter> <Filter>Header Files\Baseline</Filter>
</ClInclude>
<ClInclude Include="Poseable2DBatch.h">
<Filter>Header Files\Engine\builtin\General</Filter>
</ClInclude>
<ClInclude Include="ImageScene.h">
<Filter>Header Files\Engine\builtin\Scenes\2D\Image</Filter>
</ClInclude>
<ClInclude Include="ImageTypes.h">
<Filter>Header Files\Engine\builtin\Scenes\2D\Image</Filter>
</ClInclude>
<ClInclude Include="WithCamera.h">
<Filter>Header Files\Engine\builtin\General</Filter>
</ClInclude>
<ClInclude Include="ImageShaderProgram.h">
<Filter>Header Files\Engine\builtin\Scenes\2D\Image</Filter>
</ClInclude>
<ClInclude Include="MyBuiltinImageScene.h">
<Filter>Header Files\Example\Application</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="deps.h"> <ClInclude Include="deps.h">
<Filter>Header Files\Engine\Baseline</Filter> <Filter>Header Files\Baseline</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="MySimpleVS.glsl">
<Filter>Source Files\Example\Rendering\Shader Code</Filter>
</None>
<None Include="MyBasicFS.glsl">
<Filter>Source Files\Example\Rendering\Shader Code</Filter>
</None>
<None Include="MyBasicVS.glsl">
<Filter>Source Files\Example\Rendering\Shader Code</Filter>
</None>
<None Include="MySimpleFS.glsl">
<Filter>Source Files\Example\Rendering\Shader Code</Filter>
</None>
<None Include="BasicFS.glsl">
<Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
</None>
<None Include="BasicVS.glsl">
<Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
</None>
<None Include="LitVS.glsl">
<Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
</None>
<None Include="LitFS.glsl">
<Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
</None>
<None Include="TexturedVS.glsl">
<Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
</None>
<None Include="TexturedFS.glsl">
<Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
</None>
<None Include="LitShadowedFS.glsl">
<Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
</None>
<None Include="LitShadowedVS.glsl">
<Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
</None>
<None Include="ImageVS.glsl">
<Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
</None>
<None Include="ImageFS.glsl">
<Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
</None>
</ItemGroup>
</Project> </Project>

0
CharcoalBuiltin/lodepng.cpp → OpenGLEngine/lodepng.cpp
View File

0
CharcoalBuiltin/lodepng.h → OpenGLEngine/lodepng.h
View File

0
CharcoalBuiltin/BasicFS.glsl → shaders/BasicFS.glsl
View File

0
CharcoalBuiltin/BasicVS.glsl → shaders/BasicVS.glsl
View File

0
CharcoalBuiltin/ImageFS.glsl → shaders/ImageFS.glsl
View File

0
CharcoalBuiltin/ImageVS.glsl → shaders/ImageVS.glsl
View File

0
CharcoalBuiltin/LitFS.glsl → shaders/LitFS.glsl
View File

0
CharcoalBuiltin/LitShadowedFS.glsl → shaders/LitShadowedFS.glsl
View File

0
CharcoalBuiltin/LitShadowedVS.glsl → shaders/LitShadowedVS.glsl
View File

0
CharcoalBuiltin/LitVS.glsl → shaders/LitVS.glsl
View File

0
Example/MyBasicFS.glsl → shaders/MyBasicFS.glsl
View File

0
Example/MyBasicVS.glsl → shaders/MyBasicVS.glsl
View File

0
Example/MySimpleFS.glsl → shaders/MySimpleFS.glsl
View File

0
Example/MySimpleVS.glsl → shaders/MySimpleVS.glsl
View File

0
CharcoalBuiltin/TexturedFS.glsl → shaders/TexturedFS.glsl
View File

0
CharcoalBuiltin/TexturedVS.glsl → shaders/TexturedVS.glsl
View File