- Runtime Proj

+ Runner Proj

16 files changed, 182 insertions, 527 deletions

diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/Rendering/Material.lua b/Data/DefaultContent/Libraries/GameLab/Engine/Rendering/Material.lua
new file mode 100644
index 0000000..872d7e1
--- /dev/null
+++ b/Data/DefaultContent/Libraries/GameLab/Engine/Rendering/Material.lua
@@ -0,0 +1,8 @@
+local Material = GameLab.Class("GameLab.Engine.Rendering.Material")
+
+Material.Ctor = function(self)
+    self.shader = nil -- 绑定的shader
+    self.uniforms = {} -- {name, value}
+end
+
+return Material
\ No newline at end of file
diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/Rendering/Shader.lua b/Data/DefaultContent/Libraries/GameLab/Engine/Rendering/Shader.lua
index c64d526..b3c8aeb 100644
--- a/Data/DefaultContent/Libraries/GameLab/Engine/Rendering/Shader.lua
+++ b/Data/DefaultContent/Libraries/GameLab/Engine/Rendering/Shader.lua
@@ -1,11 +1,11 @@
 local Shader = GameLab.Engine.Rendering.Shader or {} 
 
--- @Shader.CreateFromFile
--- 从文件中创建Shader
--- @param path:string 路径
--- @return shader 创建的shader
 Shader.CreateFromFile = function( path ) 
-    
+    local glsl = GameLab.IO.ReadFile(path, GameLab.IO.EFileMode.Text)
+    if glsl ~= nil then 
+        local shader = Shader.New(glsl)
+        return shader 
+    end 
 end
 
 return Shader
\ No newline at end of file
diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/Rendering/init.lua b/Data/DefaultContent/Libraries/GameLab/Engine/Rendering/init.lua
index caefccf..5469297 100644
--- a/Data/DefaultContent/Libraries/GameLab/Engine/Rendering/init.lua
+++ b/Data/DefaultContent/Libraries/GameLab/Engine/Rendering/init.lua
@@ -7,6 +7,7 @@ local Shader = GameLab.Engine.Rendering.Shader
 
 m.Color = import("Color")
 m.Color32 = import("Color32")
+m.Shader = import("Shader")
 
 m.LoadTexture = function(path) 
 
diff --git a/Data/Resources/Shaders/Editor-Text.glsl b/Data/Resources/Shaders/Editor-Text.glsl
index af76555..3566b28 100644
--- a/Data/Resources/Shaders/Editor-Text.glsl
+++ b/Data/Resources/Shaders/Editor-Text.glsl
@@ -1,12 +1,12 @@
 #version 330 core
 
-CMD_BEGIN
+// CMD_BEGIN
 
-Cull Both
-DepthTest Off
-Blend SrcAlpha OneMinusSrcAlpha
+// Cull Both
+// DepthTest Off
+// Blend SrcAlpha OneMinusSrcAlpha
 
-CMD_END
+// CMD_END
 
 uniform mat4 gamelab_mat_mvp;
 uniform sampler2D uiTex;
diff --git a/Data/Scripts/Editor/AssetBrowser.lua b/Data/Scripts/Editor/AssetBrowser.lua
index 7c73ec3..d726654 100644
--- a/Data/Scripts/Editor/AssetBrowser.lua
+++ b/Data/Scripts/Editor/AssetBrowser.lua
@@ -16,14 +16,14 @@ local tex
 

 AssetBrowser.OnGUI = function(self)

 

-

 	if tex == nil then 

 		tex = Engine.Resource.LoadTexture("./Resources/Images/brickwall.jpg")

 	end

 

 	if shader == nil then 

-		local glsl = IO.ReadFile("./Resources/Shaders/Editor-Text.glsl", IO.EFileMode.Text) 

-		shader = Engine.Rendering.Shader.New(glsl)

+		-- local glsl = IO.ReadFile("./Resources/Shaders/Editor-Text.glsl", IO.EFileMode.Text) 

+		-- shader = Engine.Rendering.Shader.New(glsl)

+		shader = Engine.Rendering.Shader.CreateFromFile("./Resources/Shaders/Editor-Text.glsl")

 	end 

 

 	local ortho = Matrix44.New() 

diff --git a/Projects/VisualStudio/GameLab.sln b/Projects/VisualStudio/GameLab.sln
index 9a7496c..8013406 100644
--- a/Projects/VisualStudio/GameLab.sln
+++ b/Projects/VisualStudio/GameLab.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15

 VisualStudioVersion = 15.0.28307.1022

 MinimumVisualStudioVersion = 10.0.40219.1

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Runtime", "Runtime\Runtime.vcxproj", "{4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "SDL2\SDL2.vcxproj", "{8658F91C-9AAE-4819-9005-77D09C61D97F}"

 EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThirdParty", "ThirdParty", "{0F6EE105-E1FF-4770-8314-06F9F98FB68F}"

@@ -31,6 +29,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AsyncTask", "AsyncTask\Asyn
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hash-library", "hash-library\hash-library.vcxproj", "{F5341260-AFF4-4F99-9182-C8A0673E3B14}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Runner", "Runner\Runner.vcxproj", "{0168C539-D3F8-48AD-BBB0-259B87786D1F}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|x64 = Debug|x64

@@ -39,14 +39,6 @@ Global
 		Release|x86 = Release|x86

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}.Debug|x64.ActiveCfg = Debug|x64

-		{4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}.Debug|x64.Build.0 = Debug|x64

-		{4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}.Debug|x86.ActiveCfg = Debug|Win32

-		{4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}.Debug|x86.Build.0 = Debug|Win32

-		{4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}.Release|x64.ActiveCfg = Release|x64

-		{4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}.Release|x64.Build.0 = Release|x64

-		{4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}.Release|x86.ActiveCfg = Release|Win32

-		{4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}.Release|x86.Build.0 = Release|Win32

 		{8658F91C-9AAE-4819-9005-77D09C61D97F}.Debug|x64.ActiveCfg = Debug|x64

 		{8658F91C-9AAE-4819-9005-77D09C61D97F}.Debug|x64.Build.0 = Debug|x64

 		{8658F91C-9AAE-4819-9005-77D09C61D97F}.Debug|x86.ActiveCfg = Debug|Win32

@@ -135,6 +127,14 @@ Global
 		{F5341260-AFF4-4F99-9182-C8A0673E3B14}.Release|x64.Build.0 = Release|x64

 		{F5341260-AFF4-4F99-9182-C8A0673E3B14}.Release|x86.ActiveCfg = Release|Win32

 		{F5341260-AFF4-4F99-9182-C8A0673E3B14}.Release|x86.Build.0 = Release|Win32

+		{0168C539-D3F8-48AD-BBB0-259B87786D1F}.Debug|x64.ActiveCfg = Debug|x64

+		{0168C539-D3F8-48AD-BBB0-259B87786D1F}.Debug|x64.Build.0 = Debug|x64

+		{0168C539-D3F8-48AD-BBB0-259B87786D1F}.Debug|x86.ActiveCfg = Debug|Win32

+		{0168C539-D3F8-48AD-BBB0-259B87786D1F}.Debug|x86.Build.0 = Debug|Win32

+		{0168C539-D3F8-48AD-BBB0-259B87786D1F}.Release|x64.ActiveCfg = Release|x64

+		{0168C539-D3F8-48AD-BBB0-259B87786D1F}.Release|x64.Build.0 = Release|x64

+		{0168C539-D3F8-48AD-BBB0-259B87786D1F}.Release|x86.ActiveCfg = Release|Win32

+		{0168C539-D3F8-48AD-BBB0-259B87786D1F}.Release|x86.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/Projects/VisualStudio/Runner/Runner.vcxproj b/Projects/VisualStudio/Runner/Runner.vcxproj
new file mode 100644
index 0000000..f66f423
--- /dev/null
+++ b/Projects/VisualStudio/Runner/Runner.vcxproj
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{0168C539-D3F8-48AD-BBB0-259B87786D1F}</ProjectGuid>
+    <RootNamespace>Runner</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\Runner\Runner.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Runner\Runner.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Projects/VisualStudio/Runner/Runner.vcxproj.filters b/Projects/VisualStudio/Runner/Runner.vcxproj.filters
new file mode 100644
index 0000000..0a0cafd
--- /dev/null
+++ b/Projects/VisualStudio/Runner/Runner.vcxproj.filters
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\..\Runner\Runner.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Runner\Runner.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Projects/VisualStudio/Runtime/Runtime.vcxproj.user b/Projects/VisualStudio/Runner/Runner.vcxproj.user
index be25078..be25078 100644
--- a/Projects/VisualStudio/Runtime/Runtime.vcxproj.user
+++ b/Projects/VisualStudio/Runner/Runner.vcxproj.user
diff --git a/Projects/VisualStudio/Runtime/Runtime.vcxproj b/Projects/VisualStudio/Runtime/Runtime.vcxproj
deleted file mode 100644
index 27a06a0..0000000
--- a/Projects/VisualStudio/Runtime/Runtime.vcxproj
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\..\..\Runtime\FileSystem\FileSystem.h" />

-    <ClInclude Include="..\..\..\Runtime\FileSystem\Unzip.h" />

-    <ClInclude Include="..\..\..\Runtime\Graphics\Color.h" />

-    <ClInclude Include="..\..\..\Runtime\Graphics\GpuDataBuffer.h" />

-    <ClInclude Include="..\..\..\Runtime\Graphics\Device.h" />

-    <ClInclude Include="..\..\..\Runtime\Graphics\DeviceDefine.h" />

-    <ClInclude Include="..\..\..\Runtime\Graphics\FrameBuffer.h" />

-    <ClInclude Include="..\..\..\Runtime\Graphics\OpenGL.h" />

-    <ClInclude Include="..\..\..\Runtime\Graphics\RenderTexture.h" />

-    <ClInclude Include="..\..\..\Runtime\Graphics\ImageData.h" />

-    <ClInclude Include="..\..\..\Runtime\Graphics\PolyLine.h" />

-    <ClInclude Include="..\..\..\Runtime\Graphics\Point.h" />

-    <ClInclude Include="..\..\..\Runtime\Graphics\Quad.h" />

-    <ClInclude Include="..\..\..\Runtime\Graphics\GlyphAtlas.h" />

-    <ClInclude Include="..\..\..\Runtime\Graphics\Texture.h" />

-    <ClInclude Include="..\..\..\Runtime\Graphics\VertexBuffer.h" />

-    <ClInclude Include="..\..\..\Runtime\ImGUI\GUIButton.h" />

-    <ClInclude Include="..\..\..\Runtime\ImGUI\GUILabel.h" />

-    <ClInclude Include="..\..\..\Runtime\Input\Input.h" />

-    <ClInclude Include="..\..\..\Runtime\Math\AABB.h" />

-    <ClInclude Include="..\..\..\Runtime\Math\Vector2.h" />

-    <ClInclude Include="..\..\..\Runtime\Math\Vector3.h" />

-    <ClInclude Include="..\..\..\Runtime\Mesh\Font.h" />

-    <ClInclude Include="..\..\..\Runtime\Mesh\FontManager.h" />

-    <ClInclude Include="..\..\..\Runtime\Mesh\Glyph.h" />

-    <ClInclude Include="..\..\..\Runtime\Mesh\Mesh.h" />

-    <ClInclude Include="..\..\..\Runtime\Mesh\MeshUtil.h" />

-    <ClInclude Include="..\..\..\Runtime\Mesh\TextMesh.h" />

-    <ClInclude Include="..\..\..\Runtime\Physics\Rigidbody.h" />

-    <ClInclude Include="..\..\..\Runtime\Profiler\FrameStats.h" />

-    <ClInclude Include="..\..\..\Runtime\Profiler\Profiler.h" />

-    <ClInclude Include="..\..\..\Runtime\Runner.h" />

-    <ClInclude Include="..\..\..\Runtime\Shaders\ShaderChannel.h" />

-    <ClInclude Include="..\..\..\Runtime\Shaders\ShaderDefine.h" />

-    <ClInclude Include="..\..\..\Runtime\Shaders\ShaderUniform.h" />

-    <ClInclude Include="..\..\..\Runtime\Utilities\Assert.h" />

-    <ClInclude Include="..\..\..\Runtime\Utilities\Base64.h" />

-    <ClInclude Include="..\..\..\Runtime\Utilities\Exception.h" />

-    <ClInclude Include="..\..\..\Runtime\Utilities\NonCopyable.h" />

-    <ClInclude Include="..\..\..\Runtime\Utilities\Singleton.h" />

-    <ClInclude Include="..\..\..\Runtime\Utilities\Type.h" />

-    <ClInclude Include="..\..\..\Runtime\Utilities\UIDGenerator.h" />

-    <ClInclude Include="..\..\..\Runtime\Utilities\Utf8.h" />

-    <ClInclude Include="..\..\..\Runtime\Utilities\UtilMacros.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\Runtime\FileSystem\FileSystem.cpp" />

-    <ClCompile Include="..\..\..\Runtime\FileSystem\Unzip.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Graphics\GpuDataBuffer.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Graphics\Device.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Graphics\FrameBuffer.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Graphics\OpenGL.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Graphics\RenderTexture.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Graphics\ImageData.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Graphics\PolyLine.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Graphics\Point.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Graphics\Scripting\wrap_Device.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Graphics\Scripting\wrap_GL.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Graphics\Scripting\wrap_RenderTexture.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Graphics\Quad.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Graphics\GlyphAtlas.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Graphics\Texture.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Graphics\VertexBuffer.cpp" />

-    <ClCompile Include="..\..\..\Runtime\ImGUI\GUIButton.cpp" />

-    <ClCompile Include="..\..\..\Runtime\ImGUI\GUILabel.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Input\Input.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Math\Vector2.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Math\Vector3.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Mesh\Font.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Mesh\Mesh.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Physics\Scripting\wrap_Joint.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Runner.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Shaders\ShaderDefine.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Utilities\Base64.cpp" />

-    <ClCompile Include="..\..\..\Runtime\Utilities\Utf8.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\Box2D\Box2D.vcxproj">

-      <Project>{12759f92-73f9-48bc-8808-9fe709dcd134}</Project>

-    </ProjectReference>

-    <ProjectReference Include="..\SDL2main\SDL2main.vcxproj">

-      <Project>{9b542e6d-8677-4ad6-9a69-4650103906c5}</Project>

-    </ProjectReference>

-    <ProjectReference Include="..\SDL2\SDL2.vcxproj">

-      <Project>{12b7b0f8-6581-4321-9627-3ee601100463}</Project>

-    </ProjectReference>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <VCProjectVersion>15.0</VCProjectVersion>

-    <ProjectGuid>{4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}</ProjectGuid>

-    <RootNamespace>Runtime</RootNamespace>

-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v141</PlatformToolset>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v141</PlatformToolset>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v141</PlatformToolset>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v141</PlatformToolset>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="Shared">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>$(SolutionDir)..\..\Build</OutDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>$(SolutionDir)..\..\Build</OutDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <OutDir>$(SolutionDir)..\..\Build</OutDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>$(SolutionDir)..\..\Build</OutDir>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <Optimization>Disabled</Optimization>

-      <SDLCheck>true</SDLCheck>

-      <ConformanceMode>true</ConformanceMode>

-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\ThirdParty\;$(SolutionDir)..\..\ThirdParty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <Optimization>Disabled</Optimization>

-      <SDLCheck>true</SDLCheck>

-      <ConformanceMode>true</ConformanceMode>

-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\ThirdParty\;$(SolutionDir)..\..\ThirdParty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <Optimization>MaxSpeed</Optimization>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <SDLCheck>true</SDLCheck>

-      <ConformanceMode>true</ConformanceMode>

-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\ThirdParty\;$(SolutionDir)..\..\ThirdParty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <Optimization>MaxSpeed</Optimization>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <SDLCheck>true</SDLCheck>

-      <ConformanceMode>true</ConformanceMode>

-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\ThirdParty\;$(SolutionDir)..\..\ThirdParty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

-  </ItemDefinitionGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/Projects/VisualStudio/Runtime/Runtime.vcxproj.filters b/Projects/VisualStudio/Runtime/Runtime.vcxproj.filters
deleted file mode 100644
index c25be44..0000000
--- a/Projects/VisualStudio/Runtime/Runtime.vcxproj.filters
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Audio">

-      <UniqueIdentifier>{e789ad2d-945c-482e-8316-1dd0ccdfc465}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="FileSystem">

-      <UniqueIdentifier>{9ad1872a-2d30-43f7-be83-f30d53e57970}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Graphics">

-      <UniqueIdentifier>{c7bba1da-cea1-43fa-b344-17a3d4abc615}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Input">

-      <UniqueIdentifier>{d0c5cd2c-bc7a-437a-86ce-903b6891c0dd}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Math">

-      <UniqueIdentifier>{93deee15-5efc-4231-ab54-56f471ab701f}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Network">

-      <UniqueIdentifier>{088f2ab7-cbf6-4338-b43a-652fde8d0b4b}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Physics">

-      <UniqueIdentifier>{ec69ceaf-4fa8-4296-827e-fd4c537ec5ea}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Shaders">

-      <UniqueIdentifier>{bfc9838c-ddde-4d86-8da3-4ccebd976cde}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Utilities">

-      <UniqueIdentifier>{5bbfbd7d-379a-43e9-b05a-8f97b7f3fa3a}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Mesh">

-      <UniqueIdentifier>{e53ba507-aa27-4d67-9da4-42752bc84dc8}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Profiler">

-      <UniqueIdentifier>{158d8348-2b65-4ff1-b313-ba9f7bcfde32}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Graphics\Scripting">

-      <UniqueIdentifier>{fb970ccc-e9aa-4f61-854c-0b852503a375}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Physics\Scripting">

-      <UniqueIdentifier>{4478c64f-e27a-4be6-a189-8d99e0fc6b15}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="ImGUI">

-      <UniqueIdentifier>{c865b35b-5537-4757-927d-7476009f4de2}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Scripting">

-      <UniqueIdentifier>{e53b1cb1-9d81-47a0-8d40-566d4fd0ef80}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\..\..\Runtime\Utilities\NonCopyable.h">

-      <Filter>Utilities</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Utilities\Singleton.h">

-      <Filter>Utilities</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Graphics\Device.h">

-      <Filter>Graphics</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Mesh\Mesh.h">

-      <Filter>Mesh</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Mesh\MeshUtil.h">

-      <Filter>Mesh</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Mesh\TextMesh.h">

-      <Filter>Mesh</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Profiler\Profiler.h">

-      <Filter>Profiler</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Utilities\UIDGenerator.h">

-      <Filter>Utilities</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Graphics\Quad.h">

-      <Filter>Graphics</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Graphics\Texture.h">

-      <Filter>Graphics</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Math\Vector3.h">

-      <Filter>Math</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Graphics\ImageData.h">

-      <Filter>Graphics</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Mesh\Glyph.h">

-      <Filter>Mesh</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Math\Vector2.h">

-      <Filter>Math</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Graphics\Point.h">

-      <Filter>Graphics</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Input\Input.h">

-      <Filter>Input</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Graphics\VertexBuffer.h">

-      <Filter>Graphics</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Graphics\RenderTexture.h">

-      <Filter>Graphics</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Graphics\FrameBuffer.h">

-      <Filter>Graphics</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Utilities\UtilMacros.h">

-      <Filter>Utilities</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Utilities\Type.h">

-      <Filter>Utilities</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\FileSystem\FileSystem.h">

-      <Filter>FileSystem</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Utilities\Utf8.h">

-      <Filter>Utilities</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Utilities\Base64.h">

-      <Filter>Utilities</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Graphics\PolyLine.h">

-      <Filter>Graphics</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\FileSystem\Unzip.h">

-      <Filter>FileSystem</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Graphics\OpenGL.h">

-      <Filter>Graphics</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Mesh\Font.h">

-      <Filter>Mesh</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Graphics\Color.h">

-      <Filter>Graphics</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Utilities\Exception.h">

-      <Filter>Utilities</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Graphics\DeviceDefine.h">

-      <Filter>Graphics</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Graphics\GpuDataBuffer.h">

-      <Filter>Graphics</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Math\AABB.h">

-      <Filter>Math</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Shaders\ShaderChannel.h">

-      <Filter>Shaders</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Shaders\ShaderDefine.h">

-      <Filter>Shaders</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Shaders\ShaderUniform.h">

-      <Filter>Shaders</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Utilities\Assert.h">

-      <Filter>Utilities</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Profiler\FrameStats.h">

-      <Filter>Profiler</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Mesh\FontManager.h">

-      <Filter>Mesh</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Graphics\GlyphAtlas.h">

-      <Filter>Graphics</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Physics\Rigidbody.h">

-      <Filter>Physics</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\ImGUI\GUIButton.h">

-      <Filter>ImGUI</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\ImGUI\GUILabel.h">

-      <Filter>ImGUI</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\Runner.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\Runtime\Mesh\Mesh.cpp">

-      <Filter>Mesh</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Graphics\Device.cpp">

-      <Filter>Graphics</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Math\Vector3.cpp">

-      <Filter>Math</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Graphics\Scripting\wrap_Device.cpp">

-      <Filter>Graphics\Scripting</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Graphics\Quad.cpp">

-      <Filter>Graphics</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Graphics\Texture.cpp">

-      <Filter>Graphics</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Graphics\ImageData.cpp">

-      <Filter>Graphics</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Math\Vector2.cpp">

-      <Filter>Math</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Graphics\Point.cpp">

-      <Filter>Graphics</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Physics\Scripting\wrap_Joint.cpp">

-      <Filter>Physics\Scripting</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Input\Input.cpp">

-      <Filter>Input</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Graphics\VertexBuffer.cpp">

-      <Filter>Graphics</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Graphics\RenderTexture.cpp">

-      <Filter>Graphics</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Graphics\Scripting\wrap_RenderTexture.cpp">

-      <Filter>Graphics\Scripting</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Graphics\FrameBuffer.cpp">

-      <Filter>Graphics</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\FileSystem\FileSystem.cpp">

-      <Filter>FileSystem</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Utilities\Utf8.cpp">

-      <Filter>Utilities</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Utilities\Base64.cpp">

-      <Filter>Utilities</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Graphics\PolyLine.cpp">

-      <Filter>Graphics</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\FileSystem\Unzip.cpp">

-      <Filter>FileSystem</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Graphics\OpenGL.cpp">

-      <Filter>Graphics</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Graphics\Scripting\wrap_GL.cpp">

-      <Filter>Graphics\Scripting</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Mesh\Font.cpp">

-      <Filter>Mesh</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Graphics\GpuDataBuffer.cpp">

-      <Filter>Graphics</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Shaders\ShaderDefine.cpp">

-      <Filter>Shaders</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Graphics\GlyphAtlas.cpp">

-      <Filter>Graphics</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\ImGUI\GUIButton.cpp">

-      <Filter>ImGUI</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\ImGUI\GUILabel.cpp">

-      <Filter>ImGUI</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\Runner.cpp" />

-  </ItemGroup>

-</Project>
\ No newline at end of file
diff --git a/Runtime/Runner.cpp b/Runner/Runner.cpp
index e69de29..e69de29 100644
--- a/Runtime/Runner.cpp
+++ b/Runner/Runner.cpp
diff --git a/Runtime/Runner.h b/Runner/Runner.h
index e69de29..e69de29 100644
--- a/Runtime/Runner.h
+++ b/Runner/Runner.h
diff --git a/Runtime/Graphics/Shader.cpp b/Runtime/Graphics/Shader.cpp
index 4c41d6b..67bbe01 100644
--- a/Runtime/Graphics/Shader.cpp
+++ b/Runtime/Graphics/Shader.cpp
@@ -51,9 +51,10 @@ Shader::Shader(LuaBind::VM*vm, std::string& glslShader)
     // stlµÄstring»áÔÚ´óС³¬¹ýãÐÖµµÄÇé¿öÏÂÔÚÕ»Àï·ÖÅ䣬²¢ÓÃRAII±£Ö¤ÊÍ·Å
     std::string vsh ; 
     std::string fsh ;
+	RenderCommandGroup cmd;
     try
     {
-        GLSLCompiler::Compile(glslShader, vsh, fsh);
+        GLSLCompiler::Compile(glslShader, vsh, fsh, cmd);
     }
     catch (GLSLCompileException& e)
     {
diff --git a/Runtime/Graphics/ShaderCompiler.cpp b/Runtime/Graphics/ShaderCompiler.cpp
index ba69313..809c375 100644
--- a/Runtime/Graphics/ShaderCompiler.cpp
+++ b/Runtime/Graphics/ShaderCompiler.cpp
@@ -7,11 +7,12 @@ const char* VSH_END = "VSH_END";
 const char* FSH_BEGIN = "FSH_BEGIN";

 const char* FSH_END = "FSH_END";

 

-// GLSL·ÖΪÈý²¿·Ö

+// GLSL·ÖΪËIJ¿·Ö

+// * CMD_BEGIN ºÍ CMD_END Ö®¼äµÄÃüÁî

 // * VERTEX_SHADER_BEGIN ºÍ VERTEX_SHADER_ENDÖ®¼äµÄ¶¥µã×ÅÉ«Æ÷

 // * FRAGMENT_SHADER_BEGIN ºÍ FRAGMENT_SHADER_ENDÖ®¼äµÄƬ¶Î×ÅÉ«Æ÷

 // * Á½ÕßÖ®ÍâµÄ¹«¹²²¿·Ö

-void GLSLCompiler::Compile(std::string& src, std::string& vsh, std::string& fsh)/*throw GLSLCompileException*/

+void GLSLCompiler::Compile(std::string& src, std::string& vsh, std::string& fsh, RenderCommandGroup& cmd)/*throw GLSLCompileException*/

 {

     int vsh_begin = src.find(VSH_BEGIN);

     if (vsh_begin == string::npos)

diff --git a/Runtime/Graphics/ShaderCompiler.h b/Runtime/Graphics/ShaderCompiler.h
index 4e276c1..56ddb45 100644
--- a/Runtime/Graphics/ShaderCompiler.h
+++ b/Runtime/Graphics/ShaderCompiler.h
@@ -4,6 +4,7 @@
 #include <string>

 #include "Runtime/Threading/Mutex.h"

 #include "Runtime/Threading/Job.h"

+#include "Runtime/Graphics/RenderCommands.h"

 

 // ±àÒëGLSL(GameLab Shading Language) 

 

@@ -34,6 +35,6 @@ public:
 class GLSLCompiler

 {

 public: 

-    static void Compile(std::string& src, std::string& vsh, std::string& fsh)/*throw GLSLCompileException*/;

+    static void Compile(std::string& src, std::string& vsh, std::string& fsh, RenderCommandGroup& cmd)/*throw GLSLCompileException*/;

 

 };