全部移动至es模块

source/src/ECS/Utils/EntityList.ts

@@ -160,7 +160,7 @@ module es {
             this.updateLists();
 
             for (let i = 0; i < this._entities.length; i ++){
-                this._entities[i]._isDestoryed = true;
+                this._entities[i]._isDestroyed = true;
                 this._entities[i].onRemovedFromScene();
                 this._entities[i].scene = null;
             }

source/src/ECS/Utils/Matcher.ts

@@ -1,62 +1,64 @@
-class Matcher{
-    protected allSet = new BitSet();
-    protected exclusionSet = new BitSet();
-    protected oneSet = new BitSet();
+module es {
+    export class Matcher{
+        protected allSet = new BitSet();
+        protected exclusionSet = new BitSet();
+        protected oneSet = new BitSet();
 
-    public static empty(){
-        return new Matcher();
-    }
-
-    public getAllSet(){
-        return this.allSet;
-    }
-
-    public getExclusionSet(){
-        return this.exclusionSet;
-    }
-
-    public getOneSet(){
-        return this.oneSet;
-    }
-
-    public IsIntersted(e: Entity){
-        if (!this.allSet.isEmpty()){
-            for (let i = this.allSet.nextSetBit(0); i >= 0; i = this.allSet.nextSetBit(i + 1)){
-                if (!e.componentBits.get(i))
-                    return false;
-            }
+        public static empty(){
+            return new Matcher();
         }
 
-        if (!this.exclusionSet.isEmpty() && this.exclusionSet.intersects(e.componentBits))
-            return false;
+        public getAllSet(){
+            return this.allSet;
+        }
 
-        if (!this.oneSet.isEmpty() && !this.oneSet.intersects(e.componentBits))
-            return false;
+        public getExclusionSet(){
+            return this.exclusionSet;
+        }
 
-        return true;
+        public getOneSet(){
+            return this.oneSet;
+        }
+
+        public IsIntersted(e: Entity){
+            if (!this.allSet.isEmpty()){
+                for (let i = this.allSet.nextSetBit(0); i >= 0; i = this.allSet.nextSetBit(i + 1)){
+                    if (!e.componentBits.get(i))
+                        return false;
+                }
+            }
+
+            if (!this.exclusionSet.isEmpty() && this.exclusionSet.intersects(e.componentBits))
+                return false;
+
+            if (!this.oneSet.isEmpty() && !this.oneSet.intersects(e.componentBits))
+                return false;
+
+            return true;
+        }
+
+        public all(...types: any[]): Matcher{
+            types.forEach(type => {
+                this.allSet.set(ComponentTypeManager.getIndexFor(type));
+            });
+
+            return this;
+        }
+
+        public exclude(...types: any[]){
+            types.forEach(type => {
+                this.exclusionSet.set(ComponentTypeManager.getIndexFor(type));
+            });
+
+            return this;
+        }
+
+        public one(...types: any[]){
+            types.forEach(type => {
+                this.oneSet.set(ComponentTypeManager.getIndexFor(type));
+            });
+
+            return this;
+        }
     }
-
-    public all(...types: any[]): Matcher{
-        types.forEach(type => {
-            this.allSet.set(ComponentTypeManager.getIndexFor(type));
-        });
-
-        return this;
-    }
-
-    public exclude(...types: any[]){
-        types.forEach(type => {
-            this.exclusionSet.set(ComponentTypeManager.getIndexFor(type));
-        });
-
-        return this;
-    }
-
-    public one(...types: any[]){
-        types.forEach(type => {
-            this.oneSet.set(ComponentTypeManager.getIndexFor(type));
-        });
-
-        return this;
-    }
-}
+}

source/src/ECS/Utils/TextureUtils.ts

@@ -1,154 +1,156 @@
-/**
- * 纹理帮助类
- */
-class TextureUtils {
-    public static sharedCanvas: HTMLCanvasElement;
-    public static sharedContext: CanvasRenderingContext2D;
+module es {
+    /**
+     * 纹理帮助类
+     */
+    export class TextureUtils {
+        public static sharedCanvas: HTMLCanvasElement;
+        public static sharedContext: CanvasRenderingContext2D;
 
-    public static convertImageToCanvas(texture: egret.Texture, rect?: egret.Rectangle): HTMLCanvasElement{
-        if (!this.sharedCanvas){
-            this.sharedCanvas = egret.sys.createCanvas();
-            this.sharedContext = this.sharedCanvas.getContext("2d");
-        }
+        public static convertImageToCanvas(texture: egret.Texture, rect?: egret.Rectangle): HTMLCanvasElement{
+            if (!this.sharedCanvas){
+                this.sharedCanvas = egret.sys.createCanvas();
+                this.sharedContext = this.sharedCanvas.getContext("2d");
+            }
 
-        let w = texture.$getTextureWidth();
-        let h = texture.$getTextureHeight();
-        if (!rect){
-            rect = egret.$TempRectangle;
-            rect.x = 0;
-            rect.y = 0;
-            rect.width = w;
-            rect.height = h;
-        }
-        
-        rect.x = Math.min(rect.x, w - 1);
-        rect.y = Math.min(rect.y, h - 1);
-        rect.width = Math.min(rect.width, w - rect.x);
-        rect.height = Math.min(rect.height, h - rect.y);
+            let w = texture.$getTextureWidth();
+            let h = texture.$getTextureHeight();
+            if (!rect){
+                rect = egret.$TempRectangle;
+                rect.x = 0;
+                rect.y = 0;
+                rect.width = w;
+                rect.height = h;
+            }
 
-        let iWidth = Math.floor(rect.width);
-        let iHeight = Math.floor(rect.height);
-        let surface = this.sharedCanvas;
-        surface["style"]["width"] = iWidth + "px";
-        surface["style"]["height"] = iHeight + "px";
-        this.sharedCanvas.width = iWidth;
-        this.sharedCanvas.height = iHeight;
+            rect.x = Math.min(rect.x, w - 1);
+            rect.y = Math.min(rect.y, h - 1);
+            rect.width = Math.min(rect.width, w - rect.x);
+            rect.height = Math.min(rect.height, h - rect.y);
 
-        if (egret.Capabilities.renderMode == "webgl") {
-            let renderTexture: egret.RenderTexture;
-            //webgl下非RenderTexture纹理先画到RenderTexture
-            if (!(<egret.RenderTexture>texture).$renderBuffer) {
-                if (egret.sys.systemRenderer["renderClear"]) {
-                    egret.sys.systemRenderer["renderClear"]();
+            let iWidth = Math.floor(rect.width);
+            let iHeight = Math.floor(rect.height);
+            let surface = this.sharedCanvas;
+            surface["style"]["width"] = iWidth + "px";
+            surface["style"]["height"] = iHeight + "px";
+            this.sharedCanvas.width = iWidth;
+            this.sharedCanvas.height = iHeight;
+
+            if (egret.Capabilities.renderMode == "webgl") {
+                let renderTexture: egret.RenderTexture;
+                //webgl下非RenderTexture纹理先画到RenderTexture
+                if (!(<egret.RenderTexture>texture).$renderBuffer) {
+                    if (egret.sys.systemRenderer["renderClear"]) {
+                        egret.sys.systemRenderer["renderClear"]();
+                    }
+                    renderTexture = new egret.RenderTexture();
+                    renderTexture.drawToTexture(new egret.Bitmap(texture));
                 }
-                renderTexture = new egret.RenderTexture();
-                renderTexture.drawToTexture(new egret.Bitmap(texture));
+                else {
+                    renderTexture = <egret.RenderTexture>texture;
+                }
+                //从RenderTexture中读取像素数据，填入canvas
+                let pixels = renderTexture.$renderBuffer.getPixels(rect.x, rect.y, iWidth, iHeight);
+                let x = 0;
+                let y = 0;
+                for (let i = 0; i < pixels.length; i += 4) {
+                    this.sharedContext.fillStyle =
+                        'rgba(' + pixels[i]
+                        + ',' + pixels[i + 1]
+                        + ',' + pixels[i + 2]
+                        + ',' + (pixels[i + 3] / 255) + ')';
+                    this.sharedContext.fillRect(x, y, 1, 1);
+                    x++;
+                    if (x == iWidth) {
+                        x = 0;
+                        y++;
+                    }
+                }
+
+                if (!(<egret.RenderTexture>texture).$renderBuffer) {
+                    renderTexture.dispose();
+                }
+
+                return surface;
             }
             else {
-                renderTexture = <egret.RenderTexture>texture;
+                let bitmapData = texture;
+                let offsetX: number = Math.round(bitmapData.$offsetX);
+                let offsetY: number = Math.round(bitmapData.$offsetY);
+                let bitmapWidth: number = bitmapData.$bitmapWidth;
+                let bitmapHeight: number = bitmapData.$bitmapHeight;
+                let $TextureScaleFactor = SceneManager.stage.textureScaleFactor;
+                this.sharedContext.drawImage(bitmapData.$bitmapData.source, bitmapData.$bitmapX + rect.x / $TextureScaleFactor, bitmapData.$bitmapY + rect.y / $TextureScaleFactor,
+                    bitmapWidth * rect.width / w, bitmapHeight * rect.height / h, offsetX, offsetY, rect.width, rect.height);
+                return surface;
             }
-            //从RenderTexture中读取像素数据，填入canvas
-            let pixels = renderTexture.$renderBuffer.getPixels(rect.x, rect.y, iWidth, iHeight);
-            let x = 0;
-            let y = 0;
-            for (let i = 0; i < pixels.length; i += 4) {
-                this.sharedContext.fillStyle =
-                    'rgba(' + pixels[i]
-                    + ',' + pixels[i + 1]
-                    + ',' + pixels[i + 2]
-                    + ',' + (pixels[i + 3] / 255) + ')';
-                this.sharedContext.fillRect(x, y, 1, 1);
-                x++;
-                if (x == iWidth) {
-                    x = 0;
-                    y++;
-                }
-            }
-
-            if (!(<egret.RenderTexture>texture).$renderBuffer) {
-                renderTexture.dispose();
-            }
-
-            return surface;
         }
-        else {
-            let bitmapData = texture;
-            let offsetX: number = Math.round(bitmapData.$offsetX);
-            let offsetY: number = Math.round(bitmapData.$offsetY);
-            let bitmapWidth: number = bitmapData.$bitmapWidth;
-            let bitmapHeight: number = bitmapData.$bitmapHeight;
-            let $TextureScaleFactor = SceneManager.stage.textureScaleFactor;
-            this.sharedContext.drawImage(bitmapData.$bitmapData.source, bitmapData.$bitmapX + rect.x / $TextureScaleFactor, bitmapData.$bitmapY + rect.y / $TextureScaleFactor,
-                bitmapWidth * rect.width / w, bitmapHeight * rect.height / h, offsetX, offsetY, rect.width, rect.height);
-            return surface;
-        }
-    }
 
-    public static toDataURL(type: string, texture: egret.Texture, rect?: egret.Rectangle, encoderOptions?): string {
-        try {
+        public static toDataURL(type: string, texture: egret.Texture, rect?: egret.Rectangle, encoderOptions?): string {
+            try {
+                let surface = this.convertImageToCanvas(texture, rect);
+                let result = surface.toDataURL(type, encoderOptions);
+                return result;
+            }
+            catch (e) {
+                egret.$error(1033);
+            }
+            return null;
+        }
+
+        /**
+         * 有些杀毒软件认为 saveToFile 可能是一个病毒文件
+         * @param type
+         * @param texture
+         * @param filePath
+         * @param rect
+         * @param encoderOptions
+         */
+        public static eliFoTevas(type: string, texture: egret.Texture, filePath: string, rect?: egret.Rectangle, encoderOptions?): void {
             let surface = this.convertImageToCanvas(texture, rect);
-            let result = surface.toDataURL(type, encoderOptions);
+            let result = (surface as any).toTempFilePathSync({
+                fileType: type.indexOf("png") >= 0 ? "png" : "jpg"
+            });
+
+            wx.getFileSystemManager().saveFile({
+                tempFilePath: result,
+                filePath: `${wx.env.USER_DATA_PATH}/${filePath}`,
+                success: function (res) {
+                    //todo
+                }
+            })
+
             return result;
         }
-        catch (e) {
-            egret.$error(1033);
+
+        public static getPixel32(texture: egret.Texture, x: number, y: number): number[] {
+            egret.$warn(1041, "getPixel32", "getPixels");
+            return texture.getPixels(x, y);
         }
-        return null;
-    }
 
-    /**
-     * 有些杀毒软件认为 saveToFile 可能是一个病毒文件
-     * @param type 
-     * @param texture 
-     * @param filePath 
-     * @param rect 
-     * @param encoderOptions 
-     */
-    public static eliFoTevas(type: string, texture: egret.Texture, filePath: string, rect?: egret.Rectangle, encoderOptions?): void {
-        let surface = this.convertImageToCanvas(texture, rect);
-        let result = (surface as any).toTempFilePathSync({
-            fileType: type.indexOf("png") >= 0 ? "png" : "jpg"
-        });
-
-        wx.getFileSystemManager().saveFile({
-            tempFilePath: result,
-            filePath: `${wx.env.USER_DATA_PATH}/${filePath}`,
-            success: function (res) {
-                //todo
+        public static getPixels(texture: egret.Texture, x: number, y: number, width: number = 1, height: number = 1): number[] {
+            //webgl环境下不需要转换成canvas获取像素信息
+            if (egret.Capabilities.renderMode == "webgl") {
+                let renderTexture: egret.RenderTexture;
+                //webgl下非RenderTexture纹理先画到RenderTexture
+                if (!(<egret.RenderTexture>texture).$renderBuffer) {
+                    renderTexture = new egret.RenderTexture();
+                    renderTexture.drawToTexture(new egret.Bitmap(texture));
+                }
+                else {
+                    renderTexture = <egret.RenderTexture>texture;
+                }
+                //从RenderTexture中读取像素数据
+                let pixels = renderTexture.$renderBuffer.getPixels(x, y, width, height);
+                return pixels;
             }
-        })
-
-        return result;
-    }
-
-    public static getPixel32(texture: egret.Texture, x: number, y: number): number[] {
-        egret.$warn(1041, "getPixel32", "getPixels");
-        return texture.getPixels(x, y);
-    }
-
-    public static getPixels(texture: egret.Texture, x: number, y: number, width: number = 1, height: number = 1): number[] {
-        //webgl环境下不需要转换成canvas获取像素信息
-        if (egret.Capabilities.renderMode == "webgl") {
-            let renderTexture: egret.RenderTexture;
-            //webgl下非RenderTexture纹理先画到RenderTexture
-            if (!(<egret.RenderTexture>texture).$renderBuffer) {
-                renderTexture = new egret.RenderTexture();
-                renderTexture.drawToTexture(new egret.Bitmap(texture));
+            try {
+                let surface = this.convertImageToCanvas(texture);
+                let result = this.sharedContext.getImageData(x, y, width, height).data;
+                return <number[]><any>result;
             }
-            else {
-                renderTexture = <egret.RenderTexture>texture;
+            catch (e) {
+                egret.$error(1039);
             }
-            //从RenderTexture中读取像素数据
-            let pixels = renderTexture.$renderBuffer.getPixels(x, y, width, height);
-            return pixels;
-        }
-        try {
-            let surface = this.convertImageToCanvas(texture);
-            let result = this.sharedContext.getImageData(x, y, width, height).data;
-            return <number[]><any>result;
-        }
-        catch (e) {
-            egret.$error(1039);
         }
     }
-}
+}

source/src/ECS/Utils/Time.ts

@@ -1,38 +1,40 @@
-/** 提供帧定时信息 */
-class Time {
-    /** deltaTime的未缩放版本。不受时间尺度的影响 */
-    public static unscaledDeltaTime;
-    /** 前一帧到当前帧的时间增量，按时间刻度进行缩放 */
-    public static deltaTime: number = 0;
-    /** 时间刻度缩放 */
-    public static timeScale = 1;
-    /** 已传递的帧总数 */
-    public static frameCount = 0;
-    
-    private static _lastTime = 0;
-    /** 自场景加载以来的总时间 */
-    public static _timeSinceSceneLoad;
+module es {
+    /** 提供帧定时信息 */
+    export class Time {
+        /** deltaTime的未缩放版本。不受时间尺度的影响 */
+        public static unscaledDeltaTime;
+        /** 前一帧到当前帧的时间增量，按时间刻度进行缩放 */
+        public static deltaTime: number = 0;
+        /** 时间刻度缩放 */
+        public static timeScale = 1;
+        /** 已传递的帧总数 */
+        public static frameCount = 0;
 
-    public static update(currentTime: number){
-        let dt = (currentTime - this._lastTime) / 1000;
-        this.deltaTime = dt * this.timeScale;
-        this.unscaledDeltaTime = dt;
-        this._timeSinceSceneLoad += dt;
-        this.frameCount ++;
+        private static _lastTime = 0;
+        /** 自场景加载以来的总时间 */
+        public static _timeSinceSceneLoad;
 
-        this._lastTime = currentTime;
+        public static update(currentTime: number){
+            let dt = (currentTime - this._lastTime) / 1000;
+            this.deltaTime = dt * this.timeScale;
+            this.unscaledDeltaTime = dt;
+            this._timeSinceSceneLoad += dt;
+            this.frameCount ++;
+
+            this._lastTime = currentTime;
+        }
+
+        public static sceneChanged(){
+            this._timeSinceSceneLoad = 0;
+        }
+
+        /**
+         * 允许在间隔检查。只应该使用高于delta的间隔值，否则它将始终返回true。
+         * @param interval
+         */
+        public static checkEvery(interval: number){
+            // 我们减去了delta，因为timeSinceSceneLoad已经包含了这个update ticks delta
+            return (this._timeSinceSceneLoad / interval) > ((this._timeSinceSceneLoad - this.deltaTime) / interval);
+        }
     }
-
-    public static sceneChanged(){
-        this._timeSinceSceneLoad = 0;
-    }
-
-    /**
-     * 允许在间隔检查。只应该使用高于delta的间隔值，否则它将始终返回true。
-     * @param interval 
-     */
-    public static checkEvery(interval: number){
-        // 我们减去了delta，因为timeSinceSceneLoad已经包含了这个update ticks delta
-        return (this._timeSinceSceneLoad / interval) > ((this._timeSinceSceneLoad - this.deltaTime) / interval);
-    }
-}
+}