*miscHEADmaster

2 files changed, 78 insertions, 94 deletions

diff --git a/Build/modules/asura-core/asura-core.vcxproj b/Build/modules/asura-core/asura-core.vcxproj
index f548922..5b2dd32 100644
--- a/Build/modules/asura-core/asura-core.vcxproj
+++ b/Build/modules/asura-core/asura-core.vcxproj
@@ -128,19 +128,19 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\CoreModule.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Font\Glyph.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Font\String.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\Font\TTF.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\binding\_canvas.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_color.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_color32.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_gfx_device.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_gpu_buffer.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_image.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_index_buffer.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_mesh2d.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_shader.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_sprite_batch.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_texture.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_vertex_buffer.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Font\TTFImporter.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\Canvas.binding.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\Color.binding.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\Color32.binding.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\GfxDevice.binding.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\GPUBuffer.binding.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\Image.binding.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\IndexBuffer.binding.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\Mesh.binding.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\Shader.binding.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\SpriteBatch.binding.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\Texture.binding.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\VertexBuffer.binding.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Canvas.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Color.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Color32.cpp" />
@@ -149,18 +149,17 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\GfxDevice.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\GPUBuffer.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\GraphicsHelper.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Image.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\IndexBuffer.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\MatrixStack.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Mesh2D.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\Mesh.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Polygon2D.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Quad.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\RenderTarget.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\RenderTexture.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Shader.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Shape.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\SpriteBatch.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Texture.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\VBO.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\VBOs.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\VertexBuffer.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\image\binding\_image_data.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\image\binding\_image_decode_task.cpp" />
@@ -194,8 +193,7 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\CoreModule.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Font\Glyph.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Font\String.hpp" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\Font\TTF.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\Font\Utf.hpp" />
+    <ClInclude Include="..\..\..\Source\modules\asura-core\Font\TTFImporter.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\BlendMode.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Canvas.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Color.h" />
@@ -206,19 +204,18 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\GfxDevice.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\GPUBuffer.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\GraphicsHelper.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Image.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\IndexBuffer.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\MatrixStack.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Mesh2D.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-core\Graphics\Mesh.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Polygon2D.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Quad.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\RenderState.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\RenderTarget.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\RenderTexture.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Shader.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Shape.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\SpriteBatch.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Texture.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\VBO.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\VBOs.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\VertexBuffer.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Image\ImageData.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Image\ImageDecoder.h" />
@@ -264,7 +261,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\source\modules\asura-core\Font\String.inc" />
-    <None Include="..\..\..\source\modules\asura-core\Font\Utf.inc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Build/modules/asura-core/asura-core.vcxproj.filters b/Build/modules/asura-core/asura-core.vcxproj.filters
index cf39389..5ffc385 100644
--- a/Build/modules/asura-core/asura-core.vcxproj.filters
+++ b/Build/modules/asura-core/asura-core.vcxproj.filters
@@ -42,27 +42,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_color.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_color32.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_image.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_mesh2d.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_shader.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_sprite_batch.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_texture.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\window\binding\_window.cpp">
       <Filter>Window\binding</Filter>
     </ClCompile>
@@ -72,27 +51,12 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\image\binding\_image_decode_task.cpp">
       <Filter>Image\binding</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_gpu_buffer.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_index_buffer.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_vertex_buffer.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_gfx_device.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Font\Glyph.cpp">
       <Filter>Font</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Font\String.cpp">
       <Filter>Font</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\Font\TTF.cpp">
-      <Filter>Font</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Canvas.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
@@ -108,24 +72,15 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\GPUBuffer.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Image.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\IndexBuffer.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\MatrixStack.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Mesh2D.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Quad.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\RenderTarget.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Shader.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
@@ -215,18 +170,60 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\GraphicsHelper.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\VBO.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Input\InputEvent.cpp">
       <Filter>Input</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Input\InputAxis.cpp">
       <Filter>Input</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\binding\_canvas.cpp">
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\Mesh.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Font\TTFImporter.cpp">
+      <Filter>Font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\VBOs.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\Canvas.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\Color.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\Color32.binding.cpp">
       <Filter>Graphics\Binding</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\GfxDevice.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\GPUBuffer.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\Image.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\IndexBuffer.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\Mesh.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\Shader.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\SpriteBatch.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\Texture.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\VertexBuffer.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\RenderTexture.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\source\modules\asura-core\Font\Glyph.h">
@@ -235,9 +232,6 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\Font\String.hpp">
       <Filter>Font</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\Font\TTF.h">
-      <Filter>Font</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\BlendMode.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -259,27 +253,18 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\GPUBuffer.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Image.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\IndexBuffer.h">
       <Filter>Graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\MatrixStack.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Mesh2D.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Quad.h">
       <Filter>Graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\RenderState.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\RenderTarget.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Shader.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -373,9 +358,6 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\Threads\ThreadEx.h">
       <Filter>Threads</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\Font\Utf.hpp">
-      <Filter>Font</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\DrawInfo.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -388,22 +370,28 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\GraphicsHelper.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\VBO.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Input\InputEvent.h">
       <Filter>Input</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Input\InputAxis.h">
       <Filter>Input</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Source\modules\asura-core\Graphics\Mesh.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\modules\asura-core\Font\TTFImporter.h">
+      <Filter>Font</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\VBOs.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\RenderTexture.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\source\modules\asura-core\Font\String.inc">
       <Filter>Font</Filter>
     </None>
-    <None Include="..\..\..\source\modules\asura-core\Font\Utf.inc">
-      <Filter>Font</Filter>
-    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file