/zoeplat

To get this branch, use:
bzr branch http://9ix.org/bzr/zoeplat

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-03-09 05:02:20 UTC
  • Revision ID: josh@9ix.org-20130309050220-bd1ybunyhk8fhwyw
reapply jump animation after Y collision.  (there's a frame of no 
jumping no falling that I can't do anything about w/o doing better 
collision handling)

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
 
5
--inspect = require 'inspect'
 
6
--_ = require 'underscore'
5
7
 
6
 
Player = Tile:extend {
 
8
Player = Animation:extend {
7
9
   image = 'data/player.png',
 
10
   height = 32,
 
11
   width = 32,
 
12
   sequences = {
 
13
      stand = { frames = { 1 }, fps = 1 },
 
14
      walk = { frames = { 2, 3 }, fps = 5 },
 
15
      jump = { frames = { 4 }, fps = 1 }
 
16
   },
8
17
   onNew = function (self)
9
18
              self.velocity.y = 0
10
19
              self.maxVelocity.y = 400
13
22
                     -- this is all in startframe so it happens before
14
23
                     -- physics calc at beginning of update
15
24
 
16
 
                 self.velocity.x = 0
17
 
                 self.acceleration.y = 800
18
 
 
19
 
                 if the.keys:pressed('left') then
20
 
                    self.velocity.x = -200
21
 
                 elseif the.keys:pressed('right') then
22
 
                    self.velocity.x = 200
23
 
                 end
24
 
 
25
 
                 if the.keys:justPressed('up') then
26
 
                    self.velocity.y = -400
27
 
                 end
28
 
              end,
29
 
   onUpdate = function (self)
30
 
                 -- this is called after physics, so this makes sense here
31
 
                 the.view.map:subdisplace(self)
 
25
                     -- jumping/falling updates could go in EndFrame...
 
26
                     self.falling = self.velocity.y > 0
 
27
                     if self.falling then self.jumping = false end
 
28
                     --print(self.jumping, self.falling)
 
29
 
 
30
                     if not self:onGround() then
 
31
                        self:play('jump')
 
32
                     end
 
33
 
 
34
                     self.velocity.x = 0
 
35
                     self.acceleration.y = 800
 
36
 
 
37
                     if the.keys:pressed('left') then
 
38
                        self.velocity.x = -200
 
39
                        if self:onGround() then self:play('walk') end
 
40
                     elseif the.keys:pressed('right') then
 
41
                        self.velocity.x = 200
 
42
                        if self:onGround() then self:play('walk') end
 
43
                     else
 
44
                        if self:onGround() then self:play('stand') end
 
45
                     end
 
46
 
 
47
                     if the.keys:justPressed('up') and self:onGround() then
 
48
                        self.velocity.y = -400
 
49
                        self.jumping = true
 
50
                     end
 
51
                  end,
 
52
   onEndFrame = function (self)
 
53
                   --print(self.velocity.y)
 
54
                end,
 
55
   onCollide = function (self, other, xOverlap, yOverlap)
 
56
                  -- seriously, why does this even fire?
 
57
                  if other == the.view.map then return end
 
58
 
 
59
                  --print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
 
60
                  --print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
 
61
 
 
62
                  -- assumption: any other collision is with a solid map tile
 
63
                  if yOverlap > xOverlap then
 
64
                     other:displace(self)
 
65
                  elseif xOverlap > yOverlap then
 
66
                     -- check if we've moved since collisions were generated
 
67
                     local xov, yov = self:overlap(other.x, other.y,
 
68
                                                   other.width, other.height)
 
69
                     if xov ~= 0 and yov ~= 0 then
 
70
                        self.velocity.y = 0
 
71
                        other:displace(self)
 
72
                        self.jumping = false
 
73
                     end
 
74
                  else
 
75
                     print('??')
 
76
                  end
 
77
 
 
78
               end,
 
79
   onGround = function (self)
 
80
                 return (not self.jumping) and (not self.falling)
32
81
              end
33
82
}
34
83
 
37
86
              self:loadLayers('data/map.lua')
38
87
              self.focus = the.player
39
88
              self:clampTo(self.map)
40
 
           end
 
89
           end,
 
90
   onUpdate = function (self)
 
91
                 --print('tick')
 
92
                 the.player:collide(self.map)
 
93
                 --self.map:collide(the.player)
 
94
              end
41
95
}
42
96
 
43
97
the.app = App:new {
44
98
   onRun = function (self)
45
99
              self.view = GameView:new()
 
100
              --print(inspect(_(the.app):keys()))
46
101
           end,
47
102
   onUpdate = function (self, dt)
 
103
                 -- TODO: make this not work if debug console is active
48
104
                 if the.keys:justPressed('escape') then
49
105
                    love.event.quit()
50
106
                 end