Browse Source

Remove std:: dependencies.

The vector and map includes were causing an issue with a separate library I was using and I realized they could be safely removed. I figured I should submit a PR in case removing a dependency might be useful. Feedback welcome!
sduman 2 years ago
parent
commit
21d95192de
1 changed files with 2 additions and 14 deletions
  1. 2 14
      rlImGui.cpp

+ 2 - 14
rlImGui.cpp

@@ -38,18 +38,15 @@
 #endif
 #endif
 
 
 #include <math.h>
 #include <math.h>
-#include <vector>
-#include <map>
 
 
 #ifndef NO_FONT_AWESOME
 #ifndef NO_FONT_AWESOME
 #include "extras/FA6FreeSolidFontData.h"
 #include "extras/FA6FreeSolidFontData.h"
 #endif
 #endif
 
 
-static std::vector<Texture> LoadedTextures;
 static Texture2D FontTexture;
 static Texture2D FontTexture;
 
 
 static ImGuiMouseCursor CurrentMouseCursor = ImGuiMouseCursor_COUNT;
 static ImGuiMouseCursor CurrentMouseCursor = ImGuiMouseCursor_COUNT;
-static std::map<ImGuiMouseCursor, MouseCursor> MouseCursorMap;
+static MouseCursor MouseCursorMap[ImGuiMouseCursor_COUNT];
 
 
 static const char* rlImGuiGetClipText(void*)
 static const char* rlImGuiGetClipText(void*)
 {
 {
@@ -130,11 +127,7 @@ static void rlImGuiNewFrame()
 
 
                 if (!(io.ConfigFlags & ImGuiConfigFlags_NoMouseCursorChange))
                 if (!(io.ConfigFlags & ImGuiConfigFlags_NoMouseCursorChange))
                 {
                 {
-                    auto itr = MouseCursorMap.find(imgui_cursor);
-                    if (itr == MouseCursorMap.end())
-                        SetMouseCursor(MOUSE_CURSOR_DEFAULT);
-                    else
-                        SetMouseCursor(itr->second);
+		    SetMouseCursor((imgui_cursor > -1 && imgui_cursor < ImGuiMouseCursor_COUNT) ? MouseCursorMap[imgui_cursor] : MOUSE_CURSOR_DEFAULT);
                 }
                 }
             }
             }
         }
         }
@@ -348,7 +341,6 @@ static void rlRenderData(ImDrawData* data)
 
 
 void SetupMouseCursors()
 void SetupMouseCursors()
 {
 {
-    MouseCursorMap.clear();
     MouseCursorMap[ImGuiMouseCursor_Arrow] = MOUSE_CURSOR_ARROW;
     MouseCursorMap[ImGuiMouseCursor_Arrow] = MOUSE_CURSOR_ARROW;
     MouseCursorMap[ImGuiMouseCursor_TextInput] = MOUSE_CURSOR_IBEAM;
     MouseCursorMap[ImGuiMouseCursor_TextInput] = MOUSE_CURSOR_IBEAM;
     MouseCursorMap[ImGuiMouseCursor_Hand] = MOUSE_CURSOR_POINTING_HAND;
     MouseCursorMap[ImGuiMouseCursor_Hand] = MOUSE_CURSOR_POINTING_HAND;
@@ -466,11 +458,7 @@ void rlImGuiEnd()
 
 
 void rlImGuiShutdown()
 void rlImGuiShutdown()
 {
 {
-    for (const auto& tx : LoadedTextures)
-        UnloadTexture(tx);
-
     UnloadTexture(FontTexture);
     UnloadTexture(FontTexture);
-    LoadedTextures.clear();
 
 
     ImGui::DestroyContext();
     ImGui::DestroyContext();
 }
 }