diff --git a/src/main/java/com/lzxnone/terraria/client/event/ShaderRegistry.java b/src/main/java/com/lzxnone/terraria/client/event/ShaderRegistry.java index c66dd12..2f7ad51 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/ShaderRegistry.java +++ b/src/main/java/com/lzxnone/terraria/client/event/ShaderRegistry.java @@ -16,7 +16,10 @@ public class ShaderRegistry { private static ShaderInstance blur; private static ShaderInstance composite; private static ShaderInstance outline; + private static ShaderInstance outlineMask; private static ShaderInstance particleBloom; + private static ShaderInstance ironSparkParticle; + private static ShaderInstance circleParticle; private static ShaderInstance devilsDevastationEnergy; public static ShaderInstance getBlur() { @@ -31,10 +34,22 @@ public class ShaderRegistry { return outline; } + public static ShaderInstance getOutlineMask() { + return outlineMask; + } + public static ShaderInstance getParticleBloom() { return particleBloom; } + public static ShaderInstance getIronSparkParticle() { + return ironSparkParticle; + } + + public static ShaderInstance getCircleParticle() { + return circleParticle; + } + public static ShaderInstance getDevilsDevastationEnergy() { return devilsDevastationEnergy; } @@ -66,6 +81,14 @@ public class ShaderRegistry { ), shader -> outline = shader ); + event.registerShader( + new ShaderInstance( + event.getResourceProvider(), + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "outline_mask"), + DefaultVertexFormat.POSITION_TEX + ), + shader -> outlineMask = shader + ); event.registerShader( new ShaderInstance( event.getResourceProvider(), @@ -74,6 +97,22 @@ public class ShaderRegistry { ), shader -> particleBloom = shader ); + event.registerShader( + new ShaderInstance( + event.getResourceProvider(), + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "iron_spark_particle"), + DefaultVertexFormat.PARTICLE + ), + shader -> ironSparkParticle = shader + ); + event.registerShader( + new ShaderInstance( + event.getResourceProvider(), + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "circle_particle"), + DefaultVertexFormat.PARTICLE + ), + shader -> circleParticle = shader + ); event.registerShader( new ShaderInstance( event.getResourceProvider(), diff --git a/src/main/java/com/lzxnone/terraria/client/renderer/BloomRenderer.java b/src/main/java/com/lzxnone/terraria/client/renderer/BloomRenderer.java index 5123085..642d7bc 100644 --- a/src/main/java/com/lzxnone/terraria/client/renderer/BloomRenderer.java +++ b/src/main/java/com/lzxnone/terraria/client/renderer/BloomRenderer.java @@ -1,9 +1,6 @@ package com.lzxnone.terraria.client.renderer; import com.lzxnone.terraria.LzxnoneTerraria; -import com.lzxnone.terraria.client.entity.beam.ClientSwordBeamRenderBehaviors; -import com.lzxnone.terraria.client.entity.projectile.ClientStaticProjectileRenderBehaviors; -import com.lzxnone.terraria.client.entity.summon.ClientStaticSummonRenderBehaviors; import com.lzxnone.terraria.entity.IrisCompat; import com.lzxnone.terraria.entity.beam.SwordBeam; import com.lzxnone.terraria.entity.projectile.StaticProjectile; @@ -22,18 +19,23 @@ import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.ShaderInstance; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; +import net.minecraft.world.phys.Vec3; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.client.GlStateBackup; import net.neoforged.neoforge.client.event.RenderLevelStageEvent; +import org.joml.Matrix4f; +import org.joml.Matrix4fStack; import java.util.Objects; @EventBusSubscriber(modid = LzxnoneTerraria.MODID, value = Dist.CLIENT) public class BloomRenderer { private static final int GL_LINEAR = 9729; - private static final int GLOW_DIV = 2; + // 源目标必须和主目标同尺寸,否则复制后的深度与二次光栅化无法逐像素对应, + // 薄片模型会因深度误差随机丢失整面。 + private static final int GLOW_DIV = 1; private static final int BLOOM_DIV = 16; private static RenderTarget glowTarget; @@ -47,18 +49,15 @@ public class BloomRenderer { @SubscribeEvent public static void onRenderStage(RenderLevelStageEvent event) { + if(event.getStage() != RenderLevelStageEvent.Stage.AFTER_LEVEL) return; //开启光影禁用 if(IrisCompat.isShaderPackInUse()) return; if(ShaderRegistry.getBlur() == null || ShaderRegistry.getComposite() == null) return; + if(!hasAnyGlow()) return; ensureTargets(); if(glowTarget == null || bloomTarget == null) return; - - if(event.getStage() == RenderLevelStageEvent.Stage.AFTER_ENTITIES) { - onAfterEntities(event); - }else if(event.getStage() == RenderLevelStageEvent.Stage.AFTER_LEVEL) { - onAfterLevel(); - } + renderBloom(event); } private static void ensureTargets() { @@ -92,58 +91,46 @@ public class BloomRenderer { } } - private static void onAfterEntities(RenderLevelStageEvent event) { + private static void renderBloom(RenderLevelStageEvent event) { GlStateBackup backup = new GlStateBackup(); RenderSystem.backupGlState(backup); ShaderInstance prevShader = RenderSystem.getShader(); int prevTex0 = RenderSystem.getShaderTexture(0); - try{ + try { RenderTarget main = Minecraft.getInstance().getMainRenderTarget(); glowTarget.clear(false); - glowTarget.bindWrite(true); glowTarget.copyDepthFrom(main); glowTarget.bindWrite(true); renderGlowEntities( event.getPoseStack(), event.getCamera(), - event.getPartialTick().getGameTimeDeltaPartialTick(true) + event.getPartialTick().getGameTimeDeltaPartialTick(true), + event ); downsamplePass(glowTarget, bloomTarget); - blurPass(bloomTarget, pingTarget, true); blurPass(pingTarget, pongTarget, false); - }finally { - Minecraft.getInstance().getMainRenderTarget().bindWrite(true); - RenderSystem.setShaderTexture(0, prevTex0); - if(prevShader != null) { - RenderSystem.setShader(() -> prevShader); - } - RenderSystem.restoreGlState(backup); - } - } - - private static void onAfterLevel() { - GlStateBackup backup = new GlStateBackup(); - RenderSystem.backupGlState(backup); - ShaderInstance prevShader = RenderSystem.getShader(); - int prevTex0 = RenderSystem.getShaderTexture(0); - - try{ - RenderTarget main = Minecraft.getInstance().getMainRenderTarget(); main.bindWrite(true); ShaderInstance shader = ShaderRegistry.getComposite(); RenderSystem.setShader(() -> shader); RenderSystem.setShaderTexture(0, pongTarget.getColorTextureId()); + setSampleOffset(shader, 0.0f, 0.0f); RenderSystem.enableBlend(); - RenderSystem.blendFunc(GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE); + RenderSystem.blendFuncSeparate( + GlStateManager.SourceFactor.ONE, + GlStateManager.DestFactor.ONE, + GlStateManager.SourceFactor.ZERO, + GlStateManager.DestFactor.ONE + ); RenderSystem.disableDepthTest(); RenderSystem.depthMask(false); drawFullscreen(); }finally { + Minecraft.getInstance().getMainRenderTarget().bindWrite(true); RenderSystem.setShaderTexture(0, prevTex0); if(prevShader != null) { RenderSystem.setShader(() -> prevShader); @@ -157,12 +144,18 @@ public class BloomRenderer { ShaderInstance shader = ShaderRegistry.getComposite(); RenderSystem.setShader(() -> shader); RenderSystem.setShaderTexture(0, src.getColorTextureId()); + setSampleOffset(shader, 0.25f / dst.viewWidth, 0.25f / dst.viewHeight); RenderSystem.disableBlend(); RenderSystem.disableDepthTest(); RenderSystem.depthMask(false); drawFullscreen(); } + private static void setSampleOffset(ShaderInstance shader, float x, float y) { + Uniform sampleOffset = shader.getUniform("SampleOffset"); + if(sampleOffset != null) sampleOffset.set(x, y); + } + private static void blurPass(RenderTarget src, RenderTarget dst, boolean horizontal) { dst.bindWrite(true); @@ -193,46 +186,76 @@ public class BloomRenderer { BufferUploader.drawWithShader(Objects.requireNonNull(bb.build())); } - public static void renderGlowEntities(PoseStack poseStack, Camera camera, float partialTick) { + private static void renderGlowEntities(PoseStack poseStack, Camera camera, float partialTick, + RenderLevelStageEvent event) { Minecraft mc = Minecraft.getInstance(); - if(mc.level == null) { - return; - } + if(mc.level == null) return; + try(ByteBufferBuilder byteBuf = new ByteBufferBuilder(65536)) { MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(byteBuf); - for (Entity entity : mc.level.entitiesForRendering()) { - double x = Mth.lerp(partialTick, entity.xo, entity.getX()); - double y = Mth.lerp(partialTick, entity.yo, entity.getY()); - double z = Mth.lerp(partialTick, entity.zo, entity.getZ()); - float entityYaw = Mth.lerp(partialTick, entity.yRotO, entity.getYRot()); - double camX = x - camera.getPosition().x(); - double camY = y - camera.getPosition().y(); - double camZ = z - camera.getPosition().z(); + Matrix4f previousProjection = new Matrix4f(RenderSystem.getProjectionMatrix()); + VertexSorting previousSorting = RenderSystem.getVertexSorting(); + Matrix4fStack modelViewStack = RenderSystem.getModelViewStack(); + modelViewStack.pushMatrix(); + modelViewStack.set(event.getModelViewMatrix()); + RenderSystem.applyModelViewMatrix(); + RenderSystem.setProjectionMatrix(event.getProjectionMatrix(), previousSorting); - if(entity instanceof StaticProjectile projectile - && projectile.getEntityData().get(StaticProjectile.GLOW)) { + try { + for(Entity entity : mc.level.entitiesForRendering()) { + if(!hasGlow(entity)) continue; + + double x = Mth.lerp(partialTick, entity.xo, entity.getX()); + double y = Mth.lerp(partialTick, entity.yo, entity.getY()); + double z = Mth.lerp(partialTick, entity.zo, entity.getZ()); + float entityYaw = Mth.lerp(partialTick, entity.yRotO, entity.getYRot()); + + double camX = x - camera.getPosition().x(); + double camY = y - camera.getPosition().y(); + double camZ = z - camera.getPosition().z(); + + var renderer = mc.getEntityRenderDispatcher().getRenderer(entity); + Vec3 renderOffset = renderer.getRenderOffset(entity, partialTick); poseStack.pushPose(); - poseStack.translate(camX, camY, camZ); - ClientStaticProjectileRenderBehaviors.getBehavior(projectile.getEntityData().get(StaticProjectile.BEHAVIOR)) - .render(projectile, entityYaw, partialTick, poseStack, bufferSource, LightTexture.FULL_BRIGHT); - poseStack.popPose(); - }else if (entity instanceof StaticSummon summon - && summon.getEntityData().get(StaticSummon.GLOW)) { - poseStack.pushPose(); - poseStack.translate(camX, camY, camZ); - ClientStaticSummonRenderBehaviors.getBehavior(summon.getEntityData().get(StaticSummon.BEHAVIOR)) - .render(summon, entityYaw, partialTick, poseStack, bufferSource, LightTexture.FULL_BRIGHT); - poseStack.popPose(); - }else if (entity instanceof SwordBeam beam) { - poseStack.pushPose(); - poseStack.translate(camX, camY, camZ); - ClientSwordBeamRenderBehaviors.getBehavior(beam.getEntityData().get(SwordBeam.BEHAVIOR)) - .render(beam, entityYaw, partialTick, poseStack, bufferSource, LightTexture.FULL_BRIGHT); - poseStack.popPose(); + try { + poseStack.translate( + camX + renderOffset.x, + camY + renderOffset.y, + camZ + renderOffset.z + ); + renderer.render( + entity, entityYaw, partialTick, + poseStack, bufferSource, LightTexture.FULL_BRIGHT + ); + }finally { + poseStack.popPose(); + } } + bufferSource.endBatch(); + }finally { + RenderSystem.setProjectionMatrix(previousProjection, previousSorting); + modelViewStack.popMatrix(); + RenderSystem.applyModelViewMatrix(); } - bufferSource.endBatch(); } } + + private static boolean hasGlow(Entity entity) { + return entity instanceof StaticProjectile projectile + && projectile.getEntityData().get(StaticProjectile.GLOW) + || entity instanceof StaticSummon summon + && summon.getEntityData().get(StaticSummon.GLOW) + || entity instanceof SwordBeam; + } + + private static boolean hasAnyGlow() { + Minecraft mc = Minecraft.getInstance(); + if(mc.level == null) return false; + for(Entity entity : mc.level.entitiesForRendering()) { + if(hasGlow(entity)) return true; + } + return false; + } + } diff --git a/src/main/java/com/lzxnone/terraria/client/renderer/OutlineRenderer.java b/src/main/java/com/lzxnone/terraria/client/renderer/OutlineRenderer.java index 43b0cea..dffb8c1 100644 --- a/src/main/java/com/lzxnone/terraria/client/renderer/OutlineRenderer.java +++ b/src/main/java/com/lzxnone/terraria/client/renderer/OutlineRenderer.java @@ -1,11 +1,9 @@ package com.lzxnone.terraria.client.renderer; import com.lzxnone.terraria.LzxnoneTerraria; -import com.lzxnone.terraria.client.entity.beam.ClientSwordBeamRenderBehaviors; import com.lzxnone.terraria.client.entity.projectile.ClientStaticProjectileRenderBehaviors; import com.lzxnone.terraria.client.entity.summon.ClientStaticSummonRenderBehaviors; import com.lzxnone.terraria.entity.IrisCompat; -import com.lzxnone.terraria.entity.beam.SwordBeam; import com.lzxnone.terraria.entity.projectile.StaticProjectile; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.client.event.ShaderRegistry; @@ -19,38 +17,46 @@ import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderStateShard; +import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.ShaderInstance; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; +import net.minecraft.world.inventory.InventoryMenu; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.client.GlStateBackup; import net.neoforged.neoforge.client.event.RenderLevelStageEvent; +import org.joml.Matrix4f; +import org.joml.Matrix4fStack; import java.util.Objects; @EventBusSubscriber(modid = LzxnoneTerraria.MODID, value = Dist.CLIENT) public class OutlineRenderer { - private static final int GL_LINEAR = 9729; + private static final int GL_NEAREST = 9728; + private static final float OUTLINE_RADIUS = 2.0f; + private static final float DEPTH_BIAS = 0.00005f; + + private static final RenderType MASK_QUADS = createMaskRenderType(); private static RenderTarget outlineTarget; + private static RenderTarget sceneDepthTarget; private static int lastW = -1; private static int lastH = -1; @SubscribeEvent public static void onRenderStage(RenderLevelStageEvent event) { + if(event.getStage() != RenderLevelStageEvent.Stage.AFTER_LEVEL) return; if(IrisCompat.isShaderPackInUse()) return; - if(ShaderRegistry.getOutline() == null) return; + if(ShaderRegistry.getOutline() == null + || ShaderRegistry.getOutlineMask() == null) return; + if(!hasAnyOutline()) return; ensureTarget(); if(outlineTarget == null) return; - - if(event.getStage() == RenderLevelStageEvent.Stage.AFTER_ENTITIES) { - onAfterEntities(event); - }else if(event.getStage() == RenderLevelStageEvent.Stage.AFTER_LEVEL) { - onAfterLevel(); - } + renderOutline(event); } private static void ensureTarget() { @@ -58,57 +64,50 @@ public class OutlineRenderer { int w = Math.max(1, main.viewWidth); int h = Math.max(1, main.viewHeight); - if(w == lastW && h == lastH && outlineTarget != null) return; + if(w == lastW && h == lastH && outlineTarget != null && sceneDepthTarget != null) return; if(outlineTarget != null) outlineTarget.destroyBuffers(); + if(sceneDepthTarget != null) sceneDepthTarget.destroyBuffers(); outlineTarget = new TextureTarget(w, h, true, false); + sceneDepthTarget = new TextureTarget(w, h, true, false); outlineTarget.setClearColor(0f, 0f, 0f, 0f); - outlineTarget.setFilterMode(GL_LINEAR); + sceneDepthTarget.setClearColor(0f, 0f, 0f, 0f); + outlineTarget.setFilterMode(GL_NEAREST); + sceneDepthTarget.setFilterMode(GL_NEAREST); lastW = w; lastH = h; } - private static void onAfterEntities(RenderLevelStageEvent event) { + private static void renderOutline(RenderLevelStageEvent event) { GlStateBackup backup = new GlStateBackup(); RenderSystem.backupGlState(backup); ShaderInstance prevShader = RenderSystem.getShader(); int prevTex0 = RenderSystem.getShaderTexture(0); + int prevTex1 = RenderSystem.getShaderTexture(1); + int prevTex2 = RenderSystem.getShaderTexture(2); try { RenderTarget main = Minecraft.getInstance().getMainRenderTarget(); + + // 保存 AFTER_LEVEL 时主目标中最终可用的场景深度,供外扩像素做遮挡判断。 + sceneDepthTarget.copyDepthFrom(main); outlineTarget.clear(false); - outlineTarget.bindWrite(true); outlineTarget.copyDepthFrom(main); outlineTarget.bindWrite(true); renderOutlineEntities( event.getPoseStack(), event.getCamera(), - event.getPartialTick().getGameTimeDeltaPartialTick(true) + event.getPartialTick().getGameTimeDeltaPartialTick(true), + event ); - }finally { - Minecraft.getInstance().getMainRenderTarget().bindWrite(true); - RenderSystem.setShaderTexture(0, prevTex0); - if(prevShader != null) { - RenderSystem.setShader(() -> prevShader); - } - RenderSystem.restoreGlState(backup); - } - } - - private static void onAfterLevel() { - GlStateBackup backup = new GlStateBackup(); - RenderSystem.backupGlState(backup); - ShaderInstance prevShader = RenderSystem.getShader(); - int prevTex0 = RenderSystem.getShaderTexture(0); - - try { - RenderTarget main = Minecraft.getInstance().getMainRenderTarget(); main.bindWrite(true); ShaderInstance shader = ShaderRegistry.getOutline(); RenderSystem.setShader(() -> shader); RenderSystem.setShaderTexture(0, outlineTarget.getColorTextureId()); + RenderSystem.setShaderTexture(1, outlineTarget.getDepthTextureId()); + RenderSystem.setShaderTexture(2, sceneDepthTarget.getDepthTextureId()); Uniform texelSize = shader.getUniform("TexelSize"); if(texelSize != null) { @@ -120,19 +119,28 @@ public class OutlineRenderer { } Uniform radius = shader.getUniform("Radius"); if(radius != null) { - radius.set(2.0f); + radius.set(OUTLINE_RADIUS); + } + Uniform depthBias = shader.getUniform("DepthBias"); + if(depthBias != null) { + depthBias.set(DEPTH_BIAS); } RenderSystem.enableBlend(); - RenderSystem.blendFunc( + RenderSystem.blendFuncSeparate( GlStateManager.SourceFactor.SRC_ALPHA, - GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA + GlStateManager.DestFactor.ONE, + GlStateManager.SourceFactor.ZERO, + GlStateManager.DestFactor.ONE ); RenderSystem.disableDepthTest(); RenderSystem.depthMask(false); drawFullscreen(); }finally { + Minecraft.getInstance().getMainRenderTarget().bindWrite(true); RenderSystem.setShaderTexture(0, prevTex0); + RenderSystem.setShaderTexture(1, prevTex1); + RenderSystem.setShaderTexture(2, prevTex2); if(prevShader != null) { RenderSystem.setShader(() -> prevShader); } @@ -140,49 +148,112 @@ public class OutlineRenderer { } } - private static void renderOutlineEntities(PoseStack poseStack, Camera camera, float partialTick) { + private static void renderOutlineEntities(PoseStack poseStack, Camera camera, float partialTick, + RenderLevelStageEvent event) { Minecraft mc = Minecraft.getInstance(); if(mc.level == null) return; try(ByteBufferBuilder byteBuf = new ByteBufferBuilder(65536)) { - MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(byteBuf); - for(Entity entity : mc.level.entitiesForRendering()) { - double x = Mth.lerp(partialTick, entity.xo, entity.getX()); - double y = Mth.lerp(partialTick, entity.yo, entity.getY()); - double z = Mth.lerp(partialTick, entity.zo, entity.getZ()); - float entityYaw = Mth.lerp(partialTick, entity.yRotO, entity.getYRot()); + MultiBufferSource.BufferSource maskBuffers = MultiBufferSource.immediate(byteBuf); + MultiBufferSource bufferSource = ignored -> maskBuffers.getBuffer(MASK_QUADS); - double camX = x - camera.getPosition().x(); - double camY = y - camera.getPosition().y(); - double camZ = z - camera.getPosition().z(); + Matrix4f previousProjection = new Matrix4f(RenderSystem.getProjectionMatrix()); + VertexSorting previousSorting = RenderSystem.getVertexSorting(); + Matrix4fStack modelViewStack = RenderSystem.getModelViewStack(); + modelViewStack.pushMatrix(); + modelViewStack.set(event.getModelViewMatrix()); + RenderSystem.applyModelViewMatrix(); + RenderSystem.setProjectionMatrix(event.getProjectionMatrix(), previousSorting); + + try { + for(Entity entity : mc.level.entitiesForRendering()) { + if(!hasOutline(entity)) continue; + + double x = Mth.lerp(partialTick, entity.xo, entity.getX()); + double y = Mth.lerp(partialTick, entity.yo, entity.getY()); + double z = Mth.lerp(partialTick, entity.zo, entity.getZ()); + float entityYaw = Mth.lerp(partialTick, entity.yRotO, entity.getYRot()); + + double camX = x - camera.getPosition().x(); + double camY = y - camera.getPosition().y(); + double camZ = z - camera.getPosition().z(); - if(entity instanceof StaticProjectile projectile - && projectile.getEntityData().get(StaticProjectile.OUTLINE)) { poseStack.pushPose(); - poseStack.translate(camX, camY, camZ); - ClientStaticProjectileRenderBehaviors.getBehavior(projectile.getEntityData().get(StaticProjectile.BEHAVIOR)) - .render(projectile, entityYaw, partialTick, poseStack, bufferSource, LightTexture.FULL_BRIGHT); - poseStack.popPose(); - }else if(entity instanceof StaticSummon summon - && summon.getEntityData().get(StaticSummon.OUTLINE)) { - poseStack.pushPose(); - poseStack.translate(camX, camY, camZ); - ClientStaticSummonRenderBehaviors.getBehavior(summon.getEntityData().get(StaticSummon.BEHAVIOR)) - .render(summon, entityYaw, partialTick, poseStack, bufferSource, LightTexture.FULL_BRIGHT); - poseStack.popPose(); - }else if(entity instanceof SwordBeam beam - && beam.getEntityData().get(SwordBeam.OUTLINE)) { - poseStack.pushPose(); - poseStack.translate(camX, camY, camZ); - ClientSwordBeamRenderBehaviors.getBehavior(beam.getEntityData().get(SwordBeam.BEHAVIOR)) - .render(beam, entityYaw, partialTick, poseStack, bufferSource, LightTexture.FULL_BRIGHT); - poseStack.popPose(); + try { + poseStack.translate(camX, camY, camZ); + renderEntityMask(entity, entityYaw, partialTick, poseStack, bufferSource); + }finally { + poseStack.popPose(); + } } + maskBuffers.endBatch(); + }finally { + RenderSystem.setProjectionMatrix(previousProjection, previousSorting); + modelViewStack.popMatrix(); + RenderSystem.applyModelViewMatrix(); } - bufferSource.endBatch(); } } + private static boolean hasOutline(Entity entity) { + return entity instanceof StaticProjectile projectile + && projectile.getEntityData().get(StaticProjectile.OUTLINE) + || entity instanceof StaticSummon summon + && summon.getEntityData().get(StaticSummon.OUTLINE); + } + + private static boolean hasAnyOutline() { + Minecraft mc = Minecraft.getInstance(); + if(mc.level == null) return false; + for(Entity entity : mc.level.entitiesForRendering()) { + if(hasOutline(entity)) return true; + } + return false; + } + + private static void renderEntityMask(Entity entity, float entityYaw, float partialTick, + PoseStack poseStack, MultiBufferSource bufferSource) { + if(entity instanceof StaticProjectile projectile) { + if(!projectile.isInit) return; + var behavior = ClientStaticProjectileRenderBehaviors.getBehavior( + projectile.getEntityData().get(StaticProjectile.BEHAVIOR)); + String mode = projectile.getEntityData().get(StaticProjectile.RENDER_MODE); + if("item".equals(mode) && !projectile.getEntityData().get(StaticProjectile.ITEM).isEmpty()) { + behavior.renderItem(projectile, entityYaw, partialTick, poseStack, bufferSource, LightTexture.FULL_BRIGHT); + }else if("block".equals(mode) + && !projectile.getEntityData().get(StaticProjectile.BLOCK).isAir()) { + behavior.renderBlock(projectile, entityYaw, partialTick, poseStack, bufferSource, LightTexture.FULL_BRIGHT); + } + }else if(entity instanceof StaticSummon summon) { + var behavior = ClientStaticSummonRenderBehaviors.getBehavior( + summon.getEntityData().get(StaticSummon.BEHAVIOR)); + String mode = summon.getEntityData().get(StaticSummon.RENDER_MODE); + if("item".equals(mode) && !summon.getEntityData().get(StaticSummon.ITEM).isEmpty()) { + behavior.renderItem(summon, entityYaw, partialTick, poseStack, bufferSource, LightTexture.FULL_BRIGHT); + }else if("block".equals(mode) + && !summon.getEntityData().get(StaticSummon.BLOCK).isAir()) { + behavior.renderBlock(summon, entityYaw, partialTick, poseStack, bufferSource, LightTexture.FULL_BRIGHT); + } + } + } + + private static RenderType createMaskRenderType() { + RenderType.CompositeState state = RenderType.CompositeState.builder() + .setShaderState(new RenderStateShard.ShaderStateShard(ShaderRegistry::getOutlineMask)) + .setTextureState(new RenderStateShard.TextureStateShard(InventoryMenu.BLOCK_ATLAS, false, false)) + .setTransparencyState(RenderStateShard.NO_TRANSPARENCY) + .setCullState(RenderStateShard.NO_CULL) + .setLightmapState(RenderStateShard.NO_LIGHTMAP) + .setOverlayState(RenderStateShard.NO_OVERLAY) + .setDepthTestState(RenderStateShard.LEQUAL_DEPTH_TEST) + .setWriteMaskState(RenderStateShard.COLOR_DEPTH_WRITE) + .createCompositeState(false); + return RenderType.create( + "outline_mask", DefaultVertexFormat.POSITION_TEX, + VertexFormat.Mode.QUADS, 1536, false, false, state + ); + } + private static void drawFullscreen() { BufferBuilder bb = RenderSystem.renderThreadTesselator().begin( VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/DevilsDevastation.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/DevilsDevastation.java index e211c67..f2de81c 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/DevilsDevastation.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/DevilsDevastation.java @@ -356,6 +356,7 @@ public class DevilsDevastation extends MeleeWeapon { summon.getEntityData().set(StaticSummon.RZP, -135); summon.getEntityData().set(StaticSummon.LIFETIME, STUCK_LIFETIME.get()); summon.getEntityData().set(StaticSummon.GLOW, true); + summon.getEntityData().set(StaticSummon.OUTLINE, true); CompoundTag customData = new CompoundTag(); Vec3 deltaPos = pos.subtract(target.position()); @@ -412,14 +413,14 @@ public class DevilsDevastation extends MeleeWeapon { CircleParticleOptions circleParticleOptions; if(projectile.getRandom().nextInt(2) == 0) { ironSparkParticleOptions = new IronSparkParticleOptions( - 1.0f, 40, 4.0f, new Vector3f(0.729f, 0.396f, 0.345f), dirs[0].mul(0.2f), dirs[2] + 0.1f, 40, 4.0f, new Vector3f(0.729f, 0.396f, 0.345f), dirs[0].mul(0.2f), dirs[2] ); circleParticleOptions = new CircleParticleOptions( 0.1f, 40, new Vector3f(0.729f, 0.396f, 0.345f) ); }else { ironSparkParticleOptions = new IronSparkParticleOptions( - 1.0f, 40, 4.0f, new Vector3f(0.8f, 0.176f, 0.78f), dirs[0].mul(0.2f), dirs[2] + 0.1f, 40, 4.0f, new Vector3f(0.8f, 0.176f, 0.78f), dirs[0].mul(0.2f), dirs[2] ); circleParticleOptions = new CircleParticleOptions( 0.1f, 40, new Vector3f(0.8f, 0.176f, 0.78f) @@ -496,11 +497,11 @@ public class DevilsDevastation extends MeleeWeapon { IronSparkParticleOptions ironSparkParticleOptions; if(projectile.getRandom().nextInt(2) == 0) { ironSparkParticleOptions = new IronSparkParticleOptions( - 1.0f, 40, 4.0f, new Vector3f(0.729f, 0.396f, 0.345f), speed, right + 0.1f, 40, 4.0f, new Vector3f(0.729f, 0.396f, 0.345f), speed, right ); }else { ironSparkParticleOptions = new IronSparkParticleOptions( - 1.0f, 40, 4.0f, new Vector3f(0.8f, 0.176f, 0.78f), speed, right + 0.1f, 40, 4.0f, new Vector3f(0.8f, 0.176f, 0.78f), speed, right ); } ParticleUtil.addParticle( @@ -587,11 +588,11 @@ public class DevilsDevastation extends MeleeWeapon { IronSparkParticleOptions ironSparkParticleOptions; if (projectile.getRandom().nextInt(2) == 0) { ironSparkParticleOptions = new IronSparkParticleOptions( - 1.0f, 20, 16.0f, new Vector3f(0.729f, 0.396f, 0.345f), speed, MathUtil.computeCoordinateSystem(speed, 0)[2] + 0.1f, 20, 16.0f, new Vector3f(0.729f, 0.396f, 0.345f), speed, MathUtil.computeCoordinateSystem(speed, 0)[2] ); } else { ironSparkParticleOptions = new IronSparkParticleOptions( - 1.0f, 20, 16.0f, new Vector3f(0.8f, 0.176f, 0.78f), speed, MathUtil.computeCoordinateSystem(speed, 0)[2] + 0.1f, 20, 16.0f, new Vector3f(0.8f, 0.176f, 0.78f), speed, MathUtil.computeCoordinateSystem(speed, 0)[2] ); } ParticleUtil.addParticle( @@ -1081,4 +1082,3 @@ public class DevilsDevastation extends MeleeWeapon { return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); } } - diff --git a/src/main/java/com/lzxnone/terraria/particle/CircleParticle.java b/src/main/java/com/lzxnone/terraria/particle/CircleParticle.java index 5b6f745..1dc306f 100644 --- a/src/main/java/com/lzxnone/terraria/particle/CircleParticle.java +++ b/src/main/java/com/lzxnone/terraria/particle/CircleParticle.java @@ -48,7 +48,27 @@ public class CircleParticle extends TextureSheetParticle { @Override public void render(VertexConsumer buffer, Camera camera, float partialTick) { - for(int i = 0;i < 10;i++) super.render(buffer, camera, partialTick); + super.render(buffer, camera, partialTick); + } + + @Override + protected float getU0() { + return this.opaque ? super.getU0() : 0.0f; + } + + @Override + protected float getU1() { + return this.opaque ? super.getU1() : 1.0f; + } + + @Override + protected float getV0() { + return this.opaque ? super.getV0() : 0.0f; + } + + @Override + protected float getV1() { + return this.opaque ? super.getV1() : 1.0f; } @Override @@ -58,7 +78,9 @@ public class CircleParticle extends TextureSheetParticle { @Override public ParticleRenderType getRenderType() { - return this.opaque ? ParticleRenderType.PARTICLE_SHEET_OPAQUE : ModParticleRenderTypes.EMISSIVE_BLOOM_PARTICLE; + return this.opaque + ? ParticleRenderType.PARTICLE_SHEET_OPAQUE + : ModParticleRenderTypes.CIRCLE_PARTICLE; } public static class Provider implements ParticleProvider { diff --git a/src/main/java/com/lzxnone/terraria/particle/IronSparkParticle.java b/src/main/java/com/lzxnone/terraria/particle/IronSparkParticle.java index 02d24b2..b24e577 100644 --- a/src/main/java/com/lzxnone/terraria/particle/IronSparkParticle.java +++ b/src/main/java/com/lzxnone/terraria/particle/IronSparkParticle.java @@ -64,16 +64,27 @@ public class IronSparkParticle extends TextureSheetParticle { float cz = (float) (Mth.lerp(partialTick, this.zo, this.z) - camera.getPosition().z); float size = this.quadSize; - float halfLen = size * this.sparkLength * lifeRatio; - float halfWidth = size * this.sparkLength * (1 - lifeRatio) * 0.01f; + float grow = (float) Mth.smoothstep(Mth.clamp(lifeRatio / 0.15f, 0.0f, 1.0f)); + float halfLen = size * this.sparkLength * grow; + float halfWidth = size * this.sparkLength * Mth.lerp(lifeRatio, 0.025f, 0.010f); - float u0 = this.getU0(); - float u1 = this.getU1(); - float v0 = this.getV0(); - float v1 = this.getV1(); + // 专用 shader 将 UV 当作 0..1 局部坐标,不再采样粒子图集。 + float u0 = 0.0f; + float u1 = 1.0f; + float v0 = 0.0f; + float v1 = 1.0f; Vector3f dirVec = new Vector3f(this.dir); - Vector3f rightVec = new Vector3f(this.right); + Vector3f toCamera = new Vector3f(-cx, -cy, -cz); + Vector3f rightVec = new Vector3f(); + if (toCamera.lengthSquared() > 0.000001f) { + toCamera.normalize(); + toCamera.cross(dirVec, rightVec); + } + if (rightVec.lengthSquared() <= 0.000001f) { + rightVec.set(this.right); + } + rightVec.normalize(); float[][] verts = { {cx + dirVec.x * halfLen - rightVec.x * halfWidth, cy + dirVec.y * halfLen - rightVec.y * halfWidth, cz + dirVec.z * halfLen - rightVec.z * halfWidth, u1, v1}, @@ -82,14 +93,12 @@ public class IronSparkParticle extends TextureSheetParticle { {cx - dirVec.x * halfLen - rightVec.x * halfWidth, cy - dirVec.y * halfLen - rightVec.y * halfWidth, cz - dirVec.z * halfLen - rightVec.z * halfWidth, u0, v1} }; - for(int k = 0;k < 10;k++) { - for(int j = 0; j < 4; j++) { - float[] v = verts[j]; - buffer.addVertex(v[0], v[1], v[2]) - .setUv(v[3], v[4]) - .setColor(this.rCol, this.gCol, this.bCol, this.alpha) - .setLight(LightTexture.FULL_BRIGHT); - } + for(int j = 0; j < 4; j++) { + float[] v = verts[j]; + buffer.addVertex(v[0], v[1], v[2]) + .setUv(v[3], v[4]) + .setColor(this.rCol, this.gCol, this.bCol, this.alpha) + .setLight(LightTexture.FULL_BRIGHT); } } @@ -100,7 +109,7 @@ public class IronSparkParticle extends TextureSheetParticle { @Override public ParticleRenderType getRenderType() { - return ModParticleRenderTypes.EMISSIVE_BLOOM_PARTICLE; + return ModParticleRenderTypes.IRON_SPARK_PARTICLE; } public static class Provider implements ParticleProvider { diff --git a/src/main/java/com/lzxnone/terraria/particle/ModParticleRenderTypes.java b/src/main/java/com/lzxnone/terraria/particle/ModParticleRenderTypes.java index b6dde1b..e15e0de 100644 --- a/src/main/java/com/lzxnone/terraria/particle/ModParticleRenderTypes.java +++ b/src/main/java/com/lzxnone/terraria/particle/ModParticleRenderTypes.java @@ -14,6 +14,48 @@ import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.client.renderer.texture.TextureManager; public final class ModParticleRenderTypes { + public static final ParticleRenderType IRON_SPARK_PARTICLE = new ParticleRenderType() { + @Override + public BufferBuilder begin(Tesselator tesselator, TextureManager textureManager) { + RenderSystem.enableBlend(); + RenderSystem.depthMask(true); + RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE); + RenderSystem.setShader(ShaderRegistry::getIronSparkParticle); + return tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.PARTICLE); + } + + @Override + public String toString() { + return "lzxnoneterraria:iron_spark_particle"; + } + + @Override + public boolean isTranslucent() { + return false; + } + }; + + public static final ParticleRenderType CIRCLE_PARTICLE = new ParticleRenderType() { + @Override + public BufferBuilder begin(Tesselator tesselator, TextureManager textureManager) { + RenderSystem.enableBlend(); + RenderSystem.depthMask(true); + RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE); + RenderSystem.setShader(ShaderRegistry::getCircleParticle); + return tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.PARTICLE); + } + + @Override + public String toString() { + return "lzxnoneterraria:circle_particle"; + } + + @Override + public boolean isTranslucent() { + return false; + } + }; + public static final ParticleRenderType EMISSIVE_BLOOM_PARTICLE = new ParticleRenderType() { @Override public BufferBuilder begin(Tesselator tesselator, TextureManager textureManager) { diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/blur.fsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/blur.fsh index 71c916c..c4539f9 100644 --- a/src/main/resources/assets/lzxnoneterraria/shaders/core/blur.fsh +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/blur.fsh @@ -9,21 +9,13 @@ out vec4 fragColor; void main() { vec4 sum = texture(Sampler0, texCoord0) * 0.0788; - sum += texture(Sampler0, texCoord0 + Direction * 1.0) * 0.0777; - sum += texture(Sampler0, texCoord0 - Direction * 1.0) * 0.0777; - sum += texture(Sampler0, texCoord0 + Direction * 2.0) * 0.0745; - sum += texture(Sampler0, texCoord0 - Direction * 2.0) * 0.0745; - sum += texture(Sampler0, texCoord0 + Direction * 3.0) * 0.0695; - sum += texture(Sampler0, texCoord0 - Direction * 3.0) * 0.0695; - sum += texture(Sampler0, texCoord0 + Direction * 4.0) * 0.0631; - sum += texture(Sampler0, texCoord0 - Direction * 4.0) * 0.0631; - sum += texture(Sampler0, texCoord0 + Direction * 5.0) * 0.0557; - sum += texture(Sampler0, texCoord0 - Direction * 5.0) * 0.0557; - sum += texture(Sampler0, texCoord0 + Direction * 6.0) * 0.0478; - sum += texture(Sampler0, texCoord0 - Direction * 6.0) * 0.0478; - sum += texture(Sampler0, texCoord0 + Direction * 7.0) * 0.0399; - sum += texture(Sampler0, texCoord0 - Direction * 7.0) * 0.0399; - sum += texture(Sampler0, texCoord0 + Direction * 8.0) * 0.0324; - sum += texture(Sampler0, texCoord0 - Direction * 8.0) * 0.0324; + sum += texture(Sampler0, texCoord0 + Direction * 1.4895) * 0.1522; + sum += texture(Sampler0, texCoord0 - Direction * 1.4895) * 0.1522; + sum += texture(Sampler0, texCoord0 + Direction * 3.4759) * 0.1326; + sum += texture(Sampler0, texCoord0 - Direction * 3.4759) * 0.1326; + sum += texture(Sampler0, texCoord0 + Direction * 5.4618) * 0.1035; + sum += texture(Sampler0, texCoord0 - Direction * 5.4618) * 0.1035; + sum += texture(Sampler0, texCoord0 + Direction * 7.4481) * 0.0723; + sum += texture(Sampler0, texCoord0 - Direction * 7.4481) * 0.0723; fragColor = sum; } diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/circle_particle.fsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/circle_particle.fsh new file mode 100644 index 0000000..cfb9374 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/circle_particle.fsh @@ -0,0 +1,56 @@ +#version 150 + +#moj_import + +uniform vec4 ColorModulator; +uniform float FogStart; +uniform float FogEnd; + +in float vertexDistance; +in vec2 localUv; +in vec4 vertexColor; + +out vec4 fragColor; + +const float CORE_BRIGHTNESS = 3.0; +const float SHELL_BRIGHTNESS = 1.35; +const float AURA_BRIGHTNESS = 0.45; + +float circleCoverage(vec2 p, float radius) { + float distanceFromCenter = length(p); + float antialiasWidth = max(fwidth(distanceFromCenter) * 1.25, 0.001); + return 1.0 - smoothstep( + radius - antialiasWidth, + radius + antialiasWidth, + distanceFromCenter + ); +} + +void main() { + vec2 localPosition = localUv * 2.0 - 1.0; + float auraMask = circleCoverage(localPosition, 0.98); + float bodyMask = circleCoverage(localPosition, 0.72); + float coreMask = circleCoverage(localPosition, 0.30); + if (auraMask < 0.001) { + discard; + } + + float shellMask = max(bodyMask - coreMask, 0.0); + float outerAuraMask = max(auraMask - bodyMask, 0.0); + vec4 particleColor = vertexColor * ColorModulator; + vec3 weightedEmission = + particleColor.rgb * shellMask * SHELL_BRIGHTNESS + + particleColor.rgb * outerAuraMask * AURA_BRIGHTNESS + + vec3(CORE_BRIGHTNESS) * coreMask; + + float shapeAlpha = max( + coreMask, + shellMask * 0.90 + outerAuraMask * 0.40 + ); + // 固定管线还会执行 source.rgb * source.a,因此先去掉颜色中已有的 + // shapeAlpha,确保覆盖率、生命周期和雾都只衰减一次。 + vec3 sourceColor = weightedEmission / max(shapeAlpha, 0.0001); + float fogFade = linear_fog_fade(vertexDistance, FogStart, FogEnd); + float alpha = shapeAlpha * particleColor.a * fogFade; + fragColor = vec4(sourceColor, alpha); +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/circle_particle.json b/src/main/resources/assets/lzxnoneterraria/shaders/core/circle_particle.json new file mode 100644 index 0000000..f4a1ca5 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/circle_particle.json @@ -0,0 +1,15 @@ +{ + "blend": { "func": "add", "srcrgb": "srcalpha", "dstrgb": "1" }, + "vertex": "lzxnoneterraria:circle_particle", + "fragment": "lzxnoneterraria:circle_particle", + "attributes": ["Position", "UV0", "Color", "UV2"], + "samplers": [], + "uniforms": [ + { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0] }, + { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0] }, + { "name": "ColorModulator", "type": "float", "count": 4, "values": [1.0, 1.0, 1.0, 1.0] }, + { "name": "FogStart", "type": "float", "count": 1, "values": [0.0] }, + { "name": "FogEnd", "type": "float", "count": 1, "values": [1.0] }, + { "name": "FogShape", "type": "int", "count": 1, "values": [0] } + ] +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/circle_particle.vsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/circle_particle.vsh new file mode 100644 index 0000000..e52d189 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/circle_particle.vsh @@ -0,0 +1,23 @@ +#version 150 + +#moj_import + +in vec3 Position; +in vec2 UV0; +in vec4 Color; +in ivec2 UV2; + +uniform mat4 ModelViewMat; +uniform mat4 ProjMat; +uniform int FogShape; + +out float vertexDistance; +out vec2 localUv; +out vec4 vertexColor; + +void main() { + gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); + vertexDistance = fog_distance(Position, FogShape); + localUv = UV0; + vertexColor = Color; +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.fsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.fsh index d57316e..2d721fa 100644 --- a/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.fsh +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.fsh @@ -3,9 +3,20 @@ in vec2 texCoord0; uniform sampler2D Sampler0; +uniform vec2 SampleOffset; out vec4 fragColor; void main() { - fragColor = texture(Sampler0, texCoord0); + if(SampleOffset.x == 0.0 && SampleOffset.y == 0.0) { + fragColor = texture(Sampler0, texCoord0); + return; + } + + fragColor = ( + texture(Sampler0, texCoord0 + vec2(-SampleOffset.x, -SampleOffset.y)) + + texture(Sampler0, texCoord0 + vec2(SampleOffset.x, -SampleOffset.y)) + + texture(Sampler0, texCoord0 + vec2(-SampleOffset.x, SampleOffset.y)) + + texture(Sampler0, texCoord0 + vec2(SampleOffset.x, SampleOffset.y)) + ) * 0.25; } diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.json b/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.json index 80a7984..d6a119e 100644 --- a/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.json +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.json @@ -8,5 +8,7 @@ "Position", "UV0" ], - "uniforms": [] + "uniforms": [ + { "name": "SampleOffset", "type": "float", "count": 2, "values": [ 0.0, 0.0 ] } + ] } diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/iron_spark_particle.fsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/iron_spark_particle.fsh new file mode 100644 index 0000000..26fe37e --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/iron_spark_particle.fsh @@ -0,0 +1,66 @@ +#version 150 + +#moj_import + +uniform vec4 ColorModulator; +uniform float FogStart; +uniform float FogEnd; + +in float vertexDistance; +in vec2 localUv; +in vec4 vertexColor; + +out vec4 fragColor; + +const float CORE_BRIGHTNESS = 3.0; +const float SHELL_BRIGHTNESS = 1.35; +const float AURA_BRIGHTNESS = 0.45; + +float superellipseField(vec2 p, float halfLength, float halfWidth) { + vec2 q = abs(p) / vec2(halfLength, halfWidth); + return pow(q.x, 8.0) + q.y * q.y; +} + +float fieldCoverage(float field) { + float antialiasWidth = max(fwidth(field) * 0.75, 0.001); + return 1.0 - smoothstep( + 1.0 - antialiasWidth, + 1.0 + antialiasWidth, + field + ); +} + +void main() { + vec2 localPosition = localUv * 2.0 - 1.0; + float auraMask = fieldCoverage( + superellipseField(localPosition, 0.99, 0.98) + ); + float bodyMask = fieldCoverage( + superellipseField(localPosition, 0.94, 0.68) + ); + float coreMask = fieldCoverage( + superellipseField(localPosition, 0.86, 0.24) + ); + if (auraMask < 0.001) { + discard; + } + + float shellMask = max(bodyMask - coreMask, 0.0); + float outerAuraMask = max(auraMask - bodyMask, 0.0); + vec4 particleColor = vertexColor * ColorModulator; + vec3 weightedEmission = + particleColor.rgb * shellMask * SHELL_BRIGHTNESS + + particleColor.rgb * outerAuraMask * AURA_BRIGHTNESS + + vec3(CORE_BRIGHTNESS) * coreMask; + + float shapeAlpha = max( + coreMask, + shellMask * 0.90 + outerAuraMask * 0.40 + ); + // 固定管线还会执行 source.rgb * source.a,因此先去掉颜色中已有的 + // shapeAlpha,确保覆盖率、生命周期和雾都只衰减一次。 + vec3 sourceColor = weightedEmission / max(shapeAlpha, 0.0001); + float fogFade = linear_fog_fade(vertexDistance, FogStart, FogEnd); + float alpha = shapeAlpha * particleColor.a * fogFade; + fragColor = vec4(sourceColor, alpha); +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/iron_spark_particle.json b/src/main/resources/assets/lzxnoneterraria/shaders/core/iron_spark_particle.json new file mode 100644 index 0000000..c3f889c --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/iron_spark_particle.json @@ -0,0 +1,15 @@ +{ + "blend": { "func": "add", "srcrgb": "srcalpha", "dstrgb": "1" }, + "vertex": "lzxnoneterraria:iron_spark_particle", + "fragment": "lzxnoneterraria:iron_spark_particle", + "attributes": ["Position", "UV0", "Color", "UV2"], + "samplers": [], + "uniforms": [ + { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0] }, + { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0] }, + { "name": "ColorModulator", "type": "float", "count": 4, "values": [1.0, 1.0, 1.0, 1.0] }, + { "name": "FogStart", "type": "float", "count": 1, "values": [0.0] }, + { "name": "FogEnd", "type": "float", "count": 1, "values": [1.0] }, + { "name": "FogShape", "type": "int", "count": 1, "values": [0] } + ] +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/iron_spark_particle.vsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/iron_spark_particle.vsh new file mode 100644 index 0000000..e52d189 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/iron_spark_particle.vsh @@ -0,0 +1,23 @@ +#version 150 + +#moj_import + +in vec3 Position; +in vec2 UV0; +in vec4 Color; +in ivec2 UV2; + +uniform mat4 ModelViewMat; +uniform mat4 ProjMat; +uniform int FogShape; + +out float vertexDistance; +out vec2 localUv; +out vec4 vertexColor; + +void main() { + gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); + vertexDistance = fog_distance(Position, FogShape); + localUv = UV0; + vertexColor = Color; +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/outline.fsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/outline.fsh index 141bac3..9b2a6a2 100644 --- a/src/main/resources/assets/lzxnoneterraria/shaders/core/outline.fsh +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/outline.fsh @@ -3,26 +3,41 @@ in vec2 texCoord0; uniform sampler2D Sampler0; +uniform sampler2D Sampler1; +uniform sampler2D Sampler2; uniform vec2 TexelSize; uniform vec4 OutlineColor; uniform float Radius; +uniform float DepthBias; out vec4 fragColor; void main() { float center = texture(Sampler0, texCoord0).a; - float around = 0.0; - vec2 px = TexelSize * Radius; + float dilated = center; + float outlineDepth = texture(Sampler1, texCoord0).r; + int radius = int(clamp(Radius, 1.0, 4.0)); + int radiusSquared = radius * radius; - around = max(around, texture(Sampler0, texCoord0 + vec2(px.x, 0.0)).a); - around = max(around, texture(Sampler0, texCoord0 - vec2(px.x, 0.0)).a); - around = max(around, texture(Sampler0, texCoord0 + vec2(0.0, px.y)).a); - around = max(around, texture(Sampler0, texCoord0 - vec2(0.0, px.y)).a); - around = max(around, texture(Sampler0, texCoord0 + vec2(px.x, px.y)).a); - around = max(around, texture(Sampler0, texCoord0 + vec2(px.x, -px.y)).a); - around = max(around, texture(Sampler0, texCoord0 + vec2(-px.x, px.y)).a); - around = max(around, texture(Sampler0, texCoord0 - vec2(px.x, px.y)).a); + for(int y = -4; y <= 4; ++y) { + for(int x = -4; x <= 4; ++x) { + if(x * x + y * y > radiusSquared) continue; + + vec2 sampleUv = texCoord0 + vec2(float(x), float(y)) * TexelSize; + float sampleMask = texture(Sampler0, sampleUv).a; + if(sampleMask <= 0.0) continue; + + float sampleDepth = texture(Sampler1, sampleUv).r; + if(sampleMask > dilated || (sampleMask == dilated && sampleDepth < outlineDepth)) { + dilated = sampleMask; + outlineDepth = sampleDepth; + } + } + } + + float outline = max(dilated - center, 0.0); + float sceneDepth = texture(Sampler2, texCoord0).r; + if(outline <= 0.0 || outlineDepth > sceneDepth + DepthBias) discard; - float outline = max(around - center, 0.0); fragColor = vec4(OutlineColor.rgb, outline * OutlineColor.a); } diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/outline.json b/src/main/resources/assets/lzxnoneterraria/shaders/core/outline.json index 4b2aad1..5026b70 100644 --- a/src/main/resources/assets/lzxnoneterraria/shaders/core/outline.json +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/outline.json @@ -2,7 +2,9 @@ "vertex": "lzxnoneterraria:outline", "fragment": "lzxnoneterraria:outline", "samplers": [ - { "name": "Sampler0" } + { "name": "Sampler0" }, + { "name": "Sampler1" }, + { "name": "Sampler2" } ], "attributes": [ "Position", @@ -11,6 +13,7 @@ "uniforms": [ { "name": "TexelSize", "type": "float", "count": 2, "values": [ 0.001, 0.001 ] }, { "name": "OutlineColor", "type": "float", "count": 4, "values": [ 0.8, 0.176, 0.78, 1.0 ] }, - { "name": "Radius", "type": "float", "count": 1, "values": [ 2.0 ] } + { "name": "Radius", "type": "float", "count": 1, "values": [ 2.0 ] }, + { "name": "DepthBias", "type": "float", "count": 1, "values": [ 0.00005 ] } ] } diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/outline_mask.fsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/outline_mask.fsh new file mode 100644 index 0000000..7775516 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/outline_mask.fsh @@ -0,0 +1,13 @@ +#version 150 + +in vec2 texCoord0; + +uniform sampler2D Sampler0; +uniform float AlphaCutoff; + +out vec4 fragColor; + +void main() { + if(texture(Sampler0, texCoord0).a <= AlphaCutoff) discard; + fragColor = vec4(1.0); +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/outline_mask.json b/src/main/resources/assets/lzxnoneterraria/shaders/core/outline_mask.json new file mode 100644 index 0000000..334483f --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/outline_mask.json @@ -0,0 +1,16 @@ +{ + "vertex": "lzxnoneterraria:outline_mask", + "fragment": "lzxnoneterraria:outline_mask", + "samplers": [ + { "name": "Sampler0" } + ], + "attributes": [ + "Position", + "UV0" + ], + "uniforms": [ + { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0] }, + { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0] }, + { "name": "AlphaCutoff", "type": "float", "count": 1, "values": [0.05] } + ] +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/outline_mask.vsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/outline_mask.vsh new file mode 100644 index 0000000..209abf2 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/outline_mask.vsh @@ -0,0 +1,14 @@ +#version 150 + +in vec3 Position; +in vec2 UV0; + +uniform mat4 ModelViewMat; +uniform mat4 ProjMat; + +out vec2 texCoord0; + +void main() { + gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); + texCoord0 = UV0; +}