Merge branch 'v1.3' of github.com:cocos-creator/engine into v1.3

hellozhangran · Dec 20, 2016 · 1719ccf · 1719ccf
2 parents fa8cae5 + fb65f2f
commit 1719ccf
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 12 deletions.
diff --git a/cocos2d/clipping-nodes/CCClippingNode.js b/cocos2d/clipping-nodes/CCClippingNode.js
@@ -42,7 +42,7 @@
  * @property {_ccsg.Node}  stencil         - he ccsg.Node to use as a stencil to do the clipping.
  */
 cc.ClippingNode = _ccsg.Node.extend(/** @lends cc.ClippingNode# */{
-    alphaThreshold: 0,
+    alphaThreshold: 1,
     inverted: false,
 
     _stencil: null,

diff --git a/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js b/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js
@@ -47,6 +47,9 @@ proto.setStencil = function(stencil){
     }
 };
 
+// should reset program used by _stencil
+proto.resetProgramByStencil = function () { };
+
 proto._restoreCmdCallback = function (ctx) {
     var wrapper = ctx || cc._renderContext;
     wrapper.restore();

diff --git a/cocos2d/core/components/CCMask.js b/cocos2d/core/components/CCMask.js
@@ -114,12 +114,12 @@ var Mask = cc.Class({
 
         /**
          * !#en
-         * The alpha threshold.  <br/>
+         * The alpha threshold.(Not supported Canvas Mode) <br/>
          * The content is drawn only where the stencil have pixel with alpha greater than the alphaThreshold. <br/>
          * Should be a float between 0 and 1. <br/>
          * This default to 1 (so alpha test is disabled).
          * !#zh
-         * Alpha 阈值 <br/>
+         * Alpha 阈值（不支持 Canvas 模式）<br/>
          * 只有当模板的像素的 alpha 大于 alphaThreshold 时，才会绘制内容。<br/>
          * 该数值 0 ~ 1 之间的浮点数，默认值为 1（因此禁用 alpha）
          * @property alphaThreshold
@@ -133,13 +133,17 @@ var Mask = cc.Class({
             slide: true,
             tooltip: 'i18n:COMPONENT.mask.alphaThreshold',
             notify: function() {
+                if (cc._renderType === cc.game.RENDER_TYPE_CANVAS) {
+                    cc.warn("The alphaThreshold invalid in Canvas Mode.");
+                    return;
+                }
                 this._sgNode.setAlphaThreshold(this.alphaThreshold);
             }
         },
 
         /**
-         * !#en Reverse mask
-         * !#zh 反向遮罩
+         * !#en Reverse mask (Not supported Canvas Mode)
+         * !#zh 反向遮罩（不支持 Canvas 模式）
          * @property inverted
          * @type {Boolean}
          * @default false
@@ -149,6 +153,10 @@ var Mask = cc.Class({
             type: cc.Boolean,
             tooltip: 'i18n:COMPONENT.mask.inverted',
             notify: function() {
+                if (cc._renderType === cc.game.RENDER_TYPE_CANVAS) {
+                    cc.warn("The inverted invalid in Canvas Mode.");
+                    return;
+                }
                 this._sgNode.setInverted(this.inverted);
             }
         },
@@ -251,7 +259,7 @@ var Mask = cc.Class({
         this.node.off('size-changed', this._refreshStencil, this);
         this.node.off('anchor-changed', this._refreshStencil, this);
     },
-    
+
     _calculateCircle: function(center, radius, segements) {
         var polies =[];
         var anglePerStep = Math.PI * 2 / segements;
@@ -276,6 +284,7 @@ var Mask = cc.Class({
             }
             stencil.setContentSize(contentSize);
             stencil.setAnchorPoint(anchorPoint);
+            this._sgNode.setAlphaThreshold(this.alphaThreshold);
         }
         else {
             var isDrawNode = stencil instanceof cc.DrawNode;
@@ -309,7 +318,6 @@ var Mask = cc.Class({
             }
         }
         this._sgNode.setInverted(this.inverted);
-        this._sgNode.setAlphaThreshold(this.alphaThreshold);
         this._clippingStencil = stencil;
         if (!CC_JSB) {
             cc.renderer.childrenOrderDirty = true;

diff --git a/cocos2d/core/components/CCPageView.js b/cocos2d/core/components/CCPageView.js
@@ -530,20 +530,25 @@ var PageView = cc.Class({
 
     _getDragDirection: function (moveOffset) {
         if (this.direction === Direction.Horizontal) {
+            if (moveOffset.x === 0) { return 0; }
             return (moveOffset.x > 0 ? 1 : -1);
         }
         else if (this.direction === Direction.Vertical) {
             // 由于滚动 Y 轴的原点在在右上角所以应该是小于 0
+            if (moveOffset.y === 0) { return 0; }
             return (moveOffset.y < 0 ? 1 : -1);
         }
     },
 
     _handleReleaseLogic: function(touch) {
         var bounceBackStarted = this._startBounceBackIfNeeded();
-        var index = this._curPageIdx, nextIndex = 0;
         var moveOffset = cc.pSub(this._touchBeganPosition, this._touchEndPosition);
         if (bounceBackStarted) {
-            if (this._getDragDirection(moveOffset) > 0) {
+            var dragDirection = this._getDragDirection(moveOffset);
+            if (dragDirection === 0) {
+                return;
+            }
+            if (dragDirection > 0) {
                 this._curPageIdx = this._pages.length - 1;
             }
             else {
@@ -554,7 +559,7 @@ var PageView = cc.Class({
             }
         }
         else {
-            nextIndex = index + this._getDragDirection(moveOffset);
+            var index = this._curPageIdx, nextIndex = index + this._getDragDirection(moveOffset);
             if (nextIndex < this._pages.length) {
                 if (this._isScrollable(moveOffset, index, nextIndex)) {
                     this.scrollToPage(nextIndex);

diff --git a/cocos2d/core/load-pipeline/downloader.js b/cocos2d/core/load-pipeline/downloader.js
@@ -63,6 +63,16 @@ function downloadScript (item, callback, isAsync) {
     d.body.appendChild(s);
 }
 
+function downloadWebp (item, callback, isCrossOrigin, img) {
+    if (!cc.sys.capabilities.webp) {
+        setTimeout(function () {
+            callback('Load Webp ( ' + item.url + ' ) failed')
+        }, 0);
+        return;
+    }
+    downloadImage(item, callback, isCrossOrigin, img);
+}
+
 function downloadImage (item, callback, isCrossOrigin, img) {
     if (isCrossOrigin === undefined) {
         isCrossOrigin = true;
@@ -232,7 +242,7 @@ var defaultMap = {
     'gif' : downloadImage,
     'ico' : downloadImage,
     'tiff' : downloadImage,
-    'webp' : downloadImage,
+    'webp' : downloadWebp,
     'image' : downloadImage,
 
     // Audio

diff --git a/cocos2d/core/platform/CCSys.js b/cocos2d/core/platform/CCSys.js
@@ -729,6 +729,7 @@ else {
         };
     }
 
+    var _supportWebp = _tmpCanvas1.toDataURL('image/webp').startsWith('data:image/webp');
     var _supportCanvas = !!_tmpCanvas1.getContext("2d");
     var _supportWebGL = false;
     if (win.WebGLRenderingContext) {
@@ -792,7 +793,8 @@ else {
      */
     var capabilities = sys.capabilities = {
         "canvas": _supportCanvas,
-        "opengl": _supportWebGL
+        "opengl": _supportWebGL,
+        "webp": _supportWebp,
     };
     if (docEle['ontouchstart'] !== undefined || doc['ontouchstart'] !== undefined || nav.msPointerEnabled)
         capabilities["touches"] = true;