/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-16 00:27:10 UTC
  • Revision ID: josh@9ix.org-20130416002710-4soqj70ln7hdrzdb
testing audio

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
 
 
6
 
Player = Tile:extend {
7
 
   image = 'data/player.png',
8
 
   onNew = function (self)
9
 
              self.velocity.y = 0
10
 
              self.maxVelocity.y = 400
11
 
           end,
12
 
   onStartFrame = function (self)
13
 
                     -- this is all in startframe so it happens before
14
 
                     -- physics calc at beginning of update
15
 
 
16
 
                     self.velocity.x = 0
17
 
                     self.acceleration.y = 800
18
 
 
19
 
                     if the.keys:pressed('left') then
20
 
                        self.velocity.x = -200
21
 
                     elseif the.keys:pressed('right') then
22
 
                        self.velocity.x = 200
23
 
                     end
24
 
 
25
 
                     if the.keys:justPressed('up') then
26
 
                        self.velocity.y = -400
27
 
                     end
28
 
                  end,
29
 
   onCollide = function (self, other, xOverlap, yOverlap)
30
 
                  -- seriously, why does this even fire?
31
 
                  if other == the.view.map then return end
32
 
 
33
 
                  --print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
34
 
                  --print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
35
 
 
36
 
                  -- assumption: any other collision is with a solid map tile
37
 
                  if yOverlap > xOverlap then
38
 
                     other:displace(self)
39
 
                  elseif xOverlap > yOverlap then
40
 
                     -- check if we've moved since collisions were generated
41
 
                     local xov, yov = self:overlap(other.x, other.y,
42
 
                                                   other.width, other.height)
43
 
                     if xov ~= 0 and yov ~= 0 then
44
 
                        self.velocity.y = 0
45
 
                        other:displace(self)
46
 
                     end
47
 
                  else
48
 
                     print('??')
49
 
                  end
50
 
 
51
 
               end
 
5
__ = require 'underscore'
 
6
--inspect = require 'inspect'
 
7
require 'pepperprof'
 
8
require 'getopt_alt'
 
9
 
 
10
require 'sprite'
 
11
require 'animation'
 
12
require 'player'
 
13
require 'balloon'
 
14
 
 
15
util = {
 
16
   dim = function(dir)
 
17
      if dir == 'x' then
 
18
         return 'width'
 
19
      elseif dir == 'y' then
 
20
         return 'height'
 
21
      else
 
22
         if STRICT then error('dir '..dir) end
 
23
      end
 
24
   end
52
25
}
53
26
 
54
27
GameView = View:extend {
56
29
              self:loadLayers('data/map.lua')
57
30
              self.focus = the.player
58
31
              self:clampTo(self.map)
 
32
 
 
33
              the.recorder = Recorder:new{mousePosInterval = 9999}
 
34
              the.app.meta:add(the.recorder)
 
35
              if the.app.record then
 
36
                 the.recorder:startRecording()
 
37
              elseif the.app.playback then
 
38
                 local storage = Storage:new{filename = 'record.lua'}
 
39
                 storage:load()
 
40
                 --print(inspect(storage.data))
 
41
                 the.recorder.record = storage.data
 
42
                 the.recorder:startPlaying()
 
43
              end
59
44
           end,
60
45
   onUpdate = function (self)
 
46
                 --print('drawTook: ', the.drawTook)
61
47
                 --print('tick')
62
 
                 the.player:collide(self.map)
 
48
                 --the.player:collide(self.map)
63
49
                 --self.map:collide(the.player)
64
 
              end
 
50
              end,
 
51
   -- draw = function (self, x, y)
 
52
   --           View.draw(self, x, y)
 
53
 
 
54
   --           love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
55
   --        end
65
56
}
66
57
 
67
58
the.app = App:new {
 
59
   record = true,
68
60
   onRun = function (self)
69
61
              self.view = GameView:new()
 
62
              if DEBUG then
 
63
                 self.console:watch('onGround', 'the.player.onGround')
 
64
                 self.console:watch('onWall', 'the.player.onWall')
 
65
                 self.console:watch('updateTook', 'the.updateTook')
 
66
                 self.console:watch('drawTook', 'the.drawTook')
 
67
                 self.console:watch('recorder state', 'the.recorder.state')
 
68
              end
 
69
 
 
70
              --the.profiler = newProfiler('time', 2000)
 
71
              --the.profiler = newProfiler()
 
72
              --the.profiler:start()
70
73
           end,
71
74
   onUpdate = function (self, dt)
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
76
 
              end
77
 
}
 
 
b'\\ No newline at end of file'
 
75
                 if the.keys:justPressed('escape') then
 
76
                    if the.profiler then
 
77
                       the.profiler:stop()
 
78
                       local outfile = io.open( "profile.txt", "w+" )
 
79
                       the.profiler:report( outfile )
 
80
                       outfile:close()
 
81
                    end
 
82
 
 
83
                    if self.record then
 
84
                       if not love.filesystem.remove('record.lua') then
 
85
                          print('could not remove record.lua')
 
86
                       end
 
87
                       local storage = Storage:new{
 
88
                          data = the.recorder.record,
 
89
                          filename = 'record.lua'
 
90
                       }
 
91
                       storage:save(false)
 
92
                       --print(inspect(the.recorder.record))
 
93
                    end
 
94
 
 
95
                    self.quit()
 
96
                 end
 
97
              end,
 
98
   update = function (self, dt)
 
99
               the.updateStart = love.timer.getMicroTime()
 
100
               App.update(self, dt)
 
101
               if the.updateStart then
 
102
                  the.updateTook = love.timer.getMicroTime() - the.updateStart
 
103
               end
 
104
            end
 
105
}
 
106
 
 
107
function love.load (arg)
 
108
   opts = getopt(arg, '')
 
109
   if opts['p'] then
 
110
      the.app.playback = true
 
111
      the.app.record = false
 
112
   elseif opts['r'] then
 
113
      the.app.record = true
 
114
   end
 
115
 
 
116
   the.app:run()
 
117
end
 
 
b'\\ No newline at end of file'