Nurtak
diff --git a/‎src/ch/hsr/ogv/controller/ObjectGraph.java‎
Lines changed: 7 additions & 17 deletions b/‎src/ch/hsr/ogv/controller/ObjectGraph.java‎
Lines changed: 7 additions & 17 deletions
@@ -197,7 +197,7 @@ private PaneBox createArrayBox(ModelObject modelObject, ModelClass modelClass, R
 		else {
 			newPosition = new Point3D(newPosition.getX() + (ARRAYBOX_LEVEL_DIFF * 2) + (modelObject.getWidth() / 2), modelObject.getY(), newPosition.getZ());
 		}
-		while (hasArrayBoxAtPos(newPosition)) {
+		while (hasBoxApproxAtPos(newPosition)) {
 			newPosition = new Point3D(newPosition.getX(), newPosition.getY() + ARRAYBOX_LEVEL_DIFF, newPosition.getZ());
 		}
 		paneBox.setTranslateXYZ(newPosition);
@@ -234,24 +234,14 @@ private void createArrayBoxArrows(PaneBox arrayBox, Endpoint endpoint, ObjectGra
 			}
 		}
 	}
-
-	public boolean hasArrayBoxAtPos(Point3D coords) {
-		for (PaneBox paneBox : this.boxes) {
-			boolean approxEqualX = Math.floor(paneBox.getCenterPoint().getX()) == Math.floor(coords.getX());
-			boolean approxEqualY = Math.floor(paneBox.getCenterPoint().getY() + paneBox.getDepth() / 2) == Math.floor(coords.getY());
-			boolean approxEqualZ = Math.floor(paneBox.getCenterPoint().getZ()) == Math.floor(coords.getZ());
-			if (approxEqualX && approxEqualY && approxEqualZ) {
-				return true;
-			}
-		}
-		return false;
-	}
 
-	public boolean hasArrayBoxAtYZ(Point3D coords) {
+	public boolean hasBoxApproxAtPos(Point3D coords) {
+		double approxRange = 50;
 		for (PaneBox paneBox : this.boxes) {
-			boolean approxEqualY = Math.floor(paneBox.getCenterPoint().getY() + paneBox.getDepth() / 2) == Math.floor(coords.getY());
-			boolean approxEqualZ = Math.floor(paneBox.getCenterPoint().getZ()) == Math.floor(coords.getZ());
-			if (approxEqualY && approxEqualZ) {
+			boolean approxEqualX = Math.abs(paneBox.getCenterPoint().getX() - coords.getX()) < approxRange;
+			boolean approxEqualY = Math.abs((paneBox.getCenterPoint().getY() + paneBox.getDepth() / 2) - coords.getY()) < approxRange;
+			boolean approxEqualZ = Math.abs(paneBox.getCenterPoint().getZ() - coords.getZ()) < approxRange;
+			if (approxEqualX && approxEqualY && approxEqualZ) {
 				return true;
 			}
 		}
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ private PaneBox createArrayBox(ModelObject modelObject, ModelClass modelClass, R`
`197`	`197`	`else {`
`198`	`198`	`newPosition = new Point3D(newPosition.getX() + (ARRAYBOX_LEVEL_DIFF * 2) + (modelObject.getWidth() / 2), modelObject.getY(), newPosition.getZ());`
`199`	`199`	`}`
`200`		`- while (hasArrayBoxAtPos(newPosition)) {`
	`200`	`+ while (hasBoxApproxAtPos(newPosition)) {`
`201`	`201`	`newPosition = new Point3D(newPosition.getX(), newPosition.getY() + ARRAYBOX_LEVEL_DIFF, newPosition.getZ());`
`202`	`202`	`}`
`203`	`203`	`paneBox.setTranslateXYZ(newPosition);`
`@@ -234,24 +234,14 @@ private void createArrayBoxArrows(PaneBox arrayBox, Endpoint endpoint, ObjectGra`
`234`	`234`	`}`
`235`	`235`	`}`
`236`	`236`	`}`
`237`		`-`
`238`		`- public boolean hasArrayBoxAtPos(Point3D coords) {`
`239`		`- for (PaneBox paneBox : this.boxes) {`
`240`		`- boolean approxEqualX = Math.floor(paneBox.getCenterPoint().getX()) == Math.floor(coords.getX());`
`241`		`- boolean approxEqualY = Math.floor(paneBox.getCenterPoint().getY() + paneBox.getDepth() / 2) == Math.floor(coords.getY());`
`242`		`- boolean approxEqualZ = Math.floor(paneBox.getCenterPoint().getZ()) == Math.floor(coords.getZ());`
`243`		`- if (approxEqualX && approxEqualY && approxEqualZ) {`
`244`		`- return true;`
`245`		`- }`
`246`		`- }`
`247`		`- return false;`
`248`		`- }`
`249`	`237`
`250`		`- public boolean hasArrayBoxAtYZ(Point3D coords) {`
	`238`	`+ public boolean hasBoxApproxAtPos(Point3D coords) {`
	`239`	`+ double approxRange = 50;`
`251`	`240`	`for (PaneBox paneBox : this.boxes) {`
`252`		`- boolean approxEqualY = Math.floor(paneBox.getCenterPoint().getY() + paneBox.getDepth() / 2) == Math.floor(coords.getY());`
`253`		`- boolean approxEqualZ = Math.floor(paneBox.getCenterPoint().getZ()) == Math.floor(coords.getZ());`
`254`		`- if (approxEqualY && approxEqualZ) {`
	`241`	`+ boolean approxEqualX = Math.abs(paneBox.getCenterPoint().getX() - coords.getX()) < approxRange;`
	`242`	`+ boolean approxEqualY = Math.abs((paneBox.getCenterPoint().getY() + paneBox.getDepth() / 2) - coords.getY()) < approxRange;`
	`243`	`+ boolean approxEqualZ = Math.abs(paneBox.getCenterPoint().getZ() - coords.getZ()) < approxRange;`
	`244`	`+ if (approxEqualX && approxEqualY && approxEqualZ) {`
`255`	`245`	`return true;`
`256`	`246`	`}`
`257`	`247`	`}`