Adapted Escape the Dawn engine.

This commit is contained in:
2014-04-04 23:14:18 +02:00
parent 6a64de37fb
commit a7985b1686
64 changed files with 3384 additions and 79 deletions
+73 -10
View File
@@ -39,14 +39,14 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>$(BOOST_ROOT);$(SolutionDir)\..\libs;$(SolutionDir)\..\libs\glew-1.10.0\include;$(SolutionDir)\..\libs\glfw-3.0.4\include;$(SolutionDir)\..\libs\glm-0.9.5.3;$(SolutionDir)\..\libs\openal-soft-1.15.1\include;$(SolutionDir)\..\libs\bullet-2.82-r2704\src;$(IncludePath)</IncludePath>
<LibraryPath>$(BOOST_ROOT)\lib32-msvc-12.0;$(SolutionDir)\..\libs\glew-1.10.0\lib\Debug\Win32;$(SolutionDir)\..\libs\glfw-3.0.4\lib\Debug;$(SolutionDir)\..\libs\openal-soft-1.15.1\lib\Win32\Debug;$(SolutionDir)\..\libs\bullet-2.82-r2704\lib\Debug;$(LibraryPath)</LibraryPath>
<IncludePath>$(BOOST_ROOT);$(SolutionDir)\..\src;$(SolutionDir)\..\libs;$(SolutionDir)\..\libs\glew-1.10.0\include;$(SolutionDir)\..\libs\glfw-3.0.4\include;$(SolutionDir)\..\libs\glm-0.9.5.3;$(SolutionDir)\..\libs\openal-soft-1.15.1\include;$(SolutionDir)\..\libs\bullet-2.82-r2704\src;$(SolutionDir)\..\libs\SOIL\src;$(IncludePath)</IncludePath>
<LibraryPath>$(BOOST_ROOT)\lib32-msvc-12.0;$(SolutionDir)\..\libs\glew-1.10.0\lib\Debug\Win32;$(SolutionDir)\..\libs\glfw-3.0.4\lib\Debug;$(SolutionDir)\..\libs\openal-soft-1.15.1\lib\Win32\Debug;$(SolutionDir)\..\libs\bullet-2.82-r2704\lib\Debug;$(SolutionDir)\..\libs\SOIL\lib\Debug;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)\..\bin\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\..\obj\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IncludePath>$(BOOST_ROOT);$(SolutionDir)\..\libs;$(SolutionDir)\..\libs\glew-1.10.0\include;$(SolutionDir)\..\libs\glfw-3.0.4\include;$(SolutionDir)\..\libs\glm-0.9.5.3;$(SolutionDir)\..\libs\openal-soft-1.15.1\include;$(SolutionDir)\..\libs\bullet-2.82-r2704\src;$(IncludePath)</IncludePath>
<LibraryPath>$(BOOST_ROOT)\lib32-msvc-12.0;$(SolutionDir)\..\libs\glfw-3.0.4\lib\Release;$(SolutionDir)\..\libs\glew-1.10.0\lib\Release\Win32;$(SolutionDir)\..\libs\openal-soft-1.15.1\lib\Win32\Release;$(SolutionDir)\..\libs\bullet-2.82-r2704\lib\Release;$(LibraryPath)</LibraryPath>
<IncludePath>$(BOOST_ROOT);$(SolutionDir)\..\src;$(SolutionDir)\..\libs;$(SolutionDir)\..\libs\glew-1.10.0\include;$(SolutionDir)\..\libs\glfw-3.0.4\include;$(SolutionDir)\..\libs\glm-0.9.5.3;$(SolutionDir)\..\libs\openal-soft-1.15.1\include;$(SolutionDir)\..\libs\bullet-2.82-r2704\src;$(SolutionDir)\..\libs\SOIL\src;$(IncludePath)</IncludePath>
<LibraryPath>$(BOOST_ROOT)\lib32-msvc-12.0;$(SolutionDir)\..\libs\glfw-3.0.4\lib\Release;$(SolutionDir)\..\libs\glew-1.10.0\lib\Release\Win32;$(SolutionDir)\..\libs\openal-soft-1.15.1\lib\Win32\Release;$(SolutionDir)\..\libs\bullet-2.82-r2704\lib\Release;$(SolutionDir)\..\libs\SOIL\lib\Release;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)\..\bin\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\..\obj\$(Configuration)\</IntDir>
</PropertyGroup>
@@ -56,11 +56,14 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Create</PrecompiledHeader>
<PrecompiledHeaderFile>PrecompiledHeader.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>OpenAL32.lib;opengl32.lib;glu32.lib;glew32d.lib;glfw3dll.lib;BulletCollision_Debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>OpenAL32.lib;opengl32.lib;glu32.lib;SOIL.lib;glew32d.lib;glfw3dll.lib;BulletCollision_Debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -70,22 +73,82 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Create</PrecompiledHeader>
<PrecompiledHeaderFile>PrecompiledHeader.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>OpenAL32.lib;opengl32.lib;glu32.lib;glew32.lib;glfw3dll.lib;BulletCollision.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>OpenAL32.lib;opengl32.lib;glu32.lib;SOIL.lib;glew32.lib;glfw3dll.lib;BulletCollision.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep />
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\src\Camera.cpp" />
<ClCompile Include="..\..\src\CubemapTexture.cpp" />
<ClCompile Include="..\..\src\GameWorld.cpp" />
<ClCompile Include="..\..\src\main.cpp" />
<ClCompile Include="..\..\src\Model.cpp" />
<ClCompile Include="..\..\src\OBJ.cpp" />
<ClCompile Include="..\..\src\PrecompiledHeader.cpp" />
<ClCompile Include="..\..\src\Renderer.cpp" />
<ClCompile Include="..\..\src\ShaderProgram.cpp" />
<ClCompile Include="..\..\src\Skybox.cpp" />
<ClCompile Include="..\..\src\Systems\RenderSystem.cpp" />
<ClCompile Include="..\..\src\Systems\TransformSystem.cpp" />
<ClCompile Include="..\..\src\Texture.cpp" />
<ClCompile Include="..\..\src\World.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\GLM.h" />
<ClInclude Include="..\..\src\OpenGL.h" />
<ClInclude Include="..\..\src\Util\glerror.h" />
<ClInclude Include="..\..\src\Util\logging.h" />
<ClInclude Include="..\..\src\Camera.h" />
<ClInclude Include="..\..\src\Color.h" />
<ClInclude Include="..\..\src\Component.h" />
<ClInclude Include="..\..\src\Components\Bounds.h" />
<ClInclude Include="..\..\src\Components\Camera.h" />
<ClInclude Include="..\..\src\Components\Collision.h" />
<ClInclude Include="..\..\src\Components\DirectionalLight.h" />
<ClInclude Include="..\..\src\Components\Input.h" />
<ClInclude Include="..\..\src\Components\Model.h" />
<ClInclude Include="..\..\src\Components\ParticleEmitter.h" />
<ClInclude Include="..\..\src\Components\PointLight.h" />
<ClInclude Include="..\..\src\Components\PowerUp.h" />
<ClInclude Include="..\..\src\Components\SoundEmitter.h" />
<ClInclude Include="..\..\src\Components\Sprite.h" />
<ClInclude Include="..\..\src\Components\Stat.h" />
<ClInclude Include="..\..\src\Components\Template.h" />
<ClInclude Include="..\..\src\Components\Transform.h" />
<ClInclude Include="..\..\src\CubemapTexture.h" />
<ClInclude Include="..\..\src\Engine.h" />
<ClInclude Include="..\..\src\Entity.h" />
<ClInclude Include="..\..\src\Factory.h" />
<ClInclude Include="..\..\src\GameWorld.h" />
<ClInclude Include="..\..\src\Model.h" />
<ClInclude Include="..\..\src\OBJ.h" />
<ClInclude Include="..\..\src\PrecompiledHeader.h" />
<ClInclude Include="..\..\src\Renderer.h" />
<ClInclude Include="..\..\src\ShaderProgram.h" />
<ClInclude Include="..\..\src\Skybox.h" />
<ClInclude Include="..\..\src\System.h" />
<ClInclude Include="..\..\src\Systems\RenderSystem.h" />
<ClInclude Include="..\..\src\Systems\TransformSystem.h" />
<ClInclude Include="..\..\src\Texture.h" />
<ClInclude Include="..\..\src\Util\GLError.h" />
<ClInclude Include="..\..\src\Util\Logging.h" />
<ClInclude Include="..\..\src\World.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\Shaders\AABB.frag.glsl" />
<None Include="..\..\src\Shaders\Fragment.glsl" />
<None Include="..\..\src\Shaders\Normals.frag.glsl" />
<None Include="..\..\src\Shaders\Normals.geo.glsl" />
<None Include="..\..\src\Shaders\ShadowMap.frag.glsl" />
<None Include="..\..\src\Shaders\ShadowMap.vert.glsl" />
<None Include="..\..\src\Shaders\Skybox.frag.glsl" />
<None Include="..\..\src\Shaders\Skybox.vert.glsl" />
<None Include="..\..\src\Shaders\Vertex.glsl" />
<None Include="..\..\src\Shaders\VisualizeDepth.frag.glsl" />
<None Include="..\..\src\Shaders\VisualizeDepth.vert.glsl" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
+128 -4
View File
@@ -2,20 +2,144 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\..\src\main.cpp" />
<ClCompile Include="..\..\src\GameWorld.cpp" />
<ClCompile Include="..\..\src\World.cpp" />
<ClCompile Include="..\..\src\Renderer.cpp" />
<ClCompile Include="..\..\src\Camera.cpp" />
<ClCompile Include="..\..\src\Model.cpp" />
<ClCompile Include="..\..\src\Skybox.cpp" />
<ClCompile Include="..\..\src\CubemapTexture.cpp" />
<ClCompile Include="..\..\src\Texture.cpp" />
<ClCompile Include="..\..\src\ShaderProgram.cpp" />
<ClCompile Include="..\..\src\OBJ.cpp" />
<ClCompile Include="..\..\src\PrecompiledHeader.cpp" />
<ClCompile Include="..\..\src\Systems\RenderSystem.cpp">
<Filter>Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\TransformSystem.cpp">
<Filter>Systems</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Util">
<UniqueIdentifier>{ce43847c-9745-46d2-b000-069af4882886}</UniqueIdentifier>
</Filter>
<Filter Include="Shaders">
<UniqueIdentifier>{8974329a-5c12-4b94-86e7-5931555bc129}</UniqueIdentifier>
</Filter>
<Filter Include="Components">
<UniqueIdentifier>{e3f795ca-331e-4905-b423-93f651d93c09}</UniqueIdentifier>
</Filter>
<Filter Include="Systems">
<UniqueIdentifier>{1a6674dd-e1ce-4a28-a6e8-3f28468bb2f0}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\Util\logging.h">
<ClInclude Include="..\..\src\World.h" />
<ClInclude Include="..\..\src\GameWorld.h" />
<ClInclude Include="..\..\src\Factory.h" />
<ClInclude Include="..\..\src\Entity.h" />
<ClInclude Include="..\..\src\Component.h" />
<ClInclude Include="..\..\src\System.h" />
<ClInclude Include="..\..\src\Components\Camera.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Collision.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\DirectionalLight.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Input.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Model.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\ParticleEmitter.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\PointLight.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\PowerUp.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\SoundEmitter.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Sprite.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Stat.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Template.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Transform.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Bounds.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Util\GLError.h">
<Filter>Util</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Util\glerror.h">
<ClInclude Include="..\..\src\Util\Logging.h">
<Filter>Util</Filter>
</ClInclude>
<ClInclude Include="..\..\src\OpenGL.h" />
<ClInclude Include="..\..\src\GLM.h" />
<ClInclude Include="..\..\src\Color.h" />
<ClInclude Include="..\..\src\Engine.h" />
<ClInclude Include="..\..\src\Renderer.h" />
<ClInclude Include="..\..\src\PrecompiledHeader.h" />
<ClInclude Include="..\..\src\Camera.h" />
<ClInclude Include="..\..\src\Model.h" />
<ClInclude Include="..\..\src\Skybox.h" />
<ClInclude Include="..\..\src\CubemapTexture.h" />
<ClInclude Include="..\..\src\Texture.h" />
<ClInclude Include="..\..\src\ShaderProgram.h" />
<ClInclude Include="..\..\src\OBJ.h" />
<ClInclude Include="..\..\src\Systems\RenderSystem.h">
<Filter>Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\TransformSystem.h">
<Filter>Systems</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\Shaders\AABB.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\Fragment.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\Normals.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\Normals.geo.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\ShadowMap.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\ShadowMap.vert.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\Skybox.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\Skybox.vert.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\Vertex.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\VisualizeDepth.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\VisualizeDepth.vert.glsl">
<Filter>Shaders</Filter>
</None>
</ItemGroup>
</Project>