shlepa/imgui-java
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(api): fix incorrect ImDrawData#getCmdListCmdBufferTextureId return type (#272)

Browse Source 
Method must return long to be consistent with API in general.
This commit is contained in:
SpaiR authored and GitHub committed 2024-09-23 09:51:41 +03:00
1 parent c0ea002d07
commit 36d9e3a13c
3 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

imgui-binding/src/generated/java/imgui/ImDrawData.java
+1 -1
View File
@@ -63,7 +63,7 @@ public final class ImDrawData extends ImGuiStruct {
* User-provided texture ID. Set by user in ImfontAtlas::SetTexID() for fonts or passed to Image*() functions. * 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. * 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(); return (uintptr_t)THIS->CmdLists[cmdListIdx]->CmdBuffer[cmdBufferIdx].GetTexID();
*/ */
imgui-binding/src/main/java/imgui/ImDrawData.java
+1 -1
View File
@@ -67,7 +67,7 @@ public final class ImDrawData extends ImGuiStruct {
* User-provided texture ID. Set by user in ImfontAtlas::SetTexID() for fonts or passed to Image*() functions. * 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. * 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(); return (uintptr_t)THIS->CmdLists[cmdListIdx]->CmdBuffer[cmdBufferIdx].GetTexID();
*/ */
imgui-lwjgl3/src/main/java/imgui/gl3/ImGuiImplGl3.java
+2 -2
View File
@@ -474,14 +474,14 @@ public class ImGuiImplGl3 {
glScissor((int) clipMinX, (int) (fbHeight - clipMaxY), (int) (clipMaxX - clipMinX), (int) (clipMaxY - clipMinY)); glScissor((int) clipMinX, (int) (fbHeight - clipMaxY), (int) (clipMaxX - clipMinX), (int) (clipMaxY - clipMinY));
// Bind texture, Draw // 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 elemCount = drawData.getCmdListCmdBufferElemCount(n, cmdIdx);
final int idxOffset = drawData.getCmdListCmdBufferIdxOffset(n, cmdIdx); final int idxOffset = drawData.getCmdListCmdBufferIdxOffset(n, cmdIdx);
final int vtxOffset = drawData.getCmdListCmdBufferVtxOffset(n, cmdIdx); final int vtxOffset = drawData.getCmdListCmdBufferVtxOffset(n, cmdIdx);
final long indices = idxOffset * (long) ImDrawData.sizeOfImDrawIdx(); final long indices = idxOffset * (long) ImDrawData.sizeOfImDrawIdx();
final int type = ImDrawData.sizeOfImDrawIdx() == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; 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) { if (data.glVersion >= 320) {
glDrawElementsBaseVertex(GL_TRIANGLES, elemCount, type, indices, vtxOffset); glDrawElementsBaseVertex(GL_TRIANGLES, elemCount, type, indices, vtxOffset);