/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-10 23:47:59 UTC
  • Revision ID: josh@9ix.org-20130410234759-nrzne3xed1puy1v2
put sprite and player in their own files

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