Skip to content

Commit

Permalink
Make large elementSize warning.
Browse files Browse the repository at this point in the history 
Allow skipping unknown apiSchema by default.
@syoyo
syoyo committed Jul 21, 2024

Verified

This commit was signed with the committer’s verified signature.
Kikobeats Kiko Beats
GPG key ID: 8FA93B22CCF04B96
Verified
Learn about vigilant mode
1 parent c751e52 commit 95bbe51
Showing 2 changed files with 34 additions and 7 deletions.
8 changes: 7 additions & 1 deletion src/tinyusdz.hh
View file
Original file line number Diff line number Diff line change
@@ -71,13 +71,14 @@ struct USDLoadOptions {
bool load_assets{true};

///
/// (experimental)
/// (Deprecated. to be removed in the future release)
/// Do composition on load(Load sublayers, references, etc)
/// For USDZ model, this should be false.
///
bool do_composition{false};

///
/// (Deprecated. to be removed in the future release)
/// Following load flags are valid when `do_composition` is set `true`.
///
bool load_sublayers{false}; // true: Load `subLayers`
@@ -105,6 +106,11 @@ struct USDLoadOptions {
/// allowedToken
///
bool strict_allowedToken_check{false}; // Make parse error when token value is not in allowedToken list(when the schema defines allowedToken list)

///
/// apiSchema
///
bool strict_apiSchema_check{false}; // Make parse error when unknown apiSchema

///
/// User-defined fileformat hander.
33 changes: 27 additions & 6 deletions src/usdc-reader.cc
View file
Original file line number Diff line number Diff line change
@@ -355,7 +355,7 @@ class USDCReader::Impl {

private:
nonstd::expected<APISchemas, std::string> ToAPISchemas(
const ListOp<value::token> &);
const ListOp<value::token> &, bool ignore_unknown, std::string &warn);

// ListOp<T> -> (ListEditOp, [T])
template <typename T>
@@ -575,7 +575,7 @@ bool USDCReader::Impl::ReconstructGeomSubset(
namespace {}

nonstd::expected<APISchemas, std::string> USDCReader::Impl::ToAPISchemas(
const ListOp<value::token> &arg) {
const ListOp<value::token> &arg, bool ignore_unknown, std::string &warn) {
APISchemas schemas;

auto SchemaHandler =
@@ -636,6 +636,9 @@ nonstd::expected<APISchemas, std::string> USDCReader::Impl::ToAPISchemas(
if (auto pv = SchemaHandler(item)) {
std::string instanceName = ""; // TODO
schemas.names.push_back({pv.value(), instanceName});
} else if (ignore_unknown) {
warn += "Ignored unknown or unsupported API schema: " +
item.str() + "\n";
} else {
return nonstd::make_unexpected("Invalid or Unsupported API schema: " +
item.str());
@@ -657,6 +660,9 @@ nonstd::expected<APISchemas, std::string> USDCReader::Impl::ToAPISchemas(
if (auto pv = SchemaHandler(item)) {
std::string instanceName = ""; // TODO
schemas.names.push_back({pv.value(), instanceName});
} else if (ignore_unknown) {
warn += "Ignored unknown or unsupported API schema: " +
item.str() + "\n";
} else {
return nonstd::make_unexpected("Invalid or Unsupported API schema: " +
item.str());
@@ -676,6 +682,9 @@ nonstd::expected<APISchemas, std::string> USDCReader::Impl::ToAPISchemas(
if (auto pv = SchemaHandler(item)) {
std::string instanceName = ""; // TODO
schemas.names.push_back({pv.value(), instanceName});
} else if (ignore_unknown) {
warn += "Ignored unknown or unsupported API schema: " +
item.str() + "\n";
} else {
return nonstd::make_unexpected("Invalid or Unsupported API schema: " +
item.str());
@@ -694,6 +703,9 @@ nonstd::expected<APISchemas, std::string> USDCReader::Impl::ToAPISchemas(
if (auto pv = SchemaHandler(item)) {
std::string instanceName = ""; // TODO
schemas.names.push_back({pv.value(), instanceName});
} else if (ignore_unknown) {
warn += "Ignored unknown or unsupported API schema: " +
item.str() + "\n";
} else {
return nonstd::make_unexpected("Invalid or Unsupported API schema: " +
item.str());
@@ -712,6 +724,9 @@ nonstd::expected<APISchemas, std::string> USDCReader::Impl::ToAPISchemas(
if (auto pv = SchemaHandler(item)) {
std::string instanceName = ""; // TODO
schemas.names.push_back({pv.value(), instanceName});
} else if (ignore_unknown) {
warn += "Ignored unknown or unsupported API schema: " +
item.str() + "\n";
} else {
return nonstd::make_unexpected("Invalid or Unsupported API schema: " +
item.str());
@@ -730,6 +745,9 @@ nonstd::expected<APISchemas, std::string> USDCReader::Impl::ToAPISchemas(
if (auto pv = SchemaHandler(item)) {
std::string instanceName = ""; // TODO
schemas.names.push_back({pv.value(), instanceName});
} else if (ignore_unknown) {
warn += "Ignored unknown or unsupported API schema: " +
item.str() + "\n";
} else {
return nonstd::make_unexpected("Invalid or Unsupported API schema: " +
item.str());
@@ -1115,9 +1133,8 @@ bool USDCReader::Impl::ParseProperty(const SpecType spec_type,
DCOUT("elementSize = " << to_string(p));

if ((p < 1) || (uint32_t(p) > _config.kMaxElementSize)) {
PUSH_ERROR_AND_RETURN_TAG(
kTag,
fmt::format("`elementSize` must be within [{}, {}), but got {}",
PUSH_WARN(
fmt::format("`elementSize` too large. Must be within [{}, {}), but got {}",
1, _config.kMaxElementSize, p));
}

@@ -1947,11 +1964,15 @@ bool USDCReader::Impl::ParsePrimSpec(const crate::FieldValuePairVector &fvs,
if (auto pv = fv.second.as<ListOp<value::token>>()) {
auto listop = (*pv);

auto ret = ToAPISchemas(listop);
std::string warn;
auto ret = ToAPISchemas(listop, _config.allow_unknown_apiSchemas, warn);
if (!ret) {
PUSH_ERROR_AND_RETURN_TAG(
kTag, "Failed to validate `apiSchemas`: " + ret.error());
} else {
if (warn.size()) {
PUSH_WARN(warn);
}
primMeta.apiSchemas = (*ret);
}
// DCOUT("apiSchemas = " << to_string(listop));

0 comments on commit 95bbe51

Please sign in to comment.