Develop #4

Merged
wariosolis merged 35 commits from develop into master 2017-01-04 00:04:34 +01:00
4 changed files with 13 additions and 0 deletions
Showing only changes of commit 53243cef36 - Show all commits
+9
View File
@@ -1,4 +1,5 @@
local game = {} local game = {}
local gamera = require 'assets/scripts/vendor/gamera'
function game.load() function game.load()
-- Configuration -- Configuration
@@ -33,4 +34,12 @@ function game:prevLevel()
game.level = game.level - 1 game.level = game.level - 1
end end
function game:setNewSizeWorld(canvas_width, canvas_height)
local width, height = 1280, 720
game.window = { width = width , height = height }
game.canvas = { x = width / 2, y= 0, width = canvas_width, height = canvas_height }
camera.gcam = gamera.new(0, 0, game.window.width, game.window.height)
camera.gcam:setWorld(0, 0, game.canvas.width, game.canvas.height)
end
return game return game
+2
View File
@@ -6,6 +6,8 @@ local stage1 = {}
local image local image
function stage1.load(game, camera) function stage1.load(game, camera)
stage1.world = { w = 2560, h= 720}
game:setNewSizeWorld(stage1.world.w, stage1.world.h)
image = love.graphics.newImage('assets/sprites/background/bg.jpg') image = love.graphics.newImage('assets/sprites/background/bg.jpg')
arrows.load(game, stage1, camera) arrows.load(game, stage1, camera)
game.canvas.x = game.window.width game.canvas.x = game.window.width
+2
View File
@@ -6,6 +6,8 @@ local stage2 = {}
local image local image
function stage2.load(game, camera) function stage2.load(game, camera)
stage2.world = { w = 2280, h= 720}
game:setNewSizeWorld(stage2.world.w, stage2.world.h)
image = love.graphics.newImage('assets/sprites/background/bg2.jpg') image = love.graphics.newImage('assets/sprites/background/bg2.jpg')
arrows.load(game, stage2, camera) arrows.load(game, stage2, camera)
game.canvas.x = game.canvas.width / 2 game.canvas.x = game.canvas.width / 2
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 MiB

After

Width:  |  Height:  |  Size: 81 KiB