mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-09 01:06:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Performance Improvements

Browse Source
This commit is contained in:
Daniel Mills
2021-07-29 04:24:28 -04:00
parent 2f8fe43ea3
commit dc851d856d
6 changed files with 12 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java
View File

@@ -42,15 +42,15 @@ public class PlannedStructure {
private IrisJigsawStructure structure;
private IrisPosition position;
private IrisDataManager data;
private RNG rng;
private boolean verbose;
private boolean terminating;
private static transient ConcurrentLinkedHashMap<String, IrisObject> objectRotationCache
= new ConcurrentLinkedHashMap.Builder<String, IrisObject>()
.initialCapacity(64)
.maximumWeightedCapacity(1024)
.concurrencyLevel(32)
.build();
private RNG rng;
private boolean verbose;
private boolean terminating;
public PlannedStructure(IrisJigsawStructure structure, IrisPosition position, RNG rng) {
terminating = false;
@@ -286,17 +286,9 @@ public class PlannedStructure {
IrisPosition shift = test.getWorldPosition(testConnector);
test.setPosition(desiredPosition.sub(shift));
KList<PlannedPiece> collision = collidesWith(test);
if (pieceConnector.isInnerConnector() && collision.isNotEmpty()) {
for (PlannedPiece i : collision) {
if (i.equals(piece)) {
continue;
}
return false;
}
} else if (collision.isNotEmpty()) {
if(collidesWith(test, piece))
{
return false;
}
@@ -359,17 +351,6 @@ public class PlannedStructure {
return v;
}
public KList<PlannedPiece> collidesWith(PlannedPiece piece) {
KList<PlannedPiece> v = new KList<>();
for (PlannedPiece i : pieces) {
if (i.collidesWith(piece)) {
v.add(i);
}
}
return v;
}
public boolean collidesWith(PlannedPiece piece, PlannedPiece ignore) {
for (PlannedPiece i : pieces) {
if (i.equals(ignore)) {