Revert "Added preprocessor directives to allow building android witho…

…ut imgui. (#72013)" This reverts commit 19c877c.
CleverRaven · Mar 9, 2024 · 253a772 · 253a772
1 parent 3601a6a
commit 253a772
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 34 deletions.
diff --git a/src/cata_imgui.cpp b/src/cata_imgui.cpp
@@ -1,4 +1,3 @@
-#if !defined(__ANDROID__)
 #include "cata_imgui.h"
 
 #include <stack>
@@ -476,4 +475,3 @@ cataimgui::bounds cataimgui::window::get_bounds()
 {
     return { -1.f, -1.f, -1.f, -1.f };
 }
-#endif // #if defined(__ANDROID__)
diff --git a/src/cata_imgui.h b/src/cata_imgui.h
@@ -1,4 +1,3 @@
-#if !defined(__ANDROID__)
 #pragma once
 #include <string>
 #include <vector>
@@ -107,4 +106,3 @@ void load_colors();
 #endif
 
 } // namespace cataimgui
-#endif // #if defined(__ANDROID)
diff --git a/src/input_context.cpp b/src/input_context.cpp
@@ -31,15 +31,14 @@
 #include "string_input_popup.h"
 #include "translations.h"
 #include "ui_manager.h"
+#if !defined(__ANDROID__)
+#include "cata_imgui.h"
+#include "imgui/imgui.h"
 
 enum class kb_menu_status {
     remove, reset, add, add_global, execute, show
 };
 
-#if !defined(__ANDROID__)
-#include "cata_imgui.h"
-#include "imgui/imgui.h"
-
 class keybindings_ui : public cataimgui::window
 {
         // colors of the keybindings

diff --git a/src/main.cpp b/src/main.cpp
@@ -168,9 +168,7 @@ void exit_handler( int s )
         } else
 #endif
         {
-#if !defined(__ANDROID__)
             imclient.reset();
-#endif
             exit( exit_status );
         }
     }

diff --git a/src/popup.cpp b/src/popup.cpp
@@ -525,6 +525,7 @@ std::shared_ptr<query_popup_impl> query_popup::create_or_get_impl()
     }
     return impl;
 }
+#endif
 
 query_popup::result query_popup::query_once_imgui()
 {
@@ -620,13 +621,18 @@ query_popup::result query_popup::query_once_imgui()
     return res;
 }
 
+
 query_popup::result query_popup::query()
 {
+#if defined(__ANDROID__)
+    return query_legacy();
+#else
     if( get_options().has_option( "USE_IMGUI" ) && get_option<bool>( "USE_IMGUI" ) ) {
         return query_imgui();
     } else {
         return query_legacy();
     }
+#endif
 }
 
 query_popup::result query_popup::query_imgui()
@@ -639,13 +645,7 @@ query_popup::result query_popup::query_imgui()
     } while( res.wait_input );
     return res;
 }
-#else
 
-query_popup::result query_popup::query()
-{
-    return query_legacy();
-}
-#endif
 
 query_popup::result query_popup::query_legacy()
 {

diff --git a/src/popup.h b/src/popup.h
@@ -245,9 +245,7 @@ class query_popup
         };
 
         std::weak_ptr<ui_adaptor> adaptor;
-#if !defined(__ANDROID__)
         std::weak_ptr<query_popup_impl> p_impl;
-#endif
 
         // UI caches
         mutable catacurses::window win;

diff --git a/src/sdl_font.cpp b/src/sdl_font.cpp
@@ -3,9 +3,7 @@
 
 #include "font_loader.h"
 #include "output.h"
-#if !defined(__ANDROID)
 #include "imgui/imgui.h"
-#endif
 #include "sdl_utils.h"
 
 #if defined(_WIN32)
@@ -301,7 +299,7 @@ CachedTTFFont::CachedTTFFont(
         throw std::runtime_error( TTF_GetError() );
     }
     TTF_SetFontStyle( font.get(), TTF_STYLE_NORMAL );
-#if !defined(__ANDROID__)
+
     ImGuiIO &io = ImGui::GetIO();
     if( io.FontDefault == nullptr && typeface.find( "unifont" ) != std::string::npos ) {
         static const std::array<ImWchar, 17> ranges = {
@@ -317,7 +315,6 @@ CachedTTFFont::CachedTTFFont(
         };
         io.FontDefault = io.Fonts->AddFontFromFileTTF( typeface.c_str(), fontsize, nullptr, ranges.data() );
     }
-#endif
 }
 
 SDL_Texture_Ptr CachedTTFFont::create_glyph( const SDL_Renderer_Ptr &renderer,

diff --git a/src/sdltiles.cpp b/src/sdltiles.cpp
@@ -74,9 +74,7 @@
 #include "wcwidth.h"
 #include "cata_imgui.h"
 
-#if !defined(__ANDROID__)
 std::unique_ptr<cataimgui::client> imclient;
-#endif
 
 #if defined(__linux__)
 #   include <cstdlib> // getenv()/setenv()
@@ -423,11 +421,9 @@ static void WinCreate()
         geometry = std::make_unique<DefaultGeometryRenderer>();
     }
 
-#if !defined(__ANDROID__)
     cataimgui::client::sdl_renderer = renderer.get();
     cataimgui::client::sdl_window = window.get();
     imclient = std::make_unique<cataimgui::client>();
-#endif
 
     //io.Fonts->AddFontDefault();
     //io.Fonts->Build();
@@ -438,9 +434,7 @@ static void WinDestroy()
 #if defined(__ANDROID__)
     touch_joystick.reset();
 #endif
-#if !defined(__ANDROID__)
     imclient.reset();
-#endif
     shutdown_sound();
     tilecontext.reset();
     gamepad::quit();
@@ -2886,9 +2880,7 @@ static void CheckMessages()
     bool render_target_reset = false;
 
     while( SDL_PollEvent( &ev ) ) {
-#if !defined(__ANDROID__)
         imclient->process_input( &ev );
-#endif
         switch( ev.type ) {
             case SDL_WINDOWEVENT:
                 switch( ev.window.event ) {

diff --git a/src/ui_manager.cpp b/src/ui_manager.cpp
@@ -455,10 +455,8 @@ void ui_adaptor::redraw_invalidated( )
     emscripten_sleep( 1 );
 #endif
 
-#if !defined(__ANDROID__)
     imclient->end_frame();
     imgui_frame_started = false;
-#endif
 }
 
 void ui_adaptor::screen_resized()

diff --git a/src/ui_manager.h b/src/ui_manager.h
@@ -7,14 +7,12 @@
 #include "cuboid_rectangle.h"
 #include "point.h"
 
-#if !defined(__ANDROID__)
 namespace cataimgui
 {
 class client;
 } // namespace cataimgui
 
 extern std::unique_ptr<cataimgui::client> imclient;
-#endif
 
 namespace catacurses
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -168,9 +168,7 @@ void exit_handler( int s ) @@
             } else
     #endif
             {
-    #if !defined(__ANDROID__)
                 imclient.reset();
-    #endif
                 exit( exit_status );
             }
         }
@@ Expand Down @@