Selaa lähdekoodia

Merge pull request #3361 from BabylonJS/master

Nightly
David Catuhe 7 vuotta sitten
vanhempi
commit
5209324cd8

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 5755 - 5752
Playground/babylon.d.txt


+ 1 - 1
Playground/indexStable.html

@@ -391,4 +391,4 @@
     <script src="js/index.js"></script>
 </body>
 
-</html>
+</html>

+ 1 - 1
Playground/js/index.js

@@ -87,7 +87,7 @@
         var zipCode;
         BABYLON.Engine.ShadersRepository = "/src/Shaders/";
 
-        if (location.href.indexOf("Stable") !== -1) {
+        if (location.href.indexOf("indexstable") !== -1) {
             setToMultipleID("currentVersion", "innerHTML", "Version: Stable");
         } else {
             setToMultipleID("currentVersion", "innerHTML", "Version: Latest");

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 5860 - 5857
dist/preview release/babylon.d.ts


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 3 - 3
dist/preview release/babylon.js


+ 14 - 0
dist/preview release/babylon.max.js

@@ -77764,6 +77764,8 @@ var BABYLON;
             this.renderWidth = 512;
             this.renderHeight = 256;
             this.textureSize = 512;
+            this.deterministicLockstep = false;
+            this.lockstepMaxSteps = 4;
         }
         return NullEngineOptions;
     }());
@@ -77777,6 +77779,12 @@ var BABYLON;
         function NullEngine(options) {
             if (options === void 0) { options = new NullEngineOptions(); }
             var _this = _super.call(this, null) || this;
+            if (options.deterministicLockstep === undefined) {
+                options.deterministicLockstep = false;
+            }
+            if (options.lockstepMaxSteps === undefined) {
+                options.lockstepMaxSteps = 4;
+            }
             _this._options = options;
             // Init caps
             // We consider we are on a webgl1 capable device
@@ -77827,6 +77835,12 @@ var BABYLON;
             }
             return _this;
         }
+        NullEngine.prototype.isDeterministicLockStep = function () {
+            return this._options.deterministicLockstep;
+        };
+        NullEngine.prototype.getLockstepMaxSteps = function () {
+            return this._options.lockstepMaxSteps;
+        };
         NullEngine.prototype.createVertexBuffer = function (vertices) {
             return {
                 capacity: 0,

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 3 - 3
dist/preview release/babylon.worker.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 3 - 3
dist/preview release/viewer/babylon.viewer.js


+ 5 - 0
dist/preview release/what's new.md

@@ -63,6 +63,9 @@
 - Asset Task has a state (INIT, RUNNING, DONE and ERROR). [Documentation](http://doc.babylonjs.com/how_to/how_to_use_assetsmanager#task-state-and-error-handling) ([RaananW](https://github.com/RaananW))
 - Added new options to the physics impostor constructor - ignoreParent and diableBidirectionalTransformation. [Documentation](http://doc.babylonjs.com/how_to/using_the_physics_engine#impostors) ([RaananW](https://github.com/RaananW))
 - It is now possible to define which loader to use when loading assets using the SceneLoader. [Commit](https://github.com/BabylonJS/Babylon.js/commit/91bffeaafc668980be0f9cf83df69b8eb2e2ba5f) ([RaananW](https://github.com/RaananW))
+- Added scope option to Observerable ([adam](https://github.com/abow))
+- Added shadowBlur, shadowOffsetX, shadowOffsetY, shadowColor to GUI Controls ([adam](https://github.com/abow))
+- Added alignWithNormal to AbstractMesh ([adam](https://github.com/abow))
 
 ## Bug fixes
 
@@ -76,6 +79,8 @@
 - Fixed an error with deterministic step. ([RaananW](https://github.com/RaananW))
 - Fixed a bug with controller jitter when in VR. ([RaananW](https://github.com/RaananW))
 - Fixed a bug with impostor jitter when in VR. ([RaananW](https://github.com/RaananW))
+- Fixed a bug with GUI Slider not working correctly when rotated ([adam](https://github.com/abow))
+- Fixed IE11 "spacebar" bug with GUI InputText ([adam](https://github.com/abow))
 
 ## Breaking changes
 

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

@@ -298,7 +298,6 @@
         deterministicLockstep?: boolean;
         lockstepMaxSteps?: number;
         doNotHandleContextLost?: boolean;
-        constantAnimationDeltaTime?: number;
     }
 
     export interface IDisplayChangedEventArgs {

+ 19 - 0
src/Engine/babylon.nullEngine.ts

@@ -5,6 +5,9 @@
         public renderHeight = 256;
 
         public textureSize = 512;
+
+        public deterministicLockstep = false;
+        public lockstepMaxSteps = 4;
     }
 
     /**
@@ -14,9 +17,25 @@
     export class NullEngine extends Engine {
         private _options: NullEngineOptions;
 
+        public isDeterministicLockStep(): boolean {
+            return this._options.deterministicLockstep;
+        }
+
+        public getLockstepMaxSteps(): number {
+            return this._options.lockstepMaxSteps;
+        }
+
         public constructor(options: NullEngineOptions = new NullEngineOptions()) {
             super(null);
 
+            if (options.deterministicLockstep === undefined) {
+                options.deterministicLockstep = false;
+            }
+
+            if (options.lockstepMaxSteps === undefined) {
+                options.lockstepMaxSteps = 4;
+            }
+
             this._options = options;
 
             // Init caps