.pnts loader for ModelExperimental

Source/Core/AttributeCompression.js

@@ -476,4 +476,50 @@ AttributeCompression.dequantize = function (
   return dequantizedTypedArray;
 };
 
+/**
+ * Decode RGB565-encoded colors into a floating point typed array containing
+ * normalized RGB values.
+ *
+ * @param {Uint16Array} typedArray Array of RGB565 values
+ * @param {Float32Array} [result] Array to store the normalized VEC3 result
+ */
+AttributeCompression.decodeRGB565 = function (typedArray, result) {
+  //>>includeStart('debug', pragmas.debug);
+  Check.defined("typedArray", typedArray);
+
+  var expectedLength = typedArray.length * 3;
+  if (defined(result)) {
+    Check.typeOf.number.equals(
+      "result.length",
+      "typedArray.length * 3",
+      result.length,
+      expectedLength
+    );
+  }
+  //>>includeEnd('debug');
+
+  var count = typedArray.length;
+  if (!defined(result)) {
+    result = new Float32Array(count * 3);
+  }
+
+  var mask5 = (1 << 5) - 1;
+  var mask6 = (1 << 6) - 1;
+  var normalize5 = 1.0 / 31.0;
+  var normalize6 = 1.0 / 63.0;
+  for (var i = 0; i < count; i++) {
+    var value = typedArray[i];
+    var red = value >> 11;
+    var green = (value >> 5) & mask6;
+    var blue = value & mask5;
+
+    var offset = 3 * i;
+    result[offset] = red * normalize5;
+    result[offset + 1] = green * normalize6;
+    result[offset + 2] = blue * normalize5;
+  }
+
+  return result;
+};
+
 export default AttributeCompression;

Source/Scene/B3dmParser.js

@@ -20,9 +20,9 @@ var sizeOfUint32 = Uint32Array.BYTES_PER_ELEMENT;
  *
  * @private
  *
- * @param {ArrayBuffer} arrayBuffer The array buffer containing the B3DM.
- * @param {Number} [byteOffset=0] The byte offset of the beginning of the B3DM in the array buffer.
- * @returns {Object} Returns an object with the batch length, feature table (binary and json), batch table (binary and json) and glTF parts of the B3DM.
+ * @param {ArrayBuffer} arrayBuffer The array buffer containing the b3dm.
+ * @param {Number} [byteOffset=0] The byte offset of the beginning of the b3dm in the array buffer.
+ * @returns {Object} Returns an object with the batch length, feature table (binary and json), batch table (binary and json) and glTF parts of the b3dm.
  */
 B3dmParser.parse = function (arrayBuffer, byteOffset) {
   var byteStart = defaultValue(byteOffset, 0);

Source/Scene/Cesium3DTileContentFactory.js

@@ -36,6 +36,15 @@ var Cesium3DTileContentFactory = {
     );
   },
   pnts: function (tileset, tile, resource, arrayBuffer, byteOffset) {
+    if (ExperimentalFeatures.enableModelExperimental) {
+      return ModelExperimental3DTileContent.fromPnts(
+        tileset,
+        tile,
+        resource,
+        arrayBuffer,
+        byteOffset
+      );
+    }
     return new PointCloud3DTileContent(
       tileset,
       tile,

Source/Scene/ModelComponents.js

@@ -68,7 +68,7 @@ function Quantization() {
 
   /**
    * The step size of the quantization volume, equal to
-   * quantizedVolumeDimensions / quantizedVolumeOffset (component-wise).
+   * quantizedVolumeDimensions / normalizationRange (component-wise).
    * Not applicable for oct encoded attributes.
    * The type should match the attribute type - e.g. if the attribute type
    * is AttributeType.VEC4 the dimensions should be a Cartesian4.

Source/Scene/ModelExperimental/B3dmLoader.js

@@ -40,9 +40,9 @@ var FeatureIdAttribute = ModelComponents.FeatureIdAttribute;
  * @private
  *
  * @param {Object} options Object with the following properties:
- * @param {Resource} options.b3dmResource The {@link Resource} containing the B3DM.
- * @param {ArrayBuffer} options.arrayBuffer The array buffer of the B3DM contents.
- * @param {Number} [options.byteOffset] The byte offset to the beginning of the B3DM contents in the array buffer.
+ * @param {Resource} options.b3dmResource The {@link Resource} containing the b3dm.
+ * @param {ArrayBuffer} options.arrayBuffer The array buffer of the b3dm contents.
+ * @param {Number} [options.byteOffset] The byte offset to the beginning of the b3dm contents in the array buffer.
  * @param {Resource} [options.baseResource] The {@link Resource} that paths in the glTF JSON are relative to.
  * @param {Boolean} [options.releaseGltfJson=false] When true, the glTF JSON is released once the glTF is loaded. This is is especially useful for cases like 3D Tiles, where each .gltf model is unique and caching the glTF JSON is not effective.
  * @param {Boolean} [options.asynchronous=true] Determines if WebGL resource creation will be spread out over several frames or block until all WebGL resources are created.
@@ -262,7 +262,7 @@ B3dmLoader.prototype.load = function () {
 function handleError(b3dmLoader, error) {
   b3dmLoader.unload();
   b3dmLoader._state = B3dmLoaderState.FAILED;
-  var errorMessage = "Failed to load B3DM";
+  var errorMessage = "Failed to load b3dm";
   error = b3dmLoader.getError(errorMessage, error);
   b3dmLoader._promise.reject(error);
 }

Source/Scene/ModelExperimental/CustomShaderGuide/README.md

@@ -84,7 +84,7 @@ var model = Cesium.ModelExperimental.fromGltf({,
 
 **Note**: As of this writing, only tilesets that use the `3DTILES_content_gltf`
 extension will support `CustomShaders`. Future releases will add support for
-other formats such as B3DM.
+other formats such as b3dm.
 
 ## Uniforms
 

Source/Scene/ModelExperimental/ModelExperimental.js

@@ -13,6 +13,7 @@ import destroyObject from "../../Core/destroyObject.js";
 import Matrix4 from "../../Core/Matrix4.js";
 import ModelFeatureTable from "./ModelFeatureTable.js";
 import B3dmLoader from "./B3dmLoader.js";
+import PntsLoader from "./PntsLoader.js";
 import Color from "../../Core/Color.js";
 
 /**
@@ -205,7 +206,12 @@ function initialize(model) {
       ModelExperimentalUtility.getFailedLoadFunction(model, "model", resource)
     );
 
-  loader.texturesLoadedPromise
+  // Transcoded .pnts models do not have textures
+  var texturesLoadedPromise = defaultValue(
+    loader.texturesLoadedPromise,
+    when.resolve()
+  );
+  texturesLoadedPromise
     .then(function () {
       model._texturesLoaded = true;
     })
@@ -818,6 +824,37 @@ ModelExperimental.fromB3dm = function (options) {
     featureIdAttributeIndex: options.featureIdAttributeIndex,
     featureIdTextureIndex: options.featureIdTextureIndex,
   };
+
+  var model = new ModelExperimental(modelOptions);
+  return model;
+};
+
+ModelExperimental.fromPnts = function (options) {
+  var loaderOptions = {
+    arrayBuffer: options.arrayBuffer,
+    byteOffset: options.byteOffset,
+    releaseGltfJson: options.releaseGltfJson,
+    incrementallyLoadTextures: options.incrementallyLoadTextures,
+    upAxis: options.upAxis,
+    forwardAxis: options.forwardAxis,
+  };
+  var loader = new PntsLoader(loaderOptions);
+
+  var modelOptions = {
+    loader: loader,
+    resource: options.resource,
+    modelMatrix: options.modelMatrix,
+    debugShowBoundingVolume: options.debugShowBoundingVolume,
+    cull: options.cull,
+    opaquePass: options.opaquePass,
+    allowPicking: options.allowPicking,
+    customShader: options.customShader,
+    content: options.content,
+    show: options.show,
+    featureIdAttributeIndex: options.featureIdAttributeIndex,
+    featureIdTextureIndex: options.featureIdTextureIndex,
+  };
+
   var model = new ModelExperimental(modelOptions);
   return model;
 };

Source/Scene/ModelExperimental/ModelExperimental3DTileContent.js

@@ -242,3 +242,32 @@ ModelExperimental3DTileContent.fromB3dm = function (
   content._model = ModelExperimental.fromB3dm(modelOptions);
   return content;
 };
+
+ModelExperimental3DTileContent.fromPnts = function (
+  tileset,
+  tile,
+  resource,
+  arrayBuffer,
+  byteOffset
+) {
+  var content = new ModelExperimental3DTileContent(tileset, tile, resource);
+
+  var modelOptions = {
+    arrayBuffer: arrayBuffer,
+    byteOffset: byteOffset,
+    resource: resource,
+    cull: false, // The model is already culled by 3D Tiles
+    releaseGltfJson: true, // Models are unique and will not benefit from caching so save memory
+    opaquePass: Pass.CESIUM_3D_TILE, // Draw opaque portions of the model during the 3D Tiles pass
+    modelMatrix: tile.computedTransform,
+    upAxis: tileset._gltfUpAxis,
+    forwardAxis: Axis.X,
+    incrementallyLoadTextures: false,
+    customShader: tileset.customShader,
+    content: content,
+    colorBlendMode: tileset.colorBlendMode,
+    colorBlendAmount: tileset.colorBlendAmount,
+  };
+  content._model = ModelExperimental.fromPnts(modelOptions);
+  return content;
+};