/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
 
 
6
 
TERM_VEL = 400
7
 
 
8
 
Player = Tile:extend {
 
5
--inspect = require 'inspect'
 
6
--_ = require 'underscore'
 
7
 
 
8
Player = Animation:extend {
9
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
   },
10
17
   onNew = function (self)
11
18
              self.velocity.y = 0
 
19
              self.maxVelocity.y = 400
12
20
           end,
13
21
   onStartFrame = function (self)
14
22
                     -- this is all in startframe so it happens before
15
23
                     -- physics calc at beginning of update
16
24
 
17
 
                 self.velocity.x = 0
18
 
                 -- TODO: this can be replaced with sprite.maxVel.y    
19
 
                 if self.velocity.y >= TERM_VEL then
20
 
                    self.velocity.y = TERM_VEL
21
 
                    self.acceleration.y = 0
22
 
                 else
23
 
                    self.acceleration.y = 800
24
 
                 end
25
 
 
26
 
                 if the.keys:pressed('left') then
27
 
                    self.velocity.x = -200
28
 
                 elseif the.keys:pressed('right') then
29
 
                    self.velocity.x = 200
30
 
                 end
31
 
 
32
 
                 if the.keys:justPressed('up') then
33
 
                    self.velocity.y = -400
34
 
                 end
35
 
              end,
 
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,
36
52
   onUpdate = function (self)
37
 
                 -- this is called after physics, so this makes sense here
38
 
                 the.view.map:subdisplace(self)
39
 
              end
 
53
                 -- needs to happen right before collision
 
54
                 self.onGround = false
 
55
                end,
 
56
   onCollide = function (self, other, xOverlap, yOverlap)
 
57
                  -- seriously, why does this even fire?
 
58
                  if other == the.view.map then return end
 
59
 
 
60
                  --print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
 
61
                  --print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
 
62
 
 
63
                  -- assumption: any other collision is with a solid map tile
 
64
                  if yOverlap > xOverlap then
 
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
 
74
                  elseif xOverlap > yOverlap then
 
75
                     -- check if we've moved since collisions were generated
 
76
                     local xov, yov = self:overlap(other.x, other.y,
 
77
                                                   other.width, other.height)
 
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
 
 
84
                        self.velocity.y = 0
 
85
                        other:displace(self)
 
86
                        self.jumping = false
 
87
                     end
 
88
                  else
 
89
                     print('??')
 
90
                  end
 
91
 
 
92
               end,
40
93
}
41
94
 
42
95
GameView = View:extend {
44
97
              self:loadLayers('data/map.lua')
45
98
              self.focus = the.player
46
99
              self:clampTo(self.map)
47
 
           end
 
100
           end,
 
101
   onUpdate = function (self)
 
102
                 --print('tick')
 
103
                 the.player:collide(self.map)
 
104
                 --self.map:collide(the.player)
 
105
              end
48
106
}
49
107
 
50
108
the.app = App:new {
51
109
   onRun = function (self)
52
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')
53
114
           end,
54
115
   onUpdate = function (self, dt)
55
 
                 if the.keys:justPressed('escape') then
 
116
                 if the.keys:justPressed('escape') and 
 
117
                   not self.console.visible then
56
118
                    love.event.quit()
57
119
                 end
58
120
              end