Skip to content
Snippets Groups Projects

Material refactoring

Merged m.puchner requested to merge materialRefactoring into develop
2 files
+ 0
27
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -14,11 +14,9 @@
#include "GUI/Model/Material/MaterialItemUtils.h"
#include "GUI/Model/Material/MaterialItem.h"
#include "GUI/Model/Material/MaterialItemContainer.h"
#include "GUI/Model/Material/MaterialModel.h"
#include "GUI/Model/Material/MaterialModelStore.h"
#include "GUI/Util/Error.h"
#include "Sample/Material/Material.h"
#include <deque>
#include <random>
@@ -41,24 +39,6 @@ QString GUI::MaterialUtil::defaultMaterialIdentifier()
return materials.isEmpty() ? QString() : materials.front()->identifier();
}
std::unique_ptr<Material> GUI::MaterialUtil::createDomainMaterial(const QString& materialIdentifier)
{
MaterialItem* materialItem = findMaterial(materialIdentifier);
return materialItem->createMaterial();
}
std::unique_ptr<Material>
GUI::MaterialUtil::createDomainMaterial(const QString& materialIdentifier,
const MaterialItemContainer& container)
{
const MaterialItem* material_item = container.findMaterialById(materialIdentifier);
if (!material_item)
throw Error("MaterialUtils::createDomainMaterial() -> Error. Can't find "
"material with identifier '"
+ materialIdentifier + "'.");
return material_item->createMaterial();
}
MaterialItem* GUI::MaterialUtil::findMaterial(const QString& materialIdentifier)
{
if (!GUI::Model::MaterialModelStore::materialModel())
Loading