Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-13 06:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

prepare for referencing

Browse Source
This commit is contained in:
D4ve-R
2023-05-19 07:58:43 +02:00
parent f8032e1dc6
commit 6cdabe1335
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/serializers/USDSerializer.cpp
+14 -10
View File
@@ -36,12 +36,16 @@ USDSerializer::USDSerializer(const std::string& out_filename, const SerializerSe
WriteOnlyGeometrySerializer(settings), WriteOnlyGeometrySerializer(settings),
filename_(out_filename) filename_(out_filename)
{ {
std::size_t found = filename_.find_last_of("/\\");
parent_path_ = filename_.substr(0, found != std::string::npos ? found + 1 : 0);
stage_ = pxr::UsdStage::CreateNew(filename_); stage_ = pxr::UsdStage::CreateNew(filename_);
if(!stage_) if(!stage_)
throw std::runtime_error("Could not create USD stage"); throw std::runtime_error("Could not create USD stage");
pxr::UsdGeomSetStageUpAxis(stage_, pxr::UsdGeomTokens->z); if(!settings.get(SerializerSettings::USE_Y_UP))
pxr::UsdGeomSetStageUpAxis(stage_, pxr::UsdGeomTokens->z);
pxr::UsdGeomSetStageMetersPerUnit(stage_, 1.0f); pxr::UsdGeomSetStageMetersPerUnit(stage_, 1.0f);
auto world = pxr::UsdGeomXform::Define(stage_, pxr::SdfPath("/World")); auto world = pxr::UsdGeomXform::Define(stage_, pxr::SdfPath("/World"));
@@ -128,6 +132,7 @@ void USDSerializer::writeHeader() {
} }
void USDSerializer::write(const IfcGeom::TriangulationElement* o) { void USDSerializer::write(const IfcGeom::TriangulationElement* o) {
pxr::UsdGeomMesh usd_mesh;
const IfcGeom::Representation::Triangulation& mesh = o->geometry(); const IfcGeom::Representation::Triangulation& mesh = o->geometry();
const auto verts = mesh.verts(); const auto verts = mesh.verts();
const auto faces = mesh.faces(); const auto faces = mesh.faces();
@@ -138,17 +143,14 @@ void USDSerializer::write(const IfcGeom::TriangulationElement* o) {
return; return;
std::string name = o->name(); std::string name = o->name();
const std::string type = o->type();
const std::string id = std::to_string(o->id());
if(name.empty()) { if(name.empty()) {
name = "UnNamed"; name = type + "_UnNamed_" + id;
} else { } else {
name = usd_utils::toPath(name); name = type + "_" + usd_utils::toPath(name) + "_" + id;
} }
name += "_" + std::to_string(o->id()); usd_mesh = pxr::UsdGeomMesh::Define(stage_, pxr::SdfPath("/World/" + name));
auto usd_mesh = pxr::UsdGeomMesh::Define(stage_, pxr::SdfPath("/World/" + name));
usd_mesh.AddTranslateOp().Set(pxr::GfVec3d(m[9], m[10], m[11]));
usd_mesh.AddRotateXYZOp().Set(rotation_degrees_from_matrix(m));
pxr::VtVec3fArray points; pxr::VtVec3fArray points;
for(std::size_t i = 0; i < verts.size(); i+=3) { for(std::size_t i = 0; i < verts.size(); i+=3) {
points.push_back(pxr::GfVec3f(static_cast<float>(verts[i]), points.push_back(pxr::GfVec3f(static_cast<float>(verts[i]),
@@ -156,10 +158,12 @@ void USDSerializer::write(const IfcGeom::TriangulationElement* o) {
static_cast<float>(verts[i+2]))); static_cast<float>(verts[i+2])));
} }
usd_mesh.CreatePointsAttr().Set(points); usd_mesh.CreatePointsAttr().Set(points);
usd_mesh.CreateFaceVertexIndicesAttr().Set(usd_utils::toVtArray(faces)); usd_mesh.CreateFaceVertexIndicesAttr().Set(usd_utils::toVtArray(faces));
usd_mesh.CreateFaceVertexCountsAttr().Set(pxr::VtArray<int>((int) faces.size() / 3, 3)); usd_mesh.CreateFaceVertexCountsAttr().Set(pxr::VtArray<int>((int) faces.size() / 3, 3));
usd_mesh.AddTranslateOp().Set(pxr::GfVec3d(m[9], m[10], m[11]));
usd_mesh.AddRotateXYZOp().Set(rotation_degrees_from_matrix(m));
pxr::VtVec3fArray normals; pxr::VtVec3fArray normals;
for (std::vector<double>::const_iterator it = mesh.normals().begin(); it != mesh.normals().end();) for (std::vector<double>::const_iterator it = mesh.normals().begin(); it != mesh.normals().end();)
normals.push_back(pxr::GfVec3f(static_cast<float>(*(it++)), static_cast<float>(*(it++)), static_cast<float>(*(it++)))); normals.push_back(pxr::GfVec3f(static_cast<float>(*(it++)), static_cast<float>(*(it++)), static_cast<float>(*(it++))));
src/serializers/USDSerializer.h
+2
View File
@@ -62,8 +62,10 @@ class SERIALIZERS_API USDSerializer : public WriteOnlyGeometrySerializer {
private: private:
bool ready_ = false; bool ready_ = false;
const std::string filename_; const std::string filename_;
std::string parent_path_;
pxr::UsdStageRefPtr stage_; pxr::UsdStageRefPtr stage_;
std::map<std::string, pxr::UsdShadeMaterial> materials_; std::map<std::string, pxr::UsdShadeMaterial> materials_;
std::map<std::string, std::string> meshes_;
std::vector<pxr::UsdShadeMaterial> createMaterials(const std::vector<IfcGeom::Material>&); std::vector<pxr::UsdShadeMaterial> createMaterials(const std::vector<IfcGeom::Material>&);
pxr::GfVec3f rotation_degrees_from_matrix(const std::vector<double>&) const; pxr::GfVec3f rotation_degrees_from_matrix(const std::vector<double>&) const;