/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:
3
3
 
4
4
require 'zoetrope'
5
5
 
 
6
TERM_VEL = 400
 
7
 
6
8
Player = Tile:extend {
7
9
   image = 'data/player.png',
8
10
   onNew = function (self)
9
11
              self.velocity.y = 0
10
 
              self.maxVelocity.y = 400
11
12
           end,
12
13
   onStartFrame = function (self)
13
14
                     -- this is all in startframe so it happens before
14
15
                     -- physics calc at beginning of update
15
16
 
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,
 
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,
29
36
   onUpdate = function (self)
30
37
                 -- this is called after physics, so this makes sense here
31
38
                 the.view.map:subdisplace(self)