/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-04 23:27:03 UTC
  • Revision ID: josh@9ix.org-20130304232703-nob2mg5wbo5co5is
basic tiles, map, player, movement

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
5
5
 
6
6
Player = Tile:extend {
7
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
 
8
   onUpdate = function (self)
 
9
                 self.velocity.x = 0
 
10
                 self.velocity.y = 0
 
11
 
 
12
                 if the.keys:pressed('left') then
 
13
                    self.velocity.x = -200
 
14
                 elseif the.keys:pressed('right') then
 
15
                    self.velocity.x = 200
 
16
                 end
 
17
              end
52
18
}
53
19
 
54
20
GameView = View:extend {
57
23
              self.focus = the.player
58
24
              self:clampTo(self.map)
59
25
           end,
60
 
   onUpdate = function (self)
61
 
                 --print('tick')
62
 
                 the.player:collide(self.map)
63
 
                 --self.map:collide(the.player)
 
26
 
 
27
   onUpdate = function (self, dt)
 
28
                 self.map:subdisplace(the.player)
64
29
              end
65
30
}
66
31
 
69
34
              self.view = GameView:new()
70
35
           end,
71
36
   onUpdate = function (self, dt)
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
 
37
                 if the.keys:justPressed('escape') then
 
38
                    love.event.quit()
 
39
                 end
76
40
              end
77
41
}
 
 
b'\\ No newline at end of file'