From d45f3594ce44316e82967d2bce5d6d0b020831e2 Mon Sep 17 00:00:00 2001 From: sonoro1234 Date: Wed, 5 Sep 2018 13:59:51 +0200 Subject: [PATCH] move the ToSimple conversion functions out of CIMGUI_DEFINE_ENUMS_AND_STRUCTS --- cimgui_auto.h | 45 ++++++++++++++++--------------- generator/cimgui_template.h | 15 ++++++----- generator/generated/cimgui.h | 45 ++++++++++++++++--------------- generator/generated/cimgui_auto.h | 45 ++++++++++++++++--------------- 4 files changed, 77 insertions(+), 73 deletions(-) diff --git a/cimgui_auto.h b/cimgui_auto.h index 71a9f02..60cbef5 100644 --- a/cimgui_auto.h +++ b/cimgui_auto.h @@ -36,28 +36,7 @@ typedef unsigned long long ImU64; typedef struct ImVec2_Simple { float x; float y; } ImVec2_Simple; typedef struct ImVec4_Simple { float x; float y; float z; float w;} ImVec4_Simple; typedef struct ImColor_Simple { ImVec4_Simple Value;} ImColor_Simple; -inline ImVec2_Simple ImVec2ToSimple(ImVec2 vec) -{ - ImVec2_Simple result; - result.x = vec.x; - result.y = vec.y; - return result; -} -inline ImVec4_Simple ImVec4ToSimple(ImVec4 vec) -{ - ImVec4_Simple result; - result.x = vec.x; - result.y = vec.y; - result.z = vec.z; - result.w = vec.w; - return result; -} -inline ImColor_Simple ImColorToSimple(ImColor col) -{ - ImColor_Simple result; - result.Value = ImVec4ToSimple(col.Value); - return result; -} + #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS @@ -822,6 +801,28 @@ struct ImFont struct GLFWwindow; struct SDL_Window; typedef union SDL_Event SDL_Event; +inline ImVec2_Simple ImVec2ToSimple(ImVec2 vec) +{ + ImVec2_Simple result; + result.x = vec.x; + result.y = vec.y; + return result; +} +inline ImVec4_Simple ImVec4ToSimple(ImVec4 vec) +{ + ImVec4_Simple result; + result.x = vec.x; + result.y = vec.y; + result.z = vec.z; + result.w = vec.w; + return result; +} +inline ImColor_Simple ImColorToSimple(ImColor col) +{ + ImColor_Simple result; + result.Value = ImVec4ToSimple(col.Value); + return result; +} #endif // CIMGUI_DEFINE_ENUMS_AND_STRUCTS #ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS diff --git a/generator/cimgui_template.h b/generator/cimgui_template.h index ce8d639..76e1553 100644 --- a/generator/cimgui_template.h +++ b/generator/cimgui_template.h @@ -36,6 +36,14 @@ typedef unsigned long long ImU64; typedef struct ImVec2_Simple { float x; float y; } ImVec2_Simple; typedef struct ImVec4_Simple { float x; float y; float z; float w;} ImVec4_Simple; typedef struct ImColor_Simple { ImVec4_Simple Value;} ImColor_Simple; + + +#ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS +#include "imgui_structs.h" +#else +struct GLFWwindow; +struct SDL_Window; +typedef union SDL_Event SDL_Event; inline ImVec2_Simple ImVec2ToSimple(ImVec2 vec) { ImVec2_Simple result; @@ -58,13 +66,6 @@ inline ImColor_Simple ImColorToSimple(ImColor col) result.Value = ImVec4ToSimple(col.Value); return result; } - -#ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS -#include "imgui_structs.h" -#else -struct GLFWwindow; -struct SDL_Window; -typedef union SDL_Event SDL_Event; #endif // CIMGUI_DEFINE_ENUMS_AND_STRUCTS #include "auto_funcs.h" diff --git a/generator/generated/cimgui.h b/generator/generated/cimgui.h index 3be2cf1..abc0d87 100644 --- a/generator/generated/cimgui.h +++ b/generator/generated/cimgui.h @@ -36,28 +36,7 @@ typedef unsigned long long ImU64; typedef struct ImVec2_Simple { float x; float y; } ImVec2_Simple; typedef struct ImVec4_Simple { float x; float y; float z; float w;} ImVec4_Simple; typedef struct ImColor_Simple { ImVec4_Simple Value;} ImColor_Simple; -inline ImVec2_Simple ImVec2ToSimple(ImVec2 vec) -{ - ImVec2_Simple result; - result.x = vec.x; - result.y = vec.y; - return result; -} -inline ImVec4_Simple ImVec4ToSimple(ImVec4 vec) -{ - ImVec4_Simple result; - result.x = vec.x; - result.y = vec.y; - result.z = vec.z; - result.w = vec.w; - return result; -} -inline ImColor_Simple ImColorToSimple(ImColor col) -{ - ImColor_Simple result; - result.Value = ImVec4ToSimple(col.Value); - return result; -} + #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS typedef unsigned short ImDrawIdx; @@ -1062,6 +1041,28 @@ struct ImFont struct GLFWwindow; struct SDL_Window; typedef union SDL_Event SDL_Event; +inline ImVec2_Simple ImVec2ToSimple(ImVec2 vec) +{ + ImVec2_Simple result; + result.x = vec.x; + result.y = vec.y; + return result; +} +inline ImVec4_Simple ImVec4ToSimple(ImVec4 vec) +{ + ImVec4_Simple result; + result.x = vec.x; + result.y = vec.y; + result.z = vec.z; + result.w = vec.w; + return result; +} +inline ImColor_Simple ImColorToSimple(ImColor col) +{ + ImColor_Simple result; + result.Value = ImVec4ToSimple(col.Value); + return result; +} #endif // CIMGUI_DEFINE_ENUMS_AND_STRUCTS #ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS diff --git a/generator/generated/cimgui_auto.h b/generator/generated/cimgui_auto.h index 71a9f02..60cbef5 100644 --- a/generator/generated/cimgui_auto.h +++ b/generator/generated/cimgui_auto.h @@ -36,28 +36,7 @@ typedef unsigned long long ImU64; typedef struct ImVec2_Simple { float x; float y; } ImVec2_Simple; typedef struct ImVec4_Simple { float x; float y; float z; float w;} ImVec4_Simple; typedef struct ImColor_Simple { ImVec4_Simple Value;} ImColor_Simple; -inline ImVec2_Simple ImVec2ToSimple(ImVec2 vec) -{ - ImVec2_Simple result; - result.x = vec.x; - result.y = vec.y; - return result; -} -inline ImVec4_Simple ImVec4ToSimple(ImVec4 vec) -{ - ImVec4_Simple result; - result.x = vec.x; - result.y = vec.y; - result.z = vec.z; - result.w = vec.w; - return result; -} -inline ImColor_Simple ImColorToSimple(ImColor col) -{ - ImColor_Simple result; - result.Value = ImVec4ToSimple(col.Value); - return result; -} + #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS @@ -822,6 +801,28 @@ struct ImFont struct GLFWwindow; struct SDL_Window; typedef union SDL_Event SDL_Event; +inline ImVec2_Simple ImVec2ToSimple(ImVec2 vec) +{ + ImVec2_Simple result; + result.x = vec.x; + result.y = vec.y; + return result; +} +inline ImVec4_Simple ImVec4ToSimple(ImVec4 vec) +{ + ImVec4_Simple result; + result.x = vec.x; + result.y = vec.y; + result.z = vec.z; + result.w = vec.w; + return result; +} +inline ImColor_Simple ImColorToSimple(ImColor col) +{ + ImColor_Simple result; + result.Value = ImVec4ToSimple(col.Value); + return result; +} #endif // CIMGUI_DEFINE_ENUMS_AND_STRUCTS #ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS