/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-11 01:33:32 UTC
  • Revision ID: josh@9ix.org-20130411013332-7bf1zydct2v4rbyk
zoetrope 1.4 (and revert my sprite changes)

Show diffs side-by-side

added added

removed removed

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