首页 发现 帮助
注册 登录
zhangyupeng
/
Babylon.js
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

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

# Conflicts:
#	dist/preview release/babylon.d.ts
#	dist/preview release/babylon.js
#	dist/preview release/babylon.module.d.ts
#	dist/preview release/babylon.worker.js
#	dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts
#	dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js
#	dist/preview release/customConfigurations/minimalGLTFViewer/babylon.module.d.ts
#	dist/preview release/gui/babylon.gui.min.js
David Catuhe 8 年之前
父节点
6ad6e6895b cd1d1a5678
当前提交
29f7c79067
共有 22 个文件被更改，包括 2371 次插入 和 2214 次删除
分列视图 显示文件统计
  1. 2 1
      Tools/Gulp/config.json
  2. 22 3
      dist/preview release/babylon.max.js
  3. 1987 1918
      dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js
  4. 263 263
      dist/preview release/inspector/babylon.inspector.bundle.js
  5. 3 3
      dist/preview release/inspector/babylon.inspector.min.js
  6. 2 2
      dist/preview release/loaders/babylon.glTF1FileLoader.min.js
  7. 1 1
      dist/preview release/loaders/babylon.glTF2FileLoader.min.js
  8. 2 2
      dist/preview release/loaders/babylon.glTFFileLoader.min.js
  9. 1 1
      dist/preview release/loaders/babylon.objFileLoader.min.js
  10. 1 1
      dist/preview release/materialsLibrary/babylon.customMaterial.min.js
  11. 1 1
      dist/preview release/materialsLibrary/babylon.shadowOnlyMaterial.min.js
  12. 1 1
      dist/preview release/materialsLibrary/babylon.waterMaterial.min.js
  13. 1 1
      dist/preview release/postProcessesLibrary/babylon.asciiArtPostProcess.min.js
  14. 1 1
      dist/preview release/postProcessesLibrary/babylon.digitalRainPostProcess.min.js
  15. 4 3
      localDev/index.html
  16. 39 8
      src/Cameras/Inputs/babylon.arcRotateCameraPointersInput.ts
  17. 19 1
      src/Cameras/babylon.arcRotateCamera.ts
  18. 2 0
      src/Materials/Textures/babylon.mirrorTexture.ts
  19. 3 1
      src/PostProcess/RenderPipeline/Pipelines/babylon.defaultRenderingPipeline.ts
  20. 11 1
      src/PostProcess/babylon.postProcess.ts
  21. 1 1
      src/PostProcess/babylon.vrDistortionCorrectionPostProcess.ts
  22. 4 0
      src/babylon.engine.ts

+ 2 - 1
Tools/Gulp/config.json
查看文件 

@@ -593,10 +593,11 @@
 
                 "geometry.fragment"
 
             ],
 
             "shaderIncludes": [
 
+                "mrtFragmentDeclaration",
 
                 "bones300Declaration",
 
                 "instances300Declaration",
 
                 "instancesVertex",
 
-                "bonesVertex"
 
+                "bonesVertex"               
             ]
 
         },
 
         "postProcesses" :

文件差异内容过多而无法显示
+ 22 - 3
dist/preview release/babylon.max.js


文件差异内容过多而无法显示
+ 1987 - 1918
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js


文件差异内容过多而无法显示
+ 263 - 263
dist/preview release/inspector/babylon.inspector.bundle.js


文件差异内容过多而无法显示
+ 3 - 3
dist/preview release/inspector/babylon.inspector.min.js


文件差异内容过多而无法显示
+ 2 - 2
dist/preview release/loaders/babylon.glTF1FileLoader.min.js


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/loaders/babylon.glTF2FileLoader.min.js


文件差异内容过多而无法显示
+ 2 - 2
dist/preview release/loaders/babylon.glTFFileLoader.min.js


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/loaders/babylon.objFileLoader.min.js


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/materialsLibrary/babylon.customMaterial.min.js


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/materialsLibrary/babylon.shadowOnlyMaterial.min.js


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/materialsLibrary/babylon.waterMaterial.min.js


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/postProcessesLibrary/babylon.asciiArtPostProcess.min.js


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/postProcessesLibrary/babylon.digitalRainPostProcess.min.js


+ 4 - 3
localDev/index.html
查看文件 

@@ -3,8 +3,9 @@
 
 <head>
 
 	<title>Local Development</title>
 
 	
-    <script src="https://babylonjs.azurewebsites.net/cannon.js"></script>
 
-    <script src="https://babylonjs.azurewebsites.net/Oimo.js"></script>
 
+    <script src="https://code.jquery.com/pep/0.4.2/pep.min.js"></script>
 
+	<script src="https://preview.babylonjs.com/cannon.js"></script>
 
+	<script src="https://preview.babylonjs.com/Oimo.js"></script>
 
 	<script src="../assets/refs/dat.gui.min.js"></script>
 
 	<script src="../tools/DevLoader/BabylonLoader.js"></script>
 
 	<script src="src/webgl-debug.js"></script>
 
@@ -39,7 +40,7 @@
 
 </head>
 
 <body>
 
 	<div id="fps">0</div>
 
-	<canvas id="renderCanvas"></canvas>
 
+	<canvas id="renderCanvas" touch-action="none"></canvas>
 
 	
 	<script>
 
 		var canvas = document.getElementById("renderCanvas");

+ 39 - 8
src/Cameras/Inputs/babylon.arcRotateCameraPointersInput.ts
查看文件 

@@ -19,6 +19,9 @@ module BABYLON {
 
         @serialize()

         public panningSensibility: number = 50.0;

 

+        @serialize()

+        public multiTouchPanning: boolean = true;

+

         private _isPanClick: boolean = false;

         public pinchInwards = true;

 

@@ -35,7 +38,9 @@ module BABYLON {
 
             var engine = this.camera.getEngine();

             var cacheSoloPointer: { x: number, y: number, pointerId: number, type: any }; // cache pointer object for better perf on camera rotation

             var pointA: { x: number, y: number, pointerId: number, type: any }, pointB: { x: number, y: number, pointerId: number, type: any };

+            var previousPinchSquaredDistance = 0;

             var previousPinchDistance = 0;

+            var previousMultiTouchPanPosition: { x: number, y: number, isPaning: boolean } = { x: 0, y:0, isPaning: false };

 

             this._pointerInput = (p, s) => {

                 var evt = <PointerEvent>p.event;

@@ -78,7 +83,9 @@ module BABYLON {
 
                     }

 

                     cacheSoloPointer = null;

+                    previousPinchSquaredDistance = 0;

                     previousPinchDistance = 0;

+                    previousMultiTouchPanPosition.isPaning = false;

 

                     //would be better to use pointers.remove(evt.pointerId) for multitouch gestures, 

                     //but emptying completly pointers collection is required to fix a bug on iPhone : 

@@ -97,8 +104,7 @@ module BABYLON {
 
                     // One button down

                     if (pointA && pointB === undefined) {

                         if (this.panningSensibility !== 0 &&

-                            ((evt.ctrlKey && this.camera._useCtrlForPanning) ||

-                                (!this.camera._useCtrlForPanning && this._isPanClick))) {

+                            ((evt.ctrlKey && this.camera._useCtrlForPanning) || this._isPanClick)) {

                             this.camera.inertialPanningX += -(evt.clientX - cacheSoloPointer.x) / this.panningSensibility;

                             this.camera.inertialPanningY += (evt.clientY - cacheSoloPointer.y) / this.panningSensibility;

                         } else {

@@ -112,7 +118,7 @@ module BABYLON {
 
                         cacheSoloPointer.y = evt.clientY;

                     }

 

-                    // Two buttons down: pinch

+                    // Two buttons down: pinch/pan

                     else if (pointA && pointB) {

                         //if (noPreventDefault) { evt.preventDefault(); } //if pinch gesture, could be useful to force preventDefault to avoid html page scroll/zoom in some mobile browsers

                         var ed = (pointA.pointerId === evt.pointerId) ? pointA : pointB;

@@ -122,19 +128,42 @@ module BABYLON {
 
                         var distX = pointA.x - pointB.x;

                         var distY = pointA.y - pointB.y;

                         var pinchSquaredDistance = (distX * distX) + (distY * distY);

-                        if (previousPinchDistance === 0) {

-                            previousPinchDistance = pinchSquaredDistance;

+                        var pinchDistance = Math.sqrt(pinchSquaredDistance);

+                        if (previousPinchSquaredDistance === 0) {

+                            previousPinchSquaredDistance = pinchSquaredDistance;

+                            previousPinchDistance = pinchDistance;

                             return;

                         }

 

-                        if (pinchSquaredDistance !== previousPinchDistance) {

+                        if (Math.abs(pinchDistance - previousPinchDistance) > this.camera.pinchToPanMaxDistance) {

                             this.camera

-                                .inertialRadiusOffset += (pinchSquaredDistance - previousPinchDistance) /

+                                .inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) /

                                 (this.pinchPrecision *

                                     ((this.angularSensibilityX + this.angularSensibilityY) / 2) *

                                     direction);

-                            previousPinchDistance = pinchSquaredDistance;

+                            previousMultiTouchPanPosition.isPaning = false;

+                        }

+                        else {

+                            if (cacheSoloPointer.pointerId === ed.pointerId && this.panningSensibility !== 0 && this.multiTouchPanning) {

+                                if (!previousMultiTouchPanPosition.isPaning) {

+                                    previousMultiTouchPanPosition.isPaning = true;

+                                    previousMultiTouchPanPosition.x = ed.x;

+                                    previousMultiTouchPanPosition.y = ed.y;

+                                    return;

+                                }

+

+                                this.camera.inertialPanningX += -(ed.x - previousMultiTouchPanPosition.x) / this.panningSensibility;

+                                this.camera.inertialPanningY += (ed.y - previousMultiTouchPanPosition.y) / this.panningSensibility;

+                            }

                         }

+

+                        if (cacheSoloPointer.pointerId === evt.pointerId) {

+                            previousMultiTouchPanPosition.x = ed.x;

+                            previousMultiTouchPanPosition.y = ed.y;

+                        }

+

+                        previousPinchSquaredDistance = pinchSquaredDistance;

+                        previousPinchDistance = pinchDistance;

                     }

                 }

             }

@@ -152,7 +181,9 @@ module BABYLON {
 
             this._onLostFocus = () => {

                 //this._keys = [];

                 pointA = pointB = undefined;

+                previousPinchSquaredDistance = 0;

                 previousPinchDistance = 0;

+                previousMultiTouchPanPosition.isPaning = false;

                 cacheSoloPointer = null;

             };

+ 19 - 1
src/Cameras/babylon.arcRotateCamera.ts
查看文件 

@@ -57,6 +57,15 @@ module BABYLON {
 
         public inertialPanningY: number = 0;

 

         @serialize()

+        public pinchToPanMaxDistance: number = 2;

+

+        @serialize()

+        public panningDistanceLimit: number = null;

+

+        @serializeAsVector3()

+        public panningOriginTarget: Vector3 = Vector3.Zero();

+

+        @serialize()

         public panningInertia = 0.9;

 

         //-- begin properties for backward compatibility for inputs

@@ -467,7 +476,16 @@ module BABYLON {
 
                 }

 

                 if (!this._targetHost) {

-                    this._target.addInPlace(this._transformedDirection);

+                    if (this.panningDistanceLimit) {

+                        this._transformedDirection.addInPlace(this._target);

+                        var distanceSquared = Vector3.DistanceSquared(this._transformedDirection, this.panningOriginTarget);

+                        if (distanceSquared <= (this.panningDistanceLimit * this.panningDistanceLimit)) {

+                            this._target.copyFrom(this._transformedDirection);

+                        }

+                    }

+                    else {

+                        this._target.addInPlace(this._transformedDirection);

+                    }

                 }

 

                 this.inertialPanningX *= this.panningInertia;

+ 2 - 0
src/Materials/Textures/babylon.mirrorTexture.ts
查看文件 

@@ -61,6 +61,8 @@ module BABYLON {
 
         constructor(name: string, size: any, scene: Scene, generateMipMaps?: boolean, type: number = Engine.TEXTURETYPE_UNSIGNED_INT, samplingMode = Texture.BILINEAR_SAMPLINGMODE, generateDepthBuffer = true) {

             super(name, size, scene, generateMipMaps, true, type, false, samplingMode, generateDepthBuffer);

 

+            this.ignoreCameraViewport = true;

+

             this.onBeforeRenderObservable.add(() => {

                 Matrix.ReflectionToRef(this.mirrorPlane, this._mirrorMatrix);

                 this._savedViewMatrix = scene.getViewMatrix();

+ 3 - 1
src/PostProcess/RenderPipeline/Pipelines/babylon.defaultRenderingPipeline.ts
查看文件 

@@ -223,8 +223,10 @@
 
                 this.imageProcessing = new BABYLON.ImageProcessingPostProcess("imageProcessing",  1.0, null, BABYLON.Texture.BILINEAR_SAMPLINGMODE, engine, false, this._defaultPipelineTextureType);

                 if (this._hdr) {

                     this.addEffect(new PostProcessRenderEffect(engine, this.ImageProcessingPostProcessId, () => { return this.imageProcessing; }, true));

+                } else {

+                    this._scene.imageProcessingConfiguration.applyByPostProcess = false;

                 }

-            }

+            } 

 

 			if (this.fxaaEnabled) {

                 this.fxaa = new FxaaPostProcess("fxaa", 1.0, null, Texture.BILINEAR_SAMPLINGMODE, engine, false, this._defaultPipelineTextureType);

+ 11 - 1
src/PostProcess/babylon.postProcess.ts
查看文件 

@@ -20,6 +20,7 @@
 
         public scaleMode = Engine.SCALEMODE_FLOOR;

         public alwaysForcePOT = false;

         public samples = 1;

+        public adaptScaleToCurrentViewport = false;

 

         private _camera: Camera;

         private _scene: Scene;

@@ -221,9 +222,18 @@
 
                 var requiredWidth = ((sourceTexture ? sourceTexture.width : this._engine.getRenderingCanvas().width) * <number>this._options) | 0;

                 var requiredHeight = ((sourceTexture ? sourceTexture.height : this._engine.getRenderingCanvas().height) * <number>this._options) | 0;

 

-                var desiredWidth = (<PostProcessOptions>this._options).width || requiredWidth;

+                var desiredWidth = ((<PostProcessOptions>this._options).width || requiredWidth);

                 var desiredHeight = (<PostProcessOptions>this._options).height || requiredHeight;

 

+                if (this.adaptScaleToCurrentViewport) {

+                    let currentViewport = engine.currentViewport;

+

+                    if (currentViewport) {

+                        desiredWidth *= currentViewport.width;

+                        desiredHeight *= currentViewport.height;

+                    }

+                }

+

                 if (this.renderTargetSamplingMode === Texture.TRILINEAR_SAMPLINGMODE || this.alwaysForcePOT) {

                     if (!(<PostProcessOptions>this._options).width) {

                         desiredWidth = engine.needPOTTextures ? Tools.GetExponentOfTwo(desiredWidth, maxSize, this.scaleMode) : desiredWidth;

+ 1 - 1
src/PostProcess/babylon.vrDistortionCorrectionPostProcess.ts
查看文件 

@@ -10,7 +10,6 @@
 
         private _scaleFactor: Vector2;

         private _lensCenter: Vector2;

 

-        //ANY

         constructor(name: string, camera: Camera, isRightEye: boolean, vrMetrics: VRCameraMetrics) {

             super(name, "vrDistortionCorrection", [

                 'LensCenter',

@@ -23,6 +22,7 @@
 
             this._distortionFactors = vrMetrics.distortionK;

             this._postProcessScaleFactor = vrMetrics.postProcessScaleFactor;

             this._lensCenterOffset = vrMetrics.lensCenterOffset;

+            this.adaptScaleToCurrentViewport = true;

 

             this.onSizeChangedObservable.add(() => {

                 this.aspectRatio = this.width * .5 / this.height;

+ 4 - 0
src/babylon.engine.ts
查看文件 

@@ -711,6 +711,10 @@
 
             return this._textureFormatInUse;

         }

 

+        public get currentViewport(): Viewport {

+            return this._cachedViewport;

+        }

+

         // Empty texture

         public get emptyTexture(): InternalTexture {

             if (!this._emptyTexture) {