瀏覽代碼

Added promise code. Started working on the scaling issues.

Patrick Ryan 6 年之前
父節點
當前提交
8cab7d4377

文件差異過大導致無法顯示
+ 8217 - 8217
dist/preview release/babylon.d.ts


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

@@ -738,9 +738,19 @@ declare module BABYLON.GUI {
             _onPointerMove(target: Control, coordinates: BABYLON.Vector2): void;
             _onPointerUp(target: Control, coordinates: BABYLON.Vector2, pointerId: number, buttonIndex: number, notifyClick: boolean): void;
             /**
-                * This is so cool!
-                */
-            static ShowPickerDialog(advancedTexture: AdvancedDynamicTexture, pickerWidth: string, pickerHeight: string, lastColor: string, swatchLimit: number, swatchSize: number, numSwatchesPerLine: number, savedColors: Array<string>): string;
+                *
+                * @param advancedTexture defines the AdvancedDynamicTexture the dialog is assigned to
+                * @param options
+                */
+            static ShowPickerDialog(advancedTexture: AdvancedDynamicTexture, options: {
+                    pickerWidth?: string;
+                    pickerHeight?: string;
+                    lastColor?: string;
+                    swatchLimit?: number;
+                    swatchSize?: number;
+                    numSwatchesPerLine?: number;
+                    savedColors?: Array<string>;
+            }): string;
     }
 }
 declare module BABYLON.GUI {

文件差異過大導致無法顯示
+ 1 - 1
dist/preview release/gui/babylon.gui.js


文件差異過大導致無法顯示
+ 1 - 1
dist/preview release/gui/babylon.gui.min.js


文件差異過大導致無法顯示
+ 1 - 1
dist/preview release/gui/babylon.gui.min.js.map


+ 26 - 6
dist/preview release/gui/babylon.gui.module.d.ts

@@ -833,9 +833,19 @@ declare module 'babylonjs-gui/2D/controls/colorpicker' {
             _onPointerMove(target: Control, coordinates: Vector2): void;
             _onPointerUp(target: Control, coordinates: Vector2, pointerId: number, buttonIndex: number, notifyClick: boolean): void;
             /**
-                * This is so cool!
-                */
-            static ShowPickerDialog(advancedTexture: AdvancedDynamicTexture, pickerWidth: string, pickerHeight: string, lastColor: string, swatchLimit: number, swatchSize: number, numSwatchesPerLine: number, savedColors: Array<string>): string;
+                *
+                * @param advancedTexture defines the AdvancedDynamicTexture the dialog is assigned to
+                * @param options
+                */
+            static ShowPickerDialog(advancedTexture: AdvancedDynamicTexture, options: {
+                    pickerWidth?: string;
+                    pickerHeight?: string;
+                    lastColor?: string;
+                    swatchLimit?: number;
+                    swatchSize?: number;
+                    numSwatchesPerLine?: number;
+                    savedColors?: Array<string>;
+            }): string;
     }
 }
 
@@ -3734,9 +3744,19 @@ declare module BABYLON.GUI {
             _onPointerMove(target: Control, coordinates: BABYLON.Vector2): void;
             _onPointerUp(target: Control, coordinates: BABYLON.Vector2, pointerId: number, buttonIndex: number, notifyClick: boolean): void;
             /**
-                * This is so cool!
-                */
-            static ShowPickerDialog(advancedTexture: AdvancedDynamicTexture, pickerWidth: string, pickerHeight: string, lastColor: string, swatchLimit: number, swatchSize: number, numSwatchesPerLine: number, savedColors: Array<string>): string;
+                *
+                * @param advancedTexture defines the AdvancedDynamicTexture the dialog is assigned to
+                * @param options
+                */
+            static ShowPickerDialog(advancedTexture: AdvancedDynamicTexture, options: {
+                    pickerWidth?: string;
+                    pickerHeight?: string;
+                    lastColor?: string;
+                    swatchLimit?: number;
+                    swatchSize?: number;
+                    numSwatchesPerLine?: number;
+                    savedColors?: Array<string>;
+            }): string;
     }
 }
 declare module BABYLON.GUI {

文件差異過大導致無法顯示
+ 753 - 733
gui/src/2D/controls/colorpicker.ts