|
@@ -31,9 +31,11 @@ THREE.PMREMCubeUVPacker = function( cubeTextureLods, numLods ) {
|
|
encoding: ( sourceTexture.encoding === THREE.RGBEEncoding ) ? THREE.RGBM16Encoding : sourceTexture.encoding
|
|
encoding: ( sourceTexture.encoding === THREE.RGBEEncoding ) ? THREE.RGBM16Encoding : sourceTexture.encoding
|
|
};
|
|
};
|
|
|
|
|
|
- if( params.encoding === THREE.RGBM16Encoding ) {
|
|
|
|
|
|
+ if ( params.encoding === THREE.RGBM16Encoding ) {
|
|
|
|
+
|
|
params.magFilter = THREE.LinearFilter;
|
|
params.magFilter = THREE.LinearFilter;
|
|
params.minFilter = THREE.LinearFilter;
|
|
params.minFilter = THREE.LinearFilter;
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
this.CubeUVRenderTarget = new THREE.WebGLRenderTarget( size, size, params );
|
|
this.CubeUVRenderTarget = new THREE.WebGLRenderTarget( size, size, params );
|
|
@@ -45,7 +47,7 @@ THREE.PMREMCubeUVPacker = function( cubeTextureLods, numLods ) {
|
|
this.scene.add( this.camera );
|
|
this.scene.add( this.camera );
|
|
|
|
|
|
this.objects = [];
|
|
this.objects = [];
|
|
- var xOffset = 0;
|
|
|
|
|
|
+
|
|
var faceOffsets = [];
|
|
var faceOffsets = [];
|
|
faceOffsets.push( new THREE.Vector2( 0, 0 ) );
|
|
faceOffsets.push( new THREE.Vector2( 0, 0 ) );
|
|
faceOffsets.push( new THREE.Vector2( 1, 0 ) );
|
|
faceOffsets.push( new THREE.Vector2( 1, 0 ) );
|
|
@@ -53,7 +55,7 @@ THREE.PMREMCubeUVPacker = function( cubeTextureLods, numLods ) {
|
|
faceOffsets.push( new THREE.Vector2( 0, 1 ) );
|
|
faceOffsets.push( new THREE.Vector2( 0, 1 ) );
|
|
faceOffsets.push( new THREE.Vector2( 1, 1 ) );
|
|
faceOffsets.push( new THREE.Vector2( 1, 1 ) );
|
|
faceOffsets.push( new THREE.Vector2( 2, 1 ) );
|
|
faceOffsets.push( new THREE.Vector2( 2, 1 ) );
|
|
- var yOffset = 0;
|
|
|
|
|
|
+
|
|
var textureResolution = size;
|
|
var textureResolution = size;
|
|
size = cubeTextureLods[ 0 ].width;
|
|
size = cubeTextureLods[ 0 ].width;
|
|
|
|
|
|
@@ -63,8 +65,7 @@ THREE.PMREMCubeUVPacker = function( cubeTextureLods, numLods ) {
|
|
for ( var i = 0; i < this.numLods; i ++ ) {
|
|
for ( var i = 0; i < this.numLods; i ++ ) {
|
|
|
|
|
|
var offset1 = ( textureResolution - textureResolution / c ) * 0.5;
|
|
var offset1 = ( textureResolution - textureResolution / c ) * 0.5;
|
|
- if ( size > 16 )
|
|
|
|
- c *= 2;
|
|
|
|
|
|
+ if ( size > 16 ) c *= 2;
|
|
var nMips = size > 16 ? 6 : 1;
|
|
var nMips = size > 16 ? 6 : 1;
|
|
var mipOffsetX = 0;
|
|
var mipOffsetX = 0;
|
|
var mipOffsetY = 0;
|
|
var mipOffsetY = 0;
|
|
@@ -81,8 +82,6 @@ THREE.PMREMCubeUVPacker = function( cubeTextureLods, numLods ) {
|
|
material.envMap = this.cubeLods[ i ].texture;
|
|
material.envMap = this.cubeLods[ i ].texture;
|
|
material.uniforms[ 'faceIndex' ].value = k;
|
|
material.uniforms[ 'faceIndex' ].value = k;
|
|
material.uniforms[ 'mapSize' ].value = mipSize;
|
|
material.uniforms[ 'mapSize' ].value = mipSize;
|
|
- var color = material.uniforms[ 'testColor' ].value;
|
|
|
|
- //color.copy(testColor[j]);
|
|
|
|
var planeMesh = new THREE.Mesh(
|
|
var planeMesh = new THREE.Mesh(
|
|
new THREE.PlaneGeometry( mipSize, mipSize, 0 ),
|
|
new THREE.PlaneGeometry( mipSize, mipSize, 0 ),
|
|
material );
|
|
material );
|
|
@@ -99,8 +98,7 @@ THREE.PMREMCubeUVPacker = function( cubeTextureLods, numLods ) {
|
|
|
|
|
|
}
|
|
}
|
|
offset2 += 2 * size;
|
|
offset2 += 2 * size;
|
|
- if ( size > 16 )
|
|
|
|
- size /= 2;
|
|
|
|
|
|
+ if ( size > 16 ) size /= 2;
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -108,9 +106,9 @@ THREE.PMREMCubeUVPacker = function( cubeTextureLods, numLods ) {
|
|
|
|
|
|
THREE.PMREMCubeUVPacker.prototype = {
|
|
THREE.PMREMCubeUVPacker.prototype = {
|
|
|
|
|
|
- constructor : THREE.PMREMCubeUVPacker,
|
|
|
|
|
|
+ constructor: THREE.PMREMCubeUVPacker,
|
|
|
|
|
|
- update: function( renderer ) {
|
|
|
|
|
|
+ update: function ( renderer ) {
|
|
|
|
|
|
var gammaInput = renderer.gammaInput;
|
|
var gammaInput = renderer.gammaInput;
|
|
var gammaOutput = renderer.gammaOutput;
|
|
var gammaOutput = renderer.gammaOutput;
|
|
@@ -129,7 +127,7 @@ THREE.PMREMCubeUVPacker.prototype = {
|
|
|
|
|
|
},
|
|
},
|
|
|
|
|
|
- getShader: function() {
|
|
|
|
|
|
+ getShader: function () {
|
|
|
|
|
|
var shaderMaterial = new THREE.ShaderMaterial( {
|
|
var shaderMaterial = new THREE.ShaderMaterial( {
|
|
|
|
|