From 1497dccd63a84b7ee2b229b1ad9c5c02718f2a78 Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 19 Mar 2019 23:06:27 +0800 Subject: *rename --- .../Asura.Framework/scripts/graphics/animation.lua | 15 ----- .../Asura.Framework/scripts/graphics/animator.lua | 33 ---------- Source/Asura.Framework/scripts/graphics/camera.lua | 21 ------ Source/Asura.Framework/scripts/graphics/canvas.lua | 34 ---------- .../scripts/graphics/default_shaders.lua | 5 -- Source/Asura.Framework/scripts/graphics/image.lua | 40 ------------ .../Asura.Framework/scripts/graphics/material.lua | 48 -------------- .../scripts/graphics/material_manager.lua | 3 - Source/Asura.Framework/scripts/graphics/mesh2d.lua | 9 --- .../scripts/graphics/mesh2d_renderer.lua | 13 ---- .../scripts/graphics/particle_system.lua | 20 ------ .../Asura.Framework/scripts/graphics/renderer.lua | 19 ------ Source/Asura.Framework/scripts/graphics/shader.lua | 75 ---------------------- .../scripts/graphics/shaderHelper.lua | 14 ---- Source/Asura.Framework/scripts/graphics/shape.lua | 12 ---- .../scripts/graphics/shape_renderer.lua | 13 ---- Source/Asura.Framework/scripts/graphics/sprite.lua | 10 --- .../scripts/graphics/sprite_batch_renderer.lua | 9 --- .../scripts/graphics/sprite_renderer.lua | 14 ---- 19 files changed, 407 deletions(-) delete mode 100644 Source/Asura.Framework/scripts/graphics/animation.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/animator.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/camera.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/canvas.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/default_shaders.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/image.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/material.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/material_manager.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/mesh2d.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/mesh2d_renderer.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/particle_system.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/renderer.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/shader.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/shaderHelper.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/shape.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/shape_renderer.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/sprite.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/sprite_batch_renderer.lua delete mode 100644 Source/Asura.Framework/scripts/graphics/sprite_renderer.lua (limited to 'Source/Asura.Framework/scripts/graphics') diff --git a/Source/Asura.Framework/scripts/graphics/animation.lua b/Source/Asura.Framework/scripts/graphics/animation.lua deleted file mode 100644 index 285adaa..0000000 --- a/Source/Asura.Framework/scripts/graphics/animation.lua +++ /dev/null @@ -1,15 +0,0 @@ -AsuraEngine.Animation = AsuraEngine.Asset.Extend("Animation") - -local Animation = AsuraEngine.Animation - -local Frame = AsuraEngine.Class("Frame") - -function Frame.Ctor(self) - -end - -function Animation.Ctor(self) - -end - -return Animation \ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/animator.lua b/Source/Asura.Framework/scripts/graphics/animator.lua deleted file mode 100644 index c019dfa..0000000 --- a/Source/Asura.Framework/scripts/graphics/animator.lua +++ /dev/null @@ -1,33 +0,0 @@ -local Component = AsuraEngine.Framework.Require("component") - -AsuraEngine.Animator = Component.Extend("Animator") - -local Animator = AsuraEngine.Animator - --- Animator inspector variables. -Animator.spriteRenderer = AsuraEngine.Type.SpriteRenderer -Animator.animation = AsuraEngine.Type.Animation - -function Animator:Ctor(gameobject, animation) - self.base(gameobject) - self.spriteRenderer = gameobject:GetSpriteRenderer() - self.animation = animation -end - -function Animator:SetAnimation(animation) - self.animation = animation -end - -function Animator:GetAnimation() - return self.animation -end - -function Animator:OnUpdate(dt) - -end - -function Animator:OnRender() - -end - -return Animator \ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/camera.lua b/Source/Asura.Framework/scripts/graphics/camera.lua deleted file mode 100644 index a989de6..0000000 --- a/Source/Asura.Framework/scripts/graphics/camera.lua +++ /dev/null @@ -1,21 +0,0 @@ -AsuraEngine.Camera = AsuraEngine.Component.Extend("Camera") - -local Camera = AsuraEngine.Camera - -Camera.isCulling = AsuraEngine.Type.Bool -Camera.isOnScreen = AsuraEngine.Type.Bool - -function Camera.Ctor(self) - self.isCulling = false - self.isOnScreen = false -end - -function Camera.OnUpdate(dt) - -end - -function Camera.OnRender() - -end - -return Camera \ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/canvas.lua b/Source/Asura.Framework/scripts/graphics/canvas.lua deleted file mode 100644 index ce2ca20..0000000 --- a/Source/Asura.Framework/scripts/graphics/canvas.lua +++ /dev/null @@ -1,34 +0,0 @@ -AsuraEngine.Canvas = AsuraEngine.Component.Extend("Canvas") - -local Canvas = AsuraEngine.Canvas - -function Canvas.Ctor(self, width, height) - self.simCanvas = AsuraEngine.SimCanvas.New(width, height) - self.width = width - self.height = height -end - -function Canvas.GetWidth(self) - return self.width -end - -function Canvas.GetHeight(self) - return self.height -end - -function Canvas.GetSize(self) - return self.width, self.height -end - -function Canvas.OnEnable(self) - if self.simCanvas == nil then - return - end - self.simCanvas:Begin() -end - -function Canvas.OnDisable(self) - -end - -return Canvas \ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/default_shaders.lua b/Source/Asura.Framework/scripts/graphics/default_shaders.lua deleted file mode 100644 index bd54cb9..0000000 --- a/Source/Asura.Framework/scripts/graphics/default_shaders.lua +++ /dev/null @@ -1,5 +0,0 @@ ---[[ -ÄÚÖõÄshaders. -]] - - diff --git a/Source/Asura.Framework/scripts/graphics/image.lua b/Source/Asura.Framework/scripts/graphics/image.lua deleted file mode 100644 index f5ebaa2..0000000 --- a/Source/Asura.Framework/scripts/graphics/image.lua +++ /dev/null @@ -1,40 +0,0 @@ --- å›¾ç‰‡èµ„æº -AsuraEngine.Image = AsuraEngine.Asset.Extend("Image") - -local Image = AsuraEngine.Image - -function Image.Ctor(self, path) - local simImage = AsuraEngine.SimImage.New(path) - local w, h = simImage:GetSize() - self.simImage = simImage - self.width = w - self.height = h -end - -function Image.GetWidth(self) - return self.simImage.GetWidth() -end - -function Image.GetHeight(self) - return self.simImage.GetHeight() -end - -function Image.GetSize(self) - return self.simImage.GetSize() -end - ---获得x,yä½ç½®çš„颜色值 -function Image.GetColor(self, x, y) - return self.simImage.GetColor(x, y) -end - ---获得所有åƒç´ ï¼Œè¿”回到一个table里 -function Image.GetPixels(self) - return self.simImage:GetPixels() -end - ---imageä¸å¯å†ç¼–辑器编辑，所以没有ToAsset方法 ---function Image.ToAsset() ---end - -return Image \ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/material.lua b/Source/Asura.Framework/scripts/graphics/material.lua deleted file mode 100644 index 5a6e5bd..0000000 --- a/Source/Asura.Framework/scripts/graphics/material.lua +++ /dev/null @@ -1,48 +0,0 @@ ---material是shaderçš„ä»£ç† -AsuraEngine.Material = AsuraEngine.Asset.Extend("Material") - -local Material = AsuraEngine.Material - -function Material.Ctor(self) - self.uniforms = {} --uniformå˜é‡å’Œå€¼ - self.shader = nil - self.isShared = false -end - -function Material.Clone(self) - -end - -function Material:ToAsset() - -end - -function Material:GetUniform(name) - -end - -function Material:SetFloat(uniform, value) - -end - -function Material:SetTexture(uniform, tex) - -end - -function Material:SetInteger(unifrom, value) - -end - -function Material:SetVec2(uniform, value) - -end - -function Material:SetMat44(uniform, value) - -end - -function Material:GetUniformID() - -end - -return Material \ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/material_manager.lua b/Source/Asura.Framework/scripts/graphics/material_manager.lua deleted file mode 100644 index 086a5db..0000000 --- a/Source/Asura.Framework/scripts/graphics/material_manager.lua +++ /dev/null @@ -1,3 +0,0 @@ -local MaterialManager = AsuraEngine.Manager.New() - -return MaterialManager \ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/mesh2d.lua b/Source/Asura.Framework/scripts/graphics/mesh2d.lua deleted file mode 100644 index 05b2e2e..0000000 --- a/Source/Asura.Framework/scripts/graphics/mesh2d.lua +++ /dev/null @@ -1,9 +0,0 @@ -AsuraEngine.Mesh2D = AsuraEngine.Asset.Extend("Mesh2D") - -local Mesh2D = AsuraEngine.Mesh2D - -function Mesh2D.Ctor(self) - -end - -return Mesh2D \ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/mesh2d_renderer.lua b/Source/Asura.Framework/scripts/graphics/mesh2d_renderer.lua deleted file mode 100644 index 09c8c98..0000000 --- a/Source/Asura.Framework/scripts/graphics/mesh2d_renderer.lua +++ /dev/null @@ -1,13 +0,0 @@ -AsuraEngine.Mesh2DRenderer = AsuraEngine.Renderer.Extend("Mesh2DRenderer") - -local Mesh2DRenderer = AsuraEngine.Mesh2DRenderer - -function Mesh2DRenderer.Ctor(self, material) - self.base(material) -end - -function Mesh2DRenderer.OnRender(self) - -end - -return Mesh2DRenderer \ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/particle_system.lua b/Source/Asura.Framework/scripts/graphics/particle_system.lua deleted file mode 100644 index 8de3258..0000000 --- a/Source/Asura.Framework/scripts/graphics/particle_system.lua +++ /dev/null @@ -1,20 +0,0 @@ -require "graphics.sprite_renderer" - -AsuraEngine.ParticleSystem = AsuraEngine.Component.Extend("ParticleSystem") - -local ParticleSystem = AsuraEngine.ParticleSystem - -function ParticleSystem.Ctor(self, gameobject, def) - self.base(gameobject) - self.spriteRenderer = AsuraEngine.SpriteRenderer.New() -end - -function ParticleSystem.OnRenderer() - -end - -function ParticleSystem.OnUpdate(dt) - -end - -return ParticleSystem \ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/renderer.lua b/Source/Asura.Framework/scripts/graphics/renderer.lua deleted file mode 100644 index 92a6409..0000000 --- a/Source/Asura.Framework/scripts/graphics/renderer.lua +++ /dev/null @@ -1,19 +0,0 @@ -local Renderer = AsuraEngine.Component.Extend("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/scripts/graphics/shader.lua b/Source/Asura.Framework/scripts/graphics/shader.lua deleted file mode 100644 index c411619..0000000 --- a/Source/Asura.Framework/scripts/graphics/shader.lua +++ /dev/null @@ -1,75 +0,0 @@ -AsuraEngine.Shader = AsuraEngine.Asset.Extend("Shader") - -local helper = AsuraEngine.Framework.Require("graphics/shaderHelper") - -local Shader = AsuraEngine.Shader - -function Shader.Ctor(self) - self.simShader = nil - self.uniforms = {} -- 映射uniform name到location -end - ---编译shader -function Shader.Load(self, vert, frag) - self.uniforms = {} - if self.simShader == nil then - self.simShader = AsuraEngine.SimShader.New(vert, frag) - else - self.simShader:Load(vert, frag) - end - if self.simShader == nil then - --shader编译错误 - return - end - --在编译的时候就获得所有的uniformå’Œloc - local uniforms = helper.GetUniforms(vert, frag) - if uniforms == nil then - return - end - for _, uniform in uniforms do - self.uniforms[uniform] = self.simShader:GetUniformLocation(uniform) - end -end - -function Shader.GetUniformLocation(self, name) - if self.uniforms then - local id = self.uniforms[name] - return id - end - return 0 -end - -function Shader.SendVec2(self, name, vec2) - local id = self:GetUniformLocation(name) - self.simShader:SendUniformVector2(name, vec2) -end - -function Shader.SendVec3(self, name, vec3) - -end - -function Shader.SendVec4(self, name, vec4) - -end - -function Shader.SendTexture(self, name, tex) - -end - -function Shader.SendFloat(self, name, number) - -end - -function Shader.SendInteger(self, name, integer) - -end - -function Shader.SendColor(self, name, color) - -end - -function Shader.SendMat44(self, name, mat44) - -end - -return Shader \ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/shaderHelper.lua b/Source/Asura.Framework/scripts/graphics/shaderHelper.lua deleted file mode 100644 index b1b42a6..0000000 --- a/Source/Asura.Framework/scripts/graphics/shaderHelper.lua +++ /dev/null @@ -1,14 +0,0 @@ ---[[ -解æžvertex shaderå’Œ fragment shader，并å–得两个shader里é¢å®šä¹‰çš„uniforms -]] -local helper = {} - -function helper.GetUniforms(vert, frag) - -end - -function helper.TryCompileShader(vert, frag) - -end - -return helper \ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/shape.lua b/Source/Asura.Framework/scripts/graphics/shape.lua deleted file mode 100644 index 51ea8c3..0000000 --- a/Source/Asura.Framework/scripts/graphics/shape.lua +++ /dev/null @@ -1,12 +0,0 @@ --- --- 2D图形 --- -AsuraEngine.Shape = AsuraEngine.Asset.Extend("Shape") - -local Shape = AsuraEngine.Shape - -function Shape.Ctor(self) - -end - -return Shape \ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/shape_renderer.lua b/Source/Asura.Framework/scripts/graphics/shape_renderer.lua deleted file mode 100644 index 80b48b8..0000000 --- a/Source/Asura.Framework/scripts/graphics/shape_renderer.lua +++ /dev/null @@ -1,13 +0,0 @@ -AsuraEngine.ShapeRenderer = AsuraEngine.Component.Extend("ShapeRenderer") - -local ShapeRenderer = AsuraEngine.ShapeRenderer - -function ShapeRenderer.OnRenderer() - -end - -function ShapeRenderer.OnUpdate(dt) - -end - -return ShapeRenderer \ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/sprite.lua b/Source/Asura.Framework/scripts/graphics/sprite.lua deleted file mode 100644 index 9bf05f4..0000000 --- a/Source/Asura.Framework/scripts/graphics/sprite.lua +++ /dev/null @@ -1,10 +0,0 @@ -local Sprite = AsuraEngine.Asset.Extend("Sprite") -AsuraEngine.Sprite = Sprite - -function Sprite.Ctor(self, image) - self.image = image -end - -function Sprite.ToAsset(self) - -end \ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/sprite_batch_renderer.lua b/Source/Asura.Framework/scripts/graphics/sprite_batch_renderer.lua deleted file mode 100644 index 9ec73d2..0000000 --- a/Source/Asura.Framework/scripts/graphics/sprite_batch_renderer.lua +++ /dev/null @@ -1,9 +0,0 @@ -AsuraEngine.SpriteBatchRenderer = AsuraEngine.Component.Extend("SpriteBatchRenderer") - -local SpriteBatchRenderer = AsuraEngine.SpriteBatchRenderer - -function SpriteBatchRenderer.Ctor(self) - -end - -return SpriteBatchRenderer \ 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 deleted file mode 100644 index 0a41e08..0000000 --- a/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua +++ /dev/null @@ -1,14 +0,0 @@ -require "graphics.renderer" - -local SpriteRenderer = AsuraEngine.Renderer.Extend("Spriterenderer") -AsuraEngine.SpriteRenderer = SpriteRenderer - -function SpriteRenderer.Ctor(self) - self.materials = {} -end - -function SpriteRenderer:OnRender() - -end - -return SpriteRenderer \ No newline at end of file -- cgit v1.1-26-g67d0