/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:21:28 UTC
  • Revision ID: josh@9ix.org-20130312172128-l336vwqawo81c6sm
really easy version of knowing when we reached the top of a wall.  
similar to how we're doing onGround.

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
__ = require 'underscore'
6
6
--inspect = require 'inspect'
7
7
 
8
8
Player = Animation:extend {
14
14
      walk = { frames = { 2, 3 }, fps = 5 },
15
15
      jump = { frames = { 4 }, fps = 1 }
16
16
   },
 
17
   collisions = {},
 
18
   onWall = false,
17
19
   onNew = function (self)
18
20
              self.velocity.y = 0
19
21
              self.maxVelocity.y = 400
33
35
                     assert(drag, 'active sprite has no drag property')
34
36
                     assert(minVel, 'active sprite has no minVelocity property')
35
37
                     assert(maxVel, 'active sprite has no maxVelocity property')
36
 
                     assert(_.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
 
38
                     assert(__.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
37
39
                  end
38
40
 
39
41
                  vel.x = vel.x or 0
70
72
                     if self.falling then self.jumping = false end
71
73
                     --print(self.jumping, self.falling)
72
74
 
73
 
                     if not self.onGround then
 
75
                     if (not self.onGround) and (not self.onWall) then
74
76
                        self:play('jump')
75
77
                     end
76
78
 
77
 
                     self.velocity.x = 0
78
79
                     self.acceleration.y = 800
79
80
 
 
81
                     if self.onWall then
 
82
                        self.acceleration.y = 0
 
83
 
 
84
                        if the.keys:pressed('up') then
 
85
                           self.velocity.y = -200
 
86
                           self:play('stand')
 
87
                        elseif the.keys:pressed('down') then
 
88
                           self.velocity.y = 200
 
89
                           self:play('stand')
 
90
                        else
 
91
                           self.velocity.y = 0
 
92
                           self:play('stand')
 
93
                        end
 
94
                     end
 
95
 
80
96
                     if the.keys:pressed('left') then
81
97
                        self.velocity.x = -200
82
98
                        if self.onGround then self:play('walk') end
 
99
                        if self.onWall == 'right' then self.onWall = false end
83
100
                     elseif the.keys:pressed('right') then
84
101
                        self.velocity.x = 200
85
102
                        if self.onGround then self:play('walk') end
 
103
                        if self.onWall == 'left' then self.onWall = false end
86
104
                     else
87
105
                        if self.onGround then self:play('stand') end
 
106
                        if not self.onWall then
 
107
                           self.velocity.x = 0
 
108
                        end
88
109
                     end
89
110
 
90
111
                     if the.keys:justPressed('up') and self.onGround then
96
117
               -- NOTE: this is an override, not a callback
97
118
 
98
119
               self:doPhysics('x', elapsed)
 
120
               self:collide(the.view.map)
 
121
 
 
122
               -- handle X collisions
 
123
               self.onWall = false
 
124
               for _, col in ipairs(self.collisions) do
 
125
                  col.other:displaceDir(self, 'x')
 
126
                  if self.velocity.x > 0 then
 
127
                     self.onWall = 'right'
 
128
                  elseif self.velocity.x < 0 then
 
129
                     self.onWall = 'left'
 
130
                  else
 
131
                     print 'x ??'
 
132
                  end
 
133
               end
99
134
 
100
135
               self.onGround = false -- right before Y collision callbacks
101
136
               self:doPhysics('y', elapsed)
102
 
 
103
137
               self:collide(the.view.map)
104
138
 
 
139
               -- handle Y collisions
 
140
               for _, col in ipairs(self.collisions) do
 
141
                  if self.velocity.y > 0 then
 
142
                     self.onGround = true
 
143
                  end
 
144
 
 
145
                  col.other:displaceDir(self, 'y')
 
146
                  self.velocity.y = 0
 
147
                  self.jumping = false
 
148
               end
 
149
 
105
150
               Animation.update(self, elapsed)
106
151
            end,
 
152
   collide = function (self, ...)
 
153
                self.collisions = {}
 
154
                Animation.collide(self, ...)
 
155
                -- I could return a true/false value here if I wanted to...
 
156
             end,
107
157
   onCollide = function (self, other, xOverlap, yOverlap)
108
 
                  -- seriously, why does this even fire?
109
158
                  if other == the.view.map then return end
110
159
 
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,
 
160
                  table.insert(self.collisions, {other = other,
 
161
                                                 xOverlap = xOverlap,
 
162
                                                 yOverlap = yOverlap })
 
163
               end
144
164
}
145
165
 
 
166
-- displace on a specific axis (monkey patch Sprite)
 
167
function Sprite:displaceDir(other, dir)
 
168
   if not self.solid or self == other or not other.solid then return end
 
169
   if STRICT then assert(other:instanceOf(Sprite), 'asked to displace a non-sprite') end
 
170
 
 
171
   if other.sprites then
 
172
      -- handle groups
 
173
 
 
174
      for _, spr in pairs(other.sprites) do
 
175
         self:displace(spr, dir)
 
176
      end
 
177
   else
 
178
      -- handle sprites
 
179
      local dim
 
180
      if dir == 'x' then
 
181
         dim = 'width'
 
182
      elseif dir == 'y' then
 
183
         dim = 'height'
 
184
      else
 
185
         print 'dir ??'
 
186
      end
 
187
 
 
188
      local negMove = (other[dir] - self[dir]) + other[dim]
 
189
      local posMove = (self[dir] + self[dim]) - other[dir]
 
190
 
 
191
      -- TODO: re-add hinting?
 
192
      if negMove < posMove then
 
193
         chg = - negMove
 
194
      else
 
195
         chg = posMove
 
196
      end
 
197
   end
 
198
 
 
199
   other[dir] = other[dir] + chg
 
200
end
 
201
 
146
202
GameView = View:extend {
147
203
   onNew = function (self)
148
204
              self:loadLayers('data/map.lua')
159
215
the.app = App:new {
160
216
   onRun = function (self)
161
217
              self.view = GameView:new()
162
 
              --print(inspect(_(the.app):keys()))
163
218
              self.console:watch('onGround', 'the.player.onGround')
164
219
              self.console:watch('onWall', 'the.player.onWall')
165
220
           end,