4 files changed, 150 insertions, 23 deletions

diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index c27c159..d5a8442 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -1,42 +1,70 @@
 /*
 */
 
-var Map = function(){
+var Map = function(opt){
+	
+	opt = defaults(opt, {
+		type: "editor",
+		el: document.querySelector("#map"),
+		width: window.innerWidth,
+		height: window.innerHeight,
+		zoom: -2,
+		zoom_min: -6.2,
+		zoom_max: 0,
+	})
+	
 	var base = this
-	base.el = document.querySelector("#map")
+	base.el = opt.el
 	
 	if (! base.el) return
 	
-	base.dimensions = new vec2(window.innerWidth, window.innerHeight)
+	base.dimensions = new vec2(opt.width, opt.height)
 	base.center = new vec2(0,0)
 	
-	base.sides = function(){
+	base.sides_for_center = function(){
 		var sides = base.dimensions.clone().div(2).div(base.zoom)
 		return new Rect( base.center.a - sides.a, -base.center.b - sides.b,
 										 base.center.a + sides.a, -base.center.b + sides.b )
 	}
+	base.sides_for_camera = function(){
+		var sides = base.dimensions.clone().div(2).div(base.zoom)
+		return new Rect( scene.camera.x - sides.a, scene.camera.z - sides.b,
+										 scene.camera.x + sides.a, scene.camera.z + sides.b )
+	}
+
 
-	base.zoom = 1/4
-	base.zoom_exponent = -2
 	base.set_zoom = function (n) {
+		n = clamp(n, opt.zoom_min, opt.zoom_max)
 		base.zoom_exponent = n
-		base.zoom = pow(2, base.zoom_exponent)
+		base.zoom = pow(2, n)
 	}
+	base.set_zoom(opt.zoom)
 
 	var canvas = base.canvas = document.createElement("canvas")
 	canvas.width = base.dimensions.a
 	canvas.height = base.dimensions.b
 	
-	document.querySelector("#map").appendChild(canvas)
+	base.el.appendChild(canvas)
 	
-	base.draw = new MapDraw (base)
-	base.ui = new MapUI (base)
+	switch (opt.type) {
+		case "editor":
+			base.draw = new Map.Draw (base)
+			base.ui = new Map.UI.Editor (base)
+			base.sides = base.sides_for_center
+			$(window).resize(base.resize)
+			break
+		
+		case "minimap":
+			base.draw = new Map.Draw (base, { center: scene.camera, minimap: true })
+			base.ui = new Map.UI.Minimap (base)
+			base.sides = base.sides_for_camera
+			break
+	}
 	
 	base.resize = function(){
 		canvas.width = base.dimensions.a = window.innerWidth
 		canvas.height = base.dimensions.b = window.innerHeight
 	}
-	$(window).resize(base.resize)
 
 	base.update = function(){
 		base.draw.animate()
diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index a441de4..8e1fe5a 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -1,5 +1,7 @@
 
-var MapDraw = function(map){
+Map.Draw = function(map, opt){
+
+	opt = defaults(opt, { minimap: false })
 
 	var draw = this
 	
@@ -8,17 +10,30 @@ var MapDraw = function(map){
 	draw.animate = function(){
 		ctx.save()
 		draw.clear()
-		draw.ruler()
+		// draw.ruler()
 
-		ctx.translate( map.dimensions.a * 1/2, map.dimensions.b * 1/2)
-		ctx.scale( map.zoom, map.zoom )
-		ctx.translate( map.center.a,  map.center.b)
-		ctx.scale( -1, 1 )
+		if (opt.minimap) {
+			ctx.translate( map.dimensions.a * 1/2, map.dimensions.b * 1/2)
+			ctx.scale( map.zoom, map.zoom )
+			ctx.translate( opt.center.x, - opt.center.z )
+			ctx.scale( -1, 1 )
 
-		draw.regions(Rooms.regions, colors)
-		draw.mouse(map.ui.mouse.cursor)
-		draw.coords()
-		scene && draw.camera(scene.camera)
+			draw.coords()
+			draw.regions(Rooms.regions, [ "#fff" ])
+			draw.camera(scene.camera)
+		}
+		
+		else {
+			ctx.translate( map.dimensions.a * 1/2, map.dimensions.b * 1/2)
+			ctx.scale( map.zoom, map.zoom )
+			ctx.translate( map.center.a,  map.center.b )
+			ctx.scale( -1, 1 )
+
+			draw.regions(Rooms.regions, colors)
+			draw.mouse(map.ui.mouse.cursor)
+			draw.coords()
+			scene && draw.camera(scene.camera)
+		}
 
 		ctx.restore()
 	}
@@ -29,7 +44,7 @@ var MapDraw = function(map){
 
 		ctx.translate( map.dimensions.a * 1/2, map.dimensions.b * 1/2)
 		ctx.scale( map.zoom, map.zoom )
-		ctx.translate( map.center.a,  map.center.b)
+		ctx.translate( map.center.a,  map.center.b )
 		ctx.scale( -1, 1 )
 
 		draw.regions(Rooms.regions, ["#fff"])
@@ -109,6 +124,7 @@ var MapDraw = function(map){
 	}
 
 	draw.coords = function(){
+		/*
 		ctx.fillStyle = "#888";
 		dot_at(0,0)
 		ctx.fillStyle = "#bbb";
@@ -120,6 +136,7 @@ var MapDraw = function(map){
 		ctx.fillStyle = "#eee";
 		dot_at(300,0)
 		dot_at(0,300)
+		*/
 		
 		ctx.strokeStyle = "rgba(0,0,0,0.1)"
 		ctx.lineWidth = 1/map.zoom
diff --git a/public/assets/javascripts/rectangles/engine/map/ui.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 7890c9b..262272b 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -1,5 +1,6 @@
 
-var MapUI = function(map){
+Map.UI = Map.UI || {}
+Map.UI.Editor = function(map){
 
 	var base = this
 
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
new file mode 100644
index 0000000..fabbdb9
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
@@ -0,0 +1,81 @@
+
+Map.UI = Map.UI || {}
+
+Map.UI.Minimap = function(map){
+
+	var base = this
+
+	base.creating = base.dragging = base.resizing = false
+
+	base.mouse = new mouse({
+		el: map.el,
+		down: down,
+		move: move,
+		drag: drag,
+		up: up,
+		rightclick: rightclick,
+	})
+
+	base.wheel = new wheel({
+		el: map.el,
+		update: mousewheel,
+	})
+	
+	var x, z
+	
+	//
+	
+	function down (e, cursor){
+		cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+		cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+		
+		x = scene.camera.x
+		z = scene.camera.z
+
+		if (e.ctrlKey || e.which === 3) {
+			cursor.quantize(1/map.zoom)
+			map.center.a = cursor.x.a
+			map.center.b = -cursor.y.a
+			console.log(map.center+"")
+			cursor.x.b = cursor.x.a
+			cursor.y.b = cursor.y.a
+			base.mouse.down = false
+			e.preventDefault()
+			e.stopPropagation()
+			return
+		}
+	}
+
+	function move (e, cursor) {
+		cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+		cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+	}
+
+	function drag (e, cursor) {
+		cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom + map.center.a
+		cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom - map.center.b
+
+		scene.camera.x = x + cursor.x.magnitude() * map.zoom * 16
+		scene.camera.z = z + cursor.y.magnitude() * map.zoom * 16
+		Rooms.mover.room = null
+
+		if (base.dragging) {
+			base.dragging.rect.translation.a = cursor.x.magnitude()
+			base.dragging.rect.translation.b = cursor.y.magnitude()
+		}
+	}
+
+	function up (e, cursor, new_cursor) {
+		new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+		new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+
+		base.dragging = false
+	}
+
+	function mousewheel (e, val, delta){
+		map.set_zoom(map.zoom_exponent - delta/20)
+	}
+	
+	function rightclick (e){
+	}
+}