3 files changed, 30 insertions, 65 deletions

diff --git a/core/math/camera_matrix.cpp b/core/math/camera_matrix.cpp
index 0512cdd79..b7a929c8e 100644
--- a/core/math/camera_matrix.cpp
+++ b/core/math/camera_matrix.cpp
@@ -265,75 +265,26 @@ void CameraMatrix::get_viewport_size(real_t &r_width, real_t &r_height) const {
 
 bool CameraMatrix::get_endpoints(const Transform &p_transform, Vector3 *p_8points) const {
 
-	const real_t *matrix = (const real_t *)this->matrix;
-
-	///////--- Near Plane ---///////
-	Plane near_plane = Plane(matrix[3] + matrix[2],
-			matrix[7] + matrix[6],
-			matrix[11] + matrix[10],
-			-matrix[15] - matrix[14]);
-	near_plane.normalize();
-
-	///////--- Far Plane ---///////
-	Plane far_plane = Plane(matrix[2] - matrix[3],
-			matrix[6] - matrix[7],
-			matrix[10] - matrix[11],
-			matrix[15] - matrix[14]);
-	far_plane.normalize();
-
-	///////--- Right Plane ---///////
-	Plane right_plane = Plane(matrix[0] - matrix[3],
-			matrix[4] - matrix[7],
-			matrix[8] - matrix[11],
-			-matrix[15] + matrix[12]);
-	right_plane.normalize();
-
-	///////--- Top Plane ---///////
-	Plane top_plane = Plane(matrix[1] - matrix[3],
-			matrix[5] - matrix[7],
-			matrix[9] - matrix[11],
-			-matrix[15] + matrix[13]);
-	top_plane.normalize();
-
-	Vector3 near_endpoint_left, near_endpoint_right;
-	Vector3 far_endpoint_left, far_endpoint_right;
-
-	bool res = near_plane.intersect_3(right_plane, top_plane, &near_endpoint_right);
-	ERR_FAIL_COND_V(!res, false);
-
-	res = far_plane.intersect_3(right_plane, top_plane, &far_endpoint_right);
-	ERR_FAIL_COND_V(!res, false);
-
-	if ((matrix[8] == 0) && (matrix[9] == 0)) {
-		near_endpoint_left = near_endpoint_right;
-		near_endpoint_left.x = -near_endpoint_left.x;
-
-		far_endpoint_left = far_endpoint_right;
-		far_endpoint_left.x = -far_endpoint_left.x;
-	} else {
-		///////--- Left Plane ---///////
-		Plane left_plane = Plane(matrix[0] + matrix[3],
-				matrix[4] + matrix[7],
-				matrix[8] + matrix[11],
-				-matrix[15] - matrix[12]);
-		left_plane.normalize();
+	Vector<Plane> planes = get_projection_planes(Transform());
+	const Planes intersections[8][3] = {
+		{ PLANE_FAR, PLANE_LEFT, PLANE_TOP },
+		{ PLANE_FAR, PLANE_LEFT, PLANE_BOTTOM },
+		{ PLANE_FAR, PLANE_RIGHT, PLANE_TOP },
+		{ PLANE_FAR, PLANE_RIGHT, PLANE_BOTTOM },
+		{ PLANE_NEAR, PLANE_LEFT, PLANE_TOP },
+		{ PLANE_NEAR, PLANE_LEFT, PLANE_BOTTOM },
+		{ PLANE_NEAR, PLANE_RIGHT, PLANE_TOP },
+		{ PLANE_NEAR, PLANE_RIGHT, PLANE_BOTTOM },
+	};
 
-		res = near_plane.intersect_3(left_plane, top_plane, &near_endpoint_left);
-		ERR_FAIL_COND_V(!res, false);
+	for (int i = 0; i < 8; i++) {
 
-		res = far_plane.intersect_3(left_plane, top_plane, &far_endpoint_left);
+		Vector3 point;
+		bool res = planes[intersections[i][0]].intersect_3(planes[intersections[i][1]], planes[intersections[i][2]], &point);
 		ERR_FAIL_COND_V(!res, false);
+		p_8points[i] = p_transform.xform(point);
 	}
 
-	p_8points[0] = p_transform.xform(Vector3(near_endpoint_right.x, near_endpoint_right.y, near_endpoint_right.z));
-	p_8points[1] = p_transform.xform(Vector3(near_endpoint_right.x, -near_endpoint_right.y, near_endpoint_right.z));
-	p_8points[2] = p_transform.xform(Vector3(near_endpoint_left.x, near_endpoint_left.y, near_endpoint_left.z));
-	p_8points[3] = p_transform.xform(Vector3(near_endpoint_left.x, -near_endpoint_left.y, near_endpoint_left.z));
-	p_8points[4] = p_transform.xform(Vector3(far_endpoint_right.x, far_endpoint_right.y, far_endpoint_right.z));
-	p_8points[5] = p_transform.xform(Vector3(far_endpoint_right.x, -far_endpoint_right.y, far_endpoint_right.z));
-	p_8points[6] = p_transform.xform(Vector3(far_endpoint_left.x, far_endpoint_left.y, far_endpoint_left.z));
-	p_8points[7] = p_transform.xform(Vector3(far_endpoint_left.x, -far_endpoint_left.y, far_endpoint_left.z));
-
 	return true;
 }
 
@@ -610,6 +561,11 @@ int CameraMatrix::get_pixels_per_meter(int p_for_pixel_width) const {
 	return int((result.x * 0.5 + 0.5) * p_for_pixel_width);
 }
 
+bool CameraMatrix::is_orthogonal() const {
+
+	return matrix[3][3] == 1.0;
+}
+
 real_t CameraMatrix::get_fov() const {
 	const real_t *matrix = (const real_t *)this->matrix;
 
diff --git a/core/math/camera_matrix.h b/core/math/camera_matrix.h
index 175d0cdb1..3145d7335 100644
--- a/core/math/camera_matrix.h
+++ b/core/math/camera_matrix.h
@@ -69,6 +69,7 @@ struct CameraMatrix {
 	real_t get_z_near() const;
 	real_t get_aspect() const;
 	real_t get_fov() const;
+	bool is_orthogonal() const;
 
 	Vector<Plane> get_projection_planes(const Transform &p_transform) const;
 
diff --git a/core/project_settings.cpp b/core/project_settings.cpp
index a74917162..23e496113 100644
--- a/core/project_settings.cpp
+++ b/core/project_settings.cpp
@@ -114,7 +114,15 @@ String ProjectSettings::globalize_path(const String &p_path) const {
 			return p_path.replace("res:/", resource_path);
 		};
 		return p_path.replace("res://", "");
-	};
+	} else if (p_path.begins_with("user://")) {
+
+		String data_dir = OS::get_singleton()->get_data_dir();
+		if (data_dir != "") {
+
+			return p_path.replace("user:/", data_dir);
+		};
+		return p_path.replace("user://", "");
+	}
 
 	return p_path;
 }