/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-09 04:06:46 UTC
  • Revision ID: josh@9ix.org-20130309040646-2hvgxi5b87baez5g
make player an animation

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'
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
 
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
25
63
}
26
64
 
27
65
GameView = View:extend {
29
67
              self:loadLayers('data/map.lua')
30
68
              self.focus = the.player
31
69
              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
44
70
           end,
45
71
   onUpdate = function (self)
46
 
                 --print('drawTook: ', the.drawTook)
47
72
                 --print('tick')
48
 
                 --the.player:collide(self.map)
 
73
                 the.player:collide(self.map)
49
74
                 --self.map:collide(the.player)
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
 
75
              end
56
76
}
57
77
 
58
78
the.app = App:new {
59
 
   record = true,
60
79
   onRun = function (self)
61
80
              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()
73
81
           end,
74
82
   onUpdate = function (self, dt)
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'
 
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'