Merge branch 'master' of https://github.com/BabylonJS/Babylon.js into…

… msDestiny14/scene
satyapoojasama · May 3, 2021 · 0a008c4 · 0a008c4
2 parents ac66316 + 6794e68
commit 0a008c4
Show file tree

Hide file tree

Showing 74 changed files with 14,773 additions and 9,009 deletions.
diff --git a/.gitignore b/.gitignore
@@ -206,10 +206,10 @@ gui/dist/
 .netlify
 Playground/dist/
 Playground/temp/
-Sandbox/public/dist/
+sandbox/public/dist/
 ktx2Decoder/dist/
 
-# Symlinks
-inspector/src/sharedUiComponents/**/*
-nodeEditor/src/sharedUiComponents/**/*
-guiEditor/src/sharedUiComponents/**/*
+# Symlinks created during build
+inspector/src/sharedUiComponents
+nodeEditor/src/sharedUiComponents
+guiEditor/src/sharedUiComponents
diff --git a/Playground/libs/babylon.manager.d.ts b/Playground/libs/babylon.manager.d.ts
@@ -35,7 +35,7 @@ declare module BABYLON {
         /** Loads a babylon scene file using the page loader window hooks (engine.html) */
         static LoadSceneFile(sceneFile: string, queryString?: string): void;
         /** Shows the top page scene loader (engine.html) */
-        static ShowParentLoader(show: boolean): void;
+        static ShowParentLoader(show: boolean, duration?: number): void;
         /** Get the system render quality setting. */
         static GetRenderQuality(): BABYLON.RenderQuality;
         /** Set the system render quality setting. */
@@ -804,7 +804,6 @@ declare module BABYLON {
         protected materialShaderChunks: BABYLON.UniversalAlbedoChunks;
         protected updateShaderChunks(): void;
         constructor(name: string, scene: Scene);
-        getClassName(): string;
         getShaderName(): string;
         getShaderChunk(): string;
         getShaderDefines(): BABYLON.PBRMaterialDefines;
@@ -828,6 +827,7 @@ declare module BABYLON {
         protected customShaderChunkResolve(): void;
         private _buildCustomShader;
         private _createShaderChunks;
+        private dumpEffect;
         private _attachAfterBind;
     }
     /**
@@ -836,7 +836,6 @@ declare module BABYLON {
      */
     class UniversalTerrainMaterial extends BABYLON.UniversalAlbedoMaterial {
         constructor(name: string, scene: BABYLON.Scene);
-        getClassName(): string;
         getShaderName(): string;
         getShaderChunk(): string;
         protected updateShaderChunks(): void;
@@ -1604,6 +1603,8 @@ declare module BABYLON {
         /** TODO */
         static ValidateTransformGuid(node: TransformNode): void;
         /** TODO */
+        static AddShadowCastersToLight(light: BABYLON.IShadowLight, transforms: BABYLON.TransformNode[], includeChildren?: boolean): void;
+        /** TODO */
         static RegisterInstancedMeshBuffers(mesh: BABYLON.Mesh): void;
         /** TODO */
         static CloneValue(source: any, destinationObject: any): any;

diff --git a/Playground/libs/babylon.manager.js b/Playground/libs/babylon.manager.js
diff --git a/Tools/Gulp/package.json b/Tools/Gulp/package.json
@@ -16,5 +16,9 @@
     },
     "dependencies": {
         "node-sass": "^4.14.1"
+    },
+    "devDependencies": {
+        "gulp": "4.0.0",
+        "typescript": "~4.2.4"
     }
 }