zcy
/
dust3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save joint node id list

master
Jeremy HU 2022-12-01 22:42:12 +11:00
parent f447025ede
commit 995230db59
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
application/sources/document.cc
View File

@ -1739,6 +1739,13 @@ void Document::toSnapshot(dust3d::Snapshot* snapshot, const std::set<dust3d::Uui
} }
if (!boneIt.second.name.isEmpty()) if (!boneIt.second.name.isEmpty())
bone["name"] = boneIt.second.name.toUtf8().constData(); bone["name"] = boneIt.second.name.toUtf8().constData();
std::vector<std::string> nodeIdList;
for (const auto& nodeId : boneIt.second.joints) {
nodeIdList.push_back(nodeId.toString());
}
std::string nodeIds = dust3d::String::join(nodeIdList, ",");
if (!nodeIds.empty())
bone["jointNodeIdList"] = nodeIds;
snapshot->bones[bone["id"]] = bone; snapshot->bones[bone["id"]] = bone;
} }
} }
@ -1914,6 +1921,17 @@ void Document::addFromSnapshot(const dust3d::Snapshot& snapshot, enum SnapshotSo
nodeMap[node.id] = node; nodeMap[node.id] = node;
newAddedNodeIds.insert(node.id); newAddedNodeIds.insert(node.id);
} }
for (const auto& boneKv : snapshot.bones) {
std::vector<dust3d::Uuid> joints;
for (const auto& nodeIdString : dust3d::String::split(dust3d::String::valueOrEmpty(boneKv.second, "jointNodeIdList"), ',')) {
if (nodeIdString.empty())
continue;
auto newNodeId = oldNewIdMap[dust3d::Uuid(nodeIdString)];
nodeMap[newNodeId].boneJoint = true;
joints.push_back(newNodeId);
}
boneMap[oldNewIdMap[dust3d::Uuid(boneKv.first)]].joints = joints;
}
for (const auto& edgeKv : snapshot.edges) { for (const auto& edgeKv : snapshot.edges) {
if (edgeKv.second.find("from") == edgeKv.second.end() || edgeKv.second.find("to") == edgeKv.second.end() || edgeKv.second.find("partId") == edgeKv.second.end()) if (edgeKv.second.find("from") == edgeKv.second.end() || edgeKv.second.find("to") == edgeKv.second.end() || edgeKv.second.find("partId") == edgeKv.second.end())
continue; continue;
@ -2780,7 +2798,7 @@ bool Document::isTextureGenerating() const
void Document::copyNodes(std::set<dust3d::Uuid> nodeIdSet) const void Document::copyNodes(std::set<dust3d::Uuid> nodeIdSet) const
{ {
dust3d::Snapshot snapshot; dust3d::Snapshot snapshot;
toSnapshot(&snapshot, nodeIdSet, Document::SnapshotFor::Nodes); toSnapshot(&snapshot, nodeIdSet, Document::SnapshotFor::Document);
std::string snapshotXml; std::string snapshotXml;
dust3d::saveSnapshotToXmlString(snapshot, snapshotXml); dust3d::saveSnapshotToXmlString(snapshot, snapshotXml);
QClipboard* clipboard = QApplication::clipboard(); QClipboard* clipboard = QApplication::clipboard();