Skip to content

Commit 55f38df

Browse files
maxbrundevmaxbrundev
authored
Merge pull request #34 from adriengivry/feature/frustum_culling
Frustum culling
2 parents d433bce + a7027c6 commit 55f38df

40 files changed

Lines changed: 1674 additions & 131 deletions

File tree

‎Sources/Overload/OvCore/OvCore.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ xcopy "$(SolutionDir)..\..\Build\OvWindowing\bin\$(Configuration)\*.dll" "$(Solu
123123
xcopy "$(SolutionDir)..\..\Build\OvWindowing\lib\$(Configuration)\*.lib" "$(SolutionDir)..\..\Build\$(ProjectName)\lib\$(Configuration)" /e /y /i /r</Command>
124124
</PostBuildEvent>
125125
<Link>
126-
<AdditionalDependencies>liblua53.a;OvMaths.lib;OvPhysics.lib;OvRendering.lib;OvTools.lib;OvUI.lib;OvAudio.lib;OvDebug.lib;OvWindowing.lib;%(AdditionalDependencies)</AdditionalDependencies>
126+
<AdditionalDependencies>liblua53.a;OvMaths.lib;OvPhysics.lib;OvRendering.lib;OvTools.lib;OvUI.lib;OvAudio.lib;OvDebug.lib;OvWindowing.lib;OvAnalytics.lib;%(AdditionalDependencies)</AdditionalDependencies>
127127
</Link>
128128
</ItemDefinitionGroup>
129129
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -140,7 +140,7 @@ xcopy "$(SolutionDir)..\..\Build\OvWindowing\lib\$(Configuration)\*.lib" "$(Solu
140140
<Link>
141141
<EnableCOMDATFolding>true</EnableCOMDATFolding>
142142
<OptimizeReferences>true</OptimizeReferences>
143-
<AdditionalDependencies>liblua53.a;OvMaths.lib;OvPhysics.lib;OvRendering.lib;OvTools.lib;OvUI.lib;OvAudio.lib;OvDebug.lib;OvWindowing.lib;%(AdditionalDependencies)</AdditionalDependencies>
143+
<AdditionalDependencies>liblua53.a;OvMaths.lib;OvPhysics.lib;OvRendering.lib;OvTools.lib;OvUI.lib;OvAudio.lib;OvDebug.lib;OvWindowing.lib;OvAnalytics.lib;%(AdditionalDependencies)</AdditionalDependencies>
144144
</Link>
145145
<PostBuildEvent>
146146
<Command>RD /S /Q "$(SolutionDir)..\..\Build\$(ProjectName)\include"

‎Sources/Overload/OvCore/include/OvCore/ECS/Components/CCamera.h‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,6 @@ namespace OvCore::ECS::Components
3535
*/
3636
std::string GetName() override;
3737

38-
/**
39-
* Returns the projection matrix
40-
* @param p_windowWidth
41-
* @param p_windowHeight
42-
*/
43-
OvMaths::FMatrix4 GetProjectionMatrix(uint16_t p_windowWidth, uint16_t p_windowHeight);
44-
45-
/**
46-
* Returns the view matrix
47-
*/
48-
OvMaths::FMatrix4 GetViewMatrix();
49-
5038
/**
5139
* Sets the fov of the camera to the given value
5240
* @param p_value
@@ -71,6 +59,18 @@ namespace OvCore::ECS::Components
7159
*/
7260
void SetClearColor(const OvMaths::FVector3& p_clearColor);
7361

62+
/**
63+
* Defines if the camera should apply frustum geometry culling in rendering
64+
* @param p_enable
65+
*/
66+
void SetFrustumGeometryCulling(bool p_enable);
67+
68+
/**
69+
* Defines if the camera should apply frustum light culling in rendering
70+
* @param p_enable
71+
*/
72+
void SetFrustumLightCulling(bool p_enable);
73+
7474
/**
7575
* Returns the fov of the camera
7676
*/
@@ -91,6 +91,16 @@ namespace OvCore::ECS::Components
9191
*/
9292
const OvMaths::FVector3& GetClearColor() const;
9393

94+
/**
95+
* Returns true if the frustum geometry culling is enabled
96+
*/
97+
bool HasFrustumGeometryCulling() const;
98+
99+
/**
100+
* Returns true if the frustum light culling is enabled
101+
*/
102+
bool HasFrustumLightCulling() const;
103+
94104
/**
95105
* Returns the OvRendering camera instance attached to this component
96106
*/

‎Sources/Overload/OvCore/include/OvCore/ECS/Components/CModelRenderer.h‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,17 @@ namespace OvCore::ECS::Components
2121
class API_OVCORE CModelRenderer : public AComponent
2222
{
2323
public:
24+
/**
25+
* Defines how the model renderer bounding sphere should be interpreted
26+
*/
27+
enum class EFrustumBehaviour
28+
{
29+
DISABLED = 0,
30+
CULL_MODEL = 1,
31+
CULL_MESHES = 2,
32+
CULL_CUSTOM = 3
33+
};
34+
2435
/**
2536
* Constructor
2637
* @param p_owner
@@ -43,6 +54,28 @@ namespace OvCore::ECS::Components
4354
*/
4455
OvRendering::Resources::Model* GetModel() const;
4556

57+
/**
58+
* Sets a bounding mode
59+
* @param p_boundingMode
60+
*/
61+
void SetFrustumBehaviour(EFrustumBehaviour p_boundingMode);
62+
63+
/**
64+
* Returns the current bounding mode
65+
*/
66+
EFrustumBehaviour GetFrustumBehaviour() const;
67+
68+
/**
69+
* Returns the custom bounding sphere
70+
*/
71+
const OvRendering::Geometry::BoundingSphere& GetCustomBoundingSphere() const;
72+
73+
/**
74+
* Sets the custom bounding sphere
75+
* @param p_boundingSphere
76+
*/
77+
void SetCustomBoundingSphere(const OvRendering::Geometry::BoundingSphere& p_boundingSphere);
78+
4679
/**
4780
* Serialize the component
4881
* @param p_doc
@@ -66,5 +99,7 @@ namespace OvCore::ECS::Components
6699
private:
67100
OvRendering::Resources::Model* m_model = nullptr;
68101
OvTools::Eventing::Event<> m_modelChangedEvent;
102+
OvRendering::Geometry::BoundingSphere m_customBoundingSphere = { {}, 1.0f };
103+
EFrustumBehaviour m_frustumBehaviour = EFrustumBehaviour::CULL_MODEL;
69104
};
70105
}

‎Sources/Overload/OvCore/include/OvCore/ECS/Renderer.h‎

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include <OvRendering/Core/Renderer.h>
1212
#include <OvRendering/Resources/Mesh.h>
13+
#include <OvRendering/Data/Frustum.h>
1314

1415
#include "OvCore/API/Export.h"
1516
#include "OvCore/Resources/Material.h"
@@ -51,29 +52,60 @@ namespace OvCore::ECS
5152
/**
5253
* Fill the given FMatrix4 vector with lights information
5354
* @param p_scene
54-
* @param p_out
5555
*/
56-
void FindLightMatrices(const OvCore::SceneSystem::Scene& p_scene, std::vector<OvMaths::FMatrix4>& p_out);
56+
std::vector<OvMaths::FMatrix4> FindLightMatrices(const OvCore::SceneSystem::Scene& p_scene);
57+
58+
/**
59+
* Fill the given FMatrix4 vector with lights information that are inside the frustum
60+
* @param p_scene
61+
* @param p_frustum
62+
*/
63+
std::vector<OvMaths::FMatrix4> FindLightMatricesInFrustum(const OvCore::SceneSystem::Scene& p_scene, const OvRendering::Data::Frustum& p_frustum);
5764

5865
/**
5966
* Draw the given scene using the given default material (optional) if no material found on an actor
6067
* @param p_scene
6168
* @param p_cameraPosition
69+
* @param p_camera
70+
* @param p_customFrustum
71+
* @param p_defaultMaterial
72+
*/
73+
void RenderScene
74+
(
75+
OvCore::SceneSystem::Scene& p_scene,
76+
const OvMaths::FVector3& p_cameraPosition,
77+
const OvRendering::LowRenderer::Camera& p_camera,
78+
const OvRendering::Data::Frustum* p_customFrustum = nullptr,
79+
OvCore::Resources::Material* p_defaultMaterial = nullptr
80+
);
81+
82+
/**
83+
* Returns opaque and transparents drawables from the scene with frustum culling
84+
* @param p_scene
85+
* @param p_cameraPosition
86+
* @param p_frustum
6287
* @param p_defaultMaterial
6388
*/
64-
void RenderScene(OvCore::SceneSystem::Scene& p_scene, const OvMaths::FVector3& p_cameraPosition, Resources::Material* p_defaultMaterial = nullptr);
89+
std::pair<OpaqueDrawables, TransparentDrawables> FindAndSortFrustumCulledDrawables
90+
(
91+
const OvCore::SceneSystem::Scene& p_scene,
92+
const OvMaths::FVector3& p_cameraPosition,
93+
const OvRendering::Data::Frustum& p_frustum,
94+
OvCore::Resources::Material* p_defaultMaterial
95+
);
6596

6697
/**
67-
* Find every drawables objects in the scene. Sorting order:
68-
* - Opaques (Front to back)
69-
* - Transparents (Back to front)
70-
* @param p_opaques
71-
* @param p_transparents
98+
* Returns opaque and transparents drawables from the scene
7299
* @param p_scene
73100
* @param p_cameraPosition
74101
* @param p_defaultMaterial
75102
*/
76-
void FindAndSortDrawables(OpaqueDrawables& p_opaques, TransparentDrawables& p_transparents, const OvCore::SceneSystem::Scene& p_scene, const OvMaths::FVector3& p_cameraPosition, Resources::Material* p_defaultMaterial = nullptr);
103+
std::pair<OpaqueDrawables, TransparentDrawables> FindAndSortDrawables
104+
(
105+
const OvCore::SceneSystem::Scene& p_scene,
106+
const OvMaths::FVector3& p_cameraPosition,
107+
OvCore::Resources::Material* p_defaultMaterial
108+
);
77109

78110
/**
79111
* Draw a Drawable instance

‎Sources/Overload/OvCore/src/OvCore/ECS/Components/CCamera.cpp‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,6 @@ std::string OvCore::ECS::Components::CCamera::GetName()
3535
return "Camera";
3636
}
3737

38-
39-
OvMaths::FMatrix4 OvCore::ECS::Components::CCamera::GetProjectionMatrix(uint16_t p_windowWidth, uint16_t p_windowHeight)
40-
{
41-
return m_camera.GetProjectionMatrix(p_windowWidth, p_windowHeight);
42-
}
43-
44-
OvMaths::FMatrix4 OvCore::ECS::Components::CCamera::GetViewMatrix()
45-
{
46-
return m_camera.GetViewMatrix(owner.transform.GetWorldPosition());
47-
}
48-
4938
void OvCore::ECS::Components::CCamera::SetFov(float p_value)
5039
{
5140
m_camera.SetFov(p_value);
@@ -61,6 +50,16 @@ void OvCore::ECS::Components::CCamera::SetFar(float p_value)
6150
m_camera.SetFar(p_value);
6251
}
6352

53+
void OvCore::ECS::Components::CCamera::SetFrustumGeometryCulling(bool p_enable)
54+
{
55+
m_camera.SetFrustumGeometryCulling(p_enable);
56+
}
57+
58+
void OvCore::ECS::Components::CCamera::SetFrustumLightCulling(bool p_enable)
59+
{
60+
m_camera.SetFrustumLightCulling(p_enable);
61+
}
62+
6463
float OvCore::ECS::Components::CCamera::GetFov() const
6564
{
6665
return m_camera.GetFov();
@@ -81,11 +80,21 @@ const OvMaths::FVector3 & OvCore::ECS::Components::CCamera::GetClearColor() cons
8180
return m_camera.GetClearColor();
8281
}
8382

83+
bool OvCore::ECS::Components::CCamera::HasFrustumGeometryCulling() const
84+
{
85+
return m_camera.HasFrustumGeometryCulling();
86+
}
87+
8488
void OvCore::ECS::Components::CCamera::SetClearColor(const OvMaths::FVector3 & p_clearColor)
8589
{
8690
m_camera.SetClearColor(p_clearColor);
8791
}
8892

93+
bool OvCore::ECS::Components::CCamera::HasFrustumLightCulling() const
94+
{
95+
return m_camera.HasFrustumLightCulling();
96+
}
97+
8998
OvRendering::LowRenderer::Camera & OvCore::ECS::Components::CCamera::GetCamera()
9099
{
91100
return m_camera;
@@ -97,14 +106,18 @@ void OvCore::ECS::Components::CCamera::OnSerialize(tinyxml2::XMLDocument & p_doc
97106
OvCore::Helpers::Serializer::SerializeFloat(p_doc, p_node, "near", m_camera.GetNear());
98107
OvCore::Helpers::Serializer::SerializeFloat(p_doc, p_node, "far", m_camera.GetFar());
99108
OvCore::Helpers::Serializer::SerializeVec3(p_doc, p_node, "clear_color", m_camera.GetClearColor());
109+
OvCore::Helpers::Serializer::SerializeBoolean(p_doc, p_node, "frustum_geometry_culling", m_camera.HasFrustumGeometryCulling());
110+
OvCore::Helpers::Serializer::SerializeBoolean(p_doc, p_node, "frustum_light_culling", m_camera.HasFrustumLightCulling());
100111
}
101112

102113
void OvCore::ECS::Components::CCamera::OnDeserialize(tinyxml2::XMLDocument & p_doc, tinyxml2::XMLNode * p_node)
103114
{
104115
m_camera.SetFov(OvCore::Helpers::Serializer::DeserializeFloat(p_doc, p_node, "fov"));
105116
m_camera.SetNear(OvCore::Helpers::Serializer::DeserializeFloat(p_doc, p_node, "near"));
106117
m_camera.SetFar(OvCore::Helpers::Serializer::DeserializeFloat(p_doc, p_node, "far"));
107-
SetClearColor(OvCore::Helpers::Serializer::DeserializeVec3(p_doc, p_node, "clear_color"));
118+
m_camera.SetClearColor(OvCore::Helpers::Serializer::DeserializeVec3(p_doc, p_node, "clear_color"));
119+
m_camera.SetFrustumGeometryCulling(OvCore::Helpers::Serializer::DeserializeBoolean(p_doc, p_node, "frustum_geometry_culling"));
120+
m_camera.SetFrustumLightCulling(OvCore::Helpers::Serializer::DeserializeBoolean(p_doc, p_node, "frustum_light_culling"));
108121
}
109122

110123
void OvCore::ECS::Components::CCamera::OnInspector(OvUI::Internal::WidgetContainer& p_root)
@@ -113,4 +126,6 @@ void OvCore::ECS::Components::CCamera::OnInspector(OvUI::Internal::WidgetContain
113126
OvCore::Helpers::GUIDrawer::DrawScalar<float>(p_root, "Near", std::bind(&CCamera::GetNear, this), std::bind(&CCamera::SetNear, this, std::placeholders::_1));
114127
OvCore::Helpers::GUIDrawer::DrawScalar<float>(p_root, "Far", std::bind(&CCamera::GetFar, this), std::bind(&CCamera::SetFar, this, std::placeholders::_1));
115128
OvCore::Helpers::GUIDrawer::DrawColor(p_root, "Clear color", [this]() {return reinterpret_cast<const OvUI::Types::Color&>(GetClearColor()); }, [this](OvUI::Types::Color p_color) { SetClearColor({ p_color.r, p_color.g, p_color.b }); }, false);
129+
OvCore::Helpers::GUIDrawer::DrawBoolean(p_root, "Frustum Geometry Culling", std::bind(&CCamera::HasFrustumGeometryCulling, this), std::bind(&CCamera::SetFrustumGeometryCulling, this, std::placeholders::_1));
130+
OvCore::Helpers::GUIDrawer::DrawBoolean(p_root, "Frustum Light Culling", std::bind(&CCamera::HasFrustumLightCulling, this), std::bind(&CCamera::SetFrustumLightCulling, this, std::placeholders::_1));
116131
}

‎Sources/Overload/OvCore/src/OvCore/ECS/Components/CModelRenderer.cpp‎

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55
*/
66

77
#include <OvUI/Widgets/Texts/Text.h>
8+
#include <OvUI/Widgets/Texts/TextColored.h>
89
#include <OvUI/Plugins/DDTarget.h>
910
#include <OvUI/Widgets/Visual/Image.h>
11+
#include <OvUI/Widgets/Selection/ComboBox.h>
12+
#include <OvUI/Widgets/Selection/CheckBox.h>
13+
#include <OvUI/Widgets/Drags/DragFloat.h>
1014

1115
#include "OvCore/Global/ServiceLocator.h"
1216
#include "OvCore/ResourceManagement/TextureManager.h"
@@ -41,17 +45,71 @@ OvRendering::Resources::Model * OvCore::ECS::Components::CModelRenderer::GetMode
4145
return m_model;
4246
}
4347

48+
void OvCore::ECS::Components::CModelRenderer::SetFrustumBehaviour(EFrustumBehaviour p_boundingMode)
49+
{
50+
m_frustumBehaviour = p_boundingMode;
51+
}
52+
53+
OvCore::ECS::Components::CModelRenderer::EFrustumBehaviour OvCore::ECS::Components::CModelRenderer::GetFrustumBehaviour() const
54+
{
55+
return m_frustumBehaviour;
56+
}
57+
58+
const OvRendering::Geometry::BoundingSphere& OvCore::ECS::Components::CModelRenderer::GetCustomBoundingSphere() const
59+
{
60+
return m_customBoundingSphere;
61+
}
62+
63+
void OvCore::ECS::Components::CModelRenderer::SetCustomBoundingSphere(const OvRendering::Geometry::BoundingSphere& p_boundingSphere)
64+
{
65+
m_customBoundingSphere = p_boundingSphere;
66+
}
67+
4468
void OvCore::ECS::Components::CModelRenderer::OnSerialize(tinyxml2::XMLDocument & p_doc, tinyxml2::XMLNode * p_node)
4569
{
4670
OvCore::Helpers::Serializer::SerializeModel(p_doc, p_node, "model", m_model);
71+
OvCore::Helpers::Serializer::SerializeInt(p_doc, p_node, "frustum_behaviour", reinterpret_cast<int&>(m_frustumBehaviour));
72+
OvCore::Helpers::Serializer::SerializeVec3(p_doc, p_node, "custom_bounding_sphere_position", m_customBoundingSphere.position);
73+
OvCore::Helpers::Serializer::SerializeFloat(p_doc, p_node, "custom_bounding_sphere_radius", m_customBoundingSphere.radius);
4774
}
4875

4976
void OvCore::ECS::Components::CModelRenderer::OnDeserialize(tinyxml2::XMLDocument & p_doc, tinyxml2::XMLNode* p_node)
5077
{
5178
OvCore::Helpers::Serializer::DeserializeModel(p_doc, p_node, "model", m_model);
79+
OvCore::Helpers::Serializer::DeserializeInt(p_doc, p_node, "frustum_behaviour", reinterpret_cast<int&>(m_frustumBehaviour));
80+
OvCore::Helpers::Serializer::DeserializeVec3(p_doc, p_node, "custom_bounding_sphere_position", m_customBoundingSphere.position);
81+
OvCore::Helpers::Serializer::DeserializeFloat(p_doc, p_node, "custom_bounding_sphere_radius", m_customBoundingSphere.radius);
5282
}
5383

5484
void OvCore::ECS::Components::CModelRenderer::OnInspector(OvUI::Internal::WidgetContainer& p_root)
5585
{
56-
OvCore::Helpers::GUIDrawer::DrawMesh(p_root, "Model", m_model, &m_modelChangedEvent);
86+
using namespace OvCore::Helpers;
87+
88+
GUIDrawer::DrawMesh(p_root, "Model", m_model, &m_modelChangedEvent);
89+
90+
GUIDrawer::CreateTitle(p_root, "Frustum Culling Behaviour");
91+
auto& boundingMode = p_root.CreateWidget<OvUI::Widgets::Selection::ComboBox>(0);
92+
boundingMode.choices.emplace(0, "Disabled");
93+
boundingMode.choices.emplace(1, "Cull model");
94+
boundingMode.choices.emplace(2, "Cull model & sub-meshes");
95+
boundingMode.choices.emplace(3, "Cull custom bounding sphere");
96+
auto& boundingModeDispatcher = boundingMode.AddPlugin<OvUI::Plugins::DataDispatcher<int>>();
97+
boundingModeDispatcher.RegisterReference(reinterpret_cast<int&>(m_frustumBehaviour));
98+
99+
auto& centerLabel = p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>("Bounding Sphere Center", GUIDrawer::TitleColor);
100+
auto& centerWidget = p_root.CreateWidget<OvUI::Widgets::Drags::DragMultipleScalars<float, 3>>(GUIDrawer::GetDataType<float>(), GUIDrawer::_MIN_FLOAT, GUIDrawer::_MAX_FLOAT, 0.f, 0.05f, "", GUIDrawer::GetFormat<float>());
101+
auto& centerDispatcher = centerWidget.AddPlugin<OvUI::Plugins::DataDispatcher<std::array<float, 3>>>();
102+
centerDispatcher.RegisterReference(reinterpret_cast<std::array<float, 3>&>(m_customBoundingSphere.position));
103+
104+
auto& radiusLabel = p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>("Bounding Sphere Radius", GUIDrawer::TitleColor);
105+
auto& radiusWidget = p_root.CreateWidget<OvUI::Widgets::Drags::DragFloat>(0.0f, GUIDrawer::_MAX_FLOAT, 0.f, 0.1f);
106+
auto& radiusDispatcher = radiusWidget.AddPlugin<OvUI::Plugins::DataDispatcher<float>>();
107+
radiusDispatcher.RegisterReference(m_customBoundingSphere.radius);
108+
109+
boundingMode.ValueChangedEvent += [&](int p_choice)
110+
{
111+
centerLabel.enabled = centerWidget.enabled = radiusLabel.enabled = radiusWidget.enabled = p_choice == 3;
112+
};
113+
114+
centerLabel.enabled = centerWidget.enabled = radiusLabel.enabled = radiusWidget.enabled = m_frustumBehaviour == EFrustumBehaviour::CULL_CUSTOM;
57115
}

0 commit comments

Comments
 (0)