SceneLoader: working on creating entire scenes

Author: Dominik Ospelt

doc/Assumptions.txt

@@ -0,0 +1,3 @@
+- Meshes in loaded files have unique names
+- Eeach component is bound max once per scene node
+- Components can be attached to multiple nodes

src/KoRE/MeshLoader.h

@@ -32,52 +32,51 @@
 
 
 namespace kore {
-    class MeshLoader {
-        public:
-            static MeshLoader* getInstance();
-            ~MeshLoader();
+  class MeshLoader {
+  public:
+    static MeshLoader* getInstance();
+    virtual ~MeshLoader();
 
-            SceneNodePtr loadScene(const std::string& szScenePath,
-                                   const bool bUseBuffers);
-            MeshPtr loadSingleMesh(const std::string& szMeshPath,
-                                   const bool bUseBuffers);
+    SceneNodePtr loadScene(const std::string& szScenePath,
+                           const bool bUseBuffers);
+    MeshPtr loadSingleMesh(const std::string& szMeshPath,
+                           const bool bUseBuffers);
 
-        private:
-           MeshLoader();
-           const aiScene* readScene(const std::string& szScenePath);
+    kore::MeshPtr loadMesh(const aiScene* paiScene,
+                           const uint uMeshIdx,
+                           const bool bUseBuffers = true);
 
-           void loadChildNode(const aiScene* paiScene,
-                         const aiNode* paiNode,
-                         SceneNodePtr& parentNode,
-                         const bool bUseBuffers);
+  private:
+    MeshLoader();
+    const aiScene* readScene(const std::string& szScenePath);
 
-           kore::MeshPtr loadMesh(const aiScene* paiScene,
-                                   const uint uMeshIdx,
-                                   const bool bUseBuffers);
+    void loadChildNode(const aiScene* paiScene,
+                       const aiNode* paiNode,
+                       SceneNodePtr& parentNode,
+                       const bool bUseBuffers);
+    void loadVertexPositions(const aiMesh* pAiMesh,
+                             kore::MeshPtr& pMesh);
 
-            void loadVertexPositions(const aiMesh* pAiMesh,
-                                    kore::MeshPtr& pMesh);
+    void loadVertexNormals(const aiMesh* pAiMesh,
+                           kore::MeshPtr& pMesh);
 
-            void loadVertexNormals(const aiMesh* pAiMesh,
-                                    kore::MeshPtr& pMesh);
+    void loadVertexTangents(const aiMesh* pAiMesh,
+                            kore::MeshPtr& pMesh);
 
-            void loadVertexTangents(const aiMesh* pAiMesh,
-                                    kore::MeshPtr& pMesh);
+    void loadFaceIndices(const aiMesh* pAiMesh,
+                         kore::MeshPtr& pMesh);
 
-            void loadFaceIndices(const aiMesh* pAiMesh,
-                                kore::MeshPtr& pMesh);
+    void loadVertexTextureCoords(const aiMesh* pAiMesh,
+                                 kore::MeshPtr& pMesh,
+                                 const unsigned int iUVset);
 
-            void loadVertexTextureCoords(const aiMesh* pAiMesh,
-                                        kore::MeshPtr& pMesh,
-                                        const unsigned int iUVset);
+    void loadVertexColors(const aiMesh* pAiMesh,
+                          kore::MeshPtr& pMesh,
+                          const unsigned int iColorSet);
 
-            void loadVertexColors(const aiMesh* pAiMesh,
-                                  kore::MeshPtr& pMesh,
-                                  const unsigned int iColorSet);
+    glm::mat4 glmMatFromAiMat(const aiMatrix4x4& aiMat);
 
-            glm::mat4 glmMatFromAiMat(const aiMatrix4x4& aiMat);
-
-           Assimp::Importer _aiImporter;
-    };
-}
+    Assimp::Importer _aiImporter;
+  };
+};
 #endif  // CORE_INCLUDE_CORE_MESHLOADER_H_

src/KoRE/ResourceManager.cpp

@@ -42,6 +42,11 @@ void kore::ResourceManager::loadScene(const std::string& filename, SceneNodePtr
   kore::SceneLoader::getInstance()->loadScene(filename, parent);
 }
 
+void kore::ResourceManager::loadResources(const std::string& filename) {
+  kore::SceneLoader::getInstance()->loadRessources(filename);
+}
+
+// deprecated
 kore::MeshPtr
 kore::ResourceManager::loadSingleMesh(const std::string& filename,
                                       uint importFlags) {
@@ -51,3 +56,11 @@ kore::ResourceManager::loadSingleMesh(const std::string& filename,
     MeshLoader::getInstance()->loadSingleMesh(filename, bUseBuffers);
     return pNewScene;
 }
+
+void kore::ResourceManager::addMesh(const std::string& path, MeshPtr mesh) {
+  _meshes[path][mesh->getName()] = mesh;
+}
+
+kore::MeshPtr kore::ResourceManager::getMesh(const std::string& path, const std::string& id) {
+  return _meshes[path][id];
+}

src/KoRE/ResourceManager.h

@@ -38,17 +38,26 @@ namespace kore {
   class ResourceManager {
   public:
     static ResourceManager *getInstance(void);
-    // reads a scene file and creates all nodes and components within a scenegraph
+    // reads a scene file and creates all nodes and components within a scene graph
     void loadScene(const std::string& filename,
                                  SceneNodePtr parent =
                                  kore::SceneManager::getInstance()
                                  ->getRootNode());
+    // adds all resources from a specific file
+    void loadResources(const std::string& filename);
+
+    // deprecated
     kore::MeshPtr loadSingleMesh(const std::string& filename, uint importFlags);
+
+    void addMesh(const std::string& path, MeshPtr mesh);
+    kore::MeshPtr getMesh(const std::string& path, const std::string& id);
+
   private:
     ResourceManager(void);
     virtual ~ResourceManager(void);
 
-    std::map<std::string, kore::MeshPtr> _meshes;
+    std::map<std::string, std::map<std::string, kore::MeshPtr>> _meshes; // filepath, id, mesh
+    std::map<std::string, std::map<std::string, kore::MeshPtr>> _cameras; // filepath, id, camera
     std::vector<kore::ShaderPtr> _shader;
   };
 };