Browse Source

Cleaning & improving gamepad support

davrous 8 years ago
parent
commit
b0d6cfd9a5

+ 3 - 0
dist/preview release/gui/babylon.gui.d.ts

@@ -539,6 +539,9 @@ declare module BABYLON.GUI {
         private _v;
         onValueChangedObservable: Observable<Color3>;
         value: Color3;
+        width: string | number;
+        height: string | number;
+        size: string | number;
         constructor(name?: string);
         protected _getTypeName(): string;
         private _updateSquareProps();

+ 37 - 2
dist/preview release/gui/babylon.gui.js

@@ -3111,8 +3111,7 @@ var BABYLON;
                 // Events
                 _this._pointerIsDown = false;
                 _this.value = new BABYLON.Color3(.88, .1, .1);
-                _this.width = "200px";
-                _this.height = "200px";
+                _this.size = "200px";
                 _this.isPointerBlocker = true;
                 return _this;
             }
@@ -3135,6 +3134,42 @@ var BABYLON;
                 enumerable: true,
                 configurable: true
             });
+            Object.defineProperty(ColorPicker.prototype, "width", {
+                set: function (value) {
+                    if (this._width.toString(this._host) === value) {
+                        return;
+                    }
+                    if (this._width.fromString(value)) {
+                        this._height.fromString(value);
+                        this._markAsDirty();
+                    }
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(ColorPicker.prototype, "height", {
+                set: function (value) {
+                    if (this._height.toString(this._host) === value) {
+                        return;
+                    }
+                    if (this._height.fromString(value)) {
+                        this._width.fromString(value);
+                        this._markAsDirty();
+                    }
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(ColorPicker.prototype, "size", {
+                get: function () {
+                    return this.width;
+                },
+                set: function (value) {
+                    this.width = value;
+                },
+                enumerable: true,
+                configurable: true
+            });
             ColorPicker.prototype._getTypeName = function () {
                 return "ColorPicker";
             };

File diff suppressed because it is too large
+ 2 - 2
dist/preview release/gui/babylon.gui.min.js


File diff suppressed because it is too large
+ 5 - 5
dist/preview release/inspector/babylon.inspector.bundle.js


File diff suppressed because it is too large
+ 3 - 3
dist/preview release/inspector/babylon.inspector.min.js


File diff suppressed because it is too large
+ 2 - 2
dist/preview release/loaders/babylon.glTF1FileLoader.min.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/loaders/babylon.glTF2FileLoader.min.js


File diff suppressed because it is too large
+ 2 - 2
dist/preview release/loaders/babylon.glTFFileLoader.min.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/loaders/babylon.objFileLoader.min.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/materialsLibrary/babylon.customMaterial.min.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/materialsLibrary/babylon.waterMaterial.min.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/postProcessesLibrary/babylon.asciiArtPostProcess.min.js