ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

sceneconverter: rename options in preparation for whole scene conversion. 

Not sure why I didn't do this from the start, I knew this tool would
eventually be for whole scenes. Now it's an unfortunate breaking change.
pull/594/head
Vladimír Vondruš 4 years ago
parent
0a2148b93f
commit
5114893d31
3 changed files with 52 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      doc/changelog.dox
  2. 22
      src/Magnum/SceneTools/Test/SceneConverterTest.cpp
  3. 69
      src/Magnum/SceneTools/sceneconverter.cpp

6
doc/changelog.dox
Unescape View File

@ -1135,6 +1135,12 @@ See also:
made both @cpp nullptr @ce even before the object/feature destructors were made both @cpp nullptr @ce even before the object/feature destructors were
called and so it's assumed no code relied on such behavior, nevertheless called and so it's assumed no code relied on such behavior, nevertheless
it's a subtle change worth mentioning. it's a subtle change worth mentioning.
- @ref magnum-sceneconverter "magnum-sceneconverter" options
`--level`, `--only-attributes`, `--remove-duplicates` and
`--remove-duplicates-fuzzy` were renamed to `--mesh-level`,
`--only-mesh-attributes`, `--remove-duplicate-vertices` and
`--remove-duplicate-vertices-fuzzy`, respectively, to make it clear they
affect meshes and not other scene content
- Due to the rework of @ref Shaders::PhongGL to support directional and - Due to the rework of @ref Shaders::PhongGL to support directional and
attenuated point lights, the original behavior of unattenuated point lights attenuated point lights, the original behavior of unattenuated point lights
isn't available anymore. For backwards compatibility, light positions isn't available anymore. For backwards compatibility, light positions

22
src/Magnum/SceneTools/Test/SceneConverterTest.cpp
Unescape View File

@ -169,37 +169,37 @@ const struct {
"GltfImporter", "StanfordSceneConverter", "GltfImporter", "StanfordSceneConverter",
"quad-duplicates.ply", "quad-duplicates.ply",
{}}, {}},
{"filter attributes", Containers::array<Containers::String>({ {"filter mesh attributes", Containers::array<Containers::String>({
/* Only 0 gets picked from here, others ignored */ /* Only 0 gets picked from here, others ignored */
"--only-attributes", "17,0,25-36", "--only-mesh-attributes", "17,0,25-36",
Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/quad-normals-texcoords.obj"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/quad.ply")}), Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/quad-normals-texcoords.obj"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/quad.ply")}),
"ObjImporter", "StanfordSceneConverter", "ObjImporter", "StanfordSceneConverter",
"quad.ply", "quad.ply",
{}}, {}},
{"remove duplicates", Containers::array<Containers::String>({ {"remove duplicate vertices", Containers::array<Containers::String>({
"--remove-duplicates", "--remove-duplicate-vertices",
Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/quad-duplicates.obj"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/quad.ply")}), Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/quad-duplicates.obj"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/quad.ply")}),
"ObjImporter", "StanfordSceneConverter", "ObjImporter", "StanfordSceneConverter",
"quad.ply", "quad.ply",
{}}, {}},
{"remove duplicates, verbose", Containers::array<Containers::String>({ {"remove duplicate vertices, verbose", Containers::array<Containers::String>({
/* Forcing the importer and converter to avoid AnySceneImporter / /* Forcing the importer and converter to avoid AnySceneImporter /
AnySceneConverter delegation messages */ AnySceneConverter delegation messages */
"--remove-duplicates", "-v", "-I", "ObjImporter", "-C", "StanfordSceneConverter", "--remove-duplicate-vertices", "-v", "-I", "ObjImporter", "-C", "StanfordSceneConverter",
Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/quad-duplicates.obj"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/quad.ply")}), Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/quad-duplicates.obj"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/quad.ply")}),
"ObjImporter", "StanfordSceneConverter", "ObjImporter", "StanfordSceneConverter",
"quad.ply", "quad.ply",
"Duplicate removal: 6 -> 4 vertices\n"}, "Duplicate removal: 6 -> 4 vertices\n"},
{"remove duplicates fuzzy", Containers::array<Containers::String>({ {"remove duplicate vertices fuzzy", Containers::array<Containers::String>({
"--remove-duplicates-fuzzy 1.0e-1", "--remove-duplicate-vertices-fuzzy", "1.0e-1",
Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/quad-duplicates-fuzzy.obj"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/quad.ply")}), Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/quad-duplicates-fuzzy.obj"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/quad.ply")}),
"ObjImporter", "StanfordSceneConverter", "ObjImporter", "StanfordSceneConverter",
"quad.ply", "quad.ply",
{}}, {}},
{"remove duplicates fuzzy, verbose", Containers::array<Containers::String>({ {"remove duplicate vertices fuzzy, verbose", Containers::array<Containers::String>({
/* Forcing the importer and converter to avoid AnySceneImporter / /* Forcing the importer and converter to avoid AnySceneImporter /
AnySceneConverter delegation messages */ AnySceneConverter delegation messages */
"--remove-duplicates-fuzzy 1.0e-1", "-v", "-I", "ObjImporter", "-C", "StanfordSceneConverter", "--remove-duplicate-vertices-fuzzy 1.0e-1", "-v", "-I", "ObjImporter", "-C", "StanfordSceneConverter",
Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/quad-duplicates-fuzzy.obj"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/quad.ply")}), Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/quad-duplicates-fuzzy.obj"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/quad.ply")}),
"ObjImporter", "StanfordSceneConverter", "ObjImporter", "StanfordSceneConverter",
"quad.ply", "quad.ply",
@ -350,7 +350,7 @@ const struct {
"Trade::GltfImporter::scene(): mesh index 1 in node 0 out of range for 1 meshes\n" "Trade::GltfImporter::scene(): mesh index 1 in node 0 out of range for 1 meshes\n"
"Cannot import scene 0 for mesh concatenation\n"}, "Cannot import scene 0 for mesh concatenation\n"},
{"invalid attribute filter", Containers::array<Containers::String>({ {"invalid attribute filter", Containers::array<Containers::String>({
"-I", "ObjImporter", "--only-attributes", "LOLNEIN", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/whatever.ply")}), "-I", "ObjImporter", "--only-mesh-attributes", "LOLNEIN", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/whatever.ply")}),
"ObjImporter", nullptr, "ObjImporter", nullptr,
"Utility::parseNumberSequence(): unrecognized character L in LOLNEIN\n"}, "Utility::parseNumberSequence(): unrecognized character L in LOLNEIN\n"},
{"can't load converter plugin", Containers::array<Containers::String>({ {"can't load converter plugin", Containers::array<Containers::String>({

69
src/Magnum/SceneTools/sceneconverter.cpp
Unescape View File

@ -117,15 +117,15 @@ magnum-sceneconverter chair.obj -C MeshOptimizerSceneConverter \
@code{.sh} @code{.sh}
magnum-sceneconverter [-h|--help] [-I|--importer PLUGIN] magnum-sceneconverter [-h|--help] [-I|--importer PLUGIN]
[-C|--converter PLUGIN]... [--plugin-dir DIR] [--map] [-C|--converter PLUGIN]... [--plugin-dir DIR] [--map]
[--only-attributes N1,N2-N3…] [--remove-duplicates] [--only-mesh-attributes N1,N2-N3…] [--remove-duplicate-vertices]
[--remove-duplicates-fuzzy EPSILON] [--remove-duplicate-vertices-fuzzy EPSILON]
[-i|--importer-options key=val,key2=val2,…] [-i|--importer-options key=val,key2=val2,…]
[-c|--converter-options key=val,key2=val2,…]... [--mesh MESH] [-c|--converter-options key=val,key2=val2,…]... [--mesh ID]
[--level LEVEL] [--concatenate-meshes] [--info-animations] [--info-images] [--mesh-level INDEX] [--concatenate-meshes] [--info-animations]
[--info-lights] [--info-cameras] [--info-materials] [--info-meshes] [--info-images] [--info-lights] [--info-cameras] [--info-materials]
[--info-objects] [--info-scenes] [--info-skins] [--info-textures] [--info] [--info-meshes] [--info-objects] [--info-scenes] [--info-skins]
[--color on|4bit|off|auto] [--bounds] [-v|--verbose] [--profile] [--] input [--info-textures] [--info] [--color on|4bit|off|auto] [--bounds]
output [-v|--verbose] [--profile] [--] input output
@endcode @endcode
Arguments: Arguments:
@ -139,21 +139,21 @@ Arguments:
- `--plugin-dir DIR` --- override base plugin dir - `--plugin-dir DIR` --- override base plugin dir
- `--map` --- memory-map the input for zero-copy import (works only for - `--map` --- memory-map the input for zero-copy import (works only for
standalone files) standalone files)
- `--only-attributes N1,N2-N3…` --- include only attributes of given IDs in - `--only-mesh-attributes N1,N2-N3…` --- include only mesh attributes of
the output. See @ref Utility::String::parseNumberSequence() for syntax given IDs in the output. See @ref Utility::String::parseNumberSequence()
description. for syntax description.
- `--remove-duplicates` --- remove duplicate vertices using - `--remove-duplicate-vertices` --- remove duplicate vertices using
@ref MeshTools::removeDuplicates(const Trade::MeshData&) after import @ref MeshTools::removeDuplicates(const Trade::MeshData&) after import
- `--remove-duplicates-fuzzy EPSILON` --- remove duplicate vertices using - `--remove-duplicate-vertices-fuzzy EPSILON` --- remove duplicate vertices
@ref MeshTools::removeDuplicatesFuzzy(const Trade::MeshData&, Float, Double) using @ref MeshTools::removeDuplicatesFuzzy(const Trade::MeshData&, Float, Double)
after import after import
- `-i`, `--importer-options key=val,key2=val2,…` --- configuration options to - `-i`, `--importer-options key=val,key2=val2,…` --- configuration options to
pass to the importer pass to the importer
- `-c`, `--converter-options key=val,key2=val2,…` --- configuration options - `-c`, `--converter-options key=val,key2=val2,…` --- configuration options
to pass to the converter(s) to pass to the converter(s)
- `--mesh MESH` --- mesh to import (default: `0`), ignored if - `--mesh ID` --- mesh to import (default: `0`), ignored if
`--concatenate-meshes` is specified `--concatenate-meshes` is specified
- `--level LEVEL` --- mesh level to import (default: `0`), ignored if - `--mesh-level INDEX` --- mesh level to import (default: `0`), ignored if
`--concatenate-meshes` is specified `--concatenate-meshes` is specified
- `--concatenate-meshes` -- flatten mesh hierarchy and concatenate them all - `--concatenate-meshes` -- flatten mesh hierarchy and concatenate them all
together @m_class{m-label m-warning} **experimental** together @m_class{m-label m-warning} **experimental**
@ -204,8 +204,8 @@ If `--concatenate-meshes` is given, all meshes of the input file are
concatenated into a single mesh using @ref MeshTools::concatenate(), with the concatenated into a single mesh using @ref MeshTools::concatenate(), with the
scene hierarchy transformation baked in using scene hierarchy transformation baked in using
@ref SceneTools::flattenMeshHierarchy3D(). Only attributes that are present in @ref SceneTools::flattenMeshHierarchy3D(). Only attributes that are present in
the first mesh are taken, if `--only-attributes` is specified as well, the IDs the first mesh are taken, if `--only-mesh-attributes` is specified as well, the
reference attributes of the first mesh. IDs reference attributes of the first mesh.
*/ */
} }
@ -241,13 +241,13 @@ int main(int argc, char** argv) {
#if defined(CORRADE_TARGET_UNIX) || (defined(CORRADE_TARGET_WINDOWS) && !defined(CORRADE_TARGET_WINDOWS_RT)) #if defined(CORRADE_TARGET_UNIX) || (defined(CORRADE_TARGET_WINDOWS) && !defined(CORRADE_TARGET_WINDOWS_RT))
.addBooleanOption("map").setHelp("map", "memory-map the input for zero-copy import (works only for standalone files)") .addBooleanOption("map").setHelp("map", "memory-map the input for zero-copy import (works only for standalone files)")
#endif #endif
.addOption("only-attributes").setHelp("only-attributes", "include only attributes of given IDs in the output", "N1,N2-N3…") .addOption("only-mesh-attributes").setHelp("only-mesh-attributes", "include only mesh attributes of given IDs in the output", "N1,N2-N3…")
.addBooleanOption("remove-duplicates").setHelp("remove-duplicates", "remove duplicate vertices in the mesh after import") .addBooleanOption("remove-duplicate-vertices").setHelp("remove-duplicate-vertices", "remove duplicate vertices in the mesh after import")
.addOption("remove-duplicates-fuzzy").setHelp("remove-duplicates-fuzzy", "remove duplicate vertices with fuzzy comparison in the mesh after import", "EPSILON") .addOption("remove-duplicate-vertices-fuzzy").setHelp("remove-duplicate-vertices-fuzzy", "remove duplicate vertices with fuzzy comparison in the mesh after import", "EPSILON")
.addOption('i', "importer-options").setHelp("importer-options", "configuration options to pass to the importer", "key=val,key2=val2,…") .addOption('i', "importer-options").setHelp("importer-options", "configuration options to pass to the importer", "key=val,key2=val2,…")
.addArrayOption('c', "converter-options").setHelp("converter-options", "configuration options to pass to the converter(s)", "key=val,key2=val2,…") .addArrayOption('c', "converter-options").setHelp("converter-options", "configuration options to pass to the converter(s)", "key=val,key2=val2,…")
.addOption("mesh", "0").setHelp("mesh", "mesh to import, ignored if --concatenate-meshes is specified") .addOption("mesh", "0").setHelp("mesh", "mesh to import, ignored if --concatenate-meshes is specified", "ID")
.addOption("level", "0").setHelp("level", "mesh level to import, ignored if --concatenate-meshes is specified") .addOption("mesh-level", "0").setHelp("mesh-level", "mesh level to import, ignored if --concatenate-meshes is specified", "INDEX")
.addBooleanOption("concatenate-meshes").setHelp("concatenate-meshes", "flatten mesh hierarchy and concatenate them all together") .addBooleanOption("concatenate-meshes").setHelp("concatenate-meshes", "flatten mesh hierarchy and concatenate them all together")
.addBooleanOption("info-animations").setHelp("info-animations", "print info about animations in the input file and exit") .addBooleanOption("info-animations").setHelp("info-animations", "print info about animations in the input file and exit")
.addBooleanOption("info-images").setHelp("info-images", "print info about images in the input file and exit") .addBooleanOption("info-images").setHelp("info-images", "print info about images in the input file and exit")
@ -296,8 +296,9 @@ used.
If --concatenate-meshes is given, all meshes of the input file are concatenated If --concatenate-meshes is given, all meshes of the input file are concatenated
into a single mesh, with the scene hierarchy transformation baked in. Only into a single mesh, with the scene hierarchy transformation baked in. Only
attributes that are present in the first mesh are taken, if --only-attributes attributes that are present in the first mesh are taken, if
is specified as well, the IDs reference attributes of the first mesh.)") --only-mesh-attributes is specified as well, the IDs reference attributes of
the first mesh.)")
.parse(argc, argv); .parse(argc, argv);
/* Colored output. Enable only if a TTY. */ /* Colored output. Enable only if a TTY. */
@ -433,7 +434,7 @@ is specified as well, the IDs reference attributes of the first mesh.)")
/* Otherwise import just one */ /* Otherwise import just one */
} else { } else {
Trade::Implementation::Duration d{importTime}; Trade::Implementation::Duration d{importTime};
if(!(mesh = importer->mesh(args.value<UnsignedInt>("mesh"), args.value<UnsignedInt>("level")))) { if(!(mesh = importer->mesh(args.value<UnsignedInt>("mesh"), args.value<UnsignedInt>("mesh-level")))) {
Error{} << "Cannot import the mesh"; Error{} << "Cannot import the mesh";
return 4; return 4;
} }
@ -442,9 +443,9 @@ is specified as well, the IDs reference attributes of the first mesh.)")
/* Wow, C++, you suck. This implicitly initializes to random shit?! */ /* Wow, C++, you suck. This implicitly initializes to random shit?! */
std::chrono::high_resolution_clock::duration conversionTime{}; std::chrono::high_resolution_clock::duration conversionTime{};
/* Filter attributes, if requested */ /* Filter mesh attributes, if requested */
if(!args.value("only-attributes").empty()) { if(!args.value("only-mesh-attributes").empty()) {
const Containers::Optional<Containers::Array<UnsignedInt>> only = Utility::String::parseNumberSequence(args.value<Containers::StringView>("only-attributes"), 0, mesh->attributeCount()); const Containers::Optional<Containers::Array<UnsignedInt>> only = Utility::String::parseNumberSequence(args.value<Containers::StringView>("only-mesh-attributes"), 0, mesh->attributeCount());
if(!only) return 2; if(!only) return 2;
/** @todo use MeshTools::filterOnlyAttributes() once it has a rvalue /** @todo use MeshTools::filterOnlyAttributes() once it has a rvalue
@ -462,8 +463,8 @@ is specified as well, the IDs reference attributes of the first mesh.)")
vertexCount}; vertexCount};
} }
/* Remove duplicates, if requested */ /* Remove duplicate vertices, if requested */
if(args.isSet("remove-duplicates")) { if(args.isSet("remove-duplicate-vertices")) {
const UnsignedInt beforeVertexCount = mesh->vertexCount(); const UnsignedInt beforeVertexCount = mesh->vertexCount();
{ {
Trade::Implementation::Duration d{conversionTime}; Trade::Implementation::Duration d{conversionTime};
@ -473,13 +474,13 @@ is specified as well, the IDs reference attributes of the first mesh.)")
Debug{} << "Duplicate removal:" << beforeVertexCount << "->" << mesh->vertexCount() << "vertices"; Debug{} << "Duplicate removal:" << beforeVertexCount << "->" << mesh->vertexCount() << "vertices";
} }
/* Remove duplicates with fuzzy comparison, if requested */ /* Remove duplicate vertices with fuzzy comparison, if requested */
/** @todo accept two values for float and double fuzzy comparison */ /** @todo accept two values for float and double fuzzy comparison */
if(!args.value("remove-duplicates-fuzzy").empty()) { if(!args.value("remove-duplicate-vertices-fuzzy").empty()) {
const UnsignedInt beforeVertexCount = mesh->vertexCount(); const UnsignedInt beforeVertexCount = mesh->vertexCount();
{ {
Trade::Implementation::Duration d{conversionTime}; Trade::Implementation::Duration d{conversionTime};
mesh = MeshTools::removeDuplicatesFuzzy(*std::move(mesh), args.value<Float>("remove-duplicates-fuzzy")); mesh = MeshTools::removeDuplicatesFuzzy(*std::move(mesh), args.value<Float>("remove-duplicate-vertices-fuzzy"));
} }
if(args.isSet("verbose")) if(args.isSet("verbose"))
Debug{} << "Fuzzy duplicate removal:" << beforeVertexCount << "->" << mesh->vertexCount() << "vertices"; Debug{} << "Fuzzy duplicate removal:" << beforeVertexCount << "->" << mesh->vertexCount() << "vertices";

Write Preview
Loading…
Cancel
Save