From a94b3b42900d612d25bc1a40280a21fb46ffbc4b Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 28 Jan 2019 21:10:49 +0800 Subject: *misc --- .../Asura.Packer/Asura.Packer.vcxproj | 1 + .../Asura.Packer/Asura.Packer.vcxproj.filters | 6 +- Build/Asura.sln | 11 ++ Build/Samples/CursorTest/CursorTest.vcxproj | 123 +++++++++++++++++++++ .../Samples/CursorTest/CursorTest.vcxproj.filters | 6 + Build/Samples/CursorTest/CursorTest.vcxproj.user | 4 + Source/Asura.Engine/Graphics/Mesh2D.h | 2 +- Source/Asura.Engine/Scripting/Luax.hpp | 4 + Source/Asura.Framework/Class.lua | 16 ++- Source/Asura.Framework/Graphics/Animator.lua | 21 ++-- Source/Asura.Framework/Graphics/Renderer.lua | 10 ++ .../Asura.Framework/Graphics/sprite_renderer.lua | 4 + Source/Asura.Framework/class.lua | 16 ++- Source/Asura.Framework/graphics/animator.lua | 21 ++-- Source/Asura.Framework/graphics/renderer.lua | 10 ++ .../Asura.Framework/graphics/sprite_renderer.lua | 4 + Source/Samples/CursorTest/main.cpp | 8 ++ 17 files changed, 247 insertions(+), 20 deletions(-) create mode 100644 Build/Samples/CursorTest/CursorTest.vcxproj create mode 100644 Build/Samples/CursorTest/CursorTest.vcxproj.filters create mode 100644 Build/Samples/CursorTest/CursorTest.vcxproj.user create mode 100644 Source/Samples/CursorTest/main.cpp diff --git a/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj index 72a9787..b13fdc9 100644 --- a/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj +++ b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj @@ -115,6 +115,7 @@ + diff --git a/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.filters b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.filters index 9cd8510..2c4b403 100644 --- a/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.filters +++ b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.filters @@ -1,2 +1,6 @@  - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/Build/Asura.sln b/Build/Asura.sln index 657022b..74e6090 100644 --- a/Build/Asura.sln +++ b/Build/Asura.sln @@ -45,6 +45,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura.Packer", "Asura.Compi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "3rdParty\Box2D\Box2D.vcxproj", "{4122CC44-1E4C-4A08-B16F-1A650585EBD4}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CursorTest", "Samples\CursorTest\CursorTest.vcxproj", "{7B6707E6-EBB7-44CF-B850-DA606F09B26E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -205,6 +207,14 @@ Global {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|x64.Build.0 = Release|x64 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|x86.ActiveCfg = Release|Win32 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|x86.Build.0 = Release|Win32 + {7B6707E6-EBB7-44CF-B850-DA606F09B26E}.Debug|x64.ActiveCfg = Debug|x64 + {7B6707E6-EBB7-44CF-B850-DA606F09B26E}.Debug|x64.Build.0 = Debug|x64 + {7B6707E6-EBB7-44CF-B850-DA606F09B26E}.Debug|x86.ActiveCfg = Debug|Win32 + {7B6707E6-EBB7-44CF-B850-DA606F09B26E}.Debug|x86.Build.0 = Debug|Win32 + {7B6707E6-EBB7-44CF-B850-DA606F09B26E}.Release|x64.ActiveCfg = Release|x64 + {7B6707E6-EBB7-44CF-B850-DA606F09B26E}.Release|x64.Build.0 = Release|x64 + {7B6707E6-EBB7-44CF-B850-DA606F09B26E}.Release|x86.ActiveCfg = Release|Win32 + {7B6707E6-EBB7-44CF-B850-DA606F09B26E}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -221,6 +231,7 @@ Global {38019689-27C2-488F-9C50-36CA6930CEB7} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {83E0897A-E2F4-4057-8077-59C4A0C38E56} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {4122CC44-1E4C-4A08-B16F-1A650585EBD4} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} + {7B6707E6-EBB7-44CF-B850-DA606F09B26E} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} diff --git a/Build/Samples/CursorTest/CursorTest.vcxproj b/Build/Samples/CursorTest/CursorTest.vcxproj new file mode 100644 index 0000000..affd66d --- /dev/null +++ b/Build/Samples/CursorTest/CursorTest.vcxproj @@ -0,0 +1,123 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {7B6707E6-EBB7-44CF-B850-DA606F09B26E} + CursorTest + 10.0.17134.0 + + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + + + Level3 + Disabled + true + true + + + + + Level3 + Disabled + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + + + + + + + + + \ No newline at end of file diff --git a/Build/Samples/CursorTest/CursorTest.vcxproj.filters b/Build/Samples/CursorTest/CursorTest.vcxproj.filters new file mode 100644 index 0000000..9f4323e --- /dev/null +++ b/Build/Samples/CursorTest/CursorTest.vcxproj.filters @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Build/Samples/CursorTest/CursorTest.vcxproj.user b/Build/Samples/CursorTest/CursorTest.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/Build/Samples/CursorTest/CursorTest.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Source/Asura.Engine/Graphics/Mesh2D.h b/Source/Asura.Engine/Graphics/Mesh2D.h index 632b04a..cff66c4 100644 --- a/Source/Asura.Engine/Graphics/Mesh2D.h +++ b/Source/Asura.Engine/Graphics/Mesh2D.h @@ -7,7 +7,7 @@ namespace AsuraEngine { /// - /// 2D meshһЩUV + /// 2D meshһЩ㶯 /// class Mesh2D { diff --git a/Source/Asura.Engine/Scripting/Luax.hpp b/Source/Asura.Engine/Scripting/Luax.hpp index 461d5bc..5d01997 100644 --- a/Source/Asura.Engine/Scripting/Luax.hpp +++ b/Source/Asura.Engine/Scripting/Luax.hpp @@ -1,6 +1,10 @@ #ifndef __ASURA_ENGINE_LUAX_H__ #define __ASURA_ENGINE_LUAX_H__ +/// +/// Scripting with Lua. +/// + #include "Lua51/lua.h" #include "Lua51/lauxlib.h" #include "Luax/luax.h" diff --git a/Source/Asura.Framework/Class.lua b/Source/Asura.Framework/Class.lua index 164cb4a..ee30c8d 100644 --- a/Source/Asura.Framework/Class.lua +++ b/Source/Asura.Framework/Class.lua @@ -1,4 +1,16 @@ -local Class = {} -AsuraEngine.Class = Class +AsuraEngine.Class = {} +local Class = AsuraEngine.Class +Class.__index = Class +function AsuraEngine.Class.Sub(cname) + local c = {} + c.class = cname + setmetatable(c, Class) + return c +end +function AsuraEngine.Class.New(self) + local obj = {} + setmetatable(obj, self) + self.__index = self +end diff --git a/Source/Asura.Framework/Graphics/Animator.lua b/Source/Asura.Framework/Graphics/Animator.lua index 2e52104..8c8a185 100644 --- a/Source/Asura.Framework/Graphics/Animator.lua +++ b/Source/Asura.Framework/Graphics/Animator.lua @@ -1,11 +1,20 @@ -local Animator = Class(function(go) - self.gameobject = go +AsuraEngine.Animator = AsuraEngine.Component.Sub("Animator") + +local Animator = AsuraEngine.Animator + +function Animator:Ctor(go, animation) + self.base(go) self.spriteRenderer = go:GetSpriteRenderer() -end) + self.animation = animation +end -Animator.animation = AsuraEngine.Animation.None +function Animator:SetAnimation(animation) + self.animation = animation +end -local animation = AsuraEngine.Animation.New() +function Animator:GetAnimation() + return self.animation +end function Animator:OnUpdate(dt) @@ -14,5 +23,3 @@ end function Animator:OnRender() end - -return Animator \ No newline at end of file diff --git a/Source/Asura.Framework/Graphics/Renderer.lua b/Source/Asura.Framework/Graphics/Renderer.lua index 9e75026..82a8e99 100644 --- a/Source/Asura.Framework/Graphics/Renderer.lua +++ b/Source/Asura.Framework/Graphics/Renderer.lua @@ -1,9 +1,19 @@ local Renderer = AsuraEngine.Component.Sub("Renderer") AsuraEngine.Renderer = Renderer +function Renderer.Ctor(self) + self.materials = {} + self.material = nil + self.isMultiMaterials = false +end + --取材质，如果是shared，那么从此材质clone一个 function Renderer.GetMaterial(self) end +function Renderer.isMultiMaterials(self) + return self.isMultiMaterials +end + return Renderer \ No newline at end of file diff --git a/Source/Asura.Framework/Graphics/sprite_renderer.lua b/Source/Asura.Framework/Graphics/sprite_renderer.lua index 1cbebd7..925e8b1 100644 --- a/Source/Asura.Framework/Graphics/sprite_renderer.lua +++ b/Source/Asura.Framework/Graphics/sprite_renderer.lua @@ -3,6 +3,10 @@ require "graphics.renderer" local SpriteRenderer = AsuraEngine.Renderer.Sub("Spriterenderer") AsuraEngine.SpriteRenderer = SpriteRenderer +function SpriteRenderer.Ctor(self) + self.materials = {} +end + function SpriteRenderer:OnRender() end diff --git a/Source/Asura.Framework/class.lua b/Source/Asura.Framework/class.lua index 164cb4a..ee30c8d 100644 --- a/Source/Asura.Framework/class.lua +++ b/Source/Asura.Framework/class.lua @@ -1,4 +1,16 @@ -local Class = {} -AsuraEngine.Class = Class +AsuraEngine.Class = {} +local Class = AsuraEngine.Class +Class.__index = Class +function AsuraEngine.Class.Sub(cname) + local c = {} + c.class = cname + setmetatable(c, Class) + return c +end +function AsuraEngine.Class.New(self) + local obj = {} + setmetatable(obj, self) + self.__index = self +end diff --git a/Source/Asura.Framework/graphics/animator.lua b/Source/Asura.Framework/graphics/animator.lua index 2e52104..8c8a185 100644 --- a/Source/Asura.Framework/graphics/animator.lua +++ b/Source/Asura.Framework/graphics/animator.lua @@ -1,11 +1,20 @@ -local Animator = Class(function(go) - self.gameobject = go +AsuraEngine.Animator = AsuraEngine.Component.Sub("Animator") + +local Animator = AsuraEngine.Animator + +function Animator:Ctor(go, animation) + self.base(go) self.spriteRenderer = go:GetSpriteRenderer() -end) + self.animation = animation +end -Animator.animation = AsuraEngine.Animation.None +function Animator:SetAnimation(animation) + self.animation = animation +end -local animation = AsuraEngine.Animation.New() +function Animator:GetAnimation() + return self.animation +end function Animator:OnUpdate(dt) @@ -14,5 +23,3 @@ end function Animator:OnRender() end - -return Animator \ No newline at end of file diff --git a/Source/Asura.Framework/graphics/renderer.lua b/Source/Asura.Framework/graphics/renderer.lua index 9e75026..82a8e99 100644 --- a/Source/Asura.Framework/graphics/renderer.lua +++ b/Source/Asura.Framework/graphics/renderer.lua @@ -1,9 +1,19 @@ local Renderer = AsuraEngine.Component.Sub("Renderer") AsuraEngine.Renderer = Renderer +function Renderer.Ctor(self) + self.materials = {} + self.material = nil + self.isMultiMaterials = false +end + --取材质，如果是shared，那么从此材质clone一个 function Renderer.GetMaterial(self) end +function Renderer.isMultiMaterials(self) + return self.isMultiMaterials +end + return Renderer \ No newline at end of file diff --git a/Source/Asura.Framework/graphics/sprite_renderer.lua b/Source/Asura.Framework/graphics/sprite_renderer.lua index 1cbebd7..925e8b1 100644 --- a/Source/Asura.Framework/graphics/sprite_renderer.lua +++ b/Source/Asura.Framework/graphics/sprite_renderer.lua @@ -3,6 +3,10 @@ require "graphics.renderer" local SpriteRenderer = AsuraEngine.Renderer.Sub("Spriterenderer") AsuraEngine.SpriteRenderer = SpriteRenderer +function SpriteRenderer.Ctor(self) + self.materials = {} +end + function SpriteRenderer:OnRender() end diff --git a/Source/Samples/CursorTest/main.cpp b/Source/Samples/CursorTest/main.cpp new file mode 100644 index 0000000..d9798ec --- /dev/null +++ b/Source/Samples/CursorTest/main.cpp @@ -0,0 +1,8 @@ +/// +/// ޸ʽ +/// + +int main() +{ + +} \ No newline at end of file -- cgit v1.1-26-g67d0