Merge pull request #7357 from BabylonJS/master

4.1.0-beta.16

dist/preview release/babylon.max.js

@@ -39614,7 +39614,7 @@ var ThinEngine = /** @class */ (function () {
          */
         // Not mixed with Version for tooling purpose.
         get: function () {
-            return "babylonjs@4.1.0-beta.15";
+            return "babylonjs@4.1.0-beta.16";
         },
         enumerable: true,
         configurable: true
@@ -39624,7 +39624,7 @@ var ThinEngine = /** @class */ (function () {
          * Returns the current version of the framework
          */
         get: function () {
-            return "4.1.0-beta.15";
+            return "4.1.0-beta.16";
         },
         enumerable: true,
         configurable: true
@@ -71208,7 +71208,7 @@ var SimplexPerlin3DBlock = /** @class */ (function (_super) {
         functionString += "    kernel_weights = kernel_weights*kernel_weights*kernel_weights;\r\n";
         functionString += "    return dot( kernel_weights, grad_results ) * FINAL_NORMALIZATION;\r\n";
         functionString += "}\r\n";
-        state._emitFunction('SimplexPerlin3D', functionString, 'SimplexPerlin3D');
+        state._emitFunction('SimplexPerlin3D', functionString, '// SimplexPerlin3D');
         state.compilationString += this._declareOutput(this._outputs[0], state) + (" = SimplexPerlin3D(" + this.seed.associatedVariableName + ");\r\n");
         return this;
     };
@@ -72711,7 +72711,7 @@ var WorleyNoise3DBlock = /** @class */ (function (_super) {
         functionString += "    d11.y = min(d11.y,d11.z); // Done! (Phew!)\r\n";
         functionString += "    return sqrt(d11.xy); // F1, F2\r\n";
         functionString += "}\r\n\r\n";
-        state._emitFunction('worley3D', functionString, 'worley3D');
+        state._emitFunction('worley3D', functionString, '// Worley3D');
         state.compilationString += this._declareOutput(this._outputs[0], state) + (" = worley(" + this.seed.associatedVariableName + ", " + this.jitter.associatedVariableName + ", " + this.manhattanDistance + ");\r\n");
         return this;
     };

dist/preview release/glTF2Interface/package.json

@@ -1,7 +1,7 @@
 {
     "name": "babylonjs-gltf2interface",
     "description": "A typescript declaration of babylon's gltf2 inteface.",
-    "version": "4.1.0-beta.15",
+    "version": "4.1.0-beta.16",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

dist/preview release/gui/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-gui",
     "description": "The Babylon.js GUI library is an extension you can use to generate interactive user interface. It is build on top of the DynamicTexture.",
-    "version": "4.1.0-beta.15",
+    "version": "4.1.0-beta.16",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -28,7 +28,7 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs": "4.1.0-beta.15"
+        "babylonjs": "4.1.0-beta.16"
     },
     "engines": {
         "node": "*"

dist/preview release/inspector/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-inspector",
     "description": "The Babylon.js inspector.",
-    "version": "4.1.0-beta.15",
+    "version": "4.1.0-beta.16",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -29,12 +29,12 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs": "4.1.0-beta.15",
-        "babylonjs-gui": "4.1.0-beta.15",
-        "babylonjs-loaders": "4.1.0-beta.15",
-        "babylonjs-materials": "4.1.0-beta.15",
-        "babylonjs-serializers": "4.1.0-beta.15",
-        "babylonjs-gltf2interface": "4.1.0-beta.15"
+        "babylonjs": "4.1.0-beta.16",
+        "babylonjs-gui": "4.1.0-beta.16",
+        "babylonjs-loaders": "4.1.0-beta.16",
+        "babylonjs-materials": "4.1.0-beta.16",
+        "babylonjs-serializers": "4.1.0-beta.16",
+        "babylonjs-gltf2interface": "4.1.0-beta.16"
     },
     "devDependencies": {
         "@types/react": "~16.7.3",

dist/preview release/loaders/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-loaders",
     "description": "The Babylon.js file loaders library is an extension you can use to load different 3D file types into a Babylon scene.",
-    "version": "4.1.0-beta.15",
+    "version": "4.1.0-beta.16",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -28,8 +28,8 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs-gltf2interface": "4.1.0-beta.15",
-        "babylonjs": "4.1.0-beta.15"
+        "babylonjs-gltf2interface": "4.1.0-beta.16",
+        "babylonjs": "4.1.0-beta.16"
     },
     "engines": {
         "node": "*"

dist/preview release/materialsLibrary/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-materials",
     "description": "The Babylon.js materials library is a collection of advanced materials to be used in a Babylon.js scene.",
-    "version": "4.1.0-beta.15",
+    "version": "4.1.0-beta.16",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -28,7 +28,7 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs": "4.1.0-beta.15"
+        "babylonjs": "4.1.0-beta.16"
     },
     "engines": {
         "node": "*"

dist/preview release/nodeEditor/package.json

@@ -4,14 +4,14 @@
     },
     "name": "babylonjs-node-editor",
     "description": "The Babylon.js node material editor.",
-    "version": "4.1.0-beta.15",
+    "version": "4.1.0-beta.16",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
     },
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs": "4.1.0-beta.15"
+        "babylonjs": "4.1.0-beta.16"
     },
     "files": [
         "babylon.nodeEditor.max.js.map",

dist/preview release/package.json

@@ -7,7 +7,7 @@
     ],
     "name": "babylonjs",
     "description": "Babylon.js is a JavaScript 3D engine based on webgl.",
-    "version": "4.1.0-beta.15",
+    "version": "4.1.0-beta.16",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

dist/preview release/postProcessesLibrary/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-post-process",
     "description": "The Babylon.js materials library is a collection of advanced materials to be used in a Babylon.js scene.",
-    "version": "4.1.0-beta.15",
+    "version": "4.1.0-beta.16",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -28,7 +28,7 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs": "4.1.0-beta.15"
+        "babylonjs": "4.1.0-beta.16"
     },
     "engines": {
         "node": "*"

dist/preview release/proceduralTexturesLibrary/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-procedural-textures",
     "description": "The Babylon.js materials library is a collection of advanced materials to be used in a Babylon.js scene.",
-    "version": "4.1.0-beta.15",
+    "version": "4.1.0-beta.16",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -28,7 +28,7 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs": "4.1.0-beta.15"
+        "babylonjs": "4.1.0-beta.16"
     },
     "engines": {
         "node": "*"

dist/preview release/serializers/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-serializers",
     "description": "The Babylon.js serializers library is an extension you can use to serialize Babylon scenes.",
-    "version": "4.1.0-beta.15",
+    "version": "4.1.0-beta.16",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -28,8 +28,8 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs": "4.1.0-beta.15",
-        "babylonjs-gltf2interface": "4.1.0-beta.15"
+        "babylonjs": "4.1.0-beta.16",
+        "babylonjs-gltf2interface": "4.1.0-beta.16"
     },
     "engines": {
         "node": "*"

package.json

@@ -7,7 +7,7 @@
     ],
     "name": "babylonjs",
     "description": "Babylon.js is a JavaScript 3D engine based on webgl.",
-    "version": "4.1.0-beta.15",
+    "version": "4.1.0-beta.16",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -106,4 +106,4 @@
         "xhr2": "^0.1.4",
         "xmlbuilder": "8.2.2"
     }
-}
+}

src/Engines/thinEngine.ts

@@ -132,14 +132,14 @@ export class ThinEngine {
      */
     // Not mixed with Version for tooling purpose.
     public static get NpmPackage(): string {
-        return "babylonjs@4.1.0-beta.15";
+        return "babylonjs@4.1.0-beta.16";
     }
 
     /**
      * Returns the current version of the framework
      */
     public static get Version(): string {
-        return "4.1.0-beta.15";
+        return "4.1.0-beta.16";
     }
 
     /**

src/Materials/Node/Blocks/simplexPerlin3DBlock.ts

@@ -121,7 +121,7 @@ export class SimplexPerlin3DBlock extends NodeMaterialBlock {
         functionString += `    return dot( kernel_weights, grad_results ) * FINAL_NORMALIZATION;\r\n`;
         functionString += `}\r\n`;
 
-        state._emitFunction('SimplexPerlin3D', functionString, 'SimplexPerlin3D');
+        state._emitFunction('SimplexPerlin3D', functionString, '// SimplexPerlin3D');
         state.compilationString += this._declareOutput(this._outputs[0], state) + ` = SimplexPerlin3D(${this.seed.associatedVariableName});\r\n`;
 
         return this;

src/Materials/Node/Blocks/worleyNoise3DBlock.ts

@@ -224,7 +224,7 @@ export class WorleyNoise3DBlock extends NodeMaterialBlock {
         functionString += `    return sqrt(d11.xy); // F1, F2\r\n`;
         functionString += `}\r\n\r\n`;
 
-        state._emitFunction('worley3D', functionString, 'worley3D');
+        state._emitFunction('worley3D', functionString, '// Worley3D');
         state.compilationString += this._declareOutput(this._outputs[0], state) + ` = worley(${this.seed.associatedVariableName}, ${this.jitter.associatedVariableName}, ${this.manhattanDistance});\r\n`;
 
         return this;