rewriting render pipeline 7 WIP

Author: malytomas

sources/libengine/graphics/renderPipeline.cpp

@@ -98,7 +98,6 @@ namespace cage
 		struct RenderModel : private Noncopyable
 		{
 			UniMesh uni;
-			Frustum frustum; // object-space camera frustum used for culling
 			RenderComponent render;
 			std::optional<TextureAnimationComponent> textureAnimation;
 			Holder<SkeletalAnimationPreparatorInstance> skeletalAnimation;
@@ -165,19 +164,15 @@ namespace cage
 			Mat4 model;
 			Mat4 view;
 			Mat4 viewProj;
-
-			std::vector<RenderData> renderData;
-			Holder<RenderQueue> renderQueue;
-
 			std::optional<CameraData> data;
 			std::optional<ShadowmapData> shadowmap;
-
-			bool cnfRenderMissingModels = confRenderMissingModels;
-			bool cnfRenderSkeletonBones = confRenderSkeletonBones;
-
+			std::vector<RenderData> renderData;
+			Holder<RenderQueue> renderQueue;
 			mutable std::vector<UniMesh> uniMeshes;
 			mutable std::vector<Mat3x4> uniArmatures;
 			mutable std::vector<float> uniCustomData;
+			bool cnfRenderMissingModels = confRenderMissingModels;
+			bool cnfRenderSkeletonBones = confRenderSkeletonBones;
 
 			// create pipeline for regular camera
 			explicit RenderPipelineImpl(const RenderPipelineConfig &config) : RenderPipelineConfig(config)
@@ -647,7 +642,7 @@ namespace cage
 				if (shadowmap && none(rm.mesh->flags & MeshRenderFlags::ShadowCast))
 					return;
 
-				if (!intersects(rm.mesh->boundingBox(), rm.frustum))
+				if (!intersects(rm.mesh->boundingBox(), Frustum(rm.uni.mvpMat)))
 					return;
 
 				std::optional<TextureAnimationComponent> &pt = rm.textureAnimation;
@@ -799,7 +794,6 @@ namespace cage
 					d.e = rd.e;
 					RenderModel r;
 					r.uni = rm.uni;
-					r.frustum = rm.frustum;
 					r.render = rm.render;
 					r.textureAnimation = rm.textureAnimation;
 					r.skeletalAnimation = rm.skeletalAnimation.share();
@@ -839,6 +833,9 @@ namespace cage
 
 			void prepareEntities()
 			{
+				ProfilingScope profiling("prepare entities");
+				profiling.set(Stringizer() + "entities: " + scene->count());
+
 				renderData.reserve(scene->component<RenderComponent>()->count() + scene->component<TextComponent>()->count());
 
 				entitiesVisitor(
@@ -851,7 +848,6 @@ namespace cage
 						rd.e = e;
 						RenderModel rm;
 						rm.uni = initializeMeshUni(rd.model);
-						rm.frustum = Frustum(rm.uni.mvpMat);
 						rm.render = rc;
 						if (Holder<RenderObject> obj = assets->get<AssetSchemeIndexRenderObject, RenderObject>(rc.object))
 						{
@@ -886,8 +882,11 @@ namespace cage
 					+scene, false);
 			}
 
-			void sortRenderData()
+			void orderRenderData()
 			{
+				ProfilingScope profiling("order render data");
+				profiling.set(Stringizer() + "count: " + renderData.size());
+
 				std::sort(renderData.begin(), renderData.end(),
 					[](const RenderData &a, const RenderData &b) -> bool
 					{
@@ -933,7 +932,7 @@ namespace cage
 				renderQueue->checkGlErrorDebug();
 
 				prepareEntities();
-				sortRenderData();
+				orderRenderData();
 				renderPass(RenderModeEnum::Shadowmap);
 
 				renderQueue->resetFrameBuffer();
@@ -1017,7 +1016,7 @@ namespace cage
 				view = inverse(model);
 				viewProj = projection * view;
 				prepareEntities();
-				sortRenderData();
+				orderRenderData();
 				prepareCameraLights();
 
 				TextureHandle colorTexture = provisionalGraphics->texture(Stringizer() + "colorTarget_" + name + "_" + resolution,
@@ -1367,7 +1366,5 @@ namespace cage
 }
 
 // todo list:
-// reduce size of RenderModel (remove frustum, possibly some more)
-// consider parallelizing frustum culling
 // opacity for text
 // consider shadows for text