Merge remote-tracking branch 'origin/imgui' into imgui

# Conflicts:
#	main.py

config/vr_settings.json

@@ -1,15 +1,15 @@
-{
-    "render_mode": "render_pipeline",
-    "resolution_scale": 0.75,
-    "pipeline_resolution_scale": 0.75,
-    "quality_preset": "quality",
-    "pipeline_vr_config": {
-        "enable_shadows": true,
-        "enable_ao": true,
-        "enable_bloom": false,
-        "enable_motion_blur": false,
-        "enable_ssr": false,
-        "shadow_quality": "medium",
-        "ao_quality": "low"
-    }
+{
+    "render_mode": "render_pipeline",
+    "resolution_scale": 0.75,
+    "pipeline_resolution_scale": 0.75,
+    "quality_preset": "quality",
+    "pipeline_vr_config": {
+        "enable_shadows": true,
+        "enable_ao": true,
+        "enable_bloom": false,
+        "enable_motion_blur": false,
+        "enable_ssr": false,
+        "shadow_quality": "medium",
+        "ao_quality": "low"
+    }
 }

core/vr/config/vr_settings.json

@@ -1,18 +1,15 @@
-{
-    "render_mode": "render_pipeline",
-    "resolution_scale": 0.75,
-    "pipeline_resolution_scale": 0.75,
-    "quality_preset": "quality",
-    "pipeline_vr_config": {
-        "enable_shadows": true,
-        "enable_ao": true,
-        "enable_bloom": false,
-        "enable_motion_blur": false,
-        "enable_ssr": false,
-        "shadow_quality": "medium",
-        "ao_quality": "low"
-    },
-    "anti_aliasing": "4x",
-    "refresh_rate": "90Hz",
-    "async_reprojection": true
+{
+    "render_mode": "render_pipeline",
+    "resolution_scale": 0.75,
+    "pipeline_resolution_scale": 0.75,
+    "quality_preset": "quality",
+    "pipeline_vr_config": {
+        "enable_shadows": true,
+        "enable_ao": true,
+        "enable_bloom": false,
+        "enable_motion_blur": false,
+        "enable_ssr": false,
+        "shadow_quality": "medium",
+        "ao_quality": "low"
+    }
 }

imgui.ini

@@ -185,6 +185,16 @@ Pos=660,304
 Size=600,400
 Collapsed=0
 
+[Window][VR状态]
+Pos=162,152
+Size=138,296
+Collapsed=0
+
+[Window][VR设置]
+Pos=474,130
+Size=120,384
+Collapsed=0
+
 [Docking][Data]
 DockSpace         ID=0x08BD597D Window=0x1BBC0F80 Pos=0,20 Size=1920,989 Split=X
   DockNode        ID=0x00000001 Parent=0x08BD597D SizeRef=1553,989 Split=X