fix hitTestPoint bug and build

Author: himuil

build/egret/egret.d.ts

@@ -6039,7 +6039,7 @@ declare module eui {
          *
          * @param context
          */
-        $render(context: egret.sys.RenderContext): void;
+        $render(): void;
         /**
          * @private
          * UIComponentImpl 定义的所有变量请不要添加任何初始值，必须统一在此处初始化。
@@ -8592,10 +8592,6 @@ declare module eui {
          * @private
          */
         $measureContentBounds(bounds: egret.Rectangle): void;
-        /**
-         * @private
-         */
-        $render(context: egret.sys.RenderContext): void;
         private $fillColor;
         /**
          * @language en_US

build/egret/egret.js

@@ -8797,7 +8797,7 @@ var eui;
          *
          * @param context
          */
-        p.$render = function (context) {
+        p.$render = function () {
             var image = this.$Bitmap[0 /* bitmapData */];
             if (!image) {
                 return;
@@ -8809,7 +8809,7 @@ var eui;
                 return;
             }
             var values = this.$Bitmap;
-            egret.Bitmap.$drawImage(context, values[1 /* image */], values[2 /* clipX */], values[3 /* clipY */], values[4 /* clipWidth */], values[5 /* clipHeight */], values[6 /* offsetX */], values[7 /* offsetY */], values[8 /* width */], values[9 /* height */], width, height, this.$scale9Grid, this.$fillMode, values[10 /* smoothing */]);
+            egret.Bitmap.$drawImage(this.$renderNode, values[1 /* image */], values[2 /* bitmapX */], values[3 /* bitmapY */], values[4 /* bitmapWidth */], values[5 /* bitmapHeight */], values[6 /* offsetX */], values[7 /* offsetY */], values[8 /* textureWidth */], values[9 /* textureHeight */], width, height, this.scale9Grid, this.$fillMode, values[10 /* smoothing */]);
         };
         /**
          * @copy eui.UIComponent#createChildren
@@ -12441,8 +12441,7 @@ var eui;
             this.$ellipseHeight = 0;
             this.touchChildren = false;
             this.$graphics = new egret.Graphics();
-            this.$graphics.$renderContext.$targetDisplay = this;
-            this.$renderRegion = new egret.sys.Region();
+            this.$graphics.$setTarget(this);
             this.width = width;
             this.height = height;
             this.fillColor = fillColor;
@@ -12461,12 +12460,6 @@ var eui;
                 bounds.setTo(0, 0, this.width, this.height);
             }
         };
-        /**
-         * @private
-         */
-        p.$render = function (context) {
-            this.$graphics.$render(context);
-        };
         d(p, "fillColor"
             /**
              * @language en_US

build/egret/egret.min.js

@@ -201,7 +201,7 @@ declare module egret {
         /**
          * @private
          */
-        $render(context: sys.RenderContext): void;
+        $render(): void;
         /**
          * @private
          */

build/egret/egret.native.js

@@ -249,7 +249,7 @@ var egret;
              */
             this.lastTime = 0;
             this.$smoothing = egret.Bitmap.defaultSmoothing;
-            this.$renderRegion = new egret.sys.Region();
+            this.$renderNode = new egret.sys.BitmapNode();
             this.setMovieClipData(movieClipData);
         }
         var d = __define,c=MovieClip,p=c.prototype;
@@ -322,17 +322,18 @@ var egret;
         /**
          * @private
          */
-        p.$render = function (context) {
+        p.$render = function () {
             var texture = this.$bitmapData;
             if (texture) {
-                context.imageSmoothingEnabled = this.$smoothing;
                 var offsetX = Math.round(this.offsetPoint.x);
                 var offsetY = Math.round(this.offsetPoint.y);
                 var bitmapWidth = texture._bitmapWidth;
                 var bitmapHeight = texture._bitmapHeight;
+                var textureWidth = texture.$getTextureWidth();
+                var textureHeight = texture.$getTextureHeight();
                 var destW = Math.round(texture.$getScaleBitmapWidth());
                 var destH = Math.round(texture.$getScaleBitmapHeight());
-                context.drawImage(texture._bitmapData, texture._bitmapX, texture._bitmapY, bitmapWidth, bitmapHeight, offsetX, offsetY, destW, destH);
+                egret.Bitmap.$drawImage(this.$renderNode, texture._bitmapData, texture._bitmapX, texture._bitmapY, bitmapWidth, bitmapHeight, offsetX, offsetY, textureWidth, textureHeight, destW, destH, null, egret.BitmapFillMode.SCALE, this.$smoothing);
             }
         };
         /**

build/egret/egret.native.min.js

@@ -4885,7 +4885,6 @@ declare module egret.gui {
          */
         $graphics: Graphics;
         graphics: Graphics;
-        $render(context: egret.sys.RenderContext): void;
         $hitTest(stageX: number, stageY: number): DisplayObject;
         /**
          * @private
@@ -6416,7 +6415,7 @@ declare module egret.gui {
         /**
          * @private
          */
-        $render(context: sys.RenderContext): void;
+        $render(): void;
         /**
          * @private
          */

build/egret/egret.web.js

@@ -12933,23 +12933,17 @@ var egret;
                 this._strokeAlpha = 0;
                 this._strokeWeight = 1;
                 this.touchChildren = false;
-                this.$renderRegion = new egret.sys.Region();
             }
             var d = __define,c=Rect,p=c.prototype;
             d(p, "graphics"
                 ,function () {
                     if (!this.$graphics) {
                         this.$graphics = new egret.Graphics();
-                        this.$graphics.$renderContext.$targetDisplay = this;
+                        this.$graphics.$setTarget(this);
                     }
                     return this.$graphics;
                 }
             );
-            p.$render = function (context) {
-                if (this.$graphics)
-                    this.$graphics.$render(context);
-                _super.prototype.$render.call(this, context);
-            };
             p.$hitTest = function (stageX, stageY) {
                 var target = _super.prototype.$hitTest.call(this, stageX, stageY);
                 if (target == this) {
@@ -16685,7 +16679,7 @@ var egret;
                 if (source) {
                     this.source = source;
                 }
-                this.$renderRegion = new egret.sys.Region();
+                this.$renderNode = new egret.sys.BitmapNode();
                 this.autoScale = autoScale;
             }
             var d = __define,c=UIAsset,p=c.prototype;
@@ -16871,10 +16865,9 @@ var egret;
             /**
              * @private
              */
-            p.$render = function (context) {
+            p.$render = function () {
                 if (this._contentIsTexture) {
                     var bitmapData = this._content;
-                    context.imageSmoothingEnabled = this.$smoothing;
                     var destW;
                     var destH;
                     if (this.autoScale) {
@@ -16885,9 +16878,9 @@ var egret;
                         destW = bitmapData.$getTextureWidth();
                         destH = bitmapData.$getTextureHeight();
                     }
-                    egret.Bitmap.$drawImage(context, bitmapData._bitmapData, bitmapData._bitmapX, bitmapData._bitmapY, bitmapData._bitmapWidth, bitmapData._bitmapHeight, bitmapData._offsetX, bitmapData._offsetY, bitmapData.$getTextureWidth(), bitmapData.$getTextureHeight(), destW, destH, this.scale9Grid || bitmapData["scale9Grid"], this.fillMode, this.$smoothing);
+                    egret.Bitmap.$drawImage(this.$renderNode, bitmapData._bitmapData, bitmapData._bitmapX, bitmapData._bitmapY, bitmapData._bitmapWidth, bitmapData._bitmapHeight, bitmapData._offsetX, bitmapData._offsetY, bitmapData.$getTextureWidth(), bitmapData.$getTextureHeight(), destW, destH, this.scale9Grid || bitmapData["scale9Grid"], this.fillMode, this.$smoothing);
                 }
-                _super.prototype.$render.call(this, context);
+                _super.prototype.$render.call(this);
             };
             /**
              * @private

build/egret/egret.web.min.js

@@ -1197,7 +1197,7 @@ declare module RES {
     function hasRes(key: string): boolean;
     /**
      * @language en_US
-     * Run time dynamic analysis of a configuration file.
+     * parse a configuration file at run time，it will not clean the exist data.
      * @param data Configuration file data, please refer to the resource.json configuration file format. JSON object can be introduced into the corresponding.
      * @param folder Path prefix for load.
      * @see #setMaxRetryTimes
@@ -1206,7 +1206,7 @@ declare module RES {
      */
     /**
      * @language zh_CN
-     * 运行时动态解析一个配置文件。
+     * 运行时动态解析一个配置文件,此操作不会清空之前已存在的配置。
      * @param data 配置文件数据，请参考 resource.json 的配置文件格式。传入对应的 json 对象即可。
      * @param folder 加载项的路径前缀。
      * @see #setMaxRetryTimes

build/eui/eui.d.ts

@@ -2500,7 +2500,7 @@ var RES;
     RES.hasRes = hasRes;
     /**
      * @language en_US
-     * Run time dynamic analysis of a configuration file.
+     * parse a configuration file at run time，it will not clean the exist data.
      * @param data Configuration file data, please refer to the resource.json configuration file format. JSON object can be introduced into the corresponding.
      * @param folder Path prefix for load.
      * @see #setMaxRetryTimes
@@ -2509,7 +2509,7 @@ var RES;
      */
     /**
      * @language zh_CN
-     * 运行时动态解析一个配置文件。
+     * 运行时动态解析一个配置文件,此操作不会清空之前已存在的配置。
      * @param data 配置文件数据，请参考 resource.json 的配置文件格式。传入对应的 json 对象即可。
      * @param folder 加载项的路径前缀。
      * @see #setMaxRetryTimes

build/eui/eui.js

@@ -2048,10 +2048,10 @@ module egret {
                 rectangle.setTo(localX, localY, 3, 3);
                 var renderTexture = new RenderTexture();
                 renderTexture.drawToTexture(this, rectangle);
-                var context = renderTexture["context"];
+                var context = renderTexture["renderBuffer"];
                 var data:number[];
                 try {
-                    data = context.getImageData(0, 0, 1, 1).data;
+                    data = context.getPixel(0, 0);
                 }
                 catch (e) {
                     throw new Error(sys.tr(1040));

build/eui/eui.min.js

@@ -320,6 +320,7 @@ module egret.native {
          * @platform Web,Native
          */
         public quadraticCurveTo(cpx:number, cpy:number, x:number, y:number):void {
+            //console.log("quadraticCurveTo " + cpx + " " + cpy + " " + x + " " + y);
             this.$nativeContext.quadraticCurveTo(cpx, cpy, x, y);
         }
 
@@ -332,6 +333,7 @@ module egret.native {
          * @platform Web,Native
          */
         public lineTo(x:number, y:number):void {
+            //console.log("lineTo " + x + " " + y);
             this.$nativeContext.lineTo(x, y);
         }