From 3725ddf2f95f206e0909efba92cdc0a6cba6fbd8 Mon Sep 17 00:00:00 2001 From: SpaiR Date: Sat, 10 Apr 2021 15:30:00 +0300 Subject: [PATCH] [Build] Add a "one include" header files --- imgui-binding/src/main/java/imgui/ImDrawData.java | 5 +---- imgui-binding/src/main/java/imgui/ImDrawList.java | 5 +---- imgui-binding/src/main/java/imgui/ImFont.java | 5 +---- imgui-binding/src/main/java/imgui/ImFontAtlas.java | 4 +--- imgui-binding/src/main/java/imgui/ImFontConfig.java | 5 +---- imgui-binding/src/main/java/imgui/ImFontGlyph.java | 4 +--- imgui-binding/src/main/java/imgui/ImGui.java | 6 +----- imgui-binding/src/main/java/imgui/ImGuiIO.java | 6 +----- imgui-binding/src/main/java/imgui/ImGuiListClipper.java | 3 +-- .../src/main/java/imgui/ImGuiOnceUponAFrame.java | 2 +- imgui-binding/src/main/java/imgui/ImGuiPlatformIO.java | 6 +----- .../src/main/java/imgui/ImGuiPlatformMonitor.java | 5 +---- imgui-binding/src/main/java/imgui/ImGuiStorage.java | 4 +--- imgui-binding/src/main/java/imgui/ImGuiStyle.java | 5 +---- imgui-binding/src/main/java/imgui/ImGuiTextFilter.java | 4 +--- imgui-binding/src/main/java/imgui/ImGuiViewport.java | 5 +---- imgui-binding/src/main/java/imgui/ImGuiWindowClass.java | 4 +--- .../src/main/java/imgui/extension/imnodes/ImNodes.java | 5 +---- .../java/imgui/extension/imnodes/ImNodesContext.java | 6 +----- .../main/java/imgui/extension/imnodes/ImNodesStyle.java | 6 +----- .../main/java/imgui/extension/nodeditor/NodeEditor.java | 6 +----- .../java/imgui/extension/nodeditor/NodeEditorConfig.java | 6 +----- .../imgui/extension/nodeditor/NodeEditorContext.java | 4 +--- .../java/imgui/extension/nodeditor/NodeEditorStyle.java | 7 +------ imgui-binding/src/main/java/imgui/internal/ImGui.java | 4 +--- .../src/main/java/imgui/internal/ImGuiDockNode.java | 5 +---- imgui-binding/src/main/native/_base.h | 4 ++++ imgui-binding/src/main/native/_binding.h | 5 +++++ imgui-binding/src/main/native/_common.h | 4 ++++ imgui-binding/src/main/native/_imnodes.h | 5 +++++ imgui-binding/src/main/native/_nodeeditor.h | 9 +++++++++ imgui-binding/src/main/native/jni_binding_struct.h | 7 ++----- imgui-binding/src/main/native/jni_callbacks.h | 7 ++----- imgui-binding/src/main/native/jni_common.h | 7 ++----- 34 files changed, 59 insertions(+), 116 deletions(-) create mode 100644 imgui-binding/src/main/native/_base.h create mode 100644 imgui-binding/src/main/native/_binding.h create mode 100644 imgui-binding/src/main/native/_common.h create mode 100644 imgui-binding/src/main/native/_imnodes.h create mode 100644 imgui-binding/src/main/native/_nodeeditor.h diff --git a/imgui-binding/src/main/java/imgui/ImDrawData.java b/imgui-binding/src/main/java/imgui/ImDrawData.java index d6c8a49..822d035 100644 --- a/imgui-binding/src/main/java/imgui/ImDrawData.java +++ b/imgui-binding/src/main/java/imgui/ImDrawData.java @@ -28,10 +28,7 @@ public final class ImDrawData extends ImGuiStruct { } /*JNI - #include - #include - #include "jni_common.h" - #include "jni_binding_struct.h" + #include "_common.h" #define IM_DRAW_DATA ((ImDrawData*)STRUCT_PTR) */ diff --git a/imgui-binding/src/main/java/imgui/ImDrawList.java b/imgui-binding/src/main/java/imgui/ImDrawList.java index a32b74e..edf652e 100644 --- a/imgui-binding/src/main/java/imgui/ImDrawList.java +++ b/imgui-binding/src/main/java/imgui/ImDrawList.java @@ -19,10 +19,7 @@ public final class ImDrawList extends ImGuiStruct { } /*JNI - #include - #include - #include "jni_common.h" - #include "jni_binding_struct.h" + #include "_common.h" #define IM_DRAW_LIST ((ImDrawList*)STRUCT_PTR) */ diff --git a/imgui-binding/src/main/java/imgui/ImFont.java b/imgui-binding/src/main/java/imgui/ImFont.java index 6c0d3fa..4f3846d 100644 --- a/imgui-binding/src/main/java/imgui/ImFont.java +++ b/imgui-binding/src/main/java/imgui/ImFont.java @@ -18,10 +18,7 @@ public final class ImFont extends ImGuiStructDestroyable { } /*JNI - #include - #include - #include "jni_common.h" - #include "jni_binding_struct.h" + #include "_common.h" #define IM_FONT ((ImFont*)STRUCT_PTR) */ diff --git a/imgui-binding/src/main/java/imgui/ImFontAtlas.java b/imgui-binding/src/main/java/imgui/ImFontAtlas.java index 2fd57c0..5e2a181 100644 --- a/imgui-binding/src/main/java/imgui/ImFontAtlas.java +++ b/imgui-binding/src/main/java/imgui/ImFontAtlas.java @@ -37,9 +37,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable { } /*JNI - #include - #include - #include "jni_binding_struct.h" + #include "_common.h" #define IM_FONT_ATLAS ((ImFontAtlas*)STRUCT_PTR) diff --git a/imgui-binding/src/main/java/imgui/ImFontConfig.java b/imgui-binding/src/main/java/imgui/ImFontConfig.java index d68cf41..db9285d 100644 --- a/imgui-binding/src/main/java/imgui/ImFontConfig.java +++ b/imgui-binding/src/main/java/imgui/ImFontConfig.java @@ -20,10 +20,7 @@ public final class ImFontConfig extends ImGuiStructDestroyable { } /*JNI - #include - #include - #include "jni_common.h" - #include "jni_binding_struct.h" + #include "_common.h" #define IM_FONT_CONFIG ((ImFontConfig*)STRUCT_PTR) */ diff --git a/imgui-binding/src/main/java/imgui/ImFontGlyph.java b/imgui-binding/src/main/java/imgui/ImFontGlyph.java index bbb3a06..3b099b4 100644 --- a/imgui-binding/src/main/java/imgui/ImFontGlyph.java +++ b/imgui-binding/src/main/java/imgui/ImFontGlyph.java @@ -15,9 +15,7 @@ public final class ImFontGlyph extends ImGuiStructDestroyable { } /*JNI - #include - #include - #include "jni_binding_struct.h" + #include "_common.h" #define IM_FONT_GLYPH ((ImFontGlyph*)STRUCT_PTR) */ diff --git a/imgui-binding/src/main/java/imgui/ImGui.java b/imgui-binding/src/main/java/imgui/ImGui.java index 48696e1..35e6d15 100644 --- a/imgui-binding/src/main/java/imgui/ImGui.java +++ b/imgui-binding/src/main/java/imgui/ImGui.java @@ -123,11 +123,7 @@ public class ImGui { } /*JNI - #include - #include - #include "jni_common.h" - #include "jni_callbacks.h" - #include "jni_binding_struct.h" + #include "_common.h" */ private static native void nInitJni(); /* diff --git a/imgui-binding/src/main/java/imgui/ImGuiIO.java b/imgui-binding/src/main/java/imgui/ImGuiIO.java index a0512ce..8d90e91 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiIO.java +++ b/imgui-binding/src/main/java/imgui/ImGuiIO.java @@ -16,11 +16,7 @@ public final class ImGuiIO extends ImGuiStruct { } /*JNI - #include - #include - #include "jni_common.h" - #include "jni_callbacks.h" - #include "jni_binding_struct.h" + #include "_common.h" #define IO ((ImGuiIO*)STRUCT_PTR) */ diff --git a/imgui-binding/src/main/java/imgui/ImGuiListClipper.java b/imgui-binding/src/main/java/imgui/ImGuiListClipper.java index c4b0b00..495a79c 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiListClipper.java +++ b/imgui-binding/src/main/java/imgui/ImGuiListClipper.java @@ -37,8 +37,7 @@ public final class ImGuiListClipper { } /*JNI - #include - #include "jni_callbacks.h" + #include "_common.h" */ /** diff --git a/imgui-binding/src/main/java/imgui/ImGuiOnceUponAFrame.java b/imgui-binding/src/main/java/imgui/ImGuiOnceUponAFrame.java index de93a1e..7da1685 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiOnceUponAFrame.java +++ b/imgui-binding/src/main/java/imgui/ImGuiOnceUponAFrame.java @@ -13,7 +13,7 @@ public final class ImGuiOnceUponAFrame { } /*JNI - #include + #include "_common.h" */ public static native boolean get(); /* diff --git a/imgui-binding/src/main/java/imgui/ImGuiPlatformIO.java b/imgui-binding/src/main/java/imgui/ImGuiPlatformIO.java index 2cbc4ec..4df2f63 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiPlatformIO.java +++ b/imgui-binding/src/main/java/imgui/ImGuiPlatformIO.java @@ -79,11 +79,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct { } /*JNI - #include - #include - #include "jni_common.h" - #include "jni_callbacks.h" - #include "jni_binding_struct.h" + #include "_common.h" #define IMGUI_PLATFORM_IO ((ImGuiPlatformIO*)STRUCT_PTR) diff --git a/imgui-binding/src/main/java/imgui/ImGuiPlatformMonitor.java b/imgui-binding/src/main/java/imgui/ImGuiPlatformMonitor.java index 95f9f7b..5983dea 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiPlatformMonitor.java +++ b/imgui-binding/src/main/java/imgui/ImGuiPlatformMonitor.java @@ -12,10 +12,7 @@ public final class ImGuiPlatformMonitor extends ImGuiStruct { } /*JNI - #include - #include - #include "jni_common.h" - #include "jni_binding_struct.h" + #include "_common.h" #define IMGUI_PLATFORM_MONITOR ((ImGuiPlatformMonitor*)STRUCT_PTR) */ diff --git a/imgui-binding/src/main/java/imgui/ImGuiStorage.java b/imgui-binding/src/main/java/imgui/ImGuiStorage.java index b958e7f..2dc34a9 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiStorage.java +++ b/imgui-binding/src/main/java/imgui/ImGuiStorage.java @@ -21,9 +21,7 @@ public final class ImGuiStorage extends ImGuiStructDestroyable { } /*JNI - #include - #include - #include "jni_binding_struct.h" + #include "_common.h" #define IMGUI_STORAGE ((ImGuiStorage*)STRUCT_PTR) */ diff --git a/imgui-binding/src/main/java/imgui/ImGuiStyle.java b/imgui-binding/src/main/java/imgui/ImGuiStyle.java index 07f8a0f..13a38b5 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiStyle.java +++ b/imgui-binding/src/main/java/imgui/ImGuiStyle.java @@ -17,10 +17,7 @@ public final class ImGuiStyle extends ImGuiStructDestroyable { } /*JNI - #include - #include - #include "jni_common.h" - #include "jni_binding_struct.h" + #include "_common.h" #define IMGUI_STYLE ((ImGuiStyle*)STRUCT_PTR) */ diff --git a/imgui-binding/src/main/java/imgui/ImGuiTextFilter.java b/imgui-binding/src/main/java/imgui/ImGuiTextFilter.java index e69f504..eff8ede 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiTextFilter.java +++ b/imgui-binding/src/main/java/imgui/ImGuiTextFilter.java @@ -19,9 +19,7 @@ public final class ImGuiTextFilter extends ImGuiStructDestroyable { } /*JNI - #include - #include - #include "jni_binding_struct.h" + #include "_common.h" #define IMGUI_TEXT_FILTER ((ImGuiTextFilter*)STRUCT_PTR) */ diff --git a/imgui-binding/src/main/java/imgui/ImGuiViewport.java b/imgui-binding/src/main/java/imgui/ImGuiViewport.java index 1cf4df2..ec36f16 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiViewport.java +++ b/imgui-binding/src/main/java/imgui/ImGuiViewport.java @@ -15,10 +15,7 @@ public final class ImGuiViewport extends ImGuiStruct { } /*JNI - #include - #include - #include "jni_common.h" - #include "jni_binding_struct.h" + #include "_common.h" #define IMGUI_VIEWPORT ((ImGuiViewport*)STRUCT_PTR) */ diff --git a/imgui-binding/src/main/java/imgui/ImGuiWindowClass.java b/imgui-binding/src/main/java/imgui/ImGuiWindowClass.java index b9a4790..09a7e94 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiWindowClass.java +++ b/imgui-binding/src/main/java/imgui/ImGuiWindowClass.java @@ -20,9 +20,7 @@ public final class ImGuiWindowClass extends ImGuiStructDestroyable { } /*JNI - #include - #include - #include "jni_binding_struct.h" + #include "_common.h" #define IMGUI_WINDOW_CLASS ((ImGuiWindowClass*)STRUCT_PTR) */ diff --git a/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodes.java b/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodes.java index 8356033..342f579 100644 --- a/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodes.java +++ b/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodes.java @@ -18,10 +18,7 @@ public final class ImNodes { } /*JNI - #include - #include - #include - #include "jni_common.h" + #include "_imnodes.h" */ // An editor context corresponds to a set of nodes in a single workspace (created with a single diff --git a/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesContext.java b/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesContext.java index b948744..da621e4 100644 --- a/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesContext.java +++ b/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesContext.java @@ -11,11 +11,7 @@ public final class ImNodesContext extends ImGuiStructDestroyable { } /*JNI - #include - #include - #include - #include "jni_common.h" - #include "jni_binding_struct.h" + #include "_imnodes.h" #define IMNODES_CONTEXT ((imnodes::EditorContext*)STRUCT_PTR) */ diff --git a/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesStyle.java b/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesStyle.java index dfa5ea6..9d10ce3 100644 --- a/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesStyle.java +++ b/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesStyle.java @@ -8,11 +8,7 @@ public final class ImNodesStyle extends ImGuiStruct { } /*JNI - #include - #include - #include - #include "jni_common.h" - #include "jni_binding_struct.h" + #include "_imnodes.h" #define IMNODES_STYLE ((imnodes::Style*)STRUCT_PTR) */ 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 2f9bb33..ee20d20 100644 --- a/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditor.java +++ b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditor.java @@ -31,11 +31,7 @@ public final class NodeEditor { } /*JNI - #include - #include - #include - #include "jni_common.h" - #include "jni_binding_struct.h" + #include "_nodeeditor.h" namespace ed = ax::NodeEditor; */ 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 57a569b..c6cdd77 100644 --- a/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorConfig.java +++ b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorConfig.java @@ -11,11 +11,7 @@ public final class NodeEditorConfig extends ImGuiStructDestroyable { } /*JNI - #include - #include - #include - #include - #include "jni_binding_struct.h" + #include "_nodeeditor.h" namespace ed = ax::NodeEditor; diff --git a/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorContext.java b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorContext.java index 69306d0..c383944 100644 --- a/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorContext.java +++ b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorContext.java @@ -15,9 +15,7 @@ public final class NodeEditorContext extends ImGuiStructDestroyable { } /*JNI - #include - #include - #include "jni_binding_struct.h" + #include "_nodeeditor.h" namespace ed = ax::NodeEditor; diff --git a/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorStyle.java b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorStyle.java index bb78336..443a10e 100644 --- a/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorStyle.java +++ b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorStyle.java @@ -11,12 +11,7 @@ public final class NodeEditorStyle extends ImGuiStruct { } /*JNI - #include - #include - #include - #include - #include "jni_common.h" - #include "jni_binding_struct.h" + #include "_nodeeditor.h" namespace ed = ax::NodeEditor; diff --git a/imgui-binding/src/main/java/imgui/internal/ImGui.java b/imgui-binding/src/main/java/imgui/internal/ImGui.java index f90461f..9a105bb 100644 --- a/imgui-binding/src/main/java/imgui/internal/ImGui.java +++ b/imgui-binding/src/main/java/imgui/internal/ImGui.java @@ -8,10 +8,8 @@ public final class ImGui extends imgui.ImGui { private static final ImGuiDockNode DOCK_NODE = new ImGuiDockNode(0); /*JNI - #include - #include + #include "_common.h" #include - #include "jni_common.h" */ // Basic Helpers for widget code diff --git a/imgui-binding/src/main/java/imgui/internal/ImGuiDockNode.java b/imgui-binding/src/main/java/imgui/internal/ImGuiDockNode.java index aeadca6..a10f3b1 100644 --- a/imgui-binding/src/main/java/imgui/internal/ImGuiDockNode.java +++ b/imgui-binding/src/main/java/imgui/internal/ImGuiDockNode.java @@ -18,11 +18,8 @@ public final class ImGuiDockNode extends ImGuiStruct { } /*JNI - #include - #include + #include "_common.h" #include - #include "jni_common.h" - #include "jni_binding_struct.h" #define IMGUI_DOCK_NODE ((ImGuiDockNode*)STRUCT_PTR) */ diff --git a/imgui-binding/src/main/native/_base.h b/imgui-binding/src/main/native/_base.h new file mode 100644 index 0000000..c5555af --- /dev/null +++ b/imgui-binding/src/main/native/_base.h @@ -0,0 +1,4 @@ +#pragma once + +#include +#include diff --git a/imgui-binding/src/main/native/_binding.h b/imgui-binding/src/main/native/_binding.h new file mode 100644 index 0000000..5b9197d --- /dev/null +++ b/imgui-binding/src/main/native/_binding.h @@ -0,0 +1,5 @@ +#pragma once + +#include "jni_common.h" +#include "jni_callbacks.h" +#include "jni_binding_struct.h" diff --git a/imgui-binding/src/main/native/_common.h b/imgui-binding/src/main/native/_common.h new file mode 100644 index 0000000..0ef2379 --- /dev/null +++ b/imgui-binding/src/main/native/_common.h @@ -0,0 +1,4 @@ +#pragma once + +#include "_base.h" +#include "_binding.h" diff --git a/imgui-binding/src/main/native/_imnodes.h b/imgui-binding/src/main/native/_imnodes.h new file mode 100644 index 0000000..2a2db53 --- /dev/null +++ b/imgui-binding/src/main/native/_imnodes.h @@ -0,0 +1,5 @@ +#pragma once + +#include "_base.h" +#include +#include "_binding.h" diff --git a/imgui-binding/src/main/native/_nodeeditor.h b/imgui-binding/src/main/native/_nodeeditor.h new file mode 100644 index 0000000..990294b --- /dev/null +++ b/imgui-binding/src/main/native/_nodeeditor.h @@ -0,0 +1,9 @@ +#pragma once + +#include +#include +#include +#include +#include "jni_common.h" +#include "jni_callbacks.h" +#include "jni_binding_struct.h" diff --git a/imgui-binding/src/main/native/jni_binding_struct.h b/imgui-binding/src/main/native/jni_binding_struct.h index 2475f93..076872b 100644 --- a/imgui-binding/src/main/native/jni_binding_struct.h +++ b/imgui-binding/src/main/native/jni_binding_struct.h @@ -1,7 +1,6 @@ -#include +#pragma once -#ifndef JNI_BINDING_STRUCT_H -#define JNI_BINDING_STRUCT_H +#include #ifndef STRUCT_PTR #define STRUCT_PTR env->GetLongField(object, Jni::GetBindingStructPtrID()) @@ -13,5 +12,3 @@ namespace Jni jfieldID GetBindingStructPtrID(); } - -#endif diff --git a/imgui-binding/src/main/native/jni_callbacks.h b/imgui-binding/src/main/native/jni_callbacks.h index d2b0940..5f44501 100644 --- a/imgui-binding/src/main/native/jni_callbacks.h +++ b/imgui-binding/src/main/native/jni_callbacks.h @@ -1,7 +1,6 @@ -#include +#pragma once -#ifndef JNI_CALLBACK_H -#define JNI_CALLBACK_H +#include namespace Jni { @@ -27,5 +26,3 @@ namespace Jni jfloat CallImPlatformFuncViewportSuppFloat(JNIEnv* env, jobject func, jobject vp); } - -#endif diff --git a/imgui-binding/src/main/native/jni_common.h b/imgui-binding/src/main/native/jni_common.h index f8138c3..2eee006 100644 --- a/imgui-binding/src/main/native/jni_common.h +++ b/imgui-binding/src/main/native/jni_common.h @@ -1,9 +1,8 @@ +#pragma once + #include #include -#ifndef JNI_COMMON_H -#define JNI_COMMON_H - namespace Jni { void InitCommon(JNIEnv* env); @@ -18,5 +17,3 @@ namespace Jni void ImVec4Cpy(JNIEnv* env, ImVec4* src, jobject dst); void ImVec4Cpy(JNIEnv* env, ImVec4 src, jobject dst); } - -#endif