/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-05 22:11:35 UTC
  • Revision ID: josh@9ix.org-20130305221135-wrvf3q8vzc6xjdiy
some basic collision (and workarounds)

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 = 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
25
52
}
26
53
 
27
54
GameView = View:extend {
29
56
              self:loadLayers('data/map.lua')
30
57
              self.focus = the.player
31
58
              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
59
           end,
45
60
   onUpdate = function (self)
46
 
                 --print('drawTook: ', the.drawTook)
47
61
                 --print('tick')
48
 
                 --the.player:collide(self.map)
 
62
                 the.player:collide(self.map)
49
63
                 --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
69
64
              end
70
65
}
71
66
 
72
67
the.app = App:new {
73
 
   record = true,
74
68
   onRun = function (self)
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()
 
69
              self.view = GameView:new()
87
70
           end,
88
71
   onUpdate = function (self, dt)
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()
110
 
                 end
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'
 
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'