-
-
Notifications
You must be signed in to change notification settings - Fork 68
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '1.20.x/dev' into 1.20.x/stable
- Loading branch information
Showing
20 changed files
with
583 additions
and
308 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 116 additions & 0 deletions
116
...sodiumextra/mixin/optimizations/beacon_beam_rendering/MixinBeaconBlockEntityRenderer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| package me.flashyreese.mods.sodiumextra.mixin.optimizations.beacon_beam_rendering; | ||
|
|
||
| import me.jellysquid.mods.sodium.client.render.RenderGlobal; | ||
| import me.jellysquid.mods.sodium.client.render.vertex.VertexBufferWriter; | ||
| import me.jellysquid.mods.sodium.client.render.vertex.formats.ModelVertex; | ||
| import me.jellysquid.mods.sodium.client.util.color.ColorABGR; | ||
| import me.jellysquid.mods.sodium.common.util.MatrixHelper; | ||
| import net.minecraft.client.render.LightmapTextureManager; | ||
| import net.minecraft.client.render.OverlayTexture; | ||
| import net.minecraft.client.render.RenderLayer; | ||
| import net.minecraft.client.render.VertexConsumerProvider; | ||
| import net.minecraft.client.render.block.entity.BeaconBlockEntityRenderer; | ||
| import net.minecraft.client.util.math.MatrixStack; | ||
| import net.minecraft.util.Identifier; | ||
| import net.minecraft.util.math.MathHelper; | ||
| import net.minecraft.util.math.RotationAxis; | ||
| import org.joml.Matrix3f; | ||
| import org.joml.Matrix4f; | ||
| import org.lwjgl.system.MemoryStack; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Overwrite; | ||
| import org.spongepowered.asm.mixin.Unique; | ||
|
|
||
| @Mixin(BeaconBlockEntityRenderer.class) | ||
| public class MixinBeaconBlockEntityRenderer { | ||
|
|
||
| /** | ||
| * For Sodium 0.5 is method will only reduce allocations | ||
| * | ||
| * @author FlashyReese | ||
| * @reason Use optimized vertex writer, also avoids unnecessary allocations | ||
| */ | ||
| @Overwrite | ||
| public static void renderBeam(MatrixStack matrices, VertexConsumerProvider vertexConsumerProvider, Identifier textureId, float tickDelta, float heightScale, long worldTime, int yOffset, int maxY, float[] color, float innerRadius, float outerRadius) { | ||
| int height = yOffset + maxY; | ||
| matrices.push(); | ||
| matrices.translate(0.5, 0.0, 0.5); | ||
| float time = (float) Math.floorMod(worldTime, 40) + tickDelta; | ||
| float negativeTime = maxY < 0 ? time : -time; | ||
| float fractionalPart = MathHelper.fractionalPart(negativeTime * 0.2F - (float) MathHelper.floor(negativeTime * 0.1F)); | ||
| float red = color[0]; | ||
| float green = color[1]; | ||
| float blue = color[2]; | ||
| matrices.push(); | ||
| matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(time * 2.25F - 45.0F)); | ||
| float innerX1; | ||
| float innerZ2; | ||
| float innerX3 = -innerRadius; | ||
| float innerZ4 = -innerRadius; | ||
| float innerV2 = -1.0F + fractionalPart; | ||
| float innerV1 = (float) maxY * heightScale * (0.5F / innerRadius) + innerV2; | ||
|
|
||
| int colorNoneTranslucent = ColorABGR.pack(red, green, blue, 1.0F); | ||
| int colorTranslucent = ColorABGR.pack(red, green, blue, 0.125F); | ||
|
|
||
| try (MemoryStack stack = RenderGlobal.VERTEX_DATA.push()) { | ||
| long buffer = stack.nmalloc(2 * 16 * ModelVertex.STRIDE); | ||
| long ptr = buffer; | ||
| ptr = writeBeamLayerVertices(ptr, matrices, colorNoneTranslucent, yOffset, height, 0.0F, innerRadius, innerRadius, 0.0F, innerX3, 0.0F, 0.0F, innerZ4, innerV1, innerV2); | ||
| VertexBufferWriter.of(vertexConsumerProvider.getBuffer(RenderLayer.getBeaconBeam(textureId, false))).push(stack, buffer, 16, ModelVertex.FORMAT); | ||
|
|
||
| matrices.pop(); | ||
| innerX1 = -outerRadius; | ||
| float outerZ1 = -outerRadius; | ||
| innerZ2 = -outerRadius; | ||
| innerX3 = -outerRadius; | ||
| innerV2 = -1.0F + fractionalPart; | ||
| innerV1 = (float) maxY * heightScale + innerV2; | ||
|
|
||
| ptr = writeBeamLayerVertices(ptr, matrices, colorTranslucent, yOffset, height, innerX1, outerZ1, outerRadius, innerZ2, innerX3, outerRadius, outerRadius, outerRadius, innerV1, innerV2); | ||
| VertexBufferWriter.of(vertexConsumerProvider.getBuffer(RenderLayer.getBeaconBeam(textureId, true))).push(stack, buffer, 16, ModelVertex.FORMAT); | ||
| } | ||
| matrices.pop(); | ||
| } | ||
|
|
||
| @Unique | ||
| private static long writeBeamLayerVertices(long ptr, MatrixStack matrixStack, int color, int yOffset, int height, float x1, float z1, float x2, float z2, float x3, float z3, float x4, float z4, float v1, float v2) { | ||
| MatrixStack.Entry entry = matrixStack.peek(); | ||
| Matrix4f positionMatrix = entry.getPositionMatrix(); | ||
| Matrix3f normalMatrix = entry.getNormalMatrix(); | ||
|
|
||
| var normal = MatrixHelper.transformNormal(normalMatrix, (float) 0.0, (float) 1.0, (float) 0.0); | ||
|
|
||
| ptr = transformAndWriteVertex(ptr, positionMatrix, x1, height, z1, color, 1.0f, v1, normal); | ||
| ptr = transformAndWriteVertex(ptr, positionMatrix, x1, yOffset, z1, color, 1.0f, v2, normal); | ||
| ptr = transformAndWriteVertex(ptr, positionMatrix, x2, yOffset, z2, color, 0f, v2, normal); | ||
| ptr = transformAndWriteVertex(ptr, positionMatrix, x2, height, z2, color, 0f, v1, normal); | ||
|
|
||
| ptr = transformAndWriteVertex(ptr, positionMatrix, x4, height, z4, color, 1.0f, v1, normal); | ||
| ptr = transformAndWriteVertex(ptr, positionMatrix, x4, yOffset, z4, color, 1.0f, v2, normal); | ||
| ptr = transformAndWriteVertex(ptr, positionMatrix, x3, yOffset, z3, color, 0f, v2, normal); | ||
| ptr = transformAndWriteVertex(ptr, positionMatrix, x3, height, z3, color, 0f, v1, normal); | ||
|
|
||
| ptr = transformAndWriteVertex(ptr, positionMatrix, x2, height, z2, color, 1.0f, v1, normal); | ||
| ptr = transformAndWriteVertex(ptr, positionMatrix, x2, yOffset, z2, color, 1.0f, v2, normal); | ||
| ptr = transformAndWriteVertex(ptr, positionMatrix, x4, yOffset, z4, color, 0f, v2, normal); | ||
| ptr = transformAndWriteVertex(ptr, positionMatrix, x4, height, z4, color, 0f, v1, normal); | ||
|
|
||
| ptr = transformAndWriteVertex(ptr, positionMatrix, x3, height, z3, color, 1.0f, v1, normal); | ||
| ptr = transformAndWriteVertex(ptr, positionMatrix, x3, yOffset, z3, color, 1.0f, v2, normal); | ||
| ptr = transformAndWriteVertex(ptr, positionMatrix, x1, yOffset, z1, color, 0f, v2, normal); | ||
| ptr = transformAndWriteVertex(ptr, positionMatrix, x1, height, z1, color, 0f, v1, normal); | ||
| return ptr; | ||
| } | ||
|
|
||
| @Unique | ||
| private static long transformAndWriteVertex(long ptr, Matrix4f positionMatrix, float x, float y, float z, int color, float u, float v, int normal) { | ||
| float transformedX = MatrixHelper.transformPositionX(positionMatrix, x, y, z); | ||
| float transformedY = MatrixHelper.transformPositionY(positionMatrix, x, y, z); | ||
| float transformedZ = MatrixHelper.transformPositionZ(positionMatrix, x, y, z); | ||
|
|
||
| ModelVertex.write(ptr, transformedX, transformedY, transformedZ, color, u, v, LightmapTextureManager.MAX_LIGHT_COORDINATE, OverlayTexture.DEFAULT_UV, normal); | ||
| ptr += ModelVertex.STRIDE; | ||
| return ptr; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.