summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2019-01-22 20:06:22 +0800
committerchai <chaifix@163.com>2019-01-22 20:06:22 +0800
commitc1330b1ea3525eec2d09b070167df563f3917ff9 (patch)
tree8acdc9d2fa8b6dd027ed8930314320864d78229e
parent90b11fbb0e4c578bf507370e102d6a5ed30ba31e (diff)
*修改文件名大小写
-rw-r--r--Samples/Hello/shaders/sh_thunder.shader.asset16
-rw-r--r--Source/Asura.Framework/README.md3
-rw-r--r--Source/Asura.Framework/ai/statemachine.lua3
-rw-r--r--Source/Asura.Framework/audio/soundplayer.lua3
-rw-r--r--Source/Asura.Framework/class.lua3
-rw-r--r--Source/Asura.Framework/component.lua21
-rw-r--r--Source/Asura.Framework/filesystem/animationloader.lua11
-rw-r--r--Source/Asura.Framework/filesystem/gameobjectloader.lua (renamed from Source/Asura.Framework/Filesystem/PrefabLoader.lua)0
-rw-r--r--Source/Asura.Framework/filesystem/loader.lua22
-rw-r--r--Source/Asura.Framework/filesystem/materialloader.lua10
-rw-r--r--Source/Asura.Framework/filesystem/pathloader.lua11
-rw-r--r--Source/Asura.Framework/filesystem/sceneloader.lua0
-rw-r--r--Source/Asura.Framework/framework.lua1
-rw-r--r--Source/Asura.Framework/game.lua1
-rw-r--r--Source/Asura.Framework/gameobject.lua59
-rw-r--r--Source/Asura.Framework/graphics/animation.lua6
-rw-r--r--Source/Asura.Framework/graphics/animator.lua18
-rw-r--r--Source/Asura.Framework/graphics/camera.lua7
-rw-r--r--Source/Asura.Framework/graphics/canvasrenderer.lua0
-rw-r--r--Source/Asura.Framework/graphics/defaultshaders.lua5
-rw-r--r--Source/Asura.Framework/graphics/material.lua26
-rw-r--r--Source/Asura.Framework/graphics/materialmanager.lua5
-rw-r--r--Source/Asura.Framework/graphics/mesh2drenderer.lua5
-rw-r--r--Source/Asura.Framework/graphics/particlesystem.lua3
-rw-r--r--Source/Asura.Framework/graphics/renderer.lua3
-rw-r--r--Source/Asura.Framework/graphics/shaperenderer.lua0
-rw-r--r--Source/Asura.Framework/graphics/spritebatchrenderer.lua0
-rw-r--r--Source/Asura.Framework/graphics/spriterenderer.lua7
-rw-r--r--Source/Asura.Framework/gui/button.lua7
-rw-r--r--Source/Asura.Framework/gui/text.lua0
-rw-r--r--Source/Asura.Framework/math/curve.lua0
-rw-r--r--Source/Asura.Framework/object.lua0
-rw-r--r--Source/Asura.Framework/path/path.lua13
-rw-r--r--Source/Asura.Framework/path/pathcalculator.lua12
-rw-r--r--Source/Asura.Framework/path/pathmanager.lua0
-rw-r--r--Source/Asura.Framework/scene.lua8
-rw-r--r--Source/Asura.Framework/transform.lua0
37 files changed, 278 insertions, 11 deletions
diff --git a/Samples/Hello/shaders/sh_thunder.shader.asset b/Samples/Hello/shaders/sh_thunder.shader.asset
index 9e340c7..18310cb 100644
--- a/Samples/Hello/shaders/sh_thunder.shader.asset
+++ b/Samples/Hello/shaders/sh_thunder.shader.asset
@@ -1,15 +1,15 @@
{
type="shader",
vertex=[[
- void main()
- {
-
- }
+void main()
+{
+
+}
]],
fragment=[[
- void main()
- {
-
- }
+void main()
+{
+
+}
]]
} \ No newline at end of file
diff --git a/Source/Asura.Framework/README.md b/Source/Asura.Framework/README.md
deleted file mode 100644
index c803f1f..0000000
--- a/Source/Asura.Framework/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-
-AsuraFrameworkǿܣʹECSģʽչasset
-
diff --git a/Source/Asura.Framework/ai/statemachine.lua b/Source/Asura.Framework/ai/statemachine.lua
new file mode 100644
index 0000000..58012ca
--- /dev/null
+++ b/Source/Asura.Framework/ai/statemachine.lua
@@ -0,0 +1,3 @@
+local StateMachine = Class()
+
+return StateMachine \ No newline at end of file
diff --git a/Source/Asura.Framework/audio/soundplayer.lua b/Source/Asura.Framework/audio/soundplayer.lua
new file mode 100644
index 0000000..8bbeddb
--- /dev/null
+++ b/Source/Asura.Framework/audio/soundplayer.lua
@@ -0,0 +1,3 @@
+local SoundPlayer = AsuraEngine.Component.New("SoundPlayer")
+
+return SoundPlayer \ No newline at end of file
diff --git a/Source/Asura.Framework/class.lua b/Source/Asura.Framework/class.lua
new file mode 100644
index 0000000..78c577c
--- /dev/null
+++ b/Source/Asura.Framework/class.lua
@@ -0,0 +1,3 @@
+function Class()
+
+end \ No newline at end of file
diff --git a/Source/Asura.Framework/component.lua b/Source/Asura.Framework/component.lua
new file mode 100644
index 0000000..027c066
--- /dev/null
+++ b/Source/Asura.Framework/component.lua
@@ -0,0 +1,21 @@
+local Component = Class()
+
+Component.gameobject = AsuraEngine.Type.GameObject
+
+function Component:Ctor(go)
+ self.gameobject = go
+end
+
+function Component:OnEvent(e)
+
+end
+
+function Component:OnUpdate(ms)
+
+end
+
+function Component:OnDraw()
+
+end
+
+return Component \ No newline at end of file
diff --git a/Source/Asura.Framework/filesystem/animationloader.lua b/Source/Asura.Framework/filesystem/animationloader.lua
new file mode 100644
index 0000000..f1dee29
--- /dev/null
+++ b/Source/Asura.Framework/filesystem/animationloader.lua
@@ -0,0 +1,11 @@
+local AnimationLoader = AsuraEngine.Loader.New("animation")
+local AnimationManager = require "AnimationManager"
+local Animation = require "Animation"
+
+function AnimationLoader.Load(asset)
+
+ local animation = AsuraEngine.Class()
+
+end
+
+return AnimationLoader \ No newline at end of file
diff --git a/Source/Asura.Framework/Filesystem/PrefabLoader.lua b/Source/Asura.Framework/filesystem/gameobjectloader.lua
index e69de29..e69de29 100644
--- a/Source/Asura.Framework/Filesystem/PrefabLoader.lua
+++ b/Source/Asura.Framework/filesystem/gameobjectloader.lua
diff --git a/Source/Asura.Framework/filesystem/loader.lua b/Source/Asura.Framework/filesystem/loader.lua
new file mode 100644
index 0000000..fbbd68a
--- /dev/null
+++ b/Source/Asura.Framework/filesystem/loader.lua
@@ -0,0 +1,22 @@
+--[[
+࣬ԶԴ̳ͨдർ롣ԶԴıǷ
+<asset>
+ <extern>./resource.maptile</extern>
+</asset>
+ָ˵impoter֮ԶԴͨз:
+<maptile>
+ <extern>./resource.maptile</extern>
+</maptile>
+ʹöӦڲԴ͵importerԴ
+
+]]
+
+local importer = Class()
+
+function importer:InnerResource( data )
+
+
+
+end
+
+return importer \ No newline at end of file
diff --git a/Source/Asura.Framework/filesystem/materialloader.lua b/Source/Asura.Framework/filesystem/materialloader.lua
new file mode 100644
index 0000000..8ecfa51
--- /dev/null
+++ b/Source/Asura.Framework/filesystem/materialloader.lua
@@ -0,0 +1,10 @@
+local MaterialLoader = AsuraEngine.Loader.New("material")
+local MaterialManager = require "MaterialManager"
+
+function MaterialLoader.Load(mat)
+
+
+
+end
+
+return MaterialLoader \ No newline at end of file
diff --git a/Source/Asura.Framework/filesystem/pathloader.lua b/Source/Asura.Framework/filesystem/pathloader.lua
new file mode 100644
index 0000000..b9112df
--- /dev/null
+++ b/Source/Asura.Framework/filesystem/pathloader.lua
@@ -0,0 +1,11 @@
+local PathLoader = AsuraEngine.Loader.New("path")
+local PathManager = require "Path/PathManager"
+
+function PathLoader.Load(asset)
+ if asset.type ~= "path" then
+ return nil
+ end
+
+end
+
+return Path \ No newline at end of file
diff --git a/Source/Asura.Framework/filesystem/sceneloader.lua b/Source/Asura.Framework/filesystem/sceneloader.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/filesystem/sceneloader.lua
diff --git a/Source/Asura.Framework/framework.lua b/Source/Asura.Framework/framework.lua
new file mode 100644
index 0000000..b465f78
--- /dev/null
+++ b/Source/Asura.Framework/framework.lua
@@ -0,0 +1 @@
+require "" \ No newline at end of file
diff --git a/Source/Asura.Framework/game.lua b/Source/Asura.Framework/game.lua
new file mode 100644
index 0000000..3e44b53
--- /dev/null
+++ b/Source/Asura.Framework/game.lua
@@ -0,0 +1 @@
+--űѭ
diff --git a/Source/Asura.Framework/gameobject.lua b/Source/Asura.Framework/gameobject.lua
new file mode 100644
index 0000000..1b328ca
--- /dev/null
+++ b/Source/Asura.Framework/gameobject.lua
@@ -0,0 +1,59 @@
+local GameObject = AsuraEngine.Asset.SubClass("GameObject")
+
+function GameObject:OnEnable()
+
+end
+
+function GameObject:OnEvent(e)
+
+end
+
+function GameObject:OnUpdate(dt)
+
+end
+
+function GameObject:OnRender()
+
+end
+
+function GameObject:OnDisable()
+
+end
+
+function GameObject:GetTrasform()
+
+end
+
+function GameObject:GetPosition()
+
+end
+
+function GameObject:GetScale()
+
+end
+
+function GameObject:GetRotation()
+
+end
+
+function GameObject:SetTrasform(transform)
+
+end
+
+function GameObject:SetPosition()
+
+end
+
+function GameObject:SetScale()
+
+end
+
+function GameObject:SetRotation()
+
+end
+
+function GameObject:ToAsset()
+
+end
+
+return GameObject \ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/animation.lua b/Source/Asura.Framework/graphics/animation.lua
new file mode 100644
index 0000000..8b52683
--- /dev/null
+++ b/Source/Asura.Framework/graphics/animation.lua
@@ -0,0 +1,6 @@
+--animation assetĬԴ
+local Animation = AsuraEngine.Asset.New("animation")
+
+
+
+AsuraEngine.Animation = Animation \ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/animator.lua b/Source/Asura.Framework/graphics/animator.lua
new file mode 100644
index 0000000..1dca9f4
--- /dev/null
+++ b/Source/Asura.Framework/graphics/animator.lua
@@ -0,0 +1,18 @@
+local Animator = Class(function(go)
+ self.gameobject = go
+ self.spriteRenderer = go:GetSpriteRenderer()
+end)
+
+Animator.animation = AsuraEngine.Animation.None
+
+local animation = AsuraEngine.Animation.New()
+
+function Animator:OnUpdate(dt)
+
+end
+
+function Animator:OnRender()
+
+end
+
+return Animator \ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/camera.lua b/Source/Asura.Framework/graphics/camera.lua
new file mode 100644
index 0000000..41d4394
--- /dev/null
+++ b/Source/Asura.Framework/graphics/camera.lua
@@ -0,0 +1,7 @@
+local Camera = Class()
+
+Camera.mIsOnScreen = false
+
+Camera.mIsCulling = false
+
+return Camera \ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/canvasrenderer.lua b/Source/Asura.Framework/graphics/canvasrenderer.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/graphics/canvasrenderer.lua
diff --git a/Source/Asura.Framework/graphics/defaultshaders.lua b/Source/Asura.Framework/graphics/defaultshaders.lua
new file mode 100644
index 0000000..bd54cb9
--- /dev/null
+++ b/Source/Asura.Framework/graphics/defaultshaders.lua
@@ -0,0 +1,5 @@
+--[[
+õshaders.
+]]
+
+
diff --git a/Source/Asura.Framework/graphics/material.lua b/Source/Asura.Framework/graphics/material.lua
new file mode 100644
index 0000000..5f7a7fa
--- /dev/null
+++ b/Source/Asura.Framework/graphics/material.lua
@@ -0,0 +1,26 @@
+--[[
+ʣǶshaderĴ
+]]
+local Material = AsuraEngine.Class()
+
+function Material:Ctor()
+
+end
+
+function Material:ToAsset()
+
+end
+
+function Material:GetUniform(id, value)
+
+end
+
+function Material:SendFloat()
+
+end
+
+function Material:GetUniformID()
+
+end
+
+return Material \ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/materialmanager.lua b/Source/Asura.Framework/graphics/materialmanager.lua
new file mode 100644
index 0000000..46cc13d
--- /dev/null
+++ b/Source/Asura.Framework/graphics/materialmanager.lua
@@ -0,0 +1,5 @@
+local MaterialManager = AsuraEngine.Manager.New()
+
+
+
+return MaterialManager \ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/mesh2drenderer.lua b/Source/Asura.Framework/graphics/mesh2drenderer.lua
new file mode 100644
index 0000000..01f0d90
--- /dev/null
+++ b/Source/Asura.Framework/graphics/mesh2drenderer.lua
@@ -0,0 +1,5 @@
+local Mesh2DRenderer = Class()
+
+
+
+return Mesh2DRenderer \ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/particlesystem.lua b/Source/Asura.Framework/graphics/particlesystem.lua
new file mode 100644
index 0000000..21c35b8
--- /dev/null
+++ b/Source/Asura.Framework/graphics/particlesystem.lua
@@ -0,0 +1,3 @@
+--ϵͳһ
+
+local ParticleSystem
diff --git a/Source/Asura.Framework/graphics/renderer.lua b/Source/Asura.Framework/graphics/renderer.lua
new file mode 100644
index 0000000..1e44c73
--- /dev/null
+++ b/Source/Asura.Framework/graphics/renderer.lua
@@ -0,0 +1,3 @@
+local Renderer = Class()
+
+return Renderer \ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/shaperenderer.lua b/Source/Asura.Framework/graphics/shaperenderer.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/graphics/shaperenderer.lua
diff --git a/Source/Asura.Framework/graphics/spritebatchrenderer.lua b/Source/Asura.Framework/graphics/spritebatchrenderer.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/graphics/spritebatchrenderer.lua
diff --git a/Source/Asura.Framework/graphics/spriterenderer.lua b/Source/Asura.Framework/graphics/spriterenderer.lua
new file mode 100644
index 0000000..79177ba
--- /dev/null
+++ b/Source/Asura.Framework/graphics/spriterenderer.lua
@@ -0,0 +1,7 @@
+local SpriteRenderer = Class()
+
+function SpriteRenderer:OnRender()
+
+end
+
+return SpriteRenderer \ No newline at end of file
diff --git a/Source/Asura.Framework/gui/button.lua b/Source/Asura.Framework/gui/button.lua
new file mode 100644
index 0000000..a63cc01
--- /dev/null
+++ b/Source/Asura.Framework/gui/button.lua
@@ -0,0 +1,7 @@
+-- Ϸimgui
+
+local Button = AsuraEngine.Component.Extend("Button")
+
+
+
+return Button \ No newline at end of file
diff --git a/Source/Asura.Framework/gui/text.lua b/Source/Asura.Framework/gui/text.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/gui/text.lua
diff --git a/Source/Asura.Framework/math/curve.lua b/Source/Asura.Framework/math/curve.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/math/curve.lua
diff --git a/Source/Asura.Framework/object.lua b/Source/Asura.Framework/object.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/object.lua
diff --git a/Source/Asura.Framework/path/path.lua b/Source/Asura.Framework/path/path.lua
new file mode 100644
index 0000000..3b6079d
--- /dev/null
+++ b/Source/Asura.Framework/path/path.lua
@@ -0,0 +1,13 @@
+local Path = AsuraEngine.Asset.New("path")
+
+function Path:Ctor()
+
+end
+
+-- ToAssetѶpathתΪ.assetļʽ
+function Path.ToAsset(path)
+ local builder = AsuraEngine.AssetBuilder.Get()
+
+end
+
+return Path \ No newline at end of file
diff --git a/Source/Asura.Framework/path/pathcalculator.lua b/Source/Asura.Framework/path/pathcalculator.lua
new file mode 100644
index 0000000..1a564b8
--- /dev/null
+++ b/Source/Asura.Framework/path/pathcalculator.lua
@@ -0,0 +1,12 @@
+--[[
+ڱ༭componentsб
+]]
+local PathCalculator = AsuraEngine.Component.New("PathCalculator")
+
+PathCalculator.path = AsuraEngine.Asset.Type("path", "·")
+
+function PathCalculator:ctor(path)
+ self.path = path
+end
+
+return PathCalculator \ No newline at end of file
diff --git a/Source/Asura.Framework/path/pathmanager.lua b/Source/Asura.Framework/path/pathmanager.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/path/pathmanager.lua
diff --git a/Source/Asura.Framework/scene.lua b/Source/Asura.Framework/scene.lua
new file mode 100644
index 0000000..afe6344
--- /dev/null
+++ b/Source/Asura.Framework/scene.lua
@@ -0,0 +1,8 @@
+--[[
+ԭ½
+]]
+local Scene = Class()
+
+
+
+return Scene \ No newline at end of file
diff --git a/Source/Asura.Framework/transform.lua b/Source/Asura.Framework/transform.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/transform.lua