/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-19 01:35:57 UTC
  • Revision ID: josh@9ix.org-20130419013557-jbmje9kqsagj0x3j
title screen

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'
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
 
                     if not self.onGround then
31
 
                        self:play('jump')
32
 
                     end
33
 
 
34
 
                     self.velocity.x = 0
35
 
                     self.acceleration.y = 800
36
 
 
37
 
                     if the.keys:pressed('left') then
38
 
                        self.velocity.x = -200
39
 
                        if self.onGround then self:play('walk') end
40
 
                     elseif the.keys:pressed('right') then
41
 
                        self.velocity.x = 200
42
 
                        if self.onGround then self:play('walk') end
43
 
                     else
44
 
                        if self.onGround then self:play('stand') end
45
 
                     end
46
 
 
47
 
                     if the.keys:justPressed('up') and self.onGround then
48
 
                        self.velocity.y = -400
49
 
                        self.jumping = true
50
 
                     end
51
 
                  end,
52
 
   onUpdate = function (self)
53
 
                 -- needs to happen right before collision
54
 
                 self.onGround = false
55
 
                end,
56
 
   onCollide = function (self, other, xOverlap, yOverlap)
57
 
                  -- seriously, why does this even fire?
58
 
                  if other == the.view.map then return end
59
 
 
60
 
                  --print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
61
 
                  --print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
62
 
 
63
 
                  -- assumption: any other collision is with a solid map tile
64
 
                  if yOverlap > xOverlap then
65
 
                     other:displace(self)
66
 
 
67
 
                     if self.velocity.x > 0 then
68
 
                        self.onWall = 'right'
69
 
                     elseif self.velocity.x < 0 then
70
 
                        self.onWall = 'left'
71
 
                     else
72
 
                        print '??'
73
 
                     end
74
 
                  elseif xOverlap > yOverlap then
75
 
                     -- check if we've moved since collisions were generated
76
 
                     local xov, yov = self:overlap(other.x, other.y,
77
 
                                                   other.width, other.height)
78
 
                     if xov ~= 0 and yov ~= 0 then
79
 
                        --print('y collision')
80
 
                        if self.velocity.y > 0 then
81
 
                           self.onGround = true
82
 
                        end
83
 
 
84
 
                        self.velocity.y = 0
85
 
                        other:displace(self)
86
 
                        self.jumping = false
87
 
                     end
88
 
                  else
89
 
                     print('??')
90
 
                  end
91
 
 
92
 
               end,
 
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
93
25
}
94
26
 
95
27
GameView = View:extend {
97
29
              self:loadLayers('data/map.lua')
98
30
              self.focus = the.player
99
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
100
44
           end,
101
45
   onUpdate = function (self)
 
46
                 --print('drawTook: ', the.drawTook)
102
47
                 --print('tick')
103
 
                 the.player:collide(self.map)
 
48
                 --the.player:collide(self.map)
104
49
                 --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
 
56
}
 
57
 
 
58
MenuScreen = View:extend {
 
59
   --title = Text:new{text = "Test Platform Game", font = 48, wordWrap = false},
 
60
   title = Tile:new{image = 'data/title.png', x = 0, y = 0},
 
61
   onNew = function(self)
 
62
              self:add(self.title)
 
63
              --self.title:centerAround(400, 200)
 
64
           end,
 
65
   onUpdate = function(self, elapsed)
 
66
                 if the.keys:allJustPressed() then
 
67
                    the.app.view = GameView:new()
 
68
                 end
105
69
              end
106
70
}
107
71
 
108
72
the.app = App:new {
 
73
   record = true,
109
74
   onRun = function (self)
110
 
              self.view = GameView:new()
111
 
              --print(inspect(_(the.app):keys()))
112
 
              self.console:watch('onGround', 'the.player.onGround')
113
 
              self.console:watch('onWall', 'the.player.onWall')
 
75
              self.view = MenuScreen:new()
 
76
              if DEBUG then
 
77
                 self.console:watch('onGround', 'the.player.onGround')
 
78
                 self.console:watch('onWall', 'the.player.onWall')
 
79
                 self.console:watch('updateTook', 'the.updateTook')
 
80
                 self.console:watch('drawTook', 'the.drawTook')
 
81
                 self.console:watch('recorder state', 'the.recorder.state')
 
82
              end
 
83
 
 
84
              --the.profiler = newProfiler('time', 2000)
 
85
              --the.profiler = newProfiler()
 
86
              --the.profiler:start()
114
87
           end,
115
88
   onUpdate = function (self, dt)
116
 
                 if the.keys:justPressed('escape') and 
117
 
                   not self.console.visible then
118
 
                    love.event.quit()
 
89
                 if the.keys:justPressed('escape') then
 
90
                    if the.profiler then
 
91
                       the.profiler:stop()
 
92
                       local outfile = io.open( "profile.txt", "w+" )
 
93
                       the.profiler:report( outfile )
 
94
                       outfile:close()
 
95
                    end
 
96
 
 
97
                    if self.record and the.recorder then
 
98
                       if not love.filesystem.remove('record.lua') then
 
99
                          print('could not remove record.lua')
 
100
                       end
 
101
                       local storage = Storage:new{
 
102
                          data = the.recorder.record,
 
103
                          filename = 'record.lua'
 
104
                       }
 
105
                       storage:save(false)
 
106
                       --print(inspect(the.recorder.record))
 
107
                    end
 
108
 
 
109
                    self.quit()
119
110
                 end
120
 
              end
121
 
}
 
 
b'\\ No newline at end of file'
 
111
              end,
 
112
   update = function (self, dt)
 
113
               the.updateStart = love.timer.getMicroTime()
 
114
               App.update(self, dt)
 
115
               if the.updateStart then
 
116
                  the.updateTook = love.timer.getMicroTime() - the.updateStart
 
117
               end
 
118
            end
 
119
}
 
120
 
 
121
function love.load (arg)
 
122
   opts = getopt(arg, '')
 
123
   if opts['p'] then
 
124
      the.app.playback = true
 
125
      the.app.record = false
 
126
   elseif opts['r'] then
 
127
      the.app.record = true
 
128
   end
 
129
 
 
130
   the.app:run()
 
131
end
 
 
b'\\ No newline at end of file'