Merge branch 'rotLua-boundcb'

README.md

@@ -6,19 +6,19 @@ See [this page](http://paulofmandown.github.io/rotLove/) for a quick and dirty r
 
 Included:
 
- * Display          - via [rlLove](https://github.com/paulofmandown/rlLove), only supports cp437 emulation 
+ * Display          - via [rlLove](https://github.com/paulofmandown/rlLove), only supports cp437 emulation
                       rather than full font support.
  * TextDisplay      - Text based display, accepts supplied fonts
- * RNG              - via [RandmLua](http://love2d.org/forums/viewtopic.php?f=5&t=3424). 
-                      Multiply With Carry, Linear congruential generator, and Mersenne Twister. 
+ * RNG              - via [RandomLua](http://love2d.org/forums/viewtopic.php?f=5&t=3424).
+                      Multiply With Carry, Linear congruential generator, and Mersenne Twister.
                       Extended with set/getState methods.
  * StringGenerator  - Direct Port from [rot.js](http://ondras.github.io/rot.js/hp/)
- * Map              - Arena, Divided/Icey/Eller Maze, Digger/Uniform/Rogue* Dungeons. 
+ * Map              - Arena, Divided/Icey/Eller Maze, Digger/Uniform/Rogue* Dungeons.
                       Ported from [rot.js](http://ondras.github.io/rot.js/hp/).
  * Noise Generator  - Simplex Noise
  * FOV              - Bresenham Line based Ray Casting, Precise Shadow Casting
- * Color            - 147 Predefined colors; generate valid colors from string; add, multiply, or interpolate colors; 
-                      generate a random color from a reference and set of standard deviations. 
+ * Color            - 147 Predefined colors; generate valid colors from string; add, multiply, or interpolate colors;
+                      generate a random color from a reference and set of standard deviations.
                       (straight port from [rot.js](http://ondras.github.io/rot.js/hp/))
  * Path Finding     - Dijkstra and AStar pathfinding ported from [rot.js](http://ondras.github.io/rot.js/hp/).
  * Lighting         - compute light emission and blending, ported from [rot.js](http://ondras.github.io/rot.js/hp/).
@@ -28,9 +28,9 @@ Getting started
 ==========
 `git clone git://github.com/paulofmandown/rotLove.git`
 
-Add the rotLove folder/directory to your project and require the rotLove file.
+Add the contents of the src directory to lib/rotLove in your project and require the rot file.
 ```lua
-ROT=require 'rotLove/rotLove'
+ROT=require 'lib/rotLove/rot'
 function love.load()
     f=ROT.Display()
     f:writeCenter('You did it!', math.floor(f:getHeight()/2))

examples/action.lua

@@ -1,5 +1,5 @@
 --[[ ActionScheduler ]]--
-ROT= require 'rotLove/rotLove'
+ROT=require 'src.rot'
 
 function love.load()
 	s  =ROT.Scheduler.Action:new()

examples/arena.lua

@@ -1,5 +1,5 @@
 --[[ Arena ]]--
-ROT=require 'rotLove/rotLove'
+ROT=require 'src.rot'
 function love.load()
 	f=ROT.Display:new(80,24)
 	m=ROT.Map.Arena:new(f:getWidth(), f:getHeight())

examples/astar.lua

@@ -1,4 +1,4 @@
-ROT=require 'rotLove/rotLove'
+ROT=require 'src.rot'
 
 data={}
 
@@ -29,19 +29,15 @@ function love.keypressed() update=true end
 function doTheThing()
     local start=os.clock()
     map:create(mapCallback)
-    write('Map Create in '..os.clock()-start)
     p1=getRandomFloor(data)
     p2=getRandomFloor(data)
     p3=getRandomFloor(data)
     start=os.clock()
     astar=ROT.Path.AStar(p1[1], p1[2], passableCallback)
-    write('AStar init in '..os.clock()-start)
     start=os.clock()
     astar:compute(p2[1], p2[2], astarCallback)
-    write('AStar Compute in '..os.clock()-start)
     start=os.clock()
     astar:compute(p3[1], p3[2], astarCallback)
-    write('AStar Compute in '..os.clock()-start)
 
     f:write('S', tonumber(p1[1]), tonumber(p1[2]), nil, {r=0, g=0, b=255, a=255})
     f:write('E', tonumber(p2[1]), tonumber(p2[2]), nil, {r=0, g=0, b=255, a=255})

examples/bresenham.lua

@@ -1,5 +1,5 @@
 --[[ Bresenham Line of Sight ]]--
-ROT=require 'rotLove/rotLove'
+ROT=require 'src.rot'
 
 function calbak(x, y, val)
     map[x..','..y]=val

examples/brogue.lua

@@ -1,5 +1,5 @@
 --[[ Brogue ]]
-ROT=require 'rotLove/rotLove'
+ROT=require 'src.rot'
 
 function love.load()
     f  =ROT.Display(80, 30)

examples/brogueCaveGeneration.lua

@@ -1,4 +1,4 @@
-ROT=require 'rotLove/rotLove'
+ROT=require 'src.rot'
 function love.load()
     f =ROT.Display(79,29)
     cl=ROT.Map.Cellular:new(f:getWidth(), f:getHeight())
@@ -17,7 +17,6 @@ function love.update()
     if wait then return end
     local cellStart=os.clock()
     for i=1,5 do cl:create(calbak) end
-    write('cellGen in ' .. os.clock()-cellStart)
     for x=1,f:getWidth() do
         for y=1,f:getHeight() do
             if cl._map[x][y]==1 then
@@ -30,7 +29,6 @@ function love.update()
             end
         end
     end
-    write('built in '..os.clock()-start)
     writeMap()
     largest=2
     id=2

examples/cellular.lua

@@ -1,5 +1,5 @@
 --[[ Cellular ]]--
-ROT=require 'rotLove/rotLove'
+ROT=require 'src.rot'
 function love.load()
 	f =ROT.Display(80,24)
 	cl=ROT.Map.Cellular:new(f:getWidth(), f:getHeight())

examples/characters.lua

@@ -1,4 +1,4 @@
-ROT=require 'rotLove/rotLove'
+ROT=require 'src.rot'
 DSP=ROT.Display:new()
 function love.load()
     local y=1

examples/color.lua

@@ -1,5 +1,4 @@
-ROT=require 'rotLove/rotLove'
-
+ROT=require 'src.rot'
 function love.load()
     colorHandler=ROT.Color:new()
     f=ROT.Display()

examples/dice.lua

@@ -1,4 +1,4 @@
-ROT=require 'rotLove/rotLove'
+ROT=require 'src.rot'
 local f, d_with_rng, lcg
 function love.load()
     f=ROT.Display:new(80,24)

examples/digger.lua

@@ -1,5 +1,5 @@
 --[[ Digger ]]
-ROT=require 'rotLove/rotLove'
+ROT=require 'src.rot'
 
 local update=false
 function love.load()

examples/dijkstra.lua

@@ -1,4 +1,4 @@
-ROT=require 'rotLove/rotLove'
+ROT=require 'src.rot'
 
 data={}
 
@@ -29,21 +29,16 @@ function love.keypressed() update=true end
 function doTheThing()
     local start=os.clock()
     map:create(mapCallback)
-    write('Map Create in '..os.clock()-start)
-
     p1=getRandomFloor(data)
     p2=getRandomFloor(data)
     p3=getRandomFloor(data)
 
     start=os.clock()
     dijkstra=ROT.Path.Dijkstra(p1[1], p1[2], passableCallback)
-    write('Dijkstra init in '..os.clock()-start)
     start=os.clock()
     dijkstra:compute(p2[1], p2[2], dijkstraCallback)
-    write('Dijkstra Compute in '..os.clock()-start)
     start=os.clock()
     dijkstra:compute(p3[1], p3[2], dijkstraCallback)
-    write('Dijkstra Compute in '..os.clock()-start)
 
     f:write('S', tonumber(p1[1]), tonumber(p1[2]), nil, {r=0, g=0, b=255, a=255})
     f:write('E', tonumber(p2[1]), tonumber(p2[2]), nil, {r=0, g=0, b=255, a=255})

examples/dijkstraMap.lua

@@ -1,5 +1,5 @@
 --[[ Rogue ]]
-ROT=require 'rotLove/rotLove'
+ROT=require 'src.rot'
 movers={}
 clr=ROT.Color:new()
 colors={}

examples/dividedMaze.lua

@@ -1,5 +1,5 @@
 --[[ Divided Maze ]]
-ROT=require 'rotLove/rotLove'
+ROT=require 'src.rot'
 function love.load()
 	f =ROT.Display(80,24)
 	dm=ROT.Map.DividedMaze:new(f:getWidth(), f:getHeight())

examples/ellerMaze.lua

@@ -1,4 +1,4 @@
-ROT=require 'rotLove/rotLove'
+ROT=require 'src.rot'
 function love.load()
 	f =ROT.Display(211, 75)
 	em=ROT.Map.EllerMaze:new(f:getWidth(), f:getHeight())

examples/engine.lua

@@ -1,8 +1,7 @@
 --[[ Engine ]]--
-ROT= require 'rotLove/rotLove'
-class= require 'src/vendor/30log'
+ROT=require 'src.rot'
 
-a1=class{lives=3}
+a1=ROT.Class:extend("ActorOne", {lives=3})
 
 function a1:act()
 	f:write('.'..','..os.clock(), 1, self.lives)
@@ -15,7 +14,7 @@ function a1:act()
 	end
 end
 
-a2=class{}
+a2=ROT.Class:extend("ActorTwo")
 
 function a2:act()
 	f:write('@'..','..os.clock(), 1, 4)

examples/event.lua

@@ -1,5 +1,5 @@
 --[[ Event Queue ]]--
-ROT= require 'rotLove/rotLove'
+ROT=require 'src.rot'
 function love.load()
 	f=ROT.Display(80,24)
 	q=ROT.EventQueue()

examples/iceyMaze.lua

@@ -1,5 +1,5 @@
 --[[ Divided Maze ]]
-ROT=require 'rotLove/rotLove'
+ROT=require 'src.rot'
 function love.load()
 	-- Icey works better with odd width/height
 	f =ROT.Display:new(81,25)

examples/lighting.lua

@@ -1,4 +1,4 @@
-ROT= require 'rotLove/rotLove'
+ROT=require 'src.rot'
 
 function love.load()
     f=ROT.Display(80, 24)