From c4c03bee9f8695ee8a2f743a2a7f6e9835314028 Mon Sep 17 00:00:00 2001 From: SpaiR Date: Thu, 29 Aug 2024 16:54:43 +0300 Subject: [PATCH] feat(api): use `uintptr_t` instead of `intptr_t` for pointers (#265) Image methods now accept the `long` type instead of `int`, as they are expected to work with pointers as well. --- buildSrc/scripts/publish.sh | 0 .../main/kotlin/tool/generator/api/util.kt | 2 +- .../src/generated/java/imgui/ImDrawData.java | 4 +- .../src/generated/java/imgui/ImDrawList.java | 102 ++++++------- .../src/generated/java/imgui/ImFont.java | 8 +- .../src/generated/java/imgui/ImFontAtlas.java | 58 ++++---- .../generated/java/imgui/ImFontConfig.java | 4 +- .../src/generated/java/imgui/ImFontGlyph.java | 2 +- .../src/generated/java/imgui/ImGui.java | 134 +++++++++--------- .../src/generated/java/imgui/ImGuiIO.java | 4 +- .../generated/java/imgui/ImGuiKeyData.java | 2 +- .../generated/java/imgui/ImGuiPlatformIO.java | 22 +-- .../generated/java/imgui/ImGuiStorage.java | 2 +- .../src/generated/java/imgui/ImGuiStyle.java | 2 +- .../java/imgui/ImGuiTableSortSpecs.java | 2 +- .../generated/java/imgui/ImGuiTextFilter.java | 2 +- .../generated/java/imgui/ImGuiViewport.java | 6 +- .../java/imgui/ImGuiWindowClass.java | 2 +- .../imguifiledialog/ImGuiFileDialog.java | 2 +- .../java/imgui/extension/imnodes/ImNodes.java | 10 +- .../java/imgui/extension/implot/ImPlot.java | 48 +++---- .../extension/implot/ImPlotInputMap.java | 2 +- .../imgui/extension/implot/ImPlotStyle.java | 2 +- .../imgui/extension/memedit/MemoryEditor.java | 2 +- .../extension/memedit/MemoryEditorSizes.java | 2 +- .../imgui/extension/nodeditor/NodeEditor.java | 32 ++--- .../extension/nodeditor/NodeEditorConfig.java | 2 +- .../extension/texteditor/TextEditor.java | 4 +- .../TextEditorLanguageDefinition.java | 16 +-- .../generated/java/imgui/internal/ImGui.java | 6 +- .../java/imgui/internal/ImGuiDockNode.java | 16 +-- .../src/main/java/imgui/ImDrawData.java | 2 +- .../src/main/java/imgui/ImDrawList.java | 8 +- imgui-binding/src/main/java/imgui/ImFont.java | 2 +- .../src/main/java/imgui/ImFontAtlas.java | 4 +- .../src/main/java/imgui/ImFontConfig.java | 2 +- .../src/main/java/imgui/ImFontGlyph.java | 2 +- imgui-binding/src/main/java/imgui/ImGui.java | 4 +- .../src/main/java/imgui/ImGuiKeyData.java | 2 +- .../src/main/java/imgui/ImGuiPlatformIO.java | 22 +-- .../src/main/java/imgui/ImGuiStorage.java | 2 +- .../src/main/java/imgui/ImGuiStyle.java | 2 +- .../main/java/imgui/ImGuiTableSortSpecs.java | 2 +- .../src/main/java/imgui/ImGuiTextFilter.java | 2 +- .../src/main/java/imgui/ImGuiViewport.java | 4 +- .../src/main/java/imgui/ImGuiWindowClass.java | 2 +- .../imguifiledialog/ImGuiFileDialog.java | 2 +- .../java/imgui/extension/implot/ImPlot.java | 2 +- .../extension/implot/ImPlotInputMap.java | 2 +- .../imgui/extension/implot/ImPlotStyle.java | 2 +- .../imgui/extension/memedit/MemoryEditor.java | 2 +- .../extension/memedit/MemoryEditorSizes.java | 2 +- .../imgui/extension/nodeditor/NodeEditor.java | 18 +-- .../extension/nodeditor/NodeEditorConfig.java | 2 +- .../extension/texteditor/TextEditor.java | 2 +- .../TextEditorLanguageDefinition.java | 2 +- .../java/imgui/internal/ImGuiDockNode.java | 4 +- imgui-binding/src/main/native/jni_common.cpp | 2 +- 58 files changed, 303 insertions(+), 303 deletions(-) mode change 100644 => 100755 buildSrc/scripts/publish.sh diff --git a/buildSrc/scripts/publish.sh b/buildSrc/scripts/publish.sh old mode 100644 new mode 100755 diff --git a/buildSrc/src/main/kotlin/tool/generator/api/util.kt b/buildSrc/src/main/kotlin/tool/generator/api/util.kt index 873e35c..03f7e2d 100644 --- a/buildSrc/src/main/kotlin/tool/generator/api/util.kt +++ b/buildSrc/src/main/kotlin/tool/generator/api/util.kt @@ -45,7 +45,7 @@ const val A_TYPE_VALUE_ACCESSOR_SETTER = "SETTER" const val A_TYPE_VALUE_ACCESSOR_GETTER = "GETTER" const val PTR_JVM_FIELD = "ptr" -const val PTR_JNI_CAST = "intptr_t" +const val PTR_JNI_CAST = "uintptr_t" const val PTR_JNI_THIS = "THIS" const val PARAM_ARR_LEN_POSTFIX = "Count" diff --git a/imgui-binding/src/generated/java/imgui/ImDrawData.java b/imgui-binding/src/generated/java/imgui/ImDrawData.java index abae8ac..b3b2326 100644 --- a/imgui-binding/src/generated/java/imgui/ImDrawData.java +++ b/imgui-binding/src/generated/java/imgui/ImDrawData.java @@ -64,7 +64,7 @@ public final class ImDrawData extends ImGuiStruct { * Ignore if never using images or multiple fonts atlas. */ public native int getCmdListCmdBufferTextureId(int cmdListIdx, int cmdBufferIdx); /* - return (intptr_t)THIS->CmdLists[cmdListIdx]->CmdBuffer[cmdBufferIdx].GetTexID(); + return (uintptr_t)THIS->CmdLists[cmdListIdx]->CmdBuffer[cmdBufferIdx].GetTexID(); */ /** @@ -326,7 +326,7 @@ public final class ImDrawData extends ImGuiStruct { } private native long nGetOwnerViewport(); /* - return (intptr_t)THIS->OwnerViewport; + return (uintptr_t)THIS->OwnerViewport; */ // Functions diff --git a/imgui-binding/src/generated/java/imgui/ImDrawList.java b/imgui-binding/src/generated/java/imgui/ImDrawList.java index 36f320c..75dd2fc 100644 --- a/imgui-binding/src/generated/java/imgui/ImDrawList.java +++ b/imgui-binding/src/generated/java/imgui/ImDrawList.java @@ -130,12 +130,12 @@ public final class ImDrawList extends ImGuiStruct { THIS->PopClipRect(); */ - public void pushTextureID(final int textureId) { + public void pushTextureID(final long textureId) { nPushTextureID(textureId); } - private native void nPushTextureID(int textureId); /* - THIS->PushTextureID((ImTextureID)(intptr_t)textureId); + private native void nPushTextureID(long textureId); /* + THIS->PushTextureID((ImTextureID)(uintptr_t)textureId); */ public void popTextureID() { @@ -880,143 +880,143 @@ public final class ImDrawList extends ImGuiStruct { // - "pMin" and "pMax" represent the upper-left and lower-right corners of the rectangle. // - "uvMin" and "uvMax" represent the normalized texture coordinates to use for those corners. Using (0,0)->(1,1) texture coordinates will generally display the entire texture. - public void addImage(final int textureID, final ImVec2 pMin, final ImVec2 pMax) { + public void addImage(final long textureID, final ImVec2 pMin, final ImVec2 pMax) { nAddImage(textureID, pMin.x, pMin.y, pMax.x, pMax.y); } - public void addImage(final int textureID, final float pMinX, final float pMinY, final float pMaxX, final float pMaxY) { + public void addImage(final long textureID, final float pMinX, final float pMinY, final float pMaxX, final float pMaxY) { nAddImage(textureID, pMinX, pMinY, pMaxX, pMaxY); } - public void addImage(final int textureID, final ImVec2 pMin, final ImVec2 pMax, final ImVec2 uvMin) { + public void addImage(final long textureID, final ImVec2 pMin, final ImVec2 pMax, final ImVec2 uvMin) { nAddImage(textureID, pMin.x, pMin.y, pMax.x, pMax.y, uvMin.x, uvMin.y); } - public void addImage(final int textureID, final float pMinX, final float pMinY, final float pMaxX, final float pMaxY, final float uvMinX, final float uvMinY) { + public void addImage(final long textureID, final float pMinX, final float pMinY, final float pMaxX, final float pMaxY, final float uvMinX, final float uvMinY) { nAddImage(textureID, pMinX, pMinY, pMaxX, pMaxY, uvMinX, uvMinY); } - public void addImage(final int textureID, final ImVec2 pMin, final ImVec2 pMax, final ImVec2 uvMin, final ImVec2 uvMax) { + public void addImage(final long textureID, final ImVec2 pMin, final ImVec2 pMax, final ImVec2 uvMin, final ImVec2 uvMax) { nAddImage(textureID, pMin.x, pMin.y, pMax.x, pMax.y, uvMin.x, uvMin.y, uvMax.x, uvMax.y); } - public void addImage(final int textureID, final float pMinX, final float pMinY, final float pMaxX, final float pMaxY, final float uvMinX, final float uvMinY, final float uvMaxX, final float uvMaxY) { + public void addImage(final long textureID, final float pMinX, final float pMinY, final float pMaxX, final float pMaxY, final float uvMinX, final float uvMinY, final float uvMaxX, final float uvMaxY) { nAddImage(textureID, pMinX, pMinY, pMaxX, pMaxY, uvMinX, uvMinY, uvMaxX, uvMaxY); } - public void addImage(final int textureID, final ImVec2 pMin, final ImVec2 pMax, final ImVec2 uvMin, final ImVec2 uvMax, final int col) { + public void addImage(final long textureID, final ImVec2 pMin, final ImVec2 pMax, final ImVec2 uvMin, final ImVec2 uvMax, final int col) { nAddImage(textureID, pMin.x, pMin.y, pMax.x, pMax.y, uvMin.x, uvMin.y, uvMax.x, uvMax.y, col); } - public void addImage(final int textureID, final float pMinX, final float pMinY, final float pMaxX, final float pMaxY, final float uvMinX, final float uvMinY, final float uvMaxX, final float uvMaxY, final int col) { + public void addImage(final long textureID, final float pMinX, final float pMinY, final float pMaxX, final float pMaxY, final float uvMinX, final float uvMinY, final float uvMaxX, final float uvMaxY, final int col) { nAddImage(textureID, pMinX, pMinY, pMaxX, pMaxY, uvMinX, uvMinY, uvMaxX, uvMaxY, col); } - private native void nAddImage(int textureID, float pMinX, float pMinY, float pMaxX, float pMaxY); /*MANUAL + private native void nAddImage(long textureID, float pMinX, float pMinY, float pMaxX, float pMaxY); /*MANUAL ImVec2 pMin = ImVec2(pMinX, pMinY); ImVec2 pMax = ImVec2(pMaxX, pMaxY); - THIS->AddImage((ImTextureID)(intptr_t)textureID, pMin, pMax); + THIS->AddImage((ImTextureID)(uintptr_t)textureID, pMin, pMax); */ - private native void nAddImage(int textureID, float pMinX, float pMinY, float pMaxX, float pMaxY, float uvMinX, float uvMinY); /*MANUAL + private native void nAddImage(long textureID, float pMinX, float pMinY, float pMaxX, float pMaxY, float uvMinX, float uvMinY); /*MANUAL ImVec2 pMin = ImVec2(pMinX, pMinY); ImVec2 pMax = ImVec2(pMaxX, pMaxY); ImVec2 uvMin = ImVec2(uvMinX, uvMinY); - THIS->AddImage((ImTextureID)(intptr_t)textureID, pMin, pMax, uvMin); + THIS->AddImage((ImTextureID)(uintptr_t)textureID, pMin, pMax, uvMin); */ - private native void nAddImage(int textureID, float pMinX, float pMinY, float pMaxX, float pMaxY, float uvMinX, float uvMinY, float uvMaxX, float uvMaxY); /*MANUAL + private native void nAddImage(long textureID, float pMinX, float pMinY, float pMaxX, float pMaxY, float uvMinX, float uvMinY, float uvMaxX, float uvMaxY); /*MANUAL ImVec2 pMin = ImVec2(pMinX, pMinY); ImVec2 pMax = ImVec2(pMaxX, pMaxY); ImVec2 uvMin = ImVec2(uvMinX, uvMinY); ImVec2 uvMax = ImVec2(uvMaxX, uvMaxY); - THIS->AddImage((ImTextureID)(intptr_t)textureID, pMin, pMax, uvMin, uvMax); + THIS->AddImage((ImTextureID)(uintptr_t)textureID, pMin, pMax, uvMin, uvMax); */ - private native void nAddImage(int textureID, float pMinX, float pMinY, float pMaxX, float pMaxY, float uvMinX, float uvMinY, float uvMaxX, float uvMaxY, int col); /*MANUAL + private native void nAddImage(long textureID, float pMinX, float pMinY, float pMaxX, float pMaxY, float uvMinX, float uvMinY, float uvMaxX, float uvMaxY, int col); /*MANUAL ImVec2 pMin = ImVec2(pMinX, pMinY); ImVec2 pMax = ImVec2(pMaxX, pMaxY); ImVec2 uvMin = ImVec2(uvMinX, uvMinY); ImVec2 uvMax = ImVec2(uvMaxX, uvMaxY); - THIS->AddImage((ImTextureID)(intptr_t)textureID, pMin, pMax, uvMin, uvMax, col); + THIS->AddImage((ImTextureID)(uintptr_t)textureID, pMin, pMax, uvMin, uvMax, col); */ - public void addImageQuad(final int textureID, final ImVec2 p1, final ImVec2 p2, final ImVec2 p3, final ImVec2 p4) { + public void addImageQuad(final long textureID, final ImVec2 p1, final ImVec2 p2, final ImVec2 p3, final ImVec2 p4) { nAddImageQuad(textureID, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y); } - public void addImageQuad(final int textureID, final float p1X, final float p1Y, final float p2X, final float p2Y, final float p3X, final float p3Y, final float p4X, final float p4Y) { + public void addImageQuad(final long textureID, final float p1X, final float p1Y, final float p2X, final float p2Y, final float p3X, final float p3Y, final float p4X, final float p4Y) { nAddImageQuad(textureID, p1X, p1Y, p2X, p2Y, p3X, p3Y, p4X, p4Y); } - public void addImageQuad(final int textureID, final ImVec2 p1, final ImVec2 p2, final ImVec2 p3, final ImVec2 p4, final ImVec2 uv1) { + public void addImageQuad(final long textureID, final ImVec2 p1, final ImVec2 p2, final ImVec2 p3, final ImVec2 p4, final ImVec2 uv1) { nAddImageQuad(textureID, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y, uv1.x, uv1.y); } - public void addImageQuad(final int textureID, final float p1X, final float p1Y, final float p2X, final float p2Y, final float p3X, final float p3Y, final float p4X, final float p4Y, final float uv1X, final float uv1Y) { + public void addImageQuad(final long textureID, final float p1X, final float p1Y, final float p2X, final float p2Y, final float p3X, final float p3Y, final float p4X, final float p4Y, final float uv1X, final float uv1Y) { nAddImageQuad(textureID, p1X, p1Y, p2X, p2Y, p3X, p3Y, p4X, p4Y, uv1X, uv1Y); } - public void addImageQuad(final int textureID, final ImVec2 p1, final ImVec2 p2, final ImVec2 p3, final ImVec2 p4, final ImVec2 uv1, final ImVec2 uv2) { + public void addImageQuad(final long textureID, final ImVec2 p1, final ImVec2 p2, final ImVec2 p3, final ImVec2 p4, final ImVec2 uv1, final ImVec2 uv2) { nAddImageQuad(textureID, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y, uv1.x, uv1.y, uv2.x, uv2.y); } - public void addImageQuad(final int textureID, final float p1X, final float p1Y, final float p2X, final float p2Y, final float p3X, final float p3Y, final float p4X, final float p4Y, final float uv1X, final float uv1Y, final float uv2X, final float uv2Y) { + public void addImageQuad(final long textureID, final float p1X, final float p1Y, final float p2X, final float p2Y, final float p3X, final float p3Y, final float p4X, final float p4Y, final float uv1X, final float uv1Y, final float uv2X, final float uv2Y) { nAddImageQuad(textureID, p1X, p1Y, p2X, p2Y, p3X, p3Y, p4X, p4Y, uv1X, uv1Y, uv2X, uv2Y); } - public void addImageQuad(final int textureID, final ImVec2 p1, final ImVec2 p2, final ImVec2 p3, final ImVec2 p4, final ImVec2 uv1, final ImVec2 uv2, final ImVec2 uv3) { + public void addImageQuad(final long textureID, final ImVec2 p1, final ImVec2 p2, final ImVec2 p3, final ImVec2 p4, final ImVec2 uv1, final ImVec2 uv2, final ImVec2 uv3) { nAddImageQuad(textureID, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y, uv1.x, uv1.y, uv2.x, uv2.y, uv3.x, uv3.y); } - public void addImageQuad(final int textureID, final float p1X, final float p1Y, final float p2X, final float p2Y, final float p3X, final float p3Y, final float p4X, final float p4Y, final float uv1X, final float uv1Y, final float uv2X, final float uv2Y, final float uv3X, final float uv3Y) { + public void addImageQuad(final long textureID, final float p1X, final float p1Y, final float p2X, final float p2Y, final float p3X, final float p3Y, final float p4X, final float p4Y, final float uv1X, final float uv1Y, final float uv2X, final float uv2Y, final float uv3X, final float uv3Y) { nAddImageQuad(textureID, p1X, p1Y, p2X, p2Y, p3X, p3Y, p4X, p4Y, uv1X, uv1Y, uv2X, uv2Y, uv3X, uv3Y); } - public void addImageQuad(final int textureID, final ImVec2 p1, final ImVec2 p2, final ImVec2 p3, final ImVec2 p4, final ImVec2 uv1, final ImVec2 uv2, final ImVec2 uv3, final ImVec2 uv4) { + public void addImageQuad(final long textureID, final ImVec2 p1, final ImVec2 p2, final ImVec2 p3, final ImVec2 p4, final ImVec2 uv1, final ImVec2 uv2, final ImVec2 uv3, final ImVec2 uv4) { nAddImageQuad(textureID, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y, uv1.x, uv1.y, uv2.x, uv2.y, uv3.x, uv3.y, uv4.x, uv4.y); } - public void addImageQuad(final int textureID, final float p1X, final float p1Y, final float p2X, final float p2Y, final float p3X, final float p3Y, final float p4X, final float p4Y, final float uv1X, final float uv1Y, final float uv2X, final float uv2Y, final float uv3X, final float uv3Y, final float uv4X, final float uv4Y) { + public void addImageQuad(final long textureID, final float p1X, final float p1Y, final float p2X, final float p2Y, final float p3X, final float p3Y, final float p4X, final float p4Y, final float uv1X, final float uv1Y, final float uv2X, final float uv2Y, final float uv3X, final float uv3Y, final float uv4X, final float uv4Y) { nAddImageQuad(textureID, p1X, p1Y, p2X, p2Y, p3X, p3Y, p4X, p4Y, uv1X, uv1Y, uv2X, uv2Y, uv3X, uv3Y, uv4X, uv4Y); } - public void addImageQuad(final int textureID, final ImVec2 p1, final ImVec2 p2, final ImVec2 p3, final ImVec2 p4, final ImVec2 uv1, final ImVec2 uv2, final ImVec2 uv3, final ImVec2 uv4, final int col) { + public void addImageQuad(final long textureID, final ImVec2 p1, final ImVec2 p2, final ImVec2 p3, final ImVec2 p4, final ImVec2 uv1, final ImVec2 uv2, final ImVec2 uv3, final ImVec2 uv4, final int col) { nAddImageQuad(textureID, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y, uv1.x, uv1.y, uv2.x, uv2.y, uv3.x, uv3.y, uv4.x, uv4.y, col); } - public void addImageQuad(final int textureID, final float p1X, final float p1Y, final float p2X, final float p2Y, final float p3X, final float p3Y, final float p4X, final float p4Y, final float uv1X, final float uv1Y, final float uv2X, final float uv2Y, final float uv3X, final float uv3Y, final float uv4X, final float uv4Y, final int col) { + public void addImageQuad(final long textureID, final float p1X, final float p1Y, final float p2X, final float p2Y, final float p3X, final float p3Y, final float p4X, final float p4Y, final float uv1X, final float uv1Y, final float uv2X, final float uv2Y, final float uv3X, final float uv3Y, final float uv4X, final float uv4Y, final int col) { nAddImageQuad(textureID, p1X, p1Y, p2X, p2Y, p3X, p3Y, p4X, p4Y, uv1X, uv1Y, uv2X, uv2Y, uv3X, uv3Y, uv4X, uv4Y, col); } - private native void nAddImageQuad(int textureID, float p1X, float p1Y, float p2X, float p2Y, float p3X, float p3Y, float p4X, float p4Y); /*MANUAL + private native void nAddImageQuad(long textureID, float p1X, float p1Y, float p2X, float p2Y, float p3X, float p3Y, float p4X, float p4Y); /*MANUAL ImVec2 p1 = ImVec2(p1X, p1Y); ImVec2 p2 = ImVec2(p2X, p2Y); ImVec2 p3 = ImVec2(p3X, p3Y); ImVec2 p4 = ImVec2(p4X, p4Y); - THIS->AddImageQuad((ImTextureID)(intptr_t)textureID, p1, p2, p3, p4); + THIS->AddImageQuad((ImTextureID)(uintptr_t)textureID, p1, p2, p3, p4); */ - private native void nAddImageQuad(int textureID, float p1X, float p1Y, float p2X, float p2Y, float p3X, float p3Y, float p4X, float p4Y, float uv1X, float uv1Y); /*MANUAL + private native void nAddImageQuad(long textureID, float p1X, float p1Y, float p2X, float p2Y, float p3X, float p3Y, float p4X, float p4Y, float uv1X, float uv1Y); /*MANUAL ImVec2 p1 = ImVec2(p1X, p1Y); ImVec2 p2 = ImVec2(p2X, p2Y); ImVec2 p3 = ImVec2(p3X, p3Y); ImVec2 p4 = ImVec2(p4X, p4Y); ImVec2 uv1 = ImVec2(uv1X, uv1Y); - THIS->AddImageQuad((ImTextureID)(intptr_t)textureID, p1, p2, p3, p4, uv1); + THIS->AddImageQuad((ImTextureID)(uintptr_t)textureID, p1, p2, p3, p4, uv1); */ - private native void nAddImageQuad(int textureID, float p1X, float p1Y, float p2X, float p2Y, float p3X, float p3Y, float p4X, float p4Y, float uv1X, float uv1Y, float uv2X, float uv2Y); /*MANUAL + private native void nAddImageQuad(long textureID, float p1X, float p1Y, float p2X, float p2Y, float p3X, float p3Y, float p4X, float p4Y, float uv1X, float uv1Y, float uv2X, float uv2Y); /*MANUAL ImVec2 p1 = ImVec2(p1X, p1Y); ImVec2 p2 = ImVec2(p2X, p2Y); ImVec2 p3 = ImVec2(p3X, p3Y); ImVec2 p4 = ImVec2(p4X, p4Y); ImVec2 uv1 = ImVec2(uv1X, uv1Y); ImVec2 uv2 = ImVec2(uv2X, uv2Y); - THIS->AddImageQuad((ImTextureID)(intptr_t)textureID, p1, p2, p3, p4, uv1, uv2); + THIS->AddImageQuad((ImTextureID)(uintptr_t)textureID, p1, p2, p3, p4, uv1, uv2); */ - private native void nAddImageQuad(int textureID, float p1X, float p1Y, float p2X, float p2Y, float p3X, float p3Y, float p4X, float p4Y, float uv1X, float uv1Y, float uv2X, float uv2Y, float uv3X, float uv3Y); /*MANUAL + private native void nAddImageQuad(long textureID, float p1X, float p1Y, float p2X, float p2Y, float p3X, float p3Y, float p4X, float p4Y, float uv1X, float uv1Y, float uv2X, float uv2Y, float uv3X, float uv3Y); /*MANUAL ImVec2 p1 = ImVec2(p1X, p1Y); ImVec2 p2 = ImVec2(p2X, p2Y); ImVec2 p3 = ImVec2(p3X, p3Y); @@ -1024,10 +1024,10 @@ public final class ImDrawList extends ImGuiStruct { ImVec2 uv1 = ImVec2(uv1X, uv1Y); ImVec2 uv2 = ImVec2(uv2X, uv2Y); ImVec2 uv3 = ImVec2(uv3X, uv3Y); - THIS->AddImageQuad((ImTextureID)(intptr_t)textureID, p1, p2, p3, p4, uv1, uv2, uv3); + THIS->AddImageQuad((ImTextureID)(uintptr_t)textureID, p1, p2, p3, p4, uv1, uv2, uv3); */ - private native void nAddImageQuad(int textureID, float p1X, float p1Y, float p2X, float p2Y, float p3X, float p3Y, float p4X, float p4Y, float uv1X, float uv1Y, float uv2X, float uv2Y, float uv3X, float uv3Y, float uv4X, float uv4Y); /*MANUAL + private native void nAddImageQuad(long textureID, float p1X, float p1Y, float p2X, float p2Y, float p3X, float p3Y, float p4X, float p4Y, float uv1X, float uv1Y, float uv2X, float uv2Y, float uv3X, float uv3Y, float uv4X, float uv4Y); /*MANUAL ImVec2 p1 = ImVec2(p1X, p1Y); ImVec2 p2 = ImVec2(p2X, p2Y); ImVec2 p3 = ImVec2(p3X, p3Y); @@ -1036,10 +1036,10 @@ public final class ImDrawList extends ImGuiStruct { ImVec2 uv2 = ImVec2(uv2X, uv2Y); ImVec2 uv3 = ImVec2(uv3X, uv3Y); ImVec2 uv4 = ImVec2(uv4X, uv4Y); - THIS->AddImageQuad((ImTextureID)(intptr_t)textureID, p1, p2, p3, p4, uv1, uv2, uv3, uv4); + THIS->AddImageQuad((ImTextureID)(uintptr_t)textureID, p1, p2, p3, p4, uv1, uv2, uv3, uv4); */ - private native void nAddImageQuad(int textureID, float p1X, float p1Y, float p2X, float p2Y, float p3X, float p3Y, float p4X, float p4Y, float uv1X, float uv1Y, float uv2X, float uv2Y, float uv3X, float uv3Y, float uv4X, float uv4Y, int col); /*MANUAL + private native void nAddImageQuad(long textureID, float p1X, float p1Y, float p2X, float p2Y, float p3X, float p3Y, float p4X, float p4Y, float uv1X, float uv1Y, float uv2X, float uv2Y, float uv3X, float uv3Y, float uv4X, float uv4Y, int col); /*MANUAL ImVec2 p1 = ImVec2(p1X, p1Y); ImVec2 p2 = ImVec2(p2X, p2Y); ImVec2 p3 = ImVec2(p3X, p3Y); @@ -1048,39 +1048,39 @@ public final class ImDrawList extends ImGuiStruct { ImVec2 uv2 = ImVec2(uv2X, uv2Y); ImVec2 uv3 = ImVec2(uv3X, uv3Y); ImVec2 uv4 = ImVec2(uv4X, uv4Y); - THIS->AddImageQuad((ImTextureID)(intptr_t)textureID, p1, p2, p3, p4, uv1, uv2, uv3, uv4, col); + THIS->AddImageQuad((ImTextureID)(uintptr_t)textureID, p1, p2, p3, p4, uv1, uv2, uv3, uv4, col); */ - public void addImageRounded(final int textureID, final ImVec2 pMin, final ImVec2 pMax, final ImVec2 uvMin, final ImVec2 uvMax, final int col, final float rounding) { + public void addImageRounded(final long textureID, final ImVec2 pMin, final ImVec2 pMax, final ImVec2 uvMin, final ImVec2 uvMax, final int col, final float rounding) { nAddImageRounded(textureID, pMin.x, pMin.y, pMax.x, pMax.y, uvMin.x, uvMin.y, uvMax.x, uvMax.y, col, rounding); } - public void addImageRounded(final int textureID, final float pMinX, final float pMinY, final float pMaxX, final float pMaxY, final float uvMinX, final float uvMinY, final float uvMaxX, final float uvMaxY, final int col, final float rounding) { + public void addImageRounded(final long textureID, final float pMinX, final float pMinY, final float pMaxX, final float pMaxY, final float uvMinX, final float uvMinY, final float uvMaxX, final float uvMaxY, final int col, final float rounding) { nAddImageRounded(textureID, pMinX, pMinY, pMaxX, pMaxY, uvMinX, uvMinY, uvMaxX, uvMaxY, col, rounding); } - public void addImageRounded(final int textureID, final ImVec2 pMin, final ImVec2 pMax, final ImVec2 uvMin, final ImVec2 uvMax, final int col, final float rounding, final int imDrawFlags) { + public void addImageRounded(final long textureID, final ImVec2 pMin, final ImVec2 pMax, final ImVec2 uvMin, final ImVec2 uvMax, final int col, final float rounding, final int imDrawFlags) { nAddImageRounded(textureID, pMin.x, pMin.y, pMax.x, pMax.y, uvMin.x, uvMin.y, uvMax.x, uvMax.y, col, rounding, imDrawFlags); } - public void addImageRounded(final int textureID, final float pMinX, final float pMinY, final float pMaxX, final float pMaxY, final float uvMinX, final float uvMinY, final float uvMaxX, final float uvMaxY, final int col, final float rounding, final int imDrawFlags) { + public void addImageRounded(final long textureID, final float pMinX, final float pMinY, final float pMaxX, final float pMaxY, final float uvMinX, final float uvMinY, final float uvMaxX, final float uvMaxY, final int col, final float rounding, final int imDrawFlags) { nAddImageRounded(textureID, pMinX, pMinY, pMaxX, pMaxY, uvMinX, uvMinY, uvMaxX, uvMaxY, col, rounding, imDrawFlags); } - private native void nAddImageRounded(int textureID, float pMinX, float pMinY, float pMaxX, float pMaxY, float uvMinX, float uvMinY, float uvMaxX, float uvMaxY, int col, float rounding); /*MANUAL + private native void nAddImageRounded(long textureID, float pMinX, float pMinY, float pMaxX, float pMaxY, float uvMinX, float uvMinY, float uvMaxX, float uvMaxY, int col, float rounding); /*MANUAL ImVec2 pMin = ImVec2(pMinX, pMinY); ImVec2 pMax = ImVec2(pMaxX, pMaxY); ImVec2 uvMin = ImVec2(uvMinX, uvMinY); ImVec2 uvMax = ImVec2(uvMaxX, uvMaxY); - THIS->AddImageRounded((ImTextureID)(intptr_t)textureID, pMin, pMax, uvMin, uvMax, col, rounding); + THIS->AddImageRounded((ImTextureID)(uintptr_t)textureID, pMin, pMax, uvMin, uvMax, col, rounding); */ - private native void nAddImageRounded(int textureID, float pMinX, float pMinY, float pMaxX, float pMaxY, float uvMinX, float uvMinY, float uvMaxX, float uvMaxY, int col, float rounding, int imDrawFlags); /*MANUAL + private native void nAddImageRounded(long textureID, float pMinX, float pMinY, float pMaxX, float pMaxY, float uvMinX, float uvMinY, float uvMaxX, float uvMaxY, int col, float rounding, int imDrawFlags); /*MANUAL ImVec2 pMin = ImVec2(pMinX, pMinY); ImVec2 pMax = ImVec2(pMaxX, pMaxY); ImVec2 uvMin = ImVec2(uvMinX, uvMinY); ImVec2 uvMax = ImVec2(uvMaxX, uvMaxY); - THIS->AddImageRounded((ImTextureID)(intptr_t)textureID, pMin, pMax, uvMin, uvMax, col, rounding, imDrawFlags); + THIS->AddImageRounded((ImTextureID)(uintptr_t)textureID, pMin, pMax, uvMin, uvMax, col, rounding, imDrawFlags); */ // Stateful path API, add points then finish with PathFillConvex() or PathStroke() diff --git a/imgui-binding/src/generated/java/imgui/ImFont.java b/imgui-binding/src/generated/java/imgui/ImFont.java index 4e7d5a6..2624066 100644 --- a/imgui-binding/src/generated/java/imgui/ImFont.java +++ b/imgui-binding/src/generated/java/imgui/ImFont.java @@ -26,7 +26,7 @@ public final class ImFont extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImFont()); + return (uintptr_t)(new ImFont()); */ // TODO IndexAdvanceX @@ -95,7 +95,7 @@ public final class ImFont extends ImGuiStructDestroyable { } private native long nGetFallbackGlyph(); /* - return (intptr_t)THIS->FallbackGlyph; + return (uintptr_t)THIS->FallbackGlyph; */ private native void nSetFallbackGlyph(long value); /* @@ -277,7 +277,7 @@ public final class ImFont extends ImGuiStructDestroyable { } private native long nFindGlyph(int c); /* - return (intptr_t)THIS->FindGlyph((ImWchar)c); + return (uintptr_t)THIS->FindGlyph((ImWchar)c); */ public ImFontGlyph findGlyphNoFallback(final int c) { @@ -285,7 +285,7 @@ public final class ImFont extends ImGuiStructDestroyable { } private native long nFindGlyphNoFallback(int c); /* - return (intptr_t)THIS->FindGlyphNoFallback((ImWchar)c); + return (uintptr_t)THIS->FindGlyphNoFallback((ImWchar)c); */ public float getCharAdvance(final int c) { diff --git a/imgui-binding/src/generated/java/imgui/ImFontAtlas.java b/imgui-binding/src/generated/java/imgui/ImFontAtlas.java index e7036fa..9210c7f 100644 --- a/imgui-binding/src/generated/java/imgui/ImFontAtlas.java +++ b/imgui-binding/src/generated/java/imgui/ImFontAtlas.java @@ -57,7 +57,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImFontConfig()); + return (uintptr_t)(new ImFontConfig()); */ public ImFont addFont(final ImFontConfig imFontConfig) { @@ -65,7 +65,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { } private native long nAddFont(long imFontConfig); /* - return (intptr_t)THIS->AddFont(reinterpret_cast(imFontConfig)); + return (uintptr_t)THIS->AddFont(reinterpret_cast(imFontConfig)); */ public ImFont addFontDefault() { @@ -77,11 +77,11 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { } private native long nAddFontDefault(); /* - return (intptr_t)THIS->AddFontDefault(); + return (uintptr_t)THIS->AddFontDefault(); */ private native long nAddFontDefault(long imFontConfig); /* - return (intptr_t)THIS->AddFontDefault(reinterpret_cast(imFontConfig)); + return (uintptr_t)THIS->AddFontDefault(reinterpret_cast(imFontConfig)); */ public ImFont addFontFromFileTTF(final String filename, final float sizePixels) { @@ -102,14 +102,14 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromFileTTF(String obj_filename, float sizePixels); /*MANUAL auto filename = obj_filename == NULL ? NULL : (char*)env->GetStringUTFChars(obj_filename, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromFileTTF(filename, sizePixels); + auto _result = (uintptr_t)THIS->AddFontFromFileTTF(filename, sizePixels); if (filename != NULL) env->ReleaseStringUTFChars(obj_filename, filename); return _result; */ private native long nAddFontFromFileTTF(String obj_filename, float sizePixels, long fontConfig); /*MANUAL auto filename = obj_filename == NULL ? NULL : (char*)env->GetStringUTFChars(obj_filename, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromFileTTF(filename, sizePixels, reinterpret_cast(fontConfig)); + auto _result = (uintptr_t)THIS->AddFontFromFileTTF(filename, sizePixels, reinterpret_cast(fontConfig)); if (filename != NULL) env->ReleaseStringUTFChars(obj_filename, filename); return _result; */ @@ -117,7 +117,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromFileTTF(String obj_filename, float sizePixels, long fontConfig, short[] obj_glyphRanges); /*MANUAL auto filename = obj_filename == NULL ? NULL : (char*)env->GetStringUTFChars(obj_filename, JNI_FALSE); auto glyphRanges = obj_glyphRanges == NULL ? NULL : (short*)env->GetPrimitiveArrayCritical(obj_glyphRanges, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromFileTTF(filename, sizePixels, reinterpret_cast(fontConfig), (ImWchar*)&glyphRanges[0]); + auto _result = (uintptr_t)THIS->AddFontFromFileTTF(filename, sizePixels, reinterpret_cast(fontConfig), (ImWchar*)&glyphRanges[0]); if (filename != NULL) env->ReleaseStringUTFChars(obj_filename, filename); if (glyphRanges != NULL) env->ReleasePrimitiveArrayCritical(obj_glyphRanges, glyphRanges, JNI_FALSE); return _result; @@ -126,7 +126,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromFileTTF(String obj_filename, float sizePixels, short[] obj_glyphRanges); /*MANUAL auto filename = obj_filename == NULL ? NULL : (char*)env->GetStringUTFChars(obj_filename, JNI_FALSE); auto glyphRanges = obj_glyphRanges == NULL ? NULL : (short*)env->GetPrimitiveArrayCritical(obj_glyphRanges, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromFileTTF(filename, sizePixels, NULL, (ImWchar*)&glyphRanges[0]); + auto _result = (uintptr_t)THIS->AddFontFromFileTTF(filename, sizePixels, NULL, (ImWchar*)&glyphRanges[0]); if (filename != NULL) env->ReleaseStringUTFChars(obj_filename, filename); if (glyphRanges != NULL) env->ReleasePrimitiveArrayCritical(obj_glyphRanges, glyphRanges, JNI_FALSE); return _result; @@ -166,14 +166,14 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromMemoryTTF(byte[] obj_fontData, float sizePixels); /*MANUAL auto fontData = obj_fontData == NULL ? NULL : (char*)env->GetPrimitiveArrayCritical(obj_fontData, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryTTF(&fontData[0], (int)env->GetArrayLength(obj_fontData), sizePixels); + auto _result = (uintptr_t)THIS->AddFontFromMemoryTTF(&fontData[0], (int)env->GetArrayLength(obj_fontData), sizePixels); if (fontData != NULL) env->ReleasePrimitiveArrayCritical(obj_fontData, fontData, JNI_FALSE); return _result; */ private native long nAddFontFromMemoryTTF(byte[] obj_fontData, float sizePixels, long fontConfig); /*MANUAL auto fontData = obj_fontData == NULL ? NULL : (char*)env->GetPrimitiveArrayCritical(obj_fontData, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryTTF(&fontData[0], (int)env->GetArrayLength(obj_fontData), sizePixels, reinterpret_cast(fontConfig)); + auto _result = (uintptr_t)THIS->AddFontFromMemoryTTF(&fontData[0], (int)env->GetArrayLength(obj_fontData), sizePixels, reinterpret_cast(fontConfig)); if (fontData != NULL) env->ReleasePrimitiveArrayCritical(obj_fontData, fontData, JNI_FALSE); return _result; */ @@ -181,7 +181,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromMemoryTTF(byte[] obj_fontData, float sizePixels, long fontConfig, short[] obj_glyphRanges); /*MANUAL auto fontData = obj_fontData == NULL ? NULL : (char*)env->GetPrimitiveArrayCritical(obj_fontData, JNI_FALSE); auto glyphRanges = obj_glyphRanges == NULL ? NULL : (short*)env->GetPrimitiveArrayCritical(obj_glyphRanges, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryTTF(&fontData[0], (int)env->GetArrayLength(obj_fontData), sizePixels, reinterpret_cast(fontConfig), (ImWchar*)&glyphRanges[0]); + auto _result = (uintptr_t)THIS->AddFontFromMemoryTTF(&fontData[0], (int)env->GetArrayLength(obj_fontData), sizePixels, reinterpret_cast(fontConfig), (ImWchar*)&glyphRanges[0]); if (fontData != NULL) env->ReleasePrimitiveArrayCritical(obj_fontData, fontData, JNI_FALSE); if (glyphRanges != NULL) env->ReleasePrimitiveArrayCritical(obj_glyphRanges, glyphRanges, JNI_FALSE); return _result; @@ -190,7 +190,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromMemoryTTF(byte[] obj_fontData, float sizePixels, short[] obj_glyphRanges); /*MANUAL auto fontData = obj_fontData == NULL ? NULL : (char*)env->GetPrimitiveArrayCritical(obj_fontData, JNI_FALSE); auto glyphRanges = obj_glyphRanges == NULL ? NULL : (short*)env->GetPrimitiveArrayCritical(obj_glyphRanges, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryTTF(&fontData[0], (int)env->GetArrayLength(obj_fontData), sizePixels, NULL, (ImWchar*)&glyphRanges[0]); + auto _result = (uintptr_t)THIS->AddFontFromMemoryTTF(&fontData[0], (int)env->GetArrayLength(obj_fontData), sizePixels, NULL, (ImWchar*)&glyphRanges[0]); if (fontData != NULL) env->ReleasePrimitiveArrayCritical(obj_fontData, fontData, JNI_FALSE); if (glyphRanges != NULL) env->ReleasePrimitiveArrayCritical(obj_glyphRanges, glyphRanges, JNI_FALSE); return _result; @@ -230,14 +230,14 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromMemoryTTF(byte[] obj_fontData, int fontSize, float sizePixels); /*MANUAL auto fontData = obj_fontData == NULL ? NULL : (char*)env->GetPrimitiveArrayCritical(obj_fontData, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryTTF(&fontData[0], fontSize, sizePixels); + auto _result = (uintptr_t)THIS->AddFontFromMemoryTTF(&fontData[0], fontSize, sizePixels); if (fontData != NULL) env->ReleasePrimitiveArrayCritical(obj_fontData, fontData, JNI_FALSE); return _result; */ private native long nAddFontFromMemoryTTF(byte[] obj_fontData, int fontSize, float sizePixels, long fontConfig); /*MANUAL auto fontData = obj_fontData == NULL ? NULL : (char*)env->GetPrimitiveArrayCritical(obj_fontData, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryTTF(&fontData[0], fontSize, sizePixels, reinterpret_cast(fontConfig)); + auto _result = (uintptr_t)THIS->AddFontFromMemoryTTF(&fontData[0], fontSize, sizePixels, reinterpret_cast(fontConfig)); if (fontData != NULL) env->ReleasePrimitiveArrayCritical(obj_fontData, fontData, JNI_FALSE); return _result; */ @@ -245,7 +245,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromMemoryTTF(byte[] obj_fontData, int fontSize, float sizePixels, long fontConfig, short[] obj_glyphRanges); /*MANUAL auto fontData = obj_fontData == NULL ? NULL : (char*)env->GetPrimitiveArrayCritical(obj_fontData, JNI_FALSE); auto glyphRanges = obj_glyphRanges == NULL ? NULL : (short*)env->GetPrimitiveArrayCritical(obj_glyphRanges, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryTTF(&fontData[0], fontSize, sizePixels, reinterpret_cast(fontConfig), (ImWchar*)&glyphRanges[0]); + auto _result = (uintptr_t)THIS->AddFontFromMemoryTTF(&fontData[0], fontSize, sizePixels, reinterpret_cast(fontConfig), (ImWchar*)&glyphRanges[0]); if (fontData != NULL) env->ReleasePrimitiveArrayCritical(obj_fontData, fontData, JNI_FALSE); if (glyphRanges != NULL) env->ReleasePrimitiveArrayCritical(obj_glyphRanges, glyphRanges, JNI_FALSE); return _result; @@ -254,7 +254,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromMemoryTTF(byte[] obj_fontData, int fontSize, float sizePixels, short[] obj_glyphRanges); /*MANUAL auto fontData = obj_fontData == NULL ? NULL : (char*)env->GetPrimitiveArrayCritical(obj_fontData, JNI_FALSE); auto glyphRanges = obj_glyphRanges == NULL ? NULL : (short*)env->GetPrimitiveArrayCritical(obj_glyphRanges, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryTTF(&fontData[0], fontSize, sizePixels, NULL, (ImWchar*)&glyphRanges[0]); + auto _result = (uintptr_t)THIS->AddFontFromMemoryTTF(&fontData[0], fontSize, sizePixels, NULL, (ImWchar*)&glyphRanges[0]); if (fontData != NULL) env->ReleasePrimitiveArrayCritical(obj_fontData, fontData, JNI_FALSE); if (glyphRanges != NULL) env->ReleasePrimitiveArrayCritical(obj_glyphRanges, glyphRanges, JNI_FALSE); return _result; @@ -290,14 +290,14 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromMemoryCompressedTTF(byte[] obj_compressedFontData, float sizePixels); /*MANUAL auto compressedFontData = obj_compressedFontData == NULL ? NULL : (char*)env->GetPrimitiveArrayCritical(obj_compressedFontData, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], (int)env->GetArrayLength(obj_compressedFontData), sizePixels); + auto _result = (uintptr_t)THIS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], (int)env->GetArrayLength(obj_compressedFontData), sizePixels); if (compressedFontData != NULL) env->ReleasePrimitiveArrayCritical(obj_compressedFontData, compressedFontData, JNI_FALSE); return _result; */ private native long nAddFontFromMemoryCompressedTTF(byte[] obj_compressedFontData, float sizePixels, long imFontConfig); /*MANUAL auto compressedFontData = obj_compressedFontData == NULL ? NULL : (char*)env->GetPrimitiveArrayCritical(obj_compressedFontData, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], (int)env->GetArrayLength(obj_compressedFontData), sizePixels, reinterpret_cast(imFontConfig)); + auto _result = (uintptr_t)THIS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], (int)env->GetArrayLength(obj_compressedFontData), sizePixels, reinterpret_cast(imFontConfig)); if (compressedFontData != NULL) env->ReleasePrimitiveArrayCritical(obj_compressedFontData, compressedFontData, JNI_FALSE); return _result; */ @@ -305,7 +305,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromMemoryCompressedTTF(byte[] obj_compressedFontData, float sizePixels, long imFontConfig, short[] obj_glyphRanges); /*MANUAL auto compressedFontData = obj_compressedFontData == NULL ? NULL : (char*)env->GetPrimitiveArrayCritical(obj_compressedFontData, JNI_FALSE); auto glyphRanges = obj_glyphRanges == NULL ? NULL : (short*)env->GetPrimitiveArrayCritical(obj_glyphRanges, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], (int)env->GetArrayLength(obj_compressedFontData), sizePixels, reinterpret_cast(imFontConfig), (ImWchar*)&glyphRanges[0]); + auto _result = (uintptr_t)THIS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], (int)env->GetArrayLength(obj_compressedFontData), sizePixels, reinterpret_cast(imFontConfig), (ImWchar*)&glyphRanges[0]); if (compressedFontData != NULL) env->ReleasePrimitiveArrayCritical(obj_compressedFontData, compressedFontData, JNI_FALSE); if (glyphRanges != NULL) env->ReleasePrimitiveArrayCritical(obj_glyphRanges, glyphRanges, JNI_FALSE); return _result; @@ -314,7 +314,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromMemoryCompressedTTF(byte[] obj_compressedFontData, float sizePixels, short[] obj_glyphRanges); /*MANUAL auto compressedFontData = obj_compressedFontData == NULL ? NULL : (char*)env->GetPrimitiveArrayCritical(obj_compressedFontData, JNI_FALSE); auto glyphRanges = obj_glyphRanges == NULL ? NULL : (short*)env->GetPrimitiveArrayCritical(obj_glyphRanges, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], (int)env->GetArrayLength(obj_compressedFontData), sizePixels, NULL, (ImWchar*)&glyphRanges[0]); + auto _result = (uintptr_t)THIS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], (int)env->GetArrayLength(obj_compressedFontData), sizePixels, NULL, (ImWchar*)&glyphRanges[0]); if (compressedFontData != NULL) env->ReleasePrimitiveArrayCritical(obj_compressedFontData, compressedFontData, JNI_FALSE); if (glyphRanges != NULL) env->ReleasePrimitiveArrayCritical(obj_glyphRanges, glyphRanges, JNI_FALSE); return _result; @@ -350,14 +350,14 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromMemoryCompressedTTF(byte[] obj_compressedFontData, int compressedFontSize, float sizePixels); /*MANUAL auto compressedFontData = obj_compressedFontData == NULL ? NULL : (char*)env->GetPrimitiveArrayCritical(obj_compressedFontData, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], compressedFontSize, sizePixels); + auto _result = (uintptr_t)THIS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], compressedFontSize, sizePixels); if (compressedFontData != NULL) env->ReleasePrimitiveArrayCritical(obj_compressedFontData, compressedFontData, JNI_FALSE); return _result; */ private native long nAddFontFromMemoryCompressedTTF(byte[] obj_compressedFontData, int compressedFontSize, float sizePixels, long imFontConfig); /*MANUAL auto compressedFontData = obj_compressedFontData == NULL ? NULL : (char*)env->GetPrimitiveArrayCritical(obj_compressedFontData, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], compressedFontSize, sizePixels, reinterpret_cast(imFontConfig)); + auto _result = (uintptr_t)THIS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], compressedFontSize, sizePixels, reinterpret_cast(imFontConfig)); if (compressedFontData != NULL) env->ReleasePrimitiveArrayCritical(obj_compressedFontData, compressedFontData, JNI_FALSE); return _result; */ @@ -365,7 +365,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromMemoryCompressedTTF(byte[] obj_compressedFontData, int compressedFontSize, float sizePixels, long imFontConfig, short[] obj_glyphRanges); /*MANUAL auto compressedFontData = obj_compressedFontData == NULL ? NULL : (char*)env->GetPrimitiveArrayCritical(obj_compressedFontData, JNI_FALSE); auto glyphRanges = obj_glyphRanges == NULL ? NULL : (short*)env->GetPrimitiveArrayCritical(obj_glyphRanges, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], compressedFontSize, sizePixels, reinterpret_cast(imFontConfig), (ImWchar*)&glyphRanges[0]); + auto _result = (uintptr_t)THIS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], compressedFontSize, sizePixels, reinterpret_cast(imFontConfig), (ImWchar*)&glyphRanges[0]); if (compressedFontData != NULL) env->ReleasePrimitiveArrayCritical(obj_compressedFontData, compressedFontData, JNI_FALSE); if (glyphRanges != NULL) env->ReleasePrimitiveArrayCritical(obj_glyphRanges, glyphRanges, JNI_FALSE); return _result; @@ -374,7 +374,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromMemoryCompressedTTF(byte[] obj_compressedFontData, int compressedFontSize, float sizePixels, short[] obj_glyphRanges); /*MANUAL auto compressedFontData = obj_compressedFontData == NULL ? NULL : (char*)env->GetPrimitiveArrayCritical(obj_compressedFontData, JNI_FALSE); auto glyphRanges = obj_glyphRanges == NULL ? NULL : (short*)env->GetPrimitiveArrayCritical(obj_glyphRanges, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], compressedFontSize, sizePixels, NULL, (ImWchar*)&glyphRanges[0]); + auto _result = (uintptr_t)THIS->AddFontFromMemoryCompressedTTF(&compressedFontData[0], compressedFontSize, sizePixels, NULL, (ImWchar*)&glyphRanges[0]); if (compressedFontData != NULL) env->ReleasePrimitiveArrayCritical(obj_compressedFontData, compressedFontData, JNI_FALSE); if (glyphRanges != NULL) env->ReleasePrimitiveArrayCritical(obj_glyphRanges, glyphRanges, JNI_FALSE); return _result; @@ -396,7 +396,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromMemoryCompressedBase85TTF(String obj_compressedFontDataBase85, float sizePixels, long fontConfig); /*MANUAL auto compressedFontDataBase85 = obj_compressedFontDataBase85 == NULL ? NULL : (char*)env->GetStringUTFChars(obj_compressedFontDataBase85, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryCompressedBase85TTF(compressedFontDataBase85, sizePixels, reinterpret_cast(fontConfig)); + auto _result = (uintptr_t)THIS->AddFontFromMemoryCompressedBase85TTF(compressedFontDataBase85, sizePixels, reinterpret_cast(fontConfig)); if (compressedFontDataBase85 != NULL) env->ReleaseStringUTFChars(obj_compressedFontDataBase85, compressedFontDataBase85); return _result; */ @@ -404,7 +404,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { private native long nAddFontFromMemoryCompressedBase85TTF(String obj_compressedFontDataBase85, float sizePixels, long fontConfig, short[] obj_glyphRanges); /*MANUAL auto compressedFontDataBase85 = obj_compressedFontDataBase85 == NULL ? NULL : (char*)env->GetStringUTFChars(obj_compressedFontDataBase85, JNI_FALSE); auto glyphRanges = obj_glyphRanges == NULL ? NULL : (short*)env->GetPrimitiveArrayCritical(obj_glyphRanges, JNI_FALSE); - auto _result = (intptr_t)THIS->AddFontFromMemoryCompressedBase85TTF(compressedFontDataBase85, sizePixels, reinterpret_cast(fontConfig), (ImWchar*)&glyphRanges[0]); + auto _result = (uintptr_t)THIS->AddFontFromMemoryCompressedBase85TTF(compressedFontDataBase85, sizePixels, reinterpret_cast(fontConfig), (ImWchar*)&glyphRanges[0]); if (compressedFontDataBase85 != NULL) env->ReleaseStringUTFChars(obj_compressedFontDataBase85, compressedFontDataBase85); if (glyphRanges != NULL) env->ReleasePrimitiveArrayCritical(obj_glyphRanges, glyphRanges, JNI_FALSE); return _result; @@ -575,12 +575,12 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { * User data to refer to the texture once it has been uploaded to user's graphic systems. * It is passed back to you during rendering via the ImDrawCmd structure. */ - public void setTexID(final int textureID) { + public void setTexID(final long textureID) { nSetTexID(textureID); } - private native void nSetTexID(int textureID); /* - THIS->SetTexID((ImTextureID)(intptr_t)textureID); + private native void nSetTexID(long textureID); /* + THIS->SetTexID((ImTextureID)(uintptr_t)textureID); */ //------------------------------------------- diff --git a/imgui-binding/src/generated/java/imgui/ImFontConfig.java b/imgui-binding/src/generated/java/imgui/ImFontConfig.java index 02f5651..c2a0822 100644 --- a/imgui-binding/src/generated/java/imgui/ImFontConfig.java +++ b/imgui-binding/src/generated/java/imgui/ImFontConfig.java @@ -24,7 +24,7 @@ public final class ImFontConfig extends ImGuiStructDestroyable { private native long nCreate(); /* ImFontConfig* cfg = new ImFontConfig(); cfg->FontDataOwnedByAtlas = false; - return (intptr_t)cfg; + return (uintptr_t)cfg; */ /** @@ -524,7 +524,7 @@ public final class ImFontConfig extends ImGuiStructDestroyable { } private native long nGetDstFont(); /* - return (intptr_t)THIS->DstFont; + return (uintptr_t)THIS->DstFont; */ private native void nSetDstFont(long value); /* diff --git a/imgui-binding/src/generated/java/imgui/ImFontGlyph.java b/imgui-binding/src/generated/java/imgui/ImFontGlyph.java index d4407ac..9c398c0 100644 --- a/imgui-binding/src/generated/java/imgui/ImFontGlyph.java +++ b/imgui-binding/src/generated/java/imgui/ImFontGlyph.java @@ -26,7 +26,7 @@ public final class ImFontGlyph extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImFontGlyph()); + return (uintptr_t)(new ImFontGlyph()); */ /** diff --git a/imgui-binding/src/generated/java/imgui/ImGui.java b/imgui-binding/src/generated/java/imgui/ImGui.java index 13adffc..b3c20f4 100644 --- a/imgui-binding/src/generated/java/imgui/ImGui.java +++ b/imgui-binding/src/generated/java/imgui/ImGui.java @@ -174,11 +174,11 @@ public class ImGui { } private static native long nCreateContext(); /* - return (intptr_t)ImGui::CreateContext(); + return (uintptr_t)ImGui::CreateContext(); */ private static native long nCreateContext(long sharedFontAtlas); /* - return (intptr_t)ImGui::CreateContext(reinterpret_cast(sharedFontAtlas)); + return (uintptr_t)ImGui::CreateContext(reinterpret_cast(sharedFontAtlas)); */ public static void destroyContext() { @@ -202,7 +202,7 @@ public class ImGui { } private static native long nGetCurrentContext(); /* - return (intptr_t)ImGui::GetCurrentContext(); + return (uintptr_t)ImGui::GetCurrentContext(); */ public static void setCurrentContext(final ImGuiContext ctx) { @@ -226,7 +226,7 @@ public class ImGui { } private static native long nGetIO(); /* - return (intptr_t)&ImGui::GetIO(); + return (uintptr_t)&ImGui::GetIO(); */ private static final ImGuiStyle _GETSTYLE_1 = new ImGuiStyle(0); @@ -240,7 +240,7 @@ public class ImGui { } private static native long nGetStyle(); /* - return (intptr_t)&ImGui::GetStyle(); + return (uintptr_t)&ImGui::GetStyle(); */ /** @@ -288,7 +288,7 @@ public class ImGui { } private static native long nGetDrawData(); /* - return (intptr_t)ImGui::GetDrawData(); + return (uintptr_t)ImGui::GetDrawData(); */ // Demo, Debug, Information @@ -869,7 +869,7 @@ public class ImGui { } private static native long nGetWindowDrawList(); /* - return (intptr_t)ImGui::GetWindowDrawList(); + return (uintptr_t)ImGui::GetWindowDrawList(); */ /** @@ -997,7 +997,7 @@ public class ImGui { } private static native long nGetWindowViewport(); /* - return (intptr_t)ImGui::GetWindowViewport(); + return (uintptr_t)ImGui::GetWindowViewport(); */ // Prefer using SetNextXXX functions (before Begin) rather that SetXXX functions (after Begin). @@ -2045,7 +2045,7 @@ public class ImGui { } private static native long nGetFont(); /* - return (intptr_t)ImGui::GetFont(); + return (uintptr_t)ImGui::GetFont(); */ /** @@ -2997,234 +2997,234 @@ public class ImGui { return _result; */ - public static void image(final int userTextureId, final ImVec2 size) { + public static void image(final long userTextureId, final ImVec2 size) { nImage(userTextureId, size.x, size.y); } - public static void image(final int userTextureId, final float sizeX, final float sizeY) { + public static void image(final long userTextureId, final float sizeX, final float sizeY) { nImage(userTextureId, sizeX, sizeY); } - public static void image(final int userTextureId, final ImVec2 size, final ImVec2 uv0) { + public static void image(final long userTextureId, final ImVec2 size, final ImVec2 uv0) { nImage(userTextureId, size.x, size.y, uv0.x, uv0.y); } - public static void image(final int userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y) { + public static void image(final long userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y) { nImage(userTextureId, sizeX, sizeY, uv0X, uv0Y); } - public static void image(final int userTextureId, final ImVec2 size, final ImVec2 uv0, final ImVec2 uv1) { + public static void image(final long userTextureId, final ImVec2 size, final ImVec2 uv0, final ImVec2 uv1) { nImage(userTextureId, size.x, size.y, uv0.x, uv0.y, uv1.x, uv1.y); } - public static void image(final int userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y) { + public static void image(final long userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y) { nImage(userTextureId, sizeX, sizeY, uv0X, uv0Y, uv1X, uv1Y); } - public static void image(final int userTextureId, final ImVec2 size, final ImVec2 uv0, final ImVec2 uv1, final ImVec4 tintCol) { + public static void image(final long userTextureId, final ImVec2 size, final ImVec2 uv0, final ImVec2 uv1, final ImVec4 tintCol) { nImage(userTextureId, size.x, size.y, uv0.x, uv0.y, uv1.x, uv1.y, tintCol.x, tintCol.y, tintCol.z, tintCol.w); } - public static void image(final int userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y, final float tintColX, final float tintColY, final float tintColZ, final float tintColW) { + public static void image(final long userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y, final float tintColX, final float tintColY, final float tintColZ, final float tintColW) { nImage(userTextureId, sizeX, sizeY, uv0X, uv0Y, uv1X, uv1Y, tintColX, tintColY, tintColZ, tintColW); } - public static void image(final int userTextureId, final ImVec2 size, final ImVec2 uv0, final ImVec2 uv1, final ImVec4 tintCol, final ImVec4 borderCol) { + public static void image(final long userTextureId, final ImVec2 size, final ImVec2 uv0, final ImVec2 uv1, final ImVec4 tintCol, final ImVec4 borderCol) { nImage(userTextureId, size.x, size.y, uv0.x, uv0.y, uv1.x, uv1.y, tintCol.x, tintCol.y, tintCol.z, tintCol.w, borderCol.x, borderCol.y, borderCol.z, borderCol.w); } - public static void image(final int userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y, final float tintColX, final float tintColY, final float tintColZ, final float tintColW, final float borderColX, final float borderColY, final float borderColZ, final float borderColW) { + public static void image(final long userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y, final float tintColX, final float tintColY, final float tintColZ, final float tintColW, final float borderColX, final float borderColY, final float borderColZ, final float borderColW) { nImage(userTextureId, sizeX, sizeY, uv0X, uv0Y, uv1X, uv1Y, tintColX, tintColY, tintColZ, tintColW, borderColX, borderColY, borderColZ, borderColW); } - private static native void nImage(int userTextureId, float sizeX, float sizeY); /*MANUAL + private static native void nImage(long userTextureId, float sizeX, float sizeY); /*MANUAL ImVec2 size = ImVec2(sizeX, sizeY); - ImGui::Image((ImTextureID)(intptr_t)userTextureId, size); + ImGui::Image((ImTextureID)(uintptr_t)userTextureId, size); */ - private static native void nImage(int userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y); /*MANUAL + private static native void nImage(long userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y); /*MANUAL ImVec2 size = ImVec2(sizeX, sizeY); ImVec2 uv0 = ImVec2(uv0X, uv0Y); - ImGui::Image((ImTextureID)(intptr_t)userTextureId, size, uv0); + ImGui::Image((ImTextureID)(uintptr_t)userTextureId, size, uv0); */ - private static native void nImage(int userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y, float uv1X, float uv1Y); /*MANUAL + private static native void nImage(long userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y, float uv1X, float uv1Y); /*MANUAL ImVec2 size = ImVec2(sizeX, sizeY); ImVec2 uv0 = ImVec2(uv0X, uv0Y); ImVec2 uv1 = ImVec2(uv1X, uv1Y); - ImGui::Image((ImTextureID)(intptr_t)userTextureId, size, uv0, uv1); + ImGui::Image((ImTextureID)(uintptr_t)userTextureId, size, uv0, uv1); */ - private static native void nImage(int userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y, float uv1X, float uv1Y, float tintColX, float tintColY, float tintColZ, float tintColW); /*MANUAL + private static native void nImage(long userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y, float uv1X, float uv1Y, float tintColX, float tintColY, float tintColZ, float tintColW); /*MANUAL ImVec2 size = ImVec2(sizeX, sizeY); ImVec2 uv0 = ImVec2(uv0X, uv0Y); ImVec2 uv1 = ImVec2(uv1X, uv1Y); ImVec4 tintCol = ImVec4(tintColX, tintColY, tintColZ, tintColW); - ImGui::Image((ImTextureID)(intptr_t)userTextureId, size, uv0, uv1, tintCol); + ImGui::Image((ImTextureID)(uintptr_t)userTextureId, size, uv0, uv1, tintCol); */ - private static native void nImage(int userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y, float uv1X, float uv1Y, float tintColX, float tintColY, float tintColZ, float tintColW, float borderColX, float borderColY, float borderColZ, float borderColW); /*MANUAL + private static native void nImage(long userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y, float uv1X, float uv1Y, float tintColX, float tintColY, float tintColZ, float tintColW, float borderColX, float borderColY, float borderColZ, float borderColW); /*MANUAL ImVec2 size = ImVec2(sizeX, sizeY); ImVec2 uv0 = ImVec2(uv0X, uv0Y); ImVec2 uv1 = ImVec2(uv1X, uv1Y); ImVec4 tintCol = ImVec4(tintColX, tintColY, tintColZ, tintColW); ImVec4 borderCol = ImVec4(borderColX, borderColY, borderColZ, borderColW); - ImGui::Image((ImTextureID)(intptr_t)userTextureId, size, uv0, uv1, tintCol, borderCol); + ImGui::Image((ImTextureID)(uintptr_t)userTextureId, size, uv0, uv1, tintCol, borderCol); */ /** * {@code <0} framePadding uses default frame padding settings. 0 for no padding */ - public static boolean imageButton(final int userTextureId, final ImVec2 size) { + public static boolean imageButton(final long userTextureId, final ImVec2 size) { return nImageButton(userTextureId, size.x, size.y); } /** * {@code <0} framePadding uses default frame padding settings. 0 for no padding */ - public static boolean imageButton(final int userTextureId, final float sizeX, final float sizeY) { + public static boolean imageButton(final long userTextureId, final float sizeX, final float sizeY) { return nImageButton(userTextureId, sizeX, sizeY); } /** * {@code <0} framePadding uses default frame padding settings. 0 for no padding */ - public static boolean imageButton(final int userTextureId, final ImVec2 size, final ImVec2 uv0) { + public static boolean imageButton(final long userTextureId, final ImVec2 size, final ImVec2 uv0) { return nImageButton(userTextureId, size.x, size.y, uv0.x, uv0.y); } /** * {@code <0} framePadding uses default frame padding settings. 0 for no padding */ - public static boolean imageButton(final int userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y) { + public static boolean imageButton(final long userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y) { return nImageButton(userTextureId, sizeX, sizeY, uv0X, uv0Y); } /** * {@code <0} framePadding uses default frame padding settings. 0 for no padding */ - public static boolean imageButton(final int userTextureId, final ImVec2 size, final ImVec2 uv0, final ImVec2 uv1) { + public static boolean imageButton(final long userTextureId, final ImVec2 size, final ImVec2 uv0, final ImVec2 uv1) { return nImageButton(userTextureId, size.x, size.y, uv0.x, uv0.y, uv1.x, uv1.y); } /** * {@code <0} framePadding uses default frame padding settings. 0 for no padding */ - public static boolean imageButton(final int userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y) { + public static boolean imageButton(final long userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y) { return nImageButton(userTextureId, sizeX, sizeY, uv0X, uv0Y, uv1X, uv1Y); } /** * {@code <0} framePadding uses default frame padding settings. 0 for no padding */ - public static boolean imageButton(final int userTextureId, final ImVec2 size, final ImVec2 uv0, final ImVec2 uv1, final int framePadding) { + public static boolean imageButton(final long userTextureId, final ImVec2 size, final ImVec2 uv0, final ImVec2 uv1, final int framePadding) { return nImageButton(userTextureId, size.x, size.y, uv0.x, uv0.y, uv1.x, uv1.y, framePadding); } /** * {@code <0} framePadding uses default frame padding settings. 0 for no padding */ - public static boolean imageButton(final int userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y, final int framePadding) { + public static boolean imageButton(final long userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y, final int framePadding) { return nImageButton(userTextureId, sizeX, sizeY, uv0X, uv0Y, uv1X, uv1Y, framePadding); } /** * {@code <0} framePadding uses default frame padding settings. 0 for no padding */ - public static boolean imageButton(final int userTextureId, final ImVec2 size, final ImVec2 uv0, final ImVec2 uv1, final int framePadding, final ImVec4 bgCol) { + public static boolean imageButton(final long userTextureId, final ImVec2 size, final ImVec2 uv0, final ImVec2 uv1, final int framePadding, final ImVec4 bgCol) { return nImageButton(userTextureId, size.x, size.y, uv0.x, uv0.y, uv1.x, uv1.y, framePadding, bgCol.x, bgCol.y, bgCol.z, bgCol.w); } /** * {@code <0} framePadding uses default frame padding settings. 0 for no padding */ - public static boolean imageButton(final int userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y, final int framePadding, final float bgColX, final float bgColY, final float bgColZ, final float bgColW) { + public static boolean imageButton(final long userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y, final int framePadding, final float bgColX, final float bgColY, final float bgColZ, final float bgColW) { return nImageButton(userTextureId, sizeX, sizeY, uv0X, uv0Y, uv1X, uv1Y, framePadding, bgColX, bgColY, bgColZ, bgColW); } /** * {@code <0} framePadding uses default frame padding settings. 0 for no padding */ - public static boolean imageButton(final int userTextureId, final ImVec2 size, final ImVec2 uv0, final ImVec2 uv1, final int framePadding, final ImVec4 bgCol, final ImVec4 tintCol) { + public static boolean imageButton(final long userTextureId, final ImVec2 size, final ImVec2 uv0, final ImVec2 uv1, final int framePadding, final ImVec4 bgCol, final ImVec4 tintCol) { return nImageButton(userTextureId, size.x, size.y, uv0.x, uv0.y, uv1.x, uv1.y, framePadding, bgCol.x, bgCol.y, bgCol.z, bgCol.w, tintCol.x, tintCol.y, tintCol.z, tintCol.w); } /** * {@code <0} framePadding uses default frame padding settings. 0 for no padding */ - public static boolean imageButton(final int userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y, final int framePadding, final float bgColX, final float bgColY, final float bgColZ, final float bgColW, final float tintColX, final float tintColY, final float tintColZ, final float tintColW) { + public static boolean imageButton(final long userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y, final int framePadding, final float bgColX, final float bgColY, final float bgColZ, final float bgColW, final float tintColX, final float tintColY, final float tintColZ, final float tintColW) { return nImageButton(userTextureId, sizeX, sizeY, uv0X, uv0Y, uv1X, uv1Y, framePadding, bgColX, bgColY, bgColZ, bgColW, tintColX, tintColY, tintColZ, tintColW); } /** * {@code <0} framePadding uses default frame padding settings. 0 for no padding */ - public static boolean imageButton(final int userTextureId, final ImVec2 size, final ImVec2 uv0, final ImVec2 uv1, final ImVec4 bgCol, final ImVec4 tintCol) { + public static boolean imageButton(final long userTextureId, final ImVec2 size, final ImVec2 uv0, final ImVec2 uv1, final ImVec4 bgCol, final ImVec4 tintCol) { return nImageButton(userTextureId, size.x, size.y, uv0.x, uv0.y, uv1.x, uv1.y, bgCol.x, bgCol.y, bgCol.z, bgCol.w, tintCol.x, tintCol.y, tintCol.z, tintCol.w); } /** * {@code <0} framePadding uses default frame padding settings. 0 for no padding */ - public static boolean imageButton(final int userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y, final float bgColX, final float bgColY, final float bgColZ, final float bgColW, final float tintColX, final float tintColY, final float tintColZ, final float tintColW) { + public static boolean imageButton(final long userTextureId, final float sizeX, final float sizeY, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y, final float bgColX, final float bgColY, final float bgColZ, final float bgColW, final float tintColX, final float tintColY, final float tintColZ, final float tintColW) { return nImageButton(userTextureId, sizeX, sizeY, uv0X, uv0Y, uv1X, uv1Y, bgColX, bgColY, bgColZ, bgColW, tintColX, tintColY, tintColZ, tintColW); } - private static native boolean nImageButton(int userTextureId, float sizeX, float sizeY); /*MANUAL + private static native boolean nImageButton(long userTextureId, float sizeX, float sizeY); /*MANUAL ImVec2 size = ImVec2(sizeX, sizeY); - auto _result = ImGui::ImageButton((ImTextureID)(intptr_t)userTextureId, size); + auto _result = ImGui::ImageButton((ImTextureID)(uintptr_t)userTextureId, size); return _result; */ - private static native boolean nImageButton(int userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y); /*MANUAL + private static native boolean nImageButton(long userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y); /*MANUAL ImVec2 size = ImVec2(sizeX, sizeY); ImVec2 uv0 = ImVec2(uv0X, uv0Y); - auto _result = ImGui::ImageButton((ImTextureID)(intptr_t)userTextureId, size, uv0); + auto _result = ImGui::ImageButton((ImTextureID)(uintptr_t)userTextureId, size, uv0); return _result; */ - private static native boolean nImageButton(int userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y, float uv1X, float uv1Y); /*MANUAL + private static native boolean nImageButton(long userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y, float uv1X, float uv1Y); /*MANUAL ImVec2 size = ImVec2(sizeX, sizeY); ImVec2 uv0 = ImVec2(uv0X, uv0Y); ImVec2 uv1 = ImVec2(uv1X, uv1Y); - auto _result = ImGui::ImageButton((ImTextureID)(intptr_t)userTextureId, size, uv0, uv1); + auto _result = ImGui::ImageButton((ImTextureID)(uintptr_t)userTextureId, size, uv0, uv1); return _result; */ - private static native boolean nImageButton(int userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y, float uv1X, float uv1Y, int framePadding); /*MANUAL + private static native boolean nImageButton(long userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y, float uv1X, float uv1Y, int framePadding); /*MANUAL ImVec2 size = ImVec2(sizeX, sizeY); ImVec2 uv0 = ImVec2(uv0X, uv0Y); ImVec2 uv1 = ImVec2(uv1X, uv1Y); - auto _result = ImGui::ImageButton((ImTextureID)(intptr_t)userTextureId, size, uv0, uv1, framePadding); + auto _result = ImGui::ImageButton((ImTextureID)(uintptr_t)userTextureId, size, uv0, uv1, framePadding); return _result; */ - private static native boolean nImageButton(int userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y, float uv1X, float uv1Y, int framePadding, float bgColX, float bgColY, float bgColZ, float bgColW); /*MANUAL + private static native boolean nImageButton(long userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y, float uv1X, float uv1Y, int framePadding, float bgColX, float bgColY, float bgColZ, float bgColW); /*MANUAL ImVec2 size = ImVec2(sizeX, sizeY); ImVec2 uv0 = ImVec2(uv0X, uv0Y); ImVec2 uv1 = ImVec2(uv1X, uv1Y); ImVec4 bgCol = ImVec4(bgColX, bgColY, bgColZ, bgColW); - auto _result = ImGui::ImageButton((ImTextureID)(intptr_t)userTextureId, size, uv0, uv1, framePadding, bgCol); + auto _result = ImGui::ImageButton((ImTextureID)(uintptr_t)userTextureId, size, uv0, uv1, framePadding, bgCol); return _result; */ - private static native boolean nImageButton(int userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y, float uv1X, float uv1Y, int framePadding, float bgColX, float bgColY, float bgColZ, float bgColW, float tintColX, float tintColY, float tintColZ, float tintColW); /*MANUAL + private static native boolean nImageButton(long userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y, float uv1X, float uv1Y, int framePadding, float bgColX, float bgColY, float bgColZ, float bgColW, float tintColX, float tintColY, float tintColZ, float tintColW); /*MANUAL ImVec2 size = ImVec2(sizeX, sizeY); ImVec2 uv0 = ImVec2(uv0X, uv0Y); ImVec2 uv1 = ImVec2(uv1X, uv1Y); ImVec4 bgCol = ImVec4(bgColX, bgColY, bgColZ, bgColW); ImVec4 tintCol = ImVec4(tintColX, tintColY, tintColZ, tintColW); - auto _result = ImGui::ImageButton((ImTextureID)(intptr_t)userTextureId, size, uv0, uv1, framePadding, bgCol, tintCol); + auto _result = ImGui::ImageButton((ImTextureID)(uintptr_t)userTextureId, size, uv0, uv1, framePadding, bgCol, tintCol); return _result; */ - private static native boolean nImageButton(int userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y, float uv1X, float uv1Y, float bgColX, float bgColY, float bgColZ, float bgColW, float tintColX, float tintColY, float tintColZ, float tintColW); /*MANUAL + private static native boolean nImageButton(long userTextureId, float sizeX, float sizeY, float uv0X, float uv0Y, float uv1X, float uv1Y, float bgColX, float bgColY, float bgColZ, float bgColW, float tintColX, float tintColY, float tintColZ, float tintColW); /*MANUAL ImVec2 size = ImVec2(sizeX, sizeY); ImVec2 uv0 = ImVec2(uv0X, uv0Y); ImVec2 uv1 = ImVec2(uv1X, uv1Y); ImVec4 bgCol = ImVec4(bgColX, bgColY, bgColZ, bgColW); ImVec4 tintCol = ImVec4(tintColX, tintColY, tintColZ, tintColW); - auto _result = ImGui::ImageButton((ImTextureID)(intptr_t)userTextureId, size, uv0, uv1, -1, bgCol, tintCol); + auto _result = ImGui::ImageButton((ImTextureID)(uintptr_t)userTextureId, size, uv0, uv1, -1, bgCol, tintCol); return _result; */ @@ -10233,7 +10233,7 @@ public class ImGui { } private static native long nTableGetSortSpecs(); /* - return (intptr_t)ImGui::TableGetSortSpecs(); + return (uintptr_t)ImGui::TableGetSortSpecs(); */ // Tables: Miscellaneous functions @@ -11602,7 +11602,7 @@ public class ImGui { } private static native long nGetMainViewport(); /* - return (intptr_t)ImGui::GetMainViewport(); + return (uintptr_t)ImGui::GetMainViewport(); */ // Miscellaneous Utilities @@ -11687,11 +11687,11 @@ public class ImGui { } private static native long nGetBackgroundDrawList(); /* - return (intptr_t)ImGui::GetBackgroundDrawList(); + return (uintptr_t)ImGui::GetBackgroundDrawList(); */ private static native long nGetBackgroundDrawList(long viewport); /* - return (intptr_t)ImGui::GetBackgroundDrawList(reinterpret_cast(viewport)); + return (uintptr_t)ImGui::GetBackgroundDrawList(reinterpret_cast(viewport)); */ /** @@ -11711,11 +11711,11 @@ public class ImGui { } private static native long nGetForegroundDrawList(); /* - return (intptr_t)ImGui::GetForegroundDrawList(); + return (uintptr_t)ImGui::GetForegroundDrawList(); */ private static native long nGetForegroundDrawList(long viewport); /* - return (intptr_t)ImGui::GetForegroundDrawList(reinterpret_cast(viewport)); + return (uintptr_t)ImGui::GetForegroundDrawList(reinterpret_cast(viewport)); */ // TODO GetDrawListSharedData @@ -11747,7 +11747,7 @@ public class ImGui { } private static native long nGetStateStorage(); /* - return (intptr_t)ImGui::GetStateStorage(); + return (uintptr_t)ImGui::GetStateStorage(); */ /** @@ -12737,7 +12737,7 @@ public class ImGui { } private static native long nGetPlatformIO(); /* - return (intptr_t)&ImGui::GetPlatformIO(); + return (uintptr_t)&ImGui::GetPlatformIO(); */ /** @@ -12784,7 +12784,7 @@ public class ImGui { } private static native long nFindViewportByID(int imGuiID); /* - return (intptr_t)ImGui::FindViewportByID(imGuiID); + return (uintptr_t)ImGui::FindViewportByID(imGuiID); */ /** @@ -12795,6 +12795,6 @@ public class ImGui { } private static native long nFindViewportByPlatformHandle(long platformHandle); /* - return (intptr_t)ImGui::FindViewportByPlatformHandle((void*)platformHandle); + return (uintptr_t)ImGui::FindViewportByPlatformHandle((void*)platformHandle); */ } diff --git a/imgui-binding/src/generated/java/imgui/ImGuiIO.java b/imgui-binding/src/generated/java/imgui/ImGuiIO.java index aff00a3..9d23ec6 100644 --- a/imgui-binding/src/generated/java/imgui/ImGuiIO.java +++ b/imgui-binding/src/generated/java/imgui/ImGuiIO.java @@ -389,7 +389,7 @@ public final class ImGuiIO extends ImGuiStruct { } private native long nGetFonts(); /* - return (intptr_t)THIS->Fonts; + return (uintptr_t)THIS->Fonts; */ private native void nSetFonts(long value); /* @@ -455,7 +455,7 @@ public final class ImGuiIO extends ImGuiStruct { } private native long nGetFontDefault(); /* - return (intptr_t)THIS->FontDefault; + return (uintptr_t)THIS->FontDefault; */ private native void nSetFontDefault(long value); /* diff --git a/imgui-binding/src/generated/java/imgui/ImGuiKeyData.java b/imgui-binding/src/generated/java/imgui/ImGuiKeyData.java index 3540dbe..eacd31e 100644 --- a/imgui-binding/src/generated/java/imgui/ImGuiKeyData.java +++ b/imgui-binding/src/generated/java/imgui/ImGuiKeyData.java @@ -26,7 +26,7 @@ public final class ImGuiKeyData extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImGuiKeyData()); + return (uintptr_t)(new ImGuiKeyData()); */ /** diff --git a/imgui-binding/src/generated/java/imgui/ImGuiPlatformIO.java b/imgui-binding/src/generated/java/imgui/ImGuiPlatformIO.java index 4df2f63..b54eb12 100644 --- a/imgui-binding/src/generated/java/imgui/ImGuiPlatformIO.java +++ b/imgui-binding/src/generated/java/imgui/ImGuiPlatformIO.java @@ -102,7 +102,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { void PlatformStub##name(ImGuiViewport* vp) {\ if (platformCallback##name != NULL) {\ JNIEnv* env = Jni::GetEnv();\ - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp);\ + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp);\ Jni::CallImPlatformFuncViewport(env, platformCallback##name, jTmpViewport);\ }\ }\ @@ -155,7 +155,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { void PlatformStub##name(ImGuiViewport* vp, ImVec2 pos) {\ if (platformCallback##name != NULL) {\ JNIEnv* env = Jni::GetEnv();\ - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp);\ + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp);\ Jni::ImVec2Cpy(env, pos, jTmpImVec2);\ Jni::CallImPlatformFuncViewportImVec2(env, platformCallback##name, jTmpViewport, jTmpImVec2);\ }\ @@ -185,7 +185,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { ImVec2 dst;\ if (platformCallback##name != NULL) {\ JNIEnv* env = Jni::GetEnv();\ - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp);\ + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp);\ Jni::CallImPlatformFuncViewportSuppImVec2(env, platformCallback##name, jTmpViewport, jTmpImVec2);\ Jni::ImVec2Cpy(env, jTmpImVec2, &dst);\ }\ @@ -248,7 +248,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { bool PlatformStub##name(ImGuiViewport* vp) {\ if (platformCallback##name != NULL) {\ JNIEnv* env = Jni::GetEnv();\ - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp);\ + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp);\ return Jni::CallImPlatformFuncViewportSuppBoolean(env, platformCallback##name, jTmpViewport);\ }\ return false;\ @@ -287,7 +287,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { void PlatformStubSetWindowTitle(ImGuiViewport* vp, const char* str) { if (platformCallbackSetWindowTitle != NULL) { JNIEnv* env = Jni::GetEnv(); - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp); + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp); Jni::CallImPlatformFuncViewportString(env, platformCallbackSetWindowTitle, jTmpViewport, str); } } @@ -309,7 +309,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { void PlatformStubSetWindowAlpha(ImGuiViewport* vp, float alpha) { if (platformCallbackSetWindowAlpha != NULL) { JNIEnv* env = Jni::GetEnv(); - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp); + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp); Jni::CallImPlatformFuncViewportFloat(env, platformCallbackSetWindowAlpha, jTmpViewport, alpha); } } @@ -364,7 +364,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { float PlatformStubGetWindowDpiScale(ImGuiViewport* vp) { if (platformCallbackGetWindowDpiScale != NULL) { JNIEnv* env = Jni::GetEnv(); - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp); + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp); return Jni::CallImPlatformFuncViewportSuppFloat(env, platformCallbackGetWindowDpiScale, jTmpViewport); } return false; @@ -401,7 +401,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { void RendererStub##name(ImGuiViewport* vp) {\ if (rendererCallback##name != NULL) {\ JNIEnv* env = Jni::GetEnv();\ - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp);\ + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp);\ Jni::CallImPlatformFuncViewport(env, rendererCallback##name, jTmpViewport);\ }\ }\ @@ -442,7 +442,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { void RendererStubSetWindowSize(ImGuiViewport* vp, ImVec2 pos) { if (rendererCallbackSetWindowSize != NULL) { JNIEnv* env = Jni::GetEnv(); - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp); + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp); Jni::ImVec2Cpy(env, pos, jTmpImVec2); Jni::CallImPlatformFuncViewportImVec2(env, rendererCallbackSetWindowSize, jTmpViewport, jTmpImVec2); } @@ -519,7 +519,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { } private native long nGetMonitors(int idx); /* - return (intptr_t)&IMGUI_PLATFORM_IO->Monitors[idx]; + return (uintptr_t)&IMGUI_PLATFORM_IO->Monitors[idx]; */ // Viewports list (the list is updated by calling ImGui::EndFrame or ImGui::Render) @@ -535,6 +535,6 @@ public final class ImGuiPlatformIO extends ImGuiStruct { } private native long nGetViewports(int idx); /* - return (intptr_t)IMGUI_PLATFORM_IO->Viewports[idx]; + return (uintptr_t)IMGUI_PLATFORM_IO->Viewports[idx]; */ } diff --git a/imgui-binding/src/generated/java/imgui/ImGuiStorage.java b/imgui-binding/src/generated/java/imgui/ImGuiStorage.java index 1448636..21198cb 100644 --- a/imgui-binding/src/generated/java/imgui/ImGuiStorage.java +++ b/imgui-binding/src/generated/java/imgui/ImGuiStorage.java @@ -32,7 +32,7 @@ public final class ImGuiStorage extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImGuiStorage()); + return (uintptr_t)(new ImGuiStorage()); */ // - Get***() functions find pair, never add/allocate. Pairs are sorted so a query is O(log N) diff --git a/imgui-binding/src/generated/java/imgui/ImGuiStyle.java b/imgui-binding/src/generated/java/imgui/ImGuiStyle.java index ec1a179..5f5e177 100644 --- a/imgui-binding/src/generated/java/imgui/ImGuiStyle.java +++ b/imgui-binding/src/generated/java/imgui/ImGuiStyle.java @@ -27,7 +27,7 @@ public final class ImGuiStyle extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImGuiStyle()); + return (uintptr_t)(new ImGuiStyle()); */ /** diff --git a/imgui-binding/src/generated/java/imgui/ImGuiTableSortSpecs.java b/imgui-binding/src/generated/java/imgui/ImGuiTableSortSpecs.java index f44b568..6c8efc8 100644 --- a/imgui-binding/src/generated/java/imgui/ImGuiTableSortSpecs.java +++ b/imgui-binding/src/generated/java/imgui/ImGuiTableSortSpecs.java @@ -35,7 +35,7 @@ public final class ImGuiTableSortSpecs extends ImGuiStruct { int specsCount = THIS->SpecsCount; jlong jBuf[specsCount]; for (int i = 0; i < specsCount; i++) { - jBuf[i] = (intptr_t)specs; + jBuf[i] = (uintptr_t)specs; specs++; } jlongArray result = env->NewLongArray(specsCount); diff --git a/imgui-binding/src/generated/java/imgui/ImGuiTextFilter.java b/imgui-binding/src/generated/java/imgui/ImGuiTextFilter.java index 227cc03..6cf0c7e 100644 --- a/imgui-binding/src/generated/java/imgui/ImGuiTextFilter.java +++ b/imgui-binding/src/generated/java/imgui/ImGuiTextFilter.java @@ -29,7 +29,7 @@ public final class ImGuiTextFilter extends ImGuiStructDestroyable { */ private native long nCreate(String defaultFilter); /* - return (intptr_t)(new ImGuiTextFilter(defaultFilter)); + return (uintptr_t)(new ImGuiTextFilter(defaultFilter)); */ public boolean draw() { diff --git a/imgui-binding/src/generated/java/imgui/ImGuiViewport.java b/imgui-binding/src/generated/java/imgui/ImGuiViewport.java index b0a4a14..c112efe 100644 --- a/imgui-binding/src/generated/java/imgui/ImGuiViewport.java +++ b/imgui-binding/src/generated/java/imgui/ImGuiViewport.java @@ -385,7 +385,7 @@ public final class ImGuiViewport extends ImGuiStruct { } private native long nGetDrawData(); /* - return (intptr_t)THIS->DrawData; + return (uintptr_t)THIS->DrawData; */ private native void nSetDrawData(long value); /* @@ -442,7 +442,7 @@ public final class ImGuiViewport extends ImGuiStruct { * void* for FindViewportByPlatformHandle(). (e.g. suggested to use natural platform handle such as HWND, GLFWWindow*, SDL_Window*) */ public native long getPlatformHandle(); /* - return (intptr_t)THIS->PlatformHandle; + return (uintptr_t)THIS->PlatformHandle; */ /** @@ -456,7 +456,7 @@ public final class ImGuiViewport extends ImGuiStruct { * void* to hold lower-level, platform-native window handle (e.g. the HWND) when using an abstraction layer like GLFW or SDL (where PlatformHandle would be a SDL_Window*) */ public native long getPlatformHandleRaw(); /* - return (intptr_t)THIS->PlatformHandleRaw; + return (uintptr_t)THIS->PlatformHandleRaw; */ /** diff --git a/imgui-binding/src/generated/java/imgui/ImGuiWindowClass.java b/imgui-binding/src/generated/java/imgui/ImGuiWindowClass.java index 0b10d91..f31be8f 100644 --- a/imgui-binding/src/generated/java/imgui/ImGuiWindowClass.java +++ b/imgui-binding/src/generated/java/imgui/ImGuiWindowClass.java @@ -31,7 +31,7 @@ public final class ImGuiWindowClass extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImGuiWindowClass()); + return (uintptr_t)(new ImGuiWindowClass()); */ /** diff --git a/imgui-binding/src/generated/java/imgui/extension/imguifiledialog/ImGuiFileDialog.java b/imgui-binding/src/generated/java/imgui/extension/imguifiledialog/ImGuiFileDialog.java index 46d3669..4fe83d2 100644 --- a/imgui-binding/src/generated/java/imgui/extension/imguifiledialog/ImGuiFileDialog.java +++ b/imgui-binding/src/generated/java/imgui/extension/imguifiledialog/ImGuiFileDialog.java @@ -1586,6 +1586,6 @@ public final class ImGuiFileDialog { } private static native long nGetUserDatas(); /* - return (intptr_t)ImGuiFileDialog::Instance()->GetUserDatas(); + return (uintptr_t)ImGuiFileDialog::Instance()->GetUserDatas(); */ } diff --git a/imgui-binding/src/generated/java/imgui/extension/imnodes/ImNodes.java b/imgui-binding/src/generated/java/imgui/extension/imnodes/ImNodes.java index 99036a7..c53e970 100644 --- a/imgui-binding/src/generated/java/imgui/extension/imnodes/ImNodes.java +++ b/imgui-binding/src/generated/java/imgui/extension/imnodes/ImNodes.java @@ -38,7 +38,7 @@ public final class ImNodes { } private static native long nCreateContext(); /* - return (intptr_t)ImNodes::CreateContext(); + return (uintptr_t)ImNodes::CreateContext(); */ public static void destroyContext() { @@ -62,7 +62,7 @@ public final class ImNodes { } private static native long nGetCurrentContext(); /* - return (intptr_t)ImNodes::GetCurrentContext(); + return (uintptr_t)ImNodes::GetCurrentContext(); */ public static void setCurrentContext(final ImNodesContext ctx) { @@ -78,7 +78,7 @@ public final class ImNodes { } private static native long nEditorContextCreate(); /* - return (intptr_t)ImNodes::EditorContextCreate(); + return (uintptr_t)ImNodes::EditorContextCreate(); */ public static void editorContextFree(final ImNodesEditorContext context) { @@ -156,7 +156,7 @@ public final class ImNodes { } private static native long nGetIO(); /* - return (intptr_t)&ImNodes::GetIO(); + return (uintptr_t)&ImNodes::GetIO(); */ private static final ImNodesStyle _GETSTYLE_1 = new ImNodesStyle(0); @@ -170,7 +170,7 @@ public final class ImNodes { } private static native long nGetStyle(); /* - return (intptr_t)&ImNodes::GetStyle(); + return (uintptr_t)&ImNodes::GetStyle(); */ // Style presets matching the dear imgui styles of the same name. diff --git a/imgui-binding/src/generated/java/imgui/extension/implot/ImPlot.java b/imgui-binding/src/generated/java/imgui/extension/implot/ImPlot.java index 0a04947..5e946b8 100644 --- a/imgui-binding/src/generated/java/imgui/extension/implot/ImPlot.java +++ b/imgui-binding/src/generated/java/imgui/extension/implot/ImPlot.java @@ -28,7 +28,7 @@ public final class ImPlot { } private static native long nCreateContext(); /* - return (intptr_t)ImPlot::CreateContext(); + return (uintptr_t)ImPlot::CreateContext(); */ /** @@ -61,7 +61,7 @@ public final class ImPlot { } private static native long nGetCurrentContext(); /* - return (intptr_t)ImPlot::GetCurrentContext(); + return (uintptr_t)ImPlot::GetCurrentContext(); */ /** @@ -16180,107 +16180,107 @@ public final class ImPlot { /** * Plots an axis-aligned image. #bounds_min/bounds_max are in plot coordinates (y-up) and #uv0/uv1 are in texture coordinates (y-down). */ - public static void plotImage(final String labelId, final int userTextureId, final ImPlotPoint boundsMin, final ImPlotPoint boundsMax) { + public static void plotImage(final String labelId, final long userTextureId, final ImPlotPoint boundsMin, final ImPlotPoint boundsMax) { nPlotImage(labelId, userTextureId, boundsMin.x, boundsMin.y, boundsMax.x, boundsMax.y); } /** * Plots an axis-aligned image. #bounds_min/bounds_max are in plot coordinates (y-up) and #uv0/uv1 are in texture coordinates (y-down). */ - public static void plotImage(final String labelId, final int userTextureId, final double boundsMinX, final double boundsMinY, final double boundsMaxX, final double boundsMaxY) { + public static void plotImage(final String labelId, final long userTextureId, final double boundsMinX, final double boundsMinY, final double boundsMaxX, final double boundsMaxY) { nPlotImage(labelId, userTextureId, boundsMinX, boundsMinY, boundsMaxX, boundsMaxY); } /** * Plots an axis-aligned image. #bounds_min/bounds_max are in plot coordinates (y-up) and #uv0/uv1 are in texture coordinates (y-down). */ - public static void plotImage(final String labelId, final int userTextureId, final ImPlotPoint boundsMin, final ImPlotPoint boundsMax, final ImVec2 uv0) { + public static void plotImage(final String labelId, final long userTextureId, final ImPlotPoint boundsMin, final ImPlotPoint boundsMax, final ImVec2 uv0) { nPlotImage(labelId, userTextureId, boundsMin.x, boundsMin.y, boundsMax.x, boundsMax.y, uv0.x, uv0.y); } /** * Plots an axis-aligned image. #bounds_min/bounds_max are in plot coordinates (y-up) and #uv0/uv1 are in texture coordinates (y-down). */ - public static void plotImage(final String labelId, final int userTextureId, final ImPlotPoint boundsMin, final ImPlotPoint boundsMax, final float uv0X, final float uv0Y) { + public static void plotImage(final String labelId, final long userTextureId, final ImPlotPoint boundsMin, final ImPlotPoint boundsMax, final float uv0X, final float uv0Y) { nPlotImage(labelId, userTextureId, boundsMin.x, boundsMin.y, boundsMax.x, boundsMax.y, uv0X, uv0Y); } /** * Plots an axis-aligned image. #bounds_min/bounds_max are in plot coordinates (y-up) and #uv0/uv1 are in texture coordinates (y-down). */ - public static void plotImage(final String labelId, final int userTextureId, final double boundsMinX, final double boundsMinY, final double boundsMaxX, final double boundsMaxY, final ImVec2 uv0) { + public static void plotImage(final String labelId, final long userTextureId, final double boundsMinX, final double boundsMinY, final double boundsMaxX, final double boundsMaxY, final ImVec2 uv0) { nPlotImage(labelId, userTextureId, boundsMinX, boundsMinY, boundsMaxX, boundsMaxY, uv0.x, uv0.y); } /** * Plots an axis-aligned image. #bounds_min/bounds_max are in plot coordinates (y-up) and #uv0/uv1 are in texture coordinates (y-down). */ - public static void plotImage(final String labelId, final int userTextureId, final ImPlotPoint boundsMin, final ImPlotPoint boundsMax, final ImVec2 uv0, final ImVec2 uv1) { + public static void plotImage(final String labelId, final long userTextureId, final ImPlotPoint boundsMin, final ImPlotPoint boundsMax, final ImVec2 uv0, final ImVec2 uv1) { nPlotImage(labelId, userTextureId, boundsMin.x, boundsMin.y, boundsMax.x, boundsMax.y, uv0.x, uv0.y, uv1.x, uv1.y); } /** * Plots an axis-aligned image. #bounds_min/bounds_max are in plot coordinates (y-up) and #uv0/uv1 are in texture coordinates (y-down). */ - public static void plotImage(final String labelId, final int userTextureId, final ImPlotPoint boundsMin, final ImPlotPoint boundsMax, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y) { + public static void plotImage(final String labelId, final long userTextureId, final ImPlotPoint boundsMin, final ImPlotPoint boundsMax, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y) { nPlotImage(labelId, userTextureId, boundsMin.x, boundsMin.y, boundsMax.x, boundsMax.y, uv0X, uv0Y, uv1X, uv1Y); } /** * Plots an axis-aligned image. #bounds_min/bounds_max are in plot coordinates (y-up) and #uv0/uv1 are in texture coordinates (y-down). */ - public static void plotImage(final String labelId, final int userTextureId, final double boundsMinX, final double boundsMinY, final double boundsMaxX, final double boundsMaxY, final ImVec2 uv0, final ImVec2 uv1) { + public static void plotImage(final String labelId, final long userTextureId, final double boundsMinX, final double boundsMinY, final double boundsMaxX, final double boundsMaxY, final ImVec2 uv0, final ImVec2 uv1) { nPlotImage(labelId, userTextureId, boundsMinX, boundsMinY, boundsMaxX, boundsMaxY, uv0.x, uv0.y, uv1.x, uv1.y); } /** * Plots an axis-aligned image. #bounds_min/bounds_max are in plot coordinates (y-up) and #uv0/uv1 are in texture coordinates (y-down). */ - public static void plotImage(final String labelId, final int userTextureId, final ImPlotPoint boundsMin, final ImPlotPoint boundsMax, final ImVec2 uv0, final ImVec2 uv1, final ImVec4 tintCol) { + public static void plotImage(final String labelId, final long userTextureId, final ImPlotPoint boundsMin, final ImPlotPoint boundsMax, final ImVec2 uv0, final ImVec2 uv1, final ImVec4 tintCol) { nPlotImage(labelId, userTextureId, boundsMin.x, boundsMin.y, boundsMax.x, boundsMax.y, uv0.x, uv0.y, uv1.x, uv1.y, tintCol.x, tintCol.y, tintCol.z, tintCol.w); } /** * Plots an axis-aligned image. #bounds_min/bounds_max are in plot coordinates (y-up) and #uv0/uv1 are in texture coordinates (y-down). */ - public static void plotImage(final String labelId, final int userTextureId, final ImPlotPoint boundsMin, final ImPlotPoint boundsMax, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y, final float tintColX, final float tintColY, final float tintColZ, final float tintColW) { + public static void plotImage(final String labelId, final long userTextureId, final ImPlotPoint boundsMin, final ImPlotPoint boundsMax, final float uv0X, final float uv0Y, final float uv1X, final float uv1Y, final float tintColX, final float tintColY, final float tintColZ, final float tintColW) { nPlotImage(labelId, userTextureId, boundsMin.x, boundsMin.y, boundsMax.x, boundsMax.y, uv0X, uv0Y, uv1X, uv1Y, tintColX, tintColY, tintColZ, tintColW); } /** * Plots an axis-aligned image. #bounds_min/bounds_max are in plot coordinates (y-up) and #uv0/uv1 are in texture coordinates (y-down). */ - public static void plotImage(final String labelId, final int userTextureId, final double boundsMinX, final double boundsMinY, final double boundsMaxX, final double boundsMaxY, final ImVec2 uv0, final ImVec2 uv1, final ImVec4 tintCol) { + public static void plotImage(final String labelId, final long userTextureId, final double boundsMinX, final double boundsMinY, final double boundsMaxX, final double boundsMaxY, final ImVec2 uv0, final ImVec2 uv1, final ImVec4 tintCol) { nPlotImage(labelId, userTextureId, boundsMinX, boundsMinY, boundsMaxX, boundsMaxY, uv0.x, uv0.y, uv1.x, uv1.y, tintCol.x, tintCol.y, tintCol.z, tintCol.w); } - private static native void nPlotImage(String labelId, int userTextureId, double boundsMinX, double boundsMinY, double boundsMaxX, double boundsMaxY); /*MANUAL + private static native void nPlotImage(String labelId, long userTextureId, double boundsMinX, double boundsMinY, double boundsMaxX, double boundsMaxY); /*MANUAL auto labelId = obj_labelId == NULL ? NULL : (char*)env->GetStringUTFChars(obj_labelId, JNI_FALSE); - ImPlot::PlotImage(labelId, (ImTextureID)(intptr_t)userTextureId, ImPlotPoint(boundsMinX, boundsMinY), ImPlotPoint(boundsMaxX, boundsMaxY)); + ImPlot::PlotImage(labelId, (ImTextureID)(uintptr_t)userTextureId, ImPlotPoint(boundsMinX, boundsMinY), ImPlotPoint(boundsMaxX, boundsMaxY)); if (labelId != NULL) env->ReleaseStringUTFChars(obj_labelId, labelId); */ - private static native void nPlotImage(String labelId, int userTextureId, double boundsMinX, double boundsMinY, double boundsMaxX, double boundsMaxY, float uv0X, float uv0Y); /*MANUAL + private static native void nPlotImage(String labelId, long userTextureId, double boundsMinX, double boundsMinY, double boundsMaxX, double boundsMaxY, float uv0X, float uv0Y); /*MANUAL auto labelId = obj_labelId == NULL ? NULL : (char*)env->GetStringUTFChars(obj_labelId, JNI_FALSE); ImVec2 uv0 = ImVec2(uv0X, uv0Y); - ImPlot::PlotImage(labelId, (ImTextureID)(intptr_t)userTextureId, ImPlotPoint(boundsMinX, boundsMinY), ImPlotPoint(boundsMaxX, boundsMaxY), uv0); + ImPlot::PlotImage(labelId, (ImTextureID)(uintptr_t)userTextureId, ImPlotPoint(boundsMinX, boundsMinY), ImPlotPoint(boundsMaxX, boundsMaxY), uv0); if (labelId != NULL) env->ReleaseStringUTFChars(obj_labelId, labelId); */ - private static native void nPlotImage(String labelId, int userTextureId, double boundsMinX, double boundsMinY, double boundsMaxX, double boundsMaxY, float uv0X, float uv0Y, float uv1X, float uv1Y); /*MANUAL + private static native void nPlotImage(String labelId, long userTextureId, double boundsMinX, double boundsMinY, double boundsMaxX, double boundsMaxY, float uv0X, float uv0Y, float uv1X, float uv1Y); /*MANUAL auto labelId = obj_labelId == NULL ? NULL : (char*)env->GetStringUTFChars(obj_labelId, JNI_FALSE); ImVec2 uv0 = ImVec2(uv0X, uv0Y); ImVec2 uv1 = ImVec2(uv1X, uv1Y); - ImPlot::PlotImage(labelId, (ImTextureID)(intptr_t)userTextureId, ImPlotPoint(boundsMinX, boundsMinY), ImPlotPoint(boundsMaxX, boundsMaxY), uv0, uv1); + ImPlot::PlotImage(labelId, (ImTextureID)(uintptr_t)userTextureId, ImPlotPoint(boundsMinX, boundsMinY), ImPlotPoint(boundsMaxX, boundsMaxY), uv0, uv1); if (labelId != NULL) env->ReleaseStringUTFChars(obj_labelId, labelId); */ - private static native void nPlotImage(String labelId, int userTextureId, double boundsMinX, double boundsMinY, double boundsMaxX, double boundsMaxY, float uv0X, float uv0Y, float uv1X, float uv1Y, float tintColX, float tintColY, float tintColZ, float tintColW); /*MANUAL + private static native void nPlotImage(String labelId, long userTextureId, double boundsMinX, double boundsMinY, double boundsMaxX, double boundsMaxY, float uv0X, float uv0Y, float uv1X, float uv1Y, float tintColX, float tintColY, float tintColZ, float tintColW); /*MANUAL auto labelId = obj_labelId == NULL ? NULL : (char*)env->GetStringUTFChars(obj_labelId, JNI_FALSE); ImVec2 uv0 = ImVec2(uv0X, uv0Y); ImVec2 uv1 = ImVec2(uv1X, uv1Y); ImVec4 tintCol = ImVec4(tintColX, tintColY, tintColZ, tintColW); - ImPlot::PlotImage(labelId, (ImTextureID)(intptr_t)userTextureId, ImPlotPoint(boundsMinX, boundsMinY), ImPlotPoint(boundsMaxX, boundsMaxY), uv0, uv1, tintCol); + ImPlot::PlotImage(labelId, (ImTextureID)(uintptr_t)userTextureId, ImPlotPoint(boundsMinX, boundsMinY), ImPlotPoint(boundsMaxX, boundsMaxY), uv0, uv1, tintCol); if (labelId != NULL) env->ReleaseStringUTFChars(obj_labelId, labelId); */ @@ -17902,7 +17902,7 @@ public final class ImPlot { } private static native long nGetStyle(); /* - return (intptr_t)&ImPlot::GetStyle(); + return (uintptr_t)&ImPlot::GetStyle(); */ /** @@ -19348,7 +19348,7 @@ public final class ImPlot { } private static native long nGetInputMap(); /* - return (intptr_t)&ImPlot::GetInputMap(); + return (uintptr_t)&ImPlot::GetInputMap(); */ /** @@ -19442,7 +19442,7 @@ public final class ImPlot { } private static native long nGetPlotDrawList(); /* - return (intptr_t)ImPlot::GetPlotDrawList(); + return (uintptr_t)ImPlot::GetPlotDrawList(); */ /** diff --git a/imgui-binding/src/generated/java/imgui/extension/implot/ImPlotInputMap.java b/imgui-binding/src/generated/java/imgui/extension/implot/ImPlotInputMap.java index 81f775a..8f6f688 100644 --- a/imgui-binding/src/generated/java/imgui/extension/implot/ImPlotInputMap.java +++ b/imgui-binding/src/generated/java/imgui/extension/implot/ImPlotInputMap.java @@ -22,7 +22,7 @@ public final class ImPlotInputMap extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImPlotInputMap()); + return (uintptr_t)(new ImPlotInputMap()); */ /** diff --git a/imgui-binding/src/generated/java/imgui/extension/implot/ImPlotStyle.java b/imgui-binding/src/generated/java/imgui/extension/implot/ImPlotStyle.java index 0cba99b..4310009 100644 --- a/imgui-binding/src/generated/java/imgui/extension/implot/ImPlotStyle.java +++ b/imgui-binding/src/generated/java/imgui/extension/implot/ImPlotStyle.java @@ -24,7 +24,7 @@ public final class ImPlotStyle extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImPlotStyle()); + return (uintptr_t)(new ImPlotStyle()); */ public float getLineWeight() { diff --git a/imgui-binding/src/generated/java/imgui/extension/memedit/MemoryEditor.java b/imgui-binding/src/generated/java/imgui/extension/memedit/MemoryEditor.java index 7f1a1cc..56ebf43 100644 --- a/imgui-binding/src/generated/java/imgui/extension/memedit/MemoryEditor.java +++ b/imgui-binding/src/generated/java/imgui/extension/memedit/MemoryEditor.java @@ -27,7 +27,7 @@ public final class MemoryEditor extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new MemoryEditor()); + return (uintptr_t)(new MemoryEditor()); */ public boolean getOpen() { diff --git a/imgui-binding/src/generated/java/imgui/extension/memedit/MemoryEditorSizes.java b/imgui-binding/src/generated/java/imgui/extension/memedit/MemoryEditorSizes.java index 4748ba6..9fba921 100644 --- a/imgui-binding/src/generated/java/imgui/extension/memedit/MemoryEditorSizes.java +++ b/imgui-binding/src/generated/java/imgui/extension/memedit/MemoryEditorSizes.java @@ -22,7 +22,7 @@ public final class MemoryEditorSizes extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new MemoryEditor::Sizes()); + return (uintptr_t)(new MemoryEditor::Sizes()); */ public int getAddrDigitsCount() { diff --git a/imgui-binding/src/generated/java/imgui/extension/nodeditor/NodeEditor.java b/imgui-binding/src/generated/java/imgui/extension/nodeditor/NodeEditor.java index d8f2186..d5d3415 100644 --- a/imgui-binding/src/generated/java/imgui/extension/nodeditor/NodeEditor.java +++ b/imgui-binding/src/generated/java/imgui/extension/nodeditor/NodeEditor.java @@ -45,7 +45,7 @@ public final class NodeEditor { } private static native long nGetCurrentEditor(); /* - return (intptr_t)ax::NodeEditor::GetCurrentEditor(); + return (uintptr_t)ax::NodeEditor::GetCurrentEditor(); */ public static NodeEditorContext createEditor() { @@ -57,11 +57,11 @@ public final class NodeEditor { } private static native long nCreateEditor(); /* - return (intptr_t)ax::NodeEditor::CreateEditor(); + return (uintptr_t)ax::NodeEditor::CreateEditor(); */ private static native long nCreateEditor(long config); /* - return (intptr_t)ax::NodeEditor::CreateEditor(reinterpret_cast(config)); + return (uintptr_t)ax::NodeEditor::CreateEditor(reinterpret_cast(config)); */ public static void destroyEditor(final NodeEditorContext ctx) { @@ -80,7 +80,7 @@ public final class NodeEditor { } private static native long nGetStyle(); /* - return (intptr_t)&ax::NodeEditor::GetStyle(); + return (uintptr_t)&ax::NodeEditor::GetStyle(); */ public static String getStyleColorName(final int colorIndex) { @@ -391,7 +391,7 @@ public final class NodeEditor { } private static native long nGetHintForegroundDrawList(); /* - return (intptr_t)ax::NodeEditor::GetHintForegroundDrawList(); + return (uintptr_t)ax::NodeEditor::GetHintForegroundDrawList(); */ private static final ImDrawList _GETHINTBACKGROUNDDRAWLIST_1 = new ImDrawList(0); @@ -402,7 +402,7 @@ public final class NodeEditor { } private static native long nGetHintBackgroundDrawList(); /* - return (intptr_t)ax::NodeEditor::GetHintBackgroundDrawList(); + return (uintptr_t)ax::NodeEditor::GetHintBackgroundDrawList(); */ public static void endGroupHint() { @@ -421,7 +421,7 @@ public final class NodeEditor { } private static native long nGetNodeBackgroundDrawList(long nodeId); /* - return (intptr_t)ax::NodeEditor::GetNodeBackgroundDrawList(nodeId); + return (uintptr_t)ax::NodeEditor::GetNodeBackgroundDrawList(nodeId); */ public static boolean link(final long id, final long startPinId, final long endPinId) { @@ -1179,17 +1179,17 @@ public final class NodeEditor { public static native long getNodeWithContextMenu(); /* ax::NodeEditor::NodeId id; - return ax::NodeEditor::ShowNodeContextMenu(&id) ? (intptr_t)(uintptr_t)id : -1; + return ax::NodeEditor::ShowNodeContextMenu(&id) ? (uintptr_t)id : -1; */ public static native long getPinWithContextMenu(); /* ax::NodeEditor::PinId id; - return ax::NodeEditor::ShowPinContextMenu(&id) ? (intptr_t)(uintptr_t)id : -1; + return ax::NodeEditor::ShowPinContextMenu(&id) ? (uintptr_t)id : -1; */ public static native long getLinkWithContextMenu(); /* ax::NodeEditor::LinkId id; - return ax::NodeEditor::ShowLinkContextMenu(&id) ? (intptr_t)(uintptr_t)id : -1; + return ax::NodeEditor::ShowLinkContextMenu(&id) ? (uintptr_t)id : -1; */ public static boolean showBackgroundContextMenu() { @@ -1315,7 +1315,7 @@ public final class NodeEditor { } private static native long nGetHoveredNode(); /* - return (intptr_t)(uintptr_t)ax::NodeEditor::GetHoveredNode(); + return (uintptr_t)ax::NodeEditor::GetHoveredNode(); */ public static long getHoveredPin() { @@ -1323,7 +1323,7 @@ public final class NodeEditor { } private static native long nGetHoveredPin(); /* - return (intptr_t)(uintptr_t)ax::NodeEditor::GetHoveredPin(); + return (uintptr_t)ax::NodeEditor::GetHoveredPin(); */ public static long getHoveredLink() { @@ -1331,7 +1331,7 @@ public final class NodeEditor { } private static native long nGetHoveredLink(); /* - return (intptr_t)(uintptr_t)ax::NodeEditor::GetHoveredLink(); + return (uintptr_t)ax::NodeEditor::GetHoveredLink(); */ public static long getDoubleClickedNode() { @@ -1339,7 +1339,7 @@ public final class NodeEditor { } private static native long nGetDoubleClickedNode(); /* - return (intptr_t)(uintptr_t)ax::NodeEditor::GetDoubleClickedNode(); + return (uintptr_t)ax::NodeEditor::GetDoubleClickedNode(); */ public static long getDoubleClickedPin() { @@ -1347,7 +1347,7 @@ public final class NodeEditor { } private static native long nGetDoubleClickedPin(); /* - return (intptr_t)(uintptr_t)ax::NodeEditor::GetDoubleClickedPin(); + return (uintptr_t)ax::NodeEditor::GetDoubleClickedPin(); */ public static long getDoubleClickedLink() { @@ -1355,7 +1355,7 @@ public final class NodeEditor { } private static native long nGetDoubleClickedLink(); /* - return (intptr_t)(uintptr_t)ax::NodeEditor::GetDoubleClickedLink(); + return (uintptr_t)ax::NodeEditor::GetDoubleClickedLink(); */ public static boolean isBackgroundClicked() { diff --git a/imgui-binding/src/generated/java/imgui/extension/nodeditor/NodeEditorConfig.java b/imgui-binding/src/generated/java/imgui/extension/nodeditor/NodeEditorConfig.java index 8f57b21..3485dbf 100644 --- a/imgui-binding/src/generated/java/imgui/extension/nodeditor/NodeEditorConfig.java +++ b/imgui-binding/src/generated/java/imgui/extension/nodeditor/NodeEditorConfig.java @@ -14,7 +14,7 @@ public final class NodeEditorConfig extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ax::NodeEditor::Config()); + return (uintptr_t)(new ax::NodeEditor::Config()); */ public String getSettingsFile() { diff --git a/imgui-binding/src/generated/java/imgui/extension/texteditor/TextEditor.java b/imgui-binding/src/generated/java/imgui/extension/texteditor/TextEditor.java index 91f525c..978b1fe 100644 --- a/imgui-binding/src/generated/java/imgui/extension/texteditor/TextEditor.java +++ b/imgui-binding/src/generated/java/imgui/extension/texteditor/TextEditor.java @@ -26,7 +26,7 @@ public final class TextEditor extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new TextEditor()); + return (uintptr_t)(new TextEditor()); */ public void setLanguageDefinition(final TextEditorLanguageDefinition aLanguageDef) { @@ -42,7 +42,7 @@ public final class TextEditor extends ImGuiStructDestroyable { } private native long nGetLanguageDefinition(); /* - return (intptr_t)&THIS->GetLanguageDefinition(); + return (uintptr_t)&THIS->GetLanguageDefinition(); */ public native int[] getPalette(); /* diff --git a/imgui-binding/src/generated/java/imgui/extension/texteditor/TextEditorLanguageDefinition.java b/imgui-binding/src/generated/java/imgui/extension/texteditor/TextEditorLanguageDefinition.java index 3c3f5d6..4d082c7 100644 --- a/imgui-binding/src/generated/java/imgui/extension/texteditor/TextEditorLanguageDefinition.java +++ b/imgui-binding/src/generated/java/imgui/extension/texteditor/TextEditorLanguageDefinition.java @@ -25,7 +25,7 @@ public final class TextEditorLanguageDefinition extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new TextEditor::LanguageDefinition()); + return (uintptr_t)(new TextEditor::LanguageDefinition()); */ public String getName() { @@ -238,7 +238,7 @@ public final class TextEditorLanguageDefinition extends ImGuiStructDestroyable { } private static native long nCPlusPlus(); /* - return (intptr_t)&TextEditorLanguageDefinition::CPlusPlus(); + return (uintptr_t)&TextEditorLanguageDefinition::CPlusPlus(); */ private static final TextEditorLanguageDefinition _HLSL_1 = new TextEditorLanguageDefinition(0); @@ -249,7 +249,7 @@ public final class TextEditorLanguageDefinition extends ImGuiStructDestroyable { } private static native long nHLSL(); /* - return (intptr_t)&TextEditorLanguageDefinition::HLSL(); + return (uintptr_t)&TextEditorLanguageDefinition::HLSL(); */ private static final TextEditorLanguageDefinition _GLSL_1 = new TextEditorLanguageDefinition(0); @@ -260,7 +260,7 @@ public final class TextEditorLanguageDefinition extends ImGuiStructDestroyable { } private static native long nGLSL(); /* - return (intptr_t)&TextEditorLanguageDefinition::GLSL(); + return (uintptr_t)&TextEditorLanguageDefinition::GLSL(); */ private static final TextEditorLanguageDefinition _C_1 = new TextEditorLanguageDefinition(0); @@ -271,7 +271,7 @@ public final class TextEditorLanguageDefinition extends ImGuiStructDestroyable { } private static native long nC(); /* - return (intptr_t)&TextEditorLanguageDefinition::C(); + return (uintptr_t)&TextEditorLanguageDefinition::C(); */ private static final TextEditorLanguageDefinition _SQL_1 = new TextEditorLanguageDefinition(0); @@ -282,7 +282,7 @@ public final class TextEditorLanguageDefinition extends ImGuiStructDestroyable { } private static native long nSQL(); /* - return (intptr_t)&TextEditorLanguageDefinition::SQL(); + return (uintptr_t)&TextEditorLanguageDefinition::SQL(); */ private static final TextEditorLanguageDefinition _ANGELSCRIPT_1 = new TextEditorLanguageDefinition(0); @@ -293,7 +293,7 @@ public final class TextEditorLanguageDefinition extends ImGuiStructDestroyable { } private static native long nAngelScript(); /* - return (intptr_t)&TextEditorLanguageDefinition::AngelScript(); + return (uintptr_t)&TextEditorLanguageDefinition::AngelScript(); */ private static final TextEditorLanguageDefinition _LUA_1 = new TextEditorLanguageDefinition(0); @@ -304,7 +304,7 @@ public final class TextEditorLanguageDefinition extends ImGuiStructDestroyable { } private static native long nLua(); /* - return (intptr_t)&TextEditorLanguageDefinition::Lua(); + return (uintptr_t)&TextEditorLanguageDefinition::Lua(); */ /*JNI diff --git a/imgui-binding/src/generated/java/imgui/internal/ImGui.java b/imgui-binding/src/generated/java/imgui/internal/ImGui.java index ea2a1ae..890d8a5 100644 --- a/imgui-binding/src/generated/java/imgui/internal/ImGui.java +++ b/imgui-binding/src/generated/java/imgui/internal/ImGui.java @@ -109,7 +109,7 @@ public final class ImGui extends imgui.ImGui { } private static native long nDockBuilderGetNode(int nodeId); /* - return (intptr_t)ImGui::DockBuilderGetNode(nodeId); + return (uintptr_t)ImGui::DockBuilderGetNode(nodeId); */ public static ImGuiDockNode dockBuilderGetCentralNode(final int nodeId) { @@ -117,7 +117,7 @@ public final class ImGui extends imgui.ImGui { } private static native long nDockBuilderGetCentralNode(int nodeId); /* - return (intptr_t)ImGui::DockBuilderGetCentralNode(nodeId); + return (uintptr_t)ImGui::DockBuilderGetCentralNode(nodeId); */ public static int dockBuilderAddNode() { @@ -321,7 +321,7 @@ public final class ImGui extends imgui.ImGui { } private static native long nGetCurrentWindow(); /* - return (intptr_t)ImGui::GetCurrentWindow(); + return (uintptr_t)ImGui::GetCurrentWindow(); */ public static ImRect getWindowScrollbarRect(final ImGuiWindow imGuiWindow, final int axis) { diff --git a/imgui-binding/src/generated/java/imgui/internal/ImGuiDockNode.java b/imgui-binding/src/generated/java/imgui/internal/ImGuiDockNode.java index e497254..be90876 100644 --- a/imgui-binding/src/generated/java/imgui/internal/ImGuiDockNode.java +++ b/imgui-binding/src/generated/java/imgui/internal/ImGuiDockNode.java @@ -190,7 +190,7 @@ public final class ImGuiDockNode extends ImGuiStruct { } private native long nGetParentNode(); /* - return (intptr_t)THIS->ParentNode; + return (uintptr_t)THIS->ParentNode; */ private native void nSetParentNode(long value); /* @@ -205,7 +205,7 @@ public final class ImGuiDockNode extends ImGuiStruct { } private native long nGetChildNodeFirst(); /* - return (intptr_t)THIS->ChildNodes[0]; + return (uintptr_t)THIS->ChildNodes[0]; */ /** @@ -227,7 +227,7 @@ public final class ImGuiDockNode extends ImGuiStruct { } private native long nGetChildNodeSecond(); /* - return (intptr_t)THIS->ChildNodes[1]; + return (uintptr_t)THIS->ChildNodes[1]; */ /** @@ -445,7 +445,7 @@ public final class ImGuiDockNode extends ImGuiStruct { } private native long nGetWindowClass(); /* - return (intptr_t)&THIS->WindowClass; + return (uintptr_t)&THIS->WindowClass; */ public int getLastBgColor() { @@ -473,7 +473,7 @@ public final class ImGuiDockNode extends ImGuiStruct { } private native long nGetHostWindow(); /* - return (intptr_t)THIS->HostWindow; + return (uintptr_t)THIS->HostWindow; */ private native void nSetHostWindow(long value); /* @@ -495,7 +495,7 @@ public final class ImGuiDockNode extends ImGuiStruct { } private native long nGetVisibleWindow(); /* - return (intptr_t)THIS->VisibleWindow; + return (uintptr_t)THIS->VisibleWindow; */ private native void nSetVisibleWindow(long value); /* @@ -517,7 +517,7 @@ public final class ImGuiDockNode extends ImGuiStruct { } private native long nGetCentralNode(); /* - return (intptr_t)THIS->CentralNode; + return (uintptr_t)THIS->CentralNode; */ private native void nSetCentralNode(long value); /* @@ -539,7 +539,7 @@ public final class ImGuiDockNode extends ImGuiStruct { } private native long nGetOnlyNodeWithWindows(); /* - return (intptr_t)THIS->OnlyNodeWithWindows; + return (uintptr_t)THIS->OnlyNodeWithWindows; */ private native void nSetOnlyNodeWithWindows(long value); /* diff --git a/imgui-binding/src/main/java/imgui/ImDrawData.java b/imgui-binding/src/main/java/imgui/ImDrawData.java index d03015e..fc018d7 100644 --- a/imgui-binding/src/main/java/imgui/ImDrawData.java +++ b/imgui-binding/src/main/java/imgui/ImDrawData.java @@ -68,7 +68,7 @@ public final class ImDrawData extends ImGuiStruct { * Ignore if never using images or multiple fonts atlas. */ public native int getCmdListCmdBufferTextureId(int cmdListIdx, int cmdBufferIdx); /* - return (intptr_t)THIS->CmdLists[cmdListIdx]->CmdBuffer[cmdBufferIdx].GetTexID(); + return (uintptr_t)THIS->CmdLists[cmdListIdx]->CmdBuffer[cmdBufferIdx].GetTexID(); */ /** diff --git a/imgui-binding/src/main/java/imgui/ImDrawList.java b/imgui-binding/src/main/java/imgui/ImDrawList.java index c41835a..cb3926a 100644 --- a/imgui-binding/src/main/java/imgui/ImDrawList.java +++ b/imgui-binding/src/main/java/imgui/ImDrawList.java @@ -50,7 +50,7 @@ public final class ImDrawList extends ImGuiStruct { public native void PopClipRect(); @BindingMethod - public native void PushTextureID(@ArgValue(callPrefix = "(ImTextureID)(intptr_t)") int textureId); + public native void PushTextureID(@ArgValue(callPrefix = "(ImTextureID)(uintptr_t)") long textureId); @BindingMethod public native void PopTextureID(); @@ -137,13 +137,13 @@ public final class ImDrawList extends ImGuiStruct { // - "uvMin" and "uvMax" represent the normalized texture coordinates to use for those corners. Using (0,0)->(1,1) texture coordinates will generally display the entire texture. @BindingMethod - public native void AddImage(@ArgValue(callPrefix = "(ImTextureID)(intptr_t)") int textureID, ImVec2 pMin, ImVec2 pMax, @OptArg ImVec2 uvMin, @OptArg ImVec2 uvMax, @OptArg int col); + public native void AddImage(@ArgValue(callPrefix = "(ImTextureID)(uintptr_t)") long textureID, ImVec2 pMin, ImVec2 pMax, @OptArg ImVec2 uvMin, @OptArg ImVec2 uvMax, @OptArg int col); @BindingMethod - public native void AddImageQuad(@ArgValue(callPrefix = "(ImTextureID)(intptr_t)") int textureID, ImVec2 p1, ImVec2 p2, ImVec2 p3, ImVec2 p4, @OptArg ImVec2 uv1, @OptArg ImVec2 uv2, @OptArg ImVec2 uv3, @OptArg ImVec2 uv4, @OptArg int col); + public native void AddImageQuad(@ArgValue(callPrefix = "(ImTextureID)(uintptr_t)") long textureID, ImVec2 p1, ImVec2 p2, ImVec2 p3, ImVec2 p4, @OptArg ImVec2 uv1, @OptArg ImVec2 uv2, @OptArg ImVec2 uv3, @OptArg ImVec2 uv4, @OptArg int col); @BindingMethod - public native void AddImageRounded(@ArgValue(callPrefix = "(ImTextureID)(intptr_t)") int textureID, ImVec2 pMin, ImVec2 pMax, ImVec2 uvMin, ImVec2 uvMax, int col, float rounding, @OptArg int imDrawFlags); + public native void AddImageRounded(@ArgValue(callPrefix = "(ImTextureID)(uintptr_t)") long textureID, ImVec2 pMin, ImVec2 pMax, ImVec2 uvMin, ImVec2 uvMax, int col, float rounding, @OptArg int imDrawFlags); // Stateful path API, add points then finish with PathFillConvex() or PathStroke() diff --git a/imgui-binding/src/main/java/imgui/ImFont.java b/imgui-binding/src/main/java/imgui/ImFont.java index 8f0b2cc..7c10a75 100644 --- a/imgui-binding/src/main/java/imgui/ImFont.java +++ b/imgui-binding/src/main/java/imgui/ImFont.java @@ -33,7 +33,7 @@ public final class ImFont extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImFont()); + return (uintptr_t)(new ImFont()); */ // TODO IndexAdvanceX diff --git a/imgui-binding/src/main/java/imgui/ImFontAtlas.java b/imgui-binding/src/main/java/imgui/ImFontAtlas.java index 254f20d..bcd96ec 100644 --- a/imgui-binding/src/main/java/imgui/ImFontAtlas.java +++ b/imgui-binding/src/main/java/imgui/ImFontAtlas.java @@ -63,7 +63,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImFontConfig()); + return (uintptr_t)(new ImFontConfig()); */ @BindingMethod @@ -243,7 +243,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { * It is passed back to you during rendering via the ImDrawCmd structure. */ @BindingMethod - public native void SetTexID(@ArgValue(callPrefix = "(ImTextureID)(intptr_t)") int textureID); + public native void SetTexID(@ArgValue(callPrefix = "(ImTextureID)(uintptr_t)") long textureID); //------------------------------------------- // Glyph Ranges diff --git a/imgui-binding/src/main/java/imgui/ImFontConfig.java b/imgui-binding/src/main/java/imgui/ImFontConfig.java index 8231353..f44f75b 100644 --- a/imgui-binding/src/main/java/imgui/ImFontConfig.java +++ b/imgui-binding/src/main/java/imgui/ImFontConfig.java @@ -27,7 +27,7 @@ public final class ImFontConfig extends ImGuiStructDestroyable { private native long nCreate(); /* ImFontConfig* cfg = new ImFontConfig(); cfg->FontDataOwnedByAtlas = false; - return (intptr_t)cfg; + return (uintptr_t)cfg; */ /** diff --git a/imgui-binding/src/main/java/imgui/ImFontGlyph.java b/imgui-binding/src/main/java/imgui/ImFontGlyph.java index e3c5a9a..f76e466 100644 --- a/imgui-binding/src/main/java/imgui/ImFontGlyph.java +++ b/imgui-binding/src/main/java/imgui/ImFontGlyph.java @@ -29,7 +29,7 @@ public final class ImFontGlyph extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImFontGlyph()); + return (uintptr_t)(new ImFontGlyph()); */ /** diff --git a/imgui-binding/src/main/java/imgui/ImGui.java b/imgui-binding/src/main/java/imgui/ImGui.java index ee244e9..b6a810e 100644 --- a/imgui-binding/src/main/java/imgui/ImGui.java +++ b/imgui-binding/src/main/java/imgui/ImGui.java @@ -1040,13 +1040,13 @@ public class ImGui { public static native boolean ArrowButton(String strId, int dir); @BindingMethod - public static native void Image(@ArgValue(callPrefix = "(ImTextureID)(intptr_t)") int userTextureId, ImVec2 size, @OptArg ImVec2 uv0, @OptArg ImVec2 uv1, @OptArg ImVec4 tintCol, @OptArg ImVec4 borderCol); + public static native void Image(@ArgValue(callPrefix = "(ImTextureID)(uintptr_t)") long userTextureId, ImVec2 size, @OptArg ImVec2 uv0, @OptArg ImVec2 uv1, @OptArg ImVec4 tintCol, @OptArg ImVec4 borderCol); /** * {@code <0} framePadding uses default frame padding settings. 0 for no padding */ @BindingMethod - public static native boolean ImageButton(@ArgValue(callPrefix = "(ImTextureID)(intptr_t)") int userTextureId, ImVec2 size, @OptArg ImVec2 uv0, @OptArg ImVec2 uv1, @OptArg(callValue = "-1") int framePadding, @OptArg ImVec4 bgCol, @OptArg ImVec4 tintCol); + public static native boolean ImageButton(@ArgValue(callPrefix = "(ImTextureID)(uintptr_t)") long userTextureId, ImVec2 size, @OptArg ImVec2 uv0, @OptArg ImVec2 uv1, @OptArg(callValue = "-1") int framePadding, @OptArg ImVec4 bgCol, @OptArg ImVec4 tintCol); public static boolean checkbox(String label, boolean active) { return nCheckbox(label, active); diff --git a/imgui-binding/src/main/java/imgui/ImGuiKeyData.java b/imgui-binding/src/main/java/imgui/ImGuiKeyData.java index 10616f0..7f0527c 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiKeyData.java +++ b/imgui-binding/src/main/java/imgui/ImGuiKeyData.java @@ -29,7 +29,7 @@ public final class ImGuiKeyData extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImGuiKeyData()); + return (uintptr_t)(new ImGuiKeyData()); */ /** diff --git a/imgui-binding/src/main/java/imgui/ImGuiPlatformIO.java b/imgui-binding/src/main/java/imgui/ImGuiPlatformIO.java index 4df2f63..b54eb12 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiPlatformIO.java +++ b/imgui-binding/src/main/java/imgui/ImGuiPlatformIO.java @@ -102,7 +102,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { void PlatformStub##name(ImGuiViewport* vp) {\ if (platformCallback##name != NULL) {\ JNIEnv* env = Jni::GetEnv();\ - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp);\ + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp);\ Jni::CallImPlatformFuncViewport(env, platformCallback##name, jTmpViewport);\ }\ }\ @@ -155,7 +155,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { void PlatformStub##name(ImGuiViewport* vp, ImVec2 pos) {\ if (platformCallback##name != NULL) {\ JNIEnv* env = Jni::GetEnv();\ - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp);\ + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp);\ Jni::ImVec2Cpy(env, pos, jTmpImVec2);\ Jni::CallImPlatformFuncViewportImVec2(env, platformCallback##name, jTmpViewport, jTmpImVec2);\ }\ @@ -185,7 +185,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { ImVec2 dst;\ if (platformCallback##name != NULL) {\ JNIEnv* env = Jni::GetEnv();\ - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp);\ + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp);\ Jni::CallImPlatformFuncViewportSuppImVec2(env, platformCallback##name, jTmpViewport, jTmpImVec2);\ Jni::ImVec2Cpy(env, jTmpImVec2, &dst);\ }\ @@ -248,7 +248,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { bool PlatformStub##name(ImGuiViewport* vp) {\ if (platformCallback##name != NULL) {\ JNIEnv* env = Jni::GetEnv();\ - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp);\ + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp);\ return Jni::CallImPlatformFuncViewportSuppBoolean(env, platformCallback##name, jTmpViewport);\ }\ return false;\ @@ -287,7 +287,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { void PlatformStubSetWindowTitle(ImGuiViewport* vp, const char* str) { if (platformCallbackSetWindowTitle != NULL) { JNIEnv* env = Jni::GetEnv(); - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp); + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp); Jni::CallImPlatformFuncViewportString(env, platformCallbackSetWindowTitle, jTmpViewport, str); } } @@ -309,7 +309,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { void PlatformStubSetWindowAlpha(ImGuiViewport* vp, float alpha) { if (platformCallbackSetWindowAlpha != NULL) { JNIEnv* env = Jni::GetEnv(); - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp); + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp); Jni::CallImPlatformFuncViewportFloat(env, platformCallbackSetWindowAlpha, jTmpViewport, alpha); } } @@ -364,7 +364,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { float PlatformStubGetWindowDpiScale(ImGuiViewport* vp) { if (platformCallbackGetWindowDpiScale != NULL) { JNIEnv* env = Jni::GetEnv(); - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp); + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp); return Jni::CallImPlatformFuncViewportSuppFloat(env, platformCallbackGetWindowDpiScale, jTmpViewport); } return false; @@ -401,7 +401,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { void RendererStub##name(ImGuiViewport* vp) {\ if (rendererCallback##name != NULL) {\ JNIEnv* env = Jni::GetEnv();\ - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp);\ + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp);\ Jni::CallImPlatformFuncViewport(env, rendererCallback##name, jTmpViewport);\ }\ }\ @@ -442,7 +442,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { void RendererStubSetWindowSize(ImGuiViewport* vp, ImVec2 pos) { if (rendererCallbackSetWindowSize != NULL) { JNIEnv* env = Jni::GetEnv(); - env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (intptr_t)vp); + env->SetLongField(jTmpViewport, Jni::GetBindingStructPtrID(), (uintptr_t)vp); Jni::ImVec2Cpy(env, pos, jTmpImVec2); Jni::CallImPlatformFuncViewportImVec2(env, rendererCallbackSetWindowSize, jTmpViewport, jTmpImVec2); } @@ -519,7 +519,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { } private native long nGetMonitors(int idx); /* - return (intptr_t)&IMGUI_PLATFORM_IO->Monitors[idx]; + return (uintptr_t)&IMGUI_PLATFORM_IO->Monitors[idx]; */ // Viewports list (the list is updated by calling ImGui::EndFrame or ImGui::Render) @@ -535,6 +535,6 @@ public final class ImGuiPlatformIO extends ImGuiStruct { } private native long nGetViewports(int idx); /* - return (intptr_t)IMGUI_PLATFORM_IO->Viewports[idx]; + return (uintptr_t)IMGUI_PLATFORM_IO->Viewports[idx]; */ } diff --git a/imgui-binding/src/main/java/imgui/ImGuiStorage.java b/imgui-binding/src/main/java/imgui/ImGuiStorage.java index 692308d..81c1c50 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiStorage.java +++ b/imgui-binding/src/main/java/imgui/ImGuiStorage.java @@ -36,7 +36,7 @@ public final class ImGuiStorage extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImGuiStorage()); + return (uintptr_t)(new ImGuiStorage()); */ // - Get***() functions find pair, never add/allocate. Pairs are sorted so a query is O(log N) diff --git a/imgui-binding/src/main/java/imgui/ImGuiStyle.java b/imgui-binding/src/main/java/imgui/ImGuiStyle.java index cd88017..c2c2553 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiStyle.java +++ b/imgui-binding/src/main/java/imgui/ImGuiStyle.java @@ -32,7 +32,7 @@ public final class ImGuiStyle extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImGuiStyle()); + return (uintptr_t)(new ImGuiStyle()); */ /** diff --git a/imgui-binding/src/main/java/imgui/ImGuiTableSortSpecs.java b/imgui-binding/src/main/java/imgui/ImGuiTableSortSpecs.java index 6d598f0..2bcacdc 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiTableSortSpecs.java +++ b/imgui-binding/src/main/java/imgui/ImGuiTableSortSpecs.java @@ -39,7 +39,7 @@ public final class ImGuiTableSortSpecs extends ImGuiStruct { int specsCount = THIS->SpecsCount; jlong jBuf[specsCount]; for (int i = 0; i < specsCount; i++) { - jBuf[i] = (intptr_t)specs; + jBuf[i] = (uintptr_t)specs; specs++; } jlongArray result = env->NewLongArray(specsCount); diff --git a/imgui-binding/src/main/java/imgui/ImGuiTextFilter.java b/imgui-binding/src/main/java/imgui/ImGuiTextFilter.java index 11a7b9b..9665b38 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiTextFilter.java +++ b/imgui-binding/src/main/java/imgui/ImGuiTextFilter.java @@ -34,7 +34,7 @@ public final class ImGuiTextFilter extends ImGuiStructDestroyable { */ private native long nCreate(String defaultFilter); /* - return (intptr_t)(new ImGuiTextFilter(defaultFilter)); + return (uintptr_t)(new ImGuiTextFilter(defaultFilter)); */ @BindingMethod diff --git a/imgui-binding/src/main/java/imgui/ImGuiViewport.java b/imgui-binding/src/main/java/imgui/ImGuiViewport.java index afa94e9..2651a04 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiViewport.java +++ b/imgui-binding/src/main/java/imgui/ImGuiViewport.java @@ -126,7 +126,7 @@ public final class ImGuiViewport extends ImGuiStruct { * void* for FindViewportByPlatformHandle(). (e.g. suggested to use natural platform handle such as HWND, GLFWWindow*, SDL_Window*) */ public native long getPlatformHandle(); /* - return (intptr_t)THIS->PlatformHandle; + return (uintptr_t)THIS->PlatformHandle; */ /** @@ -140,7 +140,7 @@ public final class ImGuiViewport extends ImGuiStruct { * void* to hold lower-level, platform-native window handle (e.g. the HWND) when using an abstraction layer like GLFW or SDL (where PlatformHandle would be a SDL_Window*) */ public native long getPlatformHandleRaw(); /* - return (intptr_t)THIS->PlatformHandleRaw; + return (uintptr_t)THIS->PlatformHandleRaw; */ /** diff --git a/imgui-binding/src/main/java/imgui/ImGuiWindowClass.java b/imgui-binding/src/main/java/imgui/ImGuiWindowClass.java index 258ac98..c57e336 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiWindowClass.java +++ b/imgui-binding/src/main/java/imgui/ImGuiWindowClass.java @@ -34,7 +34,7 @@ public final class ImGuiWindowClass extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImGuiWindowClass()); + return (uintptr_t)(new ImGuiWindowClass()); */ /** diff --git a/imgui-binding/src/main/java/imgui/extension/imguifiledialog/ImGuiFileDialog.java b/imgui-binding/src/main/java/imgui/extension/imguifiledialog/ImGuiFileDialog.java index cae606d..4a8c0e2 100644 --- a/imgui-binding/src/main/java/imgui/extension/imguifiledialog/ImGuiFileDialog.java +++ b/imgui-binding/src/main/java/imgui/extension/imguifiledialog/ImGuiFileDialog.java @@ -301,6 +301,6 @@ public final class ImGuiFileDialog { * @return user datas sent with Open Dialog/Modal */ @BindingMethod - @ReturnValue(callPrefix = "(intptr_t)") + @ReturnValue(callPrefix = "(uintptr_t)") public static native long GetUserDatas(); } diff --git a/imgui-binding/src/main/java/imgui/extension/implot/ImPlot.java b/imgui-binding/src/main/java/imgui/extension/implot/ImPlot.java index fdd07f9..c34632f 100644 --- a/imgui-binding/src/main/java/imgui/extension/implot/ImPlot.java +++ b/imgui-binding/src/main/java/imgui/extension/implot/ImPlot.java @@ -973,7 +973,7 @@ public final class ImPlot { */ @BindingMethod public static native void PlotImage(String labelId, - @ArgValue(callPrefix = "(ImTextureID)(intptr_t)") int userTextureId, + @ArgValue(callPrefix = "(ImTextureID)(uintptr_t)") long userTextureId, ImPlotPoint boundsMin, ImPlotPoint boundsMax, @OptArg ImVec2 uv0, diff --git a/imgui-binding/src/main/java/imgui/extension/implot/ImPlotInputMap.java b/imgui-binding/src/main/java/imgui/extension/implot/ImPlotInputMap.java index 25af272..aee647c 100644 --- a/imgui-binding/src/main/java/imgui/extension/implot/ImPlotInputMap.java +++ b/imgui-binding/src/main/java/imgui/extension/implot/ImPlotInputMap.java @@ -25,7 +25,7 @@ public final class ImPlotInputMap extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImPlotInputMap()); + return (uintptr_t)(new ImPlotInputMap()); */ /** diff --git a/imgui-binding/src/main/java/imgui/extension/implot/ImPlotStyle.java b/imgui-binding/src/main/java/imgui/extension/implot/ImPlotStyle.java index 904a47f..a1f275f 100644 --- a/imgui-binding/src/main/java/imgui/extension/implot/ImPlotStyle.java +++ b/imgui-binding/src/main/java/imgui/extension/implot/ImPlotStyle.java @@ -28,7 +28,7 @@ public final class ImPlotStyle extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ImPlotStyle()); + return (uintptr_t)(new ImPlotStyle()); */ @BindingField diff --git a/imgui-binding/src/main/java/imgui/extension/memedit/MemoryEditor.java b/imgui-binding/src/main/java/imgui/extension/memedit/MemoryEditor.java index b714b9d..cc7da26 100644 --- a/imgui-binding/src/main/java/imgui/extension/memedit/MemoryEditor.java +++ b/imgui-binding/src/main/java/imgui/extension/memedit/MemoryEditor.java @@ -33,7 +33,7 @@ public final class MemoryEditor extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new MemoryEditor()); + return (uintptr_t)(new MemoryEditor()); */ @BindingField diff --git a/imgui-binding/src/main/java/imgui/extension/memedit/MemoryEditorSizes.java b/imgui-binding/src/main/java/imgui/extension/memedit/MemoryEditorSizes.java index d7df5ab..0303760 100644 --- a/imgui-binding/src/main/java/imgui/extension/memedit/MemoryEditorSizes.java +++ b/imgui-binding/src/main/java/imgui/extension/memedit/MemoryEditorSizes.java @@ -25,7 +25,7 @@ public final class MemoryEditorSizes extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new MemoryEditor::Sizes()); + return (uintptr_t)(new MemoryEditor::Sizes()); */ @BindingField diff --git a/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditor.java b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditor.java index 85c4077..ff8446a 100644 --- a/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditor.java +++ b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditor.java @@ -293,17 +293,17 @@ public final class NodeEditor { public static native long getNodeWithContextMenu(); /* ax::NodeEditor::NodeId id; - return ax::NodeEditor::ShowNodeContextMenu(&id) ? (intptr_t)(uintptr_t)id : -1; + return ax::NodeEditor::ShowNodeContextMenu(&id) ? (uintptr_t)id : -1; */ public static native long getPinWithContextMenu(); /* ax::NodeEditor::PinId id; - return ax::NodeEditor::ShowPinContextMenu(&id) ? (intptr_t)(uintptr_t)id : -1; + return ax::NodeEditor::ShowPinContextMenu(&id) ? (uintptr_t)id : -1; */ public static native long getLinkWithContextMenu(); /* ax::NodeEditor::LinkId id; - return ax::NodeEditor::ShowLinkContextMenu(&id) ? (intptr_t)(uintptr_t)id : -1; + return ax::NodeEditor::ShowLinkContextMenu(&id) ? (uintptr_t)id : -1; */ @BindingMethod @@ -349,27 +349,27 @@ public final class NodeEditor { public static native float GetCurrentZoom(); @BindingMethod - @ReturnValue(callPrefix = "(intptr_t)(uintptr_t)") + @ReturnValue(callPrefix = "(uintptr_t)") public static native long GetHoveredNode(); @BindingMethod - @ReturnValue(callPrefix = "(intptr_t)(uintptr_t)") + @ReturnValue(callPrefix = "(uintptr_t)") public static native long GetHoveredPin(); @BindingMethod - @ReturnValue(callPrefix = "(intptr_t)(uintptr_t)") + @ReturnValue(callPrefix = "(uintptr_t)") public static native long GetHoveredLink(); @BindingMethod - @ReturnValue(callPrefix = "(intptr_t)(uintptr_t)") + @ReturnValue(callPrefix = "(uintptr_t)") public static native long GetDoubleClickedNode(); @BindingMethod - @ReturnValue(callPrefix = "(intptr_t)(uintptr_t)") + @ReturnValue(callPrefix = "(uintptr_t)") public static native long GetDoubleClickedPin(); @BindingMethod - @ReturnValue(callPrefix = "(intptr_t)(uintptr_t)") + @ReturnValue(callPrefix = "(uintptr_t)") public static native long GetDoubleClickedLink(); @BindingMethod diff --git a/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorConfig.java b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorConfig.java index 090e477..c355ec4 100644 --- a/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorConfig.java +++ b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorConfig.java @@ -17,7 +17,7 @@ public final class NodeEditorConfig extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new ax::NodeEditor::Config()); + return (uintptr_t)(new ax::NodeEditor::Config()); */ @BindingField diff --git a/imgui-binding/src/main/java/imgui/extension/texteditor/TextEditor.java b/imgui-binding/src/main/java/imgui/extension/texteditor/TextEditor.java index 52aa712..5c0d8ed 100644 --- a/imgui-binding/src/main/java/imgui/extension/texteditor/TextEditor.java +++ b/imgui-binding/src/main/java/imgui/extension/texteditor/TextEditor.java @@ -32,7 +32,7 @@ public final class TextEditor extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new TextEditor()); + return (uintptr_t)(new TextEditor()); */ @BindingMethod diff --git a/imgui-binding/src/main/java/imgui/extension/texteditor/TextEditorLanguageDefinition.java b/imgui-binding/src/main/java/imgui/extension/texteditor/TextEditorLanguageDefinition.java index 8340767..051c4b5 100644 --- a/imgui-binding/src/main/java/imgui/extension/texteditor/TextEditorLanguageDefinition.java +++ b/imgui-binding/src/main/java/imgui/extension/texteditor/TextEditorLanguageDefinition.java @@ -31,7 +31,7 @@ public final class TextEditorLanguageDefinition extends ImGuiStructDestroyable { */ private native long nCreate(); /* - return (intptr_t)(new TextEditor::LanguageDefinition()); + return (uintptr_t)(new TextEditor::LanguageDefinition()); */ @BindingField(callName = "mName") diff --git a/imgui-binding/src/main/java/imgui/internal/ImGuiDockNode.java b/imgui-binding/src/main/java/imgui/internal/ImGuiDockNode.java index 11c0ae5..47a80cb 100644 --- a/imgui-binding/src/main/java/imgui/internal/ImGuiDockNode.java +++ b/imgui-binding/src/main/java/imgui/internal/ImGuiDockNode.java @@ -61,7 +61,7 @@ public final class ImGuiDockNode extends ImGuiStruct { } private native long nGetChildNodeFirst(); /* - return (intptr_t)THIS->ChildNodes[0]; + return (uintptr_t)THIS->ChildNodes[0]; */ /** @@ -83,7 +83,7 @@ public final class ImGuiDockNode extends ImGuiStruct { } private native long nGetChildNodeSecond(); /* - return (intptr_t)THIS->ChildNodes[1]; + return (uintptr_t)THIS->ChildNodes[1]; */ /** diff --git a/imgui-binding/src/main/native/jni_common.cpp b/imgui-binding/src/main/native/jni_common.cpp index e1a0a01..96546f8 100644 --- a/imgui-binding/src/main/native/jni_common.cpp +++ b/imgui-binding/src/main/native/jni_common.cpp @@ -104,7 +104,7 @@ namespace Jni jmethodID cstr = env->GetMethodID(cls, "", "(J)V"); jobjectArray dst = env->NewObjectArray(size, cls, NULL); for (int i = 0; i < size; i++) { - jobject obj = env->NewObject(cls, cstr, (jlong)(intptr_t)&src[i]); + jobject obj = env->NewObject(cls, cstr, (jlong)(uintptr_t)&src[i]); env->SetObjectArrayElement(dst, i, obj); env->DeleteLocalRef(obj); }