fix added cube/sphere

meta4d-me · Sep 21, 2023 · 02abbef · 02abbef
1 parent c28a4ee
commit 02abbef
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/Engine/Source/Editor/UILayers/EntityList.cpp b/Engine/Source/Editor/UILayers/EntityList.cpp
@@ -42,21 +42,24 @@ void EntityList::AddEntity(engine::SceneWorld* pSceneWorld)
 
     auto CreateShapeComponents = [&pSceneWorld, &pWorld, &pSceneDatabase](engine::Entity entity, cd::Mesh&& mesh, engine::MaterialType* pMaterialType)
     {
+        mesh.SetName(pSceneWorld->GetNameComponent(entity)->GetName());
+        mesh.SetID(cd::MeshID(pSceneDatabase->GetMeshCount()));
+
+        uint32_t currentMeshCount = pSceneDatabase->GetMeshCount();
+        pSceneDatabase->AddMesh(cd::MoveTemp(mesh));
+        const cd::Mesh& newAddedShape = pSceneDatabase->GetMesh(currentMeshCount);
+
         auto& collisionMeshComponent = pWorld->CreateComponent<engine::CollisionMeshComponent>(entity);
         collisionMeshComponent.SetType(engine::CollisonMeshType::AABB);
-        collisionMeshComponent.SetAABB(mesh.GetAABB());
+        collisionMeshComponent.SetAABB(newAddedShape.GetAABB());
         collisionMeshComponent.Build();
 
         auto& staticMeshComponent = pWorld->CreateComponent<engine::StaticMeshComponent>(entity);
-        staticMeshComponent.SetMeshData(&mesh);
+        staticMeshComponent.SetMeshData(&newAddedShape);
         staticMeshComponent.SetRequiredVertexFormat(&pMaterialType->GetRequiredVertexFormat());
         staticMeshComponent.Build();
         staticMeshComponent.Submit();
 
-        mesh.SetName(pSceneWorld->GetNameComponent(entity)->GetName());
-        mesh.SetID(cd::MeshID(pSceneDatabase->GetMeshCount()));
-        pSceneDatabase->AddMesh(cd::MoveTemp(mesh));
-
         auto& materialComponent = pWorld->CreateComponent<engine::MaterialComponent>(entity);
         materialComponent.Init();
         materialComponent.SetMaterialType(pMaterialType);