minimap

7 files changed, 195 insertions, 20 deletions

diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js
index 1b95989..63d3609 100644
--- a/public/assets/javascripts/rectangles/_env.js
+++ b/public/assets/javascripts/rectangles/_env.js
@@ -22,8 +22,6 @@ environment.init = function(){
 	
 	app.movements.gravity(true)
 	
-	// $("#map").hide()
-	
 	Rooms.init()
 	Scenery.init()
 	
@@ -32,5 +30,6 @@ environment.init = function(){
 }
 environment.update = function(t){
 	map.update()
+	window.minimap && window.minimap.update && minimap.update()
 	z = false
 }
diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index c27c159..0623d05 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -1,42 +1,67 @@
 /*
 */
 
-var Map = function(){
+var Map = function(opt){
+	
+	opt = defaults(opt, {
+		type: "editor",
+		el: document.querySelector("#map"),
+		width: window.innerWidth,
+		height: window.innerHeight,
+		zoom: -2,
+	})
+	
 	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) {
 		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 MapDraw (base)
+			base.ui = new Map.UI.Editor (base)
+			base.sides = base.sides_for_center
+			$(window).resize(base.resize)
+			break
+		
+		case "minimap":
+			base.draw = new MapDraw (base, { center: scene.camera })
+			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..9a3651c 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){
+var MapDraw = function(map, opt){
+
+	opt = defaults(opt, {})
 
 	var draw = this
 	
@@ -8,11 +10,16 @@ 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)
+		if (opt.center) {
+			ctx.translate( opt.center.x, - opt.center.z )
+		}
+		else {
+			ctx.translate( map.center.a,  map.center.b )
+		}
 		ctx.scale( -1, 1 )
 
 		draw.regions(Rooms.regions, colors)
@@ -29,7 +36,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 +116,7 @@ var MapDraw = function(map){
 	}
 
 	draw.coords = function(){
+		/*
 		ctx.fillStyle = "#888";
 		dot_at(0,0)
 		ctx.fillStyle = "#bbb";
@@ -120,6 +128,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..d8f39b0
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
@@ -0,0 +1,133 @@
+
+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,
+	})
+	
+	//
+	
+	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)
+
+		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
+		}
+
+		var intersects = Rooms.filter(function(r){
+			return r.focused = r.rect.contains(cursor.x.a, cursor.y.a)
+		})
+
+		if (intersects.length) {
+			base.dragging = intersects[0]
+			base.resizing = base.dragging.rect.nearEdge(cursor.x.a, cursor.y.a, resize_margin / map.zoom)
+			base.dragging.rect.translation.sides = base.resizing
+		}
+		else {
+			base.creating = true
+		}
+
+		if (e.shiftKey && base.dragging) {
+			base.dragging.rect.quantize(10/map.zoom)
+		}
+	}
+
+	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
+
+		if (base.resizing) {
+			var x_length = base.dragging.rect.x.length(),
+					y_length = base.dragging.rect.y.length()
+
+			if (base.resizing & LEFT) {
+				base.dragging.rect.translation.a = clamp( cursor.x.magnitude(), x_length - side_max, x_length - side_min )
+			}
+			if (base.resizing & RIGHT) {
+				base.dragging.rect.translation.a = clamp( cursor.x.magnitude(), side_min - x_length, side_max - x_length )
+			}
+			if (base.resizing & FRONT) {
+				base.dragging.rect.translation.b = clamp( cursor.y.magnitude(), y_length - side_max, y_length - side_min )
+			}
+			if (base.resizing & BACK) {
+				base.dragging.rect.translation.b = clamp( cursor.y.magnitude(), side_min - y_length, side_max - y_length )
+			}
+		}
+		else 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)
+
+		if (base.creating) {
+			if (cursor.height() > side_min && cursor.width() > side_min) {
+				cursor.x.abs().quantize(1)
+				cursor.y.abs().quantize(1)
+				Rooms.add_with_rect( cursor )
+			}
+		}
+		
+		if (base.resizing) {
+			base.dragging.rect.resize()
+		}
+		else if (base.dragging) {
+			base.dragging.rect.translate()
+		}
+
+		base.creating = base.dragging = base.resizing = false
+	}
+
+	function mousewheel (e, val, delta){
+		var cursor = base.mouse.cursor
+
+		var intersects = Rooms.filter(function(r){
+			return r.focused = r.rect.contains(cursor.x.a, cursor.y.a)
+		})
+		
+		if (intersects.length) {
+			intersects[0].height = clamp( ~~(intersects[0].height - delta), height_min, height_max )
+			Rooms.clipper.update()
+		}
+		else {
+			map.set_zoom(map.zoom_exponent - delta/20)
+		}
+	}
+	
+	function rightclick (e){
+	}
+}
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index d4969c1..bcd4909 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -29,6 +29,15 @@ var EditorView = View.extend({
 	
 	ready: function(data){
 		$("#map").hide()
+		
+		minimap = new Map ({
+			type: "minimap",
+			el: document.querySelector("#minimap .el"),
+			width: 130,
+			height: 130,
+			zoom: -4
+		})
+		
 		this.settings.load(data)
 	},
 	
@@ -37,6 +46,5 @@ var EditorView = View.extend({
 		this.ready(data)
 	}
 
-
 })
 
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index cb56a68..684682c 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -978,7 +978,7 @@ h5 {
 	left: 20px;
 	color: black;
 	cursor:pointer;
-	background:black;
+	background:white;
 	-webkit-transform: translateY(0px);
   transform: translateY(0px);
 }