From d1923ee6b503f05304d30af4ea10159c4410568f Mon Sep 17 00:00:00 2001 From: James Seibel Date: Thu, 24 Oct 2024 07:13:24 -0500 Subject: [PATCH] Fix generic renderer not using material type --- .../core/render/renderer/generic/RenderableBoxGroup.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/generic/RenderableBoxGroup.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/generic/RenderableBoxGroup.java index 841778712..e79aff6c6 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/generic/RenderableBoxGroup.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/generic/RenderableBoxGroup.java @@ -273,7 +273,7 @@ public class RenderableBoxGroup // colors/materials // float[] colorData = new float[boxCount * 4]; - byte[] materialData = new byte[boxCount]; + int[] materialData = new int[boxCount]; for (int i = 0; i < boxCount; i++) { DhApiRenderableBox box = this.get(i); @@ -290,9 +290,9 @@ public class RenderableBoxGroup // Upload transformation matrices GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, this.instanceChunkPosVbo); - GL32.glBufferData(GL32.GL_ARRAY_BUFFER, chunkPosData ,GL32.GL_DYNAMIC_DRAW); + GL32.glBufferData(GL32.GL_ARRAY_BUFFER, chunkPosData, GL32.GL_DYNAMIC_DRAW); GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, this.instanceSubChunkPosVbo); - GL32.glBufferData(GL32.GL_ARRAY_BUFFER, subChunkPosData ,GL32.GL_DYNAMIC_DRAW); + GL32.glBufferData(GL32.GL_ARRAY_BUFFER, subChunkPosData, GL32.GL_DYNAMIC_DRAW); GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, this.instanceScaleVbo); GL32.glBufferData(GL32.GL_ARRAY_BUFFER, scalingData, GL32.GL_DYNAMIC_DRAW); @@ -302,7 +302,7 @@ public class RenderableBoxGroup // Upload materials GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, this.instanceMaterialVbo); - GL32.glBufferData(GL32.GL_ARRAY_BUFFER, colorData, GL32.GL_DYNAMIC_DRAW); + GL32.glBufferData(GL32.GL_ARRAY_BUFFER, materialData, GL32.GL_DYNAMIC_DRAW); }