Dynamitos/Seele
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing more macos things

Browse Source
This commit is contained in:
Dynamitos
2024-01-18 18:39:44 +01:00
parent 00672cf08e
commit 0f6dabde86
6 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Graphics/VertexData.cpp
+5 -3
View File
@@ -30,10 +30,11 @@ void VertexData::resetMeshData()
void VertexData::updateMesh(PMesh mesh, Component::Transform& transform)
{
std::unique_lock l(materialDataLock);
PMaterial mat = mesh->referencedMaterial->getHandle()->getBaseMaterial();
PMaterialInstance referencedInstance = mesh->referencedMaterial->getHandle();
PMaterial mat = referencedInstance->getBaseMaterial();
MaterialData& matData = materialData[mat->getName()];
matData.material = mat;
MaterialInstanceData& matInstanceData = matData.instances[mesh->referencedMaterial->getHandle()->getId()];
MaterialInstanceData& matInstanceData = matData.instances[referencedInstance->getId()];
for (const auto& data : meshData[mesh->id])
{
matInstanceData.meshes.add(MeshInstanceData{
@@ -43,7 +44,8 @@ void VertexData::updateMesh(PMesh mesh, Component::Transform& transform)
.data = data,
});
}
matInstanceData.materialInstance = mesh->referencedMaterial->getHandle();
matInstanceData.materialInstance = referencedInstance;
referencedInstance->updateDescriptor();
}
void VertexData::createDescriptors()