animations while walking
This commit is contained in:
Sebastian Hugentobler
parent
104356d364
commit
8fd994202c
288
src/anim8.lua
Normal file
288
src/anim8.lua
Normal file
@ -0,0 +1,288 @@
|
||||
local anim8 = {
|
||||
_VERSION = 'anim8 v2.1.0',
|
||||
_DESCRIPTION = 'An animation library for LÖVE',
|
||||
_URL = 'https://github.com/kikito/anim8',
|
||||
_LICENSE = [[
|
||||
MIT LICENSE
|
||||
|
||||
Copyright (c) 2011 Enrique García Cota
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and associated documentation files (the
|
||||
"Software"), to deal in the Software without restriction, including
|
||||
without limitation the rights to use, copy, modify, merge, publish,
|
||||
distribute, sublicense, and/or sell copies of the Software, and to
|
||||
permit persons to whom the Software is furnished to do so, subject to
|
||||
the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included
|
||||
in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
]]
|
||||
}
|
||||
|
||||
local Grid = {}
|
||||
|
||||
local _frames = {}
|
||||
|
||||
local function assertPositiveInteger(value, name)
|
||||
if type(value) ~= 'number' then error(("%s should be a number, was %q"):format(name, tostring(value))) end
|
||||
if value < 1 then error(("%s should be a positive number, was %d"):format(name, value)) end
|
||||
if value ~= math.floor(value) then error(("%s should be an integer, was %d"):format(name, value)) end
|
||||
end
|
||||
|
||||
local function createFrame(self, x, y)
|
||||
local fw, fh = self.frameWidth, self.frameHeight
|
||||
return love.graphics.newQuad(
|
||||
self.left + (x-1) * fw + x * self.border,
|
||||
self.top + (y-1) * fh + y * self.border,
|
||||
fw,
|
||||
fh,
|
||||
self.imageWidth,
|
||||
self.imageHeight
|
||||
)
|
||||
end
|
||||
|
||||
local function getGridKey(...)
|
||||
return table.concat( {...} ,'-' )
|
||||
end
|
||||
|
||||
local function getOrCreateFrame(self, x, y)
|
||||
if x < 1 or x > self.width or y < 1 or y > self.height then
|
||||
error(("There is no frame for x=%d, y=%d"):format(x, y))
|
||||
end
|
||||
local key = self._key
|
||||
_frames[key] = _frames[key] or {}
|
||||
_frames[key][x] = _frames[key][x] or {}
|
||||
_frames[key][x][y] = _frames[key][x][y] or createFrame(self, x, y)
|
||||
return _frames[key][x][y]
|
||||
end
|
||||
|
||||
local function parseInterval(str)
|
||||
if type(str) == "number" then return str,str,1 end
|
||||
str = str:gsub('%s', '') -- remove spaces
|
||||
local min, max = str:match("^(%d+)-(%d+)$")
|
||||
assert(min and max, ("Could not parse interval from %q"):format(str))
|
||||
min, max = tonumber(min), tonumber(max)
|
||||
local step = min <= max and 1 or -1
|
||||
return min, max, step
|
||||
end
|
||||
|
||||
function Grid:getFrames(...)
|
||||
local result, args = {}, {...}
|
||||
local minx, maxx, stepx, miny, maxy, stepy
|
||||
|
||||
for i=1, #args, 2 do
|
||||
minx, maxx, stepx = parseInterval(args[i])
|
||||
miny, maxy, stepy = parseInterval(args[i+1])
|
||||
for y = miny, maxy, stepy do
|
||||
for x = minx, maxx, stepx do
|
||||
result[#result+1] = getOrCreateFrame(self,x,y)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return result
|
||||
end
|
||||
|
||||
local Gridmt = {
|
||||
__index = Grid,
|
||||
__call = Grid.getFrames
|
||||
}
|
||||
|
||||
local function newGrid(frameWidth, frameHeight, imageWidth, imageHeight, left, top, border)
|
||||
assertPositiveInteger(frameWidth, "frameWidth")
|
||||
assertPositiveInteger(frameHeight, "frameHeight")
|
||||
assertPositiveInteger(imageWidth, "imageWidth")
|
||||
assertPositiveInteger(imageHeight, "imageHeight")
|
||||
|
||||
left = left or 0
|
||||
top = top or 0
|
||||
border = border or 0
|
||||
|
||||
local key = getGridKey(frameWidth, frameHeight, imageWidth, imageHeight, left, top, border)
|
||||
|
||||
local grid = setmetatable(
|
||||
{ frameWidth = frameWidth,
|
||||
frameHeight = frameHeight,
|
||||
imageWidth = imageWidth,
|
||||
imageHeight = imageHeight,
|
||||
left = left,
|
||||
top = top,
|
||||
border = border,
|
||||
width = math.floor(imageWidth/frameWidth),
|
||||
height = math.floor(imageHeight/frameHeight),
|
||||
_key = key
|
||||
},
|
||||
Gridmt
|
||||
)
|
||||
return grid
|
||||
end
|
||||
|
||||
-----------------------------------------------------------
|
||||
|
||||
local Animation = {}
|
||||
|
||||
local function cloneArray(arr)
|
||||
local result = {}
|
||||
for i=1,#arr do result[i] = arr[i] end
|
||||
return result
|
||||
end
|
||||
|
||||
local function parseDurations(durations, frameCount)
|
||||
local result = {}
|
||||
if type(durations) == 'number' then
|
||||
for i=1,frameCount do result[i] = durations end
|
||||
else
|
||||
local min, max, step
|
||||
for key,duration in pairs(durations) do
|
||||
assert(type(duration) == 'number', "The value [" .. tostring(duration) .. "] should be a number")
|
||||
min, max, step = parseInterval(key)
|
||||
for i = min,max,step do result[i] = duration end
|
||||
end
|
||||
end
|
||||
|
||||
if #result < frameCount then
|
||||
error("The durations table has length of " .. tostring(#result) .. ", but it should be >= " .. tostring(frameCount))
|
||||
end
|
||||
|
||||
return result
|
||||
end
|
||||
|
||||
local function parseIntervals(durations)
|
||||
local result, time = {0},0
|
||||
for i=1,#durations do
|
||||
time = time + durations[i]
|
||||
result[i+1] = time
|
||||
end
|
||||
return result, time
|
||||
end
|
||||
|
||||
local Animationmt = { __index = Animation }
|
||||
local nop = function() end
|
||||
|
||||
local function newAnimation(frames, durations, onLoop)
|
||||
local td = type(durations);
|
||||
if (td ~= 'number' or durations <= 0) and td ~= 'table' then
|
||||
error("durations must be a positive number. Was " .. tostring(durations) )
|
||||
end
|
||||
onLoop = onLoop or nop
|
||||
durations = parseDurations(durations, #frames)
|
||||
local intervals, totalDuration = parseIntervals(durations)
|
||||
return setmetatable({
|
||||
frames = cloneArray(frames),
|
||||
durations = durations,
|
||||
intervals = intervals,
|
||||
totalDuration = totalDuration,
|
||||
onLoop = onLoop,
|
||||
timer = 0,
|
||||
position = 1,
|
||||
status = "playing",
|
||||
flippedH = false,
|
||||
flippedV = false
|
||||
},
|
||||
Animationmt
|
||||
)
|
||||
end
|
||||
|
||||
function Animation:clone()
|
||||
local newAnim = newAnimation(self.frames, self.durations, self.onLoop)
|
||||
newAnim.flippedH, newAnim.flippedV = self.flippedH, self.flippedV
|
||||
return newAnim
|
||||
end
|
||||
|
||||
function Animation:flipH()
|
||||
self.flippedH = not self.flippedH
|
||||
return self
|
||||
end
|
||||
|
||||
function Animation:flipV()
|
||||
self.flippedV = not self.flippedV
|
||||
return self
|
||||
end
|
||||
|
||||
local function seekFrameIndex(intervals, timer)
|
||||
local high, low, i = #intervals-1, 1, 1
|
||||
|
||||
while(low <= high) do
|
||||
i = math.floor((low + high) / 2)
|
||||
if timer > intervals[i+1] then low = i + 1
|
||||
elseif timer <= intervals[i] then high = i - 1
|
||||
else
|
||||
return i
|
||||
end
|
||||
end
|
||||
|
||||
return i
|
||||
end
|
||||
|
||||
function Animation:update(dt)
|
||||
if self.status ~= "playing" then return end
|
||||
|
||||
self.timer = self.timer + dt
|
||||
local loops = math.floor(self.timer / self.totalDuration)
|
||||
if loops ~= 0 then
|
||||
self.timer = self.timer - self.totalDuration * loops
|
||||
local f = type(self.onLoop) == 'function' and self.onLoop or self[self.onLoop]
|
||||
f(self, loops)
|
||||
end
|
||||
|
||||
self.position = seekFrameIndex(self.intervals, self.timer)
|
||||
end
|
||||
|
||||
function Animation:pause()
|
||||
self.status = "paused"
|
||||
end
|
||||
|
||||
function Animation:gotoFrame(position)
|
||||
self.position = position
|
||||
self.timer = self.intervals[self.position]
|
||||
end
|
||||
|
||||
function Animation:pauseAtEnd()
|
||||
self.position = #self.frames
|
||||
self.timer = self.totalDuration
|
||||
self:pause()
|
||||
end
|
||||
|
||||
function Animation:pauseAtStart()
|
||||
self.position = 1
|
||||
self.timer = 0
|
||||
self:pause()
|
||||
end
|
||||
|
||||
function Animation:resume()
|
||||
self.status = "playing"
|
||||
end
|
||||
|
||||
function Animation:draw(image, x, y, r, sx, sy, ox, oy, ...)
|
||||
local frame = self.frames[self.position]
|
||||
if self.flippedH or self.flippedV then
|
||||
r,sx,sy,ox,oy = r or 0, sx or 1, sy or 1, ox or 0, oy or 0
|
||||
local _,_,w,h = frame:getViewport()
|
||||
|
||||
if self.flippedH then
|
||||
sx = sx * -1
|
||||
ox = w - ox
|
||||
end
|
||||
if self.flippedV then
|
||||
sy = sy * -1
|
||||
oy = h - oy
|
||||
end
|
||||
end
|
||||
love.graphics.draw(image, frame, x, y, r, sx, sy, ox, oy, ...)
|
||||
end
|
||||
|
||||
-----------------------------------------------------------
|
||||
|
||||
anim8.newGrid = newGrid
|
||||
anim8.newAnimation = newAnimation
|
||||
|
||||
return anim8
|
||||
14
src/animator.lua
Normal file
14
src/animator.lua
Normal file
@ -0,0 +1,14 @@
|
||||
local anim8 = require 'anim8'
|
||||
local character = require 'character'
|
||||
|
||||
Animator = class()
|
||||
|
||||
function Animator:__init(fullWidth, fullHeight)
|
||||
self.animationGrid = anim8.newGrid(character.width, character.height, fullWidth, fullHeight)
|
||||
|
||||
self.walk_up = anim8.newAnimation(self.animationGrid('1-9', 9), 0.1)
|
||||
self.walk_left = anim8.newAnimation(self.animationGrid('1-9', 10), 0.1)
|
||||
self.walk_down = anim8.newAnimation(self.animationGrid('1-9', 11), 0.1)
|
||||
self.walk_right = anim8.newAnimation(self.animationGrid('1-9', 12), 0.1)
|
||||
end
|
||||
|
||||
@ -7,52 +7,4 @@ function character.sortNorthSouth(a, b)
|
||||
return a.info.y < b.info.y
|
||||
end
|
||||
|
||||
character.spellcast_up = {
|
||||
offsetX = 0,
|
||||
offsetY = 0,
|
||||
count = 9
|
||||
}
|
||||
|
||||
character.spellcast_left = {
|
||||
offsetX = 0,
|
||||
offsetY = 1,
|
||||
count = 9
|
||||
}
|
||||
|
||||
character.spellcast_down = {
|
||||
offsetX = 0,
|
||||
offsetY = 2,
|
||||
count = 9
|
||||
}
|
||||
|
||||
character.spellcast_right = {
|
||||
offsetX = 0,
|
||||
offsetY = 3,
|
||||
count = 9
|
||||
}
|
||||
|
||||
character.walking_up = {
|
||||
offsetX = 0,
|
||||
offsetY = 8,
|
||||
count = 9
|
||||
}
|
||||
|
||||
character.walking_left = {
|
||||
offsetX = 0,
|
||||
offsetY = 9,
|
||||
count = 9
|
||||
}
|
||||
|
||||
character.walking_down = {
|
||||
offsetX = 0,
|
||||
offsetY = 10,
|
||||
count = 9
|
||||
}
|
||||
|
||||
character.walking_right = {
|
||||
offsetX = 0,
|
||||
offsetY = 11,
|
||||
count = 9
|
||||
}
|
||||
|
||||
return character
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
local character = require "../character"
|
||||
local character = require '../character'
|
||||
local animator = require '../animator'
|
||||
|
||||
Gridwalker = class()
|
||||
|
||||
@ -8,6 +9,7 @@ Gridwalker.neighbourOffsetX = (character.width - Gridwalker.collisionTestSize) /
|
||||
Gridwalker.neighbourOffsetY = character.width - Gridwalker.collisionTestSize * 1.5
|
||||
Gridwalker.testShape = nil
|
||||
Gridwalker.charinfo = nil
|
||||
Gridwalker.animation = nil
|
||||
|
||||
function Gridwalker:sendKey(key)
|
||||
if key == "w" or key == "up" then
|
||||
@ -27,37 +29,53 @@ function Gridwalker:sendKey(key)
|
||||
end
|
||||
end
|
||||
|
||||
function Gridwalker:stopAnimation()
|
||||
self.animation:pauseAtStart()
|
||||
end
|
||||
|
||||
function Gridwalker:up()
|
||||
local newX = self.charinfo.x
|
||||
local newY = self.charinfo.y - self.speed
|
||||
|
||||
self:move(newX, newY, character.walking_up)
|
||||
self.animation = self.animator.walk_up
|
||||
|
||||
self:move(newX, newY)
|
||||
end
|
||||
|
||||
function Gridwalker:down()
|
||||
local newX = self.charinfo.x
|
||||
local newY = self.charinfo.y + self.speed
|
||||
|
||||
self:move(newX, newY, character.walking_down)
|
||||
self.animation = self.animator.walk_down
|
||||
|
||||
self:move(newX, newY)
|
||||
end
|
||||
|
||||
function Gridwalker:right()
|
||||
local newX = self.charinfo.x + self.speed
|
||||
local newY = self.charinfo.y
|
||||
|
||||
self:move(newX, newY, character.walking_right)
|
||||
self.animation = self.animator.walk_right
|
||||
|
||||
self:move(newX, newY)
|
||||
end
|
||||
|
||||
function Gridwalker:left()
|
||||
local newX = self.charinfo.x - self.speed
|
||||
local newY = self.charinfo.y
|
||||
|
||||
self:move(newX, newY, character.walking_left)
|
||||
self.animation = self.animator.walk_left
|
||||
|
||||
self:move(newX, newY)
|
||||
end
|
||||
|
||||
function Gridwalker:init()
|
||||
self.testShape = collider:addRectangle(self.charinfo.x + self.neighbourOffsetX, self.charinfo.y + self.neighbourOffsetY, self.collisionTestSize, self.collisionTestSize)
|
||||
collider:setPassive(self.testShape)
|
||||
|
||||
self.animator = Animator:new(self.charinfo.image:getWidth(), self.charinfo.image:getHeight())
|
||||
self.animation = self.animator.walk_up
|
||||
self.animation:pauseAtStart()
|
||||
end
|
||||
|
||||
function Gridwalker:setTestShape(x, y)
|
||||
@ -69,7 +87,7 @@ function Gridwalker:setTestShape(x, y)
|
||||
return testX, testY
|
||||
end
|
||||
|
||||
function Gridwalker:move(x, y, pose)
|
||||
function Gridwalker:move(x, y)
|
||||
local noCollision = true
|
||||
|
||||
local testX, testY = self:setTestShape(x, y)
|
||||
@ -82,11 +100,10 @@ function Gridwalker:move(x, y, pose)
|
||||
end
|
||||
|
||||
if noCollision then
|
||||
self.animation:resume()
|
||||
self.charinfo.x = x
|
||||
self.charinfo.y = y
|
||||
else
|
||||
self:setTestShape(self.charinfo.x, self.charinfo.y)
|
||||
end
|
||||
|
||||
self.charinfo.pose = pose
|
||||
end
|
||||
|
||||
30
src/main.lua
30
src/main.lua
@ -1,9 +1,9 @@
|
||||
class = require '30log'
|
||||
|
||||
local HC = require 'hardoncollider'
|
||||
-- has to come before the sti initialization so I can add the collision tiles
|
||||
collider = HC(100)
|
||||
|
||||
class = require '30log'
|
||||
|
||||
local sti = require "sti"
|
||||
|
||||
local character = require "character"
|
||||
@ -23,6 +23,8 @@ end
|
||||
|
||||
function love.update(dt)
|
||||
for _, char in ipairs(characters) do
|
||||
char.controller.animation:update(dt)
|
||||
|
||||
if char.relevantKeys then
|
||||
for _, relevantKey in ipairs(char.relevantKeys) do
|
||||
if love.keyboard.isDown(relevantKey) then
|
||||
@ -36,6 +38,22 @@ function love.update(dt)
|
||||
map:update(dt)
|
||||
end
|
||||
|
||||
function love.keyreleased(key)
|
||||
for _, char in ipairs(characters) do
|
||||
if char.relevantKeys then
|
||||
for _, relevantKey in ipairs(char.relevantKeys) do
|
||||
if key == relevantKey then
|
||||
char.controller:stopAnimation()
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if key == "w" then
|
||||
print()
|
||||
end
|
||||
end
|
||||
|
||||
function love.draw()
|
||||
-- Translation would normally be based on a player's x/y
|
||||
local translateX = 0
|
||||
@ -52,7 +70,7 @@ end
|
||||
function debugDrawing()
|
||||
-- draw collision shapes for debugging
|
||||
for shape in pairs(collider:shapesInRange(0, 0, windowWidth, windowHeight)) do
|
||||
shape:draw()
|
||||
shape:draw()
|
||||
end
|
||||
|
||||
-- Draw Collision Map (useful for debugging)
|
||||
@ -90,11 +108,7 @@ function initCharacters()
|
||||
local x = math.floor(sprite.info.x)
|
||||
local y = math.floor(sprite.info.y)
|
||||
|
||||
local offsetX = sprite.info.pose.offsetX * character.width
|
||||
local offsetY = sprite.info.pose.offsetY * character.height
|
||||
|
||||
local quad = love.graphics.newQuad(offsetX, offsetY, character.width, character.height, sprite.info.image:getWidth(), sprite.info.image:getHeight())
|
||||
love.graphics.draw(sprite.info.image, quad, x, y)
|
||||
sprite.info.controller.animation:draw(sprite.info.image, x, y)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user