benkyd/inferno-hart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tracing
Some checks failed
C/C++ CI / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Ben Kyd
2024-01-28 23:20:39 +00:00
parent 7f80ef96e1
commit 0cc5570098
3 changed files with 42 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/graphics/rendertarget.cpp
View File

@@ -172,15 +172,11 @@ DynamicCPUTarget* dynamic_rendertarget_create(
samplerInfo.addressModeV = VK_SAMPLER_ADDRESS_MODE_REPEAT; samplerInfo.addressModeV = VK_SAMPLER_ADDRESS_MODE_REPEAT;
samplerInfo.addressModeW = VK_SAMPLER_ADDRESS_MODE_REPEAT; samplerInfo.addressModeW = VK_SAMPLER_ADDRESS_MODE_REPEAT;
samplerInfo.anisotropyEnable = VK_FALSE; samplerInfo.anisotropyEnable = VK_FALSE;
samplerInfo.maxAnisotropy = 1.0f; samplerInfo.maxAnisotropy = 0.0f;
samplerInfo.borderColor = VK_BORDER_COLOR_INT_OPAQUE_BLACK; samplerInfo.borderColor = VK_BORDER_COLOR_INT_OPAQUE_BLACK;
samplerInfo.unnormalizedCoordinates = VK_FALSE; samplerInfo.unnormalizedCoordinates = VK_FALSE;
samplerInfo.compareEnable = VK_FALSE; samplerInfo.compareEnable = VK_FALSE;
samplerInfo.compareOp = VK_COMPARE_OP_ALWAYS; samplerInfo.compareOp = VK_COMPARE_OP_ALWAYS;
samplerInfo.mipmapMode = VK_SAMPLER_MIPMAP_MODE_LINEAR;
samplerInfo.mipLodBias = 0.0f;
samplerInfo.minLod = 0.0f;
samplerInfo.maxLod = 0.0f;
if (vkCreateSampler(device->VulkanDevice, &samplerInfo, nullptr, &target->Sampler) if (vkCreateSampler(device->VulkanDevice, &samplerInfo, nullptr, &target->Sampler)
!= VK_SUCCESS) { != VK_SUCCESS) {
@@ -188,7 +184,7 @@ DynamicCPUTarget* dynamic_rendertarget_create(
} }
// Create VkImage with Undefined // Create VkImage with Undefined
create_image(device, extent.width, extent.height, format, VK_IMAGE_TILING_OPTIMAL, create_image(device, extent.width, extent.height, format, VK_IMAGE_TILING_LINEAR,
VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT
| VK_IMAGE_USAGE_SAMPLED_BIT, | VK_IMAGE_USAGE_SAMPLED_BIT,
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, target->Image, target->Memory); VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, target->Image, target->Memory);

18
src/inferno.cpp
View File

@@ -353,15 +353,15 @@ int inferno_run(InfernoApp* app)
} }
if (ImGui::Begin("Render")) { if (ImGui::Begin("Render")) {
static ImVec2 lastViewport = { 0, 0 }; // static ImVec2 lastViewport = { 0, 0 };
ImVec2 currentViewport = ImGui::GetWindowSize(); // ImVec2 currentViewport = ImGui::GetWindowSize();
if (lastViewport.x != currentViewport.x // if (lastViewport.x != currentViewport.x
|| lastViewport.y != currentViewport.y) { // || lastViewport.y != currentViewport.y) {
graphics::camera_ray_set_viewport(scene::scene_get_camera(app->Scene), // graphics::camera_ray_set_viewport(scene::scene_get_camera(app->Scene),
{ ImGui::GetWindowSize().x, ImGui::GetWindowSize().y }); // { ImGui::GetWindowSize().x, ImGui::GetWindowSize().y });
graphics::rayr_set_viewport(app->RayRenderer, app->Scene->Camera); // graphics::rayr_set_viewport(app->RayRenderer, app->Scene->Camera);
} // }
lastViewport = currentViewport; // lastViewport = currentViewport;
graphics::rayr_draw(app->RayRenderer); graphics::rayr_draw(app->RayRenderer);

62
src/raytracing/renderer.cpp
View File

@@ -103,40 +103,40 @@ void rayr_draw(RayRenderer* renderer)
scene::scene_frame_tick(renderer->Scene); scene::scene_frame_tick(renderer->Scene);
// TODO: Rays should definately be bump allocated if possible, this is KBs of // TODO: Rays should definately be bump allocated if possible, this is KBs of
// ray data and nothing else being reallocated every frame for no reason // ray data and nothing else being reallocated every frame for no reason
// rays::ReferencedRayField startRays rays::ReferencedRayField startRays
// = rays::generate_initial_rays(scene::scene_get_camera(renderer->Scene), true); = rays::generate_initial_rays(scene::scene_get_camera(renderer->Scene), true);
#pragma omp parallel for
for (int x = 0; x < renderer->Viewport.extent.width; x++) { for (int x = 0; x < renderer->Viewport.extent.width; x++) {
for (int y = 0; y < renderer->Viewport.extent.height; y++) { for (int y = 0; y < renderer->Viewport.extent.height; y++) {
// rays::Ray* ray = startRays.Field[x * renderer->Viewport.extent.height + y]; // renderer->RenderData[y * renderer->Viewport.extent.width + x]
renderer->RenderData[y * renderer->Viewport.extent.width + x] // = { 1.0, 1.0, 1.0, 1.0 };
// = { ray->Direction.x, ray->Direction.y, ray->Direction.z, 1.0 }; rays::Ray* ray = startRays.Field[x * renderer->Viewport.extent.height + y];
= { 1.0, 1.0, 1.0, 1.0 }; rays::HitInfo* closest_hit = nullptr;
// rays::HitInfo* closest_hit = nullptr;
// for (auto& obj : scene::scene_get_renderables(renderer->Scene)) {
// for (auto& obj : scene::scene_get_renderables(renderer->Scene)) { rays::HitInfo* hit = rays::object_ray_collide(obj, ray);
// rays::HitInfo* hit = rays::object_ray_collide(obj, ray); if (hit->Did) {
// if (hit->Did) { if (closest_hit == nullptr) {
// if (closest_hit == nullptr) { closest_hit = hit;
// closest_hit = hit; } else {
// } else { bool is_closer = hit->Distance < closest_hit->Distance;
// bool is_closer = hit->Distance < closest_hit->Distance; if (is_closer) {
// if (is_closer) { delete closest_hit;
// delete closest_hit; closest_hit = hit;
// closest_hit = hit; } else {
// } else { delete hit;
// delete hit; }
// } }
// } }
// } if (hit->Did) {
// if (hit->Did) { glm::vec3 hit_distance = glm::vec3 { hit->Distance };
// glm::vec3 hit_distance = glm::vec3 { hit->Distance }; hit_distance /= 10;
// hit_distance /= 10; renderer->RenderData[y * renderer->Viewport.extent.width + x]
// renderer->RenderData[y * renderer->Viewport.extent.width + x] = { hit_distance, 1.0 };
// = { hit_distance, 1.0 }; }
// } delete hit;
// delete hit; }
// }
} }
} }