/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-07 22:24:32 UTC
  • Revision ID: josh@9ix.org-20130507222432-74d3ul1p8ffq40s5
only fire if cursor is in target area.  change cursor to reflect this.

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
7
7
                        print('hi')
8
8
                     end
9
9
 
10
 
                     local dx = love.mouse.getX() - 400
11
 
                     local dy = love.mouse.getY() - 300
 
10
                     local dx = love.mouse.getX() - the.app.width / 2
 
11
                     local dy = love.mouse.getY() - the.app.height / 2
12
12
 
13
13
                     self.acceleration.x = dx * 10
14
14
                     self.acceleration.y = dy * 10
15
15
 
16
16
                     --print(dx, dy)
17
17
 
18
 
                     love.mouse.setPosition(400,300)
 
18
                     love.mouse.setPosition(the.app.width /2, the.app.height/2)
19
19
                  end
20
20
}
21
21
 
24
24
   image = 'data/ship.png',
25
25
   maxVelocity = {x=velLimit,y=velLimit},
26
26
   minVelocity = {x=-velLimit, y=-velLimit},
 
27
   lastFired = 0,
27
28
   onStartFrame = function(self)
28
29
                     --local dx = love.mouse.getX() - self.x
29
30
                     --local dy = love.mouse.getY() - self.y
30
 
                     local dx = love.mouse.getX() - 400
31
 
                     local dy = love.mouse.getY() - 300
 
31
                     local dx = love.mouse.getX() - the.app.width / 2
 
32
                     local dy = love.mouse.getY() - the.app.height / 2
32
33
 
33
34
 
34
35
                     self.acceleration.x = dx * 2
35
36
                     self.acceleration.y = dy * 2
36
37
 
37
38
                     --TODO: acceleration limit.  It should at least be proportional (not 16:9)
 
39
 
 
40
                     if the.mouse:pressed() and -- assumes left button
 
41
                       love.timer.getTime() - self.lastFired > 0.25 and
 
42
                       the.cursor:inTargetArea() then
 
43
                           --print('pew')
 
44
                           b = Bullet:new{
 
45
                              x = self.x, y = self.y,
 
46
                              rotation = self.rotation,
 
47
                           }
 
48
                           the.app.view:add(b)
 
49
                           self.lastFired = love.timer.getTime()
 
50
                     end
38
51
                  end,
39
52
   onUpdate = function(self)
40
53
                 self.rotation = math.atan2(self.velocity.y, self.velocity.x)