Add submodule idlib-game-engine

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "idlib"]
  path = idlib
  url = https://github.com/primordialmachine/idlib
+[submodule "idlib-game-engine"]
+ path = idlib-game-engine
+ url = https://github.com/egoboo/idlib-game-engine.git

cartman/cartman.vcxproj

@@ -121,7 +121,7 @@
  <WarningLevel>Level4</WarningLevel>
  <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  <CompileAs>CompileAsCpp</CompileAs>
- <AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)/idlib-game-engine/library/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <StringPooling>true</StringPooling>
  <CompileAsManaged>false</CompileAsManaged>
  <CompileAsWinRT>false</CompileAsWinRT>
@@ -180,7 +180,7 @@ xcopy /y "$(SolutionDir)external\SDL2_ttf-2.0.12\VisualC\external\lib\$(Platform
  <BrowseInformation>false</BrowseInformation>
  <WarningLevel>Level4</WarningLevel>
  <DebugInformationFormat>None</DebugInformationFormat>
- <AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)/idlib-game-engine/library/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <CompileAsManaged>false</CompileAsManaged>
  <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
  <OmitFramePointers>true</OmitFramePointers>
@@ -242,7 +242,7 @@ xcopy /y "$(SolutionDir)external\SDL2_ttf-2.0.12\VisualC\external\lib\$(Platform
  <ClCompile>
  <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  <CompileAs>CompileAsCpp</CompileAs>
- <AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)/idlib-game-engine/library/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <Optimization>Disabled</Optimization>
  <WarningLevel>Level4</WarningLevel>
  <CompileAsManaged>false</CompileAsManaged>
@@ -299,7 +299,7 @@ xcopy /y "$(SolutionDir)external\SDL2_ttf-2.0.12\VisualC\external\lib\$(Platform
  <ClCompile>
  <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  <CompileAs>CompileAsCpp</CompileAs>
- <AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)/idlib-game-engine/library/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <UndefinePreprocessorDefinitions>_DEBUG;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
  <BufferSecurityCheck>false</BufferSecurityCheck>

cartman/src/cartman/cartman_gfx.c

@@ -888,11 +888,11 @@ void ogl_beginFrame()
  auto& renderer = Ego::Renderer::get();
  glPushAttrib( GL_ENABLE_BIT );
  renderer.setDepthTestEnabled(false);
- renderer.setCullingMode(Ego::CullingMode::None);
+ renderer.setCullingMode(id::culling_mode::none);
  glEnable( GL_TEXTURE_2D );
 
  renderer.setBlendingEnabled(true);
- renderer.setBlendFunction(Ego::BlendFunction::SourceAlpha, Ego::BlendFunction::OneMinusSourceAlpha);
+ renderer.setBlendFunction(id::blend_function::source_alpha, id::blend_function::one_minus_source_alpha);
 
  auto drawableSize = Ego::GraphicsSystem::get().window->getDrawableSize();
  renderer.setViewportRectangle(0, 0, drawableSize.x(), drawableSize.y());

egoboo.sln

@@ -5,6 +5,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game\game.vcxproj", "{E9988340-E474-4C0A-8496-EFF3296DE056}"
  ProjectSection(ProjectDependencies) = postProject
  {0F32DD35-A264-4906-8FC9-2D0FE0613230} = {0F32DD35-A264-4906-8FC9-2D0FE0613230}
+ {8BA6CBFE-EFDE-414C-867C-4A238C8803B2} = {8BA6CBFE-EFDE-414C-867C-4A238C8803B2}
  EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "egolib", "egolib\egolib.vcxproj", "{0F32DD35-A264-4906-8FC9-2D0FE0613230}"
@@ -47,6 +48,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "external\goog
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "idlib", "legacy\idlib.vcxproj", "{1AF1EAD3-B754-426E-96DF-6C9075782B5E}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "idlib-game-engine", "legacy\idlib-game-engine.vcxproj", "{8BA6CBFE-EFDE-414C-867C-4A238C8803B2}"
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|x64 = Debug|x64
@@ -183,6 +186,14 @@ Global
  {1AF1EAD3-B754-426E-96DF-6C9075782B5E}.Release|x64.Build.0 = Release|x64
  {1AF1EAD3-B754-426E-96DF-6C9075782B5E}.Release|x86.ActiveCfg = Release|Win32
  {1AF1EAD3-B754-426E-96DF-6C9075782B5E}.Release|x86.Build.0 = Release|Win32
+ {8BA6CBFE-EFDE-414C-867C-4A238C8803B2}.Debug|x64.ActiveCfg = Debug|x64
+ {8BA6CBFE-EFDE-414C-867C-4A238C8803B2}.Debug|x64.Build.0 = Debug|x64
+ {8BA6CBFE-EFDE-414C-867C-4A238C8803B2}.Debug|x86.ActiveCfg = Debug|Win32
+ {8BA6CBFE-EFDE-414C-867C-4A238C8803B2}.Debug|x86.Build.0 = Debug|Win32
+ {8BA6CBFE-EFDE-414C-867C-4A238C8803B2}.Release|x64.ActiveCfg = Release|x64
+ {8BA6CBFE-EFDE-414C-867C-4A238C8803B2}.Release|x64.Build.0 = Release|x64
+ {8BA6CBFE-EFDE-414C-867C-4A238C8803B2}.Release|x86.ActiveCfg = Release|Win32
+ {8BA6CBFE-EFDE-414C-867C-4A238C8803B2}.Release|x86.Build.0 = Release|Win32
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE

egolib/egolib-tests.vcxproj

@@ -149,7 +149,7 @@
  <PrecompiledHeader>NotUsing</PrecompiledHeader>
  <WarningLevel>Level4</WarningLevel>
  <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)\egolib\tests;$(SolutionDir)\external\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)\egolib\tests;$(SolutionDir)/idlib-game-engine/library/src;$(SolutionDir)\external\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>GTEST_LANG_CXX11=1;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <UseFullPaths>false</UseFullPaths>
  <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
@@ -189,7 +189,7 @@
  <PrecompiledHeader>NotUsing</PrecompiledHeader>
  <WarningLevel>Level4</WarningLevel>
  <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)\egolib\tests;$(SolutionDir)\external\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)\egolib\tests;$(SolutionDir)/idlib-game-engine/library/src;$(SolutionDir)\external\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>GTEST_LANG_CXX11=1;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <UseFullPaths>false</UseFullPaths>
  <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
@@ -232,7 +232,7 @@
  <Optimization>Full</Optimization>
  <FunctionLevelLinking>false</FunctionLevelLinking>
  <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(SolutionDir)\egolib\tests;$(SolutionDir)\external\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)\egolib\tests;$(SolutionDir)/idlib-game-engine/library/src;$(SolutionDir)\external\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>GTEST_LANG_CXX11=1;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <UseFullPaths>false</UseFullPaths>
  <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
@@ -274,7 +274,7 @@
  <Optimization>Full</Optimization>
  <FunctionLevelLinking>false</FunctionLevelLinking>
  <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(SolutionDir)\egolib\tests;$(SolutionDir)\external\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)\egolib\tests;$(SolutionDir)/idlib-game-engine/library/src;$(SolutionDir)\external\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>GTEST_LANG_CXX11=1;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <UseFullPaths>false</UseFullPaths>
  <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>

egolib/egolib.vcxproj

@@ -127,7 +127,7 @@
  <UndefinePreprocessorDefinitions>__cplusplus;</UndefinePreprocessorDefinitions>
  <DisableSpecificWarnings>
  </DisableSpecificWarnings>
- <AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)/idlib-game-engine/library/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
  <SDLCheck>false</SDLCheck>
  <StringPooling>true</StringPooling>
@@ -172,7 +172,7 @@
  <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
  <UndefinePreprocessorDefinitions>_DEBUG;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
  <StringPooling>true</StringPooling>
- <AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)/idlib-game-engine/library/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <IntrinsicFunctions>true</IntrinsicFunctions>
  <BufferSecurityCheck>false</BufferSecurityCheck>
  <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
@@ -247,7 +247,7 @@
  <MinimalRebuild>false</MinimalRebuild>
  <SDLCheck>false</SDLCheck>
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)/idlib-game-engine/library/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <UseFullPaths>false</UseFullPaths>
  <CompileAsWinRT>false</CompileAsWinRT>
  <FloatingPointModel>Fast</FloatingPointModel>
@@ -277,7 +277,7 @@
  <OmitFramePointers>false</OmitFramePointers>
  <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  <CompileAs>CompileAsCpp</CompileAs>
- <AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)/idlib-game-engine/library/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <MinimalRebuild>false</MinimalRebuild>
  <MultiProcessorCompilation>true</MultiProcessorCompilation>
  <SDLCheck>false</SDLCheck>
@@ -608,6 +608,7 @@
  <ClCompile Include="src\egolib\_math.c" />
  </ItemGroup>
  <ItemGroup>
+ <ClInclude Include="src\egolib\integrations\idlib.hpp" />
  <ClInclude Include="src\egolib\Math\euler_angle.hpp" />
  <ClInclude Include="src\egolib\Entities\Common.hpp" />
  <ClInclude Include="src\egolib\Entities\Enchant.hpp" />
@@ -670,16 +671,10 @@
  <ClInclude Include="src\egolib\InputControl\ModifierKeys.hpp" />
  <ClInclude Include="src\egolib\Graphics\DisplayMode.hpp" />
  <ClInclude Include="src\egolib\Graphics\SDL\DisplayMode.hpp" />
- <ClInclude Include="src\egolib\Events\MouseWheelTurnedEventArgs.hpp" />
- <ClInclude Include="src\egolib\Events\MouseButtonEventArgs.hpp" />
  <ClInclude Include="src\egolib\Math\Functors\enclose_axis_aligned_cube_in_axis_aligned_box.hpp" />
  <ClInclude Include="src\egolib\Math\Functors\enclose_sphere_in_axis_aligned_box.hpp" />
  <ClInclude Include="src\egolib\Math\Functors\enclose_axis_aligned_box_in_axis_aligned_cube.hpp" />
  <ClInclude Include="src\egolib\Math\Functors\enclose_axis_aligned_box_in_sphere.hpp" />
- <ClInclude Include="src\egolib\Events\WindowEventArgs.hpp" />
- <ClInclude Include="src\egolib\Events\KeyboardKeyEventArgs.hpp" />
- <ClInclude Include="src\egolib\Events\_Include.hpp" />
- <ClInclude Include="src\egolib\Events\MouseMovedEventArgs.hpp" />
  <ClInclude Include="src\egolib\Math\Functors\is_intersecting_axis_aligned_box_axis_aligned_cube.hpp" />
  <ClInclude Include="src\egolib\App.hpp" />
  <ClInclude Include="src\egolib\Graphics\GraphicsWindow.hpp" />
@@ -722,7 +717,6 @@
  <ClInclude Include="src\egolib\Mesh\Info.hpp" />
  <ClInclude Include="src\egolib\FileFormats\Globals.hpp" />
  <ClInclude Include="src\egolib\Console\Console.hpp" />
- <ClInclude Include="src\egolib\Renderer\BlendFunction.hpp" />
  <ClInclude Include="src\egolib\Graphics\Camera.hpp" />
  <ClInclude Include="src\egolib\Math\Transform.hpp" />
  <ClInclude Include="src\egolib\Math\Matrix.hpp" />
@@ -755,7 +749,6 @@
  <ClInclude Include="src\egolib\Math\TemplateUtilities.hpp" />
  <ClInclude Include="src\egolib\Logic\Action.hpp" />
  <ClInclude Include="src\egolib\Core\System.hpp" />
- <ClInclude Include="src\egolib\Renderer\PrimitiveType.hpp" />
  <ClInclude Include="src\egolib\Graphics\VertexBuffer.hpp" />
  <ClInclude Include="src\egolib\Graphics\PixelFormat.hpp" />
  <ClInclude Include="src\egolib\Graphics\VertexFormat.hpp" />
@@ -776,8 +769,6 @@
  <ClInclude Include="src\egolib\Graphics\Font.hpp" />
  <ClInclude Include="src\egolib\Graphics\FontManager.hpp" />
  <ClInclude Include="src\egolib\Image\Image.hpp" />
- <ClInclude Include="src\egolib\Renderer\CullingMode.hpp" />
- <ClInclude Include="src\egolib\Renderer\WindingMode.hpp" />
  <ClInclude Include="src\egolib\FileFormats\id_md2.h" />
  <ClInclude Include="src\egolib\FileFormats\map_file-v1.h" />
  <ClInclude Include="src\egolib\FileFormats\map_file-v2.h" />
@@ -894,6 +885,9 @@
  <ProjectReference Include="..\external\SDL2_ttf-2.0.12\VisualC\SDL_ttf.vcxproj">
  <Project>{d114a863-1bdc-4979-a61e-cb6b7ca5f1bb}</Project>
  </ProjectReference>
+ <ProjectReference Include="..\legacy\idlib-game-engine.vcxproj">
+ <Project>{8ba6cbfe-efde-414c-867c-4a238c8803b2}</Project>
+ </ProjectReference>
  <ProjectReference Include="..\legacy\idlib.vcxproj">
  <Project>{1af1ead3-b754-426e-96df-6c9075782b5e}</Project>
  </ProjectReference>

egolib/egolib.vcxproj.filters

@@ -127,9 +127,6 @@
  <Filter Include="Header Files\Math\Functors">
  <UniqueIdentifier>{0b01a8e7-fe6d-438a-8459-bd880b264074}</UniqueIdentifier>
  </Filter>
- <Filter Include="Header Files\Events">
- <UniqueIdentifier>{6a8ec327-4d9c-4158-8d0a-3b457c46b627}</UniqueIdentifier>
- </Filter>
  <Filter Include="Header Files\Graphics\SDL">
  <UniqueIdentifier>{d53e3288-889c-4583-bfc1-951f3aa4d996}</UniqueIdentifier>
  </Filter>
@@ -163,6 +160,9 @@
  <Filter Include="Source Files\text">
  <UniqueIdentifier>{e1ec9d0f-406e-4fc2-b07c-159de415cc78}</UniqueIdentifier>
  </Filter>
+ <Filter Include="Header Files\integrations">
+ <UniqueIdentifier>{dfc51d3f-1107-410f-b7e3-0f4083874db2}</UniqueIdentifier>
+ </Filter>
  </ItemGroup>
  <ItemGroup>
  <ClCompile Include="src\egolib\_math.c">
@@ -788,12 +788,6 @@
  <ClInclude Include="src\egolib\Math\Math.hpp">
  <Filter>Header Files\Math</Filter>
  </ClInclude>
- <ClInclude Include="src\egolib\Renderer\CullingMode.hpp">
- <Filter>Header Files\Renderer</Filter>
- </ClInclude>
- <ClInclude Include="src\egolib\Renderer\WindingMode.hpp">
- <Filter>Header Files\Renderer</Filter>
- </ClInclude>
  <ClInclude Include="src\egolib\Image\Image.hpp">
  <Filter>Header Files\Image</Filter>
  </ClInclude>
@@ -857,9 +851,6 @@
  <ClInclude Include="src\egolib\Graphics\VertexBuffer.hpp">
  <Filter>Header Files\Graphics</Filter>
  </ClInclude>
- <ClInclude Include="src\egolib\Renderer\PrimitiveType.hpp">
- <Filter>Header Files\Renderer</Filter>
- </ClInclude>
  <ClInclude Include="src\egolib\Core\System.hpp">
  <Filter>Header Files\Core</Filter>
  </ClInclude>
@@ -956,9 +947,6 @@
  <ClInclude Include="src\egolib\Renderer\CompareFunction.hpp">
  <Filter>Header Files\Renderer</Filter>
  </ClInclude>
- <ClInclude Include="src\egolib\Renderer\BlendFunction.hpp">
- <Filter>Header Files\Renderer</Filter>
- </ClInclude>
  <ClInclude Include="src\egolib\Console\Console.hpp">
  <Filter>Header Files\Console</Filter>
  </ClInclude>
@@ -1085,24 +1073,6 @@
  <ClInclude Include="src\egolib\App.hpp">
  <Filter>Header Files</Filter>
  </ClInclude>
- <ClInclude Include="src\egolib\Events\MouseMovedEventArgs.hpp">
- <Filter>Header Files\Events</Filter>
- </ClInclude>
- <ClInclude Include="src\egolib\Events\WindowEventArgs.hpp">
- <Filter>Header Files\Events</Filter>
- </ClInclude>
- <ClInclude Include="src\egolib\Events\MouseButtonEventArgs.hpp">
- <Filter>Header Files\Events</Filter>
- </ClInclude>
- <ClInclude Include="src\egolib\Events\_Include.hpp">
- <Filter>Header Files\Events</Filter>
- </ClInclude>
- <ClInclude Include="src\egolib\Events\KeyboardKeyEventArgs.hpp">
- <Filter>Header Files\Events</Filter>
- </ClInclude>
- <ClInclude Include="src\egolib\Events\MouseWheelTurnedEventArgs.hpp">
- <Filter>Header Files\Events</Filter>
- </ClInclude>
  <ClInclude Include="src\egolib\Graphics\SDL\DisplayMode.hpp">
  <Filter>Header Files\Graphics\SDL</Filter>
  </ClInclude>
@@ -1310,6 +1280,9 @@
  <ClInclude Include="src\egolib\text\document.hpp">
  <Filter>Header Files\text</Filter>
  </ClInclude>
+ <ClInclude Include="src\egolib\integrations\idlib.hpp">
+ <Filter>Header Files\integrations</Filter>
+ </ClInclude>
  </ItemGroup>
  <ItemGroup>
  <None Include="src\egolib\platform\NSFileManager+DirectoryLocations.m">

egolib/src/egolib/Console/Console.cpp

@@ -230,10 +230,10 @@ void Console::draw()
  renderer.setDepthTestEnabled(false);
 
  // draw draw front and back faces of polygons
- renderer.setCullingMode(CullingMode::None);
+ renderer.setCullingMode(id::culling_mode::none);
 
  renderer.setBlendingEnabled(true);
- renderer.setBlendFunction(BlendFunction::SourceAlpha, BlendFunction::OneMinusSourceAlpha);
+ renderer.setBlendFunction(id::blend_function::source_alpha, id::blend_function::one_minus_source_alpha);
 
  auto drawableSize = GraphicsSystem::get().window->getDrawableSize();
  renderer.setViewportRectangle(0, 0, drawableSize(0), drawableSize(1));
@@ -276,11 +276,11 @@ void Console::draw()
  vertex->x = rectangle.get_max().x(); vertex->y = rectangle.get_max().y(); ++vertex;
  vertex->x = rectangle.get_min().x(); vertex->y = rectangle.get_max().y();
  }
- renderer.render(vertexBuffer, vertexDescriptor, PrimitiveType::LineLoop, 0, 4);
+ renderer.render(vertexBuffer, vertexDescriptor, id::primitive_type::line_loop, 0, 4);
  renderer.setLineWidth(1);
 
  renderer.setColour(black);
- renderer.render(vertexBuffer, vertexDescriptor, PrimitiveType::Quadriliterals, 0, 4);
+ renderer.render(vertexBuffer, vertexDescriptor, id::primitive_type::quadriliterals, 0, 4);
 
 
  int height;