Skip to content

Commit 7b86e10

Browse files
committed
Examples: Remove EquirectangularToCubeGenerator.
1 parent b91aebf commit 7b86e10

File tree

8 files changed

+30
-316
lines changed

8 files changed

+30
-316
lines changed

docs/api/en/materials/MeshStandardMaterial.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ <h3>[property:TextureCube envMap]</h3>
173173
if adjusting texture parameters manually, ensure minFilter is set to one of the MipMap options,
174174
and that mip maps have not been otherwise forcibly disabled.</p>
175175
<p>
176-
Note: only [link:https://threejs.org/docs/#api/textures/CubeTexture cube environment maps] are supported
177-
for MeshStandardMaterial. If you want to use an equirectangular map you will need to use the
178-
[link:https://github.com/mrdoob/three.js/blob/dev/examples/js/loaders/EquirectangularToCubeGenerator.js EquirectangularToCubeGenerator].
176+
Note: only [link:https://threejs.org/docs/#api/textures/CubeTexture cube environment maps] are supported
177+
for MeshStandardMaterial. If you want to use an equirectangular map you will need to use
178+
[page:WebGLRenderTargetCube.fromEquirectangularTexture WebGLRenderTargetCube.fromEquirectangularTexture]().
179179
See this [link:https://threejs.org/examples/webgl_materials_envmaps_exr.html example] for details.
180180
</p>
181181

docs/api/zh/materials/MeshStandardMaterial.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ <h3>[property:TextureCube envMap]</h3>
136136
请确保将minFilter设置为其中一个MipMap选项,并且未强制禁用mip贴图。</p>
137137
<p>
138138
注意:MeshStandardMaterial 仅支持[link:https://threejs.org/docs/#api/textures/CubeTexture cube environment maps]。
139-
如果要使用equirectangular贴图,则需要使用 [link:https://github.com/mrdoob/three.js/blob/dev/examples/js/loaders/EquirectangularToCubeGenerator.js EquirectangularToCubeGenerator]
139+
如果要使用equirectangular贴图,则需要使用 [page:WebGLRenderTargetCube.fromEquirectangularTexture WebGLRenderTargetCube.fromEquirectangularTexture]().
140140
详细信息请参阅此示例[link:https://threejs.org/examples/webgl_materials_envmaps_exr.html example]。
141141
</p>
142142

examples/js/loaders/EquirectangularToCubeGenerator.js

Lines changed: 0 additions & 126 deletions
This file was deleted.

examples/jsm/loaders/EquirectangularToCubeGenerator.d.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.

examples/jsm/loaders/EquirectangularToCubeGenerator.js

Lines changed: 0 additions & 139 deletions
This file was deleted.

examples/webgl_loader_gltf.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import { OrbitControls } from './jsm/controls/OrbitControls.js';
2525
import { GLTFLoader } from './jsm/loaders/GLTFLoader.js';
2626
import { RGBELoader } from './jsm/loaders/RGBELoader.js';
27-
import { EquirectangularToCubeGenerator } from './jsm/loaders/EquirectangularToCubeGenerator.js';
2827
import { PMREMGenerator } from './jsm/pmrem/PMREMGenerator.js';
2928
import { PMREMCubeUVPacker } from './jsm/pmrem/PMREMCubeUVPacker.js';
3029

@@ -49,10 +48,14 @@
4948
.setPath( 'textures/equirectangular/' )
5049
.load( 'pedestrian_overpass_2k.hdr', function ( texture ) {
5150

52-
var cubeGenerator = new EquirectangularToCubeGenerator( texture, { resolution: 1024 } );
53-
cubeGenerator.update( renderer );
51+
var options = {
52+
minFilter: texture.minFilter,
53+
magFilter: texture.magFilter
54+
};
5455

55-
var pmremGenerator = new PMREMGenerator( cubeGenerator.renderTarget.texture );
56+
scene.background = new THREE.WebGLRenderTargetCube( 1024, 1024, options ).fromEquirectangularTexture( renderer, texture );
57+
58+
var pmremGenerator = new PMREMGenerator( scene.background.texture );
5659
pmremGenerator.update( renderer );
5760

5861
var pmremCubeUVPacker = new PMREMCubeUVPacker( pmremGenerator.cubeLods );
@@ -82,8 +85,6 @@
8285
pmremGenerator.dispose();
8386
pmremCubeUVPacker.dispose();
8487

85-
scene.background = cubeGenerator.renderTarget;
86-
8788
} );
8889

8990
renderer = new THREE.WebGLRenderer( { antialias: true } );

examples/webgl_loader_gltf_extensions.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import { DDSLoader } from './jsm/loaders/DDSLoader.js';
2727
import { DRACOLoader } from './jsm/loaders/DRACOLoader.js';
2828
import { RGBELoader } from './jsm/loaders/RGBELoader.js';
29-
import { EquirectangularToCubeGenerator } from './jsm/loaders/EquirectangularToCubeGenerator.js';
3029
import { PMREMGenerator } from './jsm/pmrem/PMREMGenerator.js';
3130
import { PMREMCubeUVPacker } from './jsm/pmrem/PMREMCubeUVPacker.js';
3231

@@ -159,12 +158,14 @@
159158
.setPath( 'textures/equirectangular/' )
160159
.load( 'venice_sunset_2k.hdr', function ( texture ) {
161160

162-
var cubeGenerator = new EquirectangularToCubeGenerator( texture, { resolution: 1024 } );
163-
cubeGenerator.update( renderer );
161+
var options = {
162+
minFilter: texture.minFilter,
163+
magFilter: texture.magFilter
164+
};
164165

165-
background = cubeGenerator.renderTarget;
166+
background = new THREE.WebGLRenderTargetCube( 1024, 1024, options ).fromEquirectangularTexture( renderer, texture );
166167

167-
var pmremGenerator = new PMREMGenerator( cubeGenerator.renderTarget.texture );
168+
var pmremGenerator = new PMREMGenerator( background.texture );
168169
pmremGenerator.update( renderer );
169170

170171
var pmremCubeUVPacker = new PMREMCubeUVPacker( pmremGenerator.cubeLods );

0 commit comments

Comments
 (0)