Ensure spec parity between Model and ModelExperimental

Source/Scene/ModelExperimental/ModelExperimental.js

@@ -66,7 +66,7 @@ import SplitDirection from "../SplitDirection.js";
  * @param {HeightReference} [options.heightReference=HeightReference.NONE] Determines how the model is drawn relative to terrain.
  * @param {Scene} [options.scene] Must be passed in for models that use the height reference property.
  * @param {DistanceDisplayCondition} [options.distanceDisplayCondition] The condition specifying at what distance from the camera that this model will be displayed.
- * @param {Color} [options.color] A color that blends with the model's rendered color.
+ * @param {Color} [options.color=Color.WHITE] A color that blends with the model's rendered color.
  * @param {ColorBlendMode} [options.colorBlendMode=ColorBlendMode.HIGHLIGHT] Defines how the color blends with the model.
  * @param {Number} [options.colorBlendAmount=0.5] Value used to determine the color strength when the <code>colorBlendMode</code> is <code>MIX</code>. A value of 0.0 results in the model's rendered color while a value of 1.0 results in a solid color, with any value in-between resulting in a mix of the two.
  * @param {Color} [options.silhouetteColor=Color.RED] The silhouette color. If more than 256 models have silhouettes enabled, there is a small chance that overlapping models will have minor artifacts.
@@ -195,8 +195,8 @@ export default function ModelExperimental(options) {
   this._id = options.id;
   this._idDirty = false;
 
-  const color = options.color;
-  this._color = defined(color) ? Color.clone(color) : undefined;
+  const color = defaultValue(options.color, Color.WHITE);
+  this._color = Color.clone(color);
   this._colorBlendMode = defaultValue(
     options.colorBlendMode,
     ColorBlendMode.HIGHLIGHT
@@ -2359,7 +2359,7 @@ ModelExperimental.prototype.destroyModelResources = function () {
  * @param {HeightReference} [options.heightReference=HeightReference.NONE] Determines how the model is drawn relative to terrain.
  * @param {Scene} [options.scene] Must be passed in for models that use the height reference property.
  * @param {DistanceDisplayCondition} [options.distanceDisplayCondition] The condition specifying at what distance from the camera that this model will be displayed.
- * @param {Color} [options.color] A color that blends with the model's rendered color.
+ * @param {Color} [options.color=Color.WHITE] A color that blends with the model's rendered color.
  * @param {ColorBlendMode} [options.colorBlendMode=ColorBlendMode.HIGHLIGHT] Defines how the color blends with the model.
  * @param {Number} [options.colorBlendAmount=0.5] Value used to determine the color strength when the <code>colorBlendMode</code> is <code>MIX</code>. A value of 0.0 results in the model's rendered color while a value of 1.0 results in a solid color, with any value in-between resulting in a mix of the two.
  * @param {Color} [options.silhouetteColor=Color.RED] The silhouette color. If more than 256 models have silhouettes enabled, there is a small chance that overlapping models will have minor artifacts.

Specs/Scene/GltfLoaderSpec.js

@@ -113,6 +113,7 @@ describe(
       "./Data/Models/GltfLoader/BoxWithPrimitiveOutline/glTF/BoxWithPrimitiveOutline.gltf";
     const boxWithPrimitiveOutlineSharedVertices =
       "./Data/Models/GltfLoader/BoxWithPrimitiveOutlineSharedVertices/glTF/BoxWithPrimitiveOutlineSharedVertices.gltf";
+    const multiUvTest = "./Data/Models/MultiUVTest/MultiUVTest.glb";
 
     let scene;
     let sceneWithWebgl2;
@@ -1068,6 +1069,51 @@ describe(
       });
     });
 
+    it("loads MultiUVTest", function () {
+      return loadGltf(multiUvTest).then(function (gltfLoader) {
+        const components = gltfLoader.components;
+        const scene = components.scene;
+        const rootNode = scene.nodes[0];
+        const primitive = rootNode.primitives[0];
+        const material = primitive.material;
+        const baseColorTexture = material.metallicRoughness.baseColorTexture;
+        const emissiveTexture = material.emissiveTexture;
+
+        const attributes = primitive.attributes;
+        const positionAttribute = getAttribute(
+          attributes,
+          VertexAttributeSemantic.POSITION
+        );
+        const normalAttribute = getAttribute(
+          attributes,
+          VertexAttributeSemantic.NORMAL
+        );
+        const tangentAttribute = getAttribute(
+          attributes,
+          VertexAttributeSemantic.TANGENT
+        );
+        const texcoordAttribute0 = getAttribute(
+          attributes,
+          VertexAttributeSemantic.TEXCOORD,
+          0
+        );
+        const texcoordAttribute1 = getAttribute(
+          attributes,
+          VertexAttributeSemantic.TEXCOORD,
+          1
+        );
+
+        expect(positionAttribute).toBeDefined();
+        expect(normalAttribute).toBeDefined();
+        expect(tangentAttribute).toBeDefined();
+        expect(texcoordAttribute0).toBeDefined();
+        expect(texcoordAttribute1).toBeDefined();
+
+        expect(baseColorTexture.texCoord).toBe(0);
+        expect(emissiveTexture.texCoord).toBe(1);
+      });
+    });
+
     it("loads Microcosm", function () {
       return loadGltf(microcosm).then(function (gltfLoader) {
         const components = gltfLoader.components;

Specs/Scene/ModelExperimental/ModelAnimationChannelSpec.js

@@ -589,7 +589,7 @@ describe("Scene/ModelExperimental/ModelAnimationChannel", function () {
 
     const wrappedRuntimeAnimation = {
       model: {
-        clampedAnimations: false,
+        clampAnimations: false,
       },
     };
 

Specs/Scene/ModelExperimental/ModelExperimentalAnimationCollectionSpec.js

@@ -16,6 +16,9 @@ describe("Scene/ModelExperimental/ModelExperimentalAnimationCollection", functio
   const interpolationTestUrl =
     "./Data/Models/InterpolationTest/InterpolationTest.glb";
 
+  const defaultDate = JulianDate.fromDate(
+    new Date("January 1, 2014 12:00:00 UTC")
+  );
   const scratchJulianDate = new JulianDate();
   let scene;
 
@@ -475,7 +478,7 @@ describe("Scene/ModelExperimental/ModelExperimentalAnimationCollection", functio
       },
       scene
     ).then(function (model) {
-      let time = JulianDate.fromDate(new Date("January 1, 2014 12:00:00 UTC"));
+      let time = defaultDate;
       const animations = model.activeAnimations;
       const animation = animations.add({
         index: 0,
@@ -520,17 +523,42 @@ describe("Scene/ModelExperimental/ModelExperimentalAnimationCollection", functio
     });
   });
 
-  it("animates with a delay", function () {
+  it("finishes animation when it reaches its end", function () {
     return loadAndZoomToModelExperimental(
       {
         gltf: animatedTriangleUrl,
       },
       scene
     ).then(function (model) {
-      const time = JulianDate.fromDate(
-        new Date("January 1, 2014 12:00:00 UTC")
-      );
+      const time = defaultDate;
+      const animationCollection = model.activeAnimations;
+      const animation = animationCollection.add({
+        index: 0,
+      });
+
+      const spyUpdate = jasmine.createSpy("listener");
+      animation.update.addEventListener(spyUpdate);
 
+      scene.renderForSpecs(time);
+      scene.renderForSpecs(JulianDate.addSeconds(time, 1.0, scratchJulianDate));
+      scene.renderForSpecs(JulianDate.addSeconds(time, 2.0, scratchJulianDate));
+
+      expect(spyUpdate.calls.count()).toEqual(3);
+      expect(spyUpdate.calls.argsFor(0)[2]).toEqual(0.0);
+      expect(spyUpdate.calls.argsFor(1)[2]).toEqual(1.0);
+      // Animation has reached its final time value.
+      expect(spyUpdate.calls.argsFor(2)[2]).toEqual(1.0);
+    });
+  });
+
+  it("animates with a delay", function () {
+    return loadAndZoomToModelExperimental(
+      {
+        gltf: animatedTriangleUrl,
+      },
+      scene
+    ).then(function (model) {
+      const time = defaultDate;
       const animationCollection = model.activeAnimations;
       const animation = animationCollection.add({
         index: 0,
@@ -555,10 +583,7 @@ describe("Scene/ModelExperimental/ModelExperimentalAnimationCollection", functio
       },
       scene
     ).then(function (model) {
-      const time = JulianDate.fromDate(
-        new Date("January 1, 2014 12:00:00 UTC")
-      );
-
+      const time = defaultDate;
       const animationCollection = model.activeAnimations;
       const animation = animationCollection.add({
         index: 0,
@@ -623,9 +648,7 @@ describe("Scene/ModelExperimental/ModelExperimentalAnimationCollection", functio
       },
       scene
     ).then(function (model) {
-      const time = JulianDate.fromDate(
-        new Date("January 1, 2014 12:00:00 UTC")
-      );
+      const time = defaultDate;
       const animationCollection = model.activeAnimations;
       let animationTime = 0;
       const animation = animationCollection.add({
@@ -672,9 +695,7 @@ describe("Scene/ModelExperimental/ModelExperimentalAnimationCollection", functio
       },
       scene
     ).then(function (model) {
-      const time = JulianDate.fromDate(
-        new Date("January 1, 2014 12:00:00 UTC")
-      );
+      const time = defaultDate;
       const animationCollection = model.activeAnimations;
       animationCollection.animateWhilePaused = true;
       let animationTime = 0;
@@ -719,9 +740,7 @@ describe("Scene/ModelExperimental/ModelExperimentalAnimationCollection", functio
       },
       scene
     ).then(function (model) {
-      const time = JulianDate.fromDate(
-        new Date("January 1, 2014 12:00:00 UTC")
-      );
+      const time = defaultDate;
       const animationCollection = model.activeAnimations;
       const animation = animationCollection.add({
         index: 0,
@@ -750,9 +769,7 @@ describe("Scene/ModelExperimental/ModelExperimentalAnimationCollection", functio
       },
       scene
     ).then(function (model) {
-      const time = JulianDate.fromDate(
-        new Date("January 1, 2014 12:00:00 UTC")
-      );
+      const time = defaultDate;
       const animationCollection = model.activeAnimations;
       const animation = animationCollection.add({
         index: 0,
@@ -781,9 +798,7 @@ describe("Scene/ModelExperimental/ModelExperimentalAnimationCollection", functio
       },
       scene
     ).then(function (model) {
-      const time = JulianDate.fromDate(
-        new Date("January 1, 2014 12:00:00 UTC")
-      );
+      const time = defaultDate;
       const animationCollection = model.activeAnimations;
       const animation = animationCollection.add({
         index: 0,
@@ -814,9 +829,7 @@ describe("Scene/ModelExperimental/ModelExperimentalAnimationCollection", functio
       },
       scene
     ).then(function (model) {
-      const time = JulianDate.fromDate(
-        new Date("January 1, 2014 12:00:00 UTC")
-      );
+      const time = defaultDate;
       const animationCollection = model.activeAnimations;
       const animation = animationCollection.add({
         index: 0,