camera ray with orthographic camera

Author: malytomas

sources/include/cage-core/files.h

@@ -53,7 +53,7 @@ namespace cage
 		virtual bool readLine(String &line); // non blocking
 
 		virtual void write(PointerRange<const char> buffer);
-		virtual void writeLine(const String &line);
+		virtual void writeLine(const String &line = "");
 
 		virtual void seek(uint64 position);
 		virtual uint64 tell();

sources/libsimple/cameraRay.cpp

@@ -22,9 +22,22 @@ namespace cage
 		Real px = p[0], py = -p[1];
 		const TransformComponent &ts = camera->value<TransformComponent>();
 		const CameraComponent &cs = camera->value<CameraComponent>();
-		CAGE_ASSERT(cs.cameraType == CameraTypeEnum::Perspective);
 		const Mat4 view = inverse(Mat4(ts.position, ts.orientation, Vec3(ts.scale)));
-		const Mat4 proj = perspectiveProjection(cs.perspectiveFov, Real(res[0]) / Real(res[1]), cs.near, cs.far);
+		const Mat4 proj = [&]() -> Mat4
+		{
+			switch (cs.cameraType)
+			{
+				case CameraTypeEnum::Orthographic:
+				{
+					const Vec2 os = cs.orthographicSize * 0.5;
+					return orthographicProjection(-os[0], os[0], -os[1], os[1], cs.near, cs.far);
+				}
+				case CameraTypeEnum::Perspective:
+					return perspectiveProjection(cs.perspectiveFov, Real(res[0]) / Real(res[1]), cs.near, cs.far);
+				default:
+					CAGE_THROW_ERROR(Exception, "invalid camera type");
+			}
+		}();
 		const Mat4 inv = inverse(proj * view);
 		const Vec4 pn = inv * Vec4(px, py, -1, 1);
 		const Vec4 pf = inv * Vec4(px, py, 1, 1);

sources/libsimple/graphics.cpp

@@ -97,7 +97,7 @@ namespace cage
 			{
 				case CameraTypeEnum::Orthographic:
 				{
-					const Vec2 &os = data.orthographicSize;
+					const Vec2 os = data.orthographicSize * 0.5;
 					return orthographicProjection(-os[0], os[0], -os[1], os[1], data.near, data.far);
 				}
 				case CameraTypeEnum::Perspective: