Merge pull request #5262 from TrevorDev/subEmitterDisposeEmitter

Sub emitter dispose emitter

src/Gizmos/babylon.planeRotationGizmo.ts

@@ -1,195 +1,195 @@
-module BABYLON {
-    /**
-     * Single plane rotation gizmo
-     */
-    export class PlaneRotationGizmo extends Gizmo {
-        /**
-         * Drag behavior responsible for the gizmos dragging interactions
-         */
-        public dragBehavior:PointerDragBehavior;
-        private _pointerObserver:Nullable<Observer<PointerInfo>> = null;
-        
-        /**
-         * Rotation distance in radians that the gizmo will snap to (Default: 0)
-         */
-        public snapDistance = 0;
-        /**
-         * Event that fires each time the gizmo snaps to a new location.
-         * * snapDistance is the the change in distance
-         */
-        public onSnapObservable = new Observable<{snapDistance:number}>();
-
-        /**
-         * Creates a PlaneRotationGizmo
-         * @param gizmoLayer The utility layer the gizmo will be added to
-         * @param planeNormal The normal of the plane which the gizmo will be able to rotate on
-         * @param color The color of the gizmo
-         */
-        constructor(planeNormal:Vector3, color:Color3 = Color3.Gray(), gizmoLayer:UtilityLayerRenderer = UtilityLayerRenderer.DefaultUtilityLayer){
-            super(gizmoLayer);
-            
-            // Create Material
-            var coloredMaterial = new BABYLON.StandardMaterial("", gizmoLayer.utilityLayerScene);
-            coloredMaterial.disableLighting = true;
-            coloredMaterial.emissiveColor = color;
-            
-            var hoverMaterial = new BABYLON.StandardMaterial("", gizmoLayer.utilityLayerScene);
-            hoverMaterial.disableLighting = true;
-            hoverMaterial.emissiveColor = color.add(new Color3(0.3,0.3,0.3));
-
-            // Build mesh on root node
-            var parentMesh = new BABYLON.AbstractMesh("", gizmoLayer.utilityLayerScene);
-
-            // Create circle out of lines
-            var tessellation = 64;
-            var radius = 0.8;
-            var points = new Array<Vector3>();
-            for(var i = 0;i < tessellation;i++){
-                var radian = (2*Math.PI) * (i/(tessellation-1));
-                points.push(new Vector3(radius*Math.sin(radian), 0, radius*Math.cos(radian)));
-            }
-            let rotationMesh = Mesh.CreateLines("", points, gizmoLayer.utilityLayerScene);
-            rotationMesh.color = coloredMaterial.emissiveColor;
-            
-            // Position arrow pointing in its drag axis
-            rotationMesh.scaling.scaleInPlace(0.26);
-            rotationMesh.material = coloredMaterial;
-            rotationMesh.rotation.x = Math.PI/2;
-            parentMesh.addChild(rotationMesh);
-            parentMesh.lookAt(this._rootMesh.position.subtract(planeNormal));
-            
-            this._rootMesh.addChild(parentMesh);
-            parentMesh.scaling.scaleInPlace(1/3);
-            // Add drag behavior to handle events when the gizmo is dragged
-            this.dragBehavior = new PointerDragBehavior({dragPlaneNormal: planeNormal});
-            this.dragBehavior.moveAttached = false;
-            this.dragBehavior.maxDragAngle =  Math.PI*9/20;
-            this.dragBehavior._useAlternatePickedPointAboveMaxDragAngle = true;
-            this._rootMesh.addBehavior(this.dragBehavior);
-
-            var lastDragPosition = new Vector3();
-
-            this.dragBehavior.onDragStartObservable.add((e)=>{
-                if(this.attachedMesh){
-                    lastDragPosition.copyFrom(e.dragPlanePoint);
-                }
-            })
-
-            var rotationMatrix = new Matrix();
-            var planeNormalTowardsCamera = new Vector3();
-            var localPlaneNormalTowardsCamera = new Vector3();
-
-            var tmpSnapEvent = {snapDistance: 0};
-            var currentSnapDragDistance = 0;
-            var tmpMatrix = new BABYLON.Matrix();
-            var tmpVector = new BABYLON.Vector3();
-            var amountToRotate = new BABYLON.Quaternion();
-            this.dragBehavior.onDragObservable.add((event)=>{
-                if(this.attachedMesh){
-                    if(!this.attachedMesh.rotationQuaternion){
-                        this.attachedMesh.rotationQuaternion = Quaternion.RotationYawPitchRoll(this.attachedMesh.rotation.y, this.attachedMesh.rotation.x, this.attachedMesh.rotation.z);
-                    }
-                    // Calc angle over full 360 degree (https://stackoverflow.com/questions/43493711/the-angle-between-two-3d-vectors-with-a-result-range-0-360)
-                    var newVector = event.dragPlanePoint.subtract(this.attachedMesh.absolutePosition).normalize();
-                    var originalVector = lastDragPosition.subtract(this.attachedMesh.absolutePosition).normalize();
-                    var cross = Vector3.Cross(newVector,originalVector);
-                    var dot = Vector3.Dot(newVector,originalVector);
-                    var angle = Math.atan2(cross.length(), dot);
-                    planeNormalTowardsCamera.copyFrom(planeNormal);
-                    localPlaneNormalTowardsCamera.copyFrom(planeNormal);
-                    if(this.updateGizmoRotationToMatchAttachedMesh){
-                        this.attachedMesh.rotationQuaternion.toRotationMatrix(rotationMatrix);
-                        localPlaneNormalTowardsCamera = Vector3.TransformCoordinates(planeNormalTowardsCamera, rotationMatrix);
-                    }
-                    // Flip up vector depending on which side the camera is on
-                    if(gizmoLayer.utilityLayerScene.activeCamera){
-                        var camVec = gizmoLayer.utilityLayerScene.activeCamera.position.subtract(this.attachedMesh.position);
-                        if(Vector3.Dot(camVec, localPlaneNormalTowardsCamera) > 0){
-                            planeNormalTowardsCamera.scaleInPlace(-1);
-                            localPlaneNormalTowardsCamera.scaleInPlace(-1);
-                        }
-                    }
-                    var halfCircleSide = Vector3.Dot(localPlaneNormalTowardsCamera, cross) > 0.0;
-                    if (halfCircleSide) angle = -angle;
-                    
-                    // Snapping logic
-                    var snapped = false;
-                    if(this.snapDistance != 0){
-                        currentSnapDragDistance+=angle
-                        if(Math.abs(currentSnapDragDistance)>this.snapDistance){
-                            var dragSteps = Math.floor(currentSnapDragDistance/this.snapDistance);
-                            currentSnapDragDistance = currentSnapDragDistance % this.snapDistance;
-                            angle = this.snapDistance*dragSteps;
-                            snapped = true;
-                        }else{
-                            angle = 0;
-                        }
-                    }
-
-                    // If the mesh has a parent, convert needed world rotation to local rotation
-                    tmpMatrix.reset();
-                    if(this.attachedMesh.parent){
-                        this.attachedMesh.parent.computeWorldMatrix().invertToRef(tmpMatrix);
-                        tmpMatrix.getRotationMatrixToRef(tmpMatrix);
-                        Vector3.TransformCoordinatesToRef(planeNormalTowardsCamera, tmpMatrix, planeNormalTowardsCamera);
-                    }
-
-                    // Convert angle and axis to quaternion (http://www.euclideanspace.com/maths/geometry/rotations/conversions/angleToQuaternion/index.htm)
-                    var quaternionCoefficient = Math.sin(angle/2);
-                    amountToRotate.set(planeNormalTowardsCamera.x*quaternionCoefficient,planeNormalTowardsCamera.y*quaternionCoefficient,planeNormalTowardsCamera.z*quaternionCoefficient,Math.cos(angle/2));
-
-                    // If the meshes local scale is inverted (eg. loaded gltf file parent with z scale of -1) the rotation needs to be inverted on the y axis
-                    if(tmpMatrix.determinant() > 0){
-                        amountToRotate.toEulerAnglesToRef(tmpVector);
-                        BABYLON.Quaternion.RotationYawPitchRollToRef(tmpVector.y, -tmpVector.x, -tmpVector.z, amountToRotate);
-                    }
-
-                     if(this.updateGizmoRotationToMatchAttachedMesh){
-                        // Rotate selected mesh quaternion over fixed axis
-                        this.attachedMesh.rotationQuaternion.multiplyToRef(amountToRotate,this.attachedMesh.rotationQuaternion);
-                     }else{
-                         // Rotate selected mesh quaternion over rotated axis
-                        amountToRotate.multiplyToRef(this.attachedMesh.rotationQuaternion,this.attachedMesh.rotationQuaternion);
-                     }
-                     
-
-                    lastDragPosition.copyFrom(event.dragPlanePoint);
-                    if(snapped){
-                        tmpSnapEvent.snapDistance = angle;
-                        this.onSnapObservable.notifyObservers(tmpSnapEvent);
-                    }
-                }
-            })
-
-            this._pointerObserver = gizmoLayer.utilityLayerScene.onPointerObservable.add((pointerInfo, eventState)=>{
-                if(this._customMeshSet){
-                    return;
-                }
-                var isHovered = pointerInfo.pickInfo && (this._rootMesh.getChildMeshes().indexOf(<Mesh>pointerInfo.pickInfo.pickedMesh) != -1);
-                var material = isHovered ? hoverMaterial : coloredMaterial;
-                this._rootMesh.getChildMeshes().forEach((m)=>{
-                    m.material = material;
-                    if((<LinesMesh>m).color){
-                        (<LinesMesh>m).color = material.emissiveColor
-                    }
-                });
-            });
-        }
-
-        protected _attachedMeshChanged(value:Nullable<AbstractMesh>){
-            if(this.dragBehavior){
-                this.dragBehavior.enabled = value ? true : false;
-            }
-        }
-
-        /**
-         * Disposes of the gizmo
-         */
-        public dispose(){
-            this.onSnapObservable.clear();
-            this.gizmoLayer.utilityLayerScene.onPointerObservable.remove(this._pointerObserver);
-            this.dragBehavior.detach();
-            super.dispose();
-        }
-    }
+module BABYLON {
+    /**
+     * Single plane rotation gizmo
+     */
+    export class PlaneRotationGizmo extends Gizmo {
+        /**
+         * Drag behavior responsible for the gizmos dragging interactions
+         */
+        public dragBehavior:PointerDragBehavior;
+        private _pointerObserver:Nullable<Observer<PointerInfo>> = null;
+        
+        /**
+         * Rotation distance in radians that the gizmo will snap to (Default: 0)
+         */
+        public snapDistance = 0;
+        /**
+         * Event that fires each time the gizmo snaps to a new location.
+         * * snapDistance is the the change in distance
+         */
+        public onSnapObservable = new Observable<{snapDistance:number}>();
+
+        /**
+         * Creates a PlaneRotationGizmo
+         * @param gizmoLayer The utility layer the gizmo will be added to
+         * @param planeNormal The normal of the plane which the gizmo will be able to rotate on
+         * @param color The color of the gizmo
+         * @param tessellation Amount of tessellation to be used when creating rotation circles
+         */
+        constructor(planeNormal:Vector3, color:Color3 = Color3.Gray(), gizmoLayer:UtilityLayerRenderer = UtilityLayerRenderer.DefaultUtilityLayer, tessellation = 32){
+            super(gizmoLayer);
+            
+            // Create Material
+            var coloredMaterial = new BABYLON.StandardMaterial("", gizmoLayer.utilityLayerScene);
+            coloredMaterial.disableLighting = true;
+            coloredMaterial.emissiveColor = color;
+            
+            var hoverMaterial = new BABYLON.StandardMaterial("", gizmoLayer.utilityLayerScene);
+            hoverMaterial.disableLighting = true;
+            hoverMaterial.emissiveColor = color.add(new Color3(0.3,0.3,0.3));
+
+            // Build mesh on root node
+            var parentMesh = new BABYLON.AbstractMesh("", gizmoLayer.utilityLayerScene);
+
+            // Create circle out of lines
+            var radius = 0.8;
+            var points = new Array<Vector3>();
+            for(var i = 0;i < tessellation;i++){
+                var radian = (2*Math.PI) * (i/(tessellation-1));
+                points.push(new Vector3(radius*Math.sin(radian), 0, radius*Math.cos(radian)));
+            }
+            let rotationMesh = Mesh.CreateLines("", points, gizmoLayer.utilityLayerScene);
+            rotationMesh.color = coloredMaterial.emissiveColor;
+            
+            // Position arrow pointing in its drag axis
+            rotationMesh.scaling.scaleInPlace(0.26);
+            rotationMesh.material = coloredMaterial;
+            rotationMesh.rotation.x = Math.PI/2;
+            parentMesh.addChild(rotationMesh);
+            parentMesh.lookAt(this._rootMesh.position.subtract(planeNormal));
+            
+            this._rootMesh.addChild(parentMesh);
+            parentMesh.scaling.scaleInPlace(1/3);
+            // Add drag behavior to handle events when the gizmo is dragged
+            this.dragBehavior = new PointerDragBehavior({dragPlaneNormal: planeNormal});
+            this.dragBehavior.moveAttached = false;
+            this.dragBehavior.maxDragAngle =  Math.PI*9/20;
+            this.dragBehavior._useAlternatePickedPointAboveMaxDragAngle = true;
+            this._rootMesh.addBehavior(this.dragBehavior);
+
+            var lastDragPosition = new Vector3();
+
+            this.dragBehavior.onDragStartObservable.add((e)=>{
+                if(this.attachedMesh){
+                    lastDragPosition.copyFrom(e.dragPlanePoint);
+                }
+            })
+
+            var rotationMatrix = new Matrix();
+            var planeNormalTowardsCamera = new Vector3();
+            var localPlaneNormalTowardsCamera = new Vector3();
+
+            var tmpSnapEvent = {snapDistance: 0};
+            var currentSnapDragDistance = 0;
+            var tmpMatrix = new BABYLON.Matrix();
+            var tmpVector = new BABYLON.Vector3();
+            var amountToRotate = new BABYLON.Quaternion();
+            this.dragBehavior.onDragObservable.add((event)=>{
+                if(this.attachedMesh){
+                    if(!this.attachedMesh.rotationQuaternion){
+                        this.attachedMesh.rotationQuaternion = Quaternion.RotationYawPitchRoll(this.attachedMesh.rotation.y, this.attachedMesh.rotation.x, this.attachedMesh.rotation.z);
+                    }
+                    // Calc angle over full 360 degree (https://stackoverflow.com/questions/43493711/the-angle-between-two-3d-vectors-with-a-result-range-0-360)
+                    var newVector = event.dragPlanePoint.subtract(this.attachedMesh.absolutePosition).normalize();
+                    var originalVector = lastDragPosition.subtract(this.attachedMesh.absolutePosition).normalize();
+                    var cross = Vector3.Cross(newVector,originalVector);
+                    var dot = Vector3.Dot(newVector,originalVector);
+                    var angle = Math.atan2(cross.length(), dot);
+                    planeNormalTowardsCamera.copyFrom(planeNormal);
+                    localPlaneNormalTowardsCamera.copyFrom(planeNormal);
+                    if(this.updateGizmoRotationToMatchAttachedMesh){
+                        this.attachedMesh.rotationQuaternion.toRotationMatrix(rotationMatrix);
+                        localPlaneNormalTowardsCamera = Vector3.TransformCoordinates(planeNormalTowardsCamera, rotationMatrix);
+                    }
+                    // Flip up vector depending on which side the camera is on
+                    if(gizmoLayer.utilityLayerScene.activeCamera){
+                        var camVec = gizmoLayer.utilityLayerScene.activeCamera.position.subtract(this.attachedMesh.position);
+                        if(Vector3.Dot(camVec, localPlaneNormalTowardsCamera) > 0){
+                            planeNormalTowardsCamera.scaleInPlace(-1);
+                            localPlaneNormalTowardsCamera.scaleInPlace(-1);
+                        }
+                    }
+                    var halfCircleSide = Vector3.Dot(localPlaneNormalTowardsCamera, cross) > 0.0;
+                    if (halfCircleSide) angle = -angle;
+                    
+                    // Snapping logic
+                    var snapped = false;
+                    if(this.snapDistance != 0){
+                        currentSnapDragDistance+=angle
+                        if(Math.abs(currentSnapDragDistance)>this.snapDistance){
+                            var dragSteps = Math.floor(currentSnapDragDistance/this.snapDistance);
+                            currentSnapDragDistance = currentSnapDragDistance % this.snapDistance;
+                            angle = this.snapDistance*dragSteps;
+                            snapped = true;
+                        }else{
+                            angle = 0;
+                        }
+                    }
+
+                    // If the mesh has a parent, convert needed world rotation to local rotation
+                    tmpMatrix.reset();
+                    if(this.attachedMesh.parent){
+                        this.attachedMesh.parent.computeWorldMatrix().invertToRef(tmpMatrix);
+                        tmpMatrix.getRotationMatrixToRef(tmpMatrix);
+                        Vector3.TransformCoordinatesToRef(planeNormalTowardsCamera, tmpMatrix, planeNormalTowardsCamera);
+                    }
+
+                    // Convert angle and axis to quaternion (http://www.euclideanspace.com/maths/geometry/rotations/conversions/angleToQuaternion/index.htm)
+                    var quaternionCoefficient = Math.sin(angle/2);
+                    amountToRotate.set(planeNormalTowardsCamera.x*quaternionCoefficient,planeNormalTowardsCamera.y*quaternionCoefficient,planeNormalTowardsCamera.z*quaternionCoefficient,Math.cos(angle/2));
+
+                    // If the meshes local scale is inverted (eg. loaded gltf file parent with z scale of -1) the rotation needs to be inverted on the y axis
+                    if(tmpMatrix.determinant() > 0){
+                        amountToRotate.toEulerAnglesToRef(tmpVector);
+                        BABYLON.Quaternion.RotationYawPitchRollToRef(tmpVector.y, -tmpVector.x, -tmpVector.z, amountToRotate);
+                    }
+
+                     if(this.updateGizmoRotationToMatchAttachedMesh){
+                        // Rotate selected mesh quaternion over fixed axis
+                        this.attachedMesh.rotationQuaternion.multiplyToRef(amountToRotate,this.attachedMesh.rotationQuaternion);
+                     }else{
+                         // Rotate selected mesh quaternion over rotated axis
+                        amountToRotate.multiplyToRef(this.attachedMesh.rotationQuaternion,this.attachedMesh.rotationQuaternion);
+                     }
+                     
+
+                    lastDragPosition.copyFrom(event.dragPlanePoint);
+                    if(snapped){
+                        tmpSnapEvent.snapDistance = angle;
+                        this.onSnapObservable.notifyObservers(tmpSnapEvent);
+                    }
+                }
+            })
+
+            this._pointerObserver = gizmoLayer.utilityLayerScene.onPointerObservable.add((pointerInfo, eventState)=>{
+                if(this._customMeshSet){
+                    return;
+                }
+                var isHovered = pointerInfo.pickInfo && (this._rootMesh.getChildMeshes().indexOf(<Mesh>pointerInfo.pickInfo.pickedMesh) != -1);
+                var material = isHovered ? hoverMaterial : coloredMaterial;
+                this._rootMesh.getChildMeshes().forEach((m)=>{
+                    m.material = material;
+                    if((<LinesMesh>m).color){
+                        (<LinesMesh>m).color = material.emissiveColor
+                    }
+                });
+            });
+        }
+
+        protected _attachedMeshChanged(value:Nullable<AbstractMesh>){
+            if(this.dragBehavior){
+                this.dragBehavior.enabled = value ? true : false;
+            }
+        }
+
+        /**
+         * Disposes of the gizmo
+         */
+        public dispose(){
+            this.onSnapObservable.clear();
+            this.gizmoLayer.utilityLayerScene.onPointerObservable.remove(this._pointerObserver);
+            this.dragBehavior.detach();
+            super.dispose();
+        }
+    }
 }

src/Gizmos/babylon.rotationGizmo.ts

@@ -26,12 +26,13 @@ module BABYLON {
         /**
          * Creates a RotationGizmo
          * @param gizmoLayer The utility layer the gizmo will be added to
+         * @param tessellation Amount of tessellation to be used when creating rotation circles
          */
-        constructor(gizmoLayer:UtilityLayerRenderer=UtilityLayerRenderer.DefaultUtilityLayer){
+        constructor(gizmoLayer:UtilityLayerRenderer=UtilityLayerRenderer.DefaultUtilityLayer, tessellation = 32){
             super(gizmoLayer);
-            this.xGizmo = new PlaneRotationGizmo(new Vector3(1,0,0), BABYLON.Color3.Red().scale(0.5), gizmoLayer);
-            this.yGizmo = new PlaneRotationGizmo(new Vector3(0,1,0), BABYLON.Color3.Green().scale(0.5), gizmoLayer);
-            this.zGizmo = new PlaneRotationGizmo(new Vector3(0,0,1), BABYLON.Color3.Blue().scale(0.5), gizmoLayer);
+            this.xGizmo = new PlaneRotationGizmo(new Vector3(1,0,0), BABYLON.Color3.Red().scale(0.5), gizmoLayer, tessellation);
+            this.yGizmo = new PlaneRotationGizmo(new Vector3(0,1,0), BABYLON.Color3.Green().scale(0.5), gizmoLayer, tessellation);
+            this.zGizmo = new PlaneRotationGizmo(new Vector3(0,0,1), BABYLON.Color3.Blue().scale(0.5), gizmoLayer, tessellation);
             this.attachedMesh = null;
         }
 

src/Particles/babylon.subEmitter.ts

@@ -38,7 +38,19 @@ module BABYLON {
             /**
              * the particle system to be used by the sub emitter
              */
-            public particleSystem: ParticleSystem) {
+            public particleSystem: ParticleSystem
+        ) {
+            // Create mesh as emitter to support rotation
+            if(!particleSystem.emitter || !(<AbstractMesh>particleSystem.emitter).dispose){
+                particleSystem.emitter = new BABYLON.AbstractMesh("SubemitterSystemEmitter", particleSystem.getScene());
+            }
+
+            // Automatically dispose of subemitter when system is disposed
+            particleSystem.onDisposeObservable.add(()=>{
+                if(particleSystem.emitter && (<AbstractMesh>particleSystem.emitter).dispose){
+                    (<AbstractMesh>particleSystem.emitter).dispose();
+                }
+            })
         }
         /**
          * Clones the sub emitter