Fix vertex buffer draw() not completing vertex builder object (Solves #…

…282)
fr1kin · Dec 31, 2020 · da59b82 · da59b82
1 parent 846b657
commit da59b82
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/dev/fiki/forgehax/api/extension/VertexBuilderEx.java b/src/main/java/dev/fiki/forgehax/api/extension/VertexBuilderEx.java
@@ -359,6 +359,7 @@ public static void beginQuads(BufferBuilder builder, VertexFormat format) {
   }
 
   public static void draw(BufferBuilder builder) {
+    builder.finishDrawing();
     WorldVertexBufferUploader.draw(builder);
   }
 

diff --git a/src/main/java/dev/fiki/forgehax/main/mods/player/FreecamMod.java b/src/main/java/dev/fiki/forgehax/main/mods/player/FreecamMod.java
@@ -155,6 +155,8 @@ public void onLocalPlayerUpdate(LocalPlayerUpdateEvent event) {
   @SubscribeListener
   public void onRender(RenderSpaceEvent event) {
     if (mockPlayer != null) {
+      MatrixStack stack = event.getStack();
+      stack.push();
       // mock player cant move so no need to lerp its pos and yaw
       Vector3d pos = mockPlayer.getPositionVec().subtract(event.getProjectedPos());
 
@@ -165,7 +167,7 @@ public void onRender(RenderSpaceEvent event) {
 
       MC.getRenderManager().renderEntityStatic(mockPlayer,
           pos.getX(), pos.getY(), pos.getZ(), mockPlayer.rotationYaw,
-          event.getPartialTicks(), new MatrixStack(),
+          event.getPartialTicks(), stack,
           buffer, MC.getRenderManager().getPackedLight(mockPlayer, event.getPartialTicks()));
 
 //      buffer.finish(RenderType.entitySolid(PlayerContainer.LOCATION_BLOCKS_TEXTURE));
@@ -178,6 +180,8 @@ public void onRender(RenderSpaceEvent event) {
       RenderSystem.color4f(1.f ,1.f ,1.f, 1.0f);
 
       buffer.finish();
+      stack.pop();
+//      RenderSystem.popMatrix();
     }
   }
 

diff --git a/src/main/java/dev/fiki/forgehax/main/services/ForgeEventListenerService.java b/src/main/java/dev/fiki/forgehax/main/services/ForgeEventListenerService.java
@@ -113,7 +113,6 @@ public void onRenderWorld(RenderWorldLastEvent event) {
     VectorUtil.setProjectionViewMatrix(projectionMatrix, event.getMatrixStack().getLast().getMatrix());
 
     RenderSystem.pushMatrix();
-    RenderSystem.multMatrix(event.getMatrixStack().getLast().getMatrix());
 
     RenderSystem.disableTexture();
     RenderSystem.enableBlend();