Mirrors/tinyusdz
0
0
Fork 0
mirror of https://github.com/lighttransport/tinyusdz.git synced 2026-01-18 01:11:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

[USDA parser] Fix parsing variantSet statement when it contains comments line.

Browse Source 
[tusdcat] Fix composition logic.
This commit is contained in:
Syoyo Fujita
2023-10-28 23:24:26 +09:00
parent 47fe53c9c4
commit 9a1d0afc2a
3 changed files with 97 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
examples/tusdcat/main.cc
View File

@@ -197,14 +197,15 @@ int main(int argc, char **argv) {
}
// TODO: Find more better way to Recursively resolve references/payload/variants
bool all_resolved = true;
for (int i = 0; i < kMaxIteration; i++) {
bool has_unresolved = false;
if (comp_features.references) {
if (!src_layer.check_unresolved_references()) {
all_resolved = true;
std::cout << "# iter " << i << ": no unresolved references.\n";
} else {
all_resolved = false;
has_unresolved = true;
tinyusdz::Layer composited_layer;
if (!tinyusdz::CompositeReferences(resolver, src_layer, &composited_layer, &warn, &err)) {
@@ -225,79 +226,82 @@ int main(int argc, char **argv) {
if (comp_features.payload) {
if (!src_layer.check_unresolved_payload()) {
all_resolved = true;
std::cout << "# iter " << i << ": no unresolved payload.\n";
} else {
all_resolved = false;
has_unresolved = true;
tinyusdz::Layer composited_layer;
if (!tinyusdz::CompositePayload(resolver, src_layer, &composited_layer, &warn, &err)) {
std::cerr << "Failed to composite `payload`: " << err << "\n";
return -1;
}
if (warn.size()) {
std::cout << "WARN: " << warn << "\n";
}
std::cout << "# `payload` composited\n";
std::cout << composited_layer << "\n";
src_layer = std::move(composited_layer);
}
tinyusdz::Layer composited_layer;
if (!tinyusdz::CompositePayload(resolver, src_layer, &composited_layer, &warn, &err)) {
std::cerr << "Failed to composite `payload`: " << err << "\n";
return -1;
}
if (warn.size()) {
std::cout << "WARN: " << warn << "\n";
}
std::cout << "# `payload` composited\n";
std::cout << composited_layer << "\n";
src_layer = std::move(composited_layer);
}
if (comp_features.inherits) {
if (!src_layer.check_unresolved_inherits()) {
all_resolved = true;
std::cout << "# iter " << i << ": no unresolved inherits.\n";
} else {
all_resolved = false;
has_unresolved = true;
tinyusdz::Layer composited_layer;
if (!tinyusdz::CompositeInherits(src_layer, &composited_layer, &warn, &err)) {
std::cerr << "Failed to composite `inherits`: " << err << "\n";
return -1;
}
if (warn.size()) {
std::cout << "WARN: " << warn << "\n";
}
std::cout << "# `inherits` composited\n";
std::cout << composited_layer << "\n";
src_layer = std::move(composited_layer);
}
tinyusdz::Layer composited_layer;
if (!tinyusdz::CompositeInherits(src_layer, &composited_layer, &warn, &err)) {
std::cerr << "Failed to composite `inherits`: " << err << "\n";
return -1;
}
if (warn.size()) {
std::cout << "WARN: " << warn << "\n";
}
std::cout << "# `inherits` composited\n";
std::cout << composited_layer << "\n";
src_layer = std::move(composited_layer);
}
if (comp_features.variantSets) {
if (!src_layer.check_unresolved_variant()) {
all_resolved = true;
std::cout << "# iter " << i << ": no unresolved variant.\n";
} else {
all_resolved = false;
has_unresolved = true;
tinyusdz::Layer composited_layer;
if (!tinyusdz::CompositeVariant(src_layer, &composited_layer, &warn, &err)) {
std::cerr << "Failed to composite `variantSet`: " << err << "\n";
return -1;
}
if (warn.size()) {
std::cout << "WARN: " << warn << "\n";
}
std::cout << "# `variantSet` composited\n";
std::cout << composited_layer << "\n";
src_layer = std::move(composited_layer);
}
tinyusdz::Layer composited_layer;
if (!tinyusdz::CompositeVariant(src_layer, &composited_layer, &warn, &err)) {
std::cerr << "Failed to composite `variantSet`: " << err << "\n";
return -1;
}
if (warn.size()) {
std::cout << "WARN: " << warn << "\n";
}
std::cout << "# `variantSet` composited\n";
std::cout << composited_layer << "\n";
src_layer = std::move(composited_layer);
}
// TODO
// - [ ] specializes
// - [ ] `class` Prim?
if (all_resolved) {
std::cout << "# of composition resolve iteration: " << (i + 1) << "\n";
std::cout << "# has_unresolved_references: " << src_layer.check_unresolved_references() << "\n";
std::cout << "# all resolved? " << !has_unresolved << "\n";
if (!has_unresolved) {
std::cout << "# of composition iteration to resolve fully: " << (i + 1) << "\n";
break;
}
}

8
src/ascii-parser.cc
View File

@@ -4336,6 +4336,10 @@ bool AsciiParser::ParseVariantSet(const int64_t primIdx,
Rewind(1);
}
if (!SkipCommentAndWhitespaceAndNewline()) {
return false;
}
// string
std::string variantName;
if (!ReadBasicType(&variantName)) {
@@ -4440,12 +4444,12 @@ bool AsciiParser::ParseVariantSet(const int64_t primIdx,
DCOUT(fmt::format("Done parse ParsePrimProps."));
}
if (!SkipWhitespaceAndNewline()) {
if (!SkipCommentAndWhitespaceAndNewline()) {
return false;
}
}
if (!SkipWhitespaceAndNewline()) {
if (!SkipCommentAndWhitespaceAndNewline()) {
return false;
}

31
tests/usda/variantSet-comment-block-001.usda Normal file
View File

@@ -0,0 +1,31 @@
#usda 1.0
(
defaultPrim = "isCoral"
metersPerUnit = 0.0254
upAxis = "Y"
)
def Xform "isCoral"
{
def Xform "geometry" (
variants = {
string model = "isCoral"
}
prepend variantSets = "model"
)
{
variantSet "model" = {
"isCoral" (
kind = "component"
#prepend payload = @./isCoral.usd@</isCoral>
) {
string geomname = "./isCoral.usd"
}
#"isCoral1" (
# kind = "component"
# prepend payload = @./isCoral1.usd@</isCoral1>
#) {
}
}
}