Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2025-01-12 10:50:37 +01:00
Code Issues Projects Releases Wiki Activity

Fix polygon test

Browse Source
This commit is contained in:
Mike Primm 2020-05-25 16:35:28 -05:00
parent 5e15187e46
commit 7c021d32c9
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DynmapCore/src/main/java/org/dynmap/markers/impl/AreaMarkerImpl.java
View File

@ -46,6 +46,9 @@ class AreaMarkerImpl implements AreaMarker, EnterExitMarker {
Coord(double x, double z) { Coord(double x, double z) {
this.x = x; this.z = z; this.x = x; this.z = z;
} }
public String toString() {
return String.format("{%f,%f}", x, z);
}
} }
private static class BoundingBox { private static class BoundingBox {
double xmin, xmax; double xmin, xmax;
@ -614,7 +617,6 @@ class AreaMarkerImpl implements AreaMarker, EnterExitMarker {
} }
// Test if inside polygon // Test if inside polygon
int nvert = corners.size(); int nvert = corners.size();
int i, j;
Coord v0, v1; Coord v0, v1;
boolean c = false; boolean c = false;
if (nvert == 2) { // Diagonal corners (simple rectangle if (nvert == 2) { // Diagonal corners (simple rectangle
@ -626,12 +628,11 @@ class AreaMarkerImpl implements AreaMarker, EnterExitMarker {
} }
} }
else { else {
for (i = 0, j = nvert-1; i < nvert; j = i++) { for (int i = 0, j = nvert-1; i < nvert; j = i, i++) {
v0 = corners.get(i); v0 = corners.get(i);
v1 = corners.get(j); v1 = corners.get(j);
if (((v0.z > z) != (v1.z > z)) && if (((v0.z > z) != (v1.z > z)) &&
(((x - v0.x) * (v1.z - v0.z)) < (x < (v0.x + ((v1.x-v0.x)*(z-v0.z)/(v1.z-v0.z))))) {
((v1.x - v0.x) * (z - v0.z)))) {
c = !c; c = !c;
} }
} }