From c97d8eb7f0900cb6895acb2e5bdce1044931b91a Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Fri, 22 Feb 2019 19:39:47 +0800
Subject: *misc

---
 Bin/win64/CursorTest.exe                           | Bin 60416 -> 60416 bytes
 Build/Asura.Editor/Asura.Editor.vcxproj            |   6 ++---
 Build/Asura.Editor/Asura.Editor.vcxproj.filters    |  28 +++++++++++++++------
 Source/Asura.Editor/Source/Editor.cpp              |   6 +++++
 Source/Asura.Editor/Source/Widget.h                |   9 -------
 Source/Asura.Editor/Source/Widgets/Widget.h        |   9 +++++++
 Source/Asura.Editor/Source/Window.h                |  14 -----------
 Source/Asura.Editor/Source/Window/Window.h         |  14 +++++++++++
 Source/Asura.Editor/Source/main.cpp                |   0
 .../Asura.Framework/scripts/graphics/animator.lua  |   4 ++-
 10 files changed, 55 insertions(+), 35 deletions(-)
 create mode 100644 Source/Asura.Editor/Source/Editor.cpp
 delete mode 100644 Source/Asura.Editor/Source/Widget.h
 create mode 100644 Source/Asura.Editor/Source/Widgets/Widget.h
 delete mode 100644 Source/Asura.Editor/Source/Window.h
 create mode 100644 Source/Asura.Editor/Source/Window/Window.h
 delete mode 100644 Source/Asura.Editor/Source/main.cpp

diff --git a/Bin/win64/CursorTest.exe b/Bin/win64/CursorTest.exe
index 3c1f1ca..ee7ef57 100644
Binary files a/Bin/win64/CursorTest.exe and b/Bin/win64/CursorTest.exe differ
diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj
index f69f18b..9acb1c5 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj
@@ -128,11 +128,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Source\Asura.Editor\Source\main.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Editor.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widget.h" />
-    <ClInclude Include="..\..\Source\Asura.Editor\Source\Window.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\Widget.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Window\Window.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj.filters b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
index 98bd8cc..da347f2 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
@@ -7,18 +7,30 @@
     <Filter Include="Source">
       <UniqueIdentifier>{df219ecb-2a99-443c-9313-5a6dc80a3255}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source\Widgets">
+      <UniqueIdentifier>{09171ec2-27ed-4124-9ca0-40c867d685b0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source\Event">
+      <UniqueIdentifier>{90dd768b-56f8-43b2-adef-c92ebcb635f0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source\Window">
+      <UniqueIdentifier>{b499aa99-d018-40dd-9c3c-d60d5f9b6079}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Scripts">
+      <UniqueIdentifier>{6ac40386-308a-4f94-a870-5aed5d6f27e3}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Source\Asura.Editor\Source\main.cpp">
-      <Filter>Source</Filter>
-    </ClCompile>
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\Widget.h">
+      <Filter>Source\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Window\Window.h">
+      <Filter>Source\Window</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widget.h">
-      <Filter>Source</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\Asura.Editor\Source\Window.h">
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Editor.cpp">
       <Filter>Source</Filter>
-    </ClInclude>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Asura.Editor/Source/Editor.cpp b/Source/Asura.Editor/Source/Editor.cpp
new file mode 100644
index 0000000..29fb76d
--- /dev/null
+++ b/Source/Asura.Editor/Source/Editor.cpp
@@ -0,0 +1,6 @@
+
+
+int main(int argc, char *argv[])
+{
+	
+}
\ No newline at end of file
diff --git a/Source/Asura.Editor/Source/Widget.h b/Source/Asura.Editor/Source/Widget.h
deleted file mode 100644
index 286fe91..0000000
--- a/Source/Asura.Editor/Source/Widget.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __ASURA_EDITOR_WIDGET_H__
-#define __ASURA_EDITOR_WIDGET_H__
-
-namespace AusraEditor
-{
-
-}
-
-#endif
\ No newline at end of file
diff --git a/Source/Asura.Editor/Source/Widgets/Widget.h b/Source/Asura.Editor/Source/Widgets/Widget.h
new file mode 100644
index 0000000..286fe91
--- /dev/null
+++ b/Source/Asura.Editor/Source/Widgets/Widget.h
@@ -0,0 +1,9 @@
+#ifndef __ASURA_EDITOR_WIDGET_H__
+#define __ASURA_EDITOR_WIDGET_H__
+
+namespace AusraEditor
+{
+
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/Asura.Editor/Source/Window.h b/Source/Asura.Editor/Source/Window.h
deleted file mode 100644
index 7b265ef..0000000
--- a/Source/Asura.Editor/Source/Window.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __ASURA_EDITOR_WINDOW_H__
-#define __ASURA_EDITOR_WINDOW_H__
-
-namespace AsuraEditor
-{
-
-	class Window
-	{
-
-	};
-
-}
-
-#endif
\ No newline at end of file
diff --git a/Source/Asura.Editor/Source/Window/Window.h b/Source/Asura.Editor/Source/Window/Window.h
new file mode 100644
index 0000000..7b265ef
--- /dev/null
+++ b/Source/Asura.Editor/Source/Window/Window.h
@@ -0,0 +1,14 @@
+#ifndef __ASURA_EDITOR_WINDOW_H__
+#define __ASURA_EDITOR_WINDOW_H__
+
+namespace AsuraEditor
+{
+
+	class Window
+	{
+
+	};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/Asura.Editor/Source/main.cpp b/Source/Asura.Editor/Source/main.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/Source/Asura.Framework/scripts/graphics/animator.lua b/Source/Asura.Framework/scripts/graphics/animator.lua
index 170d31f..5c77adc 100644
--- a/Source/Asura.Framework/scripts/graphics/animator.lua
+++ b/Source/Asura.Framework/scripts/graphics/animator.lua
@@ -1,4 +1,6 @@
-AsuraEngine.Animator = AsuraEngine.Component.Sub("Animator")
+local Component = AsuraEngine.Framework.Require("component")
+
+AsuraEngine.Animator = Component.Sub("Animator")
 
 local Animator = AsuraEngine.Animator
 
-- 
cgit v1.1-26-g67d0