Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Write directly to GLB from TGeometries #6404

Merged
merged 23 commits into from
Nov 1, 2023
Merged

Write directly to GLB from TGeometries #6404

Changes from 2 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
55160da
Initial implementation of glb2 export for tgeometry
errissa Sep 29, 2023
b7f792d
Add primitive type to prevent exporter crash
errissa Oct 2, 2023
9cb2935
Add normals and uvs to scene for export
errissa Oct 2, 2023
351482f
Save per-vertex color
errissa Oct 2, 2023
56f906a
Get uv coords working correctly
errissa Oct 2, 2023
0db18c4
Remove debug printout
errissa Oct 3, 2023
b2b9c6c
Style fixes
errissa Oct 3, 2023
a96da32
Skeleton of doing materials
errissa Oct 5, 2023
de84c1f
Address review comments
errissa Oct 6, 2023
21dbc5a
Ignore models when setting point and line sizes
errissa Oct 14, 2023
02486b1
Export base material properties
errissa Oct 15, 2023
05a7a64
Import clear coat using new Assimp key as backup
errissa Oct 15, 2023
ce47a25
Fix bug importing clear coat roughness
errissa Oct 16, 2023
02266d8
Remove properties not supported for export
errissa Oct 16, 2023
4222b1b
Add function to encode image to PNG in memory
errissa Oct 16, 2023
d0c5fe7
Support assimp's PBR BASE_COLOR map
errissa Oct 17, 2023
8da0f81
Add write png to memory function
errissa Oct 17, 2023
a0c4a8c
Apply style
errissa Oct 17, 2023
146288d
Complete export of texture maps
errissa Oct 17, 2023
2aea50b
Warn if mesh has triangle normals or colors
errissa Oct 18, 2023
f9937f8
Make sure Tensors are contiguous before memcpy from them
errissa Oct 18, 2023
6251a71
Swap order of operations to eliminate Tensor copy
errissa Oct 31, 2023
007348a
Make static to avoid symbol leakage
errissa Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions cpp/open3d/t/io/file_format/FileASSIMP.cpp
View file
Open in desktop
errissa marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,17 @@ bool WriteTriangleMeshUsingASSIMP(const std::string& filename,
".glb");
return false;
}
// Check for unsupported features
if (mesh.HasTriangleNormals()) {
utility::LogWarning(
"Exporting triangle normals is not supported. Please convert "
"to vertex normals or export to a format that supports it.");
}
if (mesh.HasTriangleColors()) {
utility::LogWarning(
"Exporting triangle colors is not supported. Please convert to "
"vertex colors or export to a format that supporst it.");
}

Assimp::Exporter exporter;
auto ai_scene = std::unique_ptr<aiScene>(new aiScene);
Expand All @@ -243,8 +254,9 @@ bool WriteTriangleMeshUsingASSIMP(const std::string& filename,
ai_mesh->mName.Set("Object1");
ai_mesh->mPrimitiveTypes = aiPrimitiveType_TRIANGLE;
// Guaranteed to have both vertex positions and triangle indices
auto vertices = mesh.GetVertexPositions();
auto indices = mesh.GetTriangleIndices().To(core::Dtype::UInt32);
auto vertices = mesh.GetVertexPositions().Contiguous();
auto indices =
mesh.GetTriangleIndices().Contiguous().To(core::Dtype::UInt32);
errissa marked this conversation as resolved.
Show resolved Hide resolved
ai_mesh->mNumVertices = vertices.GetShape(0);
ai_mesh->mVertices = new aiVector3D[ai_mesh->mNumVertices];
memcpy(&ai_mesh->mVertices->x, vertices.GetDataPtr(),
Expand All @@ -266,15 +278,15 @@ bool WriteTriangleMeshUsingASSIMP(const std::string& filename,
}

if (write_vertex_normals && mesh.HasVertexNormals()) {
auto normals = mesh.GetVertexNormals();
auto normals = mesh.GetVertexNormals().Contiguous();
auto m_normals = normals.GetShape(0);
ai_mesh->mNormals = new aiVector3D[m_normals];
memcpy(&ai_mesh->mNormals->x, normals.GetDataPtr(),
sizeof(float) * m_normals * 3);
}

if (write_vertex_colors && mesh.HasVertexColors()) {
auto colors = mesh.GetVertexColors();
auto colors = mesh.GetVertexColors().Contiguous();
auto m_colors = colors.GetShape(0);
ai_mesh->mColors[0] = new aiColor4D[m_colors];
if (colors.GetShape(1) == 4) {
Expand All @@ -292,7 +304,7 @@ bool WriteTriangleMeshUsingASSIMP(const std::string& filename,
}

if (write_triangle_uvs && mesh.HasTriangleAttr("texture_uvs")) {
auto triangle_uvs = mesh.GetTriangleAttr("texture_uvs");
auto triangle_uvs = mesh.GetTriangleAttr("texture_uvs").Contiguous();
auto vertex_uvs = core::Tensor::Empty({ai_mesh->mNumVertices, 2},
core::Dtype::Float32);
auto n_uvs = ai_mesh->mNumVertices;
Expand Down
Loading