From 500f3b60860a4e3081aa42eb534e3255e7d8e23e Mon Sep 17 00:00:00 2001 From: marioalexis Date: Mon, 22 Jan 2024 00:52:10 -0300 Subject: [PATCH] Material: Initialize types --- src/Mod/Material/App/AppMaterial.cpp | 24 ++++++++++++++++++++++++ src/Mod/Material/App/MaterialLibrary.cpp | 4 ++-- src/Mod/Material/App/ModelLibrary.cpp | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/Mod/Material/App/AppMaterial.cpp b/src/Mod/Material/App/AppMaterial.cpp index 9d2471c657..b63547925d 100644 --- a/src/Mod/Material/App/AppMaterial.cpp +++ b/src/Mod/Material/App/AppMaterial.cpp @@ -28,6 +28,8 @@ #include // #include "Model.h" +#include "MaterialFilter.h" + #include "MaterialManagerPy.h" #include "MaterialPy.h" #include "ModelManagerPy.h" @@ -71,5 +73,27 @@ PyMOD_INIT_FUNC(Material) Base::Interpreter().addType(&Materials::ModelPy ::Type, module, "Model"); Base::Interpreter().addType(&Materials::UUIDsPy ::Type, module, "UUIDs"); + + // Initialize types + + Materials::Material ::init(); + Materials::MaterialFilter ::init(); + Materials::MaterialManager ::init(); + Materials::Model ::init(); + Materials::ModelManager ::init(); + Materials::ModelUUIDs ::init(); + + Materials::LibraryBase ::init(); + Materials::MaterialLibrary ::init(); + Materials::ModelLibrary ::init(); + Materials::MaterialExternalLibrary ::init(); + + Materials::ModelProperty ::init(); + Materials::MaterialProperty ::init(); + + Materials::MaterialValue ::init(); + Materials::Material2DArray ::init(); + Materials::Material3DArray ::init(); + PyMOD_Return(module); } diff --git a/src/Mod/Material/App/MaterialLibrary.cpp b/src/Mod/Material/App/MaterialLibrary.cpp index 1a1573e388..87de1c2104 100644 --- a/src/Mod/Material/App/MaterialLibrary.cpp +++ b/src/Mod/Material/App/MaterialLibrary.cpp @@ -41,7 +41,7 @@ using namespace Materials; /* TRANSLATOR Material::Materials */ -TYPESYSTEM_SOURCE(Materials::MaterialLibrary, LibraryBase) +TYPESYSTEM_SOURCE(Materials::MaterialLibrary, Materials::LibraryBase) MaterialLibrary::MaterialLibrary(const QString& libraryName, const QString& dir, @@ -352,7 +352,7 @@ MaterialLibrary::getMaterialTree(const MaterialFilter* filter) const return materialTree; } -TYPESYSTEM_SOURCE(Materials::MaterialExternalLibrary, MaterialLibrary::MaterialLibrary) +TYPESYSTEM_SOURCE(Materials::MaterialExternalLibrary, Materials::MaterialLibrary) MaterialExternalLibrary::MaterialExternalLibrary(const QString& libraryName, const QString& dir, diff --git a/src/Mod/Material/App/ModelLibrary.cpp b/src/Mod/Material/App/ModelLibrary.cpp index 87a4387263..40df9b3366 100644 --- a/src/Mod/Material/App/ModelLibrary.cpp +++ b/src/Mod/Material/App/ModelLibrary.cpp @@ -99,7 +99,7 @@ QString LibraryBase::getRelativePath(const QString& path) const return filePath; } -TYPESYSTEM_SOURCE(Materials::ModelLibrary, LibraryBase) +TYPESYSTEM_SOURCE(Materials::ModelLibrary, Materials::LibraryBase) ModelLibrary::ModelLibrary(const QString& libraryName, const QString& dir, const QString& icon) : LibraryBase(libraryName, dir, icon)