X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel%2Fgeometry.cpp;h=e0b55826de35ed58bb05ca441a260a5877f45e86;hb=4f93c2526b82132ee695949779775b5e7abc7d4d;hp=c2816b44a0f585f67781ef7e6bbe4e811dcd4fe9;hpb=74b5bd523b0312ee71f0443789bb40f1476054a4;p=blank.git diff --git a/src/model/geometry.cpp b/src/model/geometry.cpp index c2816b4..e0b5582 100644 --- a/src/model/geometry.cpp +++ b/src/model/geometry.cpp @@ -47,20 +47,17 @@ bool Intersection( *dist = t_min; } if (normal) { - glm::vec4 norm(0.0f); if (min_all.x > min_all.y) { if (min_all.x > min_all.z) { - norm.x = t2.x < t1.x ? 1 : -1; + normal->x = t2.x < t1.x ? 1 : -1; } else { - norm.z = t2.z < t1.z ? 1 : -1; + normal->z = t2.z < t1.z ? 1 : -1; } } else if (min_all.y > min_all.z) { - norm.y = t2.y < t1.y ? 1 : -1; + normal->y = t2.y < t1.y ? 1 : -1; } else { - norm.z = t2.z < t1.z ? 1 : -1; + normal->z = t2.z < t1.z ? 1 : -1; } - norm = M * norm; - *normal = glm::vec3(norm); } return true; }