*misc

8 files changed, 32 insertions, 12 deletions

diff --git a/Bin/win64/CursorTest.exe b/Bin/win64/CursorTest.exe
index 3c1f1ca..ee7ef57 100644
--- a/Bin/win64/CursorTest.exe
+++ b/Bin/win64/CursorTest.exe
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/Widgets/Widget.h
index 286fe91..286fe91 100644
--- a/Source/Asura.Editor/Source/Widget.h
+++ b/Source/Asura.Editor/Source/Widgets/Widget.h
diff --git a/Source/Asura.Editor/Source/Window.h b/Source/Asura.Editor/Source/Window/Window.h
index 7b265ef..7b265ef 100644
--- a/Source/Asura.Editor/Source/Window.h
+++ b/Source/Asura.Editor/Source/Window/Window.h
diff --git a/Source/Asura.Editor/Source/main.cpp b/Source/Asura.Editor/Source/main.cpp
deleted file mode 100644
index e69de29..0000000
--- a/Source/Asura.Editor/Source/main.cpp
+++ /dev/null
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