Merge pull request cocos#21 from sunnylanwanjun/v211

V211 spine and dragonbones
brucezhu123 · Jan 16, 2019 · 880bea1 · 880bea1
2 parents 45bae93 + 6ca0729
commit 880bea1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 21 deletions.
diff --git a/extensions/dragonbones/ArmatureDisplay.js b/extensions/dragonbones/ArmatureDisplay.js
@@ -372,7 +372,7 @@ let ArmatureDisplay = cc.Class({
 
     // override
     _updateMaterial (material) {
-        this._super(material);
+        this.setMaterial(0, material);
         this._materialCache = {};
     },
 

diff --git a/extensions/dragonbones/webgl-assembler.js b/extensions/dragonbones/webgl-assembler.js
@@ -25,8 +25,8 @@
 
 const Armature = require('./ArmatureDisplay');
 const RenderFlow = require('../../cocos2d/core/renderer/render-flow');
-const gfx = require('../../cocos2d/renderer/gfx');
 const Material = require('../../cocos2d/core/assets/material/CCMaterial');
+const gfx = cc.gfx;
 
 let _boneColor = cc.color(255, 0, 0, 255);
 let _slotColor = cc.color(0, 0, 255, 255);

diff --git a/extensions/spine/Skeleton.js b/extensions/spine/Skeleton.js
@@ -376,21 +376,25 @@ sp.Skeleton = cc.Class({
         this._rootBone = null;
         this._listener = null;
         this._boundingBox = cc.rect();
-        this._material = Material.getInstantiatedBuiltinMaterial('spine', this);
         this._materialCache = {};
         this._debugRenderer = null;
         this._startSlotIndex = -1;
         this._endSlotIndex = -1;
     },
 
+    onLoad() {
+        var material = Material.getInstantiatedBuiltinMaterial('spine', this);
+        this.setMaterial(0, material);
+    },
+
     // override
     _updateMaterial (material) {
-        this._super(material);
+        this.setMaterial(0, material);
         this._materialCache = {};
     },
 
     _updateUseTint () {
-        var cache = this._materialCache
+        var cache = this._materialCache;
         for (var mKey in cache) {
             var material = cache[mKey];
             if (material) {

diff --git a/extensions/spine/spine-assembler.js b/extensions/spine/spine-assembler.js
@@ -26,11 +26,10 @@
 const Skeleton = require('./Skeleton');
 const spine = require('./lib/spine');
 const RenderFlow = require('../../cocos2d/core/renderer/render-flow');
-const Material = require('../../cocos2d/core/assets/material/CCMaterial');
 const VertexFormat = require('../../cocos2d/core/renderer/webgl/vertex-format')
 const VFOneColor = VertexFormat.vfmtPosUvColor;
 const VFTwoColor = VertexFormat.vfmtPosUvTwoColor;
-import gfx from '../../cocos2d/renderer/gfx';
+const gfx = cc.gfx;
 
 let _quadTriangles = [0, 1, 2, 2, 3, 0];
 let _slotColor = cc.color(0, 0, 255, 255);
@@ -87,21 +86,16 @@ function _getSlotMaterial (comp, slot, tex) {
     }
 
     let key = tex.url + src + dst;
-    comp._material = comp._material || Material.getInstantiatedBuiltinMaterial('spine', comp);
-    let baseMaterial = comp._material;
+    let baseMaterial = comp.sharedMaterials[0];
+    if (!baseMaterial) return null;
+
     let materialCache = comp._materialCache;
     let material = materialCache[key];
     if (!material) {
-        var baseKey = baseMaterial.getHash();
-        if (!materialCache[baseKey]) {
-            material = baseMaterial;
-        } else {
-            material = new Material();
-            material.copy(baseMaterial);
-        }
-
+        material = new cc.Material();
+        material.copy(baseMaterial);
         material.define('_USE_MODEL', true);
-        material.define('USE_TEXTURE', true);
+        material.define('USE_TINT', _useTint);
         // update texture
         material.setProperty('texture', tex);
 
@@ -118,9 +112,6 @@ function _getSlotMaterial (comp, slot, tex) {
         materialCache[key] = material;
     }
     else if (material.getProperty('texture') !== tex) {
-        if (materialCache[material._hash]) {
-            delete materialCache[material._hash];
-        }
         material.setProperty('texture', tex);
         material.updateHash(key);
         materialCache[key] = material;