Pārlūkot izejas kodu

Merge pull request #7734 from RaananW/render-size-xr

renaming variable
David Catuhe 5 gadi atpakaļ
vecāks
revīzija
c849082d43
2 mainītis faili ar 9 papildinājumiem un 9 dzēšanām
  1. 5 5
      src/Engines/thinEngine.ts
  2. 4 4
      src/XR/webXRSessionManager.ts

+ 5 - 5
src/Engines/thinEngine.ts

@@ -390,15 +390,15 @@ export class ThinEngine {
         return false;
     }
 
-    private _glLayerDimensionsObject: Nullable<{framebufferWidth: number, framebufferHeight: number}>;
+    private _framebufferDimensionsObject: Nullable<{framebufferWidth: number, framebufferHeight: number}>;
 
     /**
      * sets the object from which width and height will be taken from when getting render width and height
      * Will fallback to the gl object
      * @param dimensions the framebuffer width and height that will be used.
      */
-    public set glLayerDimensionsObject(dimensions: Nullable<{framebufferWidth: number, framebufferHeight: number}>) {
-      this._glLayerDimensionsObject = dimensions;
+    public set framebufferDimensionsObject(dimensions: Nullable<{framebufferWidth: number, framebufferHeight: number}>) {
+      this._framebufferDimensionsObject = dimensions;
     }
 
     /**
@@ -1110,7 +1110,7 @@ export class ThinEngine {
             return this._currentRenderTarget.width;
         }
 
-        return this._glLayerDimensionsObject ? this._glLayerDimensionsObject.framebufferWidth : this._gl.drawingBufferWidth;
+        return this._framebufferDimensionsObject ? this._framebufferDimensionsObject.framebufferWidth : this._gl.drawingBufferWidth;
     }
 
     /**
@@ -1123,7 +1123,7 @@ export class ThinEngine {
             return this._currentRenderTarget.height;
         }
 
-        return this._glLayerDimensionsObject ? this._glLayerDimensionsObject.framebufferHeight : this._gl.drawingBufferHeight;
+        return this._framebufferDimensionsObject ? this._framebufferDimensionsObject.framebufferHeight : this._gl.drawingBufferHeight;
     }
 
     /**

+ 4 - 4
src/XR/webXRSessionManager.ts

@@ -177,7 +177,7 @@ export class WebXRSessionManager implements IDisposable {
                 // Remove render target texture and notify frame observers
                 this._rttProvider = null;
                 // make sure dimensions object is restored
-                engine.glLayerDimensionsObject = null;
+                engine.framebufferDimensionsObject = null;
 
                 // Restore frame buffer to avoid clear on xr framebuffer after session end
                 engine.restoreDefaultFramebuffer();
@@ -225,9 +225,9 @@ export class WebXRSessionManager implements IDisposable {
                 if (xrFrame) {
                     this.onXRFrameObservable.notifyObservers(xrFrame);
                     // only run the render loop if a frame exists
-                    engine.glLayerDimensionsObject = this.baseLayer!;
+                    engine.framebufferDimensionsObject = this.baseLayer!;
                     engine._renderLoop();
-                    engine.glLayerDimensionsObject = null;
+                    engine.framebufferDimensionsObject = null;
                 }
             }
         };
@@ -238,7 +238,7 @@ export class WebXRSessionManager implements IDisposable {
             // Create render target texture from xr's webgl render target
             const rtt = this._createRenderTargetTexture(this.baseLayer!.framebufferWidth, this.baseLayer!.framebufferHeight, this.baseLayer!.framebuffer);
             this._rttProvider = { getRenderTargetForEye: () => rtt };
-            engine.glLayerDimensionsObject = this.baseLayer;
+            engine.framebufferDimensionsObject = this.baseLayer;
         }
 
         // Stop window's animation frame and trigger sessions animation frame