Patch Update - V9.2.3

[FIX] :

~ Use The Already Implemented IsKeyDown avoid calling each tick the method bound to the input

.gitignore

@@ -12,11 +12,7 @@
 *.obj
 
 # Don't ignore 3d model in OBJ
-!enginecustom/monke.obj
+!enginecustom/assets/Model/OBJ/*.obj
-!enginecustom/isosphere.obj
-!enginecustom/cone.obj
-!enginecustom/vaisseau.obj
-!enginecustom/86.obj
 
 # Precompiled Headers
 *.gch

.idea/.idea.KhaoticEngineReborn/.idea/.name

@@ -0,0 +1 @@
+KhaoticEngineReborn

.idea/.idea.KhaoticEngineReborn/.idea/discord.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DiscordProjectSettings">
+    <option name="show" value="PROJECT_FILES" />
+    <option name="description" value="" />
+    <option name="applicationTheme" value="default" />
+    <option name="iconsTheme" value="default" />
+    <option name="button1Title" value="" />
+    <option name="button1Url" value="" />
+    <option name="button2Title" value="" />
+    <option name="button2Url" value="" />
+    <option name="customApplicationId" value="" />
+  </component>
+</project>

.idea/.idea.KhaoticEngineReborn/.idea/encodings.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/enginecustom/src/src/system/applicationclass.cpp" charset="windows-1252" />
+    <file url="file://$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" charset="windows-1252" />
+    <file url="PROJECT" charset="windows-1252" />
+  </component>
+</project>

.idea/.idea.KhaoticEngineReborn/.idea/git_toolbox_blame.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxBlameSettings">
+    <option name="version" value="2" />
+  </component>
+</project>

.idea/.idea.KhaoticEngineReborn/.idea/git_toolbox_prj.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+  </component>
+</project>

.idea/.idea.KhaoticEngineReborn/.idea/indexLayout.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>

.idea/.idea.KhaoticEngineReborn/.idea/material_theme_project_new.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MaterialThemeProjectNewConfig">
+    <option name="metadata">
+      <MTProjectMetadataState>
+        <option name="migrated" value="true" />
+        <option name="pristineConfig" value="false" />
+        <option name="userId" value="4025287c:194ad69ad19:-7ff7" />
+      </MTProjectMetadataState>
+    </option>
+  </component>
+</project>

.idea/.idea.KhaoticEngineReborn/.idea/projectSettingsUpdater.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RiderProjectSettingsUpdater">
+    <option name="vcsConfiguration" value="2" />
+  </component>
+</project>

.idea/.idea.KhaoticEngineReborn/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml

@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="e81d6e08-efc7-40a0-909d-ec4943d948e9" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/imgui.ini" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/imgui.ini" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/Systemclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/Systemclass.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/inputclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/inputclass.cpp" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="DpaMonitoringSettings">
+    <option name="firstShow" value="false" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="cidr-memory-view://0" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/enginecustom/src/src/shader/CelShadingShader.cpp" root0="FORCE_HIGHLIGHTING" />
+  </component>
+  <component name="MetaFilesCheckinStateConfiguration" checkMetaFiles="true" />
+  <component name="ProblemsViewState">
+    <option name="selectedTabId" value="CurrentFile" />
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 6
+}</component>
+  <component name="ProjectId" id="2sGIWDeT5ixyzDQ0he4A3RFpG9W" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;C++ Project.enginecustom.executor&quot;: &quot;Run&quot;,
+    &quot;C/C++ Project.enginecustom.executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  },
+  &quot;keyToStringList&quot;: {
+    &quot;rider.external.source.directories&quot;: [
+      &quot;C:\\Users\\arivas\\AppData\\Roaming\\JetBrains\\Rider2024.1\\resharper-host\\DecompilerCache&quot;,
+      &quot;C:\\Users\\arivas\\AppData\\Roaming\\JetBrains\\Rider2024.1\\resharper-host\\SourcesCache&quot;,
+      &quot;C:\\Users\\arivas\\AppData\\Local\\Symbols\\src&quot;
+    ]
+  }
+}</component>
+  <component name="RunManager" selected="C++ Project.enginecustom">
+    <configuration name="KhaoticDemo" type="CppProject" factoryName="C++ Project">
+      <configuration_1>
+        <option name="CONFIGURATION" value="Debug" />
+        <option name="PLATFORM" value="x64" />
+        <option name="PROJECT_FILE_PATH" value="$PROJECT_DIR$/KhaoticDemo/KhaoticDemo.vcxproj" />
+        <option name="CURRENT_LAUNCH_PROFILE" value="Local" />
+        <option name="EXE_PATH" value="$(LocalDebuggerCommand)" />
+        <option name="PROGRAM_PARAMETERS" value="$(LocalDebuggerCommandArguments)" />
+        <option name="WORKING_DIRECTORY" value="$(LocalDebuggerWorkingDirectory)" />
+        <option name="PASS_PARENT_ENVS" value="1" />
+        <option name="USE_EXTERNAL_CONSOLE" value="0" />
+        <option name="TERMINAL_INTERACTION_BEHAVIOR" value="AUTO_DETECT" />
+      </configuration_1>
+      <option name="DEFAULT_PROJECT_PATH" value="$PROJECT_DIR$/KhaoticDemo/KhaoticDemo.vcxproj" />
+      <option name="AUTO_SELECT_PRIORITY" value="0" />
+      <method v="2">
+        <option name="Build" />
+      </method>
+    </configuration>
+    <configuration name="enginecustom" type="CppProject" factoryName="C++ Project">
+      <configuration_1>
+        <option name="CONFIGURATION" value="Debug" />
+        <option name="PLATFORM" value="x64" />
+        <option name="PROJECT_FILE_PATH" value="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj" />
+        <option name="CURRENT_LAUNCH_PROFILE" value="Local" />
+        <option name="EXE_PATH" value="$(LocalDebuggerCommand)" />
+        <option name="PROGRAM_PARAMETERS" value="$(LocalDebuggerCommandArguments)" />
+        <option name="WORKING_DIRECTORY" value="$(LocalDebuggerWorkingDirectory)" />
+        <option name="PASS_PARENT_ENVS" value="1" />
+        <option name="USE_EXTERNAL_CONSOLE" value="0" />
+        <option name="TERMINAL_INTERACTION_BEHAVIOR" value="AUTO_DETECT" />
+      </configuration_1>
+      <configuration_2>
+        <option name="CONFIGURATION" value="Release" />
+        <option name="PLATFORM" value="x64" />
+        <option name="PROJECT_FILE_PATH" value="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj" />
+        <option name="CURRENT_LAUNCH_PROFILE" value="Local" />
+        <option name="EXE_PATH" value="$(TargetPath)" />
+        <option name="PROGRAM_PARAMETERS" value="" />
+        <option name="WORKING_DIRECTORY" value="$(ProjectDir)" />
+        <option name="PASS_PARENT_ENVS" value="1" />
+        <option name="USE_EXTERNAL_CONSOLE" value="0" />
+        <option name="TERMINAL_INTERACTION_BEHAVIOR" value="AUTO_DETECT" />
+      </configuration_2>
+      <option name="DEFAULT_PROJECT_PATH" value="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj" />
+      <option name="AUTO_SELECT_PRIORITY" value="0" />
+      <method v="2">
+        <option name="Build" />
+      </method>
+    </configuration>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="e81d6e08-efc7-40a0-909d-ec4943d948e9" name="Changes" comment="" />
+      <created>1738075515913</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1738075515913</updated>
+      <workItem from="1738075517746" duration="553000" />
+      <workItem from="1738076088229" duration="80000" />
+      <workItem from="1738076192788" duration="19000" />
+      <workItem from="1738076222547" duration="6131000" />
+      <workItem from="1738171504772" duration="876000" />
+      <workItem from="1738172392786" duration="67000" />
+      <workItem from="1738173151768" duration="2361000" />
+      <workItem from="1738175535254" duration="279000" />
+      <workItem from="1738178991872" duration="2736000" />
+      <workItem from="1738244577624" duration="3000" />
+      <workItem from="1738321399968" duration="689000" />
+      <workItem from="1738358054789" duration="9000" />
+      <workItem from="1738358091089" duration="6675000" />
+      <workItem from="1738364887298" duration="2275000" />
+      <workItem from="1738515031789" duration="14018000" />
+      <workItem from="1741705445392" duration="138000" />
+      <workItem from="1741706018301" duration="5499000" />
+      <workItem from="1742198713923" duration="31000" />
+      <workItem from="1742198792655" duration="4618000" />
+      <workItem from="1742203643675" duration="600000" />
+      <workItem from="1742206836574" duration="258000" />
+      <workItem from="1742207107802" duration="5340000" />
+      <workItem from="1742228751298" duration="38000" />
+      <workItem from="1742228870107" duration="1198000" />
+      <workItem from="1742314944369" duration="79000" />
+      <workItem from="1742318452773" duration="2258000" />
+      <workItem from="1742331065936" duration="3030000" />
+      <workItem from="1742371397157" duration="13355000" />
+      <workItem from="1742425863119" duration="231000" />
+      <workItem from="1742474596806" duration="67000" />
+      <workItem from="1742474683111" duration="689000" />
+    </task>
+    <task id="LOCAL-00001" summary="Minor update - viewport window tweak">
+      <option name="closed" value="true" />
+      <created>1738175474520</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1738175474520</updated>
+    </task>
+    <task id="LOCAL-00002" summary="Patch update - add menu button">
+      <option name="closed" value="true" />
+      <created>1738181617050</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1738181617050</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="UnityCheckinConfiguration" checkUnsavedScenes="true" />
+  <component name="UnityProjectConfiguration" hasMinimizedUI="false" />
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
+    <MESSAGE value="Minor update - viewport window tweak" />
+    <MESSAGE value="Patch update - add menu button" />
+    <option name="LAST_COMMIT_MESSAGE" value="Patch update - add menu button" />
+  </component>
+  <component name="XDebuggerManager">
+    <watches-manager>
+      <configuration name="CppProject">
+        <watch expression="((class ModelClass &amp;) (*(*(*this).m_Application).m_object[0]))" />
+      </configuration>
+    </watches-manager>
+  </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
+</project>

README.md

@@ -35,11 +35,24 @@ This **DirectX11** based engine uses **ImGui** with an abstraction layer to enab
 
 **SHADER** :
 
-- Cel Shading
++ Sunlight shader
++ Cel Shading (Work In Progress)
 
 **Interface Graphique** :
 
-- Shader Manager
++ Console link to the Logger object
++ Shader Manager
++ Engine Settings
+
+**Texture File** :
+
++ All the format supported by Windows Imaging Component (WIC)
+
+**Optimization** :
+
+- Shader rendering
+- Frustum culling
+- Object rendering
 
 ## Demo :
 

enginecustom/.vscode/c_cpp_properties.json

@@ -1,18 +0,0 @@
-{
-  "configurations": [
-    {
-      "name": "windows-gcc-x64",
-      "includePath": [
-        "${workspaceFolder}/**"
-      ],
-      "compilerPath": "gcc",
-      "cStandard": "${default}",
-      "cppStandard": "${default}",
-      "intelliSenseMode": "windows-gcc-x64",
-      "compilerArgs": [
-        ""
-      ]
-    }
-  ],
-  "version": 4
-}

enginecustom/CelShadingShader.h

@@ -1,68 +0,0 @@
-#ifndef _CELSHADINGSHADER_H_
-#define _CELSHADINGSHADER_H_
-
-//////////////
-// INCLUDES //
-//////////////
-#include "Logger.h"
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: CelShadingShader
-////////////////////////////////////////////////////////////////////////////////
-class CelShadingShader
-{
-private:
-    struct MatrixBufferType
-    {
-        XMMATRIX world;
-        XMMATRIX view;
-        XMMATRIX projection;
-    };
-
-    struct LightBufferType
-    {
-        XMFLOAT4 diffuseColor;
-        XMFLOAT3 lightDirection;
-        float padding;  // Padding to ensure the structure is a multiple of 16 bytes.
-        XMFLOAT3 lightPosition; // Add light position
-        float padding2; // Padding to ensure the structure is a multiple of 16 bytes.
-        float constantAttenuation;
-        float linearAttenuation;
-        float quadraticAttenuation;
-        float padding3; // Padding to ensure the structure is a multiple of 16 bytes.
-    };
-
-
-public:
-    CelShadingShader();
-    CelShadingShader(const CelShadingShader&);
-    ~CelShadingShader();
-
-    bool Initialize(ID3D11Device*, HWND);
-    void Shutdown();
-    bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT3, XMFLOAT4, XMFLOAT3);
-
-private:
-    bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-    void ShutdownShader();
-    void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-    bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT3, XMFLOAT4, XMFLOAT3);
-    void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-    ID3D11VertexShader* m_vertexShader;
-    ID3D11PixelShader* m_pixelShader;
-    ID3D11InputLayout* m_layout;
-    ID3D11Buffer* m_matrixBuffer;
-    ID3D11SamplerState* m_sampleState;
-    ID3D11Buffer* m_lightBuffer;
-};
-
-#endif

enginecustom/Light.ps

@@ -1,84 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Filename: light.ps
-////////////////////////////////////////////////////////////////////////////////
-
-/////////////
-// DEFINES //
-/////////////
-#define NUM_LIGHTS 4
-
-/////////////
-// GLOBALS //
-/////////////
-Texture2D shaderTexture : register(t0);
-SamplerState SampleType : register(s0);
-cbuffer LightBuffer
-{
-    float4 ambientColor;
-    float3 lightDirection;
-    float padding;
-    float specularPower;
-    float4 specularColor;
-};
-
-cbuffer LightColorBuffer
-{
-    float4 diffuseColor[NUM_LIGHTS];
-};
-
-
-//////////////
-// TYPEDEFS //
-//////////////
-struct PixelInputType
-{
-    float4 position : SV_POSITION;
-    float2 tex : TEXCOORD0;
-    float3 normal : NORMAL;
-    float3 lightPos[NUM_LIGHTS] : TEXCOORD1;
-};
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Pixel Shader
-////////////////////////////////////////////////////////////////////////////////
-float4 LightPixelShader(PixelInputType input) : SV_TARGET
-{
-    float4 textureColor;
-    float3 lightDir;
-    float4 color;
-    float3 reflection;
-    float4 specular;
-    float lightIntensity[NUM_LIGHTS];
-    float4 colorArray[NUM_LIGHTS];
-    float4 colorSum;
-    int i;
-
-    // Sample the pixel color from the texture using the sampler at this texture coordinate location.
-    textureColor = shaderTexture.Sample(SampleType, input.tex);
-
-    for(i=0; i<NUM_LIGHTS; i++)
-    {
-        // Calculate the different amounts of light on this pixel based on the positions of the lights.
-        lightIntensity[i] = saturate(dot(input.normal, input.lightPos[i]));
-
-        // Determine the diffuse color amount of each of the four lights.
-        colorArray[i] = diffuseColor[i] * lightIntensity[i];
-    } 
-
-    // Initialize the sum of colors.
-    colorSum = float4(0.0f, 0.0f, 0.0f, 1.0f);
-
-    // Add all of the light colors up.
-    for(i=0; i<NUM_LIGHTS; i++)
-    {
-        colorSum.r += colorArray[i].r;
-        colorSum.g += colorArray[i].g;
-        colorSum.b += colorArray[i].b;
-    }
-
-    // Multiply the texture pixel by the combination of all four light colors to get the final result.
-    color = saturate(colorSum) * textureColor;
-
-    return color;
-}

enginecustom/Lightclass.cpp

@@ -1,91 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Filename: lightclass.cpp
-////////////////////////////////////////////////////////////////////////////////
-#include "lightclass.h"
-
-
-LightClass::LightClass()
-{
-}
-
-
-LightClass::LightClass(const LightClass& other)
-{
-}
-
-
-LightClass::~LightClass()
-{
-}
-
-void LightClass::SetAmbientColor(float red, float green, float blue, float alpha)
-{
-	m_ambientColor = XMFLOAT4(red, green, blue, alpha);
-	return;
-}
-
-
-
-void LightClass::SetDiffuseColor(float red, float green, float blue, float alpha)
-{
-    m_diffuseColor = XMFLOAT4(red, green, blue, alpha);
-    return;
-}
-
-
-void LightClass::SetDirection(float x, float y, float z)
-{
-    m_direction = XMFLOAT3(x, y, z);
-    return;
-}
-
-void LightClass::SetSpecularColor(float red, float green, float blue, float alpha)
-{
-    m_specularColor = XMFLOAT4(red, green, blue, alpha);
-    return;
-}
-
-
-void LightClass::SetSpecularPower(float power)
-{
-    m_specularPower = power;
-    return;
-}
-
-void LightClass::SetPosition(float x, float y, float z)
-{
-    m_position = XMFLOAT4(x, y, z, 1.0f);
-    return;
-}
-
-XMFLOAT4 LightClass::GetAmbientColor()
-{
-	return m_ambientColor;
-}
-
-
-XMFLOAT4 LightClass::GetDiffuseColor()
-{
-    return m_diffuseColor;
-}
-
-XMFLOAT3 LightClass::GetDirection()
-{
-    return m_direction;
-}
-
-XMFLOAT4 LightClass::GetSpecularColor()
-{
-    return m_specularColor;
-}
-
-
-float LightClass::GetSpecularPower()
-{
-    return m_specularPower;
-}
-
-XMFLOAT4 LightClass::GetPosition()
-{
-    return m_position;
-}

enginecustom/Lightclass.h

@@ -1,49 +0,0 @@
-#pragma once
-////////////////////////////////////////////////////////////////////////////////
-// Filename: lightclass.h
-////////////////////////////////////////////////////////////////////////////////
-#ifndef _LIGHTCLASS_H_
-#define _LIGHTCLASS_H_
-
-
-//////////////
-// INCLUDES //
-//////////////
-#include <directxmath.h>
-using namespace DirectX;
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: LightClass
-////////////////////////////////////////////////////////////////////////////////
-class LightClass
-{
-public:
-    LightClass();
-    LightClass(const LightClass&);
-    ~LightClass();
-
-	void SetAmbientColor(float, float, float, float);
-	void SetDiffuseColor(float, float, float, float);
-	void SetDirection(float, float, float);
-	void SetSpecularColor(float, float, float, float);
-	void SetSpecularPower(float);
-	void SetPosition(float, float, float);
-	
-	XMFLOAT4 GetAmbientColor();
-	XMFLOAT4 GetDiffuseColor();
-	XMFLOAT3 GetDirection();
-	XMFLOAT4 GetSpecularColor();
-	float GetSpecularPower();
-	XMFLOAT4 GetPosition();
-	
-private:
-	XMFLOAT4 m_ambientColor;
-	XMFLOAT4 m_diffuseColor;
-	XMFLOAT3 m_direction;
-	XMFLOAT4 m_specularColor;
-	float m_specularPower;
-	XMFLOAT4 m_position;
-};
-
-#endif

enginecustom/Lightshaderclass.h

@@ -1,92 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Filename: lightshaderclass.h
-////////////////////////////////////////////////////////////////////////////////
-#ifndef _LIGHTSHADERCLASS_H_
-#define _LIGHTSHADERCLASS_H_
-
-
-/////////////
-// GLOBALS //
-/////////////
-const int NUM_LIGHTS = 4;
-//////////////
-// INCLUDES //
-//////////////
-#include "Logger.h"
-#include <d3d11.h>
-#include <d3dcompiler.h>
-#include <directxmath.h>
-#include <fstream>
-using namespace DirectX;
-using namespace std;
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Class name: LightShaderClass
-////////////////////////////////////////////////////////////////////////////////
-class LightShaderClass
-{
-private:
-    struct MatrixBufferType
-    {
-        XMMATRIX world;
-        XMMATRIX view;
-        XMMATRIX projection;
-    };
-
-    struct CameraBufferType
-    {
-        XMFLOAT3 cameraPosition;
-        float padding;
-    };
-
-	struct LightBufferType
-	{
-		XMFLOAT4 ambientColor;
-		XMFLOAT4 diffuseColor;
-		XMFLOAT3 lightDirection;
-		float padding;  // Added extra padding so structure is a multiple of 16 for CreateBuffer function requirements.
-        float specularPower;
-        XMFLOAT4 specularColor;
-	};
-
-    struct LightColorBufferType
-    {
-        XMFLOAT4 diffuseColor[NUM_LIGHTS];
-    };
-
-    struct LightPositionBufferType
-    {
-        XMFLOAT4 lightPosition[NUM_LIGHTS];
-    };
-
-public:
-    LightShaderClass();
-    LightShaderClass(const LightShaderClass&);
-    ~LightShaderClass();
-
-	bool Initialize(ID3D11Device*, HWND);
-	void Shutdown();
-    bool Render(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4[], XMFLOAT4[], XMFLOAT4[]);
-
-private:
-    bool InitializeShader(ID3D11Device*, HWND, WCHAR*, WCHAR*);
-    void ShutdownShader();
-    void OutputShaderErrorMessage(ID3D10Blob*, HWND, WCHAR*);
-
-    bool SetShaderParameters(ID3D11DeviceContext*, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4[], XMFLOAT4[], XMFLOAT4[]);
-	void RenderShader(ID3D11DeviceContext*, int);
-
-private:
-    ID3D11VertexShader* m_vertexShader;
-    ID3D11PixelShader* m_pixelShader;
-    ID3D11InputLayout* m_layout;
-    ID3D11SamplerState* m_sampleState;
-    ID3D11Buffer* m_matrixBuffer;
-    ID3D11Buffer* m_cameraBuffer;
-    ID3D11Buffer* m_lightBuffer;
-    ID3D11Buffer* m_lightColorBuffer;
-    ID3D11Buffer* m_lightPositionBuffer;
-};
-
-#endif

enginecustom/TODO.txt

@@ -0,0 +1,8 @@
+- Scene Manager : 
+
+TODO : Save and Load Scene
+
+- ImguiManager :
+
+TODO : Add Save and Load Scene Button in the bar menu
+TODO : Add a preview of the game in a new window

enginecustom/assets/Model/OBJ/plane.obj

@@ -0,0 +1,16 @@
+# Simple 2D plane in OBJ format
+
+v -0.5 0.0 -0.5
+v 0.5 0.0 -0.5
+v -0.5 0.0 0.5
+v 0.5 0.0 0.5
+
+vt 0.0 0.0
+vt 1.0 0.0
+vt 0.0 1.0
+vt 1.0 1.0
+
+vn 0.0 1.0 0.0
+
+f 1/1/1 4/4/1 2/2/1
+f 1/1/1 3/3/1 4/4/1

enginecustom/assets/Model/imgui.ini

@@ -0,0 +1,24 @@
+[Window][Debug##Default]
+Pos=60,60
+Size=400,400
+
+[Window][Khaotic Engine]
+Pos=1120,51
+Size=392,273
+
+[Window][Objects]
+Pos=930,39
+Size=457,294
+
+[Window][Terrain]
+Pos=60,60
+Size=342,82
+
+[Window][Light]
+Pos=1551,17
+Size=358,535
+
+[Window][Shader Manager]
+Pos=30,255
+Size=172,284
+

enginecustom/assets/Skybox/imgui.ini

@@ -0,0 +1,91 @@
+[Window][Debug##Default]
+Pos=60,60
+Size=400,400
+Collapsed=0
+
+[Window][Khaotic Engine]
+Pos=1180,27
+Size=396,826
+Collapsed=0
+DockId=0x00000005,0
+
+[Window][Objects]
+Pos=8,442
+Size=290,411
+Collapsed=0
+DockId=0x0000000A,0
+
+[Window][Terrain]
+Pos=8,27
+Size=290,413
+Collapsed=0
+DockId=0x00000009,0
+
+[Window][Light]
+Pos=8,27
+Size=330,487
+Collapsed=0
+DockId=0x00000004,1
+
+[Window][Shader Manager]
+Pos=8,27
+Size=330,487
+Collapsed=0
+DockId=0x00000004,2
+
+[Window][Engine Settings]
+Pos=1180,27
+Size=396,826
+Collapsed=0
+DockId=0x00000005,1
+
+[Window][DockSpace Demo]
+Size=1584,861
+Collapsed=0
+
+[Window][Render Window]
+Pos=300,27
+Size=878,826
+Collapsed=0
+DockId=0x00000002,0
+
+[Window][DockSpace]
+Pos=0,0
+Size=1584,861
+Collapsed=0
+
+[Window][Add Object]
+Pos=1188,0
+Size=396,430
+Collapsed=0
+
+[Window][Log]
+Pos=8,518
+Size=1568,335
+Collapsed=0
+DockId=0x0000000C,0
+
+[Window][Log Window]
+Pos=8,627
+Size=1568,226
+Collapsed=0
+DockId=0x0000000E,0
+
+[Docking][Data]
+DockSpace         ID=0xC0DFADC4 Pos=8,27 Size=1568,826 Split=X
+  DockNode        ID=0x00000001 Parent=0xC0DFADC4 SizeRef=330,1094 Split=Y Selected=0x393905AB
+    DockNode      ID=0x00000004 Parent=0x00000001 SizeRef=330,487 Selected=0x393905AB
+    DockNode      ID=0x00000006 Parent=0x00000001 SizeRef=330,485 Selected=0x031DC75C
+  DockNode        ID=0x00000003 Parent=0xC0DFADC4 SizeRef=1700,1094 CentralNode=1
+DockSpace         ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=8,27 Size=1568,826 Split=Y
+  DockNode        ID=0x0000000D Parent=0xCCBD8CF7 SizeRef=1568,598 Split=Y
+    DockNode      ID=0x0000000B Parent=0x0000000D SizeRef=1568,637 Split=X
+      DockNode    ID=0x00000007 Parent=0x0000000B SizeRef=290,826 Split=Y Selected=0x393905AB
+        DockNode  ID=0x00000009 Parent=0x00000007 SizeRef=395,413 Selected=0x393905AB
+        DockNode  ID=0x0000000A Parent=0x00000007 SizeRef=395,411 Selected=0x031DC75C
+      DockNode    ID=0x00000008 Parent=0x0000000B SizeRef=1276,826 Split=X
+        DockNode  ID=0x00000002 Parent=0x00000008 SizeRef=878,826 CentralNode=1 Selected=0x9204953B
+        DockNode  ID=0x00000005 Parent=0x00000008 SizeRef=396,826 Selected=0x9F035453
+    DockNode      ID=0x0000000C Parent=0x0000000D SizeRef=1568,335 Selected=0x139FDA3F
+  DockNode        ID=0x0000000E Parent=0xCCBD8CF7 SizeRef=1568,226 Selected=0xAB74BEE9
+

enginecustom/assets/Texture/imgui.ini

@@ -0,0 +1,89 @@
+[Window][Debug##Default]
+Pos=60,60
+Size=400,400
+Collapsed=0
+
+[Window][Khaotic Engine]
+Pos=1233,27
+Size=343,826
+Collapsed=0
+DockId=0x00000005,0
+
+[Window][Objects]
+Pos=8,27
+Size=522,826
+Collapsed=0
+DockId=0x00000009,0
+
+[Window][Terrain]
+Pos=8,27
+Size=250,974
+Collapsed=0
+DockId=0x00000007,0
+
+[Window][Light]
+Pos=8,27
+Size=290,866
+Collapsed=0
+DockId=0x00000007,1
+
+[Window][Shader Manager]
+Pos=8,27
+Size=330,487
+Collapsed=0
+DockId=0x00000001,2
+
+[Window][Engine Settings]
+Pos=8,27
+Size=289,974
+Collapsed=0
+DockId=0x00000009,0
+
+[Window][DockSpace Demo]
+Size=1584,861
+Collapsed=0
+
+[Window][Render Window]
+Pos=8,27
+Size=1559,974
+Collapsed=0
+DockId=0x00000009,0
+
+[Window][DockSpace]
+Pos=0,0
+Size=1584,861
+Collapsed=0
+
+[Window][Add Object]
+Pos=1188,0
+Size=396,430
+Collapsed=0
+
+[Window][Log]
+Pos=8,518
+Size=1568,335
+Collapsed=0
+DockId=0x0000000C,0
+
+[Window][Log Window]
+Pos=8,627
+Size=1568,226
+Collapsed=0
+DockId=0x00000006,0
+
+[Docking][Data]
+DockSpace           ID=0xC0DFADC4 Pos=8,27 Size=1568,826 Split=X
+  DockNode          ID=0x00000001 Parent=0xC0DFADC4 SizeRef=330,1094 Selected=0x393905AB
+  DockNode          ID=0x00000003 Parent=0xC0DFADC4 SizeRef=1700,1094 CentralNode=1
+DockSpace           ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=8,27 Size=1568,826 Split=X
+  DockNode          ID=0x00000009 Parent=0xCCBD8CF7 SizeRef=522,974 Selected=0x031DC75C
+  DockNode          ID=0x0000000D Parent=0xCCBD8CF7 SizeRef=1044,974 Split=X
+    DockNode        ID=0x00000002 Parent=0x0000000D SizeRef=699,826 Split=Y
+      DockNode      ID=0x00000004 Parent=0x00000002 SizeRef=2032,866 Split=Y
+        DockNode    ID=0x0000000B Parent=0x00000004 SizeRef=1568,637 Split=X
+          DockNode  ID=0x00000007 Parent=0x0000000B SizeRef=250,826 Selected=0x393905AB
+          DockNode  ID=0x00000008 Parent=0x0000000B SizeRef=971,826 CentralNode=1 Selected=0x031DC75C
+        DockNode    ID=0x0000000C Parent=0x00000004 SizeRef=1568,335 Selected=0x139FDA3F
+      DockNode      ID=0x00000006 Parent=0x00000002 SizeRef=2032,226 Selected=0xAB74BEE9
+    DockNode        ID=0x00000005 Parent=0x0000000D SizeRef=343,826 Selected=0x9F035453
+

enginecustom/assets/empty.ker

@@ -0,0 +1 @@
+0 isosphere 0 10 0 1 1 1 F:\Github_Repo\khaotic-engine-Reborn\enginecustom\assets\Model\OBJ\isosphere.obj

enginecustom/assets/imgui.ini

@@ -0,0 +1,35 @@
+[Window][DockSpace]
+Pos=0,0
+Size=1584,861
+Collapsed=0
+
+[Window][Debug##Default]
+Pos=60,60
+Size=400,400
+Collapsed=0
+
+[Window][Khaotic Engine]
+Pos=1223,27
+Size=353,826
+Collapsed=0
+DockId=0x00000002,0
+
+[Window][Objects]
+Pos=8,27
+Size=345,826
+Collapsed=0
+DockId=0x00000003,0
+
+[Window][Engine Settings]
+Pos=1223,27
+Size=353,826
+Collapsed=0
+DockId=0x00000002,1
+
+[Docking][Data]
+DockSpace     ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=8,27 Size=1568,826 Split=X
+  DockNode    ID=0x00000003 Parent=0xCCBD8CF7 SizeRef=345,826 Selected=0x031DC75C
+  DockNode    ID=0x00000004 Parent=0xCCBD8CF7 SizeRef=1221,826 Split=X
+    DockNode  ID=0x00000001 Parent=0x00000004 SizeRef=866,826 CentralNode=1
+    DockNode  ID=0x00000002 Parent=0x00000004 SizeRef=353,826 Selected=0x0B098C4B
+

enginecustom/celshading.ps

@@ -1,89 +0,0 @@
-cbuffer LightBuffer
-{
-    float4 diffuseColor;
-    float3 lightDirection;
-    float padding; // Padding to ensure the structure is a multiple of 16 bytes.
-    float3 lightPosition; // Add light position
-    float padding2; // Padding to ensure the structure is a multiple of 16 bytes.
-    float constantAttenuation;
-    float linearAttenuation;
-    float quadraticAttenuation;
-    float padding3; // Padding to ensure the structure is a multiple of 16 bytes.
-};
-
-Texture2D shaderTexture;
-SamplerState SampleType;
-
-struct PixelInputType
-{
-    float4 position : SV_POSITION;
-    float3 normal : NORMAL;
-    float2 tex : TEXCOORD0;
-    float3 worldPos : TEXCOORD1; // Add world position
-};
-
-float4 CelShadingPixelShader(PixelInputType input) : SV_TARGET
-{
-    float4 textureColor;
-    float lightIntensity;
-    float4 finalColor;
-
-    // Sample the pixel color from the texture.
-    textureColor = shaderTexture.Sample(SampleType, input.tex);
-
-    float3 normal = normalize(input.normal);
-
-    // Calculate the light vector from the light position to the world position
-    float3 lightVector = normalize(lightPosition - input.worldPos);
-
-    // Calculate the light intensity based on the light direction.
-    float directionalLightIntensity = saturate(dot(normal, normalize(lightDirection)));
-
-    // Calculate the light intensity based on the light position.
-    float positionalLightIntensity = saturate(dot(normal, lightVector));
-
-    // Combine the directional and positional light intensities.
-    lightIntensity = max(directionalLightIntensity, positionalLightIntensity);
-
-    // Calculate the distance from the light to the fragment.
-    float distance = length(lightPosition - input.worldPos);
-
-    // Apply an attenuation factor based on the distance.
-    float attenuation = 1.0f / (constantAttenuation + linearAttenuation * distance + quadraticAttenuation * distance * distance);
-
-    // Combine the light intensity with the attenuation factor.
-    lightIntensity *= attenuation;
-
-    // Apply a step function to create the cel shading effect.
-    if (lightIntensity > 0.75f)
-    {
-        lightIntensity = 1.0f; // Brightest level
-    }
-    else if (lightIntensity > 0.5f)
-    {
-        lightIntensity = 0.7f; // Mid-bright level
-    }
-    else if (lightIntensity > 0.25f)
-    {
-        lightIntensity = 0.4f; // Mid-dark level
-    }
-    else
-    {
-        lightIntensity = 0.1f; // Darkest level
-    }
-
-    // Simple shadow calculation: if the fragment is behind the light source, it is in shadow.
-    float3 toLight = normalize(lightPosition - input.worldPos);
-    float shadow = saturate(dot(normal, toLight));
-    if (shadow < 0.1f)
-    {
-        lightIntensity *= 0.5f; // Darken the fragment if it is in shadow
-    }
-
-    // Calculate the final color by combining the texture color with the light intensity and diffuse color.
-    finalColor = textureColor * diffuseColor * lightIntensity;
-
-    //return finalColor;
-    
-    return float4(normal * 0.5f + 0.5f, 1.0f);
-}

enginecustom/celshading.vs

@@ -1,45 +0,0 @@
-cbuffer MatrixBuffer
-{
-    matrix worldMatrix;
-    matrix viewMatrix;
-    matrix projectionMatrix;
-};
-
-struct VertexInputType
-{
-    float4 position : POSITION;
-    float3 normal : NORMAL;
-    float2 tex : TEXCOORD0;
-};
-
-struct PixelInputType
-{
-    float4 position : SV_POSITION;
-    float3 normal : NORMAL;
-    float2 tex : TEXCOORD0;
-    float3 worldPos : TEXCOORD1; // Add world position
-};
-
-PixelInputType CelShadingVertexShader(VertexInputType input)
-{
-    PixelInputType output;
-
-    // Change the position vector to be 4 units for proper matrix calculations.
-    input.position.w = 1.0f;
-
-    // Calculate the position of the vertex against the world, view, and projection matrices.
-    float4 worldPosition = mul(input.position, worldMatrix);
-    output.position = mul(worldPosition, viewMatrix);
-    output.position = mul(output.position, projectionMatrix);
-
-    // Pass the normal to the pixel shader
-    output.normal = normalize(mul((float3x3) worldMatrix, input.normal));
-
-    // Pass the world position to the pixel shader
-    output.worldPos = worldPosition.xyz;
-
-    // Store the texture coordinates for the pixel shader.
-    output.tex = input.tex;
-
-    return output;
-}

enginecustom/enginecustom.vcxproj

@@ -19,62 +19,60 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="alphamapshaderclass.cpp" />
-    <ClCompile Include="applicationclass.cpp" />
-    <ClCompile Include="bitmapclass.cpp" />
-    <ClCompile Include="Cameraclass.cpp" />
-    <ClCompile Include="CelShadingShader.cpp" />
-    <ClCompile Include="Colorshaderclass.cpp" />
-    <ClCompile Include="d3dclass.cpp" />
-    <ClCompile Include="imguiManager.cpp" />
     <ClCompile Include="include\backends\imgui_impl_dx11.cpp" />
     <ClCompile Include="include\backends\imgui_impl_win32.cpp" />
     <ClCompile Include="include\imgui.cpp" />
-    <ClCompile Include="include\imgui_demo.cpp" />
     <ClCompile Include="include\imgui_draw.cpp" />
     <ClCompile Include="include\imgui_tables.cpp" />
     <ClCompile Include="include\imgui_widgets.cpp" />
-    <ClCompile Include="displayplaneclass.cpp" />
+    <ClCompile Include="include\Src\DDSTextureLoader.cpp" />
-    <ClCompile Include="fontclass.cpp" />
+    <ClCompile Include="include\Src\DirectXHelpers.cpp" />
-    <ClCompile Include="fontshaderclass.cpp" />
+    <ClCompile Include="include\Src\pch.cpp" />
-    <ClCompile Include="fpsclass.cpp" />
+    <ClCompile Include="include\Src\SimpleMath.cpp" />
-    <ClCompile Include="frustumclass.cpp" />
+    <ClCompile Include="include\Src\WICTextureLoader.cpp" />
-    <ClCompile Include="inputclass.cpp" />
+    <ClCompile Include="src\src\shader\alphamapshaderclass.cpp" />
-    <ClCompile Include="Lightclass.cpp" />
+    <ClCompile Include="src\src\shader\CelShadingShader.cpp" />
-    <ClCompile Include="lightmapshaderclass.cpp" />
+    <ClCompile Include="src\src\shader\Colorshaderclass.cpp" />
-    <ClCompile Include="Lightshaderclass.cpp" />
+    <ClCompile Include="src\src\shader\fontshaderclass.cpp" />
-    <ClCompile Include="Main.cpp" />
+    <ClCompile Include="src\src\shader\lightmapshaderclass.cpp" />
-    <ClCompile Include="modelclass.cpp" />
+    <ClCompile Include="src\src\shader\lightshaderclass.cpp" />
-    <ClCompile Include="object.cpp" />
+    <ClCompile Include="src\src\shader\Multitextureshaderclass.cpp" />
-    <ClCompile Include="modellistclass.cpp" />
+    <ClCompile Include="src\src\shader\normalmapshaderclass.cpp" />
-    <ClCompile Include="Multitextureshaderclass.cpp" />
+    <ClCompile Include="src\src\shader\reflectionshaderclass.cpp" />
-    <ClCompile Include="normalmapshaderclass.cpp" />
+    <ClCompile Include="src\src\shader\refractionshaderclass.cpp" />
-    <ClCompile Include="refractionshaderclass.cpp" />
+    <ClCompile Include="src\src\shader\shadermanagerclass.cpp" />
-    <ClCompile Include="shadermanagerclass.cpp" />
+    <ClCompile Include="src\src\shader\specmapshaderclass.cpp" />
-    <ClCompile Include="physics.cpp" />
+    <ClCompile Include="src\src\shader\sunlightshaderclass.cpp" />
-    <ClCompile Include="positionclass.cpp" />
+    <ClCompile Include="src\src\shader\textureshaderclass.cpp" />
-    <ClCompile Include="reflectionshaderclass.cpp" />
+    <ClCompile Include="src\src\shader\translateshaderclass.cpp" />
-    <ClCompile Include="rendertextureclass.cpp" />
+    <ClCompile Include="src\src\shader\transparentshaderclass.cpp" />
-    <ClCompile Include="specmapshaderclass.cpp" />
+    <ClCompile Include="src\src\shader\watershaderclass.cpp" />
-    <ClCompile Include="Spriteclass.cpp" />
+    <ClCompile Include="src\src\system\applicationclass.cpp" />
-    <ClCompile Include="Systemclass.cpp" />
+    <ClCompile Include="src\src\system\bitmapclass.cpp" />
-    <ClCompile Include="textclass.cpp" />
+    <ClCompile Include="src\src\system\Cameraclass.cpp" />
-    <ClCompile Include="textureclass.cpp" />
+    <ClCompile Include="src\src\system\d3dclass.cpp" />
-    <ClCompile Include="textureshaderclass.cpp" />
+    <ClCompile Include="src\src\system\displayplaneclass.cpp" />
-    <ClCompile Include="Timerclass.cpp" />
+    <ClCompile Include="src\src\system\fontclass.cpp" />
-    <ClCompile Include="translateshaderclass.cpp" />
+    <ClCompile Include="src\src\system\fpsclass.cpp" />
-    <ClCompile Include="transparentshaderclass.cpp" />
+    <ClCompile Include="src\src\system\frustum.cpp" />
-    <ClCompile Include="watershaderclass.cpp" />
+    <ClCompile Include="src\src\system\frustumclass.cpp" />
+    <ClCompile Include="src\src\system\imguiManager.cpp" />
+    <ClCompile Include="src\src\system\inputclass.cpp" />
+    <ClCompile Include="src\src\system\lightclass.cpp" />
+    <ClCompile Include="src\src\system\Main.cpp" />
+    <ClCompile Include="src\src\system\modelclass.cpp" />
+    <ClCompile Include="src\src\system\Modellistclass.cpp" />
+    <ClCompile Include="src\src\system\object.cpp" />
+    <ClCompile Include="src\src\system\physics.cpp" />
+    <ClCompile Include="src\src\system\Positionclass.cpp" />
+    <ClCompile Include="src\src\system\rendertextureclass.cpp" />
+    <ClCompile Include="src\src\system\Spriteclass.cpp" />
+    <ClCompile Include="src\src\system\Systemclass.cpp" />
+    <ClCompile Include="src\src\system\textclass.cpp" />
+    <ClCompile Include="src\src\system\textureclass.cpp" />
+    <ClCompile Include="src\src\system\Timerclass.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="alphamapshaderclass.h" />
-    <ClInclude Include="applicationclass.h" />
-    <ClInclude Include="bitmapclass.h" />
-    <ClInclude Include="Cameraclass.h" />
-    <ClInclude Include="CelShadingShader.h" />
-    <ClInclude Include="Colorshaderclass.h" />
-    <ClInclude Include="d3dclass.h" />
-    <ClInclude Include="imguiManager.h" />
     <ClInclude Include="include\backends\imgui_impl_dx11.h" />
     <ClInclude Include="include\backends\imgui_impl_win32.h" />
     <ClInclude Include="include\imconfig.h" />
@@ -83,203 +81,428 @@
     <ClInclude Include="include\imstb_rectpack.h" />
     <ClInclude Include="include\imstb_textedit.h" />
     <ClInclude Include="include\imstb_truetype.h" />
-    <ClInclude Include="displayplaneclass.h" />
+    <ClInclude Include="include\Src\CMO.h" />
-    <ClInclude Include="fontclass.h" />
+    <ClInclude Include="include\Src\DDS.h" />
-    <ClInclude Include="fontshaderclass.h" />
+    <ClInclude Include="include\Src\LoaderHelpers.h" />
-    <ClInclude Include="fpsclass.h" />
+    <ClInclude Include="include\Src\pch.h" />
-    <ClInclude Include="frustumclass.h" />
+    <ClInclude Include="include\Src\PlatformHelpers.h" />
-    <ClInclude Include="inputclass.h" />
+    <ClInclude Include="src\inc\shader\alphamapshaderclass.h" />
-    <ClInclude Include="lightclass.h" />
+    <ClInclude Include="src\inc\shader\CelShadingShader.h" />
-    <ClInclude Include="lightmapshaderclass.h" />
+    <ClInclude Include="src\inc\shader\Colorshaderclass.h" />
-    <ClInclude Include="lightshaderclass.h" />
+    <ClInclude Include="src\inc\shader\fontshaderclass.h" />
-    <ClInclude Include="Logger.h" />
+    <ClInclude Include="src\inc\shader\lightmapshaderclass.h" />
-    <ClInclude Include="modelclass.h" />
+    <ClInclude Include="src\inc\shader\lightshaderclass.h" />
-    <ClInclude Include="object.h" />
+    <ClInclude Include="src\inc\shader\lightshaderwaterclass.h" />
-    <ClInclude Include="modellistclass.h" />
+    <ClInclude Include="src\inc\shader\Multitextureshaderclass.h" />
-    <ClInclude Include="Multitextureshaderclass.h" />
+    <ClInclude Include="src\inc\shader\normalmapshaderclass.h" />
-    <ClInclude Include="normalmapshaderclass.h" />
+    <ClInclude Include="src\inc\shader\reflectionshaderclass.h" />
-    <ClInclude Include="refractionshaderclass.h" />
+    <ClInclude Include="src\inc\shader\refractionshaderclass.h" />
-    <ClInclude Include="shadermanagerclass.h" />
+    <ClInclude Include="src\inc\shader\shadermanagerclass.h" />
-    <ClInclude Include="physics.h" />
+    <ClInclude Include="src\inc\shader\specmapshaderclass.h" />
-    <ClInclude Include="positionclass.h" />
+    <ClInclude Include="src\inc\shader\sunlightshaderclass.h" />
-    <ClInclude Include="reflectionshaderclass.h" />
+    <ClInclude Include="src\inc\shader\textureshaderclass.h" />
-    <ClInclude Include="rendertextureclass.h" />
+    <ClInclude Include="src\inc\shader\translateshaderclass.h" />
-    <ClInclude Include="resources.h" />
+    <ClInclude Include="src\inc\shader\transparentshaderclass.h" />
-    <ClInclude Include="specmapshaderclass.h" />
+    <ClInclude Include="src\inc\shader\watershaderclass.h" />
-    <ClInclude Include="Spriteclass.h" />
+    <ClInclude Include="src\inc\system\applicationclass.h" />
-    <ClInclude Include="systemclass.h" />
+    <ClInclude Include="src\inc\system\bitmapclass.h" />
-    <ClInclude Include="textclass.h" />
+    <ClInclude Include="src\inc\system\Cameraclass.h" />
-    <ClInclude Include="textureclass.h" />
+    <ClInclude Include="src\inc\system\d3dclass.h" />
-    <ClInclude Include="textureshaderclass.h" />
+    <ClInclude Include="src\inc\system\displayplaneclass.h" />
-    <ClInclude Include="Timerclass.h" />
+    <ClInclude Include="src\inc\system\fontclass.h" />
-    <ClInclude Include="translateshaderclass.h" />
+    <ClInclude Include="src\inc\system\fpsclass.h" />
-    <ClInclude Include="transparentshaderclass.h" />
+    <ClInclude Include="src\inc\system\frustum.h" />
-    <ClInclude Include="watershaderclass.h" />
+    <ClInclude Include="src\inc\system\frustumclass.h" />
+    <ClInclude Include="src\inc\system\imguiManager.h" />
+    <ClInclude Include="src\inc\system\inputclass.h" />
+    <ClInclude Include="src\inc\system\lightclass.h" />
+    <ClInclude Include="src\inc\system\Logger.h" />
+    <ClInclude Include="src\inc\system\modelclass.h" />
+    <ClInclude Include="src\inc\system\Modellistclass.h" />
+    <ClInclude Include="src\inc\system\object.h" />
+    <ClInclude Include="src\inc\system\physics.h" />
+    <ClInclude Include="src\inc\system\Positionclass.h" />
+    <ClInclude Include="src\inc\system\rendertextureclass.h" />
+    <ClInclude Include="src\inc\system\sceneManager.h" />
+    <ClInclude Include="src\inc\system\Spriteclass.h" />
+    <ClInclude Include="src\inc\system\systemclass.h" />
+    <ClInclude Include="src\inc\system\textclass.h" />
+    <ClInclude Include="src\inc\system\textureclass.h" />
+    <ClInclude Include="src\inc\system\Timerclass.h" />
   </ItemGroup>
   <ItemGroup>
-    <CopyFileToFolders Include="alphamap.ps">
+    <CopyFileToFolders Include="src\hlsl\alphamap.ps">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="alphamap.vs">
+    <CopyFileToFolders Include="src\hlsl\alphamap.vs">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="font.ps">
+    <CopyFileToFolders Include="src\hlsl\celshading.ps">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="font.vs">
+    <CopyFileToFolders Include="src\hlsl\celshading.vs">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="light.ps">
+    <CopyFileToFolders Include="src\hlsl\Color.ps">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="light.vs">
+    <CopyFileToFolders Include="src\hlsl\Color.vs">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="lightmap.ps">
+    <CopyFileToFolders Include="src\hlsl\font.ps">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="lightmap.vs">
+    <CopyFileToFolders Include="src\hlsl\font.vs">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="Multitexture.ps">
+    <CopyFileToFolders Include="src\hlsl\light.ps">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="Multitexture.vs">
+    <CopyFileToFolders Include="src\hlsl\light.vs">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="normalmap.ps">
+    <CopyFileToFolders Include="src\hlsl\lightmap.ps">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="normalmap.vs">
+    <CopyFileToFolders Include="src\hlsl\lightmap.vs">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="..\KhaoticDemo\water.ps">
+    <CopyFileToFolders Include="src\hlsl\Multitexture.ps">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="celshading.ps">
+    <CopyFileToFolders Include="src\hlsl\Multitexture.vs">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="celshading.vs">
+    <CopyFileToFolders Include="src\hlsl\normalmap.ps">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <None Include="packages.config" />
+    <CopyFileToFolders Include="src\hlsl\normalmap.vs">
-    <CopyFileToFolders Include="reflection.ps">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="reflection.vs">
+    <CopyFileToFolders Include="src\hlsl\reflection.ps">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="specmap.ps">
+    <CopyFileToFolders Include="src\hlsl\reflection.vs">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="specmap.vs">
+    <CopyFileToFolders Include="src\hlsl\refraction.ps">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="texture.ps">
+    <CopyFileToFolders Include="src\hlsl\refraction.vs">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="texture.vs">
+    <CopyFileToFolders Include="src\hlsl\specmap.ps">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="transparent.ps">
+    <CopyFileToFolders Include="src\hlsl\specmap.vs">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="transparent.vs">
+    <CopyFileToFolders Include="src\hlsl\sunlight.ps">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="refraction.ps">
+    <CopyFileToFolders Include="src\hlsl\sunlight.vs">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="refraction.vs">
+    <CopyFileToFolders Include="src\hlsl\texture.ps">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="water.vs">
+    <CopyFileToFolders Include="src\hlsl\texture.vs">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="src\hlsl\translate.ps">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="src\hlsl\translate.vs">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="src\hlsl\transparent.ps">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="src\hlsl\transparent.vs">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="src\hlsl\water.ps">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="src\hlsl\water.vs">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
   </ItemGroup>
   <ItemGroup>
-    <CopyFileToFolders Include="Color.ps">
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
-      <FileType>Document</FileType>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="Color.vs">
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Vertex</ShaderType>
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Vertex</ShaderType>
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Vertex</ShaderType>
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Vertex</ShaderType>
-      <FileType>Document</FileType>
-    </CopyFileToFolders>
-  </ItemGroup>
-  <ItemGroup>
-    <CopyFileToFolders Include="alpha01.tga" />
-    <Image Include="dirt01.tga" />
     <CopyFileToFolders Include="font01.tga" />
+    <CopyFileToFolders Include="assets\Texture\alpha01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\Bricks2K.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\BricksGLOSS2K.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\BricksNRM2K.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\dirt01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\font01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\ground01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\light01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\marble01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\moss01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\normal01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\spec02.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\sprite01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\sprite02.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\sprite03.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\sprite04.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\stone01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\stone01.tga">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\wall.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\wall01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\water01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\EmptyTexture.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Skybox\skybox_back.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Skybox\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Skybox\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Skybox\skybox_bottom.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Skybox\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Skybox\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Skybox\skybox_front.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Skybox\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Skybox\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Skybox\skybox_left.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Skybox\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Skybox\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Skybox\skybox_right.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Skybox\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Skybox\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Skybox\skybox_top.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Skybox\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Skybox\</DestinationFolders>
+    </CopyFileToFolders>
     <Image Include="KhaoticIcon.ico" />
-    <CopyFileToFolders Include="light01.tga" />
-    <CopyFileToFolders Include="moss01.tga" />
-    <CopyFileToFolders Include="normal01.tga" />
-    <CopyFileToFolders Include="marble01.tga" />
-    <Image Include="papier.tga" />
-    <CopyFileToFolders Include="spec02.tga" />
     <CopyFileToFolders Include="sprite01.tga" />
     <CopyFileToFolders Include="sprite02.tga" />
     <CopyFileToFolders Include="sprite03.tga" />
     <CopyFileToFolders Include="sprite04.tga" />
-    <CopyFileToFolders Include="stone01.tga" />
-    <CopyFileToFolders Include="wall.tga" />
-    <CopyFileToFolders Include="water01.tga" />
   </ItemGroup>
   <ItemGroup>
-    <CopyFileToFolders Include="cube.txt" />
     <CopyFileToFolders Include="font01.txt" />
-    <CopyFileToFolders Include="plane.txt" />
-    <CopyFileToFolders Include="bath.txt" />
-    <Text Include="chunk.txt" />
-    <Text Include="sphere.txt" />
-    <CopyFileToFolders Include="sprite_data_01.txt" />
-    <Text Include="square.txt" />
-    <CopyFileToFolders Include="water.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <CopyFileToFolders Include="translate.ps">
-      <SubType>Designer</SubType>
-      <FileType>Document</FileType>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="translate.vs">
-      <SubType>Designer</SubType>
-      <FileType>Document</FileType>
-    </CopyFileToFolders>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="resources.rc" />
   </ItemGroup>
   <ItemGroup>
-    <CopyFileToFolders Include="cone.obj">
+    <CopyFileToFolders Include="assets\Model\OBJ\86.obj">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\OBJ\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\OBJ\</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="isosphere.obj">
+    <CopyFileToFolders Include="assets\Model\OBJ\cone.obj">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\OBJ\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\OBJ\</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="monke.obj">
+    <CopyFileToFolders Include="assets\Model\OBJ\isosphere.obj">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\OBJ\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\OBJ\</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="vaisseau.obj">
+    <CopyFileToFolders Include="assets\Model\OBJ\monke.obj">
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\OBJ\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\OBJ\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\vaisseau.obj">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\OBJ\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\OBJ\</DestinationFolders>
     </CopyFileToFolders>
   </ItemGroup>
   <ItemGroup>
-    <CopyFileToFolders Include="86.obj">
+    <CopyFileToFolders Include="assets\Model\TXT\bath.txt">
-      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\chunk.txt">
+      <FileType>Text</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\cube.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\ground.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\plane.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\sphere.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\square.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\wall.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\water.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT\</DestinationFolders>
+    </CopyFileToFolders>
+  </ItemGroup>
+  <ItemGroup>
+    <CopyFileToFolders Include="sprite_data_01.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <CopyFileToFolders Include="assets\Model\OBJ\plane.obj">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\OBJ\</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\OBJ\</DestinationFolders>
+    </CopyFileToFolders>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="TODO.txt" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{92cf56c4-76bb-40d4-8fe5-36c15f5f127a}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>KhaoticCore</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -360,7 +583,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)enginecustom\include\backends;$(SolutionDir)enginecustom\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)enginecustom\include\backends;$(SolutionDir)enginecustom\include\Inc;$(SolutionDir)enginecustom\include;$(SolutionDir)enginecustom\src\inc\shader;$(SolutionDir)enginecustom\src\inc\system;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
@@ -377,7 +600,7 @@
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
-      <AdditionalIncludeDirectories>$(SolutionDir)enginecustom\include\backends;$(SolutionDir)enginecustom\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)enginecustom\include\backends;$(SolutionDir)enginecustom\include\Inc;$(SolutionDir)enginecustom\include;$(SolutionDir)enginecustom\src\inc\shader;$(SolutionDir)enginecustom\src\inc\system;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

enginecustom/enginecustom.vcxproj.filters

@@ -31,35 +31,41 @@
     <Filter Include="Assets">
       <UniqueIdentifier>{2978535b-193d-4876-83be-1c3c4470db62}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Fichiers sources\DirectX  Tool Kit">
+      <UniqueIdentifier>{3bfbc604-3b39-4e49-bee2-b942fc5dce8c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Fichiers d%27en-tête\DirectX Tool Kit">
+      <UniqueIdentifier>{d710c862-b37d-4ad5-aa92-2456f9745881}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Assets\Texture">
+      <UniqueIdentifier>{4873a73d-d11c-4d40-b847-b6d7fef4b23d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Assets\Model">
+      <UniqueIdentifier>{3f3824c5-8a66-4f02-9845-1a9538336592}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Assets\Model\OBJ">
+      <UniqueIdentifier>{22651df1-90a4-4a19-8b97-5147b27d975a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Assets\Model\TXT">
+      <UniqueIdentifier>{f67d85e0-106e-47a1-bb9c-a5ea9111509a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Fichiers d%27en-tête\Shader">
+      <UniqueIdentifier>{e087647e-a306-4246-9320-bab0830bb634}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Fichiers sources\Shader">
+      <UniqueIdentifier>{3c669b93-a9fd-4b74-813f-f9780413f76b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Fichiers sources\System">
+      <UniqueIdentifier>{b2659b1e-695d-488e-9a1c-341691d312bc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Assets\Skybox">
+      <UniqueIdentifier>{4bfa47c6-e23c-4cae-a7af-3fc870a448e4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Fichiers d%27en-tête\System">
+      <UniqueIdentifier>{567548ae-97a4-413e-8d44-86d6e8252487}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Main.cpp">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
-    <ClCompile Include="Systemclass.cpp">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
-    <ClCompile Include="inputclass.cpp">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
-    <ClCompile Include="applicationclass.cpp">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
-    <ClCompile Include="d3dclass.cpp">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
-    <ClCompile Include="Colorshaderclass.cpp">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
-    <ClCompile Include="modelclass.cpp">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
-    <ClCompile Include="Cameraclass.cpp">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
-    <ClCompile Include="include\imgui_demo.cpp">
-      <Filter>Fichiers sources\ImGui</Filter>
-    </ClCompile>
     <ClCompile Include="include\backends\imgui_impl_dx11.cpp">
       <Filter>Fichiers sources\ImGui</Filter>
     </ClCompile>
@@ -78,125 +84,146 @@
     <ClCompile Include="include\imgui_widgets.cpp">
       <Filter>Fichiers sources\ImGui</Filter>
     </ClCompile>
-    <ClCompile Include="imguiManager.cpp">
+    <ClCompile Include="include\Src\DDSTextureLoader.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\DirectX  Tool Kit</Filter>
     </ClCompile>
-    <ClCompile Include="lightclass.cpp">
+    <ClCompile Include="include\Src\DirectXHelpers.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\DirectX  Tool Kit</Filter>
     </ClCompile>
-    <ClCompile Include="lightshaderclass.cpp">
+    <ClCompile Include="include\Src\pch.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\DirectX  Tool Kit</Filter>
     </ClCompile>
-    <ClCompile Include="object.cpp">
+    <ClCompile Include="include\Src\SimpleMath.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\DirectX  Tool Kit</Filter>
     </ClCompile>
-    <ClCompile Include="textureclass.cpp">
+    <ClCompile Include="include\Src\WICTextureLoader.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\DirectX  Tool Kit</Filter>
     </ClCompile>
-    <ClCompile Include="bitmapclass.cpp">
+    <ClCompile Include="src\src\shader\alphamapshaderclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
-    <ClCompile Include="fontclass.cpp">
+    <ClCompile Include="src\src\shader\CelShadingShader.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
-    <ClCompile Include="fontshaderclass.cpp">
+    <ClCompile Include="src\src\shader\Colorshaderclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
-    <ClCompile Include="fpsclass.cpp">
+    <ClCompile Include="src\src\shader\lightmapshaderclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
-    <ClCompile Include="Spriteclass.cpp">
+    <ClCompile Include="src\src\shader\lightshaderclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
-    <ClCompile Include="Multitextureshaderclass.cpp">
+    <ClCompile Include="src\src\shader\Multitextureshaderclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
-    <ClCompile Include="textclass.cpp">
+    <ClCompile Include="src\src\shader\normalmapshaderclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
-    <ClCompile Include="textureshaderclass.cpp">
+    <ClCompile Include="src\src\shader\reflectionshaderclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
-    <ClCompile Include="Timerclass.cpp">
+    <ClCompile Include="src\src\shader\refractionshaderclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
-    <ClCompile Include="fpsclass.cpp">
+    <ClCompile Include="src\src\shader\shadermanagerclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
-    <ClCompile Include="alphamapshaderclass.cpp">
+    <ClCompile Include="src\src\shader\specmapshaderclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
-    <ClCompile Include="specmapshaderclass.cpp">
+    <ClCompile Include="src\src\shader\sunlightshaderclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
-    <ClCompile Include="frustumclass.cpp">
+    <ClCompile Include="src\src\shader\textureshaderclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
-    <ClCompile Include="modellistclass.cpp">
+    <ClCompile Include="src\src\shader\translateshaderclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
-    <ClCompile Include="positionclass.cpp">
+    <ClCompile Include="src\src\shader\transparentshaderclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
-    <ClCompile Include="displayplaneclass.cpp">
+    <ClCompile Include="src\src\shader\watershaderclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
-    <ClCompile Include="rendertextureclass.cpp">
+    <ClCompile Include="src\src\system\applicationclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\System</Filter>
     </ClCompile>
-    <ClCompile Include="translateshaderclass.cpp">
+    <ClCompile Include="src\src\system\bitmapclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\System</Filter>
     </ClCompile>
-    <ClCompile Include="reflectionshaderclass.cpp">
+    <ClCompile Include="src\src\system\Cameraclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\System</Filter>
     </ClCompile>
-    <ClCompile Include="shadermanagerclass.cpp">
+    <ClCompile Include="src\src\system\d3dclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\System</Filter>
     </ClCompile>
-    <ClCompile Include="transparentshaderclass.cpp">
+    <ClCompile Include="src\src\system\displayplaneclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\System</Filter>
     </ClCompile>
-    <ClCompile Include="lightmapshaderclass.cpp">
+    <ClCompile Include="src\src\system\fontclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\System</Filter>
     </ClCompile>
-    <ClCompile Include="watershaderclass.cpp">
+    <ClCompile Include="src\src\system\fpsclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\System</Filter>
     </ClCompile>
-    <ClCompile Include="refractionshaderclass.cpp">
+    <ClCompile Include="src\src\system\frustum.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\System</Filter>
     </ClCompile>
-    <ClCompile Include="physics.cpp">
+    <ClCompile Include="src\src\system\frustumclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\System</Filter>
     </ClCompile>
-    <ClCompile Include="normalmapshaderclass.cpp">
+    <ClCompile Include="src\src\system\imguiManager.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\System</Filter>
     </ClCompile>
-    <ClCompile Include="CelShadingShader.cpp">
+    <ClCompile Include="src\src\system\inputclass.cpp">
-      <Filter>Fichiers sources</Filter>
+      <Filter>Fichiers sources\System</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\system\lightclass.cpp">
+      <Filter>Fichiers sources\System</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\system\Main.cpp">
+      <Filter>Fichiers sources\System</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\system\modelclass.cpp">
+      <Filter>Fichiers sources\System</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\system\Modellistclass.cpp">
+      <Filter>Fichiers sources\System</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\system\object.cpp">
+      <Filter>Fichiers sources\System</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\system\physics.cpp">
+      <Filter>Fichiers sources\System</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\system\Positionclass.cpp">
+      <Filter>Fichiers sources\System</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\system\rendertextureclass.cpp">
+      <Filter>Fichiers sources\System</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\system\Spriteclass.cpp">
+      <Filter>Fichiers sources\System</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\system\Systemclass.cpp">
+      <Filter>Fichiers sources\System</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\system\textclass.cpp">
+      <Filter>Fichiers sources\System</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\system\textureclass.cpp">
+      <Filter>Fichiers sources\System</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\system\Timerclass.cpp">
+      <Filter>Fichiers sources\System</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\shader\fontshaderclass.cpp">
+      <Filter>Fichiers sources\Shader</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="systemclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
-    <ClInclude Include="inputclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
-    <ClInclude Include="applicationclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
-    <ClInclude Include="d3dclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
-    <ClInclude Include="Colorshaderclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
-    <ClInclude Include="modelclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
-    <ClInclude Include="Cameraclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
     <ClInclude Include="include\imconfig.h">
       <Filter>Fichiers d%27en-tête\ImGui</Filter>
     </ClInclude>
@@ -221,304 +248,343 @@
     <ClInclude Include="include\backends\imgui_impl_win32.h">
       <Filter>Fichiers d%27en-tête\ImGui</Filter>
     </ClInclude>
-    <ClInclude Include="imguiManager.h">
+    <ClInclude Include="include\Src\CMO.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\DirectX Tool Kit</Filter>
     </ClInclude>
-    <ClInclude Include="lightshaderclass.h">
+    <ClInclude Include="include\Src\DDS.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\DirectX Tool Kit</Filter>
     </ClInclude>
-    <ClInclude Include="object.h">
+    <ClInclude Include="include\Src\LoaderHelpers.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\DirectX Tool Kit</Filter>
     </ClInclude>
-    <ClInclude Include="textureclass.h">
+    <ClInclude Include="include\Src\pch.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\DirectX Tool Kit</Filter>
     </ClInclude>
-    <ClInclude Include="bitmapclass.h">
+    <ClInclude Include="include\Src\PlatformHelpers.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\DirectX Tool Kit</Filter>
     </ClInclude>
-    <ClInclude Include="fontclass.h">
+    <ClInclude Include="src\inc\shader\alphamapshaderclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="fontshaderclass.h">
+    <ClInclude Include="src\inc\shader\CelShadingShader.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="fpsclass.h">
+    <ClInclude Include="src\inc\shader\Colorshaderclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="lightclass.h">
+    <ClInclude Include="src\inc\shader\fontshaderclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="Multitextureshaderclass.h">
+    <ClInclude Include="src\inc\shader\lightmapshaderclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="Spriteclass.h">
+    <ClInclude Include="src\inc\shader\lightshaderclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="textclass.h">
+    <ClInclude Include="src\inc\shader\lightshaderwaterclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="textureshaderclass.h">
+    <ClInclude Include="src\inc\shader\Multitextureshaderclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="Timerclass.h">
+    <ClInclude Include="src\inc\shader\normalmapshaderclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="fpsclass.h">
+    <ClInclude Include="src\inc\shader\reflectionshaderclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="lightmapshaderclass.h">
+    <ClInclude Include="src\inc\shader\refractionshaderclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="alphamapshaderclass.h">
+    <ClInclude Include="src\inc\shader\shadermanagerclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="normalmapshaderclass.h">
+    <ClInclude Include="src\inc\shader\specmapshaderclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="specmapshaderclass.h">
+    <ClInclude Include="src\inc\shader\sunlightshaderclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="frustumclass.h">
+    <ClInclude Include="src\inc\shader\textureshaderclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="modellistclass.h">
+    <ClInclude Include="src\inc\shader\translateshaderclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="positionclass.h">
+    <ClInclude Include="src\inc\shader\transparentshaderclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="displayplaneclass.h">
+    <ClInclude Include="src\inc\shader\watershaderclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\Shader</Filter>
     </ClInclude>
-    <ClInclude Include="rendertextureclass.h">
+    <ClInclude Include="src\inc\system\applicationclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\System</Filter>
     </ClInclude>
-    <ClInclude Include="translateshaderclass.h">
+    <ClInclude Include="src\inc\system\bitmapclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\System</Filter>
     </ClInclude>
-    <ClInclude Include="reflectionshaderclass.h">
+    <ClInclude Include="src\inc\system\Cameraclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\System</Filter>
     </ClInclude>
-    <ClInclude Include="resources.h">
+    <ClInclude Include="src\inc\system\d3dclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\System</Filter>
     </ClInclude>
-    <ClInclude Include="shadermanagerclass.h">
+    <ClInclude Include="src\inc\system\displayplaneclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\System</Filter>
     </ClInclude>
-    <ClInclude Include="transparentshaderclass.h">
+    <ClInclude Include="src\inc\system\fontclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\System</Filter>
     </ClInclude>
-    <ClInclude Include="Logger.h">
+    <ClInclude Include="src\inc\system\fpsclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\System</Filter>
     </ClInclude>
-    <ClInclude Include="watershaderclass.h">
+    <ClInclude Include="src\inc\system\frustum.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\System</Filter>
     </ClInclude>
-    <ClInclude Include="refractionshaderclass.h">
+    <ClInclude Include="src\inc\system\frustumclass.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\System</Filter>
     </ClInclude>
-    <ClInclude Include="physics.h">
+    <ClInclude Include="src\inc\system\imguiManager.h">
-      <Filter>Fichiers d%27en-tête</Filter>
+      <Filter>Fichiers d%27en-tête\System</Filter>
     </ClInclude>
-    <ClInclude Include="CelShadingShader.h">
+    <ClInclude Include="src\inc\system\inputclass.h">
+      <Filter>Fichiers d%27en-tête\System</Filter>
+    </ClInclude>
+    <ClInclude Include="src\inc\system\lightclass.h">
+      <Filter>Fichiers d%27en-tête\System</Filter>
+    </ClInclude>
+    <ClInclude Include="src\inc\system\Logger.h">
+      <Filter>Fichiers d%27en-tête\System</Filter>
+    </ClInclude>
+    <ClInclude Include="src\inc\system\modelclass.h">
+      <Filter>Fichiers d%27en-tête\System</Filter>
+    </ClInclude>
+    <ClInclude Include="src\inc\system\Modellistclass.h">
+      <Filter>Fichiers d%27en-tête\System</Filter>
+    </ClInclude>
+    <ClInclude Include="src\inc\system\object.h">
+      <Filter>Fichiers d%27en-tête\System</Filter>
+    </ClInclude>
+    <ClInclude Include="src\inc\system\physics.h">
+      <Filter>Fichiers d%27en-tête\System</Filter>
+    </ClInclude>
+    <ClInclude Include="src\inc\system\Positionclass.h">
+      <Filter>Fichiers d%27en-tête\System</Filter>
+    </ClInclude>
+    <ClInclude Include="src\inc\system\rendertextureclass.h">
+      <Filter>Fichiers d%27en-tête\System</Filter>
+    </ClInclude>
+    <ClInclude Include="src\inc\system\Spriteclass.h">
+      <Filter>Fichiers d%27en-tête\System</Filter>
+    </ClInclude>
+    <ClInclude Include="src\inc\system\systemclass.h">
+      <Filter>Fichiers d%27en-tête\System</Filter>
+    </ClInclude>
+    <ClInclude Include="src\inc\system\textclass.h">
+      <Filter>Fichiers d%27en-tête\System</Filter>
+    </ClInclude>
+    <ClInclude Include="src\inc\system\textureclass.h">
+      <Filter>Fichiers d%27en-tête\System</Filter>
+    </ClInclude>
+    <ClInclude Include="src\inc\system\Timerclass.h">
+      <Filter>Fichiers d%27en-tête\System</Filter>
+    </ClInclude>
+    <ClInclude Include="src\inc\system\sceneManager.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <Image Include="papier.tga">
-      <Filter>assets</Filter>
-    </Image>
-    <Image Include="dirt01.tga">
-      <Filter>assets</Filter>
-    </Image>
     <Image Include="KhaoticIcon.ico">
       <Filter>Assets</Filter>
     </Image>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="sphere.txt">
-      <Filter>Assets</Filter>
-    </Text>
-    <Text Include="square.txt">
-      <Filter>assets</Filter>
-    </Text>
-    <Text Include="chunk.txt">
-      <Filter>Assets</Filter>
-    </Text>
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="resources.rc">
       <Filter>Fichiers de ressources</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <CopyFileToFolders Include="font.vs">
-      <Filter>Fonts</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="font.ps">
-      <Filter>Fonts</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="Color.vs">
-      <Filter>shader</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="light.ps">
-      <Filter>shader</Filter>
-    </CopyFileToFolders>
     <CopyFileToFolders Include="font01.txt">
       <Filter>Fonts</Filter>
     </CopyFileToFolders>
     <CopyFileToFolders Include="font01.tga">
       <Filter>fonts</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="stone01.tga">
+    <CopyFileToFolders Include="assets\Model\TXT\bath.txt">
-      <Filter>assets</Filter>
+      <Filter>Assets\Model\TXT</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="cube.txt">
+    <CopyFileToFolders Include="assets\Model\TXT\chunk.txt">
-      <Filter>Assets</Filter>
+      <Filter>Assets\Model\TXT</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="plane.txt">
+    <CopyFileToFolders Include="assets\Model\TXT\cube.txt">
-      <Filter>Assets</Filter>
+      <Filter>Assets\Model\TXT</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="alpha01.tga">
+    <CopyFileToFolders Include="assets\Model\TXT\ground.txt">
-      <Filter>Assets</Filter>
+      <Filter>Assets\Model\TXT</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="light01.tga">
+    <CopyFileToFolders Include="assets\Model\TXT\plane.txt">
-      <Filter>Assets</Filter>
+      <Filter>Assets\Model\TXT</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="moss01.tga">
+    <CopyFileToFolders Include="assets\Model\TXT\sphere.txt">
-      <Filter>Assets</Filter>
+      <Filter>Assets\Model\TXT</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="normal01.tga">
+    <CopyFileToFolders Include="assets\Model\TXT\square.txt">
-      <Filter>Assets</Filter>
+      <Filter>Assets\Model\TXT</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="spec02.tga">
+    <CopyFileToFolders Include="assets\Model\TXT\wall.txt">
-      <Filter>Assets</Filter>
+      <Filter>Assets\Model\TXT</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="sprite01.tga">
+    <CopyFileToFolders Include="assets\Model\TXT\water.txt">
-      <Filter>Assets</Filter>
+      <Filter>Assets\Model\TXT</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="sprite02.tga">
+    <CopyFileToFolders Include="assets\Model\OBJ\vaisseau.obj">
-      <Filter>Assets</Filter>
+      <Filter>Assets\Model\OBJ</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\monke.obj">
+      <Filter>Assets\Model\OBJ</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\isosphere.obj">
+      <Filter>Assets\Model\OBJ</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\cone.obj">
+      <Filter>Assets\Model\OBJ</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\86.obj">
+      <Filter>Assets\Model\OBJ</Filter>
     </CopyFileToFolders>
     <CopyFileToFolders Include="sprite_data_01.txt">
       <Filter>Assets</Filter>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\stone01.tga">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\alpha01.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\Bricks2K.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\BricksGLOSS2K.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\BricksNRM2K.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\dirt01.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\font01.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\ground01.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\light01.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\marble01.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\moss01.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\normal01.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\spec02.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\sprite01.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\sprite02.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\sprite03.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\plane.obj">
+      <Filter>Assets\Model\OBJ</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\EmptyTexture.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\stone01.png">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="sprite01.tga">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="sprite02.tga">
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
     <CopyFileToFolders Include="sprite03.tga">
-      <Filter>Assets</Filter>
+      <Filter>Assets\Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\sprite04.png">
+      <Filter>Assets\Texture</Filter>
     </CopyFileToFolders>
     <CopyFileToFolders Include="sprite04.tga">
-      <Filter>Assets</Filter>
+      <Filter>Assets\Texture</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="Color.ps">
+    <CopyFileToFolders Include="assets\Texture\wall.png">
-      <Filter>shader</Filter>
+      <Filter>Assets\Texture</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="light.vs">
+    <CopyFileToFolders Include="assets\Texture\wall01.png">
-      <Filter>shader</Filter>
+      <Filter>Assets\Texture</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="lightmap.ps">
+    <CopyFileToFolders Include="assets\Texture\water01.png">
-      <Filter>shader</Filter>
+      <Filter>Assets\Texture</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="lightmap.vs">
+    <CopyFileToFolders Include="assets\Skybox\skybox_back.png">
-      <Filter>shader</Filter>
+      <Filter>Assets\Skybox</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="reflection.ps">
+    <CopyFileToFolders Include="assets\Skybox\skybox_bottom.png">
-      <Filter>shader</Filter>
+      <Filter>Assets\Skybox</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="reflection.vs">
+    <CopyFileToFolders Include="assets\Skybox\skybox_front.png">
-      <Filter>shader</Filter>
+      <Filter>Assets\Skybox</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="translate.ps">
+    <CopyFileToFolders Include="assets\Skybox\skybox_left.png">
-      <Filter>shader</Filter>
+      <Filter>Assets\Skybox</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="translate.vs">
+    <CopyFileToFolders Include="assets\Skybox\skybox_right.png">
-      <Filter>shader</Filter>
+      <Filter>Assets\Skybox</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="transparent.ps">
+    <CopyFileToFolders Include="assets\Skybox\skybox_top.png">
-      <Filter>shader</Filter>
+      <Filter>Assets\Skybox</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="transparent.vs">
-      <Filter>shader</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="Multitexture.ps">
-      <Filter>Texture</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="Multitexture.vs">
-      <Filter>Texture</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="normalmap.ps">
-      <Filter>Texture</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="normalmap.vs">
-      <Filter>Texture</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="specmap.ps">
-      <Filter>Texture</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="specmap.vs">
-      <Filter>Texture</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="texture.ps">
-      <Filter>Texture</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="texture.vs">
-      <Filter>Texture</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="alphamap.vs">
-      <Filter>Texture</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="alphamap.ps">
-      <Filter>Texture</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="refraction.ps">
-      <Filter>shader</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="refraction.vs">
-      <Filter>shader</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="..\KhaoticDemo\water.ps">
-      <Filter>shader</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="water.vs">
-      <Filter>shader</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="wall.tga">
-      <Filter>assets</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="water01.tga">
-      <Filter>Assets</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="bath.txt">
-      <Filter>Assets</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="marble01.tga">
-      <Filter>Assets</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="water.txt">
-      <Filter>Assets</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="isosphere.obj">
-      <Filter>Assets</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="cone.obj">
-      <Filter>Assets</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="monke.obj">
-      <Filter>Assets</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="vaisseau.obj">
-      <Filter>Assets</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="86.obj">
-      <Filter>Assets</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="celshading.vs">
-      <Filter>shader</Filter>
-    </CopyFileToFolders>
-    <CopyFileToFolders Include="celshading.ps">
-      <Filter>shader</Filter>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="src\hlsl\alphamap.ps" />
+    <CopyFileToFolders Include="src\hlsl\alphamap.vs" />
+    <CopyFileToFolders Include="src\hlsl\celshading.ps" />
+    <CopyFileToFolders Include="src\hlsl\celshading.vs" />
+    <CopyFileToFolders Include="src\hlsl\Color.ps" />
+    <CopyFileToFolders Include="src\hlsl\Color.vs" />
+    <CopyFileToFolders Include="src\hlsl\font.ps" />
+    <CopyFileToFolders Include="src\hlsl\font.vs" />
+    <CopyFileToFolders Include="src\hlsl\light.ps" />
+    <CopyFileToFolders Include="src\hlsl\light.vs" />
+    <CopyFileToFolders Include="src\hlsl\lightmap.ps" />
+    <CopyFileToFolders Include="src\hlsl\lightmap.vs" />
+    <CopyFileToFolders Include="src\hlsl\Multitexture.ps" />
+    <CopyFileToFolders Include="src\hlsl\Multitexture.vs" />
+    <CopyFileToFolders Include="src\hlsl\normalmap.ps" />
+    <CopyFileToFolders Include="src\hlsl\normalmap.vs" />
+    <CopyFileToFolders Include="src\hlsl\reflection.ps" />
+    <CopyFileToFolders Include="src\hlsl\reflection.vs" />
+    <CopyFileToFolders Include="src\hlsl\refraction.ps" />
+    <CopyFileToFolders Include="src\hlsl\refraction.vs" />
+    <CopyFileToFolders Include="src\hlsl\specmap.ps" />
+    <CopyFileToFolders Include="src\hlsl\specmap.vs" />
+    <CopyFileToFolders Include="src\hlsl\sunlight.ps" />
+    <CopyFileToFolders Include="src\hlsl\sunlight.vs" />
+    <CopyFileToFolders Include="src\hlsl\texture.ps" />
+    <CopyFileToFolders Include="src\hlsl\texture.vs" />
+    <CopyFileToFolders Include="src\hlsl\translate.ps" />
+    <CopyFileToFolders Include="src\hlsl\translate.vs" />
+    <CopyFileToFolders Include="src\hlsl\transparent.ps" />
+    <CopyFileToFolders Include="src\hlsl\transparent.vs" />
+    <CopyFileToFolders Include="src\hlsl\water.ps" />
+    <CopyFileToFolders Include="src\hlsl\water.vs" />
   </ItemGroup>
 </Project>

enginecustom/imgui.ini

@@ -1,24 +1,89 @@
 [Window][Debug##Default]
 Pos=60,60
 Size=400,400
+Collapsed=0
 
 [Window][Khaotic Engine]
-Pos=506,44
+Pos=1233,27
-Size=339,252
+Size=343,826
-
+Collapsed=0
-[Window][Terrain]
+DockId=0x00000005,0
-Pos=185,62
-Size=320,75
-
-[Window][Light]
-Pos=1111,62
-Size=354,190
-
-[Window][Shader Manager]
-Pos=39,177
-Size=165,54
 
 [Window][Objects]
-Pos=1450,122
+Pos=8,27
-Size=388,116
+Size=289,826
+Collapsed=0
+DockId=0x00000009,0
+
+[Window][Terrain]
+Pos=8,27
+Size=250,974
+Collapsed=0
+DockId=0x00000007,0
+
+[Window][Light]
+Pos=8,27
+Size=290,866
+Collapsed=0
+DockId=0x00000007,1
+
+[Window][Shader Manager]
+Pos=8,27
+Size=330,487
+Collapsed=0
+DockId=0x00000001,2
+
+[Window][Engine Settings]
+Pos=8,27
+Size=289,974
+Collapsed=0
+DockId=0x00000009,0
+
+[Window][DockSpace Demo]
+Size=1584,861
+Collapsed=0
+
+[Window][Render Window]
+Pos=8,27
+Size=1559,974
+Collapsed=0
+DockId=0x00000009,0
+
+[Window][DockSpace]
+Pos=0,0
+Size=1584,861
+Collapsed=0
+
+[Window][Add Object]
+Pos=1188,0
+Size=396,430
+Collapsed=0
+
+[Window][Log]
+Pos=8,518
+Size=1568,335
+Collapsed=0
+DockId=0x0000000C,0
+
+[Window][Log Window]
+Pos=8,627
+Size=1568,226
+Collapsed=0
+DockId=0x00000006,0
+
+[Docking][Data]
+DockSpace           ID=0xC0DFADC4 Pos=8,27 Size=1568,826 Split=X
+  DockNode          ID=0x00000001 Parent=0xC0DFADC4 SizeRef=330,1094 Selected=0x393905AB
+  DockNode          ID=0x00000003 Parent=0xC0DFADC4 SizeRef=1700,1094 CentralNode=1
+DockSpace           ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=8,27 Size=1568,826 Split=Y
+  DockNode          ID=0x00000004 Parent=0xCCBD8CF7 SizeRef=1568,598 Split=X
+    DockNode        ID=0x00000009 Parent=0x00000004 SizeRef=289,974 Selected=0x031DC75C
+    DockNode        ID=0x0000000D Parent=0x00000004 SizeRef=1613,974 Split=X
+      DockNode      ID=0x00000002 Parent=0x0000000D SizeRef=1268,826 Split=Y
+        DockNode    ID=0x0000000B Parent=0x00000002 SizeRef=1568,637 Split=X
+          DockNode  ID=0x00000007 Parent=0x0000000B SizeRef=250,826 Selected=0x393905AB
+          DockNode  ID=0x00000008 Parent=0x0000000B SizeRef=971,826 CentralNode=1 Selected=0x031DC75C
+        DockNode    ID=0x0000000C Parent=0x00000002 SizeRef=1568,335 Selected=0x139FDA3F
+      DockNode      ID=0x00000005 Parent=0x0000000D SizeRef=343,826 Selected=0x9F035453
+  DockNode          ID=0x00000006 Parent=0xCCBD8CF7 SizeRef=1568,226 Selected=0xAB74BEE9
 

enginecustom/imguiManager.cpp

@@ -1,381 +0,0 @@
-#include "imguiManager.h"
-#include "applicationclass.h"
-#include <string>
-
-imguiManager::imguiManager()
-{
-	io = nullptr;
-}
-
-imguiManager::~imguiManager()
-{
-}
-
-bool imguiManager::Initialize(HWND hwnd, ID3D11Device* device, ID3D11DeviceContext* deviceContext)
-{
-	Logger::Get().Log("Initializing imgui", __FILE__, __LINE__, Logger::LogLevel::Initialize);
-
-	m_device = device;
-	m_deviceContext = deviceContext;
-
-	IMGUI_CHECKVERSION();
-	ImGui::CreateContext();
-	io = &ImGui::GetIO();
-
-	ImGui_ImplWin32_Init(hwnd);
-	ImGui_ImplDX11_Init(m_device, m_deviceContext); 
-	ImGui::StyleColorsDark();
-
-	Logger::Get().Log("imgui initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
-
-	return true;
-}
-
-void imguiManager::Shutdown()
-{
-	Logger::Get().Log("Shutting down imgui", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-	ImGui_ImplDX11_Shutdown();
-	ImGui_ImplWin32_Shutdown();
-	ImGui::DestroyContext();
-	Logger::Get().Log("imgui shutdown", __FILE__, __LINE__, Logger::LogLevel::Shutdown);
-}
-
-void imguiManager::Render()
-{
-	ImGui::Render();
-	ImGui_ImplDX11_RenderDrawData(ImGui::GetDrawData());
-}
-
-void imguiManager::NewFrame()
-{
-	ImGui_ImplDX11_NewFrame();
-	ImGui_ImplWin32_NewFrame();
-	ImGui::NewFrame();
-}
-
-void imguiManager::WidgetSpeedSlider(float* speed)
-{
-	ImGui::SliderFloat("Speed", speed, 0.0f, 100.0f);
-}
-
-void imguiManager::WidgetButton()
-{
-	static int counter = 0;
-
-	if (ImGui::Button("Button"))                            // Buttons return true when clicked (most widgets return true when edited/activated)
-		counter++;
-	ImGui::SameLine();
-	ImGui::Text("counter = %d", counter);
-}
-
-void imguiManager::WidgetFPS()
-{
-	ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / io->Framerate, io->Framerate);
-}
-
-void imguiManager::WidgetAddObject(ApplicationClass* app)
-{
-	if (ImGui::CollapsingHeader("Objects"))
-	{
-		if (ImGui::Button("Add Cube"))
-		{
-			app->AddCube();
-		}
-		ImGui::SameLine();
-		if (ImGui::Button("Import Object"))
-		{
-			// Open file dialog
-			OPENFILENAME ofn;
-			WCHAR szFile[260];
-			ZeroMemory(&ofn, sizeof(ofn));
-			ofn.lStructSize = sizeof(ofn);
-			ofn.hwndOwner = NULL;
-			ofn.lpstrFile = szFile;
-			ofn.lpstrFile[0] = '\0';
-			ofn.nMaxFile = sizeof(szFile);
-			ofn.lpstrFilter = L"TXT\0*.txt\0KOBJ\0*.kobj\0*OBJ\0*.obj";
-			ofn.nFilterIndex = 1;
-			ofn.lpstrFileTitle = NULL;
-			ofn.nMaxFileTitle = 0;
-			ofn.lpstrInitialDir = NULL;
-			ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
-
-			if (GetOpenFileName(&ofn))
-			{
-				app->AddKobject(ofn.lpstrFile);
-			}
-
-		}
-		ImGui::SameLine();
-		ImGui::Text("Number of cubes: %d", app->GetCubeCount());
-	}
-}
-
-void imguiManager::WidgetShaderWindow(ApplicationClass* app)
-{
-	ImGui::Begin("Shader Manager");
-
-	// Checkbox for toggling cel shading globally in the application class by calling the SetCelShading function in the application class when the checkbox state changes
-	ImGui::Checkbox("Enable Cel Shading", &m_EnableCelShading);
-	app->SetCelShading(m_EnableCelShading);
-	
-	ImGui::End();
-}
-
-void imguiManager::WidgetObjectWindow(ApplicationClass* app)
-{
-	ImGui::Begin("Objects", &showObjectWindow);
-	int index = 0;
-	for (auto& object : app->GetKobjects())
-	{
-		std::string headerName = object->GetName() + " " + std::to_string(index);
-		if (ImGui::CollapsingHeader(headerName.c_str()))
-		{
-
-			XMVECTOR position = object->GetPosition();
-			XMVECTOR rotation = object->GetRotation();
-			XMVECTOR scale = object->GetScale();
-
-			float pos[3] = { XMVectorGetX(position), XMVectorGetY(position), XMVectorGetZ(position) };
-			std::string posLabel = "Position##" + std::to_string(index);
-			if (ImGui::DragFloat3(posLabel.c_str(), pos))
-			{
-				object->SetPosition(XMVectorSet(pos[0], pos[1], pos[2], 0.0f));
-			}
-
-			float rot[3] = { XMVectorGetX(rotation), XMVectorGetY(rotation), XMVectorGetZ(rotation) };
-			std::string rotLabel = "Rotation##" + std::to_string(index);
-			if (ImGui::DragFloat3(rotLabel.c_str(), rot))
-			{
-				object->SetRotation(XMVectorSet(rot[0], rot[1], rot[2], 0.0f));
-			}
-
-			float scl[3] = { XMVectorGetX(scale), XMVectorGetY(scale), XMVectorGetZ(scale) };
-			std::string sclLabel = "Scale##" + std::to_string(index);
-			if (ImGui::DragFloat3(sclLabel.c_str(), scl))
-			{
-				object->SetScale(XMVectorSet(scl[0], scl[1], scl[2], 0.0f));
-			}
-
-			ImGui::Separator();
-
-			// Texture
-			// add all texture category names to a vector
-			std::vector<std::string> textureCategories = { "Diffuse", "Normal", "Specular", "Alpha", "Light", "Change Me" };
-
-
-			for (int count = 0; count < 6; count++)
-			{
-				std::string textureLabel = "Texture##" + std::to_string(index);
-				ID3D11ShaderResourceView* texture = object->GetTexture(count);
-				if (texture != nullptr)
-				{
-					// Set the cursor position
-					ImGui::SetCursorPosX(count * (64 + 20) + 10); // 64 is the width of the image, 10 is the spacing
-
-					// Display the texture name
-					std::string textureName = textureCategories[count];
-					ImGui::Text(textureName.c_str());
-
-					if(count < 5)
-					{
-						ImGui::SameLine();
-					}
-				}
-			}
-
-			// Display all images
-			for (int count = 0; count < 6; count++)
-			{
-				std::string textureLabel = "Texture##" + std::to_string(index);
-				ID3D11ShaderResourceView* texture = object->GetTexture(count);
-				if (texture != nullptr)
-				{
-					// Set the cursor position
-					ImGui::SetCursorPosX(count * (64 + 20) + 10); // 64 is the width of the image, 10 is the spacing
-
-					if (ImGui::ImageButton((ImTextureID)texture, ImVec2(64, 64)))
-					{
-						// Open file dialog
-						OPENFILENAME ofn;
-						WCHAR szFile[260];
-						ZeroMemory(&ofn, sizeof(ofn));
-						ofn.lStructSize = sizeof(ofn);
-						ofn.hwndOwner = NULL;
-						ofn.lpstrFile = szFile;
-						ofn.lpstrFile[0] = '\0';
-						ofn.nMaxFile = sizeof(szFile);
-						ofn.lpstrFilter = L"Texture\0*.tga\0";
-						ofn.nFilterIndex = 1;
-						ofn.lpstrFileTitle = NULL;
-						ofn.nMaxFileTitle = 0;
-						ofn.lpstrInitialDir = NULL;
-						ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
-
-						if (GetOpenFileName(&ofn))
-						{
-							// Load the selected texture
-							object->ChangeTexture(m_device, m_deviceContext, ofn.lpstrFile, index);
-						}
-					}
-
-					if (ImGui::IsItemHovered())
-					{
-						ImGui::BeginTooltip();
-						ImGui::Image((ImTextureID)texture, ImVec2(256, 256));
-						ImGui::EndTooltip();
-					}
-
-					// If this is not the last texture, put the next button on the same line
-					if (count < 5)
-					{
-						ImGui::SameLine();
-					}
-				}
-			}
-
-
-			ImGui::Separator();
-
-			// Delete button
-			std::string deleteLabel = "Delete##" + std::to_string(index);
-			if (ImGui::Button(deleteLabel.c_str()))
-			{
-				app->DeleteKobject(index);
-			}
-
-			ImGui::Separator();
-
-			// Demo spinning
-			std::string demoLabel = "Demo spinning##" + std::to_string(index);
-			ImGui::Checkbox(demoLabel.c_str(), &object->m_demoSpinning);
-		}
-		index++;
-	}
-	
-	ImGui::End();
-}
-
-void imguiManager::WidgetTerrainWindow(ApplicationClass* app)
-{
-	ImGui::Begin("Terrain", &showTerrainWindow);
-
-	ImGui::Text("Number of terrain cubes: %d", app->GetTerrainCubeCount());
-
-	ImGui::Separator();
-
-	if (ImGui::Button("Generate Terrain"))
-	{
-		app->GenerateTerrain();
-	}
-
-	ImGui::SameLine();
-
-	if (ImGui::Button("Delete All Terrain Cubes"))
-	{
-		app->DeleteTerrain();
-	}
-
-	ImGui::End();
-}
-
-bool imguiManager::ImGuiWidgetRenderer(ApplicationClass* app)
-{
-	// Start the Dear ImGui frame
-	NewFrame();
-
-	//ImGui Widget
-	ImGui::Begin("Khaotic Engine", NULL);
-
-	float speed = app->GetSpeed();
-	WidgetSpeedSlider(&speed);
-	app->SetSpeed(speed);
-	WidgetButton();
-	WidgetFPS();
-	WidgetAddObject(app);
-	ImGui::Separator();
-
-	// Add buttons for opening windows
-	if (ImGui::Button("Open Object Window"))
-	{
-		showObjectWindow = true;
-	}
-
-	if (ImGui::Button("Open Terrain Window"))
-	{
-		showTerrainWindow = true;
-	}
-
-	if (ImGui::Button("Open Light Window"))
-	{
-		showLightWindow = true;
-	}
-
-	if (ImGui::Button("Open Shader Window"))
-	{
-		showShaderWindow = true;
-	}
-
-	ImGui::End();
-
-	// Show windows if their corresponding variables are true
-	if (showObjectWindow)
-	{
-		WidgetObjectWindow(app);
-	}
-
-	if (showTerrainWindow)
-	{
-		WidgetTerrainWindow(app);
-	}
-
-	if (showLightWindow)
-	{
-		WidgetLightWindow(app);
-	}
-
-	if (showShaderWindow)
-	{
-		WidgetShaderWindow(app);
-	}
-
-	//render imgui
-	Render();
-
-	return true;
-}
-
-void imguiManager::WidgetLightWindow(ApplicationClass* app)
-{
-	ImGui::Begin("Light", &showLightWindow);
-	int index = 0;
-
-	for(auto& light : app->GetLights())
-	{
-		std::string headerName = "Light " + std::to_string(index);
-		if (ImGui::CollapsingHeader(headerName.c_str()))
-		{
-			XMVECTOR position = app->GetLightPosition(index);
-			XMVECTOR color = app->GetLightColor(index);
-			float pos[3] = { XMVectorGetX(position), XMVectorGetY(position), XMVectorGetZ(position) };
-			float col[3] = { XMVectorGetX(color), XMVectorGetY(color), XMVectorGetZ(color) };
-
-			std::string posLabel = "Position##" + std::to_string(index);
-			std::string colLabel = "Color##" + std::to_string(index);
-
-			if (ImGui::DragFloat3(posLabel.c_str(), pos))
-			{
-				app->SetLightPosition(index, XMVectorSet(pos[0], pos[1], pos[2], 0.0f));
-			}
-
-			if (ImGui::ColorEdit3(colLabel.c_str(), col))
-			{
-				app->SetLightColor(index, XMVectorSet(col[0], col[1], col[2], 0.0f));
-			}
-
-		}
-		index++;
-	};
-
-	ImGui::End();
-}

enginecustom/imguiManager.h

@@ -1,56 +0,0 @@
-#pragma once
-#ifndef _IMGUI_MANAGER_H_
-#define _IMGUI_MANAGER_H_
-
-#include "Logger.h"	
-
-#include <imgui.h>
-#include <imgui_impl_dx11.h>
-#include <imgui_impl_win32.h>
-#include <windows.h>
-
-class ApplicationClass;
-
-class imguiManager
-{
-public:
-	imguiManager();
-	~imguiManager();
-
-	bool Initialize(HWND hwnd, ID3D11Device* device, ID3D11DeviceContext* deviceContext);
-	void Shutdown();
-	void Render();
-	void NewFrame();
-
-	// Widgets
-	void WidgetSpeedSlider(float* speed);
-	void WidgetButton();
-	void WidgetFPS();
-	void WidgetAddObject(ApplicationClass* app);
-
-	void WidgetObjectWindow(ApplicationClass* app);
-	void WidgetTerrainWindow(ApplicationClass* app);
-	void WidgetLightWindow(ApplicationClass* app);
-	void WidgetShaderWindow(ApplicationClass* app);
-
-	bool ImGuiWidgetRenderer(ApplicationClass* app);
-
-	// Shader toggles
-
-	bool m_EnableCelShading;
-
-private :
-	bool showObjectWindow = false;
-	bool showTerrainWindow = false;
-	bool showLightWindow = false;
-	bool showShaderWindow = false;
-
-private:
-	ImGuiIO* io;
-
-	ID3D11Device* m_device;
-	ID3D11DeviceContext* m_deviceContext;
-
-};
-
-#endif

enginecustom/include/Inc/Audio.h

@@ -0,0 +1,832 @@
+//--------------------------------------------------------------------------------------
+// File: Audio.h
+//
+// DirectXTK for Audio header
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248929
+// http://go.microsoft.com/fwlink/?LinkID=615561
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <objbase.h>
+#include <mmreg.h>
+#include <Audioclient.h>
+
+#if (defined(_XBOX_ONE) && defined(_TITLE)) || defined(_GAMING_XBOX)
+#include <xma2defs.h>
+#ifdef _MSC_VER
+#pragma comment(lib,"acphal.lib")
+#endif
+#endif
+
+#ifndef XAUDIO2_HELPER_FUNCTIONS
+#define XAUDIO2_HELPER_FUNCTIONS
+#endif
+
+#if defined(USING_XAUDIO2_REDIST) || (_WIN32_WINNT >= 0x0A00 /*_WIN32_WINNT_WIN10*/) || defined(_XBOX_ONE)
+#define USING_XAUDIO2_9
+#elif (_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/)
+#define USING_XAUDIO2_8
+#elif (_WIN32_WINNT >= 0x0601 /*_WIN32_WINNT_WIN7*/)
+#error Windows 7 SP1 requires the XAudio2Redist NuGet package https://aka.ms/xaudio2redist
+#else
+#error DirectX Tool Kit for Audio not supported on this platform
+#endif
+
+#include <xaudio2.h>
+#include <xaudio2fx.h>
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4619 4616 5246)
+#endif
+#include <x3daudio.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#include <xapofx.h>
+
+#if !defined(USING_XAUDIO2_REDIST) && defined(_MSC_VER)
+#if defined(USING_XAUDIO2_8) && defined(NTDDI_WIN10) && !defined(_M_IX86)
+// The xaudio2_8.lib in the Windows 10 SDK for x86 is incorrectly annotated as __cdecl instead of __stdcall, so avoid using it in this case.
+#pragma comment(lib,"xaudio2_8.lib")
+#else
+#pragma comment(lib,"xaudio2.lib")
+#endif
+#endif
+
+#include <DirectXMath.h>
+
+
+namespace DirectX
+{
+    class SoundEffectInstance;
+    class SoundStreamInstance;
+
+    //----------------------------------------------------------------------------------
+    struct AudioStatistics
+    {
+        size_t  playingOneShots;        // Number of one-shot sounds currently playing
+        size_t  playingInstances;       // Number of sound effect instances currently playing
+        size_t  allocatedInstances;     // Number of SoundEffectInstance allocated
+        size_t  allocatedVoices;        // Number of XAudio2 voices allocated (standard, 3D, one-shots, and idle one-shots)
+        size_t  allocatedVoices3d;      // Number of XAudio2 voices allocated for 3D
+        size_t  allocatedVoicesOneShot; // Number of XAudio2 voices allocated for one-shot sounds
+        size_t  allocatedVoicesIdle;    // Number of XAudio2 voices allocated for one-shot sounds but not currently in use
+        size_t  audioBytes;             // Total wave data (in bytes) in SoundEffects and in-memory WaveBanks
+    #if (defined(_XBOX_ONE) && defined(_TITLE)) || defined(_GAMING_XBOX)
+        size_t  xmaAudioBytes;          // Total wave data (in bytes) in SoundEffects and in-memory WaveBanks allocated with ApuAlloc
+    #endif
+        size_t  streamingBytes;         // Total size of streaming buffers (in bytes) in streaming WaveBanks
+    };
+
+
+    //----------------------------------------------------------------------------------
+    class IVoiceNotify
+    {
+    public:
+        virtual ~IVoiceNotify() = default;
+
+        IVoiceNotify(const IVoiceNotify&) = delete;
+        IVoiceNotify& operator=(const IVoiceNotify&) = delete;
+
+        IVoiceNotify(IVoiceNotify&&) = default;
+        IVoiceNotify& operator=(IVoiceNotify&&) = default;
+
+        virtual void __cdecl OnBufferEnd() = 0;
+            // Notfication that a voice buffer has finished
+            // Note this is called from XAudio2's worker thread, so it should perform very minimal and thread-safe operations
+
+        virtual void __cdecl OnCriticalError() = 0;
+            // Notification that the audio engine encountered a critical error
+
+        virtual void __cdecl OnReset() = 0;
+            // Notification of an audio engine reset
+
+        virtual void __cdecl OnUpdate() = 0;
+            // Notification of an audio engine per-frame update (opt-in)
+
+        virtual void __cdecl OnDestroyEngine() noexcept = 0;
+            // Notification that the audio engine is being destroyed
+
+        virtual void __cdecl OnTrim() = 0;
+            // Notification of a request to trim the voice pool
+
+        virtual void __cdecl GatherStatistics(AudioStatistics& stats) const = 0;
+            // Contribute to statistics request
+
+        virtual void __cdecl OnDestroyParent() noexcept = 0;
+            // Optional notification used by some objects
+
+    protected:
+        IVoiceNotify() = default;
+    };
+
+    //----------------------------------------------------------------------------------
+    enum AUDIO_ENGINE_FLAGS : uint32_t
+    {
+        AudioEngine_Default = 0x0,
+
+        AudioEngine_EnvironmentalReverb = 0x1,
+        AudioEngine_ReverbUseFilters = 0x2,
+        AudioEngine_UseMasteringLimiter = 0x4,
+
+        AudioEngine_Debug = 0x10000,
+        AudioEngine_ThrowOnNoAudioHW = 0x20000,
+        AudioEngine_DisableVoiceReuse = 0x40000,
+    };
+
+    enum SOUND_EFFECT_INSTANCE_FLAGS : uint32_t
+    {
+        SoundEffectInstance_Default = 0x0,
+
+        SoundEffectInstance_Use3D = 0x1,
+        SoundEffectInstance_ReverbUseFilters = 0x2,
+        SoundEffectInstance_NoSetPitch = 0x4,
+
+        SoundEffectInstance_UseRedirectLFE = 0x10000,
+    };
+
+    enum AUDIO_ENGINE_REVERB : unsigned int
+    {
+        Reverb_Off,
+        Reverb_Default,
+        Reverb_Generic,
+        Reverb_Forest,
+        Reverb_PaddedCell,
+        Reverb_Room,
+        Reverb_Bathroom,
+        Reverb_LivingRoom,
+        Reverb_StoneRoom,
+        Reverb_Auditorium,
+        Reverb_ConcertHall,
+        Reverb_Cave,
+        Reverb_Arena,
+        Reverb_Hangar,
+        Reverb_CarpetedHallway,
+        Reverb_Hallway,
+        Reverb_StoneCorridor,
+        Reverb_Alley,
+        Reverb_City,
+        Reverb_Mountains,
+        Reverb_Quarry,
+        Reverb_Plain,
+        Reverb_ParkingLot,
+        Reverb_SewerPipe,
+        Reverb_Underwater,
+        Reverb_SmallRoom,
+        Reverb_MediumRoom,
+        Reverb_LargeRoom,
+        Reverb_MediumHall,
+        Reverb_LargeHall,
+        Reverb_Plate,
+        Reverb_MAX
+    };
+
+    enum SoundState
+    {
+        STOPPED = 0,
+        PLAYING,
+        PAUSED
+    };
+
+
+    //----------------------------------------------------------------------------------
+    class AudioEngine
+    {
+    public:
+        explicit AudioEngine(
+            AUDIO_ENGINE_FLAGS flags = AudioEngine_Default,
+            _In_opt_ const WAVEFORMATEX* wfx = nullptr,
+            _In_opt_z_ const wchar_t* deviceId = nullptr,
+            AUDIO_STREAM_CATEGORY category = AudioCategory_GameEffects) noexcept(false);
+
+        AudioEngine(AudioEngine&&) noexcept;
+        AudioEngine& operator= (AudioEngine&&) noexcept;
+
+        AudioEngine(AudioEngine const&) = delete;
+        AudioEngine& operator= (AudioEngine const&) = delete;
+
+        virtual ~AudioEngine();
+
+        bool __cdecl Update();
+            // Performs per-frame processing for the audio engine, returns false if in 'silent mode'
+
+        bool __cdecl Reset(_In_opt_ const WAVEFORMATEX* wfx = nullptr, _In_opt_z_ const wchar_t* deviceId = nullptr);
+            // Reset audio engine from critical error/silent mode using a new device; can also 'migrate' the graph
+            // Returns true if succesfully reset, false if in 'silent mode' due to no default device
+            // Note: One shots are lost, all SoundEffectInstances are in the STOPPED state after successful reset
+
+        void __cdecl Suspend() noexcept;
+        void __cdecl Resume();
+            // Suspend/resumes audio processing (i.e. global pause/resume)
+
+        float __cdecl GetMasterVolume() const noexcept;
+        void __cdecl SetMasterVolume(float volume);
+            // Master volume property for all sounds
+
+        void __cdecl SetReverb(AUDIO_ENGINE_REVERB reverb);
+        void __cdecl SetReverb(_In_opt_ const XAUDIO2FX_REVERB_PARAMETERS* native);
+            // Sets environmental reverb for 3D positional audio (if active)
+
+        void __cdecl SetMasteringLimit(int release, int loudness);
+            // Sets the mastering volume limiter properties (if active)
+
+        AudioStatistics __cdecl GetStatistics() const;
+            // Gathers audio engine statistics
+
+        WAVEFORMATEXTENSIBLE __cdecl GetOutputFormat() const noexcept;
+            // Returns the format of the audio output device associated with the mastering voice.
+
+        uint32_t __cdecl GetChannelMask() const noexcept;
+            // Returns the output channel mask
+
+        int __cdecl GetOutputSampleRate() const noexcept;
+            // Returns the sample rate going into the mastering voice
+
+        unsigned int __cdecl GetOutputChannels() const noexcept;
+            // Returns the number of channels going into the mastering voice
+
+        bool __cdecl IsAudioDevicePresent() const noexcept;
+            // Returns true if the audio graph is operating normally, false if in 'silent mode'
+
+        bool __cdecl IsCriticalError() const noexcept;
+            // Returns true if the audio graph is halted due to a critical error (which also places the engine into 'silent mode')
+
+        // Voice pool management.
+        void __cdecl SetDefaultSampleRate(int sampleRate);
+            // Sample rate for voices in the reuse pool (defaults to 44100)
+
+        void __cdecl SetMaxVoicePool(size_t maxOneShots, size_t maxInstances);
+            // Maximum number of voices to allocate for one-shots and instances
+            // Note: one-shots over this limit are ignored; too many instance voices throws an exception
+
+        void __cdecl TrimVoicePool();
+            // Releases any currently unused voices
+
+        // Internal-use functions
+        void __cdecl AllocateVoice(_In_ const WAVEFORMATEX* wfx,
+            SOUND_EFFECT_INSTANCE_FLAGS flags, bool oneshot, _Outptr_result_maybenull_ IXAudio2SourceVoice** voice);
+
+        void __cdecl DestroyVoice(_In_ IXAudio2SourceVoice* voice) noexcept;
+            // Should only be called for instance voices, not one-shots
+
+        void __cdecl RegisterNotify(_In_ IVoiceNotify* notify, bool usesUpdate);
+        void __cdecl UnregisterNotify(_In_ IVoiceNotify* notify, bool usesOneShots, bool usesUpdate);
+
+        // XAudio2 interface access
+        IXAudio2* __cdecl GetInterface() const noexcept;
+        IXAudio2MasteringVoice* __cdecl GetMasterVoice() const noexcept;
+        IXAudio2SubmixVoice* __cdecl GetReverbVoice() const noexcept;
+        X3DAUDIO_HANDLE& __cdecl Get3DHandle() const noexcept;
+
+        // Static functions
+        struct RendererDetail
+        {
+            std::wstring deviceId;
+            std::wstring description;
+        };
+
+        static std::vector<RendererDetail> __cdecl GetRendererDetails();
+            // Returns a list of valid audio endpoint devices
+
+#if defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED)
+        explicit AudioEngine(
+            AUDIO_ENGINE_FLAGS flags = AudioEngine_Default,
+            _In_opt_ const WAVEFORMATEX* wfx = nullptr,
+            _In_opt_z_ const __wchar_t* deviceId = nullptr,
+            AUDIO_STREAM_CATEGORY category = AudioCategory_GameEffects) noexcept(false);
+
+        bool __cdecl Reset(_In_opt_ const WAVEFORMATEX* wfx = nullptr, _In_opt_z_ const __wchar_t* deviceId = nullptr);
+#endif
+
+    private:
+        // Private implementation.
+        class Impl;
+        std::unique_ptr<Impl> pImpl;
+    };
+
+
+    //----------------------------------------------------------------------------------
+    class WaveBank
+    {
+    public:
+        WaveBank(_In_ AudioEngine* engine, _In_z_ const wchar_t* wbFileName);
+
+        WaveBank(WaveBank&&) noexcept;
+        WaveBank& operator= (WaveBank&&) noexcept;
+
+        WaveBank(WaveBank const&) = delete;
+        WaveBank& operator= (WaveBank const&) = delete;
+
+        virtual ~WaveBank();
+
+        void __cdecl Play(unsigned int index);
+        void __cdecl Play(unsigned int index, float volume, float pitch, float pan);
+
+        void __cdecl Play(_In_z_ const char* name);
+        void __cdecl Play(_In_z_ const char* name, float volume, float pitch, float pan);
+
+        std::unique_ptr<SoundEffectInstance> __cdecl CreateInstance(unsigned int index,
+            SOUND_EFFECT_INSTANCE_FLAGS flags = SoundEffectInstance_Default);
+        std::unique_ptr<SoundEffectInstance> __cdecl CreateInstance(_In_z_ const char* name,
+            SOUND_EFFECT_INSTANCE_FLAGS flags = SoundEffectInstance_Default);
+
+        std::unique_ptr<SoundStreamInstance> __cdecl CreateStreamInstance(unsigned int index,
+            SOUND_EFFECT_INSTANCE_FLAGS flags = SoundEffectInstance_Default);
+        std::unique_ptr<SoundStreamInstance> __cdecl CreateStreamInstance(_In_z_ const char* name,
+            SOUND_EFFECT_INSTANCE_FLAGS flags = SoundEffectInstance_Default);
+
+        bool __cdecl IsPrepared() const noexcept;
+        bool __cdecl IsInUse() const noexcept;
+        bool __cdecl IsStreamingBank() const noexcept;
+        bool __cdecl IsAdvancedFormat() const noexcept;
+
+        size_t __cdecl GetSampleSizeInBytes(unsigned int index) const noexcept;
+        // Returns size of wave audio data
+
+        size_t __cdecl GetSampleDuration(unsigned int index) const noexcept;
+        // Returns the duration in samples
+
+        size_t __cdecl GetSampleDurationMS(unsigned int index) const noexcept;
+        // Returns the duration in milliseconds
+
+        const WAVEFORMATEX* __cdecl GetFormat(unsigned int index, _Out_writes_bytes_(maxsize) WAVEFORMATEX* wfx, size_t maxsize) const noexcept;
+
+        int __cdecl Find(_In_z_ const char* name) const;
+
+    #ifdef USING_XAUDIO2_9
+        bool __cdecl FillSubmitBuffer(unsigned int index, _Out_ XAUDIO2_BUFFER& buffer, _Out_ XAUDIO2_BUFFER_WMA& wmaBuffer) const;
+    #else
+        void __cdecl FillSubmitBuffer(unsigned int index, _Out_ XAUDIO2_BUFFER& buffer) const;
+    #endif
+
+        void __cdecl UnregisterInstance(_In_ IVoiceNotify* instance);
+
+        HANDLE __cdecl GetAsyncHandle() const noexcept;
+
+        bool __cdecl GetPrivateData(unsigned int index, _Out_writes_bytes_(datasize) void* data, size_t datasize);
+
+#if defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED)
+        WaveBank(_In_ AudioEngine* engine, _In_z_ const __wchar_t* wbFileName);
+#endif
+
+    private:
+        // Private implementation.
+        class Impl;
+
+        std::unique_ptr<Impl> pImpl;
+    };
+
+
+    //----------------------------------------------------------------------------------
+    class SoundEffect
+    {
+    public:
+        SoundEffect(_In_ AudioEngine* engine, _In_z_ const wchar_t* waveFileName);
+
+        SoundEffect(_In_ AudioEngine* engine, _Inout_ std::unique_ptr<uint8_t[]>& wavData,
+            _In_ const WAVEFORMATEX* wfx, _In_reads_bytes_(audioBytes) const uint8_t* startAudio, size_t audioBytes);
+
+        SoundEffect(_In_ AudioEngine* engine, _Inout_ std::unique_ptr<uint8_t[]>& wavData,
+            _In_ const WAVEFORMATEX* wfx, _In_reads_bytes_(audioBytes) const uint8_t* startAudio, size_t audioBytes,
+            uint32_t loopStart, uint32_t loopLength);
+
+    #ifdef USING_XAUDIO2_9
+
+        SoundEffect(_In_ AudioEngine* engine, _Inout_ std::unique_ptr<uint8_t[]>& wavData,
+            _In_ const WAVEFORMATEX* wfx, _In_reads_bytes_(audioBytes) const uint8_t* startAudio, size_t audioBytes,
+            _In_reads_(seekCount) const uint32_t* seekTable, size_t seekCount);
+
+    #endif
+
+        SoundEffect(SoundEffect&&) noexcept;
+        SoundEffect& operator= (SoundEffect&&) noexcept;
+
+        SoundEffect(SoundEffect const&) = delete;
+        SoundEffect& operator= (SoundEffect const&) = delete;
+
+        virtual ~SoundEffect();
+
+        void __cdecl Play();
+        void __cdecl Play(float volume, float pitch, float pan);
+
+        std::unique_ptr<SoundEffectInstance> __cdecl CreateInstance(SOUND_EFFECT_INSTANCE_FLAGS flags = SoundEffectInstance_Default);
+
+        bool __cdecl IsInUse() const noexcept;
+
+        size_t __cdecl GetSampleSizeInBytes() const noexcept;
+        // Returns size of wave audio data
+
+        size_t __cdecl GetSampleDuration() const noexcept;
+        // Returns the duration in samples
+
+        size_t __cdecl GetSampleDurationMS() const noexcept;
+        // Returns the duration in milliseconds
+
+        const WAVEFORMATEX* __cdecl GetFormat() const noexcept;
+
+    #ifdef USING_XAUDIO2_9
+        bool __cdecl FillSubmitBuffer(_Out_ XAUDIO2_BUFFER& buffer, _Out_ XAUDIO2_BUFFER_WMA& wmaBuffer) const;
+    #else
+        void __cdecl FillSubmitBuffer(_Out_ XAUDIO2_BUFFER& buffer) const;
+    #endif
+
+        void __cdecl UnregisterInstance(_In_ IVoiceNotify* instance);
+
+#if defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED)
+        SoundEffect(_In_ AudioEngine* engine, _In_z_ const __wchar_t* waveFileName);
+#endif
+
+    private:
+        // Private implementation.
+        class Impl;
+
+        std::unique_ptr<Impl> pImpl;
+    };
+
+
+    //----------------------------------------------------------------------------------
+    struct AudioListener : public X3DAUDIO_LISTENER
+    {
+        X3DAUDIO_CONE   ListenerCone;
+
+        AudioListener() noexcept :
+            X3DAUDIO_LISTENER{},
+            ListenerCone{}
+        {
+            OrientFront.z = -1.f;
+
+            OrientTop.y = 1.f;
+        }
+
+        void XM_CALLCONV SetPosition(FXMVECTOR v) noexcept
+        {
+            XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&Position), v);
+        }
+        void __cdecl SetPosition(const XMFLOAT3& pos) noexcept
+        {
+            Position.x = pos.x;
+            Position.y = pos.y;
+            Position.z = pos.z;
+        }
+
+        void XM_CALLCONV SetVelocity(FXMVECTOR v) noexcept
+        {
+            XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&Velocity), v);
+        }
+        void __cdecl SetVelocity(const XMFLOAT3& vel) noexcept
+        {
+            Velocity.x = vel.x;
+            Velocity.y = vel.y;
+            Velocity.z = vel.z;
+        }
+
+        void XM_CALLCONV SetOrientation(FXMVECTOR forward, FXMVECTOR up) noexcept
+        {
+            XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&OrientFront), forward);
+            XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&OrientTop), up);
+        }
+        void __cdecl SetOrientation(const XMFLOAT3& forward, const XMFLOAT3& up) noexcept
+        {
+            OrientFront.x = forward.x;  OrientTop.x = up.x;
+            OrientFront.y = forward.y;  OrientTop.y = up.y;
+            OrientFront.z = forward.z;  OrientTop.z = up.z;
+        }
+
+        void XM_CALLCONV SetOrientationFromQuaternion(FXMVECTOR quat) noexcept
+        {
+            const XMVECTOR forward = XMVector3Rotate(g_XMIdentityR2, quat);
+            XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&OrientFront), forward);
+
+            const XMVECTOR up = XMVector3Rotate(g_XMIdentityR1, quat);
+            XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&OrientTop), up);
+        }
+
+        // Updates velocity and orientation by tracking changes in position over time.
+        void XM_CALLCONV Update(FXMVECTOR newPos, XMVECTOR upDir, float dt) noexcept
+        {
+            if (dt > 0.f)
+            {
+                const XMVECTOR lastPos = XMLoadFloat3(reinterpret_cast<const XMFLOAT3*>(&Position));
+
+                XMVECTOR vDelta = XMVectorSubtract(newPos, lastPos);
+                const XMVECTOR vt = XMVectorReplicate(dt);
+                XMVECTOR v = XMVectorDivide(vDelta, vt);
+                XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&Velocity), v);
+
+                vDelta = XMVector3Normalize(vDelta);
+                XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&OrientFront), vDelta);
+
+                v = XMVector3Cross(upDir, vDelta);
+                v = XMVector3Normalize(v);
+
+                v = XMVector3Cross(vDelta, v);
+                v = XMVector3Normalize(v);
+                XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&OrientTop), v);
+
+                XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&Position), newPos);
+            }
+        }
+
+        void __cdecl SetOmnidirectional() noexcept
+        {
+            pCone = nullptr;
+        }
+
+        void __cdecl SetCone(const X3DAUDIO_CONE& listenerCone);
+
+        bool __cdecl IsValid() const;
+    };
+
+
+    //----------------------------------------------------------------------------------
+    struct AudioEmitter : public X3DAUDIO_EMITTER
+    {
+        X3DAUDIO_CONE   EmitterCone;
+        float           EmitterAzimuths[XAUDIO2_MAX_AUDIO_CHANNELS];
+
+        AudioEmitter() noexcept :
+            X3DAUDIO_EMITTER{},
+            EmitterCone{},
+            EmitterAzimuths{}
+        {
+            OrientFront.z = -1.f;
+
+            OrientTop.y =
+                ChannelRadius =
+                CurveDistanceScaler =
+                DopplerScaler = 1.f;
+
+            ChannelCount = 1;
+            pChannelAzimuths = EmitterAzimuths;
+
+            InnerRadiusAngle = X3DAUDIO_PI / 4.0f;
+        }
+
+        void XM_CALLCONV SetPosition(FXMVECTOR v) noexcept
+        {
+            XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&Position), v);
+        }
+        void __cdecl SetPosition(const XMFLOAT3& pos) noexcept
+        {
+            Position.x = pos.x;
+            Position.y = pos.y;
+            Position.z = pos.z;
+        }
+
+        void XM_CALLCONV SetVelocity(FXMVECTOR v) noexcept
+        {
+            XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&Velocity), v);
+        }
+        void __cdecl SetVelocity(const XMFLOAT3& vel) noexcept
+        {
+            Velocity.x = vel.x;
+            Velocity.y = vel.y;
+            Velocity.z = vel.z;
+        }
+
+        void XM_CALLCONV SetOrientation(FXMVECTOR forward, FXMVECTOR up) noexcept
+        {
+            XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&OrientFront), forward);
+            XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&OrientTop), up);
+        }
+        void __cdecl SetOrientation(const XMFLOAT3& forward, const XMFLOAT3& up) noexcept
+        {
+            OrientFront.x = forward.x;  OrientTop.x = up.x;
+            OrientFront.y = forward.y;  OrientTop.y = up.y;
+            OrientFront.z = forward.z;  OrientTop.z = up.z;
+        }
+
+        void XM_CALLCONV SetOrientationFromQuaternion(FXMVECTOR quat) noexcept
+        {
+            const XMVECTOR forward = XMVector3Rotate(g_XMIdentityR2, quat);
+            XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&OrientFront), forward);
+
+            const XMVECTOR up = XMVector3Rotate(g_XMIdentityR1, quat);
+            XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&OrientTop), up);
+        }
+
+        // Updates velocity and orientation by tracking changes in position over time.
+        void XM_CALLCONV Update(FXMVECTOR newPos, XMVECTOR upDir, float dt) noexcept
+        {
+            if (dt > 0.f)
+            {
+                const XMVECTOR lastPos = XMLoadFloat3(reinterpret_cast<const XMFLOAT3*>(&Position));
+
+                XMVECTOR vDelta = XMVectorSubtract(newPos, lastPos);
+                const XMVECTOR vt = XMVectorReplicate(dt);
+                XMVECTOR v = XMVectorDivide(vDelta, vt);
+                XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&Velocity), v);
+
+                vDelta = XMVector3Normalize(vDelta);
+                XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&OrientFront), vDelta);
+
+                v = XMVector3Cross(upDir, vDelta);
+                v = XMVector3Normalize(v);
+
+                v = XMVector3Cross(vDelta, v);
+                v = XMVector3Normalize(v);
+                XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&OrientTop), v);
+
+                XMStoreFloat3(reinterpret_cast<XMFLOAT3*>(&Position), newPos);
+            }
+        }
+
+        void __cdecl SetOmnidirectional() noexcept
+        {
+            pCone = nullptr;
+        }
+
+        // Only used for single-channel emitters.
+        void __cdecl SetCone(const X3DAUDIO_CONE& emitterCone);
+
+        // Set multi-channel emitter azimuths based on speaker configuration geometry.
+        void __cdecl EnableDefaultMultiChannel(unsigned int channels, float radius = 1.f);
+
+        // Set default volume, LFE, LPF, and reverb curves.
+        void __cdecl EnableDefaultCurves() noexcept;
+        void __cdecl EnableLinearCurves() noexcept;
+
+        void __cdecl EnableInverseSquareCurves() noexcept
+        {
+            pVolumeCurve = nullptr;
+            pLFECurve = nullptr;
+            pLPFDirectCurve = nullptr;
+            pLPFReverbCurve = nullptr;
+            pReverbCurve = nullptr;
+        }
+
+        bool __cdecl IsValid() const;
+    };
+
+
+    //----------------------------------------------------------------------------------
+    class SoundEffectInstance
+    {
+    public:
+        SoundEffectInstance(SoundEffectInstance&&) noexcept;
+        SoundEffectInstance& operator= (SoundEffectInstance&&) noexcept;
+
+        SoundEffectInstance(SoundEffectInstance const&) = delete;
+        SoundEffectInstance& operator= (SoundEffectInstance const&) = delete;
+
+        virtual ~SoundEffectInstance();
+
+        void __cdecl Play(bool loop = false);
+        void __cdecl Stop(bool immediate = true) noexcept;
+        void __cdecl Pause() noexcept;
+        void __cdecl Resume();
+
+        void __cdecl SetVolume(float volume);
+        void __cdecl SetPitch(float pitch);
+        void __cdecl SetPan(float pan);
+
+        void __cdecl Apply3D(const X3DAUDIO_LISTENER& listener, const X3DAUDIO_EMITTER& emitter, bool rhcoords = true);
+
+        bool __cdecl IsLooped() const noexcept;
+
+        SoundState __cdecl GetState() noexcept;
+
+        unsigned int __cdecl GetChannelCount() const noexcept;
+
+        IVoiceNotify* __cdecl GetVoiceNotify() const noexcept;
+
+    private:
+        // Private implementation.
+        class Impl;
+
+        std::unique_ptr<Impl> pImpl;
+
+        // Private constructors
+        SoundEffectInstance(_In_ AudioEngine* engine, _In_ SoundEffect* effect, SOUND_EFFECT_INSTANCE_FLAGS flags);
+        SoundEffectInstance(_In_ AudioEngine* engine, _In_ WaveBank* effect, unsigned int index, SOUND_EFFECT_INSTANCE_FLAGS flags);
+
+        friend std::unique_ptr<SoundEffectInstance> __cdecl SoundEffect::CreateInstance(SOUND_EFFECT_INSTANCE_FLAGS);
+        friend std::unique_ptr<SoundEffectInstance> __cdecl WaveBank::CreateInstance(unsigned int, SOUND_EFFECT_INSTANCE_FLAGS);
+    };
+
+
+    //----------------------------------------------------------------------------------
+    class SoundStreamInstance
+    {
+    public:
+        SoundStreamInstance(SoundStreamInstance&&) noexcept;
+        SoundStreamInstance& operator= (SoundStreamInstance&&) noexcept;
+
+        SoundStreamInstance(SoundStreamInstance const&) = delete;
+        SoundStreamInstance& operator= (SoundStreamInstance const&) = delete;
+
+        virtual ~SoundStreamInstance();
+
+        void __cdecl Play(bool loop = false);
+        void __cdecl Stop(bool immediate = true) noexcept;
+        void __cdecl Pause() noexcept;
+        void __cdecl Resume();
+
+        void __cdecl SetVolume(float volume);
+        void __cdecl SetPitch(float pitch);
+        void __cdecl SetPan(float pan);
+
+        void __cdecl Apply3D(const X3DAUDIO_LISTENER& listener, const X3DAUDIO_EMITTER& emitter, bool rhcoords = true);
+
+        bool __cdecl IsLooped() const noexcept;
+
+        SoundState __cdecl GetState() noexcept;
+
+        unsigned int __cdecl GetChannelCount() const noexcept;
+
+        IVoiceNotify* __cdecl GetVoiceNotify() const noexcept;
+
+    private:
+        // Private implementation.
+        class Impl;
+
+        std::unique_ptr<Impl> pImpl;
+
+        // Private constructors
+        SoundStreamInstance(_In_ AudioEngine* engine, _In_ WaveBank* effect, unsigned int index, SOUND_EFFECT_INSTANCE_FLAGS flags);
+
+        friend std::unique_ptr<SoundStreamInstance> __cdecl WaveBank::CreateStreamInstance(unsigned int, SOUND_EFFECT_INSTANCE_FLAGS);
+    };
+
+
+    //----------------------------------------------------------------------------------
+    class DynamicSoundEffectInstance
+    {
+    public:
+        DynamicSoundEffectInstance(_In_ AudioEngine* engine,
+            _In_ std::function<void __cdecl(DynamicSoundEffectInstance*)> bufferNeeded,
+            int sampleRate, int channels, int sampleBits = 16,
+            SOUND_EFFECT_INSTANCE_FLAGS flags = SoundEffectInstance_Default);
+
+        DynamicSoundEffectInstance(DynamicSoundEffectInstance&&) noexcept;
+        DynamicSoundEffectInstance& operator= (DynamicSoundEffectInstance&&) noexcept;
+
+        DynamicSoundEffectInstance(DynamicSoundEffectInstance const&) = delete;
+        DynamicSoundEffectInstance& operator= (DynamicSoundEffectInstance const&) = delete;
+
+        virtual ~DynamicSoundEffectInstance();
+
+        void __cdecl Play();
+        void __cdecl Stop(bool immediate = true) noexcept;
+        void __cdecl Pause() noexcept;
+        void __cdecl Resume();
+
+        void __cdecl SetVolume(float volume);
+        void __cdecl SetPitch(float pitch);
+        void __cdecl SetPan(float pan);
+
+        void __cdecl Apply3D(const X3DAUDIO_LISTENER& listener, const X3DAUDIO_EMITTER& emitter, bool rhcoords = true);
+
+        void __cdecl SubmitBuffer(_In_reads_bytes_(audioBytes) const uint8_t* pAudioData, size_t audioBytes);
+        void __cdecl SubmitBuffer(_In_reads_bytes_(audioBytes) const uint8_t* pAudioData, uint32_t offset, size_t audioBytes);
+
+        SoundState __cdecl GetState() noexcept;
+
+        size_t __cdecl GetSampleDuration(size_t bytes) const noexcept;
+        // Returns duration in samples of a buffer of a given size
+
+        size_t __cdecl GetSampleDurationMS(size_t bytes) const noexcept;
+        // Returns duration in milliseconds of a buffer of a given size
+
+        size_t __cdecl GetSampleSizeInBytes(uint64_t duration) const noexcept;
+        // Returns size of a buffer for a duration given in milliseconds
+
+        int __cdecl GetPendingBufferCount() const noexcept;
+
+        const WAVEFORMATEX* __cdecl GetFormat() const noexcept;
+
+        unsigned int __cdecl GetChannelCount() const noexcept;
+
+    private:
+        // Private implementation.
+        class Impl;
+
+        std::unique_ptr<Impl> pImpl;
+    };
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
+#endif
+
+    DEFINE_ENUM_FLAG_OPERATORS(AUDIO_ENGINE_FLAGS);
+    DEFINE_ENUM_FLAG_OPERATORS(SOUND_EFFECT_INSTANCE_FLAGS);
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+}

enginecustom/include/Inc/BufferHelpers.h

@@ -0,0 +1,164 @@
+//--------------------------------------------------------------------------------------
+// File: BufferHelpers.h
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#include <cassert>
+#include <cstddef>
+
+#if defined(_XBOX_ONE) && defined(_TITLE)
+#include <d3d11_x.h>
+#include "GraphicsMemory.h"
+#else
+#include <d3d11_1.h>
+#endif
+
+#include <wrl\client.h>
+
+
+namespace DirectX
+{
+    // Helpers for creating initialized Direct3D buffer resources.
+    HRESULT __cdecl CreateStaticBuffer(_In_ ID3D11Device* device,
+        _In_reads_bytes_(count* stride) const void* ptr,
+        size_t count,
+        size_t stride,
+        unsigned int bindFlags,
+        _COM_Outptr_ ID3D11Buffer** pBuffer) noexcept;
+
+    template<typename T>
+    HRESULT CreateStaticBuffer(_In_ ID3D11Device* device,
+        _In_reads_(count) T const* data,
+        size_t count,
+        unsigned int bindFlags,
+        _COM_Outptr_ ID3D11Buffer** pBuffer) noexcept
+    {
+        return CreateStaticBuffer(device, data, count, sizeof(T), bindFlags, pBuffer);
+    }
+
+    template<typename T>
+    HRESULT CreateStaticBuffer(_In_ ID3D11Device* device,
+        T const& data,
+        unsigned int bindFlags,
+        _COM_Outptr_ ID3D11Buffer** pBuffer) noexcept
+    {
+        return CreateStaticBuffer(device, data.data(), data.size(), sizeof(typename T::value_type), bindFlags, pBuffer);
+    }
+
+    // Helpers for creating texture from memory arrays.
+    HRESULT __cdecl CreateTextureFromMemory(_In_ ID3D11Device* device,
+        size_t width,
+        DXGI_FORMAT format,
+        const D3D11_SUBRESOURCE_DATA& initData,
+        _COM_Outptr_opt_ ID3D11Texture1D** texture,
+        _COM_Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        unsigned int bindFlags = D3D11_BIND_SHADER_RESOURCE) noexcept;
+
+    HRESULT __cdecl CreateTextureFromMemory(_In_ ID3D11Device* device,
+        size_t width, size_t height,
+        DXGI_FORMAT format,
+        const D3D11_SUBRESOURCE_DATA& initData,
+        _COM_Outptr_opt_ ID3D11Texture2D** texture,
+        _COM_Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        unsigned int bindFlags = D3D11_BIND_SHADER_RESOURCE) noexcept;
+
+    HRESULT __cdecl CreateTextureFromMemory(
+    #if defined(_XBOX_ONE) && defined(_TITLE)
+        _In_ ID3D11DeviceX* d3dDeviceX,
+        _In_ ID3D11DeviceContextX* d3dContextX,
+    #else
+        _In_ ID3D11Device* device,
+        _In_ ID3D11DeviceContext* d3dContext,
+    #endif
+        size_t width, size_t height,
+        DXGI_FORMAT format,
+        const D3D11_SUBRESOURCE_DATA& initData,
+        _COM_Outptr_opt_ ID3D11Texture2D** texture,
+        _COM_Outptr_opt_ ID3D11ShaderResourceView** textureView) noexcept;
+
+    HRESULT __cdecl CreateTextureFromMemory(_In_ ID3D11Device* device,
+        size_t width, size_t height, size_t depth,
+        DXGI_FORMAT format,
+        const D3D11_SUBRESOURCE_DATA& initData,
+        _COM_Outptr_opt_ ID3D11Texture3D** texture,
+        _COM_Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        unsigned int bindFlags = D3D11_BIND_SHADER_RESOURCE) noexcept;
+
+    // Strongly typed wrapper around a Direct3D constant buffer.
+    inline namespace DX11
+    {
+        namespace Private
+        {
+            // Base class, not to be used directly: clients should access this via the derived PrimitiveBatch<T>.
+            class ConstantBufferBase
+            {
+            protected:
+                void __cdecl CreateBuffer(_In_ ID3D11Device* device, size_t bytes, _Outptr_ ID3D11Buffer** pBuffer);
+            };
+        }
+    }
+
+    template<typename T>
+    class ConstantBuffer : public DX11::Private::ConstantBufferBase
+    {
+    public:
+        // Constructor.
+        ConstantBuffer() = default;
+        explicit ConstantBuffer(_In_ ID3D11Device* device) noexcept(false)
+        {
+            CreateBuffer(device, sizeof(T), mConstantBuffer.GetAddressOf());
+        }
+
+        ConstantBuffer(ConstantBuffer&&) = default;
+        ConstantBuffer& operator= (ConstantBuffer&&) = default;
+
+        ConstantBuffer(ConstantBuffer const&) = delete;
+        ConstantBuffer& operator= (ConstantBuffer const&) = delete;
+
+        void Create(_In_ ID3D11Device* device)
+        {
+            CreateBuffer(device, sizeof(T), mConstantBuffer.ReleaseAndGetAddressOf());
+        }
+
+        // Writes new data into the constant buffer.
+    #if defined(_XBOX_ONE) && defined(_TITLE)
+        void __cdecl SetData(_In_ ID3D11DeviceContext* deviceContext, T const& value, void** grfxMemory)
+        {
+            assert(grfxMemory != nullptr);
+
+            void* ptr = GraphicsMemory::Get().Allocate(deviceContext, sizeof(T), 64);
+            assert(ptr != nullptr);
+
+            *(T*)ptr = value;
+
+            *grfxMemory = ptr;
+        }
+    #else
+
+        void __cdecl SetData(_In_ ID3D11DeviceContext* deviceContext, T const& value) noexcept
+        {
+            assert(mConstantBuffer);
+
+            D3D11_MAPPED_SUBRESOURCE mappedResource;
+            if (SUCCEEDED(deviceContext->Map(mConstantBuffer.Get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource)))
+            {
+                *static_cast<T*>(mappedResource.pData) = value;
+
+                deviceContext->Unmap(mConstantBuffer.Get(), 0);
+            }
+        }
+    #endif // _XBOX_ONE && _TITLE
+
+        // Looks up the underlying D3D constant buffer.
+        ID3D11Buffer* GetBuffer() const noexcept { return mConstantBuffer.Get(); }
+
+    private:
+        Microsoft::WRL::ComPtr<ID3D11Buffer> mConstantBuffer;
+    };
+}

enginecustom/include/Inc/CommonStates.h

@@ -0,0 +1,72 @@
+//--------------------------------------------------------------------------------------
+// File: CommonStates.h
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#if defined(_XBOX_ONE) && defined(_TITLE)
+#include <d3d11_x.h>
+#else
+#include <d3d11_1.h>
+#endif
+
+#include <memory>
+
+
+namespace DirectX
+{
+    inline namespace DX11
+    {
+        class CommonStates
+        {
+        public:
+            explicit CommonStates(_In_ ID3D11Device* device);
+
+            CommonStates(CommonStates&&) noexcept;
+            CommonStates& operator= (CommonStates&&) noexcept;
+
+            CommonStates(CommonStates const&) = delete;
+            CommonStates& operator= (CommonStates const&) = delete;
+
+            virtual ~CommonStates();
+
+            // Blend states.
+            ID3D11BlendState* __cdecl Opaque() const;
+            ID3D11BlendState* __cdecl AlphaBlend() const;
+            ID3D11BlendState* __cdecl Additive() const;
+            ID3D11BlendState* __cdecl NonPremultiplied() const;
+
+            // Depth stencil states.
+            ID3D11DepthStencilState* __cdecl DepthNone() const;
+            ID3D11DepthStencilState* __cdecl DepthDefault() const;
+            ID3D11DepthStencilState* __cdecl DepthRead() const;
+            ID3D11DepthStencilState* __cdecl DepthReverseZ() const;
+            ID3D11DepthStencilState* __cdecl DepthReadReverseZ() const;
+
+            // Rasterizer states.
+            ID3D11RasterizerState* __cdecl CullNone() const;
+            ID3D11RasterizerState* __cdecl CullClockwise() const;
+            ID3D11RasterizerState* __cdecl CullCounterClockwise() const;
+            ID3D11RasterizerState* __cdecl Wireframe() const;
+
+            // Sampler states.
+            ID3D11SamplerState* __cdecl PointWrap() const;
+            ID3D11SamplerState* __cdecl PointClamp() const;
+            ID3D11SamplerState* __cdecl LinearWrap() const;
+            ID3D11SamplerState* __cdecl LinearClamp() const;
+            ID3D11SamplerState* __cdecl AnisotropicWrap() const;
+            ID3D11SamplerState* __cdecl AnisotropicClamp() const;
+
+        private:
+            // Private implementation.
+            class Impl;
+
+            std::shared_ptr<Impl> pImpl;
+        };
+    }
+}

enginecustom/include/Inc/DDSTextureLoader.h

@@ -0,0 +1,182 @@
+//--------------------------------------------------------------------------------------
+// File: DDSTextureLoader.h
+//
+// Functions for loading a DDS texture and creating a Direct3D runtime resource for it
+//
+// Note these functions are useful as a light-weight runtime loader for DDS files. For
+// a full-featured DDS file reader, writer, and texture processing pipeline see
+// the 'Texconv' sample and the 'DirectXTex' library.
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248926
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#if defined(_XBOX_ONE) && defined(_TITLE)
+#include <d3d11_x.h>
+#else
+#include <d3d11_1.h>
+#endif
+
+#include <cstddef>
+#include <cstdint>
+
+
+namespace DirectX
+{
+#ifndef DDS_ALPHA_MODE_DEFINED
+#define DDS_ALPHA_MODE_DEFINED
+    enum DDS_ALPHA_MODE : uint32_t
+    {
+        DDS_ALPHA_MODE_UNKNOWN = 0,
+        DDS_ALPHA_MODE_STRAIGHT = 1,
+        DDS_ALPHA_MODE_PREMULTIPLIED = 2,
+        DDS_ALPHA_MODE_OPAQUE = 3,
+        DDS_ALPHA_MODE_CUSTOM = 4,
+    };
+#endif
+
+    inline namespace DX11
+    {
+        enum DDS_LOADER_FLAGS : uint32_t
+        {
+            DDS_LOADER_DEFAULT = 0,
+            DDS_LOADER_FORCE_SRGB = 0x1,
+            DDS_LOADER_IGNORE_SRGB = 0x2,
+        };
+    }
+
+    // Standard version
+    HRESULT __cdecl CreateDDSTextureFromMemory(
+        _In_ ID3D11Device* d3dDevice,
+        _In_reads_bytes_(ddsDataSize) const uint8_t* ddsData,
+        _In_ size_t ddsDataSize,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _In_ size_t maxsize = 0,
+        _Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr) noexcept;
+
+    HRESULT __cdecl CreateDDSTextureFromFile(
+        _In_ ID3D11Device* d3dDevice,
+        _In_z_ const wchar_t* szFileName,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _In_ size_t maxsize = 0,
+        _Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr) noexcept;
+
+    // Standard version with optional auto-gen mipmap support
+    HRESULT __cdecl CreateDDSTextureFromMemory(
+    #if defined(_XBOX_ONE) && defined(_TITLE)
+        _In_ ID3D11DeviceX* d3dDevice,
+        _In_opt_ ID3D11DeviceContextX* d3dContext,
+    #else
+        _In_ ID3D11Device* d3dDevice,
+        _In_opt_ ID3D11DeviceContext* d3dContext,
+    #endif
+        _In_reads_bytes_(ddsDataSize) const uint8_t* ddsData,
+        _In_ size_t ddsDataSize,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _In_ size_t maxsize = 0,
+        _Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr) noexcept;
+
+    HRESULT __cdecl CreateDDSTextureFromFile(
+    #if defined(_XBOX_ONE) && defined(_TITLE)
+        _In_ ID3D11DeviceX* d3dDevice,
+        _In_opt_ ID3D11DeviceContextX* d3dContext,
+    #else
+        _In_ ID3D11Device* d3dDevice,
+        _In_opt_ ID3D11DeviceContext* d3dContext,
+    #endif
+        _In_z_ const wchar_t* szFileName,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _In_ size_t maxsize = 0,
+        _Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr) noexcept;
+
+    // Extended version
+    HRESULT __cdecl CreateDDSTextureFromMemoryEx(
+        _In_ ID3D11Device* d3dDevice,
+        _In_reads_bytes_(ddsDataSize) const uint8_t* ddsData,
+        _In_ size_t ddsDataSize,
+        _In_ size_t maxsize,
+        _In_ D3D11_USAGE usage,
+        _In_ unsigned int bindFlags,
+        _In_ unsigned int cpuAccessFlags,
+        _In_ unsigned int miscFlags,
+        _In_ DDS_LOADER_FLAGS loadFlags,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr) noexcept;
+
+    HRESULT __cdecl CreateDDSTextureFromFileEx(
+        _In_ ID3D11Device* d3dDevice,
+        _In_z_ const wchar_t* szFileName,
+        _In_ size_t maxsize,
+        _In_ D3D11_USAGE usage,
+        _In_ unsigned int bindFlags,
+        _In_ unsigned int cpuAccessFlags,
+        _In_ unsigned int miscFlags,
+        _In_ DDS_LOADER_FLAGS loadFlags,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr) noexcept;
+
+    // Extended version with optional auto-gen mipmap support
+    HRESULT __cdecl CreateDDSTextureFromMemoryEx(
+    #if defined(_XBOX_ONE) && defined(_TITLE)
+        _In_ ID3D11DeviceX* d3dDevice,
+        _In_opt_ ID3D11DeviceContextX* d3dContext,
+    #else
+        _In_ ID3D11Device* d3dDevice,
+        _In_opt_ ID3D11DeviceContext* d3dContext,
+    #endif
+        _In_reads_bytes_(ddsDataSize) const uint8_t* ddsData,
+        _In_ size_t ddsDataSize,
+        _In_ size_t maxsize,
+        _In_ D3D11_USAGE usage,
+        _In_ unsigned int bindFlags,
+        _In_ unsigned int cpuAccessFlags,
+        _In_ unsigned int miscFlags,
+        _In_ DDS_LOADER_FLAGS loadFlags,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr) noexcept;
+
+    HRESULT __cdecl CreateDDSTextureFromFileEx(
+    #if defined(_XBOX_ONE) && defined(_TITLE)
+        _In_ ID3D11DeviceX* d3dDevice,
+        _In_opt_ ID3D11DeviceContextX* d3dContext,
+    #else
+        _In_ ID3D11Device* d3dDevice,
+        _In_opt_ ID3D11DeviceContext* d3dContext,
+    #endif
+        _In_z_ const wchar_t* szFileName,
+        _In_ size_t maxsize,
+        _In_ D3D11_USAGE usage,
+        _In_ unsigned int bindFlags,
+        _In_ unsigned int cpuAccessFlags,
+        _In_ unsigned int miscFlags,
+        _In_ DDS_LOADER_FLAGS loadFlags,
+        _Outptr_opt_ ID3D11Resource** texture,
+        _Outptr_opt_ ID3D11ShaderResourceView** textureView,
+        _Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr) noexcept;
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
+#endif
+
+    inline namespace DX11
+    {
+        DEFINE_ENUM_FLAG_OPERATORS(DDS_LOADER_FLAGS);
+    }
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+}

enginecustom/include/Inc/DirectXHelpers.h

@@ -0,0 +1,232 @@
+//--------------------------------------------------------------------------------------
+// File: DirectXHelpers.h
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#if defined(_XBOX_ONE) && defined(_TITLE)
+#include <d3d11_x.h>
+#else
+#include <d3d11_1.h>
+#endif
+
+#ifdef _MSC_VER
+#if !defined(NO_D3D11_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
+#if !defined(_XBOX_ONE) || !defined(_TITLE)
+#pragma comment(lib,"dxguid.lib")
+#endif
+#endif
+#endif
+
+#ifndef IID_GRAPHICS_PPV_ARGS
+#define IID_GRAPHICS_PPV_ARGS(x) IID_PPV_ARGS(x)
+#endif
+
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <exception>
+
+//
+// The core Direct3D headers provide the following helper C++ classes
+//  CD3D11_RECT
+//  CD3D11_BOX
+//  CD3D11_DEPTH_STENCIL_DESC
+//  CD3D11_BLEND_DESC, CD3D11_BLEND_DESC1
+//  CD3D11_RASTERIZER_DESC, CD3D11_RASTERIZER_DESC1
+//  CD3D11_BUFFER_DESC
+//  CD3D11_TEXTURE1D_DESC
+//  CD3D11_TEXTURE2D_DESC
+//  CD3D11_TEXTURE3D_DESC
+//  CD3D11_SHADER_RESOURCE_VIEW_DESC
+//  CD3D11_RENDER_TARGET_VIEW_DESC
+//  CD3D11_VIEWPORT
+//  CD3D11_DEPTH_STENCIL_VIEW_DESC
+//  CD3D11_UNORDERED_ACCESS_VIEW_DESC
+//  CD3D11_SAMPLER_DESC
+//  CD3D11_QUERY_DESC
+//  CD3D11_COUNTER_DESC
+//
+
+
+namespace DirectX
+{
+    inline namespace DX11
+    {
+        class IEffect;
+    }
+
+    // simliar to std::lock_guard for exception-safe Direct3D resource locking
+    class MapGuard : public D3D11_MAPPED_SUBRESOURCE
+    {
+    public:
+        MapGuard(_In_ ID3D11DeviceContext* context,
+            _In_ ID3D11Resource *resource,
+            _In_ unsigned int subresource,
+            _In_ D3D11_MAP mapType,
+            _In_ unsigned int mapFlags) noexcept(false)
+            : mContext(context), mResource(resource), mSubresource(subresource)
+        {
+            HRESULT hr = mContext->Map(resource, subresource, mapType, mapFlags, this);
+            if (FAILED(hr))
+            {
+                throw std::exception();
+            }
+        }
+
+        MapGuard(MapGuard&&) = delete;
+        MapGuard& operator= (MapGuard&&) = delete;
+
+        MapGuard(MapGuard const&) = delete;
+        MapGuard& operator= (MapGuard const&) = delete;
+
+        ~MapGuard()
+        {
+            mContext->Unmap(mResource, mSubresource);
+        }
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-warning-option"
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
+#endif
+
+        uint8_t* get() const noexcept
+        {
+            return static_cast<uint8_t*>(pData);
+        }
+        uint8_t* get(size_t slice) const noexcept
+        {
+            return static_cast<uint8_t*>(pData) + (slice * DepthPitch);
+        }
+
+        uint8_t* scanline(size_t row) const noexcept
+        {
+            return static_cast<uint8_t*>(pData) + (row * RowPitch);
+        }
+        uint8_t* scanline(size_t slice, size_t row) const noexcept
+        {
+            return static_cast<uint8_t*>(pData) + (slice * DepthPitch) + (row * RowPitch);
+        }
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+        template<typename T>
+        void copy(_In_reads_(count) T const* data, size_t count) noexcept
+        {
+            memcpy(pData, data, count * sizeof(T));
+        }
+
+        template<typename T>
+        void copy(T const& data) noexcept
+        {
+            memcpy(pData, data.data(), data.size() * sizeof(typename T::value_type));
+        }
+
+    private:
+        ID3D11DeviceContext*    mContext;
+        ID3D11Resource*         mResource;
+        unsigned int            mSubresource;
+    };
+
+
+    // Helper sets a D3D resource name string (used by PIX and debug layer leak reporting).
+    #if !defined(NO_D3D11_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
+    template<UINT TNameLength>
+    inline void SetDebugObjectName(_In_ ID3D11DeviceChild* resource, _In_z_ const char(&name)[TNameLength]) noexcept
+    {
+    #if defined(_XBOX_ONE) && defined(_TITLE)
+        wchar_t wname[MAX_PATH];
+        int result = MultiByteToWideChar(CP_UTF8, 0, name, TNameLength, wname, MAX_PATH);
+        if (result > 0)
+        {
+            resource->SetName(wname);
+        }
+    #else
+        resource->SetPrivateData(WKPDID_D3DDebugObjectName, TNameLength - 1, name);
+    #endif
+    }
+    #else
+    template<UINT TNameLength>
+    inline void SetDebugObjectName(_In_ ID3D11DeviceChild*, _In_z_ const char(&)[TNameLength]) noexcept
+    {
+    }
+    #endif
+
+#if !defined(NO_D3D11_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
+    template<UINT TNameLength>
+    inline void SetDebugObjectName(_In_ ID3D11DeviceChild* resource, _In_z_ const wchar_t(&name)[TNameLength])
+    {
+    #if defined(_XBOX_ONE) && defined(_TITLE)
+        resource->SetName(name);
+    #else
+        char aname[MAX_PATH];
+        int result = WideCharToMultiByte(CP_UTF8, 0, name, TNameLength, aname, MAX_PATH, nullptr, nullptr);
+        if (result > 0)
+        {
+            resource->SetPrivateData(WKPDID_D3DDebugObjectName, TNameLength - 1, aname);
+        }
+    #endif
+    }
+#else
+    template<UINT TNameLength>
+    inline void SetDebugObjectName(_In_ ID3D11DeviceChild*, _In_z_ const wchar_t(&)[TNameLength])
+    {
+    }
+#endif
+
+    inline namespace DX11
+    {
+        // Helper to check for power-of-2
+        template<typename T>
+        constexpr bool IsPowerOf2(T x) noexcept { return ((x != 0) && !(x & (x - 1))); }
+
+        // Helpers for aligning values by a power of 2
+        template<typename T>
+        inline T AlignDown(T size, size_t alignment) noexcept
+        {
+            if (alignment > 0)
+            {
+                assert(((alignment - 1) & alignment) == 0);
+                auto mask = static_cast<T>(alignment - 1);
+                return size & ~mask;
+            }
+            return size;
+        }
+
+        template<typename T>
+        inline T AlignUp(T size, size_t alignment) noexcept
+        {
+            if (alignment > 0)
+            {
+                assert(((alignment - 1) & alignment) == 0);
+                auto mask = static_cast<T>(alignment - 1);
+                return (size + mask) & ~mask;
+            }
+            return size;
+        }
+    }
+
+    // Helper for creating a Direct3D input layout to match a shader from an IEffect
+    HRESULT __cdecl CreateInputLayoutFromEffect(_In_ ID3D11Device* device,
+        _In_ IEffect* effect,
+        _In_reads_(count) const D3D11_INPUT_ELEMENT_DESC* desc,
+        size_t count,
+        _COM_Outptr_ ID3D11InputLayout** pInputLayout) noexcept;
+
+    template<typename T>
+    HRESULT CreateInputLayoutFromEffect(_In_ ID3D11Device* device,
+        _In_ IEffect* effect,
+        _COM_Outptr_ ID3D11InputLayout** pInputLayout) noexcept
+    {
+        return CreateInputLayoutFromEffect(device, effect, T::InputElements, T::InputElementCount, pInputLayout);
+    }
+}

enginecustom/include/Inc/GamePad.h

@@ -0,0 +1,329 @@
+//--------------------------------------------------------------------------------------
+// File: GamePad.h
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248929
+// http://go.microsoft.com/fwlink/?LinkID=615561
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#if !defined(USING_XINPUT) && !defined(USING_GAMEINPUT) && !defined(USING_WINDOWS_GAMING_INPUT)
+
+#ifdef _GAMING_DESKTOP
+#include <grdk.h>
+#endif
+
+#if (defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_GAMES)) || (defined(_GAMING_DESKTOP) && (_GRDK_EDITION >= 220600))
+#define USING_GAMEINPUT
+#elif (_WIN32_WINNT >= 0x0A00 /*_WIN32_WINNT_WIN10*/) && !defined(_GAMING_DESKTOP) && !defined(__MINGW32__)
+#define USING_WINDOWS_GAMING_INPUT
+#elif !defined(_XBOX_ONE)
+#define USING_XINPUT
+#endif
+
+#endif // !USING_XINPUT && !USING_GAMEINPUT && !USING_WINDOWS_GAMING_INPUT
+
+#ifdef USING_GAMEINPUT
+#include <GameInput.h>
+#if !defined(_GAMING_XBOX) && defined(_MSC_VER)
+#pragma comment(lib,"gameinput.lib")
+#endif
+
+#elif defined(USING_WINDOWS_GAMING_INPUT)
+#ifdef _MSC_VER
+#pragma comment(lib,"runtimeobject.lib")
+#endif
+#include <string>
+
+#elif defined(_XBOX_ONE)
+// Legacy Xbox One XDK uses Windows::Xbox::Input
+
+#elif defined(USING_XINPUT)
+#ifdef _MSC_VER
+#if (_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/ )
+#pragma comment(lib,"xinput.lib")
+#else
+#pragma comment(lib,"xinput9_1_0.lib")
+#endif
+#endif
+#endif
+
+#include <cstdint>
+#include <memory>
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#endif
+
+
+namespace DirectX
+{
+    class GamePad
+    {
+    public:
+        GamePad() noexcept(false);
+
+        GamePad(GamePad&&) noexcept;
+        GamePad& operator= (GamePad&&) noexcept;
+
+        GamePad(GamePad const&) = delete;
+        GamePad& operator=(GamePad const&) = delete;
+
+        virtual ~GamePad();
+
+    #if defined(USING_GAMEINPUT) || defined(USING_WINDOWS_GAMING_INPUT) || defined(_XBOX_ONE)
+        static constexpr int MAX_PLAYER_COUNT = 8;
+    #else
+        static constexpr int MAX_PLAYER_COUNT = 4;
+    #endif
+
+        static constexpr int c_MostRecent = -1;
+
+    #ifdef USING_GAMEINPUT
+        static constexpr int c_MergedInput = -2;
+    #endif
+
+        enum DeadZone
+        {
+            DEAD_ZONE_INDEPENDENT_AXES = 0,
+            DEAD_ZONE_CIRCULAR,
+            DEAD_ZONE_NONE,
+        };
+
+        struct Buttons
+        {
+            bool a;
+            bool b;
+            bool x;
+            bool y;
+            bool leftStick;
+            bool rightStick;
+            bool leftShoulder;
+            bool rightShoulder;
+            union
+            {
+                bool back;
+                bool view;
+            };
+            union
+            {
+                bool start;
+                bool menu;
+            };
+        };
+
+        struct DPad
+        {
+            bool up;
+            bool down;
+            bool right;
+            bool left;
+        };
+
+        struct ThumbSticks
+        {
+            float leftX;
+            float leftY;
+            float rightX;
+            float rightY;
+        };
+
+        struct Triggers
+        {
+            float left;
+            float right;
+        };
+
+        struct State
+        {
+            bool        connected;
+            uint64_t    packet;
+            Buttons     buttons;
+            DPad        dpad;
+            ThumbSticks thumbSticks;
+            Triggers    triggers;
+
+            bool __cdecl IsConnected() const noexcept { return connected; }
+
+            // Is the button pressed currently?
+            bool __cdecl IsAPressed() const noexcept { return buttons.a; }
+            bool __cdecl IsBPressed() const noexcept { return buttons.b; }
+            bool __cdecl IsXPressed() const noexcept { return buttons.x; }
+            bool __cdecl IsYPressed() const noexcept { return buttons.y; }
+
+            bool __cdecl IsLeftStickPressed() const noexcept { return buttons.leftStick; }
+            bool __cdecl IsRightStickPressed() const noexcept { return buttons.rightStick; }
+
+            bool __cdecl IsLeftShoulderPressed() const noexcept { return buttons.leftShoulder; }
+            bool __cdecl IsRightShoulderPressed() const noexcept { return buttons.rightShoulder; }
+
+            bool __cdecl IsBackPressed() const noexcept { return buttons.back; }
+            bool __cdecl IsViewPressed() const noexcept { return buttons.view; }
+            bool __cdecl IsStartPressed() const noexcept { return buttons.start; }
+            bool __cdecl IsMenuPressed() const noexcept { return buttons.menu; }
+
+            bool __cdecl IsDPadDownPressed() const noexcept { return dpad.down; }
+            bool __cdecl IsDPadUpPressed() const noexcept { return dpad.up; }
+            bool __cdecl IsDPadLeftPressed() const noexcept { return dpad.left; }
+            bool __cdecl IsDPadRightPressed() const noexcept { return dpad.right; }
+
+            bool __cdecl IsLeftThumbStickUp() const noexcept { return (thumbSticks.leftY > 0.5f) != 0; }
+            bool __cdecl IsLeftThumbStickDown() const noexcept { return (thumbSticks.leftY < -0.5f) != 0; }
+            bool __cdecl IsLeftThumbStickLeft() const noexcept { return (thumbSticks.leftX < -0.5f) != 0; }
+            bool __cdecl IsLeftThumbStickRight() const noexcept { return (thumbSticks.leftX > 0.5f) != 0; }
+
+            bool __cdecl IsRightThumbStickUp() const noexcept { return (thumbSticks.rightY > 0.5f) != 0; }
+            bool __cdecl IsRightThumbStickDown() const noexcept { return (thumbSticks.rightY < -0.5f) != 0; }
+            bool __cdecl IsRightThumbStickLeft() const noexcept { return (thumbSticks.rightX < -0.5f) != 0; }
+            bool __cdecl IsRightThumbStickRight() const noexcept { return (thumbSticks.rightX > 0.5f) != 0; }
+
+            bool __cdecl IsLeftTriggerPressed() const noexcept { return (triggers.left > 0.5f) != 0; }
+            bool __cdecl IsRightTriggerPressed() const noexcept { return (triggers.right > 0.5f) != 0; }
+        };
+
+        struct Capabilities
+        {
+            enum Type
+            {
+                UNKNOWN = 0,
+                GAMEPAD,
+                WHEEL,
+                ARCADE_STICK,
+                FLIGHT_STICK,
+                DANCE_PAD,
+                GUITAR,
+                GUITAR_ALTERNATE,
+                DRUM_KIT,
+                GUITAR_BASS = 11,
+                ARCADE_PAD = 19,
+            };
+
+            bool                connected;
+            Type                gamepadType;
+        #ifdef USING_GAMEINPUT
+            APP_LOCAL_DEVICE_ID id;
+        #elif defined(USING_WINDOWS_GAMING_INPUT)
+            std::wstring        id;
+        #else
+            uint64_t            id;
+        #endif
+            uint16_t            vid;
+            uint16_t            pid;
+
+            Capabilities() noexcept : connected(false), gamepadType(UNKNOWN), id{}, vid(0), pid(0) {}
+
+            bool __cdecl IsConnected() const noexcept { return connected; }
+        };
+
+        class ButtonStateTracker
+        {
+        public:
+            enum ButtonState
+            {
+                UP = 0,         // Button is up
+                HELD = 1,       // Button is held down
+                RELEASED = 2,   // Button was just released
+                PRESSED = 3,    // Buton was just pressed
+            };
+
+            ButtonState a;
+            ButtonState b;
+            ButtonState x;
+            ButtonState y;
+
+            ButtonState leftStick;
+            ButtonState rightStick;
+
+            ButtonState leftShoulder;
+            ButtonState rightShoulder;
+
+            union
+            {
+                ButtonState back;
+                ButtonState view;
+            };
+
+            union
+            {
+                ButtonState start;
+                ButtonState menu;
+            };
+
+            ButtonState dpadUp;
+            ButtonState dpadDown;
+            ButtonState dpadLeft;
+            ButtonState dpadRight;
+
+            ButtonState leftStickUp;
+            ButtonState leftStickDown;
+            ButtonState leftStickLeft;
+            ButtonState leftStickRight;
+
+            ButtonState rightStickUp;
+            ButtonState rightStickDown;
+            ButtonState rightStickLeft;
+            ButtonState rightStickRight;
+
+            ButtonState leftTrigger;
+            ButtonState rightTrigger;
+
+        #ifdef _PREFAST_
+        #pragma prefast(push)
+        #pragma prefast(disable : 26495, "Reset() performs the initialization")
+        #endif
+            ButtonStateTracker() noexcept { Reset(); }
+        #ifdef _PREFAST_
+        #pragma prefast(pop)
+        #endif
+
+            void __cdecl Update(const State& state) noexcept;
+
+            void __cdecl Reset() noexcept;
+
+            State __cdecl GetLastState() const noexcept { return lastState; }
+
+        private:
+            State lastState;
+        };
+
+        // Retrieve the current state of the gamepad of the associated player index
+        State __cdecl GetState(int player, DeadZone deadZoneMode = DEAD_ZONE_INDEPENDENT_AXES);
+
+        // Retrieve the current capabilities of the gamepad of the associated player index
+        Capabilities __cdecl GetCapabilities(int player);
+
+        // Set the vibration motor speeds of the gamepad
+        bool __cdecl SetVibration(int player, float leftMotor, float rightMotor, float leftTrigger = 0.f, float rightTrigger = 0.f) noexcept;
+
+        // Handle suspending/resuming
+        void __cdecl Suspend() noexcept;
+        void __cdecl Resume() noexcept;
+
+    #ifdef USING_GAMEINPUT
+        void __cdecl RegisterEvents(void* ctrlChanged) noexcept;
+
+        // Underlying device access
+        _Success_(return)
+            bool __cdecl GetDevice(int player, _Outptr_ IGameInputDevice * *device) noexcept;
+    #elif defined(USING_WINDOWS_GAMING_INPUT) || defined(_XBOX_ONE)
+        void __cdecl RegisterEvents(void* ctrlChanged, void* userChanged) noexcept;
+    #endif
+
+        // Singleton
+        static GamePad& __cdecl Get();
+
+    private:
+        // Private implementation.
+        class Impl;
+
+        std::unique_ptr<Impl> pImpl;
+    };
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif

enginecustom/include/Inc/GeometricPrimitive.h

@@ -0,0 +1,111 @@
+//--------------------------------------------------------------------------------------
+// File: GeometricPrimitive.h
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#include "VertexTypes.h"
+
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <vector>
+
+#include <DirectXColors.h>
+
+
+namespace DirectX
+{
+    inline namespace DX11
+    {
+        class IEffect;
+
+        class GeometricPrimitive
+        {
+        public:
+            GeometricPrimitive(GeometricPrimitive&&) = default;
+            GeometricPrimitive& operator= (GeometricPrimitive&&) = default;
+
+            GeometricPrimitive(GeometricPrimitive const&) = delete;
+            GeometricPrimitive& operator= (GeometricPrimitive const&) = delete;
+
+            using VertexType = VertexPositionNormalTexture;
+            using VertexCollection = std::vector<VertexType>;
+            using IndexCollection = std::vector<uint16_t>;
+
+            virtual ~GeometricPrimitive();
+
+            // Factory methods.
+            static std::unique_ptr<GeometricPrimitive> __cdecl CreateCube(_In_ ID3D11DeviceContext* deviceContext, float size = 1, bool rhcoords = true);
+            static std::unique_ptr<GeometricPrimitive> __cdecl CreateBox(_In_ ID3D11DeviceContext* deviceContext, const XMFLOAT3& size, bool rhcoords = true, bool invertn = false);
+            static std::unique_ptr<GeometricPrimitive> __cdecl CreateSphere(_In_ ID3D11DeviceContext* deviceContext, float diameter = 1, size_t tessellation = 16, bool rhcoords = true, bool invertn = false);
+            static std::unique_ptr<GeometricPrimitive> __cdecl CreateGeoSphere(_In_ ID3D11DeviceContext* deviceContext, float diameter = 1, size_t tessellation = 3, bool rhcoords = true);
+            static std::unique_ptr<GeometricPrimitive> __cdecl CreateCylinder(_In_ ID3D11DeviceContext* deviceContext, float height = 1, float diameter = 1, size_t tessellation = 32, bool rhcoords = true);
+            static std::unique_ptr<GeometricPrimitive> __cdecl CreateCone(_In_ ID3D11DeviceContext* deviceContext, float diameter = 1, float height = 1, size_t tessellation = 32, bool rhcoords = true);
+            static std::unique_ptr<GeometricPrimitive> __cdecl CreateTorus(_In_ ID3D11DeviceContext* deviceContext, float diameter = 1, float thickness = 0.333f, size_t tessellation = 32, bool rhcoords = true);
+            static std::unique_ptr<GeometricPrimitive> __cdecl CreateTetrahedron(_In_ ID3D11DeviceContext* deviceContext, float size = 1, bool rhcoords = true);
+            static std::unique_ptr<GeometricPrimitive> __cdecl CreateOctahedron(_In_ ID3D11DeviceContext* deviceContext, float size = 1, bool rhcoords = true);
+            static std::unique_ptr<GeometricPrimitive> __cdecl CreateDodecahedron(_In_ ID3D11DeviceContext* deviceContext, float size = 1, bool rhcoords = true);
+            static std::unique_ptr<GeometricPrimitive> __cdecl CreateIcosahedron(_In_ ID3D11DeviceContext* deviceContext, float size = 1, bool rhcoords = true);
+            static std::unique_ptr<GeometricPrimitive> __cdecl CreateTeapot(_In_ ID3D11DeviceContext* deviceContext, float size = 1, size_t tessellation = 8, bool rhcoords = true);
+            static std::unique_ptr<GeometricPrimitive> __cdecl CreateCustom(_In_ ID3D11DeviceContext* deviceContext, const VertexCollection& vertices, const IndexCollection& indices);
+
+            static void __cdecl CreateCube(VertexCollection& vertices, IndexCollection& indices, float size = 1, bool rhcoords = true);
+            static void __cdecl CreateBox(VertexCollection& vertices, IndexCollection& indices, const XMFLOAT3& size, bool rhcoords = true, bool invertn = false);
+            static void __cdecl CreateSphere(VertexCollection& vertices, IndexCollection& indices, float diameter = 1, size_t tessellation = 16, bool rhcoords = true, bool invertn = false);
+            static void __cdecl CreateGeoSphere(VertexCollection& vertices, IndexCollection& indices, float diameter = 1, size_t tessellation = 3, bool rhcoords = true);
+            static void __cdecl CreateCylinder(VertexCollection& vertices, IndexCollection& indices, float height = 1, float diameter = 1, size_t tessellation = 32, bool rhcoords = true);
+            static void __cdecl CreateCone(VertexCollection& vertices, IndexCollection& indices, float diameter = 1, float height = 1, size_t tessellation = 32, bool rhcoords = true);
+            static void __cdecl CreateTorus(VertexCollection& vertices, IndexCollection& indices, float diameter = 1, float thickness = 0.333f, size_t tessellation = 32, bool rhcoords = true);
+            static void __cdecl CreateTetrahedron(VertexCollection& vertices, IndexCollection& indices, float size = 1, bool rhcoords = true);
+            static void __cdecl CreateOctahedron(VertexCollection& vertices, IndexCollection& indices, float size = 1, bool rhcoords = true);
+            static void __cdecl CreateDodecahedron(VertexCollection& vertices, IndexCollection& indices, float size = 1, bool rhcoords = true);
+            static void __cdecl CreateIcosahedron(VertexCollection& vertices, IndexCollection& indices, float size = 1, bool rhcoords = true);
+            static void __cdecl CreateTeapot(VertexCollection& vertices, IndexCollection& indices, float size = 1, size_t tessellation = 8, bool rhcoords = true);
+
+            // Draw the primitive.
+            void XM_CALLCONV Draw(FXMMATRIX world, CXMMATRIX view, CXMMATRIX projection,
+                FXMVECTOR color = Colors::White,
+                _In_opt_ ID3D11ShaderResourceView* texture = nullptr,
+                bool wireframe = false,
+                _In_ std::function<void __cdecl()> setCustomState = nullptr) const;
+
+            // Draw the primitive using a custom effect.
+            void __cdecl Draw(_In_ IEffect* effect,
+                _In_ ID3D11InputLayout* inputLayout,
+                bool alpha = false, bool wireframe = false,
+                _In_ std::function<void __cdecl()> setCustomState = nullptr) const;
+
+            void __cdecl DrawInstanced(_In_ IEffect* effect,
+                _In_ ID3D11InputLayout* inputLayout,
+                uint32_t instanceCount,
+                bool alpha = false, bool wireframe = false,
+                uint32_t startInstanceLocation = 0,
+                _In_ std::function<void __cdecl()> setCustomState = nullptr) const;
+
+           // Create input layout for drawing with a custom effect.
+            void __cdecl CreateInputLayout(_In_ IEffect* effect, _Outptr_ ID3D11InputLayout** inputLayout) const;
+
+            static void SetDepthBufferMode(bool reverseZ)
+            {
+                s_reversez = reverseZ;
+            }
+
+        private:
+            static bool s_reversez;
+
+            GeometricPrimitive() noexcept(false);
+
+            // Private implementation.
+            class Impl;
+
+            std::unique_ptr<Impl> pImpl;
+        };
+    }
+}

enginecustom/include/Inc/GraphicsMemory.h

@@ -0,0 +1,57 @@
+//--------------------------------------------------------------------------------------
+// File: GraphicsMemory.h
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#if defined(_XBOX_ONE) && defined(_TITLE)
+#include <d3d11_x.h>
+#else
+#include <d3d11_1.h>
+#endif
+
+#include <cstddef>
+#include <memory>
+
+
+namespace DirectX
+{
+    inline namespace DX11
+    {
+        class GraphicsMemory
+        {
+        public:
+        #if defined(_XBOX_ONE) && defined(_TITLE)
+            GraphicsMemory(_In_ ID3D11DeviceX* device, unsigned int backBufferCount = 2);
+        #else
+            GraphicsMemory(_In_ ID3D11Device* device, unsigned int backBufferCount = 2);
+        #endif
+
+            GraphicsMemory(GraphicsMemory&&) noexcept;
+            GraphicsMemory& operator= (GraphicsMemory&&) noexcept;
+
+            GraphicsMemory(GraphicsMemory const&) = delete;
+            GraphicsMemory& operator=(GraphicsMemory const&) = delete;
+
+            virtual ~GraphicsMemory();
+
+            void* __cdecl Allocate(_In_opt_ ID3D11DeviceContext* context, size_t size, int alignment);
+
+            void __cdecl Commit();
+
+            // Singleton
+            static GraphicsMemory& __cdecl Get();
+
+        private:
+            // Private implementation.
+            class Impl;
+
+            std::unique_ptr<Impl> pImpl;
+        };
+    }
+}

enginecustom/include/Inc/Keyboard.h

@@ -0,0 +1,532 @@
+//--------------------------------------------------------------------------------------
+// File: Keyboard.h
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248929
+// http://go.microsoft.com/fwlink/?LinkID=615561
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#if !defined(USING_XINPUT) && !defined(USING_GAMEINPUT) && !defined(USING_COREWINDOW)
+
+#ifdef _GAMING_DESKTOP
+#include <grdk.h>
+#endif
+
+#if (defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_GAMES)) || (defined(_GAMING_DESKTOP) && (_GRDK_EDITION >= 220600))
+#define USING_GAMEINPUT
+#elif (defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)) || (defined(_XBOX_ONE) && defined(_TITLE))
+#define USING_COREWINDOW
+#endif
+
+#endif // !USING_XINPUT && !USING_GAMEINPUT && !USING_WINDOWS_GAMING_INPUT
+
+#if defined(USING_GAMEINPUT) && !defined(_GAMING_XBOX) && defined(_MSC_VER)
+#pragma comment(lib,"gameinput.lib")
+#endif
+
+#include <cstdint>
+#include <memory>
+
+#ifdef USING_COREWINDOW
+namespace ABI { namespace Windows { namespace UI { namespace Core { struct ICoreWindow; } } } }
+#endif
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#endif
+
+
+namespace DirectX
+{
+    class Keyboard
+    {
+    public:
+        Keyboard() noexcept(false);
+
+        Keyboard(Keyboard&&) noexcept;
+        Keyboard& operator= (Keyboard&&) noexcept;
+
+        Keyboard(Keyboard const&) = delete;
+        Keyboard& operator=(Keyboard const&) = delete;
+
+        virtual ~Keyboard();
+
+        enum Keys : unsigned char
+        {
+            None = 0,
+
+            Back = 0x8,
+            Tab = 0x9,
+
+            Enter = 0xd,
+
+            Pause = 0x13,
+            CapsLock = 0x14,
+            Kana = 0x15,
+            ImeOn = 0x16,
+
+            Kanji = 0x19,
+
+            ImeOff = 0x1a,
+            Escape = 0x1b,
+            ImeConvert = 0x1c,
+            ImeNoConvert = 0x1d,
+
+            Space = 0x20,
+            PageUp = 0x21,
+            PageDown = 0x22,
+            End = 0x23,
+            Home = 0x24,
+            Left = 0x25,
+            Up = 0x26,
+            Right = 0x27,
+            Down = 0x28,
+            Select = 0x29,
+            Print = 0x2a,
+            Execute = 0x2b,
+            PrintScreen = 0x2c,
+            Insert = 0x2d,
+            Delete = 0x2e,
+            Help = 0x2f,
+            D0 = 0x30,
+            D1 = 0x31,
+            D2 = 0x32,
+            D3 = 0x33,
+            D4 = 0x34,
+            D5 = 0x35,
+            D6 = 0x36,
+            D7 = 0x37,
+            D8 = 0x38,
+            D9 = 0x39,
+
+            A = 0x41,
+            B = 0x42,
+            C = 0x43,
+            D = 0x44,
+            E = 0x45,
+            F = 0x46,
+            G = 0x47,
+            H = 0x48,
+            I = 0x49,
+            J = 0x4a,
+            K = 0x4b,
+            L = 0x4c,
+            M = 0x4d,
+            N = 0x4e,
+            O = 0x4f,
+            P = 0x50,
+            Q = 0x51,
+            R = 0x52,
+            S = 0x53,
+            T = 0x54,
+            U = 0x55,
+            V = 0x56,
+            W = 0x57,
+            X = 0x58,
+            Y = 0x59,
+            Z = 0x5a,
+            LeftWindows = 0x5b,
+            RightWindows = 0x5c,
+            Apps = 0x5d,
+
+            Sleep = 0x5f,
+            NumPad0 = 0x60,
+            NumPad1 = 0x61,
+            NumPad2 = 0x62,
+            NumPad3 = 0x63,
+            NumPad4 = 0x64,
+            NumPad5 = 0x65,
+            NumPad6 = 0x66,
+            NumPad7 = 0x67,
+            NumPad8 = 0x68,
+            NumPad9 = 0x69,
+            Multiply = 0x6a,
+            Add = 0x6b,
+            Separator = 0x6c,
+            Subtract = 0x6d,
+
+            Decimal = 0x6e,
+            Divide = 0x6f,
+            F1 = 0x70,
+            F2 = 0x71,
+            F3 = 0x72,
+            F4 = 0x73,
+            F5 = 0x74,
+            F6 = 0x75,
+            F7 = 0x76,
+            F8 = 0x77,
+            F9 = 0x78,
+            F10 = 0x79,
+            F11 = 0x7a,
+            F12 = 0x7b,
+            F13 = 0x7c,
+            F14 = 0x7d,
+            F15 = 0x7e,
+            F16 = 0x7f,
+            F17 = 0x80,
+            F18 = 0x81,
+            F19 = 0x82,
+            F20 = 0x83,
+            F21 = 0x84,
+            F22 = 0x85,
+            F23 = 0x86,
+            F24 = 0x87,
+
+            NumLock = 0x90,
+            Scroll = 0x91,
+
+            LeftShift = 0xa0,
+            RightShift = 0xa1,
+            LeftControl = 0xa2,
+            RightControl = 0xa3,
+            LeftAlt = 0xa4,
+            RightAlt = 0xa5,
+            BrowserBack = 0xa6,
+            BrowserForward = 0xa7,
+            BrowserRefresh = 0xa8,
+            BrowserStop = 0xa9,
+            BrowserSearch = 0xaa,
+            BrowserFavorites = 0xab,
+            BrowserHome = 0xac,
+            VolumeMute = 0xad,
+            VolumeDown = 0xae,
+            VolumeUp = 0xaf,
+            MediaNextTrack = 0xb0,
+            MediaPreviousTrack = 0xb1,
+            MediaStop = 0xb2,
+            MediaPlayPause = 0xb3,
+            LaunchMail = 0xb4,
+            SelectMedia = 0xb5,
+            LaunchApplication1 = 0xb6,
+            LaunchApplication2 = 0xb7,
+
+            OemSemicolon = 0xba,
+            OemPlus = 0xbb,
+            OemComma = 0xbc,
+            OemMinus = 0xbd,
+            OemPeriod = 0xbe,
+            OemQuestion = 0xbf,
+            OemTilde = 0xc0,
+
+            OemOpenBrackets = 0xdb,
+            OemPipe = 0xdc,
+            OemCloseBrackets = 0xdd,
+            OemQuotes = 0xde,
+            Oem8 = 0xdf,
+
+            OemBackslash = 0xe2,
+
+            ProcessKey = 0xe5,
+
+            OemCopy = 0xf2,
+            OemAuto = 0xf3,
+            OemEnlW = 0xf4,
+
+            Attn = 0xf6,
+            Crsel = 0xf7,
+            Exsel = 0xf8,
+            EraseEof = 0xf9,
+            Play = 0xfa,
+            Zoom = 0xfb,
+
+            Pa1 = 0xfd,
+            OemClear = 0xfe,
+        };
+
+        struct State
+        {
+            bool Reserved0 : 8;
+            bool Back : 1;              // VK_BACK, 0x8
+            bool Tab : 1;               // VK_TAB, 0x9
+            bool Reserved1 : 3;
+            bool Enter : 1;             // VK_RETURN, 0xD
+            bool Reserved2 : 2;
+            bool Reserved3 : 3;
+            bool Pause : 1;             // VK_PAUSE, 0x13
+            bool CapsLock : 1;          // VK_CAPITAL, 0x14
+            bool Kana : 1;              // VK_KANA, 0x15
+            bool ImeOn : 1;             // VK_IME_ON, 0x16
+            bool Reserved4 : 1;
+            bool Reserved5 : 1;
+            bool Kanji : 1;             // VK_KANJI, 0x19
+            bool ImeOff : 1;            // VK_IME_OFF, 0X1A
+            bool Escape : 1;            // VK_ESCAPE, 0x1B
+            bool ImeConvert : 1;        // VK_CONVERT, 0x1C
+            bool ImeNoConvert : 1;      // VK_NONCONVERT, 0x1D
+            bool Reserved7 : 2;
+            bool Space : 1;             // VK_SPACE, 0x20
+            bool PageUp : 1;            // VK_PRIOR, 0x21
+            bool PageDown : 1;          // VK_NEXT, 0x22
+            bool End : 1;               // VK_END, 0x23
+            bool Home : 1;              // VK_HOME, 0x24
+            bool Left : 1;              // VK_LEFT, 0x25
+            bool Up : 1;                // VK_UP, 0x26
+            bool Right : 1;             // VK_RIGHT, 0x27
+            bool Down : 1;              // VK_DOWN, 0x28
+            bool Select : 1;            // VK_SELECT, 0x29
+            bool Print : 1;             // VK_PRINT, 0x2A
+            bool Execute : 1;           // VK_EXECUTE, 0x2B
+            bool PrintScreen : 1;       // VK_SNAPSHOT, 0x2C
+            bool Insert : 1;            // VK_INSERT, 0x2D
+            bool Delete : 1;            // VK_DELETE, 0x2E
+            bool Help : 1;              // VK_HELP, 0x2F
+            bool D0 : 1;                // 0x30
+            bool D1 : 1;                // 0x31
+            bool D2 : 1;                // 0x32
+            bool D3 : 1;                // 0x33
+            bool D4 : 1;                // 0x34
+            bool D5 : 1;                // 0x35
+            bool D6 : 1;                // 0x36
+            bool D7 : 1;                // 0x37
+            bool D8 : 1;                // 0x38
+            bool D9 : 1;                // 0x39
+            bool Reserved8 : 6;
+            bool Reserved9 : 1;
+            bool A : 1;                 // 0x41
+            bool B : 1;                 // 0x42
+            bool C : 1;                 // 0x43
+            bool D : 1;                 // 0x44
+            bool E : 1;                 // 0x45
+            bool F : 1;                 // 0x46
+            bool G : 1;                 // 0x47
+            bool H : 1;                 // 0x48
+            bool I : 1;                 // 0x49
+            bool J : 1;                 // 0x4A
+            bool K : 1;                 // 0x4B
+            bool L : 1;                 // 0x4C
+            bool M : 1;                 // 0x4D
+            bool N : 1;                 // 0x4E
+            bool O : 1;                 // 0x4F
+            bool P : 1;                 // 0x50
+            bool Q : 1;                 // 0x51
+            bool R : 1;                 // 0x52
+            bool S : 1;                 // 0x53
+            bool T : 1;                 // 0x54
+            bool U : 1;                 // 0x55
+            bool V : 1;                 // 0x56
+            bool W : 1;                 // 0x57
+            bool X : 1;                 // 0x58
+            bool Y : 1;                 // 0x59
+            bool Z : 1;                 // 0x5A
+            bool LeftWindows : 1;       // VK_LWIN, 0x5B
+            bool RightWindows : 1;      // VK_RWIN, 0x5C
+            bool Apps : 1;              // VK_APPS, 0x5D
+            bool Reserved10 : 1;
+            bool Sleep : 1;             // VK_SLEEP, 0x5F
+            bool NumPad0 : 1;           // VK_NUMPAD0, 0x60
+            bool NumPad1 : 1;           // VK_NUMPAD1, 0x61
+            bool NumPad2 : 1;           // VK_NUMPAD2, 0x62
+            bool NumPad3 : 1;           // VK_NUMPAD3, 0x63
+            bool NumPad4 : 1;           // VK_NUMPAD4, 0x64
+            bool NumPad5 : 1;           // VK_NUMPAD5, 0x65
+            bool NumPad6 : 1;           // VK_NUMPAD6, 0x66
+            bool NumPad7 : 1;           // VK_NUMPAD7, 0x67
+            bool NumPad8 : 1;           // VK_NUMPAD8, 0x68
+            bool NumPad9 : 1;           // VK_NUMPAD9, 0x69
+            bool Multiply : 1;          // VK_MULTIPLY, 0x6A
+            bool Add : 1;               // VK_ADD, 0x6B
+            bool Separator : 1;         // VK_SEPARATOR, 0x6C
+            bool Subtract : 1;          // VK_SUBTRACT, 0x6D
+            bool Decimal : 1;           // VK_DECIMANL, 0x6E
+            bool Divide : 1;            // VK_DIVIDE, 0x6F
+            bool F1 : 1;                // VK_F1, 0x70
+            bool F2 : 1;                // VK_F2, 0x71
+            bool F3 : 1;                // VK_F3, 0x72
+            bool F4 : 1;                // VK_F4, 0x73
+            bool F5 : 1;                // VK_F5, 0x74
+            bool F6 : 1;                // VK_F6, 0x75
+            bool F7 : 1;                // VK_F7, 0x76
+            bool F8 : 1;                // VK_F8, 0x77
+            bool F9 : 1;                // VK_F9, 0x78
+            bool F10 : 1;               // VK_F10, 0x79
+            bool F11 : 1;               // VK_F11, 0x7A
+            bool F12 : 1;               // VK_F12, 0x7B
+            bool F13 : 1;               // VK_F13, 0x7C
+            bool F14 : 1;               // VK_F14, 0x7D
+            bool F15 : 1;               // VK_F15, 0x7E
+            bool F16 : 1;               // VK_F16, 0x7F
+            bool F17 : 1;               // VK_F17, 0x80
+            bool F18 : 1;               // VK_F18, 0x81
+            bool F19 : 1;               // VK_F19, 0x82
+            bool F20 : 1;               // VK_F20, 0x83
+            bool F21 : 1;               // VK_F21, 0x84
+            bool F22 : 1;               // VK_F22, 0x85
+            bool F23 : 1;               // VK_F23, 0x86
+            bool F24 : 1;               // VK_F24, 0x87
+            bool Reserved11 : 8;
+            bool NumLock : 1;           // VK_NUMLOCK, 0x90
+            bool Scroll : 1;            // VK_SCROLL, 0x91
+            bool Reserved12 : 6;
+            bool Reserved13 : 8;
+            bool LeftShift : 1;         // VK_LSHIFT, 0xA0
+            bool RightShift : 1;        // VK_RSHIFT, 0xA1
+            bool LeftControl : 1;       // VK_LCONTROL, 0xA2
+            bool RightControl : 1;      // VK_RCONTROL, 0xA3
+            bool LeftAlt : 1;           // VK_LMENU, 0xA4
+            bool RightAlt : 1;          // VK_RMENU, 0xA5
+            bool BrowserBack : 1;       // VK_BROWSER_BACK, 0xA6
+            bool BrowserForward : 1;    // VK_BROWSER_FORWARD, 0xA7
+            bool BrowserRefresh : 1;    // VK_BROWSER_REFRESH, 0xA8
+            bool BrowserStop : 1;       // VK_BROWSER_STOP, 0xA9
+            bool BrowserSearch : 1;     // VK_BROWSER_SEARCH, 0xAA
+            bool BrowserFavorites : 1;  // VK_BROWSER_FAVORITES, 0xAB
+            bool BrowserHome : 1;       // VK_BROWSER_HOME, 0xAC
+            bool VolumeMute : 1;        // VK_VOLUME_MUTE, 0xAD
+            bool VolumeDown : 1;        // VK_VOLUME_DOWN, 0xAE
+            bool VolumeUp : 1;          // VK_VOLUME_UP, 0xAF
+            bool MediaNextTrack : 1;    // VK_MEDIA_NEXT_TRACK, 0xB0
+            bool MediaPreviousTrack : 1;// VK_MEDIA_PREV_TRACK, 0xB1
+            bool MediaStop : 1;         // VK_MEDIA_STOP, 0xB2
+            bool MediaPlayPause : 1;    // VK_MEDIA_PLAY_PAUSE, 0xB3
+            bool LaunchMail : 1;        // VK_LAUNCH_MAIL, 0xB4
+            bool SelectMedia : 1;       // VK_LAUNCH_MEDIA_SELECT, 0xB5
+            bool LaunchApplication1 : 1;// VK_LAUNCH_APP1, 0xB6
+            bool LaunchApplication2 : 1;// VK_LAUNCH_APP2, 0xB7
+            bool Reserved14 : 2;
+            bool OemSemicolon : 1;      // VK_OEM_1, 0xBA
+            bool OemPlus : 1;           // VK_OEM_PLUS, 0xBB
+            bool OemComma : 1;          // VK_OEM_COMMA, 0xBC
+            bool OemMinus : 1;          // VK_OEM_MINUS, 0xBD
+            bool OemPeriod : 1;         // VK_OEM_PERIOD, 0xBE
+            bool OemQuestion : 1;       // VK_OEM_2, 0xBF
+            bool OemTilde : 1;          // VK_OEM_3, 0xC0
+            bool Reserved15 : 7;
+            bool Reserved16 : 8;
+            bool Reserved17 : 8;
+            bool Reserved18 : 3;
+            bool OemOpenBrackets : 1;   // VK_OEM_4, 0xDB
+            bool OemPipe : 1;           // VK_OEM_5, 0xDC
+            bool OemCloseBrackets : 1;  // VK_OEM_6, 0xDD
+            bool OemQuotes : 1;         // VK_OEM_7, 0xDE
+            bool Oem8 : 1;              // VK_OEM_8, 0xDF
+            bool Reserved19 : 2;
+            bool OemBackslash : 1;      // VK_OEM_102, 0xE2
+            bool Reserved20 : 2;
+            bool ProcessKey : 1;        // VK_PROCESSKEY, 0xE5
+            bool Reserved21 : 2;
+            bool Reserved22 : 8;
+            bool Reserved23 : 2;
+            bool OemCopy : 1;           // 0XF2
+            bool OemAuto : 1;           // 0xF3
+            bool OemEnlW : 1;           // 0xF4
+            bool Reserved24 : 1;
+            bool Attn : 1;              // VK_ATTN, 0xF6
+            bool Crsel : 1;             // VK_CRSEL, 0xF7
+            bool Exsel : 1;             // VK_EXSEL, 0xF8
+            bool EraseEof : 1;          // VK_EREOF, 0xF9
+            bool Play : 1;              // VK_PLAY, 0xFA
+            bool Zoom : 1;              // VK_ZOOM, 0xFB
+            bool Reserved25 : 1;
+            bool Pa1 : 1;               // VK_PA1, 0xFD
+            bool OemClear : 1;          // VK_OEM_CLEAR, 0xFE
+            bool Reserved26 : 1;
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-warning-option"
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
+#endif
+
+            bool __cdecl IsKeyDown(Keys key) const noexcept
+            {
+                if (key <= 0xfe)
+                {
+                    auto ptr = reinterpret_cast<const uint32_t*>(this);
+                    const unsigned int bf = 1u << (key & 0x1f);
+                    return (ptr[(key >> 5)] & bf) != 0;
+                }
+                return false;
+            }
+
+            bool __cdecl IsKeyUp(Keys key) const noexcept
+            {
+                if (key <= 0xfe)
+                {
+                    auto ptr = reinterpret_cast<const uint32_t*>(this);
+                    const unsigned int bf = 1u << (key & 0x1f);
+                    return (ptr[(key >> 5)] & bf) == 0;
+                }
+                return false;
+            }
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+        };
+
+        class KeyboardStateTracker
+        {
+        public:
+            State released;
+            State pressed;
+
+        #ifdef _PREFAST_
+        #pragma prefast(push)
+        #pragma prefast(disable : 26495, "Reset() performs the initialization")
+        #endif
+            KeyboardStateTracker() noexcept { Reset(); }
+        #ifdef _PREFAST_
+        #pragma prefast(pop)
+        #endif
+
+            void __cdecl Update(const State& state) noexcept;
+
+            void __cdecl Reset() noexcept;
+
+            bool __cdecl IsKeyPressed(Keys key) const noexcept { return pressed.IsKeyDown(key); }
+            bool __cdecl IsKeyReleased(Keys key) const noexcept { return released.IsKeyDown(key); }
+
+            State __cdecl GetLastState() const noexcept { return lastState; }
+
+        public:
+            State lastState;
+        };
+
+        // Retrieve the current state of the keyboard
+        State __cdecl GetState() const;
+
+        // Reset the keyboard state
+        void __cdecl Reset() noexcept;
+
+        // Feature detection
+        bool __cdecl IsConnected() const;
+
+    #ifdef USING_COREWINDOW
+        void __cdecl SetWindow(ABI::Windows::UI::Core::ICoreWindow* window);
+    #ifdef __cplusplus_winrt
+        void __cdecl SetWindow(Windows::UI::Core::CoreWindow^ window)
+        {
+            // See https://msdn.microsoft.com/en-us/library/hh755802.aspx
+            SetWindow(reinterpret_cast<ABI::Windows::UI::Core::ICoreWindow*>(window));
+        }
+    #endif
+    #ifdef CPPWINRT_VERSION
+        void __cdecl SetWindow(winrt::Windows::UI::Core::CoreWindow window)
+        {
+            // See https://docs.microsoft.com/en-us/windows/uwp/cpp-and-winrt-apis/interop-winrt-abi
+            SetWindow(reinterpret_cast<ABI::Windows::UI::Core::ICoreWindow*>(winrt::get_abi(window)));
+        }
+    #endif
+    #elif defined(WM_USER)
+        static void __cdecl ProcessMessage(UINT message, WPARAM wParam, LPARAM lParam);
+    #endif
+
+        // Singleton
+        static Keyboard& __cdecl Get();
+
+    private:
+        // Private implementation.
+        class Impl;
+
+        std::unique_ptr<Impl> pImpl;
+    };
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif

enginecustom/include/Inc/Model.h

@@ -0,0 +1,372 @@
+//--------------------------------------------------------------------------------------
+// File: Model.h
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#if defined(_XBOX_ONE) && defined(_TITLE)
+#include <d3d11_x.h>
+#else
+#include <d3d11_1.h>
+#include <dxgiformat.h>
+#endif
+
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <new>
+#include <set>
+#include <string>
+#include <vector>
+
+#include <malloc.h>
+
+#include <wrl\client.h>
+
+#include <DirectXMath.h>
+#include <DirectXCollision.h>
+
+
+namespace DirectX
+{
+    inline namespace DX11
+    {
+        class IEffect;
+        class IEffectFactory;
+        class CommonStates;
+        class ModelMesh;
+
+        //------------------------------------------------------------------------------
+        // Model loading options
+        enum ModelLoaderFlags : uint32_t
+        {
+            ModelLoader_Clockwise = 0x0,
+            ModelLoader_CounterClockwise = 0x1,
+            ModelLoader_PremultipledAlpha = 0x2,
+            ModelLoader_MaterialColorsSRGB = 0x4,
+            ModelLoader_AllowLargeModels = 0x8,
+            ModelLoader_IncludeBones = 0x10,
+            ModelLoader_DisableSkinning = 0x20,
+        };
+
+        //------------------------------------------------------------------------------
+        // Frame hierarchy for rigid body and skeletal animation
+        struct ModelBone
+        {
+            ModelBone() noexcept :
+                parentIndex(c_Invalid),
+                childIndex(c_Invalid),
+                siblingIndex(c_Invalid)
+            {
+            }
+
+            ModelBone(uint32_t parent, uint32_t child, uint32_t sibling) noexcept :
+                parentIndex(parent),
+                childIndex(child),
+                siblingIndex(sibling)
+            {
+            }
+
+            uint32_t            parentIndex;
+            uint32_t            childIndex;
+            uint32_t            siblingIndex;
+            std::wstring        name;
+
+            using Collection = std::vector<ModelBone>;
+
+            static constexpr uint32_t c_Invalid = uint32_t(-1);
+
+            struct aligned_deleter { void operator()(void* p) noexcept { _aligned_free(p); } };
+
+            using TransformArray = std::unique_ptr<XMMATRIX[], aligned_deleter>;
+
+            static TransformArray MakeArray(size_t count)
+            {
+                void* temp = _aligned_malloc(sizeof(XMMATRIX) * count, 16);
+                if (!temp)
+                    throw std::bad_alloc();
+                return TransformArray(static_cast<XMMATRIX*>(temp));
+            }
+        };
+
+
+        //------------------------------------------------------------------------------
+        // Each mesh part is a submesh with a single effect
+        class ModelMeshPart
+        {
+        public:
+            ModelMeshPart() noexcept;
+
+            ModelMeshPart(ModelMeshPart&&) = default;
+            ModelMeshPart& operator= (ModelMeshPart&&) = default;
+
+            ModelMeshPart(ModelMeshPart const&) = default;
+            ModelMeshPart& operator= (ModelMeshPart const&) = default;
+
+            virtual ~ModelMeshPart();
+
+            using Collection = std::vector<std::unique_ptr<ModelMeshPart>>;
+            using InputLayoutCollection = std::vector<D3D11_INPUT_ELEMENT_DESC>;
+
+            uint32_t                                                indexCount;
+            uint32_t                                                startIndex;
+            int32_t                                                 vertexOffset;
+            uint32_t                                                vertexStride;
+            D3D_PRIMITIVE_TOPOLOGY                                  primitiveType;
+            DXGI_FORMAT                                             indexFormat;
+            Microsoft::WRL::ComPtr<ID3D11InputLayout>               inputLayout;
+            Microsoft::WRL::ComPtr<ID3D11Buffer>                    indexBuffer;
+            Microsoft::WRL::ComPtr<ID3D11Buffer>                    vertexBuffer;
+            std::shared_ptr<IEffect>                                effect;
+            std::shared_ptr<InputLayoutCollection>                  vbDecl;
+            bool                                                    isAlpha;
+
+            // Draw mesh part with custom effect
+            void __cdecl Draw(
+                _In_ ID3D11DeviceContext* deviceContext,
+                _In_ IEffect* ieffect,
+                _In_ ID3D11InputLayout* iinputLayout,
+                _In_ std::function<void __cdecl()> setCustomState = nullptr) const;
+
+            void __cdecl DrawInstanced(
+                _In_ ID3D11DeviceContext* deviceContext,
+                _In_ IEffect* ieffect,
+                _In_ ID3D11InputLayout* iinputLayout,
+                uint32_t instanceCount,
+                uint32_t startInstanceLocation = 0,
+                _In_ std::function<void __cdecl()> setCustomState = nullptr) const;
+
+           // Create input layout for drawing with a custom effect.
+            void __cdecl CreateInputLayout(_In_ ID3D11Device* device, _In_ IEffect* ieffect, _Outptr_ ID3D11InputLayout** iinputLayout) const;
+
+            // Change effect used by part and regenerate input layout (be sure to call Model::Modified as well)
+            void __cdecl ModifyEffect(_In_ ID3D11Device* device, _In_ const std::shared_ptr<IEffect>& ieffect, bool isalpha = false);
+        };
+
+
+        //------------------------------------------------------------------------------
+        // A mesh consists of one or more model mesh parts
+        class ModelMesh
+        {
+        public:
+            ModelMesh() noexcept;
+
+            ModelMesh(ModelMesh&&) = default;
+            ModelMesh& operator= (ModelMesh&&) = default;
+
+            ModelMesh(ModelMesh const&) = default;
+            ModelMesh& operator= (ModelMesh const&) = default;
+
+            virtual ~ModelMesh();
+
+            BoundingSphere              boundingSphere;
+            BoundingBox                 boundingBox;
+            ModelMeshPart::Collection   meshParts;
+            uint32_t                    boneIndex;
+            std::vector<uint32_t>       boneInfluences;
+            std::wstring                name;
+            bool                        ccw;
+            bool                        pmalpha;
+
+            using Collection = std::vector<std::shared_ptr<ModelMesh>>;
+
+            // Setup states for drawing mesh
+            void __cdecl PrepareForRendering(
+                _In_ ID3D11DeviceContext* deviceContext,
+                const CommonStates& states,
+                bool alpha = false,
+                bool wireframe = false) const;
+
+            // Draw the mesh
+            void XM_CALLCONV Draw(
+                _In_ ID3D11DeviceContext* deviceContext,
+                FXMMATRIX world, CXMMATRIX view, CXMMATRIX projection,
+                bool alpha = false,
+                _In_ std::function<void __cdecl()> setCustomState = nullptr) const;
+
+            // Draw the mesh using model bones
+            void XM_CALLCONV Draw(
+                _In_ ID3D11DeviceContext* deviceContext,
+                size_t nbones, _In_reads_(nbones) const XMMATRIX* boneTransforms,
+                FXMMATRIX world, CXMMATRIX view, CXMMATRIX projection,
+                bool alpha = false,
+                _In_ std::function<void __cdecl()> setCustomState = nullptr) const;
+
+            // Draw the mesh using skinning
+            void XM_CALLCONV DrawSkinned(
+                _In_ ID3D11DeviceContext* deviceContext,
+                size_t nbones, _In_reads_(nbones) const XMMATRIX* boneTransforms,
+                FXMMATRIX world, CXMMATRIX view, CXMMATRIX projection,
+                bool alpha = false,
+                _In_ std::function<void __cdecl()> setCustomState = nullptr) const;
+
+            static void SetDepthBufferMode(bool reverseZ)
+            {
+                s_reversez = reverseZ;
+            }
+
+        private:
+            static bool s_reversez;
+        };
+
+
+        //------------------------------------------------------------------------------
+        // A model consists of one or more meshes
+        class Model
+        {
+        public:
+            Model() = default;
+
+            Model(Model&&) = default;
+            Model& operator= (Model&&) = default;
+
+            Model(Model const& other);
+            Model& operator= (Model const& rhs);
+
+            virtual ~Model();
+
+            ModelMesh::Collection       meshes;
+            ModelBone::Collection       bones;
+            ModelBone::TransformArray   boneMatrices;
+            ModelBone::TransformArray   invBindPoseMatrices;
+            std::wstring                name;
+
+            // Draw all the meshes in the model
+            void XM_CALLCONV Draw(
+                _In_ ID3D11DeviceContext* deviceContext,
+                const CommonStates& states,
+                FXMMATRIX world, CXMMATRIX view, CXMMATRIX projection,
+                bool wireframe = false,
+                _In_ std::function<void __cdecl()> setCustomState = nullptr) const;
+
+            // Draw all the meshes using model bones
+            void XM_CALLCONV Draw(
+                _In_ ID3D11DeviceContext* deviceContext,
+                const CommonStates& states,
+                size_t nbones, _In_reads_(nbones) const XMMATRIX* boneTransforms,
+                FXMMATRIX world, CXMMATRIX view, CXMMATRIX projection,
+                bool wireframe = false,
+                _In_ std::function<void __cdecl()> setCustomState = nullptr) const;
+
+            // Draw all the meshes using skinning
+            void XM_CALLCONV DrawSkinned(
+                _In_ ID3D11DeviceContext* deviceContext,
+                const CommonStates& states,
+                size_t nbones, _In_reads_(nbones) const XMMATRIX* boneTransforms,
+                FXMMATRIX world, CXMMATRIX view, CXMMATRIX projection,
+                bool wireframe = false,
+                _In_ std::function<void __cdecl()> setCustomState = nullptr) const;
+
+            // Compute bone positions based on heirarchy and transform matrices
+            void __cdecl CopyAbsoluteBoneTransformsTo(
+                size_t nbones,
+                _Out_writes_(nbones) XMMATRIX* boneTransforms) const;
+
+            void __cdecl CopyAbsoluteBoneTransforms(
+                size_t nbones,
+                _In_reads_(nbones) const XMMATRIX* inBoneTransforms,
+                _Out_writes_(nbones) XMMATRIX* outBoneTransforms) const;
+
+            // Set bone matrices to a set of relative tansforms
+            void __cdecl CopyBoneTransformsFrom(
+                size_t nbones,
+                _In_reads_(nbones) const XMMATRIX* boneTransforms);
+
+            // Copies the relative bone matrices to a transform array
+            void __cdecl CopyBoneTransformsTo(
+                size_t nbones,
+                _Out_writes_(nbones) XMMATRIX* boneTransforms) const;
+
+            // Notify model that effects, parts list, or mesh list has changed
+            void __cdecl Modified() noexcept { mEffectCache.clear(); }
+
+            // Update all effects used by the model
+            void __cdecl UpdateEffects(_In_ std::function<void __cdecl(IEffect*)> setEffect);
+
+            // Loads a model from a Visual Studio Starter Kit .CMO file
+            static std::unique_ptr<Model> __cdecl CreateFromCMO(
+                _In_ ID3D11Device* device,
+                _In_reads_bytes_(dataSize) const uint8_t* meshData, size_t dataSize,
+                _In_ IEffectFactory& fxFactory,
+                ModelLoaderFlags flags = ModelLoader_CounterClockwise,
+                _Out_opt_ size_t* animsOffset = nullptr);
+            static std::unique_ptr<Model> __cdecl CreateFromCMO(
+                _In_ ID3D11Device* device,
+                _In_z_ const wchar_t* szFileName,
+                _In_ IEffectFactory& fxFactory,
+                ModelLoaderFlags flags = ModelLoader_CounterClockwise,
+                _Out_opt_ size_t* animsOffset = nullptr);
+
+            // Loads a model from a DirectX SDK .SDKMESH file
+            static std::unique_ptr<Model> __cdecl CreateFromSDKMESH(
+                _In_ ID3D11Device* device,
+                _In_reads_bytes_(dataSize) const uint8_t* meshData, _In_ size_t dataSize,
+                _In_ IEffectFactory& fxFactory,
+                ModelLoaderFlags flags = ModelLoader_Clockwise);
+            static std::unique_ptr<Model> __cdecl CreateFromSDKMESH(
+                _In_ ID3D11Device* device,
+                _In_z_ const wchar_t* szFileName,
+                _In_ IEffectFactory& fxFactory,
+                ModelLoaderFlags flags = ModelLoader_Clockwise);
+
+            // Loads a model from a .VBO file
+            static std::unique_ptr<Model> __cdecl CreateFromVBO(
+                _In_ ID3D11Device* device,
+                _In_reads_bytes_(dataSize) const uint8_t* meshData, _In_ size_t dataSize,
+                _In_ std::shared_ptr<IEffect> ieffect = nullptr,
+                ModelLoaderFlags flags = ModelLoader_Clockwise);
+            static std::unique_ptr<Model> __cdecl CreateFromVBO(
+                _In_ ID3D11Device* device,
+                _In_z_ const wchar_t* szFileName,
+                _In_ std::shared_ptr<IEffect> ieffect = nullptr,
+                ModelLoaderFlags flags = ModelLoader_Clockwise);
+
+#if defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED)
+            static std::unique_ptr<Model> __cdecl CreateFromCMO(
+                _In_ ID3D11Device* device,
+                _In_z_ const __wchar_t* szFileName,
+                _In_ IEffectFactory& fxFactory,
+                ModelLoaderFlags flags = ModelLoader_CounterClockwise,
+                _Out_opt_ size_t* animsOffset = nullptr);
+
+            static std::unique_ptr<Model> __cdecl CreateFromSDKMESH(
+                _In_ ID3D11Device* device,
+                _In_z_ const __wchar_t* szFileName,
+                _In_ IEffectFactory& fxFactory,
+                ModelLoaderFlags flags = ModelLoader_Clockwise);
+
+            static std::unique_ptr<Model> __cdecl CreateFromVBO(
+                _In_ ID3D11Device* device,
+                _In_z_ const __wchar_t* szFileName,
+                _In_ std::shared_ptr<IEffect> ieffect = nullptr,
+                ModelLoaderFlags flags = ModelLoader_Clockwise);
+#endif // !_NATIVE_WCHAR_T_DEFINED
+
+        private:
+            std::set<IEffect*>  mEffectCache;
+
+            void __cdecl ComputeAbsolute(uint32_t index,
+                CXMMATRIX local, size_t nbones,
+                _In_reads_(nbones) const XMMATRIX* inBoneTransforms,
+                _Inout_updates_(nbones) XMMATRIX* outBoneTransforms,
+                size_t& visited) const;
+        };
+
+    #ifdef __clang__
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
+    #endif
+
+        DEFINE_ENUM_FLAG_OPERATORS(ModelLoaderFlags);
+
+    #ifdef __clang__
+    #pragma clang diagnostic pop
+    #endif
+    }
+}

enginecustom/include/Inc/Mouse.h

@@ -0,0 +1,172 @@
+//--------------------------------------------------------------------------------------
+// File: Mouse.h
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248929
+// http://go.microsoft.com/fwlink/?LinkID=615561
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#if !defined(USING_XINPUT) && !defined(USING_GAMEINPUT) && !defined(USING_COREWINDOW)
+
+#ifdef _GAMING_DESKTOP
+#include <grdk.h>
+#endif
+
+#if (defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_GAMES)) || (defined(_GAMING_DESKTOP) && (_GRDK_EDITION >= 220600))
+#define USING_GAMEINPUT
+#elif (defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)) || (defined(_XBOX_ONE) && defined(_TITLE))
+#define USING_COREWINDOW
+#endif
+
+#endif // !USING_XINPUT && !USING_GAMEINPUT && !USING_WINDOWS_GAMING_INPUT
+
+#if defined(USING_GAMEINPUT) && !defined(_GAMING_XBOX) && defined(_MSC_VER)
+#pragma comment(lib,"gameinput.lib")
+#endif
+
+#include <memory>
+
+#ifdef USING_COREWINDOW
+namespace ABI { namespace Windows { namespace UI { namespace Core { struct ICoreWindow; } } } }
+#endif
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#endif
+
+
+namespace DirectX
+{
+    class Mouse
+    {
+    public:
+        Mouse() noexcept(false);
+
+        Mouse(Mouse&&) noexcept;
+        Mouse& operator= (Mouse&&) noexcept;
+
+        Mouse(Mouse const&) = delete;
+        Mouse& operator=(Mouse const&) = delete;
+
+        virtual ~Mouse();
+
+        enum Mode
+        {
+            MODE_ABSOLUTE = 0,
+            MODE_RELATIVE,
+        };
+
+        struct State
+        {
+            bool    leftButton;
+            bool    middleButton;
+            bool    rightButton;
+            bool    xButton1;
+            bool    xButton2;
+            int     x;
+            int     y;
+            int     scrollWheelValue;
+            Mode    positionMode;
+        };
+
+        class ButtonStateTracker
+        {
+        public:
+            enum ButtonState
+            {
+                UP = 0,         // Button is up
+                HELD = 1,       // Button is held down
+                RELEASED = 2,   // Button was just released
+                PRESSED = 3,    // Buton was just pressed
+            };
+
+            ButtonState leftButton;
+            ButtonState middleButton;
+            ButtonState rightButton;
+            ButtonState xButton1;
+            ButtonState xButton2;
+
+        #ifdef _PREFAST_
+        #pragma prefast(push)
+        #pragma prefast(disable : 26495, "Reset() performs the initialization")
+        #endif
+            ButtonStateTracker() noexcept { Reset(); }
+        #ifdef _PREFAST_
+        #pragma prefast(pop)
+        #endif
+
+            void __cdecl Update(const State& state) noexcept;
+
+            void __cdecl Reset() noexcept;
+
+            State __cdecl GetLastState() const noexcept { return lastState; }
+
+        private:
+            State lastState;
+        };
+
+        // Retrieve the current state of the mouse
+        State __cdecl GetState() const;
+
+        // Resets the accumulated scroll wheel value
+        void __cdecl ResetScrollWheelValue() noexcept;
+
+        // Sets mouse mode (defaults to absolute)
+        void __cdecl SetMode(Mode mode);
+
+        // Signals the end of frame (recommended, but optional)
+        void __cdecl EndOfInputFrame() noexcept;
+
+        // Feature detection
+        bool __cdecl IsConnected() const;
+
+        // Cursor visibility
+        bool __cdecl IsVisible() const noexcept;
+        void __cdecl SetVisible(bool visible);
+
+    #ifdef USING_COREWINDOW
+        void __cdecl SetWindow(ABI::Windows::UI::Core::ICoreWindow* window);
+    #ifdef __cplusplus_winrt
+        void __cdecl SetWindow(Windows::UI::Core::CoreWindow^ window)
+        {
+            // See https://msdn.microsoft.com/en-us/library/hh755802.aspx
+            SetWindow(reinterpret_cast<ABI::Windows::UI::Core::ICoreWindow*>(window));
+        }
+    #endif
+    #ifdef CPPWINRT_VERSION
+        void __cdecl SetWindow(winrt::Windows::UI::Core::CoreWindow window)
+        {
+            // See https://docs.microsoft.com/en-us/windows/uwp/cpp-and-winrt-apis/interop-winrt-abi
+            SetWindow(reinterpret_cast<ABI::Windows::UI::Core::ICoreWindow*>(winrt::get_abi(window)));
+        }
+    #endif
+
+        static void __cdecl SetDpi(float dpi);
+    #elif defined(WM_USER)
+        void __cdecl SetWindow(HWND window);
+        static void __cdecl ProcessMessage(UINT message, WPARAM wParam, LPARAM lParam);
+
+    #ifdef _GAMING_XBOX
+        static void __cdecl SetResolution(float scale);
+    #endif
+    #endif
+
+        // Singleton
+        static Mouse& __cdecl Get();
+
+    private:
+        // Private implementation.
+        class Impl;
+
+        std::unique_ptr<Impl> pImpl;
+    };
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif

enginecustom/include/Inc/PostProcess.h

@@ -0,0 +1,227 @@
+//--------------------------------------------------------------------------------------
+// File: PostProcess.h
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#if defined(_XBOX_ONE) && defined(_TITLE)
+#include <d3d11_x.h>
+#else
+#include <d3d11_1.h>
+#endif
+
+#include <memory>
+#include <functional>
+
+#include <DirectXMath.h>
+
+
+namespace DirectX
+{
+    inline namespace DX11
+    {
+        //------------------------------------------------------------------------------
+        // Abstract interface representing a post-process pass
+        class IPostProcess
+        {
+        public:
+            virtual ~IPostProcess() = default;
+
+            IPostProcess(const IPostProcess&) = delete;
+            IPostProcess& operator=(const IPostProcess&) = delete;
+
+            virtual void __cdecl Process(_In_ ID3D11DeviceContext* deviceContext,
+                _In_ std::function<void __cdecl()> setCustomState = nullptr) = 0;
+
+        protected:
+            IPostProcess() = default;
+            IPostProcess(IPostProcess&&) = default;
+            IPostProcess& operator=(IPostProcess&&) = default;
+        };
+
+
+        //------------------------------------------------------------------------------
+        // Basic post-process
+        class BasicPostProcess : public IPostProcess
+        {
+        public:
+            enum Effect : unsigned int
+            {
+                Copy,
+                Monochrome,
+                Sepia,
+                DownScale_2x2,
+                DownScale_4x4,
+                GaussianBlur_5x5,
+                BloomExtract,
+                BloomBlur,
+                Effect_Max
+            };
+
+            explicit BasicPostProcess(_In_ ID3D11Device* device);
+
+            BasicPostProcess(BasicPostProcess&&) noexcept;
+            BasicPostProcess& operator= (BasicPostProcess&&) noexcept;
+
+            BasicPostProcess(BasicPostProcess const&) = delete;
+            BasicPostProcess& operator= (BasicPostProcess const&) = delete;
+
+            ~BasicPostProcess() override;
+
+            // IPostProcess methods.
+            void __cdecl Process(
+                _In_ ID3D11DeviceContext* deviceContext,
+                _In_ std::function<void __cdecl()> setCustomState = nullptr) override;
+
+            // Shader control
+            void __cdecl SetEffect(Effect fx);
+
+            // Properties
+            void __cdecl SetSourceTexture(_In_opt_ ID3D11ShaderResourceView* value);
+
+            // Sets multiplier for GaussianBlur_5x5
+            void __cdecl SetGaussianParameter(float multiplier);
+
+            // Sets parameters for BloomExtract
+            void __cdecl SetBloomExtractParameter(float threshold);
+
+            // Sets parameters for BloomBlur
+            void __cdecl SetBloomBlurParameters(bool horizontal, float size, float brightness);
+
+        private:
+            // Private implementation.
+            class Impl;
+
+            std::unique_ptr<Impl> pImpl;
+        };
+
+
+        //------------------------------------------------------------------------------
+        // Dual-texure post-process
+        class DualPostProcess : public IPostProcess
+        {
+        public:
+            enum Effect : unsigned int
+            {
+                Merge,
+                BloomCombine,
+                Effect_Max
+            };
+
+            explicit DualPostProcess(_In_ ID3D11Device* device);
+
+            DualPostProcess(DualPostProcess&&) noexcept;
+            DualPostProcess& operator= (DualPostProcess&&) noexcept;
+
+            DualPostProcess(DualPostProcess const&) = delete;
+            DualPostProcess& operator= (DualPostProcess const&) = delete;
+
+            ~DualPostProcess() override;
+
+            // IPostProcess methods.
+            void __cdecl Process(_In_ ID3D11DeviceContext* deviceContext,
+                _In_ std::function<void __cdecl()> setCustomState = nullptr) override;
+
+            // Shader control
+            void __cdecl SetEffect(Effect fx);
+
+            // Properties
+            void __cdecl SetSourceTexture(_In_opt_ ID3D11ShaderResourceView* value);
+            void __cdecl SetSourceTexture2(_In_opt_ ID3D11ShaderResourceView* value);
+
+            // Sets parameters for Merge
+            void __cdecl SetMergeParameters(float weight1, float weight2);
+
+            // Sets parameters for BloomCombine
+            void __cdecl SetBloomCombineParameters(float bloom, float base, float bloomSaturation, float baseSaturation);
+
+        private:
+            // Private implementation.
+            class Impl;
+
+            std::unique_ptr<Impl> pImpl;
+        };
+
+
+        //------------------------------------------------------------------------------
+        // Tone-map post-process
+        class ToneMapPostProcess : public IPostProcess
+        {
+        public:
+            // Tone-mapping operator
+            enum Operator : unsigned int
+            {
+                None,               // Pass-through
+                Saturate,           // Clamp [0,1]
+                Reinhard,           // x/(1+x)
+                ACESFilmic,
+                Operator_Max
+            };
+
+            // Electro-Optical Transfer Function (EOTF)
+            enum TransferFunction : unsigned int
+            {
+                Linear,             // Pass-through
+                SRGB,               // sRGB (Rec.709 and approximate sRGB display curve)
+                ST2084,             // HDR10 (Rec.2020 color primaries and ST.2084 display curve)
+                TransferFunction_Max
+            };
+
+            // Color Rotation Transform for HDR10
+            enum ColorPrimaryRotation : unsigned int
+            {
+                HDTV_to_UHDTV,       // Rec.709 to Rec.2020
+                DCI_P3_D65_to_UHDTV, // DCI-P3-D65 (a.k.a Display P3 or P3D65) to Rec.2020
+                HDTV_to_DCI_P3_D65,  // Rec.709 to DCI-P3-D65 (a.k.a Display P3 or P3D65)
+            };
+
+            explicit ToneMapPostProcess(_In_ ID3D11Device* device);
+
+            ToneMapPostProcess(ToneMapPostProcess&&) noexcept;
+            ToneMapPostProcess& operator= (ToneMapPostProcess&&) noexcept;
+
+            ToneMapPostProcess(ToneMapPostProcess const&) = delete;
+            ToneMapPostProcess& operator= (ToneMapPostProcess const&) = delete;
+
+            ~ToneMapPostProcess() override;
+
+            // IPostProcess methods.
+            void __cdecl Process(_In_ ID3D11DeviceContext* deviceContext,
+                _In_ std::function<void __cdecl()> setCustomState = nullptr) override;
+
+            // Shader control
+            void __cdecl SetOperator(Operator op);
+
+            void __cdecl SetTransferFunction(TransferFunction func);
+
+        #if defined(_XBOX_ONE) && defined(_TITLE)
+            // Uses Multiple Render Targets to generate both HDR10 and GameDVR SDR signals
+            void __cdecl SetMRTOutput(bool value = true);
+        #endif
+
+            // Properties
+            void __cdecl SetHDRSourceTexture(_In_opt_ ID3D11ShaderResourceView* value);
+
+            // Sets the Color Rotation Transform for HDR10 signal output
+            void __cdecl SetColorRotation(ColorPrimaryRotation value);
+            void __cdecl SetColorRotation(CXMMATRIX value);
+
+            // Sets exposure value for LDR tonemap operators
+            void __cdecl SetExposure(float exposureValue);
+
+            // Sets ST.2084 parameter for how bright white should be in nits
+            void __cdecl SetST2084Parameter(float paperWhiteNits);
+
+        private:
+            // Private implementation.
+            class Impl;
+
+            std::unique_ptr<Impl> pImpl;
+        };
+    }
+}

enginecustom/include/Inc/PrimitiveBatch.h

@@ -0,0 +1,140 @@
+//--------------------------------------------------------------------------------------
+// File: PrimitiveBatch.h
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#if defined(_XBOX_ONE) && defined(_TITLE)
+#include <d3d11_x.h>
+#else
+#include <d3d11_1.h>
+#endif
+
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <memory>
+#include <utility>
+
+
+namespace DirectX
+{
+    inline namespace DX11
+    {
+        namespace Private
+        {
+        // Base class, not to be used directly: clients should access this via the derived PrimitiveBatch<T>.
+            class PrimitiveBatchBase
+            {
+            protected:
+                PrimitiveBatchBase(_In_ ID3D11DeviceContext* deviceContext, size_t maxIndices, size_t maxVertices, size_t vertexSize);
+
+                PrimitiveBatchBase(PrimitiveBatchBase&&) noexcept;
+                PrimitiveBatchBase& operator= (PrimitiveBatchBase&&) noexcept;
+
+                PrimitiveBatchBase(PrimitiveBatchBase const&) = delete;
+                PrimitiveBatchBase& operator= (PrimitiveBatchBase const&) = delete;
+
+                virtual ~PrimitiveBatchBase();
+
+            public:
+                // Begin/End a batch of primitive drawing operations.
+                void __cdecl Begin();
+                void __cdecl End();
+
+            protected:
+                // Internal, untyped drawing method.
+                void __cdecl Draw(D3D11_PRIMITIVE_TOPOLOGY topology, bool isIndexed, _In_opt_count_(indexCount) uint16_t const* indices, size_t indexCount, size_t vertexCount, _Out_ void** pMappedVertices);
+
+            private:
+                // Private implementation.
+                class Impl;
+
+                std::unique_ptr<Impl> pImpl;
+            };
+        }
+
+        // Template makes the API typesafe, eg. PrimitiveBatch<VertexPositionColor>.
+        template<typename TVertex>
+        class PrimitiveBatch : public Private::PrimitiveBatchBase
+        {
+            static constexpr size_t DefaultBatchSize = 2048;
+
+        public:
+            explicit PrimitiveBatch(_In_ ID3D11DeviceContext* deviceContext, size_t maxIndices = DefaultBatchSize * 3, size_t maxVertices = DefaultBatchSize)
+                : PrimitiveBatchBase(deviceContext, maxIndices, maxVertices, sizeof(TVertex))
+            {
+            }
+
+            PrimitiveBatch(PrimitiveBatch&&) = default;
+            PrimitiveBatch& operator= (PrimitiveBatch&&) = default;
+
+            PrimitiveBatch(PrimitiveBatch const&) = delete;
+            PrimitiveBatch& operator= (PrimitiveBatch const&) = delete;
+
+            // Similar to the D3D9 API DrawPrimitiveUP.
+            void Draw(D3D11_PRIMITIVE_TOPOLOGY topology, _In_reads_(vertexCount) TVertex const* vertices, size_t vertexCount)
+            {
+                void* mappedVertices;
+
+                PrimitiveBatchBase::Draw(topology, false, nullptr, 0, vertexCount, &mappedVertices);
+
+                memcpy(mappedVertices, vertices, vertexCount * sizeof(TVertex));
+            }
+
+
+            // Similar to the D3D9 API DrawIndexedPrimitiveUP.
+            void DrawIndexed(D3D11_PRIMITIVE_TOPOLOGY topology, _In_reads_(indexCount) uint16_t const* indices, size_t indexCount, _In_reads_(vertexCount) TVertex const* vertices, size_t vertexCount)
+            {
+                void* mappedVertices;
+
+                PrimitiveBatchBase::Draw(topology, true, indices, indexCount, vertexCount, &mappedVertices);
+
+                memcpy(mappedVertices, vertices, vertexCount * sizeof(TVertex));
+            }
+
+
+            void DrawLine(TVertex const& v1, TVertex const& v2)
+            {
+                TVertex* mappedVertices;
+
+                PrimitiveBatchBase::Draw(D3D11_PRIMITIVE_TOPOLOGY_LINELIST, false, nullptr, 0, 2, reinterpret_cast<void**>(&mappedVertices));
+
+                mappedVertices[0] = v1;
+                mappedVertices[1] = v2;
+            }
+
+
+            void DrawTriangle(TVertex const& v1, TVertex const& v2, TVertex const& v3)
+            {
+                TVertex* mappedVertices;
+
+                PrimitiveBatchBase::Draw(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST, false, nullptr, 0, 3, reinterpret_cast<void**>(&mappedVertices));
+
+                mappedVertices[0] = v1;
+                mappedVertices[1] = v2;
+                mappedVertices[2] = v3;
+            }
+
+
+            void DrawQuad(TVertex const& v1, TVertex const& v2, TVertex const& v3, TVertex const& v4)
+            {
+                static const uint16_t quadIndices[] = { 0, 1, 2, 0, 2, 3 };
+
+                TVertex* mappedVertices;
+
+                PrimitiveBatchBase::Draw(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST, true, quadIndices, 6, 4, reinterpret_cast<void**>(&mappedVertices));
+
+                mappedVertices[0] = v1;
+                mappedVertices[1] = v2;
+                mappedVertices[2] = v3;
+                mappedVertices[3] = v4;
+            }
+        };
+    }
+}

enginecustom/include/Inc/ScreenGrab.h

@@ -0,0 +1,54 @@
+//--------------------------------------------------------------------------------------
+// File: ScreenGrab.h
+//
+// Function for capturing a 2D texture and saving it to a file (aka a 'screenshot'
+// when used on a Direct3D Render Target).
+//
+// Note these functions are useful as a light-weight runtime screen grabber. For
+// full-featured texture capture, DDS writer, and texture processing pipeline,
+// see the 'Texconv' sample and the 'DirectXTex' library.
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248926
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#if defined(_XBOX_ONE) && defined(_TITLE)
+#include <d3d11_x.h>
+#else
+#include <d3d11_1.h>
+#endif
+
+#include <functional>
+
+#if defined(NTDDI_WIN10_FE) || defined(__MINGW32__)
+#include <ocidl.h>
+#else
+#include <OCIdl.h>
+#endif
+
+#ifdef _MSC_VER
+#pragma comment(lib,"uuid.lib")
+#endif
+
+
+namespace DirectX
+{
+    HRESULT __cdecl SaveDDSTextureToFile(
+        _In_ ID3D11DeviceContext* pContext,
+        _In_ ID3D11Resource* pSource,
+        _In_z_ const wchar_t* fileName) noexcept;
+
+    HRESULT __cdecl SaveWICTextureToFile(
+        _In_ ID3D11DeviceContext* pContext,
+        _In_ ID3D11Resource* pSource,
+        _In_ REFGUID guidContainerFormat,
+        _In_z_ const wchar_t* fileName,
+        _In_opt_ const GUID* targetFormat = nullptr,
+        _In_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr,
+        _In_ bool forceSRGB = false);
+}

enginecustom/include/Inc/SpriteBatch.h

@@ -0,0 +1,102 @@
+//--------------------------------------------------------------------------------------
+// File: SpriteBatch.h
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#if defined(_XBOX_ONE) && defined(_TITLE)
+#include <d3d11_x.h>
+#else
+#include <d3d11_1.h>
+#include <dxgi1_2.h>
+#endif
+
+#include <cstdint>
+#include <functional>
+#include <memory>
+
+#include <DirectXMath.h>
+#include <DirectXColors.h>
+
+
+namespace DirectX
+{
+    inline namespace DX11
+    {
+        enum SpriteSortMode
+        {
+            SpriteSortMode_Deferred,
+            SpriteSortMode_Immediate,
+            SpriteSortMode_Texture,
+            SpriteSortMode_BackToFront,
+            SpriteSortMode_FrontToBack,
+        };
+
+        enum SpriteEffects : uint32_t
+        {
+            SpriteEffects_None = 0,
+            SpriteEffects_FlipHorizontally = 1,
+            SpriteEffects_FlipVertically = 2,
+            SpriteEffects_FlipBoth = SpriteEffects_FlipHorizontally | SpriteEffects_FlipVertically,
+        };
+
+        class SpriteBatch
+        {
+        public:
+            explicit SpriteBatch(_In_ ID3D11DeviceContext* deviceContext);
+
+            SpriteBatch(SpriteBatch&&) noexcept;
+            SpriteBatch& operator= (SpriteBatch&&) noexcept;
+
+            SpriteBatch(SpriteBatch const&) = delete;
+            SpriteBatch& operator= (SpriteBatch const&) = delete;
+
+            virtual ~SpriteBatch();
+
+            // Begin/End a batch of sprite drawing operations.
+            void XM_CALLCONV Begin(SpriteSortMode sortMode = SpriteSortMode_Deferred,
+                _In_opt_ ID3D11BlendState* blendState = nullptr,
+                _In_opt_ ID3D11SamplerState* samplerState = nullptr,
+                _In_opt_ ID3D11DepthStencilState* depthStencilState = nullptr,
+                _In_opt_ ID3D11RasterizerState* rasterizerState = nullptr,
+                _In_ std::function<void __cdecl()> setCustomShaders = nullptr,
+                FXMMATRIX transformMatrix = MatrixIdentity);
+            void __cdecl End();
+
+            // Draw overloads specifying position, origin and scale as XMFLOAT2.
+            void XM_CALLCONV Draw(_In_ ID3D11ShaderResourceView* texture, XMFLOAT2 const& position, FXMVECTOR color = Colors::White);
+            void XM_CALLCONV Draw(_In_ ID3D11ShaderResourceView* texture, XMFLOAT2 const& position, _In_opt_ RECT const* sourceRectangle, FXMVECTOR color = Colors::White, float rotation = 0, XMFLOAT2 const& origin = Float2Zero, float scale = 1, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0);
+            void XM_CALLCONV Draw(_In_ ID3D11ShaderResourceView* texture, XMFLOAT2 const& position, _In_opt_ RECT const* sourceRectangle, FXMVECTOR color, float rotation, XMFLOAT2 const& origin, XMFLOAT2 const& scale, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0);
+
+            // Draw overloads specifying position, origin and scale via the first two components of an XMVECTOR.
+            void XM_CALLCONV Draw(_In_ ID3D11ShaderResourceView* texture, FXMVECTOR position, FXMVECTOR color = Colors::White);
+            void XM_CALLCONV Draw(_In_ ID3D11ShaderResourceView* texture, FXMVECTOR position, _In_opt_ RECT const* sourceRectangle, FXMVECTOR color = Colors::White, float rotation = 0, FXMVECTOR origin = g_XMZero, float scale = 1, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0);
+            void XM_CALLCONV Draw(_In_ ID3D11ShaderResourceView* texture, FXMVECTOR position, _In_opt_ RECT const* sourceRectangle, FXMVECTOR color, float rotation, FXMVECTOR origin, GXMVECTOR scale, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0);
+
+            // Draw overloads specifying position as a RECT.
+            void XM_CALLCONV Draw(_In_ ID3D11ShaderResourceView* texture, RECT const& destinationRectangle, FXMVECTOR color = Colors::White);
+            void XM_CALLCONV Draw(_In_ ID3D11ShaderResourceView* texture, RECT const& destinationRectangle, _In_opt_ RECT const* sourceRectangle, FXMVECTOR color = Colors::White, float rotation = 0, XMFLOAT2 const& origin = Float2Zero, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0);
+
+            // Rotation mode to be applied to the sprite transformation
+            void __cdecl SetRotation(DXGI_MODE_ROTATION mode);
+            DXGI_MODE_ROTATION __cdecl GetRotation() const noexcept;
+
+            // Set viewport for sprite transformation
+            void __cdecl SetViewport(const D3D11_VIEWPORT& viewPort);
+
+        private:
+            // Private implementation.
+            struct Impl;
+
+            std::unique_ptr<Impl> pImpl;
+
+            static const XMMATRIX MatrixIdentity;
+            static const XMFLOAT2 Float2Zero;
+        };
+    }
+}

enginecustom/include/Inc/SpriteFont.h

@@ -0,0 +1,116 @@
+//--------------------------------------------------------------------------------------
+// File: SpriteFont.h
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248929
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#include "SpriteBatch.h"
+
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+
+
+namespace DirectX
+{
+    inline namespace DX11
+    {
+        class SpriteFont
+        {
+        public:
+            struct Glyph;
+
+            SpriteFont(_In_ ID3D11Device* device, _In_z_ wchar_t const* fileName, bool forceSRGB = false);
+            SpriteFont(_In_ ID3D11Device* device, _In_reads_bytes_(dataSize) uint8_t const* dataBlob, _In_ size_t dataSize, bool forceSRGB = false);
+            SpriteFont(_In_ ID3D11ShaderResourceView* texture, _In_reads_(glyphCount) Glyph const* glyphs, _In_ size_t glyphCount, _In_ float lineSpacing);
+
+            SpriteFont(SpriteFont&&) noexcept;
+            SpriteFont& operator= (SpriteFont&&) noexcept;
+
+            SpriteFont(SpriteFont const&) = delete;
+            SpriteFont& operator= (SpriteFont const&) = delete;
+
+            virtual ~SpriteFont();
+
+            // Wide-character / UTF-16LE
+            void XM_CALLCONV DrawString(_In_ SpriteBatch* spriteBatch, _In_z_ wchar_t const* text, XMFLOAT2 const& position, FXMVECTOR color = Colors::White, float rotation = 0, XMFLOAT2 const& origin = Float2Zero, float scale = 1, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0) const;
+            void XM_CALLCONV DrawString(_In_ SpriteBatch* spriteBatch, _In_z_ wchar_t const* text, XMFLOAT2 const& position, FXMVECTOR color, float rotation, XMFLOAT2 const& origin, XMFLOAT2 const& scale, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0) const;
+            void XM_CALLCONV DrawString(_In_ SpriteBatch* spriteBatch, _In_z_ wchar_t const* text, FXMVECTOR position, FXMVECTOR color = Colors::White, float rotation = 0, FXMVECTOR origin = g_XMZero, float scale = 1, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0) const;
+            void XM_CALLCONV DrawString(_In_ SpriteBatch* spriteBatch, _In_z_ wchar_t const* text, FXMVECTOR position, FXMVECTOR color, float rotation, FXMVECTOR origin, GXMVECTOR scale, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0) const;
+
+            XMVECTOR XM_CALLCONV MeasureString(_In_z_ wchar_t const* text, bool ignoreWhitespace = true) const;
+
+            RECT __cdecl MeasureDrawBounds(_In_z_ wchar_t const* text, XMFLOAT2 const& position, bool ignoreWhitespace = true) const;
+            RECT XM_CALLCONV MeasureDrawBounds(_In_z_ wchar_t const* text, FXMVECTOR position, bool ignoreWhitespace = true) const;
+
+            // UTF-8
+            void XM_CALLCONV DrawString(_In_ SpriteBatch* spriteBatch, _In_z_ char const* text, XMFLOAT2 const& position, FXMVECTOR color = Colors::White, float rotation = 0, XMFLOAT2 const& origin = Float2Zero, float scale = 1, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0) const;
+            void XM_CALLCONV DrawString(_In_ SpriteBatch* spriteBatch, _In_z_ char const* text, XMFLOAT2 const& position, FXMVECTOR color, float rotation, XMFLOAT2 const& origin, XMFLOAT2 const& scale, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0) const;
+            void XM_CALLCONV DrawString(_In_ SpriteBatch* spriteBatch, _In_z_ char const* text, FXMVECTOR position, FXMVECTOR color = Colors::White, float rotation = 0, FXMVECTOR origin = g_XMZero, float scale = 1, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0) const;
+            void XM_CALLCONV DrawString(_In_ SpriteBatch* spriteBatch, _In_z_ char const* text, FXMVECTOR position, FXMVECTOR color, float rotation, FXMVECTOR origin, GXMVECTOR scale, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0) const;
+
+            XMVECTOR XM_CALLCONV MeasureString(_In_z_ char const* text, bool ignoreWhitespace = true) const;
+
+            RECT __cdecl MeasureDrawBounds(_In_z_ char const* text, XMFLOAT2 const& position, bool ignoreWhitespace = true) const;
+            RECT XM_CALLCONV MeasureDrawBounds(_In_z_ char const* text, FXMVECTOR position, bool ignoreWhitespace = true) const;
+
+            // Spacing properties
+            float __cdecl GetLineSpacing() const noexcept;
+            void __cdecl SetLineSpacing(float spacing);
+
+            // Font properties
+            wchar_t __cdecl GetDefaultCharacter() const noexcept;
+            void __cdecl SetDefaultCharacter(wchar_t character);
+
+            bool __cdecl ContainsCharacter(wchar_t character) const;
+
+            // Custom layout/rendering
+            Glyph const* __cdecl FindGlyph(wchar_t character) const;
+            void __cdecl GetSpriteSheet(ID3D11ShaderResourceView** texture) const;
+
+            // Describes a single character glyph.
+            struct Glyph
+            {
+                uint32_t Character;
+                RECT Subrect;
+                float XOffset;
+                float YOffset;
+                float XAdvance;
+            };
+
+#if defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED)
+            SpriteFont(_In_ ID3D11Device* device, _In_z_ __wchar_t const* fileName, bool forceSRGB = false);
+
+            void XM_CALLCONV DrawString(_In_ SpriteBatch* spriteBatch, _In_z_ __wchar_t const* text, XMFLOAT2 const& position, FXMVECTOR color = Colors::White, float rotation = 0, XMFLOAT2 const& origin = Float2Zero, float scale = 1, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0) const;
+
+            void XM_CALLCONV DrawString(_In_ SpriteBatch* spriteBatch, _In_z_ __wchar_t const* text, XMFLOAT2 const& position, FXMVECTOR color, float rotation, XMFLOAT2 const& origin, XMFLOAT2 const& scale, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0) const;
+            void XM_CALLCONV DrawString(_In_ SpriteBatch* spriteBatch, _In_z_ __wchar_t const* text, FXMVECTOR position, FXMVECTOR color = Colors::White, float rotation = 0, FXMVECTOR origin = g_XMZero, float scale = 1, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0) const;
+            void XM_CALLCONV DrawString(_In_ SpriteBatch* spriteBatch, _In_z_ __wchar_t const* text, FXMVECTOR position, FXMVECTOR color, float rotation, FXMVECTOR origin, GXMVECTOR scale, SpriteEffects effects = SpriteEffects_None, float layerDepth = 0) const;
+
+            XMVECTOR XM_CALLCONV MeasureString(_In_z_ __wchar_t const* text, bool ignoreWhitespace = true) const;
+
+            RECT __cdecl MeasureDrawBounds(_In_z_ __wchar_t const* text, XMFLOAT2 const& position, bool ignoreWhitespace = true) const;
+            RECT XM_CALLCONV MeasureDrawBounds(_In_z_ __wchar_t const* text, FXMVECTOR position, bool ignoreWhitespace = true) const;
+
+            void __cdecl SetDefaultCharacter(__wchar_t character);
+
+            bool __cdecl ContainsCharacter(__wchar_t character) const;
+
+            Glyph const* __cdecl FindGlyph(__wchar_t character) const;
+#endif // !_NATIVE_WCHAR_T_DEFINED
+
+        private:
+            // Private implementation.
+            class Impl;
+
+            std::unique_ptr<Impl> pImpl;
+
+            static const XMFLOAT2 Float2Zero;
+        };
+    }
+}