/traderous

To get this branch, use:
bzr branch http://9ix.org/bzr/traderous

« back to all changes in this revision

Viewing changes to player.lua

  • Committer: Josh C
  • Date: 2013-05-13 20:26:30 UTC
  • Revision ID: josh@9ix.org-20130513202630-jd3tf1rr5zp3gbcm
move player around looping world

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
27
27
   minVelocity = {x=-velLimit, y=-velLimit},
28
28
   lastFired = 0,
29
29
   onStartFrame = function(self)
30
 
                     --local dx = love.mouse.getX() - self.x
31
 
                     --local dy = love.mouse.getY() - self.y
32
 
                     local dx = love.mouse.getX() - the.app.width / 2
33
 
                     local dy = love.mouse.getY() - the.app.height / 2
34
 
 
35
 
 
36
 
                     self.acceleration.x = dx * 2
37
 
                     self.acceleration.y = dy * 2
38
 
 
39
 
                     --TODO: acceleration limit.  It should at least be proportional (not 16:9)
 
30
                     --- TAKE 2
 
31
 
 
32
                     local mouseVec = vector.new(
 
33
                        love.mouse.getX() - the.app.width / 2,
 
34
                        love.mouse.getY() - the.app.height / 2
 
35
                     )
 
36
 
 
37
                     self.rotation = math.atan2(mouseVec.y, mouseVec.x)
 
38
 
 
39
                     if mouseVec:len2() > 64^2 then
 
40
                        self.acceleration = vector.new(500, 0)
 
41
                        self.acceleration:rotate_inplace(self.rotation)
 
42
                     else
 
43
                        self.acceleration = {x=0, y=0}
 
44
                     end
40
45
 
41
46
                     if the.mouse:pressed() and -- assumes left button
42
47
                       love.timer.getTime() - self.lastFired > 0.25 and
50
55
                     end
51
56
                  end,
52
57
   onUpdate = function(self)
53
 
                 self.rotation = math.atan2(self.velocity.y, self.velocity.x)
 
58
                 if self.x < the.app.width / 2 then
 
59
                    self.x = the.bg.width - the.app.width / 2
 
60
                 elseif self.x > the.bg.width - the.app.width / 2 then
 
61
                    self.x = the.app.width / 2
 
62
                 end
 
63
 
 
64
                 if self.y < the.app.height / 2 then
 
65
                    self.y = the.bg.height - the.app.height / 2
 
66
                 elseif self.y > the.bg.height - the.app.height / 2 then
 
67
                    self.y = the.app.height / 2
 
68
                 end
 
69
 
54
70
              end
55
71
}
 
 
b'\\ No newline at end of file'