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.

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

Convert tool to convert wmtk mesh types #832

Merged
merged 33 commits into from
Nov 16, 2024
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
3062a30
moved named multimesh to from the input component to the multimesh co…
mtao Oct 27, 2024
d6f06f4
preparing output component to output named multimesh stuff
mtao Oct 27, 2024
293c7b4
making input/output both support writing json for name data
mtao Oct 29, 2024
5efcc0c
Updating input slightly
mtao Oct 29, 2024
6625c75
Merge branch 'mtao/simpler_app_declaration' into mtao/multimesh_namin…
mtao Oct 29, 2024
1e68032
fixing keys when htere are multiple meshes
mtao Oct 29, 2024
39e3c81
adding convert app
mtao Oct 29, 2024
6450327
adding basic convert app
mtao Oct 29, 2024
cce6bad
making convert output meshes potentially
mtao Oct 29, 2024
8751e61
adding example usage of convert app
mtao Oct 29, 2024
2a09c8d
updating convert to support output better
mtao Oct 30, 2024
c78b88f
being more explicit when fetching std::optional<fs::path> from json i…
mtao Nov 3, 2024
8a22d17
Merge remote-tracking branch 'upstream/main' into mtao/multimesh_nami…
mtao Nov 3, 2024
03ccb0e
adding a data dir for convert
mtao Nov 3, 2024
ea83f61
update on output component for windows std::optional<fs::path> to json
mtao Nov 3, 2024
4be06a5
updating named mesh tooling for getting all meshes
mtao Nov 5, 2024
184f4e6
Merge remote-tracking branch 'upstream/main' into mtao/multimesh_nami…
mtao Nov 5, 2024
5fc0f19
updates
mtao Nov 6, 2024
74d6ea3
Adding a path resolver class to encapsulate path stuff from json
mtao Nov 8, 2024
5834c11
fixing path resolver usage
mtao Nov 9, 2024
a4f7c7b
cnovert seems to work
mtao Nov 11, 2024
1fec8f2
naming works better now with convert app
mtao Nov 11, 2024
5868840
updates
mtao Nov 11, 2024
17e97a5
removing data dir printout
mtao Nov 12, 2024
cbee74a
updates
mtao Nov 12, 2024
c86b1dc
adding unit tests for convert app
mtao Nov 12, 2024
5f5c15e
removing temporary test filesl
mtao Nov 12, 2024
241468d
fixing camel split
mtao Nov 12, 2024
4e0d6b1
Merge remote-tracking branch 'upstream/main' into mtao/multimesh_nami…
mtao Nov 14, 2024
f2be66e
updating path for diff versions of split_path
mtao Nov 14, 2024
87c1efe
removing spurious print statements
mtao Nov 15, 2024
19f4428
missing cpp20 check
mtao Nov 15, 2024
b63a823
giving up on string_view for now
mtao Nov 15, 2024
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
Prev Previous commit
Next Next commit
updates
mtao committed Nov 12, 2024

Verified

This commit was signed with the committer’s verified signature.
torkelrogstad Torkel Rogstad
commit cbee74aefa153c2b8b023a261c008cf49307224a
2 changes: 1 addition & 1 deletion applications/convert/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -20,6 +20,6 @@ wmtk_register_integration_test(
CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/test_config.json
CONFIG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/examples
GIT_REPOSITORY "https://github.com/wildmeshing/data.git"
GIT_TAG 152a561697a6e923451ca8535309cbe1e116a9fa
GIT_TAG 363f8e860673a4e4f68df6465b99e86809c96283
#EXTRA_ARGUMENTS run
)
Empty file.
23 changes: 0 additions & 23 deletions applications/convert/examples/merge_uv.json

This file was deleted.

19 changes: 10 additions & 9 deletions applications/convert/examples/split_uv.json
Original file line number Diff line number Diff line change
@@ -11,15 +11,16 @@
}
],
"output": {
"position": {
"file": "ogre_pos.vtu",
"position_attribute": "vertices"
},
"position.uv": {
"file": "ogre_uv.vtu",
"position_attribute": "vertices"
}
}
"position": {
"file": "ogre_pos.vtu",
"position_attribute": "vertices"
},
"position.uv": {
"file": "ogre_uv.vtu",
"position_attribute": "vertices"
}
},
"root": "/home/mtao/.local/cpm/wmtk_data/aa0abd4658bb064515ee7cc2a7be87aa",
"tree": {
"position": "uv"
}
Original file line number Diff line number Diff line change
@@ -283,5 +283,7 @@ void NamedMultiMesh::append_child_mesh_names(const Mesh& parent, const NamedMult
} else if (child_size < id) {
*cur_mesh->m_children[id] = *o.m_name_root;
}
cur_mesh->update_child_names();

}
} // namespace wmtk::components::multimesh