fix ray tracer projection plane

3DEditor/private/Editor.cpp

@@ -58,7 +58,7 @@ void Editor::loadDefaults() {
 
 void Editor::setViewportSize(const Vec2F& size) {
 	// TODO remove
-	mScene.mCamera.rotate(0.01f, 0.0);
+	// mScene.mCamera.rotate(0.01f, 0.0);
 
 	mScene.mRenderSettings.size = size;
 
@@ -72,6 +72,7 @@ Editor::~Editor() {
 
 void Editor::renderPathFrame() {
 	mPathRenderer.render(mScene, mPathTracerBuffers, mScene.mRenderSettings);
+	// mPathTracerBuffers.color.flipY();
 
 	{
 		glBindTexture(GL_TEXTURE_2D, mPathRenderTexture);

Containers/public/Buffer2D.hpp

@@ -59,6 +59,24 @@ namespace tp {
 
 		tType* getBuff() const { return mBuff; }
 
+		void flipY() {
+			for (Index i = 0; i < mSize.x; i++) {
+				const auto lenIdx = mSize.y - 1;
+				for (Index j = 0; j < mSize.y / 2; j++) {
+					swap(get({i, j}), get({i, lenIdx - j}));
+				}
+			}
+		}
+
+		void flipX() {
+			for (Index i = 0; i < mSize.y; i++) {
+				const auto lenIdx = mSize.x - 1;
+				for (Index j = 0; j < mSize.x / 2; j++) {
+					swap(get({i, j}), get({i, lenIdx - j}));
+				}
+			}
+		}
+
 		inline tType& get(const Index2D& at) {
 			DEBUG_ASSERT(mBuff && at.x < mSize.x && at.y < mSize.y && at.x >= 0 && at.y >= 0)
 			return *(mBuff + mSize.x * at.y + at.x);

Math/private/Camera.cpp

@@ -57,7 +57,7 @@ Mat4F Camera::calculateProjectionMatrix() const {
 	return out;
 }
 
-Vec3F Camera::project(Vec2F normalized) {
+Vec3F Camera::project(Vec2F normalized) const {
 	auto camMat = calculateTransformationMatrix();
 	auto inv = camMat.inv();
 
@@ -68,7 +68,7 @@ Vec3F Camera::project(Vec2F normalized) {
 	return Vec3F(inv * world_pos4);
 }
 
-Vec2F Camera::project(const Vec3F& world) {
+Vec2F Camera::project(const Vec3F& world) const {
 	Vec4F world_pos4(world.x, world.y, world.z, 1);
 	Vec4F transformed = calculateViewMatrix() * world_pos4;
 	transformed = calculateProjectionMatrix() * transformed;

Math/public/Camera.hpp

@@ -39,8 +39,10 @@ namespace tp {
 		[[nodiscard]] Mat4F calculateTransformationMatrix() const;
 		[[nodiscard]] Mat<halnf, 4, 4> calculateProjectionMatrix() const;
 		[[nodiscard]] Mat<halnf, 4, 4> calculateViewMatrix() const;
-		[[nodiscard]] Vec3F project(Vec2F normalized);
+
-		[[nodiscard]] Vec2F project(const Vec3F& world);
+		// from -1 -1 is top left corner. z is distance to the target
+		[[nodiscard]] Vec3F project(Vec2F normalized) const;
+		[[nodiscard]] Vec2F project(const Vec3F& world) const;
 		[[nodiscard]] static Vec2F project(const tp::Vec3F& world, const tp::Mat4F& viewMat, const tp::Mat4F& projMat);
 	};
 }

RayTracer/private/RayTracer.cpp

@@ -127,24 +127,22 @@ void RayTracer::render(const Scene& scene, OutputBuffers& out, const RenderSetti
 	mSettings = settings;
 
 	auto pos = mScene->mCamera.getPos();
-	auto fov = mScene->mCamera.getFOV();
+	auto camera = mScene->mCamera;
-	auto height = sqrt(mScene->mCamera.getRatio());
-	auto width = 1.f / height;
-	auto forward = mScene->mCamera.getForward();
-	auto up = mScene->mCamera.getUp();
-	auto right = forward.cross(up);
-	auto planeCenter = pos + (forward * halnf(width / (2.f * tan(fov / 2.f))));
-	auto planeCenterOffset = (up * (halnf) height / 2.f) - (right * (halnf) width / 2.f);
 
-	auto planeLeftTop = planeCenter + planeCenterOffset;
+	const auto planeLeftTop = camera.project({ -1, -1 });
+	const auto planeRightTop = camera.project({ 1, -1 });
+	const auto planeRightBottom = camera.project({ 1, 1 });
+
+	const auto up = (planeRightBottom - planeRightTop);
+	const auto right = planeRightTop - planeLeftTop;
 
 	RayCastData castData;
 
 	Ray ray = { { 0, 0, 0 }, pos };
 
 	Vec3F iterPoint = { 0, 0, 0 };
-	Vec3F deltaX = right * halnf(width / (alnf) mSettings.size.x);
+	Vec3F deltaX = right / halnf(mSettings.size.x);
-	Vec3F deltaY = up * halnf(-height / (alnf) mSettings.size.y);
+	Vec3F deltaY = up / halnf(mSettings.size.y);
 
 	ualni maxIterations = mSettings.size.x * mSettings.size.y;
 	ualni currIter = 0;

RayTracer/tests/Test.cpp

@@ -93,6 +93,8 @@ SUITE(RayTracer) {
 		RayTracer rt;
 		rt.render(scene, output, settings);
 
+		output.color.flipY();
+
 		CHECK(compareCols(output.color.get({ 6, 4 }), RGBA{ 0.560100f, 0.560100f, 0.560100f, 1.000000f }));
 		CHECK(compareCols(output.color.get({ 6, 5 }), RGBA{ 0.353739f, 0.353739f, 0.353739f, 1.000000f }));
 		CHECK(compareCols(output.color.get({ 6, 6 }), RGBA{ 0.242577f, 0.242577f, 0.242577f, 1.000000f }));