/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-14 00:15:01 UTC
  • Revision ID: josh@9ix.org-20130514001501-z14e702ncp21s0yr
try to not spawn rocks where you can see them.  not working if screen 
crosses game boundaries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
9
9
 
10
10
require 'version'
11
11
require 'wrap_tile'
 
12
require 'mirror'
12
13
require 'player'
13
14
require 'enemy'
14
15
require 'cursor'
15
16
require 'bullet'
 
17
require 'rock'
16
18
 
17
19
util = {
18
20
   signOf = function(value)
21
23
               else
22
24
                  return -1
23
25
               end
24
 
            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
25
70
}
26
71
 
27
72
GameView = View:extend {
 
73
   lastRock = 0,
 
74
   rockInterval = 1,
 
75
   gameStart = 0,
28
76
   onNew = function (self)
29
77
              -- for x = 1,30 do
30
78
              --    for y = 1,30 do
47
95
              the.player = SpacePlayer:new{x=1366,y=768}
48
96
              self:add(the.player)
49
97
 
50
 
              self:add(Enemy:new{x=400, y=300})
 
98
              --self:add(Enemy:new{x=400, y=300})
51
99
 
52
100
              the.cursor = Cursor:new()
53
101
              self:add(the.cursor)
58
106
              --self:loadLayers('data/map.lua')
59
107
              self.focus = the.player
60
108
              --self:clampTo(self.map)
 
109
 
 
110
              self.gameStart = love.timer.getTime()
61
111
           end,
 
112
   onUpdate = function(self, dt)
 
113
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
 
114
                    local unseenRock = nil
 
115
                    while not unseenRock do
 
116
                       local rock = Rock:new{
 
117
                          x = math.random(the.app.width / 2,
 
118
                                          the.bg.width - the.app.width / 2),
 
119
                          y = math.random(the.app.height / 2,
 
120
                                          the.bg.height - the.app.height / 2),
 
121
                          velocity = {
 
122
                             x = math.random(-300, 300),
 
123
                             y = math.random(-300, 300),
 
124
                             rotation = math.random(-7, 7)
 
125
                          },
 
126
                          scale = math.random() + 0.5
 
127
                       }
 
128
 
 
129
                       local rockToPlayer = util.shortestVector(rock, the.player)
 
130
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
 
131
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
 
132
                         unseenRock = rock
 
133
                        end
 
134
                    end
 
135
 
 
136
                    self:add(unseenRock)
 
137
 
 
138
                    self.lastRock = love.timer.getTime()
 
139
                 end
 
140
              end,
62
141
   draw = function (self, x, y)
63
142
             View.draw(self, x, y)
64
143
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
82
161
the.app = App:new {
83
162
   onRun = function (self)
84
163
              print('Version: ' .. VERSION)
 
164
 
 
165
              math.randomseed(os.time())
 
166
 
85
167
              self.view = GameView:new()
86
168
              if DEBUG then
87
169
                 self.console:watch('VERSION', 'VERSION')