From 859a6818f429361edb75c1ce08efd0887a17954e Mon Sep 17 00:00:00 2001 From: SpaiR Date: Mon, 23 Sep 2024 08:50:39 +0300 Subject: [PATCH] fix(api): fix incorrect ImDrawData#getCmdListCmdBufferTextureId return type Method must return long to be consistent with API in general. --- imgui-binding/src/generated/java/imgui/ImDrawData.java | 2 +- imgui-binding/src/main/java/imgui/ImDrawData.java | 2 +- imgui-lwjgl3/src/main/java/imgui/gl3/ImGuiImplGl3.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/imgui-binding/src/generated/java/imgui/ImDrawData.java b/imgui-binding/src/generated/java/imgui/ImDrawData.java index b3b2326e..e100472e 100644 --- a/imgui-binding/src/generated/java/imgui/ImDrawData.java +++ b/imgui-binding/src/generated/java/imgui/ImDrawData.java @@ -63,7 +63,7 @@ public ImVec4 getCmdListCmdBufferClipRect(final int cmdListIdx, final int cmdBuf * User-provided texture ID. Set by user in ImfontAtlas::SetTexID() for fonts or passed to Image*() functions. * Ignore if never using images or multiple fonts atlas. */ - public native int getCmdListCmdBufferTextureId(int cmdListIdx, int cmdBufferIdx); /* + public native long getCmdListCmdBufferTextureId(int cmdListIdx, int cmdBufferIdx); /* return (uintptr_t)THIS->CmdLists[cmdListIdx]->CmdBuffer[cmdBufferIdx].GetTexID(); */ diff --git a/imgui-binding/src/main/java/imgui/ImDrawData.java b/imgui-binding/src/main/java/imgui/ImDrawData.java index fc018d77..6341a092 100644 --- a/imgui-binding/src/main/java/imgui/ImDrawData.java +++ b/imgui-binding/src/main/java/imgui/ImDrawData.java @@ -67,7 +67,7 @@ public ImVec4 getCmdListCmdBufferClipRect(final int cmdListIdx, final int cmdBuf * User-provided texture ID. Set by user in ImfontAtlas::SetTexID() for fonts or passed to Image*() functions. * Ignore if never using images or multiple fonts atlas. */ - public native int getCmdListCmdBufferTextureId(int cmdListIdx, int cmdBufferIdx); /* + public native long getCmdListCmdBufferTextureId(int cmdListIdx, int cmdBufferIdx); /* return (uintptr_t)THIS->CmdLists[cmdListIdx]->CmdBuffer[cmdBufferIdx].GetTexID(); */ diff --git a/imgui-lwjgl3/src/main/java/imgui/gl3/ImGuiImplGl3.java b/imgui-lwjgl3/src/main/java/imgui/gl3/ImGuiImplGl3.java index 0afab1e9..7435bffd 100644 --- a/imgui-lwjgl3/src/main/java/imgui/gl3/ImGuiImplGl3.java +++ b/imgui-lwjgl3/src/main/java/imgui/gl3/ImGuiImplGl3.java @@ -474,14 +474,14 @@ public void renderDrawData(final ImDrawData drawData) { glScissor((int) clipMinX, (int) (fbHeight - clipMaxY), (int) (clipMaxX - clipMinX), (int) (clipMaxY - clipMinY)); // Bind texture, Draw - final int textureId = drawData.getCmdListCmdBufferTextureId(n, cmdIdx); + final long textureId = drawData.getCmdListCmdBufferTextureId(n, cmdIdx); final int elemCount = drawData.getCmdListCmdBufferElemCount(n, cmdIdx); final int idxOffset = drawData.getCmdListCmdBufferIdxOffset(n, cmdIdx); final int vtxOffset = drawData.getCmdListCmdBufferVtxOffset(n, cmdIdx); final long indices = idxOffset * (long) ImDrawData.sizeOfImDrawIdx(); final int type = ImDrawData.sizeOfImDrawIdx() == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; - glBindTexture(GL_TEXTURE_2D, textureId); + glBindTexture(GL_TEXTURE_2D, (int) textureId); if (data.glVersion >= 320) { glDrawElementsBaseVertex(GL_TRIANGLES, elemCount, type, indices, vtxOffset);