GltfLoader updates

Source/Scene/FeatureTextureProperty.js

@@ -32,13 +32,13 @@ function FeatureTextureProperty(options) {
   //>>includeEnd('debug');
 
   var textureInfo = property.texture;
-  var texture = GltfLoaderUtil.createModelTexture({
+  var textureReader = GltfLoaderUtil.createModelTexture({
     textureInfo: textureInfo,
     channels: property.channels,
     texture: textures[textureInfo.index],
   });
 
-  this._texture = texture;
+  this._textureReader = textureReader;
   this._classProperty = classProperty;
   this._extras = property.extras;
   this._extensions = property.extensions;
@@ -49,13 +49,13 @@ Object.defineProperties(FeatureTextureProperty.prototype, {
    * The texture.
    *
    * @memberof FeatureTextureProperty.prototype
-   * @type {ModelComponents.Texture}
+   * @type {ModelComponents.TextureReader}
    * @readonly
    * @private
    */
-  texture: {
+  textureReader: {
     get: function () {
-      return this._texture;
+      return this._textureReader;
     },
   },
 

Source/Scene/GltfLoader.js

@@ -613,21 +613,21 @@ function loadTexture(
 
   loader._textureLoaders.push(textureLoader);
 
-  var texture = GltfLoaderUtil.createModelTexture({
+  var textureReader = GltfLoaderUtil.createModelTexture({
     textureInfo: textureInfo,
   });
 
   textureLoader.promise.then(function (textureLoader) {
     if (loader.isDestroyed()) {
       return;
     }
-    texture.texture = textureLoader.texture;
+    textureReader.texture = textureLoader.texture;
     if (defined(samplerOverride)) {
-      texture.texture.sampler = samplerOverride;
+      textureReader.texture.sampler = samplerOverride;
     }
   });
 
-  return texture;
+  return textureReader;
 }
 
 function loadMaterial(loader, gltf, gltfMaterial, supportedImageFormats) {
@@ -758,15 +758,15 @@ function loadFeatureIdTexture(
   var textureInfo = featureIds.texture;
 
   featureIdTexture.featureTableId = gltfFeatureIdTexture.featureTable;
-  featureIdTexture.texture = loadTexture(
+  featureIdTexture.textureReader = loadTexture(
     loader,
     gltf,
     textureInfo,
     supportedImageFormats,
     Sampler.NEAREST // Feature ID textures require nearest sampling
   );
 
-  featureIdTexture.texture.channels = featureIds.channels;
+  featureIdTexture.textureReader.channels = featureIds.channels;
 
   return featureIdTexture;
 }

Source/Scene/GltfLoaderUtil.js

@@ -201,7 +201,7 @@ var defaultScale = new Cartesian2(1.0, 1.0);
  * @param {String} [options.channels] The texture channels to read from.
  * @param {Texture} [options.texture] The texture object.
  *
- * @returns {ModelComponents.Texture} The texture.
+ * @returns {ModelComponents.TextureReader} The texture.
  */
 GltfLoaderUtil.createModelTexture = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
@@ -240,13 +240,13 @@ GltfLoaderUtil.createModelTexture = function (options) {
       );
   }
 
-  var modelTexture = new ModelComponents.Texture();
-  modelTexture.texture = texture;
-  modelTexture.texCoord = texCoord;
-  modelTexture.transform = transform;
-  modelTexture.channels = channels;
+  var modelTextureReader = new ModelComponents.TextureReader();
+  modelTextureReader.texture = texture;
+  modelTextureReader.texCoord = texCoord;
+  modelTextureReader.transform = transform;
+  modelTextureReader.channels = channels;
 
-  return modelTexture;
+  return modelTextureReader;
 };
 
 export default GltfLoaderUtil;

Source/Scene/ModelComponents.js

@@ -361,10 +361,10 @@ function FeatureIdTexture() {
   /**
    * The texture containing feature IDs.
    *
-   * @type {ModelComponents.Texture}
+   * @type {ModelComponents.TextureReader}
    * @private
    */
-  this.texture = undefined;
+  this.textureReader = undefined;
 }
 
 /**
@@ -647,21 +647,21 @@ function Components() {
 }
 
 /**
- * A texture.
+ * The components for reading a texture.
  *
- * @alias ModelComponents.Texture
+ * @alias ModelComponents.TextureReader
  * @constructor
  *
  * @private
  */
-function Texture() {
+function TextureReader() {
   /**
    * The underlying GPU texture. The {@link Texture} contains the sampler.
    *
    * @type {Texture}
    * @private
    */
-  this.texture = undefined;
+  this.textureReader = undefined;
 
   /**
    * The texture coordinate set.
@@ -700,15 +700,15 @@ function MetallicRoughness() {
   /**
    * The base color texture.
    *
-   * @type {ModelComponents.Texture}
+   * @type {ModelComponents.TextureReader}
    * @private
    */
   this.baseColorTexture = undefined;
 
   /**
    * The metallic roughness texture.
    *
-   * @type {ModelComponents.Texture}
+   * @type {ModelComponents.TextureReader}
    * @private
    */
   this.metallicRoughnessTexture = undefined;
@@ -775,15 +775,15 @@ function SpecularGlossiness() {
   /**
    * The diffuse texture.
    *
-   * @type {ModelComponents.Texture}
+   * @type {ModelComponents.TextureReader}
    * @private
    */
   this.diffuseTexture = undefined;
 
   /**
    * The specular glossiness texture.
    *
-   * @type {ModelComponents.Texture}
+   * @type {ModelComponents.TextureReader}
    * @private
    */
   this.specularGlossinessTexture = undefined;
@@ -863,23 +863,23 @@ function Material() {
   /**
    * The emissive texture.
    *
-   * @type {ModelComponents.Texture}
+   * @type {ModelComponents.TextureReader}
    * @private
    */
   this.emissiveTexture = undefined;
 
   /**
    * The normal texture.
    *
-   * @type {ModelComponents.Texture}
+   * @type {ModelComponents.TextureReader}
    * @private
    */
   this.normalTexture = undefined;
 
   /**
    * The occlusion texture.
    *
-   * @type {ModelComponents.Texture}
+   * @type {ModelComponents.TextureReader}
    * @private
    */
   this.occlusionTexture = undefined;
@@ -947,7 +947,7 @@ ModelComponents.Skin = Skin;
 ModelComponents.Node = Node;
 ModelComponents.Scene = Scene;
 ModelComponents.Components = Components;
-ModelComponents.Texture = Texture;
+ModelComponents.TextureReader = TextureReader;
 ModelComponents.MetallicRoughness = MetallicRoughness;
 ModelComponents.SpecularGlossiness = SpecularGlossiness;
 ModelComponents.Material = Material;

Specs/Scene/FeatureTexturePropertySpec.js

@@ -95,11 +95,11 @@ describe("Scene/FeatureTextureProperty", function () {
       0.0, 0.0, 1.0
     );
 
-    var modelTexture = featureTextureProperty.texture;
-    expect(modelTexture.texture).toBe(texture);
-    expect(modelTexture.texCoord).toBe(1);
-    expect(modelTexture.transform).toEqual(expectedTransform);
-    expect(modelTexture.channels).toBe("rgb");
+    var modelTextureReader = featureTextureProperty.textureReader;
+    expect(modelTextureReader.texture).toBe(texture);
+    expect(modelTextureReader.texCoord).toBe(1);
+    expect(modelTextureReader.transform).toEqual(expectedTransform);
+    expect(modelTextureReader.channels).toBe("rgb");
   });
 
   it("constructor throws without property", function () {

Specs/Scene/GltfFeatureMetadataLoaderSpec.js

@@ -361,16 +361,16 @@ describe(
         var intensityProperty = mapTexture.getProperty("intensity");
         var vegetationProperty = orthoTexture.getProperty("vegetation");
 
-        expect(colorProperty.texture.texture.width).toBe(1);
-        expect(colorProperty.texture.texture.height).toBe(1);
-        expect(colorProperty.texture.texture).toBe(
-          intensityProperty.texture.texture
+        expect(colorProperty.textureReader.texture.width).toBe(1);
+        expect(colorProperty.textureReader.texture.height).toBe(1);
+        expect(colorProperty.textureReader.texture).toBe(
+          intensityProperty.textureReader.texture
         );
 
-        expect(vegetationProperty.texture.texture.width).toBe(1);
-        expect(vegetationProperty.texture.texture.height).toBe(1);
-        expect(vegetationProperty.texture.texture).not.toBe(
-          colorProperty.texture.texture
+        expect(vegetationProperty.textureReader.texture.width).toBe(1);
+        expect(vegetationProperty.textureReader.texture.height).toBe(1);
+        expect(vegetationProperty.textureReader.texture).not.toBe(
+          colorProperty.textureReader.texture
         );
 
         expect(Object.keys(featureMetadata.schema.classes).sort()).toEqual([

Specs/Scene/GltfLoaderSpec.js

@@ -791,11 +791,13 @@ describe(
         expect(primitive.featureTextureIds).toEqual(["vegetationTexture"]);
 
         expect(featureIdTexture.featureTableId).toBe("landCoverTable");
-        expect(featureIdTexture.texture.channels).toBe("r");
-        expect(featureIdTexture.texture.texCoord).toBe(0);
-        expect(featureIdTexture.texture.texture.width).toBe(256);
-        expect(featureIdTexture.texture.texture.height).toBe(256);
-        expect(featureIdTexture.texture.texture.sampler).toBe(Sampler.NEAREST);
+        expect(featureIdTexture.textureReader.channels).toBe("r");
+        expect(featureIdTexture.textureReader.texCoord).toBe(0);
+        expect(featureIdTexture.textureReader.texture.width).toBe(256);
+        expect(featureIdTexture.textureReader.texture.height).toBe(256);
+        expect(featureIdTexture.textureReader.texture.sampler).toBe(
+          Sampler.NEAREST
+        );
 
         var classDefinition = featureMetadata.schema.classes.landCover;
         var properties = classDefinition.properties;
@@ -823,8 +825,8 @@ describe(
           "vegetationDensity"
         );
 
-        expect(vegetationProperty.texture.texture.width).toBe(256);
-        expect(vegetationProperty.texture.texture.height).toBe(256);
+        expect(vegetationProperty.textureReader.texture.width).toBe(256);
+        expect(vegetationProperty.textureReader.texture.height).toBe(256);
       });
     });