Add old panorama textures + Rework animatium$panoramaStart/animatium$panoramaEnd mixin code

Author: lowercasebtw

src/main/java/org/visuals/legacy/animatium/mixins/v1/gui/MixinPanoramaRenderer_LegacyRendering.java

@@ -27,21 +27,23 @@
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.blaze3d.opengl.GlStateManager;
 import com.mojang.blaze3d.opengl.GlTexture;
 import com.mojang.blaze3d.opengl.GlTextureView;
 import com.mojang.blaze3d.pipeline.RenderPipeline;
 import com.mojang.blaze3d.systems.GpuDevice;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.textures.TextureFormat;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.renderer.CubeMap;
 import net.minecraft.client.renderer.PanoramaRenderer;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.Mth;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.visuals.legacy.animatium.Animatium;
 import org.visuals.legacy.animatium.config.AnimatiumConfig;
 import org.visuals.legacy.animatium.util.PanoramaRendererUtility;
@@ -51,22 +53,37 @@ public abstract class MixinPanoramaRenderer_LegacyRendering {
     @Unique
     private GlTextureView animatium$backgroundTextureView;
 
-    @Inject(method = "render", at = @At("HEAD"))
-    private void animatium$panoramaStart(GuiGraphics guiGraphics, int width, int height, boolean spin, CallbackInfo ci) {
-        if (Animatium.ENABLED && AnimatiumConfig.instance().screen.panoramaRendering) {
+    @Unique
+    private float animatium$spin = 0.0F;
+
+    @WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/CubeMap;render(Lnet/minecraft/client/Minecraft;FF)V", ordinal = 0))
+    private void animatium$panoramaRendering(
+            CubeMap instance,
+            Minecraft minecraft,
+            float xRot,
+            float yRot,
+            Operation<Void> original,
+            @Local(argsOnly = true) GuiGraphics guiGraphics,
+            @Local(argsOnly = true, ordinal = 0) int width,
+            @Local(argsOnly = true, ordinal = 1) int height
+    ) {
+        final boolean enabled = Animatium.ENABLED && AnimatiumConfig.instance().screen.panoramaRendering;
+        if (enabled) {
             if (animatium$backgroundTextureView == null) {
                 final GpuDevice device = RenderSystem.getDevice();
                 final GlTexture animatium$backgroundTexture = (GlTexture) device.createTexture(() -> "Background texture", 15, TextureFormat.RGBA8, 256, 256, 1, 1);
                 animatium$backgroundTextureView = (GlTextureView) device.createTextureView(animatium$backgroundTexture);
             }
 
+            animatium$spin += minecraft.getDeltaTracker().getRealtimeDeltaTicks();
+            xRot = Mth.sin(animatium$spin / 400.0F) * 25.0F + 20.0F;
+            yRot = -animatium$spin * 0.1F;
+
             GlStateManager._viewport(0, 0, 256, 256);
         }
-    }
 
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/CubeMap;render(Lnet/minecraft/client/Minecraft;FF)V", ordinal = 0, shift = At.Shift.AFTER))
-    private void animatium$panoramaFinish(GuiGraphics guiGraphics, int width, int height, boolean spin, CallbackInfo ci) {
-        if (Animatium.ENABLED && AnimatiumConfig.instance().screen.panoramaRendering) {
+        original.call(instance, minecraft, xRot, yRot);
+        if (enabled) {
             PanoramaRendererUtility.render(guiGraphics.pose(), animatium$backgroundTextureView, width, height);
         }
     }

src/main/java/org/visuals/legacy/animatium/util/PanoramaRendererUtility.java

@@ -67,18 +67,26 @@ public class PanoramaRendererUtility {
                     .withLocation(Animatium.location("pipeline/basic_texture"))
                     .build();
 
-    // To be called after ``cubeMap.render``
+    /**
+     * In PanoramaRenderer, before ``cubeMap.render``, set viewPort to (0, 0, 256, 256)
+     * then call this method after ``cubeMap.render``
+     *
+     * @param matrix      The GUI matrix
+     * @param textureView The texture we are drawing to
+     * @param width       Screen width
+     * @param height      Screen Height
+     */
     public void render(Matrix3x2f matrix, GlTextureView textureView, int width, int height) {
         final RenderTarget renderTarget = Minecraft.getInstance().getMainRenderTarget();
-        for (int i = 0; i < 6; ++i) {
-            PanoramaRendererUtility.writeAndBlitBlurTexture(matrix, renderTarget, textureView, width, height);
+        for (int i = 0; i < 7; ++i) {
+            writeAndBlitBlurTexture(matrix, renderTarget, textureView, width, height);
         }
 
-        PanoramaRendererUtility.renderFinalTexture(renderTarget, textureView, width, height);
+        renderFinalTexture(renderTarget, textureView, width, height);
     }
 
-    public void writeAndBlitBlurTexture(Matrix3x2f matrix, RenderTarget renderTarget, GlTextureView texture, int width, int height) {
-        texture.texture().setTextureFilter(FilterMode.LINEAR, false);
+    private void writeAndBlitBlurTexture(Matrix3x2f matrix, RenderTarget renderTarget, GlTextureView texture, int width, int height) {
+        texture.texture().setTextureFilter(FilterMode.LINEAR, FilterMode.LINEAR, false);
         // Ensures enough width/height for it to not crash when window is resized
         if (renderTarget.width >= 256 && renderTarget.height >= 256) {
             RenderSystem.getDevice().createCommandEncoder().copyTextureToTexture(
@@ -103,13 +111,19 @@ public void writeAndBlitBlurTexture(Matrix3x2f matrix, RenderTarget renderTarget
                 bufferBuilder.addVertexWith2DPose(matrix, 0.0F, height).setUv(0.0F + growth, 0.0F).setColor(color);
             }
 
-            RenderUtils.drawBuffer(pipeline, renderTarget, bufferBuilder.buildOrThrow(), (pass) -> {
-                pass.bindSampler("Sampler0", texture);
-            });
+            RenderUtils.drawBuffer(pipeline, renderTarget, bufferBuilder.buildOrThrow(), (pass) -> pass.bindSampler("Sampler0", texture));
         }
     }
 
-    public void renderFinalTexture(RenderTarget renderTarget, GlTextureView texture, int width, int height) {
+    /**
+     * Renders the final full image to the screen
+     *
+     * @param renderTarget The render target we are drawing to
+     * @param texture      The temporary texture
+     * @param width        Screen width
+     * @param height       Screen height
+     */
+    private void renderFinalTexture(RenderTarget renderTarget, GlTextureView texture, int width, int height) {
         float aspect = 120.0F / (float) (Math.max(width, height));
         float sw = (float) width * aspect / 256.0F;
         float sh = (float) height * aspect / 256.0F;
@@ -121,9 +135,7 @@ public void renderFinalTexture(RenderTarget renderTarget, GlTextureView texture,
             bufferBuilder.addVertex(width, height, 0.0F).setUv(0.5F - sh, 0.5F - sw).setColor(color);
             bufferBuilder.addVertex(width, 0.0F, 0.0F).setUv(0.5F + sh, 0.5F - sw).setColor(color);
             bufferBuilder.addVertex(0.0F, 0.0F, 0.0F).setUv(0.5F + sh, 0.5F + sw).setColor(color);
-            RenderUtils.drawBuffer(pipeline, renderTarget, bufferBuilder.buildOrThrow(), (pass) -> {
-                pass.bindSampler("Sampler0", texture);
-            });
+            RenderUtils.drawBuffer(pipeline, renderTarget, bufferBuilder.buildOrThrow(), (pass) -> pass.bindSampler("Sampler0", texture));
         }
     }
 }

src/main/java/org/visuals/legacy/animatium/util/RenderUtils.java

@@ -129,6 +129,7 @@ public void drawBuffer(RenderPipeline renderPipeline, RenderTarget renderTarget,
 
                 renderPass.setUniform("DynamicTransforms", dynamicTransforms);
                 renderPassConsumer.accept(renderPass);
+
                 RenderSystem.bindDefaultUniforms(renderPass);
                 renderPass.setVertexBuffer(0, vertexBuffer);
                 renderPass.setIndexBuffer(indexBuffer, indexType);