diff --git a/HydraClient/source/HydraGame.cpp b/HydraClient/source/HydraGame.cpp index 9f8c11f..e494fee 100644 --- a/HydraClient/source/HydraGame.cpp +++ b/HydraClient/source/HydraGame.cpp @@ -6,7 +6,7 @@ bool HydraGame::Initialise() m_sun_light_id = GetEngine()->ActorManager()->CreateActor(); GetEngine()->ActorManager()->InitialiseActor(m_sun_light_id); - GetEngine()->ActorManager()->SetOrientation(m_sun_light_id, -0.5f, -0.2f, 0.0f); + GetEngine()->ActorManager()->SetOrientation(m_sun_light_id, 0.0f, 0.0f, 0.0f); // m_spawner_id = GetEngine()->ActorManager()->CreateActor(); // GetEngine()->ActorManager()->InitialiseActor(m_spawner_id); @@ -62,7 +62,7 @@ bool HydraGame::Initialise() m_player_actor_id = GetEngine()->ActorManager()->CreateActor(); GetEngine()->ActorManager()->InitialiseActor(m_player_actor_id); - GetEngine()->ActorManager()->SetPosition(m_player_actor_id, glm::dvec3(0, 10, 110)); + GetEngine()->ActorManager()->SetPosition(m_player_actor_id, glm::dvec3(0, 10, 51000)); GetEngine()->PossessPlayer(m_player_actor_id); GetEngine()->Camera()->AttachToActor(m_player_actor_id); @@ -82,7 +82,7 @@ void HydraGame::Update(float delta_t_seconds) // } m_angle += m_diff; - // GetEngine()->ActorManager()->SetOrientation(m_other_light_id, -0.5f, m_angle, 0); + GetEngine()->ActorManager()->SetOrientation(m_sun_light_id, 0, m_angle, 0); // GetEngine()->ActorManager()->SetOrientation(m_gltf_id, 0, m_angle, 0); // GetEngine()->ActorManager()->SetOrientation(m_plane_actor_id, 0, m_angle, 0); } diff --git a/HydraClient/source/HydraGame.h b/HydraClient/source/HydraGame.h index c62f67d..0ff126d 100644 --- a/HydraClient/source/HydraGame.h +++ b/HydraClient/source/HydraGame.h @@ -24,7 +24,7 @@ class HydraGame : public HydraGameProxy HydraID m_planet_actor_id = INVALID_HYDRA_ID; float m_time = 0; float m_angle = 0; - float m_diff = 0.005; + float m_diff = 0.001; public: virtual bool Initialise() override; virtual void Update(float delta_t_seconds) override; diff --git a/HydraEngine/source/HydraDefines.h b/HydraEngine/source/HydraDefines.h index 2e8c260..4d80f33 100644 --- a/HydraEngine/source/HydraDefines.h +++ b/HydraEngine/source/HydraDefines.h @@ -45,7 +45,7 @@ const uint32_t MAX_DIRECTIONAL_SHADOWS = 10; const uint32_t MAX_SPOT_SHADOWS = 10; const uint32_t MAX_POINT_SHADOWS = 10; //const uint32_t SHADOW_MAP_SIZE = 1024; -const uint32_t DIRECTIONAL_SHADOW_MAP_SIZE = 2048; +const uint32_t DIRECTIONAL_SHADOW_MAP_SIZE = 8128; const uint32_t SPOT_SHADOW_MAP_SIZE = 1024; const uint32_t POINT_SHADOW_MAP_SIZE = 2048; diff --git a/HydraEngine/source/actor/HydraPlayerActor.cpp b/HydraEngine/source/actor/HydraPlayerActor.cpp index 60799ac..70269f7 100644 --- a/HydraEngine/source/actor/HydraPlayerActor.cpp +++ b/HydraEngine/source/actor/HydraPlayerActor.cpp @@ -57,7 +57,7 @@ void HydraPlayerActor::HandleInput(float delta_t) if (move_fast) { - extra_speed = 1500; + extra_speed = 500; } GetEngine()->ActorManager()->RotateActor(GetID(), y_angle, x_angle, 0.0f); diff --git a/HydraEngine/source/actor/PlanetActor/HydraPlanetActor.cpp b/HydraEngine/source/actor/PlanetActor/HydraPlanetActor.cpp index a646ac2..84df3c8 100644 --- a/HydraEngine/source/actor/PlanetActor/HydraPlanetActor.cpp +++ b/HydraEngine/source/actor/PlanetActor/HydraPlanetActor.cpp @@ -214,8 +214,8 @@ void HydraPlanetActor::_CreateRenderableComponent() void HydraPlanetActor::_CreateQuads() { uint32_t divisions = 100; - float diameter = 100.0f; - float quad_size = 100.0f; + float diameter = 50000.0f; + float quad_size = 50000.0f; float radius = diameter /2.0f; m_quads[0] = GetEngine()->ActorManager()->CreateActor(); HydraPlanetQuadActor* quad0 = static_cast(GetEngine()->ActorManager()->GetActor(m_quads[0])); diff --git a/HydraEngine/source/actor/PlanetActor/HydraPlanetQuadActor.cpp b/HydraEngine/source/actor/PlanetActor/HydraPlanetQuadActor.cpp index 5c28963..d6b7517 100644 --- a/HydraEngine/source/actor/PlanetActor/HydraPlanetQuadActor.cpp +++ b/HydraEngine/source/actor/PlanetActor/HydraPlanetQuadActor.cpp @@ -50,13 +50,13 @@ glm::vec3 HydraPlanetQuadActor::_ProjectSphere(glm::dvec4 vert_in, glm::mat4 tra FastNoiseLite fnl; - fnl.SetFrequency(0.1f); fnl.SetNoiseType(FastNoiseLite::NoiseType::NoiseType_OpenSimplex2); - fnl.SetFractalType(FastNoiseLite::FractalType::FractalType_FBm); + fnl.SetFractalType(FastNoiseLite::FractalType::FractalType_Ridged); fnl.SetSeed(341411); + fnl.SetFrequency(0.05); float noise = fnl.GetNoise(vert.x, vert.y, vert.z); - vert = glm::normalize(vert) * ((m_planet_diameter / 2.0) + (noise * 1.0f)); + vert = glm::normalize(vert) * ((m_planet_diameter / 2.0) + (noise * 1500.0f)); vert = inv_trans * glm::dvec4(vert.x, vert.y, vert.z, 1.0); diff --git a/HydraEngine/source/ecs/systems/HydraDirectionalShadowSourceSystem.cpp b/HydraEngine/source/ecs/systems/HydraDirectionalShadowSourceSystem.cpp index cac5b63..87199c8 100644 --- a/HydraEngine/source/ecs/systems/HydraDirectionalShadowSourceSystem.cpp +++ b/HydraEngine/source/ecs/systems/HydraDirectionalShadowSourceSystem.cpp @@ -91,21 +91,24 @@ void HydraDirectionalShadowSourceSystem::_UpdateShadowMap(HydraID entity_id) } glm::mat4 view = glm::lookAt(light_pos, target_pos, up_vector); + + float view_near = 0.1f;//max_shadow_range - shadow_distance; + float view_far = 100000.0f;// max_shadow_range + shadow_distance; + float shadow_inc = (view_far -4.0f) / 5.0f; for (uint32_t i = 0; i < 6; i++) { - float view_near = 0.1f;//max_shadow_range - shadow_distance; - float view_far = 2000.0f;// max_shadow_range + shadow_distance; + glm::mat4 proj = glm::ortho(-view_size, view_size, -view_size, view_size, view_near, view_far); // Save data to component - shad_comp.far_plane[i] = shadow_distance; - shad_comp.near_plane[i] = 0; + shad_comp.far_plane[i] = shadow_distance; + shad_comp.near_plane[i] = 0; shad_comp.light_space_proj[i] = proj; - shad_comp.light_space_view[i] = view; + shad_comp.light_space_view[i] = view; // Scale bounds exponentially for the next cascade tier - view_size *= 3.0f; - shadow_distance *= 3.0f; + view_size = view_size * 2.0f; + shadow_distance = shadow_distance += shadow_inc; } // GetEngine()->ActorManager()->SetPosition(m_shadow_actor_id, light_pos); // GetEngine()->ActorManager()->SetOrientation(m_shadow_actor_id, pos_comp.orientation.x, pos_comp.orientation.y, pos_comp.orientation.z); diff --git a/HydraEngine/source/pipeline/HydraShadowPipeline.cpp b/HydraEngine/source/pipeline/HydraShadowPipeline.cpp index d387cc5..c4c9405 100644 --- a/HydraEngine/source/pipeline/HydraShadowPipeline.cpp +++ b/HydraEngine/source/pipeline/HydraShadowPipeline.cpp @@ -216,7 +216,7 @@ void HydraShadowPipeline::_CreateDirectionalRenderStage() 0, textures, true, - GL_BACK, + GL_NONE, true, HYDRA_RENDERABLE_TYPE::HYDRA_COLOUR); m_render_stages[DIRECTIONAL_RENDER_STAGE] = render_stage; diff --git a/build/Debug/HydraClient.pdb b/build/Debug/HydraClient.pdb index 12788ab..9fcd249 100644 Binary files a/build/Debug/HydraClient.pdb and b/build/Debug/HydraClient.pdb differ diff --git a/build/HydraClient.dir/Debug/HydraClient.ilk b/build/HydraClient.dir/Debug/HydraClient.ilk index a0b5c39..c50d3d9 100644 Binary files a/build/HydraClient.dir/Debug/HydraClient.ilk and b/build/HydraClient.dir/Debug/HydraClient.ilk differ diff --git a/build/HydraClient.dir/Debug/HydraClient.tlog/CL.read.1.tlog b/build/HydraClient.dir/Debug/HydraClient.tlog/CL.read.1.tlog index 820d186..61ad2d4 100644 Binary files a/build/HydraClient.dir/Debug/HydraClient.tlog/CL.read.1.tlog and b/build/HydraClient.dir/Debug/HydraClient.tlog/CL.read.1.tlog differ diff --git a/build/HydraClient.dir/Debug/HydraClient.tlog/CL.write.1.tlog b/build/HydraClient.dir/Debug/HydraClient.tlog/CL.write.1.tlog index 6c56cb0..8e2333e 100644 Binary files a/build/HydraClient.dir/Debug/HydraClient.tlog/CL.write.1.tlog and b/build/HydraClient.dir/Debug/HydraClient.tlog/CL.write.1.tlog differ diff --git a/build/HydraClient.dir/Debug/vc143.pdb b/build/HydraClient.dir/Debug/vc143.pdb index 93cd2b5..125df0b 100644 Binary files a/build/HydraClient.dir/Debug/vc143.pdb and b/build/HydraClient.dir/Debug/vc143.pdb differ diff --git a/build/HydraEngine/Debug/HydraEngine.pdb b/build/HydraEngine/Debug/HydraEngine.pdb index 74d3072..95e822c 100644 Binary files a/build/HydraEngine/Debug/HydraEngine.pdb and b/build/HydraEngine/Debug/HydraEngine.pdb differ diff --git a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.ilk b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.ilk index db59aba..a169f60 100644 Binary files a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.ilk and b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.ilk differ diff --git a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/CL.command.1.tlog b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/CL.command.1.tlog index 5b65d99..30ae51e 100644 Binary files a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/CL.command.1.tlog and b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/CL.command.1.tlog differ diff --git a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/CL.read.1.tlog b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/CL.read.1.tlog index 82fd442..a4cf86d 100644 Binary files a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/CL.read.1.tlog and b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/CL.read.1.tlog differ diff --git a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/CL.write.1.tlog b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/CL.write.1.tlog index 519f927..45aa808 100644 Binary files a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/CL.write.1.tlog and b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/CL.write.1.tlog differ diff --git a/build/HydraEngine/HydraEngine.dir/Debug/vc143.pdb b/build/HydraEngine/HydraEngine.dir/Debug/vc143.pdb index d626063..062451d 100644 Binary files a/build/HydraEngine/HydraEngine.dir/Debug/vc143.pdb and b/build/HydraEngine/HydraEngine.dir/Debug/vc143.pdb differ diff --git a/build/linkerrors.txt b/build/linkerrors.txt index 526c4bb..51c14db 100644 --- a/build/linkerrors.txt +++ b/build/linkerrors.txt @@ -1,6 +1,6 @@ ================================================================================ Linker Errors -Generated: 2026-09-07T14:48:39.171Z +Generated: 2026-09-07T15:33:52.829Z Total Errors: 1 ================================================================================