Tools Circular dependencies

Tools/Config/tempCircularValidation/core.json

@@ -1,31 +1,7 @@
 {
-    "../../src/Animations/animatable.ts": [
-        "../../src/Animations/runtimeAnimation.ts"
-    ],
-    "../../src/Animations/animation.ts": [
-        "../../src/Materials/Textures/texture.ts",
-        "../../src/Misc/decorators.ts",
-        "../../src/node.ts"
-    ],
-    "../../src/Animations/runtimeAnimation.ts": [
-        "../../src/Animations/animation.ts"
-    ],
     "../../src/Behaviors/Meshes/pointerDragBehavior.ts": [
         "../../src/Gizmos/boundingBoxGizmo.ts"
     ],
-    "../../src/Cameras/camera.ts": [
-        "../../src/Animations/animation.ts",
-        "../../src/Misc/decorators.ts",
-        "../../src/Misc/tools.ts",
-        "../../src/PostProcesses/anaglyphPostProcess.ts",
-        "../../src/PostProcesses/passPostProcess.ts",
-        "../../src/PostProcesses/stereoscopicInterlacePostProcess.ts",
-        "../../src/PostProcesses/vrDistortionCorrectionPostProcess.ts",
-        "../../src/node.ts"
-    ],
-    "../../src/Collisions/collisionCoordinator.ts": [
-        "../../src/Engines/engine.ts"
-    ],
     "../../src/Culling/Octrees/octree.ts": [
         "../../src/Culling/Octrees/octreeBlock.ts"
     ],
@@ -36,12 +12,8 @@
         "../../src/Meshes/abstractMesh.ts"
     ],
     "../../src/Engines/engine.ts": [
-        "../../src/Materials/Textures/baseTexture.ts",
         "../../src/Materials/Textures/internalTexture.ts",
-        "../../src/Materials/material.ts",
-        "../../src/Misc/promise.ts",
-        "../../src/Misc/tools.ts",
-        "../../src/PostProcesses/passPostProcess.ts"
+        "../../src/Materials/material.ts"
     ],
     "../../src/Gizmos/boundingBoxGizmo.ts": [
         "../../src/Behaviors/Meshes/pointerDragBehavior.ts"
@@ -64,63 +36,25 @@
     "../../src/Lights/Shadows/shadowGeneratorSceneComponent.ts": [
         "../../src/Lights/Shadows/shadowGenerator.ts"
     ],
-    "../../src/Lights/light.ts": [
-        "../../src/Animations/animation.ts",
-        "../../src/Misc/decorators.ts",
-        "../../src/node.ts"
-    ],
     "../../src/Loading/sceneLoader.ts": [
-        "../../src/Engines/engine.ts",
-        "../../src/Misc/filesInput.ts",
-        "../../src/Misc/tools.ts",
-        "../../src/scene.ts"
-    ],
-    "../../src/Materials/Textures/baseTexture.ts": [
-        "../../src/Misc/decorators.ts",
-        "../../src/Misc/tools.ts"
+        "../../src/Misc/filesInput.ts"
     ],
     "../../src/Materials/Textures/internalTexture.ts": [
         "../../src/Engines/engine.ts"
     ],
-    "../../src/Materials/Textures/texture.ts": [
-        "../../src/Materials/Textures/baseTexture.ts",
-        "../../src/Misc/decorators.ts",
-        "../../src/Misc/tools.ts"
-    ],
-    "../../src/Materials/colorCurves.ts": [
-        "../../src/Misc/decorators.ts"
-    ],
-    "../../src/Materials/imageProcessingConfiguration.ts": [
-        "../../src/Materials/colorCurves.ts",
-        "../../src/Misc/decorators.ts",
-        "../../src/Misc/tools.ts"
-    ],
     "../../src/Materials/material.ts": [
-        "../../src/Meshes/subMesh.ts",
-        "../../src/Misc/decorators.ts",
-        "../../src/Misc/tools.ts"
+        "../../src/Meshes/subMesh.ts"
     ],
     "../../src/Materials/materialHelper.ts": [
-        "../../src/Lights/light.ts",
         "../../src/scene.ts"
     ],
-    "../../src/Materials/pushMaterial.ts": [
-        "../../src/Materials/material.ts"
-    ],
     "../../src/Materials/standardMaterial.ts": [
-        "../../src/Engines/engine.ts",
-        "../../src/Materials/Textures/texture.ts",
-        "../../src/Materials/imageProcessingConfiguration.ts",
         "../../src/Materials/materialHelper.ts",
-        "../../src/Materials/pushMaterial.ts",
-        "../../src/Misc/decorators.ts",
         "../../src/scene.ts"
     ],
     "../../src/Meshes/abstractMesh.ts": [
         "../../src/Culling/boundingInfo.ts",
-        "../../src/Engines/engine.ts",
-        "../../src/Meshes/transformNode.ts",
-        "../../src/Misc/tools.ts"
+        "../../src/Engines/engine.ts"
     ],
     "../../src/Meshes/geometry.ts": [
         "../../src/Meshes/mesh.ts"
@@ -130,29 +64,10 @@
     ],
     "../../src/Meshes/subMesh.ts": [
         "../../src/Culling/boundingInfo.ts",
-        "../../src/Materials/material.ts",
-        "../../src/Misc/tools.ts"
-    ],
-    "../../src/Meshes/transformNode.ts": [
-        "../../src/Misc/decorators.ts",
-        "../../src/Misc/tags.ts",
-        "../../src/node.ts"
-    ],
-    "../../src/Misc/decorators.ts": [
-        "../../src/Misc/tags.ts"
+        "../../src/Materials/material.ts"
     ],
     "../../src/Misc/filesInput.ts": [
-        "../../src/Loading/sceneLoader.ts",
-        "../../src/Misc/tools.ts"
-    ],
-    "../../src/Misc/promise.ts": [
-        "../../src/Misc/tools.ts"
-    ],
-    "../../src/Misc/tags.ts": [
-        "../../src/Misc/tools.ts"
-    ],
-    "../../src/Misc/tools.ts": [
-        "../../src/Misc/filesInput.ts"
+        "../../src/Loading/sceneLoader.ts"
     ],
     "../../src/Particles/particleHelper.ts": [
         "../../src/Particles/particleSystemSet.ts"
@@ -172,25 +87,6 @@
     "../../src/Physics/physicsEngine.ts": [
         "../../src/Physics/Plugins/cannonJSPlugin.ts"
     ],
-    "../../src/PostProcesses/anaglyphPostProcess.ts": [
-        "../../src/PostProcesses/postProcess.ts"
-    ],
-    "../../src/PostProcesses/passPostProcess.ts": [
-        "../../src/PostProcesses/postProcess.ts"
-    ],
-    "../../src/PostProcesses/postProcess.ts": [
-        "../../src/Misc/tools.ts"
-    ],
-    "../../src/PostProcesses/postProcessManager.ts": [
-        "../../src/Materials/material.ts"
-    ],
-    "../../src/PostProcesses/stereoscopicInterlacePostProcess.ts": [
-        "../../src/PostProcesses/postProcess.ts"
-    ],
-    "../../src/PostProcesses/vrDistortionCorrectionPostProcess.ts": [
-        "../../src/Materials/Textures/texture.ts",
-        "../../src/PostProcesses/postProcess.ts"
-    ],
     "../../src/Rendering/depthRenderer.ts": [
         "../../src/Rendering/depthRendererSceneComponent.ts"
     ],
@@ -203,21 +99,8 @@
     "../../src/Rendering/geometryBufferRendererSceneComponent.ts": [
         "../../src/Rendering/geometryBufferRenderer.ts"
     ],
-    "../../src/node.ts": [
-        "../../src/Misc/decorators.ts"
-    ],
     "../../src/scene.ts": [
-        "../../src/Animations/animatable.ts",
-        "../../src/Animations/animation.ts",
-        "../../src/Cameras/camera.ts",
-        "../../src/Collisions/collisionCoordinator.ts",
-        "../../src/Lights/light.ts",
-        "../../src/Materials/imageProcessingConfiguration.ts",
-        "../../src/Materials/standardMaterial.ts",
-        "../../src/Meshes/abstractMesh.ts",
-        "../../src/Misc/tags.ts",
-        "../../src/Misc/tools.ts",
-        "../../src/PostProcesses/postProcessManager.ts"
-    ],
-    "errorCount": 108
+        "../../src/Materials/standardMaterial.ts"
+    ],
+    "errorCount": 37
 }

src/Misc/filesInput.ts

@@ -1,8 +1,8 @@
 import { Engine } from "../Engines/engine";
 import { Scene } from "../scene";
 import { SceneLoaderProgressEvent, SceneLoader } from "../Loading/sceneLoader";
-import { Tools } from "./tools";
 import { Logger } from "../Misc/logger";
+import { FilesInputStore } from "./filesInputStore";
 
     /**
      * Class used to help managing file picking and drag'n'drop
@@ -11,7 +11,9 @@ import { Logger } from "../Misc/logger";
         /**
          * List of files ready to be loaded
          */
-        public static FilesToLoad: { [key: string]: File } = {};
+        public static get FilesToLoad() {
+            return FilesInputStore.FilesToLoad;
+        }
 
         /**
          * Callback called when a file is processed
@@ -258,7 +260,7 @@ import { Logger } from "../Misc/logger";
             if (this._sceneFileToLoad) {
                 if (this._currentScene) {
                     if (Logger.errorsCount > 0) {
-                        Tools.ClearLogCache();
+                        Logger.ClearLogCache();
                     }
                     this._engine.stopRenderLoop();
                 }

src/Misc/filesInputStore.ts

@@ -0,0 +1,10 @@
+/**
+ * Class used to help managing file picking and drag'n'drop
+ * File Storage
+ */
+export class FilesInputStore {
+    /**
+     * List of files ready to be loaded
+     */
+    public static FilesToLoad: { [key: string]: File } = { };
+}

src/Misc/tools.ts

@@ -3,7 +3,7 @@ import { Color4, Color3, Vector2, Vector3 } from "../Maths/math";
 import { Scalar } from "../Maths/math.scalar";
 import { IOfflineProvider } from "../Offline/IOfflineProvider";
 import { Observable } from "./observable";
-import { FilesInput } from "./filesInput";
+import { FilesInputStore } from "./filesInputStore";
 import { Constants } from "../Engines/constants";
 import { DomManagement } from "./domManagement";
 import { Logger } from "./logger";
@@ -805,15 +805,15 @@ declare type Animation = import("../Animations/animation").Animation;
             else {
                 if (url.indexOf("file:") !== -1) {
                     var textureName = decodeURIComponent(url.substring(5).toLowerCase());
-                    if (FilesInput.FilesToLoad[textureName]) {
+                    if (FilesInputStore.FilesToLoad[textureName]) {
                         try {
                             var blobURL;
                             try {
-                                blobURL = URL.createObjectURL(FilesInput.FilesToLoad[textureName]);
+                                blobURL = URL.createObjectURL(FilesInputStore.FilesToLoad[textureName]);
                             }
                             catch (ex) {
                                 // Chrome doesn't support oneTimeOnly parameter
-                                blobURL = URL.createObjectURL(FilesInput.FilesToLoad[textureName]);
+                                blobURL = URL.createObjectURL(FilesInputStore.FilesToLoad[textureName]);
                             }
                             img.src = blobURL;
                             usingObjectURL = true;
@@ -849,8 +849,8 @@ declare type Animation = import("../Animations/animation").Animation;
             // If file and file input are set
             if (url.indexOf("file:") !== -1) {
                 const fileName = decodeURIComponent(url.substring(5).toLowerCase());
-                if (FilesInput.FilesToLoad[fileName]) {
-                    return Tools.ReadFile(FilesInput.FilesToLoad[fileName], onSuccess, onProgress, useArrayBuffer);
+                if (FilesInputStore.FilesToLoad[fileName]) {
+                    return Tools.ReadFile(FilesInputStore.FilesToLoad[fileName], onSuccess, onProgress, useArrayBuffer);
                 }
             }