/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-05-07 20:42:07 UTC
  • Revision ID: josh@9ix.org-20130507204207-yavvb4hhzhrjnw1e
fullscreen.  (there must be a more subtle way...)

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
5
 
vector = require 'vector'
6
 
--inspect = require 'inspect'
7
 
 
8
 
require 'group'
 
5
--__ = require 'underscore'
9
6
 
10
7
require 'version'
11
 
require 'wrap_tile'
12
 
require 'mirror'
13
8
require 'player'
14
9
require 'enemy'
15
10
require 'cursor'
16
11
require 'bullet'
17
 
require 'rock'
18
 
require 'boom'
19
 
require 'planet'
20
 
require 'trade_view'
21
12
 
22
13
util = {
23
14
   signOf = function(value)
26
17
               else
27
18
                  return -1
28
19
               end
29
 
            end,
30
 
   shortestVector = function(from, to)
31
 
                       if STRICT then
32
 
                          if from.x < the.app.width / 2 or
33
 
                             from.x > the.bg.width - the.app.width / 2 or
34
 
                             from.y < the.app.height / 2 or
35
 
                             from.y > the.bg.height - the.app.height / 2 then
36
 
                             error('"from" coordinate out of bounds: X='..from.x..' Y='..from.y)
37
 
                          end
38
 
 
39
 
                          if to.x < the.app.width / 2 or
40
 
                             to.x > the.bg.width - the.app.width / 2 or
41
 
                             to.y < the.app.height / 2 or
42
 
                             to.y > the.bg.height - the.app.height / 2 then
43
 
                             error('"to" coordinate out of bounds: X='..to.x..' Y='..to.y)
44
 
                          end
45
 
                       end
46
 
 
47
 
                       -- normalize grid to account for mirror zones
48
 
                       local fx = from.x - the.app.width / 2
49
 
                       local fy = from.y - the.app.height / 2
50
 
                       local tx = to.x - the.app.width / 2
51
 
                       local ty = to.y - the.app.height / 2
52
 
 
53
 
                       local short = {}
54
 
 
55
 
                       -- pick shorter x
56
 
                       if math.abs(tx - fx) < math.abs(tx - fx - (the.bg.width - the.app.width)) then
57
 
                          -- straight path is shorter
58
 
                          short.x = tx - fx
59
 
                       else
60
 
                          short.x = tx - fx - (the.bg.width - the.app.width)
61
 
                       end
62
 
 
63
 
                       -- pick shorter y
64
 
                       if math.abs(ty - fy) < math.abs(ty - fy - (the.bg.height - the.app.height)) then
65
 
                          -- straight path is shorter
66
 
                          short.y = ty - fy
67
 
                       else
68
 
                          short.y = ty - fy - (the.bg.height - the.app.height)
69
 
                       end
70
 
 
71
 
                       return vector.new(short.x, short.y)
72
 
                    end
 
20
            end
73
21
}
74
22
 
75
23
GameView = View:extend {
76
24
   onNew = function (self)
77
 
              the.storage = Storage:new{filename = 'scores.lua'}
78
 
              the.storage:load()
79
 
              --if not the.storage.data.highScore then
80
 
              --   print('initializing storage')
81
 
              --   the.storage.data = {highScore = 0}
82
 
              --end
83
 
 
84
 
              the.bullets = Group:new()
85
 
              the.interface = Group:new()
86
 
              the.planets = Group:new()
87
 
              the.indicators = Group:new()
88
 
 
89
 
              the.bg = Tile:new{
90
 
                 image = 'data/stars3.png',
91
 
                 width = 13660,
92
 
                 height = 7680
93
 
              }
94
 
              self:add(the.bg)
95
 
 
96
 
              self:add(the.planets)
 
25
              for x = 1,30 do
 
26
                 for y = 1,30 do
 
27
                    self:add(Fill:new{x=x*400, y=y*400,
 
28
                                      width = 32, height = 32,
 
29
                                      fill = {0,0,255}
 
30
                                   })
 
31
                 end
 
32
              end
97
33
 
98
34
              --the.player = CrystalPlayer:new{x=400,y=300}
99
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
35
              the.player = SpacePlayer:new{x=400,y=300}
100
36
              self:add(the.player)
101
 
              self:add(the.player.thrust)
102
 
 
103
 
              local e = Enemy:new{x=400, y=300}
104
 
              --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
105
 
              self:add(e)
106
 
              self:add(e.thrust) -- why doesn't this work in Enemy.new?
107
 
 
108
 
              self:add(the.bullets)
109
 
              self:add(the.indicators)
110
 
              self:add(the.interface)
111
 
 
112
 
              for _ = 1, math.random(6) do
113
 
                 local planet = Planet:new{
114
 
                    x = math.random(the.app.width / 2,
115
 
                                    the.bg.width - the.app.width / 2),
116
 
                    y = math.random(the.app.height / 2,
117
 
                                    the.bg.height - the.app.height / 2),
118
 
                    rotation = math.random() * math.pi
119
 
                 }
120
 
                 the.planets:add(planet)
121
 
              end
122
 
 
123
 
              the.cursor = Cursor:new()
124
 
              self:add(the.cursor)
 
37
 
 
38
              self:add(Enemy:new{x=400, y=300})
 
39
 
 
40
              self:add(Cursor:new())
125
41
 
126
42
              love.mouse.setGrab(true)
127
43
              love.mouse.setVisible(false)
128
 
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
129
44
 
 
45
              --self:loadLayers('data/map.lua')
130
46
              self.focus = the.player
 
47
              --self:clampTo(self.map)
131
48
           end,
132
 
   onUpdate = function(self, dt)
133
 
                 the.bullets:collide(the.planets)
134
 
              end,
135
 
   onEndFrame = function(self)
136
 
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
137
 
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
138
 
                end,
139
49
   draw = function (self, x, y)
140
50
             View.draw(self, x, y)
141
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
142
 
          end,
 
51
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
52
          end
143
53
}
144
54
 
145
55
MenuScreen = View:extend {
159
69
the.app = App:new {
160
70
   onRun = function (self)
161
71
              print('Version: ' .. VERSION)
162
 
 
163
 
              math.randomseed(os.time())
164
 
 
165
72
              self.view = GameView:new()
166
 
 
167
73
              if DEBUG then
168
74
                 self.console:watch('VERSION', 'VERSION')
169
75
                 self.console:watch('updateTook', 'the.updateTook')
170
 
                 self.console:watch('the.player.x', 'the.player.x')
171
 
                 self.console:watch('the.player.y', 'the.player.y')
172
 
                 self.console:watch('the.app.width', 'the.app.width')
173
 
                 self.console:watch('the.app.height', 'the.app.height')
174
 
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
175
 
                 self.console:watch('num rocks', '#the.rocks.sprites')
176
 
                 self.console:watch('num planets', '#the.planets.sprites')
177
76
                 --self.console:watch('drawTook', 'the.drawTook')
178
 
 
179
 
                 -- back off that dark overlay a bit
180
 
                 self.console.fill.fill[4] = 75
181
77
              end
182
78
           end,
183
79
   onUpdate = function (self, dt)
184
 
                 if not (DEBUG and the.console.visible) then
185
 
                    if the.keys:justPressed('q') then
186
 
                       self.quit()
187
 
                    elseif the.keys:justPressed('return') then
188
 
                       if the.keys:pressed('alt') then
189
 
                          love.graphics.toggleFullscreen()
190
 
                       else
191
 
                          self.view = GameView:new()
192
 
                       end
193
 
                    elseif the.keys:justPressed('f1') then
194
 
                       local ss = love.graphics.newScreenshot()
195
 
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
196
 
                    elseif the.keys:justPressed('f11') then
197
 
                       love.graphics.toggleFullscreen()
198
 
                    end
 
80
                 if the.keys:justPressed('escape') then
 
81
                    self.quit()
199
82
                 end
200
83
              end,
201
84
   update = function (self, dt)
206
89
               end
207
90
            end
208
91
}
209
 
 
210
 
realRun = love.run
211
 
function love.run()
212
 
   -- should fail silently if it can't go to fullscreen...
213
 
   love.graphics.toggleFullscreen()
214
 
 
215
 
   realRun()
216
 
end
 
 
b'\\ No newline at end of file'