Merge pull request #28 from pmacom/release/0.0.33

updating build
pmacom · May 5, 2022 · 2e904c1 · 2e904c1
2 parents 6ee229f + 20082a6
commit 2e904c1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 25 deletions.
diff --git a/src/utils/AnimationQueue.ts b/src/utils/AnimationQueue.ts
@@ -1,8 +1,4 @@
-// @ts-ignore
-import _Map from 'es6-map'
-
-// @ts-ignore
-import _Set from 'es6-set' 
+declare const Map: any
 
 /**
  * Usage
@@ -29,7 +25,7 @@ export interface Dash_AnimationQueue_Setting {
 class AnimationQueue_Controller implements ISystem {
     private system: ISystem
     private nonce: number = 0
-    private queue: typeof _Map = new _Map()
+    private queue: typeof Map = new Map()
     constructor(){ this.system = this }
     add(setting: Dash_AnimationQueue_Setting): Dash_AnimationQueue_Setting {
         setting.id = this.nonce++

diff --git a/src/utils/Countdown.ts b/src/utils/Countdown.ts
@@ -1,17 +1,17 @@
 import { Dash_OnUpdateFrame, Dash_OnUpdateFrame_Instance } from "./OnUpdateFrame"
-// @ts-ignore
-import _Map from 'es6-map'
 
-// @ts-ignore
-import _Set from 'es6-set' 
+declare const Set: any
 
 export class Dash_Countdown {
     private remaining: number = 0
     private timer: Dash_OnUpdateFrame_Instance
     private seconds: number = 0
-    private onCompleteMap: _Set<()=>void> = new _Set()
-    private onUpdateMap: _Set<(remaining: number) => void> = new _Set()
-    private onSecondMap: _Set<(remaining: number) => void> = new _Set()
+    private onCompleteMap: typeof Set = new Set()
+    private onUpdateMap: typeof Set = new Set()
+    private onSecondMap: typeof Set = new Set()
+    // private onCompleteMap: Set<()=>void> = new Set()
+    // private onUpdateMap: Set<(remaining: number) => void> = new Set()
+    // private onSecondMap: Set<(remaining: number) => void> = new Set()
 
     constructor(){
         this.timer = Dash_OnUpdateFrame.add((data: any, dt: number) => this.onFrame(data, dt))

diff --git a/src/utils/DynamicImage.ts b/src/utils/DynamicImage.ts
@@ -1,9 +1,6 @@
 import { Dash_OnUpdateFrame, Dash_OnUpdateFrame_Instance } from "../utils/OnUpdateFrame"
-// @ts-ignore
-import _Map from 'es6-map'
 
-// @ts-ignore
-import _Set from 'es6-set' 
+declare const Map: any
 
 interface IDynamicImageSettings {
     from: string | number,
@@ -20,7 +17,8 @@ interface IDynamicImageAction {
 
 export class DynamicImage {
     private animation: Dash_OnUpdateFrame_Instance
-    private tweens: _Map<string, IDynamicImageAction> = new _Map()
+    private tweens: typeof Map = new Map()
+    // private tweens: Map<string, IDynamicImageAction> = new Map()
 
     constructor(public image: UIImage){
         this.animation = Dash_OnUpdateFrame.add((data: any, dt: number) => this.update(data, dt))

diff --git a/src/utils/OnUpdateFrame.ts b/src/utils/OnUpdateFrame.ts
@@ -1,9 +1,3 @@
-// @ts-ignore
-import _Map from 'es6-map'
-
-// @ts-ignore
-import _Set from 'es6-set' 
-
 /**
  * Usage
  **
@@ -14,6 +8,8 @@ import _Set from 'es6-set'
     Wait(() => { trackEntityController.stop() }, 3)
 */
 
+declare const Map: any
+
 export interface Dash_OnUpdateFrame_Setting {
     id?: number
     data?: any
@@ -29,7 +25,7 @@ export interface Dash_OnUpdateFrame_Instance {
 export class Dash_OnUpdateFrame_Controller implements ISystem {
     private system: ISystem
     private nonce: number = 0
-    private queue: typeof _Map = new _Map()
+    private queue: typeof Map = new Map()
     constructor(){ this.system = this }
     add(onFrame: (data: any, dt: number) => void, data?: any): Dash_OnUpdateFrame_Instance {
         const setting = { id: this.nonce++, onFrame, data }