Преглед на файлове

use babylonjs instead of @babylonjs

Trevor Baron преди 6 години
родител
ревизия
e78dd92158
променени са 31 файла, в които са добавени 132 реда и са изтрити 126 реда
  1. 1 1
      Viewer/src/configuration/configuration.ts
  2. 2 2
      Viewer/src/configuration/configurationContainer.ts
  3. 1 1
      Viewer/src/configuration/globals.ts
  4. 1 1
      Viewer/src/configuration/interfaces/defaultRenderingPipelineConfiguration.ts
  5. 1 1
      Viewer/src/configuration/mappers.ts
  6. 1 1
      Viewer/src/configuration/renderOnlyLoader.ts
  7. 1 1
      Viewer/src/configuration/types/extended.ts
  8. 2 2
      Viewer/src/index.ts
  9. 2 2
      Viewer/src/labs/environmentSerializer.ts
  10. 6 6
      Viewer/src/labs/texture.ts
  11. 4 4
      Viewer/src/labs/viewerLabs.ts
  12. 5 5
      Viewer/src/loader/modelLoader.ts
  13. 2 2
      Viewer/src/loader/plugins/applyMaterialConfig.ts
  14. 3 3
      Viewer/src/loader/plugins/extendedMaterialLoaderPlugin.ts
  15. 1 1
      Viewer/src/loader/plugins/index.ts
  16. 6 6
      Viewer/src/loader/plugins/loaderPlugin.ts
  17. 3 3
      Viewer/src/loader/plugins/msftLodLoaderPlugin.ts
  18. 2 2
      Viewer/src/loader/plugins/telemetryLoaderPlugin.ts
  19. 4 4
      Viewer/src/managers/observablesManager.ts
  20. 27 27
      Viewer/src/managers/sceneManager.ts
  21. 2 2
      Viewer/src/managers/telemetryManager.ts
  22. 2 2
      Viewer/src/model/modelAnimation.ts
  23. 17 17
      Viewer/src/model/viewerModel.ts
  24. 2 2
      Viewer/src/optimizer/custom/extended.ts
  25. 10 10
      Viewer/src/renderOnlyIndex.ts
  26. 1 1
      Viewer/src/templating/plugins/printButton.ts
  27. 2 2
      Viewer/src/templating/templateManager.ts
  28. 5 5
      Viewer/src/viewer/defaultViewer.ts
  29. 9 9
      Viewer/src/viewer/viewer.ts
  30. 1 1
      Viewer/src/viewer/viewerManager.ts
  31. 6 0
      Viewer/tsconfig.json

+ 1 - 1
Viewer/src/configuration/configuration.ts

@@ -1,4 +1,4 @@
-import { EngineOptions } from '@babylonjs/core/Engines/engine';
+import { EngineOptions } from 'babylonjs/Engines/engine';
 import { ICameraConfiguration, IDefaultRenderingPipelineConfiguration, IGroundConfiguration, ILightConfiguration, IModelConfiguration, IObserversConfiguration, ISceneConfiguration, ISceneOptimizerConfiguration, ISkyboxConfiguration, ITemplateConfiguration, IVRConfiguration } from './interfaces';
 import { IEnvironmentMapConfiguration } from './interfaces/environmentMapConfiguration';
 

+ 2 - 2
Viewer/src/configuration/configurationContainer.ts

@@ -1,6 +1,6 @@
 import { ViewerConfiguration } from './configuration';
-import { Color3 } from '@babylonjs/core/Maths/math';
-import { Scene } from '@babylonjs/core/scene';
+import { Color3 } from 'babylonjs/Maths/math';
+import { Scene } from 'babylonjs/scene';
 
 export class ConfigurationContainer {
 

+ 1 - 1
Viewer/src/configuration/globals.ts

@@ -1,4 +1,4 @@
-import { Engine } from "@babylonjs/core/Engines/engine";
+import { Engine } from "babylonjs/Engines/engine";
 
 export class ViewerGlobals {
 

+ 1 - 1
Viewer/src/configuration/interfaces/defaultRenderingPipelineConfiguration.ts

@@ -1,4 +1,4 @@
-import { DepthOfFieldEffectBlurLevel } from "@babylonjs/core/PostProcesses/depthOfFieldEffect";
+import { DepthOfFieldEffectBlurLevel } from "babylonjs/PostProcesses/depthOfFieldEffect";
 
 export interface IDefaultRenderingPipelineConfiguration {
     sharpenEnabled?: boolean;

+ 1 - 1
Viewer/src/configuration/mappers.ts

@@ -1,4 +1,4 @@
-import { Tools } from '@babylonjs/core/Misc/tools';
+import { Tools } from 'babylonjs/Misc/tools';
 import { ViewerConfiguration } from './configuration';
 
 import { kebabToCamel } from '../helper/';

+ 1 - 1
Viewer/src/configuration/renderOnlyLoader.ts

@@ -3,7 +3,7 @@ import { ViewerConfiguration } from './configuration';
 import { processConfigurationCompatibility } from './configurationCompatibility';
 
 import { deepmerge } from '../helper';
-import { IFileRequest, Tools } from '@babylonjs/core/Misc/tools';
+import { IFileRequest, Tools } from 'babylonjs/Misc/tools';
 import { extendedConfiguration } from './types/extended';
 import { renderOnlyDefaultConfiguration } from './types/renderOnlyDefault';
 

+ 1 - 1
Viewer/src/configuration/types/extended.ts

@@ -1,5 +1,5 @@
 import { ViewerConfiguration } from './../configuration';
-import { Tools } from '@babylonjs/core/Misc/tools';
+import { Tools } from 'babylonjs/Misc/tools';
 
 /**
  * The viewer's "extended" configuration.

+ 2 - 2
Viewer/src/index.ts

@@ -17,10 +17,10 @@ import { registerCustomOptimizer } from './optimizer/custom';
  * An HTML-Based viewer for 3D models, based on BabylonJS and its extensions.
  */
 
-import * as BABYLON from '@babylonjs/core';
+import * as BABYLON from 'babylonjs';
 
 // load needed modules.
-import '@babylonjs/loaders';
+import 'babylonjs-loaders';
 import 'pepjs';
 
 import { initListeners, InitTags } from './initializer';

+ 2 - 2
Viewer/src/labs/environmentSerializer.ts

@@ -1,5 +1,5 @@
-import { Vector3 } from '@babylonjs/core/Maths/math';
-import { Tools } from '@babylonjs/core/Misc/tools';
+import { Vector3 } from 'babylonjs/Maths/math';
+import { Tools } from 'babylonjs/Misc/tools';
 import { TextureCube, PixelFormat, PixelType } from './texture';
 
 /**

+ 6 - 6
Viewer/src/labs/texture.ts

@@ -1,9 +1,9 @@
-import { Scene } from "@babylonjs/core/scene";
-import { CubeTexture } from "@babylonjs/core/Materials/Textures/cubeTexture";
-import { InternalTexture } from "@babylonjs/core/Materials/Textures/internalTexture";
-import { Scalar } from "@babylonjs/core/Maths/math.scalar";
-import { BaseTexture } from "@babylonjs/core/Materials/Textures/baseTexture";
-import { Texture } from "@babylonjs/core/Materials/Textures/texture";
+import { Scene } from "babylonjs/scene";
+import { CubeTexture } from "babylonjs/Materials/Textures/cubeTexture";
+import { InternalTexture } from "babylonjs/Materials/Textures/internalTexture";
+import { Scalar } from "babylonjs/Maths/math.scalar";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { Texture } from "babylonjs/Materials/Textures/texture";
 
 /**
  * WebGL Pixel Formats

+ 4 - 4
Viewer/src/labs/viewerLabs.ts

@@ -1,8 +1,8 @@
 import { PBREnvironment, EnvironmentDeserializer } from "./environmentSerializer";
-import { Scene } from "@babylonjs/core/scene";
-import { Vector3, Quaternion, Axis, Matrix, Tmp } from "@babylonjs/core/Maths/math";
-import { SphericalPolynomial } from "@babylonjs/core/Maths/sphericalPolynomial";
-import { ShadowLight } from "@babylonjs/core/Lights/shadowLight";
+import { Scene } from "babylonjs/scene";
+import { Vector3, Quaternion, Axis, Matrix, Tmp } from "babylonjs/Maths/math";
+import { SphericalPolynomial } from "babylonjs/Maths/sphericalPolynomial";
+import { ShadowLight } from "babylonjs/Lights/shadowLight";
 import { TextureUtils } from "./texture";
 
 

+ 5 - 5
Viewer/src/loader/modelLoader.ts

@@ -1,8 +1,8 @@
-import {GLTFFileLoader, GLTFLoaderAnimationStartMode} from "@babylonjs/loaders/glTF/glTFFileLoader"
-import { ISceneLoaderPlugin, ISceneLoaderPluginAsync } from '@babylonjs/core/Loading/sceneLoader';
-import { Tools } from '@babylonjs/core/Misc/tools';
-import { SceneLoader } from '@babylonjs/core/Loading/sceneLoader';
-import { Tags } from '@babylonjs/core/Misc/tags';
+import {GLTFFileLoader, GLTFLoaderAnimationStartMode} from "babylonjs-loaders/glTF/glTFFileLoader"
+import { ISceneLoaderPlugin, ISceneLoaderPluginAsync } from 'babylonjs/Loading/sceneLoader';
+import { Tools } from 'babylonjs/Misc/tools';
+import { SceneLoader } from 'babylonjs/Loading/sceneLoader';
+import { Tags } from 'babylonjs/Misc/tags';
 
 import { ConfigurationContainer } from '../configuration/configurationContainer';
 import { IModelConfiguration } from '../configuration/interfaces/modelConfiguration';

+ 2 - 2
Viewer/src/loader/plugins/applyMaterialConfig.ts

@@ -1,7 +1,7 @@
 import { ViewerModel } from '../../model/viewerModel';
 import { ILoaderPlugin } from './loaderPlugin';
-import { ISceneLoaderPlugin, ISceneLoaderPluginAsync } from '@babylonjs/core/Loading/sceneLoader';
-import { Material } from '@babylonjs/core/Materials/material';
+import { ISceneLoaderPlugin, ISceneLoaderPluginAsync } from 'babylonjs/Loading/sceneLoader';
+import { Material } from 'babylonjs/Materials/material';
 
 /**
  * Force-apply material configuration right after a material was loaded.

+ 3 - 3
Viewer/src/loader/plugins/extendedMaterialLoaderPlugin.ts

@@ -1,6 +1,6 @@
-import { Material } from '@babylonjs/core/Materials/material';
-import { PBRMaterial } from '@babylonjs/core/Materials/PBR/pbrMaterial';
-import { Engine } from '@babylonjs/core/Engines/engine';
+import { Material } from 'babylonjs/Materials/material';
+import { PBRMaterial } from 'babylonjs/Materials/PBR/pbrMaterial';
+import { Engine } from 'babylonjs/Engines/engine';
 import { ILoaderPlugin } from './loaderPlugin';
 
 /**

+ 1 - 1
Viewer/src/loader/plugins/index.ts

@@ -3,7 +3,7 @@ import { ILoaderPlugin } from "./loaderPlugin";
 import { MSFTLodLoaderPlugin } from './msftLodLoaderPlugin';
 import { ApplyMaterialConfigPlugin } from './applyMaterialConfig';
 import { ExtendedMaterialLoaderPlugin } from './extendedMaterialLoaderPlugin';
-import { Tools } from "@babylonjs/core/Misc/tools";
+import { Tools } from "babylonjs/Misc/tools";
 
 const pluginCache: { [key: string]: ILoaderPlugin } = {};
 

+ 6 - 6
Viewer/src/loader/plugins/loaderPlugin.ts

@@ -1,10 +1,10 @@
 import { ViewerModel } from "../../model/viewerModel";
-import { IGLTFLoaderExtension, IGLTFLoaderData } from "@babylonjs/loaders/glTF/glTFFileLoader";
-import { ISceneLoaderPlugin, ISceneLoaderPluginAsync } from "@babylonjs/core/Loading/sceneLoader";
-import { SceneLoaderProgressEvent } from "@babylonjs/core/Loading/sceneLoader";
-import { AbstractMesh } from "@babylonjs/core/Meshes/abstractMesh";
-import { BaseTexture } from "@babylonjs/core/Materials/Textures/baseTexture";
-import { Material } from "@babylonjs/core/Materials/material";
+import { IGLTFLoaderExtension, IGLTFLoaderData } from "babylonjs-loaders/glTF/glTFFileLoader";
+import { ISceneLoaderPlugin, ISceneLoaderPluginAsync } from "babylonjs/Loading/sceneLoader";
+import { SceneLoaderProgressEvent } from "babylonjs/Loading/sceneLoader";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { Material } from "babylonjs/Materials/material";
 
 /**
  * This interface defines the structure of a loader plugin.

+ 3 - 3
Viewer/src/loader/plugins/msftLodLoaderPlugin.ts

@@ -1,6 +1,6 @@
-import { ISceneLoaderPlugin, ISceneLoaderPluginAsync } from '@babylonjs/core/Loading/sceneLoader';
-import { IGLTFLoaderExtension } from '@babylonjs/loaders/glTF/2.0/glTFLoaderExtension';
-import { GLTF2 } from '@babylonjs/loaders/glTF';
+import { ISceneLoaderPlugin, ISceneLoaderPluginAsync } from 'babylonjs/Loading/sceneLoader';
+import { IGLTFLoaderExtension } from 'babylonjs-loaders/glTF/2.0/glTFLoaderExtension';
+import { GLTF2 } from 'babylonjs-loaders/glTF/index';
 import { ViewerModel } from '../../model/viewerModel';
 import { ILoaderPlugin } from './loaderPlugin';
 

+ 2 - 2
Viewer/src/loader/plugins/telemetryLoaderPlugin.ts

@@ -1,8 +1,8 @@
 import { ILoaderPlugin } from "./loaderPlugin";
 import { telemetryManager } from "../../managers/telemetryManager";
 import { ViewerModel } from "../../model/viewerModel";
-import { ISceneLoaderPlugin, ISceneLoaderPluginAsync } from "@babylonjs/core/Loading/sceneLoader";
-import { PrecisionDate } from "@babylonjs/core/Misc/precisionDate";
+import { ISceneLoaderPlugin, ISceneLoaderPluginAsync } from "babylonjs/Loading/sceneLoader";
+import { PrecisionDate } from "babylonjs/Misc/precisionDate";
 
 export class TelemetryLoaderPlugin implements ILoaderPlugin {
 

+ 4 - 4
Viewer/src/managers/observablesManager.ts

@@ -1,7 +1,7 @@
-import { Observable } from '@babylonjs/core/Misc/observable';
-import { Scene } from '@babylonjs/core/scene';
-import { Engine } from '@babylonjs/core/Engines/engine';
-import { SceneLoaderProgressEvent, ISceneLoaderPlugin, ISceneLoaderPluginAsync } from '@babylonjs/core/Loading/sceneLoader';
+import { Observable } from 'babylonjs/Misc/observable';
+import { Scene } from 'babylonjs/scene';
+import { Engine } from 'babylonjs/Engines/engine';
+import { SceneLoaderProgressEvent, ISceneLoaderPlugin, ISceneLoaderPluginAsync } from 'babylonjs/Loading/sceneLoader';
 
 import { ViewerModel } from '../model/viewerModel';
 

+ 27 - 27
Viewer/src/managers/sceneManager.ts

@@ -8,33 +8,33 @@ import { ObservablesManager } from '../managers/observablesManager';
 import { ConfigurationContainer } from '../configuration/configurationContainer';
 import { deepmerge } from '../helper';
 import { IEnvironmentMapConfiguration } from '../configuration/interfaces/environmentMapConfiguration';
-import { Observable } from '@babylonjs/core/Misc/observable';
-import { SceneOptimizer, SceneOptimizerOptions } from '@babylonjs/core/Misc/sceneOptimizer';
-import { ArcRotateCamera } from '@babylonjs/core/Cameras/arcRotateCamera';
-import { Light } from '@babylonjs/core/Lights/light';
-import { EnvironmentHelper, IEnvironmentHelperOptions } from '@babylonjs/core/Helpers/environmentHelper';
-import { VRExperienceHelper, VRExperienceHelperOptions } from '@babylonjs/core/Cameras/VR/vrExperienceHelper';
-import { Color3, Quaternion, Vector3, Axis, Matrix } from '@babylonjs/core/Maths/math';
-import { Nullable } from '@babylonjs/core/types';
-import { DefaultRenderingPipeline } from '@babylonjs/core/PostProcesses/RenderPipeline/Pipelines/defaultRenderingPipeline';
-import { Engine } from '@babylonjs/core/Engines/engine';
-import { Animation } from '@babylonjs/core/Animations';
-import { AnimationPropertiesOverride } from '@babylonjs/core/Animations/animationPropertiesOverride';
-import { RenderTargetTexture } from '@babylonjs/core/Materials/Textures/renderTargetTexture';
-import { PBRMaterial } from '@babylonjs/core/Materials/PBR/pbrMaterial';
-import { ShadowLight, IShadowLight } from '@babylonjs/core/Lights/shadowLight';
-import { CubeTexture } from '@babylonjs/core/Materials/Textures/cubeTexture';
-import { DirectionalLight } from '@babylonjs/core/Lights/directionalLight';
-import { Scalar } from '@babylonjs/core/Maths/math.scalar';
-import { SpotLight } from '@babylonjs/core/Lights/spotLight';
-import { PointLight } from '@babylonjs/core/Lights/pointLight';
-import { AbstractMesh } from '@babylonjs/core/Meshes/abstractMesh';
-import { Mesh } from '@babylonjs/core/Meshes/mesh';
-import { Tags } from '@babylonjs/core/Misc/tags';
-import { Behavior } from '@babylonjs/core/Behaviors/behavior';
-import { FramingBehavior } from '@babylonjs/core/Behaviors/Cameras/framingBehavior';
-import { Scene } from '@babylonjs/core/scene';
-import { ShadowGenerator } from '@babylonjs/core/Lights/Shadows/shadowGenerator';
+import { Observable } from 'babylonjs/Misc/observable';
+import { SceneOptimizer, SceneOptimizerOptions } from 'babylonjs/Misc/sceneOptimizer';
+import { ArcRotateCamera } from 'babylonjs/Cameras/arcRotateCamera';
+import { Light } from 'babylonjs/Lights/light';
+import { EnvironmentHelper, IEnvironmentHelperOptions } from 'babylonjs/Helpers/environmentHelper';
+import { VRExperienceHelper, VRExperienceHelperOptions } from 'babylonjs/Cameras/VR/vrExperienceHelper';
+import { Color3, Quaternion, Vector3, Axis, Matrix } from 'babylonjs/Maths/math';
+import { Nullable } from 'babylonjs/types';
+import { DefaultRenderingPipeline } from 'babylonjs/PostProcesses/RenderPipeline/Pipelines/defaultRenderingPipeline';
+import { Engine } from 'babylonjs/Engines/engine';
+import { Animation } from 'babylonjs/Animations/index';
+import { AnimationPropertiesOverride } from 'babylonjs/Animations/animationPropertiesOverride';
+import { RenderTargetTexture } from 'babylonjs/Materials/Textures/renderTargetTexture';
+import { PBRMaterial } from 'babylonjs/Materials/PBR/pbrMaterial';
+import { ShadowLight, IShadowLight } from 'babylonjs/Lights/shadowLight';
+import { CubeTexture } from 'babylonjs/Materials/Textures/cubeTexture';
+import { DirectionalLight } from 'babylonjs/Lights/directionalLight';
+import { Scalar } from 'babylonjs/Maths/math.scalar';
+import { SpotLight } from 'babylonjs/Lights/spotLight';
+import { PointLight } from 'babylonjs/Lights/pointLight';
+import { AbstractMesh } from 'babylonjs/Meshes/abstractMesh';
+import { Mesh } from 'babylonjs/Meshes/mesh';
+import { Tags } from 'babylonjs/Misc/tags';
+import { Behavior } from 'babylonjs/Behaviors/behavior';
+import { FramingBehavior } from 'babylonjs/Behaviors/Cameras/framingBehavior';
+import { Scene } from 'babylonjs/scene';
+import { ShadowGenerator } from 'babylonjs/Lights/Shadows/shadowGenerator';
 
 /**
  * This interface describes the structure of the variable sent with the configuration observables of the scene manager.

+ 2 - 2
Viewer/src/managers/telemetryManager.ts

@@ -1,5 +1,5 @@
-import { Observable } from "@babylonjs/core/Misc/observable";
-import { Engine } from "@babylonjs/core/Engines/engine";
+import { Observable } from "babylonjs/Misc/observable";
+import { Engine } from "babylonjs/Engines/engine";
 
 
 /**

+ 2 - 2
Viewer/src/model/modelAnimation.ts

@@ -1,5 +1,5 @@
-import { Vector3 } from "@babylonjs/core/Maths/math";
-import { AnimationGroup, Animatable } from "@babylonjs/core/Animations";
+import { Vector3 } from "babylonjs/Maths/math";
+import { AnimationGroup, Animatable } from "babylonjs/Animations/index";
 
 /**
  * Animation play mode enum - is the animation looping or playing once

+ 17 - 17
Viewer/src/model/viewerModel.ts

@@ -1,20 +1,20 @@
-import { IDisposable } from "@babylonjs/core/scene";
-import { ISceneLoaderPlugin, ISceneLoaderPluginAsync } from "@babylonjs/core/Loading/sceneLoader";
-import { AbstractMesh } from "@babylonjs/core/Meshes/abstractMesh";
-import { IParticleSystem } from "@babylonjs/core/Particles/IParticleSystem";
-import { Skeleton } from "@babylonjs/core/Bones/skeleton";
-import { Observable } from "@babylonjs/core/Misc/observable";
-import { SceneLoaderProgressEvent } from "@babylonjs/core/Loading/sceneLoader";
-import { AnimationGroup } from "@babylonjs/core/Animations/animationGroup";
-import { Animation, Animatable, CircleEase, BackEase, BounceEase, CubicEase, ElasticEase, ExponentialEase, PowerEase, QuadraticEase, QuarticEase, QuinticEase, SineEase } from "@babylonjs/core/Animations";
-import { Nullable } from "@babylonjs/core/types";
-import { Quaternion, Vector3 } from "@babylonjs/core/Maths/math";
-import { Tags } from "@babylonjs/core/Misc/tags";
-import { Material } from "@babylonjs/core/Materials/material";
-import { PBRMaterial } from "@babylonjs/core/Materials/PBR/pbrMaterial";
-import { MultiMaterial } from "@babylonjs/core/Materials/multiMaterial";
-import { Tools } from "@babylonjs/core/Misc/tools";
-import { GLTFFileLoader } from "@babylonjs/loaders/glTF";
+import { IDisposable } from "babylonjs/scene";
+import { ISceneLoaderPlugin, ISceneLoaderPluginAsync } from "babylonjs/Loading/sceneLoader";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+import { IParticleSystem } from "babylonjs/Particles/IParticleSystem";
+import { Skeleton } from "babylonjs/Bones/skeleton";
+import { Observable } from "babylonjs/Misc/observable";
+import { SceneLoaderProgressEvent } from "babylonjs/Loading/sceneLoader";
+import { AnimationGroup } from "babylonjs/Animations/animationGroup";
+import { Animation, Animatable, CircleEase, BackEase, BounceEase, CubicEase, ElasticEase, ExponentialEase, PowerEase, QuadraticEase, QuarticEase, QuinticEase, SineEase } from "babylonjs/Animations/index";
+import { Nullable } from "babylonjs/types";
+import { Quaternion, Vector3 } from "babylonjs/Maths/math";
+import { Tags } from "babylonjs/Misc/tags";
+import { Material } from "babylonjs/Materials/material";
+import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
+import { MultiMaterial } from "babylonjs/Materials/multiMaterial";
+import { Tools } from "babylonjs/Misc/tools";
+import { GLTFFileLoader } from "babylonjs-loaders/glTF/index";
 import { IAsset } from "babylonjs-gltf2interface";
 import { IModelConfiguration } from "../configuration/interfaces/modelConfiguration";
 import { IModelAnimationConfiguration } from "../configuration/interfaces/modelAnimationConfiguration";

+ 2 - 2
Viewer/src/optimizer/custom/extended.ts

@@ -1,5 +1,5 @@
-import { DefaultRenderingPipeline } from '@babylonjs/core/PostProcesses/RenderPipeline/Pipelines/defaultRenderingPipeline';
-import { Scalar } from '@babylonjs/core/Maths/math.scalar';
+import { DefaultRenderingPipeline } from 'babylonjs/PostProcesses/RenderPipeline/Pipelines/defaultRenderingPipeline';
+import { Scalar } from 'babylonjs/Maths/math.scalar';
 import { SceneManager } from '../../managers/sceneManager';
 
 /**

+ 10 - 10
Viewer/src/renderOnlyIndex.ts

@@ -1,18 +1,18 @@
 import { RenderOnlyViewer } from './viewer/renderOnlyViewer';
 
 // Required side effects
-import '@babylonjs/loaders/glTF/2.0';
-import "@babylonjs/core/Lights/Shadows/shadowGeneratorSceneComponent"
-import "@babylonjs/core/Debug/debugLayer";
-import "@babylonjs/core/Meshes/Builders/planeBuilder";
-import "@babylonjs/core/Meshes/Builders/boxBuilder";
-import "@babylonjs/core/Materials/Textures/Loaders/ddsTextureLoader"
-import "@babylonjs/core/Materials/Textures/Loaders/envTextureLoader"
-import "@babylonjs/core/Materials/Textures/Loaders/ktxTextureLoader"
-import "@babylonjs/core/PostProcesses/RenderPipeline/postProcessRenderPipelineManagerSceneComponent";
+import 'babylonjs-loaders/glTF/2.0';
+import "babylonjs/Lights/Shadows/shadowGeneratorSceneComponent"
+import "babylonjs/Debug/debugLayer";
+import "babylonjs/Meshes/Builders/planeBuilder";
+import "babylonjs/Meshes/Builders/boxBuilder";
+import "babylonjs/Materials/Textures/Loaders/ddsTextureLoader"
+import "babylonjs/Materials/Textures/Loaders/envTextureLoader"
+import "babylonjs/Materials/Textures/Loaders/ktxTextureLoader"
+import "babylonjs/PostProcesses/RenderPipeline/postProcessRenderPipelineManagerSceneComponent";
 
 // Override default material factory to avoid the dependency on standard material
-import { Scene } from '@babylonjs/core/scene';
+import { Scene } from 'babylonjs/scene';
 Scene.DefaultMaterialFactory = (scene:Scene)=>{return null as any};
 
 export { RenderOnlyViewer };

+ 1 - 1
Viewer/src/templating/plugins/printButton.ts

@@ -1,7 +1,7 @@
 import { AbstractViewerNavbarButton } from "../viewerTemplatePlugin";
 import { DefaultViewer } from "../../viewer/defaultViewer";
 import { EventCallback } from "../templateManager";
-import { Tools } from "@babylonjs/core/Misc/tools";
+import { Tools } from "babylonjs/Misc/tools";
 
 export class PrintButtonPlugin extends AbstractViewerNavbarButton {
 

+ 2 - 2
Viewer/src/templating/templateManager.ts

@@ -1,5 +1,5 @@
-import { Observable } from '@babylonjs/core/Misc/observable';
-import { IFileRequest, Tools } from '@babylonjs/core/Misc/tools';
+import { Observable } from 'babylonjs/Misc/observable';
+import { IFileRequest, Tools } from 'babylonjs/Misc/tools';
 import { isUrl, camelToKebab, kebabToCamel } from '../helper';
 
 import * as Handlebars from 'handlebars/dist/handlebars';

+ 5 - 5
Viewer/src/viewer/defaultViewer.ts

@@ -1,13 +1,13 @@
 
 import { ViewerConfiguration, IModelConfiguration, ILightConfiguration, ISceneConfiguration } from './../configuration';
 import { Template, EventCallback } from '../templating/templateManager';
-import { FilesInput } from '@babylonjs/core/Misc/filesInput';
-import { SpotLight } from '@babylonjs/core/Lights/spotLight';
-import { Vector3 } from '@babylonjs/core/Maths/math';
+import { FilesInput } from 'babylonjs/Misc/filesInput';
+import { SpotLight } from 'babylonjs/Lights/spotLight';
+import { Vector3 } from 'babylonjs/Maths/math';
 import { TemplateManager } from '../templating/templateManager';
 import { AbstractViewerWithTemplate } from './viewerWithTemplate';
-import { StandardMaterial } from '@babylonjs/core/Materials/standardMaterial';
-import { PBRMaterial } from '@babylonjs/core/Materials/PBR/pbrMaterial';
+import { StandardMaterial } from 'babylonjs/Materials/standardMaterial';
+import { PBRMaterial } from 'babylonjs/Materials/PBR/pbrMaterial';
 import { extendClassWithConfig } from '../helper';
 import { ViewerModel } from '../model/viewerModel';
 import { IModelAnimation, AnimationState } from '../model/modelAnimation';

+ 9 - 9
Viewer/src/viewer/viewer.ts

@@ -1,12 +1,12 @@
-import { Engine } from '@babylonjs/core/Engines/engine';
-import { ISceneLoaderPlugin, ISceneLoaderPluginAsync, SceneLoaderProgressEvent } from '@babylonjs/core/Loading/sceneLoader';
-import { Observable } from '@babylonjs/core/Misc/observable';
-import { Scene } from '@babylonjs/core/scene';
-import { RenderingManager } from '@babylonjs/core/Rendering/renderingManager';
-import { Vector3 } from '@babylonjs/core/Maths/math';
-import { TargetCamera } from '@babylonjs/core/Cameras/targetCamera';
-import { Tools } from '@babylonjs/core/Misc/tools';
-import { Effect } from '@babylonjs/core/Materials/effect';
+import { Engine } from 'babylonjs/Engines/engine';
+import { ISceneLoaderPlugin, ISceneLoaderPluginAsync, SceneLoaderProgressEvent } from 'babylonjs/Loading/sceneLoader';
+import { Observable } from 'babylonjs/Misc/observable';
+import { Scene } from 'babylonjs/scene';
+import { RenderingManager } from 'babylonjs/Rendering/renderingManager';
+import { Vector3 } from 'babylonjs/Maths/math';
+import { TargetCamera } from 'babylonjs/Cameras/targetCamera';
+import { Tools } from 'babylonjs/Misc/tools';
+import { Effect } from 'babylonjs/Materials/effect';
 import { ConfigurationLoader } from '../configuration/loader';
 import { IModelConfiguration, IObserversConfiguration, ViewerConfiguration } from '../configuration/';
 import { processConfigurationCompatibility } from '../configuration/configurationCompatibility';

+ 1 - 1
Viewer/src/viewer/viewerManager.ts

@@ -1,4 +1,4 @@
-import { Observable } from '@babylonjs/core/Misc/observable';
+import { Observable } from 'babylonjs/Misc/observable';
 import { AbstractViewer } from './viewer';
 
 /**

+ 6 - 0
Viewer/tsconfig.json

@@ -28,6 +28,12 @@
             "babylonjs-loaders": [
                 "../../dist/preview release/loaders/babylonjs.loaders.module.d.ts"
             ],
+            "babylonjs/*": [
+                "../../dist/preview release/babylon.module.d.ts"
+            ],
+            "babylonjs-loaders/*": [
+                "../../dist/preview release/loaders/babylonjs.loaders.module.d.ts"
+            ],
             "babylonjs-gltf2interface": [
                 "../../dist/preview release/glTF2Interface/babylon.glTF2Interface.d.ts"
             ],