mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 03:15:07 +00:00
Stub out lightning stuff, doppleganger render
This commit is contained in:
1 parent
f8d1b5aff0
commit
2b87cd4bdb
4 files changed
+43
-25
No files matched your search
@@ -67,12 +67,12 @@ public class LightningHandler {
|
||||
render.bindTexture(outsideResource);
|
||||
int counter = 0;
|
||||
|
||||
tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR);
|
||||
tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEXTURE_LIGHT_COLOR);
|
||||
for (FXLightning bolt : queuedLightningBolts) {
|
||||
bolt.renderBolt(0, false);
|
||||
if(counter % BATCH_THRESHOLD == BATCH_THRESHOLD - 1) {
|
||||
tessellator.draw();
|
||||
tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR);
|
||||
tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEXTURE_LIGHT_COLOR);
|
||||
}
|
||||
counter++;
|
||||
}
|
||||
@@ -81,12 +81,12 @@ public class LightningHandler {
|
||||
render.bindTexture(insideResource);
|
||||
counter = 0;
|
||||
|
||||
tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR);
|
||||
tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEXTURE_LIGHT_COLOR);
|
||||
for (FXLightning bolt : queuedLightningBolts) {
|
||||
bolt.renderBolt(1, true);
|
||||
if(counter % BATCH_THRESHOLD == BATCH_THRESHOLD - 1) {
|
||||
tessellator.draw();
|
||||
tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR);
|
||||
tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEXTURE_LIGHT_COLOR);
|
||||
}
|
||||
counter++;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package vazkii.botania.client.fx;
|
||||
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.particle.IParticleRenderType;
|
||||
@@ -65,7 +66,7 @@ public class FXLightning extends Particle {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderParticle(BufferBuilder buffer, ActiveRenderInfo info, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) {
|
||||
public void buildGeometry(IVertexBuilder buffer, ActiveRenderInfo info, float partialTicks) {
|
||||
LightningHandler.queuedLightningBolts.offer(this);
|
||||
}
|
||||
|
||||
@@ -109,27 +110,27 @@ public class FXLightning extends Particle {
|
||||
int b = color & 0xFF;
|
||||
int a = (int) (mainAlpha * rendersegment.light * 0xFF);
|
||||
|
||||
wr.pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
|
||||
wr.pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
|
||||
wr.pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
|
||||
wr.pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
|
||||
wr.vertex(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).texture(0.5F, 0).light(0xF000F0).color(r, g, b, a).endVertex();
|
||||
wr.vertex(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).texture(0.5F, 0).light(0xF000F0).color(r, g, b, a).endVertex();
|
||||
wr.vertex(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).texture(0.5F, 1).light(0xF000F0).color(r, g, b, a).endVertex();
|
||||
wr.vertex(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).texture(0.5F, 1).light(0xF000F0).color(r, g, b, a).endVertex();
|
||||
|
||||
if(rendersegment.next == null) {
|
||||
Vector3 roundend = rendersegment.endPoint.point.add(rendersegment.diff.normalize().multiply(width));
|
||||
|
||||
wr.pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
|
||||
wr.pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
|
||||
wr.pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
|
||||
wr.pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
|
||||
wr.vertex(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).texture(0, 0).light(0xF000F0).color(r, g, b, a).endVertex();
|
||||
wr.vertex(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).texture(0.5F, 0).light(0xF000F0).color(r, g, b, a).endVertex();
|
||||
wr.vertex(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).texture(0.5F, 1).light(0xF000F0).color(r, g, b, a).endVertex();
|
||||
wr.vertex(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).texture(0, 1).light(0xF000F0).color(r, g, b, a).endVertex();
|
||||
}
|
||||
|
||||
if(rendersegment.prev == null) {
|
||||
Vector3 roundend = rendersegment.startPoint.point.subtract(rendersegment.diff.normalize().multiply(width));
|
||||
|
||||
wr.pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
|
||||
wr.pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
|
||||
wr.pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
|
||||
wr.pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
|
||||
wr.vertex(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).texture(0.5F, 0).light(0xF000F0).color(r, g, b, a).endVertex();
|
||||
wr.vertex(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).texture(0, 0).light(0xF000F0).color(r, g, b, a).endVertex();
|
||||
wr.vertex(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).texture(0, 1).light(0xF000F0).color(r, g, b, a).endVertex();
|
||||
wr.vertex(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).texture(0.5F, 1).light(0xF000F0).color(r, g, b, a).endVertex();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,10 +10,12 @@
|
||||
*/
|
||||
package vazkii.botania.client.render.entity;
|
||||
|
||||
import com.mojang.blaze3d.platform.GLX;
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.entity.player.AbstractClientPlayerEntity;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.entity.BipedRenderer;
|
||||
import net.minecraft.client.renderer.entity.EntityRendererManager;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
@@ -22,6 +24,7 @@ import net.minecraft.client.resources.DefaultPlayerSkin;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import vazkii.botania.api.internal.ShaderCallback;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.client.core.helper.ShaderWrappedRenderLayer;
|
||||
import vazkii.botania.common.entity.EntityDoppleganger;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
@@ -34,7 +37,7 @@ public class RenderDoppleganger extends BipedRenderer<EntityDoppleganger, BipedM
|
||||
private static float grainIntensity = DEFAULT_GRAIN_INTENSITY;
|
||||
private static float disfiguration = DEFAULT_DISFIGURATION;
|
||||
|
||||
public static final ShaderCallback callback = shader -> {
|
||||
private static final ShaderCallback CALLBACK = shader -> {
|
||||
// Frag Uniforms
|
||||
int disfigurationUniform = GlStateManager.getUniformLocation(shader, "disfiguration");
|
||||
ShaderHelper.FLOAT_BUF.position(0);
|
||||
@@ -63,11 +66,11 @@ public class RenderDoppleganger extends BipedRenderer<EntityDoppleganger, BipedM
|
||||
};
|
||||
|
||||
public RenderDoppleganger(EntityRendererManager renderManager) {
|
||||
super(renderManager, new PlayerModel<>(0.0F, false), 0F);
|
||||
super(renderManager, new Model(), 0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doRender(@Nonnull EntityDoppleganger dopple, double par2, double par4, double par6, float par8, float par9) {
|
||||
public void render(@Nonnull EntityDoppleganger dopple, float yaw, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int light) {
|
||||
int invulTime = dopple.getInvulTime();
|
||||
if(invulTime > 0) {
|
||||
grainIntensity = invulTime > 20 ? 1F : invulTime * 0.05F;
|
||||
@@ -77,9 +80,7 @@ public class RenderDoppleganger extends BipedRenderer<EntityDoppleganger, BipedM
|
||||
grainIntensity = 0.05F + dopple.hurtTime * ((1F - 0.15F) / 10F);
|
||||
}
|
||||
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.DOPPLEGANGER, callback);
|
||||
super.doRender(dopple, par2, par4, par6, par8, par9);
|
||||
ShaderHelper.releaseShader();
|
||||
super.render(dopple, yaw, partialTicks, ms, buffers, light);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@@ -93,4 +94,20 @@ public class RenderDoppleganger extends BipedRenderer<EntityDoppleganger, BipedM
|
||||
return ((AbstractClientPlayerEntity) mc.getRenderViewEntity()).getLocationSkin();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean func_225622_a_(EntityDoppleganger dopple, boolean fallback) {
|
||||
return true;
|
||||
}
|
||||
|
||||
private static class Model extends BipedModel<EntityDoppleganger> {
|
||||
private static RenderType makeRenderType(ResourceLocation texture) {
|
||||
RenderType normal = RenderType.getEntityTranslucent(texture);
|
||||
return new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.DOPPLEGANGER, CALLBACK, normal);
|
||||
}
|
||||
|
||||
Model() {
|
||||
super(Model::makeRenderType, 0, 0, 64, 64);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -98,7 +98,7 @@ public class RenderTilePool extends TileEntityRenderer<TilePool> {
|
||||
ms.scale(s, s, s);
|
||||
|
||||
IVertexBuilder buffer = buffers.getBuffer(RenderHelper.ICON_OVERLAY);
|
||||
renderIcon(ms, buffer, overlayIcon, alpha);
|
||||
IconHelper.renderIcon(ms, buffer, 0, 0, overlayIcon, 16, 16, alpha);
|
||||
|
||||
ms.pop();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user