Loading logic moved to Asset classes

2020-06-08 01:44:47 +02:00
parent 356e6058fe
commit ab4a3b5e23
50 changed files with 966 additions and 558 deletions
@@ -32,31 +32,15 @@ void Scene::addPrimitiveComponent(PPrimitiveComponent comp)
    primitives.add(comp);
 }

-Map<PMaterial, MeshBatch> Scene::getMeshBatches()
+Array<MeshBatch> Scene::getMeshBatches()
 {
    meshBatches.clear();
    for (auto primitive : primitives)
    {
-    /*    Array<PMaterial> materials = primitive->materials;
-        PMaterialInstance matInstance = primitive->;
-        PMaterial mat = matInstance->getBaseMaterial();
-        MeshBatch inst;
-        inst.instance = primitive->instance;
-        inst.vertexBuffer = primitive->vertexBuffer;
-        inst.indexBuffer = primitive->indexBuffer;
-        inst.modelMatrix = primitive->getRenderMatrix();
-
-        if (meshBatches.find(mat) != meshBatches.end())
+        for(auto batch : primitive->staticMeshes)
        {
-            MeshBatchElement &state = meshBatches[mat];
-            state.instances.add(inst);
+            meshBatches.add(batch);
        }
-        else
-        {
-            MeshBatchElement state;
-            state.instances.add(inst);
-            meshBatches[mat] = state;
-        }*/
    }
    return meshBatches;
 }