More small tweaks.

CesiumAsync/include/CesiumAsync/SharedAsset.h

@@ -30,7 +30,7 @@ template <typename TAssetType, typename TAssetKey> class SharedAssetDepot;
  * An independent asset isn't affiliated with an asset depot at all.
  * Its lifetime is controlled exclusively by IntrusivePointer / reference
  * counting. When the asset's reference count goes to zero, it deletes itself.
- * An independent asset's `_pDepot` is nullptr.
+ * An independent asset's {@link getDepot} returns nullptr.
  *
  * **Active Depot Asset**
  * This is an asset that is owned by an asset depot and that is in use, meaning

CesiumAsync/include/CesiumAsync/SharedAssetDepot.h

@@ -103,18 +103,6 @@ class CESIUMASYNC_API SharedAssetDepot
       const TAssetKey& assetKey) {
     // We need to take care here to avoid two assets starting to load before the
     // first asset has added an entry and set its maybePendingAsset field.
-
-    // Calling the factory function while holding the mutex unnecessarily
-    // limits parallelism. It can even lead to a bug in the scenario where the
-    // `thenInWorkerThread` continuation is invoked immediately in the current
-    // thread, before `thenInWorkerThread` itself returns. That would result
-    // in an attempt to lock the mutex recursively, which is not allowed.
-
-    // So we jump through some hoops here to publish "this thread is working
-    // on it", then unlock the mutex, and _then_ actually call the factory
-    // function.
-    Promise<void> promise = asyncSystem.createPromise<void>();
-
     std::unique_lock lock(this->_mutex);
 
     auto existingIt = this->_assets.find(assetKey);
@@ -131,6 +119,17 @@ class CESIUMASYNC_API SharedAssetDepot
       }
     }
 
+    // Calling the factory function while holding the mutex unnecessarily
+    // limits parallelism. It can even lead to a bug in the scenario where the
+    // `thenInWorkerThread` continuation is invoked immediately in the current
+    // thread, before `thenInWorkerThread` itself returns. That would result
+    // in an attempt to lock the mutex recursively, which is not allowed.
+
+    // So we jump through some hoops here to publish "this thread is working
+    // on it", then unlock the mutex, and _then_ actually call the factory
+    // function.
+    Promise<void> promise = asyncSystem.createPromise<void>();
+
     // We haven't loaded or started to load this asset yet.
     // Let's do that now.
     CesiumUtility::IntrusivePointer<SharedAssetDepot<TAssetType, TAssetKey>>
@@ -440,8 +439,6 @@ class CESIUMASYNC_API SharedAssetDepot
   // it are dropped.
   CesiumUtility::IntrusivePointer<SharedAssetDepot<TAssetType, TAssetKey>>
       _pKeepAlive;
-
-  friend class SharedAsset<TAssetType>;
 };
 
 } // namespace CesiumAsync

CesiumGltf/include/CesiumGltf/FeatureIdTextureView.h

@@ -1,17 +1,9 @@
 #pragma once
 
 #include "CesiumGltf/FeatureIdTexture.h"
-#include "CesiumGltf/Image.h"
-#include "CesiumGltf/ImageAsset.h"
-#include "CesiumGltf/KhrTextureTransform.h"
-#include "CesiumGltf/Texture.h"
 #include "CesiumGltf/TextureView.h"
 
-#include <algorithm>
-#include <cmath>
-#include <cstddef>
 #include <cstdint>
-#include <optional>
 
 namespace CesiumGltf {
 

CesiumGltf/include/CesiumGltf/ImageAsset.h

@@ -27,8 +27,8 @@ struct CESIUMGLTF_API ImageAssetMipPosition {
 };
 
 /**
- * @brief Holds {@link Image} properties that are specific to the glTF loader
- * rather than part of the glTF spec.
+ * @brief A 2D image asset, including its pixel data. The image may have
+ * mipmaps, and it may be encoded in a GPU compression format.
  */
 struct CESIUMGLTF_API ImageAsset final
     : public CesiumAsync::SharedAsset<ImageAsset> {

CesiumGltf/src/PropertyTextureView.cpp

@@ -83,7 +83,7 @@ PropertyTextureView::checkImage(const int32_t imageIndex) const noexcept {
   const CesiumUtility::IntrusivePointer<ImageAsset>& pImage =
       _pModel->images[static_cast<size_t>(imageIndex)].pAsset;
 
-  if (pImage->width < 1 || pImage->height < 1) {
+  if (!pImage || pImage->width < 1 || pImage->height < 1) {
     return PropertyTexturePropertyViewStatus::ErrorEmptyImage;
   }
 

CesiumGltf/src/TextureView.cpp

@@ -42,7 +42,7 @@ TextureView::TextureView(
   }
 
   this->_pImage = model.images[static_cast<size_t>(texture.source)].pAsset;
-  if (this->_pImage->width < 1 || this->_pImage->height < 1) {
+  if (!this->_pImage || this->_pImage->width < 1 || this->_pImage->height < 1) {
     this->_textureViewStatus = TextureViewStatus::ErrorEmptyImage;
     return;
   }