Test_Project_Cocos/cocos-enhance-kit
1
0
Fork 0
mirror of https://github.com/smallmain/cocos-enhance-kit.git synced 2024-12-25 11:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[engine] 多纹理渲染、动态图集调整开关时主动刷新渲染状态

Browse Source
This commit is contained in:
SmallMain 2022-06-25 01:03:18 +08:00
parent a414bb7945
commit d46a4db8cb
4 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/cocos2d/core/components/CCLabel.js
View File

@ -586,15 +586,24 @@ let Label = cc.Class({
autoSwitchMaterial: {
type: RenderComponent.EnableType,
default: RenderComponent.EnableType.GLOBAL,
notify(oldValue) {
if (this.autoSwitchMaterial === oldValue) return;
this.setVertsDirty();
},
},
allowDynamicAtlas: {
type: RenderComponent.EnableType,
default: RenderComponent.EnableType.GLOBAL,
notify(oldValue) {
if (this.allowDynamicAtlas === oldValue) return;
this.setVertsDirty();
},
},
enableRetina: {
type: RenderComponent.EnableType,
default: RenderComponent.EnableType.GLOBAL,
notify(oldValue) {
if (this.enableRetina === oldValue) return;
this.setVertsDirty();
}
},

12
engine/cocos2d/core/components/CCMotionStreak.js
View File

@ -219,9 +219,21 @@ var MotionStreak = cc.Class({
autoSwitchMaterial: {
type: RenderComponent.EnableType,
default: RenderComponent.EnableType.GLOBAL,
notify(oldValue) {
if (this.autoSwitchMaterial === oldValue) return;
this.setVertsDirty();
},
},
},
setVertsDirty() {
// 自动切换材质
this._checkSwitchMaterial();
this._updateMaterial();
this._super();
},
__preload() {
this._super();
this._checkSwitchMaterial();

8
engine/cocos2d/core/components/CCSprite.js
View File

@ -391,10 +391,18 @@ var Sprite = cc.Class({
autoSwitchMaterial: {
type: RenderComponent.EnableType,
default: RenderComponent.EnableType.GLOBAL,
notify(oldValue) {
if (this.autoSwitchMaterial === oldValue) return;
this.setVertsDirty();
},
},
allowDynamicAtlas: {
type: RenderComponent.EnableType,
default: RenderComponent.EnableType.GLOBAL,
notify(oldValue) {
if (this.allowDynamicAtlas === oldValue) return;
this.setVertsDirty();
},
},
},

18
engine/extensions/spine/Skeleton.js
View File

@ -435,10 +435,18 @@ sp.Skeleton = cc.Class({
autoSwitchMaterial: {
type: RenderComponent.EnableType,
default: RenderComponent.EnableType.GLOBAL,
notify(oldValue) {
if (this.autoSwitchMaterial === oldValue) return;
this.setVertsDirty();
},
},
allowDynamicAtlas: {
type: RenderComponent.EnableType,
default: RenderComponent.EnableType.GLOBAL,
notify(oldValue) {
if (this.allowDynamicAtlas === oldValue) return;
this.setVertsDirty();
},
},
},
@ -458,6 +466,13 @@ sp.Skeleton = cc.Class({
this._dataDirty = true;
},
setVertsDirty() {
this._dataDirty = true;
this.invalidAnimationCache();
this._materialCache = {};
this._super();
},
// override base class _getDefaultMaterial to modify default material
_getDefaultMaterial () {
return cc.Material.getBuiltinMaterial('2d-spine');
@ -1010,8 +1025,7 @@ sp.Skeleton = cc.Class({
attachment.setRegion(region);
attachment.updateOffset();
}
this._dataDirty = true;
this.invalidAnimationCache();
this.setVertsDirty();
return true;
}
return false;