|
@@ -24,7 +24,6 @@
|
|
import { OrbitControls } from './jsm/controls/OrbitControls.js';
|
|
import { OrbitControls } from './jsm/controls/OrbitControls.js';
|
|
import { HDRCubeTextureLoader } from './jsm/loaders/HDRCubeTextureLoader.js';
|
|
import { HDRCubeTextureLoader } from './jsm/loaders/HDRCubeTextureLoader.js';
|
|
import { PMREMGenerator } from './jsm/pmrem/PMREMGenerator.js';
|
|
import { PMREMGenerator } from './jsm/pmrem/PMREMGenerator.js';
|
|
- import { PMREMCubeUVPacker } from './jsm/pmrem/PMREMCubeUVPacker.js';
|
|
|
|
|
|
|
|
var params = {
|
|
var params = {
|
|
envMap: 'HDR',
|
|
envMap: 'HDR',
|
|
@@ -85,20 +84,12 @@
|
|
.setDataType( THREE.UnsignedByteType )
|
|
.setDataType( THREE.UnsignedByteType )
|
|
.load( hdrUrls, function () {
|
|
.load( hdrUrls, function () {
|
|
|
|
|
|
- var pmremGenerator = new PMREMGenerator( hdrCubeMap );
|
|
|
|
- pmremGenerator.update( renderer );
|
|
|
|
-
|
|
|
|
- var pmremCubeUVPacker = new PMREMCubeUVPacker( pmremGenerator.cubeLods );
|
|
|
|
- pmremCubeUVPacker.update( renderer );
|
|
|
|
-
|
|
|
|
- hdrCubeRenderTarget = pmremCubeUVPacker.CubeUVRenderTarget;
|
|
|
|
|
|
+ var pmremGenerator = new PMREMGenerator( renderer );
|
|
|
|
+ hdrCubeRenderTarget = pmremGenerator.fromCubemap( hdrCubeMap );
|
|
|
|
|
|
hdrCubeMap.magFilter = THREE.LinearFilter;
|
|
hdrCubeMap.magFilter = THREE.LinearFilter;
|
|
hdrCubeMap.needsUpdate = true;
|
|
hdrCubeMap.needsUpdate = true;
|
|
|
|
|
|
- pmremGenerator.dispose();
|
|
|
|
- pmremCubeUVPacker.dispose();
|
|
|
|
-
|
|
|
|
} );
|
|
} );
|
|
|
|
|
|
var ldrUrls = [ 'px.png', 'nx.png', 'py.png', 'ny.png', 'pz.png', 'nz.png' ];
|
|
var ldrUrls = [ 'px.png', 'nx.png', 'py.png', 'ny.png', 'pz.png', 'nz.png' ];
|
|
@@ -106,18 +97,10 @@
|
|
.setPath( './textures/cube/pisa/' )
|
|
.setPath( './textures/cube/pisa/' )
|
|
.load( ldrUrls, function () {
|
|
.load( ldrUrls, function () {
|
|
|
|
|
|
- ldrCubeMap.encoding = THREE.sRGBEncoding;
|
|
|
|
-
|
|
|
|
- var pmremGenerator = new PMREMGenerator( ldrCubeMap );
|
|
|
|
- pmremGenerator.update( renderer );
|
|
|
|
-
|
|
|
|
- var pmremCubeUVPacker = new PMREMCubeUVPacker( pmremGenerator.cubeLods );
|
|
|
|
- pmremCubeUVPacker.update( renderer );
|
|
|
|
|
|
+ ldrCubeMap.encoding = THREE.GammaEncoding;
|
|
|
|
|
|
- ldrCubeRenderTarget = pmremCubeUVPacker.CubeUVRenderTarget;
|
|
|
|
-
|
|
|
|
- pmremGenerator.dispose();
|
|
|
|
- pmremCubeUVPacker.dispose();
|
|
|
|
|
|
+ var pmremGenerator = new PMREMGenerator( renderer );
|
|
|
|
+ ldrCubeRenderTarget = pmremGenerator.fromCubemap( ldrCubeMap );
|
|
|
|
|
|
} );
|
|
} );
|
|
|
|
|
|
@@ -130,20 +113,12 @@
|
|
rgbmCubeMap.encoding = THREE.RGBM16Encoding;
|
|
rgbmCubeMap.encoding = THREE.RGBM16Encoding;
|
|
rgbmCubeMap.format = THREE.RGBAFormat;
|
|
rgbmCubeMap.format = THREE.RGBAFormat;
|
|
|
|
|
|
- var pmremGenerator = new PMREMGenerator( rgbmCubeMap );
|
|
|
|
- pmremGenerator.update( renderer );
|
|
|
|
-
|
|
|
|
- var pmremCubeUVPacker = new PMREMCubeUVPacker( pmremGenerator.cubeLods );
|
|
|
|
- pmremCubeUVPacker.update( renderer );
|
|
|
|
-
|
|
|
|
- rgbmCubeRenderTarget = pmremCubeUVPacker.CubeUVRenderTarget;
|
|
|
|
|
|
+ var pmremGenerator = new PMREMGenerator( renderer );
|
|
|
|
+ rgbmCubeRenderTarget = pmremGenerator.fromCubemap( rgbmCubeMap );
|
|
|
|
|
|
rgbmCubeMap.magFilter = THREE.LinearFilter;
|
|
rgbmCubeMap.magFilter = THREE.LinearFilter;
|
|
rgbmCubeMap.needsUpdate = true;
|
|
rgbmCubeMap.needsUpdate = true;
|
|
|
|
|
|
- pmremGenerator.dispose();
|
|
|
|
- pmremCubeUVPacker.dispose();
|
|
|
|
-
|
|
|
|
} );
|
|
} );
|
|
|
|
|
|
renderer.setPixelRatio( window.devicePixelRatio );
|
|
renderer.setPixelRatio( window.devicePixelRatio );
|