/spacey

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

« back to all changes in this revision

Viewing changes to player.lua

  • Committer: Josh C
  • Date: 2013-05-05 17:28:53 UTC
  • Revision ID: josh@9ix.org-20130505172853-j6jm7k7ng0tgkyo0
pew pew!

Show diffs side-by-side

added added

removed removed

Lines of Context:
7
7
                        print('hi')
8
8
                     end
9
9
 
10
 
                     local dx = love.mouse.getX() - the.app.width / 2
11
 
                     local dy = love.mouse.getY() - the.app.height / 2
 
10
                     local dx = love.mouse.getX() - 400
 
11
                     local dy = love.mouse.getY() - 300
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(the.app.width /2, the.app.height/2)
 
18
                     love.mouse.setPosition(400,300)
19
19
                  end
20
20
}
21
21
 
28
28
   onStartFrame = function(self)
29
29
                     --local dx = love.mouse.getX() - self.x
30
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
 
31
                     local dx = love.mouse.getX() - 400
 
32
                     local dy = love.mouse.getY() - 300
33
33
 
34
34
 
35
35
                     self.acceleration.x = dx * 2
37
37
 
38
38
                     --TODO: acceleration limit.  It should at least be proportional (not 16:9)
39
39
 
40
 
                     if the.mouse:pressed() and -- assumes left button
41
 
                       love.timer.getTime() - self.lastFired > 0.25 and
42
 
                       the.cursor:inTargetArea() then
 
40
                     if the.mouse:pressed() then -- assumes left button
 
41
                        if love.timer.getTime() - self.lastFired > 0.25 then
43
42
                           --print('pew')
44
43
                           b = Bullet:new{
45
44
                              x = self.x, y = self.y,
46
45
                              rotation = self.rotation,
 
46
                              velocity = {
 
47
                                 x = self.velocity.x * 1.5,
 
48
                                 y = self.velocity.y * 1.5
 
49
                              },
47
50
                           }
48
51
                           the.app.view:add(b)
49
52
                           self.lastFired = love.timer.getTime()
 
53
                        end
50
54
                     end
51
55
                  end,
52
56
   onUpdate = function(self)