/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:49:40 UTC
  • Revision ID: josh@9ix.org-20130309054940-hg1a3ro2j8yj32p7
more reliable onGround calc

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
 
_ = require 'underscore'
6
5
--inspect = require 'inspect'
 
6
--_ = require 'underscore'
7
7
 
8
8
Player = Animation:extend {
9
9
   image = 'data/player.png',
18
18
              self.velocity.y = 0
19
19
              self.maxVelocity.y = 400
20
20
           end,
21
 
   doPhysics = function (self, dir, elapsed)
22
 
                  local vel = self.velocity
23
 
                  local acc = self.acceleration
24
 
                  local drag = self.drag
25
 
                  local minVel = self.minVelocity
26
 
                  local maxVel = self.maxVelocity
27
 
 
28
 
                  -- check existence of properties
29
 
 
30
 
                  if STRICT then
31
 
                     assert(vel, 'active sprite has no velocity property')
32
 
                     assert(acc, 'active sprite has no acceleration property')
33
 
                     assert(drag, 'active sprite has no drag property')
34
 
                     assert(minVel, 'active sprite has no minVelocity property')
35
 
                     assert(maxVel, 'active sprite has no maxVelocity property')
36
 
                     assert(_.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
37
 
                  end
38
 
 
39
 
                  vel.x = vel.x or 0
40
 
                  vel.y = vel.y or 0
41
 
                  vel.rotation = vel.rotation or 0
42
 
 
43
 
                  -- physics
44
 
 
45
 
                  if acc[dir] and acc[dir] ~= 0 then
46
 
                     vel[dir] = vel[dir] + acc[dir] * elapsed
47
 
                  else
48
 
                     if drag[dir] then
49
 
                        if vel[dir] > 0 then
50
 
                           vel[dir] = vel[dir] - drag[dir] * elapsed
51
 
                           if vel[dir] < 0 then vel[dir] = 0 end
52
 
                        elseif vel[dir] < 0 then
53
 
                           vel[dir] = vel[dir] + drag[dir] * elapsed
54
 
                           if vel[dir] > 0 then vel[dir] = 0 end
55
 
                        end
56
 
                     end
57
 
                  end
58
 
 
59
 
                  if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
60
 
                  if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
61
 
 
62
 
                  if vel[dir] ~= 0 then self[dir] = self[dir] + vel[dir] * elapsed end
63
 
               end,
64
21
   onStartFrame = function (self)
65
22
                     -- this is all in startframe so it happens before
66
23
                     -- physics calc at beginning of update
92
49
                        self.jumping = true
93
50
                     end
94
51
                  end,
95
 
   update = function (self, elapsed)
96
 
               -- NOTE: this is an override, not a callback
97
 
 
98
 
               self:doPhysics('x', elapsed)
99
 
 
100
 
               self.onGround = false -- right before Y collision callbacks
101
 
               self:doPhysics('y', elapsed)
102
 
 
103
 
               self:collide(the.view.map)
104
 
 
105
 
               Animation.update(self, elapsed)
106
 
            end,
 
52
   onUpdate = function (self)
 
53
                 -- needs to happen right before collision
 
54
                 self.onGround = false
 
55
                end,
107
56
   onCollide = function (self, other, xOverlap, yOverlap)
108
57
                  -- seriously, why does this even fire?
109
58
                  if other == the.view.map then return end
114
63
                  -- assumption: any other collision is with a solid map tile
115
64
                  if yOverlap > xOverlap then
116
65
                     other:displace(self)
117
 
 
118
 
                     if self.velocity.x > 0 then
119
 
                        self.onWall = 'right'
120
 
                     elseif self.velocity.x < 0 then
121
 
                        self.onWall = 'left'
122
 
                     else
123
 
                        print 'x ??'
124
 
                     end
125
66
                  elseif xOverlap > yOverlap then
126
67
                     -- check if we've moved since collisions were generated
127
68
                     local xov, yov = self:overlap(other.x, other.y,
137
78
                        self.jumping = false
138
79
                     end
139
80
                  else
140
 
                     print('xy ??')
 
81
                     print('??')
141
82
                  end
142
83
 
143
84
               end,
151
92
           end,
152
93
   onUpdate = function (self)
153
94
                 --print('tick')
154
 
                 --the.player:collide(self.map)
 
95
                 the.player:collide(self.map)
155
96
                 --self.map:collide(the.player)
156
97
              end
157
98
}
161
102
              self.view = GameView:new()
162
103
              --print(inspect(_(the.app):keys()))
163
104
              self.console:watch('onGround', 'the.player.onGround')
164
 
              self.console:watch('onWall', 'the.player.onWall')
165
105
           end,
166
106
   onUpdate = function (self, dt)
167
107
                 if the.keys:justPressed('escape') and 
168
108
                   not self.console.visible then
169
 
                    self.quit()
 
109
                    love.event.quit()
170
110
                 end
171
111
              end
172
112
}
 
 
b'\\ No newline at end of file'