loaders relative import paths

loaders/src/OBJ/objFileLoader.ts

@@ -1,5 +1,18 @@
-import { Geometry, Mesh, SceneLoader, Vector3, Vector2, Tools, Color3, StandardMaterial, Nullable, Scene, Texture, ISceneLoaderPluginAsync, SceneLoaderProgressEvent, AbstractMesh, IParticleSystem, Skeleton, AnimationGroup, AssetContainer, VertexData } from "babylonjs";
-
+import { Nullable } from "babylonjs/types";
+import { Vector3, Vector2, Color3 } from "babylonjs/Maths/math";
+import { Tools } from "babylonjs/Misc/tools";
+import { VertexData } from "babylonjs/Meshes/mesh.vertexData";
+import { Geometry } from "babylonjs/Meshes/geometry";
+import { AnimationGroup } from "babylonjs/Animations/animationGroup";
+import { Skeleton } from "babylonjs/Bones/skeleton";
+import { IParticleSystem } from "babylonjs/Particles/IParticleSystem";
+import { Texture } from "babylonjs/Materials/Textures/texture";
+import { StandardMaterial } from "babylonjs/Materials/standardMaterial";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+import { Mesh } from "babylonjs/Meshes/mesh";
+import { SceneLoader, ISceneLoaderPluginAsync, SceneLoaderProgressEvent } from "babylonjs/Loading/sceneLoader";
+import { AssetContainer } from "babylonjs/assetContainer";
+import { Scene } from "babylonjs/scene";
 /**
  * Class reading and parsing the MTL file bundled with the obj file.
  */

loaders/src/STL/stlFileLoader.ts

@@ -1,4 +1,13 @@
-import { Scene, SceneLoader, ISceneLoaderPlugin, ISceneLoaderPluginExtensions, Nullable, AbstractMesh, IParticleSystem, Skeleton, Mesh, Tools, AssetContainer, VertexBuffer } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Tools } from "babylonjs/Misc/tools";
+import { VertexBuffer } from "babylonjs/Meshes/buffer";
+import { Skeleton } from "babylonjs/Bones/skeleton";
+import { IParticleSystem } from "babylonjs/Particles/IParticleSystem";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+import { Mesh } from "babylonjs/Meshes/mesh";
+import { SceneLoader, ISceneLoaderPlugin, ISceneLoaderPluginExtensions } from "babylonjs/Loading/sceneLoader";
+import { AssetContainer } from "babylonjs/assetContainer";
+import { Scene } from "babylonjs/scene";
 
 /**
  * STL file type loader.

loaders/src/glTF/1.0/glTFBinaryExtension.ts

@@ -1,6 +1,6 @@
 import { GLTFLoaderExtension } from "./glTFLoaderExtension";
 import { GLTFUtils } from "./glTFLoaderUtils";
-import { Scene } from "babylonjs";
+import { Scene } from "babylonjs/scene";
 import { IGLTFLoaderData } from "../glTFFileLoader";
 import { IGLTFRuntime, IGLTFTexture, IGLTFImage, IGLTFBufferView, EComponentType, IGLTFShader } from "./glTFLoaderInterfaces";
 import { GLTFLoader, GLTFLoaderBase } from "./glTFLoader";

loaders/src/glTF/1.0/glTFLoaderExtension.ts

@@ -1,4 +1,8 @@
-import { Scene, Texture, Material, Nullable } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Material } from "babylonjs/Materials/material";
+import { Texture } from "babylonjs/Materials/Textures/texture";
+import { Scene } from "babylonjs/scene";
+
 import { IGLTFLoaderData } from "../glTFFileLoader";
 import { IGLTFRuntime } from "./glTFLoaderInterfaces";
 import { GLTFLoader, GLTFLoaderBase } from "./glTFLoader";

loaders/src/glTF/1.0/glTFLoaderInterfaces.ts

@@ -1,4 +1,8 @@
-import { Texture, Skeleton, Scene, Bone, Node } from "babylonjs";
+import { Bone } from "babylonjs/Bones/bone";
+import { Skeleton } from "babylonjs/Bones/skeleton";
+import { Texture } from "babylonjs/Materials/Textures/texture";
+import { Node } from "babylonjs/node";
+import { Scene } from "babylonjs/scene";
 
 /**
 * Enums

loaders/src/glTF/1.0/glTFLoaderUtils.ts

@@ -1,5 +1,12 @@
-import { Scene, ShaderMaterial, Effect, Nullable, Matrix, Vector2, Vector3, Vector4, Texture, Color4, Node } from "babylonjs";
-import { IGLTFTechniqueParameter, EParameterType, ETextureWrapMode, IGLTFAccessor, ETextureFilterType, IGLTFRuntime, IGLTFBufferView, EComponentType } from "./glTFLoaderInterfaces";
+import { IGLTFTechniqueParameter, EParameterType, ETextureWrapMode, IGLTFAccessor, ETextureFilterType, IGLTFRuntime, IGLTFBufferView, EComponentType } from "./glTFLoaderInterfaces";
+
+import { Nullable } from "babylonjs/types";
+import { Vector2, Vector3, Vector4, Color4, Matrix } from "babylonjs/Maths/math";
+import { Effect } from "babylonjs/Materials/effect";
+import { ShaderMaterial } from "babylonjs/Materials/shaderMaterial";
+import { Texture } from "babylonjs/Materials/Textures/texture";
+import { Node } from "babylonjs/node";
+import { Scene } from "babylonjs/scene";
 
 /**
 * Utils functions for GLTF

loaders/src/glTF/1.0/glTFMaterialsCommonExtension.ts

@@ -2,7 +2,14 @@ import { GLTFLoaderExtension, GLTFLoaderBase } from ".";
 
 import { IGLTFRuntime, IGLTFMaterial } from "./glTFLoaderInterfaces";
 
-import { HemisphericLight, Vector3, Color3, PointLight, DirectionalLight, SpotLight, Tools, Material, StandardMaterial } from "babylonjs";
+import { Color3, Vector3 } from "babylonjs/Maths/math";
+import { Tools } from "babylonjs/Misc/tools";
+import { Material } from "babylonjs/Materials/material";
+import { StandardMaterial } from "babylonjs/Materials/standardMaterial";
+import { HemisphericLight } from "babylonjs/Lights/hemisphericLight";
+import { DirectionalLight } from "babylonjs/Lights/directionalLight";
+import { PointLight } from "babylonjs/Lights/pointLight";
+import { SpotLight } from "babylonjs/Lights/spotLight";
 
 import { GLTFLoader } from "./glTFLoader";
 

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

@@ -1,4 +1,10 @@
-import { BaseTexture, Nullable, RawCubeTexture, Quaternion, Matrix, SphericalHarmonics, SphericalPolynomial, Scalar } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Scalar } from "babylonjs/Maths/math.scalar";
+import { SphericalHarmonics, SphericalPolynomial } from "babylonjs/Maths/sphericalPolynomial";
+import { Quaternion, Matrix } from "babylonjs/Maths/math";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { RawCubeTexture } from "babylonjs/Materials/Textures/rawCubeTexture";
+
 import { IChildRootProperty } from "babylonjs-gltf2interface";
 import { IScene } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";

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

@@ -1,4 +1,9 @@
-import { Geometry, DracoCompression, Mesh, Nullable, VertexBuffer } from "babylonjs";
+import { DracoCompression } from "babylonjs/Meshes/Compression/dracoCompression";
+import { Nullable } from "babylonjs/types";
+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 { IGLTFLoaderExtension } from "../glTFLoaderExtension";

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

@@ -1,4 +1,11 @@
-import { TransformNode, Nullable, Light, DirectionalLight, Vector3, PointLight, SpotLight, Color3 } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Color3, Vector3 } from "babylonjs/Maths/math";
+import { DirectionalLight } from "babylonjs/Lights/directionalLight";
+import { PointLight } from "babylonjs/Lights/pointLight";
+import { SpotLight } from "babylonjs/Lights/spotLight";
+import { Light } from "babylonjs/Lights/light";
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+
 import { IChildRootProperty } from "babylonjs-gltf2interface";
 import { INode } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";

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

@@ -1,4 +1,8 @@
-import { Material, Nullable, PBRMaterial, Color3 } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Color3 } from "babylonjs/Maths/math";
+import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
+import { Material } from "babylonjs/Materials/material";
+
 import { ITextureInfo, IMaterial } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader } from "../glTFLoader";

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

@@ -1,4 +1,8 @@
-import { Material, Nullable, PBRMaterial, Color3 } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Color3 } from "babylonjs/Maths/math";
+import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
+import { Material } from "babylonjs/Materials/material";
+
 import { IMaterial } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader } from "../glTFLoader";

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

@@ -1,4 +1,7 @@
-import { BaseTexture, Nullable, Texture } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { Texture } from "babylonjs/Materials/Textures/texture";
+
 import { ITextureInfo } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader } from "../glTFLoader";

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

@@ -1,4 +1,12 @@
-import { WeightedSound, Sound, Nullable, TransformNode, Vector3, Tools, AnimationGroup, AnimationEvent } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Vector3 } from "babylonjs/Maths/math";
+import { Tools } from "babylonjs/Misc/tools";
+import { AnimationGroup } from "babylonjs/Animations/animationGroup";
+import { AnimationEvent } from "babylonjs/Animations/animation";
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+import { Sound } from "babylonjs/Audio/sound";
+import { WeightedSound } from "babylonjs/Audio/weightedsound";
+
 import { IArrayItem, IScene, INode, IAnimation } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader, ArrayItem } from "../glTFLoader";

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

@@ -1,4 +1,10 @@
-import { Observable, Nullable, Deferred, Mesh, TransformNode, Material } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Observable } from "babylonjs/Misc/observable";
+import { Deferred } from "babylonjs/Misc/deferred";
+import { Material } from "babylonjs/Materials/material";
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+import { Mesh } from "babylonjs/Meshes/mesh";
+
 import { INode, IMaterial } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader, ArrayItem } from "../glTFLoader";

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

@@ -1,4 +1,7 @@
-import { Material, Nullable, PBRMaterial } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Material } from "babylonjs/Materials/material";
+import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
+
 import { IMaterial } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader } from "../glTFLoader";

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

@@ -1,4 +1,7 @@
-import { Material, Nullable, PBRMaterial } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Material } from "babylonjs/Materials/material";
+import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
+
 import { IMaterial } from "../glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTFLoader } from "../glTFLoader";

loaders/src/glTF/2.0/glTFLoader.ts

@@ -1,4 +1,28 @@
-import { IFileRequest, Buffer, Animation, Scene, Nullable, Mesh, Material, SceneLoaderProgressEvent, Tools, AbstractMesh, IParticleSystem, Skeleton, AnimationGroup, Geometry, VertexBuffer, MorphTargetManager, MorphTarget, TransformNode, Vector3, Quaternion, Matrix, Bone, Camera, FreeCamera, IAnimationKey, AnimationKeyInterpolation, IndicesArray, PBRMaterial, Color3, BaseTexture, Deferred, Texture, LoadFileError } from "babylonjs";
+import { IndicesArray, Nullable } from "babylonjs/types";
+import { Deferred } from "babylonjs/Misc/deferred";
+import { Quaternion, Color3, Vector3, Matrix } from "babylonjs/Maths/math";
+import { LoadFileError, IFileRequest, Tools } from "babylonjs/Misc/tools";
+import { Camera } from "babylonjs/Cameras/camera";
+import { FreeCamera } from "babylonjs/Cameras/freeCamera";
+import { AnimationGroup } from "babylonjs/Animations/animationGroup";
+import { Animation, IAnimationKey, AnimationKeyInterpolation } from "babylonjs/Animations/animation";
+import { Bone } from "babylonjs/Bones/bone";
+import { Skeleton } from "babylonjs/Bones/skeleton";
+import { IParticleSystem } from "babylonjs/Particles/IParticleSystem";
+import { Material } from "babylonjs/Materials/material";
+import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { Texture } from "babylonjs/Materials/Textures/texture";
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+import { Buffer, VertexBuffer } from "babylonjs/Meshes/buffer";
+import { Geometry } from "babylonjs/Meshes/geometry";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+import { Mesh } from "babylonjs/Meshes/mesh";
+import { MorphTarget } from "babylonjs/Morph/morphTarget";
+import { MorphTargetManager } from "babylonjs/Morph/morphTargetManager";
+import { SceneLoaderProgressEvent } from "babylonjs/Loading/sceneLoader";
+import { Scene } from "babylonjs/scene";
+
 import { IProperty, AccessorType, CameraType, AnimationChannelTargetPath, AnimationSamplerInterpolation, AccessorComponentType, MaterialAlphaMode, TextureMinFilter, TextureWrapMode, TextureMagFilter, MeshPrimitiveMode } from "babylonjs-gltf2interface";
 import { _IAnimationSamplerData, IGLTF, ISampler, INode, IScene, IMesh,  IAccessor, ISkin, ICamera, IAnimation, IAnimationChannel, IAnimationSampler, IBuffer, IBufferView, IMaterialPbrMetallicRoughness, IMaterial, ITextureInfo, ITexture, IImage, IMeshPrimitive, IArrayItem as IArrItem, _ISamplerData } from "./glTFLoaderInterfaces";
 import { IGLTFLoaderExtension } from "./glTFLoaderExtension";

loaders/src/glTF/2.0/glTFLoaderExtension.ts

@@ -1,4 +1,13 @@
-import { IDisposable, Nullable, TransformNode, Mesh, Camera, Geometry, Material, BaseTexture, AnimationGroup } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { AnimationGroup } from "babylonjs/Animations/animationGroup";
+import { Material } from "babylonjs/Materials/material";
+import { Camera } from "babylonjs/Cameras/camera";
+import { Geometry } from "babylonjs/Meshes/geometry";
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { Mesh } from "babylonjs/Meshes/mesh";
+import { IDisposable } from "babylonjs/scene";
+
 import { IScene, INode, ICamera, IMeshPrimitive, IMaterial, ITextureInfo, IAnimation } from "./glTFLoaderInterfaces";
 import { IGLTFLoaderExtension as IGLTFBaseLoaderExtension } from "../glTFFileLoader";
 

loaders/src/glTF/2.0/glTFLoaderInterfaces.ts

@@ -1,4 +1,12 @@
-import { VertexBuffer, Buffer, AnimationGroup, Material, TransformNode, AbstractMesh, Mesh, Bone, Skeleton } from "babylonjs";
+import { AnimationGroup } from "babylonjs/Animations/animationGroup";
+import { Bone } from "babylonjs/Bones/bone";
+import { Skeleton } from "babylonjs/Bones/skeleton";
+import { Material } from "babylonjs/Materials/material";
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+import { Buffer, VertexBuffer } from "babylonjs/Meshes/buffer";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+import { Mesh } from "babylonjs/Meshes/mesh";
+
 import * as IGLTF2 from "babylonjs-gltf2interface";
 
     /**

loaders/src/glTF/glTFFileLoader.ts

@@ -1,6 +1,19 @@
-import { IDisposable, Nullable, Scene, ISceneLoaderPluginAsync, ISceneLoaderPluginFactory, Observable, Observer, SceneLoaderProgressEvent, AbstractMesh, IParticleSystem, Skeleton, AnimationGroup, BaseTexture, Material, Camera, ISceneLoaderPluginExtensions, ISceneLoaderPlugin, AssetContainer, Tools, SceneLoader } from "babylonjs";
 import { IGLTFValidationResults, IGLTFValidationOptions } from "babylonjs-gltf2interface";
 
+import { Nullable } from "babylonjs/types";
+import { Observable, Observer } from "babylonjs/Misc/observable";
+import { Tools } from "babylonjs/Misc/tools";
+import { Camera } from "babylonjs/Cameras/camera";
+import { AnimationGroup } from "babylonjs/Animations/animationGroup";
+import { Skeleton } from "babylonjs/Bones/skeleton";
+import { IParticleSystem } from "babylonjs/Particles/IParticleSystem";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { Material } from "babylonjs/Materials/material";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+import { SceneLoader, ISceneLoaderPluginFactory, ISceneLoaderPlugin, ISceneLoaderPluginAsync, SceneLoaderProgressEvent, ISceneLoaderPluginExtensions } from "babylonjs/Loading/sceneLoader";
+import { AssetContainer } from "babylonjs/assetContainer";
+import { Scene, IDisposable } from "babylonjs/scene";
+
 /**
  * glTF validator object
  */

loaders/tsconfig.json

@@ -4,11 +4,11 @@
     "baseUrl": "./src/",
     "rootDir": "./src/",
     "paths": {
-        "babylonjs": [
-          "../../dist/preview release/babylon.module.d.ts"
-        ],
         "babylonjs-gltf2interface": [
           "../../dist/preview release/glTF2Interface/babylon.glTF2Interface.d.ts"
+        ],
+        "babylonjs/*": [
+          "../../dist/preview release/babylon.module.d.ts"
         ]
     }
   }