mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: Generate UUID from objectID and volumeIndex 

Jira: XXXX

Change-Id: I65147ef9b695f8af8de260d722e604b0e0bab563
Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com>
This commit is contained in:
maosheng.wei 2023-11-07 09:22:40 +08:00 committed by Lane.Wei
parent 84800a674f
commit bb31e912ef
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libslic3r/Format/bbs_3mf.cpp
View File

@ -6411,7 +6411,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
else else
stream << " <" << COMPONENT_TAG << " p:path=\"" << xml_escape(*ppath) << "\" objectid=\"" << volume_id; // << "\"/>\n"; stream << " <" << COMPONENT_TAG << " p:path=\"" << xml_escape(*ppath) << "\" objectid=\"" << volume_id; // << "\"/>\n";
if (m_production_ext) if (m_production_ext)
stream << "\" " << PUUID_ATTR << "=\"" << hex_wrap<boost::uint32_t>{(boost::uint32_t) (volume_id + (object_data.backup_id << 16))} << COMPONENT_UUID_SUFFIX; stream << "\" " << PUUID_ATTR << "=\"" << hex_wrap<boost::uint32_t>{(boost::uint32_t) (index + (object_data.backup_id << 16))} << COMPONENT_UUID_SUFFIX;
const Transform3d &transf = volume->get_matrix(); const Transform3d &transf = volume->get_matrix();
stream << "\" " << TRANSFORM_ATTR << "=\""; stream << "\" " << TRANSFORM_ATTR << "=\"";
for (unsigned c = 0; c < 4; ++c) { for (unsigned c = 0; c < 4; ++c) {
@ -6509,7 +6509,8 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
char buf[256]; char buf[256];
unsigned int vertices_count = 0; unsigned int vertices_count = 0;
//unsigned int triangles_count = 0; //unsigned int triangles_count = 0;
for (ModelVolume* volume : object.volumes) { for (unsigned int index = 0; index < object.volumes.size(); index++) {
ModelVolume *volume = object.volumes[index];
if (volume == nullptr) if (volume == nullptr)
continue; continue;
@ -6536,7 +6537,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
if (m_production_ext) { if (m_production_ext) {
std::stringstream stream; std::stringstream stream;
reset_stream(stream); reset_stream(stream);
stream << "\" " << PUUID_ATTR << "=\"" << hex_wrap<boost::uint32_t>{(boost::uint32_t) (volume_id + (object_data.backup_id << 16))} << SUB_OBJECT_UUID_SUFFIX; stream << "\" " << PUUID_ATTR << "=\"" << hex_wrap<boost::uint32_t>{(boost::uint32_t) (index + (object_data.backup_id << 16))} << SUB_OBJECT_UUID_SUFFIX;
//output_buffer += "\" "; //output_buffer += "\" ";
//output_buffer += PUUID_ATTR; //output_buffer += PUUID_ATTR;
//output_buffer += "=\""; //output_buffer += "=\"";