Skip to content

Fix issues #24 and #31 #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tsuyumori wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix issues #24 and #31 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 14 additions & 33 deletions src/main/java/doctor4t/astronomical/client/render/world/AstraSkyRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import doctor4t.astronomical.common.structure.Star;
import doctor4t.astronomical.common.structure.Starfall;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.*;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.util.Identifier;
Expand All @@ -28,12 +28,15 @@
import org.lwjgl.opengl.GL11;
import team.lodestar.lodestone.handlers.RenderHandler;
import team.lodestar.lodestone.handlers.ScreenshakeHandler;
import team.lodestar.lodestone.handlers.screenparticle.ScreenParticleHandler;
import team.lodestar.lodestone.helpers.RenderHelper;
import team.lodestar.lodestone.setup.LodestoneParticles;
import team.lodestar.lodestone.setup.LodestoneRenderLayers;
import team.lodestar.lodestone.setup.LodestoneScreenParticles;
import team.lodestar.lodestone.setup.LodestoneShaders;
import team.lodestar.lodestone.systems.rendering.VFXBuilders;
import team.lodestar.lodestone.systems.rendering.particle.Easing;
import team.lodestar.lodestone.systems.rendering.particle.ScreenParticleBuilder;
import team.lodestar.lodestone.systems.rendering.particle.WorldParticleBuilder;
import team.lodestar.lodestone.systems.rendering.particle.data.ColorParticleData;
import team.lodestar.lodestone.systems.rendering.particle.data.GenericParticleData;
Expand Down Expand Up @@ -80,7 +83,7 @@ public static void renderSky(MatrixStack matrices, VertexConsumerProvider provid

// interactable stars
bufferBuilder.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR_TEXTURE_LIGHT);
RenderSystem.setShader(LodestoneShaders.LODESTONE_TEXTURE.getInstance());
RenderSystem.setShader(GameRenderer::getPositionColorTexLightmapShader);
RenderSystem.setShaderTexture(0, InteractableStar.INTERACTABLE_TEX);
float scale = .2f;
AstraSkyComponent com = world.getComponent(AstraCardinalComponents.SKY);
Expand All @@ -104,7 +107,7 @@ public static void renderSky(MatrixStack matrices, VertexConsumerProvider provid
VertexData p4 = createVertexData(vector, UP, (scale + 0.4f * ((1 + MathHelper.sin(rot4)) / 2f)) * .5f * c.getSize(), 95, rot4, Color.WHITE);
apply((v, col, u) -> bufferBuilder.vertex(matrix4f, v.x(), v.y(), v.z()).color(col.getRed(), col.getGreen(), col.getBlue(), alpha).uv(u.x, u.y).light(RenderHelper.FULL_BRIGHT).next(), p4);
}
drawWithShader(bufferBuilder.end());
BufferRenderer.drawWithShader(bufferBuilder.end());

// supernovae explosions
bufferBuilder.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR_TEXTURE_LIGHT);
Expand All @@ -125,7 +128,7 @@ public static void renderSky(MatrixStack matrices, VertexConsumerProvider provid
yuh += c.getRandomOffset() / 10f;
}
}
drawWithShader(bufferBuilder.end());
BufferRenderer.drawWithShader(bufferBuilder.end());

// supernovae explosions dust
bufferBuilder.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR_TEXTURE_LIGHT);
Expand All @@ -144,7 +147,7 @@ public static void renderSky(MatrixStack matrices, VertexConsumerProvider provid
yuh += c.getRandomOffset();
}
}
drawWithShader(bufferBuilder.end());
BufferRenderer.drawWithShader(bufferBuilder.end());

RenderSystem.disableBlend();
RenderSystem.setShaderColor(1, 1, 1, 1);
Expand All @@ -153,31 +156,6 @@ public static void renderSky(MatrixStack matrices, VertexConsumerProvider provid
RenderSystem.defaultBlendFunc();
}

private static VertexBuffer upload(BufferBuilder.RenderedBuffer renderedBuffer) {
RenderSystem.assertOnRenderThread();
if (renderedBuffer.isEmpty()) {
renderedBuffer.release();
return null;
} else {
VertexBuffer vertexBuffer = getAndBindBuffer(renderedBuffer.getParameters().getVertexFormat());
vertexBuffer.upload(renderedBuffer);
return vertexBuffer;
}
}

private static VertexBuffer getAndBindBuffer(VertexFormat format) {
VertexBuffer vertexBuffer = format.getBuffer();
vertexBuffer.bind();
return vertexBuffer;
}

private static void drawWithShader(BufferBuilder.RenderedBuffer renderedBuffer) {
VertexBuffer vertexBuffer = upload(renderedBuffer);
if (vertexBuffer != null) {
vertexBuffer.draw(RenderSystem.getModelViewMatrix(), RenderSystem.getProjectionMatrix(), LodestoneShaders.LODESTONE_TEXTURE.instance);
}
}

public static void redrawStars() {
shouldTankPerformanceForAFewFrames = true;
}
Expand Down Expand Up @@ -226,9 +204,12 @@ public static void renderStarfalls(MatrixStack matrices, float tickDelta, Client
h /= 300;
h *= (MinecraftClient.getInstance().cameraEntity.getRotationVecClient().dotProduct(new Vec3d(one.getX(), one.getY(), one.getZ()).subtract(MinecraftClient.getInstance().player.getPos()).normalize()) + 1) / 2;

// todo lmao
// ScreenParticleBuilder b2 = ScreenParticleBuilder.create(LodestoneScreenParticles.SPARKLE).setAlpha((float) h, 0f).setScale(100000f).setColor(color, color).setLifetime(10).overrideRenderOrder(ScreenParticle.RenderOrder.AFTER_EVERYTHING);
// b2.repeat(0, 0, 1);
ScreenParticleBuilder.create(LodestoneScreenParticles.SPARKLE, ScreenParticleHandler.LATE_PARTICLES)
.setColorData(ColorParticleData.create(color, color).build())
.setTransparencyData(GenericParticleData.create((float)h, 0f).build())
.setScaleData(GenericParticleData.create(100000f).build())
.setLifetime(10)
.spawn(0, 0);

ScreenshakeHandler.addScreenshake(new ScreenshakeInstance((int) (50 * h)).setIntensity(0f, 1f, 0f).setEasing(Easing.EXPO_OUT, Easing.SINE_OUT));
}
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/doctor4t/astronomical/client/render/world/AstraWorldVFXBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,15 @@
import org.joml.Vector3f;
import team.lodestar.lodestone.helpers.RenderHelper;
import team.lodestar.lodestone.setup.LodestoneRenderLayers;
import team.lodestar.lodestone.setup.LodestoneShaders;
import team.lodestar.lodestone.systems.rendering.Phases;
import team.lodestar.lodestone.systems.rendering.VFXBuilders;

import java.awt.*;

public class AstraWorldVFXBuilder extends VFXBuilders.WorldVFXBuilder {
public static final LodestoneRenderLayers.RenderLayerProvider TEXTURE_ACTUAL_TRIANGLE = new LodestoneRenderLayers.RenderLayerProvider((texture) -> LodestoneRenderLayers.createGenericRenderLayer(texture.getNamespace(), "texture_actual_triangle", VertexFormats.POSITION_COLOR_TEXTURE, VertexFormat.DrawMode.TRIANGLES, RenderPhase.POSITION_COLOR_TEXTURE_LIGHTMAP_SHADER, Phases.NO_TRANSPARENCY, texture));
public static final LodestoneRenderLayers.RenderLayerProvider TEXTURE_ACTUAL_TRIANGLE_TRANSPARENT = new LodestoneRenderLayers.RenderLayerProvider((texture) -> LodestoneRenderLayers.createGenericRenderLayer(texture.getNamespace(), "texture_actual_triangle_transparent", VertexFormats.POSITION_COLOR_TEXTURE_LIGHT, VertexFormat.DrawMode.TRIANGLES, LodestoneShaders.LODESTONE_TEXTURE.phase, Phases.NORMAL_TRANSPARENCY, texture));
public static final LodestoneRenderLayers.RenderLayerProvider TEXTURE_ACTUAL_TRIANGLE_ADDITIVE = new LodestoneRenderLayers.RenderLayerProvider((texture) -> LodestoneRenderLayers.createGenericRenderLayer(texture.getNamespace(), "texture_actual_triangle_additive", VertexFormats.POSITION_COLOR_TEXTURE_LIGHT, VertexFormat.DrawMode.TRIANGLES, LodestoneShaders.LODESTONE_TEXTURE.phase, Phases.ADDITIVE_TRANSPARENCY, texture));
public static final LodestoneRenderLayers.RenderLayerProvider TEXTURE_ACTUAL_TRIANGLE_TRANSPARENT = new LodestoneRenderLayers.RenderLayerProvider((texture) -> LodestoneRenderLayers.createGenericRenderLayer(texture.getNamespace(), "texture_actual_triangle_transparent", VertexFormats.POSITION_COLOR_TEXTURE_LIGHT, VertexFormat.DrawMode.TRIANGLES, Phases.POSITION_COLOR_TEXTURE_LIGHTMAP_SHADER, Phases.NORMAL_TRANSPARENCY, texture));
public static final LodestoneRenderLayers.RenderLayerProvider TEXTURE_ACTUAL_TRIANGLE_ADDITIVE = new LodestoneRenderLayers.RenderLayerProvider((texture) -> LodestoneRenderLayers.createGenericRenderLayer(texture.getNamespace(), "texture_actual_triangle_additive", VertexFormats.POSITION_COLOR_TEXTURE_LIGHT, VertexFormat.DrawMode.TRIANGLES, Phases.POSITION_COLOR_TEXTURE_LIGHTMAP_SHADER, Phases.ADDITIVE_TRANSPARENCY, texture));

public AstraWorldVFXBuilder() {

Expand Down