Fixing slang compilation temporarily, renaming vertexfactory

This commit is contained in:
Dynamitos
2020-08-06 00:54:43 +02:00
parent ab4a3b5e23
commit f27859a02c
66 changed files with 1005 additions and 627 deletions
@@ -2,7 +2,7 @@
#include "Scene/Scene.h"
#include "Material/MaterialInstance.h"
#include "Asset/MeshAsset.h"
#include "Graphics/RenderPass/VertexFactory.h"
#include "Graphics/VertexShaderInput.h"
using namespace Seele;
@@ -17,10 +17,10 @@ public:
virtual void notifySceneAttach(PScene scene) override;
Matrix4 getRenderMatrix();
Array<StaticMeshBatch> staticMeshes;
private:
Array<PMaterialAsset> materials;
Gfx::PUniformBuffer uniformBuffer;
Array<StaticMeshBatch> staticMeshes;
friend class Scene;
};
DEFINE_REF(PrimitiveComponent);
-13
View File
@@ -31,16 +31,3 @@ void Scene::addPrimitiveComponent(PPrimitiveComponent comp)
{
primitives.add(comp);
}
Array<MeshBatch> Scene::getMeshBatches()
{
meshBatches.clear();
for (auto primitive : primitives)
{
for(auto batch : primitive->staticMeshes)
{
meshBatches.add(batch);
}
}
return meshBatches;
}
+1 -2
View File
@@ -19,12 +19,11 @@ public:
void addActor(PActor actor);
void addPrimitiveComponent(PPrimitiveComponent comp);
const Array<PPrimitiveComponent>& getPrimitives() const { return primitives; }
private:
Array<MeshBatch> meshBatches;
Array<PActor> rootActors;
Array<PPrimitiveComponent> primitives;
const static int constant = 10;
public:
Array<MeshBatch> getMeshBatches();
};
} // namespace Seele