Close #36

lwjglgamedev · Jul 23, 2022 · b7b3d44 · b7b3d44
1 parent a3d3022
commit b7b3d44
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/bookcontents/chapter-15/chapter-15.md b/bookcontents/chapter-15/chapter-15.md
@@ -371,9 +371,11 @@ public class GuiRenderActivity {
                     rect.extent(it -> it.width((int) (imVec4.z - imVec4.x)).height((int) (imVec4.w - imVec4.y)));
                     vkCmdSetScissor(cmdHandle, 0, rect);
                     int numElements = imDrawData.getCmdListCmdBufferElemCount(i, j);
-                    vkCmdDrawIndexed(cmdHandle, numElements, 1, offsetIdx, offsetVtx, 0);
-                    offsetIdx += numElements;
+                    vkCmdDrawIndexed(cmdHandle, numElements, 1,
+                            offsetIdx + imDrawData.getCmdListCmdBufferIdxOffset(i, j),
+                            offsetVtx + imDrawData.getCmdListCmdBufferVtxOffset(i, j), 0);
                 }
+                offsetIdx += imDrawData.getCmdListIdxBufferSize(i);
                 offsetVtx += imDrawData.getCmdListVtxBufferSize(i);
             }
         }

diff --git a/booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/gui/GuiRenderActivity.java b/booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/gui/GuiRenderActivity.java
@@ -185,9 +185,11 @@ public void recordCommandBuffer(Scene scene, CommandBuffer commandBuffer) {
                     rect.extent(it -> it.width((int) (imVec4.z - imVec4.x)).height((int) (imVec4.w - imVec4.y)));
                     vkCmdSetScissor(cmdHandle, 0, rect);
                     int numElements = imDrawData.getCmdListCmdBufferElemCount(i, j);
-                    vkCmdDrawIndexed(cmdHandle, numElements, 1, offsetIdx, offsetVtx, 0);
-                    offsetIdx += numElements;
+                    vkCmdDrawIndexed(cmdHandle, numElements, 1,
+                            offsetIdx + imDrawData.getCmdListCmdBufferIdxOffset(i, j),
+                            offsetVtx + imDrawData.getCmdListCmdBufferVtxOffset(i, j), 0);
                 }
+                offsetIdx += imDrawData.getCmdListIdxBufferSize(i);
                 offsetVtx += imDrawData.getCmdListVtxBufferSize(i);
             }
         }

diff --git a/booksamples/chapter-16/src/main/java/org/vulkanb/eng/graph/gui/GuiRenderActivity.java b/booksamples/chapter-16/src/main/java/org/vulkanb/eng/graph/gui/GuiRenderActivity.java
@@ -185,9 +185,11 @@ public void recordCommandBuffer(Scene scene, CommandBuffer commandBuffer) {
                     rect.extent(it -> it.width((int) (imVec4.z - imVec4.x)).height((int) (imVec4.w - imVec4.y)));
                     vkCmdSetScissor(cmdHandle, 0, rect);
                     int numElements = imDrawData.getCmdListCmdBufferElemCount(i, j);
-                    vkCmdDrawIndexed(cmdHandle, numElements, 1, offsetIdx, offsetVtx, 0);
-                    offsetIdx += numElements;
+                    vkCmdDrawIndexed(cmdHandle, numElements, 1,
+                            offsetIdx + imDrawData.getCmdListCmdBufferIdxOffset(i, j),
+                            offsetVtx + imDrawData.getCmdListCmdBufferVtxOffset(i, j), 0);
                 }
+                offsetIdx += imDrawData.getCmdListIdxBufferSize(i);
                 offsetVtx += imDrawData.getCmdListVtxBufferSize(i);
             }
         }