Scopify assets

src/dawn/asset/AssetLoader.cpp

@@ -8,6 +8,8 @@
 
 using namespace Dawn;
 
+const std::string AssetLoader::ASSET_TYPE = "unknown";
+
 AssetLoader::AssetLoader(
   const std::shared_ptr<AssetManager> assetManager,
   const std::string name

src/dawn/asset/AssetLoader.hpp

@@ -14,9 +14,10 @@ namespace Dawn {
       std::weak_ptr<AssetManager> assetManager;
 
     public:
+      const static std::string ASSET_TYPE;
+
       const std::string name;
       bool_t loaded = false;
-      
 
       /**
        * Create an abstract Asset object.
@@ -42,6 +43,13 @@ namespace Dawn {
        */
       virtual void updateAsync() = 0;
 
+      /**
+       * Returns the asset type.
+       * 
+       * @return The asset type.
+       */
+      virtual std::string getAssetType() const = 0;
+
       /**
        * Returns the asset manager.
        * 

src/dawn/asset/AssetManager.cpp

@@ -27,38 +27,33 @@ void AssetManager::update() {
   }
 }
 
-void AssetManager::removeExisting(const std::string &filename) {
+// Disabled because it does not respect scopes
-  auto existing = std::find_if(
+// void AssetManager::removeExisting(const std::string &filename) {
-    pendingAssetLoaders.begin(), pendingAssetLoaders.end(),
+//   auto existing = std::find_if(
-    [&](auto &loader) {
+//     pendingAssetLoaders.begin(), pendingAssetLoaders.end(),
-      return loader->name == filename;
+//     [&](auto &loader) {
-    }
+//       return loader->name == filename;
-  );
+//     }
-  if(existing != pendingAssetLoaders.end()) {
+//   );
-    pendingAssetLoaders.erase(existing);
+//   if(existing != pendingAssetLoaders.end()) {
-  }
+//     pendingAssetLoaders.erase(existing);
+//   }
 
-  existing = std::find_if(
+//   existing = std::find_if(
-    finishedAssetLoaders.begin(), finishedAssetLoaders.end(),
+//     finishedAssetLoaders.begin(), finishedAssetLoaders.end(),
-    [&](auto &loader) {
+//     [&](auto &loader) {
-      return loader->name == filename;
+//       return loader->name == filename;
-    }
+//     }
-  );
+//   );
-  if(existing != finishedAssetLoaders.end()) {
+//   if(existing != finishedAssetLoaders.end()) {
-    finishedAssetLoaders.erase(existing);
+//     finishedAssetLoaders.erase(existing);
-  }
+//   }
-}
+// }
 
 bool_t AssetManager::isEverythingLoaded() {
   return pendingAssetLoaders.size() == 0;
 }
 
-bool_t AssetManager::isLoaded(const std::string &filename) {
-  auto existing = this->getExisting<AssetLoader>(filename);
-  if(existing) return existing->loaded;
-  return false;
-}
-
 AssetManager::~AssetManager() {
   
 }

src/dawn/asset/AssetManager.hpp

@@ -25,7 +25,10 @@ namespace Dawn {
           pendingAssetLoaders.begin(),
           pendingAssetLoaders.end(),
           [&](auto &loader) {
-            return loader->name == filename;
+            return (
+              loader->name == filename &&
+              loader->getAssetType() == T::ASSET_TYPE
+            );
           }
         );
 
@@ -33,7 +36,10 @@ namespace Dawn {
           existing = std::find_if(
             finishedAssetLoaders.begin(), finishedAssetLoaders.end(),
             [&](auto &loader) {
-              return loader->name == filename;
+              return (
+                loader->name == filename &&
+                loader->getAssetType() == T::ASSET_TYPE
+              );
             }
           );
           
@@ -69,14 +75,6 @@ namespace Dawn {
        */
       bool_t isEverythingLoaded();
 
-      /**
-       * Returns whether the asset manager has loaded the given asset. 
-       * 
-       * @param filename The filename of the asset to check.
-       * @return True if the asset has been loaded.
-       */
-      bool_t isLoaded(const std::string &filename);
-
       /**
        * Returns the asset loader for the given asset.
        * 

src/dawn/asset/loader/JSONLoader.cpp

@@ -7,6 +7,8 @@
 
 using namespace Dawn;
 
+const std::string JSONLoader::ASSET_TYPE = "json";
+
 JSONLoader::JSONLoader(
   const std::shared_ptr<AssetManager> assetManager,
   const std::string name
@@ -30,6 +32,10 @@ void JSONLoader::updateAsync() {
 void JSONLoader::updateSync() {
 }
 
+std::string JSONLoader::getAssetType() const {
+  return JSONLoader::ASSET_TYPE;
+}
+
 JSONLoader::~JSONLoader() {
   
 }

src/dawn/asset/loader/JSONLoader.hpp

@@ -23,6 +23,8 @@ namespace Dawn {
       enum JSONLoaderState state;
 
     public:
+      const static std::string ASSET_TYPE;
+
       json data;
 
       JSONLoader(
@@ -31,6 +33,7 @@ namespace Dawn {
       );
       void updateSync() override;
       void updateAsync() override;
+      std::string getAssetType() const override;
       ~JSONLoader();
   };
 }

src/dawn/asset/loader/SceneLoader.cpp

@@ -7,6 +7,8 @@
 
 using namespace Dawn;
 
+const std::string SceneLoader::ASSET_TYPE = "scene";
+
 SceneLoader::SceneLoader(
   const std::shared_ptr<AssetManager> assetManager,
   const std::string name
@@ -35,6 +37,10 @@ void SceneLoader::updateSync() {
 
 }
 
+std::string SceneLoader::getAssetType() const {
+  return SceneLoader::ASSET_TYPE;
+}
+
 std::shared_ptr<Scene> SceneLoader::getScene() {
   return scene;
 }

src/dawn/asset/loader/SceneLoader.hpp

@@ -21,12 +21,15 @@ namespace Dawn {
       std::shared_ptr<Scene> scene;
 
     public:
+      const static std::string ASSET_TYPE;
+
       SceneLoader(
         const std::shared_ptr<AssetManager> assetManager,
         const std::string name
       );
       void updateSync() override;
       void updateAsync() override;
+      std::string getAssetType() const override;
 
       /**
        * Returns the Scene that was loaded, or nullptr if not loaded.

src/dawn/asset/loader/TextureLoader.cpp

@@ -8,6 +8,8 @@
 
 using namespace Dawn;
 
+const std::string TextureLoader::ASSET_TYPE = "texture";
+
 TextureLoader::TextureLoader(
   const std::shared_ptr<AssetManager> assetManager,
   const std::string name
@@ -137,6 +139,10 @@ void TextureLoader::updateSync() {
   this->loaded = true;
 }
 
+std::string TextureLoader::getAssetType() const {
+  return TextureLoader::ASSET_TYPE;
+}
+
 std::shared_ptr<Texture> TextureLoader::getTexture() {
   return this->texture;
 }

src/dawn/asset/loader/TextureLoader.hpp

@@ -33,6 +33,8 @@ namespace Dawn {
       std::shared_ptr<Texture> texture;
 
     public:
+      const static std::string ASSET_TYPE;
+
       TextureLoader(
         const std::shared_ptr<AssetManager> assetManager,
         const std::string name
@@ -40,6 +42,7 @@ namespace Dawn {
 
       void updateSync() override;
       void updateAsync() override;
+      std::string getAssetType() const override;
 
       /**
        * Get the texture asset.

src/dawn/asset/loader/TrueTypeLoader.cpp

@@ -8,6 +8,8 @@
 
 using namespace Dawn;
 
+const std::string TrueTypeLoader::ASSET_TYPE = "ttf";
+
 TrueTypeLoader::TrueTypeLoader(
   const std::shared_ptr<AssetManager> assetManager,
   const std::string name
@@ -65,6 +67,10 @@ void TrueTypeLoader::updateAsync() {
   state = TrueTypeLoaderState::ASYNC_DONE;
 }
 
+std::string TrueTypeLoader::getAssetType() const {
+  return TrueTypeLoader::ASSET_TYPE;
+}
+
 std::shared_ptr<TrueTypeTexture> TrueTypeLoader::getTexture(
   const uint32_t fontSize
 ) {

src/dawn/asset/loader/TrueTypeLoader.hpp

@@ -27,6 +27,8 @@ namespace Dawn {
       uint8_t *buffer = nullptr;
 
     public:
+      const static std::string ASSET_TYPE;
+
       TrueTypeLoader(
         const std::shared_ptr<AssetManager> assetManager,
         const std::string name
@@ -34,6 +36,7 @@ namespace Dawn {
 
       void updateSync() override;
       void updateAsync() override;
+      std::string getAssetType() const override;
 
       /**
        * Returns the texture for the given font size.

src/dawn/game/IGame.cpp

@@ -38,15 +38,8 @@ void IGame::init() {
 
   this->initManagers();
 
-
+  auto initialScene = this->getInitialScene();
-  auto sceneLoader = this->assetManager->get<SceneLoader>("test_scene.json");
+  nextFrameScene = std::make_shared<Scene>(selfAsGame, initialScene);
-  while(!sceneLoader->loaded) {
-    this->assetManager->update();
-  }
-  nextFrameScene = sceneLoader->getScene();
-
-  // auto initialScene = this->getInitialScene();
-  // nextFrameScene = std::make_shared<Scene>(selfAsGame, initialScene);
 }
 
 void IGame::deinit() {