Add tweening

Fixed List vertical sliding issue Split GUISprite class to GUIObject and GUISprite
RobertoMalatesta · Apr 26, 2015 · 4c83a35 · 4c83a35
1 parent f456849
commit 4c83a35
Show file tree

Hide file tree

Showing 27 changed files with 787 additions and 698 deletions.
diff --git a/EZGUI.csproj b/EZGUI.csproj
@@ -84,6 +84,7 @@
     <Content Include="js\pixi3.dev.js" />
     <TypeScriptCompile Include="src\components\Label.ts" />
     <TypeScriptCompile Include="src\components\Slider.ts" />
+    <TypeScriptCompile Include="src\GUIObject.ts" />
     <TypeScriptCompile Include="src\tween\Easing.ts" />
     <TypeScriptCompile Include="src\tween\Interpolation.ts" />
     <TypeScriptCompile Include="src\tween\Tween.ts" />

diff --git a/README.md b/README.md
@@ -9,10 +9,11 @@ Important
 The code in this repository is still in developement, and some breaking changes may occure
 
 
-Features
+Features.
 --------
  * Flexible configuration : EZGUI use a flexible JSON configuration format for theme an gui definitions
  * Themes : a default theme is provided but you can create your own custom theme.
+ * Tweening 
  * Extendable : you can easily create your own components
 
 

diff --git a/assets/kenney-theme/kenney-theme.json b/assets/kenney-theme/kenney-theme.json
@@ -1,15 +1,15 @@
 {
     "__config__": {
-        "name": "kenney-theme",
+        "name": "kenney",
         "resources": [
-            "./kenney-atlas.json",
-            "./images/bg.png"
+            "./kenney-atlas.json"
         ]
     },
 
     "default": {
         "scale": 0.5,
-        "bg": "./images/bg.png",
+        "bg": "wnd-grey-bg.png",
+        "padding" : 2,
         "bgPadding": 6,
         "corner": "wnd-grey-corner.png",
         "line": "wnd-grey-line.png",
@@ -19,7 +19,7 @@
             "color": "black"
         }
     },
-    "Window": {
+    "Dialog": {
         "bgPadding": 5,
         "bg": "wnd-grey-bg.png",
         "corner": "wnd-grey-corner.png",

diff --git a/assets/metalworks-theme/metalworks-theme.json b/assets/metalworks-theme/metalworks-theme.json
@@ -1,6 +1,6 @@
 {
     "__config__": {
-        "name": "metalworks-theme",
+        "name": "metalworks",
         "resources": [
             "./images/header-bg.png",
             "./images/bg.png",

diff --git a/dist/EZGUI.d.ts b/dist/EZGUI.d.ts
@@ -119,7 +119,7 @@ declare module EZGUI {
         private _onStopCallback;
         constructor(object: any);
         to(properties: any, duration: any): Tween;
-        start(time: any): Tween;
+        start(time?: any): Tween;
         stop(): Tween;
         stopChainedTweens(): void;
         delay(amount: any): Tween;
@@ -190,7 +190,29 @@ declare module EZGUI {
     }
 }
 declare module EZGUI {
-    class GUISprite extends EZGUI.Compatibility.GUIDisplayObjectContainer {
+    class GUIObject extends EZGUI.Compatibility.GUIDisplayObjectContainer {
+        guiID: string;
+        userData: any;
+        container: PIXI.DisplayObjectContainer;
+        guiParent: GUISprite;
+        constructor();
+        protected setupEvents(): void;
+        originalAddChildAt(child: any, index: any): PIXI.DisplayObject;
+        originalAddChild(child: any): PIXI.DisplayObject;
+        addChild(child: any): PIXI.DisplayObject;
+        removeChild(child: any): PIXI.DisplayObject;
+        mouseInObj(event: any, guiSprite: any): boolean;
+        canTrigger(event: any, guiSprite: any): boolean;
+        on(event: any, fn: any, context?: any): void;
+        off(event: any, fn?: any, context?: any): void;
+        preUpdate(): void;
+        update(): void;
+        postUpdate(): void;
+        destroy(): void;
+    }
+}
+declare module EZGUI {
+    class GUISprite extends GUIObject {
         _settings: any;
         themeId: any;
         guiID: string;
@@ -201,30 +223,16 @@ declare module EZGUI {
         dragXInterval: number[];
         dragYInterval: number[];
         theme: Theme;
-        container: PIXI.DisplayObjectContainer;
         protected textObj: any;
-        guiParent: GUISprite;
         text: string;
         constructor(_settings: any, themeId: any);
-        protected setupEvents(): void;
         setDraggable(val?: boolean): void;
         protected handleEvents(): void;
         protected draw(): void;
         protected drawText(): void;
-        originalAddChildAt(child: any, index: any): PIXI.DisplayObject;
-        originalAddChild(child: any): PIXI.DisplayObject;
-        addChild(child: any): PIXI.DisplayObject;
-        removeChild(child: any): PIXI.DisplayObject;
         createChild(childSettings: any, order?: any): any;
-        mouseInObj(event: any, guiSprite: any): boolean;
-        canTrigger(event: any, guiSprite: any): boolean;
         setState(state?: string): void;
-        on(event: any, fn: any, context?: any): void;
-        off(event: any, fn?: any, context?: any): void;
-        preUpdate(): void;
-        update(): void;
-        postUpdate(): void;
-        destroy(): void;
+        animateTo(x: any, y: any, time?: number, easing?: (k: any) => any, callback?: any): void;
         protected getFrameConfig(config: any, state: any): any;
         protected getComponentConfig(component: any, part: any, side: any, state: any): any;
         protected createThemeCorner(settings: any, part: any, side: any, state: any): PIXI.Sprite;
@@ -256,6 +264,7 @@ declare module EZGUI.Component {
         constructor(_settings: any, themeId: any);
         protected handleEvents(): void;
         protected draw(): void;
+        protected drawText(): void;
     }
 }
 declare module EZGUI.Component {