/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-05 22:11:35 UTC
  • Revision ID: josh@9ix.org-20130305221135-wrvf3q8vzc6xjdiy
some basic collision (and workarounds)

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
5
 
_ = require 'underscore'
6
 
--inspect = require 'inspect'
7
5
 
8
 
Player = Animation:extend {
 
6
Player = Tile:extend {
9
7
   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
 
   },
17
8
   onNew = function (self)
18
9
              self.velocity.y = 0
19
10
              self.maxVelocity.y = 400
20
11
           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
12
   onStartFrame = function (self)
65
13
                     -- this is all in startframe so it happens before
66
14
                     -- physics calc at beginning of update
67
15
 
68
 
                     -- jumping/falling updates could go in EndFrame...
69
 
                     self.falling = self.velocity.y > 0
70
 
                     if self.falling then self.jumping = false end
71
 
                     --print(self.jumping, self.falling)
72
 
 
73
 
                     if not self.onGround then
74
 
                        self:play('jump')
75
 
                     end
76
 
 
77
16
                     self.velocity.x = 0
78
17
                     self.acceleration.y = 800
79
18
 
80
19
                     if the.keys:pressed('left') then
81
20
                        self.velocity.x = -200
82
 
                        if self.onGround then self:play('walk') end
83
21
                     elseif the.keys:pressed('right') then
84
22
                        self.velocity.x = 200
85
 
                        if self.onGround then self:play('walk') end
86
 
                     else
87
 
                        if self.onGround then self:play('stand') end
88
23
                     end
89
24
 
90
 
                     if the.keys:justPressed('up') and self.onGround then
 
25
                     if the.keys:justPressed('up') then
91
26
                        self.velocity.y = -400
92
 
                        self.jumping = true
93
27
                     end
94
28
                  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,
107
29
   onCollide = function (self, other, xOverlap, yOverlap)
108
30
                  -- seriously, why does this even fire?
109
31
                  if other == the.view.map then return end
114
36
                  -- assumption: any other collision is with a solid map tile
115
37
                  if yOverlap > xOverlap then
116
38
                     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
39
                  elseif xOverlap > yOverlap then
126
40
                     -- check if we've moved since collisions were generated
127
41
                     local xov, yov = self:overlap(other.x, other.y,
128
42
                                                   other.width, other.height)
129
43
                     if xov ~= 0 and yov ~= 0 then
130
 
                        --print('y collision')
131
 
                        if self.velocity.y > 0 then
132
 
                           self.onGround = true
133
 
                        end
134
 
 
135
44
                        self.velocity.y = 0
136
45
                        other:displace(self)
137
 
                        self.jumping = false
138
46
                     end
139
47
                  else
140
 
                     print('xy ??')
 
48
                     print('??')
141
49
                  end
142
50
 
143
 
               end,
 
51
               end
144
52
}
145
53
 
146
54
GameView = View:extend {
151
59
           end,
152
60
   onUpdate = function (self)
153
61
                 --print('tick')
154
 
                 --the.player:collide(self.map)
 
62
                 the.player:collide(self.map)
155
63
                 --self.map:collide(the.player)
156
64
              end
157
65
}
159
67
the.app = App:new {
160
68
   onRun = function (self)
161
69
              self.view = GameView:new()
162
 
              --print(inspect(_(the.app):keys()))
163
 
              self.console:watch('onGround', 'the.player.onGround')
164
 
              self.console:watch('onWall', 'the.player.onWall')
165
70
           end,
166
71
   onUpdate = function (self, dt)
167
 
                 if the.keys:justPressed('escape') and 
168
 
                   not self.console.visible then
169
 
                    self.quit()
170
 
                 end
 
72
                 -- apparently I can do this w/ C-A-q if DEBUG is on
 
73
                 -- if the.keys:justPressed('escape') then
 
74
                 --    love.event.quit()
 
75
                 -- end
171
76
              end
172
77
}
 
 
b'\\ No newline at end of file'