Skip to content
Snippets Groups Projects
Commit 8f30bef7 authored by Matthias Puchner's avatar Matthias Puchner
Browse files

rm obsolete code

parent 03b49745
No related branches found
No related tags found
1 merge request!489Material refactoring
......@@ -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())
......
......@@ -21,9 +21,6 @@
class Material;
class MaterialItem;
class MaterialItemContainer;
class ItemWithMaterial;
class ParticleLayoutItem;
namespace GUI::MaterialUtil {
......@@ -31,10 +28,6 @@ QColor randomMaterialColor();
QString defaultMaterialIdentifier();
std::unique_ptr<Material> createDomainMaterial(const QString& materialIdentifier);
std::unique_ptr<Material> createDomainMaterial(const QString& materialIdentifier,
const MaterialItemContainer& container);
MaterialItem* findMaterial(const QString& materialIdentifier);
} // namespace GUI::MaterialUtil
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment