]> git.lizzy.rs Git - BoundingBoxOutlineReloaded.git/blobdiff - src/main/java/com/irtimaled/bbor/client/ClientRenderer.java
General performance improvements and serverside fixes
[BoundingBoxOutlineReloaded.git] / src / main / java / com / irtimaled / bbor / client / ClientRenderer.java
index 62ea07c8650fbcae85306b78e7c56886f5d5b56e..554dcdc064f97d3ed2739751cb1e58d4494d19f7 100644 (file)
@@ -1,24 +1,54 @@
 package com.irtimaled.bbor.client;
 
 import com.irtimaled.bbor.client.interop.ClientInterop;
-import com.irtimaled.bbor.client.providers.*;
-import com.irtimaled.bbor.client.renderers.*;
+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.RenderHelper;
+import com.irtimaled.bbor.client.renderers.RenderQueue;
 import com.irtimaled.bbor.common.MathHelper;
-import com.irtimaled.bbor.common.models.*;
-import com.irtimaled.bbor.config.ConfigManager;
-import org.lwjgl.opengl.GL11;
-
-import java.util.HashMap;
+import com.irtimaled.bbor.common.TypeHelper;
+import com.irtimaled.bbor.common.models.AbstractBoundingBox;
+import com.irtimaled.bbor.common.models.DimensionId;
+import it.unimi.dsi.fastutil.objects.Object2ObjectMaps;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.util.math.MatrixStack;
+
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashSet;
+import java.util.LinkedList;
+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 Set<IBoundingBoxProvider> providers = new HashSet<>();
+    private static final Set<IBoundingBoxProvider> providers = new HashSet<>();
+
+    private static AtomicLong lastDurationNanos = new AtomicLong(0L);
 
     public static boolean getActive() {
         return active;
@@ -36,29 +66,37 @@ public class ClientRenderer {
     }
 
     static {
-        registerRenderer(BoundingBoxVillage.class, new VillageRenderer());
-        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 CuboidRenderer());
-        registerRenderer(BoundingBoxBiomeBorder.class, new BiomeBorderRenderer());
-
-        registerProvider(new SlimeChunkProvider());
-        registerProvider(new WorldSpawnProvider());
-        registerProvider(new SpawningSphereProvider());
-        registerProvider(new BeaconProvider());
-        registerProvider(new CustomBoxProvider());
-        registerProvider(new BiomeBorderProvider());
+        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
+            registerProvider(new SlimeChunkProvider());
+            registerProvider(new WorldSpawnProvider());
+            registerProvider(new SpawningSphereProvider());
+            registerProvider(new BeaconProvider());
+            registerProvider(new CustomBoxProvider());
+            registerProvider(new CustomBeaconProvider());
+            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) {
         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) {
@@ -71,41 +109,53 @@ public class ClientRenderer {
         return boundingBox.intersectsBounds(minX, minZ, maxX, maxZ);
     }
 
-    public static void render(int dimensionId) {
-        if(!active) return;
-
-        Set<AbstractBoundingBox> boundingBoxes = getBoundingBoxes(dimensionId);
+    public static void render(MatrixStack matrixStack, DimensionId dimensionId) {
+        if (!active) return;
 
-        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);
+        long startTime = System.nanoTime();
+        matrixStack.push();
+        RenderHelper.beforeRender();
 
-        if (ConfigManager.alwaysVisible.get()) {
-            GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT);
+        for (AbstractBoundingBox key : getBoundingBoxes(dimensionId)) {
+            AbstractRenderer renderer = key.getRenderer();
+            if (renderer != null) renderer.render(matrixStack, key);
         }
 
-        for (AbstractBoundingBox key : boundingBoxes) {
-            if (!key.shouldRender() || !isWithinRenderDistance(key)) continue;
+        RenderQueue.renderDeferred();
 
-            AbstractRenderer renderer = boundingBoxRendererMap.get(key.getClass());
-            if (renderer == null) continue;
+        RenderHelper.afterRender();
+        matrixStack.pop();
+        lastDurationNanos.set(System.nanoTime() - startTime);
+    }
 
-            renderer.render(key);
+    public static List<AbstractBoundingBox> getBoundingBoxes(DimensionId dimensionId) {
+        List<AbstractBoundingBox> tmp = new LinkedList<>();
+        for (IBoundingBoxProvider<?> provider : providers) {
+            if (provider.canProvide(dimensionId)) {
+                for (AbstractBoundingBox boundingBox : provider.get(dimensionId)) {
+                    if (boundingBox.isVisibleCulling() && isWithinRenderDistance(boundingBox)) {
+                        tmp.add(boundingBox);
+                    }
+                }
+            }
         }
 
-        GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL);
-        GL11.glEnable(GL11.GL_CULL_FACE);
-        GL11.glEnable(GL11.GL_TEXTURE_2D);
+        Point point = Player.getPoint();
+        final ArrayList<AbstractBoundingBox> result = new ArrayList<>(tmp);
+        result.sort(Comparator.comparingDouble((AbstractBoundingBox boundingBox) -> boundingBox.getDistance(point.getX(), point.getY(), point.getZ())).reversed());
+
+        return result;
     }
 
-    private static Set<AbstractBoundingBox> getBoundingBoxes(int dimensionId) {
-        Set<AbstractBoundingBox> boundingBoxes = new HashSet<>();
-        for(IBoundingBoxProvider<?> provider: providers) {
-            for (AbstractBoundingBox boundingBox : provider.get(dimensionId)) {
-                boundingBoxes.add(boundingBox);
-            }
+    public static void clear() {
+        for(IBoundingBoxProvider<?> provider : providers) {
+            TypeHelper.doIfType(provider, ICachingProvider.class, ICachingProvider::clearCache);
         }
-        return boundingBoxes;
     }
+
+    public static long getLastDurationNanos() {
+        return lastDurationNanos.get();
+    }
+
+
 }