Bladeren bron

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

# Conflicts:
#	Playground/babylon.d.txt
#	dist/preview release/babylon.d.ts
#	dist/preview release/babylon.js
#	dist/preview release/babylon.worker.js
#	dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts
#	dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js
#	dist/preview release/viewer/babylon.viewer.js
David Catuhe 7 jaren geleden
bovenliggende
commit
f381357825
31 gewijzigde bestanden met toevoegingen van 23137 en 23128 verwijderingen
  1. 7931 7931
      Playground/babylon.d.txt
  2. BIN
      Playground/textures/normal.png
  3. 1 3
      Tools/Gulp/package.json
  4. 5101 5101
      dist/preview release/babylon.d.ts
  5. 40 40
      dist/preview release/babylon.js
  6. 3 1
      dist/preview release/babylon.max.js
  7. 41 41
      dist/preview release/babylon.worker.js
  8. 9879 9879
      dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts
  9. 43 43
      dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js
  10. 3 1
      dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js
  11. 3 3
      dist/preview release/gui/babylon.gui.min.js
  12. 4 4
      dist/preview release/inspector/babylon.inspector.bundle.js
  13. 3 3
      dist/preview release/inspector/babylon.inspector.min.js
  14. 2 2
      dist/preview release/loaders/babylon.glTF1FileLoader.min.js
  15. 2 2
      dist/preview release/loaders/babylon.glTF2FileLoader.min.js
  16. 3 3
      dist/preview release/loaders/babylon.glTFFileLoader.min.js
  17. 1 1
      dist/preview release/loaders/babylon.objFileLoader.min.js
  18. 3 3
      dist/preview release/loaders/babylonjs.loaders.min.js
  19. 1 1
      dist/preview release/materialsLibrary/babylon.customMaterial.min.js
  20. 1 1
      dist/preview release/materialsLibrary/babylon.shadowOnlyMaterial.min.js
  21. 1 1
      dist/preview release/materialsLibrary/babylon.waterMaterial.min.js
  22. 3 3
      dist/preview release/materialsLibrary/babylonjs.materials.min.js
  23. 1 1
      dist/preview release/postProcessesLibrary/babylon.asciiArtPostProcess.min.js
  24. 1 1
      dist/preview release/postProcessesLibrary/babylon.digitalRainPostProcess.min.js
  25. 1 1
      dist/preview release/postProcessesLibrary/babylonjs.postProcess.min.js
  26. 1 1
      dist/preview release/serializers/babylon.glTF2Serializer.min.js
  27. 1 1
      dist/preview release/serializers/babylonjs.serializers.min.js
  28. 52 52
      dist/preview release/viewer/babylon.viewer.js
  29. 4 1
      src/Mesh/babylon.transformNode.ts
  30. 6 1
      src/Tools/babylon.sceneSerializer.ts
  31. 1 2
      tests/validation/config.json

File diff suppressed because it is too large
+ 7931 - 7931
Playground/babylon.d.txt


BIN
Playground/textures/normal.png


+ 1 - 3
Tools/Gulp/package.json

@@ -44,16 +44,14 @@
         "ts-loader": "^2.3.7",
         "typescript": "^2.6.2",
         "webpack-stream": "^4.0.0",
-
         "karma": "^2.0.0",
         "karma-chrome-launcher": "^2.2.0",
         "karma-sauce-launcher": "^1.2.0",
-
         "mocha": "^4.0.1",
         "chai": "^4.1.2",
         "sinon": "^4.1.3",
         "karma-mocha": "^1.3.0",
-        "karma-chai":"^0.1.0",
+        "karma-chai": "^0.1.0",
         "karma-sinon": "^1.0.5"
     },
     "scripts": {

File diff suppressed because it is too large
+ 5101 - 5101
dist/preview release/babylon.d.ts


File diff suppressed because it is too large
+ 40 - 40
dist/preview release/babylon.js


+ 3 - 1
dist/preview release/babylon.max.js

@@ -13585,7 +13585,7 @@ var BABYLON;
          */
         TransformNode.prototype._getWorldMatrixDeterminant = function () {
             if (this._currentRenderId !== this.getScene().getRenderId()) {
-                this._worldMatrixDeterminant = this.computeWorldMatrix().determinant();
+                this.computeWorldMatrix();
             }
             return this._worldMatrixDeterminant;
         };
@@ -14233,6 +14233,8 @@ var BABYLON;
             if (!this._poseMatrix) {
                 this._poseMatrix = BABYLON.Matrix.Invert(this._worldMatrix);
             }
+            // Cache the determinant
+            this._worldMatrixDeterminant = this._worldMatrix.determinant();
             return this._worldMatrix;
         };
         TransformNode.prototype._afterComputeWorldMatrix = function () {

File diff suppressed because it is too large
+ 41 - 41
dist/preview release/babylon.worker.js


File diff suppressed because it is too large
+ 9879 - 9879
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts


File diff suppressed because it is too large
+ 43 - 43
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js


+ 3 - 1
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js

@@ -13585,7 +13585,7 @@ var BABYLON;
          */
         TransformNode.prototype._getWorldMatrixDeterminant = function () {
             if (this._currentRenderId !== this.getScene().getRenderId()) {
-                this._worldMatrixDeterminant = this.computeWorldMatrix().determinant();
+                this.computeWorldMatrix();
             }
             return this._worldMatrixDeterminant;
         };
@@ -14233,6 +14233,8 @@ var BABYLON;
             if (!this._poseMatrix) {
                 this._poseMatrix = BABYLON.Matrix.Invert(this._worldMatrix);
             }
+            // Cache the determinant
+            this._worldMatrixDeterminant = this._worldMatrix.determinant();
             return this._worldMatrix;
         };
         TransformNode.prototype._afterComputeWorldMatrix = function () {

File diff suppressed because it is too large
+ 3 - 3
dist/preview release/gui/babylon.gui.min.js


File diff suppressed because it is too large
+ 4 - 4
dist/preview release/inspector/babylon.inspector.bundle.js


File diff suppressed because it is too large
+ 3 - 3
dist/preview release/inspector/babylon.inspector.min.js


File diff suppressed because it is too large
+ 2 - 2
dist/preview release/loaders/babylon.glTF1FileLoader.min.js


File diff suppressed because it is too large
+ 2 - 2
dist/preview release/loaders/babylon.glTF2FileLoader.min.js


File diff suppressed because it is too large
+ 3 - 3
dist/preview release/loaders/babylon.glTFFileLoader.min.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/loaders/babylon.objFileLoader.min.js


File diff suppressed because it is too large
+ 3 - 3
dist/preview release/loaders/babylonjs.loaders.min.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/materialsLibrary/babylon.customMaterial.min.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/materialsLibrary/babylon.shadowOnlyMaterial.min.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/materialsLibrary/babylon.waterMaterial.min.js


File diff suppressed because it is too large
+ 3 - 3
dist/preview release/materialsLibrary/babylonjs.materials.min.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/postProcessesLibrary/babylon.asciiArtPostProcess.min.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/postProcessesLibrary/babylon.digitalRainPostProcess.min.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/postProcessesLibrary/babylonjs.postProcess.min.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/serializers/babylon.glTF2Serializer.min.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/serializers/babylonjs.serializers.min.js


File diff suppressed because it is too large
+ 52 - 52
dist/preview release/viewer/babylon.viewer.js


+ 4 - 1
src/Mesh/babylon.transformNode.ts

@@ -119,7 +119,7 @@ module BABYLON {
          */
         protected _getWorldMatrixDeterminant(): number {
             if (this._currentRenderId !== this.getScene().getRenderId()) {
-                this._worldMatrixDeterminant = this.computeWorldMatrix().determinant();
+                this.computeWorldMatrix();
             }
             return this._worldMatrixDeterminant;
         }
@@ -835,6 +835,9 @@ module BABYLON {
                 this._poseMatrix = Matrix.Invert(this._worldMatrix);
             }
 
+            // Cache the determinant
+            this._worldMatrixDeterminant = this._worldMatrix.determinant();
+
             return this._worldMatrix;
         }
 

+ 6 - 1
src/Tools/babylon.sceneSerializer.ts

@@ -209,6 +209,11 @@
                 serializationObject.multiMaterials.push(multiMaterial.serialize());
             }
 
+            // Environment texture
+            if (scene.environmentTexture) {
+                serializationObject.environmentTexture = scene.environmentTexture.name;
+            }
+
             // Skeletons
             serializationObject.skeletons = [];
             for (index = 0; index < scene.skeletons.length; index++) {
@@ -219,7 +224,7 @@
             serializationObject.transformNodes = [];
             for (index = 0; index < scene.transformNodes.length; index++) {
                 serializationObject.transformNodes.push(scene.transformNodes[index].serialize());
-            }            
+            }
 
             // Geometries
             serializationObject.geometries = {};

+ 1 - 2
tests/validation/config.json

@@ -176,8 +176,7 @@
     },
     {
       "title": "Normals",
-      "scriptToRun": "/Demos/Normals/index.js",
-      "functionToCall": "createScene",
+      "playgroundId": "#WXKLLJ#2",
       "referenceImage": "normals.png"
     },
     {