diff --git a/HydraClient/source/HydraGame.cpp b/HydraClient/source/HydraGame.cpp index f123b7d..5353ae8 100644 --- a/HydraClient/source/HydraGame.cpp +++ b/HydraClient/source/HydraGame.cpp @@ -9,15 +9,15 @@ bool HydraGame::Initialise() // GetEngine()->ActorManager()->SetOrientation(m_sun_light_id, -0.5f, 0.0f, 0.0f); // GetEngine()->ActorManager()->SetPosition(m_sun_light_id, glm::dvec3(0.0f, 4.0f, 10.0f)); - m_sun_light_id = GetEngine()->ActorManager()->CreateActor(); + m_sun_light_id = GetEngine()->ActorManager()->CreateActor(); GetEngine()->ActorManager()->InitialiseActor(m_sun_light_id); - GetEngine()->ActorManager()->SetOrientation(m_sun_light_id, -0.5f, 0.0f, 0.0f); - GetEngine()->ActorManager()->SetPosition(m_sun_light_id, glm::dvec3(0.0f, 4.0f, 10.0f)); + GetEngine()->ActorManager()->SetOrientation(m_sun_light_id, -0.25f, 0.0f, 0.0f); + GetEngine()->ActorManager()->SetPosition(m_sun_light_id, glm::dvec3(0.0f, 5.0f, 10.0f)); - m_other_light_id = GetEngine()->ActorManager()->CreateActor(); - GetEngine()->ActorManager()->InitialiseActor(m_other_light_id); - GetEngine()->ActorManager()->SetOrientation(m_other_light_id, -0.5f, 0.0f, 0.0f); - GetEngine()->ActorManager()->SetPosition(m_other_light_id, glm::dvec3(5.0f, 4.0f, 5.0f)); + // m_other_light_id = GetEngine()->ActorManager()->CreateActor(); + // GetEngine()->ActorManager()->InitialiseActor(m_other_light_id); + // GetEngine()->ActorManager()->SetOrientation(m_other_light_id, -0.5f, 0.0f, 0.0f); + // GetEngine()->ActorManager()->SetPosition(m_other_light_id, glm::dvec3(5.0f, 4.0f, 5.0f)); // m_other_light_id = GetEngine()->ActorManager()->CreateActor(); // GetEngine()->ActorManager()->InitialiseActor(m_other_light_id); // GetEngine()->ActorManager()->SetOrientation(m_other_light_id, 0.4f, 0.5f, 0.0f); @@ -61,7 +61,7 @@ void HydraGame::Update(float delta_t_seconds) // } m_angle += m_diff; - GetEngine()->ActorManager()->SetOrientation(m_sun_light_id, -0.2, m_angle, 0); + //GetEngine()->ActorManager()->SetOrientation(m_sun_light_id, -0.2, m_angle, 0); // GetEngine()->ActorManager()->SetOrientation(m_gltf_id, 0, m_angle, 0); // GetEngine()->ActorManager()->SetOrientation(m_plane_actor_id, 0, m_angle, 0); } \ No newline at end of file diff --git a/HydraEngine/includes/Hydra.h b/HydraEngine/includes/Hydra.h index 8b0069e..34135c4 100644 --- a/HydraEngine/includes/Hydra.h +++ b/HydraEngine/includes/Hydra.h @@ -9,6 +9,7 @@ #include "../source/actor/HydraPlayerActor.h" #include "../source/actor/HydraDirectionalLightActor.h" #include "../source/actor/HydraPointLightActor.h" +#include "../source/actor/HydraSpotLightActor.h" #include "../source/camera/HydraCamera.h" #include diff --git a/HydraEngine/source/ShaderFiles/deferred_output_shader.frag b/HydraEngine/source/ShaderFiles/deferred_output_shader.frag index a21b1cc..e5fee0d 100644 --- a/HydraEngine/source/ShaderFiles/deferred_output_shader.frag +++ b/HydraEngine/source/ShaderFiles/deferred_output_shader.frag @@ -25,8 +25,8 @@ struct light_structure float constant; float linear; float quadratic; - float falloff; - float falloff_smooth; + float cutoff; + float cutoff_outer; uint entity_id; uint light_type; }; @@ -166,51 +166,12 @@ vec3 DirectionalShading(vec3 normal, vec3 view_pos) { - // vec3 N = normalize(normal); - // vec3 V = normalize(vieview_pos - world_pos); - - // // calculate reflectance at normal incidence; if dia-electric (like plastic) use F0 - // // of 0.04 and if it's a metal, use the albedo color as F0 (metallic workflow) - // vec3 F0 = vec3(0.04); - // F0 = mix(F0, diffuse, metallic); - - // // reflectance equation - // vec3 Lo = vec3(0.0); - - // // calculate per-light radiance - // vec3 L = normalize(lightDir); - // vec3 H = normalize(V + L); float distance = length(light_pos - world_pos); float attenuation = 1.0; vec3 radiance = diffuse * attenuation; vec3 Lo = CalculatePBR(normal, view_pos, world_pos, light_dir, diffuse, radiance, roughness, metallic); - // // Cook-Torrance BRDF - // float NDF = DistributionGGX(N, H, roughness); - // float G = GeometrySmith(N, V, L, roughness); - // vec3 F = fresnelSchlick(clamp(dot(H, V), 0.0, 1.0), F0); - - // vec3 numerator = NDF * G * F; - // float denominator = 4.0 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.0001; // + 0.0001 to prevent divide by zero - // vec3 specular = numerator / denominator; - - // // kS is equal to Fresnel - // vec3 kS = F; - // // for energy conservation, the diffuse and specular light can't - // // be above 1.0 (unless the surface emits light); to preserve this - // // relationship the diffuse component (kD) should equal 1.0 - kS. - // vec3 kD = vec3(1.0) - kS; - // // multiply kD by the inverse metalness such that only non-metals - // // have diffuse lighting, or a linear blend if partly metal (pure metals - // // have no diffuse light). - // kD *= 1.0 - metallic; - - // // scale light by NdotL - // float NdotL = max(dot(N, L), 0.0); - - // // add to outgoing radiance Lo - // Lo += (kD * diffuse / PI + specular) * radiance * NdotL; // note that we already multiplied the BRDF by the Fresnel (kS) so we won't multiply by kS again return Lo; } @@ -229,57 +190,58 @@ vec3 PointShading(vec3 normal, vec3 view_pos) { - // vec3 N = normalize(normal); - // vec3 V = normalize(viewPos - worldPos); - // // calculate reflectance at normal incidence; if dia-electric (like plastic) use F0 - // // of 0.04 and if it's a metal, use the albedo color as F0 (metallic workflow) - // vec3 F0 = vec3(0.04); - // F0 = mix(F0, diffuse, metallic); - - // // reflectance equation - // vec3 Lo = vec3(0.0); - - // // calculate per-light radiance - // vec3 L = normalize(lightPos - worldPos); - // vec3 H = normalize(V + L); float distance = length(light_pos - world_pos); float attenuation = 1.0; - - //attenuation = light_intensity / (distance * distance); + attenuation = light_intensity / (light_constant + (light_linear * distance) + (light_quadratic * distance * distance)); vec3 radiance = diffuse * attenuation; vec3 light_dir = normalize(light_pos - world_pos); vec3 Lo = CalculatePBR(normal, view_pos, world_pos, light_dir, diffuse, radiance, roughness, metallic); - // // Cook-Torrance BRDF - // float NDF = DistributionGGX(N, H, roughness); - // float G = GeometrySmith(N, V, L, roughness); - // vec3 F = fresnelSchlick(clamp(dot(H, V), 0.0, 1.0), F0); - - // vec3 numerator = NDF * G * F; - // float denominator = 4.0 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.0001; // + 0.0001 to prevent divide by zero - // vec3 specular = (numerator / denominator) * attenuation; + return Lo; +} +vec3 SpotShading(vec3 normal, + vec3 diffuse, + float roughness, + float metallic, + float light_intensity, + vec3 light_dir, + vec3 light_pos, + float cutoff, + float cutoff_outer, + float light_constant, + float light_linear, + float light_quadratic, + vec3 world_pos, + vec3 view_pos) +{ + + vec3 direction_to_light = normalize(light_pos - world_pos); + float theta = dot(direction_to_light, light_dir); + float falloff = 0.0f; + + - // // kS is equal to Fresnel - // vec3 kS = F; - // // for energy conservation, the diffuse and specular light can't - // // be above 1.0 (unless the surface emits light); to preserve this - // // relationship the diffuse component (kD) should equal 1.0 - kS. - // vec3 kD = vec3(1.0) - kS; - // // multiply kD by the inverse metalness such that only non-metals - // // have diffuse lighting, or a linear blend if partly metal (pure metals - // // have no diffuse light). - // kD *= 1.0 - metallic; - // // scale light by NdotL - // float NdotL = max(dot(N, L), 0.0); + // if(theta > cutoff) + // { + float epsilon = cutoff - cutoff_outer; + falloff = clamp((theta - cutoff_outer) / epsilon, 0.0, 1.0); + + //} - // // add to outgoing radiance Lo - // Lo += (kD * diffuse / PI + specular) * radiance * NdotL; // note that we already multiplied the BRDF by the Fresnel (kS) so we won't multiply by kS again + float distance = length(light_pos - world_pos); + float attenuation = 1.0; + + attenuation = light_intensity / (light_constant + (light_linear * distance) + (light_quadratic * distance * distance)); + vec3 radiance = diffuse * attenuation * falloff; + + vec3 Lo = CalculatePBR(normal, view_pos, world_pos, direction_to_light, diffuse, radiance, roughness, metallic); return Lo; } + mat3 GetRotationOnlyMatrix(mat4 model_mat) { mat3 rot_mat; @@ -313,17 +275,17 @@ void main() { mat4 model = model_matrix[lights[i].entity_id]; mat3 rot_mat = GetRotationOnlyMatrix(model); - vec3 light_direction = rot_mat * vec3(0,0,1); + vec3 light_direction = normalize(rot_mat * vec3(0,0,1)); vec3 light_pos = model[3].xyz; if(lights[i].light_type == HYDRA_LIGHT_DIRECTIONAL) { - Lo+= DirectionalShading(normal, diffuse.xyz, rough, metal, lights[i].intensity, light_direction, light_pos, world_pos, ubo_per_frame.viewer_pos); + Lo += DirectionalShading(normal, diffuse.xyz, rough, metal, lights[i].intensity, light_direction, light_pos, world_pos, ubo_per_frame.viewer_pos); } else if(lights[i].light_type == HYDRA_LIGHT_POINT) { - Lo+= PointShading(normal, + Lo += PointShading(normal, diffuse.xyz, rough, metal, @@ -335,6 +297,23 @@ void main() world_pos, ubo_per_frame.viewer_pos); } + else if(lights[i].light_type == HYDRA_LIGHT_SPOT) + { + Lo += SpotShading(normal, + diffuse.xyz, + rough, + metal, + lights[i].intensity, + light_direction, + light_pos, + lights[i].cutoff, + lights[i].cutoff_outer, + lights[i].constant, + lights[i].linear, + lights[i].quadratic, + world_pos, + ubo_per_frame.viewer_pos); + } } @@ -347,7 +326,7 @@ void main() float ao = 1; vec3 ambient = vec3(0.05) * diffuse.xyz * ao; - vec3 output_color = Lo; + vec3 output_color = Lo + ambient; // HDR tonemapping output_color = output_color / (output_color + vec3(1.0)); diff --git a/HydraEngine/source/actor/HydraSpotLightActor.cpp b/HydraEngine/source/actor/HydraSpotLightActor.cpp index db62b2f..95b9189 100644 --- a/HydraEngine/source/actor/HydraSpotLightActor.cpp +++ b/HydraEngine/source/actor/HydraSpotLightActor.cpp @@ -21,9 +21,10 @@ void HydraSpotLightActor::InitialiseComponents() HydraECS *ecs = GetEngine()->ECS(); light_comp.diffuse = glm::vec4(1,1,1,1); - light_comp.intensity = 100.0f; + light_comp.intensity = 1000.0f; light_comp.light_type = static_cast(HYDRA_LIGHT_TYPE::HYDRA_LIGHT_SPOT); - + light_comp.cutoff = glm::cos(glm::radians(10.0f)); + light_comp.cutoff_outer = glm::cos(glm::radians(25.0f)); light_comp.entity_id = GetID(); ecs->AddComponent(GetID(), light_comp); diff --git a/HydraEngine/source/ecs/components/HydraLightComponent.h b/HydraEngine/source/ecs/components/HydraLightComponent.h index 227c4f4..9809b17 100644 --- a/HydraEngine/source/ecs/components/HydraLightComponent.h +++ b/HydraEngine/source/ecs/components/HydraLightComponent.h @@ -11,8 +11,8 @@ struct HydraLightComponent float constant = 1.0f; float linear = 0.7; float quadratic = 1.8; - float falloff = 1.5; - float falloff_smooth = 0.0f; + float cutoff = 0.5f; + float cutoff_outer = 0.75f; HydraID entity_id; uint32_t light_type; }; diff --git a/build/.cmake/api/v1/reply/codemodel-v2-aa0145a10a295b367570.json b/build/.cmake/api/v1/reply/codemodel-v2-5dc3199adeadec3fb6d9.json similarity index 93% rename from build/.cmake/api/v1/reply/codemodel-v2-aa0145a10a295b367570.json rename to build/.cmake/api/v1/reply/codemodel-v2-5dc3199adeadec3fb6d9.json index 904e9ca..065e52d 100644 --- a/build/.cmake/api/v1/reply/codemodel-v2-aa0145a10a295b367570.json +++ b/build/.cmake/api/v1/reply/codemodel-v2-5dc3199adeadec3fb6d9.json @@ -161,28 +161,28 @@ { "directoryIndex" : 0, "id" : "ALL_BUILD::@6890427a1f51a3e7e1df", - "jsonFile" : "target-ALL_BUILD-Debug-9ddbbbeb4caedf0a48f0.json", + "jsonFile" : "target-ALL_BUILD-Debug-79cb89fa590649c6cd6a.json", "name" : "ALL_BUILD", "projectIndex" : 0 }, { "directoryIndex" : 1, "id" : "ALL_BUILD::@fafd37b19aacd4c483ed", - "jsonFile" : "target-ALL_BUILD-Debug-30097c8e6651db3aff43.json", + "jsonFile" : "target-ALL_BUILD-Debug-21126e6f26f8151b82a1.json", "name" : "ALL_BUILD", "projectIndex" : 1 }, { "directoryIndex" : 0, "id" : "HydraClient::@6890427a1f51a3e7e1df", - "jsonFile" : "target-HydraClient-Debug-78ce361b98c7c89e9629.json", + "jsonFile" : "target-HydraClient-Debug-ccca9689ebe6b19fe65a.json", "name" : "HydraClient", "projectIndex" : 0 }, { "directoryIndex" : 1, "id" : "HydraEngine::@fafd37b19aacd4c483ed", - "jsonFile" : "target-HydraEngine-Debug-552fba7b8e0c042c3903.json", + "jsonFile" : "target-HydraEngine-Debug-80357fe79254dd887a59.json", "name" : "HydraEngine", "projectIndex" : 1 }, @@ -355,28 +355,28 @@ { "directoryIndex" : 0, "id" : "ALL_BUILD::@6890427a1f51a3e7e1df", - "jsonFile" : "target-ALL_BUILD-Release-9ddbbbeb4caedf0a48f0.json", + "jsonFile" : "target-ALL_BUILD-Release-79cb89fa590649c6cd6a.json", "name" : "ALL_BUILD", "projectIndex" : 0 }, { "directoryIndex" : 1, "id" : "ALL_BUILD::@fafd37b19aacd4c483ed", - "jsonFile" : "target-ALL_BUILD-Release-30097c8e6651db3aff43.json", + "jsonFile" : "target-ALL_BUILD-Release-21126e6f26f8151b82a1.json", "name" : "ALL_BUILD", "projectIndex" : 1 }, { "directoryIndex" : 0, "id" : "HydraClient::@6890427a1f51a3e7e1df", - "jsonFile" : "target-HydraClient-Release-5f750d1feb1d099be72b.json", + "jsonFile" : "target-HydraClient-Release-f300bf694420197200c5.json", "name" : "HydraClient", "projectIndex" : 0 }, { "directoryIndex" : 1, "id" : "HydraEngine::@fafd37b19aacd4c483ed", - "jsonFile" : "target-HydraEngine-Release-d5355df26e8e8ebc1862.json", + "jsonFile" : "target-HydraEngine-Release-9db118658af30c021c9e.json", "name" : "HydraEngine", "projectIndex" : 1 }, @@ -549,28 +549,28 @@ { "directoryIndex" : 0, "id" : "ALL_BUILD::@6890427a1f51a3e7e1df", - "jsonFile" : "target-ALL_BUILD-MinSizeRel-9ddbbbeb4caedf0a48f0.json", + "jsonFile" : "target-ALL_BUILD-MinSizeRel-79cb89fa590649c6cd6a.json", "name" : "ALL_BUILD", "projectIndex" : 0 }, { "directoryIndex" : 1, "id" : "ALL_BUILD::@fafd37b19aacd4c483ed", - "jsonFile" : "target-ALL_BUILD-MinSizeRel-30097c8e6651db3aff43.json", + "jsonFile" : "target-ALL_BUILD-MinSizeRel-21126e6f26f8151b82a1.json", "name" : "ALL_BUILD", "projectIndex" : 1 }, { "directoryIndex" : 0, "id" : "HydraClient::@6890427a1f51a3e7e1df", - "jsonFile" : "target-HydraClient-MinSizeRel-0b1754e9511a8dea2861.json", + "jsonFile" : "target-HydraClient-MinSizeRel-707588ed524688a0f034.json", "name" : "HydraClient", "projectIndex" : 0 }, { "directoryIndex" : 1, "id" : "HydraEngine::@fafd37b19aacd4c483ed", - "jsonFile" : "target-HydraEngine-MinSizeRel-300e0b7a01e3150809fd.json", + "jsonFile" : "target-HydraEngine-MinSizeRel-e47416ca42d57e6b4584.json", "name" : "HydraEngine", "projectIndex" : 1 }, @@ -743,28 +743,28 @@ { "directoryIndex" : 0, "id" : "ALL_BUILD::@6890427a1f51a3e7e1df", - "jsonFile" : "target-ALL_BUILD-RelWithDebInfo-9ddbbbeb4caedf0a48f0.json", + "jsonFile" : "target-ALL_BUILD-RelWithDebInfo-79cb89fa590649c6cd6a.json", "name" : "ALL_BUILD", "projectIndex" : 0 }, { "directoryIndex" : 1, "id" : "ALL_BUILD::@fafd37b19aacd4c483ed", - "jsonFile" : "target-ALL_BUILD-RelWithDebInfo-30097c8e6651db3aff43.json", + "jsonFile" : "target-ALL_BUILD-RelWithDebInfo-21126e6f26f8151b82a1.json", "name" : "ALL_BUILD", "projectIndex" : 1 }, { "directoryIndex" : 0, "id" : "HydraClient::@6890427a1f51a3e7e1df", - "jsonFile" : "target-HydraClient-RelWithDebInfo-19110864938462bdea5b.json", + "jsonFile" : "target-HydraClient-RelWithDebInfo-a4b1a5ac731bdcc03733.json", "name" : "HydraClient", "projectIndex" : 0 }, { "directoryIndex" : 1, "id" : "HydraEngine::@fafd37b19aacd4c483ed", - "jsonFile" : "target-HydraEngine-RelWithDebInfo-365df9edb3aa4717e569.json", + "jsonFile" : "target-HydraEngine-RelWithDebInfo-e135d2e0a1ad932817c2.json", "name" : "HydraEngine", "projectIndex" : 1 }, diff --git a/build/.cmake/api/v1/reply/index-2026-07-18T10-41-34-0647.json b/build/.cmake/api/v1/reply/index-2026-07-24T14-59-05-0564.json similarity index 94% rename from build/.cmake/api/v1/reply/index-2026-07-18T10-41-34-0647.json rename to build/.cmake/api/v1/reply/index-2026-07-24T14-59-05-0564.json index 754fa7f..7fe55b4 100644 --- a/build/.cmake/api/v1/reply/index-2026-07-18T10-41-34-0647.json +++ b/build/.cmake/api/v1/reply/index-2026-07-24T14-59-05-0564.json @@ -27,7 +27,7 @@ "objects" : [ { - "jsonFile" : "codemodel-v2-aa0145a10a295b367570.json", + "jsonFile" : "codemodel-v2-5dc3199adeadec3fb6d9.json", "kind" : "codemodel", "version" : { @@ -100,7 +100,7 @@ } }, { - "jsonFile" : "codemodel-v2-aa0145a10a295b367570.json", + "jsonFile" : "codemodel-v2-5dc3199adeadec3fb6d9.json", "kind" : "codemodel", "version" : { diff --git a/build/.cmake/api/v1/reply/target-ALL_BUILD-MinSizeRel-30097c8e6651db3aff43.json b/build/.cmake/api/v1/reply/target-ALL_BUILD-Debug-21126e6f26f8151b82a1.json similarity index 100% rename from build/.cmake/api/v1/reply/target-ALL_BUILD-MinSizeRel-30097c8e6651db3aff43.json rename to build/.cmake/api/v1/reply/target-ALL_BUILD-Debug-21126e6f26f8151b82a1.json index 9fd930e..3293cbc 100644 --- a/build/.cmake/api/v1/reply/target-ALL_BUILD-MinSizeRel-30097c8e6651db3aff43.json +++ b/build/.cmake/api/v1/reply/target-ALL_BUILD-Debug-21126e6f26f8151b82a1.json @@ -22,10 +22,10 @@ "dependencies" : [ { - "id" : "HydraEngine::@fafd37b19aacd4c483ed" + "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" }, { - "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" + "id" : "HydraEngine::@fafd37b19aacd4c483ed" } ], "folder" : diff --git a/build/.cmake/api/v1/reply/target-ALL_BUILD-RelWithDebInfo-9ddbbbeb4caedf0a48f0.json b/build/.cmake/api/v1/reply/target-ALL_BUILD-Debug-79cb89fa590649c6cd6a.json similarity index 100% rename from build/.cmake/api/v1/reply/target-ALL_BUILD-RelWithDebInfo-9ddbbbeb4caedf0a48f0.json rename to build/.cmake/api/v1/reply/target-ALL_BUILD-Debug-79cb89fa590649c6cd6a.json index 93dc2e3..3ef51d0 100644 --- a/build/.cmake/api/v1/reply/target-ALL_BUILD-RelWithDebInfo-9ddbbbeb4caedf0a48f0.json +++ b/build/.cmake/api/v1/reply/target-ALL_BUILD-Debug-79cb89fa590649c6cd6a.json @@ -25,10 +25,10 @@ "id" : "HydraClient::@6890427a1f51a3e7e1df" }, { - "id" : "HydraEngine::@fafd37b19aacd4c483ed" + "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" }, { - "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" + "id" : "HydraEngine::@fafd37b19aacd4c483ed" } ], "folder" : diff --git a/build/.cmake/api/v1/reply/target-ALL_BUILD-RelWithDebInfo-30097c8e6651db3aff43.json b/build/.cmake/api/v1/reply/target-ALL_BUILD-MinSizeRel-21126e6f26f8151b82a1.json similarity index 100% rename from build/.cmake/api/v1/reply/target-ALL_BUILD-RelWithDebInfo-30097c8e6651db3aff43.json rename to build/.cmake/api/v1/reply/target-ALL_BUILD-MinSizeRel-21126e6f26f8151b82a1.json index 9fd930e..3293cbc 100644 --- a/build/.cmake/api/v1/reply/target-ALL_BUILD-RelWithDebInfo-30097c8e6651db3aff43.json +++ b/build/.cmake/api/v1/reply/target-ALL_BUILD-MinSizeRel-21126e6f26f8151b82a1.json @@ -22,10 +22,10 @@ "dependencies" : [ { - "id" : "HydraEngine::@fafd37b19aacd4c483ed" + "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" }, { - "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" + "id" : "HydraEngine::@fafd37b19aacd4c483ed" } ], "folder" : diff --git a/build/.cmake/api/v1/reply/target-ALL_BUILD-MinSizeRel-9ddbbbeb4caedf0a48f0.json b/build/.cmake/api/v1/reply/target-ALL_BUILD-MinSizeRel-79cb89fa590649c6cd6a.json similarity index 100% rename from build/.cmake/api/v1/reply/target-ALL_BUILD-MinSizeRel-9ddbbbeb4caedf0a48f0.json rename to build/.cmake/api/v1/reply/target-ALL_BUILD-MinSizeRel-79cb89fa590649c6cd6a.json index 93dc2e3..3ef51d0 100644 --- a/build/.cmake/api/v1/reply/target-ALL_BUILD-MinSizeRel-9ddbbbeb4caedf0a48f0.json +++ b/build/.cmake/api/v1/reply/target-ALL_BUILD-MinSizeRel-79cb89fa590649c6cd6a.json @@ -25,10 +25,10 @@ "id" : "HydraClient::@6890427a1f51a3e7e1df" }, { - "id" : "HydraEngine::@fafd37b19aacd4c483ed" + "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" }, { - "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" + "id" : "HydraEngine::@fafd37b19aacd4c483ed" } ], "folder" : diff --git a/build/.cmake/api/v1/reply/target-ALL_BUILD-Debug-30097c8e6651db3aff43.json b/build/.cmake/api/v1/reply/target-ALL_BUILD-RelWithDebInfo-21126e6f26f8151b82a1.json similarity index 100% rename from build/.cmake/api/v1/reply/target-ALL_BUILD-Debug-30097c8e6651db3aff43.json rename to build/.cmake/api/v1/reply/target-ALL_BUILD-RelWithDebInfo-21126e6f26f8151b82a1.json index 9fd930e..3293cbc 100644 --- a/build/.cmake/api/v1/reply/target-ALL_BUILD-Debug-30097c8e6651db3aff43.json +++ b/build/.cmake/api/v1/reply/target-ALL_BUILD-RelWithDebInfo-21126e6f26f8151b82a1.json @@ -22,10 +22,10 @@ "dependencies" : [ { - "id" : "HydraEngine::@fafd37b19aacd4c483ed" + "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" }, { - "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" + "id" : "HydraEngine::@fafd37b19aacd4c483ed" } ], "folder" : diff --git a/build/.cmake/api/v1/reply/target-ALL_BUILD-Release-9ddbbbeb4caedf0a48f0.json b/build/.cmake/api/v1/reply/target-ALL_BUILD-RelWithDebInfo-79cb89fa590649c6cd6a.json similarity index 100% rename from build/.cmake/api/v1/reply/target-ALL_BUILD-Release-9ddbbbeb4caedf0a48f0.json rename to build/.cmake/api/v1/reply/target-ALL_BUILD-RelWithDebInfo-79cb89fa590649c6cd6a.json index 93dc2e3..3ef51d0 100644 --- a/build/.cmake/api/v1/reply/target-ALL_BUILD-Release-9ddbbbeb4caedf0a48f0.json +++ b/build/.cmake/api/v1/reply/target-ALL_BUILD-RelWithDebInfo-79cb89fa590649c6cd6a.json @@ -25,10 +25,10 @@ "id" : "HydraClient::@6890427a1f51a3e7e1df" }, { - "id" : "HydraEngine::@fafd37b19aacd4c483ed" + "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" }, { - "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" + "id" : "HydraEngine::@fafd37b19aacd4c483ed" } ], "folder" : diff --git a/build/.cmake/api/v1/reply/target-ALL_BUILD-Release-30097c8e6651db3aff43.json b/build/.cmake/api/v1/reply/target-ALL_BUILD-Release-21126e6f26f8151b82a1.json similarity index 100% rename from build/.cmake/api/v1/reply/target-ALL_BUILD-Release-30097c8e6651db3aff43.json rename to build/.cmake/api/v1/reply/target-ALL_BUILD-Release-21126e6f26f8151b82a1.json index 9fd930e..3293cbc 100644 --- a/build/.cmake/api/v1/reply/target-ALL_BUILD-Release-30097c8e6651db3aff43.json +++ b/build/.cmake/api/v1/reply/target-ALL_BUILD-Release-21126e6f26f8151b82a1.json @@ -22,10 +22,10 @@ "dependencies" : [ { - "id" : "HydraEngine::@fafd37b19aacd4c483ed" + "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" }, { - "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" + "id" : "HydraEngine::@fafd37b19aacd4c483ed" } ], "folder" : diff --git a/build/.cmake/api/v1/reply/target-ALL_BUILD-Debug-9ddbbbeb4caedf0a48f0.json b/build/.cmake/api/v1/reply/target-ALL_BUILD-Release-79cb89fa590649c6cd6a.json similarity index 100% rename from build/.cmake/api/v1/reply/target-ALL_BUILD-Debug-9ddbbbeb4caedf0a48f0.json rename to build/.cmake/api/v1/reply/target-ALL_BUILD-Release-79cb89fa590649c6cd6a.json index 93dc2e3..3ef51d0 100644 --- a/build/.cmake/api/v1/reply/target-ALL_BUILD-Debug-9ddbbbeb4caedf0a48f0.json +++ b/build/.cmake/api/v1/reply/target-ALL_BUILD-Release-79cb89fa590649c6cd6a.json @@ -25,10 +25,10 @@ "id" : "HydraClient::@6890427a1f51a3e7e1df" }, { - "id" : "HydraEngine::@fafd37b19aacd4c483ed" + "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" }, { - "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" + "id" : "HydraEngine::@fafd37b19aacd4c483ed" } ], "folder" : diff --git a/build/.cmake/api/v1/reply/target-HydraClient-Debug-78ce361b98c7c89e9629.json b/build/.cmake/api/v1/reply/target-HydraClient-Debug-ccca9689ebe6b19fe65a.json similarity index 100% rename from build/.cmake/api/v1/reply/target-HydraClient-Debug-78ce361b98c7c89e9629.json rename to build/.cmake/api/v1/reply/target-HydraClient-Debug-ccca9689ebe6b19fe65a.json index 47646bd..c7b1ff5 100644 --- a/build/.cmake/api/v1/reply/target-HydraClient-Debug-78ce361b98c7c89e9629.json +++ b/build/.cmake/api/v1/reply/target-HydraClient-Debug-ccca9689ebe6b19fe65a.json @@ -107,11 +107,11 @@ "dependencies" : [ { - "backtrace" : 2, - "id" : "HydraEngine::@fafd37b19aacd4c483ed" + "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" }, { - "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" + "backtrace" : 2, + "id" : "HydraEngine::@fafd37b19aacd4c483ed" } ], "id" : "HydraClient::@6890427a1f51a3e7e1df", diff --git a/build/.cmake/api/v1/reply/target-HydraClient-MinSizeRel-0b1754e9511a8dea2861.json b/build/.cmake/api/v1/reply/target-HydraClient-MinSizeRel-707588ed524688a0f034.json similarity index 100% rename from build/.cmake/api/v1/reply/target-HydraClient-MinSizeRel-0b1754e9511a8dea2861.json rename to build/.cmake/api/v1/reply/target-HydraClient-MinSizeRel-707588ed524688a0f034.json index 14caed4..9381a96 100644 --- a/build/.cmake/api/v1/reply/target-HydraClient-MinSizeRel-0b1754e9511a8dea2861.json +++ b/build/.cmake/api/v1/reply/target-HydraClient-MinSizeRel-707588ed524688a0f034.json @@ -107,11 +107,11 @@ "dependencies" : [ { - "backtrace" : 2, - "id" : "HydraEngine::@fafd37b19aacd4c483ed" + "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" }, { - "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" + "backtrace" : 2, + "id" : "HydraEngine::@fafd37b19aacd4c483ed" } ], "id" : "HydraClient::@6890427a1f51a3e7e1df", diff --git a/build/.cmake/api/v1/reply/target-HydraClient-RelWithDebInfo-19110864938462bdea5b.json b/build/.cmake/api/v1/reply/target-HydraClient-RelWithDebInfo-a4b1a5ac731bdcc03733.json similarity index 100% rename from build/.cmake/api/v1/reply/target-HydraClient-RelWithDebInfo-19110864938462bdea5b.json rename to build/.cmake/api/v1/reply/target-HydraClient-RelWithDebInfo-a4b1a5ac731bdcc03733.json index b28d9b3..0e5cae5 100644 --- a/build/.cmake/api/v1/reply/target-HydraClient-RelWithDebInfo-19110864938462bdea5b.json +++ b/build/.cmake/api/v1/reply/target-HydraClient-RelWithDebInfo-a4b1a5ac731bdcc03733.json @@ -107,11 +107,11 @@ "dependencies" : [ { - "backtrace" : 2, - "id" : "HydraEngine::@fafd37b19aacd4c483ed" + "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" }, { - "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" + "backtrace" : 2, + "id" : "HydraEngine::@fafd37b19aacd4c483ed" } ], "id" : "HydraClient::@6890427a1f51a3e7e1df", diff --git a/build/.cmake/api/v1/reply/target-HydraClient-Release-5f750d1feb1d099be72b.json b/build/.cmake/api/v1/reply/target-HydraClient-Release-f300bf694420197200c5.json similarity index 100% rename from build/.cmake/api/v1/reply/target-HydraClient-Release-5f750d1feb1d099be72b.json rename to build/.cmake/api/v1/reply/target-HydraClient-Release-f300bf694420197200c5.json index f63d5ce..331eab5 100644 --- a/build/.cmake/api/v1/reply/target-HydraClient-Release-5f750d1feb1d099be72b.json +++ b/build/.cmake/api/v1/reply/target-HydraClient-Release-f300bf694420197200c5.json @@ -107,11 +107,11 @@ "dependencies" : [ { - "backtrace" : 2, - "id" : "HydraEngine::@fafd37b19aacd4c483ed" + "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" }, { - "id" : "ZERO_CHECK::@6890427a1f51a3e7e1df" + "backtrace" : 2, + "id" : "HydraEngine::@fafd37b19aacd4c483ed" } ], "id" : "HydraClient::@6890427a1f51a3e7e1df", diff --git a/build/.cmake/api/v1/reply/target-HydraEngine-Debug-552fba7b8e0c042c3903.json b/build/.cmake/api/v1/reply/target-HydraEngine-Debug-80357fe79254dd887a59.json similarity index 97% rename from build/.cmake/api/v1/reply/target-HydraEngine-Debug-552fba7b8e0c042c3903.json rename to build/.cmake/api/v1/reply/target-HydraEngine-Debug-80357fe79254dd887a59.json index bec4dc6..c01e267 100644 --- a/build/.cmake/api/v1/reply/target-HydraEngine-Debug-552fba7b8e0c042c3903.json +++ b/build/.cmake/api/v1/reply/target-HydraEngine-Debug-80357fe79254dd887a59.json @@ -199,16 +199,16 @@ 15, 17, 19, - 22, - 25, - 28, + 21, + 24, + 27, 30, - 34, + 32, 36, - 40, - 44, + 38, + 42, 46, - 56, + 48, 58, 60, 62, @@ -218,8 +218,8 @@ 70, 72, 74, - 77, - 80, + 76, + 79, 82, 84, 86, @@ -228,7 +228,8 @@ 92, 94, 96, - 100 + 98, + 102 ] } ], @@ -315,16 +316,16 @@ 15, 17, 19, - 22, - 25, - 28, + 21, + 24, + 27, 30, - 34, + 32, 36, - 40, - 44, + 38, + 42, 46, - 56, + 48, 58, 60, 62, @@ -334,8 +335,8 @@ 70, 72, 74, - 77, - 80, + 76, + 79, 82, 84, 86, @@ -344,7 +345,8 @@ 92, 94, 96, - 100 + 98, + 102 ] }, { @@ -363,25 +365,24 @@ 16, 18, 20, - 21, + 22, 23, - 24, + 25, 26, - 27, + 28, 29, 31, - 32, 33, + 34, 35, 37, - 38, 39, + 40, 41, - 42, 43, + 44, 45, 47, - 48, 49, 50, 51, @@ -389,6 +390,7 @@ 53, 54, 55, + 56, 57, 59, 61, @@ -399,9 +401,9 @@ 71, 73, 75, - 76, + 77, 78, - 79, + 80, 81, 83, 85, @@ -411,9 +413,10 @@ 93, 95, 97, - 98, 99, - 101 + 100, + 101, + 103 ] } ], @@ -533,6 +536,17 @@ "path" : "HydraEngine/source/actor/HydraPointLightActor.h", "sourceGroupIndex" : 1 }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "HydraEngine/source/actor/HydraSpotLightActor.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "path" : "HydraEngine/source/actor/HydraSpotLightActor.h", + "sourceGroupIndex" : 1 + }, { "backtrace" : 1, "path" : "HydraEngine/source/buffer/HydraBuffer.h", diff --git a/build/.cmake/api/v1/reply/target-HydraEngine-MinSizeRel-300e0b7a01e3150809fd.json b/build/.cmake/api/v1/reply/target-HydraEngine-MinSizeRel-e47416ca42d57e6b4584.json similarity index 97% rename from build/.cmake/api/v1/reply/target-HydraEngine-MinSizeRel-300e0b7a01e3150809fd.json rename to build/.cmake/api/v1/reply/target-HydraEngine-MinSizeRel-e47416ca42d57e6b4584.json index 9b50f2f..1e6ec1f 100644 --- a/build/.cmake/api/v1/reply/target-HydraEngine-MinSizeRel-300e0b7a01e3150809fd.json +++ b/build/.cmake/api/v1/reply/target-HydraEngine-MinSizeRel-e47416ca42d57e6b4584.json @@ -199,16 +199,16 @@ 15, 17, 19, - 22, - 25, - 28, + 21, + 24, + 27, 30, - 34, + 32, 36, - 40, - 44, + 38, + 42, 46, - 56, + 48, 58, 60, 62, @@ -218,8 +218,8 @@ 70, 72, 74, - 77, - 80, + 76, + 79, 82, 84, 86, @@ -228,7 +228,8 @@ 92, 94, 96, - 100 + 98, + 102 ] } ], @@ -315,16 +316,16 @@ 15, 17, 19, - 22, - 25, - 28, + 21, + 24, + 27, 30, - 34, + 32, 36, - 40, - 44, + 38, + 42, 46, - 56, + 48, 58, 60, 62, @@ -334,8 +335,8 @@ 70, 72, 74, - 77, - 80, + 76, + 79, 82, 84, 86, @@ -344,7 +345,8 @@ 92, 94, 96, - 100 + 98, + 102 ] }, { @@ -363,25 +365,24 @@ 16, 18, 20, - 21, + 22, 23, - 24, + 25, 26, - 27, + 28, 29, 31, - 32, 33, + 34, 35, 37, - 38, 39, + 40, 41, - 42, 43, + 44, 45, 47, - 48, 49, 50, 51, @@ -389,6 +390,7 @@ 53, 54, 55, + 56, 57, 59, 61, @@ -399,9 +401,9 @@ 71, 73, 75, - 76, + 77, 78, - 79, + 80, 81, 83, 85, @@ -411,9 +413,10 @@ 93, 95, 97, - 98, 99, - 101 + 100, + 101, + 103 ] } ], @@ -533,6 +536,17 @@ "path" : "HydraEngine/source/actor/HydraPointLightActor.h", "sourceGroupIndex" : 1 }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "HydraEngine/source/actor/HydraSpotLightActor.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "path" : "HydraEngine/source/actor/HydraSpotLightActor.h", + "sourceGroupIndex" : 1 + }, { "backtrace" : 1, "path" : "HydraEngine/source/buffer/HydraBuffer.h", diff --git a/build/.cmake/api/v1/reply/target-HydraEngine-RelWithDebInfo-365df9edb3aa4717e569.json b/build/.cmake/api/v1/reply/target-HydraEngine-RelWithDebInfo-e135d2e0a1ad932817c2.json similarity index 97% rename from build/.cmake/api/v1/reply/target-HydraEngine-RelWithDebInfo-365df9edb3aa4717e569.json rename to build/.cmake/api/v1/reply/target-HydraEngine-RelWithDebInfo-e135d2e0a1ad932817c2.json index 27168ea..0722f68 100644 --- a/build/.cmake/api/v1/reply/target-HydraEngine-RelWithDebInfo-365df9edb3aa4717e569.json +++ b/build/.cmake/api/v1/reply/target-HydraEngine-RelWithDebInfo-e135d2e0a1ad932817c2.json @@ -199,16 +199,16 @@ 15, 17, 19, - 22, - 25, - 28, + 21, + 24, + 27, 30, - 34, + 32, 36, - 40, - 44, + 38, + 42, 46, - 56, + 48, 58, 60, 62, @@ -218,8 +218,8 @@ 70, 72, 74, - 77, - 80, + 76, + 79, 82, 84, 86, @@ -228,7 +228,8 @@ 92, 94, 96, - 100 + 98, + 102 ] } ], @@ -315,16 +316,16 @@ 15, 17, 19, - 22, - 25, - 28, + 21, + 24, + 27, 30, - 34, + 32, 36, - 40, - 44, + 38, + 42, 46, - 56, + 48, 58, 60, 62, @@ -334,8 +335,8 @@ 70, 72, 74, - 77, - 80, + 76, + 79, 82, 84, 86, @@ -344,7 +345,8 @@ 92, 94, 96, - 100 + 98, + 102 ] }, { @@ -363,25 +365,24 @@ 16, 18, 20, - 21, + 22, 23, - 24, + 25, 26, - 27, + 28, 29, 31, - 32, 33, + 34, 35, 37, - 38, 39, + 40, 41, - 42, 43, + 44, 45, 47, - 48, 49, 50, 51, @@ -389,6 +390,7 @@ 53, 54, 55, + 56, 57, 59, 61, @@ -399,9 +401,9 @@ 71, 73, 75, - 76, + 77, 78, - 79, + 80, 81, 83, 85, @@ -411,9 +413,10 @@ 93, 95, 97, - 98, 99, - 101 + 100, + 101, + 103 ] } ], @@ -533,6 +536,17 @@ "path" : "HydraEngine/source/actor/HydraPointLightActor.h", "sourceGroupIndex" : 1 }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "HydraEngine/source/actor/HydraSpotLightActor.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "path" : "HydraEngine/source/actor/HydraSpotLightActor.h", + "sourceGroupIndex" : 1 + }, { "backtrace" : 1, "path" : "HydraEngine/source/buffer/HydraBuffer.h", diff --git a/build/.cmake/api/v1/reply/target-HydraEngine-Release-d5355df26e8e8ebc1862.json b/build/.cmake/api/v1/reply/target-HydraEngine-Release-9db118658af30c021c9e.json similarity index 97% rename from build/.cmake/api/v1/reply/target-HydraEngine-Release-d5355df26e8e8ebc1862.json rename to build/.cmake/api/v1/reply/target-HydraEngine-Release-9db118658af30c021c9e.json index 6c81070..1f212d6 100644 --- a/build/.cmake/api/v1/reply/target-HydraEngine-Release-d5355df26e8e8ebc1862.json +++ b/build/.cmake/api/v1/reply/target-HydraEngine-Release-9db118658af30c021c9e.json @@ -199,16 +199,16 @@ 15, 17, 19, - 22, - 25, - 28, + 21, + 24, + 27, 30, - 34, + 32, 36, - 40, - 44, + 38, + 42, 46, - 56, + 48, 58, 60, 62, @@ -218,8 +218,8 @@ 70, 72, 74, - 77, - 80, + 76, + 79, 82, 84, 86, @@ -228,7 +228,8 @@ 92, 94, 96, - 100 + 98, + 102 ] } ], @@ -315,16 +316,16 @@ 15, 17, 19, - 22, - 25, - 28, + 21, + 24, + 27, 30, - 34, + 32, 36, - 40, - 44, + 38, + 42, 46, - 56, + 48, 58, 60, 62, @@ -334,8 +335,8 @@ 70, 72, 74, - 77, - 80, + 76, + 79, 82, 84, 86, @@ -344,7 +345,8 @@ 92, 94, 96, - 100 + 98, + 102 ] }, { @@ -363,25 +365,24 @@ 16, 18, 20, - 21, + 22, 23, - 24, + 25, 26, - 27, + 28, 29, 31, - 32, 33, + 34, 35, 37, - 38, 39, + 40, 41, - 42, 43, + 44, 45, 47, - 48, 49, 50, 51, @@ -389,6 +390,7 @@ 53, 54, 55, + 56, 57, 59, 61, @@ -399,9 +401,9 @@ 71, 73, 75, - 76, + 77, 78, - 79, + 80, 81, 83, 85, @@ -411,9 +413,10 @@ 93, 95, 97, - 98, 99, - 101 + 100, + 101, + 103 ] } ], @@ -533,6 +536,17 @@ "path" : "HydraEngine/source/actor/HydraPointLightActor.h", "sourceGroupIndex" : 1 }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "HydraEngine/source/actor/HydraSpotLightActor.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "path" : "HydraEngine/source/actor/HydraSpotLightActor.h", + "sourceGroupIndex" : 1 + }, { "backtrace" : 1, "path" : "HydraEngine/source/buffer/HydraBuffer.h", diff --git a/build/Debug/HydraClient.pdb b/build/Debug/HydraClient.pdb index 5073582..a85c8fc 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 7eb1a41..d89e824 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 31d542f..3222c2c 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/link.read.1.tlog b/build/HydraClient.dir/Debug/HydraClient.tlog/link.read.1.tlog index 6cbe136..fe4b3e0 100644 Binary files a/build/HydraClient.dir/Debug/HydraClient.tlog/link.read.1.tlog and b/build/HydraClient.dir/Debug/HydraClient.tlog/link.read.1.tlog differ diff --git a/build/HydraClient.dir/Debug/vc143.pdb b/build/HydraClient.dir/Debug/vc143.pdb index a9d86e9..7d9d1d8 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.exp b/build/HydraEngine/Debug/HydraEngine.exp index 44a1b77..06d9285 100644 Binary files a/build/HydraEngine/Debug/HydraEngine.exp and b/build/HydraEngine/Debug/HydraEngine.exp differ diff --git a/build/HydraEngine/Debug/HydraEngine.pdb b/build/HydraEngine/Debug/HydraEngine.pdb index 0e8bca6..f701c3f 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 a9760fe..fc00c94 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 41aa1ae..2dc7d3c 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 ddefabf..acf1748 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 4481e68..85ea444 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/HydraEngine.tlog/Cl.items.tlog b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/Cl.items.tlog index 70ea433..ca60778 100644 --- a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/Cl.items.tlog +++ b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/Cl.items.tlog @@ -7,6 +7,7 @@ C:\Code\HydraV3\HydraEngine\source\actor\HydraOutputActor.cpp;C:\Code\HydraV3\bu C:\Code\HydraV3\HydraEngine\source\actor\HydraPlaneActor.cpp;C:\Code\HydraV3\build\HydraEngine\HydraEngine.dir\Debug\HydraPlaneActor.obj C:\Code\HydraV3\HydraEngine\source\actor\HydraPlayerActor.cpp;C:\Code\HydraV3\build\HydraEngine\HydraEngine.dir\Debug\HydraPlayerActor.obj C:\Code\HydraV3\HydraEngine\source\actor\HydraPointLightActor.cpp;C:\Code\HydraV3\build\HydraEngine\HydraEngine.dir\Debug\HydraPointLightActor.obj +C:\Code\HydraV3\HydraEngine\source\actor\HydraSpotLightActor.cpp;C:\Code\HydraV3\build\HydraEngine\HydraEngine.dir\Debug\HydraSpotLightActor.obj C:\Code\HydraV3\HydraEngine\source\buffer\HydraBufferManager.cpp;C:\Code\HydraV3\build\HydraEngine\HydraEngine.dir\Debug\HydraBufferManager.obj C:\Code\HydraV3\HydraEngine\source\buffer\HydraLightBufferManager.cpp;C:\Code\HydraV3\build\HydraEngine\HydraEngine.dir\Debug\HydraLightBufferManager.obj C:\Code\HydraV3\HydraEngine\source\buffer\HydraMaterialBufferManager.cpp;C:\Code\HydraV3\build\HydraEngine\HydraEngine.dir\Debug\HydraMaterialBufferManager.obj diff --git a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/link.command.1.tlog b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/link.command.1.tlog index c3f4f67..2178d55 100644 Binary files a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/link.command.1.tlog and b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/link.command.1.tlog differ diff --git a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/link.read.1.tlog b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/link.read.1.tlog index e4de3d1..3269bff 100644 Binary files a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/link.read.1.tlog and b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/link.read.1.tlog differ diff --git a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/link.secondary.1.tlog b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/link.secondary.1.tlog index 0833333..5db5f4c 100644 --- a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/link.secondary.1.tlog +++ b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/link.secondary.1.tlog @@ -1,4 +1,4 @@ -^C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\CMAKECXXCOMPILERID.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAACTOR.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAACTORMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRABUFFERMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRACAMERA.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRADEFERREDPIPELINE.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRADIRECTIONALLIGHTACTOR.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAECS.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAENGINE.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAFORWARDPIPELINE.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAGAMEPROXY.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAGLTFACTOR.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAGLTFLOADER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAINPUTMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRALIGHTBUFFERMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRALIGHTSYSTEM.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAMATERIALBUFFERMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAMATERIALSYSTEM.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAMESHMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAMESHSYSTEM.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAOBJECT.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAOUTPUTACTOR.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAPIPELINE.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAPLANEACTOR.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAPLAYERACTOR.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAPOINTLIGHTACTOR.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRARENDERER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRARENDERSTAGE.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRARENDERSYSTEM.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRASYSTEM.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRASYSTEMMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRATASK.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRATASKBARRIER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRATASKSCHEDULER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRATEXTUREBUFFERMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRATHREAD.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRATRANSFORMSYSTEM.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAVERTEXBUFFERMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAWINDOWMANAGER.OBJ +^C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\CMAKECXXCOMPILERID.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAACTOR.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAACTORMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRABUFFERMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRACAMERA.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRADEFERREDPIPELINE.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRADIRECTIONALLIGHTACTOR.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAECS.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAENGINE.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAFORWARDPIPELINE.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAGAMEPROXY.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAGLTFACTOR.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAGLTFLOADER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAINPUTMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRALIGHTBUFFERMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRALIGHTSYSTEM.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAMATERIALBUFFERMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAMATERIALSYSTEM.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAMESHMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAMESHSYSTEM.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAOBJECT.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAOUTPUTACTOR.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAPIPELINE.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAPLANEACTOR.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAPLAYERACTOR.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAPOINTLIGHTACTOR.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRARENDERER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRARENDERSTAGE.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRARENDERSYSTEM.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRASPOTLIGHTACTOR.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRASYSTEM.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRASYSTEMMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRATASK.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRATASKBARRIER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRATASKSCHEDULER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRATEXTUREBUFFERMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRATHREAD.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRATRANSFORMSYSTEM.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAVERTEXBUFFERMANAGER.OBJ|C:\CODE\HYDRAV3\BUILD\HYDRAENGINE\HYDRAENGINE.DIR\DEBUG\HYDRAWINDOWMANAGER.OBJ C:\Code\HydraV3\build\HydraEngine\Debug\HydraEngine.lib C:\Code\HydraV3\build\HydraEngine\Debug\HydraEngine.EXP C:\Code\HydraV3\build\HydraEngine\HydraEngine.dir\Debug\HydraEngine.ilk diff --git a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/link.write.1.tlog b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/link.write.1.tlog index b309409..36cf88a 100644 Binary files a/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/link.write.1.tlog and b/build/HydraEngine/HydraEngine.dir/Debug/HydraEngine.tlog/link.write.1.tlog differ diff --git a/build/HydraEngine/HydraEngine.dir/Debug/vc143.pdb b/build/HydraEngine/HydraEngine.dir/Debug/vc143.pdb index 5f766f9..d6cf0b2 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/HydraEngine/HydraEngine.vcxproj b/build/HydraEngine/HydraEngine.vcxproj index 3607c95..8013169 100644 --- a/build/HydraEngine/HydraEngine.vcxproj +++ b/build/HydraEngine/HydraEngine.vcxproj @@ -446,6 +446,8 @@ if %errorlevel% neq 0 goto :VCEnd + + diff --git a/build/HydraEngine/HydraEngine.vcxproj.filters b/build/HydraEngine/HydraEngine.vcxproj.filters index c5b156d..fda0702 100644 --- a/build/HydraEngine/HydraEngine.vcxproj.filters +++ b/build/HydraEngine/HydraEngine.vcxproj.filters @@ -28,6 +28,9 @@ Source Files + + Source Files + Source Files @@ -156,6 +159,9 @@ Header Files + + Header Files + Header Files