package com.irtimaled.bbor.client;
-import com.irtimaled.bbor.client.config.ConfigManager;
import com.irtimaled.bbor.client.interop.ClientInterop;
-import com.irtimaled.bbor.client.models.*;
-import com.irtimaled.bbor.client.providers.*;
-import com.irtimaled.bbor.client.renderers.*;
+import com.irtimaled.bbor.client.models.BoundingBoxBeacon;
+import com.irtimaled.bbor.client.models.BoundingBoxBedrockCeiling;
+import com.irtimaled.bbor.client.models.BoundingBoxBiomeBorder;
+import com.irtimaled.bbor.client.models.BoundingBoxConduit;
+import com.irtimaled.bbor.client.models.BoundingBoxFlowerForest;
+import com.irtimaled.bbor.client.models.BoundingBoxLine;
+import com.irtimaled.bbor.client.models.BoundingBoxMobSpawner;
+import com.irtimaled.bbor.client.models.BoundingBoxSlimeChunk;
+import com.irtimaled.bbor.client.models.BoundingBoxSpawnableBlocks;
+import com.irtimaled.bbor.client.models.BoundingBoxSpawningSphere;
+import com.irtimaled.bbor.client.models.BoundingBoxSphere;
+import com.irtimaled.bbor.client.models.BoundingBoxWorldSpawn;
+import com.irtimaled.bbor.client.models.Point;
+import com.irtimaled.bbor.client.providers.BeaconProvider;
+import com.irtimaled.bbor.client.providers.BedrockCeilingProvider;
+import com.irtimaled.bbor.client.providers.BiomeBorderProvider;
+import com.irtimaled.bbor.client.providers.ConduitProvider;
+import com.irtimaled.bbor.client.providers.CustomBeaconProvider;
+import com.irtimaled.bbor.client.providers.CustomBoxProvider;
+import com.irtimaled.bbor.client.providers.CustomLineProvider;
+import com.irtimaled.bbor.client.providers.CustomSphereProvider;
+import com.irtimaled.bbor.client.providers.FlowerForestProvider;
+import com.irtimaled.bbor.client.providers.IBoundingBoxProvider;
+import com.irtimaled.bbor.client.providers.ICachingProvider;
+import com.irtimaled.bbor.client.providers.MobSpawnerProvider;
+import com.irtimaled.bbor.client.providers.SlimeChunkProvider;
+import com.irtimaled.bbor.client.providers.SpawnableBlocksProvider;
+import com.irtimaled.bbor.client.providers.SpawningSphereProvider;
+import com.irtimaled.bbor.client.providers.WorldSpawnProvider;
+import com.irtimaled.bbor.client.renderers.AbstractRenderer;
+import com.irtimaled.bbor.client.renderers.BeaconRenderer;
+import com.irtimaled.bbor.client.renderers.BiomeBorderRenderer;
+import com.irtimaled.bbor.client.renderers.ConduitRenderer;
+import com.irtimaled.bbor.client.renderers.CuboidRenderer;
+import com.irtimaled.bbor.client.renderers.FlowerForestRenderer;
+import com.irtimaled.bbor.client.renderers.LineRenderer;
+import com.irtimaled.bbor.client.renderers.MobSpawnerRenderer;
+import com.irtimaled.bbor.client.renderers.RenderHelper;
+import com.irtimaled.bbor.client.renderers.RenderQueue;
+import com.irtimaled.bbor.client.renderers.SlimeChunkRenderer;
+import com.irtimaled.bbor.client.renderers.SpawnableBlocksRenderer;
+import com.irtimaled.bbor.client.renderers.SpawningSphereRenderer;
+import com.irtimaled.bbor.client.renderers.SphereRenderer;
+import com.irtimaled.bbor.client.renderers.WorldSpawnRenderer;
import com.irtimaled.bbor.common.MathHelper;
+import com.irtimaled.bbor.common.TypeHelper;
import com.irtimaled.bbor.common.models.AbstractBoundingBox;
import com.irtimaled.bbor.common.models.BoundingBoxCuboid;
-import com.irtimaled.bbor.common.models.BoundingBoxVillage;
-import org.lwjgl.opengl.GL11;
+import com.irtimaled.bbor.common.models.DimensionId;
+import net.minecraft.client.util.math.MatrixStack;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Stream;
public class ClientRenderer {
private static final int CHUNK_SIZE = 16;
private static boolean active;
private static final Set<IBoundingBoxProvider> providers = new HashSet<>();
+ private static AtomicLong lastDurationNanos = new AtomicLong(0L);
+
public static boolean getActive() {
return active;
}
}
static {
- registerRenderer(BoundingBoxVillage.class, new VillageRenderer());
registerRenderer(BoundingBoxSlimeChunk.class, new SlimeChunkRenderer());
registerRenderer(BoundingBoxWorldSpawn.class, new WorldSpawnRenderer());
registerRenderer(BoundingBoxCuboid.class, new CuboidRenderer());
registerRenderer(BoundingBoxBeacon.class, new BeaconRenderer());
registerRenderer(BoundingBoxBiomeBorder.class, new BiomeBorderRenderer());
registerRenderer(BoundingBoxConduit.class, new ConduitRenderer());
+ registerRenderer(BoundingBoxSpawnableBlocks.class, new SpawnableBlocksRenderer());
+ registerRenderer(BoundingBoxLine.class, new LineRenderer());
+ registerRenderer(BoundingBoxSphere.class, new SphereRenderer());
+ registerRenderer(BoundingBoxFlowerForest.class, new FlowerForestRenderer());
+ registerRenderer(BoundingBoxBedrockCeiling.class, new CuboidRenderer());
registerProvider(new SlimeChunkProvider());
registerProvider(new WorldSpawnProvider());
registerProvider(new BiomeBorderProvider());
registerProvider(new MobSpawnerProvider());
registerProvider(new ConduitProvider());
+ registerProvider(new SpawnableBlocksProvider());
+ registerProvider(new CustomLineProvider());
+ registerProvider(new CustomSphereProvider());
+ registerProvider(new FlowerForestProvider());
+ registerProvider(new BedrockCeilingProvider());
}
public static <T extends AbstractBoundingBox> void registerProvider(IBoundingBoxProvider<T> provider) {
return boundingBox.intersectsBounds(minX, minZ, maxX, maxZ);
}
- public static void render(int dimensionId) {
+ public static void render(MatrixStack matrixStack, DimensionId dimensionId) {
if (!active) return;
- Set<AbstractBoundingBox> boundingBoxes = getBoundingBoxes(dimensionId);
-
- GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
- GL11.glLineWidth(2.0f);
- GL11.glDisable(GL11.GL_TEXTURE_2D);
- GL11.glDisable(GL11.GL_CULL_FACE);
-
- if (ConfigManager.alwaysVisible.get()) {
- GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT);
- }
+ long startTime = System.nanoTime();
+ matrixStack.push();
+ RenderHelper.beforeRender();
- for (AbstractBoundingBox key : boundingBoxes) {
+ getBoundingBoxes(dimensionId).forEach(key -> {
AbstractRenderer renderer = boundingBoxRendererMap.get(key.getClass());
- if (renderer == null) continue;
+ if (renderer != null) renderer.render(matrixStack, key);
+ });
- renderer.render(key);
- }
+ RenderQueue.renderDeferred();
- GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL);
- GL11.glEnable(GL11.GL_CULL_FACE);
- GL11.glEnable(GL11.GL_TEXTURE_2D);
+ RenderHelper.afterRender();
+ matrixStack.pop();
+ lastDurationNanos.set(System.nanoTime() - startTime);
}
- private static Set<AbstractBoundingBox> getBoundingBoxes(int dimensionId) {
- Set<AbstractBoundingBox> boundingBoxes = new HashSet<>();
+ public static Stream<AbstractBoundingBox> getBoundingBoxes(DimensionId dimensionId) {
+ Stream.Builder<AbstractBoundingBox> boundingBoxes = Stream.builder();
for (IBoundingBoxProvider<?> provider : providers) {
if (provider.canProvide(dimensionId)) {
for (AbstractBoundingBox boundingBox : provider.get(dimensionId)) {
if (isWithinRenderDistance(boundingBox)) {
- boundingBoxes.add(boundingBox);
+ boundingBoxes.accept(boundingBox);
}
}
}
}
- return boundingBoxes;
+
+ Point point = Player.getPoint();
+ return boundingBoxes.build()
+ .sorted(Comparator
+ .comparingDouble((AbstractBoundingBox boundingBox) -> boundingBox.getDistance(point.getX(), point.getY(), point.getZ())).reversed());
}
+
+ public static void clear() {
+ for(IBoundingBoxProvider<?> provider : providers) {
+ TypeHelper.doIfType(provider, ICachingProvider.class, ICachingProvider::clearCache);
+ }
+ }
+
+ public static long getLastDurationNanos() {
+ return lastDurationNanos.get();
+ }
+
+
}
projects / BoundingBoxOutlineReloaded.git / blobdiff