diff options
| author | chai <chaifix@163.com> | 2019-01-25 21:11:26 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2019-01-25 21:11:26 +0800 |
| commit | 409262a6a26972770ba64728a60d45dd2d9fb752 (patch) | |
| tree | c14b1efa27f000925c9e73a327b44e1d6ce6bb6e | |
| parent | 6d221f0f74d8ff188f5af2278213e7adaeb749b2 (diff) | |
*misc
| -rw-r--r-- | Build/Asura.Framework/Asura.Framework.vcxproj | 2 | ||||
| -rw-r--r-- | Build/Asura.Framework/Asura.Framework.vcxproj.filters | 2 | ||||
| -rw-r--r-- | Build/Asura.sln | 2 | ||||
| -rw-r--r-- | Source/Asura.Framework/Filesystem/gameobject_loader.lua | 1 | ||||
| -rw-r--r-- | Source/Asura.Framework/filesystem/entity_loader.lua | 2 | ||||
| -rw-r--r-- | Source/Asura.Framework/filesystem/gameobject_loader.lua | 1 |
6 files changed, 6 insertions, 4 deletions
diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj b/Build/Asura.Framework/Asura.Framework.vcxproj index 92c22fb..7bbd532 100644 --- a/Build/Asura.Framework/Asura.Framework.vcxproj +++ b/Build/Asura.Framework/Asura.Framework.vcxproj @@ -31,7 +31,7 @@ <None Include="..\..\Source\Asura.Framework\filesystem\scene_loader.lua" /> <None Include="..\..\Source\Asura.Framework\framework.lua" /> <None Include="..\..\Source\Asura.Framework\game.lua" /> - <None Include="..\..\Source\Asura.Framework\gameobject.lua" /> + <None Include="..\..\Source\Asura.Framework\entity.lua" /> <None Include="..\..\Source\Asura.Framework\graphics\animation.lua" /> <None Include="..\..\Source\Asura.Framework\graphics\animator.lua" /> <None Include="..\..\Source\Asura.Framework\graphics\camera.lua" /> diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj.filters b/Build/Asura.Framework/Asura.Framework.vcxproj.filters index 14878fd..322661c 100644 --- a/Build/Asura.Framework/Asura.Framework.vcxproj.filters +++ b/Build/Asura.Framework/Asura.Framework.vcxproj.filters @@ -31,7 +31,6 @@ <None Include="..\..\Source\Asura.Framework\component.lua" /> <None Include="..\..\Source\Asura.Framework\framework.lua" /> <None Include="..\..\Source\Asura.Framework\game.lua" /> - <None Include="..\..\Source\Asura.Framework\gameobject.lua" /> <None Include="..\..\Source\Asura.Framework\object.lua" /> <None Include="..\..\Source\Asura.Framework\scene.lua" /> <None Include="..\..\Source\Asura.Framework\transform.lua" /> @@ -116,5 +115,6 @@ <None Include="..\..\Source\Asura.Framework\path\path_manager.lua"> <Filter>path</Filter> </None> + <None Include="..\..\Source\Asura.Framework\entity.lua" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/Build/Asura.sln b/Build/Asura.sln index 04c343a..a65386b 100644 --- a/Build/Asura.sln +++ b/Build/Asura.sln @@ -29,6 +29,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura.Packer", "Asura.Compi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura.Unpacker", "Asura.Unpacker\Asura.Unpacker.vcxproj", "{092155A4-23DF-49E1-9353-03C4DDBAB7BC}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{E068D138-C824-4365-B5A3-27C65E8FD0B5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 diff --git a/Source/Asura.Framework/Filesystem/gameobject_loader.lua b/Source/Asura.Framework/Filesystem/gameobject_loader.lua deleted file mode 100644 index b2234dc..0000000 --- a/Source/Asura.Framework/Filesystem/gameobject_loader.lua +++ /dev/null @@ -1 +0,0 @@ -local GameObjectLoader =
\ No newline at end of file diff --git a/Source/Asura.Framework/filesystem/entity_loader.lua b/Source/Asura.Framework/filesystem/entity_loader.lua new file mode 100644 index 0000000..ad2351c --- /dev/null +++ b/Source/Asura.Framework/filesystem/entity_loader.lua @@ -0,0 +1,2 @@ +local EntityLoader = AsuraEngine.Loader.New("entity") + diff --git a/Source/Asura.Framework/filesystem/gameobject_loader.lua b/Source/Asura.Framework/filesystem/gameobject_loader.lua deleted file mode 100644 index b2234dc..0000000 --- a/Source/Asura.Framework/filesystem/gameobject_loader.lua +++ /dev/null @@ -1 +0,0 @@ -local GameObjectLoader =
\ No newline at end of file |