v4.0.0

Former-commit-id: 6904ea076c4ea35e0575824244977a527ed34a4a
BabylonJS · Apr 30, 2019 · b0588e5 · b0588e5
1 parent e93809f
commit b0588e5
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 20 deletions.
diff --git a/Playground/babylon.d.txt b/Playground/babylon.d.txt
@@ -16603,7 +16603,7 @@ declare module BABYLON {
          */
         refreshBoundingInfo(applySkeleton?: boolean): InstancedMesh;
         /** @hidden */private _preActivate(): InstancedMesh;
-        /** @hidden */private _activate(renderId: number): boolean;
+        /** @hidden */private _activate(renderId: number, intermediateRendering: boolean): boolean;
         /** @hidden */private _postActivate(): void;
         getWorldMatrix(): Matrix;
         readonly isAnInstance: boolean;
@@ -23809,6 +23809,44 @@ declare module BABYLON {
     }
 }
 declare module BABYLON {
+    /** @hidden */private class _FacetDataStorage {
+        facetPositions: Vector3[];
+        facetNormals: Vector3[];
+        facetPartitioning: number[][];
+        facetNb: number;
+        partitioningSubdivisions: number;
+        partitioningBBoxRatio: number;
+        facetDataEnabled: boolean;
+        facetParameters: any;
+        bbSize: Vector3;
+        subDiv: {
+            max: number;
+            X: number;
+            Y: number;
+            Z: number;
+        };
+        facetDepthSort: boolean;
+        facetDepthSortEnabled: boolean;
+        depthSortedIndices: IndicesArray;
+        depthSortedFacets: {
+            ind: number;
+            sqDistance: number;
+        }[];
+        facetDepthSortFunction: (f1: {
+            ind: number;
+            sqDistance: number;
+        }, f2: {
+            ind: number;
+            sqDistance: number;
+        }) => number;
+        facetDepthSortFrom: Vector3;
+        facetDepthSortOrigin: Vector3;
+        invertedMatrix: Matrix;
+    }
+    /**
+     * @hidden
+     **/private class _InternalAbstractMeshDataInfo {private _hasVertexAlpha: boolean;private _useVertexColors: boolean;private _numBoneInfluencers: number;private _applyFog: boolean;private _receiveShadows: boolean;private _facetData: _FacetDataStorage;private _visibility: number;private _skeleton: Nullable<Skeleton>;private _layerMask: number;private _computeBonesUsingShaders: boolean;private _isActive: boolean;private _onlyForInstances: boolean;private _isActiveIntermediate: boolean;private _onlyForInstancesIntermediate: boolean;
+    }
     /**
      * Class used to store all common mesh properties
      */
@@ -23869,7 +23907,7 @@ declare module BABYLON {
         static readonly BILLBOARDMODE_Z: number;
         /** Billboard on all axes */
         static readonly BILLBOARDMODE_ALL: number;
-        private _internalAbstractMeshDataInfo;
+        /** @hidden */private _internalAbstractMeshDataInfo: _InternalAbstractMeshDataInfo;
         /**
          * The culling strategy to use to check whether the mesh must be rendered or not.
          * This value can be changed at any time and will be used on the next render mesh selection.
@@ -23938,8 +23976,6 @@ declare module BABYLON {
          */
         definedFacingForward: boolean;
         /** @hidden */private _occlusionQuery: Nullable<WebGLQuery>;
-        /** @hidden */private _isActive: boolean;
-        /** @hidden */private _onlyForInstances: boolean;
         /** @hidden */private _renderingGroup: Nullable<RenderingGroup>;
         /**
          * Gets or sets mesh visibility between 0 and 1 (default is 1)
@@ -24236,7 +24272,7 @@ declare module BABYLON {
         readonly useBones: boolean;
         /** @hidden */private _preActivate(): void;
         /** @hidden */private _preActivateForIntermediateRendering(renderId: number): void;
-        /** @hidden */private _activate(renderId: number): boolean;
+        /** @hidden */private _activate(renderId: number, intermediateRendering: boolean): boolean;
         /** @hidden */private _postActivate(): void;
         /** @hidden */private _freeze(): void;
         /** @hidden */private _unFreeze(): void;
@@ -26343,6 +26379,10 @@ declare module BABYLON {
         private _loadingDivBackgroundColor;
         private _loadingDiv;
         private _loadingTextDiv;
+        /** Gets or sets the logo url to use for the default loading screen */
+        static DefaultLogoUrl: string;
+        /** Gets or sets the spinner url to use for the default loading screen */
+        static DefaultSpinnerUrl: string;
         /**
          * Creates a new default loading screen
          * @param _renderingCanvas defines the canvas used to render the scene

diff --git a/Tools/Gulp/package.json b/Tools/Gulp/package.json
@@ -1,6 +1,6 @@
 {
     "name": "babylonjs",
-    "version": "3.3.0",
+    "version": "0.0.0",
     "description": "Babylon.js is a 3D engine based on webgl and javascript",
     "main": "",
     "repository": {
@@ -13,4 +13,4 @@
         "build": "gulp --max-old-space-size=8192 --tsLintFix",
         "start": "gulp run --max-old-space-size=8192"
     }
-}
+}
diff --git a/Viewer/assets/package.json b/Viewer/assets/package.json
@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-viewer-assets",
     "description": "Compiled resources for the Babylon viewer.",
-    "version": "3.3.0-alpha.3",
+    "version": "0.0.0",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

diff --git a/package.json b/package.json
@@ -3,13 +3,11 @@
         "name": "David CATUHE"
     },
     "contributors": [
-        "David ROUSSET",
-        "Sebastien VANDENBERGHE",
-        "Raanan Weber"
+        "Sebastien VANDENBERGHE"
     ],
     "name": "babylonjs",
     "description": "Babylon.js is a JavaScript 3D engine based on webgl.",
-    "version": "4.0.0-rc.3",
+    "version": "4.0.0",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

diff --git a/src/Engines/engine.ts b/src/Engines/engine.ts
@@ -491,14 +491,14 @@ export class Engine {
      */
     // Not mixed with Version for tooling purpose.
     public static get NpmPackage(): string {
-        return "babylonjs@4.0.0-rc.3";
+        return "babylonjs@4.0.0";
     }
 
     /**
      * Returns the current version of the framework
      */
     public static get Version(): string {
-        return "4.0.0-rc.3";
+        return "4.0.0";
     }
 
     /**

diff --git a/tests/validation/config.json b/tests/validation/config.json
@@ -1,5 +1,5 @@
 {
-    "root": "https://rawgit.com/BabylonJS/Website/master",
+    "root": "https://rawgit.com/BabylonJS/Website/master/build",
     "tests": [
         {
             "title": "Unindexed mesh",

diff --git a/tests/validation/validation.js b/tests/validation/validation.js
@@ -148,7 +148,7 @@ function processCurrentScene(test, resultCanvas, result, renderImage, index, wai
             currentScene.activeCamera.useAutoRotationBehavior = false;
         }
         engine.runRenderLoop(function() {
-            try {                
+            try {
                 currentScene.render();
                 renderCount--;
 
@@ -324,10 +324,10 @@ function runTest(index, done) {
                     try {
                         request.onreadystatechange = null;
 
-                        var scriptToRun = request.responseText.replace(/..\/..\/assets\//g, config.root + "/Assets/");
-                        scriptToRun = scriptToRun.replace(/..\/..\/Assets\//g, config.root + "/Assets/");
-                        scriptToRun = scriptToRun.replace(/\/assets\//g, config.root + "/Assets/");
-                        scriptToRun = scriptToRun.replace(/\/Assets\//g, config.root + "/Assets/");
+                        var scriptToRun = request.responseText.replace(/..\/..\/assets\//g, config.root + "/assets/");
+                        scriptToRun = scriptToRun.replace(/..\/..\/Assets\//g, config.root + "/assets/");
+                        scriptToRun = scriptToRun.replace(/\/assets\//g, config.root + "/assets/");
+                        scriptToRun = scriptToRun.replace(/\/Assets\//g, config.root + "/assets/");
 
                         if (test.replace) {
                             var split = test.replace.split(",");