|
@@ -9212,7 +9212,6 @@ class CubeCamera extends Object3D {
|
|
|
const currentOutputEncoding = renderer.outputEncoding;
|
|
|
const currentToneMapping = renderer.toneMapping;
|
|
|
const currentXrEnabled = renderer.xr.enabled;
|
|
|
- renderer.outputEncoding = LinearEncoding;
|
|
|
renderer.toneMapping = NoToneMapping;
|
|
|
renderer.xr.enabled = false;
|
|
|
const generateMipmaps = renderTarget.texture.generateMipmaps;
|
|
@@ -13783,16 +13782,6 @@ function PureArrayUniform(id, activeInfo, addr) {
|
|
|
this.setValue = getPureArraySetter(activeInfo.type); // this.path = activeInfo.name; // DEBUG
|
|
|
}
|
|
|
|
|
|
-PureArrayUniform.prototype.updateCache = function (data) {
|
|
|
- const cache = this.cache;
|
|
|
-
|
|
|
- if (data instanceof Float32Array && cache.length !== data.length) {
|
|
|
- this.cache = new Float32Array(data.length);
|
|
|
- }
|
|
|
-
|
|
|
- copyArray(cache, data);
|
|
|
-};
|
|
|
-
|
|
|
function StructuredUniform(id) {
|
|
|
this.id = id;
|
|
|
this.seq = [];
|
|
@@ -18303,6 +18292,7 @@ class WebXRManager extends EventDispatcher {
|
|
|
let framebufferScaleFactor = 1.0;
|
|
|
let referenceSpace = null;
|
|
|
let referenceSpaceType = 'local-floor';
|
|
|
+ let customReferenceSpace = null;
|
|
|
let pose = null;
|
|
|
let glBinding = null;
|
|
|
let glProjLayer = null;
|
|
@@ -18415,7 +18405,11 @@ class WebXRManager extends EventDispatcher {
|
|
|
};
|
|
|
|
|
|
this.getReferenceSpace = function () {
|
|
|
- return referenceSpace;
|
|
|
+ return customReferenceSpace || referenceSpace;
|
|
|
+ };
|
|
|
+
|
|
|
+ this.setReferenceSpace = function (space) {
|
|
|
+ customReferenceSpace = space;
|
|
|
};
|
|
|
|
|
|
this.getBaseLayer = function () {
|
|
@@ -18688,7 +18682,7 @@ class WebXRManager extends EventDispatcher {
|
|
|
let onAnimationFrameCallback = null;
|
|
|
|
|
|
function onAnimationFrame(time, frame) {
|
|
|
- pose = frame.getViewerPose(referenceSpace);
|
|
|
+ pose = frame.getViewerPose(customReferenceSpace || referenceSpace);
|
|
|
xrFrame = frame;
|
|
|
|
|
|
if (pose !== null) {
|
|
@@ -18745,7 +18739,7 @@ class WebXRManager extends EventDispatcher {
|
|
|
const controller = inputSourcesMap.get(inputSource);
|
|
|
|
|
|
if (controller !== undefined) {
|
|
|
- controller.update(inputSource, frame, referenceSpace);
|
|
|
+ controller.update(inputSource, frame, customReferenceSpace || referenceSpace);
|
|
|
}
|
|
|
}
|
|
|
|