mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 02:45:13 +00:00
Lots of shader renderlayer work
This commit is contained in:
1 parent
ab170e94dd
commit
363dd5e04c
13 files changed
+192
-163
No files matched your search
@@ -100,7 +100,7 @@ public final class ModelHandler {
|
||||
ClientRegistry.bindTileEntityRenderer(TilePool.TYPE, RenderTilePool::new);
|
||||
ClientRegistry.bindTileEntityRenderer(TileRuneAltar.TYPE, RenderTileRuneAltar::new);
|
||||
ClientRegistry.bindTileEntityRenderer(TilePylon.TYPE, RenderTilePylon::new);
|
||||
ClientRegistry.bindTileEntityRenderer(TileEnchanter.TYPE, new RenderTileEnchanter());
|
||||
ClientRegistry.bindTileEntityRenderer(TileEnchanter.TYPE, RenderTileEnchanter::new);
|
||||
ClientRegistry.bindTileEntityRenderer(TileAlfPortal.TYPE, RenderTileAlfPortal::new);
|
||||
ClientRegistry.bindTileEntityRenderer(TileFloatingFlower.TYPE, renderTileFloatingFlower);
|
||||
// TODO 1.14 this seems highly questionable.
|
||||
@@ -108,7 +108,7 @@ public final class ModelHandler {
|
||||
ClientRegistry.bindTileEntityRenderer(TileTinyPotato.TYPE, new RenderTileTinyPotato());
|
||||
ClientRegistry.bindTileEntityRenderer(TileStarfield.TYPE, new RenderTileStarfield());
|
||||
ClientRegistry.bindTileEntityRenderer(TileBrewery.TYPE, RenderTileBrewery::new);
|
||||
ClientRegistry.bindTileEntityRenderer(TileTerraPlate.TYPE, new RenderTileTerraPlate());
|
||||
ClientRegistry.bindTileEntityRenderer(TileTerraPlate.TYPE, RenderTileTerraPlate::new);
|
||||
ClientRegistry.bindTileEntityRenderer(TileRedStringComparator.TYPE, RenderTileRedString::new);
|
||||
ClientRegistry.bindTileEntityRenderer(TileRedStringContainer.TYPE, RenderTileRedString::new);
|
||||
ClientRegistry.bindTileEntityRenderer(TileRedStringDispenser.TYPE, RenderTileRedString::new);
|
||||
|
||||
@@ -10,12 +10,27 @@
|
||||
*/
|
||||
package vazkii.botania.client.core.helper;
|
||||
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.renderer.BufferBuilder;
|
||||
import net.minecraft.client.renderer.Matrix4f;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public final class IconHelper {
|
||||
/**
|
||||
* Draw an icon into the buffer, using the {@link RenderHelper#ICON_OVERLAY} vertex format
|
||||
*/
|
||||
public static void renderIcon(MatrixStack ms, IVertexBuilder buffer, int x, int y, TextureAtlasSprite icon, int width, int height, float alpha) {
|
||||
Matrix4f mat = ms.peek().getModel();
|
||||
int fullbright = 0xF000F0;
|
||||
buffer.vertex(mat, x, y + height, 0).color(1, 1, 1, alpha).texture(icon.getMinU(), icon.getMaxV()).light(fullbright).endVertex();
|
||||
buffer.vertex(mat, x + width, y + height, 0).color(1, 1, 1, alpha).texture(icon.getMaxU(), icon.getMaxV()).light(fullbright).endVertex();
|
||||
buffer.vertex(mat, x + width, y, 0).color(1, 1, 1, alpha).texture(icon.getMaxU(), icon.getMinV()).light(fullbright).endVertex();
|
||||
buffer.vertex(mat, x, y, 0).color(1, 1, 1, alpha).texture(icon.getMinU(), icon.getMinV()).light(fullbright).endVertex();
|
||||
}
|
||||
|
||||
// todo 1.15 remove this and just render real generated models added using addSpecialModel
|
||||
/**
|
||||
|
||||
@@ -44,34 +44,51 @@ public final class RenderHelper {
|
||||
public static final RenderType LINE_5;
|
||||
public static final RenderType LINE_8;
|
||||
public static final RenderType ICON_OVERLAY;
|
||||
public static final RenderType BABYLON_ICON;
|
||||
public static final RenderType MANA_POOL_WATER;
|
||||
public static final RenderType TERRA_PLATE;
|
||||
public static final RenderType ENCHANTER;
|
||||
|
||||
// todo 1.15 AT's for necessary fields
|
||||
static {
|
||||
RenderState.TransparencyState lightningTransparency = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228512_d_");
|
||||
RenderType.State glState = RenderType.State.builder().shadeModel(new RenderState.ShadeModelState(true))
|
||||
.writeMaskState(new RenderState.WriteMaskState(true, false))
|
||||
RenderState.TransparencyState translucentTransparency = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228515_g_");
|
||||
RenderState.TextureState mipmapBlockAtlasTexture = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228521_m_");
|
||||
RenderState.CullState disableCull = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228491_A_");
|
||||
RenderState.LayerState projectionLayering = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228500_J_");
|
||||
RenderState.WriteMaskState colorMask = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228496_F_");
|
||||
RenderType.ShadeModelState smoothShade = new RenderState.ShadeModelState(true);
|
||||
RenderState.LightmapState enableLightmap = new RenderState.LightmapState(true);
|
||||
|
||||
RenderType.State glState = RenderType.State.builder().shadeModel(smoothShade)
|
||||
.writeMaskState(colorMask)
|
||||
.transparency(lightningTransparency)
|
||||
.build(false);
|
||||
STAR_LAYER = RenderType.of(LibResources.PREFIX_MOD + "star", DefaultVertexFormats.POSITION_COLOR, GL11.GL_TRIANGLES, 256, false, true, glState);
|
||||
|
||||
RenderState.TransparencyState translucentTransparency = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228515_g_");
|
||||
RenderState.CullState disableCull = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228491_A_");
|
||||
glState = RenderType.State.builder().transparency(translucentTransparency).cull(disableCull).build(false);
|
||||
RECTANGLE = RenderType.of(LibResources.PREFIX_MOD + "rectangle_highlight", DefaultVertexFormats.POSITION_COLOR, GL11.GL_QUADS, 256, false, true, glState);
|
||||
CIRCLE = RenderType.of(LibResources.PREFIX_MOD + "circle_highlight", DefaultVertexFormats.POSITION_COLOR, GL11.GL_TRIANGLES, 256, false, true, glState);
|
||||
|
||||
RenderState.LayerState projectionLayering = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228500_J_");
|
||||
RenderState.WriteMaskState colorMask = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228496_F_");
|
||||
|
||||
glState = RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(1))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false);
|
||||
LINE_1 = RenderType.of(LibResources.PREFIX_MOD + "line_1", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 128, glState);
|
||||
glState = RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(4))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false);
|
||||
LINE_4 = RenderType.of(LibResources.PREFIX_MOD + "line_4", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 128, glState);
|
||||
glState = RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(5))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false);
|
||||
LINE_5 = RenderType.of(LibResources.PREFIX_MOD + "line_5", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 64, glState);
|
||||
glState = RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(8))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false);
|
||||
LINE_8 = RenderType.of(LibResources.PREFIX_MOD + "line_8", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 64, glState);
|
||||
|
||||
RenderState.TextureState mipmapBlockAtlasTexture = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228521_m_");
|
||||
glState = RenderType.State.builder().texture(mipmapBlockAtlasTexture).transparency(translucentTransparency).build(true);
|
||||
glState = RenderType.State.builder().texture(mipmapBlockAtlasTexture).transparency(translucentTransparency).lightmap(enableLightmap).build(true);
|
||||
ICON_OVERLAY = RenderType.of(LibResources.PREFIX_MOD + "icon_overlay", DefaultVertexFormats.POSITION_COLOR_TEXTURE_LIGHT, GL11.GL_QUADS, 128, glState);
|
||||
|
||||
RenderState.TextureState babylonTexture = new RenderState.TextureState(new ResourceLocation(LibResources.MISC_BABYLON), false, true);
|
||||
glState = RenderType.State.builder().texture(babylonTexture).transparency(translucentTransparency).cull(disableCull).shadeModel(smoothShade).build(true);
|
||||
BABYLON_ICON = new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.HALO, null, RenderType.of(LibResources.PREFIX_MOD + "babylon", DefaultVertexFormats.POSITION_COLOR_TEXTURE, GL11.GL_QUADS, 64, glState));
|
||||
|
||||
MANA_POOL_WATER = new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.MANA_POOL, null, ICON_OVERLAY);
|
||||
TERRA_PLATE = new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.TERRA_PLATE, null, ICON_OVERLAY);
|
||||
ENCHANTER = new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.ENCHANTER_RUNE, null, ICON_OVERLAY);
|
||||
}
|
||||
|
||||
public static void drawTexturedModalRect(int par1, int par2, float z, int par3, int par4, int par5, int par6) {
|
||||
|
||||
@@ -34,6 +34,7 @@ import java.io.InputStream;
|
||||
import java.nio.FloatBuffer;
|
||||
import java.util.EnumMap;
|
||||
import java.util.Map;
|
||||
import java.util.OptionalInt;
|
||||
|
||||
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
|
||||
|
||||
@@ -89,24 +90,32 @@ public final class ShaderHelper {
|
||||
}
|
||||
}
|
||||
|
||||
public static void useShader(BotaniaShader shader, ShaderCallback callback) {
|
||||
if(!useShaders())
|
||||
return;
|
||||
public static OptionalInt getShader(BotaniaShader shader) {
|
||||
ShaderProgram prog = PROGRAMS.get(shader);
|
||||
return prog == null ? OptionalInt.empty() : OptionalInt.of(prog.getProgram());
|
||||
}
|
||||
|
||||
public static void useShader(BotaniaShader shader, ShaderCallback callback) {
|
||||
ShaderProgram prog = PROGRAMS.get(shader);
|
||||
if(prog == null)
|
||||
return;
|
||||
useShader(prog.getProgram(), callback);
|
||||
}
|
||||
|
||||
public static void useShader(int shader, ShaderCallback callback) {
|
||||
if(!useShaders())
|
||||
return;
|
||||
|
||||
// todo 1.15 is this still necessary? only has an effect without a vsh and we now have passthrough vsh for every program
|
||||
lighting = GL11.glGetBoolean(GL11.GL_LIGHTING);
|
||||
GlStateManager.disableLighting();
|
||||
ShaderLinkHelper.useProgram(prog.getProgram());
|
||||
ShaderLinkHelper.useProgram(shader);
|
||||
|
||||
int time = GlStateManager.getUniformLocation(prog.getProgram(), "time");
|
||||
int time = GlStateManager.getUniformLocation(shader, "time");
|
||||
GlStateManager.uniform1(time, ClientTickHandler.ticksInGame);
|
||||
|
||||
if(callback != null)
|
||||
callback.call(prog.getProgram());
|
||||
callback.call(shader);
|
||||
}
|
||||
|
||||
public static void useShader(BotaniaShader shader) {
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
package vazkii.botania.client.core.helper;
|
||||
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import vazkii.botania.api.internal.ShaderCallback;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
|
||||
public class ShaderWrappedRenderLayer extends RenderType {
|
||||
private final RenderType delegate;
|
||||
private final ShaderHelper.BotaniaShader shader;
|
||||
|
||||
@Nullable
|
||||
private final ShaderCallback cb;
|
||||
|
||||
public ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader shader, @Nullable ShaderCallback cb, RenderType delegate) {
|
||||
super(LibResources.PREFIX_MOD + delegate.toString() + "_with_" + shader.name(), delegate.getVertexFormat(), delegate.getDrawMode(), delegate.getExpectedBufferSize(), delegate.func_228665_s_(), true,
|
||||
() -> {
|
||||
delegate.startDrawing();
|
||||
ShaderHelper.useShader(shader, cb);
|
||||
},
|
||||
() -> {
|
||||
ShaderHelper.releaseShader();
|
||||
delegate.endDrawing();
|
||||
});
|
||||
this.delegate = delegate;
|
||||
this.shader = shader;
|
||||
this.cb = cb;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<RenderType> getTexture() {
|
||||
return delegate.getTexture();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(@Nullable Object other) {
|
||||
return other instanceof ShaderWrappedRenderLayer
|
||||
&& delegate.equals(((ShaderWrappedRenderLayer) other).delegate)
|
||||
&& shader == ((ShaderWrappedRenderLayer) other).shader
|
||||
&& Objects.equals(cb, ((ShaderWrappedRenderLayer) other).cb);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(delegate, shader, cb);
|
||||
}
|
||||
}
|
||||
@@ -12,9 +12,14 @@ package vazkii.botania.client.model;
|
||||
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.entity.model.EntityModel;
|
||||
import net.minecraft.client.renderer.model.ModelRenderer;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.client.core.helper.ShaderWrappedRenderLayer;
|
||||
import vazkii.botania.client.render.entity.RenderPixie;
|
||||
import vazkii.botania.common.entity.EntityPixie;
|
||||
|
||||
public class ModelPixie extends EntityModel<EntityPixie> {
|
||||
@@ -24,7 +29,16 @@ public class ModelPixie extends EntityModel<EntityPixie> {
|
||||
public ModelRenderer rightWingT;
|
||||
public ModelRenderer rightWingB;
|
||||
|
||||
private static boolean evil = false;
|
||||
private static RenderType pixieLayer(ResourceLocation texture) {
|
||||
RenderType normal = RenderType.getEntityCutoutNoCull(texture);
|
||||
return evil
|
||||
? new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.DOPPLEGANGER, RenderPixie.SHADER_CALLBACK, normal)
|
||||
: normal;
|
||||
}
|
||||
|
||||
public ModelPixie() {
|
||||
super(ModelPixie::pixieLayer);
|
||||
textureWidth = 32;
|
||||
textureHeight = 32;
|
||||
|
||||
@@ -68,10 +82,13 @@ public class ModelPixie extends EntityModel<EntityPixie> {
|
||||
|
||||
@Override
|
||||
public void setAngles(EntityPixie entity, float f, float f1, float f2, float f3, float f4) {
|
||||
evil = entity.getPixieType() == 1;
|
||||
rightWingT.rotateAngleY = -(MathHelper.cos(f2 * 1.7F) * (float)Math.PI * 0.5F);
|
||||
leftWingT.rotateAngleY = MathHelper.cos(f2 * 1.7F) * (float)Math.PI * 0.5F;
|
||||
rightWingB.rotateAngleY = -(MathHelper.cos(f2 * 1.7F) * (float)Math.PI * 0.25F);
|
||||
leftWingB.rotateAngleY = MathHelper.cos(f2 * 1.7F) * (float)Math.PI * 0.25F;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -13,9 +13,11 @@ package vazkii.botania.client.render.entity;
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.platform.GLX;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Atlases;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Matrix4f;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderer;
|
||||
@@ -29,6 +31,7 @@ import net.minecraft.util.ResourceLocation;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.common.entity.EntityBabylonWeapon;
|
||||
@@ -54,32 +57,22 @@ public class RenderBabylonWeapon extends EntityRenderer<EntityBabylonWeapon> {
|
||||
float charge = Math.min(10F, Math.max(live, weapon.getChargeTicks()) + partialTicks);
|
||||
float chargeMul = charge / 10F;
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
ms.push();
|
||||
float s = 1.5F;
|
||||
ms.scale(s, s, s);
|
||||
GlStateManager.rotatef(-90F, 0F, 1F, 0F);
|
||||
GlStateManager.rotatef(45F, 0F, 0F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, chargeMul);
|
||||
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F));
|
||||
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(45F));
|
||||
|
||||
// todo 1.15 get the alpha in to the BMR
|
||||
// GlStateManager.color4f(1F, 1F, 1F, chargeMul);
|
||||
|
||||
GlStateManager.disableLighting();
|
||||
IBakedModel model = MiscellaneousIcons.INSTANCE.kingKeyWeaponModels[weapon.getVariety()];
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffers.getBuffer(Atlases.getEntityTranslucent()), null, model, 1, 1, 1, 0xF000F0, OverlayTexture.DEFAULT_UV);
|
||||
ms.pop();
|
||||
|
||||
GlStateManager.disableCull();
|
||||
GlStateManager.shadeModel(GL11.GL_SMOOTH);
|
||||
GlStateManager.color4f(1F, 1F, 1F, chargeMul);
|
||||
|
||||
Minecraft.getInstance().textureManager.bindTexture(babylon);
|
||||
|
||||
Tessellator tes = Tessellator.getInstance();
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.HALO);
|
||||
Random rand = new Random(weapon.getUniqueID().getMostSignificantBits());
|
||||
GlStateManager.rotatef(-90F, 1F, 0F, 0F);
|
||||
GlStateManager.translatef(0F, -0.3F + rand.nextFloat() * 0.1F, 1F);
|
||||
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(-90F));
|
||||
ms.translate(0F, -0.3F + rand.nextFloat() * 0.1F, 1F);
|
||||
|
||||
s = chargeMul;
|
||||
if(live > delay)
|
||||
@@ -87,20 +80,15 @@ public class RenderBabylonWeapon extends EntityRenderer<EntityBabylonWeapon> {
|
||||
s *= 2F;
|
||||
ms.scale(s, s, s);
|
||||
|
||||
GlStateManager.rotatef(charge * 9F + (weapon.ticksExisted + partialTicks) * 0.5F + rand.nextFloat() * 360F, 0F, 1F, 0F);
|
||||
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(charge * 9F + (weapon.ticksExisted + partialTicks) * 0.5F + rand.nextFloat() * 360F));
|
||||
|
||||
tes.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
|
||||
tes.getBuffer().pos(-1, 0, -1).tex(0, 0).endVertex();
|
||||
tes.getBuffer().pos(-1, 0, 1).tex(0, 1).endVertex();
|
||||
tes.getBuffer().pos(1, 0, 1).tex(1, 1).endVertex();
|
||||
tes.getBuffer().pos(1, 0, -1).tex(1, 0).endVertex();
|
||||
tes.draw();
|
||||
IVertexBuilder buffer = buffers.getBuffer(RenderHelper.BABYLON_ICON);
|
||||
Matrix4f mat = ms.peek().getModel();
|
||||
buffer.vertex(mat, -1, 0, -1).color(1, 1, 1, chargeMul).texture(0, 0).endVertex();
|
||||
buffer.vertex(mat, -1, 0, 1).color(1, 1, 1, chargeMul).texture(0, 1).endVertex();
|
||||
buffer.vertex(mat, 1, 0, 1).color(1, 1, 1, chargeMul).texture(1, 1).endVertex();
|
||||
buffer.vertex(mat, 1, 0, -1).color(1, 1, 1, chargeMul).texture(1, 0).endVertex();
|
||||
|
||||
ShaderHelper.releaseShader();
|
||||
|
||||
GlStateManager.enableLighting();
|
||||
GlStateManager.shadeModel(GL11.GL_FLAT);
|
||||
GlStateManager.enableCull();
|
||||
ms.pop();
|
||||
}
|
||||
|
||||
|
||||
@@ -10,12 +10,10 @@
|
||||
*/
|
||||
package vazkii.botania.client.render.entity;
|
||||
|
||||
import com.mojang.blaze3d.platform.GLX;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.renderer.entity.EntityRendererManager;
|
||||
import net.minecraft.client.renderer.entity.MobRenderer;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.api.internal.ShaderCallback;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
@@ -26,7 +24,7 @@ import javax.annotation.Nonnull;
|
||||
|
||||
public class RenderPixie extends MobRenderer<EntityPixie, ModelPixie> {
|
||||
|
||||
private final ShaderCallback callback = shader -> {
|
||||
public static final ShaderCallback SHADER_CALLBACK = shader -> {
|
||||
// Frag Uniforms
|
||||
int disfigurationUniform = GlStateManager.getUniformLocation(shader, "disfiguration");
|
||||
ShaderHelper.FLOAT_BUF.position(0);
|
||||
@@ -49,13 +47,4 @@ public class RenderPixie extends MobRenderer<EntityPixie, ModelPixie> {
|
||||
public ResourceLocation getEntityTexture(@Nonnull EntityPixie entity) {
|
||||
return new ResourceLocation(LibResources.MODEL_PIXIE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doRender(@Nonnull EntityPixie pixie, double par2, double par4, double par6, float par8, float par9) {
|
||||
if(pixie.getPixieType() == 1)
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.DOPPLEGANGER, callback);
|
||||
super.doRender(pixie, par2, par4, par6, par8, par9);
|
||||
if(pixie.getPixieType() == 1)
|
||||
ShaderHelper.releaseShader();
|
||||
}
|
||||
}
|
||||
@@ -10,18 +10,25 @@
|
||||
*/
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.platform.GLX;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderer;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.entity.item.ItemEntity;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.client.core.proxy.ClientProxy;
|
||||
import vazkii.botania.common.block.tile.TileEnchanter;
|
||||
@@ -32,8 +39,12 @@ public class RenderTileEnchanter extends TileEntityRenderer<TileEnchanter> {
|
||||
|
||||
private ItemEntity item;
|
||||
|
||||
public RenderTileEnchanter(TileEntityRendererDispatcher manager) {
|
||||
super(manager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(@Nonnull TileEnchanter enchanter, double d0, double d1, double d2, float f, int digProgress) {
|
||||
public void render(@Nonnull TileEnchanter enchanter, float f, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
|
||||
float alphaMod = 0F;
|
||||
|
||||
if(enchanter.stage == TileEnchanter.State.GATHER_MANA)
|
||||
@@ -50,68 +61,34 @@ public class RenderTileEnchanter extends TileEntityRenderer<TileEnchanter> {
|
||||
item.age = ClientTickHandler.ticksInGame;
|
||||
item.setItem(enchanter.itemToEnchant);
|
||||
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translatef(0.5F, 1.25F, 0.5F);
|
||||
((EntityRenderer) Minecraft.getInstance().getRenderManager().renderers.get(ItemEntity.class)).doRender(item, d0, d1, d2, 1F, f);
|
||||
GlStateManager.translatef(-0.5F, -1.25F, -0.5F);
|
||||
ms.translate(0.5F, 1.25F, 0.5F);
|
||||
Minecraft.getInstance().getRenderManager().render(item, 0, 0, 0, 0, f, ms, buffers, light);
|
||||
ms.translate(-0.5F, -1.25F, -0.5F);
|
||||
}
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translated(d0, d1, d2);
|
||||
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90F));
|
||||
ms.translate(-2F, -2F, -0.001F);
|
||||
|
||||
GlStateManager.rotatef(90F, 1F, 0F, 0F);
|
||||
GlStateManager.translatef(-2F, -2F, -0.001F);
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.disableAlphaTest();
|
||||
float alpha = (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 8D) + 1D) / 5D + 0.4D) * alphaMod;
|
||||
|
||||
if(alpha > 0) {
|
||||
if(ShaderHelper.useShaders())
|
||||
GlStateManager.color4f(1F, 1F, 1F, alpha);
|
||||
else {
|
||||
int light = 15728880;
|
||||
int lightmapX = light % 65536;
|
||||
int lightmapY = light / 65536;
|
||||
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY);
|
||||
GlStateManager.color4f(0.6F + (float) ((Math.cos((ClientTickHandler.ticksInGame + f) / 6D) + 1D) / 5D), 0.1F, 0.9F, alpha);
|
||||
}
|
||||
|
||||
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
|
||||
|
||||
if(enchanter.stage == TileEnchanter.State.DO_ENCHANT || enchanter.stage == TileEnchanter.State.RESET) {
|
||||
int ticks = enchanter.stageTicks + enchanter.stage3EndTicks;
|
||||
int angle = ticks * 2;
|
||||
float yTranslation = Math.min(20, ticks) / 20F * 1.15F;
|
||||
float scale = ticks < 10 ? 1F : 1F - Math.min(20, ticks - 10) / 20F * 0.75F;
|
||||
|
||||
GlStateManager.translatef(2.5F, 2.5F, -yTranslation);
|
||||
GlStateManager.scalef(scale, scale, 1F);
|
||||
GlStateManager.rotatef(angle, 0F, 0F, 1F);
|
||||
GlStateManager.translatef(-2.5F, -2.5F, 0F);
|
||||
ms.translate(2.5F, 2.5F, -yTranslation);
|
||||
ms.scale(scale, scale, 1F);
|
||||
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(angle));
|
||||
ms.translate(-2.5F, -2.5F, 0F);
|
||||
}
|
||||
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.ENCHANTER_RUNE);
|
||||
renderIcon(0, 0, MiscellaneousIcons.INSTANCE.enchanterOverlay, 5, 5, 240);
|
||||
ShaderHelper.releaseShader();
|
||||
IVertexBuilder buffer = buffers.getBuffer(RenderHelper.ENCHANTER);
|
||||
IconHelper.renderIcon(ms, buffer, 0, 0, MiscellaneousIcons.INSTANCE.enchanterOverlay, 5, 5, 240);
|
||||
}
|
||||
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
private void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) {
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
tessellator.getBuffer().begin(GL11.GL_QUADS, ClientProxy.POSITION_TEX_LMAP);
|
||||
tessellator.getBuffer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).lightmap(brightness, brightness).endVertex();
|
||||
tessellator.getBuffer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).lightmap(brightness, brightness).endVertex();
|
||||
tessellator.getBuffer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).lightmap(brightness, brightness).endVertex();
|
||||
tessellator.getBuffer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).lightmap(brightness, brightness).endVertex();
|
||||
tessellator.draw();
|
||||
ms.pop();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -11,7 +11,6 @@
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
@@ -19,21 +18,16 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Matrix4f;
|
||||
import net.minecraft.client.renderer.RenderTypeLookup;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.api.mana.IPoolOverlayProvider;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.client.core.proxy.ClientProxy;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.mana.BlockPool;
|
||||
import vazkii.botania.common.block.tile.mana.TilePool;
|
||||
|
||||
@@ -104,7 +98,7 @@ public class RenderTilePool extends TileEntityRenderer<TilePool> {
|
||||
ms.scale(s, s, s);
|
||||
|
||||
IVertexBuilder buffer = buffers.getBuffer(RenderHelper.ICON_OVERLAY);
|
||||
renderIcon(ms, buffer, 0, 0, overlayIcon, 16, 16, alpha);
|
||||
renderIcon(ms, buffer, overlayIcon, alpha);
|
||||
|
||||
ms.pop();
|
||||
}
|
||||
@@ -118,9 +112,8 @@ public class RenderTilePool extends TileEntityRenderer<TilePool> {
|
||||
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90F));
|
||||
ms.scale(s, s, s);
|
||||
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.MANA_POOL);
|
||||
renderIcon(ms, buffers, MiscellaneousIcons.INSTANCE.manaWater, 16, 16, 1);
|
||||
ShaderHelper.releaseShader();
|
||||
IVertexBuilder buffer = buffers.getBuffer(RenderHelper.MANA_POOL_WATER);
|
||||
IconHelper.renderIcon(ms, buffer, 0, 0, MiscellaneousIcons.INSTANCE.manaWater, 16, 16, 1);
|
||||
|
||||
ms.pop();
|
||||
}
|
||||
@@ -129,13 +122,4 @@ public class RenderTilePool extends TileEntityRenderer<TilePool> {
|
||||
cartMana = -1;
|
||||
}
|
||||
|
||||
private void renderIcon(MatrixStack ms, IVertexBuilder buffer, int x, int y, TextureAtlasSprite icon, int width, int height, float alpha) {
|
||||
Matrix4f mat = ms.peek().getModel();
|
||||
int fullbright = 0xF000F0;
|
||||
buffer.vertex(mat, x, y + height, 0).color(1, 1, 1, alpha).texture(icon.getMinU(), icon.getMaxV()).light(fullbright).endVertex();
|
||||
buffer.vertex(mat, x + width, y + height, 0).color(1, 1, 1, alpha).texture(icon.getMaxU(), icon.getMaxV()).light(fullbright).endVertex();
|
||||
buffer.vertex(mat, x + width, y, 0).color(1, 1, 1, alpha).texture(icon.getMaxU(), icon.getMinV()).light(fullbright).endVertex();
|
||||
buffer.vertex(mat, x, y, 0).color(1, 1, 1, alpha).texture(icon.getMinU(), icon.getMinV()).light(fullbright).endVertex();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -10,16 +10,24 @@
|
||||
*/
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.platform.GLX;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Matrix4f;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.client.core.proxy.ClientProxy;
|
||||
import vazkii.botania.common.block.tile.TileTerraPlate;
|
||||
@@ -28,51 +36,26 @@ import javax.annotation.Nonnull;
|
||||
|
||||
public class RenderTileTerraPlate extends TileEntityRenderer<TileTerraPlate> {
|
||||
|
||||
public RenderTileTerraPlate(TileEntityRendererDispatcher manager) {
|
||||
super(manager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(@Nonnull TileTerraPlate plate, double d0, double d1, double d2, float f, int digProgress) {
|
||||
public void render(@Nonnull TileTerraPlate plate, float f, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
|
||||
float max = TileTerraPlate.MAX_MANA / 10F;
|
||||
float alphaMod = Math.min(max, plate.getCurrentMana()) / max;
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translated(d0, d1, d2);
|
||||
|
||||
GlStateManager.rotatef(90F, 1F, 0F, 0F);
|
||||
GlStateManager.translatef(0F, 0F, -3F / 16F - 0.001F);
|
||||
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90F));
|
||||
ms.translate(0F, 0F, -3F / 16F - 0.001F);
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.disableAlphaTest();
|
||||
float alpha = (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 8D) + 1D) / 5D + 0.6D) * alphaMod;
|
||||
if(ShaderHelper.useShaders())
|
||||
GlStateManager.color4f(1F, 1F, 1F, alpha);
|
||||
else {
|
||||
int light = 15728880;
|
||||
int lightmapX = light % 65536;
|
||||
int lightmapY = light / 65536;
|
||||
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY);
|
||||
GlStateManager.color4f(0.6F + (float) ((Math.cos((ClientTickHandler.ticksInGame + f) / 6D) + 1D) / 5D), 0.1F, 0.9F, alpha);
|
||||
}
|
||||
|
||||
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
|
||||
IVertexBuilder buffer = buffers.getBuffer(RenderHelper.TERRA_PLATE);
|
||||
IconHelper.renderIcon(ms, buffer, 0, 0, MiscellaneousIcons.INSTANCE.terraPlateOverlay, 1, 1, alpha);
|
||||
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.TERRA_PLATE);
|
||||
renderIcon(0, 0, MiscellaneousIcons.INSTANCE.terraPlateOverlay, 1, 1, 240);
|
||||
ShaderHelper.releaseShader();
|
||||
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.popMatrix();
|
||||
ms.pop();
|
||||
}
|
||||
|
||||
public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) {
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
tessellator.getBuffer().begin(GL11.GL_QUADS, ClientProxy.POSITION_TEX_LMAP);
|
||||
tessellator.getBuffer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).lightmap(brightness, brightness).endVertex();
|
||||
tessellator.getBuffer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).lightmap(brightness, brightness).endVertex();
|
||||
tessellator.getBuffer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).lightmap(brightness, brightness).endVertex();
|
||||
tessellator.getBuffer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).lightmap(brightness, brightness).endVertex();
|
||||
tessellator.draw();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -950,7 +950,7 @@ public class EntityDoppleganger extends MobEntity implements IBotaniaBoss, IEnti
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public int getBossBarShaderProgram(boolean background) {
|
||||
return background ? 0 : ShaderHelper.dopplegangerBar;
|
||||
return background ? 0 : ShaderHelper.getShader(ShaderHelper.BotaniaShader.DOPPLEGANGER_BAR).orElse(0);
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
|
||||
@@ -304,7 +304,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
|
||||
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
|
||||
int meta = getVariant(stack);
|
||||
if(meta > 0 && meta <= MiscellaneousIcons.INSTANCE.tiaraWingIcons.length) {
|
||||
IBakedModel icon = MiscellaneousIcons.INSTANCE.tiaraWingIcons[meta - 1];
|
||||
IBakedModel model = MiscellaneousIcons.INSTANCE.tiaraWingIcons[meta - 1];
|
||||
|
||||
boolean flying = ((PlayerEntity) player).abilities.isFlying;
|
||||
|
||||
|
||||
Reference in new issue
Block a user