Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optimize spine/dragonbones material update #13416

Merged
merged 2 commits into from Nov 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions cc.config.json
Expand Up @@ -117,6 +117,10 @@
},
"dragon-bones": {
"modules": [ "dragon-bones" ],
"dependentAssets":[
"c27215d8-6835-4b68-bfbb-bdeac6100c04",
"b5d6115f-0370-4d7c-aad3-c194cc71cf98"
],
"dependentModules": [ "2d" ]
},
"marionette": {
Expand Down
27 changes: 20 additions & 7 deletions cocos/dragon-bones/ArmatureDisplay.ts
Expand Up @@ -591,11 +591,10 @@ export class ArmatureDisplay extends UIRenderer {
}

private getMaterialTemplate () : Material {
let material = this.customMaterial;
if (material === null) {
material = builtinResMgr.get<Material>('default-spine-material');
}
return material;
if (this.customMaterial !== null) return this.customMaterial;
if (this.material) return this.material;
this.updateMaterial();
return this.material!;
}

public getMaterialForBlend (src: BlendFactor, dst: BlendFactor): MaterialInstance {
Expand Down Expand Up @@ -624,6 +623,12 @@ export class ArmatureDisplay extends UIRenderer {
return inst;
}

@override
protected _updateBuiltinMaterial (): Material {
const material = builtinResMgr.get<Material>('default-spine-material');
return material;
}

@override
@type(Material)
@displayOrder(0)
Expand All @@ -633,11 +638,19 @@ export class ArmatureDisplay extends UIRenderer {
}
set customMaterial (val) {
this._customMaterial = val;
this._cleanMaterialCache();
this.setMaterial(this._customMaterial, 0);
this.updateMaterial();
this.markForUpdateRenderData();
}

@override
protected updateMaterial () {
let mat;
if (this._customMaterial) mat = this._customMaterial;
else mat = this._updateBuiltinMaterial();
this.setMaterial(mat, 0);
this._cleanMaterialCache();
}

protected _render (batcher: Batcher2D) {
let indicesCount = 0;
if (this.renderData && this._drawList) {
Expand Down
27 changes: 20 additions & 7 deletions cocos/spine/skeleton.ts
Expand Up @@ -160,6 +160,12 @@ export class Skeleton extends UIRenderer {
public static AnimationCacheMode = AnimationCacheMode;
get drawList () { return this._drawList; }

@override
protected _updateBuiltinMaterial (): Material {
const material = builtinResMgr.get<Material>('default-spine-material');
return material;
}

@override
@type(Material)
@displayOrder(0)
Expand All @@ -169,11 +175,19 @@ export class Skeleton extends UIRenderer {
}
set customMaterial (val) {
this._customMaterial = val;
this._cleanMaterialCache();
this.setMaterial(this._customMaterial, 0);
this.updateMaterial();
this.markForUpdateRenderData();
}

@override
protected updateMaterial () {
let mat;
if (this._customMaterial) mat = this._customMaterial;
else mat = this._updateBuiltinMaterial();
this.setMaterial(mat, 0);
this._cleanMaterialCache();
}

/**
* @en The skeletal animation is paused?
* @zh 该骨骼动画是否暂停。
Expand Down Expand Up @@ -1354,11 +1368,10 @@ export class Skeleton extends UIRenderer {
}

private getMaterialTemplate () : Material {
let material = this.customMaterial;
if (material === null) {
material = builtinResMgr.get<Material>('default-spine-material');
}
return material;
if (this.customMaterial !== null) return this.customMaterial;
if (this.material) return this.material;
this.updateMaterial();
return this.material!;
}

public getMaterialForBlendAndTint (src: BlendFactor, dst: BlendFactor, type: SpineMaterialType): MaterialInstance {
Expand Down
Expand Up @@ -417,6 +417,10 @@ void CCArmatureCacheDisplay::setRenderEntity(cc::RenderEntity* entity) {

void CCArmatureCacheDisplay::setMaterial(cc::Material *material) {
_material = material;
for (auto &item : _materialCaches) {
CC_SAFE_DELETE(item.second);
}
_materialCaches.clear();
}


Expand Down
Expand Up @@ -419,6 +419,10 @@ void CCArmatureDisplay::setRenderEntity(cc::RenderEntity* entity) {

void CCArmatureDisplay::setMaterial(cc::Material *material) {
_material = material;
for (auto &item : _materialCaches) {
CC_SAFE_DELETE(item.second);
}
_materialCaches.clear();
}


Expand Down
Expand Up @@ -559,6 +559,10 @@ void SkeletonCacheAnimation::setRenderEntity(cc::RenderEntity* entity) {

void SkeletonCacheAnimation::setMaterial(cc::Material *material) {
_material = material;
for (auto &item : _materialCaches) {
CC_SAFE_DELETE(item.second);
}
_materialCaches.clear();
}

cc::RenderDrawInfo* SkeletonCacheAnimation::requestDrawInfo(int idx) {
Expand Down
Expand Up @@ -1006,6 +1006,10 @@ void SkeletonRenderer::setRenderEntity(cc::RenderEntity* entity) {

void SkeletonRenderer::setMaterial(cc::Material *material) {
_material = material;
for (auto &item : _materialCaches) {
CC_SAFE_DELETE(item.second);
}
_materialCaches.clear();
}

cc::RenderDrawInfo* SkeletonRenderer::requestDrawInfo(int idx) {
Expand Down
9 changes: 9 additions & 0 deletions platforms/native/engine/jsb-dragonbones.js
Expand Up @@ -540,6 +540,15 @@ const cacheManager = require('./jsb-cache-manager');
middleware.release();
};

const _updateMaterial = armatureDisplayProto.updateMaterial;
armatureDisplayProto.updateMaterial = function () {
_updateMaterial.call(this);
if (this._nativeDisplay) {
const mat = this.getMaterialTemplate();
this._nativeDisplay.setMaterial(mat);
}
};

armatureDisplayProto.once = function (eventType, listener, target) {
if (this._nativeDisplay) {
if (this.isAnimationCached()) {
Expand Down
9 changes: 9 additions & 0 deletions platforms/native/engine/jsb-spine-skeleton.js
Expand Up @@ -258,6 +258,15 @@ const cacheManager = require('./jsb-cache-manager');
},
});

const _updateMaterial = skeleton.updateMaterial;
skeleton.updateMaterial = function () {
_updateMaterial.call(this);
if (this._nativeSkeleton) {
const mat = this.getMaterialTemplate();
this._nativeSkeleton.setMaterial(mat);
}
};

const _updateDebugDraw = skeleton._updateDebugDraw;
skeleton._updateDebugDraw = function () {
_updateDebugDraw.call(this);
Expand Down