From 6dc9b11368a185c2e76452a7a582f66c4967a5e1 Mon Sep 17 00:00:00 2001 From: Shane Harris Date: Wed, 13 Jul 2022 19:07:14 +0100 Subject: [PATCH] added in new tools screen --- desktop-app/src/app/adb-client.service.ts | 35 +- desktop-app/src/app/app.component.html | 2 +- desktop-app/src/app/app.component.scss | 2 +- .../connection-status.component.html | 2 +- .../src/app/content/content.component.html | 2 +- .../src/app/content/content.component.scss | 2 - .../current-tasks.component.html | 10 +- .../src/app/files/files.component.html | 8 +- .../src/app/header/header.component.html | 88 +-- .../src/app/header/header.component.scss | 14 +- .../headset-settings.component.html | 667 ++++++++++-------- .../headset-settings.component.scss | 7 + .../headset-settings.component.ts | 141 +++- .../src/app/packages/packages.component.html | 7 +- desktop-app/src/styles.scss | 8 +- 15 files changed, 552 insertions(+), 443 deletions(-) diff --git a/desktop-app/src/app/adb-client.service.ts b/desktop-app/src/app/adb-client.service.ts index 44343fa..7608c18 100644 --- a/desktop-app/src/app/adb-client.service.ts +++ b/desktop-app/src/app/adb-client.service.ts @@ -346,11 +346,6 @@ export class AdbClientService { this.deviceStatusMessage = this.deviceName + ' ' + - ' wifi' + - ' ' + - (this.deviceIp || 'Not found...') + - ' ' + ' ' + (this.isBatteryCharging ? 'battery_charging_full' : 'battery_full') + @@ -368,37 +363,13 @@ export class AdbClientService { } break; case ConnectionStatus.DISCONNECTED: - this.deviceStatusMessage = - 'Not Detected' + - (this.deviceIp - ? ' ' + - ' wifi' + - ' ' + - this.deviceIp - : ''); + this.deviceStatusMessage = 'Not Detected'; break; case ConnectionStatus.UNAUTHORIZED: - this.deviceStatusMessage = - 'Unauthorized: Allow in headset. ' + - (this.deviceIp - ? ' ' + - ' wifi' + - ' ' + - this.deviceIp - : ''); + this.deviceStatusMessage = 'Unauthorized: Allow in headset'; break; case ConnectionStatus.DEV_MODE: - this.deviceStatusMessage = - 'Dev Mode: Enable dev mode in the Oculus phone app. ' + - (this.deviceIp - ? ' ' + - ' wifi' + - ' ' + - this.deviceIp - : ''); + this.deviceStatusMessage = 'Dev Mode: Enable dev mode in the Oculus phone app'; break; } } diff --git a/desktop-app/src/app/app.component.html b/desktop-app/src/app/app.component.html index bbb9bea..dbe9c34 100644 --- a/desktop-app/src/app/app.component.html +++ b/desktop-app/src/app/app.component.html @@ -1,6 +1,6 @@
- +
diff --git a/desktop-app/src/app/app.component.scss b/desktop-app/src/app/app.component.scss index 72e0227..e17c067 100644 --- a/desktop-app/src/app/app.component.scss +++ b/desktop-app/src/app/app.component.scss @@ -31,5 +31,5 @@ left: 0; position: fixed; z-index: 8; - background:#0c0c0c; + background:#12152d; } diff --git a/desktop-app/src/app/connection-status/connection-status.component.html b/desktop-app/src/app/connection-status/connection-status.component.html index feedafc..5075532 100644 --- a/desktop-app/src/app/connection-status/connection-status.component.html +++ b/desktop-app/src/app/connection-status/connection-status.component.html @@ -36,7 +36,7 @@ - +
Fix It For Me
diff --git a/desktop-app/src/app/content/content.component.html b/desktop-app/src/app/content/content.component.html index 08d92cc..f0ce951 100644 --- a/desktop-app/src/app/content/content.component.html +++ b/desktop-app/src/app/content/content.component.html @@ -1,3 +1,3 @@
- +
diff --git a/desktop-app/src/app/content/content.component.scss b/desktop-app/src/app/content/content.component.scss index ae83f54..ba49a00 100644 --- a/desktop-app/src/app/content/content.component.scss +++ b/desktop-app/src/app/content/content.component.scss @@ -1,7 +1,6 @@ .body-content { height: calc(100% - 200px); width: 100%; - background: #f0f0f0; position: relative; overflow: auto; } @@ -11,7 +10,6 @@ border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; transition: background-color 350ms ease-out; - background-color:#0c0c0c; } /*.content-dark-theme{*/ /*background-color:#211c23;*/ diff --git a/desktop-app/src/app/current-tasks/current-tasks.component.html b/desktop-app/src/app/current-tasks/current-tasks.component.html index 0bd65ed..72471b9 100644 --- a/desktop-app/src/app/current-tasks/current-tasks.component.html +++ b/desktop-app/src/app/current-tasks/current-tasks.component.html @@ -1,5 +1,13 @@ + + +
-

No tasks running...

+
+ +
No tasks running. +

+
Back Home
+
diff --git a/desktop-app/src/app/files/files.component.html b/desktop-app/src/app/files/files.component.html index db94929..953ecf6 100644 --- a/desktop-app/src/app/files/files.component.html +++ b/desktop-app/src/app/files/files.component.html @@ -9,10 +9,10 @@
-
-

- No device connected yet...

- +
+
You are not currently connected. +

+
Open Setup Instructions
diff --git a/desktop-app/src/app/header/header.component.html b/desktop-app/src/app/header/header.component.html index 7aa09b0..873092e 100644 --- a/desktop-app/src/app/header/header.component.html +++ b/desktop-app/src/app/header/header.component.html @@ -56,43 +56,25 @@
- - - -
- live_tvStreaming
-
wifiWifi
- - - - - - - - - - - - -
inputADB Commands
- - - + + + + + + + + + +
- - arrow_drop_down - + + + + arrow_back @@ -109,12 +91,12 @@ arrow_forward live_tv wifi @@ -146,26 +128,11 @@ tooltip="Device settings & tools"> build - input - - - - - - - - - - - - - - - -
arrow_drop_down - -
+
+
-
+ +
+
+
Open Setup Instructions
@@ -199,13 +168,6 @@
-
Manage the apps on your headset.
Click Show All to - see all apps including system apps.
-
Manage settings on your headset.
-
Setup your headset with SideQuest.
- -
Manage tasks for installing,
downloading and uploading - from your headset.
-
-
- - You are not currently connected. - +
+
You are not currently connected.

- +
Open Setup Instructions
-

MTP ( Media Transfer Protocol )

-
- -
-

- This allows you to transfer files between your computer and your headset using your favourite file explorer. You may need to re-enable this when you re-connect your headset. -

-
+

Quality & Performance

+
+
+
+
Set CPU and GPU level
+

+ This can improve performance for apps & games at the expense of quicker battery draining and your device may get a little hotter than normal but totally within limits. +

+

+ +

+

+ +

+

+ +

+
Default Texture Size
+
+ This will change how high quality some of the in game textures are rendered at. +
+
+

+ +

+

+ +

+

+ +

+

+ +

+

+ +

+
+
+

+ +

+

+ +

+

+ +

+

+ +

+

+ +

+
-

Experimental Mode

-
- -
-

- This enables experimental features in your Oculus Quest such as Passthrough API support ( requires guardian to be enabled ). -

-
-

Refresh Rate

+
Refresh Rate
+

This will allow you to change to 90Hz refresh rate for 90fps support in games on Quest 2.

+

+ +

+

+ +

+

+ +

+

+ +

+
+
-

- -

-

- -

-

- -

-

- -

+
+ Set FFR ( Fixed Foveated Rendering ) level +
-

- This will allow you to change to 90Hz refresh rate for 90fps support in games on Quest 2.
- WARNING: This does not work in all games, and does not work with Oculus Link. This setting may also reset to default when you restart your headset. You may need to press the power button twice to turn the screen off and on to enable this setting for apps that dont have it natively enabled. -


-

Proximity Sensor

+

+ This will change how the view is rendered in the outer edges of the viewscreen for each eye. Higher is better + performance, lower is better quality. +

-
-
Disable Proximity Sensor
-
-

- This disables the proximity sensor effectively keeping your quest awake when not on your head ( requires restart to re-enable ). -


- -

Guardian

-
- +

+ +

+

+ +

+

+ +

+

+ +

+

+ +

+
Chromatic Aberration
+

+ This will enable/disable chromatic aberration. +

+

+ +

+

+ +

+

+ +

+
+
-

- This will enable/disable the guardian. -


+

Streaming & Video

-

Set CPU and GPU level

+
+ +
+
+ +
Tetiana's Presets
+ +

+ Quickly set the video capture resolution while also using 60 FPS and 10Mbps bitrate capture settings too. +

+
+
Full HD ( 1920 x 1080 )
+
Square ( 1600 x 1600 )
+
+ +
Video Capture Size
+ +

+ This changes the resolution of captured videos on the Quest +

+

+ +

+

+ +

+

+ +

+

+ +

+

+ +

+ + + + + + + + + + + + + +
+
+ + +
Video Capture FPS
+ +

+ This changes the frame rate of captured videos on the Quest +

+

+ +

+

+ +

+

+ +

+ +
Video Capture Bitrate
+ +

+ This changes the quality of captured videos on the Quest +

+

+ +

+

+ +

+

+ +

+

+ +

+
+
+
+

Experimental & Miscellaneous

+
+ +
Experimental Mode
+

+ This enables experimental features in your Oculus Quest such as Passthrough API support ( requires guardian to be enabled ). +

+
+ +
+
MTP ( Media Transfer Protocol )
+

+ This allows you to transfer files between your computer and your headset using your favourite file explorer. You may need to re-enable this when you re-connect your headset. +

+
+ +
+ +
Proximity Sensor
+ +

+ This disables the proximity sensor effectively keeping your quest awake when not on your head ( requires restart to re-enable ). +

+
+
Disable Proximity Sensor
+
+ +
Guardian
+

+ This will enable/disable the guardian. +

+
+ +
-

- -

-

- -

-

- -

-

- This can improve performance for 2D apps & games at the cost of draining your battery quicker and your device may get a little hotter than normal but totally within limits. -


-

Default Texture Size

-
- This will change how high quality some of the in game textures are rendered at.
-

- -

-

- -

-

- -

-

- -

-

- -

-

- -

-

- -

-

- -

-

- -

-

- -

Chromatic Aberration

-

- -

-

- -

-

- -

-

- This will enable/disable chromatic aberration. -


-

Full Rate Capture

-
- +

SideQuest Stuff

+
+ +
SideQuest Folders
+

+ This changes the resolution of captured videos on the Quest +

+ +
+
Open Main App Folder
+
Open APK Backup Folder
+
Open ADB Folder
+
+ +
SideQuest Debugger
+ +

+ Open the SideQuest chromium dev tools. +

+
+
Open SideQuest Debugger
+
-

- This will enable/disable the full rate capture for videos recorded i.e. 60/72fps rather than 30fps. -


-

- Set FFR ( Fixed Foveated Rendering ) level -

-

- -

-

- -

-

- -

-

- -

-

- -

- -

- This will change how the view is rendered in the outer edges of the viewscreen for each eye. Higher is better - performance, lower is better quality. This gets reset when you reboot the device. -


-

Set Video Capture Size

- -

- -

-

- -

-

- -

-

- -

-

- This changes the resolution of captured videos on the Quest -


- -

SideQuest Folders

- -
-
Open Main App Folder
-
Open APK Backup Folder
-
Open ADB Folder
-
-

- This changes the resolution of captured videos on the Quest -


- -

SideQuest Debugger

- -
-
Open SideQuest Debugger
-
-

- Open the SideQuest chromium dev tools. -


diff --git a/desktop-app/src/app/headset-settings/headset-settings.component.scss b/desktop-app/src/app/headset-settings/headset-settings.component.scss index 76364a0..2d7fe19 100644 --- a/desktop-app/src/app/headset-settings/headset-settings.component.scss +++ b/desktop-app/src/app/headset-settings/headset-settings.component.scss @@ -10,4 +10,11 @@ .description-section{ font-size: 0.9rem; + line-height: 1.5em; +} +.section-container{ + padding: 20px 40px 30px; + //border: 1px solid white; + //border-radius: 5px; + background: #1a1d3c; } diff --git a/desktop-app/src/app/headset-settings/headset-settings.component.ts b/desktop-app/src/app/headset-settings/headset-settings.component.ts index d09307f..598ccde 100644 --- a/desktop-app/src/app/headset-settings/headset-settings.component.ts +++ b/desktop-app/src/app/headset-settings/headset-settings.component.ts @@ -41,20 +41,12 @@ enum SSO { _Quest1, _Quest2, } -enum SVR { - _1024, - _1536, -} enum CR { _480, _720, _1080, _1024, -} -enum SVB { - _5Mbps, - _15Mbps, - _25Mbps, + _1600, } enum RR { _60, @@ -63,6 +55,22 @@ enum RR { _90, _120, } +enum FPS { + _24, + _30, + _60, +} +enum BR { + _2K, + _5K, + _10K, + _15K, + _20K, +} +enum TP { + _FHD, + _SQUARE, +} @Component({ selector: 'app-headset-settings', templateUrl: './headset-settings.component.html', @@ -80,17 +88,19 @@ export class HeadsetSettingsComponent implements OnInit { videoCaptureSize: string; cpuGpuLevel: string; textureSize: string; + captureFps: string; + captureBitrate: string; FFR = FFR; - SVR = SVR; - SVB = SVB; SSO = SSO; GU = GU; CA = CA; CR = CR; GPU = GPU; - FR = GU; RR = RR; EXP = EXP; + BR = BR; + FPS = FPS; + TP = TP; constructor(public adbService: AdbClientService, public appService: AppService, private statusService: StatusBarService) { this.appService.resetTop(); appService.webService.isWebviewOpen = false; @@ -116,7 +126,8 @@ export class HeadsetSettingsComponent implements OnInit { await this.getString('debug.oculus.refreshRate', '72', 'refreshRate'); await this.getString('debug.oculus.forceChroma', '1', 'chromaticAberration'); await this.getString('debug.oculus.foveation.level', '2', 'fixedFoveatedRendering'); - // await this.getString('debug.oculus.forceChroma', '1', 'videoCaptureSize'); + await this.getString('debug.oculus.capture.fps', '24', 'captureFps'); + await this.getString('debug.oculus.capture.bitrate', '5000000', 'captureBitrate'); await this.getDoubleString('debug.oculus.capture.width', 'debug.oculus.capture.height', '1024', '1024', 'videoCaptureSize'); await this.getDoubleString('debug.oculus.cpuLevel', 'debug.oculus.gpuLevel', 'app', 'app', 'cpuGpuLevel'); await this.getDoubleString('debug.oculus.textureWidth', 'debug.oculus.textureHeight', '1440', '1584', 'textureSize'); @@ -209,14 +220,81 @@ export class HeadsetSettingsComponent implements OnInit { }) .catch(e => this.statusService.showStatus(e, true)); } - setFullRate(fullRate: GU) { - this.runAdbCommand('setprop debug.oculus.fullRateCapture ' + (fullRate === GU.ON ? 1 : 0)) - .then(() => { - this.statusService.showStatus('Full Rate Capture set OK!!'); - return this.getBool('fullRateCaptureEnabled', 'debug.oculus.fullRateCapture'); + setCaptureFPSRate(fps: FPS) { + let value = 0; + switch (fps) { + case FPS._24: + value = 24; + break; + case FPS._30: + value = 30; + break; + case FPS._60: + value = 60; + break; + } + this.runAdbCommand('setprop debug.oculus.capture.fps ' + value) + .then(async () => { + this.statusService.showStatus('Capture FPS set OK!!'); + await this.getString('debug.oculus.capture.fps', '24', 'captureFps'); }) .catch(e => this.statusService.showStatus(e, true)); } + setCaptureBitrate(bitrate: BR) { + let value = 0; + switch (bitrate) { + case BR._5K: + value = 5000000; + break; + case BR._10K: + value = 10000000; + break; + case BR._15K: + value = 15000000; + break; + case BR._20K: + value = 20000000; + break; + } + this.runAdbCommand('setprop debug.oculus.capture.bitrate ' + value) + .then(() => { + this.statusService.showStatus('Capture Bit Rate set OK!!'); + return this.getString('debug.oculus.capture.bitrate', '5000000', 'captureBitrate'); + }) + .catch(e => this.statusService.showStatus(e, true)); + } + setTetianasPreset(tp: TP) { + let width = 1920; + let height = 1080; + switch (tp) { + case TP._FHD: + width = 1920; + height = 1080; + break; + case TP._SQUARE: + width = 1600; + height = 1600; + break; + } + this.runAdbCommand('setprop debug.oculus.capture.width ' + width) + .then(() => this.runAdbCommand('setprop debug.oculus.capture.height ' + height)) + .then(() => this.runAdbCommand('setprop debug.oculus.capture.fps 60')) + .then(() => this.runAdbCommand('setprop debug.oculus.capture.bitrate 10000000')) + .then(async () => { + this.statusService.showStatus('Capture settings set OK!!'); + await this.getString('debug.oculus.capture.bitrate', '5000000', 'captureBitrate'); + await this.getString('debug.oculus.capture.fps', '24', 'captureFps'); + await this.getDoubleString( + 'debug.oculus.capture.width', + 'debug.oculus.capture.height', + '1024', + '1024', + 'videoCaptureSize' + ); + }) + .catch(e => this.statusService.showStatus(e, true)); + console.log(this.videoCaptureSize); + } setGuardian(guardian: GU) { this.runAdbCommand('setprop debug.oculus.guardian_pause ' + (guardian === GU.ON ? 0 : 1)) .then(() => { @@ -326,28 +404,9 @@ export class HeadsetSettingsComponent implements OnInit { }) .catch(e => this.statusService.showStatus(e, true)); } - setSVB(svb: SVB) { - let value = 5000000; - switch (svb) { - case SVB._5Mbps: - value = 5000000; - break; - case SVB._15Mbps: - value = 15000000; - break; - case SVB._25Mbps: - value = 25000000; - break; - } - this.runAdbCommand('setprop debug.oculus.videoBitrate ' + value) - .then(() => { - this.statusService.showStatus('Video Bitrate set OK!!'); - }) - .catch(e => this.statusService.showStatus(e, true)); - } setCR(svr: CR) { - let width = 1280; - let height = 720; + let width = 1024; + let height = 1024; switch (svr) { case CR._480: width = 640; @@ -365,6 +424,10 @@ export class HeadsetSettingsComponent implements OnInit { width = 1024; height = 1024; break; + case CR._1600: + width = 1600; + height = 1600; + break; } this.runAdbCommand('setprop debug.oculus.capture.width ' + width) .then(() => this.runAdbCommand('setprop debug.oculus.capture.height ' + height)) diff --git a/desktop-app/src/app/packages/packages.component.html b/desktop-app/src/app/packages/packages.component.html index d31c6f1..784816b 100644 --- a/desktop-app/src/app/packages/packages.component.html +++ b/desktop-app/src/app/packages/packages.component.html @@ -1,8 +1,9 @@
-
-

- No device connected...

+
+
You are not currently connected. +

+
Open Setup Instructions
diff --git a/desktop-app/src/styles.scss b/desktop-app/src/styles.scss index d2c2818..3a62703 100644 --- a/desktop-app/src/styles.scss +++ b/desktop-app/src/styles.scss @@ -5,7 +5,7 @@ body { height: 100%; padding: 0; margin: 0; - background:#0c0c0c; + background:#12152d; } body{ @@ -151,10 +151,8 @@ body{ cursor:pointer; } .section-title { - font-size: 2rem; - margin-top: 0.4em; + margin-top: 1em; margin-left: 1em; - font-family: 'PT Sans', sans-serif; } .link, .sort-link { @@ -271,7 +269,7 @@ code > pre, .code{ .pure-material-button-contained.slim{ padding: 5px 10px; height: 25px; - line-height: 20px; + line-height: 17px; } .pure-material-button-contained.tiny{