juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-30 16:42:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use AMF object and volume metadata for handling per-object and per-volume settings

Browse Source
This commit is contained in:
Alessandro Ranellucci
2014-07-11 20:09:01 +02:00
parent 4d67f902b6
commit f82a8475a1
7 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xs/src/Model.cpp
View File

@@ -321,7 +321,7 @@ ModelVolume::ModelVolume(ModelObject* object, const TriangleMesh &mesh)
{}
ModelVolume::ModelVolume(ModelObject* object, const ModelVolume &other)
: object(object), mesh(other.mesh), modifier(other.modifier)
: object(object), mesh(other.mesh), config(other.config), modifier(other.modifier)
{
this->material_id(other.material_id());
}

1
xs/src/Model.hpp
View File

@@ -139,6 +139,7 @@ class ModelVolume
friend class ModelObject;
public:
TriangleMesh mesh;
DynamicPrintConfig config;
bool modifier;
ModelObject* get_object() const { return this->object; };

2
xs/xsp/Model.xsp
View File

@@ -167,6 +167,8 @@ ModelMaterial::attributes()
%code%{ THIS->material_id(material_id); %};
Ref<ModelMaterial> material();
Ref<DynamicPrintConfig> config()
%code%{ RETVAL = &THIS->config; %};
Ref<TriangleMesh> mesh()
%code%{ RETVAL = &THIS->mesh; %};