use cc::pipeline namespace (#2575)

This commit is contained in:
minggo
2020-06-16 15:20:03 +08:00
committed by GitHub
parent e645d102e8
commit 715f43bbb6
23 changed files with 100 additions and 54 deletions
@@ -1,5 +1,7 @@
#include "BatchedBuffer.h"
NS_PP_BEGIN
namespace cc {
namespace pipeline {
NS_PP_END
} // namespace pipeline
} // namespace cc
@@ -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
+5 -3
View File
@@ -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
@@ -1,5 +1,7 @@
#include "InstancedBuffer.h"
NS_PP_BEGIN
namespace cc {
namespace pipeline {
NS_PP_END
} // namespace pipeline
} // namespace cc
@@ -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
@@ -1,5 +1,7 @@
#include "RenderBatchedQueue.h"
NS_PP_BEGIN
namespace cc {
namespace pipeline {
NS_PP_END
}
} // namespace cc
@@ -2,7 +2,8 @@
#include "core/CoreStd.h"
NS_PP_BEGIN
namespace cc {
namespace pipeline {
class BatchedBuffer;
@@ -20,4 +21,5 @@ private:
cc::set<BatchedBuffer *>::type _queue;
};
NS_PP_END
} // namespace pipeline
} // namespace cc
@@ -1,5 +1,7 @@
#include "RenderFlow.h"
NS_PP_BEGIN
namespace cc {
namespace pipeline {
NS_PP_END
} //namespace pipeline
} // namespace cc
+4 -2
View File
@@ -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
@@ -1,5 +1,7 @@
#include "RenderInstancedQueue.h"
NS_PP_BEGIN
namespace cc {
namespace pipeline {
NS_PP_END
} // namespace pipeline
} // namespace cc
@@ -2,7 +2,8 @@
#include "core/CoreStd.h"
NS_PP_BEGIN
namespace cc {
namespace pipeline {
class InstancedBuffer;
@@ -20,4 +21,5 @@ private:
cc::set<InstancedBuffer *>::type _queue;
};
NS_PP_END
} // namespace pipeline
} // namespace cc
@@ -1,5 +1,7 @@
#include "RenderPipeline.h"
NS_PP_BEGIN
namespace cc {
namespace pipeline {
NS_PP_END
} // namespace pipeline
} // namespace cc
@@ -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
@@ -1,5 +1,7 @@
#include "RenderStage.h"
NS_PP_BEGIN
namespace cc {
namespace pipeline {
NS_PP_END
} // namespace pipeline
} // namespace cc
+4 -2
View File
@@ -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
@@ -1,5 +1,7 @@
#include "RenderView.h"
NS_PP_BEGIN
namespace cc {
namespace pipeline {
NS_PP_END
} // namespace pipeline
} // namespace cc
+5 -3
View File
@@ -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
@@ -1,5 +1,7 @@
#include "ForwardFlow.h"
NS_PP_BEGIN
namespace cc {
namespace pipeline {
NS_PP_END
} // namespace pipeline
} // namespace cc
@@ -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
@@ -1,5 +1,7 @@
#include "ForwardPipeline.h"
NS_PP_BEGIN
namespace cc {
namespace pipeline {
NS_PP_END
} // namespace pipeline
} // namespace cc
@@ -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
@@ -1,5 +1,7 @@
#include "ForwardStage.h"
NS_PP_BEGIN
namespace cc {
namespace pipeline {
NS_PP_END
} // namespace pipeline
} // namespace cc
@@ -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