Skip to content

Commit c5e295f

Browse files
mrdoobmrdoob
committed
Updated builds.
1 parent 571f3cf commit c5e295f

File tree

3 files changed

+78
-88
lines changed

3 files changed

+78
-88
lines changed

‎build/three.js‎

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -19210,20 +19210,25 @@
1921019210
if (_clippingEnabled === true) clipping.beginShadows();
1921119211
const shadowsArray = currentRenderState.state.shadowsArray;
1921219212
shadowMap.render(shadowsArray, scene, camera);
19213-
currentRenderState.setupLights(_this.physicallyCorrectLights);
19214-
currentRenderState.setupLightsView(camera);
1921519213
if (_clippingEnabled === true) clipping.endShadows(); //
1921619214

1921719215
if (this.info.autoReset === true) this.info.reset(); //
1921819216

1921919217
background.render(currentRenderList, scene); // render scene
1922019218

19221-
const opaqueObjects = currentRenderList.opaque;
19222-
const transmissiveObjects = currentRenderList.transmissive;
19223-
const transparentObjects = currentRenderList.transparent;
19224-
if (opaqueObjects.length > 0) renderObjects(opaqueObjects, scene, camera);
19225-
if (transmissiveObjects.length > 0) renderTransmissiveObjects(opaqueObjects, transmissiveObjects, scene, camera);
19226-
if (transparentObjects.length > 0) renderObjects(transparentObjects, scene, camera); //
19219+
currentRenderState.setupLights(_this.physicallyCorrectLights);
19220+
19221+
if (camera.isArrayCamera) {
19222+
const cameras = camera.cameras;
19223+
19224+
for (let i = 0, l = cameras.length; i < l; i++) {
19225+
const camera2 = cameras[i];
19226+
renderScene(currentRenderList, scene, camera2, camera2.viewport);
19227+
}
19228+
} else {
19229+
renderScene(currentRenderList, scene, camera);
19230+
} //
19231+
1922719232

1922819233
if (_currentRenderTarget !== null) {
1922919234
// resolve multisample renderbuffers to a single-sample texture if necessary
@@ -19336,7 +19341,19 @@
1933619341
}
1933719342
}
1933819343

19339-
function renderTransmissiveObjects(opaqueObjects, transmissiveObjects, scene, camera) {
19344+
function renderScene(currentRenderList, scene, camera, viewport) {
19345+
const opaqueObjects = currentRenderList.opaque;
19346+
const transmissiveObjects = currentRenderList.transmissive;
19347+
const transparentObjects = currentRenderList.transparent;
19348+
currentRenderState.setupLightsView(camera);
19349+
if (transmissiveObjects.length > 0) renderTransmissionPass(opaqueObjects, scene, camera);
19350+
if (viewport) state.viewport(_currentViewport.copy(viewport));
19351+
if (opaqueObjects.length > 0) renderObjects(opaqueObjects, scene, camera);
19352+
if (transmissiveObjects.length > 0) renderObjects(transmissiveObjects, scene, camera);
19353+
if (transparentObjects.length > 0) renderObjects(transparentObjects, scene, camera);
19354+
}
19355+
19356+
function renderTransmissionPass(opaqueObjects, scene, camera) {
1934019357
if (_transmissionRenderTarget === null) {
1934119358
const needsAntialias = _antialias === true && capabilities.isWebGL2 === true;
1934219359
const renderTargetType = needsAntialias ? WebGLMultisampleRenderTarget : WebGLRenderTarget;
@@ -19366,40 +19383,19 @@
1936619383
textures.updateRenderTargetMipmap(_transmissionRenderTarget);
1936719384

1936819385
_this.setRenderTarget(currentRenderTarget);
19369-
19370-
renderObjects(transmissiveObjects, scene, camera);
1937119386
}
1937219387

1937319388
function renderObjects(renderList, scene, camera) {
1937419389
const overrideMaterial = scene.isScene === true ? scene.overrideMaterial : null;
1937519390

19376-
if (camera.isArrayCamera) {
19377-
const cameras = camera.cameras;
19391+
for (let i = 0, l = renderList.length; i < l; i++) {
19392+
const renderItem = renderList[i];
19393+
const object = renderItem.object;
19394+
const geometry = renderItem.geometry;
19395+
const material = overrideMaterial === null ? renderItem.material : overrideMaterial;
19396+
const group = renderItem.group;
1937819397

19379-
for (let i = 0, l = cameras.length; i < l; i++) {
19380-
const camera2 = cameras[i];
19381-
state.viewport(_currentViewport.copy(camera2.viewport));
19382-
currentRenderState.setupLightsView(camera2);
19383-
19384-
for (let j = 0, jl = renderList.length; j < jl; j++) {
19385-
const renderItem = renderList[j];
19386-
const object = renderItem.object;
19387-
const geometry = renderItem.geometry;
19388-
const material = overrideMaterial === null ? renderItem.material : overrideMaterial;
19389-
const group = renderItem.group;
19390-
19391-
if (object.layers.test(camera2.layers)) {
19392-
renderObject(object, scene, camera2, geometry, material, group);
19393-
}
19394-
}
19395-
}
19396-
} else {
19397-
for (let j = 0, jl = renderList.length; j < jl; j++) {
19398-
const renderItem = renderList[j];
19399-
const object = renderItem.object;
19400-
const geometry = renderItem.geometry;
19401-
const material = overrideMaterial === null ? renderItem.material : overrideMaterial;
19402-
const group = renderItem.group;
19398+
if (object.layers.test(camera.layers)) {
1940319399
renderObject(object, scene, camera, geometry, material, group);
1940419400
}
1940519401
}

‎build/three.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/three.module.js‎

Lines changed: 44 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -25881,9 +25881,6 @@ function WebGLRenderer( parameters = {} ) {
2588125881

2588225882
shadowMap.render( shadowsArray, scene, camera );
2588325883

25884-
currentRenderState.setupLights( _this.physicallyCorrectLights );
25885-
currentRenderState.setupLightsView( camera );
25886-
2588725884
if ( _clippingEnabled === true ) clipping.endShadows();
2588825885

2588925886
//
@@ -25896,13 +25893,25 @@ function WebGLRenderer( parameters = {} ) {
2589625893

2589725894
// render scene
2589825895

25899-
const opaqueObjects = currentRenderList.opaque;
25900-
const transmissiveObjects = currentRenderList.transmissive;
25901-
const transparentObjects = currentRenderList.transparent;
25896+
currentRenderState.setupLights( _this.physicallyCorrectLights );
2590225897

25903-
if ( opaqueObjects.length > 0 ) renderObjects( opaqueObjects, scene, camera );
25904-
if ( transmissiveObjects.length > 0 ) renderTransmissiveObjects( opaqueObjects, transmissiveObjects, scene, camera );
25905-
if ( transparentObjects.length > 0 ) renderObjects( transparentObjects, scene, camera );
25898+
if ( camera.isArrayCamera ) {
25899+
25900+
const cameras = camera.cameras;
25901+
25902+
for ( let i = 0, l = cameras.length; i < l; i ++ ) {
25903+
25904+
const camera2 = cameras[ i ];
25905+
25906+
renderScene( currentRenderList, scene, camera2, camera2.viewport );
25907+
25908+
}
25909+
25910+
} else {
25911+
25912+
renderScene( currentRenderList, scene, camera );
25913+
25914+
}
2590625915

2590725916
//
2590825917

@@ -26087,7 +26096,25 @@ function WebGLRenderer( parameters = {} ) {
2608726096

2608826097
}
2608926098

26090-
function renderTransmissiveObjects( opaqueObjects, transmissiveObjects, scene, camera ) {
26099+
function renderScene( currentRenderList, scene, camera, viewport ) {
26100+
26101+
const opaqueObjects = currentRenderList.opaque;
26102+
const transmissiveObjects = currentRenderList.transmissive;
26103+
const transparentObjects = currentRenderList.transparent;
26104+
26105+
currentRenderState.setupLightsView( camera );
26106+
26107+
if ( transmissiveObjects.length > 0 ) renderTransmissionPass( opaqueObjects, scene, camera );
26108+
26109+
if ( viewport ) state.viewport( _currentViewport.copy( viewport ) );
26110+
26111+
if ( opaqueObjects.length > 0 ) renderObjects( opaqueObjects, scene, camera );
26112+
if ( transmissiveObjects.length > 0 ) renderObjects( transmissiveObjects, scene, camera );
26113+
if ( transparentObjects.length > 0 ) renderObjects( transparentObjects, scene, camera );
26114+
26115+
}
26116+
26117+
function renderTransmissionPass( opaqueObjects, scene, camera ) {
2609126118

2609226119
if ( _transmissionRenderTarget === null ) {
2609326120

@@ -26123,55 +26150,22 @@ function WebGLRenderer( parameters = {} ) {
2612326150

2612426151
_this.setRenderTarget( currentRenderTarget );
2612526152

26126-
renderObjects( transmissiveObjects, scene, camera );
26127-
2612826153
}
2612926154

2613026155
function renderObjects( renderList, scene, camera ) {
2613126156

2613226157
const overrideMaterial = scene.isScene === true ? scene.overrideMaterial : null;
2613326158

26134-
if ( camera.isArrayCamera ) {
26135-
26136-
const cameras = camera.cameras;
26137-
26138-
for ( let i = 0, l = cameras.length; i < l; i ++ ) {
26139-
26140-
const camera2 = cameras[ i ];
26141-
26142-
state.viewport( _currentViewport.copy( camera2.viewport ) );
26143-
26144-
currentRenderState.setupLightsView( camera2 );
26145-
26146-
for ( let j = 0, jl = renderList.length; j < jl; j ++ ) {
26147-
26148-
const renderItem = renderList[ j ];
26149-
26150-
const object = renderItem.object;
26151-
const geometry = renderItem.geometry;
26152-
const material = overrideMaterial === null ? renderItem.material : overrideMaterial;
26153-
const group = renderItem.group;
26154-
26155-
if ( object.layers.test( camera2.layers ) ) {
26156-
26157-
renderObject( object, scene, camera2, geometry, material, group );
26158-
26159-
}
26160-
26161-
}
26162-
26163-
}
26164-
26165-
} else {
26159+
for ( let i = 0, l = renderList.length; i < l; i ++ ) {
2616626160

26167-
for ( let j = 0, jl = renderList.length; j < jl; j ++ ) {
26161+
const renderItem = renderList[ i ];
2616826162

26169-
const renderItem = renderList[ j ];
26163+
const object = renderItem.object;
26164+
const geometry = renderItem.geometry;
26165+
const material = overrideMaterial === null ? renderItem.material : overrideMaterial;
26166+
const group = renderItem.group;
2617026167

26171-
const object = renderItem.object;
26172-
const geometry = renderItem.geometry;
26173-
const material = overrideMaterial === null ? renderItem.material : overrideMaterial;
26174-
const group = renderItem.group;
26168+
if ( object.layers.test( camera.layers ) ) {
2617526169

2617626170
renderObject( object, scene, camera, geometry, material, group );
2617726171

0 commit comments

Comments
 (0)