archive/CitraVR
1
0
Fork 0
mirror of https://github.com/amwatson/CitraVR.git synced 2024-09-20 11:21:44 +02:00
Code Issues Projects Releases Packages Wiki Activity

hard-codes are based on scale factor (seems to work)

Browse source
This commit is contained in:
amwatson 2024-01-20 16:45:21 -06:00
parent 6a3c4d3ed5
commit 3834856767
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.cpp
View file

@ -304,15 +304,15 @@ void GameSurfaceLayer::Frame(const XrSpace& space, std::vector<XrCompositionLaye
layer.eyeVisibility = eye == 0 ? XR_EYE_VISIBILITY_LEFT : XR_EYE_VISIBILITY_RIGHT;
memset(&layer.subImage, 0, sizeof(XrSwapchainSubImage));
layer.subImage.swapchain = swapchain_.Handle;
layer.subImage.imageRect.offset.x = (eye == 0 ? 0 : panelWidth) + 250/2;
layer.subImage.imageRect.offset.x = (eye == 0 ? 0 : panelWidth) + (50/2) * SCALE_FACTOR;
layer.subImage.imageRect.offset.y = 0;
layer.subImage.imageRect.extent.width = panelWidth - 250;
layer.subImage.imageRect.extent.width = panelWidth - 50 * SCALE_FACTOR;
layer.subImage.imageRect.extent.height = panelHeight - verticalBorderTex;
layer.subImage.imageArrayIndex = 0;
layer.pose = topPanelFromWorld_;
// Scale to get the desired density within the visible area (if we
// want).
const auto scale = GetDensityScaleForSize(panelWidth - 250, -panelHeight, 1.0f);
const auto scale = GetDensityScaleForSize(panelWidth - 50 * SCALE_FACTOR, -panelHeight, 1.0f);
layer.size.width = scale.x;
layer.size.height = scale.y;
@ -340,14 +340,14 @@ void GameSurfaceLayer::Frame(const XrSpace& space, std::vector<XrCompositionLaye
layer.eyeVisibility = XR_EYE_VISIBILITY_BOTH;
memset(&layer.subImage, 0, sizeof(XrSwapchainSubImage));
layer.subImage.swapchain = swapchain_.Handle;
layer.subImage.imageRect.offset.x = 450/2;
layer.subImage.imageRect.offset.x = (90/2) * SCALE_FACTOR;
layer.subImage.imageRect.offset.y = panelHeight + verticalBorderTex;
layer.subImage.imageRect.extent.width = panelWidth - 450;
layer.subImage.imageRect.extent.width = panelWidth - 90 * SCALE_FACTOR;
layer.subImage.imageRect.extent.height = panelHeight;
layer.subImage.imageArrayIndex = 0;
layer.pose = lowerPanelFromWorld_;
const auto scale =
GetDensityScaleForSize(panelWidth - 450, -panelHeight, kLowerPanelScaleFactor);
GetDensityScaleForSize(panelWidth - 90 * SCALE_FACTOR, -panelHeight, kLowerPanelScaleFactor);
layer.size.width = scale.x;
layer.size.height = scale.y;
layers[layerCount++].mQuad = layer;

2
src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.h
View file

@ -142,7 +142,7 @@ private:
static constexpr uint32_t SURFACE_WIDTH =
(NUM_EYES * std::max(Core::kScreenTopWidth, Core::kScreenBottomWidth) * SCALE_FACTOR) -
1500;
300 * SCALE_FACTOR;
static constexpr uint32_t SURFACE_HEIGHT =
(Core::kScreenTopHeight + Core::kScreenBottomHeight) * SCALE_FACTOR;