/traderous

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

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-06-11 00:15:54 UTC
  • Revision ID: josh@9ix.org-20130611001554-tkzp73ke16buhnuy
bring indicators a little closer from edge

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
16
16
require 'bullet'
17
17
require 'rock'
18
18
require 'boom'
19
 
require 'planet'
20
 
require 'trade_view'
21
19
 
22
20
util = {
23
21
   signOf = function(value)
111
109
              self:add(the.planets)
112
110
 
113
111
              --the.player = CrystalPlayer:new{x=400,y=300}
114
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
112
              the.player = SpacePlayer:new{x=1366,y=768}
115
113
              self:add(the.player)
116
114
              self:add(the.player.thrust)
117
115
 
125
123
              self:add(the.interface)
126
124
 
127
125
              for _ = 1, math.random(6) do
128
 
                 local planet = Planet:new{
 
126
                 local planet = Tile:new{
 
127
                    image = 'data/planet1.png',
129
128
                    x = math.random(the.app.width / 2,
130
129
                                    the.bg.width - the.app.width / 2),
131
130
                    y = math.random(the.app.height / 2,
133
132
                    rotation = math.random() * math.pi
134
133
                 }
135
134
                 the.planets:add(planet)
 
135
 
 
136
                 planet.indicator = Tile:new{
 
137
                    image = 'data/planet1ind.png',
 
138
                 }
 
139
                 the.indicators:add(planet.indicator)
136
140
              end
137
141
 
138
142
              the.cursor = Cursor:new()
192
196
              self.gameStart = love.timer.getTime()
193
197
           end,
194
198
   onUpdate = function(self, dt)
195
 
                 the.bullets:collide(the.planets)
 
199
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
 
200
                    local unseenRock = nil
 
201
                    while not unseenRock do
 
202
                       local rock = Rock:new{
 
203
                          x = math.random(the.app.width / 2,
 
204
                                          the.bg.width - the.app.width / 2),
 
205
                          y = math.random(the.app.height / 2,
 
206
                                          the.bg.height - the.app.height / 2),
 
207
                          velocity = {
 
208
                             x = math.random(-300, 300),
 
209
                             y = math.random(-300, 300),
 
210
                             rotation = math.random(-7, 7)
 
211
                          },
 
212
                          scale = math.random() + 0.5
 
213
                       }
 
214
 
 
215
                       local rockToPlayer = util.shortestVector(rock, the.player)
 
216
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
 
217
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
 
218
                         unseenRock = rock
 
219
                        end
 
220
                    end
 
221
 
 
222
                    the.rocks:add(unseenRock)
 
223
 
 
224
                    self.lastRock = love.timer.getTime()
 
225
                 end
 
226
 
 
227
                 the.bullets:collide(the.rockColliders)
196
228
 
197
229
                 -- this should really go somewhere else...
198
230
                 for _, planet in ipairs(the.planets.sprites) do
 
231
                    local indx, indy
 
232
                    local pvec = vector.new(
 
233
                       planet.x - the.player.x + planet.width / 2,
 
234
                       planet.y - the.player.y + planet.height / 2 )
 
235
 
 
236
                    -- TODO: is there a better way to specify the
 
237
                    -- screen rectangle?
 
238
                    if planet:intersects(the.player.x - the.app.width / 2,
 
239
                                         the.player.y - the.app.height / 2,
 
240
                                         the.app.width,
 
241
                                         the.app.height) then
 
242
                       -- planet is on the screen
 
243
                       planet.indicator.visible = false
 
244
                    else
 
245
                       planet.indicator.visible = true
 
246
 
 
247
                       if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
 
248
                          indx = (the.app.width / 2 - 10) * util.signOf(pvec.x) + 8
 
249
                          indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x)
 
250
                       else
 
251
                          indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8
 
252
                          indx = (the.app.height / 2 - 10) * pvec.x / math.abs(pvec.y)
 
253
                       end
 
254
 
 
255
                       planet.indicator.x = the.player.x + indx
 
256
                       planet.indicator.y = the.player.y + indy
 
257
                    end
199
258
                 end
200
259
 
201
260
                 -- for _, mirror in ipairs(the.mirrors.sprites) do