Merge pull request #1788 from sebavan/Development

Actions Manager, use keyCode as parameter for keypress and keyup

Tools/Gulp/config.json

@@ -208,7 +208,6 @@
       "../../src/PostProcess/babylon.lensRenderingPipeline.js",
       "../../src/PostProcess/babylon.colorCorrectionPostProcess.js",
       "../../src/Cameras/babylon.stereoscopicCameras.js",
-      "../../src/Cameras/Holographic/babylon.holographicCamera.js",
       "../../src/PostProcess/babylon.hdrRenderingPipeline.js",
       "../../src/Rendering/babylon.edgesRenderer.js",
       "../../src/PostProcess/babylon.tonemapPostProcess.js",

src/Actions/babylon.actionManager.ts

@@ -268,7 +268,7 @@
                         || trigger === ActionManager.OnKeyDownTrigger) {
                         var parameter = action.getTriggerParameter();
 
-                        if (parameter) {
+                        if (parameter && parameter !== evt.sourceEvent.keyCode) {
                             var unicode = evt.sourceEvent.charCode ? evt.sourceEvent.charCode : evt.sourceEvent.keyCode;
                             var actualkey = String.fromCharCode(unicode).toLowerCase();
                             if (actualkey !== parameter.toLowerCase()) {

src/Cameras/Holographic/babylon.holographicCamera.ts

@@ -1,111 +0,0 @@
-interface Window { 
-    holographicViewMatrix: boolean;
-    getViewMatrix(): Float32Array;
-    getCameraPositionVector(): Float32Array;
-} 
-
-module BABYLON {
-    export class HolographicCamera extends Camera {
-        
-        private _identityProjection: Matrix;
-
-        private _scriptProjection: Matrix;
-        private _scriptViewProjection: Matrix;
-
-        private _holographicViewMatrix: Matrix;
-
-        private _onBeforeRenderObserver: Observer<Scene>;
-        private _onBeforeCameraRenderObserver: Observer<Camera>;
-
-        constructor(name: string, scene: Scene) {            
-            super(name, BABYLON.Vector3.Zero(), scene);
-
-            scene.clearColor = new BABYLON.Color4(0, 0, 0, 0);
-            
-            this._holographicViewMatrix = new Matrix();            
-            this._identityProjection = BABYLON.Matrix.Identity();
-            this._scriptProjection = BABYLON.Matrix.Transpose(BABYLON.Matrix.PerspectiveFovLH(30, window.innerWidth / window.innerHeight, 1, 20));
-            this._scriptViewProjection = BABYLON.Matrix.Identity();
-
-            this.fov = 30;
-            this.minZ = 1.0;
-            this.maxZ = 20;
-            this.mode = BABYLON.Camera.PERSPECTIVE_CAMERA;
-            this.isIntermediate = false;
-            this.viewport = new BABYLON.Viewport(0, 0, 1.0, 1.0);
-            this.layerMask = 0x0FFFFFFF;
-            this.fovMode = BABYLON.Camera.FOVMODE_VERTICAL_FIXED;
-            this.cameraRigMode = BABYLON.Camera.RIG_MODE_NONE;
-
-            var self = this;
-            this._onBeforeRenderObserver = scene.onBeforeRenderObservable.add(function (scene) {
-                self._holographicViewMatrix.m = window.getViewMatrix();
-                self.setViewMatrix(self._holographicViewMatrix);
-
-                var position = window.getCameraPositionVector();
-                self.position.copyFromFloats(-position[0], position[1], -position[2]);
-            })
-            this._onBeforeCameraRenderObserver = scene.onBeforeCameraRenderObservable.add(function() {
-                if (scene.frustumPlanes) {
-                    self.getFrustumPlanesToRef(scene.frustumPlanes);
-                }
-            })
-
-            scene.addCamera(this);
-            if (!scene.activeCamera) {
-                scene.activeCamera = this;
-            }
-        }
-
-        public getTypeName(): string {
-            return "HolographicCamera";
-        };        
-
-
-        public getProjectionMatrix(): Matrix {
-            return this._identityProjection;
-        };
-        
-        public getViewMatrix(): Matrix {
-            return this._holographicViewMatrix;
-        };
-
-        public setViewMatrix(view: Matrix) : void {
-            this._holographicViewMatrix = view;
-
-            view.m[0] = -view.m[0];
-            view.m[1] = -view.m[1];
-            view.m[2] = -view.m[2];
-            view.m[3] = -view.m[3];
-
-            view.m[8] = -view.m[8];
-            view.m[9] = -view.m[9];
-            view.m[10] = -view.m[10];
-            view.m[11] = -view.m[11];
-        };
-        
-        public _initCache(): void { };
-        public _updateCache(): void { };
-        public _updateFromScene(): void { };
-
-        // Synchronized
-        public _isSynchronizedViewMatrix() : boolean {
-            return true;
-        };
-        public _isSynchronizedProjectionMatrix() : boolean {
-            return true;
-        };
-
-        private getFrustumPlanesToRef(result: Plane[]): Plane[] {
-            this._holographicViewMatrix.multiplyToRef(this._scriptProjection, this._scriptViewProjection);
-            BABYLON.Frustum.GetPlanesToRef(this._scriptViewProjection, result);
-            return result;
-        };
-
-        public dispose(): void {
-            this.getScene().onBeforeRenderObservable.remove(this._onBeforeRenderObserver);
-            this.getScene().onBeforeCameraRenderObservable.remove(this._onBeforeCameraRenderObserver);
-            super.dispose();
-        }
-    }
-}

src/Cameras/babylon.camera.ts

@@ -739,8 +739,6 @@
                     return () => new TouchCamera(name, Vector3.Zero(), scene);
                 case "VirtualJoysticksCamera":
                     return () => new VirtualJoysticksCamera(name, Vector3.Zero(), scene);
-                case "HolographicCamera":
-                    return () => new HolographicCamera(name, scene);
                 case "WebVRFreeCamera":
                     return () => new WebVRFreeCamera(name, Vector3.Zero(), scene);
                 case "WebVRGamepadCamera":