kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Materials: External Modules Part 1

Browse Source 
Refactored code to support local and external material sources

This is the first PR in a series to support external modules. External
modules allow materials to be stored in external data sources such as
databases or web services. No new functionality is introduced in this
PR, rather it is a refactoring of code that will allow for changes to
be introduced in future PRs. Minor performance improvements have also
been made in the model and material managers.

The Python API has been enhanced for many data types to allow for
modification within Python.
This commit is contained in:
David Carter
2025-03-07 10:13:56 -05:00
committed by Chris Hennes
parent 3c4977a2d4
commit 00c57a9d08
80 changed files with 4372 additions and 1396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Mod/Material/App/MaterialLoader.h
View File

@@ -33,12 +33,14 @@
namespace Materials
{
class MaterialLibrary;
class MaterialLibraryLocal;
class MaterialEntry
{
public:
MaterialEntry() = default;
MaterialEntry(const std::shared_ptr<MaterialLibrary>& library,
MaterialEntry(const std::shared_ptr<MaterialLibraryLocal>& library,
const QString& modelName,
const QString& dir,
const QString& modelUuid);
@@ -47,7 +49,7 @@ public:
virtual void
addToTree(std::shared_ptr<std::map<QString, std::shared_ptr<Material>>> materialMap) = 0;
std::shared_ptr<MaterialLibrary> getLibrary() const
std::shared_ptr<MaterialLibraryLocal> getLibrary() const
{
return _library;
}
@@ -65,7 +67,7 @@ public:
}
protected:
std::shared_ptr<MaterialLibrary> _library;
std::shared_ptr<MaterialLibraryLocal> _library;
QString _name;
QString _directory;
QString _uuid;
@@ -74,7 +76,7 @@ protected:
class MaterialYamlEntry: public MaterialEntry
{
public:
MaterialYamlEntry(const std::shared_ptr<MaterialLibrary>& library,
MaterialYamlEntry(const std::shared_ptr<MaterialLibraryLocal>& library,
const QString& modelName,
const QString& dir,
const QString& modelUuid,
@@ -101,8 +103,8 @@ private:
static std::shared_ptr<QList<QVariant>> readList(const YAML::Node& node,
bool isImageList = false);
static std::shared_ptr<QList<QVariant>> readImageList(const YAML::Node& node);
static std::shared_ptr<Material2DArray> read2DArray(const YAML::Node& node, int columns);
static std::shared_ptr<Material3DArray> read3DArray(const YAML::Node& node, int columns);
static std::shared_ptr<Array2D> read2DArray(const YAML::Node& node, int columns);
static std::shared_ptr<Array3D> read3DArray(const YAML::Node& node, int columns);
YAML::Node _model;
};
@@ -114,14 +116,14 @@ public:
const std::shared_ptr<std::list<std::shared_ptr<MaterialLibrary>>>& libraryList);
~MaterialLoader() = default;
std::shared_ptr<std::list<std::shared_ptr<MaterialLibrary>>> getMaterialLibraries();
static std::shared_ptr<std::list<QString>> getMaterialFolders(const MaterialLibrary& library);
static std::shared_ptr<std::list<QString>>
getMaterialFolders(const MaterialLibraryLocal& library);
static void showYaml(const YAML::Node& yaml);
static void
dereference(const std::shared_ptr<std::map<QString, std::shared_ptr<Material>>>& materialMap,
const std::shared_ptr<Material>& material);
static std::shared_ptr<MaterialEntry>
getMaterialFromYAML(const std::shared_ptr<MaterialLibrary>& library,
getMaterialFromYAML(const std::shared_ptr<MaterialLibraryLocal>& library,
YAML::Node& yamlroot,
const QString& path);
@@ -131,10 +133,11 @@ private:
void addToTree(std::shared_ptr<MaterialEntry> model);
void dereference(const std::shared_ptr<Material>& material);
std::shared_ptr<MaterialEntry>
getMaterialFromPath(const std::shared_ptr<MaterialLibrary>& library, const QString& path) const;
void addLibrary(const std::shared_ptr<MaterialLibrary>& model);
void loadLibrary(const std::shared_ptr<MaterialLibrary>& library);
void loadLibraries();
getMaterialFromPath(const std::shared_ptr<MaterialLibraryLocal>& library, const QString& path) const;
void addLibrary(const std::shared_ptr<MaterialLibraryLocal>& model);
void loadLibrary(const std::shared_ptr<MaterialLibraryLocal>& library);
void loadLibraries(
const std::shared_ptr<std::list<std::shared_ptr<MaterialLibrary>>>& libraryList);
static std::unique_ptr<std::map<QString, std::shared_ptr<MaterialEntry>>> _materialEntryMap;
std::shared_ptr<std::map<QString, std::shared_ptr<Material>>> _materialMap;