mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-08-21 00:51:56 -06:00
ENABLE_ENHANCED_RELOAD_FROM_DISK set as default
This commit is contained in:
parent
1115e77b38
commit
2dc9949a4c
13 changed files with 10 additions and 269 deletions
|
@ -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())
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -15,10 +15,8 @@
|
|||
#include <stack>
|
||||
#include <vector>
|
||||
|
||||
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
#include <boost/algorithm/string/classification.hpp>
|
||||
#include <boost/algorithm/string/split.hpp>
|
||||
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
|
||||
#ifdef SLIC3R_DEBUG
|
||||
#include "SVG.hpp"
|
||||
|
@ -1381,7 +1379,6 @@ void Transformation::set_from_transform(const Transform3d& transform)
|
|||
// std::cout << "something went wrong in extracting data from matrix" << std::endl;
|
||||
}
|
||||
|
||||
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
void Transformation::set_from_string(const std::string& transform_str)
|
||||
{
|
||||
Transform3d transform = Transform3d::Identity();
|
||||
|
@ -1407,7 +1404,6 @@ void Transformation::set_from_string(const std::string& transform_str)
|
|||
|
||||
set_from_transform(transform);
|
||||
}
|
||||
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
|
||||
void Transformation::reset()
|
||||
{
|
||||
|
|
|
@ -278,9 +278,7 @@ public:
|
|||
void set_mirror(Axis axis, double mirror);
|
||||
|
||||
void set_from_transform(const Transform3d& transform);
|
||||
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
void set_from_string(const std::string& transform_str);
|
||||
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
|
||||
void reset();
|
||||
|
||||
|
|
|
@ -141,14 +141,12 @@ Model Model::read_from_archive(const std::string& input_file, DynamicPrintConfig
|
|||
|
||||
for (ModelObject *o : model.objects)
|
||||
{
|
||||
#if !ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
if (boost::algorithm::iends_with(input_file, ".zip.amf"))
|
||||
{
|
||||
// we remove the .zip part of the extension to avoid it be added to filenames when exporting
|
||||
o->input_file = boost::ireplace_last_copy(input_file, ".zip.", ".");
|
||||
}
|
||||
else
|
||||
#endif // !ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
// if (boost::algorithm::iends_with(input_file, ".zip.amf"))
|
||||
// {
|
||||
// // we remove the .zip part of the extension to avoid it be added to filenames when exporting
|
||||
// o->input_file = boost::ireplace_last_copy(input_file, ".zip.", ".");
|
||||
// }
|
||||
// else
|
||||
o->input_file = input_file;
|
||||
}
|
||||
|
||||
|
@ -172,11 +170,9 @@ ModelObject* Model::add_object(const char *name, const char *path, const Triangl
|
|||
new_object->input_file = path;
|
||||
ModelVolume *new_volume = new_object->add_volume(mesh);
|
||||
new_volume->name = name;
|
||||
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
new_volume->source.input_file = path;
|
||||
new_volume->source.object_idx = (int)this->objects.size() - 1;
|
||||
new_volume->source.volume_idx = (int)new_object->volumes.size() - 1;
|
||||
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
new_object->invalidate_bounding_box();
|
||||
return new_object;
|
||||
}
|
||||
|
@ -189,11 +185,9 @@ ModelObject* Model::add_object(const char *name, const char *path, TriangleMesh
|
|||
new_object->input_file = path;
|
||||
ModelVolume *new_volume = new_object->add_volume(std::move(mesh));
|
||||
new_volume->name = name;
|
||||
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
new_volume->source.input_file = path;
|
||||
new_volume->source.object_idx = (int)this->objects.size() - 1;
|
||||
new_volume->source.volume_idx = (int)new_object->volumes.size() - 1;
|
||||
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
new_object->invalidate_bounding_box();
|
||||
return new_object;
|
||||
}
|
||||
|
@ -1555,11 +1549,7 @@ bool ModelVolume::is_splittable() const
|
|||
return m_is_splittable == 1;
|
||||
}
|
||||
|
||||
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
void ModelVolume::center_geometry_after_creation(bool update_source_offset)
|
||||
#else
|
||||
void ModelVolume::center_geometry_after_creation()
|
||||
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
{
|
||||
Vec3d shift = this->mesh().bounding_box().center();
|
||||
if (!shift.isApprox(Vec3d::Zero()))
|
||||
|
@ -1570,10 +1560,9 @@ void ModelVolume::center_geometry_after_creation()
|
|||
const_cast<TriangleMesh*>(m_convex_hull.get())->translate(-(float)shift(0), -(float)shift(1), -(float)shift(2));
|
||||
translate(shift);
|
||||
}
|
||||
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
|
||||
if (update_source_offset)
|
||||
source.mesh_offset = shift;
|
||||
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
}
|
||||
|
||||
void ModelVolume::calculate_convex_hull()
|
||||
|
|
|
@ -392,7 +392,6 @@ class ModelVolume final : public ObjectBase
|
|||
{
|
||||
public:
|
||||
std::string name;
|
||||
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
// struct used by reload from disk command to recover data from disk
|
||||
struct Source
|
||||
{
|
||||
|
@ -404,7 +403,7 @@ public:
|
|||
template<class Archive> void serialize(Archive& ar) { ar(input_file, object_idx, volume_idx, mesh_offset); }
|
||||
};
|
||||
Source source;
|
||||
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
|
||||
// The triangular model.
|
||||
const TriangleMesh& mesh() const { return *m_mesh.get(); }
|
||||
void set_mesh(const TriangleMesh &mesh) { m_mesh = std::make_shared<const TriangleMesh>(mesh); }
|
||||
|
@ -453,11 +452,7 @@ public:
|
|||
|
||||
// Translates the mesh and the convex hull so that the origin of their vertices is in the center of this volume's bounding box.
|
||||
// Attention! This method may only be called just after ModelVolume creation! It must not be called once the TriangleMesh of this ModelVolume is shared!
|
||||
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
void center_geometry_after_creation(bool update_source_offset = true);
|
||||
#else
|
||||
void center_geometry_after_creation();
|
||||
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
|
||||
void calculate_convex_hull();
|
||||
const TriangleMesh& get_convex_hull() const;
|
||||
|
@ -546,11 +541,7 @@ private:
|
|||
// Copying an existing volume, therefore this volume will get a copy of the ID assigned.
|
||||
ModelVolume(ModelObject *object, const ModelVolume &other) :
|
||||
ObjectBase(other),
|
||||
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
name(other.name), source(other.source), m_mesh(other.m_mesh), m_convex_hull(other.m_convex_hull), config(other.config), m_type(other.m_type), object(object), m_transformation(other.m_transformation)
|
||||
#else
|
||||
name(other.name), m_mesh(other.m_mesh), m_convex_hull(other.m_convex_hull), config(other.config), m_type(other.m_type), object(object), m_transformation(other.m_transformation)
|
||||
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
{
|
||||
assert(this->id().valid()); assert(this->config.id().valid()); assert(this->id() != this->config.id());
|
||||
assert(this->id() == other.id() && this->config.id() == other.config.id());
|
||||
|
@ -558,11 +549,7 @@ private:
|
|||
}
|
||||
// Providing a new mesh, therefore this volume will get a new unique ID assigned.
|
||||
ModelVolume(ModelObject *object, const ModelVolume &other, const TriangleMesh &&mesh) :
|
||||
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
name(other.name), source(other.source), m_mesh(new TriangleMesh(std::move(mesh))), config(other.config), m_type(other.m_type), object(object), m_transformation(other.m_transformation)
|
||||
#else
|
||||
name(other.name), m_mesh(new TriangleMesh(std::move(mesh))), config(other.config), m_type(other.m_type), object(object), m_transformation(other.m_transformation)
|
||||
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
{
|
||||
assert(this->id().valid()); assert(this->config.id().valid()); assert(this->id() != this->config.id());
|
||||
assert(this->id() != other.id() && this->config.id() == other.config.id());
|
||||
|
@ -583,11 +570,7 @@ private:
|
|||
}
|
||||
template<class Archive> void load(Archive &ar) {
|
||||
bool has_convex_hull;
|
||||
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
ar(name, source, m_mesh, m_type, m_material_id, m_transformation, m_is_splittable, has_convex_hull);
|
||||
#else
|
||||
ar(name, m_mesh, m_type, m_material_id, m_transformation, m_is_splittable, has_convex_hull);
|
||||
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
cereal::load_by_value(ar, config);
|
||||
assert(m_mesh);
|
||||
if (has_convex_hull) {
|
||||
|
@ -600,11 +583,7 @@ private:
|
|||
}
|
||||
template<class Archive> void save(Archive &ar) const {
|
||||
bool has_convex_hull = m_convex_hull.get() != nullptr;
|
||||
#if ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
ar(name, source, m_mesh, m_type, m_material_id, m_transformation, m_is_splittable, has_convex_hull);
|
||||
#else
|
||||
ar(name, m_mesh, m_type, m_material_id, m_transformation, m_is_splittable, has_convex_hull);
|
||||
#endif // ENABLE_ENHANCED_RELOAD_FROM_DISK
|
||||
cereal::save_by_value(ar, config);
|
||||
if (has_convex_hull)
|
||||
cereal::save_optional(ar, m_convex_hull);
|
||||
|
|
|
@ -32,11 +32,4 @@
|
|||
#define ENABLE_NONCUSTOM_DATA_VIEW_RENDERING (0 && ENABLE_1_42_0_ALPHA1)
|
||||
|
||||
|
||||
//====================
|
||||
// 2.2.0.alpha1 techs
|
||||
//====================
|
||||
#define ENABLE_2_2_0_ALPHA1 1
|
||||
|
||||
#define ENABLE_ENHANCED_RELOAD_FROM_DISK (1 && ENABLE_2_2_0_ALPHA1)
|
||||
|
||||
#endif // _technologies_h_
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue