Skip to content

Commit

Permalink
Merge branch 'main' into 11716-visualize-fog
Browse files Browse the repository at this point in the history
  • Loading branch information
ptrgags committed Jan 5, 2024
2 parents c4e1b37 + 31293c1 commit 95b2a87
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
4 changes: 4 additions & 0 deletions packages/engine/Source/Scene/Cesium3DTileset.js
Original file line number Diff line number Diff line change
Expand Up @@ -1656,6 +1656,7 @@ Object.defineProperties(Cesium3DTileset.prototype, {
* <li>The glTF cannot contain morph targets, skins, or animations.</li>
* <li>The glTF cannot contain the <code>EXT_mesh_gpu_instancing</code> extension.</li>
* <li>Only meshes with TRIANGLES can be used to classify other assets.</li>
* <li>The meshes must be watertight.</li>
* <li>The <code>POSITION</code> semantic is required.</li>
* <li>If <code>_BATCHID</code>s and an index buffer are both present, all indices with the same batch id must occupy contiguous sections of the index buffer.</li>
* <li>If <code>_BATCHID</code>s are present with no index buffer, all positions with the same batch id must occupy contiguous sections of the position buffer.</li>
Expand All @@ -1665,6 +1666,9 @@ Object.defineProperties(Cesium3DTileset.prototype, {
* Additionally, classification is not supported for points or instanced 3D
* models.
* </p>
* <p>
* The 3D Tiles or terrain receiving the classification must be opaque.
* </p>
*
* @memberof Cesium3DTileset.prototype
*
Expand Down
6 changes: 5 additions & 1 deletion packages/engine/Source/Scene/Model/Model.js
Original file line number Diff line number Diff line change
Expand Up @@ -1552,11 +1552,15 @@ Object.defineProperties(Model.prototype, {
* <li>The glTF cannot contain morph targets, skins, or animations.</li>
* <li>The glTF cannot contain the <code>EXT_mesh_gpu_instancing</code> extension.</li>
* <li>Only meshes with TRIANGLES can be used to classify other assets.</li>
* <li>The position attribute is required.</li>
* <li>The meshes must be watertight.</li>
* <li>The POSITION attribute is required.</li>
* <li>If feature IDs and an index buffer are both present, all indices with the same feature id must occupy contiguous sections of the index buffer.</li>
* <li>If feature IDs are present without an index buffer, all positions with the same feature id must occupy contiguous sections of the position buffer.</li>
* </ul>
* </p>
* <p>
* The 3D Tiles or terrain receiving the classification must be opaque.
* </p>
*
* @memberof Model.prototype
*
Expand Down

0 comments on commit 95b2a87

Please sign in to comment.