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

Need to rework origins

Browse Source
This commit is contained in:
Confideo-IOM
2026-09-23 22:29:31 +01:00
parent 94a2bb508e
commit 6015f0bc71
50 changed files with 506 additions and 1067 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HydraEngine/source/actor/PlanetActor/HydraPlanetQuadActor.cpp
+110 -64
View File
@@ -1,6 +1,7 @@
#include "HydraPlanetQuadActor.h"
#include "../../engine/HydraEngine.h"
#include "../../actor/HydraActorManager.h"
#include "../../actor/HydraTestCubeActor.h"
#include "../../task/HydraTask.h"
#include "../../ecs/HydraECS.h"
#include "../../ecs/components/HydraPositionComponent.h"
@@ -22,9 +23,7 @@ void HydraPlanetQuadActor::InitialiseComponents()
// HydraID entity_id = ecs->CreateEntity();
_CreatePosition();
// _CreatePhysics();
_CreateMaterial();
_CreateRenderableComponent();
}
@@ -32,62 +31,96 @@ void HydraPlanetQuadActor::DeferredInitialiseComponents()
{
}
void HydraPlanetQuadActor::InitialiseQuad(float planet_diameter, float quad_dimension, uint32_t divisions, glm::dvec3 origin, glm::vec3 orientation)
void HydraPlanetQuadActor::Destroy()
{
}
void HydraPlanetQuadActor::InitialiseQuad(HydraID parent_id, float planet_diameter, float quad_dimension, uint32_t divisions, glm::dvec3 origin, glm::vec3 orientation)
{
m_divisions = divisions;
m_planet_diameter = planet_diameter;
m_origin = origin;
m_quad_dimension = quad_dimension;
m_orientation = orientation;
m_parent_id = parent_id;
GetEngine()->ActorManager()->SetPositionAndOrientation(GetID(), origin, orientation, true);
_CreateMesh();
}
void HydraPlanetQuadActor::CheckResolution(glm::dvec3 player_position)
{
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)
HydraMeshComponent mesh_comp = GetEngine()->ECS()->GetComponent<HydraMeshComponent>(GetID());
if (mesh_comp.mesh_state == HYDRA_STATE::Ready)
{
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)
bool should_split = false;
bool should_merge = 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)
{
HydraPlanetQuadActor* child = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(child_id));
child->CheckResolution(player_position);
should_split = true;
}
HydraRenderableComponent& renderable = GetEngine()->ECS()->GetComponent<HydraRenderableComponent>(GetID());
renderable.active = false;
}
else if((should_split) && (m_divided))
{
for(HydraID child_id : m_child_quads)
if(distance_to_quad > m_quad_dimension * 1.1f)
{
HydraPlanetQuadActor* child = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(child_id));
child->CheckResolution(player_position);
should_merge = 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_merge) && (m_divided)) // Is split but should not be
{
for (HydraID child_id : m_child_quads)
{
HydraPlanetQuadActor* child = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(child_id));
child->CheckResolution(player_position);
GetEngine()->ActorManager()->DeleteActor(child_id);
}
m_child_quads.clear();
m_divided = false;
HydraRenderableComponent &renderable = GetEngine()->ECS()->GetComponent<HydraRenderableComponent>(GetID());
renderable.active = true;
}
}
else if ((!should_split) && (m_divided)) //Is split but should not be
{
//Merge this quad and all its children
}
}
HydraPlanetQuadActor::~HydraPlanetQuadActor()
{
if(m_center_actor != INVALID_HYDRA_ID)
{
GetEngine()->ActorManager()->DeleteActor(m_center_actor);
}
}
void HydraPlanetQuadActor::_MergeQuads()
{
}
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;
{
glm::dvec4 vert = trans * vert_in;
vert = glm::normalize(vert);
vert = vert * (m_planet_diameter / 2.0);
FastNoiseLite fnl;
@@ -98,18 +131,31 @@ glm::vec3 HydraPlanetQuadActor::_ProjectSphere(glm::dvec4 vert_in, glm::dmat4 tr
fnl.SetFractalOctaves(8);
float noise = fnl.GetNoise(vert.x, vert.y, vert.z);
vert = glm::normalize(vert) * ((m_planet_diameter / 2.0) + (noise * 500.0f));
vert = inv_trans * glm::dvec4(vert.x, vert.y, vert.z, 1.0);
return glm::vec3(vert);
}
glm::dvec3 HydraPlanetQuadActor::_ProjectCentre(glm::dvec4 vert_in, glm::dmat4 trans, double diameter, glm::vec3 origin)
{
glm::dvec4 vert = trans * vert_in;
{
// glm::dvec4 vert = trans * vert_in;
// vert = glm::normalize(vert);
// vert = vert * (m_planet_diameter / 2.0);
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);
fnl.SetSeed(341411);
fnl.SetFrequency(0.00009);
fnl.SetFractalOctaves(8);
float noise = fnl.GetNoise(vert.x, vert.y, vert.z);
vert = glm::normalize(vert) * ((m_planet_diameter / 2.0) + (noise * 500.0f));
return glm::dvec3(vert);
}
@@ -119,9 +165,9 @@ void HydraPlanetQuadActor::_Split()
float quad_size = m_quad_dimension / 2.0f;
float radius = m_planet_diameter / 2.0f;
//2 | 3
//-----
//0 | 1
// 2 | 3
//-------
// 0 | 1
std::vector<glm::vec3> origins;
@@ -129,21 +175,16 @@ void HydraPlanetQuadActor::_Split()
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 ++)
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);
HydraPlanetQuadActor *quad = static_cast<HydraPlanetQuadActor *>(GetEngine()->ActorManager()->GetActor(quad_id));
GetEngine()->ActorManager()->InitialiseActor(quad_id);
//GetEngine()->ActorManager()->SetRelationship(GetID(), quad_id);
quad->InitialiseQuad(GetID(), m_planet_diameter, quad_size, m_divisions, origins[i], m_orientation);
m_child_quads.push_back(quad_id);
}
}
void HydraPlanetQuadActor::_CreatePosition()
@@ -159,8 +200,6 @@ 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());
@@ -170,8 +209,8 @@ void HydraPlanetQuadActor::_CreateMesh()
mesh->vertexes.resize(vert_counts);
mesh->indexes.resize(index_counts);
float min_x = 0;//-m_quad_dimension / 2.0f;
float min_y = 0;//-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;
@@ -179,9 +218,9 @@ void HydraPlanetQuadActor::_CreateMesh()
float max_z = 0.0f;
float min_u = 0;
float min_v = 1 * (m_divisions-1);
float min_v = 1 * (m_divisions - 1);
float max_u = 1 * (m_divisions-1);
float max_u = 1 * (m_divisions - 1);
float max_v = 0;
float xy_inc = m_quad_dimension / (m_divisions - 1);
@@ -200,16 +239,24 @@ void HydraPlanetQuadActor::_CreateMesh()
uint32_t vert_idx = 0;
uint32_t index_idx = 0;
//glm::mat4 trans = GetEngine()->ActorManager()->GetActorPose(actor_id);
// glm::mat4 trans = GetEngine()->ActorManager()->GetActorPose(actor_id);
glm::dmat4 trans_matrix = glm::translate(pos_comp.position);
glm::dmat4 rot_matrix = glm::toMat4(glm::quat(pos_comp.orientation));
glm::dmat4 trans = trans_matrix * rot_matrix;
glm::dmat4 rot_matrix = glm::toMat4(glm::quat(pos_comp.orientation));
glm::dmat4 trans = trans_matrix * rot_matrix;
glm::dmat4 inv_trans = glm::inverse(trans);
glm::dvec4 centre = glm::dvec4(max_x - min_x, max_y - min_y, max_z - min_z, 1.0);
glm::vec4 centre = glm::dvec4(min_x, min_y, min_z, 1) + (glm::dvec4(max_x, max_y, max_z, 1) / 2.0);
centre.z = m_origin.z;
centre.w = 1;
m_centre = _ProjectCentre(centre, trans, m_planet_diameter, glm::vec3(max_x, max_y, max_z) - glm::vec3(min_x, min_y, min_z));
m_centre = _ProjectCentre(centre, trans, m_planet_diameter, m_origin);
m_center_actor = GetEngine()->ActorManager()->CreateActor<HydraTestCubeActor>();
HydraTestCubeActor* center_actor = static_cast<HydraTestCubeActor*>(GetEngine()->ActorManager()->GetActor(m_center_actor));
center_actor->SetScale(100);
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++)
{
@@ -240,7 +287,7 @@ void HydraPlanetQuadActor::_CreateMesh()
}
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);
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};
@@ -320,4 +367,3 @@ void HydraPlanetQuadActor::_CreateRenderableComponent()
ecs->AddComponent<HydraRenderableComponent>(GetID(), render_comp);
ecs->AddComponent<HydraShadowCasterComponent>(GetID(), shad_caster);
}