Merge pull request #6681 from AnalyticalGraphicsInc/more-orientations

Missed a constructor in #6632.
CesiumGS · Jun 13, 2018 · c3f5a51 · c3f5a51
2 parents d321899 + beab213
commit c3f5a51
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/Source/Scene/ClassificationModel.js b/Source/Scene/ClassificationModel.js
@@ -88,7 +88,7 @@ define([
     ///////////////////////////////////////////////////////////////////////////
 
     /**
-     * A 3D model for classifying other 3D assets based on glTF, the runtime asset format for WebGL, OpenGL ES, and OpenGL.
+     * A 3D model for classifying other 3D assets based on glTF, the runtime 3D asset format.
      * This is a special case when a model of a 3D tileset becomes a classifier when setting {@link Cesium3DTileset#classificationType}.
      *
      * @alias ClassificationModel

diff --git a/Source/Scene/Instanced3DModel3DTileContent.js b/Source/Scene/Instanced3DModel3DTileContent.js
@@ -21,6 +21,7 @@ define([
         '../Core/Transforms',
         '../Core/TranslationRotationScale',
         '../Renderer/Pass',
+        './Axis',
         './Cesium3DTileBatchTable',
         './Cesium3DTileFeature',
         './Cesium3DTileFeatureTable',
@@ -48,6 +49,7 @@ define([
         Transforms,
         TranslationRotationScale,
         Pass,
+        Axis,
         Cesium3DTileBatchTable,
         Cesium3DTileFeature,
         Cesium3DTileFeatureTable,
@@ -281,6 +283,7 @@ define([
             basePath : undefined,
             incrementallyLoadTextures : false,
             upAxis : content._tileset._gltfUpAxis,
+            forwardAxis : Axis.X,
             opaquePass : Pass.CESIUM_3D_TILE, // Draw opaque portions during the 3D Tiles pass
             pickIdLoaded : getPickIdCallback(content)
         };

diff --git a/Source/Scene/ModelInstanceCollection.js b/Source/Scene/ModelInstanceCollection.js
@@ -152,6 +152,7 @@ define([
         this._asynchronous = options.asynchronous;
         this._incrementallyLoadTextures = options.incrementallyLoadTextures;
         this._upAxis = options.upAxis; // Undocumented option
+        this._forwardAxis = options.forwardAxis; // Undocumented option
 
         this.shadows = defaultValue(options.shadows, ShadowMode.ENABLED);
         this._shadows = this.shadows;
@@ -569,6 +570,7 @@ define([
             allowPicking : allowPicking,
             incrementallyLoadTextures : collection._incrementallyLoadTextures,
             upAxis : collection._upAxis,
+            forwardAxis : collection._forwardAxis,
             precreatedAttributes : undefined,
             vertexShaderLoaded : undefined,
             fragmentShaderLoaded : undefined,

diff --git a/Specs/Scene/ModelSpec.js b/Specs/Scene/ModelSpec.js
@@ -2273,7 +2273,6 @@ defineSuite([
 
     function checkVertexColors(model) {
         model.zoomTo();
-        scene.camera.rotateRight(CesiumMath.PI_OVER_TWO);
         scene.camera.moveUp(0.1);
         // Red
         scene.camera.moveLeft(0.5);
@@ -2318,7 +2317,9 @@ defineSuite([
     });
 
     it('loads a glTF 2.0 with vertex colors', function() {
-        return loadModel(vertexColorTestUrl).then(function(m) {
+        return loadModel(vertexColorTestUrl, {
+            forwardAxis : Axis.X
+        }).then(function(m) {
             m.show = true;
             checkVertexColors(m);
             primitives.remove(m);