build 1.1.5

hiloteam · Dec 12, 2017 · 0c2446b · 0c2446b
1 parent 0f5b1ec
commit 0c2446b
Show file tree

Hide file tree

Showing 402 changed files with 2,259 additions and 2,008 deletions.
diff --git a/build/amd/hilo-amd.js b/build/amd/hilo-amd.js
diff --git a/build/amd/hilo-amd.min.js b/build/amd/hilo-amd.min.js
diff --git a/build/amd/hilo-amd.zip b/build/amd/hilo-amd.zip
diff --git a/build/amd/hilo/core/Class.js b/build/amd/hilo/core/Class.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */

diff --git a/build/amd/hilo/core/Class.min.js b/build/amd/hilo/core/Class.min.js
diff --git a/build/amd/hilo/core/Hilo.js b/build/amd/hilo/core/Hilo.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */
@@ -25,7 +25,7 @@ var Hilo = {
      * Hilo version
      * @type String
      */
-    version:'1.1.4',
+    version:'1.1.5',
     /**
      * @language=en
      * Gets a globally unique id. Such as Stage1, Bitmap2 etc.

diff --git a/build/amd/hilo/core/Hilo.min.js b/build/amd/hilo/core/Hilo.min.js
diff --git a/build/amd/hilo/event/EventMixin.js b/build/amd/hilo/event/EventMixin.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */

diff --git a/build/amd/hilo/event/EventMixin.min.js b/build/amd/hilo/event/EventMixin.min.js
diff --git a/build/amd/hilo/game/Camera.js b/build/amd/hilo/game/Camera.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */

diff --git a/build/amd/hilo/game/Camera.min.js b/build/amd/hilo/game/Camera.min.js
diff --git a/build/amd/hilo/game/Camera3d.js b/build/amd/hilo/game/Camera3d.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */

diff --git a/build/amd/hilo/game/Camera3d.min.js b/build/amd/hilo/game/Camera3d.min.js
diff --git a/build/amd/hilo/game/ParticleSystem.js b/build/amd/hilo/game/ParticleSystem.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */

diff --git a/build/amd/hilo/game/ParticleSystem.min.js b/build/amd/hilo/game/ParticleSystem.min.js
diff --git a/build/amd/hilo/geom/Matrix.js b/build/amd/hilo/geom/Matrix.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */

diff --git a/build/amd/hilo/geom/Matrix.min.js b/build/amd/hilo/geom/Matrix.min.js
diff --git a/build/amd/hilo/loader/ImageLoader.js b/build/amd/hilo/loader/ImageLoader.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */

diff --git a/build/amd/hilo/loader/ImageLoader.min.js b/build/amd/hilo/loader/ImageLoader.min.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */

diff --git a/build/amd/hilo/loader/LoadQueue.js b/build/amd/hilo/loader/LoadQueue.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */

diff --git a/build/amd/hilo/loader/LoadQueue.min.js b/build/amd/hilo/loader/LoadQueue.min.js
diff --git a/build/amd/hilo/loader/ScriptLoader.js b/build/amd/hilo/loader/ScriptLoader.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */

diff --git a/build/amd/hilo/loader/ScriptLoader.min.js b/build/amd/hilo/loader/ScriptLoader.min.js
diff --git a/build/amd/hilo/media/HTMLAudio.js b/build/amd/hilo/media/HTMLAudio.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */

diff --git a/build/amd/hilo/media/HTMLAudio.min.js b/build/amd/hilo/media/HTMLAudio.min.js
diff --git a/build/amd/hilo/media/WebAudio.js b/build/amd/hilo/media/WebAudio.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */

diff --git a/build/amd/hilo/media/WebAudio.min.js b/build/amd/hilo/media/WebAudio.min.js
diff --git a/build/amd/hilo/media/WebSound.js b/build/amd/hilo/media/WebSound.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */

diff --git a/build/amd/hilo/media/WebSound.min.js b/build/amd/hilo/media/WebSound.min.js
diff --git a/build/amd/hilo/renderer/CanvasRenderer.js b/build/amd/hilo/renderer/CanvasRenderer.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */
@@ -137,53 +137,9 @@ var CanvasRenderer = Class.create(/** @lends CanvasRenderer.prototype */{
             //alignment
             var align = target.align;
             if(align){
-                if(typeof align === 'function'){
-                    target.align();
-                }else{
-                    var parent = target.parent;
-                    if(parent){
-                        var w = target.width, h = target.height,
-                            pw = parent.width, ph = parent.height;
-                        switch(align){
-                            case 'TL':
-                                x = 0;
-                                y = 0;
-                                break;
-                            case 'T':
-                                x = pw - w >> 1;
-                                y = 0;
-                                break;
-                            case 'TR':
-                                x = pw - w;
-                                y = 0;
-                                break;
-                            case 'L':
-                                x = 0;
-                                y = ph - h >> 1;
-                                break;
-                            case 'C':
-                                x = pw - w >> 1;
-                                y = ph - h >> 1;
-                                break;
-                            case 'R':
-                                x = pw - w;
-                                y = ph - h >> 1;
-                                break;
-                            case 'BL':
-                                x = 0;
-                                y = ph - h;
-                                break;
-                            case 'B':
-                                x = pw - w >> 1;
-                                y = ph - h;
-                                break;
-                            case 'BR':
-                                x = pw - w;
-                                y = ph - h;
-                                break;
-                        }
-                    }
-                }
+                var pos = target.getAlignPosition();
+                x = pos.x;
+                y = pos.y;
             }
 
             if(x != 0 || y != 0) ctx.translate(x, y);

diff --git a/build/amd/hilo/renderer/CanvasRenderer.min.js b/build/amd/hilo/renderer/CanvasRenderer.min.js
diff --git a/build/amd/hilo/renderer/DOMRenderer.js b/build/amd/hilo/renderer/DOMRenderer.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */

diff --git a/build/amd/hilo/renderer/DOMRenderer.min.js b/build/amd/hilo/renderer/DOMRenderer.min.js
diff --git a/build/amd/hilo/renderer/Renderer.js b/build/amd/hilo/renderer/Renderer.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */

diff --git a/build/amd/hilo/renderer/Renderer.min.js b/build/amd/hilo/renderer/Renderer.min.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */

diff --git a/build/amd/hilo/renderer/WebGLRenderer.js b/build/amd/hilo/renderer/WebGLRenderer.js
@@ -1,5 +1,5 @@
 /**
- * Hilo 1.1.4 for amd
+ * Hilo 1.1.5 for amd
  * Copyright 2016 alibaba.com
  * Licensed under the MIT License
  */
@@ -431,12 +431,13 @@ var WebGLRenderer = Class.create(/** @lends WebGLRenderer.prototype */{
             sin = Math.sin(r);
         }
 
+        var pos = view.getAlignPosition();
         mtx.a = cos*scaleX;
         mtx.b = sin*scaleX;
         mtx.c = -sin*scaleY;
         mtx.d = cos*scaleY;
-        mtx.tx =  view.x - mtx.a * pivotX - mtx.c * pivotY;
-        mtx.ty =  view.y - mtx.b * pivotX - mtx.d * pivotY;
+        mtx.tx =  pos.x - mtx.a * pivotX - mtx.c * pivotY;
+        mtx.ty =  pos.y - mtx.b * pivotX - mtx.d * pivotY;
 
         mtx.concat(ancestor.__webglWorldMatrix);
     },