/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-12 17:48:42 UTC
  • Revision ID: josh@9ix.org-20130312174842-co8zn0hy0v6u18qf
climbing animation

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'
5
6
--inspect = require 'inspect'
6
 
--_ = require 'underscore'
7
7
 
8
8
Player = Animation:extend {
9
9
   image = 'data/player.png',
12
12
   sequences = {
13
13
      stand = { frames = { 1 }, fps = 1 },
14
14
      walk = { frames = { 2, 3 }, fps = 5 },
15
 
      jump = { frames = { 4 }, fps = 1 }
 
15
      jump = { frames = { 4 }, fps = 1 },
 
16
      climbLeft = { frames = { 5, 6 }, fps = 5 },
 
17
      climbRight = { frames = { 7, 8 }, fps = 5 }
16
18
   },
 
19
   collisions = {},
 
20
   onWall = false,
17
21
   onNew = function (self)
18
22
              self.velocity.y = 0
19
23
              self.maxVelocity.y = 400
20
24
           end,
 
25
   doPhysics = function (self, dir, elapsed)
 
26
                  local vel = self.velocity
 
27
                  local acc = self.acceleration
 
28
                  local drag = self.drag
 
29
                  local minVel = self.minVelocity
 
30
                  local maxVel = self.maxVelocity
 
31
 
 
32
                  -- check existence of properties
 
33
 
 
34
                  if STRICT then
 
35
                     assert(vel, 'active sprite has no velocity property')
 
36
                     assert(acc, 'active sprite has no acceleration property')
 
37
                     assert(drag, 'active sprite has no drag property')
 
38
                     assert(minVel, 'active sprite has no minVelocity property')
 
39
                     assert(maxVel, 'active sprite has no maxVelocity property')
 
40
                     assert(__.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
 
41
                  end
 
42
 
 
43
                  vel.x = vel.x or 0
 
44
                  vel.y = vel.y or 0
 
45
                  vel.rotation = vel.rotation or 0
 
46
 
 
47
                  -- physics
 
48
 
 
49
                  if acc[dir] and acc[dir] ~= 0 then
 
50
                     vel[dir] = vel[dir] + acc[dir] * elapsed
 
51
                  else
 
52
                     if drag[dir] then
 
53
                        if vel[dir] > 0 then
 
54
                           vel[dir] = vel[dir] - drag[dir] * elapsed
 
55
                           if vel[dir] < 0 then vel[dir] = 0 end
 
56
                        elseif vel[dir] < 0 then
 
57
                           vel[dir] = vel[dir] + drag[dir] * elapsed
 
58
                           if vel[dir] > 0 then vel[dir] = 0 end
 
59
                        end
 
60
                     end
 
61
                  end
 
62
 
 
63
                  if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
 
64
                  if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
 
65
 
 
66
                  if vel[dir] ~= 0 then self[dir] = self[dir] + vel[dir] * elapsed end
 
67
               end,
21
68
   onStartFrame = function (self)
22
69
                     -- this is all in startframe so it happens before
23
70
                     -- physics calc at beginning of update
27
74
                     if self.falling then self.jumping = false end
28
75
                     --print(self.jumping, self.falling)
29
76
 
30
 
                     if not self:onGround() then
 
77
                     if (not self.onGround) and (not self.onWall) then
31
78
                        self:play('jump')
32
79
                     end
33
80
 
34
 
                     self.velocity.x = 0
35
81
                     self.acceleration.y = 800
36
82
 
 
83
                     if self.onWall then
 
84
                        self.acceleration.y = 0
 
85
 
 
86
                        if self.onWall == 'right' then
 
87
                           self:play('climbRight')
 
88
                        elseif self.onWall == 'left' then
 
89
                           self:play('climbLeft')
 
90
                        end
 
91
 
 
92
                        if the.keys:pressed('up') then
 
93
                           self.velocity.y = -200
 
94
                        elseif the.keys:pressed('down') then
 
95
                           self.velocity.y = 200
 
96
                        else
 
97
                           self.velocity.y = 0
 
98
                           self:freeze(self.sequences[self.currentName].frames[1])
 
99
                        end
 
100
                     end
 
101
 
37
102
                     if the.keys:pressed('left') then
38
103
                        self.velocity.x = -200
39
 
                        if self:onGround() then self:play('walk') end
 
104
                        if self.onGround then self:play('walk') end
 
105
                        if self.onWall == 'right' then self.onWall = false end
40
106
                     elseif the.keys:pressed('right') then
41
107
                        self.velocity.x = 200
42
 
                        if self:onGround() then self:play('walk') end
 
108
                        if self.onGround then self:play('walk') end
 
109
                        if self.onWall == 'left' then self.onWall = false end
43
110
                     else
44
 
                        if self:onGround() then self:play('stand') end
 
111
                        if not self.onWall then
 
112
                           if self.onGround then self:play('stand') end
 
113
                           self.velocity.x = 0
 
114
                        end
45
115
                     end
46
116
 
47
 
                     if the.keys:justPressed('up') and self:onGround() then
 
117
                     if the.keys:justPressed('up') and self.onGround then
48
118
                        self.velocity.y = -400
49
119
                        self.jumping = true
50
120
                     end
51
121
                  end,
52
 
   onEndFrame = function (self)
53
 
                   --print(self.velocity.y)
54
 
                end,
 
122
   update = function (self, elapsed)
 
123
               -- NOTE: this is an override, not a callback
 
124
 
 
125
               self:doPhysics('x', elapsed)
 
126
               self:collide(the.view.map)
 
127
 
 
128
               -- handle X collisions
 
129
               self.onWall = false
 
130
               for _, col in ipairs(self.collisions) do
 
131
                  col.other:displaceDir(self, 'x')
 
132
                  if self.velocity.x > 0 then
 
133
                     self.onWall = 'right'
 
134
                  elseif self.velocity.x < 0 then
 
135
                     self.onWall = 'left'
 
136
                  else
 
137
                     print 'x ??'
 
138
                  end
 
139
               end
 
140
 
 
141
               self.onGround = false -- right before Y collision callbacks
 
142
               self:doPhysics('y', elapsed)
 
143
               self:collide(the.view.map)
 
144
 
 
145
               -- handle Y collisions
 
146
               for _, col in ipairs(self.collisions) do
 
147
                  if self.velocity.y > 0 then
 
148
                     self.onGround = true
 
149
                  end
 
150
 
 
151
                  col.other:displaceDir(self, 'y')
 
152
                  self.velocity.y = 0
 
153
                  self.jumping = false
 
154
               end
 
155
 
 
156
               Animation.update(self, elapsed)
 
157
            end,
 
158
   collide = function (self, ...)
 
159
                self.collisions = {}
 
160
                Animation.collide(self, ...)
 
161
                -- I could return a true/false value here if I wanted to...
 
162
             end,
55
163
   onCollide = function (self, other, xOverlap, yOverlap)
56
 
                  -- seriously, why does this even fire?
57
164
                  if other == the.view.map then return end
58
165
 
59
 
                  --print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
60
 
                  --print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
61
 
 
62
 
                  -- assumption: any other collision is with a solid map tile
63
 
                  if yOverlap > xOverlap then
64
 
                     other:displace(self)
65
 
                  elseif xOverlap > yOverlap then
66
 
                     -- check if we've moved since collisions were generated
67
 
                     local xov, yov = self:overlap(other.x, other.y,
68
 
                                                   other.width, other.height)
69
 
                     if xov ~= 0 and yov ~= 0 then
70
 
                        self.velocity.y = 0
71
 
                        other:displace(self)
72
 
                        self.jumping = false
73
 
                     end
74
 
                  else
75
 
                     print('??')
76
 
                  end
77
 
 
78
 
               end,
79
 
   onGround = function (self)
80
 
                 return (not self.jumping) and (not self.falling)
81
 
              end
 
166
                  table.insert(self.collisions, {other = other,
 
167
                                                 xOverlap = xOverlap,
 
168
                                                 yOverlap = yOverlap })
 
169
               end
82
170
}
83
171
 
 
172
-- displace on a specific axis (monkey patch Sprite)
 
173
function Sprite:displaceDir(other, dir)
 
174
   if not self.solid or self == other or not other.solid then return end
 
175
   if STRICT then assert(other:instanceOf(Sprite), 'asked to displace a non-sprite') end
 
176
 
 
177
   if other.sprites then
 
178
      -- handle groups
 
179
 
 
180
      for _, spr in pairs(other.sprites) do
 
181
         self:displace(spr, dir)
 
182
      end
 
183
   else
 
184
      -- handle sprites
 
185
      local dim
 
186
      if dir == 'x' then
 
187
         dim = 'width'
 
188
      elseif dir == 'y' then
 
189
         dim = 'height'
 
190
      else
 
191
         print 'dir ??'
 
192
      end
 
193
 
 
194
      local negMove = (other[dir] - self[dir]) + other[dim]
 
195
      local posMove = (self[dir] + self[dim]) - other[dir]
 
196
 
 
197
      -- TODO: re-add hinting?
 
198
      if negMove < posMove then
 
199
         chg = - negMove
 
200
      else
 
201
         chg = posMove
 
202
      end
 
203
   end
 
204
 
 
205
   other[dir] = other[dir] + chg
 
206
end
 
207
 
84
208
GameView = View:extend {
85
209
   onNew = function (self)
86
210
              self:loadLayers('data/map.lua')
89
213
           end,
90
214
   onUpdate = function (self)
91
215
                 --print('tick')
92
 
                 the.player:collide(self.map)
 
216
                 --the.player:collide(self.map)
93
217
                 --self.map:collide(the.player)
94
218
              end
95
219
}
97
221
the.app = App:new {
98
222
   onRun = function (self)
99
223
              self.view = GameView:new()
100
 
              --print(inspect(_(the.app):keys()))
 
224
              self.console:watch('onGround', 'the.player.onGround')
 
225
              self.console:watch('onWall', 'the.player.onWall')
101
226
           end,
102
227
   onUpdate = function (self, dt)
103
228
                 if the.keys:justPressed('escape') and 
104
229
                   not self.console.visible then
105
 
                    love.event.quit()
 
230
                    self.quit()
106
231
                 end
107
232
              end
108
233
}
 
 
b'\\ No newline at end of file'