From 8f4b799ddb22b1a0ef59240f1e6299059bb3e8b7 Mon Sep 17 00:00:00 2001 From: Filip Sykala - NTB T15p Date: Wed, 20 Jul 2022 14:46:48 +0200 Subject: [PATCH] Add cereal include + simplify load/save to serialize --- src/libslic3r/Point.hpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/libslic3r/Point.hpp b/src/libslic3r/Point.hpp index f96dd801a..dbf3c3832 100644 --- a/src/libslic3r/Point.hpp +++ b/src/libslic3r/Point.hpp @@ -540,6 +540,7 @@ namespace boost { namespace polygon { } } // end Boost +#include // Serialization through the Cereal library namespace cereal { // template void serialize(Archive& archive, Slic3r::Vec2crd &v) { archive(v.x(), v.y()); } @@ -554,16 +555,10 @@ namespace cereal { template void serialize(Archive& archive, Slic3r::Vec3d &v) { archive(v.x(), v.y(), v.z()); } template void serialize(Archive& archive, Slic3r::Matrix4d &m){ archive(binary_data(m.data(), 4*4*sizeof(double))); } - template void load(Archive& archive, Slic3r::Matrix2f &m) { archive.loadBinary((char*)m.data(), sizeof(float) * 4); } - template void save(Archive& archive, Slic3r::Matrix2f &m) { archive.saveBinary((char*)m.data(), sizeof(float) * 4); } + template void serialize(Archive& archive, Slic3r::Matrix2f &m){ archive(binary_data(m.data(), 2*2*sizeof(float))); } // Eigen Transformation serialization template inline void serialize(Archive& archive, Eigen::Transform& t){ archive(t.matrix()); } - -#if ENABLE_WORLD_COORDINATE - //template void load(Archive& archive, Slic3r::Transform3d& m) { archive.loadBinary((char*)m.data(), sizeof(double) * 16); } - //template void save(Archive& archive, const Slic3r::Transform3d& m) { archive.saveBinary((char*)m.data(), sizeof(double) * 16); } -#endif // ENABLE_WORLD_COORDINATE } // To be able to use Vec<> and Mat<> in range based for loops: