diff --git a/cocos/rendering/pipeline-scene-data.ts b/cocos/rendering/pipeline-scene-data.ts index 0b1ccf744f..d895608300 100644 --- a/cocos/rendering/pipeline-scene-data.ts +++ b/cocos/rendering/pipeline-scene-data.ts @@ -211,6 +211,9 @@ export class PipelineSceneData { this._occlusionQueryVertexBuffer = null; this._occlusionQueryIndicesBuffer?.destroy(); this._occlusionQueryIndicesBuffer = null; + this._standardSkinMeshRenderer = null; + this._standardSkinModel = null; + this._skinMaterialModel = null; } private _createOcclusionQueryIA () { diff --git a/native/cocos/renderer/pipeline/PipelineSceneData.cpp b/native/cocos/renderer/pipeline/PipelineSceneData.cpp index 28255c3f4e..0daac7c146 100644 --- a/native/cocos/renderer/pipeline/PipelineSceneData.cpp +++ b/native/cocos/renderer/pipeline/PipelineSceneData.cpp @@ -37,6 +37,7 @@ #include "scene/Shadow.h" #include "scene/Skybox.h" #include "scene/Skin.h" +#include "scene/Model.h" namespace cc { namespace pipeline { @@ -86,6 +87,8 @@ void PipelineSceneData::destroy() { _occlusionQueryInputAssembler = nullptr; _occlusionQueryVertexBuffer = nullptr; _occlusionQueryIndicesBuffer = nullptr; + _standardSkinModel = nullptr; + _skinMaterialModel = nullptr; } void PipelineSceneData::initOcclusionQuery() { @@ -169,5 +172,13 @@ gfx::InputAssembler *PipelineSceneData::createOcclusionQueryIA() { return _device->createInputAssembler(info); } +void PipelineSceneData::setStandardSkinModel(scene::Model* val) { + _standardSkinModel = val; +} + +void PipelineSceneData::setSkinMaterialModel(scene::Model* val) { + _skinMaterialModel = val; +} + } // namespace pipeline } // namespace cc diff --git a/native/cocos/renderer/pipeline/PipelineSceneData.h b/native/cocos/renderer/pipeline/PipelineSceneData.h index 4dbdab6017..cb9e9eeab0 100644 --- a/native/cocos/renderer/pipeline/PipelineSceneData.h +++ b/native/cocos/renderer/pipeline/PipelineSceneData.h @@ -92,10 +92,10 @@ public: inline void setShadingScale(float val) { _shadingScale = val; } inline bool getCSMSupported() const { return _csmSupported; } inline void setCSMSupported(bool val) { _csmSupported = val; } - inline scene::Model *getStandardSkinModel() const { return _standardSkinModel; } - inline void setStandardSkinModel(scene::Model *val) { _standardSkinModel = val; } - inline scene::Model *getSkinMaterialModel() const { return _skinMaterialModel; } - inline void setSkinMaterialModel(scene::Model *val) { _skinMaterialModel = val; } + inline scene::Model *getStandardSkinModel() const { return _standardSkinModel.get(); } + void setStandardSkinModel(scene::Model *val); + inline scene::Model *getSkinMaterialModel() const { return _skinMaterialModel.get(); } + void setSkinMaterialModel(scene::Model *val); protected: void initOcclusionQuery(); @@ -110,6 +110,8 @@ protected: IntrusivePtr _occlusionQueryInputAssembler; IntrusivePtr _occlusionQueryMaterial{nullptr}; IntrusivePtr _debugRendererMaterial{nullptr}; + IntrusivePtr _standardSkinModel; + IntrusivePtr _skinMaterialModel; gfx::Shader *_occlusionQueryShader{nullptr}; // weak reference scene::Pass *_occlusionQueryPass{nullptr}; // weak reference @@ -131,10 +133,6 @@ protected: // manage memory manually scene::Skin *_skin{nullptr}; // manage memory manually - scene::Model *_standardSkinModel{nullptr}; - // manage memory manually - scene::Model *_skinMaterialModel{nullptr}; - CSMLayers *_csmLayers{nullptr}; bool _isHDR{true};