b7456401e0
Added image scene to render an image in a scene. There is also now a testing image that is an uber meme. Currently the problem is that the spritebatch cannot use the offsetof macro because it is a templated class. Possible solutions to this are changing it to be specifyable or implemented per vertex type as the other batches have been.
292 lines
13 KiB
XML
292 lines
13 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
<ItemGroup Label="ProjectConfigurations">
|
|
<ProjectConfiguration Include="Debug|Win32">
|
|
<Configuration>Debug</Configuration>
|
|
<Platform>Win32</Platform>
|
|
</ProjectConfiguration>
|
|
<ProjectConfiguration Include="Release|Win32">
|
|
<Configuration>Release</Configuration>
|
|
<Platform>Win32</Platform>
|
|
</ProjectConfiguration>
|
|
<ProjectConfiguration Include="Debug|x64">
|
|
<Configuration>Debug</Configuration>
|
|
<Platform>x64</Platform>
|
|
</ProjectConfiguration>
|
|
<ProjectConfiguration Include="Release|x64">
|
|
<Configuration>Release</Configuration>
|
|
<Platform>x64</Platform>
|
|
</ProjectConfiguration>
|
|
</ItemGroup>
|
|
<PropertyGroup Label="Globals">
|
|
<VCProjectVersion>15.0</VCProjectVersion>
|
|
<ProjectGuid>{C03B666E-F3CE-4223-977D-9D6E2952F22E}</ProjectGuid>
|
|
<RootNamespace>OpenGLEngine</RootNamespace>
|
|
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
|
|
</PropertyGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
<UseDebugLibraries>true</UseDebugLibraries>
|
|
<PlatformToolset>v141</PlatformToolset>
|
|
<CharacterSet>MultiByte</CharacterSet>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
<UseDebugLibraries>false</UseDebugLibraries>
|
|
<PlatformToolset>v141</PlatformToolset>
|
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
<CharacterSet>MultiByte</CharacterSet>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
<UseDebugLibraries>true</UseDebugLibraries>
|
|
<PlatformToolset>v141</PlatformToolset>
|
|
<CharacterSet>MultiByte</CharacterSet>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
<UseDebugLibraries>false</UseDebugLibraries>
|
|
<PlatformToolset>v141</PlatformToolset>
|
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
<CharacterSet>MultiByte</CharacterSet>
|
|
</PropertyGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
<ImportGroup Label="ExtensionSettings">
|
|
</ImportGroup>
|
|
<ImportGroup Label="Shared">
|
|
</ImportGroup>
|
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
</ImportGroup>
|
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
</ImportGroup>
|
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
</ImportGroup>
|
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
</ImportGroup>
|
|
<PropertyGroup Label="UserMacros" />
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
<LibraryPath>$(ProjectDir)..\lib;$(LibraryPath)</LibraryPath>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
<LibraryPath>$(ProjectDir)..\lib;$(LibraryPath)</LibraryPath>
|
|
</PropertyGroup>
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
<ClCompile>
|
|
<WarningLevel>Level3</WarningLevel>
|
|
<Optimization>Disabled</Optimization>
|
|
<SDLCheck>true</SDLCheck>
|
|
<ConformanceMode>true</ConformanceMode>
|
|
</ClCompile>
|
|
</ItemDefinitionGroup>
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
<ClCompile>
|
|
<WarningLevel>Level3</WarningLevel>
|
|
<Optimization>Disabled</Optimization>
|
|
<SDLCheck>true</SDLCheck>
|
|
<ConformanceMode>true</ConformanceMode>
|
|
<AdditionalIncludeDirectories>$(ProjectDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
<PreprocessorDefinitions>SHADER_PATH=R"($(ProjectDir))";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
</ClCompile>
|
|
<Link />
|
|
<PostBuildEvent>
|
|
<Message>
|
|
</Message>
|
|
<Command>
|
|
</Command>
|
|
</PostBuildEvent>
|
|
<PreBuildEvent>
|
|
<Command>copy "$(ProjectDir)..\dll\*" "$(OutDir)"</Command>
|
|
</PreBuildEvent>
|
|
<PreBuildEvent>
|
|
<Message>Copy DLLs</Message>
|
|
</PreBuildEvent>
|
|
</ItemDefinitionGroup>
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
<ClCompile>
|
|
<WarningLevel>Level3</WarningLevel>
|
|
<Optimization>MaxSpeed</Optimization>
|
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
<SDLCheck>true</SDLCheck>
|
|
<ConformanceMode>true</ConformanceMode>
|
|
</ClCompile>
|
|
<Link>
|
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
<OptimizeReferences>true</OptimizeReferences>
|
|
</Link>
|
|
</ItemDefinitionGroup>
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
<ClCompile>
|
|
<WarningLevel>Level3</WarningLevel>
|
|
<Optimization>MaxSpeed</Optimization>
|
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
<SDLCheck>true</SDLCheck>
|
|
<ConformanceMode>true</ConformanceMode>
|
|
<AdditionalIncludeDirectories>$(ProjectDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
<PreprocessorDefinitions>SHADER_PATH=R"($(ProjectDir))";IMAGE_PATH=R"($(SolutionDir)images\)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
</ClCompile>
|
|
<Link>
|
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
<OptimizeReferences>true</OptimizeReferences>
|
|
</Link>
|
|
<PostBuildEvent>
|
|
<Message>
|
|
</Message>
|
|
<Command>
|
|
</Command>
|
|
</PostBuildEvent>
|
|
<PreBuildEvent>
|
|
<Command>copy "$(ProjectDir)..\dll\*" "$(OutDir)"</Command>
|
|
</PreBuildEvent>
|
|
<PreBuildEvent>
|
|
<Message>Copy DLLs</Message>
|
|
</PreBuildEvent>
|
|
</ItemDefinitionGroup>
|
|
<ItemGroup>
|
|
<ClCompile Include="Application.cpp" />
|
|
<ClCompile Include="AutoPrerenderingScene.cpp" />
|
|
<ClCompile Include="BasicBatch.cpp" />
|
|
<ClCompile Include="BasicScene.cpp" />
|
|
<ClCompile Include="Camera2D.cpp" />
|
|
<ClCompile Include="Camera3D.cpp" />
|
|
<ClCompile Include="FPS.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="MyBuiltinCubeScene.cpp" />
|
|
<ClCompile Include="GLFWInputManager.cpp" />
|
|
<ClCompile Include="GLUtil.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="Poseable2D.cpp" />
|
|
<ClCompile Include="Shader.cpp" />
|
|
<ClCompile Include="ShaderProgram.cpp" />
|
|
<ClCompile Include="Sampler.cpp" />
|
|
<ClCompile Include="stdafx.cpp">
|
|
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
|
|
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
|
|
</ClCompile>
|
|
<ClCompile Include="TexturedBatch.cpp" />
|
|
<ClCompile Include="TexturedScene.cpp" />
|
|
<ClCompile Include="Util.cpp" />
|
|
<ClCompile Include="VertexFragmentShaderProgram.cpp" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<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="Batched.h" />
|
|
<ClInclude Include="BuiltinBatch.h" />
|
|
<ClInclude Include="BuiltinCamera3D.h" />
|
|
<ClInclude Include="BuiltinCamera2D.h" />
|
|
<ClInclude Include="Camera.h" />
|
|
<ClInclude Include="Camera2D.h" />
|
|
<ClInclude Include="Camera3D.h" />
|
|
<ClInclude Include="constants.h" />
|
|
<ClInclude Include="DrawMode.h" />
|
|
<ClInclude Include="Exception.h" />
|
|
<ClInclude Include="FPS.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="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="Poseable2D.h" />
|
|
<ClInclude Include="SpriteBatch.h" />
|
|
<ClInclude Include="Texture.h" />
|
|
<ClInclude Include="TexturedBatch.h" />
|
|
<ClInclude Include="TexturedTypes.h" />
|
|
<ClInclude Include="TextureFactory.h" />
|
|
<ClInclude Include="TextureGenerator.h" />
|
|
<ClInclude Include="TextureRenderable.h" />
|
|
<ClInclude Include="TexturedScene.h" />
|
|
<ClInclude Include="TexturedShaderProgram.h" />
|
|
<ClInclude Include="VertexFragmentShaderProgram.h" />
|
|
<ClInclude Include="GLFWInputManager.h" />
|
|
<ClInclude Include="GLUtil.h" />
|
|
<ClInclude Include="InputManager.h" />
|
|
<ClInclude Include="Mesh.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="Renderable.h" />
|
|
<ClInclude Include="Scene.h" />
|
|
<ClInclude Include="Shader.h" />
|
|
<ClInclude Include="ShaderProgram.h" />
|
|
<ClInclude Include="stdafx.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>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
<ImportGroup Label="ExtensionTargets">
|
|
</ImportGroup>
|
|
</Project> |