diff --git a/native/cocos/renderer/pipeline/BatchedBuffer.cpp b/native/cocos/renderer/pipeline/BatchedBuffer.cpp index 992f3f5d1d..031e7a9b70 100644 --- a/native/cocos/renderer/pipeline/BatchedBuffer.cpp +++ b/native/cocos/renderer/pipeline/BatchedBuffer.cpp @@ -1,5 +1,7 @@ #include "BatchedBuffer.h" -NS_PP_BEGIN +namespace cc { +namespace pipeline { -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/BatchedBuffer.h b/native/cocos/renderer/pipeline/BatchedBuffer.h index 47c6f16ec0..c7e2d27a07 100644 --- a/native/cocos/renderer/pipeline/BatchedBuffer.h +++ b/native/cocos/renderer/pipeline/BatchedBuffer.h @@ -5,9 +5,10 @@ namespace cc { class Pass; class SubModel; -} +} // namespace cc -NS_PP_BEGIN +namespace cc { +namespace pipeline { class CC_DLL BatchedBuffer : public cc::Object { public: @@ -28,4 +29,5 @@ private: cc::Pass *_pass = nullptr; }; -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/Define.h b/native/cocos/renderer/pipeline/Define.h index bdab3bfef8..fb3747c7bf 100644 --- a/native/cocos/renderer/pipeline/Define.h +++ b/native/cocos/renderer/pipeline/Define.h @@ -3,10 +3,11 @@ #include "core/CoreStd.h" namespace cc { -class PSOCreateInfo; +struct PSOCreateInfo; } -NS_PP_BEGIN +namespace cc { +namespace pipeline { class RenderStage; class RenderFlow; @@ -70,4 +71,5 @@ const uint CAMERA_DEFAULT_MASK = 1; //constexpr CAMERA_DEFAULT_MASK = Layers.makeMaskExclude([Layers.BitMask.UI_2D, Layers.BitMask.GIZMOS, Layers.BitMask.EDITOR, // Layers.BitMask.SCENE_GIZMO, Layers.BitMask.PROFILER]); -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/InstancedBuffer.cpp b/native/cocos/renderer/pipeline/InstancedBuffer.cpp index 3e5af9e26d..58c2793ad0 100644 --- a/native/cocos/renderer/pipeline/InstancedBuffer.cpp +++ b/native/cocos/renderer/pipeline/InstancedBuffer.cpp @@ -1,5 +1,7 @@ #include "InstancedBuffer.h" -NS_PP_BEGIN +namespace cc { +namespace pipeline { -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/InstancedBuffer.h b/native/cocos/renderer/pipeline/InstancedBuffer.h index ec47d04f76..fe66c0dc20 100644 --- a/native/cocos/renderer/pipeline/InstancedBuffer.h +++ b/native/cocos/renderer/pipeline/InstancedBuffer.h @@ -7,9 +7,10 @@ class Pass; struct InstancedAttributeBlock; struct PSOCreateInfo; class SubModel; -} +} // namespace cc -NS_PP_BEGIN +namespace cc { +namespace pipeline { class InstancedBuffer : public cc::Object { public: @@ -34,4 +35,5 @@ private: cc::Pass *_pass = nullptr; }; -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/RenderBatchedQueue.cpp b/native/cocos/renderer/pipeline/RenderBatchedQueue.cpp index 3727d1a5d4..d5360469a0 100644 --- a/native/cocos/renderer/pipeline/RenderBatchedQueue.cpp +++ b/native/cocos/renderer/pipeline/RenderBatchedQueue.cpp @@ -1,5 +1,7 @@ #include "RenderBatchedQueue.h" -NS_PP_BEGIN +namespace cc { +namespace pipeline { -NS_PP_END +} +} // namespace cc diff --git a/native/cocos/renderer/pipeline/RenderBatchedQueue.h b/native/cocos/renderer/pipeline/RenderBatchedQueue.h index 0e5cfddbf5..a4faeec775 100644 --- a/native/cocos/renderer/pipeline/RenderBatchedQueue.h +++ b/native/cocos/renderer/pipeline/RenderBatchedQueue.h @@ -2,7 +2,8 @@ #include "core/CoreStd.h" -NS_PP_BEGIN +namespace cc { +namespace pipeline { class BatchedBuffer; @@ -20,4 +21,5 @@ private: cc::set::type _queue; }; -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/RenderFlow.cpp b/native/cocos/renderer/pipeline/RenderFlow.cpp index 72118c4d6d..c60e9694ed 100644 --- a/native/cocos/renderer/pipeline/RenderFlow.cpp +++ b/native/cocos/renderer/pipeline/RenderFlow.cpp @@ -1,5 +1,7 @@ #include "RenderFlow.h" -NS_PP_BEGIN +namespace cc { +namespace pipeline { -NS_PP_END +} //namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/RenderFlow.h b/native/cocos/renderer/pipeline/RenderFlow.h index 0201c64261..f168a9bc93 100644 --- a/native/cocos/renderer/pipeline/RenderFlow.h +++ b/native/cocos/renderer/pipeline/RenderFlow.h @@ -8,7 +8,8 @@ class GFXDevice; } -NS_PP_BEGIN +namespace cc { +namespace pipeline { class RenderPipeline; class RenderStage; @@ -50,4 +51,5 @@ protected: // RenderFlowType _type = ; }; -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/RenderInstancedQueue.cpp b/native/cocos/renderer/pipeline/RenderInstancedQueue.cpp index 595a1cda16..71c14d1f09 100644 --- a/native/cocos/renderer/pipeline/RenderInstancedQueue.cpp +++ b/native/cocos/renderer/pipeline/RenderInstancedQueue.cpp @@ -1,5 +1,7 @@ #include "RenderInstancedQueue.h" -NS_PP_BEGIN +namespace cc { +namespace pipeline { -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/RenderInstancedQueue.h b/native/cocos/renderer/pipeline/RenderInstancedQueue.h index e47a80e001..0190849fae 100644 --- a/native/cocos/renderer/pipeline/RenderInstancedQueue.h +++ b/native/cocos/renderer/pipeline/RenderInstancedQueue.h @@ -2,7 +2,8 @@ #include "core/CoreStd.h" -NS_PP_BEGIN +namespace cc { +namespace pipeline { class InstancedBuffer; @@ -20,4 +21,5 @@ private: cc::set::type _queue; }; -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/RenderPipeline.cpp b/native/cocos/renderer/pipeline/RenderPipeline.cpp index 5c05a3c1b2..1730dc3e9d 100644 --- a/native/cocos/renderer/pipeline/RenderPipeline.cpp +++ b/native/cocos/renderer/pipeline/RenderPipeline.cpp @@ -1,5 +1,7 @@ #include "RenderPipeline.h" -NS_PP_BEGIN +namespace cc { +namespace pipeline { -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/RenderPipeline.h b/native/cocos/renderer/pipeline/RenderPipeline.h index 5be85b72b7..f133bf6cd5 100644 --- a/native/cocos/renderer/pipeline/RenderPipeline.h +++ b/native/cocos/renderer/pipeline/RenderPipeline.h @@ -13,9 +13,10 @@ class Light; class Root; class Model; class Camera; -} +} // namespace cc -NS_PP_BEGIN +namespace cc { +namespace pipeline { class RenderView; @@ -107,4 +108,5 @@ protected: bool _isUseDynamicBatching = false; }; -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/RenderStage.cpp b/native/cocos/renderer/pipeline/RenderStage.cpp index 5fa47b8119..44889cb2f4 100644 --- a/native/cocos/renderer/pipeline/RenderStage.cpp +++ b/native/cocos/renderer/pipeline/RenderStage.cpp @@ -1,5 +1,7 @@ #include "RenderStage.h" -NS_PP_BEGIN +namespace cc { +namespace pipeline { -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/RenderStage.h b/native/cocos/renderer/pipeline/RenderStage.h index 1a14bc8310..8198be61f2 100644 --- a/native/cocos/renderer/pipeline/RenderStage.h +++ b/native/cocos/renderer/pipeline/RenderStage.h @@ -6,7 +6,8 @@ namespace cc { class GFXFramebuffer; } -NS_PP_BEGIN +namespace cc { +namespace pipeline { class RenderFlow; class RenderPipeline; @@ -46,4 +47,5 @@ protected: int _priority = 0; }; -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/RenderView.cpp b/native/cocos/renderer/pipeline/RenderView.cpp index fc141722d3..aa0924e2b5 100644 --- a/native/cocos/renderer/pipeline/RenderView.cpp +++ b/native/cocos/renderer/pipeline/RenderView.cpp @@ -1,5 +1,7 @@ #include "RenderView.h" -NS_PP_BEGIN +namespace cc { +namespace pipeline { -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/RenderView.h b/native/cocos/renderer/pipeline/RenderView.h index efcfa0762d..aee68707e5 100644 --- a/native/cocos/renderer/pipeline/RenderView.h +++ b/native/cocos/renderer/pipeline/RenderView.h @@ -5,9 +5,10 @@ namespace cc { class Camera; class Root; -} +} // namespace cc -NS_PP_BEGIN +namespace cc { +namespace pipeline { class RenderFlow; @@ -45,4 +46,5 @@ private: bool _isEnabled = false; }; -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/forward/ForwardFlow.cpp b/native/cocos/renderer/pipeline/forward/ForwardFlow.cpp index 69e6e1a1df..ac73f9a9bb 100644 --- a/native/cocos/renderer/pipeline/forward/ForwardFlow.cpp +++ b/native/cocos/renderer/pipeline/forward/ForwardFlow.cpp @@ -1,5 +1,7 @@ #include "ForwardFlow.h" -NS_PP_BEGIN +namespace cc { +namespace pipeline { -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/forward/ForwardFlow.h b/native/cocos/renderer/pipeline/forward/ForwardFlow.h index 66e0411980..6b246faab8 100644 --- a/native/cocos/renderer/pipeline/forward/ForwardFlow.h +++ b/native/cocos/renderer/pipeline/forward/ForwardFlow.h @@ -2,7 +2,8 @@ #include "../RenderFlow.h" -NS_PP_BEGIN +namespace cc { +namespace pipeline { class RenderView; @@ -17,4 +18,5 @@ public: virtual void rebuild() override; }; -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/forward/ForwardPipeline.cpp b/native/cocos/renderer/pipeline/forward/ForwardPipeline.cpp index 82fb7a266e..67f9300434 100644 --- a/native/cocos/renderer/pipeline/forward/ForwardPipeline.cpp +++ b/native/cocos/renderer/pipeline/forward/ForwardPipeline.cpp @@ -1,5 +1,7 @@ #include "ForwardPipeline.h" -NS_PP_BEGIN +namespace cc { +namespace pipeline { -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/forward/ForwardPipeline.h b/native/cocos/renderer/pipeline/forward/ForwardPipeline.h index 63dc0b9b94..ebaf32896a 100644 --- a/native/cocos/renderer/pipeline/forward/ForwardPipeline.h +++ b/native/cocos/renderer/pipeline/forward/ForwardPipeline.h @@ -2,7 +2,8 @@ #include "../RenderPipeline.h" -NS_PP_BEGIN +namespace cc { +namespace pipeline { class CC_DLL ForwardPipeline : public RenderPipeline { public: @@ -28,4 +29,5 @@ private: cc::GFXBuffer *_lightsUBO = nullptr; }; -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/forward/ForwardStage.cpp b/native/cocos/renderer/pipeline/forward/ForwardStage.cpp index d5f485e7b5..1b0cb54390 100644 --- a/native/cocos/renderer/pipeline/forward/ForwardStage.cpp +++ b/native/cocos/renderer/pipeline/forward/ForwardStage.cpp @@ -1,5 +1,7 @@ #include "ForwardStage.h" -NS_PP_BEGIN +namespace cc { +namespace pipeline { -NS_PP_END +} // namespace pipeline +} // namespace cc diff --git a/native/cocos/renderer/pipeline/forward/ForwardStage.h b/native/cocos/renderer/pipeline/forward/ForwardStage.h index 3e2a01a16f..a91a088edc 100644 --- a/native/cocos/renderer/pipeline/forward/ForwardStage.h +++ b/native/cocos/renderer/pipeline/forward/ForwardStage.h @@ -2,7 +2,8 @@ #include "../RenderStage.h" -NS_PP_BEGIN +namespace cc { +namespace pipeline { class RenderFlow; class RenderView; @@ -13,7 +14,7 @@ class RenderAdditiveLightQueue; class CC_DLL ForwardStage : public RenderStage { public: static const RenderStageInfo &getInitializeInfo(); - + ForwardStage(); ~ForwardStage(); @@ -22,13 +23,14 @@ public: virtual void resize(uint width, uint height) override; virtual void rebuild() override; virtual void render(RenderView *view) override; - + private: static RenderStageInfo _initInfo; - + RenderBatchedQueue *_batchedQueue = nullptr; RenderInstancedQueue *_instancedQueue = nullptr; RenderAdditiveLightQueue *_additiveLightQueue = nullptr; }; -NS_PP_END +} // namespace pipeline +} // namespace cc