Move Gltf-Pipeline to Source/Scene

.eslintignore

@@ -2,6 +2,7 @@ Apps/HelloWorld.html
 Apps/Sandcastle/ThirdParty/**
 Build/**
 Documentation/**
+Source/Scene/GltfPipeline/**
 Source/Shaders/**
 Source/ThirdParty/**
 Source/ThirdPartyNpm/**

.prettierignore

@@ -22,6 +22,7 @@
 # Re-ignore a few things caught above
 **/*.min.js
 Source/Cesium.js
+Source/Scene/GltfPipeline/**
 Source/Shaders/**/*.js
 Source/ThirdParty/**
 Source/ThirdPartyNpm/**

Source/Scene/ClassificationModel.js

@@ -16,12 +16,12 @@ import PrimitiveType from "../Core/PrimitiveType.js";
 import RuntimeError from "../Core/RuntimeError.js";
 import Transforms from "../Core/Transforms.js";
 import WebGLConstants from "../Core/WebGLConstants.js";
-import addDefaults from "../ThirdParty/GltfPipeline/addDefaults.js";
-import ForEach from "../ThirdParty/GltfPipeline/ForEach.js";
-import getAccessorByteStride from "../ThirdParty/GltfPipeline/getAccessorByteStride.js";
-import numberOfComponentsForType from "../ThirdParty/GltfPipeline/numberOfComponentsForType.js";
-import parseGlb from "../ThirdParty/GltfPipeline/parseGlb.js";
-import updateVersion from "../ThirdParty/GltfPipeline/updateVersion.js";
+import addDefaults from "./GltfPipeline/addDefaults.js";
+import ForEach from "./GltfPipeline/ForEach.js";
+import getAccessorByteStride from "./GltfPipeline/getAccessorByteStride.js";
+import numberOfComponentsForType from "./GltfPipeline/numberOfComponentsForType.js";
+import parseGlb from "./GltfPipeline/parseGlb.js";
+import updateVersion from "./GltfPipeline/updateVersion.js";
 import when from "../ThirdPartyNpm/when.js";
 import Axis from "./Axis.js";
 import ModelLoadResources from "./ModelLoadResources.js";

Source/Scene/DracoLoader.js

@@ -3,7 +3,7 @@ import ComponentDatatype from "../Core/ComponentDatatype.js";
 import defined from "../Core/defined.js";
 import FeatureDetection from "../Core/FeatureDetection.js";
 import TaskProcessor from "../Core/TaskProcessor.js";
-import ForEach from "../ThirdParty/GltfPipeline/ForEach.js";
+import ForEach from "./GltfPipeline/ForEach.js";
 import when from "../ThirdPartyNpm/when.js";
 
 /**

Source/Scene/GltfJsonLoader.js

@@ -5,12 +5,12 @@ import getJsonFromTypedArray from "../Core/getJsonFromTypedArray.js";
 import getMagic from "../Core/getMagic.js";
 import isDataUri from "../Core/isDataUri.js";
 import Resource from "../Core/Resource.js";
-import addDefaults from "../ThirdParty/GltfPipeline/addDefaults.js";
-import addPipelineExtras from "../ThirdParty/GltfPipeline/addPipelineExtras.js";
-import ForEach from "../ThirdParty/GltfPipeline/ForEach.js";
-import parseGlb from "../ThirdParty/GltfPipeline/parseGlb.js";
-import removePipelineExtras from "../ThirdParty/GltfPipeline/removePipelineExtras.js";
-import updateVersion from "../ThirdParty/GltfPipeline/updateVersion.js";
+import addDefaults from "./GltfPipeline/addDefaults.js";
+import addPipelineExtras from "./GltfPipeline/addPipelineExtras.js";
+import ForEach from "./GltfPipeline/ForEach.js";
+import parseGlb from "./GltfPipeline/parseGlb.js";
+import removePipelineExtras from "./GltfPipeline/removePipelineExtras.js";
+import updateVersion from "./GltfPipeline/updateVersion.js";
 import when from "../ThirdPartyNpm/when.js";
 import ResourceLoader from "./ResourceLoader.js";
 import ResourceLoaderState from "./ResourceLoaderState.js";

Source/Scene/GltfLoader.js

@@ -9,9 +9,9 @@ import FeatureDetection from "../Core/FeatureDetection.js";
 import Matrix4 from "../Core/Matrix4.js";
 import Quaternion from "../Core/Quaternion.js";
 import Sampler from "../Renderer/Sampler.js";
-import getAccessorByteStride from "../ThirdParty/GltfPipeline/getAccessorByteStride.js";
-import getComponentReader from "../ThirdParty/GltfPipeline/getComponentReader.js";
-import numberOfComponentsForType from "../ThirdParty/GltfPipeline/numberOfComponentsForType.js";
+import getAccessorByteStride from "./GltfPipeline/getAccessorByteStride.js";
+import getComponentReader from "./GltfPipeline/getComponentReader.js";
+import numberOfComponentsForType from "./GltfPipeline/numberOfComponentsForType.js";
 import when from "../ThirdPartyNpm/when.js";
 import AttributeType from "./AttributeType.js";
 import GltfFeatureMetadataLoader from "./GltfFeatureMetadataLoader.js";

Source/ThirdParty/GltfPipeline/forEachTextureInMaterial.js → Source/Scene/GltfPipeline/forEachTextureInMaterial.js

@@ -7,6 +7,8 @@ import defined from "../../Core/defined.js"
  * Mimics the behavior of functions in gltf-pipeline ForEach.
  * @param {Object} material The glTF material.
  * @param {forEachTextureInMaterial~handler} handler Function that is called for each texture in the material.
+ *
+ * @private
  */
 function forEachTextureInMaterial(material, handler) {
     Check.typeOf.object('material', material);
@@ -129,6 +131,8 @@ function forEachTextureInMaterial(material, handler) {
  * @callback forEachTextureInMaterial~handler
  * @param {Number} The texture index.
  * @param {Object} The texture info object.
+ *
+ * @private
  */
 
 export default forEachTextureInMaterial;

Source/ThirdParty/GltfPipeline/getComponentReader.js → Source/Scene/GltfPipeline/getComponentReader.js

@@ -70,6 +70,8 @@ function getComponentReader(componentType) {
  * @param {Number} numberOfComponents The number of components to read.
  * @param {Number} componentTypeByteLength The byte length of each component.
  * @param {Number} result An array storing the components that are read.
+ *
+ * @private
  */
 
 export default getComponentReader;

Source/ThirdParty/GltfPipeline/removeUnusedElements.js → Source/Scene/GltfPipeline/removeUnusedElements.js

@@ -120,6 +120,10 @@ Remove.buffer = function(gltf, bufferId) {
         if (defined(bufferView.buffer) && bufferView.buffer > bufferId) {
             bufferView.buffer--;
         }
+
+        if (defined(bufferView.extensions) && defined(bufferView.extensions.EXT_meshopt_compression)) {
+            bufferView.extensions.EXT_meshopt_compression.buffer--;
+        }
     });
 };
 
@@ -424,6 +428,9 @@ getListOfElementsIdsInUse.buffer = function(gltf) {
         if (defined(bufferView.buffer)) {
             usedBufferIds[bufferView.buffer] = true;
         }
+        if (defined(bufferView.extensions) && defined(bufferView.extensions.EXT_meshopt_compression)) {
+            usedBufferIds[bufferView.extensions.EXT_meshopt_compression.buffer] = true;
+        }
     });
 
     return usedBufferIds;

Source/Scene/Model.js

@@ -43,14 +43,14 @@ import Texture from "../Renderer/Texture.js";
 import TextureMinificationFilter from "../Renderer/TextureMinificationFilter.js";
 import TextureWrap from "../Renderer/TextureWrap.js";
 import VertexArray from "../Renderer/VertexArray.js";
-import addDefaults from "../ThirdParty/GltfPipeline/addDefaults.js";
-import addPipelineExtras from "../ThirdParty/GltfPipeline/addPipelineExtras.js";
-import ForEach from "../ThirdParty/GltfPipeline/ForEach.js";
-import getAccessorByteStride from "../ThirdParty/GltfPipeline/getAccessorByteStride.js";
-import usesExtension from "../ThirdParty/GltfPipeline/usesExtension.js";
-import numberOfComponentsForType from "../ThirdParty/GltfPipeline/numberOfComponentsForType.js";
-import parseGlb from "../ThirdParty/GltfPipeline/parseGlb.js";
-import updateVersion from "../ThirdParty/GltfPipeline/updateVersion.js";
+import addDefaults from "./GltfPipeline/addDefaults.js";
+import addPipelineExtras from "./GltfPipeline/addPipelineExtras.js";
+import ForEach from "./GltfPipeline/ForEach.js";
+import getAccessorByteStride from "./GltfPipeline/getAccessorByteStride.js";
+import usesExtension from "./GltfPipeline/usesExtension.js";
+import numberOfComponentsForType from "./GltfPipeline/numberOfComponentsForType.js";
+import parseGlb from "./GltfPipeline/parseGlb.js";
+import updateVersion from "./GltfPipeline/updateVersion.js";
 import when from "../ThirdPartyNpm/when.js";
 import Axis from "./Axis.js";
 import BlendingState from "./BlendingState.js";

Source/Scene/ModelAnimationCache.js

@@ -9,8 +9,8 @@ import QuaternionSpline from "../Core/QuaternionSpline.js";
 import Spline from "../Core/Spline.js";
 import WebGLConstants from "../Core/WebGLConstants.js";
 import WeightSpline from "../Core/WeightSpline.js";
-import getAccessorByteStride from "../ThirdParty/GltfPipeline/getAccessorByteStride.js";
-import numberOfComponentsForType from "../ThirdParty/GltfPipeline/numberOfComponentsForType.js";
+import getAccessorByteStride from "./GltfPipeline/getAccessorByteStride.js";
+import numberOfComponentsForType from "./GltfPipeline/numberOfComponentsForType.js";
 import AttributeType from "./AttributeType.js";
 
 /**

Source/Scene/ModelInstanceCollection.js

@@ -20,7 +20,7 @@ import DrawCommand from "../Renderer/DrawCommand.js";
 import Pass from "../Renderer/Pass.js";
 import RenderState from "../Renderer/RenderState.js";
 import ShaderSource from "../Renderer/ShaderSource.js";
-import ForEach from "../ThirdParty/GltfPipeline/ForEach.js";
+import ForEach from "./GltfPipeline/ForEach.js";
 import when from "../ThirdPartyNpm/when.js";
 import Model from "./Model.js";
 import ModelInstance from "./ModelInstance.js";

Source/Scene/ModelOutlineLoader.js

@@ -6,7 +6,7 @@ import Texture from "../Renderer/Texture.js";
 import TextureMagnificationFilter from "../Renderer/TextureMagnificationFilter.js";
 import TextureMinificationFilter from "../Renderer/TextureMinificationFilter.js";
 import TextureWrap from "../Renderer/TextureWrap.js";
-import ForEach from "../ThirdParty/GltfPipeline/ForEach.js";
+import ForEach from "./GltfPipeline/ForEach.js";
 
 // glTF does not allow an index value of 65535 because this is the primitive
 // restart value in some APIs.

Source/Scene/ModelUtility.js

@@ -11,9 +11,9 @@ import Quaternion from "../Core/Quaternion.js";
 import RuntimeError from "../Core/RuntimeError.js";
 import WebGLConstants from "../Core/WebGLConstants.js";
 import ShaderSource from "../Renderer/ShaderSource.js";
-import addToArray from "../ThirdParty/GltfPipeline/addToArray.js";
-import ForEach from "../ThirdParty/GltfPipeline/ForEach.js";
-import usesExtension from "../ThirdParty/GltfPipeline/usesExtension.js";
+import addToArray from "./GltfPipeline/addToArray.js";
+import ForEach from "./GltfPipeline/ForEach.js";
+import usesExtension from "./GltfPipeline/usesExtension.js";
 import AttributeType from "./AttributeType.js";
 import Axis from "./Axis.js";
 

Source/Scene/processModelMaterialsCommon.js

@@ -2,9 +2,9 @@ import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import WebGLConstants from "../Core/WebGLConstants.js";
 import webGLConstantToGlslType from "../Core/webGLConstantToGlslType.js";
-import addToArray from "../ThirdParty/GltfPipeline/addToArray.js";
-import ForEach from "../ThirdParty/GltfPipeline/ForEach.js";
-import usesExtension from "../ThirdParty/GltfPipeline/usesExtension.js";
+import addToArray from "./GltfPipeline/addToArray.js";
+import ForEach from "./GltfPipeline/ForEach.js";
+import usesExtension from "./GltfPipeline/usesExtension.js";
 import ModelUtility from "./ModelUtility.js";
 
 /**

Source/Scene/processPbrMaterials.js

@@ -2,9 +2,9 @@ import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import WebGLConstants from "../Core/WebGLConstants.js";
 import webGLConstantToGlslType from "../Core/webGLConstantToGlslType.js";
-import addToArray from "../ThirdParty/GltfPipeline/addToArray.js";
-import ForEach from "../ThirdParty/GltfPipeline/ForEach.js";
-import usesExtension from "../ThirdParty/GltfPipeline/usesExtension.js";
+import addToArray from "./GltfPipeline/addToArray.js";
+import ForEach from "./GltfPipeline/ForEach.js";
+import usesExtension from "./GltfPipeline/usesExtension.js";
 import ModelUtility from "./ModelUtility.js";
 
 /**

Specs/Scene/GltfBuilder.js

@@ -1,5 +1,5 @@
 import { defined, RuntimeError } from "../../Source/Cesium.js";
-import findAccessorMinMax from "../../Source/ThirdParty/GltfPipeline/findAccessorMinMax.js";
+import findAccessorMinMax from "../../Source/Scene/GltfPipeline/findAccessorMinMax.js";
 
 /**
  * A fluent interface for programmatically building a glTF.