entity map layer sorting improved, sort reason debug info

flypup · Mar 23, 2013 · 6aba71a · 6aba71a
1 parent 78eaa2f
commit 6aba71a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/app/scripts/models/Entity.js b/app/scripts/models/Entity.js
@@ -51,6 +51,7 @@
 				layerName: '',
 				// debug
 				label: null,
+				sortReason: null,
 				// character specific
 				input: null,
 				climbHeight: 128.0,

diff --git a/app/scripts/models/MapElement.js b/app/scripts/models/MapElement.js
@@ -101,17 +101,30 @@
 
 			// -- CHECK IF ENTITY IS IN FRONT --
 			var mapBounds = this.getSortBounds();
+			var entityBounds = entity.getSortBounds();
 
 			// Entity is above Element
 			if (entity.z >= mapBounds.top) {
-				return true;
+				// Entity is not behind Element
+				if (entityBounds.front > mapBounds.back) {
+					if (ec.debug > 0) {
+						entity.sortReason = 'above '+this.name;
+					}
+					return true;
+				}
+				return false;
 			}
 
-			var entityBounds = entity.getSortBounds();
-
 			// Entity is in front of Element
 			if (entityBounds.back > mapBounds.front) {
-				return true;
+				// Entity is not under Element
+				if (entityBounds.top > this.z) {
+					if (ec.debug > 0) {
+						entity.sortReason = 'before '+this.name;
+					}
+					return true;
+				}
+				return false;
 			}
 
 			// -- CHECK IF ENTITY IS BEHIND --
@@ -159,6 +172,9 @@
 					if (distance > 0) { // Entity is outside Element shape
 						// Entity is in front of edge
 						if (direction > 0) {
+							if (ec.debug > 0) {
+								entity.sortReason = 'edge '+this.name;
+							}
 							return true;
 						}
 					} else { // Entity is inside Element shape
@@ -169,6 +185,9 @@
 				case 'oval':
 					// Entity is in front of Element
 					if ((entityBounds.front + entityBounds.back)/2 > (mapBounds.front + mapBounds.back)/2) {
+						if (ec.debug > 0) {
+							entity.sortReason = 'center '+this.name;
+						}
 						return true;
 					}
 					break;

diff --git a/app/scripts/views/Canvas2dEntityView.js b/app/scripts/views/Canvas2dEntityView.js
@@ -149,10 +149,11 @@
 			var fieldHeight = 48;
 			entity.label = entity.label || ec.Entity.getLabel(context, fieldHeight);
 			entity.label.setPos(x-16, y-((o&&o.regY+fieldHeight)||0));
-			var info = ''+ entity.layerNum +': '+ entity.layerName +' z: '+ entity.z.toFixed(1);
+			var info = ''+ entity.layerNum +': '+ entity.layerName +', '+ entity.sortReason;
 			if (entity.mapCollision.length) {
 				info += '\r' + ec.objectToProps(entity.mapCollision, 'name').join(',');
 			}
+			info += '\rz: '+ entity.z.toFixed(1);
 			if (entity.input) {
 				var goal = entity.input.goal;
 				if (goal) {