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

Tess

Browse Source
This commit is contained in:
Confideo-IOM
2026-09-29 12:52:37 +01:00
parent 7a1eaa3654
commit def7bbffee
46 changed files with 1492 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HydraEngine/source/actor/PlanetActor/HydraPlanetActor.cpp
+9 -26
View File
@@ -20,33 +20,16 @@
void HydraPlanetActor::FixedTick(float delta_t)
{
HydraTaskScheduler* task_scheduler = GetEngine()->TaskScheduler();
if(task_scheduler->BarrierComplete(m_update_barrier))
{
//if(task_scheduler->BarrierComplete(m_update_barrier))
//{
// m_update_barrier = task_scheduler->CreateBarrier();
// HydraID task_id = task_scheduler->CreateTask<HydraCheckPlanetResolutionTask>(HydraThreadAffinity::General, m_update_barrier);
// HydraCheckPlanetResolutionTask* task = static_cast<HydraCheckPlanetResolutionTask*>(task_scheduler->GetTask(task_id));
// task->Initialise(m_quads);
// task_scheduler->StartTask(task_id);
m_update_barrier = task_scheduler->CreateBarrier();
HydraID task_id = task_scheduler->CreateTask<HydraCheckPlanetResolutionTask>(HydraThreadAffinity::General, m_update_barrier);
HydraCheckPlanetResolutionTask* task = static_cast<HydraCheckPlanetResolutionTask*>(task_scheduler->GetTask(task_id));
task->Initialise(m_quads);
task_scheduler->StartTask(task_id);
// HydraID player_id = GetEngine()->GetPossessedPlayer();
// HydraPositionComponent pos_comp = GetEngine()->ECS()->GetComponent<HydraPositionComponent>(player_id);
// HydraActorManager* actor_manager = GetEngine()->ActorManager();
// 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* quad4 = static_cast<HydraPlanetQuadActor*>(actor_manager->GetActor(m_quads[4]));
// HydraPlanetQuadActor* quad5 = static_cast<HydraPlanetQuadActor*>(actor_manager->GetActor(m_quads[5]));
// quad0->CheckResolution(pos_comp.position);
// quad1->CheckResolution(pos_comp.position);
// quad2->CheckResolution(pos_comp.position);
// quad3->CheckResolution(pos_comp.position);
// quad4->CheckResolution(pos_comp.position);
// quad5->CheckResolution(pos_comp.position);
}
//}
}
void HydraPlanetActor::InitialiseComponents()
HydraEngine/source/actor/PlanetActor/HydraPlanetQuadActor.cpp
+177 -99
View File
@@ -33,7 +33,6 @@ void HydraPlanetQuadActor::DeferredInitialiseComponents()
void HydraPlanetQuadActor::Destroy()
{
}
void HydraPlanetQuadActor::InitialiseQuad(HydraID parent_id, float planet_diameter, float quad_dimension, uint32_t divisions, glm::dvec3 origin, glm::vec3 orientation)
@@ -44,7 +43,7 @@ void HydraPlanetQuadActor::InitialiseQuad(HydraID parent_id, float planet_diamet
m_quad_dimension = quad_dimension;
m_orientation = orientation;
m_parent_id = parent_id;
//GetEngine()->ActorManager()->SetPositionAndOrientation(GetID(), origin, orientation, true);
// GetEngine()->ActorManager()->SetPositionAndOrientation(GetID(), origin, orientation, true);
_CreateMesh();
}
@@ -58,11 +57,11 @@ void HydraPlanetQuadActor::CheckResolution(glm::dvec3 player_position)
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)&& (m_quad_dimension > 64))
{
if ((distance_to_quad < m_quad_dimension) && (m_quad_dimension > 64))
{
should_split = true;
}
if(distance_to_quad > m_quad_dimension * 1.1f)
if (distance_to_quad > m_quad_dimension * 1.1f)
{
should_merge = true;
}
@@ -93,7 +92,7 @@ void HydraPlanetQuadActor::CheckResolution(glm::dvec3 player_position)
{
for (HydraID child_id : m_child_quads)
{
HydraPlanetQuadActor* child = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(child_id));
HydraPlanetQuadActor *child = static_cast<HydraPlanetQuadActor *>(GetEngine()->ActorManager()->GetActor(child_id));
child->CheckResolution(player_position);
GetEngine()->ActorManager()->DeleteActor(child_id);
}
@@ -107,11 +106,10 @@ void HydraPlanetQuadActor::CheckResolution(glm::dvec3 player_position)
HydraPlanetQuadActor::~HydraPlanetQuadActor()
{
if(m_center_actor != INVALID_HYDRA_ID)
if (m_center_actor != INVALID_HYDRA_ID)
{
GetEngine()->ActorManager()->DeleteActor(m_center_actor);
GetEngine()->ActorManager()->DeleteActor(m_center_actor);
}
}
void HydraPlanetQuadActor::_MergeQuads()
@@ -121,7 +119,7 @@ void HydraPlanetQuadActor::_MergeQuads()
glm::vec3 HydraPlanetQuadActor::_ProjectSphere(glm::dvec4 vert_in, glm::dmat4 trans, glm::dmat4 inv_trans, double diameter, glm::vec3 origin)
{
return glm::dvec3(vert_in);
glm::dvec4 vert = trans * vert_in;
vert = glm::normalize(vert);
vert = vert * (m_planet_diameter / 2.0);
@@ -142,12 +140,12 @@ glm::vec3 HydraPlanetQuadActor::_ProjectSphere(glm::dvec4 vert_in, glm::dmat4 tr
glm::dvec3 HydraPlanetQuadActor::_ProjectCentre(glm::vec3 vert_in, glm::dmat4 trans, double diameter)
{
glm::dvec4 vert = trans * glm::dvec4(vert_in,1);
return glm::dvec3(vert_in);
glm::dvec4 vert = trans * glm::dvec4(vert_in, 1);
vert = glm::normalize(vert);
vert = vert * (m_planet_diameter / 2.0);
// vert_in = glm::normalize(vert_in);
// vert_in = vert_in * (m_planet_diameter / 2.0f);
FastNoiseLite fnl;
@@ -157,7 +155,6 @@ glm::dvec3 HydraPlanetQuadActor::_ProjectCentre(glm::vec3 vert_in, glm::dmat4 tr
fnl.SetFrequency(0.00009);
fnl.SetFractalOctaves(15);
fnl.SetFractalLacunarity(2.1);
float noise = fnl.GetNoise(vert.x, vert.y, vert.z);
@@ -189,7 +186,7 @@ void HydraPlanetQuadActor::_Split()
HydraPlanetQuadActor *quad = static_cast<HydraPlanetQuadActor *>(GetEngine()->ActorManager()->GetActor(quad_id));
GetEngine()->ActorManager()->InitialiseActor(quad_id);
quad->InitialiseQuad(GetID(), m_planet_diameter, child_quad_size, m_divisions, origins[i], m_orientation);
m_child_quads.push_back(quad_id);
}
}
@@ -207,12 +204,13 @@ void HydraPlanetQuadActor::_CreateMesh()
HydraMeshManager *mesh_manager = GetEngine()->MeshManager();
HydraID mesh_id = mesh_manager->CreateMesh();
HydraMesh *mesh = mesh_manager->GetMesh(mesh_id);
HydraMaterialComponent mat_comp = GetEngine()->ECS()->GetComponent<HydraMaterialComponent>(GetID());
HydraPositionComponent pos_comp = GetEngine()->ECS()->GetComponent<HydraPositionComponent>(GetID());
uint32_t vert_counts = m_divisions * m_divisions;
uint32_t index_counts = ((m_divisions - 1) * (m_divisions - 1)) * 6;
uint32_t vert_counts = 4;
uint32_t index_counts = 4;
mesh->vertexes.resize(vert_counts);
mesh->indexes.resize(index_counts);
@@ -225,33 +223,20 @@ void HydraPlanetQuadActor::_CreateMesh()
float max_z = 0.0f;
float min_u = 0;
float min_v = 1 * (m_divisions - 1);
float min_v = 0;
float max_u = 1 * (m_divisions - 1);
float max_v = 0;
float xy_inc = m_quad_dimension / (m_divisions - 1);
float u_inc = max_u / (m_divisions - 1);
float v_inc = -min_v / (m_divisions - 1);
float max_u = 1;
float max_v = 1;
// 1---2
// | / |
// 0---3
HydraID actor_id = GetID();
float y = min_y;
float x = min_x;
float u = min_u;
float v = min_v;
uint32_t vert_idx = 0;
uint32_t index_idx = 0;
// glm::mat4 trans = GetEngine()->ActorManager()->GetActorPose(actor_id);
glm::dvec4 quad_direction = glm::toMat4(glm::quat(m_orientation)) * glm::dvec4(0,0,1,1);
glm::dvec4 quad_direction = glm::toMat4(glm::quat(m_orientation)) * glm::dvec4(0, 0, 1, 1);
glm::dvec4 transformed_origin = glm::toMat4(glm::quat(m_orientation)) * glm::dvec4(m_origin, 1);
glm::dvec4 quad_position = transformed_origin + (quad_direction * (m_planet_diameter /2.0));
glm::dvec4 quad_position = transformed_origin + (quad_direction * (m_planet_diameter / 2.0));
glm::dmat4 trans_matrix = glm::translate(glm::dvec3(quad_position));
glm::dmat4 rot_matrix = glm::toMat4(glm::quat(m_orientation));
@@ -260,66 +245,32 @@ void HydraPlanetQuadActor::_CreateMesh()
GetEngine()->ActorManager()->SetPositionAndOrientation(GetID(), quad_position, m_orientation, true);
m_centre = _ProjectCentre(glm::vec3(0,0,1), trans, m_planet_diameter);
m_centre = _ProjectCentre(glm::vec3(0, 0, 1), trans, m_planet_diameter);
// Create Vertex
glm::dvec4 vert = glm::dvec4(min_x, min_y, min_z, 1.0);
glm::vec3 final_vert = _ProjectSphere(vert, trans, inv_trans, m_planet_diameter, m_origin);
mesh->vertexes[0] = {final_vert.x, final_vert.y, final_vert.z, min_u, min_v, actor_id, mat_comp.material_id, 0};
vert = glm::dvec4(min_x, max_y, min_z, 1.0);
final_vert = _ProjectSphere(vert, trans, inv_trans, m_planet_diameter, m_origin);
mesh->vertexes[1] = {final_vert.x, final_vert.y, final_vert.z, min_u, max_v, actor_id, mat_comp.material_id, 0};
vert = glm::dvec4(max_x, max_y, min_z, 1.0);
final_vert = _ProjectSphere(vert, trans, inv_trans, m_planet_diameter, m_origin);
mesh->vertexes[2] = {final_vert.x, final_vert.y, final_vert.z, max_u, max_v, actor_id, mat_comp.material_id, 0};
vert = glm::dvec4(max_x, min_y, min_z, 1.0);
final_vert = _ProjectSphere(vert, trans, inv_trans, m_planet_diameter, m_origin);
mesh->vertexes[3] = {final_vert.x, final_vert.y, final_vert.z, max_u, min_v, actor_id, mat_comp.material_id, 0};
mesh->indexes[0] = 0;
mesh->indexes[1] = 3;
mesh->indexes[2] = 1;
mesh->indexes[3] = 2;
// m_center_actor = GetEngine()->ActorManager()->CreateActor<HydraTestCubeActor>();
// HydraTestCubeActor* center_actor = static_cast<HydraTestCubeActor*>(GetEngine()->ActorManager()->GetActor(m_center_actor));
// center_actor->SetScale(1);
// GetEngine()->ActorManager()->InitialiseActor(m_center_actor);
// GetEngine()->ActorManager()->SetPosition(m_center_actor, m_centre);
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;
uint32_t ind1 = vert_idx + m_divisions;
uint32_t ind2 = vert_idx + m_divisions + 1;
uint32_t ind3 = vert_idx + 1;
mesh->indexes[index_idx + 0] = ind0;
mesh->indexes[index_idx + 1] = ind2;
mesh->indexes[index_idx + 2] = ind1;
mesh->indexes[index_idx + 3] = ind0;
mesh->indexes[index_idx + 4] = ind3;
mesh->indexes[index_idx + 5] = ind2;
x += xy_inc;
u += u_inc;
vert_idx++;
index_idx += 6;
}
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};
// Add the end vert but no indexes
// mesh->vertexes[vert_idx] = {x, y, min_z, u, v, actor_id, mat_comp.material_id, 0};
vert_idx++;
y += xy_inc;
v += v_inc;
x = min_x;
u = min_u;
}
// the last row
for (uint32_t x_count = 0; x_count < m_divisions; x_count++)
{
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};
x += xy_inc;
u += u_inc;
vert_idx++;
}
mesh_manager->CalculateNormals(mesh->mesh_id);
//mesh_manager->CalculateNormals(mesh->mesh_id);
HydraECS *ecs = GetEngine()->ECS();
HydraMeshComponent mesh_comp;
@@ -328,9 +279,136 @@ void HydraPlanetQuadActor::_CreateMesh()
mesh_comp.mesh_state = HYDRA_STATE::Waiting;
ecs->AddComponent<HydraMeshComponent>(GetID(), mesh_comp);
HydraRenderableComponent& render_comp = GetEngine()->ECS()->GetComponent<HydraRenderableComponent>(GetID());
HydraRenderableComponent &render_comp = GetEngine()->ECS()->GetComponent<HydraRenderableComponent>(GetID());
render_comp.active = true;
}
// void HydraPlanetQuadActor::_CreateMesh()
// {
// HydraMeshManager *mesh_manager = GetEngine()->MeshManager();
// HydraID mesh_id = mesh_manager->CreateMesh();
// HydraMesh *mesh = mesh_manager->GetMesh(mesh_id);
// HydraMaterialComponent mat_comp = GetEngine()->ECS()->GetComponent<HydraMaterialComponent>(GetID());
// HydraPositionComponent pos_comp = GetEngine()->ECS()->GetComponent<HydraPositionComponent>(GetID());
// uint32_t vert_counts = m_divisions * m_divisions;
// uint32_t index_counts = ((m_divisions - 1) * (m_divisions - 1)) * 6;
// 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_z = 0.0f;
// float max_x = m_quad_dimension / 2.0f;
// float max_y = m_quad_dimension / 2.0f;
// float max_z = 0.0f;
// float min_u = 0;
// float min_v = 1 * (m_divisions - 1);
// float max_u = 1 * (m_divisions - 1);
// float max_v = 0;
// float xy_inc = m_quad_dimension / (m_divisions - 1);
// float u_inc = max_u / (m_divisions - 1);
// float v_inc = -min_v / (m_divisions - 1);
// // 1---2
// // | / |
// // 0---3
// HydraID actor_id = GetID();
// float y = min_y;
// float x = min_x;
// float u = min_u;
// float v = min_v;
// uint32_t vert_idx = 0;
// uint32_t index_idx = 0;
// // glm::mat4 trans = GetEngine()->ActorManager()->GetActorPose(actor_id);
// glm::dvec4 quad_direction = glm::toMat4(glm::quat(m_orientation)) * glm::dvec4(0,0,1,1);
// glm::dvec4 transformed_origin = glm::toMat4(glm::quat(m_orientation)) * glm::dvec4(m_origin, 1);
// glm::dvec4 quad_position = transformed_origin + (quad_direction * (m_planet_diameter /2.0));
// glm::dmat4 trans_matrix = glm::translate(glm::dvec3(quad_position));
// glm::dmat4 rot_matrix = glm::toMat4(glm::quat(m_orientation));
// glm::dmat4 trans = trans_matrix * rot_matrix;
// glm::dmat4 inv_trans = glm::inverse(trans);
// GetEngine()->ActorManager()->SetPositionAndOrientation(GetID(), quad_position, m_orientation, true);
// m_centre = _ProjectCentre(glm::vec3(0,0,1), trans, m_planet_diameter);
// // m_center_actor = GetEngine()->ActorManager()->CreateActor<HydraTestCubeActor>();
// // HydraTestCubeActor* center_actor = static_cast<HydraTestCubeActor*>(GetEngine()->ActorManager()->GetActor(m_center_actor));
// // center_actor->SetScale(1);
// // GetEngine()->ActorManager()->InitialiseActor(m_center_actor);
// // GetEngine()->ActorManager()->SetPosition(m_center_actor, m_centre);
// 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;
// uint32_t ind1 = vert_idx + m_divisions;
// uint32_t ind2 = vert_idx + m_divisions + 1;
// uint32_t ind3 = vert_idx + 1;
// mesh->indexes[index_idx + 0] = ind0;
// mesh->indexes[index_idx + 1] = ind2;
// mesh->indexes[index_idx + 2] = ind1;
// mesh->indexes[index_idx + 3] = ind0;
// mesh->indexes[index_idx + 4] = ind3;
// mesh->indexes[index_idx + 5] = ind2;
// x += xy_inc;
// u += u_inc;
// vert_idx++;
// index_idx += 6;
// }
// 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};
// // Add the end vert but no indexes
// // mesh->vertexes[vert_idx] = {x, y, min_z, u, v, actor_id, mat_comp.material_id, 0};
// vert_idx++;
// y += xy_inc;
// v += v_inc;
// x = min_x;
// u = min_u;
// }
// // the last row
// for (uint32_t x_count = 0; x_count < m_divisions; x_count++)
// {
// 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};
// x += xy_inc;
// u += u_inc;
// vert_idx++;
// }
// mesh_manager->CalculateNormals(mesh->mesh_id);
// HydraECS *ecs = GetEngine()->ECS();
// HydraMeshComponent mesh_comp;
// mesh_comp.mesh_id = mesh_id;
// mesh_comp.mesh_state = HYDRA_STATE::Waiting;
// ecs->AddComponent<HydraMeshComponent>(GetID(), mesh_comp);
// HydraRenderableComponent& render_comp = GetEngine()->ECS()->GetComponent<HydraRenderableComponent>(GetID());
// render_comp.active = true;
// }
void HydraPlanetQuadActor::_CreateMaterial()
{
@@ -374,8 +452,8 @@ void HydraPlanetQuadActor::_CreateRenderableComponent()
HydraRenderableComponent render_comp;
HydraShadowCasterComponent shad_caster;
HydraECS *ecs = GetEngine()->ECS();
render_comp.renderable_types.set((uint32_t)HYDRA_RENDERABLE_TYPE::HYDRA_COLOUR, true);
render_comp.renderable_types.set((uint32_t)HYDRA_RENDERABLE_TYPE::HYDRA_SHADOW_CASTER, true);
render_comp.renderable_types.set((uint32_t)HYDRA_RENDERABLE_TYPE::HYDRA_LANDSCAPE, true);
//render_comp.renderable_types.set((uint32_t)HYDRA_RENDERABLE_TYPE::HYDRA_SHADOW_CASTER, true);
ecs->AddComponent<HydraRenderableComponent>(GetID(), render_comp);
ecs->AddComponent<HydraShadowCasterComponent>(GetID(), shad_caster);
render_comp.active = false;