diff options
19 files changed, 77 insertions, 62 deletions
diff --git a/Bin/win64/CursorTest.exe b/Bin/win64/CursorTest.exe Binary files differindex 069d236..03daf2c 100644 --- a/Bin/win64/CursorTest.exe +++ b/Bin/win64/CursorTest.exe diff --git a/Bin/win64/SDL2.dll b/Bin/win64/SDL2.dll Binary files differindex 2823c44..fa0a9d6 100644 --- a/Bin/win64/SDL2.dll +++ b/Bin/win64/SDL2.dll diff --git a/Build/3rdParty/vorbis/vorbis.vcxproj.filters b/Build/3rdParty/vorbis/vorbis.vcxproj.filters index 3c6f4fd..9cd8510 100644 --- a/Build/3rdParty/vorbis/vorbis.vcxproj.filters +++ b/Build/3rdParty/vorbis/vorbis.vcxproj.filters @@ -1,17 +1,2 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="源文件"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="头文件"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions> - </Filter> - <Filter Include="资源文件"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> - </ItemGroup> -</Project>
\ No newline at end of file +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file diff --git a/Build/3rdParty/zlib/zlib.vcxproj.filters b/Build/3rdParty/zlib/zlib.vcxproj.filters index 3c6f4fd..9cd8510 100644 --- a/Build/3rdParty/zlib/zlib.vcxproj.filters +++ b/Build/3rdParty/zlib/zlib.vcxproj.filters @@ -1,17 +1,2 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="源文件"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="头文件"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions> - </Filter> - <Filter Include="资源文件"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> - </ItemGroup> -</Project>
\ No newline at end of file +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file diff --git a/Build/Asura.Runner/Asura.Runner.vcxproj b/Build/Asura.Runner/Asura.Runner.vcxproj index d3b7d1e..7661cc6 100644 --- a/Build/Asura.Runner/Asura.Runner.vcxproj +++ b/Build/Asura.Runner/Asura.Runner.vcxproj @@ -86,6 +86,7 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -108,6 +109,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <EnableCOMDATFolding>true</EnableCOMDATFolding> diff --git a/Build/Samples/CursorTest/CursorTest.vcxproj b/Build/Samples/CursorTest/CursorTest.vcxproj index f9793f7..94b1d6b 100644 --- a/Build/Samples/CursorTest/CursorTest.vcxproj +++ b/Build/Samples/CursorTest/CursorTest.vcxproj @@ -81,7 +81,11 @@ <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> + <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdParty</AdditionalIncludeDirectories> </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -113,10 +117,12 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> + <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdParty</AdditionalIncludeDirectories> </ClCompile> <Link> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> + <SubSystem>Windows</SubSystem> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/Source/3rdParty/SDL2/src/main/windows/SDL_windows_main.c b/Source/3rdParty/SDL2/src/main/windows/SDL_windows_main.c index 32f6727..9c07cda 100644 --- a/Source/3rdParty/SDL2/src/main/windows/SDL_windows_main.c +++ b/Source/3rdParty/SDL2/src/main/windows/SDL_windows_main.c @@ -121,7 +121,7 @@ OutOfMemory(void) static int main_getcmdline() { - char **argv; + char **argv = 0; int argc; char *cmdline = NULL; int retval = 0; diff --git a/Source/Asura.Engine/Graphics/Canvas.h b/Source/Asura.Engine/Graphics/Canvas.h index 67d7a63..fab9cba 100644 --- a/Source/Asura.Engine/Graphics/Canvas.h +++ b/Source/Asura.Engine/Graphics/Canvas.h @@ -16,8 +16,7 @@ namespace AsuraEngine private: - // AsuraEngine.SimCanvas - LUAX_DECL_FACTORY(SimCanvas); + LUAX_DECL_FACTORY(SimCanvas); // AsuraEngine.SimCanvas }; diff --git a/Source/Asura.Engine/Graphics/Color.h b/Source/Asura.Engine/Graphics/Color.h index 40b55e4..f07919c 100644 --- a/Source/Asura.Engine/Graphics/Color.h +++ b/Source/Asura.Engine/Graphics/Color.h @@ -8,20 +8,36 @@ namespace AsuraEngine namespace Graphics { + class Color; + /// /// 32bitsɫ /// - class Color + class Color32 { public: - Color(byte r, byte g, byte b, byte a); - ~Color(); + Color32(Color c); + Color32(byte r, byte g, byte b, byte a); byte r, g, b, a; private: + LUAX_DECL_FACTORY(Color32); + + }; + + class Color + { + public: + + Color(Color32 c32); + + float r, g, b, a; + + private: + LUAX_DECL_FACTORY(Color); }; diff --git a/Source/Asura.Framework/scripts/ai/state_graph.lua b/Source/Asura.Framework/scripts/ai/state_graph.lua new file mode 100644 index 0000000..a699e76 --- /dev/null +++ b/Source/Asura.Framework/scripts/ai/state_graph.lua @@ -0,0 +1,11 @@ +local StateGraph = AsuraEngine.Asset.Sub("StateGraph") + +AsuraEngine.StateGraph = StateGraph + +function StateGraph.Ctor(self) + +end + +function StateGraph.ToAsset() + +end
\ No newline at end of file diff --git a/Source/Asura.Framework/scripts/ai/state_machine.lua b/Source/Asura.Framework/scripts/ai/state_machine.lua index b1ff849..66276a0 100644 --- a/Source/Asura.Framework/scripts/ai/state_machine.lua +++ b/Source/Asura.Framework/scripts/ai/state_machine.lua @@ -1,6 +1,6 @@ local StateMachine = Class() AsuraEngine.StateMachine = StateMachine -function StateMachine.Ctor(self, statemap) - self.statemap = statemap +function StateMachine.Ctor(self, stategraph) + self.stategraph = stategraph end
\ No newline at end of file diff --git a/Source/Asura.Framework/scripts/ai/state_map.lua b/Source/Asura.Framework/scripts/ai/state_map.lua deleted file mode 100644 index 7e986de..0000000 --- a/Source/Asura.Framework/scripts/ai/state_map.lua +++ /dev/null @@ -1,12 +0,0 @@ -local StateMap = AsuraEngine.Asset.Sub("StateMap") - -AsuraEngine.StateMap = StateMap - -function StateMap.Ctor(self) - -end - -function StateMap.ToAsset() - -end - diff --git a/Source/Asura.Framework/scripts/framework.lua b/Source/Asura.Framework/scripts/framework.lua index 14e7b24..5da0020 100644 --- a/Source/Asura.Framework/scripts/framework.lua +++ b/Source/Asura.Framework/scripts/framework.lua @@ -1,2 +1,21 @@ ---框架入口文件 +package.path = "scripts\\?.lua" + +--loader +local loadfn = function(modulename) + local errmsg = "" + local modulepath = string.gsub(modulename, "%.", "/") + for path in string.gmatch(package.path, "([^;]+)") do + local filename = string.gsub(path, "%?", modulepath) + filename = string.gsub(filename, "\\", "/") + local result = kleiloadlua(filename) + if result then + return result + end + errmsg = errmsg.."\n\tno file '"..filename.."' (checked with custom loader)" + end + return errmsg +end + +table.insert(package.loaders, 1, loadfn) + require "" diff --git a/Source/Asura.Framework/scripts/graphics/image.lua b/Source/Asura.Framework/scripts/graphics/image.lua index ae91466..c96906b 100644 --- a/Source/Asura.Framework/scripts/graphics/image.lua +++ b/Source/Asura.Framework/scripts/graphics/image.lua @@ -35,4 +35,6 @@ end --image不可再编辑器编辑，所以没有ToAsset方法 --function Image.ToAsset() ---end
\ No newline at end of file +--end + +return Image
\ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/renderer.lua b/Source/Asura.Framework/scripts/graphics/renderer.lua index 46fd548..a7091b0 100644 --- a/Source/Asura.Framework/scripts/graphics/renderer.lua +++ b/Source/Asura.Framework/scripts/graphics/renderer.lua @@ -2,9 +2,9 @@ local Renderer = AsuraEngine.Component.Sub("Renderer") AsuraEngine.Renderer = Renderer function Renderer.Ctor(self) - self.mMaterials = {} - self.mMaterial = nil - self.mIsMultiMaterials = false + self.materials = {} + self.material = nil + self.isMultiMaterials = false end --取材质，如果是shared，那么从此材质clone一个 @@ -13,7 +13,7 @@ function Renderer.GetMaterial(self) end function Renderer.IsMultiMaterials(self) - return self.mIsMultiMaterials + return self.isMultiMaterials end return Renderer
\ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua b/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua index 2d1fae5..93937d7 100644 --- a/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua +++ b/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua @@ -4,7 +4,7 @@ local SpriteRenderer = AsuraEngine.Renderer.Sub("Spriterenderer") AsuraEngine.SpriteRenderer = SpriteRenderer function SpriteRenderer.Ctor(self) - self.mMaterials = {} + self.materials = {} end function SpriteRenderer:OnRender() diff --git a/Source/Asura.Framework/scripts/managers/scene_manager.lua b/Source/Asura.Framework/scripts/managers/scene_manager.lua index fc5a6ba..8c4e24f 100644 --- a/Source/Asura.Framework/scripts/managers/scene_manager.lua +++ b/Source/Asura.Framework/scripts/managers/scene_manager.lua @@ -13,4 +13,4 @@ function SceneManager.GetSceneByGUID() end -return SceneManager
\ No newline at end of file +return SceneManager
\ No newline at end of file diff --git a/Source/Asura.Runner/main.cpp b/Source/Asura.Runner/main.cpp index 218b1a9..2501188 100644 --- a/Source/Asura.Runner/main.cpp +++ b/Source/Asura.Runner/main.cpp @@ -1,3 +1,5 @@ +#include "SDl2/SDL.h" + // ϷᱻһԴļrunnerȡݣϷ // RunnerֻܶȡpackerϷļeditorֱϷassetsRunnerһСл int main() diff --git a/Source/Samples/CursorTest/main.cpp b/Source/Samples/CursorTest/main.cpp index c41b83a..803503a 100644 --- a/Source/Samples/CursorTest/main.cpp +++ b/Source/Samples/CursorTest/main.cpp @@ -4,7 +4,7 @@ #include "SDL2/SDL.h" -int main() +int main(int argc, char* args[]) { - + return 0; }
\ No newline at end of file |