David Catuhe 7 lat temu
rodzic
commit
b82d6f3ec6

Plik diff jest za duży
+ 2557 - 2557
dist/preview release/babylon.d.ts


Plik diff jest za duży
+ 1 - 1
dist/preview release/babylon.js


+ 11 - 9
dist/preview release/babylon.max.js

@@ -11796,7 +11796,7 @@ var BABYLON;
              * Returns the current version of the framework
              */
             get: function () {
-                return "3.3.0-beta.3";
+                return "3.3.0-beta.4";
             },
             enumerable: true,
             configurable: true
@@ -93814,7 +93814,7 @@ var BABYLON;
                 _dragBehavior.onDragObservable.add(function (event) {
                     _this.onRotationSphereDragObservable.notifyObservers({});
                     if (_this.attachedMesh) {
-                        _this.removeAndStorePivotPoint();
+                        _this._removeAndStorePivotPoint();
                         var worldDragDirection = startingTurnDirection;
                         // Project the world right on to the drag plane
                         var toSub = event.dragPlaneNormal.scale(BABYLON.Vector3.Dot(event.dragPlaneNormal, worldDragDirection));
@@ -93848,7 +93848,7 @@ var BABYLON;
                             _this._anchorMesh.removeChild(_this.attachedMesh);
                         }
                         _this.updateBoundingBox();
-                        _this.restorePivotPoint();
+                        _this._restorePivotPoint();
                     }
                 });
                 // Selection/deselection
@@ -93883,7 +93883,7 @@ var BABYLON;
                         _dragBehavior.onDragObservable.add(function (event) {
                             _this.onScaleBoxDragObservable.notifyObservers({});
                             if (_this.attachedMesh) {
-                                _this.removeAndStorePivotPoint();
+                                _this._removeAndStorePivotPoint();
                                 var relativeDragDistance = (event.dragDistance / _this._boundingDimensions.length()) * _this._anchorMesh.scaling.length();
                                 var deltaScale = new BABYLON.Vector3(relativeDragDistance, relativeDragDistance, relativeDragDistance);
                                 deltaScale.scaleInPlace(_this._scaleDragSpeed);
@@ -93909,7 +93909,7 @@ var BABYLON;
                                     _this._anchorMesh.scaling.subtractInPlace(deltaScale);
                                 }
                                 _this._anchorMesh.removeChild(_this.attachedMesh);
-                                _this.restorePivotPoint();
+                                _this._restorePivotPoint();
                             }
                         });
                         // Selection/deselection
@@ -93958,7 +93958,7 @@ var BABYLON;
             _this.updateBoundingBox();
             return _this;
         }
-        BoundingBoxGizmo.prototype.removeAndStorePivotPoint = function () {
+        BoundingBoxGizmo.prototype._removeAndStorePivotPoint = function () {
             if (this.attachedMesh && this._pivotCached === 0) {
                 // Save old pivot and set pivot to 0,0,0
                 this.attachedMesh.getPivotPointToRef(this._oldPivotPoint);
@@ -93974,7 +93974,7 @@ var BABYLON;
             }
             this._pivotCached++;
         };
-        BoundingBoxGizmo.prototype.restorePivotPoint = function () {
+        BoundingBoxGizmo.prototype._restorePivotPoint = function () {
             if (this.attachedMesh && !this._oldPivotPoint.equalsToFloats(0, 0, 0) && this._pivotCached === 1) {
                 this.attachedMesh.setPivotPoint(this._oldPivotPoint);
                 this._tmpVector.copyFromFloats(1, 1, 1);
@@ -93988,8 +93988,10 @@ var BABYLON;
             if (value) {
                 // Reset anchor mesh to match attached mesh's scale
                 // This is needed to avoid invalid box/sphere position on first drag
+                this._removeAndStorePivotPoint();
                 this._anchorMesh.addChild(value);
                 this._anchorMesh.removeChild(value);
+                this._restorePivotPoint();
                 this.updateBoundingBox();
             }
         };
@@ -94013,7 +94015,7 @@ var BABYLON;
          */
         BoundingBoxGizmo.prototype.updateBoundingBox = function () {
             if (this.attachedMesh) {
-                this.removeAndStorePivotPoint();
+                this._removeAndStorePivotPoint();
                 this._update();
                 // Rotate based on axis
                 if (!this.attachedMesh.rotationQuaternion) {
@@ -94104,7 +94106,7 @@ var BABYLON;
             }
             if (this.attachedMesh) {
                 this._existingMeshScale.copyFrom(this.attachedMesh.scaling);
-                this.restorePivotPoint();
+                this._restorePivotPoint();
             }
         };
         /**

+ 11 - 9
dist/preview release/babylon.no-module.max.js

@@ -11763,7 +11763,7 @@ var BABYLON;
              * Returns the current version of the framework
              */
             get: function () {
-                return "3.3.0-beta.3";
+                return "3.3.0-beta.4";
             },
             enumerable: true,
             configurable: true
@@ -93781,7 +93781,7 @@ var BABYLON;
                 _dragBehavior.onDragObservable.add(function (event) {
                     _this.onRotationSphereDragObservable.notifyObservers({});
                     if (_this.attachedMesh) {
-                        _this.removeAndStorePivotPoint();
+                        _this._removeAndStorePivotPoint();
                         var worldDragDirection = startingTurnDirection;
                         // Project the world right on to the drag plane
                         var toSub = event.dragPlaneNormal.scale(BABYLON.Vector3.Dot(event.dragPlaneNormal, worldDragDirection));
@@ -93815,7 +93815,7 @@ var BABYLON;
                             _this._anchorMesh.removeChild(_this.attachedMesh);
                         }
                         _this.updateBoundingBox();
-                        _this.restorePivotPoint();
+                        _this._restorePivotPoint();
                     }
                 });
                 // Selection/deselection
@@ -93850,7 +93850,7 @@ var BABYLON;
                         _dragBehavior.onDragObservable.add(function (event) {
                             _this.onScaleBoxDragObservable.notifyObservers({});
                             if (_this.attachedMesh) {
-                                _this.removeAndStorePivotPoint();
+                                _this._removeAndStorePivotPoint();
                                 var relativeDragDistance = (event.dragDistance / _this._boundingDimensions.length()) * _this._anchorMesh.scaling.length();
                                 var deltaScale = new BABYLON.Vector3(relativeDragDistance, relativeDragDistance, relativeDragDistance);
                                 deltaScale.scaleInPlace(_this._scaleDragSpeed);
@@ -93876,7 +93876,7 @@ var BABYLON;
                                     _this._anchorMesh.scaling.subtractInPlace(deltaScale);
                                 }
                                 _this._anchorMesh.removeChild(_this.attachedMesh);
-                                _this.restorePivotPoint();
+                                _this._restorePivotPoint();
                             }
                         });
                         // Selection/deselection
@@ -93925,7 +93925,7 @@ var BABYLON;
             _this.updateBoundingBox();
             return _this;
         }
-        BoundingBoxGizmo.prototype.removeAndStorePivotPoint = function () {
+        BoundingBoxGizmo.prototype._removeAndStorePivotPoint = function () {
             if (this.attachedMesh && this._pivotCached === 0) {
                 // Save old pivot and set pivot to 0,0,0
                 this.attachedMesh.getPivotPointToRef(this._oldPivotPoint);
@@ -93941,7 +93941,7 @@ var BABYLON;
             }
             this._pivotCached++;
         };
-        BoundingBoxGizmo.prototype.restorePivotPoint = function () {
+        BoundingBoxGizmo.prototype._restorePivotPoint = function () {
             if (this.attachedMesh && !this._oldPivotPoint.equalsToFloats(0, 0, 0) && this._pivotCached === 1) {
                 this.attachedMesh.setPivotPoint(this._oldPivotPoint);
                 this._tmpVector.copyFromFloats(1, 1, 1);
@@ -93955,8 +93955,10 @@ var BABYLON;
             if (value) {
                 // Reset anchor mesh to match attached mesh's scale
                 // This is needed to avoid invalid box/sphere position on first drag
+                this._removeAndStorePivotPoint();
                 this._anchorMesh.addChild(value);
                 this._anchorMesh.removeChild(value);
+                this._restorePivotPoint();
                 this.updateBoundingBox();
             }
         };
@@ -93980,7 +93982,7 @@ var BABYLON;
          */
         BoundingBoxGizmo.prototype.updateBoundingBox = function () {
             if (this.attachedMesh) {
-                this.removeAndStorePivotPoint();
+                this._removeAndStorePivotPoint();
                 this._update();
                 // Rotate based on axis
                 if (!this.attachedMesh.rotationQuaternion) {
@@ -94071,7 +94073,7 @@ var BABYLON;
             }
             if (this.attachedMesh) {
                 this._existingMeshScale.copyFrom(this.attachedMesh.scaling);
-                this.restorePivotPoint();
+                this._restorePivotPoint();
             }
         };
         /**

Plik diff jest za duży
+ 1 - 1
dist/preview release/babylon.worker.js


+ 11 - 9
dist/preview release/es6.js

@@ -11763,7 +11763,7 @@ var BABYLON;
              * Returns the current version of the framework
              */
             get: function () {
-                return "3.3.0-beta.3";
+                return "3.3.0-beta.4";
             },
             enumerable: true,
             configurable: true
@@ -93781,7 +93781,7 @@ var BABYLON;
                 _dragBehavior.onDragObservable.add(function (event) {
                     _this.onRotationSphereDragObservable.notifyObservers({});
                     if (_this.attachedMesh) {
-                        _this.removeAndStorePivotPoint();
+                        _this._removeAndStorePivotPoint();
                         var worldDragDirection = startingTurnDirection;
                         // Project the world right on to the drag plane
                         var toSub = event.dragPlaneNormal.scale(BABYLON.Vector3.Dot(event.dragPlaneNormal, worldDragDirection));
@@ -93815,7 +93815,7 @@ var BABYLON;
                             _this._anchorMesh.removeChild(_this.attachedMesh);
                         }
                         _this.updateBoundingBox();
-                        _this.restorePivotPoint();
+                        _this._restorePivotPoint();
                     }
                 });
                 // Selection/deselection
@@ -93850,7 +93850,7 @@ var BABYLON;
                         _dragBehavior.onDragObservable.add(function (event) {
                             _this.onScaleBoxDragObservable.notifyObservers({});
                             if (_this.attachedMesh) {
-                                _this.removeAndStorePivotPoint();
+                                _this._removeAndStorePivotPoint();
                                 var relativeDragDistance = (event.dragDistance / _this._boundingDimensions.length()) * _this._anchorMesh.scaling.length();
                                 var deltaScale = new BABYLON.Vector3(relativeDragDistance, relativeDragDistance, relativeDragDistance);
                                 deltaScale.scaleInPlace(_this._scaleDragSpeed);
@@ -93876,7 +93876,7 @@ var BABYLON;
                                     _this._anchorMesh.scaling.subtractInPlace(deltaScale);
                                 }
                                 _this._anchorMesh.removeChild(_this.attachedMesh);
-                                _this.restorePivotPoint();
+                                _this._restorePivotPoint();
                             }
                         });
                         // Selection/deselection
@@ -93925,7 +93925,7 @@ var BABYLON;
             _this.updateBoundingBox();
             return _this;
         }
-        BoundingBoxGizmo.prototype.removeAndStorePivotPoint = function () {
+        BoundingBoxGizmo.prototype._removeAndStorePivotPoint = function () {
             if (this.attachedMesh && this._pivotCached === 0) {
                 // Save old pivot and set pivot to 0,0,0
                 this.attachedMesh.getPivotPointToRef(this._oldPivotPoint);
@@ -93941,7 +93941,7 @@ var BABYLON;
             }
             this._pivotCached++;
         };
-        BoundingBoxGizmo.prototype.restorePivotPoint = function () {
+        BoundingBoxGizmo.prototype._restorePivotPoint = function () {
             if (this.attachedMesh && !this._oldPivotPoint.equalsToFloats(0, 0, 0) && this._pivotCached === 1) {
                 this.attachedMesh.setPivotPoint(this._oldPivotPoint);
                 this._tmpVector.copyFromFloats(1, 1, 1);
@@ -93955,8 +93955,10 @@ var BABYLON;
             if (value) {
                 // Reset anchor mesh to match attached mesh's scale
                 // This is needed to avoid invalid box/sphere position on first drag
+                this._removeAndStorePivotPoint();
                 this._anchorMesh.addChild(value);
                 this._anchorMesh.removeChild(value);
+                this._restorePivotPoint();
                 this.updateBoundingBox();
             }
         };
@@ -93980,7 +93982,7 @@ var BABYLON;
          */
         BoundingBoxGizmo.prototype.updateBoundingBox = function () {
             if (this.attachedMesh) {
-                this.removeAndStorePivotPoint();
+                this._removeAndStorePivotPoint();
                 this._update();
                 // Rotate based on axis
                 if (!this.attachedMesh.rotationQuaternion) {
@@ -94071,7 +94073,7 @@ var BABYLON;
             }
             if (this.attachedMesh) {
                 this._existingMeshScale.copyFrom(this.attachedMesh.scaling);
-                this.restorePivotPoint();
+                this._restorePivotPoint();
             }
         };
         /**

+ 1 - 1
dist/preview release/glTF2Interface/package.json

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

+ 1 - 1
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": "3.3.0-beta.3",
+    "version": "3.3.0-beta.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 1 - 1
dist/preview release/inspector/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-inspector",
     "description": "The Babylon.js inspector.",
-    "version": "3.3.0-beta.3",
+    "version": "3.3.0-beta.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 2 - 2
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": "3.3.0-beta.3",
+    "version": "3.3.0-beta.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -27,7 +27,7 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs-gltf2interface": "3.3.0-beta.3"
+        "babylonjs-gltf2interface": "3.3.0-beta.4"
     },
     "peerDependencies": {
         "babylonjs": ">=3.2.0-alpha"

+ 1 - 1
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": "3.3.0-beta.3",
+    "version": "3.3.0-beta.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

Plik diff jest za duży
+ 2 - 2
dist/preview release/postProcessesLibrary/babylon.asciiArtPostProcess.js


Plik diff jest za duży
+ 1 - 1
dist/preview release/postProcessesLibrary/babylon.asciiArtPostProcess.min.js


Plik diff jest za duży
+ 2 - 2
dist/preview release/postProcessesLibrary/babylonjs.postProcess.js


Plik diff jest za duży
+ 1 - 1
dist/preview release/postProcessesLibrary/babylonjs.postProcess.min.js


+ 1 - 1
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": "3.3.0-beta.3",
+    "version": "3.3.0-beta.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 1 - 1
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": "3.3.0-beta.3",
+    "version": "3.3.0-beta.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 2 - 2
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": "3.3.0-beta.3",
+    "version": "3.3.0-beta.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -27,7 +27,7 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs-gltf2interface": "3.3.0-beta.3"
+        "babylonjs-gltf2interface": "3.3.0-beta.4"
     },
     "peerDependencies": {
         "babylonjs": ">=3.2.0-alpha"

Plik diff jest za duży
+ 1 - 1
dist/preview release/viewer/babylon.viewer.js


Plik diff jest za duży
+ 1 - 1
dist/preview release/viewer/babylon.viewer.max.js


+ 2 - 2
package.json

@@ -9,7 +9,7 @@
     ],
     "name": "babylonjs",
     "description": "Babylon.js is a JavaScript 3D engine based on webgl.",
-    "version": "3.3.0-beta.3",
+    "version": "3.3.0-beta.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -43,4 +43,4 @@
         "base64-font-loader": "0.0.4",
         "typescript": "^3.0.1"
     }
-}
+}

+ 1 - 1
src/Engine/babylon.engine.ts

@@ -475,7 +475,7 @@
          * Returns the current version of the framework
          */
         public static get Version(): string {
-            return "3.3.0-beta.3";
+            return "3.3.0-beta.4";
         }
 
         // Updatable statics so stick with vars here