Skip to content

Commit

Permalink
Merge remote-tracking branch 'mrdoob/dev' into remove-framebuffer-copy
Browse files Browse the repository at this point in the history
# Conflicts:
#	docs/api/en/renderers/WebGLRenderer.html
#	src/renderers/WebGLRenderer.js
  • Loading branch information
gkjohnson committed Oct 31, 2024
2 parents baeb835 + 841ca14 commit 0e3a18e
Show file tree
Hide file tree
Showing 47 changed files with 2,361 additions and 1,887 deletions.
3 changes: 1 addition & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ used before a patch is released.

You may submit the report in the following ways:

- send an email to [email protected]; and/or
- send us a [private vulnerability report](https://github.com/mrdoob/three.js/security/advisories/new)
- send an email to [email protected].

Please provide the following information in your report:

Expand Down
21 changes: 16 additions & 5 deletions build/three.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
'use strict';

const REVISION = '170dev';
const REVISION = '170';

const MOUSE = { LEFT: 0, MIDDLE: 1, RIGHT: 2, ROTATE: 0, DOLLY: 1, PAN: 2 };
const TOUCH = { ROTATE: 0, PAN: 1, DOLLY_PAN: 2, DOLLY_ROTATE: 3 };
Expand Down Expand Up @@ -2603,6 +2603,17 @@ class Vector4 {

}

divide( v ) {

this.x /= v.x;
this.y /= v.y;
this.z /= v.z;
this.w /= v.w;

return this;

}

divideScalar( scalar ) {

return this.multiplyScalar( 1 / scalar );
Expand Down Expand Up @@ -27149,18 +27160,14 @@ class WebXRManager extends EventDispatcher {
//

const cameraL = new PerspectiveCamera();
cameraL.layers.enable( 1 );
cameraL.viewport = new Vector4();

const cameraR = new PerspectiveCamera();
cameraR.layers.enable( 2 );
cameraR.viewport = new Vector4();

const cameras = [ cameraL, cameraR ];

const cameraXR = new ArrayCamera();
cameraXR.layers.enable( 1 );
cameraXR.layers.enable( 2 );

let _currentDepthNear = null;
let _currentDepthFar = null;
Expand Down Expand Up @@ -27670,6 +27677,10 @@ class WebXRManager extends EventDispatcher {

}

cameraL.layers.mask = camera.layers.mask | 0b010;
cameraR.layers.mask = camera.layers.mask | 0b100;
cameraXR.layers.mask = cameraL.layers.mask | cameraR.layers.mask;

const parent = camera.parent;
const cameras = cameraXR.cameras;

Expand Down
21 changes: 16 additions & 5 deletions build/three.module.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Copyright 2010-2024 Three.js Authors
* SPDX-License-Identifier: MIT
*/
const REVISION = '170dev';
const REVISION = '170';

const MOUSE = { LEFT: 0, MIDDLE: 1, RIGHT: 2, ROTATE: 0, DOLLY: 1, PAN: 2 };
const TOUCH = { ROTATE: 0, PAN: 1, DOLLY_PAN: 2, DOLLY_ROTATE: 3 };
Expand Down Expand Up @@ -2601,6 +2601,17 @@ class Vector4 {

}

divide( v ) {

this.x /= v.x;
this.y /= v.y;
this.z /= v.z;
this.w /= v.w;

return this;

}

divideScalar( scalar ) {

return this.multiplyScalar( 1 / scalar );
Expand Down Expand Up @@ -27147,18 +27158,14 @@ class WebXRManager extends EventDispatcher {
//

const cameraL = new PerspectiveCamera();
cameraL.layers.enable( 1 );
cameraL.viewport = new Vector4();

const cameraR = new PerspectiveCamera();
cameraR.layers.enable( 2 );
cameraR.viewport = new Vector4();

const cameras = [ cameraL, cameraR ];

const cameraXR = new ArrayCamera();
cameraXR.layers.enable( 1 );
cameraXR.layers.enable( 2 );

let _currentDepthNear = null;
let _currentDepthFar = null;
Expand Down Expand Up @@ -27668,6 +27675,10 @@ class WebXRManager extends EventDispatcher {

}

cameraL.layers.mask = camera.layers.mask | 0b010;
cameraR.layers.mask = camera.layers.mask | 0b100;
cameraXR.layers.mask = cameraL.layers.mask | cameraR.layers.mask;

const parent = camera.parent;
const cameras = cameraXR.cameras;

Expand Down
2 changes: 1 addition & 1 deletion build/three.module.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 0e3a18e

Please sign in to comment.