/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-04-22 20:42:06 UTC
  • Revision ID: josh@9ix.org-20130422204206-of4wo7sulpkp0pft
stop build from dropping backup files EVERYWHERE

Show diffs side-by-side

added added

removed removed

Lines of Context:
4
4
require 'zoetrope'
5
5
__ = require 'underscore'
6
6
--inspect = require 'inspect'
7
 
 
8
 
Player = Animation:extend {
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
 
      climbLeft = { frames = { 5, 6 }, fps = 5 },
17
 
      climbRight = { frames = { 7, 8 }, fps = 5 }
18
 
   },
19
 
   collisions = {},
20
 
   onWall = false,
21
 
   onNew = function (self)
22
 
              self.velocity.y = 0
23
 
              self.maxVelocity.y = 400
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,
68
 
   onStartFrame = function (self)
69
 
                     -- this is all in startframe so it happens before
70
 
                     -- physics calc at beginning of update
71
 
 
72
 
                     -- jumping/falling updates could go in EndFrame...
73
 
                     self.falling = self.velocity.y > 0
74
 
                     if self.falling then self.jumping = false end
75
 
                     --print(self.jumping, self.falling)
76
 
 
77
 
                     if (not self.onGround) and (not self.onWall) then
78
 
                        self:play('jump')
79
 
                     end
80
 
 
81
 
                     self.acceleration.y = 800
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
 
 
102
 
                     if the.keys:pressed('left') then
103
 
                        self.velocity.x = -200
104
 
                        if self.onGround then self:play('walk') end
105
 
                        if self.onWall == 'right' then self.onWall = false end
106
 
                     elseif the.keys:pressed('right') then
107
 
                        self.velocity.x = 200
108
 
                        if self.onGround then self:play('walk') end
109
 
                        if self.onWall == 'left' then self.onWall = false end
110
 
                     else
111
 
                        if not self.onWall then
112
 
                           if self.onGround then self:play('stand') end
113
 
                           self.velocity.x = 0
114
 
                        end
115
 
                     end
116
 
 
117
 
                     if the.keys:justPressed('up') and self.onGround then
118
 
                        self.velocity.y = -400
119
 
                        self.jumping = true
120
 
                     end
121
 
                  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,
163
 
   onCollide = function (self, other, xOverlap, yOverlap)
164
 
                  if other == the.view.map then return end
165
 
 
166
 
                  table.insert(self.collisions, {other = other,
167
 
                                                 xOverlap = xOverlap,
168
 
                                                 yOverlap = yOverlap })
169
 
               end
170
 
}
171
 
 
172
 
function Sprite:displaceDir(other, dir)
173
 
   if not self.solid or self == other or not other.solid then return end
174
 
   if STRICT then assert(other:instanceOf(Sprite), 'asked to displace a non-sprite') end
175
 
 
176
 
   if other.sprites then
177
 
      -- handle groups
178
 
 
179
 
      for _, spr in pairs(other.sprites) do
180
 
         self:displace(spr, dir)
181
 
      end
182
 
   else
183
 
      -- handle sprites
184
 
      local dim
 
7
require 'pepperprof'
 
8
require 'getopt_alt'
 
9
 
 
10
require 'sprite'
 
11
require 'animation'
 
12
require 'player'
 
13
require 'balloon'
 
14
require 'version'
 
15
 
 
16
util = {
 
17
   dim = function(dir)
185
18
      if dir == 'x' then
186
 
         dim = 'width'
 
19
         return 'width'
187
20
      elseif dir == 'y' then
188
 
         dim = 'height'
189
 
      else
190
 
         print 'dir ??'
191
 
      end
192
 
 
193
 
      local negMove = (other[dir] - self[dir]) + other[dim]
194
 
      local posMove = (self[dir] + self[dim]) - other[dir]
195
 
 
196
 
      -- TODO: re-add hinting?
197
 
      if negMove < posMove then
198
 
         chg = - negMove
199
 
      else
200
 
         chg = posMove
 
21
         return 'height'
 
22
      else
 
23
         if STRICT then error('dir '..dir) end
201
24
      end
202
25
   end
203
 
 
204
 
   other[dir] = other[dir] + chg
205
 
end
 
26
}
206
27
 
207
28
GameView = View:extend {
208
29
   onNew = function (self)
209
30
              self:loadLayers('data/map.lua')
210
31
              self.focus = the.player
211
32
              self:clampTo(self.map)
 
33
 
 
34
              the.recorder = Recorder:new{mousePosInterval = 9999}
 
35
              the.app.meta:add(the.recorder)
 
36
              if the.app.record then
 
37
                 the.recorder:startRecording()
 
38
              elseif the.app.playback then
 
39
                 local storage = Storage:new{filename = 'record.lua'}
 
40
                 storage:load()
 
41
                 --print(inspect(storage.data))
 
42
                 the.recorder.record = storage.data
 
43
                 the.recorder:startPlaying()
 
44
              end
212
45
           end,
213
46
   onUpdate = function (self)
 
47
                 --print('drawTook: ', the.drawTook)
214
48
                 --print('tick')
215
49
                 --the.player:collide(self.map)
216
50
                 --self.map:collide(the.player)
 
51
              end,
 
52
   -- draw = function (self, x, y)
 
53
   --           View.draw(self, x, y)
 
54
 
 
55
   --           love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
56
   --        end
 
57
}
 
58
 
 
59
MenuScreen = View:extend {
 
60
   --title = Text:new{text = "Test Platform Game", font = 48, wordWrap = false},
 
61
   title = Tile:new{image = 'data/title.png', x = 0, y = 0},
 
62
   onNew = function(self)
 
63
              self:add(self.title)
 
64
              --self.title:centerAround(400, 200)
 
65
           end,
 
66
   onUpdate = function(self, elapsed)
 
67
                 if the.keys:allJustPressed() then
 
68
                    the.app.view = GameView:new()
 
69
                 end
217
70
              end
218
71
}
219
72
 
220
73
the.app = App:new {
 
74
   record = true,
221
75
   onRun = function (self)
222
 
              self.view = GameView:new()
223
 
              self.console:watch('onGround', 'the.player.onGround')
224
 
              self.console:watch('onWall', 'the.player.onWall')
 
76
              self.view = MenuScreen:new()
 
77
              if DEBUG then
 
78
                 self.console:watch('VERSION', 'VERSION')
 
79
                 self.console:watch('onGround', 'the.player.onGround')
 
80
                 self.console:watch('onWall', 'the.player.onWall')
 
81
                 self.console:watch('updateTook', 'the.updateTook')
 
82
                 self.console:watch('drawTook', 'the.drawTook')
 
83
                 self.console:watch('recorder state', 'the.recorder.state')
 
84
              end
 
85
 
 
86
              --the.profiler = newProfiler('time', 2000)
 
87
              --the.profiler = newProfiler()
 
88
              --the.profiler:start()
225
89
           end,
226
90
   onUpdate = function (self, dt)
227
 
                 if the.keys:justPressed('escape') and 
228
 
                   not self.console.visible then
 
91
                 if the.keys:justPressed('escape') then
 
92
                    if the.profiler then
 
93
                       the.profiler:stop()
 
94
                       local outfile = io.open( "profile.txt", "w+" )
 
95
                       the.profiler:report( outfile )
 
96
                       outfile:close()
 
97
                    end
 
98
 
 
99
                    if self.record and the.recorder then
 
100
                       if not love.filesystem.remove('record.lua') then
 
101
                          print('could not remove record.lua')
 
102
                       end
 
103
                       local storage = Storage:new{
 
104
                          data = the.recorder.record,
 
105
                          filename = 'record.lua'
 
106
                       }
 
107
                       storage:save(false)
 
108
                       --print(inspect(the.recorder.record))
 
109
                    end
 
110
 
229
111
                    self.quit()
230
112
                 end
231
 
              end
232
 
}
 
 
b'\\ No newline at end of file'
 
113
              end,
 
114
   update = function (self, dt)
 
115
               the.updateStart = love.timer.getMicroTime()
 
116
               App.update(self, dt)
 
117
               if the.updateStart then
 
118
                  the.updateTook = love.timer.getMicroTime() - the.updateStart
 
119
               end
 
120
            end
 
121
}
 
122
 
 
123
function love.load (arg)
 
124
   opts = getopt(arg, '')
 
125
   if opts['p'] then
 
126
      the.app.playback = true
 
127
      the.app.record = false
 
128
   elseif opts['r'] then
 
129
      the.app.record = true
 
130
   end
 
131
 
 
132
   the.app:run()
 
133
end
 
 
b'\\ No newline at end of file'