Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 17:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

ConvexPolyhedralRegions now preserve the order of their vertices.

Browse Source
This commit is contained in:
TomyLobo 2013-08-05 19:46:39 +02:00 committed by wizjany
parent d7d8930cd4
commit d4a7f7b48a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/sk89q/worldedit/regions/ConvexPolyhedralRegion.java
View File

@ -21,7 +21,6 @@ package com.sk89q.worldedit.regions;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
@ -36,7 +35,7 @@ public class ConvexPolyhedralRegion extends AbstractRegion {
/** /**
* Vertices that are contained in the convex hull. * Vertices that are contained in the convex hull.
*/ */
private final Set<Vector> vertices = new HashSet<Vector>(); private final Set<Vector> vertices = new LinkedHashSet<Vector>();
/** /**
* Triangles that form the convex hull. * Triangles that form the convex hull.
@ -46,7 +45,7 @@ public class ConvexPolyhedralRegion extends AbstractRegion {
/** /**
* Vertices that are coplanar to the first 3 vertices. * Vertices that are coplanar to the first 3 vertices.
*/ */
private final Set<Vector> vertexBacklog = new HashSet<Vector>(); private final Set<Vector> vertexBacklog = new LinkedHashSet<Vector>();
/** /**
* Minimum point of the axis-aligned bounding box. * Minimum point of the axis-aligned bounding box.
@ -195,11 +194,13 @@ public class ConvexPolyhedralRegion extends AbstractRegion {
} }
if (!vertexBacklog.isEmpty()) { if (!vertexBacklog.isEmpty()) {
vertices.remove(vertex);
final List<Vector> vertexBacklog2 = new ArrayList<Vector>(vertexBacklog); final List<Vector> vertexBacklog2 = new ArrayList<Vector>(vertexBacklog);
vertexBacklog.clear(); vertexBacklog.clear();
for (Vector vertex2 : vertexBacklog2) { for (Vector vertex2 : vertexBacklog2) {
addVertex(vertex2); addVertex(vertex2);
} }
vertices.add(vertex);
} }
return true; return true;