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

Inspector relative path

sebavan преди 6 години
родител
ревизия
71d8effb3e
променени са 78 файла, в които са добавени 331 реда и са изтрити 107 реда
  1. 3 1
      inspector/src/components/actionTabs/actionTabsComponent.tsx
  2. 1 1
      inspector/src/components/actionTabs/lines/checkBoxLineComponent.tsx
  3. 2 1
      inspector/src/components/actionTabs/lines/color3LineComponent.tsx
  4. 2 1
      inspector/src/components/actionTabs/lines/floatLineComponent.tsx
  5. 2 1
      inspector/src/components/actionTabs/lines/optionsLineComponent.tsx
  6. 2 1
      inspector/src/components/actionTabs/lines/quaternionLineComponent.tsx
  7. 2 1
      inspector/src/components/actionTabs/lines/radioLineComponent.tsx
  8. 1 1
      inspector/src/components/actionTabs/lines/sliderLineComponent.tsx
  9. 1 1
      inspector/src/components/actionTabs/lines/textInputLineComponent.tsx
  10. 8 1
      inspector/src/components/actionTabs/lines/textureLineComponent.tsx
  11. 7 1
      inspector/src/components/actionTabs/lines/textureLinkLineComponent.tsx
  12. 3 1
      inspector/src/components/actionTabs/lines/vector3LineComponent.tsx
  13. 2 1
      inspector/src/components/actionTabs/paneComponent.tsx
  14. 4 1
      inspector/src/components/actionTabs/tabs/debugTabComponent.tsx
  15. 31 2
      inspector/src/components/actionTabs/tabs/propertyGridTabComponent.tsx
  16. 6 1
      inspector/src/components/actionTabs/tabs/propertyGrids/animationGroupPropertyGridComponent.tsx
  17. 4 1
      inspector/src/components/actionTabs/tabs/propertyGrids/cameras/arcRotateCameraPropertyGridComponent.tsx
  18. 2 1
      inspector/src/components/actionTabs/tabs/propertyGrids/cameras/commonCameraPropertyGridComponent.tsx
  19. 2 1
      inspector/src/components/actionTabs/tabs/propertyGrids/cameras/freeCameraPropertyGridComponent.tsx
  20. 3 1
      inspector/src/components/actionTabs/tabs/propertyGrids/fogPropertyGridComponent.tsx
  21. 2 2
      inspector/src/components/actionTabs/tabs/propertyGrids/gui/checkboxPropertyGridComponent.tsx
  22. 1 1
      inspector/src/components/actionTabs/tabs/propertyGrids/gui/colorPickerPropertyGridComponent.tsx
  23. 2 2
      inspector/src/components/actionTabs/tabs/propertyGrids/gui/commonControlPropertyGridComponent.tsx
  24. 1 1
      inspector/src/components/actionTabs/tabs/propertyGrids/gui/controlPropertyGridComponent.tsx
  25. 2 2
      inspector/src/components/actionTabs/tabs/propertyGrids/gui/ellipsePropertyGridComponent.tsx
  26. 1 1
      inspector/src/components/actionTabs/tabs/propertyGrids/gui/gridPropertyGridComponent.tsx
  27. 2 2
      inspector/src/components/actionTabs/tabs/propertyGrids/gui/imageBasedSliderPropertyGridComponent.tsx
  28. 2 2
      inspector/src/components/actionTabs/tabs/propertyGrids/gui/imagePropertyGridComponent.tsx
  29. 2 2
      inspector/src/components/actionTabs/tabs/propertyGrids/gui/inputTextPropertyGridComponent.tsx
  30. 2 2
      inspector/src/components/actionTabs/tabs/propertyGrids/gui/linePropertyGridComponent.tsx
  31. 2 2
      inspector/src/components/actionTabs/tabs/propertyGrids/gui/radioButtonPropertyGridComponent.tsx
  32. 2 2
      inspector/src/components/actionTabs/tabs/propertyGrids/gui/rectanglePropertyGridComponent.tsx
  33. 2 2
      inspector/src/components/actionTabs/tabs/propertyGrids/gui/scrollViewerPropertyGridComponent.tsx
  34. 2 2
      inspector/src/components/actionTabs/tabs/propertyGrids/gui/sliderPropertyGridComponent.tsx
  35. 2 2
      inspector/src/components/actionTabs/tabs/propertyGrids/gui/stackPanelPropertyGridComponent.tsx
  36. 2 2
      inspector/src/components/actionTabs/tabs/propertyGrids/gui/textBlockPropertyGridComponent.tsx
  37. 2 1
      inspector/src/components/actionTabs/tabs/propertyGrids/lights/commonLightPropertyGridComponent.tsx
  38. 2 1
      inspector/src/components/actionTabs/tabs/propertyGrids/lights/commonShadowLightPropertyGridComponent.tsx
  39. 2 1
      inspector/src/components/actionTabs/tabs/propertyGrids/lights/directionalLightPropertyGridComponent.tsx
  40. 2 1
      inspector/src/components/actionTabs/tabs/propertyGrids/lights/hemisphericLightPropertyGridComponent.tsx
  41. 2 1
      inspector/src/components/actionTabs/tabs/propertyGrids/lights/pointLightPropertyGridComponent.tsx
  42. 2 1
      inspector/src/components/actionTabs/tabs/propertyGrids/lights/spotLightPropertyGridComponent.tsx
  43. 5 1
      inspector/src/components/actionTabs/tabs/propertyGrids/materials/backgroundMaterialPropertyGridComponent.tsx
  44. 6 1
      inspector/src/components/actionTabs/tabs/propertyGrids/materials/commonMaterialPropertyGridComponent.tsx
  45. 4 1
      inspector/src/components/actionTabs/tabs/propertyGrids/materials/materialPropertyGridComponent.tsx
  46. 5 1
      inspector/src/components/actionTabs/tabs/propertyGrids/materials/pbrMaterialPropertyGridComponent.tsx
  47. 5 1
      inspector/src/components/actionTabs/tabs/propertyGrids/materials/pbrMetallicRoughnessMaterialPropertyGridComponent.tsx
  48. 5 1
      inspector/src/components/actionTabs/tabs/propertyGrids/materials/pbrSpecularGlossinessMaterialPropertyGridComponent.tsx
  49. 5 1
      inspector/src/components/actionTabs/tabs/propertyGrids/materials/standardMaterialPropertyGridComponent.tsx
  50. 10 2
      inspector/src/components/actionTabs/tabs/propertyGrids/materials/texturePropertyGridComponent.tsx
  51. 5 1
      inspector/src/components/actionTabs/tabs/propertyGrids/meshes/axesViewerComponent.tsx
  52. 10 1
      inspector/src/components/actionTabs/tabs/propertyGrids/meshes/meshPropertyGridComponent.tsx
  53. 4 1
      inspector/src/components/actionTabs/tabs/propertyGrids/meshes/transformNodePropertyGridComponent.tsx
  54. 10 1
      inspector/src/components/actionTabs/tabs/propertyGrids/renderGridPropertyGridComponent.tsx
  55. 10 1
      inspector/src/components/actionTabs/tabs/propertyGrids/scenePropertyGridComponent.tsx
  56. 6 1
      inspector/src/components/actionTabs/tabs/statisticsTabComponent.tsx
  57. 1 1
      inspector/src/components/actionTabs/tabs/tools/gltfComponent.tsx
  58. 16 3
      inspector/src/components/actionTabs/tabs/toolsTabComponent.tsx
  59. 1 1
      inspector/src/components/embedHost/embedHostComponent.tsx
  60. 7 3
      inspector/src/components/globalState.ts
  61. 3 1
      inspector/src/components/headerComponent.tsx
  62. 3 1
      inspector/src/components/sceneExplorer/entities/animationGroupTreeItemComponent.tsx
  63. 6 1
      inspector/src/components/sceneExplorer/entities/cameraTreeItemComponent.tsx
  64. 7 2
      inspector/src/components/sceneExplorer/entities/gui/advancedDynamicTextureTreeItemComponent.tsx
  65. 2 2
      inspector/src/components/sceneExplorer/entities/gui/controlTreeItemComponent.tsx
  66. 3 1
      inspector/src/components/sceneExplorer/entities/lightTreeItemComponent.tsx
  67. 3 1
      inspector/src/components/sceneExplorer/entities/materialTreeItemComponent.tsx
  68. 5 1
      inspector/src/components/sceneExplorer/entities/meshTreeItemComponent.tsx
  69. 7 1
      inspector/src/components/sceneExplorer/entities/sceneTreeItemComponent.tsx
  70. 3 1
      inspector/src/components/sceneExplorer/entities/textureTreeItemComponent.tsx
  71. 2 1
      inspector/src/components/sceneExplorer/entities/transformNodeTreeItemComponent.tsx
  72. 2 1
      inspector/src/components/sceneExplorer/extensionsComponent.tsx
  73. 7 1
      inspector/src/components/sceneExplorer/sceneExplorerComponent.tsx
  74. 4 1
      inspector/src/components/sceneExplorer/treeItemComponent.tsx
  75. 3 1
      inspector/src/components/sceneExplorer/treeItemSelectableComponent.tsx
  76. 11 2
      inspector/src/components/sceneExplorer/treeItemSpecializedComponent.tsx
  77. 9 2
      inspector/src/inspector.ts
  78. 7 7
      inspector/tsconfig.json

+ 3 - 1
inspector/src/components/actionTabs/actionTabsComponent.tsx

@@ -1,5 +1,7 @@
 import * as React from "react";
-import { Observer, Scene, Nullable } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Observer } from "babylonjs/Misc/observable";
+import { Scene } from "babylonjs/scene";
 import { TabsComponent } from "./tabsComponent";
 import { faFileAlt, faWrench, faBug, faChartBar } from '@fortawesome/free-solid-svg-icons';
 import { StatisticsTabComponent } from "./tabs/statisticsTabComponent";

+ 1 - 1
inspector/src/components/actionTabs/lines/checkBoxLineComponent.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../propertyChangedEvent";
 
 export interface ICheckBoxLineComponentProps {

+ 2 - 1
inspector/src/components/actionTabs/lines/color3LineComponent.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
-import { Observable, Color3 } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
+import { Color3 } from "babylonjs/Maths/math";
 import { PropertyChangedEvent } from "../../propertyChangedEvent";
 import { NumericInputComponent } from "./numericInputComponent";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";

+ 2 - 1
inspector/src/components/actionTabs/lines/floatLineComponent.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../propertyChangedEvent";
 import { LockObject } from "../tabs/propertyGrids/lockObject";
 

+ 2 - 1
inspector/src/components/actionTabs/lines/optionsLineComponent.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../propertyChangedEvent";
 
 class ListLineOption {

+ 2 - 1
inspector/src/components/actionTabs/lines/quaternionLineComponent.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
-import { Observable, Quaternion, Vector3 } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
+import { Quaternion, Vector3 } from "babylonjs/Maths/math";
 import { NumericInputComponent } from "./numericInputComponent";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faMinus, faPlus } from "@fortawesome/free-solid-svg-icons";

+ 2 - 1
inspector/src/components/actionTabs/lines/radioLineComponent.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
-import { Observer, Observable, Nullable } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Observer, Observable } from "babylonjs/Misc/observable";
 
 interface IRadioButtonLineComponentProps {
     onSelectionChangedObservable: Observable<RadioButtonLineComponent>,

+ 1 - 1
inspector/src/components/actionTabs/lines/sliderLineComponent.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../propertyChangedEvent";
 
 interface ISliderLineComponentProps {

+ 1 - 1
inspector/src/components/actionTabs/lines/textInputLineComponent.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "components/propertyChangedEvent";
 import { LockObject } from "../tabs/propertyGrids/lockObject";
 

+ 8 - 1
inspector/src/components/actionTabs/lines/textureLineComponent.tsx

@@ -1,5 +1,12 @@
 import * as React from "react";
-import { BaseTexture, PostProcess, Texture, PassPostProcess, PassCubePostProcess, RenderTargetTexture, Constants } from "babylonjs";
+
+import { Constants } from "babylonjs/Engines/constants";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { Texture } from "babylonjs/Materials/Textures/texture";
+import { RenderTargetTexture } from "babylonjs/Materials/Textures/renderTargetTexture";
+import { PostProcess } from "babylonjs/PostProcesses/postProcess";
+import { PassPostProcess, PassCubePostProcess } from "babylonjs/PostProcesses/passPostProcess";
+
 import { GlobalState } from "components/globalState";
 
 interface ITextureLineComponentProps {

+ 7 - 1
inspector/src/components/actionTabs/lines/textureLinkLineComponent.tsx

@@ -1,5 +1,11 @@
 import * as React from "react";
-import { BaseTexture, Observable, Material, Observer, Nullable, StandardMaterial } from "babylonjs";
+
+import { Nullable } from "babylonjs/types";
+import { Observable, Observer } from "babylonjs/Misc/observable";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { Material } from "babylonjs/Materials/material";
+import { StandardMaterial } from "babylonjs/Materials/standardMaterial";
+
 import { TextLineComponent } from "./textLineComponent";
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faWrench } from '@fortawesome/free-solid-svg-icons';

+ 3 - 1
inspector/src/components/actionTabs/lines/vector3LineComponent.tsx

@@ -1,5 +1,7 @@
 import * as React from "react";
-import { Vector3, Observable } from "babylonjs";
+import { Vector3 } from "babylonjs/Maths/math";
+import { Observable } from "babylonjs/Misc/observable";
+
 import { NumericInputComponent } from "./numericInputComponent";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faMinus, faPlus } from "@fortawesome/free-solid-svg-icons";

+ 2 - 1
inspector/src/components/actionTabs/paneComponent.tsx

@@ -1,6 +1,7 @@
 import * as React from "react";
 import { IconDefinition } from '@fortawesome/free-solid-svg-icons';
-import { Scene, Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
+import { Scene } from "babylonjs/scene";
 import { PropertyChangedEvent } from "../propertyChangedEvent";
 import { GlobalState } from "components/globalState";
 

+ 4 - 1
inspector/src/components/actionTabs/tabs/debugTabComponent.tsx

@@ -3,7 +3,10 @@ import { PaneComponent, IPaneComponentProps } from "../paneComponent";
 import { LineContainerComponent } from "../lineContainerComponent";
 import { CheckBoxLineComponent } from "../lines/checkBoxLineComponent";
 import { RenderGridPropertyGridComponent } from "./propertyGrids/renderGridPropertyGridComponent";
-import { SkeletonViewer, PhysicsViewer, StandardMaterial } from "babylonjs";
+
+import { SkeletonViewer } from "babylonjs/Debug/skeletonViewer";
+import { PhysicsViewer } from "babylonjs/Debug/physicsViewer";
+import { StandardMaterial } from "babylonjs/Materials/standardMaterial";
 
 export class DebugTabComponent extends PaneComponent {
     private _skeletonViewersEnabled = false;

+ 31 - 2
inspector/src/components/actionTabs/tabs/propertyGridTabComponent.tsx

@@ -1,6 +1,22 @@
 import * as React from "react";
 import { PaneComponent, IPaneComponentProps } from "../paneComponent";
-import { Mesh, TransformNode, Material, StandardMaterial, Texture, PBRMaterial, Scene, FreeCamera, ArcRotateCamera, HemisphericLight, PointLight, BackgroundMaterial, AnimationGroup, PBRMetallicRoughnessMaterial, PBRSpecularGlossinessMaterial } from "babylonjs";
+
+import { ArcRotateCamera } from "babylonjs/Cameras/arcRotateCamera";
+import { FreeCamera } from "babylonjs/Cameras/freeCamera";
+import { AnimationGroup } from "babylonjs/Animations/animationGroup";
+import { Material } from "babylonjs/Materials/material";
+import { BackgroundMaterial } from "babylonjs/Materials/Background/backgroundMaterial";
+import { StandardMaterial } from "babylonjs/Materials/standardMaterial";
+import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
+import { PBRMetallicRoughnessMaterial } from "babylonjs/Materials/PBR/pbrMetallicRoughnessMaterial";
+import { PBRSpecularGlossinessMaterial } from "babylonjs/Materials/PBR/pbrSpecularGlossinessMaterial";
+import { Texture } from "babylonjs/Materials/Textures/texture";
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+import { Mesh } from "babylonjs/Meshes/mesh";
+import { HemisphericLight } from "babylonjs/Lights/hemisphericLight";
+import { PointLight } from "babylonjs/Lights/pointLight";
+import { Scene } from "babylonjs/scene";
+
 import { MaterialPropertyGridComponent } from "./propertyGrids/materials/materialPropertyGridComponent";
 import { StandardMaterialPropertyGridComponent } from "./propertyGrids/materials/standardMaterialPropertyGridComponent";
 import { TexturePropertyGridComponent } from "./propertyGrids/materials/texturePropertyGridComponent";
@@ -19,7 +35,20 @@ import { TextBlockPropertyGridComponent } from "./propertyGrids/gui/textBlockPro
 import { TextBlock } from "babylonjs-gui/2D/controls/textBlock";
 import { InputText } from "babylonjs-gui/2D/controls/inputText";
 import { InputTextPropertyGridComponent } from "./propertyGrids/gui/inputTextPropertyGridComponent";
-import { ColorPicker, Image, Slider, ImageBasedSlider, Rectangle, Ellipse, Checkbox, RadioButton, Line, ScrollViewer, Grid, StackPanel } from "babylonjs-gui";
+
+import { ColorPicker } from "babylonjs-gui/2D/controls/colorpicker";
+import { Image } from "babylonjs-gui/2D/controls/image";
+import { Slider } from "babylonjs-gui/2D/controls/sliders/slider";
+import { ImageBasedSlider } from "babylonjs-gui/2D/controls/sliders/imageBasedSlider";
+import { Rectangle } from "babylonjs-gui/2D/controls/rectangle";
+import { Ellipse } from "babylonjs-gui/2D/controls/ellipse";
+import { Checkbox } from "babylonjs-gui/2D/controls/checkbox";
+import { RadioButton } from "babylonjs-gui/2D/controls/radioButton";
+import { Line } from "babylonjs-gui/2D/controls/line";
+import { ScrollViewer } from "babylonjs-gui/2D/controls/scrollViewers/scrollViewer";
+import { Grid } from "babylonjs-gui/2D/controls/grid";
+import { StackPanel } from "babylonjs-gui/2D/controls/stackPanel";
+
 import { ColorPickerPropertyGridComponent } from "./propertyGrids/gui/colorPickerPropertyGridComponent";
 import { AnimationGroupGridComponent } from "./propertyGrids/animationGroupPropertyGridComponent";
 import { LockObject } from "./propertyGrids/lockObject";

+ 6 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/animationGroupPropertyGridComponent.tsx

@@ -1,5 +1,10 @@
 import * as React from "react";
-import { Observable, AnimationGroup, Scene, Nullable, Observer } from "babylonjs";
+
+import { Nullable } from "babylonjs/types";
+import { Observable, Observer } from "babylonjs/Misc/observable";
+import { AnimationGroup } from "babylonjs/Animations/animationGroup";
+import { Scene } from "babylonjs/scene";
+
 import { PropertyChangedEvent } from "../../../propertyChangedEvent";
 import { ButtonLineComponent } from "../../lines/buttonLineComponent";
 import { LineContainerComponent } from "../../lineContainerComponent";

+ 4 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/cameras/arcRotateCameraPropertyGridComponent.tsx

@@ -1,5 +1,8 @@
 import * as React from "react";
-import { Observable, ArcRotateCamera } from "babylonjs";
+
+import { ArcRotateCamera } from "babylonjs/Cameras/arcRotateCamera";
+import { Observable } from "babylonjs/Misc/observable";
+
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonCameraPropertyGridComponent } from "./commonCameraPropertyGridComponent";
 import { LineContainerComponent } from "../../../lineContainerComponent";

+ 2 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/cameras/commonCameraPropertyGridComponent.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
-import { Camera, Observable } from "babylonjs";
+import { Camera } from "babylonjs/Cameras/camera";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { SliderLineComponent } from "../../../lines/sliderLineComponent";
 import { LineContainerComponent } from "../../../lineContainerComponent";

+ 2 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/cameras/freeCameraPropertyGridComponent.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
-import { Observable, FreeCamera } from "babylonjs";
+import { FreeCamera } from "babylonjs/Cameras/freeCamera";
+import { Observable } from "babylonjs/Misc/observable";
 import { CommonCameraPropertyGridComponent } from "./commonCameraPropertyGridComponent";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { LineContainerComponent } from "../../../lineContainerComponent";

+ 3 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/fogPropertyGridComponent.tsx

@@ -1,5 +1,7 @@
 import * as React from "react";
-import { Observable, Scene } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
+import { Scene } from "babylonjs/scene";
+
 import { PropertyChangedEvent } from "../../../propertyChangedEvent";
 import { Color3LineComponent } from "../../lines/color3LineComponent";
 import { FloatLineComponent } from "../../lines/floatLineComponent";

+ 2 - 2
inspector/src/components/actionTabs/tabs/propertyGrids/gui/checkboxPropertyGridComponent.tsx

@@ -1,9 +1,9 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonControlPropertyGridComponent } from "./commonControlPropertyGridComponent";
 import { LockObject } from "../lockObject";
-import { Checkbox } from "babylonjs-gui";
+import { Checkbox } from "babylonjs-gui/2D/controls/checkbox";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { FloatLineComponent } from "../../../lines/floatLineComponent";
 import { CheckBoxLineComponent } from "../../../lines/checkBoxLineComponent";

+ 1 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/gui/colorPickerPropertyGridComponent.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonControlPropertyGridComponent } from "./commonControlPropertyGridComponent";
 import { LineContainerComponent } from "../../../lineContainerComponent";

+ 2 - 2
inspector/src/components/actionTabs/tabs/propertyGrids/gui/commonControlPropertyGridComponent.tsx

@@ -1,15 +1,15 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { TextLineComponent } from "../../../lines/textLineComponent";
 import { Control } from "babylonjs-gui/2D/controls/control";
+import { Grid } from "babylonjs-gui/2D/controls/grid";
 import { SliderLineComponent } from "../../../lines/sliderLineComponent";
 import { FloatLineComponent } from "../../../lines/floatLineComponent";
 import { TextInputLineComponent } from "../../../lines/textInputLineComponent";
 import { LockObject } from "../lockObject";
 import { OptionsLineComponent } from "../../../lines/optionsLineComponent";
-import { Grid } from "babylonjs-gui";
 
 interface ICommonControlPropertyGridComponentProps {
     control: Control;

+ 1 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/gui/controlPropertyGridComponent.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { Control } from "babylonjs-gui/2D/controls/control";
 import { CommonControlPropertyGridComponent } from "./commonControlPropertyGridComponent";

+ 2 - 2
inspector/src/components/actionTabs/tabs/propertyGrids/gui/ellipsePropertyGridComponent.tsx

@@ -1,9 +1,9 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonControlPropertyGridComponent } from "./commonControlPropertyGridComponent";
 import { LockObject } from "../lockObject";
-import { Ellipse } from "babylonjs-gui";
+import { Ellipse } from "babylonjs-gui/2D/controls/ellipse";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { FloatLineComponent } from "../../../lines/floatLineComponent";
 import { CheckBoxLineComponent } from "../../../lines/checkBoxLineComponent";

+ 1 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/gui/gridPropertyGridComponent.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonControlPropertyGridComponent } from "./commonControlPropertyGridComponent";
 import { LockObject } from "../lockObject";

+ 2 - 2
inspector/src/components/actionTabs/tabs/propertyGrids/gui/imageBasedSliderPropertyGridComponent.tsx

@@ -1,10 +1,10 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonControlPropertyGridComponent } from "./commonControlPropertyGridComponent";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { LockObject } from "../lockObject";
-import { ImageBasedSlider } from "babylonjs-gui";
+import { ImageBasedSlider } from "babylonjs-gui/2D/controls/sliders/imageBasedSlider";
 import { FloatLineComponent } from "../../../lines/floatLineComponent";
 import { CheckBoxLineComponent } from "../../../lines/checkBoxLineComponent";
 import { TextInputLineComponent } from "../../../lines/textInputLineComponent";

+ 2 - 2
inspector/src/components/actionTabs/tabs/propertyGrids/gui/imagePropertyGridComponent.tsx

@@ -1,10 +1,10 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonControlPropertyGridComponent } from "./commonControlPropertyGridComponent";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { LockObject } from "../lockObject";
-import { Image } from "babylonjs-gui";
+import { Image } from "babylonjs-gui/2D/controls/image";
 import { FloatLineComponent } from "../../../lines/floatLineComponent";
 import { CheckBoxLineComponent } from "../../../lines/checkBoxLineComponent";
 import { OptionsLineComponent } from "../../../lines/optionsLineComponent";

+ 2 - 2
inspector/src/components/actionTabs/tabs/propertyGrids/gui/inputTextPropertyGridComponent.tsx

@@ -1,8 +1,8 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonControlPropertyGridComponent } from "./commonControlPropertyGridComponent";
-import { InputText } from "babylonjs-gui";
+import { InputText } from "babylonjs-gui/2D/controls/inputText";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { TextInputLineComponent } from "../../../lines/textInputLineComponent";
 import { SliderLineComponent } from "../../../lines/sliderLineComponent";

+ 2 - 2
inspector/src/components/actionTabs/tabs/propertyGrids/gui/linePropertyGridComponent.tsx

@@ -1,9 +1,9 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonControlPropertyGridComponent } from "./commonControlPropertyGridComponent";
 import { LockObject } from "../lockObject";
-import { Line } from "babylonjs-gui";
+import { Line } from "babylonjs-gui/2D/controls/line";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { FloatLineComponent } from "../../../lines/floatLineComponent";
 import { TextInputLineComponent } from "../../../lines/textInputLineComponent";

+ 2 - 2
inspector/src/components/actionTabs/tabs/propertyGrids/gui/radioButtonPropertyGridComponent.tsx

@@ -1,9 +1,9 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonControlPropertyGridComponent } from "./commonControlPropertyGridComponent";
 import { LockObject } from "../lockObject";
-import { RadioButton } from "babylonjs-gui";
+import { RadioButton } from "babylonjs-gui/2D/controls/radioButton";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { FloatLineComponent } from "../../../lines/floatLineComponent";
 import { TextInputLineComponent } from "../../../lines/textInputLineComponent";

+ 2 - 2
inspector/src/components/actionTabs/tabs/propertyGrids/gui/rectanglePropertyGridComponent.tsx

@@ -1,9 +1,9 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonControlPropertyGridComponent } from "./commonControlPropertyGridComponent";
 import { LockObject } from "../lockObject";
-import { Rectangle } from "babylonjs-gui";
+import { Rectangle } from "babylonjs-gui/2D/controls/rectangle";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { FloatLineComponent } from "../../../lines/floatLineComponent";
 import { CheckBoxLineComponent } from "../../../lines/checkBoxLineComponent";

+ 2 - 2
inspector/src/components/actionTabs/tabs/propertyGrids/gui/scrollViewerPropertyGridComponent.tsx

@@ -1,9 +1,9 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonControlPropertyGridComponent } from "./commonControlPropertyGridComponent";
 import { LockObject } from "../lockObject";
-import { ScrollViewer } from "babylonjs-gui";
+import { ScrollViewer } from "babylonjs-gui/2D/controls/scrollViewers/scrollViewer";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { FloatLineComponent } from "../../../lines/floatLineComponent";
 import { TextInputLineComponent } from "../../../lines/textInputLineComponent";

+ 2 - 2
inspector/src/components/actionTabs/tabs/propertyGrids/gui/sliderPropertyGridComponent.tsx

@@ -1,10 +1,10 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonControlPropertyGridComponent } from "./commonControlPropertyGridComponent";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { LockObject } from "../lockObject";
-import { Slider } from "babylonjs-gui";
+import { Slider } from "babylonjs-gui/2D/controls/sliders/slider";
 import { FloatLineComponent } from "../../../lines/floatLineComponent";
 import { CheckBoxLineComponent } from "../../../lines/checkBoxLineComponent";
 import { TextInputLineComponent } from "../../../lines/textInputLineComponent";

+ 2 - 2
inspector/src/components/actionTabs/tabs/propertyGrids/gui/stackPanelPropertyGridComponent.tsx

@@ -1,9 +1,9 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonControlPropertyGridComponent } from "./commonControlPropertyGridComponent";
 import { LockObject } from "../lockObject";
-import { StackPanel } from "babylonjs-gui";
+import { StackPanel } from "babylonjs-gui/2D/controls/stackPanel";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { CheckBoxLineComponent } from "../../../lines/checkBoxLineComponent";
 

+ 2 - 2
inspector/src/components/actionTabs/tabs/propertyGrids/gui/textBlockPropertyGridComponent.tsx

@@ -1,8 +1,8 @@
 import * as React from "react";
-import { Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonControlPropertyGridComponent } from "./commonControlPropertyGridComponent";
-import { TextBlock } from "babylonjs-gui";
+import { TextBlock } from "babylonjs-gui/2D/controls/textBlock";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { TextInputLineComponent } from "../../../lines/textInputLineComponent";
 import { LockObject } from "../lockObject";

+ 2 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/lights/commonLightPropertyGridComponent.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
-import { Light, Observable } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
+import { Light } from "babylonjs/Lights/light";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { FloatLineComponent } from "../../../lines/floatLineComponent";

+ 2 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/lights/commonShadowLightPropertyGridComponent.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
-import { Observable, IShadowLight } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
+import { IShadowLight } from "babylonjs/Lights/shadowLight";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { CheckBoxLineComponent } from "../../../lines/checkBoxLineComponent";

+ 2 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/lights/directionalLightPropertyGridComponent.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
-import { Observable, DirectionalLight } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
+import { DirectionalLight } from "babylonjs/Lights/directionalLight";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonLightPropertyGridComponent } from "./commonLightPropertyGridComponent";
 import { LineContainerComponent } from "../../../lineContainerComponent";

+ 2 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/lights/hemisphericLightPropertyGridComponent.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
-import { Observable, HemisphericLight } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
+import { HemisphericLight } from "babylonjs/Lights/hemisphericLight";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonLightPropertyGridComponent } from "./commonLightPropertyGridComponent";
 import { LineContainerComponent } from "../../../lineContainerComponent";

+ 2 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/lights/pointLightPropertyGridComponent.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
-import { Observable, PointLight } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
+import { PointLight } from "babylonjs/Lights/pointLight";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonLightPropertyGridComponent } from "./commonLightPropertyGridComponent";
 import { LineContainerComponent } from "../../../lineContainerComponent";

+ 2 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/lights/spotLightPropertyGridComponent.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
-import { Observable, SpotLight } from "babylonjs";
+import { Observable } from "babylonjs/Misc/observable";
+import { SpotLight } from "babylonjs/Lights/spotLight";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonLightPropertyGridComponent } from "./commonLightPropertyGridComponent";
 import { LineContainerComponent } from "../../../lineContainerComponent";

+ 5 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/materials/backgroundMaterialPropertyGridComponent.tsx

@@ -1,5 +1,9 @@
 import * as React from "react";
-import { Observable, BackgroundMaterial, BaseTexture } from "babylonjs";
+
+import { Observable } from "babylonjs/Misc/observable";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { BackgroundMaterial } from "babylonjs/Materials/Background/backgroundMaterial";
+
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { Color3LineComponent } from "../../../lines/color3LineComponent";

+ 6 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/materials/commonMaterialPropertyGridComponent.tsx

@@ -1,5 +1,10 @@
 import * as React from "react";
-import { Material, Observable, PBRMaterial, Engine } from "babylonjs";
+
+import { Observable } from "babylonjs/Misc/observable";
+import { Material } from "babylonjs/Materials/material";
+import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
+import { Engine } from "babylonjs/Engines/engine";
+
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CheckBoxLineComponent } from "../../../lines/checkBoxLineComponent";
 import { SliderLineComponent } from "../../../lines/sliderLineComponent";

+ 4 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/materials/materialPropertyGridComponent.tsx

@@ -1,5 +1,8 @@
 import * as React from "react";
-import { Material, Observable } from "babylonjs";
+
+import { Observable } from "babylonjs/Misc/observable";
+import { Material } from "babylonjs/Materials/material";
+
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonMaterialPropertyGridComponent } from "./commonMaterialPropertyGridComponent";
 import { LockObject } from "../lockObject";

+ 5 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/materials/pbrMaterialPropertyGridComponent.tsx

@@ -1,5 +1,9 @@
 import * as React from "react";
-import { Observable, PBRMaterial, BaseTexture } from "babylonjs";
+
+import { Observable } from "babylonjs/Misc/observable";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
+
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { Color3LineComponent } from "../../../lines/color3LineComponent";

+ 5 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/materials/pbrMetallicRoughnessMaterialPropertyGridComponent.tsx

@@ -1,5 +1,9 @@
 import * as React from "react";
-import { Observable, PBRMetallicRoughnessMaterial, BaseTexture } from "babylonjs";
+
+import { Observable } from "babylonjs/Misc/observable";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { PBRMetallicRoughnessMaterial } from "babylonjs/Materials/PBR/pbrMetallicRoughnessMaterial";
+
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { Color3LineComponent } from "../../../lines/color3LineComponent";

+ 5 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/materials/pbrSpecularGlossinessMaterialPropertyGridComponent.tsx

@@ -1,5 +1,9 @@
 import * as React from "react";
-import { Observable, PBRSpecularGlossinessMaterial, BaseTexture } from "babylonjs";
+
+import { Observable } from "babylonjs/Misc/observable";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { PBRSpecularGlossinessMaterial } from "babylonjs/Materials/PBR/pbrSpecularGlossinessMaterial";
+
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { Color3LineComponent } from "../../../lines/color3LineComponent";

+ 5 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/materials/standardMaterialPropertyGridComponent.tsx

@@ -1,5 +1,9 @@
 import * as React from "react";
-import { Observable, StandardMaterial, BaseTexture } from "babylonjs";
+
+import { Observable } from "babylonjs/Misc/observable";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { StandardMaterial } from "babylonjs/Materials/standardMaterial";
+
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { Color3LineComponent } from "../../../lines/color3LineComponent";

+ 10 - 2
inspector/src/components/actionTabs/tabs/propertyGrids/materials/texturePropertyGridComponent.tsx

@@ -1,5 +1,12 @@
 import * as React from "react";
-import { Texture, BaseTexture, CubeTexture, Observable, Nullable, Tools } from "babylonjs";
+
+import { Nullable } from "babylonjs/types";
+import { Tools } from "babylonjs/Misc/tools";
+import { Observable } from "babylonjs/Misc/observable";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { Texture } from "babylonjs/Materials/Textures/texture";
+import { CubeTexture } from "babylonjs/Materials/Textures/cubeTexture";
+
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { SliderLineComponent } from "../../../lines/sliderLineComponent";
@@ -13,7 +20,8 @@ import { LockObject } from "../lockObject";
 import { ValueLineComponent } from "../../../lines/valueLineComponent";
 import { GlobalState } from "components/globalState";
 
-import { AdvancedDynamicTextureInstrumentation, AdvancedDynamicTexture } from "babylonjs-gui";
+import { AdvancedDynamicTextureInstrumentation } from "babylonjs-gui/2D/adtInstrumentation";
+import { AdvancedDynamicTexture } from "babylonjs-gui/2D/advancedDynamicTexture";
 
 interface ITexturePropertyGridComponentProps {
     texture: BaseTexture,

+ 5 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/meshes/axesViewerComponent.tsx

@@ -1,5 +1,9 @@
 import * as React from "react";
-import { TransformNode, Vector3, Tmp, AxesViewer } from "babylonjs";
+
+import { Vector3, Tmp } from "babylonjs/Maths/math";
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+import { AxesViewer } from "babylonjs/Debug/axesViewer";
+
 import { CheckBoxLineComponent } from "../../../lines/checkBoxLineComponent";
 
 interface IAxisViewerComponentProps {

+ 10 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/meshes/meshPropertyGridComponent.tsx

@@ -1,5 +1,14 @@
 import * as React from "react";
-import { Mesh, Observable, VertexBuffer, Color3, Vector3, MeshBuilder, Tools, PhysicsImpostor, Scene } from "babylonjs";
+
+import { Observable } from "babylonjs/Misc/observable";
+import { Tools } from "babylonjs/Misc/tools";
+import { Color3, Vector3 } from "babylonjs/Maths/math";
+import { Mesh } from "babylonjs/Meshes/mesh";
+import { VertexBuffer } from "babylonjs/Meshes/buffer";
+import { MeshBuilder } from "babylonjs/Meshes/meshBuilder";
+import { PhysicsImpostor } from "babylonjs/Physics/physicsImpostor";
+import { Scene } from "babylonjs/scene";
+
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { TextLineComponent } from "../../../lines/textLineComponent";

+ 4 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/meshes/transformNodePropertyGridComponent.tsx

@@ -1,5 +1,8 @@
 import * as React from "react";
-import { TransformNode, Observable } from "babylonjs";
+
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+import { Observable } from "babylonjs/Misc/observable";
+
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { CheckBoxLineComponent } from "../../../lines/checkBoxLineComponent";

+ 10 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/renderGridPropertyGridComponent.tsx

@@ -1,5 +1,14 @@
 import * as React from "react";
-import { Scene, AbstractMesh, Nullable, UtilityLayerRenderer, Tools, Mesh, Color3, Texture } from "babylonjs";
+
+import { Nullable } from "babylonjs/types";
+import { Tools } from "babylonjs/Misc/tools";
+import { Color3 } from "babylonjs/Maths/math";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+import { Mesh } from "babylonjs/Meshes/mesh";
+import { Texture } from "babylonjs/Materials/Textures/texture";
+import { UtilityLayerRenderer } from "babylonjs/Rendering/utilityLayerRenderer";
+import { Scene } from "babylonjs/scene";
+
 import { CheckBoxLineComponent } from "../../lines/checkBoxLineComponent";
 
 interface IRenderGridPropertyGridComponentProps {

+ 10 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/scenePropertyGridComponent.tsx

@@ -1,5 +1,14 @@
 import * as React from "react";
-import { Observable, Scene, BaseTexture, Nullable, Vector3, CubeTexture, Tools, ImageProcessingConfiguration } from "babylonjs";
+
+import { Nullable } from "babylonjs/types";
+import { Observable } from "babylonjs/Misc/observable";
+import { Tools } from "babylonjs/Misc/tools";
+import { Vector3 } from "babylonjs/Maths/math";
+import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
+import { CubeTexture } from "babylonjs/Materials/Textures/cubeTexture";
+import { ImageProcessingConfiguration } from "babylonjs/Materials/imageProcessingConfiguration";
+import { Scene } from "babylonjs/scene";
+
 import { PropertyChangedEvent } from "../../../propertyChangedEvent";
 import { LineContainerComponent } from "../../lineContainerComponent";
 import { RadioButtonLineComponent } from "../../lines/radioLineComponent";

+ 6 - 1
inspector/src/components/actionTabs/tabs/statisticsTabComponent.tsx

@@ -2,7 +2,12 @@ import * as React from "react";
 import { PaneComponent, IPaneComponentProps } from "../paneComponent";
 import { TextLineComponent } from "../lines/textLineComponent";
 import { LineContainerComponent } from "../lineContainerComponent";
-import { SceneInstrumentation, EngineInstrumentation, Nullable, Engine } from "babylonjs";
+
+import { Nullable } from "babylonjs/types";
+import { EngineInstrumentation } from "babylonjs/Instrumentation/engineInstrumentation";
+import { SceneInstrumentation } from "babylonjs/Instrumentation/sceneInstrumentation";
+import { Engine } from "babylonjs/Engines/engine";
+
 import { ValueLineComponent } from "../lines/valueLineComponent";
 import { BooleanLineComponent } from "../lines/booleanLineComponent";
 

+ 1 - 1
inspector/src/components/actionTabs/tabs/tools/gltfComponent.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { Scene } from "babylonjs";
+import { Scene } from "babylonjs/scene";
 import { LineContainerComponent } from "../../lineContainerComponent";
 import { CheckBoxLineComponent } from "../../lines/checkBoxLineComponent";
 import { GlobalState } from "../../../globalState";

+ 16 - 3
inspector/src/components/actionTabs/tabs/toolsTabComponent.tsx

@@ -2,10 +2,23 @@ import * as React from "react";
 import { PaneComponent, IPaneComponentProps } from "../paneComponent";
 import { LineContainerComponent } from "../lineContainerComponent";
 import { ButtonLineComponent } from "../lines/buttonLineComponent";
-import { VideoRecorder, Nullable, TransformNode, PBRMaterial, StandardMaterial, BackgroundMaterial, EnvironmentTextureTools, CubeTexture, Tools, Mesh, Texture, SceneSerializer } from "babylonjs";
+
+import { Nullable } from "babylonjs/types";
+import { VideoRecorder } from "babylonjs/Misc/videoRecorder";
+import { Tools } from "babylonjs/Misc/tools";
+import { EnvironmentTextureTools } from "babylonjs/Misc/environmentTextureTools";
+import { BackgroundMaterial } from "babylonjs/Materials/Background/backgroundMaterial";
+import { StandardMaterial } from "babylonjs/Materials/standardMaterial";
+import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
+import { CubeTexture } from "babylonjs/Materials/Textures/cubeTexture";
+import { Texture } from "babylonjs/Materials/Textures/texture";
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+import { SceneSerializer } from "babylonjs/Misc/sceneSerializer";
+import { Mesh } from "babylonjs/Meshes/mesh";
+
 import { GLTFComponent } from "./tools/gltfComponent";
-import { GLTFData } from "babylonjs-serializers";
-import { GLTF2Export } from "babylonjs-serializers";
+
+import { GLTFData, GLTF2Export } from "babylonjs-serializers/glTF/2.0/index";
 
 export class ToolsTabComponent extends PaneComponent {
     private _videoRecorder: Nullable<VideoRecorder>;

+ 1 - 1
inspector/src/components/embedHost/embedHostComponent.tsx

@@ -3,7 +3,7 @@ import { HeaderComponent } from "../headerComponent";
 import Resizable from "re-resizable";
 import { SceneExplorerComponent } from "../sceneExplorer/sceneExplorerComponent";
 import { ActionTabsComponent } from "../actionTabs/actionTabsComponent";
-import { Scene } from "babylonjs";
+import { Scene } from "babylonjs/scene";
 import { GlobalState } from "components/globalState";
 
 const Split = require('split.js')

+ 7 - 3
inspector/src/components/globalState.ts

@@ -1,7 +1,11 @@
-import { Observable, ISceneLoaderPlugin, ISceneLoaderPluginAsync, Observer, Nullable, Scene } from "babylonjs";
+import { GLTFFileLoader, IGLTFLoaderExtension } from "babylonjs-loaders/glTF/index";
+
+import { Nullable } from "babylonjs/types";
+import { Observable, Observer } from "babylonjs/Misc/observable";
+import { ISceneLoaderPlugin, ISceneLoaderPluginAsync } from "babylonjs/Loading/sceneLoader";
+import { Scene } from "babylonjs/scene";
+
 import { PropertyChangedEvent } from "./propertyChangedEvent";
-import { IGLTFLoaderExtension, GLTFFileLoader } from "babylonjs-loaders";
-import { } from "babylonjs-gltf2interface";
 
 export class GlobalState {
     public onSelectionChangedObservable: Observable<string>;

+ 3 - 1
inspector/src/components/headerComponent.tsx

@@ -1,8 +1,10 @@
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faWindowRestore, faTimes, faArrowLeft } from "@fortawesome/free-solid-svg-icons";
-import { Observable, Observer, Nullable } from "babylonjs";
 import * as React from "react";
 
+import { Nullable } from "babylonjs/types";
+import { Observable, Observer } from "babylonjs/Misc/observable";
+
 export interface IHeaderComponentProps {
     title: string,
     handleBack?: boolean,

+ 3 - 1
inspector/src/components/sceneExplorer/entities/animationGroupTreeItemComponent.tsx

@@ -1,4 +1,6 @@
-import { IExplorerExtensibilityGroup, AnimationGroup } from "babylonjs";
+import { AnimationGroup } from "babylonjs/Animations/animationGroup";
+import { IExplorerExtensibilityGroup } from "babylonjs/Debug/debugLayer";
+
 import { faFilm } from '@fortawesome/free-solid-svg-icons';
 import { TreeItemLabelComponent } from "../treeItemLabelComponent";
 import { ExtensionsComponent } from "../extensionsComponent";

+ 6 - 1
inspector/src/components/sceneExplorer/entities/cameraTreeItemComponent.tsx

@@ -1,4 +1,9 @@
-import { Camera, Observer, Scene, Nullable, IExplorerExtensibilityGroup } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Observer } from "babylonjs/Misc/observable";
+import { IExplorerExtensibilityGroup } from "babylonjs/Debug/debugLayer";
+import { Camera } from "babylonjs/Cameras/camera";
+import { Scene } from "babylonjs/scene";
+
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faVideo, faCamera } from '@fortawesome/free-solid-svg-icons';
 import { TreeItemLabelComponent } from "../treeItemLabelComponent";

+ 7 - 2
inspector/src/components/sceneExplorer/entities/gui/advancedDynamicTextureTreeItemComponent.tsx

@@ -1,9 +1,14 @@
+import { Nullable } from "babylonjs/types";
+import { Observer, Observable } from "babylonjs/Misc/observable";
+import { IExplorerExtensibilityGroup } from "babylonjs/Debug/debugLayer";
+
+import { Control } from 'babylonjs-gui/2D/controls/control';
+import { AdvancedDynamicTexture } from 'babylonjs-gui/2D/advancedDynamicTexture';
+
 import { faImage, faCrosshairs } from '@fortawesome/free-solid-svg-icons';
-import { IExplorerExtensibilityGroup, Nullable, Observer, Observable } from "babylonjs";
 import { TreeItemLabelComponent } from "../../treeItemLabelComponent";
 import { ExtensionsComponent } from "../../extensionsComponent";
 import * as React from 'react';
-import { AdvancedDynamicTexture, Control } from 'babylonjs-gui';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
 interface IAdvancedDynamicTextureTreeItemComponentProps {

+ 2 - 2
inspector/src/components/sceneExplorer/entities/gui/controlTreeItemComponent.tsx

@@ -1,6 +1,6 @@
 import { faObjectGroup, faHighlighter, faEye, faEyeSlash } from '@fortawesome/free-solid-svg-icons';
-import { IExplorerExtensibilityGroup } from "babylonjs";
-import { Control } from "babylonjs-gui";
+import { IExplorerExtensibilityGroup } from "babylonjs/Debug/debugLayer";
+import { Control } from "babylonjs-gui/2D/controls/control";
 import { TreeItemLabelComponent } from "../../treeItemLabelComponent";
 import { ExtensionsComponent } from "../../extensionsComponent";
 import * as React from 'react';

+ 3 - 1
inspector/src/components/sceneExplorer/entities/lightTreeItemComponent.tsx

@@ -1,4 +1,6 @@
-import { Light, IExplorerExtensibilityGroup } from "babylonjs";
+import { IExplorerExtensibilityGroup } from "babylonjs/Debug/debugLayer";
+import { Light } from "babylonjs/Lights/light";
+
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faLightbulb } from '@fortawesome/free-solid-svg-icons';
 import { faLightbulb as faLightbubRegular } from '@fortawesome/free-regular-svg-icons';

+ 3 - 1
inspector/src/components/sceneExplorer/entities/materialTreeItemComponent.tsx

@@ -1,5 +1,7 @@
+import { IExplorerExtensibilityGroup } from "babylonjs/Debug/debugLayer";
+import { Material } from "babylonjs/Materials/material";
+
 import { faBrush } from '@fortawesome/free-solid-svg-icons';
-import { Material, IExplorerExtensibilityGroup } from "babylonjs";
 import { TreeItemLabelComponent } from "../treeItemLabelComponent";
 import { ExtensionsComponent } from "../extensionsComponent";
 import * as React from 'react';

+ 5 - 1
inspector/src/components/sceneExplorer/entities/meshTreeItemComponent.tsx

@@ -1,4 +1,8 @@
-import { AbstractMesh, IExplorerExtensibilityGroup, Color3, BoundingBoxGizmo } from "babylonjs";
+import { IExplorerExtensibilityGroup } from "babylonjs/Debug/debugLayer";
+import { Color3 } from "babylonjs/Maths/math";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+import { BoundingBoxGizmo } from "babylonjs/Gizmos/boundingBoxGizmo";
+
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faCube } from '@fortawesome/free-solid-svg-icons';
 import { faEye, faEyeSlash } from '@fortawesome/free-regular-svg-icons';

+ 7 - 1
inspector/src/components/sceneExplorer/entities/sceneTreeItemComponent.tsx

@@ -1,4 +1,10 @@
-import { Scene, Observable, PointerInfo, Observer, Nullable, GizmoManager, IExplorerExtensibilityGroup, PointerEventTypes } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { Observer, Observable } from "babylonjs/Misc/observable";
+import { PointerInfo, PointerEventTypes } from "babylonjs/Events/pointerEvents";
+import { IExplorerExtensibilityGroup } from "babylonjs/Debug/debugLayer";
+import { GizmoManager } from "babylonjs/Gizmos/gizmoManager";
+import { Scene } from "babylonjs/scene";
+
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faSyncAlt, faImage, faCrosshairs, faArrowsAlt, faCompress, faRedoAlt } from '@fortawesome/free-solid-svg-icons';
 import { ExtensionsComponent } from "../extensionsComponent";

+ 3 - 1
inspector/src/components/sceneExplorer/entities/textureTreeItemComponent.tsx

@@ -1,5 +1,7 @@
+import { IExplorerExtensibilityGroup } from "babylonjs/Debug/debugLayer";
+import { Texture } from "babylonjs/Materials/Textures/texture";
+
 import { faImage } from '@fortawesome/free-solid-svg-icons';
-import { Texture, IExplorerExtensibilityGroup } from "babylonjs";
 import { TreeItemLabelComponent } from "../treeItemLabelComponent";
 import { ExtensionsComponent } from "../extensionsComponent";
 import * as React from 'react';

+ 2 - 1
inspector/src/components/sceneExplorer/entities/transformNodeTreeItemComponent.tsx

@@ -1,4 +1,5 @@
-import { TransformNode, IExplorerExtensibilityGroup } from "babylonjs";
+import { IExplorerExtensibilityGroup } from "babylonjs/Debug/debugLayer";
+import { TransformNode } from "babylonjs/Meshes/transformNode";
 import { faCodeBranch } from '@fortawesome/free-solid-svg-icons';
 import { TreeItemLabelComponent } from "../treeItemLabelComponent";
 import { ExtensionsComponent } from "../extensionsComponent";

+ 2 - 1
inspector/src/components/sceneExplorer/extensionsComponent.tsx

@@ -1,7 +1,8 @@
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faEllipsisH } from '@fortawesome/free-solid-svg-icons';
 import * as React from "react";
-import { Nullable, IExplorerExtensibilityGroup } from "babylonjs";
+import { Nullable } from "babylonjs/types";
+import { IExplorerExtensibilityGroup } from "babylonjs/Debug/debugLayer";
 
 interface IExtensionsComponentProps {
     target: any,

+ 7 - 1
inspector/src/components/sceneExplorer/sceneExplorerComponent.tsx

@@ -1,5 +1,11 @@
 import * as React from "react";
-import { Scene, Observer, Nullable, IExplorerExtensibilityGroup, Engine } from "babylonjs";
+
+import { Nullable } from "babylonjs/types";
+import { Observer } from "babylonjs/Misc/observable";
+import { IExplorerExtensibilityGroup } from "babylonjs/Debug/debugLayer";
+import { Engine } from "babylonjs/Engines/engine";
+import { Scene } from "babylonjs/scene";
+
 import { TreeItemComponent } from "./treeItemComponent";
 import Resizable from "re-resizable";
 import { HeaderComponent } from "../headerComponent";

+ 4 - 1
inspector/src/components/sceneExplorer/treeItemComponent.tsx

@@ -1,5 +1,8 @@
 import * as React from "react";
-import { Nullable, IExplorerExtensibilityGroup } from "babylonjs";
+
+import { Nullable } from "babylonjs/types";
+import { IExplorerExtensibilityGroup } from "babylonjs/Debug/debugLayer";
+
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faPlus, faMinus, faBan, faExpandArrowsAlt, faCompress } from '@fortawesome/free-solid-svg-icons';
 import { TreeItemSelectableComponent } from "./treeItemSelectableComponent";

+ 3 - 1
inspector/src/components/sceneExplorer/treeItemSelectableComponent.tsx

@@ -1,5 +1,7 @@
+import { Nullable } from "babylonjs/types";
+import { IExplorerExtensibilityGroup } from "babylonjs/Debug/debugLayer";
+
 import { TreeItemSpecializedComponent } from "./treeItemSpecializedComponent";
-import { Nullable, IExplorerExtensibilityGroup } from "babylonjs";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faMinus, faPlus } from "@fortawesome/free-solid-svg-icons";
 import { Tools } from "../../tools";

+ 11 - 2
inspector/src/components/sceneExplorer/treeItemSpecializedComponent.tsx

@@ -1,4 +1,12 @@
-import { AbstractMesh, Camera, Light, Material, Texture, TransformNode, IExplorerExtensibilityGroup, AnimationGroup } from "babylonjs";
+import { Camera } from "babylonjs/Cameras/camera";
+import { IExplorerExtensibilityGroup } from "babylonjs/Debug/debugLayer";
+import { AnimationGroup } from "babylonjs/Animations/animationGroup";
+import { Material } from "babylonjs/Materials/material";
+import { Texture } from "babylonjs/Materials/Textures/texture";
+import { TransformNode } from "babylonjs/Meshes/transformNode";
+import { Light } from "babylonjs/Lights/light";
+import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
+
 import { MeshTreeItemComponent } from "./entities/meshTreeItemComponent";
 import { CameraTreeItemComponent } from "./entities/cameraTreeItemComponent";
 import { LightTreeItemComponent } from "./entities/lightTreeItemComponent";
@@ -9,7 +17,8 @@ import { TextureTreeItemComponent } from "./entities/textureTreeItemComponent";
 import { TransformNodeItemComponent } from "./entities/transformNodeTreeItemComponent";
 import * as React from "react";
 import { ControlTreeItemComponent } from "./entities/gui/controlTreeItemComponent";
-import { Control, AdvancedDynamicTexture } from "babylonjs-gui";
+import { Control } from "babylonjs-gui/2D/controls/control";
+import { AdvancedDynamicTexture } from "babylonjs-gui/2D/advancedDynamicTexture";
 import { AdvancedDynamicTextureTreeItemComponent } from "./entities/gui/advancedDynamicTextureTreeItemComponent";
 import { AnimationGroupItemComponent } from "./entities/animationGroupTreeItemComponent";
 import { GlobalState } from "../globalState";

+ 9 - 2
inspector/src/inspector.ts

@@ -1,13 +1,20 @@
 
 import * as React from "react";
 import * as ReactDOM from "react-dom";
+
+import { IInspectorOptions } from "babylonjs/Debug/debugLayer";
+import { Nullable } from "babylonjs/types";
+import { Observable, Observer } from "babylonjs/Misc/observable";
+import { Engine } from "babylonjs/Engines/engine";
+import { Scene } from "babylonjs/scene";
+import { SceneLoader } from "babylonjs/Loading/sceneLoader";
+
 import { ActionTabsComponent } from "./components/actionTabs/actionTabsComponent";
 import { SceneExplorerComponent } from "./components/sceneExplorer/sceneExplorerComponent";
-import { Scene, Observable, Observer, Nullable, IInspectorOptions, SceneLoader, Engine } from "babylonjs";
 import { EmbedHostComponent } from "./components/embedHost/embedHostComponent";
 import { PropertyChangedEvent } from "./components/propertyChangedEvent";
 import { GlobalState } from "./components/globalState";
-import { GLTFFileLoader } from "babylonjs-loaders";
+import { GLTFFileLoader } from "babylonjs-loaders/glTF/index";
 
 interface IInternalInspectorOptions extends IInspectorOptions {
     popup: boolean;

+ 7 - 7
inspector/tsconfig.json

@@ -5,21 +5,21 @@
         "baseUrl": "./src/",
         "rootDir": "./src/",
         "paths": {
-            "babylonjs": [
-                "../../dist/preview release/babylon.module.d.ts"
-            ],
-            "babylonjs-gui": [
+            "babylonjs-gui/*": [
                 "../../dist/preview release/gui/babylon.gui.module.d.ts"
             ],
             "babylonjs-gltf2interface": [
                 "../../dist/preview release/glTF2Interface/babylon.glTF2Interface.d.ts"
             ],
-            "babylonjs-loaders": [
+            "babylonjs-loaders/*": [
                 "../../dist/preview release/loaders/babylonjs.loaders.module.d.ts"
             ],
-            "babylonjs-serializers": [
+            "babylonjs-serializers/*": [
                 "../../dist/preview release/serializers/babylonjs.serializers.module.d.ts"
-            ]
+            ],
+            "babylonjs/*": [
+                "../../dist/preview release/babylon.module.d.ts"
+            ],
         }
     }
 }