/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-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
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
 
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},
 
28
   lastFired = 0,
27
29
   onStartFrame = function(self)
28
 
                     --local dx = love.mouse.getX() - self.x
29
 
                     --local dy = love.mouse.getY() - self.y
30
 
                     local dx = love.mouse.getX() - 400
31
 
                     local dy = love.mouse.getY() - 300
32
 
 
33
 
 
34
 
                     self.acceleration.x = dx * 2
35
 
                     self.acceleration.y = dy * 2
 
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
 
48
 
 
49
                     if the.mouse:pressed() and -- assumes left button
 
50
                       love.timer.getTime() - self.lastFired > 0.25 and
 
51
                       the.cursor:inTargetArea() then
 
52
                           --print('pew')
 
53
                           b = Bullet:new{
 
54
                              x = self.x, y = self.y,
 
55
                           }
 
56
                           the.app.view:add(b)
 
57
                           self.lastFired = love.timer.getTime()
 
58
                     end
36
59
                  end,
37
60
   onUpdate = function(self)
38
 
                 self.rotation = math.atan2(self.velocity.y, self.velocity.x)
39
61
              end
40
62
}
 
 
b'\\ No newline at end of file'