Skip to content

Commit 48a45ec

Browse files
committed
clean up var naming
1 parent c079a92 commit 48a45ec

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

src/main/java/baritone/utils/BaritoneRenderType.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -59,57 +59,57 @@ public VertexFormat.Mode mode() {
5959
@Override
6060
public void draw(final MeshData meshData) {
6161
this.setupRenderState();
62-
GpuBufferSlice gpuBufferSlice = RenderSystem.getDynamicUniforms()
63-
.writeTransform(
64-
RenderSystem.getModelViewMatrix(),
65-
new Vector4f(1.0F, 1.0F, 1.0F, 1.0F),
66-
RenderSystem.getModelOffset(),
67-
RenderSystem.getTextureMatrix(),
68-
RenderSystem.getShaderLineWidth()
69-
);
70-
7162
try {
72-
GpuBuffer gpuBuffer = this.renderPipeline.getVertexFormat().uploadImmediateVertexBuffer(meshData.vertexBuffer());
73-
GpuBuffer gpuBuffer2;
63+
GpuBuffer vertexBuffer = this.renderPipeline.getVertexFormat().uploadImmediateVertexBuffer(meshData.vertexBuffer());
64+
GpuBuffer indexBuffer;
7465
VertexFormat.IndexType indexType;
7566
if (meshData.indexBuffer() == null) {
7667
RenderSystem.AutoStorageIndexBuffer autoStorageIndexBuffer = RenderSystem.getSequentialBuffer(meshData.drawState().mode());
77-
gpuBuffer2 = autoStorageIndexBuffer.getBuffer(meshData.drawState().indexCount());
68+
indexBuffer = autoStorageIndexBuffer.getBuffer(meshData.drawState().indexCount());
7869
indexType = autoStorageIndexBuffer.type();
7970
} else {
80-
gpuBuffer2 = this.renderPipeline.getVertexFormat().uploadImmediateIndexBuffer(meshData.indexBuffer());
71+
indexBuffer = this.renderPipeline.getVertexFormat().uploadImmediateIndexBuffer(meshData.indexBuffer());
8172
indexType = meshData.drawState().indexType();
8273
}
8374

8475
RenderTarget renderTarget = RenderStateShard.MAIN_TARGET.getRenderTarget();
85-
GpuTextureView gpuTextureView = RenderSystem.outputColorTextureOverride != null
76+
GpuTextureView colorTextureTarget = RenderSystem.outputColorTextureOverride != null
8677
? RenderSystem.outputColorTextureOverride
8778
: renderTarget.getColorTextureView();
88-
GpuTextureView gpuTextureView2 = renderTarget.useDepth
79+
GpuTextureView depthTextureTarget = renderTarget.useDepth
8980
? (RenderSystem.outputDepthTextureOverride != null ? RenderSystem.outputDepthTextureOverride : renderTarget.getDepthTextureView())
9081
: null;
9182

83+
GpuBufferSlice dynamicTransformsUbo = RenderSystem.getDynamicUniforms()
84+
.writeTransform(
85+
RenderSystem.getModelViewMatrix(),
86+
new Vector4f(1.0F, 1.0F, 1.0F, 1.0F),
87+
RenderSystem.getModelOffset(),
88+
RenderSystem.getTextureMatrix(),
89+
RenderSystem.getShaderLineWidth()
90+
);
91+
9292
try (RenderPass renderPass = RenderSystem.getDevice()
9393
.createCommandEncoder()
94-
.createRenderPass(() -> "Immediate draw for " + this.getName(), gpuTextureView, OptionalInt.empty(), gpuTextureView2, OptionalDouble.empty())) {
94+
.createRenderPass(() -> "Immediate draw for " + this.getName(), colorTextureTarget, OptionalInt.empty(), depthTextureTarget, OptionalDouble.empty())) {
9595
renderPass.setPipeline(this.renderPipeline);
9696
ScissorState scissorState = RenderSystem.getScissorStateForRenderTypeDraws();
9797
if (scissorState.enabled()) {
9898
renderPass.enableScissor(scissorState.x(), scissorState.y(), scissorState.width(), scissorState.height());
9999
}
100100

101101
RenderSystem.bindDefaultUniforms(renderPass);
102-
renderPass.setUniform("DynamicTransforms", gpuBufferSlice);
103-
renderPass.setVertexBuffer(0, gpuBuffer);
102+
renderPass.setUniform("DynamicTransforms", dynamicTransformsUbo);
103+
renderPass.setVertexBuffer(0, vertexBuffer);
104104

105105
for (int i = 0; i < 12; i++) {
106-
GpuTextureView gpuTextureView3 = RenderSystem.getShaderTexture(i);
107-
if (gpuTextureView3 != null) {
108-
renderPass.bindSampler("Sampler" + i, gpuTextureView3);
106+
GpuTextureView texture = RenderSystem.getShaderTexture(i);
107+
if (texture != null) {
108+
renderPass.bindSampler("Sampler" + i, texture);
109109
}
110110
}
111111

112-
renderPass.setIndexBuffer(gpuBuffer2, indexType);
112+
renderPass.setIndexBuffer(indexBuffer, indexType);
113113
renderPass.drawIndexed(0, 0, meshData.drawState().indexCount(), 1);
114114
}
115115
} catch (Throwable e) {

0 commit comments

Comments
 (0)