rob/HydraV3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Splitting

Browse Source
This commit is contained in:
Confideo-IOM
2026-09-22 15:22:41 +01:00
parent 2734c663c7
commit 94a2bb508e
47 changed files with 1148 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HydraEngine/source/actor/PlanetActor/HydraPlanetActor.cpp
+35 -34
View File
@@ -23,14 +23,14 @@ void HydraPlanetActor::FixedTick(float delta_t)
HydraECS* ecs = GetEngine()->ECS();
HydraPlanetQuadActor* quad0 = static_cast<HydraPlanetQuadActor*>(actor_manager->GetActor(m_quads[0]));
HydraPlanetQuadActor* quad1 = static_cast<HydraPlanetQuadActor*>(actor_manager->GetActor(m_quads[1]));
HydraPlanetQuadActor* quad2 = static_cast<HydraPlanetQuadActor*>(actor_manager->GetActor(m_quads[2]));
HydraPlanetQuadActor* quad3 = static_cast<HydraPlanetQuadActor*>(actor_manager->GetActor(m_quads[3]));
// HydraPlanetQuadActor* quad1 = static_cast<HydraPlanetQuadActor*>(actor_manager->GetActor(m_quads[1]));
// HydraPlanetQuadActor* quad2 = static_cast<HydraPlanetQuadActor*>(actor_manager->GetActor(m_quads[2]));
// HydraPlanetQuadActor* quad3 = static_cast<HydraPlanetQuadActor*>(actor_manager->GetActor(m_quads[3]));
quad0->CheckResolution(pos_comp.position);
quad1->CheckResolution(pos_comp.position);
quad2->CheckResolution(pos_comp.position);
quad3->CheckResolution(pos_comp.position);
// quad1->CheckResolution(pos_comp.position);
// quad2->CheckResolution(pos_comp.position);
// quad3->CheckResolution(pos_comp.position);
}
void HydraPlanetActor::InitialiseComponents()
@@ -241,45 +241,46 @@ void HydraPlanetActor::_CreateRenderableComponent()
void HydraPlanetActor::_CreateQuads()
{
uint32_t divisions = 100;
uint32_t divisions = 16;
float diameter = 50000.0f;
float quad_size = 50000.0f;
float radius = diameter /2.0f;
float half_quad = quad_size / 2.0f;
float radius = diameter / 2.0f;
m_quads[0] = GetEngine()->ActorManager()->CreateActor<HydraPlanetQuadActor>();
HydraPlanetQuadActor* quad0 = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(m_quads[0]));
quad0->InitialiseQuad(diameter, quad_size, divisions, glm::vec3(0,0,radius), glm::vec3(0,0,0));
quad0->InitialiseQuad(diameter, quad_size, divisions, glm::vec3(-half_quad, -half_quad, half_quad), glm::vec3(0,0,0));
GetEngine()->ActorManager()->InitialiseActor(m_quads[0]);
GetEngine()->ActorManager()->SetRelationship(GetID(), m_quads[0]);
m_quads[1] = GetEngine()->ActorManager()->CreateActor<HydraPlanetQuadActor>();
HydraPlanetQuadActor* quad1 = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(m_quads[1]));
quad1->InitialiseQuad(diameter, quad_size, divisions, glm::vec3(radius,0,0), glm::vec3(0,glm::radians(90.0f),0));
GetEngine()->ActorManager()->InitialiseActor(m_quads[1]);
GetEngine()->ActorManager()->SetRelationship(GetID(), m_quads[1]);
// m_quads[1] = GetEngine()->ActorManager()->CreateActor<HydraPlanetQuadActor>();
// HydraPlanetQuadActor* quad1 = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(m_quads[1]));
// quad1->InitialiseQuad(diameter, quad_size, divisions, glm::vec3(radius,0,0), glm::vec3(0,glm::radians(90.0f),0));
// GetEngine()->ActorManager()->InitialiseActor(m_quads[1]);
// GetEngine()->ActorManager()->SetRelationship(GetID(), m_quads[1]);
m_quads[2] = GetEngine()->ActorManager()->CreateActor<HydraPlanetQuadActor>();
HydraPlanetQuadActor* quad2 = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(m_quads[2]));
quad2->InitialiseQuad(diameter, quad_size, divisions, glm::vec3(0,0,-radius), glm::vec3(0,glm::radians(180.0f),0));
GetEngine()->ActorManager()->InitialiseActor(m_quads[2]);
GetEngine()->ActorManager()->SetRelationship(GetID(), m_quads[2]);
// m_quads[2] = GetEngine()->ActorManager()->CreateActor<HydraPlanetQuadActor>();
// HydraPlanetQuadActor* quad2 = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(m_quads[2]));
// quad2->InitialiseQuad(diameter, quad_size, divisions, glm::vec3(0,0,-radius), glm::vec3(0,glm::radians(180.0f),0));
// GetEngine()->ActorManager()->InitialiseActor(m_quads[2]);
// GetEngine()->ActorManager()->SetRelationship(GetID(), m_quads[2]);
m_quads[3] = GetEngine()->ActorManager()->CreateActor<HydraPlanetQuadActor>();
HydraPlanetQuadActor* quad3 = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(m_quads[3]));
quad3->InitialiseQuad(diameter, quad_size, divisions, glm::vec3(-radius,0,0), glm::vec3(0,glm::radians(270.0f),0));
GetEngine()->ActorManager()->InitialiseActor(m_quads[3]);
GetEngine()->ActorManager()->SetRelationship(GetID(), m_quads[3]);
// m_quads[3] = GetEngine()->ActorManager()->CreateActor<HydraPlanetQuadActor>();
// HydraPlanetQuadActor* quad3 = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(m_quads[3]));
// quad3->InitialiseQuad(diameter, quad_size, divisions, glm::vec3(-radius,0,0), glm::vec3(0,glm::radians(270.0f),0));
// GetEngine()->ActorManager()->InitialiseActor(m_quads[3]);
// GetEngine()->ActorManager()->SetRelationship(GetID(), m_quads[3]);
m_quads[4] = GetEngine()->ActorManager()->CreateActor<HydraPlanetQuadActor>();
HydraPlanetQuadActor* quad4 = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(m_quads[4]));
quad4->InitialiseQuad(diameter, quad_size, divisions, glm::vec3(0,radius,0), glm::vec3(glm::radians(-90.0f), 0, 0));
GetEngine()->ActorManager()->InitialiseActor(m_quads[4]);
GetEngine()->ActorManager()->SetRelationship(GetID(), m_quads[4]);
// m_quads[4] = GetEngine()->ActorManager()->CreateActor<HydraPlanetQuadActor>();
// HydraPlanetQuadActor* quad4 = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(m_quads[4]));
// quad4->InitialiseQuad(diameter, quad_size, divisions, glm::vec3(0,radius,0), glm::vec3(glm::radians(-90.0f), 0, 0));
// GetEngine()->ActorManager()->InitialiseActor(m_quads[4]);
// GetEngine()->ActorManager()->SetRelationship(GetID(), m_quads[4]);
m_quads[5] = GetEngine()->ActorManager()->CreateActor<HydraPlanetQuadActor>();
HydraPlanetQuadActor* quad5 = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(m_quads[5]));
quad5->InitialiseQuad(diameter, quad_size, divisions, glm::vec3(0,-radius,0), glm::vec3(glm::radians(90.0f), 0, 0));
GetEngine()->ActorManager()->InitialiseActor(m_quads[5]);
GetEngine()->ActorManager()->SetRelationship(GetID(), m_quads[5]);
// m_quads[5] = GetEngine()->ActorManager()->CreateActor<HydraPlanetQuadActor>();
// HydraPlanetQuadActor* quad5 = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(m_quads[5]));
// quad5->InitialiseQuad(diameter, quad_size, divisions, glm::vec3(0,-radius,0), glm::vec3(glm::radians(90.0f), 0, 0));
// GetEngine()->ActorManager()->InitialiseActor(m_quads[5]);
// GetEngine()->ActorManager()->SetRelationship(GetID(), m_quads[5]);
}
HydraEngine/source/actor/PlanetActor/HydraPlanetQuadActor.cpp
+73 -18
View File
@@ -38,34 +38,58 @@ void HydraPlanetQuadActor::InitialiseQuad(float planet_diameter, float quad_dime
m_planet_diameter = planet_diameter;
m_origin = origin;
m_quad_dimension = quad_dimension;
m_orientation = orientation;
GetEngine()->ActorManager()->SetPositionAndOrientation(GetID(), origin, orientation, true);
_CreateMesh();
}
void HydraPlanetQuadActor::CheckResolution(glm::dvec3 player_position)
{
if(m_divided)
{
std::vector<HydraID> children = GetEngine()->ActorManager()->GetChildren(GetID());
for(HydraID child_id : children)
{
}
}
bool should_split = false;
double distance_to_quad = glm::length(player_position - m_centre);
//might need to bias this so it splits sooner and merges later
if(distance_to_quad < m_quad_dimension)
{
should_split = true;
}
//Not split but should be
if((should_split) && (!m_divided))
{
//Split this quad
_Split();
//Check its children to see if they should be split
//std::vector<HydraID> children = GetEngine()->ActorManager()->GetChildren(GetID());
for(HydraID child_id : m_child_quads)
{
HydraPlanetQuadActor* child = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(child_id));
child->CheckResolution(player_position);
}
HydraRenderableComponent& renderable = GetEngine()->ECS()->GetComponent<HydraRenderableComponent>(GetID());
renderable.active = false;
}
else if((should_split) && (m_divided))
{
for(HydraID child_id : m_child_quads)
{
HydraPlanetQuadActor* child = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(child_id));
child->CheckResolution(player_position);
}
}
else if ((!should_split) && (m_divided)) //Is split but should not be
{
//Merge this quad and all its children
}
}
glm::vec3 HydraPlanetQuadActor::_ProjectSphere(glm::dvec4 vert_in, glm::dmat4 trans, glm::dmat4 inv_trans, double diameter, glm::vec3 origin)
{
glm::dvec4 vert = trans * vert_in;
vert = glm::normalize(vert);
vert = vert * (m_planet_diameter / 2.0);
FastNoiseLite fnl;
fnl.SetNoiseType(FastNoiseLite::NoiseType::NoiseType_OpenSimplex2);
fnl.SetFractalType(FastNoiseLite::FractalType::FractalType_Ridged);
@@ -89,6 +113,39 @@ glm::dvec3 HydraPlanetQuadActor::_ProjectCentre(glm::dvec4 vert_in, glm::dmat4 t
return glm::dvec3(vert);
}
void HydraPlanetQuadActor::_Split()
{
m_divided = true;
float quad_size = m_quad_dimension / 2.0f;
float radius = m_planet_diameter / 2.0f;
//2 | 3
//-----
//0 | 1
std::vector<glm::vec3> origins;
origins.push_back(m_origin);
origins.push_back(m_origin + glm::vec3(quad_size, 0, 0));
origins.push_back(m_origin + glm::vec3(0, quad_size, 0));
origins.push_back(m_origin + glm::vec3(quad_size, quad_size, 0));
// glm::vec3 origin0 = m_origin;
// glm::vec3 origin1 = m_origin + glm::vec3(quad_size, 0, 0);
// glm::vec3 origin2 = m_origin + glm::vec3(0, quad_size, 0);
// glm::vec3 origin3 = m_origin;
for(uint32_t i = 0; i < 4; i ++)
{
HydraID quad_id = GetEngine()->ActorManager()->CreateActor<HydraPlanetQuadActor>();
HydraPlanetQuadActor* quad = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(quad_id));
quad->InitialiseQuad(m_planet_diameter, quad_size, m_divisions, origins[i], m_orientation);
GetEngine()->ActorManager()->InitialiseActor(quad_id);
//GetEngine()->ActorManager()->SetRelationship(GetID(), quad_id);
m_child_quads.push_back(quad_id);
}
}
void HydraPlanetQuadActor::_CreatePosition()
{
HydraECS *ecs = GetEngine()->ECS();
@@ -113,12 +170,12 @@ void HydraPlanetQuadActor::_CreateMesh()
mesh->vertexes.resize(vert_counts);
mesh->indexes.resize(index_counts);
float min_x = -m_quad_dimension / 2.0f;
float min_y = -m_quad_dimension / 2.0f;
float min_x = 0;//-m_quad_dimension / 2.0f;
float min_y = 0;//-m_quad_dimension / 2.0f;
float min_z = 0.0f;
float max_x = m_quad_dimension / 2.0f;
float max_y = m_quad_dimension / 2.0f;
float max_x = m_quad_dimension;
float max_y = m_quad_dimension;
float max_z = 0.0f;
float min_u = 0;
@@ -152,18 +209,16 @@ void HydraPlanetQuadActor::_CreateMesh()
glm::dvec4 centre = glm::dvec4(max_x - min_x, max_y - min_y, max_z - min_z, 1.0);
m_centre = _ProjectCentre(centre, trans, m_planet_diameter, m_origin);
m_centre = _ProjectCentre(centre, trans, m_planet_diameter, glm::vec3(max_x, max_y, max_z) - glm::vec3(min_x, min_y, min_z));
for (uint32_t y_count = 0; y_count < m_divisions - 1; y_count++)
{
for (uint32_t x_count = 0; x_count < m_divisions - 1; x_count++)
{
// Create Vertex
glm::dvec4 vert = glm::dvec4(x, y, min_z, 1.0);
glm::vec3 final_vert = _ProjectSphere(vert, trans, inv_trans, m_planet_diameter, m_origin);
mesh->vertexes[vert_idx] = {final_vert.x, final_vert.y, final_vert.z, u, v, actor_id, mat_comp.material_id, 0};
uint32_t ind0 = vert_idx;
HydraEngine/source/actor/PlanetActor/HydraPlanetQuadActor.h
+4 -1
View File
@@ -15,8 +15,10 @@ class CLASS_DEFINE HydraPlanetQuadActor : public HydraActor
private:
glm::vec3 _ProjectSphere(glm::dvec4 vert_in, glm::dmat4 trans, glm::dmat4 inv_trans, double diameter, glm::vec3 origin);
glm::dvec3 _ProjectCentre(glm::dvec4 vert_in, glm::dmat4 trans, double diameter, glm::vec3 origin);
void _Split();
double m_scale = 1.0;
double m_widthscale = 1000.0f;
HydraID m_material_component = INVALID_HYDRA_ID;
HydraID m_position_component = INVALID_HYDRA_ID;
HydraID m_mesh_component = INVALID_HYDRA_ID;
@@ -25,9 +27,10 @@ class CLASS_DEFINE HydraPlanetQuadActor : public HydraActor
float m_planet_diameter = 0;
glm::dvec3 m_centre {};
glm::vec3 m_origin {};
glm::vec3 m_orientation {};
bool m_divided = false;
std::vector<HydraID> m_child_quads;
protected:
void _CreatePosition();
void _CreateMesh();
HydraEngine/source/ecs/components/HydraMeshComponent.h
+1
View File
@@ -11,6 +11,7 @@ struct HydraMeshComponent
HYDRA_STATE mesh_state = HYDRA_STATE::Empty;
glm::vec3 origin {};
glm::vec3 extent {};
bool render = true;
};
HydraEngine/source/ecs/components/HydraRenderableComponent.h
+1
View File
@@ -4,6 +4,7 @@
struct HydraRenderableComponent
{
bool active = true;
HydraSignature renderable_types;
};
HydraEngine/source/pipeline/HydraRenderStage.cpp
+1 -1
View File
@@ -112,7 +112,7 @@ void HydraRenderStage::Render(std::set<HydraID>& entities, uint32_t framebuffer_
for(const auto& entity_id : entities )
{
HydraRenderableComponent render_comp = ecs->GetComponent<HydraRenderableComponent>(entity_id);
if((render_comp.renderable_types & signature) == signature)
if(((render_comp.renderable_types & signature) == signature) && (render_comp.active))
{
HydraMeshComponent mesh_comp = ecs->GetComponent<HydraMeshComponent>(entity_id);
if(mesh_comp.mesh_state == HYDRA_STATE::Ready)