eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 03:29:19 +02:00
Code Issues 123 Wiki Activity

mouse picking improvements: filter out backfacing; include near plane in ray origin computation

Browse Source
This commit is contained in:
Wls50
2025-11-28 22:01:27 +01:00
committed by Hirek
parent a22f449ecd
commit aa0b6e9965
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
betterRenderer/renderer/source/nvrenderer.cpp
View File

@@ -386,12 +386,21 @@ bool NvRenderer::Render() {
(static_cast<glm::dvec2>(Global.cursor_pos) / (static_cast<glm::dvec2>(Global.cursor_pos) /
static_cast<glm::dvec2>(Global.window_size) - static_cast<glm::dvec2>(Global.window_size) -
.5); .5);
m_mouse_ro = pass.m_origin; {
glm::dvec4 mouse_rd_norm = glm::dvec4 mouse_ro_norm =
inverse(projection) * glm::dvec4(mousepos, 1., 1.); inverse(projection) * glm::dvec4(mousepos, 1., 1.);
mouse_rd_norm /= mouse_rd_norm.w; mouse_ro_norm /= mouse_ro_norm.w;
m_mouse_rd = m_mouse_ro = pass.m_origin + static_cast<glm::dvec3>(
normalize(inverse(transform) * glm::dvec4(mouse_rd_norm.xyz, 0.)); inverse(transform) *
glm::dvec4(mouse_ro_norm.xyz, 1.));
}
{
glm::dvec4 mouse_rd_norm =
inverse(projection) * glm::dvec4(mousepos, 0., 1.);
mouse_rd_norm /= mouse_rd_norm.w;
m_mouse_rd =
normalize(inverse(transform) * glm::dvec4(mouse_rd_norm.xyz, 0.));
}
} }
m_picked_submodel = nullptr; m_picked_submodel = nullptr;

4
betterRenderer/renderer/source/rt_model.cpp
View File

@@ -137,7 +137,9 @@ const TSubModel* Rt::RtModel::Intersect(
[&](size_t const begin, size_t const end) { [&](size_t const begin, size_t const end) {
for (size_t i = begin; i < end; ++i) { for (size_t i = begin; i < end; ++i) {
size_t const j = submodel.bvh.prim_ids[i]; size_t const j = submodel.bvh.prim_ids[i];
if (auto hit = submodel.tris[j].intersect(ray)) { if (auto hit = submodel.tris[j].intersect(ray);
!!hit && dot(rd_local, glm::make_vec3(
submodel.tris[j].n.values)) > 0.) {
prim_id = i; prim_id = i;
std::tie(ray.tmax, u, v) = *hit; std::tie(ray.tmax, u, v) = *hit;
result = submodel.submodel; result = submodel.submodel;