Pigeon skeleton;

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "deps/spine-runtimes"]
-	path = deps/spine-runtimes
-	url = https://github.com/bjornswenson/spine-runtimes
 [submodule "deps/lovestep"]
 	path = deps/lovestep
 	url = https://github.com/bjornswenson/lovestep
+[submodule "deps/spine"]
+	path = deps/spine
+	url = [email protected]:bjornswenson/spine-runtimes

data/animation/pigeon.lua

@@ -0,0 +1,7 @@
+local Pigeon = extend(Animation)
+
+Pigeon.scale = .15
+Pigeon.default = nil
+Pigeon.states = {}
+
+return Pigeon

deps/animation.lua

@@ -0,0 +1,120 @@
+Animation = class()
+
+Animation.defaultMix = .2
+
+function Animation:init(vars)
+  --table.merge(vars, self, true)
+
+  self:initSpine(self.code)
+
+  self.event = Event()
+  self.spine.animationState.onComplete = function() self.event:emit('complete', {state = self.state}) end
+  self.spine.animationState.onEvent = function(_, data) self.event:emit('event', data) end
+
+  self:set(self.default)
+  self.speed = 1
+  self.flipped = false
+end
+
+function Animation:draw(x, y, options)
+  options = options or {}
+  local skeleton, animationState = self.spine.skeleton, self.spine.animationState
+  self:setPosition(x, y)
+  skeleton.flipX = self.flipped
+  if self.backwards then skeleton.flipX = not skeleton.flipX end
+  if not options.noupdate then self:tick(ls.dt) end
+  animationState:apply(skeleton)
+  local root = skeleton:getRootBone()
+  if root then
+    root.scaleX = self.scale
+    root.scaleY = self.scale
+  end
+  skeleton:updateWorldTransform()
+  skeleton:draw()
+
+  if options.debug then
+    table.each(self.spine.skeleton.slots, function(slot)
+      slot:setAttachment(self.spine.skeleton:getAttachment(slot.data.name, slot.data.name .. '_bb'))
+      self.spine.skeleton.flipY = true
+    end)
+    skeleton:updateWorldTransform()
+    self.spine.skeletonBounds:update(self.spine.skeleton)
+    love.graphics.setColor(255, 255, 255)
+    for i = 1, #self.spine.skeletonBounds.polygons do
+      love.graphics.polygon('line', self.spine.skeletonBounds.polygons[i])
+    end
+    table.each(self.spine.skeleton.slots, function(slot)
+      slot:setAttachment(self.spine.skeleton:getAttachment(slot.data.name, slot.data.name))
+      self.spine.skeleton.flipY = false
+    end)
+  end
+end
+
+function Animation:tick(delta)
+  self.spine.animationState:update(delta * (--[[self.state.speed]]1 or 1) * self.speed)
+  self.spine.animationState:apply(self.spine.skeleton)
+end
+
+function Animation:setPosition(x, y)
+  local skeleton = self.spine.skeleton
+  skeleton.x = x + (self.offsetx or 0)
+  skeleton.y = y + (self.offsety or 0)
+end
+
+function Animation:set(name, options)
+  if type(name) == 'number' and self.states[name] then name = self.states[name].name end
+  if not name or not self.states[name] then return end
+  options = options or {}
+
+  local target = self.states[name]
+
+  if self.state and self.state.name == target.name then return end
+  if not options.force and self.state and self.state.priority > target.priority then return end
+
+  self.state = target
+  if self.spine.skeletonData:findAnimation(self.state.name) then
+    self.spine.animationState:setAnimationByName(0, self.state.name, self.state.loop)
+  end
+end
+
+function Animation:contains(x, y)
+  do return false end
+
+  table.each(self.spine.skeleton.slots, function(slot)
+    slot:setAttachment(self.spine.skeleton:getAttachment(slot.data.name, slot.data.name .. '_bb'))
+  end)
+
+  self.spine.skeleton.flipY = true
+  self.spine.skeleton:updateWorldTransform()
+  self.spine.skeletonBounds:update(self.spine.skeleton)
+  self.spine.skeleton.flipY = false
+  local contains = self.spine.skeletonBounds:containsPoint(x, y)
+
+  table.each(self.spine.skeleton.slots, function(slot)
+    slot:setAttachment(self.spine.skeleton:getAttachment(slot.data.name, slot.data.name))
+  end)
+
+  return contains
+end
+
+function Animation:initSpine()
+  local s = setmetatable({}, data.animation[self.code].spine)
+
+  s.skeleton = spine.Skeleton.new(s.skeletonData)
+  s.skeletonBounds = spine.SkeletonBounds.new()
+  s.animationState = spine.AnimationState.new(s.animationStateData)
+
+	s.skeleton:setToSetupPose()
+  s.skeleton.createImage = function(_, attachment)
+    return self.graphics[attachment.name]
+  end
+  s.skeleton.createAtlasImage = function(_, page)
+    return self.graphics[page.name:gsub('.png', ''):gsub('.dds', '')]
+  end
+
+  self.spine = s
+end
+
+function Animation:on(...)
+  return self.event:on(...)
+end

deps/dkjson.lua

@@ -0,0 +1,791 @@
+    -- Module options:
+    local always_try_using_lpeg = true
+
+    --[==[
+
+David Kolf's JSON module for Lua 5.1/5.2
+========================================
+
+*Version 2.2*
+
+This module writes no global values, not even the module table.
+Import it using
+
+    json = require ("dkjson")
+
+Exported functions and values:
+
+`json.encode (object [, state])`
+--------------------------------
+
+Create a string representing the object. `Object` can be a table,
+a string, a number, a boolean, `nil`, `json.null` or any object with
+a function `__tojson` in its metatable. A table can only use strings
+and numbers as keys and its values have to be valid objects as
+well. It raises an error for any invalid data types or reference
+cycles.
+
+`state` is an optional table with the following fields:
+
+  - `indent`
+    When `indent` (a boolean) is set, the created string will contain
+    newlines and indentations. Otherwise it will be one long line.
+  - `keyorder`
+    `keyorder` is an array to specify the ordering of keys in the
+    encoded output. If an object has keys which are not in this array
+    they are written after the sorted keys.
+  - `level`
+    This is the initial level of indentation used when `indent` is
+    set. For each level two spaces are added. When absent it is set
+    to 0.
+  - `buffer`
+    `buffer` is an array to store the strings for the result so they
+    can be concatenated at once. When it isn't given, the encode
+    function will create it temporary and will return the
+    concatenated result.
+  - `bufferlen`
+    When `bufferlen` is set, it has to be the index of the last
+    element of `buffer`.
+  - `tables`
+    `tables` is a set to detect reference cycles. It is created
+    temporary when absent. Every table that is currently processed
+    is used as key, the value is `true`.
+
+When `state.buffer` was set, the return value will be `true` on
+success. Without `state.buffer` the return value will be a string.
+
+`json.decode (string [, position [, null]])`
+--------------------------------------------
+
+Decode `string` starting at `position` or at 1 if `position` was
+omitted.
+
+`null` is an optional value to be returned for null values. The
+default is `nil`, but you could set it to `json.null` or any other
+value.
+
+The return values are the object or `nil`, the position of the next
+character that doesn't belong to the object, and in case of errors
+an error message.
+
+Two metatables are created. Every array or object that is decoded gets
+a metatable with the `__jsontype` field set to either `array` or
+`object`. If you want to provide your own metatables use the syntax
+
+    json.decode (string, position, null, objectmeta, arraymeta)
+
+To prevent the assigning of metatables pass `nil`:
+
+    json.decode (string, position, null, nil)
+
+`<metatable>.__jsonorder`
+-------------------------
+
+`__jsonorder` can overwrite the `keyorder` for a specific table.
+
+`<metatable>.__jsontype`
+------------------------
+
+`__jsontype` can be either `"array"` or `"object"`. This value is only
+checked for empty tables. (The default for empty tables is `"array"`).
+
+`<metatable>.__tojson (self, state)`
+------------------------------------
+
+You can provide your own `__tojson` function in a metatable. In this
+function you can either add directly to the buffer and return true,
+or you can return a string. On errors nil and a message should be
+returned.
+
+`json.null`
+-----------
+
+You can use this value for setting explicit `null` values.
+
+`json.version`
+--------------
+
+Set to `"dkjson 2.2"`.
+
+`json.quotestring (string)`
+---------------------------
+
+Quote a UTF-8 string and escape critical characters using JSON
+escape sequences. This function is only necessary when you build
+your own `__tojson` functions.
+
+`json.addnewline (state)`
+-------------------------
+
+When `state.indent` is set, add a newline to `state.buffer` and spaces
+according to `state.level`.
+
+LPeg support
+------------
+
+When the local configuration variable `always_try_using_lpeg` is set,
+this module tries to load LPeg to replace the `decode` function. The
+speed increase is significant. You can get the LPeg module at
+  <http://www.inf.puc-rio.br/~roberto/lpeg/>.
+When LPeg couldn't be loaded, the pure Lua functions stay active.
+
+In case you don't want this module to require LPeg on its own,
+disable the option `always_try_using_lpeg` in the options section at
+the top of the module.
+
+In this case you can later load LPeg support using
+
+### `json.use_lpeg ()`
+
+Require the LPeg module and replace the functions `quotestring` and
+and `decode` with functions that use LPeg patterns.
+This function returns the module table, so you can load the module
+using:
+
+    json = require "dkjson".use_lpeg()
+
+Alternatively you can use `pcall` so the JSON module still works when
+LPeg isn't found.
+
+    json = require "dkjson"
+    pcall (json.use_lpeg)
+
+### `json.using_lpeg`
+
+This variable is set to `true` when LPeg was loaded successfully.
+
+---------------------------------------------------------------------
+
+Contact
+-------
+
+You can contact the author by sending an e-mail to 'kolf' at the
+e-mail provider 'gmx.de'.
+
+---------------------------------------------------------------------
+
+*Copyright (C) 2010, 2011, 2012 David Heiko Kolf*
+
+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.
+
+<!-- This documentation can be parsed using Markdown to generate HTML.
+     The source code is enclosed in a HTML comment so it won't be displayed
+     by browsers, but it should be removed from the final HTML file as
+     it isn't a valid HTML comment (and wastes space).
+  -->
+
+  <!--]==]
+
+-- global dependencies:
+local pairs, type, tostring, tonumber, getmetatable, setmetatable, rawset =
+      pairs, type, tostring, tonumber, getmetatable, setmetatable, rawset
+local error, require, pcall, select = error, require, pcall, select
+local floor, huge = math.floor, math.huge
+local strrep, gsub, strsub, strbyte, strchar, strfind, strlen, strformat =
+      string.rep, string.gsub, string.sub, string.byte, string.char,
+      string.find, string.len, string.format
+local concat = table.concat
+
+local _ENV = nil -- blocking globals in Lua 5.2
+
+local json = { version = "dkjson 2.2" }
+
+pcall (function()
+  -- Enable access to blocked metatables.
+  -- Don't worry, this module doesn't change anything in them.
+  local debmeta = require "debug".getmetatable
+  if debmeta then getmetatable = debmeta end
+end)
+
+json.null = setmetatable ({}, {
+  __tojson = function () return "null" end
+})
+
+local function isarray (tbl)
+  local max, n, arraylen = 0, 0, 0
+  for k,v in pairs (tbl) do
+    if k == 'n' and type(v) == 'number' then
+      arraylen = v
+      if v > max then
+        max = v
+      end
+    else
+      if type(k) ~= 'number' or k < 1 or floor(k) ~= k then
+        return false
+      end
+      if k > max then
+        max = k
+      end
+      n = n + 1
+    end
+  end
+  if max > 10 and max > arraylen and max > n * 2 then
+    return false -- don't create an array with too many holes
+  end
+  return true, max
+end
+
+local escapecodes = {
+  ["\""] = "\\\"", ["\\"] = "\\\\", ["\b"] = "\\b", ["\f"] = "\\f",
+  ["\n"] = "\\n",  ["\r"] = "\\r",  ["\t"] = "\\t"
+}
+
+local function escapeutf8 (uchar)
+  local value = escapecodes[uchar]
+  if value then
+    return value
+  end
+  local a, b, c, d = strbyte (uchar, 1, 4)
+  a, b, c, d = a or 0, b or 0, c or 0, d or 0
+  if a <= 0x7f then
+    value = a
+  elseif 0xc0 <= a and a <= 0xdf and b >= 0x80 then
+    value = (a - 0xc0) * 0x40 + b - 0x80
+  elseif 0xe0 <= a and a <= 0xef and b >= 0x80 and c >= 0x80 then
+    value = ((a - 0xe0) * 0x40 + b - 0x80) * 0x40 + c - 0x80
+  elseif 0xf0 <= a and a <= 0xf7 and b >= 0x80 and c >= 0x80 and d >= 0x80 then
+    value = (((a - 0xf0) * 0x40 + b - 0x80) * 0x40 + c - 0x80) * 0x40 + d - 0x80
+  else
+    return ""
+  end
+  if value <= 0xffff then
+    return strformat ("\\u%.4x", value)
+  elseif value <= 0x10ffff then
+    -- encode as UTF-16 surrogate pair
+    value = value - 0x10000
+    local highsur, lowsur = 0xD800 + floor (value/0x400), 0xDC00 + (value % 0x400)
+    return strformat ("\\u%.4x\\u%.4x", highsur, lowsur)
+  else
+    return ""
+  end
+end
+
+local function fsub (str, pattern, repl)
+  -- gsub always builds a new string in a buffer, even when no match
+  -- exists. First using find should be more efficient when most strings
+  -- don't contain the pattern.
+  if strfind (str, pattern) then
+    return gsub (str, pattern, repl)
+  else
+    return str
+  end
+end
+
+local function quotestring (value)
+  -- based on the regexp "escapable" in https://github.com/douglascrockford/JSON-js
+  value = fsub (value, "[%z\1-\31\"\\\127]", escapeutf8)
+  if strfind (value, "[\194\216\220\225\226\239]") then
+    value = fsub (value, "\194[\128-\159\173]", escapeutf8)
+    value = fsub (value, "\216[\128-\132]", escapeutf8)
+    value = fsub (value, "\220\143", escapeutf8)
+    value = fsub (value, "\225\158[\180\181]", escapeutf8)
+    value = fsub (value, "\226\128[\140-\143\168\175]", escapeutf8)
+    value = fsub (value, "\226\129[\160-\175]", escapeutf8)
+    value = fsub (value, "\239\187\191", escapeutf8)
+    value = fsub (value, "\239\191[\176\191]", escapeutf8)
+  end
+  return "\"" .. value .. "\""
+end
+json.quotestring = quotestring
+
+local function addnewline2 (level, buffer, buflen)
+  buffer[buflen+1] = "\n"
+  buffer[buflen+2] = strrep ("  ", level)
+  buflen = buflen + 2
+  return buflen
+end
+
+function json.addnewline (state)
+  if state.indent then
+    state.bufferlen = addnewline2 (state.level or 0,
+                           state.buffer, state.bufferlen or #(state.buffer))
+  end
+end
+
+local encode2 -- forward declaration
+
+local function addpair (key, value, prev, indent, level, buffer, buflen, tables, globalorder)
+  local kt = type (key)
+  if kt ~= 'string' and kt ~= 'number' then
+    return nil, "type '" .. kt .. "' is not supported as a key by JSON."
+  end
+  if prev then
+    buflen = buflen + 1
+    buffer[buflen] = ","
+  end
+  if indent then
+    buflen = addnewline2 (level, buffer, buflen)
+  end
+  buffer[buflen+1] = quotestring (key)
+  buffer[buflen+2] = ":"
+  return encode2 (value, indent, level, buffer, buflen + 2, tables, globalorder)
+end
+
+encode2 = function (value, indent, level, buffer, buflen, tables, globalorder)
+  local valtype = type (value)
+  local valmeta = getmetatable (value)
+  valmeta = type (valmeta) == 'table' and valmeta -- only tables
+  local valtojson = valmeta and valmeta.__tojson
+  if valtojson then
+    if tables[value] then
+      return nil, "reference cycle"
+    end
+    tables[value] = true
+    local state = {
+        indent = indent, level = level, buffer = buffer,
+        bufferlen = buflen, tables = tables, keyorder = globalorder
+    }
+    local ret, msg = valtojson (value, state)
+    if not ret then return nil, msg end
+    tables[value] = nil
+    buflen = state.bufferlen
+    if type (ret) == 'string' then
+      buflen = buflen + 1
+      buffer[buflen] = ret
+    end
+  elseif value == nil then
+    buflen = buflen + 1
+    buffer[buflen] = "null"
+  elseif valtype == 'number' then
+    local s
+    if value ~= value or value >= huge or -value >= huge then
+      -- This is the behaviour of the original JSON implementation.
+      s = "null"
+    else
+      s = tostring (value)
+    end
+    buflen = buflen + 1
+    buffer[buflen] = s
+  elseif valtype == 'boolean' then
+    buflen = buflen + 1
+    buffer[buflen] = value and "true" or "false"
+  elseif valtype == 'string' then
+    buflen = buflen + 1
+    buffer[buflen] = quotestring (value)
+  elseif valtype == 'table' then
+    if tables[value] then
+      return nil, "reference cycle"
+    end
+    tables[value] = true
+    level = level + 1
+    local isa, n = isarray (value)
+    if n == 0 and valmeta and valmeta.__jsontype == 'object' then
+      isa = false
+    end
+    local msg
+    if isa then -- JSON array
+      buflen = buflen + 1
+      buffer[buflen] = "["
+      for i = 1, n do
+        buflen, msg = encode2 (value[i], indent, level, buffer, buflen, tables, globalorder)
+        if not buflen then return nil, msg end
+        if i < n then
+          buflen = buflen + 1
+          buffer[buflen] = ","
+        end
+      end
+      buflen = buflen + 1
+      buffer[buflen] = "]"
+    else -- JSON object
+      local prev = false
+      buflen = buflen + 1
+      buffer[buflen] = "{"
+      local order = valmeta and valmeta.__jsonorder or globalorder
+      if order then
+        local used = {}
+        n = #order
+        for i = 1, n do
+          local k = order[i]
+          local v = value[k]
+          if v then
+            used[k] = true
+            buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder)
+            prev = true -- add a seperator before the next element
+          end
+        end
+        for k,v in pairs (value) do
+          if not used[k] then
+            buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder)
+            if not buflen then return nil, msg end
+            prev = true -- add a seperator before the next element
+          end
+        end
+      else -- unordered
+        for k,v in pairs (value) do
+          buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder)
+          if not buflen then return nil, msg end
+          prev = true -- add a seperator before the next element
+        end
+      end
+      if indent then
+        buflen = addnewline2 (level - 1, buffer, buflen)
+      end
+      buflen = buflen + 1
+      buffer[buflen] = "}"
+    end
+    tables[value] = nil
+  else
+    return nil, "type '" .. valtype .. "' is not supported by JSON."
+  end
+  return buflen
+end
+
+function json.encode (value, state)
+  state = state or {}
+  local oldbuffer = state.buffer
+  local buffer = oldbuffer or {}
+  local ret, msg = encode2 (value, state.indent, state.level or 0,
+                   buffer, state.bufferlen or 0, state.tables or {}, state.keyorder)
+  if not ret then
+    error (msg, 2)
+  elseif oldbuffer then
+    state.bufferlen = ret
+    return true
+  else
+    return concat (buffer)
+  end
+end
+
+local function loc (str, where)
+  local line, pos, linepos = 1, 1, 0
+  while true do
+    pos = strfind (str, "\n", pos, true)
+    if pos and pos < where then
+      line = line + 1
+      linepos = pos
+      pos = pos + 1
+    else
+      break
+    end
+  end
+  return "line " .. line .. ", column " .. (where - linepos)
+end
+
+local function unterminated (str, what, where)
+  return nil, strlen (str) + 1, "unterminated " .. what .. " at " .. loc (str, where)
+end
+
+local function scanwhite (str, pos)
+  while true do
+    pos = strfind (str, "%S", pos)
+    if not pos then return nil end
+    if strsub (str, pos, pos + 2) == "\239\187\191" then
+      -- UTF-8 Byte Order Mark
+      pos = pos + 3
+    else
+      return pos
+    end
+  end
+end
+
+local escapechars = {
+  ["\""] = "\"", ["\\"] = "\\", ["/"] = "/", ["b"] = "\b", ["f"] = "\f",
+  ["n"] = "\n", ["r"] = "\r", ["t"] = "\t"
+}
+
+local function unichar (value)
+  if value < 0 then
+    return nil
+  elseif value <= 0x007f then
+    return strchar (value)
+  elseif value <= 0x07ff then
+    return strchar (0xc0 + floor(value/0x40),
+                    0x80 + (floor(value) % 0x40))
+  elseif value <= 0xffff then
+    return strchar (0xe0 + floor(value/0x1000),
+                    0x80 + (floor(value/0x40) % 0x40),
+                    0x80 + (floor(value) % 0x40))
+  elseif value <= 0x10ffff then
+    return strchar (0xf0 + floor(value/0x40000),
+                    0x80 + (floor(value/0x1000) % 0x40),
+                    0x80 + (floor(value/0x40) % 0x40),
+                    0x80 + (floor(value) % 0x40))
+  else
+    return nil
+  end
+end
+
+local function scanstring (str, pos)
+  local lastpos = pos + 1
+  local buffer, n = {}, 0
+  while true do
+    local nextpos = strfind (str, "[\"\\]", lastpos)
+    if not nextpos then
+      return unterminated (str, "string", pos)
+    end
+    if nextpos > lastpos then
+      n = n + 1
+      buffer[n] = strsub (str, lastpos, nextpos - 1)
+    end
+    if strsub (str, nextpos, nextpos) == "\"" then
+      lastpos = nextpos + 1
+      break
+    else
+      local escchar = strsub (str, nextpos + 1, nextpos + 1)
+      local value
+      if escchar == "u" then
+        value = tonumber (strsub (str, nextpos + 2, nextpos + 5), 16)
+        if value then
+          local value2
+          if 0xD800 <= value and value <= 0xDBff then
+            -- we have the high surrogate of UTF-16. Check if there is a
+            -- low surrogate escaped nearby to combine them.
+            if strsub (str, nextpos + 6, nextpos + 7) == "\\u" then
+              value2 = tonumber (strsub (str, nextpos + 8, nextpos + 11), 16)
+              if value2 and 0xDC00 <= value2 and value2 <= 0xDFFF then
+                value = (value - 0xD800)  * 0x400 + (value2 - 0xDC00) + 0x10000
+              else
+                value2 = nil -- in case it was out of range for a low surrogate
+              end
+            end
+          end
+          value = value and unichar (value)
+          if value then
+            if value2 then
+              lastpos = nextpos + 12
+            else
+              lastpos = nextpos + 6
+            end
+          end
+        end
+      end
+      if not value then
+        value = escapechars[escchar] or escchar
+        lastpos = nextpos + 2
+      end
+      n = n + 1
+      buffer[n] = value
+    end
+  end
+  if n == 1 then
+    return buffer[1], lastpos
+  elseif n > 1 then
+    return concat (buffer), lastpos
+  else
+    return "", lastpos
+  end
+end
+
+local scanvalue -- forward declaration
+
+local function scantable (what, closechar, str, startpos, nullval, objectmeta, arraymeta)
+  local len = strlen (str)
+  local tbl, n = {}, 0
+  local pos = startpos + 1
+  if what == 'object' then
+    setmetatable (tbl, objectmeta)
+  else
+    setmetatable (tbl, arraymeta)
+  end
+  while true do
+    pos = scanwhite (str, pos)
+    if not pos then return unterminated (str, what, startpos) end
+    local char = strsub (str, pos, pos)
+    if char == closechar then
+      return tbl, pos + 1
+    end
+    local val1, err
+    val1, pos, err = scanvalue (str, pos, nullval, objectmeta, arraymeta)
+    if err then return nil, pos, err end
+    pos = scanwhite (str, pos)
+    if not pos then return unterminated (str, what, startpos) end
+    char = strsub (str, pos, pos)
+    if char == ":" then
+      if val1 == nil then
+        return nil, pos, "cannot use nil as table index (at " .. loc (str, pos) .. ")"
+      end
+      pos = scanwhite (str, pos + 1)
+      if not pos then return unterminated (str, what, startpos) end
+      local val2
+      val2, pos, err = scanvalue (str, pos, nullval, objectmeta, arraymeta)
+      if err then return nil, pos, err end
+      tbl[val1] = val2
+      pos = scanwhite (str, pos)
+      if not pos then return unterminated (str, what, startpos) end
+      char = strsub (str, pos, pos)
+    else
+      n = n + 1
+      tbl[n] = val1
+    end
+    if char == "," then
+      pos = pos + 1
+    end
+  end
+end
+
+scanvalue = function (str, pos, nullval, objectmeta, arraymeta)
+  pos = pos or 1
+  pos = scanwhite (str, pos)
+  if not pos then
+    return nil, strlen (str) + 1, "no valid JSON value (reached the end)"
+  end
+  local char = strsub (str, pos, pos)
+  if char == "{" then
+    return scantable ('object', "}", str, pos, nullval, objectmeta, arraymeta)
+  elseif char == "[" then
+    return scantable ('array', "]", str, pos, nullval, objectmeta, arraymeta)
+  elseif char == "\"" then
+    return scanstring (str, pos)
+  else
+    local pstart, pend = strfind (str, "^%-?[%d%.]+[eE]?[%+%-]?%d*", pos)
+    if pstart then
+      local number = tonumber (strsub (str, pstart, pend))
+      if number then
+        return number, pend + 1
+      end
+    end
+    pstart, pend = strfind (str, "^%a%w*", pos)
+    if pstart then
+      local name = strsub (str, pstart, pend)
+      if name == "true" then
+        return true, pend + 1
+      elseif name == "false" then
+        return false, pend + 1
+      elseif name == "null" then
+        return nullval, pend + 1
+      end
+    end
+    return nil, pos, "no valid JSON value at " .. loc (str, pos)
+  end
+end
+
+local function optionalmetatables(...)
+  if select("#", ...) > 0 then
+    return ...
+  else
+    return {__jsontype = 'object'}, {__jsontype = 'array'}
+  end
+end
+
+function json.decode (str, pos, nullval, ...)
+  local objectmeta, arraymeta = optionalmetatables(...)
+  return scanvalue (str, pos, nullval, objectmeta, arraymeta)
+end
+
+function json.use_lpeg ()
+  local g = require ("lpeg")
+  local pegmatch = g.match
+  local P, S, R, V = g.P, g.S, g.R, g.V
+
+  local function ErrorCall (str, pos, msg, state)
+    if not state.msg then
+      state.msg = msg .. " at " .. loc (str, pos)
+      state.pos = pos
+    end
+    return false
+  end
+
+  local function Err (msg)
+    return g.Cmt (g.Cc (msg) * g.Carg (2), ErrorCall)
+  end
+
+  local Space = (S" \n\r\t" + P"\239\187\191")^0
+
+  local PlainChar = 1 - S"\"\\\n\r"
+  local EscapeSequence = (P"\\" * g.C (S"\"\\/bfnrt" + Err "unsupported escape sequence")) / escapechars
+  local HexDigit = R("09", "af", "AF")
+  local function UTF16Surrogate (match, pos, high, low)
+    high, low = tonumber (high, 16), tonumber (low, 16)
+    if 0xD800 <= high and high <= 0xDBff and 0xDC00 <= low and low <= 0xDFFF then
+      return true, unichar ((high - 0xD800)  * 0x400 + (low - 0xDC00) + 0x10000)
+    else
+      return false
+    end
+  end
+  local function UTF16BMP (hex)
+    return unichar (tonumber (hex, 16))
+  end
+  local U16Sequence = (P"\\u" * g.C (HexDigit * HexDigit * HexDigit * HexDigit))
+  local UnicodeEscape = g.Cmt (U16Sequence * U16Sequence, UTF16Surrogate) + U16Sequence/UTF16BMP
+  local Char = UnicodeEscape + EscapeSequence + PlainChar
+  local String = P"\"" * g.Cs (Char ^ 0) * (P"\"" + Err "unterminated string")
+  local Integer = P"-"^(-1) * (P"0" + (R"19" * R"09"^0))
+  local Fractal = P"." * R"09"^0
+  local Exponent = (S"eE") * (S"+-")^(-1) * R"09"^1
+  local Number = (Integer * Fractal^(-1) * Exponent^(-1))/tonumber
+  local Constant = P"true" * g.Cc (true) + P"false" * g.Cc (false) + P"null" * g.Carg (1)
+  local SimpleValue = Number + String + Constant
+  local ArrayContent, ObjectContent
+
+  -- The functions parsearray and parseobject parse only a single value/pair
+  -- at a time and store them directly to avoid hitting the LPeg limits.
+  local function parsearray (str, pos, nullval, state)
+    local obj, cont
+    local npos
+    local t, nt = {}, 0
+    repeat
+      obj, cont, npos = pegmatch (ArrayContent, str, pos, nullval, state)
+      if not npos then break end
+      pos = npos
+      nt = nt + 1
+      t[nt] = obj
+    until cont == 'last'
+    return pos, setmetatable (t, state.arraymeta)
+  end
+
+  local function parseobject (str, pos, nullval, state)
+    local obj, key, cont
+    local npos
+    local t = {}
+    repeat
+      key, obj, cont, npos = pegmatch (ObjectContent, str, pos, nullval, state)
+      if not npos then break end
+      pos = npos
+      t[key] = obj
+    until cont == 'last'
+    return pos, setmetatable (t, state.objectmeta)
+  end
+
+  local Array = P"[" * g.Cmt (g.Carg(1) * g.Carg(2), parsearray) * Space * (P"]" + Err "']' expected")
+  local Object = P"{" * g.Cmt (g.Carg(1) * g.Carg(2), parseobject) * Space * (P"}" + Err "'}' expected")
+  local Value = Space * (Array + Object + SimpleValue)
+  local ExpectedValue = Value + Space * Err "value expected"
+  ArrayContent = Value * Space * (P"," * g.Cc'cont' + g.Cc'last') * g.Cp()
+  local Pair = g.Cg (Space * String * Space * (P":" + Err "colon expected") * ExpectedValue)
+  ObjectContent = Pair * Space * (P"," * g.Cc'cont' + g.Cc'last') * g.Cp()
+  local DecodeValue = ExpectedValue * g.Cp ()
+
+  function json.decode (str, pos, nullval, ...)
+    local state = {}
+    state.objectmeta, state.arraymeta = optionalmetatables(...)
+    local obj, retpos = pegmatch (DecodeValue, str, pos, nullval, state)
+    if state.msg then
+      return nil, state.pos, state.msg
+    else
+      return obj, retpos
+    end
+  end
+
+  -- use this function only once:
+  json.use_lpeg = function () return json end
+
+  json.using_lpeg = true
+
+  return json -- so you can get the module using json = require "dkjson".use_lpeg()
+end
+
+if always_try_using_lpeg then
+  pcall (json.use_lpeg)
+end
+
+return json
+
+-->

deps/event.lua

@@ -0,0 +1,27 @@
+Event = class()
+
+function Event:init()
+  self.handlers = {}
+end
+
+function Event:on(event, fn, context)
+  self.handlers[event] = self.handlers[event] or {}
+  if context then
+    self.handlers[event][context] = fn
+  else
+    table.insert(self.handlers[event], fn)
+  end
+end
+
+function Event:emit(event, data)
+  if not self.handlers[event] then return end
+  for _, fn in pairs(self.handlers[event]) do
+    fn(data)
+  end
+end
+
+function Event:remove(event, context)
+  if self.handlers[event] and self.handlers[event][context] then
+    self.handlers[event][context] = nil
+  end
+end

deps/util.lua

@@ -16,8 +16,21 @@ function math.hlora(x1, y1, x2, y2, rx, ry, rw, rh) -- Hot line on rectangle act
       or math.hlola(x1, y1, x2, y2, rx, ryh, rxw, ryh)
 end
 
-function drawPhysicsObject(how, obj)
+physics = {}
+function physics.draw(how, obj)
   if obj.shape:typeOf('PolygonShape') then
     love.graphics.polygon(how, obj.body:getWorldPoints(obj.shape:getPoints()))
   end
 end
+
+timer = {}
+function timer.rot(v, fn)
+ if v > 0 then
+   v = v - ls.tickrate
+   if v <= 0 then
+     v = 0
+     v = f.exe(fn) or 0
+   end
+ end
+ return v
+end

game.lua

@@ -1,7 +1,7 @@
 Game = class()
 
 function Game:load()
-  self.world = love.physics.newWorld(0, 98)
+  self.world = love.physics.newWorld(0, 500)
   self.map = Map(ctx)
   self.pigeon = Pigeon()
   self.people = {}

loader.lua

@@ -0,0 +1,116 @@
+data = {}
+data.load = function()
+
+  -- Media
+	local function lookup(ext, fn)
+		local function halp(s, k)
+			local base = s._path .. '/' .. k
+      local function extLoad(ext)
+        if love.filesystem.exists(base .. ext) then
+          s[k] = fn(base .. ext)
+        elseif love.filesystem.isDirectory(base) then
+          local t = {}
+          t._path = base
+          setmetatable(t, {__index = halp})
+          s[k] = t
+        else
+          return false
+        end
+
+        return true
+      end
+
+      if type(ext) == 'table' then
+        lume.each(ext, function(e) return extLoad(e) end)
+      else
+        extLoad(ext)
+      end
+
+			return rawget(s, k)
+		end
+
+		return halp
+	end
+
+  data.media = {}
+	data.media.graphics = setmetatable({_path = 'media/graphics'}, {__index = lookup({'.png', '.dds'}, love.graphics and love.graphics.newImage or f.empty)})
+
+  -- Data
+  local function load(dir, type, fn)
+    local id = 1
+    local function halp(dir, dst)
+      for _, file in ipairs(love.filesystem.getDirectoryItems(dir)) do
+        path = dir .. '/' .. file
+        if love.filesystem.isDirectory(path) then
+          dst[file] = {}
+          halp(path, dst[file])
+        elseif file:match('%.lua$') and not file:match('^%.') then
+          local obj = love.filesystem.load(path)()
+          assert(obj, path .. ' did not return a value')
+          obj.code = obj.code or file:gsub('%.lua', '')
+          obj.id = id
+          obj = f.exe(fn, obj) or obj
+          data[type][id] = obj
+          dst[obj.code] = obj
+          id = id + 1
+        end
+      end
+    end
+
+    data[type] = {}
+    halp(dir, data[type])
+  end
+
+  load('data/animation', 'animation', function(animation)
+
+    -- Set up lazy loading for images
+    local code = animation.code
+    animation.graphics = setmetatable({_path = 'media/skeletons/' .. code}, {
+      __index = lookup({'.png', '.dds'}, function(path)
+        local img = love.graphics.newImage(path)
+        if path:match('%.dds') then img:setMipmapFilter('nearest', 1) end
+        return img
+      end)
+    })
+
+    -- Set up static spine data structures
+    local s = {}
+    s.__index = s
+    if love.filesystem.exists('media/skeletons/' .. code .. '/' .. code .. '.atlas') then
+      s.atlas = spine.Atlas.new('media/skeletons/' .. code .. '/' .. code .. '.atlas')
+      s.atlasAttachmentLoader = spine.AtlasAttachmentLoader.new(s.atlas)
+    end
+    s.json = spine.SkeletonJson.new(s.atlasAttachmentLoader)
+    s.skeletonData = s.json:readSkeletonDataFile('media/skeletons/' .. code .. '/' .. code .. '.json')
+    s.animationStateData = spine.AnimationStateData.new(s.skeletonData)
+
+    -- Reverse-index keys (sorted for consistent order)
+    local keys = lume.keys(animation.states)
+    table.sort(keys)
+
+    for i = 1, #keys do
+      local state = animation.states[keys[i]]
+      animation.states[i] = state
+      state.index = i
+      state.name = keys[i]
+    end
+
+    -- Set mixes
+    for i = 1, #animation.states do
+      lume.each(animation.states, function(state)
+        if state.index ~= i then
+          s.animationStateData:setMix(animation.states[i].name, state.name, Animation.defaultMix)
+        end
+      end)
+
+      lume.each(animation.states[i].mix, function(time, to)
+        s.animationStateData:setMix(animation.states[i].name, to, time)
+      end)
+    end
+
+    animation.spine = s
+
+    return animation
+  end)
+end
+

main.lua

@@ -1,5 +1,6 @@
 require 'require'
 
 function love.load()
+  data.load()
   Context:bind(Game)
 end

map.lua

@@ -17,5 +17,5 @@ function Map:draw()
   g.rectangle('fill', 0, 0, self.width, self.height)
 
   g.setColor(100, 80, 0)
-  drawPhysicsObject('fill', self.ground)
+  physics.draw('fill', self.ground)
 end

media/skeletons/pigeon/pigeon.json

@@ -0,0 +1,154 @@
+{
+"skeleton": { "hash": "+aXukBFuk86JeciF+TzXAV+VW14", "spine": "2.1.27", "width": 1222.73, "height": 1500.37 },
+"bones": [
+	{ "name": "root" },
+	{
+		"name": "body1",
+		"parent": "root",
+		"length": 204.7,
+		"x": 54.09,
+		"y": 971.34,
+		"scaleX": 3.274,
+		"scaleY": 3.274,
+		"rotation": -137.28
+	},
+	{ "name": "body2", "parent": "body1", "length": 71.18, "x": 7.92, "y": 19.92, "rotation": 115.65 },
+	{ "name": "leftthigh", "parent": "body1", "length": 41.26, "x": 113.34, "y": 105.87, "rotation": 45.68 },
+	{ "name": "leftwing", "parent": "body1", "length": 100.44, "x": 56.09, "y": 20.75, "rotation": -32.08 },
+	{ "name": "neck4", "parent": "body1", "length": 8.46, "x": -30.1, "y": -6.61, "rotation": -171.05 },
+	{ "name": "rightthigh", "parent": "body1", "length": 76.97, "x": 148.38, "y": 103.93, "rotation": 47.34 },
+	{ "name": "rightwing", "parent": "body1", "length": 134.5, "x": 116.07, "y": 18.52, "rotation": -32.2 },
+	{ "name": "body3", "parent": "body2", "length": 76.47, "x": -6.96, "y": -32.57, "rotation": -18.91 },
+	{ "name": "leftshin", "parent": "leftthigh", "length": 32.21, "x": 49.76, "y": 4.44, "rotation": 27.46 },
+	{ "name": "neck3", "parent": "neck4", "length": 12.62, "x": 16.48, "y": 2.12, "rotation": 18.29 },
+	{ "name": "rightshin", "parent": "rightthigh", "length": 45.48, "x": 75.43, "y": 1.46, "rotation": 23.96 },
+	{ "name": "body4", "parent": "body3", "length": 66.4, "x": 9.12, "y": -50.94, "rotation": -3.58 },
+	{ "name": "leftfoot", "parent": "leftshin", "length": 16.74, "x": 39.38, "y": -0.61, "rotation": 81.49 },
+	{ "name": "neck2", "parent": "neck3", "length": 11.12, "x": 23.7, "y": 1.56 },
+	{ "name": "rightfoot", "parent": "rightshin", "length": 22.79, "x": 46.34, "y": 3.9, "rotation": 64.71 },
+	{ "name": "leftclaw1", "parent": "leftfoot", "length": 17.86, "x": 21.33, "y": -6.02, "rotation": -19.1 },
+	{ "name": "leftclaw2", "parent": "leftfoot", "length": 19.71, "x": 23.68, "y": 3.56, "rotation": -19.1 },
+	{ "name": "leftclaw3", "parent": "leftfoot", "length": 12.92, "x": 25.01, "y": 5.73, "rotation": -17.07 },
+	{ "name": "neck1", "parent": "neck2", "length": 7.9, "x": 17.74, "y": -0.1, "rotation": -12.43 },
+	{ "name": "rightclaw1", "parent": "rightfoot", "length": 33.09, "x": 29.63, "y": -3.66, "rotation": -8.06 },
+	{ "name": "rightclaw2", "parent": "rightfoot", "length": 33.52, "x": 30.57, "y": 9.89, "rotation": -6.26 },
+	{ "name": "rightclaw3", "parent": "rightfoot", "length": 23.59, "x": 27.31, "y": 18.44, "rotation": -6.26 },
+	{ "name": "head", "parent": "neck1", "length": 30.9, "x": 29.81, "y": 0.93, "rotation": 30.56 },
+	{ "name": "beakclosed", "parent": "head", "length": 26.24, "x": 11.06, "y": -32.91, "rotation": -130.11 },
+	{ "name": "beakopen", "parent": "head", "length": 26.59, "x": 9.08, "y": -30.6, "rotation": -129.66 },
+	{ "name": "pupil", "parent": "head", "length": 5.54, "x": 23.09, "y": -8.27, "rotation": 32.52 }
+],
+"slots": [
+	{ "name": "leftwing", "bone": "leftwing", "attachment": "leftwing" },
+	{ "name": "leftthigh", "bone": "leftthigh", "attachment": "leftthigh" },
+	{ "name": "leftshin", "bone": "leftshin", "attachment": "leftshin" },
+	{ "name": "leftclaw3", "bone": "leftclaw3", "attachment": "leftclaw3" },
+	{ "name": "leftclaw2", "bone": "leftclaw2", "attachment": "leftclaw2" },
+	{ "name": "leftclaw1", "bone": "leftclaw1", "attachment": "leftclaw1" },
+	{ "name": "leftfoot", "bone": "leftfoot", "attachment": "leftfoot" },
+	{ "name": "body4", "bone": "body4", "attachment": "body4" },
+	{ "name": "body3", "bone": "body3", "attachment": "body3" },
+	{ "name": "body2", "bone": "body2", "attachment": "body2" },
+	{ "name": "body1", "bone": "body1", "attachment": "body1" },
+	{ "name": "neck4", "bone": "neck4", "attachment": "neck4" },
+	{ "name": "neck3", "bone": "neck3", "attachment": "neck3" },
+	{ "name": "neck2", "bone": "neck2", "attachment": "neck2" },
+	{ "name": "neck1", "bone": "neck1", "attachment": "neck1" },
+	{ "name": "beakopen", "bone": "beakopen", "attachment": "beakopen" },
+	{ "name": "beakclosed", "bone": "beakclosed", "attachment": "beakclosed" },
+	{ "name": "head", "bone": "beakclosed", "attachment": "head" },
+	{ "name": "rightthigh", "bone": "rightthigh", "attachment": "rightthigh" },
+	{ "name": "rightshin", "bone": "rightshin", "attachment": "rightshin" },
+	{ "name": "rightclaw3", "bone": "rightclaw3", "attachment": "rightclaw3" },
+	{ "name": "rightclaw2", "bone": "rightclaw2", "attachment": "rightclaw2" },
+	{ "name": "rightclaw1", "bone": "rightclaw1", "attachment": "rightclaw1" },
+	{ "name": "rightfoot", "bone": "rightfoot", "attachment": "rightfoot" },
+	{ "name": "rightwing", "bone": "rightwing", "attachment": "rightwing" },
+	{ "name": "pupil", "bone": "pupil", "attachment": "pupil" }
+],
+"skins": {
+	"default": {
+		"beakclosed": {
+			"beakclosed": { "x": 6.59, "y": 0.3, "scaleX": 0.305, "scaleY": 0.305, "rotation": 42.02, "width": 139, "height": 133 }
+		},
+		"beakopen": {
+			"beakopen": { "x": 9.27, "y": 1.5, "scaleX": 0.305, "scaleY": 0.305, "rotation": 41.57, "width": 136, "height": 149 }
+		},
+		"body1": {
+			"body1": { "x": 104.22, "y": -14.22, "scaleX": 0.305, "scaleY": 0.305, "rotation": 137.28, "width": 1134, "height": 681 }
+		},
+		"body2": {
+			"body2": { "x": 36.78, "y": -41.87, "scaleX": 0.305, "scaleY": 0.305, "rotation": 21.63, "width": 320, "height": 333 }
+		},
+		"body3": {
+			"body3": { "x": 43.03, "y": -35.77, "scaleX": 0.305, "scaleY": 0.305, "rotation": 40.55, "width": 284, "height": 414 }
+		},
+		"body4": {
+			"body4": { "x": -31.43, "y": -43.2, "scaleX": 0.305, "scaleY": 0.305, "rotation": 44.13, "width": 1002, "height": 599 }
+		},
+		"head": {
+			"head": { "x": -18.73, "y": -13.75, "scaleX": 0.305, "scaleY": 0.305, "rotation": 42.02, "width": 325, "height": 237 }
+		},
+		"leftclaw1": {
+			"leftclaw1": { "x": 15.74, "y": -0.02, "scaleX": 0.305, "scaleY": 0.305, "rotation": 1.76, "width": 125, "height": 45 }
+		},
+		"leftclaw2": {
+			"leftclaw2": { "x": 11.48, "y": -0.53, "scaleX": 0.305, "scaleY": 0.305, "rotation": 1.76, "width": 125, "height": 45 }
+		},
+		"leftclaw3": {
+			"leftclaw3": { "x": 8.85, "y": -1.7, "scaleX": 0.305, "scaleY": 0.305, "rotation": -0.27, "width": 90, "height": 24 }
+		},
+		"leftfoot": {
+			"leftfoot": { "x": -0.57, "y": 5.73, "scaleX": 0.305, "scaleY": 0.305, "rotation": -17.34, "width": 168, "height": 85 }
+		},
+		"leftshin": {
+			"leftshin": { "x": 10.19, "scaleX": 0.305, "scaleY": 0.305, "rotation": 64.14, "width": 99, "height": 178 }
+		},
+		"leftthigh": {
+			"leftthigh": { "x": 18.92, "y": -1.27, "scaleX": 0.305, "scaleY": 0.305, "rotation": 91.6, "width": 134, "height": 189 }
+		},
+		"leftwing": {
+			"leftwing": { "x": 73.58, "y": -1.93, "scaleX": 0.305, "scaleY": 0.305, "rotation": 169.37, "width": 697, "height": 294 }
+		},
+		"neck1": {
+			"neck1": { "x": 6.48, "y": 0.89, "scaleX": 0.305, "scaleY": 0.305, "rotation": -57.52, "width": 316, "height": 170 }
+		},
+		"neck2": {
+			"neck2": { "x": 8.1, "y": -4.89, "scaleX": 0.305, "scaleY": 0.305, "rotation": -69.96, "width": 282, "height": 181 }
+		},
+		"neck3": {
+			"neck3": { "x": 13.87, "y": -2.72, "scaleX": 0.305, "scaleY": 0.305, "rotation": -69.96, "width": 276, "height": 198 }
+		},
+		"neck4": {
+			"neck4": { "x": 8.34, "y": -7.2, "scaleX": 0.305, "scaleY": 0.305, "rotation": -51.66, "width": 293, "height": 217 }
+		},
+		"pupil": {
+			"pupil": { "x": 5.36, "y": -6.39, "scaleX": 0.305, "scaleY": 0.305, "rotation": -120.62, "width": 65, "height": 66 }
+		},
+		"rightclaw1": {
+			"rightclaw1": { "x": 12.84, "y": 1.75, "scaleX": 0.305, "scaleY": 0.305, "rotation": 9.33, "width": 202, "height": 47 }
+		},
+		"rightclaw2": {
+			"rightclaw2": { "x": 20.88, "y": -0.94, "scaleX": 0.305, "scaleY": 0.305, "rotation": 7.53, "width": 206, "height": 68 }
+		},
+		"rightclaw3": {
+			"rightclaw3": { "x": 11.35, "y": 1.43, "scaleX": 0.305, "scaleY": 0.305, "rotation": 7.53, "width": 118, "height": 34 }
+		},
+		"rightfoot": {
+			"rightfoot": { "x": -0.52, "y": 5.56, "scaleX": 0.305, "scaleY": 0.305, "rotation": 1.26, "width": 195, "height": 114 }
+		},
+		"rightshin": {
+			"rightshin": { "x": 11.92, "y": 0.75, "scaleX": 0.305, "scaleY": 0.305, "rotation": 65.97, "width": 117, "height": 177 }
+		},
+		"rightthigh": {
+			"rightthigh": { "x": 31.34, "y": 2.62, "scaleX": 0.305, "scaleY": 0.305, "rotation": 89.94, "width": 148, "height": 283 }
+		},
+		"rightwing": {
+			"rightwing": { "x": 70.26, "y": -6.73, "scaleX": 0.305, "scaleY": 0.305, "rotation": 169.49, "width": 748, "height": 412 }
+		}
+	}
+},
+"animations": {
+	"animation": {}
+}
+}

person.lua

@@ -1,5 +1,7 @@
 Person = class()
 
+Person.category = 3
+
 function Person:init(x, y, dir)
   self.x = x
   self.y = y
@@ -14,16 +16,30 @@ function Person:init(x, y, dir)
   self.body:setUserData(self)
 
   self.body:setMass(10)
+  self.fixture:setFriction(.35)
+  self.fixture:setCategory(self.category)
+  self.fixture:setMask(self.category)
+
+  self.stable = true
+  self.walkTimer = 1
 end
 
 function Person:update()
-  self.body:applyLinearImpulse(300 * self.direction * ls.tickrate, 0)
+  self.body:setFixedRotation(self.stable)
+  self.walkTimer = timer.rot(self.walkTimer, function()
+    self.body:applyLinearImpulse(self.direction * 50, -100)
+    return .6 + love.math.random() * .2
+  end)
 end
 
 function Person:draw()
   local g = love.graphics
+
+  g.setColor(255, 255, 255, 35)
+  physics.draw('fill', self)
+
   g.setColor(255, 255, 255)
-  drawPhysicsObject('line', self)
+  physics.draw('line', self)
 end
 
 function Person:die()

pigeon.lua

@@ -20,6 +20,8 @@ function Pigeon:init()
   self.lives = 3
   self.health = 100
   self.maxHealth = 100
+
+  self.animation = data.animation.pigeon()
 end
 
 function Pigeon:update()
@@ -136,6 +138,8 @@ function Pigeon:draw()
     g.line(x, y - self.h / 2, x2, y2 - self.h / 2)
     g.setLineWidth(1)
   end
+
+  self.animation:draw(self.x, self.y)
 end
 
 function Pigeon:keypressed(key)

require.lua

@@ -1,9 +1,12 @@
 require 'deps/class'
+require 'deps/spine/love/spine'
 flux = require 'deps/flux'
 lume = require 'deps/lume'
 lurker = require 'deps/lurker'
 ls = require 'deps/lovestep/lovestep'
 require 'deps/util'
+require 'deps/animation'
+require 'deps/event'
 
 require 'context'
 require 'game'
@@ -12,3 +15,5 @@ require 'pigeon'
 require 'map'
 
 require 'hud'
+
+require 'loader'