summaryrefslogtreecommitdiff
path: root/Source/Asura.Framework/scripts/graphics
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2019-02-22 13:50:12 +0800
committerchai <chaifix@163.com>2019-02-22 13:50:12 +0800
commit22ba8d6af9e9a67e6bac11365df23b6a61fa62c7 (patch)
tree7e86accc40e3b99b8ae575f718136239fc249d2d /Source/Asura.Framework/scripts/graphics
parentf756fa0a17675ea70956af9c42f6c1117a84f9bd (diff)
*修改缩进
Diffstat (limited to 'Source/Asura.Framework/scripts/graphics')
-rw-r--r--Source/Asura.Framework/scripts/graphics/animator.lua12
-rw-r--r--Source/Asura.Framework/scripts/graphics/camera.lua4
-rw-r--r--Source/Asura.Framework/scripts/graphics/canvas.lua22
-rw-r--r--Source/Asura.Framework/scripts/graphics/image.lua20
-rw-r--r--Source/Asura.Framework/scripts/graphics/material.lua6
-rw-r--r--Source/Asura.Framework/scripts/graphics/mesh2d_renderer.lua2
-rw-r--r--Source/Asura.Framework/scripts/graphics/particle_system.lua4
-rw-r--r--Source/Asura.Framework/scripts/graphics/renderer.lua10
-rw-r--r--Source/Asura.Framework/scripts/graphics/shader.lua4
-rw-r--r--Source/Asura.Framework/scripts/graphics/sprite.lua2
-rw-r--r--Source/Asura.Framework/scripts/graphics/sprite_renderer.lua4
11 files changed, 45 insertions, 45 deletions
diff --git a/Source/Asura.Framework/scripts/graphics/animator.lua b/Source/Asura.Framework/scripts/graphics/animator.lua
index 02f67ff..170d31f 100644
--- a/Source/Asura.Framework/scripts/graphics/animator.lua
+++ b/Source/Asura.Framework/scripts/graphics/animator.lua
@@ -7,17 +7,17 @@ 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
+ self.base(gameobject)
+ self.spriteRenderer = gameobject:GetSpriteRenderer()
+ self.animation = animation
end
function Animator:SetAnimation(animation)
- self.animation = animation
+ self.animation = animation
end
function Animator:GetAnimation()
- return self.animation
+ return self.animation
end
function Animator:OnUpdate(dt)
@@ -25,7 +25,7 @@ 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
index c8176f8..383c328 100644
--- a/Source/Asura.Framework/scripts/graphics/camera.lua
+++ b/Source/Asura.Framework/scripts/graphics/camera.lua
@@ -6,8 +6,8 @@ Camera.isCulling = AsuraEngine.Type.Bool
Camera.isOnScreen = AsuraEngine.Type.Bool
function Camera.Ctor(self)
- self.isCulling = false
- self.isOnScreen = false
+ self.isCulling = false
+ self.isOnScreen = false
end
function Camera.OnUpdate(dt)
diff --git a/Source/Asura.Framework/scripts/graphics/canvas.lua b/Source/Asura.Framework/scripts/graphics/canvas.lua
index 248c3ab..11e71f3 100644
--- a/Source/Asura.Framework/scripts/graphics/canvas.lua
+++ b/Source/Asura.Framework/scripts/graphics/canvas.lua
@@ -3,32 +3,32 @@ AsuraEngine.Canvas = AsuraEngine.Component.Sub("Canvas")
local Canvas = AsuraEngine.Canvas
function Canvas.Ctor(self, width, height)
- self.simCanvas = AsuraEngine.SimCanvas.New(width, height)
- self.width = width
- self.height = height
+ self.simCanvas = AsuraEngine.SimCanvas.New(width, height)
+ self.width = width
+ self.height = height
end
function Canvas.GetWidth(self)
- return self.width
+ return self.width
end
function Canvas.GetHeight(self)
- return self.height
+ return self.height
end
function Canvas.GetSize(self)
- return self.width, self.height
+ return self.width, self.height
end
function Canvas.OnEnable(self)
- if self.simCanvas == nil then
- return
- end
- self.simCanvas:Begin()
+ 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/image.lua b/Source/Asura.Framework/scripts/graphics/image.lua
index c96906b..dcdb4c3 100644
--- a/Source/Asura.Framework/scripts/graphics/image.lua
+++ b/Source/Asura.Framework/scripts/graphics/image.lua
@@ -4,33 +4,33 @@ AsuraEngine.Image = AsuraEngine.Asset.Sub("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
+ 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()
+ return self.simImage.GetWidth()
end
function Image.GetHeight(self)
- return self.simImage.GetHeight()
+ return self.simImage.GetHeight()
end
function Image.GetSize(self)
- return self.simImage.GetSize()
+ return self.simImage.GetSize()
end
--获得x,y位置的颜色值
function Image.GetColor(self, x, y)
- return self.simImage.GetColor(x, y)
+ return self.simImage.GetColor(x, y)
end
--获得所有像素,返回到一个table里
function Image.GetPixels(self)
- return self.simImage:GetPixels()
+ return self.simImage:GetPixels()
end
--image不可再编辑器编辑,所以没有ToAsset方法
diff --git a/Source/Asura.Framework/scripts/graphics/material.lua b/Source/Asura.Framework/scripts/graphics/material.lua
index 37d42e3..f347789 100644
--- a/Source/Asura.Framework/scripts/graphics/material.lua
+++ b/Source/Asura.Framework/scripts/graphics/material.lua
@@ -4,8 +4,8 @@ AsuraEngine.Material = AsuraEngine.Asset.Sub("Material")
local Material = AsuraEngine.Material
function Material.Ctor(self)
- self.uniforms = {} --uniform变量和值
- self.isShared = false
+ self.uniforms = {} --uniform变量和值
+ self.isShared = false
end
function Material.Clone(self)
@@ -21,7 +21,7 @@ function Material:GetUniform(name)
end
function Material:SetFloat(uniform, value)
-
+
end
function Material:SetTexture(uniform, tex)
diff --git a/Source/Asura.Framework/scripts/graphics/mesh2d_renderer.lua b/Source/Asura.Framework/scripts/graphics/mesh2d_renderer.lua
index 67577bc..ca97283 100644
--- a/Source/Asura.Framework/scripts/graphics/mesh2d_renderer.lua
+++ b/Source/Asura.Framework/scripts/graphics/mesh2d_renderer.lua
@@ -3,7 +3,7 @@ AsuraEngine.Mesh2DRenderer = AsuraEngine.Renderer.Sub("Mesh2DRenderer")
local Mesh2DRenderer = AsuraEngine.Mesh2DRenderer
function Mesh2DRenderer.Ctor(self, material)
- self.base(material)
+ self.base(material)
end
function Mesh2DRenderer.OnRender(self)
diff --git a/Source/Asura.Framework/scripts/graphics/particle_system.lua b/Source/Asura.Framework/scripts/graphics/particle_system.lua
index 055d1b2..a2e3c26 100644
--- a/Source/Asura.Framework/scripts/graphics/particle_system.lua
+++ b/Source/Asura.Framework/scripts/graphics/particle_system.lua
@@ -5,8 +5,8 @@ AsuraEngine.ParticleSystem = AsuraEngine.Component.Sub("ParticleSystem")
local ParticleSystem = AsuraEngine.ParticleSystem
function ParticleSystem.Ctor(self, gameobject, def)
- self.base(gameobject)
- self.spriteRenderer = AsuraEngine.SpriteRenderer.New()
+ self.base(gameobject)
+ self.spriteRenderer = AsuraEngine.SpriteRenderer.New()
end
function ParticleSystem.OnRenderer()
diff --git a/Source/Asura.Framework/scripts/graphics/renderer.lua b/Source/Asura.Framework/scripts/graphics/renderer.lua
index a7091b0..189c9d1 100644
--- a/Source/Asura.Framework/scripts/graphics/renderer.lua
+++ b/Source/Asura.Framework/scripts/graphics/renderer.lua
@@ -2,18 +2,18 @@ local Renderer = AsuraEngine.Component.Sub("Renderer")
AsuraEngine.Renderer = Renderer
function Renderer.Ctor(self)
- self.materials = {}
- self.material = nil
- self.isMultiMaterials = false
+ self.materials = {}
+ self.material = nil
+ self.isMultiMaterials = false
end
--取材质,如果是shared,那么从此材质clone一个
function Renderer.GetMaterial(self)
-
+
end
function Renderer.IsMultiMaterials(self)
- return self.isMultiMaterials
+ 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
index e427b1b..a886481 100644
--- a/Source/Asura.Framework/scripts/graphics/shader.lua
+++ b/Source/Asura.Framework/scripts/graphics/shader.lua
@@ -3,8 +3,8 @@ AsuraEngine.Shader = AsuraEngine.Asset.Sub("Shader")
local Shader = AsuraEngine.Shader
function Shader.Ctor(self, vert, frag)
- local simShader = AsuraEngine.simShader(vert, frag)
- self.simShader = shader
+ local simShader = AsuraEngine.simShader(vert, frag)
+ self.simShader = shader
end
diff --git a/Source/Asura.Framework/scripts/graphics/sprite.lua b/Source/Asura.Framework/scripts/graphics/sprite.lua
index 745138e..da116fc 100644
--- a/Source/Asura.Framework/scripts/graphics/sprite.lua
+++ b/Source/Asura.Framework/scripts/graphics/sprite.lua
@@ -2,7 +2,7 @@ local Sprite = AsuraEngine.Asset.Sub("Sprite")
AsuraEngine.Sprite = Sprite
function Sprite.Ctor(self, image)
- self.image = image
+ self.image = image
end
function Sprite.ToAsset(self)
diff --git a/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua b/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua
index 93937d7..5ceafd2 100644
--- a/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua
+++ b/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua
@@ -4,11 +4,11 @@ local SpriteRenderer = AsuraEngine.Renderer.Sub("Spriterenderer")
AsuraEngine.SpriteRenderer = SpriteRenderer
function SpriteRenderer.Ctor(self)
- self.materials = {}
+ self.materials = {}
end
function SpriteRenderer:OnRender()
-
+
end
return SpriteRenderer \ No newline at end of file