|
@@ -10514,7 +10514,8 @@
|
|
let currentBackgroundVersion = 0;
|
|
let currentBackgroundVersion = 0;
|
|
let currentTonemapping = null;
|
|
let currentTonemapping = null;
|
|
|
|
|
|
- function render(renderList, scene, camera, forceClear) {
|
|
|
|
|
|
+ function render(renderList, scene) {
|
|
|
|
+ let forceClear = false;
|
|
let background = scene.isScene === true ? scene.background : null;
|
|
let background = scene.isScene === true ? scene.background : null;
|
|
|
|
|
|
if (background && background.isTexture) {
|
|
if (background && background.isTexture) {
|
|
@@ -17845,18 +17846,6 @@
|
|
xr.addEventListener('sessionend', onXRSessionEnd); // Rendering
|
|
xr.addEventListener('sessionend', onXRSessionEnd); // Rendering
|
|
|
|
|
|
this.render = function (scene, camera) {
|
|
this.render = function (scene, camera) {
|
|
- let renderTarget, forceClear;
|
|
|
|
-
|
|
|
|
- if (arguments[2] !== undefined) {
|
|
|
|
- console.warn('THREE.WebGLRenderer.render(): the renderTarget argument has been removed. Use .setRenderTarget() instead.');
|
|
|
|
- renderTarget = arguments[2];
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (arguments[3] !== undefined) {
|
|
|
|
- console.warn('THREE.WebGLRenderer.render(): the forceClear argument has been removed. Use .clear() instead.');
|
|
|
|
- forceClear = arguments[3];
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
if (camera !== undefined && camera.isCamera !== true) {
|
|
if (camera !== undefined && camera.isCamera !== true) {
|
|
console.error('THREE.WebGLRenderer.render: camera is not an instance of THREE.Camera.');
|
|
console.error('THREE.WebGLRenderer.render: camera is not an instance of THREE.Camera.');
|
|
return;
|
|
return;
|
|
@@ -17873,7 +17862,7 @@
|
|
} //
|
|
} //
|
|
|
|
|
|
|
|
|
|
- if (scene.isScene === true) scene.onBeforeRender(_this, scene, camera, renderTarget || _currentRenderTarget);
|
|
|
|
|
|
+ if (scene.isScene === true) scene.onBeforeRender(_this, scene, camera, _currentRenderTarget);
|
|
currentRenderState = renderStates.get(scene, renderStateStack.length);
|
|
currentRenderState = renderStates.get(scene, renderStateStack.length);
|
|
currentRenderState.init();
|
|
currentRenderState.init();
|
|
renderStateStack.push(currentRenderState);
|
|
renderStateStack.push(currentRenderState);
|
|
@@ -17902,14 +17891,9 @@
|
|
currentRenderState.setupLightsView(camera);
|
|
currentRenderState.setupLightsView(camera);
|
|
if (_clippingEnabled === true) clipping.endShadows(); //
|
|
if (_clippingEnabled === true) clipping.endShadows(); //
|
|
|
|
|
|
- if (this.info.autoReset === true) this.info.reset();
|
|
|
|
-
|
|
|
|
- if (renderTarget !== undefined) {
|
|
|
|
- this.setRenderTarget(renderTarget);
|
|
|
|
- } //
|
|
|
|
-
|
|
|
|
|
|
+ if (this.info.autoReset === true) this.info.reset(); //
|
|
|
|
|
|
- background.render(currentRenderList, scene, camera, forceClear); // render scene
|
|
|
|
|
|
+ background.render(currentRenderList, scene); // render scene
|
|
|
|
|
|
const opaqueObjects = currentRenderList.opaque;
|
|
const opaqueObjects = currentRenderList.opaque;
|
|
const transparentObjects = currentRenderList.transparent;
|
|
const transparentObjects = currentRenderList.transparent;
|