- fixing 10fps cap in console mode

- fixing tid display
nadrino · May 7, 2023 · dd7d4ec · dd7d4ec
1 parent 91d5931
commit dd7d4ec
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 55 deletions.
diff --git a/src/Applications/SimpleModManagerConsole/src/SimpleModManagerConsole.cpp b/src/Applications/SimpleModManagerConsole/src/SimpleModManagerConsole.cpp
@@ -8,19 +8,6 @@
 #include "thread"
 
 
-// test
-struct FpsCap{
-  explicit FpsCap(double fps_) : createDate(std::chrono::system_clock::now()), fpsMax(1/fps_) {}
-  ~FpsCap(){
-    auto timeDiff = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now() - createDate);
-    std::this_thread::sleep_for(fpsMax - timeDiff);
-  }
-
-  std::chrono::system_clock::time_point createDate;
-  std::chrono::duration<double> fpsMax;
-};
-
-
 // MAIN
 int main( int argc, char **argv ){
   consoleInit(nullptr);

diff --git a/src/ModManagerCore/include/ConsoleHandler.h b/src/ModManagerCore/include/ConsoleHandler.h
@@ -21,6 +21,17 @@
 
 namespace ConsoleHandler{
 
+  struct FpsCap{
+    explicit FpsCap(double fps_) : createDate(std::chrono::system_clock::now()), fpsMax(1/fps_) {}
+    ~FpsCap(){
+      auto timeDiff = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now() - createDate);
+      std::this_thread::sleep_for(fpsMax - timeDiff);
+    }
+
+    std::chrono::system_clock::time_point createDate;
+    std::chrono::duration<double> fpsMax;
+  };
+
   void upgradeFrom150(){
     std::string oldPath = GenericToolbox::getCurrentWorkingDirectory() + "/parameters.ini"; // before 1.5.0
     if(GenericToolbox::doesPathIsFile(oldPath)){
@@ -73,7 +84,7 @@ namespace ConsoleHandler{
     // Main loop
     u64 kDown, kHeld;
     while( appletMainLoop() ) {
-//    FpsCap fpsGuard(120);
+      FpsCap fpsGuard(30);
 
       //Scan all the inputs. This should be done once for each frame
       padUpdate( &pad );
@@ -99,7 +110,7 @@ namespace ConsoleHandler{
       gameBrowser.printTerminal();
       std::cout << std::flush;
 
-      std::this_thread::sleep_for(std::chrono::milliseconds(100));
+//      std::this_thread::sleep_for(std::chrono::milliseconds(100));
     } // while
   }
 

diff --git a/src/ModManagerGui/CoreExtension/include/GuiUtils.h b/src/ModManagerGui/CoreExtension/include/GuiUtils.h
diff --git a/src/ModManagerGui/FrameGameBrowser/src/TabGames.cpp b/src/ModManagerGui/FrameGameBrowser/src/TabGames.cpp
@@ -6,7 +6,6 @@
 #include <GlobalObjects.h>
 #include <FrameModBrowser.h>
 #include "FrameRoot.h"
-#include "GuiUtils.h"
 
 #include "Logger.h"
 #include "GenericToolbox.Switch.h"
@@ -48,14 +47,15 @@ TabGames::TabGames(FrameRoot* owner_) : _owner_(owner_) {
       LogScopeIndent;
       LogInfo << "Adding game folder: \"" << gameEntry.title << "\"" << std::endl;
 
-      int nMods = int( GenericToolbox::getListOfSubFoldersInFolder(
-          this->getConfig().baseFolder + "/" + gameEntry.title
-      ).size() );
+      std::string gamePath{GenericToolbox::joinPath(this->getConfig().baseFolder, gameEntry.title)};
+      int nMods = int( GenericToolbox::getListOfSubFoldersInFolder(gamePath).size() );
 
       // memory allocation
       auto* item = new brls::ListItem(gameEntry.title, "", std::to_string(nMods) + " mod(s) available.");
 
-      auto* icon = ModManagerUtils::getFolderIcon( this->getConfig().baseFolder + "/" + gameEntry.title );
+      // looking for tid is quite slow... Slows down the boot up
+      std::string _titleId_{ GenericToolbox::Switch::Utils::lookForTidInSubFolders(gamePath) };
+      auto* icon = GenericToolbox::Switch::Utils::getIconFromTitleId(_titleId_);
       if(icon != nullptr){ item->setThumbnail(icon, 0x20000); }
       item->getClickEvent()->subscribe([&, gameEntry](View* view) {
         LogWarning << "Opening \"" << gameEntry.title << "\"" << std::endl;

diff --git a/src/ModManagerGui/FrameModBrowser/src/FrameModBrowser.cpp b/src/ModManagerGui/FrameModBrowser/src/FrameModBrowser.cpp
@@ -9,8 +9,6 @@
 #include <TabModPresets.h>
 #include <TabModOptions.h>
 
-#include "GuiUtils.h"
-
 #include "GenericToolbox.Switch.h"
 #include "Logger.h"
 
@@ -27,9 +25,8 @@ FrameModBrowser::FrameModBrowser(GuiModManager* guiModManagerPtr_) : _guiModMana
 
   std::string gamePath = getGameBrowser().getModManager().getGameFolderPath();
 
-
-  _titleId_ = GenericToolbox::Switch::Utils::lookForTidInSubFolders( gamePath );
-  _icon_ = ModManagerUtils::getFolderIcon( getGameBrowser().getModManager().getGameFolderPath() );
+  _titleId_ = GenericToolbox::Switch::Utils::lookForTidInSubFolders( gamePath, 5);
+  _icon_ = GenericToolbox::Switch::Utils::getIconFromTitleId( _titleId_ );
   if(_icon_ != nullptr){ this->setIcon(_icon_, 0x20000); }
   else{ this->setIcon("romfs:/images/icon_corner.png"); }
 

diff --git a/src/ModManagerGui/FrameModBrowser/src/TabModOptions.cpp b/src/ModManagerGui/FrameModBrowser/src/TabModOptions.cpp
@@ -146,15 +146,19 @@ void TabModOptions::buildGameIdentificationItem(){
   _itemGameIdentification_ = new brls::ListItem(
     "Associated TitleID",
     "",
-    "Current value :"
+    "Current value: "
   );
 
   if( _owner_->getIcon() != nullptr ){
-    _itemGameIdentification_->setValue( _owner_->getTitleId() );
     _itemGameIdentification_->setThumbnail( _owner_->getIcon(), 0x20000 );
+    _itemGameIdentification_->setSubLabel(
+        _itemGameIdentification_->getSubLabel() + _owner_->getTitleId()
+    );
   }
   else{
-    _itemGameIdentification_->setValue("No TitleID candidate");
+    _itemGameIdentification_->setSubLabel(
+        _itemGameIdentification_->getSubLabel() + "Not found."
+    );
   }
 
 }

diff --git a/submodules/cpp-generic-toolbox b/submodules/cpp-generic-toolbox