Skip to content

Commit e62c5e1

Browse files
committed
Rename RenderProperties to RenderOverrides
1 parent c3eb1d1 commit e62c5e1

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/main/java/org/visuals/legacy/animatium/util/PanoramaRendererUtility.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private void setup() {
128128
}
129129

130130
public void render(final GuiGraphics guiGraphics, final RenderTarget renderTarget, final int width, final int height) {
131-
final RenderUtils.RenderProperties properties = new RenderUtils.RenderProperties(new Vector4i(0, 0, 256, 256), 0);
131+
final RenderUtils.RenderOverrides properties = new RenderUtils.RenderOverrides(new Vector4i(0, 0, 256, 256), 0);
132132
renderPanorama(PANORAMA, renderTarget, width, height, properties);
133133
for (int layer = 0; layer < 7; ++layer) {
134134
final int prevTex = GlStateManager._getInteger(GL11.GL_TEXTURE_BINDING_2D);
@@ -137,13 +137,13 @@ public void render(final GuiGraphics guiGraphics, final RenderTarget renderTarge
137137
GlStateManager._texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR);
138138
GL11.glCopyTexSubImage2D(GL11.GL_TEXTURE_2D, 0, 0, 0, 0, 0, 256, 256);
139139
GlStateManager._bindTexture(prevTex);
140-
RenderUtils.drawInGui(renderTarget, new BlitBlurTexture(guiGraphics.pose(), backgroundTextureView, width, height), RenderUtils.RenderProperties.DEFAULT);
140+
RenderUtils.drawInGui(renderTarget, new BlitBlurTexture(guiGraphics.pose(), backgroundTextureView, width, height), RenderUtils.RenderOverrides.DEFAULT);
141141
}
142142

143143
// RenderUtils.renderInGui(renderTarget, new BlitFinalTexture(guiGraphics.pose(), backgroundTextureView, width, height), RenderUtils.RenderProperties.DEFAULT);
144144
}
145145

146-
private void renderPanorama(final RenderPipeline pipeline, final RenderTarget renderTarget, final int width, final int height, final RenderUtils.RenderProperties renderProperties) {
146+
private void renderPanorama(final RenderPipeline pipeline, final RenderTarget renderTarget, final int width, final int height, final RenderUtils.RenderOverrides renderOverrides) {
147147
RenderSystem.setProjectionMatrix(projectionMatrixBuffer.getBuffer(width, height, 120.0F), ProjectionType.PERSPECTIVE);
148148
final Matrix4fStack modelViewStack = RenderSystem.getModelViewStack();
149149
modelViewStack.pushMatrix();
@@ -180,7 +180,7 @@ private void renderPanorama(final RenderPipeline pipeline, final RenderTarget re
180180
builder.addVertex(1.0F, 1.0F, 1.0F).setUv(1.0F, 1.0F).setColor(color);
181181
builder.addVertex(-1.0F, 1.0F, 1.0F).setUv(0.0F, 1.0F).setColor(color);
182182
final GpuBufferSlice dynamicTransforms = DynamicTransformsBuilder.of().withModelViewMatrix(modelViewStack).build();
183-
RenderUtils.drawWithPipeline(renderTarget, pipeline, builder.buildOrThrow(), renderProperties, (pass) -> {
183+
RenderUtils.drawWithPipeline(renderTarget, pipeline, builder.buildOrThrow(), renderOverrides, (pass) -> {
184184
pass.setUniform("DynamicTransforms", dynamicTransforms);
185185
pass.bindSampler("Sampler0", panoramaTexture);
186186
});

src/main/java/org/visuals/legacy/animatium/util/RenderUtils.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public void drawWithPipeline(
123123
final RenderTarget renderTarget,
124124
final RenderPipeline renderPipeline,
125125
final MeshData meshData,
126-
final RenderProperties renderProperties,
126+
final RenderOverrides renderOverrides,
127127
final Consumer<RenderPass> renderPassConsumer
128128
) {
129129
try {
@@ -142,8 +142,8 @@ public void drawWithPipeline(
142142
final GpuTextureView colorTextureView = RenderSystem.outputColorTextureOverride != null ? RenderSystem.outputColorTextureOverride : renderTarget.getColorTextureView();
143143
final GpuTextureView depthTextureView = renderTarget.useDepth ? (RenderSystem.outputDepthTextureOverride != null ? RenderSystem.outputDepthTextureOverride : renderTarget.getDepthTextureView()) : null;
144144
try (RenderPass renderPass = RenderSystem.getDevice().createCommandEncoder().createRenderPass(() -> "Immediate draw for " + renderPipeline, colorTextureView, OptionalInt.empty(), depthTextureView, OptionalDouble.empty())) {
145-
final int prevFramebufferId = renderProperties.applyFramebuffer();
146-
final IntBuffer viewportBuffer = renderProperties.applyViewport();
145+
final int prevFramebufferId = renderOverrides.applyFramebuffer();
146+
final IntBuffer viewportBuffer = renderOverrides.applyViewport();
147147

148148
renderPass.setPipeline(renderPipeline);
149149
renderPass.setVertexBuffer(0, vertexBuffer);
@@ -185,10 +185,10 @@ public void drawWithPipeline(
185185
final MeshData meshData,
186186
final Consumer<RenderPass> renderPassConsumer
187187
) {
188-
drawWithPipeline(renderTarget, renderPipeline, meshData, RenderProperties.DEFAULT, renderPassConsumer);
188+
drawWithPipeline(renderTarget, renderPipeline, meshData, RenderOverrides.DEFAULT, renderPassConsumer);
189189
}
190190

191-
public void drawInGui(final RenderTarget renderTarget, final GuiElementRenderState element, final RenderProperties renderProperties) {
191+
public void drawInGui(final RenderTarget renderTarget, final GuiElementRenderState element, final RenderOverrides renderOverrides) {
192192
final Minecraft minecraft = Minecraft.getInstance();
193193
final Window window = minecraft.getWindow();
194194
final GameRendererAccessor gameRendererAccessor = (GameRendererAccessor) minecraft.gameRenderer;
@@ -215,8 +215,8 @@ public void drawInGui(final RenderTarget renderTarget, final GuiElementRenderSta
215215
final GpuTextureView colorTextureView = RenderSystem.outputColorTextureOverride != null ? RenderSystem.outputColorTextureOverride : renderTarget.getColorTextureView();
216216
final GpuTextureView depthTextureView = renderTarget.useDepth ? (RenderSystem.outputDepthTextureOverride != null ? RenderSystem.outputDepthTextureOverride : renderTarget.getDepthTextureView()) : null;
217217
try (final RenderPass renderPass = device.createCommandEncoder().createRenderPass(() -> "Immediate GUI RenderPass", colorTextureView, OptionalInt.empty(), depthTextureView, OptionalDouble.empty())) {
218-
final int prevFramebufferId = renderProperties.applyFramebuffer();
219-
final IntBuffer viewportBuffer = renderProperties.applyViewport();
218+
final int prevFramebufferId = renderOverrides.applyFramebuffer();
219+
final IntBuffer viewportBuffer = renderOverrides.applyViewport();
220220

221221
renderPass.setPipeline(pipeline);
222222
renderPass.setVertexBuffer(0, vertexBuffer);
@@ -246,8 +246,8 @@ public void drawInGui(final RenderTarget renderTarget, final GuiElementRenderSta
246246
}
247247
}
248248

249-
public record RenderProperties(@Nullable Vector4i viewport, int framebufferId) {
250-
public static final RenderProperties DEFAULT = new RenderProperties(null, -1);
249+
public record RenderOverrides(@Nullable Vector4i viewport, int framebufferId) {
250+
public static final RenderOverrides DEFAULT = new RenderOverrides(null, -1);
251251

252252
public int applyFramebuffer() {
253253
final int prevFbo = GL11.glGetInteger(GL30C.GL_FRAMEBUFFER_BINDING);

0 commit comments

Comments
 (0)