From 1644012dfefc2118b82da3e4f4e1ddab1f2db66b Mon Sep 17 00:00:00 2001
From: Evert Prants <imsonotsleepy@gmail.com>
Date: Mon, 20 Aug 2018 18:40:25 +0300
Subject: [PATCH] Simple intersection testing

---
 dist/dwelibs.min.js |  2 +-
 src/math.js         | 56 ++++++++++++++++++++++++++++++++++++++++++---
 src/tiled.js        | 23 ++++++++++++++++---
 3 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/dist/dwelibs.min.js b/dist/dwelibs.min.js
index d0a31f1..1bd3aba 100644
--- a/dist/dwelibs.min.js
+++ b/dist/dwelibs.min.js
@@ -1 +1 @@
-!function(t){var e={};function n(i){if(e[i])return e[i].exports;var r=e[i]={i:i,l:!1,exports:{}};return t[i].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=t,n.c=e,n.d=function(t,e,i){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:i})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var i=Object.create(null);if(n.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)n.d(i,r,function(e){return t[e]}.bind(null,r));return i},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=0)}([function(t,e,n){"use strict";window.DWE={};n(1),n(2),n(3),n(4),n(5),n(6),n(7)},function(t,e,n){"use strict";DWE.context=function(t){return t.star=function(e,n,i,r,o){var a=Math.PI/2*3,s=e,u=n,h=Math.PI/i;t.beginPath(),t.moveTo(e,n-r);for(var l=0;l<i;l++)s=e+Math.cos(a)*r,u=n+Math.sin(a)*r,t.lineTo(s,u),a+=h,s=e+Math.cos(a)*o,u=n+Math.sin(a)*o,t.lineTo(s,u),a+=h;t.lineTo(e,n-r),t.closePath()},t.fillStar=function(e,n,i,r,o){t.star(e,n,i,r,o),t.fill()},t.circle=function(e,n,i,r){r||(r=0),t.beginPath(),t.arc(e,n,i,r,2*Math.PI,!0),t.closePath()},t.fillCircle=function(e,n,i,r){t.circle(e,n,i,r),t.fill()},t}},function(t,e,n){"use strict";var i=function(){function t(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}return function(e,n,i){return n&&t(e.prototype,n),i&&t(e,i),e}}();function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}DWE.Math={},DWE.Math.random=function(t,e){return Math.floor(Math.random()*e)+t},DWE.Math.lerp=function(t,e,n){return(1-n)*t+n*e},DWE.Math.reverseLerp=function(t,e,n){return 1/((e-t)*n)},DWE.Math.intersectsBox=function(t,e,n,i,r,o,a,s){return 2*Math.abs(t-r)<=n+a&&2*Math.abs(e-o)<=i+s},DWE.Math.intersects2Box=function(t,e){return 2*Math.abs(t.x-e.x)<=t.width+e.width&&2*Math.abs(t.y-e.y)<=t.height+e.height},DWE.Math.clamp=function(t,e,n){return Math.max(e,Math.min(n,t))},DWE.Math.Vector2=function(){function t(e,n){r(this,t),this.x=e,this.y=n}return i(t,[{key:"normalize",value:function(){var t=this.magnitude;this.x/=t,this.y/=t}},{key:"distance",value:function(t){if(!(t instanceof DWE.Math.Vector2))throw new Error("Distance function takes another Vector2 as an argument.");return Math.abs(Math.sqrt(Math.pow(t.x-this.x,2)+Math.pow(t.y-this.y,2)))}},{key:"magnitude",get:function(){return Math.abs(Math.sqrt(this.x*this.x+this.y*this.y))}}]),t}(),DWE.Math.Box2=function(){function t(e,n,i,o){r(this,t),this.x=e,this.y=n,this.width=i,this.height=o}return i(t,[{key:"intersectsBox",value:function(t){if(!(t instanceof DWE.Math.Box2))throw new Error("Intersection function takes another Box2 as an argument.");return DWE.Math.intersects2Box(this,t)}},{key:"intersectsCircle",value:function(t){if(!(t instanceof DWE.Math.Circle))throw new Error("Intersection function takes another Circle as an argument.");var e=new DWE.Math.Vector2(Math.abs(t.x-this.x),Math.abs(t.y-this.y));return!(e.x>this.width/2+t.r)&&(!(e.y>this.height/2+t.r)&&(e.x<=this.width/2||(e.y<=this.height/2||Math.pow(e.x-this.width/2,2)+Math.pow(e.y-this.height/2,2)<=Math.pow(t.r,2))))}}]),t}(),DWE.Math.Circle=function(){function t(e,n,i){r(this,t),this.x=e,this.y=n,this.r=i}return i(t,[{key:"radius",get:function(){return this.r}}]),t}()},function(t,e,n){"use strict";DWE.getMousePosition=function(t,e){var n=void 0,i=void 0;if(t.changedTouches){var r=t.changedTouches[0];r&&(t.pageX=r.pageX,t.pageY=r.pageY)}return t.pageX||t.pageY?(n=t.pageX,i=t.pageY):(n=t.clientX+document.body.scrollLeft+document.documentElement.scrollLeft,i=t.clientY+document.body.scrollTop+document.documentElement.scrollTop),n-=e.offsetLeft,i-=e.offsetTop,new DWE.Math.Vector2(n,i)}},function(t,e,n){"use strict";DWE.Keyboard={};var i={},r={},o={backspace:8,tab:9,enter:13,shift:16,ctrl:17,alt:18,pausebreak:19,capslock:20,escape:27,pgup:33,pgdown:34,end:35,home:36,left:37,up:38,right:39,down:40,insert:45,delete:46,"left-window":91,"right-window":92,select:93,numpad0:96,numpad1:97,numpad2:98,numpad3:99,numpad4:100,numpad5:101,numpad6:102,numpad7:103,numpad8:104,numpad9:105,multiply:106,add:107,subtract:109,decimal:110,divide:111,f1:112,f2:113,f3:114,f4:115,f5:116,f6:117,f7:118,f8:119,f9:120,f10:121,f11:122,f12:123,numlock:144,scrolllock:145,"semi-colon":186,equals:187,comma:188,dash:189,period:190,fwdslash:191,grave:192,"open-bracket":219,bkslash:220,"close-braket":221,"single-quote":222};function a(t){return null!=i[t]&&i[t]}function s(t){return null!=r[t]&&r[t]}DWE.Keyboard.toggleKey=function(t,e){var n=null;for(var r in o){if(t===o[r]){n=r;break}}n||(n=String.fromCharCode(t).toLowerCase()),i[n]=!0===e},DWE.Keyboard.keyDown=function(t){var e;window.event?e=window.event.keyCode:t&&(e=t.which),DWE.Keyboard.toggleKey(e,!0)},DWE.Keyboard.keyUp=function(t){var e;window.event?e=window.event.keyCode:t&&(e=t.which),DWE.Keyboard.toggleKey(e,!1)},DWE.Keyboard.isDown=function(t){return a(t)&&s(t)},DWE.Keyboard.isUp=function(t){return!DWE.Keyboard.isDown(t)},DWE.Keyboard.isPressed=function(t){return!0===a(t)&&!1===s(t)},DWE.Keyboard.nextIteration=function(){for(var t in r={},i)!0===i[t]&&(r[t]=!0)}},function(t,e,n){"use strict";var i=function(){function t(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}return function(e,n,i){return n&&t(e.prototype,n),i&&t(e,i),e}}();DWE.Image={},DWE.Image.Image=function(t){var e=this;this.src=t,this.img=new Image,this.img.src=this.src,this.width=0,this.height=0,this.loaded=!1,this.errored=!1,this.img.onload=function(){e.loaded=!0,e.width=e.img.width,e.height=e.img.height,e.onload&&e.onload.apply(e,[])},this.img.onerror=function(t){e.loaded=!1,e.errored=!0,e.onerror&&e.onerror.apply(e,[t])}},DWE.Image.TileMap=function(t){function e(t,n,i){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,e);var r=function(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return r.aspectWidth=n,r.aspectHeight=i,r.tiles=[],r}return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}(e,DWE.Image.Image),i(e,[{key:"onload",value:function(){for(var t=0;t<this.height/this.aspectHeight;t++)for(var e=0;e<this.width/this.aspectWidth;e++)this.tiles.push(new DWE.Math.Vector2(e,t));this.onready&&this.onready.call(this,this)}},{key:"draw",value:function(t,e,n,i,r,o){var a=this.tiles[e];a&&t.drawImage(this.img,a.x*this.aspectWidth,a.y*this.aspectHeight,this.aspectWidth,this.aspectHeight,n,i,r,o)}}]),e}(),DWE.Image.loadImageArray=function(t){return new Promise(function(e,n){var i=0,r=t.length,o=[];!function a(s){var u=t[s],h=new DWE.Image.Image(u);h.onload=function(){o.push(h),++i==r?e(o):a(i)},h.onerror=function(t){n(t)}}(i)})}},function(t,e,n){"use strict";DWE.File={},DWE.File.httpGET=function(t){return new Promise(function(e,n){var i=new XMLHttpRequest;i.onreadystatechange=function(){4==i.readyState&&200==i.status?e(i.responseText):4==i.readyState&&i.status>=400&&n(i.responseText)},i.open("GET",t,!0),i.responseType="text",i.send(null)})},DWE.File.loadJson=function(t){return new Promise(function(e,n){DWE.File.httpGET(t).then(function(t){var i;try{i=JSON.parse(t)}catch(t){return n(t)}e(i)},n)})}},function(t,e,n){"use strict";var i=function(){function t(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}return function(e,n,i){return n&&t(e.prototype,n),i&&t(e,i),e}}();DWE.Tiled={},DWE.Tiled.Map=function(){function t(e){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.file=e;var n=e.split("/");this.name=n[n.length-1],this.dir=n.slice(0,-1).join("/"),this.loaded=!1,this.tileMaps=[],this.layers={},this.tileWidth=0,this.tileHeight=0,this.scale=1,this.loadTiledMap()}return i(t,[{key:"done",value:function(){this.onready&&this.onready.apply(this,[this]),this.loaded=!0}},{key:"error",value:function(t){this.onerror?this.onerror.apply(this,[t]):console.error(t),this.loaded=!1}},{key:"loadTiledMap",value:function(){var t=this;DWE.File.loadJson(this.file).then(function(e){if("orthogonal"!==e.orientation||"right-down"!==e.renderorder)return t.error(new Error("Currently, DWE Libs only allows orthogonal orientation and right-down render order."));var n=t;!function t(i){if(i===e.tilesets.length)return function(){var t=e.width,i=e.height;for(var r in e.layers){var o=e.layers[r],a=o.width||t,s=o.height||i,u=[];if("tilelayer"==o.type&&o.visible){for(var h=0;h<a;h++)for(var l=0;l<s;l++){var c=o.data[l*a+h];0!=c&&u.push({x:h,y:l,tile:c})}n.layers[o.name]={tiles:u,x:parseInt(o.x),y:parseInt(o.y)}}}n.width=t,n.height=i,n.tileWidth=e.tilewidth,n.tileHeight=e.tileheight,n.done()}();var r=e.tilesets[i],o=n.dir+"/"+r.source;DWE.File.httpGET(o).then(function(e){var o=(new DOMParser).parseFromString(e,"application/xml").getElementsByTagName("tileset");for(var a in o){var s=o[a];if(s instanceof Element){var u=parseInt(s.getAttribute("tilewidth")),h=parseInt(s.getAttribute("tileheight")),l=s.getElementsByTagName("image")[0];if(l){var c=new DWE.Image.TileMap(n.dir+"/"+l.getAttribute("source"),u,h);c.offset=r.firstgid,c.tileCount=parseInt(s.getAttribute("tilecount")),n.tileMaps.push(c),c.onready=function(){t(i+1)}}}}},function(t){n.error.apply(n,[t])})}(0)},function(t){map.error.apply(map,[t])})}},{key:"drawLayer",value:function(t,e,n,i){if(!this.layers[i])return null;var r=this.layers[i];for(var o in this.tileMaps){var a=this.tileMaps[o];for(var s in r.tiles){var u=r.tiles[s],h=a.tileCount||a.tiles.length;u.tile>=a.offset&&u.tile<=h&&a.draw(t,u.tile-a.offset,u.x*this.tileWidth*this.scale+e.x+r.x+n.x,u.y*this.tileHeight*this.scale+e.y+r.y+n.y,this.tileWidth*this.scale,this.tileHeight*this.scale)}}}},{key:"collideLayer",value:function(t,e){if(!this.layers[e])return null;this.layers[e];return null}},{key:"setScale",value:function(t){this.scale=t}}]),t}()}]);
\ No newline at end of file
+!function(t){var e={};function n(r){if(e[r])return e[r].exports;var i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var i in t)n.d(r,i,function(e){return t[e]}.bind(null,i));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=0)}([function(t,e,n){"use strict";window.DWE={};n(1),n(2),n(3),n(4),n(5),n(6),n(7)},function(t,e,n){"use strict";DWE.context=function(t){return t.star=function(e,n,r,i,o){var a=Math.PI/2*3,s=e,u=n,h=Math.PI/r;t.beginPath(),t.moveTo(e,n-i);for(var c=0;c<r;c++)s=e+Math.cos(a)*i,u=n+Math.sin(a)*i,t.lineTo(s,u),a+=h,s=e+Math.cos(a)*o,u=n+Math.sin(a)*o,t.lineTo(s,u),a+=h;t.lineTo(e,n-i),t.closePath()},t.fillStar=function(e,n,r,i,o){t.star(e,n,r,i,o),t.fill()},t.circle=function(e,n,r,i){i||(i=0),t.beginPath(),t.arc(e,n,r,i,2*Math.PI,!0),t.closePath()},t.fillCircle=function(e,n,r,i){t.circle(e,n,r,i),t.fill()},t}},function(t,e,n){"use strict";var r=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}();function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}DWE.Math={},DWE.Math.random=function(t,e){return Math.floor(Math.random()*e)+t},DWE.Math.lerp=function(t,e,n){return(1-n)*t+n*e},DWE.Math.reverseLerp=function(t,e,n){return 1/((e-t)*n)},DWE.Math.intersectsBox=function(t,e,n,r,i,o,a,s){return 2*Math.abs(t-i)<=n+a&&2*Math.abs(e-o)<=r+s},DWE.Math.intersects2Box=function(t,e){return 2*Math.abs(t.x-e.x)<=t.width+e.width&&2*Math.abs(t.y-e.y)<=t.height+e.height},DWE.Math.clamp=function(t,e,n){return Math.max(e,Math.min(n,t))},DWE.Math.Vector2=function(){function t(e,n){i(this,t),this.x=e,this.y=n}return r(t,[{key:"normalize",value:function(){var t=this.magnitude;return this.x/=t,this.y/=t,this}},{key:"distance",value:function(t){if(!(t instanceof DWE.Math.Vector2))throw new Error("Distance function takes another Vector2 as an argument.");return Math.abs(Math.sqrt(Math.pow(t.x-this.x,2)+Math.pow(t.y-this.y,2)))}},{key:"add",value:function(t){if(!(t instanceof DWE.Math.Vector2))throw new Error("Add function takes another Vector2 as an argument.");return this.x+=t.x,this.y+=t.y,this}},{key:"subtract",value:function(t){if(!(t instanceof DWE.Math.Vector2))throw new Error("Subtract function takes another Vector2 as an argument.");return this.x-=t.x,this.y-=t.y,this}},{key:"multiply",value:function(t){if("number"==typeof t&&!isNaN(t))return this.x*=t,this.y*=t,this;if(!(t instanceof DWE.Math.Vector2))throw new Error("Multiply function takes a Vector2 or Number as an argument.");return this.x*=t.x,this.y*=t.y,this}},{key:"divide",value:function(t){if("number"==typeof t&&!isNaN(t))return this.x/=t,this.y/=t,this;if(!(t instanceof DWE.Math.Vector2))throw new Error("Division function takes a Vector2 or Number as an argument.");return this.x/=t.x,this.y/=t.y,this}},{key:"magnitude",get:function(){return Math.abs(Math.sqrt(this.x*this.x+this.y*this.y))}},{key:"isNormal",get:function(){return 1===Math.floor(this.magnitude)}},{key:"angle",get:function(){return this.isNormal?Math.atan2(this.x,this.y):NaN}}]),t}(),DWE.Math.Box2=function(t){function e(t,n,r,o){i(this,e);var a=function(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return a.width=r,a.height=o,a}return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}(e,DWE.Math.Vector2),r(e,[{key:"intersectsBox",value:function(t){if(!(t instanceof DWE.Math.Box2))throw new Error("Intersection function takes another Box2 as an argument.");return DWE.Math.intersects2Box(this,t)}},{key:"intersectsCircle",value:function(t){if(!(t instanceof DWE.Math.Circle))throw new Error("Intersection function takes another Circle as an argument.");var e=new DWE.Math.Vector2(Math.abs(t.x-this.x),Math.abs(t.y-this.y));return!(e.x>this.width/2+t.r)&&(!(e.y>this.height/2+t.r)&&(e.x<=this.width/2||(e.y<=this.height/2||Math.pow(e.x-this.width/2,2)+Math.pow(e.y-this.height/2,2)<=Math.pow(t.r,2))))}}]),e}(),DWE.Math.Circle=function(){function t(e,n,r){i(this,t),this.x=e,this.y=n,this.r=r}return r(t,[{key:"radius",get:function(){return this.r}}]),t}()},function(t,e,n){"use strict";DWE.getMousePosition=function(t,e){var n=void 0,r=void 0;if(t.changedTouches){var i=t.changedTouches[0];i&&(t.pageX=i.pageX,t.pageY=i.pageY)}return t.pageX||t.pageY?(n=t.pageX,r=t.pageY):(n=t.clientX+document.body.scrollLeft+document.documentElement.scrollLeft,r=t.clientY+document.body.scrollTop+document.documentElement.scrollTop),n-=e.offsetLeft,r-=e.offsetTop,new DWE.Math.Vector2(n,r)}},function(t,e,n){"use strict";DWE.Keyboard={};var r={},i={},o={backspace:8,tab:9,enter:13,shift:16,ctrl:17,alt:18,pausebreak:19,capslock:20,escape:27,pgup:33,pgdown:34,end:35,home:36,left:37,up:38,right:39,down:40,insert:45,delete:46,"left-window":91,"right-window":92,select:93,numpad0:96,numpad1:97,numpad2:98,numpad3:99,numpad4:100,numpad5:101,numpad6:102,numpad7:103,numpad8:104,numpad9:105,multiply:106,add:107,subtract:109,decimal:110,divide:111,f1:112,f2:113,f3:114,f4:115,f5:116,f6:117,f7:118,f8:119,f9:120,f10:121,f11:122,f12:123,numlock:144,scrolllock:145,"semi-colon":186,equals:187,comma:188,dash:189,period:190,fwdslash:191,grave:192,"open-bracket":219,bkslash:220,"close-braket":221,"single-quote":222};function a(t){return null!=r[t]&&r[t]}function s(t){return null!=i[t]&&i[t]}DWE.Keyboard.toggleKey=function(t,e){var n=null;for(var i in o){if(t===o[i]){n=i;break}}n||(n=String.fromCharCode(t).toLowerCase()),r[n]=!0===e},DWE.Keyboard.keyDown=function(t){var e;window.event?e=window.event.keyCode:t&&(e=t.which),DWE.Keyboard.toggleKey(e,!0)},DWE.Keyboard.keyUp=function(t){var e;window.event?e=window.event.keyCode:t&&(e=t.which),DWE.Keyboard.toggleKey(e,!1)},DWE.Keyboard.isDown=function(t){return a(t)&&s(t)},DWE.Keyboard.isUp=function(t){return!DWE.Keyboard.isDown(t)},DWE.Keyboard.isPressed=function(t){return!0===a(t)&&!1===s(t)},DWE.Keyboard.nextIteration=function(){for(var t in i={},r)!0===r[t]&&(i[t]=!0)}},function(t,e,n){"use strict";var r=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}();DWE.Image={},DWE.Image.Image=function(t){var e=this;this.src=t,this.img=new Image,this.img.src=this.src,this.width=0,this.height=0,this.loaded=!1,this.errored=!1,this.img.onload=function(){e.loaded=!0,e.width=e.img.width,e.height=e.img.height,e.onload&&e.onload.apply(e,[])},this.img.onerror=function(t){e.loaded=!1,e.errored=!0,e.onerror&&e.onerror.apply(e,[t])}},DWE.Image.TileMap=function(t){function e(t,n,r){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,e);var i=function(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return i.aspectWidth=n,i.aspectHeight=r,i.tiles=[],i}return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}(e,DWE.Image.Image),r(e,[{key:"onload",value:function(){for(var t=0;t<this.height/this.aspectHeight;t++)for(var e=0;e<this.width/this.aspectWidth;e++)this.tiles.push(new DWE.Math.Vector2(e,t));this.onready&&this.onready.call(this,this)}},{key:"draw",value:function(t,e,n,r,i,o){var a=this.tiles[e];a&&t.drawImage(this.img,a.x*this.aspectWidth,a.y*this.aspectHeight,this.aspectWidth,this.aspectHeight,n,r,i,o)}}]),e}(),DWE.Image.loadImageArray=function(t){return new Promise(function(e,n){var r=0,i=t.length,o=[];!function a(s){var u=t[s],h=new DWE.Image.Image(u);h.onload=function(){o.push(h),++r==i?e(o):a(r)},h.onerror=function(t){n(t)}}(r)})}},function(t,e,n){"use strict";DWE.File={},DWE.File.httpGET=function(t){return new Promise(function(e,n){var r=new XMLHttpRequest;r.onreadystatechange=function(){4==r.readyState&&200==r.status?e(r.responseText):4==r.readyState&&r.status>=400&&n(r.responseText)},r.open("GET",t,!0),r.responseType="text",r.send(null)})},DWE.File.loadJson=function(t){return new Promise(function(e,n){DWE.File.httpGET(t).then(function(t){var r;try{r=JSON.parse(t)}catch(t){return n(t)}e(r)},n)})}},function(t,e,n){"use strict";var r=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}();DWE.Tiled={},DWE.Tiled.Map=function(){function t(e){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.file=e;var n=e.split("/");this.name=n[n.length-1],this.dir=n.slice(0,-1).join("/"),this.loaded=!1,this.tileMaps=[],this.layers={},this.tileWidth=0,this.tileHeight=0,this.scale=1,this.loadTiledMap()}return r(t,[{key:"done",value:function(){this.onready&&this.onready.apply(this,[this]),this.loaded=!0}},{key:"error",value:function(t){this.onerror?this.onerror.apply(this,[t]):console.error(t),this.loaded=!1}},{key:"loadTiledMap",value:function(){var t=this;DWE.File.loadJson(this.file).then(function(e){if("orthogonal"!==e.orientation||"right-down"!==e.renderorder)return t.error(new Error("Currently, DWE Libs only allows orthogonal orientation and right-down render order."));var n=t;!function t(r){if(r===e.tilesets.length)return function(){var t=e.width,r=e.height;for(var i in e.layers){var o=e.layers[i],a=o.width||t,s=o.height||r,u=[];if("tilelayer"==o.type&&o.visible){for(var h=0;h<a;h++)for(var c=0;c<s;c++){var l=o.data[c*a+h];0!=l&&u.push({x:h,y:c,tile:l})}n.layers[o.name]={tiles:u,x:parseInt(o.x),y:parseInt(o.y)}}}n.width=t,n.height=r,n.tileWidth=e.tilewidth,n.tileHeight=e.tileheight,n.done()}();var i=e.tilesets[r],o=n.dir+"/"+i.source;DWE.File.httpGET(o).then(function(e){var o=(new DOMParser).parseFromString(e,"application/xml").getElementsByTagName("tileset");for(var a in o){var s=o[a];if(s instanceof Element){var u=parseInt(s.getAttribute("tilewidth")),h=parseInt(s.getAttribute("tileheight")),c=s.getElementsByTagName("image")[0];if(c){var l=new DWE.Image.TileMap(n.dir+"/"+c.getAttribute("source"),u,h);l.offset=i.firstgid,l.tileCount=parseInt(s.getAttribute("tilecount")),n.tileMaps.push(l),l.onready=function(){t(r+1)}}}}},function(t){n.error.apply(n,[t])})}(0)},function(t){map.error.apply(map,[t])})}},{key:"drawLayer",value:function(t,e,n,r){if(!this.layers[r])return null;var i=this.layers[r];for(var o in this.tileMaps){var a=this.tileMaps[o];for(var s in i.tiles){var u=i.tiles[s],h=a.tileCount||a.tiles.length;u.tile>=a.offset&&u.tile<=h&&a.draw(t,u.tile-a.offset,u.x*this.tileWidth*this.scale+e.x+i.x+n.x,u.y*this.tileHeight*this.scale+e.y+i.y+n.y,this.tileWidth*this.scale,this.tileHeight*this.scale)}}}},{key:"collideLayer",value:function(t,e,n,r,i){if(!this.layers[r])return null;var o=this.layers[r],a=null,s=new DWE.Math.Box2(t.x*this.scale+e.x+o.x-n.x,t.y*this.scale+e.y+o.y-n.y,t.width,t.height);for(var u in o.tiles){var h=o.tiles[u],c=new DWE.Math.Box2(h.x*this.tileWidth*this.scale+e.x+o.x+n.x,h.y*this.tileHeight*this.scale+e.y+o.y+n.y,this.tileWidth,this.tileHeight);c.distance(s)>i||s.intersectsBox(c)&&(a||(a=[]),a.push(c.subtract(s).normalize()))}return a}},{key:"setScale",value:function(t){this.scale=t}}]),t}()}]);
\ No newline at end of file
diff --git a/src/math.js b/src/math.js
index db07d73..f62a57c 100644
--- a/src/math.js
+++ b/src/math.js
@@ -42,20 +42,70 @@ DWE.Math.Vector2 = class {
     var len = this.magnitude
     this.x /= len
     this.y /= len
+
+    return this
+  }
+
+  get isNormal () {
+    return 1 === Math.floor(this.magnitude)
+  }
+
+  get angle () {
+    if (!this.isNormal) return NaN
+    return Math.atan2(this.x, this.y)
   }
 
   distance (vec) {
     if (!(vec instanceof DWE.Math.Vector2)) throw new Error('Distance function takes another Vector2 as an argument.')
     return Math.abs(Math.sqrt(Math.pow(vec.x - this.x, 2) + Math.pow(vec.y - this.y, 2)))
   }
+
+  add (vec) {
+    if (!(vec instanceof DWE.Math.Vector2)) throw new Error('Add function takes another Vector2 as an argument.')
+    this.x += vec.x
+    this.y += vec.y
+    return this
+  }
+
+  subtract (vec) {
+    if (!(vec instanceof DWE.Math.Vector2)) throw new Error('Subtract function takes another Vector2 as an argument.')
+    this.x -= vec.x
+    this.y -= vec.y
+    return this
+  }
+
+  multiply (vec) {
+    if (typeof vec === 'number' && !isNaN(vec)) {
+      this.x *= vec
+      this.y *= vec
+      return this
+    }
+
+    if (!(vec instanceof DWE.Math.Vector2)) throw new Error('Multiply function takes a Vector2 or Number as an argument.')
+    this.x *= vec.x
+    this.y *= vec.y
+    return this
+  }
+
+  divide (vec) {
+    if (typeof vec === 'number' && !isNaN(vec)) {
+      this.x /= vec
+      this.y /= vec
+      return this
+    }
+
+    if (!(vec instanceof DWE.Math.Vector2)) throw new Error('Division function takes a Vector2 or Number as an argument.')
+    this.x /= vec.x
+    this.y /= vec.y
+    return this
+  }
 }
 
 // A box.
 
-DWE.Math.Box2 = class {
+DWE.Math.Box2 = class Box2 extends DWE.Math.Vector2 {
   constructor (x, y, w, h) {
-    this.x = x
-    this.y = y
+    super(x, y)
     this.width = w
     this.height = h
   }
diff --git a/src/tiled.js b/src/tiled.js
index 758c26e..d79b605 100644
--- a/src/tiled.js
+++ b/src/tiled.js
@@ -144,11 +144,28 @@ DWE.Tiled.Map = class {
     }
   }
 
-  collideLayer (object, name) {
+  // object: Object that collides (i.e. a player, monster)
+  // name: Name of the layer (generally "static")
+  // effectiveRange: Range around object where tiles are tested for collisions
+  collideLayer (object, origin, viewport, name, effectiveRange) {
     if (!this.layers[name]) return null
     var layer = this.layers[name]
-    // TODO: Handle object collisions with map tiles
-    return null
+    var collisions = null
+    var posAbs = new DWE.Math.Box2((object.x * this.scale) + origin.x + layer.x - viewport.x,
+        (object.y * this.scale) + origin.y + layer.y - viewport.y, object.width, object.height)
+
+    for (let i in layer.tiles) {
+      let tile = layer.tiles[i]
+      let tilePosAbs = new DWE.Math.Box2((tile.x * this.tileWidth * this.scale) + origin.x + layer.x + viewport.x,
+        (tile.y * this.tileHeight * this.scale) + origin.y + layer.y + viewport.y, this.tileWidth, this.tileHeight)
+      if (tilePosAbs.distance(posAbs) > effectiveRange) continue
+      if (posAbs.intersectsBox(tilePosAbs)) {
+        if (!collisions) collisions = []
+        collisions.push(tilePosAbs.subtract(posAbs).normalize())
+      }
+    }
+
+    return collisions
   }
 
   setScale (scale) {