@plastic-software/three 0.183.2 → 0.183.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plastic-software/three",
-  "version": "0.183.2",
+  "version": "0.183.4",
   "description": "JavaScript 3D library",
   "type": "module",
   "main": "./build/three.cjs",

package/src/renderers/WebGLRenderer.js

@@ -2578,7 +2578,7 @@ class WebGLRenderer {
 			if ( object.isBatchedMesh ) {
 
 				p_uniforms.setOptional( _gl, object, 'batchingTexture' );
-				if ( objects._matricesTexture !== null ) {
+				if ( object._matricesTexture !== null ) {
 
 					p_uniforms.setValue( _gl, 'batchingTexture', object._matricesTexture, textures );
 

package/src/renderers/shaders/ShaderChunk/batching_pars_vertex.glsl.js

@@ -1,4 +1,24 @@
 export default /* glsl */`
+#ifdef USE_OCTAHEDRAL_NORMALS
+
+	attribute vec2 normalOctahedral;
+
+	vec3 decodeOctahedralNormal( vec2 value ) {
+
+		vec3 normal = vec3( value, 1.0 - abs( value.x ) - abs( value.y ) );
+
+		if ( normal.z < 0.0 ) {
+
+			normal.xy = ( 1.0 - abs( normal.yx ) ) * vec2( normal.x >= 0.0 ? 1.0 : - 1.0, normal.y >= 0.0 ? 1.0 : - 1.0 );
+
+		}
+
+		return normalize( normal );
+
+	}
+
+#endif
+
 #ifdef USE_BATCHING_MATRIX
 	#if ! defined( GL_ANGLE_multi_draw )
 	#define gl_DrawID _gl_DrawID

package/src/renderers/shaders/ShaderChunk/beginnormal_vertex.glsl.js

@@ -1,5 +1,13 @@
 export default /* glsl */`
-vec3 objectNormal = vec3( normal );
+#ifdef USE_OCTAHEDRAL_NORMALS
+
+	vec3 objectNormal = decodeOctahedralNormal( normalOctahedral );
+
+#else
+
+	vec3 objectNormal = vec3( normal );
+
+#endif
 
 #ifdef USE_TANGENT
 

package/src/renderers/shaders/ShaderChunk/cube_uv_reflection_fragment.glsl.js

@@ -123,11 +123,11 @@ export default /* glsl */`
 	#define cubeUV_r1 0.8
 	#define cubeUV_m1 - 1.0
 	#define cubeUV_r4 0.4
-	#define cubeUV_m4 5.0
+	#define cubeUV_m4 2.0
 	#define cubeUV_r5 0.305
-	#define cubeUV_m5 6.0
+	#define cubeUV_m5 3.0
 	#define cubeUV_r6 0.21
-	#define cubeUV_m6 7.0
+	#define cubeUV_m6 4.0
 
 	float roughnessToMip( float roughness ) {
 
@@ -151,7 +151,7 @@ export default /* glsl */`
 
 		} else {
 
-			mip = - 2.0 * log2( 1.16 * roughness ) + 3.0; // 1.16 = 1.79^0.25
+			mip = - 2.0 * log2( 1.16 * roughness ); // 1.16 = 1.79^0.25
 		}
 
 		return mip;

package/src/renderers/webgl/WebGLProgram.js

@@ -483,6 +483,7 @@ function WebGLProgram( renderer, cacheKey, parameters, bindingStates ) {
 			parameters.batching ? '#define USE_BATCHING' : '',
 			parameters.batchingMatrix ? '#define USE_BATCHING_MATRIX' : '',
 			parameters.batchingColor ? '#define USE_BATCHING_COLOR' : '',
+			parameters.normalOctahedral ? '#define USE_OCTAHEDRAL_NORMALS' : '',
 			parameters.instancing ? '#define USE_INSTANCING' : '',
 			parameters.instancingColor ? '#define USE_INSTANCING_COLOR' : '',
 			parameters.instancingMorph ? '#define USE_INSTANCING_MORPH' : '',

package/src/renderers/webgl/WebGLPrograms.js

@@ -162,6 +162,8 @@ function WebGLPrograms( renderer, environments, extensions, capabilities, bindin
 
 		const HAS_ALPHAHASH = !! material.alphaHash;
 
+		const HAS_OCTAHEDRAL_NORMALS = object.geometry.attributes.normalOctahedral !== undefined;
+
 		const HAS_EXTENSIONS = !! material.extensions;
 
 		let toneMapping = NoToneMapping;
@@ -197,6 +199,7 @@ function WebGLPrograms( renderer, environments, extensions, capabilities, bindin
 			batching: IS_BATCHEDMESH,
 			batchingMatrix: IS_BATCHEDMESH && object._matricesTexture !== null,
 			batchingColor: IS_BATCHEDMESH && object._colorsTexture !== null,
+			normalOctahedral: HAS_OCTAHEDRAL_NORMALS,
 			instancing: IS_INSTANCEDMESH,
 			instancingColor: IS_INSTANCEDMESH && object.instanceColor !== null,
 			instancingMorph: IS_INSTANCEDMESH && object.morphTexture !== null,
@@ -538,6 +541,8 @@ function WebGLPrograms( renderer, environments, extensions, capabilities, bindin
 			_programLayers.enable( 21 );
 		if ( parameters.batchingMatrix )
 			_programLayers.enable( 22 );
+		if ( parameters.normalOctahedral )
+			_programLayers.enable( 23 );
 
 		array.push( _programLayers.mask );
 		_programLayers.disableAll();