diff --git a/src/imconfig.h b/src/imconfig.h index 824a81a..6e0bdb0 100644 --- a/src/imconfig.h +++ b/src/imconfig.h @@ -6,6 +6,9 @@ #pragma once +#include +#include + //---- Define assertion handler. Defaults to calling assert(). //#define IM_ASSERT(_EXPR) MyAssert(_EXPR) @@ -14,7 +17,7 @@ //#define IMGUI_API __declspec( dllimport ) //---- Don't define obsolete functions names. Consider enabling from time to time or when updating to reduce like hood of using already obsolete function/names -//#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS +#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS //---- Include imgui_user.h at the end of imgui.h //#define IMGUI_INCLUDE_IMGUI_USER_H @@ -25,7 +28,7 @@ //---- Don't implement demo windows functionality (ShowDemoWindow()/ShowStyleEditor()/ShowUserGuide() methods will be empty) //---- It is very strongly recommended to NOT disable the demo windows. Please read the comment at the top of imgui_demo.cpp to learn why. -//#define IMGUI_DISABLE_DEMO_WINDOWS +#define IMGUI_DISABLE_DEMO_WINDOWS //---- Don't implement ImFormatString(), ImFormatStringV() so you can reimplement them yourself. //#define IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS @@ -37,15 +40,14 @@ //#define IMGUI_STB_NAMESPACE ImGuiStb //---- Define constructor and implicit cast operators to convert back<>forth from your math types and ImVec2/ImVec4. -/* #define IM_VEC2_CLASS_EXTRA \ - ImVec2(const MyVec2& f) { x = f.x; y = f.y; } \ - operator MyVec2() const { return MyVec2(x,y); } + ImVec2(const glm::vec2& f) { x = f.x; y = f.y; } \ + operator glm::vec2() const { return glm::vec2(x,y); } #define IM_VEC4_CLASS_EXTRA \ - ImVec4(const MyVec4& f) { x = f.x; y = f.y; z = f.z; w = f.w; } \ - operator MyVec4() const { return MyVec4(x,y,z,w); } -*/ + ImVec4(const glm::vec4& f) { x = f.x; y = f.y; z = f.z; w = f.w; } \ + operator glm::vec4() const { return glm::vec4(x,y,z,w); } + //---- Use 32-bit vertex indices (instead of default: 16-bit) to allow meshes with more than 64K vertices //#define ImDrawIdx unsigned int