To get this branch, use:
bzr branch
http://9ix.org/bzr/traderous
« back to all changes in this revision
Viewing changes to main.lua
- browse files at revision 23
- compare with another revision
- download diff
- download tarball
- view history from revision 23
- Committer: Josh C
- Date: 2013-05-13 21:25:26 UTC
- Revision ID: josh@9ix.org-20130513212526-3q6md6n9xzhcmoa6
and that fixes the corner bug
- files removed:
- data/rock.png
- files modified:
- bullet.lua
added
removed
main.lua
5
5
--__ = require 'underscore'
6
6
vector = require 'vector'
7
7
8
require 'group'
9
10
8
require 'version'
11
9
require 'wrap_tile'
12
require 'mirror'
13
10
require 'player'
14
11
require 'enemy'
15
12
require 'cursor'
16
13
require 'bullet'
17
require 'rock'
18
14
19
15
util = {
20
16
signOf = function(value)
23
19
else
24
20
return -1
25
21
end
26
end,
27
shortestVector = function(from, to)
28
if STRICT then
29
if from.x < the.app.width / 2 or
30
from.x > the.bg.width - the.app.width / 2 or
31
from.y < the.app.height / 2 or
32
from.y > the.bg.height - the.app.height / 2 then
33
error('"from" coordinate out of bounds: X='..from.x..' Y='..from.y)
34
end
35
36
if to.x < the.app.width / 2 or
37
to.x > the.bg.width - the.app.width / 2 or
38
to.y < the.app.height / 2 or
39
to.y > the.bg.height - the.app.height / 2 then
40
error('"to" coordinate out of bounds: X='..to.x..' Y='..to.y)
41
end
42
end
43
44
-- normalize grid to account for mirror zones
45
local fx = from.x - the.app.width / 2
46
local fy = from.y - the.app.height / 2
47
local tx = to.x - the.app.width / 2
48
local ty = to.y - the.app.height / 2
49
50
local short = {}
51
52
-- pick shorter x
53
if math.abs(tx - fx) < math.abs(tx - fx - (the.bg.width - the.app.width)) then
54
-- straight path is shorter
55
short.x = tx - fx
56
else
57
short.x = tx - fx - (the.bg.width - the.app.width)
58
end
59
60
-- pick shorter y
61
if math.abs(ty - fy) < math.abs(ty - fy - (the.bg.height - the.app.height)) then
62
-- straight path is shorter
63
short.y = ty - fy
64
else
65
short.y = ty - fy - (the.bg.height - the.app.height)
66
end
67
68
return vector.new(short.x, short.y)
69
end
22
end
70
23
}
71
24
72
25
GameView = View:extend {
73
lastRock = 0,
74
rockInterval = 1,
75
gameStart = 0,
76
26
onNew = function (self)
77
27
-- for x = 1,30 do
78
28
-- for y = 1,30 do
83
33
-- end
84
34
-- end
85
35
86
the.rockColliders = Group:new()
87
the.bullets = Group:new()
88
89
36
the.bg = Tile:new{
90
37
image = 'data/stars3.png',
91
38
-- 1366x768 * 3
98
45
the.player = SpacePlayer:new{x=1366,y=768}
99
46
self:add(the.player)
100
47
101
--self:add(Enemy:new{x=400, y=300})
48
self:add(Enemy:new{x=400, y=300})
102
49
103
50
the.cursor = Cursor:new()
104
51
self:add(the.cursor)
109
56
--self:loadLayers('data/map.lua')
110
57
self.focus = the.player
111
58
--self:clampTo(self.map)
112
113
self.gameStart = love.timer.getTime()
114
59
end,
115
onUpdate = function(self, dt)
116
if love.timer.getTime() > self.lastRock + self.rockInterval then
117
local unseenRock = nil
118
while not unseenRock do
119
local rock = Rock:new{
120
x = math.random(the.app.width / 2,
121
the.bg.width - the.app.width / 2),
122
y = math.random(the.app.height / 2,
123
the.bg.height - the.app.height / 2),
124
velocity = {
125
x = math.random(-300, 300),
126
y = math.random(-300, 300),
127
rotation = math.random(-7, 7)
128
},
129
scale = math.random() + 0.5
130
}
131
132
local rockToPlayer = util.shortestVector(rock, the.player)
133
if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
134
math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
135
unseenRock = rock
136
end
137
end
138
139
self:add(unseenRock)
140
141
self.lastRock = love.timer.getTime()
142
end
143
144
the.bullets:collide(the.rockColliders)
145
end,
146
60
draw = function (self, x, y)
147
61
View.draw(self, x, y)
148
62
love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
166
80
the.app = App:new {
167
81
onRun = function (self)
168
82
print('Version: ' .. VERSION)
169
170
math.randomseed(os.time())
171
172
83
self.view = GameView:new()
173
84
if DEBUG then
174
85
self.console:watch('VERSION', 'VERSION')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1