Merge branch 'dev' of github.com:syoyo/tinyusdz into dev

lighttransport · Oct 17, 2023 · 2d53632 · 2d53632
2 parents 151b65b + b38e43e
commit 2d53632
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/crate-reader.hh b/src/crate-reader.hh
@@ -28,14 +28,14 @@ struct CrateReaderConfig {
   // Set limits to prevent infinite-loop, buffer-overrun, out-of-memory, etc.
   size_t maxTOCSections = 32;
 
-  size_t maxNumTokens = 1024 * 1024;
-  size_t maxNumStrings = 1024 * 1024;
-  size_t maxNumFields = 1024 * 1024;
-  size_t maxNumFieldSets = 1024 * 1024;
-  size_t maxNumSpecifiers = 1024 * 1024;
-  size_t maxNumPaths = 1024 * 1024;
-
-  size_t maxNumIndices = 1024 * 1024 * 16;
+  size_t maxNumTokens = 1024 * 1024 * 64;
+  size_t maxNumStrings = 1024 * 1024 * 64;
+  size_t maxNumFields = 1024 * 1024 * 256;
+  size_t maxNumFieldSets = 1024 * 1024 * 256;
+  size_t maxNumSpecifiers = 1024 * 1024 * 256;
+  size_t maxNumPaths = 1024 * 1024 * 256;
+
+  size_t maxNumIndices = 1024 * 1024 * 256;
   size_t maxDictElements = 256;
   size_t maxArrayElements = 1024 * 1024 * 1024;  // 1G
   size_t maxAssetPathElements = 512;

diff --git a/src/tydra/render-data.cc b/src/tydra/render-data.cc
@@ -650,7 +650,7 @@ bool RenderSceneConverter::ConvertMesh(const int64_t rmaterial_id,
         std::vector<vec2> uvs(vattr.counts());
         memcpy(uvs.data(), vattr.data.data(), vattr.data.size());
 
-        dst.facevaryingTexcoords[slotId] = uvs;
+        dst.facevaryingTexcoords[uint32_t(slotId)] = uvs;
 
       } else {
         PUSH_ERROR_AND_RETURN(ret.error());