/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 06:03:56 UTC
  • Revision ID: josh@9ix.org-20130309060356-qvi2yd0odhfr3e6t
try to track X collisions.  break out Sprite's physics in prep for 
overriding them completely.

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
27
27
                     if self.falling then self.jumping = false end
28
28
                     --print(self.jumping, self.falling)
29
29
 
30
 
                     if not self:onGround() then
 
30
                     if not self.onGround then
31
31
                        self:play('jump')
32
32
                     end
33
33
 
36
36
 
37
37
                     if the.keys:pressed('left') then
38
38
                        self.velocity.x = -200
39
 
                        if self:onGround() then self:play('walk') end
 
39
                        if self.onGround then self:play('walk') end
40
40
                     elseif the.keys:pressed('right') then
41
41
                        self.velocity.x = 200
42
 
                        if self:onGround() then self:play('walk') end
 
42
                        if self.onGround then self:play('walk') end
43
43
                     else
44
 
                        if self:onGround() then self:play('stand') end
 
44
                        if self.onGround then self:play('stand') end
45
45
                     end
46
46
 
47
 
                     if the.keys:justPressed('up') and self:onGround() then
 
47
                     if the.keys:justPressed('up') and self.onGround then
48
48
                        self.velocity.y = -400
49
49
                        self.jumping = true
50
50
                     end
51
51
                  end,
52
 
   onEndFrame = function (self)
53
 
                   --print(self.velocity.y)
 
52
   onUpdate = function (self)
 
53
                 -- needs to happen right before collision
 
54
                 self.onGround = false
54
55
                end,
55
56
   onCollide = function (self, other, xOverlap, yOverlap)
56
57
                  -- seriously, why does this even fire?
62
63
                  -- assumption: any other collision is with a solid map tile
63
64
                  if yOverlap > xOverlap then
64
65
                     other:displace(self)
 
66
 
 
67
                     if self.velocity.x > 0 then
 
68
                        self.onWall = 'right'
 
69
                     elseif self.velocity.x < 0 then
 
70
                        self.onWall = 'left'
 
71
                     else
 
72
                        print '??'
 
73
                     end
65
74
                  elseif xOverlap > yOverlap then
66
75
                     -- check if we've moved since collisions were generated
67
76
                     local xov, yov = self:overlap(other.x, other.y,
68
77
                                                   other.width, other.height)
69
78
                     if xov ~= 0 and yov ~= 0 then
 
79
                        --print('y collision')
 
80
                        if self.velocity.y > 0 then
 
81
                           self.onGround = true
 
82
                        end
 
83
 
70
84
                        self.velocity.y = 0
71
85
                        other:displace(self)
72
86
                        self.jumping = false
76
90
                  end
77
91
 
78
92
               end,
79
 
   onGround = function (self)
80
 
                 return (not self.jumping) and (not self.falling)
81
 
              end
82
93
}
83
94
 
84
95
GameView = View:extend {
98
109
   onRun = function (self)
99
110
              self.view = GameView:new()
100
111
              --print(inspect(_(the.app):keys()))
 
112
              self.console:watch('onGround', 'the.player.onGround')
 
113
              self.console:watch('onWall', 'the.player.onWall')
101
114
           end,
102
115
   onUpdate = function (self, dt)
103
116
                 if the.keys:justPressed('escape') and