/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 00:14:58 UTC
  • Revision ID: josh@9ix.org-20130305001458-206jxv29dgeenj3n
jump

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
 
 
8
 
Player = Animation:extend {
 
5
 
 
6
TERM_VEL = 400
 
7
 
 
8
Player = Tile: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
 
   },
17
10
   onNew = function (self)
18
11
              self.velocity.y = 0
19
 
              self.maxVelocity.y = 400
20
12
           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
 
   onStartFrame = function (self)
65
 
                     -- this is all in startframe so it happens before
66
 
                     -- physics calc at beginning of update
67
 
 
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
 
                     self.velocity.x = 0
78
 
                     self.acceleration.y = 800
79
 
 
80
 
                     if the.keys:pressed('left') then
81
 
                        self.velocity.x = -200
82
 
                        if self.onGround then self:play('walk') end
83
 
                     elseif the.keys:pressed('right') then
84
 
                        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
 
                     end
89
 
 
90
 
                     if the.keys:justPressed('up') and self.onGround then
91
 
                        self.velocity.y = -400
92
 
                        self.jumping = true
93
 
                     end
94
 
                  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
 
   onCollide = function (self, other, xOverlap, yOverlap)
108
 
                  -- seriously, why does this even fire?
109
 
                  if other == the.view.map then return end
110
 
 
111
 
                  --print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
112
 
                  --print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
113
 
 
114
 
                  -- assumption: any other collision is with a solid map tile
115
 
                  if yOverlap > xOverlap then
116
 
                     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
 
                  elseif xOverlap > yOverlap then
126
 
                     -- check if we've moved since collisions were generated
127
 
                     local xov, yov = self:overlap(other.x, other.y,
128
 
                                                   other.width, other.height)
129
 
                     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
 
                        self.velocity.y = 0
136
 
                        other:displace(self)
137
 
                        self.jumping = false
138
 
                     end
139
 
                  else
140
 
                     print('xy ??')
141
 
                  end
142
 
 
143
 
               end,
 
13
   onUpdate = function (self)
 
14
 
 
15
                 self.velocity.x = 0
 
16
                 if self.velocity.y >= TERM_VEL then
 
17
                    self.velocity.y = TERM_VEL
 
18
                    self.acceleration.y = 0
 
19
                 else
 
20
                    self.acceleration.y = 800
 
21
                 end
 
22
 
 
23
                 if the.keys:pressed('left') then
 
24
                    self.velocity.x = -200
 
25
                 elseif the.keys:pressed('right') then
 
26
                    self.velocity.x = 200
 
27
                 end
 
28
 
 
29
                 if the.keys:justPressed('up') then
 
30
                    self.velocity.y = -400
 
31
                 end
 
32
 
 
33
              end
144
34
}
145
35
 
146
36
GameView = View:extend {
149
39
              self.focus = the.player
150
40
              self:clampTo(self.map)
151
41
           end,
152
 
   onUpdate = function (self)
153
 
                 --print('tick')
154
 
                 --the.player:collide(self.map)
155
 
                 --self.map:collide(the.player)
156
 
              end
 
42
 
 
43
   onEndFrame = function (self, dt)
 
44
                   self.map:subdisplace(the.player)
 
45
                end
157
46
}
158
47
 
159
48
the.app = App:new {
160
49
   onRun = function (self)
161
50
              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
51
           end,
166
52
   onUpdate = function (self, dt)
167
 
                 if the.keys:justPressed('escape') and 
168
 
                   not self.console.visible then
169
 
                    self.quit()
 
53
                 if the.keys:justPressed('escape') then
 
54
                    love.event.quit()
170
55
                 end
171
56
              end
172
57
}
 
 
b'\\ No newline at end of file'