Traktor: **WIP** InstanceMesh being rewritten; using GPU culling and …

…indirect draw.

code/Mesh/Editor/IMeshConverter.h

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -49,7 +49,6 @@ class IMeshConverter : public Object
 		const Guid& materialGuid,
 		const std::map< std::wstring, std::list< MeshMaterialTechnique > >& materialTechniqueMap,
 		const AlignedVector< render::VertexElement >& vertexElements,
-		int32_t maxInstanceCount,
 		MeshResource* meshResource,
 		IStream* meshResourceStream
 	) const = 0;

code/Mesh/Editor/Instance/InstanceMeshConverter.cpp

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,6 +11,7 @@
 #include "Core/Log/Log.h"
 #include "Core/Math/Half.h"
 #include "Core/Misc/String.h"
+#include "Editor/IPipelineDepends.h"
 #include "Mesh/Editor/IndexRange.h"
 #include "Mesh/Editor/MeshVertexWriter.h"
 #include "Mesh/Editor/Instance/InstanceMeshConverter.h"
@@ -27,11 +28,16 @@
 #include "Render/Mesh/MeshWriter.h"
 #include "Render/Mesh/SystemMeshFactory.h"
 
-namespace traktor
+namespace traktor::mesh
 {
-	namespace mesh
+	namespace
 	{
 
+const Guid c_shaderInstanceMeshCull(L"{37998131-BDA1-DE45-B175-35B088FEE61C}");
+const Guid c_shaderInstanceMeshDraw(L"{A8FDE33C-D75B-4D4E-848F-7D7CF97F11D0}");
+
+	}
+
 Ref< MeshResource > InstanceMeshConverter::createResource() const
 {
 	return new InstanceMeshResource();
@@ -54,17 +60,10 @@ bool InstanceMeshConverter::convert(
 	const Guid& materialGuid,
 	const std::map< std::wstring, std::list< MeshMaterialTechnique > >& materialTechniqueMap,
 	const AlignedVector< render::VertexElement >& vertexElements,
-	int32_t maxInstanceCount,
 	MeshResource* meshResource,
 	IStream* meshResourceStream
 ) const
 {
-	if (maxInstanceCount <= 0)
-	{
-		log::error << L"No per-instance parameter data, max instance count is zero." << Endl;
-		return false;
-	}
-
 	const model::Model* model = models[0];
 	T_FATAL_ASSERT(model != nullptr);
 
@@ -213,10 +212,14 @@ bool InstanceMeshConverter::convert(
 	checked_type_cast< InstanceMeshResource* >(meshResource)->m_haveRenderMesh = true;
 	checked_type_cast< InstanceMeshResource* >(meshResource)->m_shader = resource::Id< render::Shader >(materialGuid);
 	checked_type_cast< InstanceMeshResource* >(meshResource)->m_parts = parts;
-	checked_type_cast< InstanceMeshResource* >(meshResource)->m_maxInstanceCount = maxInstanceCount;
 
 	return true;
 }
 
-	}
+void InstanceMeshConverter::addDependencies(editor::IPipelineDepends* pipelineDepends)
+{
+	pipelineDepends->addDependency(c_shaderInstanceMeshCull, editor::PdfBuild);
+	pipelineDepends->addDependency(c_shaderInstanceMeshDraw, editor::PdfBuild);
+}
+
 }

code/Mesh/Editor/Instance/InstanceMeshConverter.h

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,10 +10,15 @@
 
 #include "Mesh/Editor/IMeshConverter.h"
 
-namespace traktor
+namespace traktor::editor
+{
+
+class IPipelineDepends;
+
+}
+
+namespace traktor::mesh
 {
-	namespace mesh
-	{
 
 class InstanceMeshConverter : public IMeshConverter
 {
@@ -28,12 +33,11 @@ class InstanceMeshConverter : public IMeshConverter
 		const Guid& materialGuid,
 		const std::map< std::wstring, std::list< MeshMaterialTechnique > >& materialTechniqueMap,
 		const AlignedVector< render::VertexElement >& vertexElements,
-		int32_t maxInstanceCount,
 		MeshResource* meshResource,
 		IStream* meshResourceStream
 	) const override final;
+
+	static void addDependencies(editor::IPipelineDepends* pipelineDepends);
 };
 
-	}
 }
-

code/Mesh/Editor/MeshPipeline.cpp

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022-2023 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -145,7 +145,7 @@ bool buildEmbeddedTexture(editor::IPipelineBuilder* pipelineBuilder, model::Mate
 
 	}
 
-T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.mesh.MeshPipeline", 38, MeshPipeline, editor::IPipeline)
+T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.mesh.MeshPipeline", 39, MeshPipeline, editor::IPipeline)
 
 MeshPipeline::MeshPipeline()
 :	m_promoteHalf(false)
@@ -230,6 +230,9 @@ bool MeshPipeline::buildDependencies(
 		pipelineDepends->addDependency(it.second, editor::PdfBuild | editor::PdfResource);
 
 	pipelineDepends->addDependency< render::ShaderGraph >();
+
+	// Add dependencies from mesh subsystems.
+	InstanceMeshConverter::addDependencies(pipelineDepends);
 	return true;
 }
 
@@ -449,7 +452,6 @@ bool MeshPipeline::buildOutput(
 
 	const int32_t jointCount = models[0]->getJointCount();
 	const bool vertexColor = haveVertexColors(*models[0]);
-	int32_t maxInstanceCount = 0;
 
 	for (const auto& materialPair : materials)
 	{
@@ -637,13 +639,6 @@ bool MeshPipeline::buildOutput(
 					if (uniformJointCount * 2 != indexedUniform->getLength())
 						indexedUniform->setLength(uniformJointCount * 2);		// Each bone is represented of a quaternion and a vector thus multiply by 2.
 				}
-				else if (indexedUniform->getParameterName() == L"InstanceWorld")
-				{
-					// Determine how many instances we can use when rendering instanced meshed
-					// based on how many entries in uniform.
-					if (maxInstanceCount <= 0 || maxInstanceCount > indexedUniform->getLength() / 2)
-						maxInstanceCount = indexedUniform->getLength() / 2;		// Length of uniform is twice of max number of instances.
-				}
 			}
 		}
 
@@ -827,7 +822,6 @@ bool MeshPipeline::buildOutput(
 		materialGuid,
 		materialTechniqueMap,
 		vertexElements,
-		maxInstanceCount,
 		resource,
 		stream
 	))

code/Mesh/Editor/Skinned/SkinnedMeshConverter.cpp

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -27,10 +27,8 @@
 #include "Render/Mesh/MeshWriter.h"
 #include "Render/Mesh/SystemMeshFactory.h"
 
-namespace traktor
+namespace traktor::mesh
 {
-	namespace mesh
-	{
 
 Ref< MeshResource > SkinnedMeshConverter::createResource() const
 {
@@ -54,7 +52,6 @@ bool SkinnedMeshConverter::convert(
 	const Guid& materialGuid,
 	const std::map< std::wstring, std::list< MeshMaterialTechnique > >& materialTechniqueMap,
 	const AlignedVector< render::VertexElement >& vertexElements,
-	int32_t maxInstanceCount,
 	MeshResource* meshResource,
 	IStream* meshResourceStream
 ) const
@@ -264,5 +261,4 @@ bool SkinnedMeshConverter::convert(
 	return true;
 }
 
-	}
 }

code/Mesh/Editor/Skinned/SkinnedMeshConverter.h

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,10 +10,8 @@
 
 #include "Mesh/Editor/IMeshConverter.h"
 
-namespace traktor
+namespace traktor::mesh
 {
-	namespace mesh
-	{
 
 class SkinnedMeshConverter : public IMeshConverter
 {
@@ -28,12 +26,9 @@ class SkinnedMeshConverter : public IMeshConverter
 		const Guid& materialGuid,
 		const std::map< std::wstring, std::list< MeshMaterialTechnique > >& materialTechniqueMap,
 		const AlignedVector< render::VertexElement >& vertexElements,
-		int32_t maxInstanceCount,
 		MeshResource* meshResource,
 		IStream* meshResourceStream
 	) const override final;
 };
 
-	}
 }
-

code/Mesh/Editor/Static/StaticMeshConverter.cpp

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -26,10 +26,8 @@
 #include "Render/Mesh/MeshWriter.h"
 #include "Render/Mesh/SystemMeshFactory.h"
 
-namespace traktor
+namespace traktor::mesh
 {
-	namespace mesh
-	{
 
 Ref< MeshResource > StaticMeshConverter::createResource() const
 {
@@ -54,7 +52,6 @@ bool StaticMeshConverter::convert(
 	const Guid& materialGuid,
 	const std::map< std::wstring, std::list< MeshMaterialTechnique > >& materialTechniqueMap,
 	const AlignedVector< render::VertexElement >& vertexElements,
-	int32_t maxInstanceCount,
 	MeshResource* meshResource,
 	IStream* meshResourceStream
 ) const
@@ -228,5 +225,4 @@ bool StaticMeshConverter::convert(
 	return true;
 }
 
-	}
 }

code/Mesh/Editor/Static/StaticMeshConverter.h

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,10 +10,8 @@
 
 #include "Mesh/Editor/IMeshConverter.h"
 
-namespace traktor
+namespace traktor::mesh
 {
-	namespace mesh
-	{
 
 class StaticMeshConverter : public IMeshConverter
 {
@@ -28,12 +26,9 @@ class StaticMeshConverter : public IMeshConverter
 		const Guid& materialGuid,
 		const std::map< std::wstring, std::list< MeshMaterialTechnique > >& materialTechniqueMap,
 		const AlignedVector< render::VertexElement >& vertexElements,
-		int32_t maxInstanceCount,
 		MeshResource* meshResource,
 		IStream* meshResourceStream
 	) const override final;
 };
 
-	}
 }
-