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.interop.TileEntitiesHelper;
+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.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.RenderHelper;
+import com.irtimaled.bbor.client.renderers.RenderQueue;
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.DimensionId;
-import org.lwjgl.opengl.GL11;
-
-import java.util.HashMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectMaps;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.util.math.MatrixStack;
+
+import java.util.Comparator;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
public class ClientRenderer {
private static final int CHUNK_SIZE = 16;
- private static final Map<Class<? extends AbstractBoundingBox>, AbstractRenderer> boundingBoxRendererMap = new HashMap<>();
+ private static final Map<Class<? extends AbstractBoundingBox>, AbstractRenderer> boundingBoxRendererMap = Object2ObjectMaps.synchronize(new Object2ObjectOpenHashMap<>());
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(BoundingBoxSlimeChunk.class, new SlimeChunkRenderer());
- registerRenderer(BoundingBoxWorldSpawn.class, new WorldSpawnRenderer());
- registerRenderer(BoundingBoxCuboid.class, new CuboidRenderer());
- registerRenderer(BoundingBoxMobSpawner.class, new MobSpawnerRenderer());
- registerRenderer(BoundingBoxSpawningSphere.class, new SpawningSphereRenderer());
- 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());
-
registerProvider(new SlimeChunkProvider());
registerProvider(new WorldSpawnProvider());
registerProvider(new SpawningSphereProvider());
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) {
providers.add(provider);
}
- public static <T extends AbstractBoundingBox> void registerRenderer(Class<? extends T> type, AbstractRenderer<T> renderer) {
- boundingBoxRendererMap.put(type, renderer);
+ public static <T extends AbstractBoundingBox> AbstractRenderer<T> registerRenderer(Class<? extends T> type, Supplier<AbstractRenderer<T>> renderer) {
+ if (FabricLoader.getInstance().getEnvironmentType() != EnvType.CLIENT) return null;
+ final AbstractRenderer<T> renderer1 = renderer.get();
+ boundingBoxRendererMap.put(type, renderer1);
+ return renderer1;
+ }
+
+ public static AbstractRenderer getRenderer(Class<? extends AbstractBoundingBox> clazz) {
+ return boundingBoxRendererMap.get(clazz);
}
private static boolean isWithinRenderDistance(AbstractBoundingBox boundingBox) {
return boundingBox.intersectsBounds(minX, minZ, maxX, maxZ);
}
- public static void render(DimensionId 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);
- GL11.glEnable(GL11.GL_DEPTH_TEST);
-
- if (ConfigManager.alwaysVisible.get()) {
- GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT);
- }
+ long startTime = System.nanoTime();
+ matrixStack.push();
+ RenderHelper.beforeRender();
+ TileEntitiesHelper.clearCache();
+ final List<AbstractBoundingBox> boundingBoxes = getBoundingBoxes(dimensionId);
+ RenderCulling.flushPreRendering();
for (AbstractBoundingBox key : boundingBoxes) {
- AbstractRenderer renderer = boundingBoxRendererMap.get(key.getClass());
- if (renderer == null) continue;
-
- renderer.render(key);
+ AbstractRenderer renderer = key.getRenderer();
+ if (renderer != null) renderer.render(matrixStack, key);
}
- GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL);
- GL11.glEnable(GL11.GL_CULL_FACE);
- GL11.glEnable(GL11.GL_TEXTURE_2D);
+ RenderQueue.renderDeferred();
+
+ RenderHelper.afterRender();
+ RenderCulling.flushRendering();
+ matrixStack.pop();
+ lastDurationNanos.set(System.nanoTime() - startTime);
}
- private static Set<AbstractBoundingBox> getBoundingBoxes(DimensionId dimensionId) {
- Set<AbstractBoundingBox> boundingBoxes = new HashSet<>();
+ private static final ObjectArrayList<AbstractBoundingBox> listForRendering = new ObjectArrayList<>();
+
+ public static List<AbstractBoundingBox> getBoundingBoxes(DimensionId dimensionId) {
+ listForRendering.clear();
+ final boolean doPreCulling = ConfigManager.fastRender.get() >= 2;
for (IBoundingBoxProvider<?> provider : providers) {
if (provider.canProvide(dimensionId)) {
for (AbstractBoundingBox boundingBox : provider.get(dimensionId)) {
if (isWithinRenderDistance(boundingBox)) {
- boundingBoxes.add(boundingBox);
+ if (doPreCulling && !boundingBox.isVisibleCulling()) continue;
+ listForRendering.add(boundingBox);
}
}
}
}
- return boundingBoxes;
+
+ Point point = Player.getPoint();
+ listForRendering.sort(Comparator.comparingDouble((AbstractBoundingBox boundingBox) -> boundingBox.getDistance(point.getX(), point.getY(), point.getZ())).reversed());
+
+ return listForRendering;
+ }
+
+ 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