/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 04:58:45 UTC
  • Revision ID: josh@9ix.org-20130309045845-wdcov53ghv2h6iwf
apply acceleration to velocity, THEN apply velocity to position (then do 
collision).  important for detecting correct velocity

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'
7
5
 
8
6
Player = Animation:extend {
9
7
   image = 'data/player.png',
22
20
                     -- this is all in startframe so it happens before
23
21
                     -- physics calc at beginning of update
24
22
 
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
23
                     self.velocity.x = 0
35
24
                     self.acceleration.y = 800
36
25
 
37
26
                     if the.keys:pressed('left') then
38
27
                        self.velocity.x = -200
39
 
                        if self.onGround then self:play('walk') end
 
28
                        self:play('walk')
40
29
                     elseif the.keys:pressed('right') then
41
30
                        self.velocity.x = 200
42
 
                        if self.onGround then self:play('walk') end
 
31
                        self:play('walk')
43
32
                     else
44
 
                        if self.onGround then self:play('stand') end
 
33
                        self:play('stand')
45
34
                     end
46
35
 
47
 
                     if the.keys:justPressed('up') and self.onGround then
 
36
                     if the.keys:justPressed('up') then
48
37
                        self.velocity.y = -400
49
 
                        self.jumping = true
50
38
                     end
51
39
                  end,
52
 
   onUpdate = function (self)
53
 
                 -- needs to happen right before collision
54
 
                 self.onGround = false
55
 
                end,
56
40
   onCollide = function (self, other, xOverlap, yOverlap)
57
41
                  -- seriously, why does this even fire?
58
42
                  if other == the.view.map then return end
63
47
                  -- assumption: any other collision is with a solid map tile
64
48
                  if yOverlap > xOverlap then
65
49
                     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
74
50
                  elseif xOverlap > yOverlap then
75
51
                     -- check if we've moved since collisions were generated
76
52
                     local xov, yov = self:overlap(other.x, other.y,
77
53
                                                   other.width, other.height)
78
54
                     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
 
 
84
55
                        self.velocity.y = 0
85
56
                        other:displace(self)
86
 
                        self.jumping = false
87
57
                     end
88
58
                  else
89
59
                     print('??')
90
60
                  end
91
61
 
92
 
               end,
 
62
               end
93
63
}
94
64
 
95
65
GameView = View:extend {
108
78
the.app = App:new {
109
79
   onRun = function (self)
110
80
              self.view = GameView:new()
111
 
              --print(inspect(_(the.app):keys()))
112
 
              self.console:watch('onGround', 'the.player.onGround')
113
 
              self.console:watch('onWall', 'the.player.onWall')
114
81
           end,
115
82
   onUpdate = function (self, dt)
116
 
                 if the.keys:justPressed('escape') and 
117
 
                   not self.console.visible then
118
 
                    love.event.quit()
119
 
                 end
 
83
                 -- apparently I can do this w/ C-A-q if DEBUG is on
 
84
                 -- if the.keys:justPressed('escape') then
 
85
                 --    love.event.quit()
 
86
                 -- end
120
87
              end
121
88
}
 
 
b'\\ No newline at end of file'