Skip to content

Commit 8094686

Browse files
committed
Examples: Use RGBM16 format in webgl_materials_standard example.
1 parent 0df6685 commit 8094686

File tree

1 file changed

+10
-19
lines changed

1 file changed

+10
-19
lines changed

examples/webgl_materials_standard.html

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@
4646

4747
<script src="js/controls/TrackballControls.js"></script>
4848
<script src="js/loaders/OBJLoader.js"></script>
49-
<script src="js/loaders/RGBELoader.js"></script>
50-
<script src="js/loaders/HDRCubeTextureLoader.js"></script>
5149

5250
<script src="js/pmrem/PMREMGenerator.js"></script>
5351
<script src="js/pmrem/PMREMCubeUVPacker.js"></script>
@@ -140,33 +138,26 @@
140138

141139
} );
142140

143-
var genCubeUrls = function ( prefix, postfix ) {
141+
new THREE.CubeTextureLoader().setPath( './textures/cube/pisaRGBM16/' )
142+
.load( [ 'px.png', 'nx.png', 'py.png', 'ny.png', 'pz.png', 'nz.png' ], function ( rgbmCubeMap ) {
144143

145-
return [
146-
prefix + 'px' + postfix, prefix + 'nx' + postfix,
147-
prefix + 'py' + postfix, prefix + 'ny' + postfix,
148-
prefix + 'pz' + postfix, prefix + 'nz' + postfix
149-
];
144+
rgbmCubeMap.encoding = THREE.RGBM16Encoding;
145+
rgbmCubeMap.format = THREE.RGBAFormat;
150146

151-
};
152-
153-
var hdrUrls = genCubeUrls( './textures/cube/pisaHDR/', '.hdr' );
154-
new THREE.HDRCubeTextureLoader().load( THREE.UnsignedByteType, hdrUrls, function ( hdrCubeMap ) {
155-
156-
var pmremGenerator = new THREE.PMREMGenerator( hdrCubeMap );
147+
var pmremGenerator = new THREE.PMREMGenerator( rgbmCubeMap );
157148
pmremGenerator.update( renderer );
158149

159150
var pmremCubeUVPacker = new THREE.PMREMCubeUVPacker( pmremGenerator.cubeLods );
160151
pmremCubeUVPacker.update( renderer );
161152

162-
var hdrCubeRenderTarget = pmremCubeUVPacker.CubeUVRenderTarget;
153+
var rgbmCubeRenderTarget = pmremCubeUVPacker.CubeUVRenderTarget;
163154

164-
material.envMap = hdrCubeRenderTarget.texture;
155+
material.envMap = rgbmCubeRenderTarget.texture;
165156
material.needsUpdate = true; // is this needed?
166157

167-
hdrCubeMap.magFilter = THREE.LinearFilter;
168-
hdrCubeMap.needsUpdate = true;
169-
scene.background = hdrCubeMap;
158+
rgbmCubeMap.magFilter = THREE.LinearFilter;
159+
rgbmCubeMap.needsUpdate = true;
160+
scene.background = rgbmCubeMap;
170161

171162
pmremGenerator.dispose();
172163
pmremCubeUVPacker.dispose();

0 commit comments

Comments
 (0)