mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 11:49:37 +00:00
Enumify shaders in prep for renderlayers using them
This commit is contained in:
1 parent
601b6ce550
commit
ab170e94dd
19 files changed
+169
-378
No files matched your search
@@ -59,7 +59,7 @@ public final class AstrolabePreviewHandler {
|
||||
}
|
||||
}
|
||||
|
||||
ShaderHelper.useShader(ShaderHelper.alpha, shader -> {
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.ALPHA, shader -> {
|
||||
int alpha = GlStateManager.getUniformLocation(shader, "alpha");
|
||||
ShaderHelper.FLOAT_BUF.position(0);
|
||||
ShaderHelper.FLOAT_BUF.put(0, 0.4F);
|
||||
|
||||
@@ -140,7 +140,7 @@ public final class ContributorFancinessHandler extends LayerRenderer<AbstractCli
|
||||
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90));
|
||||
ms.scale(0.5F, 0.5F, 0.5F);
|
||||
// todo 1.15 shader
|
||||
ShaderHelper.useShader(ShaderHelper.gold);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.GOLD);
|
||||
Minecraft.getInstance().getItemRenderer().renderItem(player, flower, ItemCameraTransforms.TransformType.NONE, false, ms, buffers, player.world, 0xF000F0, OverlayTexture.DEFAULT_UV);
|
||||
ShaderHelper.releaseShader();
|
||||
ms.pop();
|
||||
|
||||
@@ -14,7 +14,6 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.renderer.BufferBuilder;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Matrix4f;
|
||||
@@ -44,6 +43,7 @@ public final class RenderHelper {
|
||||
public static final RenderType LINE_4;
|
||||
public static final RenderType LINE_5;
|
||||
public static final RenderType LINE_8;
|
||||
public static final RenderType ICON_OVERLAY;
|
||||
|
||||
// todo 1.15 AT's for necessary fields
|
||||
static {
|
||||
@@ -63,10 +63,15 @@ public final class RenderHelper {
|
||||
RenderState.LayerState projectionLayering = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228500_J_");
|
||||
RenderState.WriteMaskState colorMask = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228496_F_");
|
||||
|
||||
LINE_1 = RenderType.of(LibResources.PREFIX_MOD + "line_1", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 128, RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(1))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false));
|
||||
LINE_4 = RenderType.of(LibResources.PREFIX_MOD + "line_4", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 128, RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(4))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false));
|
||||
LINE_5 = RenderType.of(LibResources.PREFIX_MOD + "line_5", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 64, RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(5))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false));
|
||||
LINE_8 = RenderType.of(LibResources.PREFIX_MOD + "line_8", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 64, RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(8))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false));
|
||||
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);
|
||||
LINE_4 = RenderType.of(LibResources.PREFIX_MOD + "line_4", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 128, glState);
|
||||
LINE_5 = RenderType.of(LibResources.PREFIX_MOD + "line_5", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 64, glState);
|
||||
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);
|
||||
ICON_OVERLAY = RenderType.of(LibResources.PREFIX_MOD + "icon_overlay", DefaultVertexFormats.POSITION_COLOR_TEXTURE_LIGHT, GL11.GL_QUADS, 128, glState);
|
||||
}
|
||||
|
||||
public static void drawTexturedModalRect(int par1, int par2, float z, int par3, int par4, int par5, int par6) {
|
||||
|
||||
@@ -10,58 +10,62 @@
|
||||
*/
|
||||
package vazkii.botania.client.core.helper;
|
||||
|
||||
import com.mojang.blaze3d.platform.GLX;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.shader.IShaderManager;
|
||||
import net.minecraft.client.shader.ShaderLinkHelper;
|
||||
import net.minecraft.client.shader.ShaderLoader;
|
||||
import net.minecraft.resources.IReloadableResourceManager;
|
||||
import net.minecraft.resources.IResourceManager;
|
||||
import net.minecraft.resources.IResourceManagerReloadListener;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.fml.ModList;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL20;
|
||||
import org.lwjgl.system.MemoryUtil;
|
||||
import vazkii.botania.api.internal.ShaderCallback;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.nio.FloatBuffer;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.EnumMap;
|
||||
import java.util.Map;
|
||||
|
||||
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
|
||||
|
||||
public final class ShaderHelper {
|
||||
public enum BotaniaShader {
|
||||
PYLON_GLOW(LibResources.SHADER_PASSTHROUGH_VERT, LibResources.SHADER_PYLON_GLOW_FRAG),
|
||||
ENCHANTER_RUNE(LibResources.SHADER_PASSTHROUGH_VERT, LibResources.SHADER_ENCHANTER_RUNE_FRAG),
|
||||
MANA_POOL(LibResources.SHADER_PASSTHROUGH_VERT, LibResources.SHADER_MANA_POOL_FRAG),
|
||||
DOPPLEGANGER(LibResources.SHADER_DOPLLEGANGER_VERT, LibResources.SHADER_DOPLLEGANGER_FRAG),
|
||||
HALO(LibResources.SHADER_PASSTHROUGH_VERT, LibResources.SHADER_HALO_FRAG),
|
||||
DOPPLEGANGER_BAR(LibResources.SHADER_PASSTHROUGH_VERT, LibResources.SHADER_DOPLLEGANGER_BAR_FRAG),
|
||||
TERRA_PLATE(LibResources.SHADER_PASSTHROUGH_VERT, LibResources.SHADER_TERRA_PLATE_RUNE_FRAG),
|
||||
FILM_GRAIN(LibResources.SHADER_PASSTHROUGH_VERT, LibResources.SHADER_FILM_GRAIN_FRAG),
|
||||
GOLD(LibResources.SHADER_PASSTHROUGH_VERT, LibResources.SHADER_GOLD_FRAG),
|
||||
ALPHA(LibResources.SHADER_PASSTHROUGH_VERT, LibResources.SHADER_ALPHA_FRAG);
|
||||
|
||||
public final String vertexShaderPath;
|
||||
public final String fragmentShaderPath;
|
||||
|
||||
BotaniaShader(String vertexShaderPath, String fragmentShaderPath) {
|
||||
this.vertexShaderPath = vertexShaderPath;
|
||||
this.fragmentShaderPath = fragmentShaderPath;
|
||||
}
|
||||
}
|
||||
// Scratch buffer to use for uniforms
|
||||
public static final FloatBuffer FLOAT_BUF = MemoryUtil.memAllocFloat(1);
|
||||
public static int pylonGlow = 0;
|
||||
public static int enchanterRune = 0;
|
||||
public static int manaPool = 0;
|
||||
public static int doppleganger = 0;
|
||||
public static int halo = 0;
|
||||
public static int dopplegangerBar = 0;
|
||||
public static int terraPlateRune = 0;
|
||||
public static int filmGrain = 0;
|
||||
public static int gold = 0;
|
||||
public static int categoryButton = 0;
|
||||
public static int alpha = 0;
|
||||
private static final Map<BotaniaShader, ShaderProgram> PROGRAMS = new EnumMap<>(BotaniaShader.class);
|
||||
|
||||
private static boolean hasIncompatibleMods = false;
|
||||
private static boolean checkedIncompatibility = false;
|
||||
private static boolean lighting;
|
||||
|
||||
private static void deleteProgram(int id) {
|
||||
if (id != 0) {
|
||||
GlStateManager.deleteProgram(id);
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public static void initShaders() {
|
||||
// Can be null when running datagenerators due to the unfortunate time we call this
|
||||
@@ -69,29 +73,8 @@ public final class ShaderHelper {
|
||||
&& Minecraft.getInstance().getResourceManager() instanceof IReloadableResourceManager) {
|
||||
((IReloadableResourceManager) Minecraft.getInstance().getResourceManager()).addReloadListener(
|
||||
(IResourceManagerReloadListener) manager -> {
|
||||
deleteProgram(pylonGlow);
|
||||
pylonGlow = 0;
|
||||
deleteProgram(enchanterRune);
|
||||
enchanterRune = 0;
|
||||
deleteProgram(manaPool);
|
||||
manaPool = 0;
|
||||
deleteProgram(doppleganger);
|
||||
doppleganger = 0;
|
||||
deleteProgram(halo);
|
||||
halo = 0;
|
||||
deleteProgram(dopplegangerBar);
|
||||
dopplegangerBar = 0;
|
||||
deleteProgram(terraPlateRune);
|
||||
terraPlateRune = 0;
|
||||
deleteProgram(filmGrain);
|
||||
filmGrain = 0;
|
||||
deleteProgram(gold);
|
||||
gold = 0;
|
||||
deleteProgram(categoryButton);
|
||||
categoryButton = 0;
|
||||
deleteProgram(alpha);
|
||||
alpha = 0;
|
||||
|
||||
PROGRAMS.values().forEach(ShaderLinkHelper::deleteShader);
|
||||
PROGRAMS.clear();
|
||||
loadShaders(manager);
|
||||
});
|
||||
}
|
||||
@@ -101,48 +84,43 @@ public final class ShaderHelper {
|
||||
if(!useShaders())
|
||||
return;
|
||||
|
||||
pylonGlow = createProgram(manager, null, LibResources.SHADER_PYLON_GLOW_FRAG);
|
||||
enchanterRune = createProgram(manager, null, LibResources.SHADER_ENCHANTER_RUNE_FRAG);
|
||||
manaPool = createProgram(manager, null, LibResources.SHADER_MANA_POOL_FRAG);
|
||||
doppleganger = createProgram(manager, LibResources.SHADER_DOPLLEGANGER_VERT, LibResources.SHADER_DOPLLEGANGER_FRAG);
|
||||
halo = createProgram(manager, null, LibResources.SHADER_HALO_FRAG);
|
||||
dopplegangerBar = createProgram(manager, null, LibResources.SHADER_DOPLLEGANGER_BAR_FRAG);
|
||||
terraPlateRune = createProgram(manager, null, LibResources.SHADER_TERRA_PLATE_RUNE_FRAG);
|
||||
filmGrain = createProgram(manager, null, LibResources.SHADER_FILM_GRAIN_FRAG);
|
||||
gold = createProgram(manager, null, LibResources.SHADER_GOLD_FRAG);
|
||||
categoryButton = createProgram(manager, null, LibResources.SHADER_CATEGORY_BUTTON_FRAG);
|
||||
alpha = createProgram(manager, LibResources.SHADER_ALPHA_VERT, LibResources.SHADER_ALPHA_FRAG);
|
||||
}
|
||||
|
||||
public static void useShader(int shader, ShaderCallback callback) {
|
||||
if(!useShaders())
|
||||
return;
|
||||
|
||||
lighting = GL11.glGetBoolean(GL11.GL_LIGHTING);
|
||||
GlStateManager.disableLighting();
|
||||
GlStateManager.useProgram(shader);
|
||||
|
||||
if(shader != 0) {
|
||||
int time = GlStateManager.getUniformLocation(shader, "time");
|
||||
GlStateManager.uniform1(time, ClientTickHandler.ticksInGame);
|
||||
|
||||
if(callback != null)
|
||||
callback.call(shader);
|
||||
for (BotaniaShader shader : BotaniaShader.values()) {
|
||||
createProgram(manager, shader);
|
||||
}
|
||||
}
|
||||
|
||||
public static void useShader(int shader) {
|
||||
public static void useShader(BotaniaShader shader, ShaderCallback callback) {
|
||||
if(!useShaders())
|
||||
return;
|
||||
|
||||
ShaderProgram prog = PROGRAMS.get(shader);
|
||||
if(prog == null)
|
||||
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());
|
||||
|
||||
int time = GlStateManager.getUniformLocation(prog.getProgram(), "time");
|
||||
GlStateManager.uniform1(time, ClientTickHandler.ticksInGame);
|
||||
|
||||
if(callback != null)
|
||||
callback.call(prog.getProgram());
|
||||
}
|
||||
|
||||
public static void useShader(BotaniaShader shader) {
|
||||
useShader(shader, null);
|
||||
}
|
||||
|
||||
public static void releaseShader() {
|
||||
// todo 1.15 see above
|
||||
if(lighting)
|
||||
GlStateManager.enableLighting();
|
||||
useShader(0);
|
||||
ShaderLinkHelper.useProgram(0);
|
||||
}
|
||||
|
||||
public static boolean useShaders() {
|
||||
// usePostProcess equivalent to hasShaders
|
||||
return ConfigHandler.CLIENT.useShaders.get() && checkIncompatibleMods();
|
||||
}
|
||||
|
||||
@@ -155,65 +133,55 @@ public final class ShaderHelper {
|
||||
return !hasIncompatibleMods;
|
||||
}
|
||||
|
||||
private static int createProgram(IResourceManager manager, String vert, String frag) {
|
||||
int vertId = 0, fragId = 0, program;
|
||||
if(vert != null)
|
||||
vertId = createShader(manager, vert, GL20.GL_VERTEX_SHADER);
|
||||
if(frag != null)
|
||||
fragId = createShader(manager, frag, GL20.GL_FRAGMENT_SHADER);
|
||||
|
||||
program = GlStateManager.createProgram();
|
||||
if(program == 0)
|
||||
return 0;
|
||||
|
||||
if(vert != null)
|
||||
GlStateManager.attachShader(program, vertId);
|
||||
if(frag != null)
|
||||
GlStateManager.attachShader(program, fragId);
|
||||
|
||||
GlStateManager.linkProgram(program);
|
||||
if (GlStateManager.getProgram(program, GL20.GL_LINK_STATUS) == GL11.GL_FALSE) {
|
||||
Botania.LOGGER.warn("Error encountered when linking program containing VS {} and FS {}. Log output:", vert, frag);
|
||||
Botania.LOGGER.warn(GlStateManager.getProgramInfoLog(program, 32768));
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Free the shader immediately, it will stay alive until the program is deleted
|
||||
GlStateManager.deleteShader(vertId);
|
||||
GlStateManager.deleteShader(fragId);
|
||||
|
||||
return program;
|
||||
}
|
||||
|
||||
private static int createShader(IResourceManager manager, String filename, int shaderType){
|
||||
int shader = 0;
|
||||
private static void createProgram(IResourceManager manager, BotaniaShader shader) {
|
||||
try {
|
||||
shader = GlStateManager.createShader(shaderType);
|
||||
|
||||
if(shader == 0)
|
||||
return 0;
|
||||
|
||||
GlStateManager.shaderSource(shader, readFileAsString(manager, filename));
|
||||
GlStateManager.compileShader(shader);
|
||||
|
||||
if (GlStateManager.getShader(shader, GL20.GL_COMPILE_STATUS) == GL11.GL_FALSE) {
|
||||
String s1 = StringUtils.trim(GlStateManager.getShaderInfoLog(shader, 32768));
|
||||
throw new IOException("Couldn't compile " + filename + ": " + s1);
|
||||
}
|
||||
|
||||
return shader;
|
||||
} catch(Exception e) {
|
||||
GlStateManager.deleteShader(shader);
|
||||
e.printStackTrace();
|
||||
return -1;
|
||||
ShaderLoader vert = createShader(manager, shader.vertexShaderPath, ShaderLoader.ShaderType.VERTEX);
|
||||
ShaderLoader frag = createShader(manager, shader.fragmentShaderPath, ShaderLoader.ShaderType.FRAGMENT);
|
||||
int progId = ShaderLinkHelper.createProgram();
|
||||
ShaderProgram prog = new ShaderProgram(progId, vert, frag);
|
||||
ShaderLinkHelper.linkProgram(prog);
|
||||
PROGRAMS.put(shader, prog);
|
||||
} catch (IOException ex) {
|
||||
Botania.LOGGER.error("Failed to load program {}", shader.name(), ex);
|
||||
}
|
||||
}
|
||||
|
||||
private static String readFileAsString(IResourceManager manager, String filename) throws Exception {
|
||||
InputStream in = manager.getResource(new ResourceLocation(LibMisc.MOD_ID, filename)).getInputStream();
|
||||
private static ShaderLoader createShader(IResourceManager manager, String filename, ShaderLoader.ShaderType shaderType) throws IOException {
|
||||
ResourceLocation loc = prefix(filename);
|
||||
try (InputStream is = new BufferedInputStream(manager.getResource(loc).getInputStream())) {
|
||||
return ShaderLoader.func_216534_a(shaderType, loc.toString(), is);
|
||||
}
|
||||
}
|
||||
|
||||
try (BufferedReader reader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))) {
|
||||
return reader.lines().collect(Collectors.joining("\n"));
|
||||
private static class ShaderProgram implements IShaderManager {
|
||||
private final int program;
|
||||
private final ShaderLoader vert;
|
||||
private final ShaderLoader frag;
|
||||
|
||||
private ShaderProgram(int program, ShaderLoader vert, ShaderLoader frag) {
|
||||
this.program = program;
|
||||
this.vert = vert;
|
||||
this.frag = frag;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getProgram() {
|
||||
return program;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void markDirty() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public ShaderLoader getVertexShaderLoader() {
|
||||
return vert;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ShaderLoader getFragmentShaderLoader() {
|
||||
return frag;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.fx;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.particle.IParticleRenderType;
|
||||
import net.minecraft.client.particle.Particle;
|
||||
@@ -174,20 +175,20 @@ public class FXSparkle extends Particle {
|
||||
}
|
||||
|
||||
private static void beginRenderCommon(BufferBuilder buffer, TextureManager textureManager) {
|
||||
GlStateManager.depthMask(false);
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
|
||||
GlStateManager.alphaFunc(GL11.GL_GREATER, 0.003921569F);
|
||||
GlStateManager.disableLighting();
|
||||
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 0.75F);
|
||||
RenderSystem.depthMask(false);
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
|
||||
RenderSystem.alphaFunc(GL11.GL_GREATER, 0.003921569F);
|
||||
RenderSystem.disableLighting();
|
||||
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 0.75F);
|
||||
textureManager.bindTexture(ConfigHandler.CLIENT.matrixMode.get() ? vanillaParticles : particles);
|
||||
buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
|
||||
}
|
||||
|
||||
private static void endRenderCommon() {
|
||||
GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F);
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.depthMask(true);
|
||||
RenderSystem.alphaFunc(GL11.GL_GREATER, 0.1F);
|
||||
RenderSystem.disableBlend();
|
||||
RenderSystem.depthMask(true);
|
||||
}
|
||||
|
||||
private static final IParticleRenderType NORMAL_RENDER = new IParticleRenderType() {
|
||||
@@ -212,7 +213,7 @@ public class FXSparkle extends Particle {
|
||||
@Override
|
||||
public void beginRender(BufferBuilder bufferBuilder, TextureManager textureManager) {
|
||||
beginRenderCommon(bufferBuilder, textureManager);
|
||||
ShaderHelper.useShader(ShaderHelper.filmGrain);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.FILM_GRAIN);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -149,6 +149,6 @@ public final class LibResources {
|
||||
public static final String SHADER_GOLD_FRAG = PREFIX_SHADER + "gold.frag";
|
||||
public static final String SHADER_CATEGORY_BUTTON_FRAG = PREFIX_SHADER + "category_button.frag";
|
||||
public static final String SHADER_ALPHA_FRAG = PREFIX_SHADER + "alpha.frag";
|
||||
public static final String SHADER_ALPHA_VERT = PREFIX_SHADER + "alpha.vert";
|
||||
public static final String SHADER_PASSTHROUGH_VERT = PREFIX_SHADER + "passthrough.vert";
|
||||
|
||||
}
|
||||
@@ -76,7 +76,7 @@ public class RenderBabylonWeapon extends EntityRenderer<EntityBabylonWeapon> {
|
||||
Minecraft.getInstance().textureManager.bindTexture(babylon);
|
||||
|
||||
Tessellator tes = Tessellator.getInstance();
|
||||
ShaderHelper.useShader(ShaderHelper.halo);
|
||||
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);
|
||||
|
||||
@@ -77,7 +77,7 @@ public class RenderDoppleganger extends BipedRenderer<EntityDoppleganger, BipedM
|
||||
grainIntensity = 0.05F + dopple.hurtTime * ((1F - 0.15F) / 10F);
|
||||
}
|
||||
|
||||
ShaderHelper.useShader(ShaderHelper.doppleganger, callback);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.DOPPLEGANGER, callback);
|
||||
super.doRender(dopple, par2, par4, par6, par8, par9);
|
||||
ShaderHelper.releaseShader();
|
||||
}
|
||||
|
||||
@@ -53,7 +53,7 @@ public class RenderPixie extends MobRenderer<EntityPixie, ModelPixie> {
|
||||
@Override
|
||||
public void doRender(@Nonnull EntityPixie pixie, double par2, double par4, double par6, float par8, float par9) {
|
||||
if(pixie.getPixieType() == 1)
|
||||
ShaderHelper.useShader(ShaderHelper.doppleganger, callback);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.DOPPLEGANGER, callback);
|
||||
super.doRender(pixie, par2, par4, par6, par8, par9);
|
||||
if(pixie.getPixieType() == 1)
|
||||
ShaderHelper.releaseShader();
|
||||
|
||||
@@ -93,7 +93,7 @@ public class RenderTileEnchanter extends TileEntityRenderer<TileEnchanter> {
|
||||
GlStateManager.translatef(-2.5F, -2.5F, 0F);
|
||||
}
|
||||
|
||||
ShaderHelper.useShader(ShaderHelper.enchanterRune);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.ENCHANTER_RUNE);
|
||||
renderIcon(0, 0, MiscellaneousIcons.INSTANCE.enchanterOverlay, 5, 5, 240);
|
||||
ShaderHelper.releaseShader();
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ public class RenderTileGaiaHead extends SkullTileEntityRenderer {
|
||||
else if(view instanceof EnderDragonEntity)
|
||||
type = SkullBlock.Types.DRAGON;
|
||||
|
||||
ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.DOPPLEGANGER, RenderDoppleganger.defaultCallback);
|
||||
original.render(x, y, z, facing, rotationIn, type, profile, destroyStage, animationProgress);
|
||||
ShaderHelper.releaseShader();
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ public class RenderTileLightRelay extends TileEntityRenderer<TileLightRelay> {
|
||||
GlStateManager.translatef(0F, -off, 0F);
|
||||
|
||||
mc.textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
|
||||
ShaderHelper.useShader(ShaderHelper.halo);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.HALO);
|
||||
renderIcon(tessellator, iicon);
|
||||
ShaderHelper.releaseShader();
|
||||
|
||||
|
||||
@@ -17,8 +17,10 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
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;
|
||||
@@ -28,6 +30,7 @@ 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.RenderHelper;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.client.core.proxy.ClientProxy;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
@@ -92,68 +95,47 @@ public class RenderTilePool extends TileEntityRenderer<TilePool> {
|
||||
if(pool != null) {
|
||||
Block below = pool.getWorld().getBlockState(pool.getPos().down()).getBlock();
|
||||
if(below instanceof IPoolOverlayProvider) {
|
||||
TextureAtlasSprite overlay = ((IPoolOverlayProvider) below).getIcon(pool.getWorld(), pool.getPos());
|
||||
if(overlay != null) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.disableAlphaTest();
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1 * (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 20.0) + 1) * 0.3 + 0.2));
|
||||
GlStateManager.translatef(-0.5F, -1F - 0.43F, -0.5F);
|
||||
GlStateManager.rotatef(90F, 1F, 0F, 0F);
|
||||
GlStateManager.scalef(s, s, s);
|
||||
TextureAtlasSprite overlayIcon = ((IPoolOverlayProvider) below).getIcon(pool.getWorld(), pool.getPos());
|
||||
if(overlayIcon != null) {
|
||||
ms.push();
|
||||
float alpha = (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 20.0) + 1) * 0.3 + 0.2);
|
||||
ms.translate(-0.5F, -1F - 0.43F, -0.5F);
|
||||
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90F));
|
||||
ms.scale(s, s, s);
|
||||
|
||||
renderIcon(0, 0, overlay, 16, 16, 240);
|
||||
IVertexBuilder buffer = buffers.getBuffer(RenderHelper.ICON_OVERLAY);
|
||||
renderIcon(ms, buffer, 0, 0, overlayIcon, 16, 16, alpha);
|
||||
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.popMatrix();
|
||||
ms.pop();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(waterLevel > 0) {
|
||||
s = 1F / 256F * 14F;
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.disableAlphaTest();
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translatef(w, -1F - (0.43F - waterLevel), w);
|
||||
GlStateManager.rotatef(90F, 1F, 0F, 0F);
|
||||
GlStateManager.scalef(s, s, s);
|
||||
ms.push();
|
||||
ms.translate(w, -1F - (0.43F - waterLevel), w);
|
||||
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90F));
|
||||
ms.scale(s, s, s);
|
||||
|
||||
ShaderHelper.useShader(ShaderHelper.manaPool);
|
||||
renderIcon(0, 0, MiscellaneousIcons.INSTANCE.manaWater, 16, 16, 240);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.MANA_POOL);
|
||||
renderIcon(ms, buffers, MiscellaneousIcons.INSTANCE.manaWater, 16, 16, 1);
|
||||
ShaderHelper.releaseShader();
|
||||
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.popMatrix();
|
||||
ms.pop();
|
||||
}
|
||||
ms.pop();
|
||||
|
||||
cartMana = -1;
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
|
||||
private BlockState poolForVariant(BlockPool.Variant v) {
|
||||
switch (v) {
|
||||
default:
|
||||
case DEFAULT: return ModBlocks.manaPool.getDefaultState();
|
||||
case CREATIVE: return ModBlocks.creativePool.getDefaultState();
|
||||
case DILUTED: return ModBlocks.dilutedPool.getDefaultState();
|
||||
case FABULOUS: return ModBlocks.fabulousPool.getDefaultState();
|
||||
}
|
||||
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();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -121,7 +121,7 @@ public class RenderTilePylon extends TileEntityRenderer<TilePylon> {
|
||||
GlStateManager.disableAlphaTest();
|
||||
|
||||
if(pylon != null)
|
||||
ShaderHelper.useShader(ShaderHelper.pylonGlow);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.PYLON_GLOW);
|
||||
// todo 1.15 custom render layer
|
||||
model.renderCrystal(ms, buffer, light, overlay);
|
||||
if(pylon != null)
|
||||
|
||||
@@ -55,7 +55,7 @@ public class RenderTileTerraPlate extends TileEntityRenderer<TileTerraPlate> {
|
||||
|
||||
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
|
||||
|
||||
ShaderHelper.useShader(ShaderHelper.terraPlateRune);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.TERRA_PLATE);
|
||||
renderIcon(0, 0, MiscellaneousIcons.INSTANCE.terraPlateOverlay, 1, 1, 240);
|
||||
ShaderHelper.releaseShader();
|
||||
|
||||
|
||||
@@ -87,23 +87,23 @@ public class RenderTileTinyPotato extends TileEntityRenderer<TileTinyPotato> {
|
||||
|
||||
boolean usedShader = false;
|
||||
if (matches(name, "gaia")) {
|
||||
ShaderHelper.useShader(ShaderHelper.doppleganger);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.DOPPLEGANGER);
|
||||
name = removeFromFront(name, "gaia");
|
||||
usedShader = true;
|
||||
} else if (matches(name, "hot")) {
|
||||
ShaderHelper.useShader(ShaderHelper.halo);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.HALO);
|
||||
name = removeFromFront(name, "hot");
|
||||
usedShader = true;
|
||||
} else if (matches(name, "magic")) {
|
||||
ShaderHelper.useShader(ShaderHelper.enchanterRune);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.ENCHANTER_RUNE);
|
||||
name = removeFromFront(name, "magic");
|
||||
usedShader = true;
|
||||
} else if (matches(name, "gold")) {
|
||||
ShaderHelper.useShader(ShaderHelper.gold);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.GOLD);
|
||||
name = removeFromFront(name, "gold");
|
||||
usedShader = true;
|
||||
} else if (matches(name, "snoop")) {
|
||||
ShaderHelper.useShader(ShaderHelper.terraPlateRune);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.TERRA_PLATE);
|
||||
name = removeFromFront(name, "snoop");
|
||||
usedShader = true;
|
||||
}
|
||||
@@ -302,7 +302,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer<TileTinyPotato> {
|
||||
GlStateManager.rotatef(180F, 1F, 0F, 0F);
|
||||
GlStateManager.rotatef(180F, 0F, 1F, 0F);
|
||||
GlStateManager.translatef(0F, 0F, 0F);
|
||||
ShaderHelper.useShader(ShaderHelper.gold);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.GOLD);
|
||||
renderItem(ms, buffers, light, overlay, icon);
|
||||
ShaderHelper.releaseShader();
|
||||
}
|
||||
|
||||
@@ -46,176 +46,10 @@ public class SkyblockSkyRenderer implements IRenderHandler {
|
||||
// [VanillaCopy] WorldRenderer.renderSky, overworld section, edits noted
|
||||
@Override
|
||||
public void render(int ticks, float partialTicks, ClientWorld world, Minecraft mc) {
|
||||
// Environment setup
|
||||
int glSkyList = mc.worldRenderer.glSkyList;
|
||||
net.minecraft.client.renderer.vertex.VertexBuffer skyVBO = mc.worldRenderer.skyVBO;
|
||||
|
||||
// Begin
|
||||
GlStateManager.disableTexture();
|
||||
Vec3d vec3d = world.getSkyColor(mc.gameRenderer.getActiveRenderInfo().getBlockPos(), partialTicks);
|
||||
float f = (float)vec3d.x;
|
||||
float f1 = (float)vec3d.y;
|
||||
float f2 = (float)vec3d.z;
|
||||
|
||||
// Botania - darken when in void
|
||||
float insideVoid = 0;
|
||||
if(mc.player.getY() <= -2)
|
||||
insideVoid = (float) Math.min(1F, -(mc.player.getY() + 2) / 30F);
|
||||
|
||||
f = Math.max(0F, f - insideVoid);
|
||||
f1 = Math.max(0F, f1 - insideVoid);
|
||||
f2 = Math.max(0F, f2 - insideVoid);
|
||||
|
||||
GlStateManager.color3f(f, f1, f2);
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
BufferBuilder bufferbuilder = tessellator.getBuffer();
|
||||
GlStateManager.depthMask(false);
|
||||
GlStateManager.enableFog();
|
||||
GlStateManager.color3f(f, f1, f2);
|
||||
if (GLX.useVbo()) {
|
||||
skyVBO.bindBuffer();
|
||||
GlStateManager.enableClientState(32884);
|
||||
GlStateManager.vertexPointer(3, 5126, 12, 0);
|
||||
skyVBO.drawArrays(7);
|
||||
skyVBO.unbindBuffer();
|
||||
GlStateManager.disableClientState(32884);
|
||||
} else {
|
||||
GlStateManager.callList(glSkyList);
|
||||
}
|
||||
|
||||
GlStateManager.disableFog();
|
||||
GlStateManager.disableAlphaTest();
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
float[] afloat = world.dimension.calcSunriseSunsetColors(world.getCelestialAngle(partialTicks), partialTicks);
|
||||
if (afloat != null) {
|
||||
GlStateManager.disableTexture();
|
||||
GlStateManager.shadeModel(7425);
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.rotatef(90.0F, 1.0F, 0.0F, 0.0F);
|
||||
GlStateManager.rotatef(MathHelper.sin(world.getCelestialAngleRadians(partialTicks)) < 0.0F ? 180.0F : 0.0F, 0.0F, 0.0F, 1.0F);
|
||||
GlStateManager.rotatef(90.0F, 0.0F, 0.0F, 1.0F);
|
||||
float f3 = afloat[0];
|
||||
float f4 = afloat[1];
|
||||
float f5 = afloat[2];
|
||||
bufferbuilder.begin(6, DefaultVertexFormats.POSITION_COLOR);
|
||||
bufferbuilder.pos(0.0D, 100.0D, 0.0D).color(f3, f4, f5, afloat[3]).endVertex();
|
||||
int i = 16;
|
||||
|
||||
for(int j = 0; j <= 16; ++j) {
|
||||
float f6 = (float)j * ((float)Math.PI * 2F) / 16.0F;
|
||||
float f7 = MathHelper.sin(f6);
|
||||
float f8 = MathHelper.cos(f6);
|
||||
bufferbuilder.pos((double)(f7 * 120.0F), (double)(f8 * 120.0F), (double)(-f8 * 40.0F * afloat[3])).color(afloat[0], afloat[1], afloat[2], 0.0F).endVertex();
|
||||
}
|
||||
|
||||
tessellator.draw();
|
||||
GlStateManager.popMatrix();
|
||||
GlStateManager.shadeModel(7424);
|
||||
}
|
||||
|
||||
GlStateManager.enableTexture();
|
||||
GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
|
||||
GlStateManager.pushMatrix();
|
||||
float f11 = 1.0F - world.getRainStrength(partialTicks);
|
||||
GlStateManager.color4f(1.0F, 1.0F, 1.0F, f11);
|
||||
GlStateManager.rotatef(-90.0F, 0.0F, 1.0F, 0.0F);
|
||||
// Botania - extras
|
||||
renderExtra(world, partialTicks, insideVoid);
|
||||
GlStateManager.rotatef(world.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F);
|
||||
float f12 = 60.0F; // Botania: 30 -> 60
|
||||
mc.textureManager.bindTexture(SUN_TEXTURES);
|
||||
bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX);
|
||||
bufferbuilder.pos((double)(-f12), 100.0D, (double)(-f12)).tex(0.0D, 0.0D).endVertex();
|
||||
bufferbuilder.pos((double)f12, 100.0D, (double)(-f12)).tex(1.0D, 0.0D).endVertex();
|
||||
bufferbuilder.pos((double)f12, 100.0D, (double)f12).tex(1.0D, 1.0D).endVertex();
|
||||
bufferbuilder.pos((double)(-f12), 100.0D, (double)f12).tex(0.0D, 1.0D).endVertex();
|
||||
tessellator.draw();
|
||||
f12 = 60.0F; // Botania: 20 -> 60
|
||||
mc.textureManager.bindTexture(MOON_PHASES_TEXTURES);
|
||||
int k = world.getMoonPhase();
|
||||
int l = k % 4;
|
||||
int i1 = k / 4 % 2;
|
||||
float f13 = (float)(l + 0) / 4.0F;
|
||||
float f14 = (float)(i1 + 0) / 2.0F;
|
||||
float f15 = (float)(l + 1) / 4.0F;
|
||||
float f9 = (float)(i1 + 1) / 2.0F;
|
||||
bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX);
|
||||
bufferbuilder.pos((double)(-f12), -100.0D, (double)f12).tex((double)f15, (double)f9).endVertex();
|
||||
bufferbuilder.pos((double)f12, -100.0D, (double)f12).tex((double)f13, (double)f9).endVertex();
|
||||
bufferbuilder.pos((double)f12, -100.0D, (double)(-f12)).tex((double)f13, (double)f14).endVertex();
|
||||
bufferbuilder.pos((double)(-f12), -100.0D, (double)(-f12)).tex((double)f15, (double)f14).endVertex();
|
||||
tessellator.draw();
|
||||
GlStateManager.disableTexture();
|
||||
// Botania: custom stars
|
||||
{
|
||||
float celAng = world.getCelestialAngle(partialTicks);
|
||||
float effCelAng = celAng;
|
||||
if(celAng > 0.5)
|
||||
effCelAng = 0.5F - (celAng - 0.5F);
|
||||
float starAlpha = f11 * Math.max(0.1F, effCelAng * 2);
|
||||
renderStars(mc, starAlpha, partialTicks);
|
||||
}
|
||||
/*
|
||||
float f10 = world.getStarBrightness(partialTicks) * f11;
|
||||
if (f10 > 0.0F) {
|
||||
GlStateManager.color4f(f10, f10, f10, f10);
|
||||
if (this.vboEnabled) {
|
||||
starVBO.bindBuffer();
|
||||
GlStateManager.enableClientState(32884);
|
||||
GlStateManager.vertexPointer(3, 5126, 12, 0);
|
||||
starVBO.drawArrays(7);
|
||||
starVBO.unbindBuffer();
|
||||
GlStateManager.disableClientState(32884);
|
||||
} else {
|
||||
GlStateManager.callList(this.starGLCallList);
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.enableFog();
|
||||
GlStateManager.popMatrix();
|
||||
// Botania: no horizon
|
||||
/*
|
||||
GlStateManager.disableTexture();
|
||||
GlStateManager.color3f(0.0F, 0.0F, 0.0F);
|
||||
double d0 = this.mc.player.getEyePosition(partialTicks).y - this.world.getHorizon();
|
||||
if (d0 < 0.0D) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translatef(0.0F, 12.0F, 0.0F);
|
||||
if (this.vboEnabled) {
|
||||
this.sky2VBO.bindBuffer();
|
||||
GlStateManager.enableClientState(32884);
|
||||
GlStateManager.vertexPointer(3, 5126, 12, 0);
|
||||
this.sky2VBO.drawArrays(7);
|
||||
this.sky2VBO.unbindBuffer();
|
||||
GlStateManager.disableClientState(32884);
|
||||
} else {
|
||||
GlStateManager.callList(this.glSkyList2);
|
||||
}
|
||||
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
if (this.world.dimension.isSkyColored()) {
|
||||
GlStateManager.color3f(f * 0.2F + 0.04F, f1 * 0.2F + 0.04F, f2 * 0.6F + 0.1F);
|
||||
} else {
|
||||
GlStateManager.color3f(f, f1, f2);
|
||||
}
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translatef(0.0F, -((float)(d0 - 16.0D)), 0.0F);
|
||||
GlStateManager.callList(this.glSkyList2);
|
||||
GlStateManager.popMatrix();
|
||||
*/
|
||||
GlStateManager.enableTexture();
|
||||
GlStateManager.depthMask(true);
|
||||
// todo 1.15 need the matrix to do anything useful
|
||||
}
|
||||
|
||||
/*
|
||||
private void renderExtra(ClientWorld world, float partialTicks, float insideVoid) {
|
||||
// Botania - Begin extra stuff
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
@@ -436,5 +270,6 @@ public class SkyblockSkyRenderer implements IRenderHandler {
|
||||
GlStateManager.callList(displayList);
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
}
|
||||
@@ -438,7 +438,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
|
||||
else GlStateManager.rotatef(Botania.proxy.getWorldElapsedTicks(), 0, 1, 0);
|
||||
|
||||
Tessellator tes = Tessellator.getInstance();
|
||||
ShaderHelper.useShader(ShaderHelper.halo);
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.HALO);
|
||||
tes.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
|
||||
tes.getBuffer().pos(-0.75, 0, -0.75).tex(0, 0).endVertex();
|
||||
tes.getBuffer().pos(-0.75, 0, 0.75).tex(0, 1).endVertex();
|
||||
|
||||
Reference in new issue
Block a user