Gui import relative paths

gui/src/2D/adtInstrumentation.ts

@@ -1,4 +1,9 @@
-import { IDisposable, PerfCounter, Nullable, Observer } from "babylonjs";
+
+import { Nullable } from "babylonjs/types";
+import { Observer } from "babylonjs/Misc/observable";
+import { PerfCounter } from "babylonjs/Misc/tools";
+import { IDisposable } from "babylonjs/scene";
+
 import { AdvancedDynamicTexture } from "./advancedDynamicTexture";
 
 /**

gui/src/2D/advancedDynamicTexture.ts

@@ -1,4 +1,19 @@
-import { DynamicTexture, Nullable, Observer, Camera, Engine, KeyboardInfoPre, PointerInfoPre, PointerInfo, ClipboardEventTypes, Layer, Viewport, Scene, Texture, KeyboardEventTypes, Vector3, Matrix, Vector2, Tools, PointerEventTypes, AbstractMesh, StandardMaterial, Color3, Observable, ClipboardInfo } from 'babylonjs';
+import { Nullable } from "babylonjs/types";
+import { Observable, Observer } from "babylonjs/Misc/observable";
+import { Viewport, Color3, Vector2, Vector3, Matrix } from "babylonjs/Maths/math";
+import { Tools } from "babylonjs/Misc/tools";
+import { PointerInfoPre, PointerInfo, PointerEventTypes } from 'babylonjs/Events/pointerEvents';
+import { ClipboardEventTypes, ClipboardInfo } from "babylonjs/Events/clipboardEvents";
+import { KeyboardInfoPre, KeyboardEventTypes } from "babylonjs/Events/keyboardEvents";
+import { Camera } from "babylonjs/Cameras/camera";
+import { StandardMaterial } from "babylonjs/Materials/standardMaterial";
+import { Texture } from "babylonjs/Materials/Textures/texture";
+import { DynamicTexture } from "babylonjs/Materials/Textures/dynamicTexture";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+import { Layer } from "babylonjs/Layers/layer";
+import { Engine } from "babylonjs/Engines/engine";
+import { Scene } from "babylonjs/scene";
+
 import { Container } from "./controls/container";
 import { Control } from "./controls/control";
 import { Style } from "./style";

gui/src/2D/controls/button.ts

@@ -1,8 +1,10 @@
+import { Nullable } from "babylonjs/types";
+import { Vector2 } from "babylonjs/Maths/math";
+
 import { Rectangle } from "./rectangle";
 import { Control } from "./control";
 import { TextBlock } from "./textBlock";
 import { Image } from "./image";
-import { Vector2, Nullable } from "babylonjs";
 
 /**
  * Class used to create 2D buttons

gui/src/2D/controls/checkbox.ts

@@ -1,5 +1,7 @@
+import { Observable } from "babylonjs/Misc/observable";
+import { Vector2 } from "babylonjs/Maths/math";
+
 import { Control } from "./control";
-import { Observable, Vector2 } from "babylonjs";
 import { StackPanel } from "./stackPanel";
 import { TextBlock } from "./textBlock";
 

gui/src/2D/controls/colorpicker.ts

@@ -1,5 +1,7 @@
+import { Observable } from "babylonjs/Misc/observable";
+import { Color3, Vector2 } from "babylonjs/Maths/math";
+
 import { Control } from "./control";
-import { Color3, Observable, Vector2 } from "babylonjs";
 import { Measure } from "../measure";
 
 /** Class used to create color pickers */

gui/src/2D/controls/container.ts

@@ -1,6 +1,8 @@
+import { Nullable } from "babylonjs/types";
+import { Logger } from "babylonjs/Misc/logger";
+
 import { Control } from "./control";
 import { Measure } from "../measure";
-import { Nullable, Logger } from "babylonjs";
 import { AdvancedDynamicTexture } from "../advancedDynamicTexture";
 
 /**

gui/src/2D/controls/control.ts

@@ -1,7 +1,16 @@
+import { Nullable } from "babylonjs/types";
+import { Observable, Observer } from "babylonjs/Misc/observable";
+import { Vector2, Vector3, Matrix } from "babylonjs/Maths/math";
+import { PointerEventTypes } from 'babylonjs/Events/pointerEvents';
+import { Logger } from "babylonjs/Misc/logger";
+import { Tools } from "babylonjs/Misc/tools";
+import { Polygon } from "babylonjs/Meshes/polygonMesh";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+import { Scene } from "babylonjs/scene";
+
 import { Container } from "./container";
 import { AdvancedDynamicTexture } from "../advancedDynamicTexture";
 import { ValueAndUnit } from "../valueAndUnit";
-import { Nullable, Observer, Vector2, AbstractMesh, Observable, Vector3, Scene, Tools, Matrix, PointerEventTypes, Logger, Polygon } from "babylonjs";
 import { Measure } from "../measure";
 import { Style } from "../style";
 import { Matrix2D, Vector2WithInfo } from "../math2D";

gui/src/2D/controls/displayGrid.ts

@@ -1,4 +1,3 @@
-
 import { Control } from ".";
 
 /** Class used to render a grid  */

gui/src/2D/controls/grid.ts

@@ -1,8 +1,9 @@
+import { Nullable } from "babylonjs/types";
+
 import { Container } from "./container";
 import { ValueAndUnit } from "../valueAndUnit";
 import { Control } from "./control";
 import { Measure } from "../measure";
-import { Nullable } from "babylonjs";
 
 /**
  * Class used to create a 2D grid container

gui/src/2D/controls/image.ts

@@ -1,5 +1,8 @@
+import { Nullable } from "babylonjs/types";
+import { Observable } from "babylonjs/Misc/observable";
+import { Tools } from "babylonjs/Misc/tools";
+
 import { Control } from "./control";
-import { Nullable, Tools, Observable } from "babylonjs";
 import { Measure } from "../measure";
 
 /**

gui/src/2D/controls/inputText.ts

@@ -1,7 +1,12 @@
+import { Nullable } from "babylonjs/types";
+import { Observable, Observer } from "babylonjs/Misc/observable";
+import { Vector2 } from "babylonjs/Maths/math";
+import { ClipboardEventTypes, ClipboardInfo } from "babylonjs/Events/clipboardEvents";
+import { PointerInfo, PointerEventTypes } from 'babylonjs/Events/pointerEvents';
+
 import { Control } from "./control";
 import { IFocusableControl } from "../advancedDynamicTexture";
 import { ValueAndUnit } from "../valueAndUnit";
-import { Nullable, Observable, Observer, Vector2, ClipboardEventTypes, ClipboardInfo, PointerInfo, PointerEventTypes } from 'babylonjs';
 import { VirtualKeyboard } from "./virtualKeyboard";
 
 /**

gui/src/2D/controls/line.ts

@@ -1,6 +1,11 @@
+import { Nullable } from "babylonjs/types";
+import { Observer } from "babylonjs/Misc/observable";
+import { Vector3, Matrix } from "babylonjs/Maths/math";
+import { Tools } from "babylonjs/Misc/tools";
+import { Scene } from "babylonjs/scene";
+
 import { Control } from "./control";
 import { ValueAndUnit } from "../valueAndUnit";
-import { Nullable, Observer, Vector3, Scene, Tools, Matrix } from "babylonjs";
 import { Measure } from "../measure";
 
 /** Class used to render 2D lines */

gui/src/2D/controls/multiLine.ts

@@ -1,6 +1,8 @@
+import { Nullable } from "babylonjs/types";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+
 import { Control } from "./control";
 import { MultiLinePoint } from "../multiLinePoint";
-import { Nullable, AbstractMesh } from "babylonjs";
 import { Measure } from "../measure";
 
 /**

gui/src/2D/controls/radioButton.ts

@@ -1,5 +1,7 @@
+import { Observable } from "babylonjs/Misc/observable";
+import { Vector2 } from "babylonjs/Maths/math";
+
 import { Control } from "./control";
-import { Observable, Vector2 } from "babylonjs";
 import { StackPanel, TextBlock } from ".";
 
 /**

gui/src/2D/controls/scrollViewers/scrollViewer.ts

@@ -1,8 +1,11 @@
+import { Nullable } from "babylonjs/types";
+import { Observer } from "babylonjs/Misc/observable";
+import { PointerInfo, PointerEventTypes } from "babylonjs/Events/pointerEvents";
+
 import { Rectangle } from "../rectangle";
 import { Grid } from "../grid";
 import { Control } from "../control";
 import { Container } from "../container";
-import { PointerInfo, Observer, Nullable, PointerEventTypes } from "babylonjs";
 import { Measure } from "../../measure";
 import { AdvancedDynamicTexture } from "../../advancedDynamicTexture";
 import { _ScrollViewerWindow } from "./scrollViewerWindow";

gui/src/2D/controls/sliders/baseSlider.ts

@@ -1,6 +1,8 @@
+import { Observable } from "babylonjs/Misc/observable";
+import { Vector2 } from "babylonjs/Maths/math";
+
 import { Control } from "../control";
 import { ValueAndUnit } from "../../valueAndUnit";
-import { Observable, Vector2 } from "babylonjs";
 
 /**
  * Class used to create slider controls

gui/src/2D/controls/sliders/scrollBar.ts

@@ -1,6 +1,6 @@
+import { Vector2 } from "babylonjs/Maths/math";
 import { BaseSlider } from "./baseSlider";
 import { Control } from "..";
-import { Vector2 } from "babylonjs";
 import { Measure } from "../../measure";
 
 /**

gui/src/2D/controls/stackPanel.ts

@@ -1,7 +1,8 @@
+import { Tools } from "babylonjs/Misc/tools";
+
 import { Container } from "./container";
 import { Measure } from "../measure";
 import { Control } from "./control";
-import { Tools } from "babylonjs";
 
 /**
  * Class used to create a 2D stack panel container

gui/src/2D/controls/textBlock.ts

@@ -1,4 +1,4 @@
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { Measure } from "../measure";
 import { ValueAndUnit } from "../valueAndUnit";
 import { Control } from "./control";

gui/src/2D/controls/virtualKeyboard.ts

@@ -1,5 +1,7 @@
+import { Nullable } from "babylonjs/types";
+import { Observable, Observer } from "babylonjs/Misc/observable";
+
 import { StackPanel } from "./stackPanel";
-import { Observable, Nullable, Observer } from "babylonjs";
 import { Button } from "./button";
 import { Container } from "./container";
 import { TextBlock } from "./textBlock";

gui/src/2D/math2D.ts

@@ -1,4 +1,5 @@
-import { Vector2, Epsilon, Nullable } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Vector2, Epsilon } from "babylonjs/Maths/math";
 
 /**
  * Class used to transport Vector2 information for pointer events

gui/src/2D/multiLinePoint.ts

@@ -1,7 +1,12 @@
+import { Nullable } from "babylonjs/types";
+import { Observer } from "babylonjs/Misc/observable";
+import { Vector2 } from "babylonjs/Maths/math";
+import { Camera } from "babylonjs/Cameras/camera";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+
 import { MultiLine } from "./controls/multiLine";
 import { ValueAndUnit } from "./valueAndUnit";
 import { Control } from "./controls/control";
-import { AbstractMesh, Nullable, Observer, Camera, Vector2 } from "babylonjs";
 
 /**
  * Class used to store a point for a MultiLine object.

gui/src/2D/style.ts

@@ -1,4 +1,5 @@
-import { IDisposable, Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
+import { IDisposable } from "babylonjs/scene";
 import { AdvancedDynamicTexture } from "./advancedDynamicTexture";
 import { ValueAndUnit } from "./valueAndUnit";
 

gui/src/3D/controls/abstractButton3D.ts

@@ -1,5 +1,7 @@
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+import { Scene } from "babylonjs/scene";
+
 import { Control3D } from "./control3D";
-import { TransformNode, Scene } from "babylonjs";
 
 /**
  * Class used as a root to all buttons

gui/src/3D/controls/button3D.ts

@@ -1,5 +1,14 @@
+import { int, Nullable } from "babylonjs/types";
+import { Color3, Vector4 } from "babylonjs/Maths/math";
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+import { MeshBuilder } from "babylonjs/Meshes/meshBuilder";
+import { Material } from "babylonjs/Materials/material";
+import { StandardMaterial } from "babylonjs/Materials/standardMaterial";
+import { Texture } from "babylonjs/Materials/Textures/texture";
+import { Scene } from "babylonjs/scene";
+
 import { AbstractButton3D } from "./abstractButton3D";
-import { Material, Nullable, int, Color3, StandardMaterial, Texture, Scene, TransformNode, Vector4, MeshBuilder, AbstractMesh } from "babylonjs";
 import { AdvancedDynamicTexture } from "../../2D/advancedDynamicTexture";
 import { Control } from "../../2D/controls/control";
 

gui/src/3D/controls/container3D.ts

@@ -1,5 +1,8 @@
+import { Nullable } from "babylonjs/types";
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+import { Scene } from "babylonjs/scene";
+
 import { Control3D } from "./control3D";
-import { Scene, Nullable, TransformNode } from "babylonjs";
 
 /**
  * Class used to create containers for controls

gui/src/3D/controls/control3D.ts

@@ -1,4 +1,12 @@
-import { IDisposable, IBehaviorAware, Nullable, TransformNode, Vector3, Observable, Behavior, AbstractMesh, Scene, PointerEventTypes } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Observable } from "babylonjs/Misc/observable";
+import { Vector3 } from "babylonjs/Maths/math";
+import { PointerEventTypes } from "babylonjs/Events/pointerEvents";
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+import { IBehaviorAware, Behavior } from "babylonjs/Behaviors/behavior";
+import { IDisposable, Scene } from "babylonjs/scene";
+
 import { GUI3DManager } from "../gui3DManager";
 import { Vector3WithInfo } from "../vector3WithInfo";
 import { Container3D } from "./container3D";

gui/src/3D/controls/cylinderPanel.ts

@@ -1,5 +1,8 @@
+import { Tools } from "babylonjs/Misc/tools";
+import { Space, Axis, Matrix, Tmp, Vector3 } from "babylonjs/Maths/math";
+import { float } from "babylonjs/types";
+
 import { VolumeBasedPanel } from "./volumeBasedPanel";
-import { float, Tools, Vector3, Matrix, Tmp, Space, Axis } from "babylonjs";
 import { Control3D } from "./control3D";
 import { Container3D } from "./container3D";
 

gui/src/3D/controls/holographicButton.ts

@@ -1,5 +1,15 @@
 import { Button3D } from "./button3D";
-import { Mesh, StandardMaterial, Nullable, Observer, Vector3, Scene, TransformNode, MeshBuilder, Color3, FadeInOutBehavior } from "babylonjs";
+
+import { Nullable } from "babylonjs/types";
+import { Observer } from "babylonjs/Misc/observable";
+import { Color3, Vector3 } from "babylonjs/Maths/math";
+import { StandardMaterial } from "babylonjs/Materials/standardMaterial";
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+import { Mesh } from "babylonjs/Meshes/mesh";
+import { MeshBuilder } from "babylonjs/Meshes/meshBuilder";
+import { FadeInOutBehavior } from "babylonjs/Behaviors/Meshes/fadeInOutBehavior";
+import { Scene } from "babylonjs/scene";
+
 import { FluentMaterial } from "../materials/fluentMaterial";
 import { StackPanel } from "../../2D/controls/stackPanel";
 import { Image } from "../../2D/controls/image";

gui/src/3D/controls/meshButton3D.ts

@@ -1,4 +1,8 @@
-import { Scene, TransformNode, AbstractMesh, Mesh } from "babylonjs";
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+import { Mesh } from "babylonjs/Meshes/mesh";
+import { Scene } from "babylonjs/scene";
+
 import { Button3D } from "./button3D";
 
 /**

gui/src/3D/controls/planePanel.ts

@@ -1,4 +1,5 @@
-import { Tmp, Vector3 } from "babylonjs";
+import { Tmp, Vector3 } from "babylonjs/Maths/math";
+
 import { Container3D } from "./container3D";
 import { Control3D } from "./control3D";
 import { VolumeBasedPanel } from "./volumeBasedPanel";

gui/src/3D/controls/scatterPanel.ts

@@ -1,5 +1,8 @@
+import { Tools } from "babylonjs/Misc/tools";
+import { Tmp, Vector3 } from "babylonjs/Maths/math";
+import { float } from "babylonjs/types";
+
 import { VolumeBasedPanel } from "./volumeBasedPanel";
-import { float, Tools, Vector3, Tmp } from "babylonjs";
 import { Control3D } from "./control3D";
 import { Container3D } from "./container3D";
 

gui/src/3D/controls/spherePanel.ts

@@ -1,5 +1,8 @@
+import { Tools } from "babylonjs/Misc/tools";
+import { Space, Axis, Matrix, Tmp, Vector3 } from "babylonjs/Maths/math";
+import { float } from "babylonjs/types";
+
 import { VolumeBasedPanel } from "./volumeBasedPanel";
-import { float, Tools, Vector3, Matrix, Tmp, Axis, Space } from "babylonjs";
 import { Control3D } from "./control3D";
 import { Container3D } from "./container3D";
 

gui/src/3D/controls/stackPanel3D.ts

@@ -1,5 +1,7 @@
+import { Tools } from "babylonjs/Misc/tools";
+import { Matrix, Tmp, Vector3 } from "babylonjs/Maths/math";
+
 import { Container3D } from "./container3D";
-import { Tools, Matrix, Tmp, Vector3 } from "babylonjs";
 
 /**
  * Class used to create a stack panel in 3D on XY plane

gui/src/3D/controls/volumeBasedPanel.ts

@@ -1,5 +1,8 @@
+import { Tools } from "babylonjs/Misc/tools";
+import { Matrix, Tmp, Vector3 } from "babylonjs/Maths/math";
+import { int } from "babylonjs/types";
+
 import { Container3D } from "./container3D";
-import { Tools, int, Matrix, Tmp, Vector3 } from "babylonjs";
 import { Control3D } from "./control3D";
 
 /**

gui/src/3D/gui3DManager.ts

@@ -1,4 +1,14 @@
-import { IDisposable, Scene, Nullable, Observer, UtilityLayerRenderer, PointerInfo, Observable, Vector3, Material, AbstractMesh, Engine, HemisphericLight, PointerEventTypes } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Observable, Observer } from "babylonjs/Misc/observable";
+import { Vector3 } from "babylonjs/Maths/math";
+import { PointerInfo, PointerEventTypes } from 'babylonjs/Events/pointerEvents';
+import { Material } from "babylonjs/Materials/material";
+import { HemisphericLight } from "babylonjs/Lights/hemisphericLight";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+import { UtilityLayerRenderer } from "babylonjs/Rendering/utilityLayerRenderer";
+import { Engine } from "babylonjs/Engines/engine";
+import { IDisposable, Scene } from "babylonjs/scene";
+
 import { Container3D } from "./controls/container3D";
 import { Control3D } from "./controls/control3D";
 

gui/src/3D/materials/fluentMaterial.ts

@@ -1,4 +1,16 @@
-import { MaterialDefines, PushMaterial, serialize, expandToProperty, serializeAsColor3, Color3, serializeAsColor4, Color4, serializeAsVector3, Vector3, Scene, Nullable, BaseTexture, AbstractMesh, SubMesh, VertexBuffer, MaterialHelper, EffectCreationOptions, Matrix, Mesh, Tmp, SerializationHelper, serializeAsTexture } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { serializeAsColor4, serializeAsVector3, serializeAsTexture, serialize, expandToProperty, serializeAsColor3, SerializationHelper } from "babylonjs/Misc/decorators";
+import { Color3, Vector3, Color4, Matrix, Tmp } from "babylonjs/Maths/math";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { MaterialDefines } from "babylonjs/Materials/materialDefines";
+import { EffectCreationOptions } from "babylonjs/Materials/effect";
+import { MaterialHelper } from "babylonjs/Materials/materialHelper";
+import { PushMaterial } from "babylonjs/Materials/pushMaterial";
+import { VertexBuffer } from "babylonjs/Meshes/buffer";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+import { SubMesh } from "babylonjs/Meshes/subMesh";
+import { Mesh } from "babylonjs/Meshes/mesh";
+import { Scene } from "babylonjs/scene";
 
 import "./shaders/fluent.vertex";
 import "./shaders/fluent.fragment";

gui/src/3D/vector3WithInfo.ts

@@ -1,4 +1,4 @@
-import { Vector3 } from "babylonjs";
+import { Vector3 } from "babylonjs/Maths/math";
 
 /**
  * Class used to transport Vector3 information for pointer events

gui/tsconfig.json

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