Moved CreateModelOptions into tilesetOptions.rendererOptions

Author: david-lively

Editor/Cesium3DTilesetEditor.cs

@@ -84,7 +84,7 @@ private void OnEnable()
             //    this.serializedObject.FindProperty("_lodTransitionLength");
             this._generateSmoothNormals =
                 this.serializedObject.FindProperty("_generateSmoothNormals");
-            this._ignoreKhrMaterialsUnlit = this.serializedObject.FindProperty("_ignoreKHRMaterialsUnlit");
+            this._ignoreKhrMaterialsUnlit = this.serializedObject.FindProperty("_ignoreKhrMaterialsUnlit");
 
             this._pointCloudShading = this.serializedObject.FindProperty("_pointCloudShading");
 
@@ -428,7 +428,7 @@ private void DrawRenderProperties()
                 "rendered with smooth normals instead when the original glTF is missing normals.");
             EditorGUILayout.PropertyField(this._generateSmoothNormals, generateSmoothNormalsContent);
 
-            var ignoreKHRMaterialsUnlit = new GUIContent(
+            var ignoreKhrMaterialsUnlit = new GUIContent(
                 "Ignore KHR_materials_unlit",
                 "Whether to ignore the KHR_materials_unlit extension on the glTF tiles in "+
                 "this tileset, if it exists, and instead render with standard lighting and "+
@@ -439,7 +439,7 @@ private void DrawRenderProperties()
                 "tilesets because lighting and shadows are already baked into their "+
                 "textures. "
             );
-            EditorGUILayout.PropertyField(this._ignoreKhrMaterialsUnlit, ignoreKHRMaterialsUnlit);
+            EditorGUILayout.PropertyField(this._ignoreKhrMaterialsUnlit, ignoreKhrMaterialsUnlit);
         }
 
         private void DrawPointCloudShadingProperties()

native~/Runtime/src/Cesium3DTilesetImpl.cpp

@@ -566,6 +566,7 @@ void Cesium3DTilesetImpl::DestroyTileset(
 void Cesium3DTilesetImpl::LoadTileset(
     const DotNet::CesiumForUnity::Cesium3DTileset& tileset) {
   TilesetOptions options{};
+  options.rendererOptions = CreateModelOptions(tileset);
   options.maximumScreenSpaceError = tileset.maximumScreenSpaceError();
   options.preloadAncestors = tileset.preloadAncestors();
   options.preloadSiblings = tileset.preloadSiblings();

native~/Runtime/src/UnityPrepareRendererResources.cpp

@@ -907,31 +907,25 @@ UnityPrepareRendererResources::prepareInLoadThread(
     TileLoadResult tileLoadResult;
   };
 
-  CreateModelOptions options{};
-
   return asyncSystem
-      .runInMainThread([numberOfPrimitives,
-                        tileset = this->_tilesetGameObject,
-                        &options]() {
-        const auto tilesetComponent =
-            tileset.GetComponent<DotNet::CesiumForUnity::Cesium3DTileset>();
-        if (tilesetComponent != nullptr)
-          options.ignoreKhrMaterialUnlit =
-              tilesetComponent.ignoreKhrMaterialsUnlit();
+      .runInMainThread([numberOfPrimitives]() {
         // Allocate a MeshDataArray for the primitives.
         // Unfortunately, this must be done on the main thread.
         return UnityEngine::Mesh::AllocateWritableMeshData(numberOfPrimitives);
       })
       .thenInWorkerThread(
-          [tileLoadResult = std::move(tileLoadResult),
-           &options](UnityEngine::MeshDataArray&& meshDataArray) mutable {
+          [tileLoadResult = std::move(tileLoadResult), rendererOptions](UnityEngine::MeshDataArray&& meshDataArray) mutable {
             MeshDataResult meshDataResult{std::move(meshDataArray), {}};
             // Free the MeshDataArray if something goes wrong.
             ScopeGuard sg([&meshDataResult]() {
               meshDataResult.meshDataArray.Dispose();
             });
 
-            populateMeshDataArray(meshDataResult, tileLoadResult, options);
+            const auto* pOptions = std::any_cast<CreateModelOptions>(&rendererOptions);
+            if (pOptions)
+              populateMeshDataArray(meshDataResult, tileLoadResult, *pOptions);
+            else
+              populateMeshDataArray(meshDataResult, tileLoadResult, {});
 
             // We're returning the MeshDataArray, so don't free it.
             sg.release();