TETRAEDGE: Cache FSNode lookups

This is based on @andrewglass's work in PR scummvm#5714, and allows us to cache the remaining cases where Common::FSNode is used
bluegr · Aug 4, 2024 · bc92a10 · bc92a10
1 parent eb0f20a
commit bc92a10
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/engines/tetraedge/te/te_core.cpp b/engines/tetraedge/te/te_core.cpp
@@ -38,7 +38,7 @@
 
 namespace Tetraedge {
 
-TeCore::TeCore() : _loc(nullptr), _coreNotReady(true) {
+TeCore::TeCore() : _loc(nullptr), _coreNotReady(true), _resourcesRoot("") {
 	create();
 }
 
@@ -61,6 +61,21 @@ void TeCore::create() {
 	_coreNotReady = false;
 	_activityTrackingTimer.alarmSignal().add(this, &TeCore::onActivityTrackingAlarm);
 	warning("TODO: TeCore::create: Finish implementing me.");
+
+	const Common::FSNode gameRoot(ConfMan.getPath("path"));
+	if (!gameRoot.isDirectory())
+		error("Game directory should be a directory");
+	const Common::FSNode resNode = (g_engine->getGamePlatform() == Common::kPlatformMacintosh
+										? gameRoot.getChild("Resources")
+										: gameRoot);
+	if (!resNode.isDirectory())
+		error("Resources directory should exist in game");
+
+	_resourcesRoot = Common::FSDirectory(resNode, 5, false, false, true);
+}
+
+Common::FSNode TeCore::getFSNode(const Common::Path &path) const {
+	return Common::FSNode(Common::Path(_resourcesRoot.getFSNode().getPath()).join(path));
 }
 
 TeICodec *TeCore::createVideoCodec(const Common::String &extn) {

diff --git a/engines/tetraedge/te/te_core.h b/engines/tetraedge/te/te_core.h
@@ -59,13 +59,15 @@ class TeCore {
 	// adds things like "PC-MacOSX" to the path, and there is not clear logic
 	// to them, so here we are.
 	Common::Path findFile(const Common::Path &path) const;
+	Common::FSNode getFSNode(const Common::Path &path) const;
 
 	bool _coreNotReady;
 
 private:
 	TeILoc *_loc;
 
 	Common::HashMap<Common::String, Common::String, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> _fileSystemFlags;
+	Common::FSDirectory _resourcesRoot;
 
 	TeTimer _activityTrackingTimer;
 };

diff --git a/engines/tetraedge/te/te_images_sequence.cpp b/engines/tetraedge/te/te_images_sequence.cpp
@@ -20,11 +20,12 @@
  */
 
 #include "common/file.h"
-#include "common/config-manager.h"
 #include "image/png.h"
 #include "graphics/surface.h"
 #include "graphics/managed_surface.h"
 
+#include "tetraedge/tetraedge.h"
+#include "tetraedge/te/te_core.h"
 #include "tetraedge/te/te_images_sequence.h"
 
 namespace Tetraedge {
@@ -49,8 +50,7 @@ static bool compareNodes(const Common::FSNode &left, const Common::FSNode &right
 }
 
 bool TeImagesSequence::load(const Common::Path &directory) {
-	const Common::FSNode gameRoot(ConfMan.getPath("path"));
-	Common::FSNode dir(gameRoot.getChild("Resources").getPath().joinInPlace(directory));
+	Common::FSNode dir = g_engine->getCore()->getFSNode(directory);
 
 	const Common::String path = directory.toString('/');
 	if (!dir.isDirectory()) {

diff --git a/engines/tetraedge/te/te_sprite_layout.cpp b/engines/tetraedge/te/te_sprite_layout.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-#include "common/config-manager.h"
 #include "common/file.h"
 
 #include "tetraedge/tetraedge.h"
@@ -83,8 +82,7 @@ bool TeSpriteLayout::load(const Common::Path &path) {
 	}
 
 	TeCore *core = g_engine->getCore();
-	const Common::FSNode gameRoot(ConfMan.getPath("path"));
-	Common::FSNode spriteNode(gameRoot.getChild("Resources").getPath().joinInPlace(path));
+	Common::FSNode spriteNode = core->getFSNode(path);
 	Common::Path spritePath(path);
 
 	// The path can point to a single file, or a folder with files