Skip to content
This repository has been archived by the owner on May 2, 2022. It is now read-only.

Commit

Permalink
1, delete .vscode folder and tsconfig.json as everyone has their own …
Browse files Browse the repository at this point in the history
…configurations

2, update PixiJS engine to latest v4.7.3 (mainly for PIXI.Text changing)
3, update pixi.js.d to v4.7.3
4, update tweenjs.d to latest v0.6.2
5, bitmapFont mode for GTextField now supports "Resizable / Colorable" which the editor supports
6, do not use createjs.Ticker to advance the Tween anymore but just use PIXI.ticker to update it actively instead
7, change the way to stop tween in each Gear classes.
  • Loading branch information
jcyuan committed May 16, 2018
1 parent dde544e commit bf88fa6
Show file tree
Hide file tree
Showing 29 changed files with 893 additions and 1,313 deletions.
45 changes: 0 additions & 45 deletions .vscode/tasks.json

This file was deleted.

30 changes: 25 additions & 5 deletions dist/fairygui.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// <reference types="tweenjs" />
declare namespace fgui {
class InteractiveEvents {
static Down: string;
Expand Down Expand Up @@ -1089,7 +1090,7 @@ declare namespace fgui {
}
}
declare namespace fgui {
class GRootStatus {
class GRootPointerStatus {
touchDown: boolean;
mouseX: number;
mouseY: number;
Expand All @@ -1108,10 +1109,29 @@ declare namespace fgui {
private $uid;
private static $inst;
private static $retStatus;
/**
* the singleton instance of the GRoot object
*/
static readonly inst: GRoot;
static readonly statusData: GRootStatus;
/**
* @deprecated will be removed later, please use pointerStatusData instead
*/
static readonly statusData: GRootPointerStatus;
/**
* the current mouse/pointer data
*/
static readonly pointerStatusData: GRootPointerStatus;
/**
* get the objects which are placed underneath the given stage coordinate
* @param globalX the stage X
* @param globalY the stage Y
*/
getObjectUnderPoint(globalX: number, globalY: number): GObject;
/**The main entry */
/**
* the main entry to lauch the UI root, e.g.: GRoot.inst.attachTo(app, options)
* @param app your PIXI.Application instance to be used in this GRoot instance
* @param stageOptions stage rotation / resize options
*/
attachTo(app: PIXI.Application, stageOptions?: UIStageOptions): void;
constructor();
readonly uniqueID: number;
Expand Down Expand Up @@ -1258,6 +1278,7 @@ declare namespace fgui {
exists(callback: (...args: any[]) => void, thisObj: any): boolean;
remove(callback: (...args: any[]) => void, thisObj: any): void;
advance(): void;
tickTween(): void;
setTicker(ticker: PIXI.ticker.Ticker): void;
}
}
Expand Down Expand Up @@ -1374,7 +1395,6 @@ declare namespace fgui {
private $contentHeight;
private $scrollType;
private $scrollSpeed;
private $mouseWheelSpeed;
private $scrollBarMargin;
private $bouncebackEffect;
private $touchEffect;
Expand All @@ -1384,7 +1404,6 @@ declare namespace fgui {
private $displayOnLeft;
private $snapToItem;
private $displayOnDemand;
private $mouseWheelEnabled;
private $pageMode;
private $pageSizeH;
private $pageSizeV;
Expand Down Expand Up @@ -1767,6 +1786,7 @@ declare namespace fgui {
ttf: boolean;
glyphs: GlyphDictionary;
resizable: boolean;
colorable: boolean;
constructor();
}
}
Expand Down
Loading

0 comments on commit bf88fa6

Please sign in to comment.