/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-04 22:53:27 UTC
  • Revision ID: josh@9ix.org-20130504225327-dsc1gi3ri96h50s2
trying some movement styles.  derivatives on crystal quest movement.

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
3
3
 
4
4
require 'zoetrope'
5
5
--__ = require 'underscore'
6
 
vector = require 'vector'
7
 
 
8
 
require 'group'
9
6
 
10
7
require 'version'
11
 
require 'wrap_tile'
12
 
require 'mirror'
13
8
require 'player'
14
 
require 'enemy'
15
 
require 'cursor'
16
 
require 'bullet'
17
 
require 'rock'
18
 
 
19
 
util = {
20
 
   signOf = function(value)
21
 
               if value >= 0 then
22
 
                  return 1
23
 
               else
24
 
                  return -1
25
 
               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
70
 
}
71
9
 
72
10
GameView = View:extend {
73
 
   lastRock = 0,
74
 
   rockInterval = 1,
75
 
   gameStart = 0,
76
11
   onNew = function (self)
77
 
              -- for x = 1,30 do
78
 
              --    for y = 1,30 do
79
 
              --       self:add(Fill:new{x=x*400, y=y*400,
80
 
              --                         width = 32, height = 32,
81
 
              --                         fill = {0,0,255}
82
 
              --                      })
83
 
              --    end
84
 
              -- end
85
 
 
86
 
              the.bg = Tile:new{
87
 
                 image = 'data/stars3.png',
88
 
                 -- 1366x768 * 3
89
 
                 width = 4098,
90
 
                 height = 2304
91
 
              }
92
 
              self:add(the.bg)
 
12
              for x = 1,30 do
 
13
                 for y = 1,30 do
 
14
                    self:add(Fill:new{x=x*400, y=y*400,
 
15
                                      width = 32, height = 32,
 
16
                                      fill = {0,0,255}
 
17
                                   })
 
18
                 end
 
19
              end
93
20
 
94
21
              --the.player = CrystalPlayer:new{x=400,y=300}
95
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
22
              the.player = SpacePlayer:new{x=400,y=300}
96
23
              self:add(the.player)
97
24
 
98
 
              --self:add(Enemy:new{x=400, y=300})
99
 
 
100
 
              the.cursor = Cursor:new()
101
 
              self:add(the.cursor)
102
 
 
103
25
              love.mouse.setGrab(true)
104
 
              love.mouse.setVisible(false)
 
26
              --love.mouse.setVisible(false)
105
27
 
106
28
              --self:loadLayers('data/map.lua')
107
29
              self.focus = the.player
108
30
              --self:clampTo(self.map)
109
 
 
110
 
              self.gameStart = love.timer.getTime()
111
31
           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,
141
32
   draw = function (self, x, y)
142
33
             View.draw(self, x, y)
143
34
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
161
52
the.app = App:new {
162
53
   onRun = function (self)
163
54
              print('Version: ' .. VERSION)
164
 
 
165
 
              math.randomseed(os.time())
166
 
 
167
55
              self.view = GameView:new()
168
56
              if DEBUG then
169
57
                 self.console:watch('VERSION', 'VERSION')
170
58
                 self.console:watch('updateTook', 'the.updateTook')
171
 
                 self.console:watch('the.player.x', 'the.player.x')
172
 
                 self.console:watch('the.player.y', 'the.player.y')
173
 
                 self.console:watch('the.app.width', 'the.app.width')
174
 
                 self.console:watch('the.app.height', 'the.app.height')
175
59
                 --self.console:watch('drawTook', 'the.drawTook')
176
 
 
177
 
                 -- back off that dark overlay a bit
178
 
                 self.console.fill.fill[4] = 75
179
60
              end
180
61
           end,
181
62
   onUpdate = function (self, dt)