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