9 files changed, 72 insertions, 25 deletions

@@ -54,6 +54,7 @@ set(SOURCE_FILES
   "src/ipc_dialog.cpp"
   "src/report_popup.cpp"
   "src/updater.cpp"
+  "src/icons.cpp"
   "vendor/whereami/whereami.c"
 )
 
@@ -7,6 +7,7 @@
 #include "ap_state.h"
 #include "game_data.h"
 #include "global.h"
+#include "icons.h"
 #include "tracker_config.h"
 #include "tracker_panel.h"
 #include "tracker_state.h"
@@ -129,7 +130,7 @@ void AreaPopup::UpdateIndicators() {
           (location.hunt && AP_HasCheckedHuntPanel(location.ap_location_id));
     }
 
-    wxBitmap* eye_ptr = checked ? &checked_eye_ : &unchecked_eye_;
+    const wxBitmap* eye_ptr = checked ? checked_eye_ : unchecked_eye_;
 
     mem_dc.DrawBitmap(*eye_ptr, {FromDIP(10), cur_height});
 
@@ -155,7 +156,7 @@ void AreaPopup::UpdateIndicators() {
       mem_dc.SetTextForeground(*text_color);
 
       bool checked = reachable && AP_IsPaintingChecked(painting.internal_id);
-      wxBitmap* eye_ptr = checked ? &checked_eye_ : &unchecked_eye_;
+      const wxBitmap* eye_ptr = checked ? checked_eye_ : unchecked_eye_;
       mem_dc.DrawBitmap(*eye_ptr, {FromDIP(10), cur_height});
 
       wxSize item_extent = mem_dc.GetTextExtent(painting.display_name);
@@ -182,13 +183,8 @@ void AreaPopup::OnDPIChanged(wxDPIChangedEvent& event) {
 }
 
 void AreaPopup::LoadIcons() {
-  // TODO: We do not have to read these in and scale them for every single
-  // popup.
-  unchecked_eye_ =
-      wxBitmap(wxImage(GetAbsolutePath("assets/unchecked.png").c_str(),
-                       wxBITMAP_TYPE_PNG)
-                   .Scale(FromDIP(32), FromDIP(32)));
-  checked_eye_ = wxBitmap(
-      wxImage(GetAbsolutePath("assets/checked.png").c_str(), wxBITMAP_TYPE_PNG)
-          .Scale(FromDIP(32), FromDIP(32)));
+  unchecked_eye_ = GetTheIconCache().GetIcon("assets/unchecked.png",
+                                             FromDIP(wxSize{32, 32}));
+  checked_eye_ =
+      GetTheIconCache().GetIcon("assets/checked.png", FromDIP(wxSize{32, 32}));
 }
@@ -21,8 +21,9 @@ class AreaPopup : public wxScrolledCanvas {
 
   int area_id_;
 
-  wxBitmap unchecked_eye_;
-  wxBitmap checked_eye_;
+  const wxBitmap* unchecked_eye_;
+  const wxBitmap* checked_eye_;
+
   wxBitmap rendered_;
 };
 
@@ -0,0 +1,22 @@
+#include "icons.h"
+
+#include "global.h"
+
+const wxBitmap* IconCache::GetIcon(const std::string& filename, wxSize size) {
+  std::tuple<std::string, int, int> key = {filename, size.x, size.y};
+
+  if (!icons_.count(key)) {
+    icons_[key] =
+        wxBitmap(wxImage(GetAbsolutePath(filename).c_str(),
+                         wxBITMAP_TYPE_PNG)
+                     .Scale(size.x, size.y));
+  }
+
+  return &icons_.at(key);
+}
+
+static IconCache* ICON_CACHE_INSTANCE = nullptr;
+
+void SetTheIconCache(IconCache* instance) { ICON_CACHE_INSTANCE = instance; }
+
+IconCache& GetTheIconCache() { return *ICON_CACHE_INSTANCE; }
@@ -0,0 +1,25 @@
+#ifndef ICONS_H_B95159A6
+#define ICONS_H_B95159A6
+
+#include <wx/wxprec.h>
+
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
+#include <map>
+#include <string>
+#include <tuple>
+
+class IconCache {
+ public:
+  const wxBitmap* GetIcon(const std::string& filename, wxSize size);
+
+ private:
+  std::map<std::tuple<std::string, int, int>, wxBitmap> icons_;
+};
+
+void SetTheIconCache(IconCache* instance);
+IconCache& GetTheIconCache();
+
+#endif /* end of include guard: ICONS_H_B95159A6 */
@@ -6,6 +6,7 @@
 #include <string>
 
 #include "global.h"
+#include "icons.h"
 #include "tracker_state.h"
 
 ReportPopup::ReportPopup(wxWindow* parent)
@@ -73,7 +74,7 @@ void ReportPopup::UpdateIndicators() {
   int cur_height = FromDIP(10);
 
   for (const auto& [text, obtained] : report) {
-    wxBitmap* eye_ptr = obtained ? &checked_eye_ : &unchecked_eye_;
+    const wxBitmap* eye_ptr = obtained ? checked_eye_ : unchecked_eye_;
 
     mem_dc.DrawBitmap(*eye_ptr, wxPoint{FromDIP(10), cur_height});
 
@@ -104,13 +105,8 @@ void ReportPopup::OnDPIChanged(wxDPIChangedEvent& event) {
 }
 
 void ReportPopup::LoadIcons() {
-  // TODO: We do not have to read these in and scale them for every single
-  // popup.
-  unchecked_eye_ =
-      wxBitmap(wxImage(GetAbsolutePath("assets/unchecked.png").c_str(),
-                       wxBITMAP_TYPE_PNG)
-                   .Scale(FromDIP(32), FromDIP(32)));
-  checked_eye_ = wxBitmap(
-      wxImage(GetAbsolutePath("assets/checked.png").c_str(), wxBITMAP_TYPE_PNG)
-          .Scale(FromDIP(32), FromDIP(32)));
+  unchecked_eye_ = GetTheIconCache().GetIcon("assets/unchecked.png",
+                                             FromDIP(wxSize{32, 32}));
+  checked_eye_ =
+      GetTheIconCache().GetIcon("assets/checked.png", FromDIP(wxSize{32, 32}));
 }
@@ -25,8 +25,9 @@ class ReportPopup : public wxScrolledCanvas {
 
   int door_id_ = -1;
 
-  wxBitmap unchecked_eye_;
-  wxBitmap checked_eye_;
+  const wxBitmap* unchecked_eye_;
+  const wxBitmap* checked_eye_;
+
   wxBitmap rendered_;
 };
 
@@ -63,6 +63,8 @@ TrackerFrame::TrackerFrame()
   AP_SetTrackerFrame(this);
   IPC_SetTrackerFrame(this);
 
+  SetTheIconCache(&icons_);
+
   updater_ = std::make_unique<Updater>(this);
   updater_->Cleanup();
 
@@ -9,6 +9,7 @@
 
 #include <memory>
 
+#include "icons.h"
 #include "updater.h"
 
 class AchievementsPane;
@@ -94,6 +95,8 @@ class TrackerFrame : public wxFrame {
 
   wxMenuItem *zoom_in_menu_item_;
   wxMenuItem *zoom_out_menu_item_;
+
+  IconCache icons_;
 };
 
 #endif /* end of include guard: TRACKER_FRAME_H_86BD8DFB */