/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 16:38:21 UTC
  • Revision ID: josh@9ix.org-20130305163821-kw70drafjsh7329k
fix jitter caused by focus shift happening in the wrong order.  Looks 
like this is fixed in: 
https://bitbucket.org/klembot/zoetrope/commits/5e67ba491768caab0da8b9afc9954c072851e143

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
3
3
 
4
4
require 'zoetrope'
5
5
 
6
 
Player = Animation:extend {
 
6
TERM_VEL = 400
 
7
 
 
8
Player = Tile:extend {
7
9
   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
10
   onNew = function (self)
16
11
              self.velocity.y = 0
17
 
              self.maxVelocity.y = 400
18
12
           end,
19
13
   onStartFrame = function (self)
20
14
                     -- this is all in startframe so it happens before
21
15
                     -- physics calc at beginning of update
22
16
 
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
 
17
                 self.velocity.x = 0
 
18
                 -- TODO: this can be replaced with sprite.maxVel.y    
 
19
                 if self.velocity.y >= TERM_VEL then
 
20
                    self.velocity.y = TERM_VEL
 
21
                    self.acceleration.y = 0
 
22
                 else
 
23
                    self.acceleration.y = 800
 
24
                 end
 
25
 
 
26
                 if the.keys:pressed('left') then
 
27
                    self.velocity.x = -200
 
28
                 elseif the.keys:pressed('right') then
 
29
                    self.velocity.x = 200
 
30
                 end
 
31
 
 
32
                 if the.keys:justPressed('up') then
 
33
                    self.velocity.y = -400
 
34
                 end
 
35
              end,
 
36
   onUpdate = function (self)
 
37
                 -- this is called after physics, so this makes sense here
 
38
                 the.view.map:subdisplace(self)
 
39
              end
63
40
}
64
41
 
65
42
GameView = View:extend {
67
44
              self:loadLayers('data/map.lua')
68
45
              self.focus = the.player
69
46
              self:clampTo(self.map)
70
 
           end,
71
 
   onUpdate = function (self)
72
 
                 --print('tick')
73
 
                 the.player:collide(self.map)
74
 
                 --self.map:collide(the.player)
75
 
              end
 
47
           end
76
48
}
77
49
 
78
50
the.app = App:new {
80
52
              self.view = GameView:new()
81
53
           end,
82
54
   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
 
55
                 if the.keys:justPressed('escape') then
 
56
                    love.event.quit()
 
57
                 end
87
58
              end
88
59
}
 
 
b'\\ No newline at end of file'