/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 21:25:26 UTC
  • Revision ID: josh@9ix.org-20130513212526-3q6md6n9xzhcmoa6
and that fixes the corner bug

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
19
19
                  end
20
20
}
21
21
 
22
 
local velLimit = 600
23
 
SpacePlayer = Tile:extend{
 
22
local velLimit = 400
 
23
--local velLimit = 50
 
24
SpacePlayer = WrapTile:extend{
24
25
   image = 'data/ship.png',
25
26
   maxVelocity = {x=velLimit,y=velLimit},
26
27
   minVelocity = {x=-velLimit, y=-velLimit},
27
28
   lastFired = 0,
28
29
   onStartFrame = function(self)
29
 
                     --local dx = love.mouse.getX() - self.x
30
 
                     --local dy = love.mouse.getY() - self.y
31
 
                     local dx = love.mouse.getX() - the.app.width / 2
32
 
                     local dy = love.mouse.getY() - the.app.height / 2
33
 
 
34
 
 
35
 
                     self.acceleration.x = dx * 2
36
 
                     self.acceleration.y = dy * 2
37
 
 
38
 
                     --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(300, 0)
 
41
                        self.acceleration:rotate_inplace(self.rotation)
 
42
                     else
 
43
                        self.acceleration = {x=0, y=0}
 
44
                        if DEBUG and the.console.visible then
 
45
                           self.velocity = {x=0, y=0}
 
46
                        end
 
47
                     end
39
48
 
40
49
                     if the.mouse:pressed() and -- assumes left button
41
50
                       love.timer.getTime() - self.lastFired > 0.25 and
43
52
                           --print('pew')
44
53
                           b = Bullet:new{
45
54
                              x = self.x, y = self.y,
46
 
                              rotation = self.rotation,
47
55
                           }
48
56
                           the.app.view:add(b)
49
57
                           self.lastFired = love.timer.getTime()
50
58
                     end
51
59
                  end,
52
60
   onUpdate = function(self)
53
 
                 self.rotation = math.atan2(self.velocity.y, self.velocity.x)
54
61
              end
55
62
}
 
 
b'\\ No newline at end of file'