Merge "Scale up the display and rotate by 90 degrees" (f89046d4) · Commits · e / os / platform_frameworks_native

services/vr/vr_window_manager/shell_view.cpp

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,8 @@ namespace dvr {

	namespace {		namespace {

			constexpr float kLayerScaleFactor = 4.0f;

	constexpr unsigned int kVRAppLayerCount = 2;		constexpr unsigned int kVRAppLayerCount = 2;

	constexpr unsigned int kMaximumPendingFrames = 8;		constexpr unsigned int kMaximumPendingFrames = 8;
	@@ -105,6 +107,9 @@ mat4 GetScalingMatrix(float width, float height) {
	else		else
	xscale = ar;		xscale = ar;

			xscale *= kLayerScaleFactor;
			yscale *= kLayerScaleFactor;

	return mat4(Eigen::Scaling<float>(xscale, yscale, 1.0));		return mat4(Eigen::Scaling<float>(xscale, yscale, 1.0));
	}		}

	@@ -126,7 +131,7 @@ mat4 GetHorizontallyAlignedMatrixFromPose(const Posef& pose) {
	m(3, 0) = 0.0f; m(3, 1) = 0.0f; m(3, 2) = 0.0f; m(3, 3) = 1.0f;		m(3, 0) = 0.0f; m(3, 1) = 0.0f; m(3, 2) = 0.0f; m(3, 3) = 1.0f;
	// clang-format on		// clang-format on

	return m;		return m * Eigen::AngleAxisf(M_PI * 0.5f, vec3::UnitZ());
	}		}

	// Helper function that applies the crop transform to the texture layer and		// Helper function that applies the crop transform to the texture layer and