3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-26 02:01:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

ENABLE_ENHANCED_RELOAD_FROM_DISK set as default

Browse source
This commit is contained in:
Enrico Turri 2019-09-23 15:35:49 +02:00
parent 1115e77b38
commit 2dc9949a4c
13 changed files with 10 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/libslic3r/Format/3mf.cpp
View file

@ -31,12 +31,8 @@ namespace pt = boost::property_tree;
// VERSION NUMBERS
// 0 : .3mf, files saved by older slic3r or other applications. No version definition in them.
// 1 : Introduction of 3mf versioning. No other change in data saved into 3mf files.
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
// 2 : Meshes saved in their local system; Volumes' matrices and source data added to Metadata/Slic3r_PE_model.config file.
const unsigned int VERSION_3MF = 2;
#else
const unsigned int VERSION_3MF = 1;
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
const char* SLIC3RPE_3MF_VERSION = "slic3rpe:Version3mf"; // definition of the metadata name saved into .model file
const std::string MODEL_FOLDER = "3D/";
@ -92,7 +88,6 @@ const char* VOLUME_TYPE = "volume";
const char* NAME_KEY = "name";
const char* MODIFIER_KEY = "modifier";
const char* VOLUME_TYPE_KEY = "volume_type";
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
const char* MATRIX_KEY = "matrix";
const char* SOURCE_FILE_KEY = "source_file";
const char* SOURCE_OBJECT_ID_KEY = "source_object_id";
@ -100,7 +95,6 @@ const char* SOURCE_VOLUME_ID_KEY = "source_volume_id";
const char* SOURCE_OFFSET_X_KEY = "source_offset_x";
const char* SOURCE_OFFSET_Y_KEY = "source_offset_y";
const char* SOURCE_OFFSET_Z_KEY = "source_offset_z";
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
const unsigned int VALID_OBJECT_TYPES_COUNT = 1;
const char* VALID_OBJECT_TYPES[] =
@ -162,25 +156,15 @@ bool get_attribute_value_bool(const char** attributes, unsigned int attributes_s
return (text != nullptr) ? (bool)::atoi(text) : true;
}
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
Slic3r::Transform3d get_transform_from_3mf_specs_string(const std::string& mat_str)
#else
Slic3r::Transform3d get_transform_from_string(const std::string& mat_str)
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
{
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
// check: https://3mf.io/3d-manufacturing-format/ or https://github.com/3MFConsortium/spec_core/blob/master/3MF%20Core%20Specification.md
// to see how matrices are stored inside 3mf according to specifications
Slic3r::Transform3d ret = Slic3r::Transform3d::Identity();
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
if (mat_str.empty())
// empty string means default identity matrix
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
return ret;
#else
return Slic3r::Transform3d::Identity();
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
std::vector<std::string> mat_elements_str;
boost::split(mat_elements_str, mat_str, boost::is_any_of(" "), boost::token_compress_on);
@ -188,13 +172,8 @@ Slic3r::Transform3d get_transform_from_string(const std::string& mat_str)
unsigned int size = (unsigned int)mat_elements_str.size();
if (size != 12)
// invalid data, return identity matrix
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
return ret;
#else
return Slic3r::Transform3d::Identity();
Slic3r::Transform3d ret = Slic3r::Transform3d::Identity();
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
unsigned int i = 0;
// matrices are stored into 3mf files as 4x3
// we need to transpose them
@ -1407,11 +1386,7 @@ namespace Slic3r {
bool _3MF_Importer::_handle_start_component(const char** attributes, unsigned int num_attributes)
{
int object_id = get_attribute_value_int(attributes, num_attributes, OBJECTID_ATTR);
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
Transform3d transform = get_transform_from_3mf_specs_string(get_attribute_value_string(attributes, num_attributes, TRANSFORM_ATTR));
#else
Transform3d transform = get_transform_from_string(get_attribute_value_string(attributes, num_attributes, TRANSFORM_ATTR));
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
IdToModelObjectMap::iterator object_item = m_objects.find(object_id);
if (object_item == m_objects.end())
@ -1457,11 +1432,7 @@ namespace Slic3r {
// see specifications
int object_id = get_attribute_value_int(attributes, num_attributes, OBJECTID_ATTR);
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
Transform3d transform = get_transform_from_3mf_specs_string(get_attribute_value_string(attributes, num_attributes, TRANSFORM_ATTR));
#else
Transform3d transform = get_transform_from_string(get_attribute_value_string(attributes, num_attributes, TRANSFORM_ATTR));
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
int printable = get_attribute_value_bool(attributes, num_attributes, PRINTABLE_ATTR);
return _create_object_instance(object_id, transform, printable, 1);
@ -1674,7 +1645,6 @@ namespace Slic3r {
return false;
}
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
Slic3r::Geometry::Transformation transform;
if (m_version > 1)
{
@ -1689,7 +1659,6 @@ namespace Slic3r {
}
}
Transform3d inv_matrix = transform.get_matrix().inverse();
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
// splits volume out of imported geometry
TriangleMesh triangle_mesh;
@ -1708,16 +1677,12 @@ namespace Slic3r {
stl_facet& facet = stl.facet_start[i];
for (unsigned int v = 0; v < 3; ++v)
{
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
unsigned int tri_id = geometry.triangles[src_start_id + ii + v] * 3;
Vec3f vertex(geometry.vertices[tri_id + 0], geometry.vertices[tri_id + 1], geometry.vertices[tri_id + 2]);
if (m_version > 1)
// revert the vertices to the original mesh reference system
vertex = (inv_matrix * vertex.cast<double>()).cast<float>();
::memcpy(facet.vertex[v].data(), (const void*)vertex.data(), 3 * sizeof(float));
#else
::memcpy(facet.vertex[v].data(), (const void*)&geometry.vertices[geometry.triangles[src_start_id + ii + v] * 3], 3 * sizeof(float));
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
}
}
@ -1725,20 +1690,12 @@ namespace Slic3r {
triangle_mesh.repair();
ModelVolume* volume = object.add_volume(std::move(triangle_mesh));
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
// apply the volume matrix taken from the metadata, if present
if (m_version > 1)
volume->set_transformation(transform);
#else
volume->center_geometry_after_creation();
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
volume->calculate_convex_hull();
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
// apply the remaining volume's metadata
#else
// apply volume's name and config data
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
for (const Metadata& metadata : volume_data.metadata)
{
if (metadata.key == NAME_KEY)
@ -1747,7 +1704,6 @@ namespace Slic3r {
volume->set_type(ModelVolumeType::PARAMETER_MODIFIER);
else if (metadata.key == VOLUME_TYPE_KEY)
volume->set_type(ModelVolume::type_from_string(metadata.value));
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
else if (metadata.key == SOURCE_FILE_KEY)
volume->source.input_file = metadata.value;
else if (metadata.key == SOURCE_OBJECT_ID_KEY)
@ -1760,7 +1716,6 @@ namespace Slic3r {
volume->source.mesh_offset(1) = ::atof(metadata.value.c_str());
else if (metadata.key == SOURCE_OFFSET_Z_KEY)
volume->source.mesh_offset(2) = ::atof(metadata.value.c_str());
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
else
volume->config.set_deserialize(metadata.key, metadata.value);
}
@ -2434,7 +2389,6 @@ namespace Slic3r {
stream << " <" << METADATA_TAG << " " << TYPE_ATTR << "=\"" << VOLUME_TYPE << "\" " << KEY_ATTR << "=\"" << VOLUME_TYPE_KEY << "\" " <<
VALUE_ATTR << "=\"" << ModelVolume::type_to_string(volume->type()) << "\"/>\n";
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
// stores volume's local matrix
stream << " <" << METADATA_TAG << " " << TYPE_ATTR << "=\"" << VOLUME_TYPE << "\" " << KEY_ATTR << "=\"" << MATRIX_KEY << "\" " << VALUE_ATTR << "=\"";
const Transform3d& matrix = volume->get_matrix();
@ -2459,7 +2413,6 @@ namespace Slic3r {
stream << " <" << METADATA_TAG << " " << TYPE_ATTR << "=\"" << VOLUME_TYPE << "\" " << KEY_ATTR << "=\"" << SOURCE_OFFSET_Y_KEY << "\" " << VALUE_ATTR << "=\"" << volume->source.mesh_offset(1) << "\"/>\n";
stream << " <" << METADATA_TAG << " " << TYPE_ATTR << "=\"" << VOLUME_TYPE << "\" " << KEY_ATTR << "=\"" << SOURCE_OFFSET_Z_KEY << "\" " << VALUE_ATTR << "=\"" << volume->source.mesh_offset(2) << "\"/>\n";
}
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
// stores volume's config data
for (const std::string& key : volume->config.keys())

20
src/libslic3r/Format/AMF.cpp
View file

@ -12,9 +12,7 @@
#include "../PrintConfig.hpp"
#include "../Utils.hpp"
#include "../I18N.hpp"
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
#include "../Geometry.hpp"
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
#include "AMF.hpp"
@ -39,12 +37,8 @@
// Added x and y components of rotation
// Added x, y and z components of scale
// Added x, y and z components of mirror
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
// 3 : Meshes saved in their local system; Added volumes' matrices and source data
const unsigned int VERSION_AMF = 3;
#else
const unsigned int VERSION_AMF = 2;
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
const char* SLIC3RPE_AMF_VERSION = "slic3rpe_amf_version";
const char* SLIC3R_CONFIG_TYPE = "slic3rpe_config";
@ -569,18 +563,15 @@ void AMFParserContext::endElement(const char * /* name */)
stl.stats.original_num_facets = stl.stats.number_of_facets;
stl_allocate(&stl);
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
Slic3r::Geometry::Transformation transform;
if (m_version > 2)
transform = m_volume->get_transformation();
Transform3d inv_matrix = transform.get_matrix().inverse();
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
for (size_t i = 0; i < m_volume_facets.size();) {
stl_facet &facet = stl.facet_start[i/3];
for (unsigned int v = 0; v < 3; ++v)
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
{
unsigned int tri_id = m_volume_facets[i++] * 3;
Vec3f vertex(m_object_vertices[tri_id + 0], m_object_vertices[tri_id + 1], m_object_vertices[tri_id + 2]);
@ -589,19 +580,12 @@ void AMFParserContext::endElement(const char * /* name */)
vertex = (inv_matrix * vertex.cast<double>()).cast<float>();
::memcpy((void*)facet.vertex[v].data(), (const void*)vertex.data(), 3 * sizeof(float));
}
#else
memcpy(facet.vertex[v].data(), &m_object_vertices[m_volume_facets[i ++] * 3], 3 * sizeof(float));
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
}
stl_get_size(&stl);
mesh.repair();
m_volume->set_mesh(std::move(mesh));
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
// pass false if the mesh offset has been already taken from the data
m_volume->center_geometry_after_creation(m_volume->source.input_file.empty());
#else
m_volume->center_geometry_after_creation();
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
m_volume->calculate_convex_hull();
m_volume_facets.clear();
m_volume = nullptr;
@ -697,7 +681,6 @@ void AMFParserContext::endElement(const char * /* name */)
} else if (strcmp(opt_key, "volume_type") == 0) {
m_volume->set_type(ModelVolume::type_from_string(m_value[1]));
}
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
else if (strcmp(opt_key, "matrix") == 0) {
Geometry::Transformation transform;
transform.set_from_string(m_value[1]);
@ -721,7 +704,6 @@ void AMFParserContext::endElement(const char * /* name */)
else if (strcmp(opt_key, "source_offset_z") == 0) {
m_volume->source.mesh_offset(2) = ::atof(m_value[1].c_str());
}
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
}
} else if (m_path.size() == 3) {
if (m_path[1] == NODE_TYPE_MATERIAL) {
@ -1115,7 +1097,6 @@ bool store_amf(const char *path, Model *model, const DynamicPrintConfig *config)
if (volume->is_modifier())
stream << " <metadata type=\"slic3r.modifier\">1</metadata>\n";
stream << " <metadata type=\"slic3r.volume_type\">" << ModelVolume::type_to_string(volume->type()) << "</metadata>\n";
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
stream << " <metadata type=\"slic3r.matrix\">";
const Transform3d& matrix = volume->get_matrix();
for (int r = 0; r < 4; ++r)
@ -1137,7 +1118,6 @@ bool store_amf(const char *path, Model *model, const DynamicPrintConfig *config)
stream << " <metadata type=\"slic3r.source_offset_y\">" << volume->source.mesh_offset(1) << "</metadata>\n";
stream << " <metadata type=\"slic3r.source_offset_z\">" << volume->source.mesh_offset(2) << "</metadata>\n";
}
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
const indexed_triangle_set &its = volume->mesh().its;
for (size_t i = 0; i < its.indices.size(); ++i) {
stream << " <triangle>\n";