/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-10 23:42:44 UTC
  • Revision ID: josh@9ix.org-20130610234244-r0qlqjqjymdc5nhs
move fullscreen into love.run so it doesn't keep toggling on ctl-alt-R

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
19
 
21
20
util = {
22
21
   signOf = function(value)
110
109
              self:add(the.planets)
111
110
 
112
111
              --the.player = CrystalPlayer:new{x=400,y=300}
113
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
112
              the.player = SpacePlayer:new{x=1366,y=768}
114
113
              self:add(the.player)
115
114
              self:add(the.player.thrust)
116
115
 
124
123
              self:add(the.interface)
125
124
 
126
125
              for _ = 1, math.random(6) do
127
 
                 local planet = Planet:new{
 
126
                 local planet = Tile:new{
 
127
                    image = 'data/planet1.png',
128
128
                    x = math.random(the.app.width / 2,
129
129
                                    the.bg.width - the.app.width / 2),
130
130
                    y = math.random(the.app.height / 2,
132
132
                    rotation = math.random() * math.pi
133
133
                 }
134
134
                 the.planets:add(planet)
 
135
 
 
136
                 planet.indicator = Tile:new{
 
137
                    image = 'data/planet1ind.png',
 
138
                 }
 
139
                 the.indicators:add(planet.indicator)
135
140
              end
136
141
 
137
142
              the.cursor = Cursor:new()
240
245
                       planet.indicator.visible = true
241
246
 
242
247
                       if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
243
 
                          indx = (the.app.width / 2 - 10) * util.signOf(pvec.x) + 8
244
 
                          indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x)
 
248
                          indx = the.app.width / 2 * util.signOf(pvec.x) + 8
 
249
                          indy = the.app.width / 2 * pvec.y / math.abs(pvec.x)
245
250
                       else
246
 
                          indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8
247
 
                          indx = (the.app.height / 2 - 10) * pvec.x / math.abs(pvec.y)
 
251
                          indy = the.app.height / 2 * util.signOf(pvec.y) + 8
 
252
                          indx = the.app.height / 2 * pvec.x / math.abs(pvec.y)
248
253
                       end
249
254
 
250
255
                       planet.indicator.x = the.player.x + indx