mirror of
https://github.com/cemu-project/vcpkg.git
synced 2025-07-27 09:37:19 +02:00
49 lines
2.1 KiB
Diff
49 lines
2.1 KiB
Diff
From bc61e1cd9cbc80cd44fc905393a5278d14dfae8f Mon Sep 17 00:00:00 2001
|
|
From: unknown <aaa@bbb.cccdeef>
|
|
Date: Sun, 26 Jul 2020 18:27:09 +0200
|
|
Subject: [PATCH] config
|
|
|
|
---
|
|
imconfig.h | 15 ++++++++-------
|
|
1 file changed, 8 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/imconfig.h b/imconfig.h
|
|
index c6817de7..9346f958 100644
|
|
--- a/imconfig.h
|
|
+++ b/imconfig.h
|
|
@@ -24,7 +24,7 @@
|
|
//#define IMGUI_API __declspec( dllimport )
|
|
|
|
//---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to avoid using soon-to-be obsolete function/names.
|
|
-//#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
|
+#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
|
|
|
//---- Disable all of Dear ImGui or don't implement standard windows.
|
|
// It is very strongly recommended to NOT disable the demo windows during development. Please read comments in imgui_demo.cpp.
|
|
@@ -64,15 +64,16 @@
|
|
|
|
//---- Define constructor and implicit cast operators to convert back<>forth between your math types and ImVec2/ImVec4.
|
|
// This will be inlined as part of ImVec2 and ImVec4 class declarations.
|
|
-/*
|
|
+#include <glm/vec2.hpp>
|
|
+#include <glm/vec4.hpp>
|
|
#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 (default is 16-bit) is one way to allow large meshes with more than 64K vertices.
|
|
// Your renderer back-end will need to support it (most example renderer back-ends support both 16/32-bit indices).
|
|
--
|
|
2.27.0.windows.1
|
|
|