Move the interfaces to babylonjs-gltf2interface

loaders/src/glTF/2.0/Extensions/EXT_lights_image_based.ts

@@ -5,33 +5,19 @@ import { Quaternion, Matrix } from "babylonjs/Maths/math.vector";
 import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
 import { RawCubeTexture } from "babylonjs/Materials/Textures/rawCubeTexture";
 
-import { IChildRootProperty } from "babylonjs-gltf2interface";
+import { ILightReferenceImageBased, ILightImageBased, ILightsImageBased } from "babylonjs-gltf2interface";
 import { IScene } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader, ArrayItem } from "../glTFLoader";
 
 const NAME = "EXT_lights_image_based";
 
-/** @hidden */
-export interface ILightReferenceImageBased {
-    light: number;
-}
-
-/** @hidden */
-export interface ILightImageBased extends IChildRootProperty {
-    intensity: number;
-    rotation: number[];
-    specularImageSize: number;
-    specularImages: number[][];
-    irradianceCoefficients: number[][];
-
-    _babylonTexture?: BaseTexture;
-    _loaded?: Promise<void>;
-}
-
-/** @hidden */
-export interface ILightsImageBased {
-    lights: ILightImageBased[];
+declare module "babylonjs-gltf2interface" {
+    /** @hidden */
+    interface ILightImageBased {
+        _babylonTexture?: BaseTexture;
+        _loaded?: Promise<void>;
+    }
 }
 
 /**

loaders/src/glTF/2.0/Extensions/EXT_mesh_gpu_instancing.ts

@@ -6,15 +6,10 @@ import { GLTFLoader, ArrayItem } from "../glTFLoader";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { INode } from "../glTFLoaderInterfaces";
 import { TmpVectors } from 'babylonjs/Maths/math.vector';
+import { IEXTMeshGpuInstancing } from "babylonjs-gltf2interface";
 
 const NAME = "EXT_mesh_gpu_instancing";
 
-/** @hidden */
-export interface IEXTMeshGpuInstancing {
-    mesh?: number;
-    attributes: { [name: string]: number };
-}
-
 /**
  * [Proposed Specification](https://github.com/KhronosGroup/glTF/pull/1691)
  * [Playground Sample](https://playground.babylonjs.com/#QFIGLW#9)

loaders/src/glTF/2.0/Extensions/ExtrasAsMetadata.ts

@@ -7,14 +7,10 @@ import { INode, ICamera, IMaterial } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader } from "../glTFLoader";
 import { Material } from "babylonjs/Materials/material";
+import { ObjectWithMetadata } from "babylonjs-gltf2interface";
 
 const NAME = "ExtrasAsMetadata";
 
-/** @hidden */
-export interface ObjectWithMetadata {
-    metadata: any;
-}
-
 /**
  * Store glTF extras (if present) in BJS objects' metadata
  */

loaders/src/glTF/2.0/Extensions/KHR_draco_mesh_compression.ts

@@ -4,21 +4,14 @@ import { VertexBuffer } from "babylonjs/Meshes/buffer";
 import { Geometry } from "babylonjs/Meshes/geometry";
 import { Mesh } from "babylonjs/Meshes/mesh";
 
-import { MeshPrimitiveMode } from "babylonjs-gltf2interface";
-import { IBufferView, IMeshPrimitive } from "../glTFLoaderInterfaces";
+import { MeshPrimitiveMode, IKHRDracoMeshCompression } from "babylonjs-gltf2interface";
+import { IMeshPrimitive, IBufferView } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader, ArrayItem } from "../glTFLoader";
 
 const NAME = "KHR_draco_mesh_compression";
 
-/** @hidden */
-export interface IKHRDracoMeshCompression {
-    bufferView: number;
-    attributes: { [name: string]: number };
-}
-
-/** @hidden */
-export interface IBufferViewDraco extends IBufferView {
+interface IBufferViewDraco extends IBufferView {
     _dracoBabylonGeometry?: Promise<Geometry>;
 }
 

loaders/src/glTF/2.0/Extensions/KHR_lights_punctual.ts

@@ -7,42 +7,13 @@ import { SpotLight } from "babylonjs/Lights/spotLight";
 import { Light } from "babylonjs/Lights/light";
 import { TransformNode } from "babylonjs/Meshes/transformNode";
 
-import { IChildRootProperty } from "babylonjs-gltf2interface";
+import { LightType, ILightReference, ILight, ILights } from "babylonjs-gltf2interface";
 import { INode } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader, ArrayItem } from "../glTFLoader";
 
 const NAME = "KHR_lights_punctual";
 
-/** @hidden */
-export enum LightType {
-    DIRECTIONAL = "directional",
-    POINT = "point",
-    SPOT = "spot"
-}
-
-/** @hidden */
-export interface ILightReference {
-    light: number;
-}
-
-/** @hidden */
-export interface ILight extends IChildRootProperty {
-    type: LightType;
-    color?: number[];
-    intensity?: number;
-    range?: number;
-    spot?: {
-        innerConeAngle?: number;
-        outerConeAngle?: number;
-    };
-}
-
-/** @hidden */
-export interface ILights {
-    lights: ILight[];
-}
-
 /**
  * [Specification](https://github.com/KhronosGroup/glTF/blob/master/extensions/2.0/Khronos/KHR_lights_punctual)
  */

loaders/src/glTF/2.0/Extensions/KHR_materials_clearcoat.ts

@@ -2,22 +2,13 @@ import { Nullable } from "babylonjs/types";
 import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
 import { Material } from "babylonjs/Materials/material";
 
-import { ITextureInfo, IMaterial } from "../glTFLoaderInterfaces";
+import { IMaterial } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader } from "../glTFLoader";
-import { IMaterialNormalTextureInfo } from 'babylonjs-gltf2interface';
+import { IKHR_materials_clearcoat } from 'babylonjs-gltf2interface';
 
 const NAME = "KHR_materials_clearcoat";
 
-/** @hidden */
-export interface IKHR_materials_clearcoat {
-    clearcoatFactor: number;
-    clearcoatTexture: ITextureInfo;
-    clearcoatRoughnessFactor: number;
-    clearcoatRoughnessTexture: ITextureInfo;
-    clearcoatNormalTexture: IMaterialNormalTextureInfo;
-}
-
 /**
  * [Proposed Specification](https://github.com/KhronosGroup/glTF/pull/1677)
  * [Playground Sample](https://www.babylonjs-playground.com/frame.html#7F7PN6#8)

loaders/src/glTF/2.0/Extensions/KHR_materials_ior.ts

@@ -5,14 +5,10 @@ import { Material } from "babylonjs/Materials/material";
 import { IMaterial } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader } from "../glTFLoader";
+import { IKHR_materials_ior } from 'babylonjs-gltf2interface';
 
 const NAME = "KHR_materials_ior";
 
-/** @hidden */
-export interface IKHR_materials_ior {
-    ior: number;
-}
-
 /**
  * [Proposed Specification](https://github.com/KhronosGroup/glTF/pull/1718)
  * !!! Experimental Extension Subject to Changes !!!

loaders/src/glTF/2.0/Extensions/KHR_materials_pbrSpecularGlossiness.ts

@@ -3,21 +3,13 @@ import { Color3 } from "babylonjs/Maths/math.color";
 import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
 import { Material } from "babylonjs/Materials/material";
 
-import { ITextureInfo, IMaterial } from "../glTFLoaderInterfaces";
+import { IMaterial } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader } from "../glTFLoader";
+import { IKHRMaterialsPbrSpecularGlossiness } from 'babylonjs-gltf2interface';
 
 const NAME = "KHR_materials_pbrSpecularGlossiness";
 
-/** @hidden */
-export interface IKHRMaterialsPbrSpecularGlossiness {
-    diffuseFactor: number[];
-    diffuseTexture: ITextureInfo;
-    specularFactor: number[];
-    glossinessFactor: number;
-    specularGlossinessTexture: ITextureInfo;
-}
-
 /**
  * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_pbrSpecularGlossiness)
  */

loaders/src/glTF/2.0/Extensions/KHR_materials_sheen.ts

@@ -2,20 +2,14 @@ import { Nullable } from "babylonjs/types";
 import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
 import { Material } from "babylonjs/Materials/material";
 
-import { ITextureInfo, IMaterial } from "../glTFLoaderInterfaces";
+import { IMaterial } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader } from "../glTFLoader";
 import { Color3 } from 'babylonjs/Maths/math.color';
+import { IKHR_materials_sheen } from 'babylonjs-gltf2interface';
 
 const NAME = "KHR_materials_sheen";
 
-/** @hidden */
-export interface IKHR_materials_sheen {
-    sheenColorFactor: number[];
-    sheenTexture: ITextureInfo;
-    sheenRoughnessFactor: number;
-}
-
 /**
  * [Proposed Specification](https://github.com/KhronosGroup/glTF/pull/1688)
  * [Playground Sample](https://www.babylonjs-playground.com/frame.html#BNIZX6#4)

loaders/src/glTF/2.0/Extensions/KHR_materials_specular.ts

@@ -2,20 +2,14 @@ import { Nullable } from "babylonjs/types";
 import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
 import { Material } from "babylonjs/Materials/material";
 
-import { IMaterial, ITextureInfo } from "../glTFLoaderInterfaces";
+import { IMaterial } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader } from "../glTFLoader";
 import { Color3 } from 'babylonjs/Maths/math.color';
+import { IKHR_materials_specular } from 'babylonjs-gltf2interface';
 
 const NAME = "KHR_materials_specular";
 
-/** @hidden */
-export interface IKHR_materials_specular {
-    specularFactor: number;
-    specularColorFactor: number[];
-    specularTexture: ITextureInfo;
-}
-
 /**
  * [Proposed Specification](https://github.com/KhronosGroup/glTF/pull/1719)
  * !!! Experimental Extension Subject to Changes !!!

loaders/src/glTF/2.0/Extensions/KHR_materials_transmission.ts

@@ -2,18 +2,13 @@ import { Nullable } from "babylonjs/types";
 import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
 import { Material } from "babylonjs/Materials/material";
 import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
-import { IMaterial, ITextureInfo } from "../glTFLoaderInterfaces";
+import { IMaterial } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader } from "../glTFLoader";
+import { IMaterialsTransmission } from 'babylonjs-gltf2interface';
 
 const NAME = "KHR_materials_transmission";
 
-/** @hidden */
-export interface IMaterialsTransmission {
-    transmissionFactor?: number;
-    transmissionTexture?: ITextureInfo;
-}
-
 /**
  * [Proposed Specification](https://github.com/KhronosGroup/glTF/pull/1698)
  * !!! Experimental Extension Subject to Changes !!!

loaders/src/glTF/2.0/Extensions/KHR_materials_variants.ts

@@ -6,32 +6,20 @@ import { Material } from 'babylonjs/Materials/material';
 import { Mesh } from 'babylonjs/Meshes/mesh';
 import { AbstractMesh } from 'babylonjs/Meshes/abstractMesh';
 import { INode, IMeshPrimitive, IMesh } from '../glTFLoaderInterfaces';
+import { IKHRMaterialVariants } from 'babylonjs-gltf2interface';
 
 const NAME = "KHR_materials_variants";
 
-/** @hidden */
-export interface IKHRMaterialVariantsMapping {
-    tags: string[];
-    material: number;
-}
-
-/** @hidden */
-export interface IKHRMaterialVariants {
-    mapping: IKHRMaterialVariantsMapping[];
+interface IVariantsMap {
+    [key: string]: Array<{ mesh: AbstractMesh, material: Nullable<Material> }>;
 }
 
-/** @hidden */
-export interface IExtensionMetadata {
+interface IExtensionMetadata {
     lastSelected: Nullable<string | Array<string>>;
     original: Array<{ mesh: AbstractMesh, material: Nullable<Material> }>;
     variants: IVariantsMap;
 }
 
-/** @hidden */
-export interface IVariantsMap {
-    [key: string]: Array<{ mesh: AbstractMesh, material: Nullable<Material> }>;
-}
-
 /**
  * [Proposed Specification](https://github.com/KhronosGroup/glTF/pull/1681)
  * !!! Experimental Extension Subject to Changes !!!

loaders/src/glTF/2.0/Extensions/KHR_texture_basisu.ts

@@ -3,14 +3,10 @@ import { GLTFLoader, ArrayItem } from "../glTFLoader";
 import { ITexture } from "../glTFLoaderInterfaces";
 import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
 import { Nullable } from "babylonjs/types";
+import { IKHRTextureBasisU } from 'babylonjs-gltf2interface';
 
 const NAME = "KHR_texture_basisu";
 
-/** @hidden */
-export interface IKHRTextureBasisU {
-    source: number;
-}
-
 /**
  * [Proposed Specification](https://github.com/KhronosGroup/glTF/pull/1751)
  * !!! Experimental Extension Subject to Changes !!!

loaders/src/glTF/2.0/Extensions/KHR_texture_transform.ts

@@ -5,17 +5,10 @@ import { Texture } from "babylonjs/Materials/Textures/texture";
 import { ITextureInfo } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader } from "../glTFLoader";
+import { IKHRTextureTransform } from 'babylonjs-gltf2interface';
 
 const NAME = "KHR_texture_transform";
 
-/** @hidden */
-export interface IKHRTextureTransform {
-    offset?: number[];
-    rotation?: number;
-    scale?: number[];
-    texCoord?: number;
-}
-
 /**
  * [Specification](https://github.com/KhronosGroup/glTF/blob/master/extensions/2.0/Khronos/KHR_texture_transform)
  */

loaders/src/glTF/2.0/Extensions/KHR_xmp.ts

@@ -1,23 +1,9 @@
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader } from "../glTFLoader";
+import { IKHR_xmp_gltf, IKHR_xmp_node } from 'babylonjs-gltf2interface';
 
 const NAME = "KHR_xmp";
 
-/** @hidden */
-export interface IKHR_xmp_data {
-    [key: string]: unknown;
-}
-
-/** @hidden */
-export interface IKHR_xmp_gltf {
-    packets: IKHR_xmp_data[];
-}
-
-/** @hidden */
-export interface IKHR_xmp_node {
-    packet: number;
-}
-
 /**
  * [Proposed Specification](https://github.com/KhronosGroup/glTF/pull/1553)
  * !!! Experimental Extension Subject to Changes !!!

loaders/src/glTF/2.0/Extensions/MSFT_audio_emitter.ts

@@ -10,61 +10,15 @@ import { WeightedSound } from "babylonjs/Audio/weightedsound";
 import { IArrayItem, IScene, INode, IAnimation } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader, ArrayItem } from "../glTFLoader";
-import { IProperty } from 'babylonjs-gltf2interface';
+import { IClip, IEmitter, IEmittersReference, IAnimationEvent, AnimationEventAction } from 'babylonjs-gltf2interface';
 
 const NAME = "MSFT_audio_emitter";
 
-/** @hidden */
-export interface IClipReference {
-    clip: number;
-    weight?: number;
-}
-
-/** @hidden */
-export interface IEmittersReference {
-    emitters: number[];
-}
-
-/** @hidden */
-export const enum DistanceModel {
-    linear = "linear",
-    inverse = "inverse",
-    exponential = "exponential",
-}
-
-/** @hidden */
-export interface IEmitter {
-    name?: string;
-    distanceModel?: DistanceModel;
-    refDistance?: number;
-    maxDistance?: number;
-    rolloffFactor?: number;
-    innerAngle?: number;
-    outerAngle?: number;
-    loop?: boolean;
-    volume?: number;
-    clips: IClipReference[];
-}
-
-/** @hidden */
-export const enum AudioMimeType {
-    WAV = "audio/wav",
-}
-
-/** @hidden */
-export interface IClip extends IProperty {
-    uri?: string;
-    bufferView?: number;
-    mimeType?: AudioMimeType;
-}
-
-/** @hidden */
-export interface ILoaderClip extends IClip, IArrayItem {
+interface ILoaderClip extends IClip, IArrayItem {
     _objectURL?: Promise<string>;
 }
 
-/** @hidden */
-export interface ILoaderEmitter extends IEmitter, IArrayItem {
+interface ILoaderEmitter extends IEmitter, IArrayItem {
     _babylonData?: {
         sound?: WeightedSound;
         loaded: Promise<void>;
@@ -72,33 +26,15 @@ export interface ILoaderEmitter extends IEmitter, IArrayItem {
     _babylonSounds: Sound[];
 }
 
-/** @hidden */
-export interface IMSFTAudioEmitter {
+interface IMSFTAudioEmitter {
     clips: ILoaderClip[];
     emitters: ILoaderEmitter[];
 }
 
-/** @hidden */
-export const enum AnimationEventAction {
-    play = "play",
-    pause = "pause",
-    stop = "stop",
-}
-
-/** @hidden */
-export interface IAnimationEvent {
-    action: AnimationEventAction;
-    emitter: number;
-    time: number;
-    startOffset?: number;
-}
-
-/** @hidden */
-export interface ILoaderAnimationEvent extends IAnimationEvent, IArrayItem {
+interface ILoaderAnimationEvent extends IAnimationEvent, IArrayItem {
 }
 
-/** @hidden */
-export interface ILoaderAnimationEvents {
+interface ILoaderAnimationEvents {
     events: ILoaderAnimationEvent[];
 }
 

loaders/src/glTF/2.0/Extensions/MSFT_lod.ts

@@ -8,17 +8,11 @@ import { BaseTexture } from 'babylonjs/Materials/Textures/baseTexture';
 import { INode, IMaterial, IBuffer, IScene } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader, ArrayItem } from "../glTFLoader";
-import { IProperty } from 'babylonjs-gltf2interface';
+import { IProperty, IMSFTLOD } from 'babylonjs-gltf2interface';
 
 const NAME = "MSFT_lod";
 
-/** @hidden */
-export interface IMSFTLOD {
-    ids: number[];
-}
-
-/** @hidden */
-export interface IBufferInfo {
+interface IBufferInfo {
     start: number;
     end: number;
     loaded: Deferred<ArrayBufferView>;