Преглед на файлове

Revert "WebXRManager: Honor WebXR native layer scaling. (#24877)" (#25040)

This reverts commit 52fb52dd297f7c33fb8a47e337d8b01109031ec9.
mrdoob преди 2 години
родител
ревизия
6f5cc268b6
променени са 2 файла, в които са добавени 3 реда и са изтрити 18 реда
  1. 2 3
      docs/api/en/renderers/webxr/WebXRManager.html
  2. 1 15
      src/renderers/webxr/WebXRManager.js

+ 2 - 3
docs/api/en/renderers/webxr/WebXRManager.html

@@ -104,10 +104,9 @@
 		Specifies the amount of foveation used by the XR compositor for the layer. Must be a value between `0` and `1`.
 		</p>
 
-		<h3>[method:undefined setFramebufferScaleFactor]( [param:Float factor], [param:Boolean limited] )</h3>
+		<h3>[method:undefined setFramebufferScaleFactor]( [param:Float framebufferScaleFactor] )</h3>
 		<p>
-		[page:Float factor] — The framebuffer scale factor to set.<br />
-		[page:Boolean limited] — Whether the framebuffer scale factor should be reduced to the native limit if the value ends up being higher than the device's capabilities. Default is `false`.<br /><br />
+		[page:Float framebufferScaleFactor] — The framebuffer scale factor to set.<br /><br />
 
 		Specifies the scaling factor to use when determining the size of the framebuffer when rendering to a XR device.
 		The value is relative to the default XR device display resolution. Default is `1`. A value of `0.5` would specify

+ 1 - 15
src/renderers/webxr/WebXRManager.js

@@ -26,7 +26,6 @@ class WebXRManager extends EventDispatcher {
 
 		let session = null;
 		let framebufferScaleFactor = 1.0;
-		let limitWithNativeFramebufferScaleFactor = false;
 
 		let referenceSpace = null;
 		let referenceSpaceType = 'local-floor';
@@ -186,10 +185,9 @@ class WebXRManager extends EventDispatcher {
 
 		}
 
-		this.setFramebufferScaleFactor = function ( value, limited = false ) {
+		this.setFramebufferScaleFactor = function ( value ) {
 
 			framebufferScaleFactor = value;
-			limitWithNativeFramebufferScaleFactor = limited;
 
 			if ( scope.isPresenting === true ) {
 
@@ -270,18 +268,6 @@ class WebXRManager extends EventDispatcher {
 
 				}
 
-				if ( limitWithNativeFramebufferScaleFactor === true && XRWebGLLayer.getNativeFramebufferScaleFactor ) {
-
-					const nativeFramebufferScaleFactor = XRWebGLLayer.getNativeFramebufferScaleFactor( session );
-
-					if ( nativeFramebufferScaleFactor < framebufferScaleFactor ) {
-
-						framebufferScaleFactor = nativeFramebufferScaleFactor;
-
-					}
-
-				}
-
 				if ( ( session.renderState.layers === undefined ) || ( renderer.capabilities.isWebGL2 === false ) ) {
 
 					const layerInit = {