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

Division works

Browse Source
This commit is contained in:
Confideo-IOM
2026-09-24 20:15:39 +01:00
parent 6015f0bc71
commit 5ded63d3f4
22 changed files with 99 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HydraEngine/source/actor/HydraPlayerActor.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ void HydraPlayerActor::HandleInput(float delta_t)
if (move_fast)
{
extra_speed = 500;
extra_speed = 300;
}
GetEngine()->ActorManager()->RotateActor(GetID(), y_angle, x_angle, 0.0f);
HydraEngine/source/actor/PlanetActor/HydraPlanetActor.cpp
+37 -37
View File
@@ -22,19 +22,19 @@ void HydraPlanetActor::FixedTick(float delta_t)
HydraActorManager* actor_manager = GetEngine()->ActorManager();
HydraECS* ecs = GetEngine()->ECS();
//HydraPlanetQuadActor* quad0 = static_cast<HydraPlanetQuadActor*>(actor_manager->GetActor(m_quads[0]));
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]));
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);
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);
quad2->CheckResolution(pos_comp.position);
quad3->CheckResolution(pos_comp.position);
quad4->CheckResolution(pos_comp.position);
quad5->CheckResolution(pos_comp.position);
}
void HydraPlanetActor::InitialiseComponents()
@@ -245,46 +245,46 @@ void HydraPlanetActor::_CreateRenderableComponent()
void HydraPlanetActor::_CreateQuads()
{
uint32_t divisions = 16;
uint32_t divisions = 64;
float diameter = 50000.0f;
float quad_size = 50000.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]));
// GetEngine()->ActorManager()->InitialiseActor(m_quads[0]);
// quad0->InitialiseQuad(INVALID_HYDRA_ID, diameter, quad_size, divisions, glm::vec3(-half_quad, -half_quad, half_quad), glm::vec3(0,0,0));
// GetEngine()->ActorManager()->SetRelationship(GetID(), m_quads[0]);
m_quads[0] = GetEngine()->ActorManager()->CreateActor<HydraPlanetQuadActor>();
HydraPlanetQuadActor* quad0 = static_cast<HydraPlanetQuadActor*>(GetEngine()->ActorManager()->GetActor(m_quads[0]));
GetEngine()->ActorManager()->InitialiseActor(m_quads[0]);
quad0->InitialiseQuad(INVALID_HYDRA_ID, diameter, quad_size, divisions, glm::vec3(0,0,0), glm::vec3(0,0,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]));
GetEngine()->ActorManager()->InitialiseActor(m_quads[1]);
quad1->InitialiseQuad(INVALID_HYDRA_ID, diameter, quad_size, divisions, glm::vec3(half_quad, -half_quad, half_quad), glm::vec3(0,glm::radians(90.0f),0));
quad1->InitialiseQuad(INVALID_HYDRA_ID, diameter, quad_size, divisions, glm::vec3(0, 0, 0), glm::vec3(0,glm::radians(90.0f),0));
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]));
// GetEngine()->ActorManager()->InitialiseActor(m_quads[2]);
// quad2->InitialiseQuad(INVALID_HYDRA_ID, diameter, quad_size, divisions, glm::vec3(half_quad,-half_quad,-half_quad), glm::vec3(0,glm::radians(180.0f),0));
// 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]));
GetEngine()->ActorManager()->InitialiseActor(m_quads[2]);
quad2->InitialiseQuad(INVALID_HYDRA_ID, diameter, quad_size, divisions, glm::vec3(0, 0, 0), glm::vec3(0,glm::radians(180.0f),0));
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]));
// GetEngine()->ActorManager()->InitialiseActor(m_quads[3]);
// quad3->InitialiseQuad(INVALID_HYDRA_ID, diameter, quad_size, divisions, glm::vec3(-half_quad,-half_quad,-half_quad), glm::vec3(0,glm::radians(270.0f),0));
// 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]));
GetEngine()->ActorManager()->InitialiseActor(m_quads[3]);
quad3->InitialiseQuad(INVALID_HYDRA_ID, diameter, quad_size, divisions, glm::vec3(0, 0, 0), glm::vec3(0,glm::radians(270.0f),0));
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]));
// GetEngine()->ActorManager()->InitialiseActor(m_quads[4]);
// quad4->InitialiseQuad(INVALID_HYDRA_ID, diameter, quad_size, divisions, glm::vec3(-half_quad, half_quad, half_quad), glm::vec3(glm::radians(-90.0f), 0, 0));
// 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]));
GetEngine()->ActorManager()->InitialiseActor(m_quads[4]);
quad4->InitialiseQuad(INVALID_HYDRA_ID, diameter, quad_size, divisions, glm::vec3(0, 0, 0), glm::vec3(glm::radians(-90.0f), 0, 0));
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]));
// GetEngine()->ActorManager()->InitialiseActor(m_quads[5]);
// quad5->InitialiseQuad(INVALID_HYDRA_ID, diameter, quad_size, divisions, glm::vec3(-half_quad, -half_quad, -half_quad), glm::vec3(glm::radians(90.0f), 0, 0));
// 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]));
GetEngine()->ActorManager()->InitialiseActor(m_quads[5]);
quad5->InitialiseQuad(INVALID_HYDRA_ID, diameter, quad_size, divisions, glm::vec3(0, 0, 0), glm::vec3(glm::radians(90.0f), 0, 0));
GetEngine()->ActorManager()->SetRelationship(GetID(), m_quads[5]);
}
HydraEngine/source/actor/PlanetActor/HydraPlanetQuadActor.cpp
+35 -27
View File
@@ -44,7 +44,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();
}
@@ -120,6 +120,7 @@ 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;
vert = glm::normalize(vert);
vert = vert * (m_planet_diameter / 2.0);
@@ -137,15 +138,17 @@ glm::vec3 HydraPlanetQuadActor::_ProjectSphere(glm::dvec4 vert_in, glm::dmat4 tr
return glm::vec3(vert);
}
glm::dvec3 HydraPlanetQuadActor::_ProjectCentre(glm::dvec4 vert_in, glm::dmat4 trans, double diameter, glm::vec3 origin)
glm::dvec3 HydraPlanetQuadActor::_ProjectCentre(glm::vec3 vert_in, glm::dmat4 trans, double diameter)
{
// glm::dvec4 vert = trans * vert_in;
// vert = glm::normalize(vert);
// vert = vert * (m_planet_diameter / 2.0);
glm::dvec4 vert = trans * 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;
fnl.SetNoiseType(FastNoiseLite::NoiseType::NoiseType_OpenSimplex2);
fnl.SetFractalType(FastNoiseLite::FractalType::FractalType_Ridged);
@@ -162,7 +165,8 @@ glm::dvec3 HydraPlanetQuadActor::_ProjectCentre(glm::dvec4 vert_in, glm::dmat4 t
void HydraPlanetQuadActor::_Split()
{
m_divided = true;
float quad_size = m_quad_dimension / 2.0f;
float child_quad_size = m_quad_dimension / 2.0f;
float child_half_quad_size = child_quad_size / 2.0f;
float radius = m_planet_diameter / 2.0f;
// 2 | 3
@@ -171,17 +175,17 @@ void HydraPlanetQuadActor::_Split()
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));
origins.push_back(glm::vec3(m_origin.x - child_half_quad_size, m_origin.y - child_half_quad_size, m_origin.z));
origins.push_back(glm::vec3(m_origin.x + child_half_quad_size, m_origin.y - child_half_quad_size, m_origin.z));
origins.push_back(glm::vec3(m_origin.x - child_half_quad_size, m_origin.y + child_half_quad_size, m_origin.z));
origins.push_back(glm::vec3(m_origin.x + child_half_quad_size, m_origin.y + child_half_quad_size, m_origin.z));
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));
GetEngine()->ActorManager()->InitialiseActor(quad_id);
quad->InitialiseQuad(GetID(), m_planet_diameter, quad_size, m_divisions, origins[i], m_orientation);
quad->InitialiseQuad(GetID(), m_planet_diameter, child_quad_size, m_divisions, origins[i], m_orientation);
m_child_quads.push_back(quad_id);
}
@@ -209,12 +213,12 @@ 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 = -m_quad_dimension / 2.0f;
float min_y = -m_quad_dimension / 2.0f;
float min_z = 0.0f;
float max_x = m_quad_dimension;
float max_y = m_quad_dimension;
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;
@@ -241,22 +245,26 @@ void HydraPlanetQuadActor::_CreateMesh()
uint32_t index_idx = 0;
// 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::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);
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;
GetEngine()->ActorManager()->SetPositionAndOrientation(GetID(), quad_position, m_orientation, true);
m_centre = _ProjectCentre(centre, trans, m_planet_diameter, m_origin);
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(100);
GetEngine()->ActorManager()->InitialiseActor(m_center_actor);
GetEngine()->ActorManager()->SetPosition(m_center_actor, m_centre);
// 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++)
{
HydraEngine/source/actor/PlanetActor/HydraPlanetQuadActor.h
+2 -2
View File
@@ -15,7 +15,7 @@ class CLASS_DEFINE HydraPlanetQuadActor : public HydraActor
virtual ~HydraPlanetQuadActor();
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);
glm::dvec3 _ProjectCentre(glm::vec3 centre, glm::dmat4 trans, double diameter);
void _Split();
HydraID m_parent_id = INVALID_HYDRA_ID;
double m_scale = 1.0;
@@ -24,7 +24,7 @@ class CLASS_DEFINE HydraPlanetQuadActor : public HydraActor
HydraID m_material_component = INVALID_HYDRA_ID;
HydraID m_position_component = INVALID_HYDRA_ID;
HydraID m_mesh_component = INVALID_HYDRA_ID;
uint32_t m_divisions = 100;
uint32_t m_divisions = 64;
float m_quad_dimension = 0;
float m_planet_diameter = 0;
glm::dvec3 m_centre {};