mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Multicore smartbore

Browse Source
This commit is contained in:
cyberpwn 2021-09-13 09:14:08 -04:00
parent 40b0a37110
commit ca961e8498
1 changed files with 66 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/com/volmit/iris/engine/object/IrisObject.java
View File

@ -22,12 +22,12 @@ import com.volmit.iris.Iris;
import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisData;
import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.core.loader.IrisRegistrant;
import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.data.cache.AtomicCache;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.placer.HeightmapObjectPlacer; import com.volmit.iris.engine.framework.placer.HeightmapObjectPlacer;
import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.context.IrisContext; import com.volmit.iris.util.context.IrisContext;
import com.volmit.iris.util.data.B; import com.volmit.iris.util.data.B;
import com.volmit.iris.util.format.Form;
import com.volmit.iris.util.interpolation.IrisInterpolation; import com.volmit.iris.util.interpolation.IrisInterpolation;
import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.json.JSONObject;
import com.volmit.iris.util.math.AxisAlignedBB; import com.volmit.iris.util.math.AxisAlignedBB;
@ -35,8 +35,11 @@ import com.volmit.iris.util.math.BlockPosition;
import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.math.Position2;
import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.matter.MatterMarker; import com.volmit.iris.util.matter.MatterMarker;
import com.volmit.iris.util.parallel.BurstExecutor;
import com.volmit.iris.util.parallel.MultiBurst;
import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.plugin.VolmitSender;
import com.volmit.iris.util.scheduling.IrisLock; import com.volmit.iris.util.scheduling.IrisLock;
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@ -65,6 +68,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer; import java.util.function.Consumer;
@SuppressWarnings("DefaultAnnotationParam") @SuppressWarnings("DefaultAnnotationParam")
@ -160,8 +164,10 @@ public class IrisObject extends IrisRegistrant {
return; return;
} }
PrecisionStopwatch p = PrecisionStopwatch.start();
BlockData vair = debug ? VAIR_DEBUG : VAIR;
lock.lock(); lock.lock();
int applied = 0; AtomicInteger applied = new AtomicInteger();
if (getBlocks().isEmpty()) { if (getBlocks().isEmpty()) {
lock.unlock(); lock.unlock();
Iris.warn("Cannot Smart Bore " + getLoadKey() + " because it has 0 blocks in it."); Iris.warn("Cannot Smart Bore " + getLoadKey() + " because it has 0 blocks in it.");
@ -181,14 +187,18 @@ public class IrisObject extends IrisRegistrant {
min.setZ(Math.min(i.getZ(), min.getZ())); min.setZ(Math.min(i.getZ(), min.getZ()));
} }
BurstExecutor burst = MultiBurst.burst.burst();
// Smash X // Smash X
for (int rayY = min.getBlockY(); rayY <= max.getBlockY(); rayY++) { for (int rayY = min.getBlockY(); rayY <= max.getBlockY(); rayY++) {
int finalRayY = rayY;
burst.queue(() -> {
for (int rayZ = min.getBlockZ(); rayZ <= max.getBlockZ(); rayZ++) { for (int rayZ = min.getBlockZ(); rayZ <= max.getBlockZ(); rayZ++) {
int start = Integer.MAX_VALUE; int start = Integer.MAX_VALUE;
int end = Integer.MIN_VALUE; int end = Integer.MIN_VALUE;
for (int ray = min.getBlockX(); ray <= max.getBlockX(); ray++) { for (int ray = min.getBlockX(); ray <= max.getBlockX(); ray++) {
if (getBlocks().containsKey(new BlockVector(ray, rayY, rayZ))) { if (getBlocks().containsKey(new BlockVector(ray, finalRayY, rayZ))) {
start = Math.min(ray, start); start = Math.min(ray, start);
end = Math.max(ray, end); end = Math.max(ray, end);
} }
@ -196,25 +206,28 @@ public class IrisObject extends IrisRegistrant {
if (start != Integer.MAX_VALUE && end != Integer.MIN_VALUE) { if (start != Integer.MAX_VALUE && end != Integer.MIN_VALUE) {
for (int i = start; i <= end; i++) { for (int i = start; i <= end; i++) {
BlockVector v = new BlockVector(i, rayY, rayZ); BlockVector v = new BlockVector(i, finalRayY, rayZ);
if (!getBlocks().containsKey(v) || B.isAir(getBlocks().get(v))) { if (!B.isAir(getBlocks().get(v))) {
getBlocks().put(v, debug ? VAIR_DEBUG : VAIR); getBlocks().computeIfAbsent(v, (vv) -> vair);
applied++; applied.getAndIncrement();
} }
} }
} }
} }
});
} }
// Smash Y // Smash Y
for (int rayX = min.getBlockX(); rayX <= max.getBlockX(); rayX++) { for (int rayX = min.getBlockX(); rayX <= max.getBlockX(); rayX++) {
int finalRayX = rayX;
burst.queue(() -> {
for (int rayZ = min.getBlockZ(); rayZ <= max.getBlockZ(); rayZ++) { for (int rayZ = min.getBlockZ(); rayZ <= max.getBlockZ(); rayZ++) {
int start = Integer.MAX_VALUE; int start = Integer.MAX_VALUE;
int end = Integer.MIN_VALUE; int end = Integer.MIN_VALUE;
for (int ray = min.getBlockY(); ray <= max.getBlockY(); ray++) { for (int ray = min.getBlockY(); ray <= max.getBlockY(); ray++) {
if (getBlocks().containsKey(new BlockVector(rayX, ray, rayZ))) { if (getBlocks().containsKey(new BlockVector(finalRayX, ray, rayZ))) {
start = Math.min(ray, start); start = Math.min(ray, start);
end = Math.max(ray, end); end = Math.max(ray, end);
} }
@ -222,25 +235,28 @@ public class IrisObject extends IrisRegistrant {
if (start != Integer.MAX_VALUE && end != Integer.MIN_VALUE) { if (start != Integer.MAX_VALUE && end != Integer.MIN_VALUE) {
for (int i = start; i <= end; i++) { for (int i = start; i <= end; i++) {
BlockVector v = new BlockVector(rayX, i, rayZ); BlockVector v = new BlockVector(finalRayX, i, rayZ);
if (!getBlocks().containsKey(v) || B.isAir(getBlocks().get(v))) { if (!B.isAir(getBlocks().get(v))) {
getBlocks().put(v, debug ? VAIR_DEBUG : VAIR); getBlocks().computeIfAbsent(v, (vv) -> vair);
applied++; applied.getAndIncrement();
} }
} }
} }
} }
});
} }
// Smash Z // Smash Z
for (int rayX = min.getBlockX(); rayX <= max.getBlockX(); rayX++) { for (int rayX = min.getBlockX(); rayX <= max.getBlockX(); rayX++) {
int finalRayX = rayX;
burst.queue(() -> {
for (int rayY = min.getBlockY(); rayY <= max.getBlockY(); rayY++) { for (int rayY = min.getBlockY(); rayY <= max.getBlockY(); rayY++) {
int start = Integer.MAX_VALUE; int start = Integer.MAX_VALUE;
int end = Integer.MIN_VALUE; int end = Integer.MIN_VALUE;
for (int ray = min.getBlockZ(); ray <= max.getBlockZ(); ray++) { for (int ray = min.getBlockZ(); ray <= max.getBlockZ(); ray++) {
if (getBlocks().containsKey(new BlockVector(rayX, rayY, ray))) { if (getBlocks().containsKey(new BlockVector(finalRayX, rayY, ray))) {
start = Math.min(ray, start); start = Math.min(ray, start);
end = Math.max(ray, end); end = Math.max(ray, end);
} }
@ -248,21 +264,22 @@ public class IrisObject extends IrisRegistrant {
if (start != Integer.MAX_VALUE && end != Integer.MIN_VALUE) { if (start != Integer.MAX_VALUE && end != Integer.MIN_VALUE) {
for (int i = start; i <= end; i++) { for (int i = start; i <= end; i++) {
BlockVector v = new BlockVector(rayX, rayY, i); BlockVector v = new BlockVector(finalRayX, rayY, i);
if (!getBlocks().containsKey(v) || B.isAir(getBlocks().get(v))) { if (!B.isAir(getBlocks().get(v))) {
getBlocks().put(v, debug ? VAIR_DEBUG : VAIR); getBlocks().computeIfAbsent(v, (vv) -> vair);
applied++; applied.getAndIncrement();
} }
} }
} }
} }
});
} }
Iris.verbose("- Applied Smart Bore to " + getLoadKey() + " Filled with " + applied + " VOID_AIR blocks."); burst.complete();
smartBored = true; smartBored = true;
lock.unlock(); lock.unlock();
Iris.debug("Smart Bore: " + getLoadKey() + " in " + Form.duration(p.getMilliseconds(), 2) + " (" + Form.f(applied.get()) + ")");
} }
public synchronized IrisObject copy() { public synchronized IrisObject copy() {