tri11paragon
/
COSC-3P93-Project
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Texture issue is on UV generation but debug color pre clamp implies it's correct but not scaled?

main
Brett 2022-11-21 00:57:00 -05:00
parent 763d57327f
commit cf75e66684
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Step 3/resources/livingmylifeinstereodoesntseemthatbad.PNG Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 499 KiB

6
Step 3/src/engine/world.cpp
View File

@ -57,7 +57,7 @@ namespace Raytracing {
// calculate the uv coords and normalize to [0, 1] // calculate the uv coords and normalize to [0, 1]
PRECISION_TYPE u = (atan2(-RayAtRoot.z(), RayAtRoot.x()) + std::numbers::pi) / (2 * std::numbers::pi); PRECISION_TYPE u = (atan2(-RayAtRoot.z(), RayAtRoot.x()) + std::numbers::pi) / (2 * std::numbers::pi);
PRECISION_TYPE v = acos(RayAtRoot.y()) / std::numbers::pi; PRECISION_TYPE v = acos(RayAtRoot.y()) / std::numbers::pi;
return {true, RayAtRoot, normal, root, u, v}; return {true, RayAtRoot, normal, root, clamp(u, 0, 1.0), clamp(v, 0, 1.0)};
} }
std::pair<HitData, Object*> World::checkIfHit(const Ray& ray, PRECISION_TYPE min, PRECISION_TYPE max) const { std::pair<HitData, Object*> World::checkIfHit(const Ray& ray, PRECISION_TYPE min, PRECISION_TYPE max) const {
@ -149,7 +149,7 @@ namespace Raytracing {
// if we are unable to load the image return the debug color. // if we are unable to load the image return the debug color.
// This causes major issues (force this to happen, you'll see), indicates issue + looks really cool. // This causes major issues (force this to happen, you'll see), indicates issue + looks really cool.
if (!data) if (!data)
Vec4{0, 1, 0.2} * Vec4{u, v, 1.0}; return Vec4{0, 1, 0.2} * Vec4{u, v, 1.0};
// if you render out the debug color above you'll notice that the UV coords are rotated. // if you render out the debug color above you'll notice that the UV coords are rotated.
// you can also see this from the debug view, which *as of now* is rendering based on UV coords * normals * red // you can also see this from the debug view, which *as of now* is rendering based on UV coords * normals * red
@ -244,7 +244,7 @@ namespace Raytracing {
// that area is how much each UV factors into the final UV coord // that area is how much each UV factors into the final UV coord
auto uv = theTriangle.uv1 * areaVert1 + theTriangle.uv2 * areaVert2 + theTriangle.uv3 * areaVert3; auto uv = theTriangle.uv1 * areaVert1 + theTriangle.uv2 * areaVert2 + theTriangle.uv3 * areaVert3;
return {true, rayIntersectionPoint, normal, t, uv.x(), uv.y()}; return {true, rayIntersectionPoint, normal, t, clamp(uv.x(), 0, 1.0), clamp(uv.y(), 0, 1.0)};
} }
return {false, Vec4(), Vec4(), 0}; return {false, Vec4(), Vec4(), 0};