diff --git a/imgui-binding/src/main/java/imgui/imnodes/ImNodes.java b/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodes.java similarity index 99% rename from imgui-binding/src/main/java/imgui/imnodes/ImNodes.java rename to imgui-binding/src/main/java/imgui/extension/imnodes/ImNodes.java index 7fa1a6d..ce51cc7 100644 --- a/imgui-binding/src/main/java/imgui/imnodes/ImNodes.java +++ b/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodes.java @@ -1,6 +1,7 @@ -package imgui.imnodes; +package imgui.extension.imnodes; import imgui.ImVec2; +import imgui.extension.imnodes.flag.ImNodesPinShape; import imgui.type.ImBoolean; import imgui.type.ImInt; diff --git a/imgui-binding/src/main/java/imgui/imnodes/ImNodesContext.java b/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesContext.java similarity index 96% rename from imgui-binding/src/main/java/imgui/imnodes/ImNodesContext.java rename to imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesContext.java index cc7dece..122bcf8 100644 --- a/imgui-binding/src/main/java/imgui/imnodes/ImNodesContext.java +++ b/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesContext.java @@ -1,4 +1,4 @@ -package imgui.imnodes; +package imgui.extension.imnodes; import imgui.binding.ImGuiStructDestroyable; diff --git a/imgui-binding/src/main/java/imgui/imnodes/ImNodesStyle.java b/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesStyle.java similarity index 99% rename from imgui-binding/src/main/java/imgui/imnodes/ImNodesStyle.java rename to imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesStyle.java index b5e94ef..dfa5ea6 100644 --- a/imgui-binding/src/main/java/imgui/imnodes/ImNodesStyle.java +++ b/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesStyle.java @@ -1,4 +1,4 @@ -package imgui.imnodes; +package imgui.extension.imnodes; import imgui.binding.ImGuiStruct; diff --git a/imgui-binding/src/main/java/imgui/imnodes/ImNodesAttributeFlags.java b/imgui-binding/src/main/java/imgui/extension/imnodes/flag/ImNodesAttributeFlags.java similarity index 96% rename from imgui-binding/src/main/java/imgui/imnodes/ImNodesAttributeFlags.java rename to imgui-binding/src/main/java/imgui/extension/imnodes/flag/ImNodesAttributeFlags.java index 16a464a..3fdc677 100644 --- a/imgui-binding/src/main/java/imgui/imnodes/ImNodesAttributeFlags.java +++ b/imgui-binding/src/main/java/imgui/extension/imnodes/flag/ImNodesAttributeFlags.java @@ -1,4 +1,4 @@ -package imgui.imnodes; +package imgui.extension.imnodes; /** * This enum controls the way the attribute pins behave. diff --git a/imgui-binding/src/main/java/imgui/imnodes/ImNodesColorStyle.java b/imgui-binding/src/main/java/imgui/extension/imnodes/flag/ImNodesColorStyle.java similarity index 96% rename from imgui-binding/src/main/java/imgui/imnodes/ImNodesColorStyle.java rename to imgui-binding/src/main/java/imgui/extension/imnodes/flag/ImNodesColorStyle.java index dc05874..5786fda 100644 --- a/imgui-binding/src/main/java/imgui/imnodes/ImNodesColorStyle.java +++ b/imgui-binding/src/main/java/imgui/extension/imnodes/flag/ImNodesColorStyle.java @@ -1,4 +1,4 @@ -package imgui.imnodes; +package imgui.extension.imnodes; public final class ImNodesColorStyle { private ImNodesColorStyle() { diff --git a/imgui-binding/src/main/java/imgui/imnodes/ImNodesPinShape.java b/imgui-binding/src/main/java/imgui/extension/imnodes/flag/ImNodesPinShape.java similarity index 92% rename from imgui-binding/src/main/java/imgui/imnodes/ImNodesPinShape.java rename to imgui-binding/src/main/java/imgui/extension/imnodes/flag/ImNodesPinShape.java index 38def36..de57e8c 100644 --- a/imgui-binding/src/main/java/imgui/imnodes/ImNodesPinShape.java +++ b/imgui-binding/src/main/java/imgui/extension/imnodes/flag/ImNodesPinShape.java @@ -1,4 +1,4 @@ -package imgui.imnodes; +package imgui.extension.imnodes; /** * This enum controls the way attribute pins look. diff --git a/imgui-binding/src/main/java/imgui/imnodes/ImNodesStyleFlags.java b/imgui-binding/src/main/java/imgui/extension/imnodes/flag/ImNodesStyleFlags.java similarity index 86% rename from imgui-binding/src/main/java/imgui/imnodes/ImNodesStyleFlags.java rename to imgui-binding/src/main/java/imgui/extension/imnodes/flag/ImNodesStyleFlags.java index e3a9809..3132460 100644 --- a/imgui-binding/src/main/java/imgui/imnodes/ImNodesStyleFlags.java +++ b/imgui-binding/src/main/java/imgui/extension/imnodes/flag/ImNodesStyleFlags.java @@ -1,4 +1,4 @@ -package imgui.imnodes; +package imgui.extension.imnodes; public final class ImNodesStyleFlags { private ImNodesStyleFlags() { diff --git a/imgui-binding/src/main/java/imgui/imnodes/ImNodesStyleVar.java b/imgui-binding/src/main/java/imgui/extension/imnodes/flag/ImNodesStyleVar.java similarity index 96% rename from imgui-binding/src/main/java/imgui/imnodes/ImNodesStyleVar.java rename to imgui-binding/src/main/java/imgui/extension/imnodes/flag/ImNodesStyleVar.java index 19bfbac..bf52baf 100644 --- a/imgui-binding/src/main/java/imgui/imnodes/ImNodesStyleVar.java +++ b/imgui-binding/src/main/java/imgui/extension/imnodes/flag/ImNodesStyleVar.java @@ -1,4 +1,4 @@ -package imgui.imnodes; +package imgui.extension.imnodes; public final class ImNodesStyleVar { private ImNodesStyleVar() { diff --git a/imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditor.java b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditor.java similarity index 96% rename from imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditor.java rename to imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditor.java index 4c802a9..52f9de1 100644 --- a/imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditor.java +++ b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditor.java @@ -1,4 +1,4 @@ -package imgui.nodeditor; +package imgui.extension.nodeditor; import imgui.ImDrawList; import imgui.ImVec2; @@ -20,14 +20,14 @@ import imgui.type.ImLong; * Binding notice: instead of special types for ids of nodes, links and pins which used in native library * we use longs to reduce boilerplate and garbage production */ -public final class ImNodeEditor { +public final class NodeEditor { private static final ImDrawList HINT_FOREGROUND_DRAW_LIST = new ImDrawList(0); private static final ImDrawList HINT_BACKGROUND_DRAW_LIST = new ImDrawList(0); private static final ImDrawList NODE_BACKGROUND_DRAW_LIST = new ImDrawList(0); - private static ImNodeEditorStyle style; + private static NodeEditorStyle style; - private ImNodeEditor() { + private NodeEditor() { } /*JNI @@ -43,22 +43,22 @@ public final class ImNodeEditor { /** * This method exists for api consistency and you can just call NodeEditorContext manually */ - public static ImNodeEditorContext createEditor() { - return new ImNodeEditorContext(); + public static NodeEditorContext createEditor() { + return new NodeEditorContext(); } - public static ImNodeEditorContext createEditor(final ImNodeEditorConfig config) { - return new ImNodeEditorContext(config); + public static NodeEditorContext createEditor(final NodeEditorConfig config) { + return new NodeEditorContext(config); } /** * This method exists for api consistency and you can just call NodeEditorContext.destroy() manually */ - public static void destroyEditor(final ImNodeEditorContext editorContext) { + public static void destroyEditor(final NodeEditorContext editorContext) { editorContext.destroy(); } - public static void setCurrentEditor(final ImNodeEditorContext editorContext) { + public static void setCurrentEditor(final NodeEditorContext editorContext) { nSetCurrentEditor(editorContext.ptr); } @@ -127,9 +127,9 @@ public final class ImNodeEditor { return ed::CanvasToScreen(ImVec2(0.0f, canvasSpacePosY)).y; */ - public static ImNodeEditorStyle getStyle() { + public static NodeEditorStyle getStyle() { if (style == null) { - style = new ImNodeEditorStyle(nGetStyle()); + style = new NodeEditorStyle(nGetStyle()); } return style; } diff --git a/imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorConfig.java b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorConfig.java similarity index 83% rename from imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorConfig.java rename to imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorConfig.java index 5302f2a..57a569b 100644 --- a/imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorConfig.java +++ b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorConfig.java @@ -1,12 +1,12 @@ -package imgui.nodeditor; +package imgui.extension.nodeditor; import imgui.binding.ImGuiStructDestroyable; -public final class ImNodeEditorConfig extends ImGuiStructDestroyable { - public ImNodeEditorConfig() { +public final class NodeEditorConfig extends ImGuiStructDestroyable { + public NodeEditorConfig() { } - public ImNodeEditorConfig(final long ptr) { + public NodeEditorConfig(final long ptr) { super(ptr); } diff --git a/imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorContext.java b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorContext.java similarity index 77% rename from imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorContext.java rename to imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorContext.java index c4ded88..69306d0 100644 --- a/imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorContext.java +++ b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorContext.java @@ -1,16 +1,16 @@ -package imgui.nodeditor; +package imgui.extension.nodeditor; import imgui.binding.ImGuiStructDestroyable; -public final class ImNodeEditorContext extends ImGuiStructDestroyable { - public ImNodeEditorContext() { +public final class NodeEditorContext extends ImGuiStructDestroyable { + public NodeEditorContext() { } - public ImNodeEditorContext(final ImNodeEditorConfig config) { + public NodeEditorContext(final NodeEditorConfig config) { this(nCreate(config.ptr)); } - public ImNodeEditorContext(final long ptr) { + public NodeEditorContext(final long ptr) { super(ptr); } diff --git a/imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorStyle.java b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorStyle.java similarity index 98% rename from imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorStyle.java rename to imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorStyle.java index fb2cedb..344afd8 100644 --- a/imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorStyle.java +++ b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorStyle.java @@ -1,11 +1,11 @@ -package imgui.nodeditor; +package imgui.extension.nodeditor; import imgui.ImVec2; import imgui.ImVec4; import imgui.binding.ImGuiStruct; -public final class ImNodeEditorStyle extends ImGuiStruct { - public ImNodeEditorStyle(final long ptr) { +public final class NodeEditorStyle extends ImGuiStruct { + public NodeEditorStyle(final long ptr) { super(ptr); } diff --git a/imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorPinKind.java b/imgui-binding/src/main/java/imgui/extension/nodeditor/flag/NodeEditorPinKind.java similarity index 80% rename from imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorPinKind.java rename to imgui-binding/src/main/java/imgui/extension/nodeditor/flag/NodeEditorPinKind.java index d0df2fc..c7eee53 100644 --- a/imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorPinKind.java +++ b/imgui-binding/src/main/java/imgui/extension/nodeditor/flag/NodeEditorPinKind.java @@ -1,4 +1,4 @@ -package imgui.nodeditor; +package imgui.extension.nodeditor.flag; public final class ImNodeEditorPinKind { private ImNodeEditorPinKind() { diff --git a/imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorStyleColor.java b/imgui-binding/src/main/java/imgui/extension/nodeditor/flag/NodeEditorStyleColor.java similarity index 95% rename from imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorStyleColor.java rename to imgui-binding/src/main/java/imgui/extension/nodeditor/flag/NodeEditorStyleColor.java index f08846d..922dfae 100644 --- a/imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorStyleColor.java +++ b/imgui-binding/src/main/java/imgui/extension/nodeditor/flag/NodeEditorStyleColor.java @@ -1,4 +1,4 @@ -package imgui.nodeditor; +package imgui.extension.nodeditor.flag; public final class ImNodeEditorStyleColor { private ImNodeEditorStyleColor() { diff --git a/imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorStyleVar.java b/imgui-binding/src/main/java/imgui/extension/nodeditor/flag/NodeEditorStyleVar.java similarity index 96% rename from imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorStyleVar.java rename to imgui-binding/src/main/java/imgui/extension/nodeditor/flag/NodeEditorStyleVar.java index 65c4060..14c6d91 100644 --- a/imgui-binding/src/main/java/imgui/nodeditor/ImNodeEditorStyleVar.java +++ b/imgui-binding/src/main/java/imgui/extension/nodeditor/flag/NodeEditorStyleVar.java @@ -1,4 +1,4 @@ -package imgui.nodeditor; +package imgui.extension.nodeditor.flag; public final class ImNodeEditorStyleVar { private ImNodeEditorStyleVar() { diff --git a/imgui-lwjgl3/src/test/java/ExampleUi.java b/imgui-lwjgl3/src/test/java/ExampleUi.java index e92d761..c20d36d 100644 --- a/imgui-lwjgl3/src/test/java/ExampleUi.java +++ b/imgui-lwjgl3/src/test/java/ExampleUi.java @@ -5,15 +5,15 @@ import imgui.flag.ImGuiDir; import imgui.flag.ImGuiInputTextFlags; import imgui.flag.ImGuiStyleVar; import imgui.flag.ImGuiWindowFlags; -import imgui.imnodes.ImNodes; -import imgui.imnodes.ImNodesContext; -import imgui.imnodes.ImNodesPinShape; -import imgui.nodeditor.ImNodeEditor; +import imgui.extension.imnodes.ImNodes; +import imgui.extension.imnodes.ImNodesContext; +import imgui.extension.imnodes.flag.ImNodesPinShape; +import imgui.extension.nodeditor.NodeEditor; import imgui.internal.ImGui; import imgui.internal.flag.ImGuiDockNodeFlags; -import imgui.nodeditor.ImNodeEditorConfig; -import imgui.nodeditor.ImNodeEditorContext; -import imgui.nodeditor.ImNodeEditorPinKind; +import imgui.extension.nodeditor.NodeEditorConfig; +import imgui.extension.nodeditor.NodeEditorContext; +import imgui.extension.nodeditor.flag.NodeEditorPinKind; import imgui.type.ImBoolean; import imgui.ImColor; import imgui.type.ImInt; @@ -76,7 +76,7 @@ final class ExampleUi { private ImNodesContext imNodesContext; // Context for imgui-node-editor example - private ImNodeEditorContext imNodeEditorContext; + private NodeEditorContext nodeEditorContext; // Graph used both for imnodes and imgui-node-editor demo private final Graph graph = new Graph(); @@ -85,10 +85,10 @@ final class ExampleUi { if (imNodesContext == null) { imNodesContext = new ImNodesContext(); } - if (imNodeEditorContext == null) { - final ImNodeEditorConfig config = new ImNodeEditorConfig(); + if (nodeEditorContext == null) { + final NodeEditorConfig config = new NodeEditorConfig(); config.setSettingsFile(null); - imNodeEditorContext = new ImNodeEditorContext(config); + nodeEditorContext = new NodeEditorContext(config); } final int dockspaceId = ImGui.getID("MyDockSpace"); @@ -333,52 +333,52 @@ final class ExampleUi { ImGui.text("This a demo graph editor for imgui-node-editor"); if (ImGui.button("Navigate to content")) { - ImNodeEditor.navigateToContent(1F); + NodeEditor.navigateToContent(1F); } - ImNodeEditor.setCurrentEditor(imNodeEditorContext); - ImNodeEditor.begin("Node Editor"); + NodeEditor.setCurrentEditor(nodeEditorContext); + NodeEditor.begin("Node Editor"); for (Graph.GraphNode node : graph.nodes.values()) { - ImNodeEditor.beginNode(node.nodeId); + NodeEditor.beginNode(node.nodeId); ImGui.text(node.getName()); - ImNodeEditor.beginPin(node.getInputPinId(), ImNodeEditorPinKind.Input); + NodeEditor.beginPin(node.getInputPinId(), NodeEditorPinKind.Input); ImGui.text("-> In"); - ImNodeEditor.endPin(); + NodeEditor.endPin(); ImGui.sameLine(); - ImNodeEditor.beginPin(node.getOutputPinId(), ImNodeEditorPinKind.Output); + NodeEditor.beginPin(node.getOutputPinId(), NodeEditorPinKind.Output); ImGui.text("Out ->"); - ImNodeEditor.endPin(); + NodeEditor.endPin(); - ImNodeEditor.endNode(); + NodeEditor.endNode(); } - if (ImNodeEditor.beginCreate()) { + if (NodeEditor.beginCreate()) { final ImLong a = new ImLong(); final ImLong b = new ImLong(); - if (ImNodeEditor.queryNewLink(a, b)) { + if (NodeEditor.queryNewLink(a, b)) { final Graph.GraphNode source = graph.findByOutput(a.get()); final Graph.GraphNode target = graph.findByInput(b.get()); - if (source != null && target != null && source.outputNodeId != target.nodeId && ImNodeEditor.acceptNewItem()) { + if (source != null && target != null && source.outputNodeId != target.nodeId && NodeEditor.acceptNewItem()) { source.outputNodeId = target.nodeId; } } } - ImNodeEditor.endCreate(); + NodeEditor.endCreate(); int uniqueLinkId = 1; for (Graph.GraphNode node : graph.nodes.values()) { if (graph.nodes.containsKey(node.outputNodeId)) { - ImNodeEditor.link(uniqueLinkId++, node.getOutputPinId(), graph.nodes.get(node.outputNodeId).getInputPinId()); + NodeEditor.link(uniqueLinkId++, node.getOutputPinId(), graph.nodes.get(node.outputNodeId).getInputPinId()); } } - ImNodeEditor.suspend(); - final long nodeWithContextMenu = ImNodeEditor.getNodeWithContextMenu(); + NodeEditor.suspend(); + final long nodeWithContextMenu = NodeEditor.getNodeWithContextMenu(); if (nodeWithContextMenu != -1) { ImGui.openPopup("node-context"); ImGui.getStateStorage().setInt(ImGui.getID("delete-node-id"), (int) nodeWithContextMenu); @@ -395,22 +395,22 @@ final class ExampleUi { } } - if (ImNodeEditor.showBackgroundContextMenu()) { + if (NodeEditor.showBackgroundContextMenu()) { ImGui.openPopup("node-editor-context"); } if (ImGui.beginPopup("node-editor-context")) { if (ImGui.button("Create new node")) { final Graph.GraphNode node = graph.createGraphNode(); - final float canvasX = ImNodeEditor.toCanvasX(ImGui.getMousePosX()); - final float canvasY = ImNodeEditor.toCanvasY(ImGui.getMousePosY()); - ImNodeEditor.setNodePosition(node.nodeId, canvasX, canvasY); + final float canvasX = NodeEditor.toCanvasX(ImGui.getMousePosX()); + final float canvasY = NodeEditor.toCanvasY(ImGui.getMousePosY()); + NodeEditor.setNodePosition(node.nodeId, canvasX, canvasY); ImGui.closeCurrentPopup(); } ImGui.endPopup(); } - ImNodeEditor.resume(); + NodeEditor.resume(); - ImNodeEditor.end(); + NodeEditor.end(); ImGui.end(); } diff --git a/imgui-lwjgl3/src/test/java/ImGuiGlfwExample.java b/imgui-lwjgl3/src/test/java/ImGuiGlfwExample.java index 7e6f83f..d6169a4 100644 --- a/imgui-lwjgl3/src/test/java/ImGuiGlfwExample.java +++ b/imgui-lwjgl3/src/test/java/ImGuiGlfwExample.java @@ -48,7 +48,7 @@ import java.io.UncheckedIOException; import java.nio.IntBuffer; import java.util.Objects; -import imgui.imnodes.ImNodes; +import imgui.extension.imnodes.ImNodes; import org.lwjgl.glfw.GLFWErrorCallback; import org.lwjgl.glfw.GLFWVidMode; import org.lwjgl.opengl.GL;