three-stdlib 2.6.2 → 2.6.3

package/nodes/utils/ColorSpaceNode.js

@@ -1,9 +1,7 @@
-import { GammaEncoding, RGBDEncoding, RGBM16Encoding, RGBM7Encoding, RGBEEncoding, sRGBEncoding, LinearEncoding } from 'three';
+import { sRGBEncoding, LinearEncoding } from 'three';
 import { TempNode } from '../core/TempNode.js';
 import { ConstNode } from '../core/ConstNode.js';
-import { FloatNode } from '../inputs/FloatNode.js';
 import { FunctionNode } from '../core/FunctionNode.js';
-import { ExpressionNode } from '../core/ExpressionNode.js';
 
 function ColorSpaceNode(input, method) {
   TempNode.call(this, 'v4');
@@ -12,21 +10,9 @@ function ColorSpaceNode(input, method) {
 }
 
 ColorSpaceNode.Nodes = function () {
-  // For a discussion of what this is, please read this: http://lousodrome.net/blog/light/2013/05/26/gamma-correct-and-hdr-rendering-in-a-32-bits-buffer/
   var LinearToLinear = new FunctionNode(['vec4 LinearToLinear( in vec4 value ) {', '	return value;', '}'].join('\n'));
-  var GammaToLinear = new FunctionNode(['vec4 GammaToLinear( in vec4 value, in float gammaFactor ) {', '	return vec4( pow( value.xyz, vec3( gammaFactor ) ), value.w );', '}'].join('\n'));
-  var LinearToGamma = new FunctionNode(['vec4 LinearToGamma( in vec4 value, in float gammaFactor ) {', '	return vec4( pow( value.xyz, vec3( 1.0 / gammaFactor ) ), value.w );', '}'].join('\n'));
   var sRGBToLinear = new FunctionNode(['vec4 sRGBToLinear( in vec4 value ) {', '	return vec4( mix( pow( value.rgb * 0.9478672986 + vec3( 0.0521327014 ), vec3( 2.4 ) ), value.rgb * 0.0773993808, vec3( lessThanEqual( value.rgb, vec3( 0.04045 ) ) ) ), value.w );', '}'].join('\n'));
-  var LinearTosRGB = new FunctionNode(['vec4 LinearTosRGB( in vec4 value ) {', '	return vec4( mix( pow( value.rgb, vec3( 0.41666 ) ) * 1.055 - vec3( 0.055 ), value.rgb * 12.92, vec3( lessThanEqual( value.rgb, vec3( 0.0031308 ) ) ) ), value.w );', '}'].join('\n'));
-  var RGBEToLinear = new FunctionNode(['vec4 RGBEToLinear( in vec4 value ) {', '	return vec4( value.rgb * exp2( value.a * 255.0 - 128.0 ), 1.0 );', '}'].join('\n'));
-  var LinearToRGBE = new FunctionNode(['vec4 LinearToRGBE( in vec4 value ) {', '	float maxComponent = max( max( value.r, value.g ), value.b );', '	float fExp = clamp( ceil( log2( maxComponent ) ), -128.0, 127.0 );', '	return vec4( value.rgb / exp2( fExp ), ( fExp + 128.0 ) / 255.0 );', //  return vec4( value.brg, ( 3.0 + 128.0 ) / 256.0 );
-  '}'].join('\n')); // reference: http://iwasbeingirony.blogspot.ca/2010/06/difference-between-rgbm-and-rgbd.html
-
-  var RGBMToLinear = new FunctionNode(['vec3 RGBMToLinear( in vec4 value, in float maxRange ) {', '	return vec4( value.xyz * value.w * maxRange, 1.0 );', '}'].join('\n'));
-  var LinearToRGBM = new FunctionNode(['vec3 LinearToRGBM( in vec4 value, in float maxRange ) {', '	float maxRGB = max( value.x, max( value.g, value.b ) );', '	float M      = clamp( maxRGB / maxRange, 0.0, 1.0 );', '	M            = ceil( M * 255.0 ) / 255.0;', '	return vec4( value.rgb / ( M * maxRange ), M );', '}'].join('\n')); // reference: http://iwasbeingirony.blogspot.ca/2010/06/difference-between-rgbm-and-rgbd.html
-
-  var RGBDToLinear = new FunctionNode(['vec3 RGBDToLinear( in vec4 value, in float maxRange ) {', '	return vec4( value.rgb * ( ( maxRange / 255.0 ) / value.a ), 1.0 );', '}'].join('\n'));
-  var LinearToRGBD = new FunctionNode(['vec3 LinearToRGBD( in vec4 value, in float maxRange ) {', '	float maxRGB = max( value.x, max( value.g, value.b ) );', '	float D      = max( maxRange / maxRGB, 1.0 );', '	D            = clamp( floor( D ) / 255.0, 0.0, 1.0 );', '	return vec4( value.rgb * ( D * ( 255.0 / maxRange ) ), D );', '}'].join('\n')); // LogLuv reference: http://graphicrants.blogspot.ca/2009/04/rgbm-color-encoding.html
+  var LinearTosRGB = new FunctionNode(['vec4 LinearTosRGB( in vec4 value ) {', '	return vec4( mix( pow( value.rgb, vec3( 0.41666 ) ) * 1.055 - vec3( 0.055 ), value.rgb * 12.92, vec3( lessThanEqual( value.rgb, vec3( 0.0031308 ) ) ) ), value.w );', '}'].join('\n')); // LogLuv reference: http://graphicrants.blogspot.ca/2009/04/rgbm-color-encoding.html
   // M matrix, for encoding
 
   var cLogLuvM = new ConstNode('const mat3 cLogLuvM = mat3( 0.2209, 0.3390, 0.4184, 0.1138, 0.6780, 0.7319, 0.0102, 0.1130, 0.2969 );');
@@ -36,16 +22,8 @@ ColorSpaceNode.Nodes = function () {
   var LogLuvToLinear = new FunctionNode(['vec4 LogLuvToLinear( in vec4 value ) {', '	float Le = value.z * 255.0 + value.w;', '	vec3 Xp_Y_XYZp;', '	Xp_Y_XYZp.y = exp2((Le - 127.0) / 2.0);', '	Xp_Y_XYZp.z = Xp_Y_XYZp.y / value.y;', '	Xp_Y_XYZp.x = value.x * Xp_Y_XYZp.z;', '	vec3 vRGB = cLogLuvInverseM * Xp_Y_XYZp.rgb;', '	return vec4( max(vRGB, 0.0), 1.0 );', '}'].join('\n'), [cLogLuvInverseM]);
   return {
     LinearToLinear: LinearToLinear,
-    GammaToLinear: GammaToLinear,
-    LinearToGamma: LinearToGamma,
     sRGBToLinear: sRGBToLinear,
     LinearTosRGB: LinearTosRGB,
-    RGBEToLinear: RGBEToLinear,
-    LinearToRGBE: LinearToRGBE,
-    RGBMToLinear: RGBMToLinear,
-    LinearToRGBM: LinearToRGBM,
-    RGBDToLinear: RGBDToLinear,
-    LinearToRGBD: LinearToRGBD,
     cLogLuvM: cLogLuvM,
     LinearToLogLuv: LinearToLogLuv,
     cLogLuvInverseM: cLogLuvInverseM,
@@ -54,16 +32,10 @@ ColorSpaceNode.Nodes = function () {
 }();
 
 ColorSpaceNode.LINEAR_TO_LINEAR = 'LinearToLinear';
-ColorSpaceNode.GAMMA_TO_LINEAR = 'GammaToLinear';
-ColorSpaceNode.LINEAR_TO_GAMMA = 'LinearToGamma';
 ColorSpaceNode.SRGB_TO_LINEAR = 'sRGBToLinear';
 ColorSpaceNode.LINEAR_TO_SRGB = 'LinearTosRGB';
 ColorSpaceNode.RGBE_TO_LINEAR = 'RGBEToLinear';
 ColorSpaceNode.LINEAR_TO_RGBE = 'LinearToRGBE';
-ColorSpaceNode.RGBM_TO_LINEAR = 'RGBMToLinear';
-ColorSpaceNode.LINEAR_TO_RGBM = 'LinearToRGBM';
-ColorSpaceNode.RGBD_TO_LINEAR = 'RGBDToLinear';
-ColorSpaceNode.LINEAR_TO_RGBD = 'LinearToRGBD';
 ColorSpaceNode.LINEAR_TO_LOG_LUV = 'LinearToLogLuv';
 ColorSpaceNode.LOG_LUV_TO_LINEAR = 'LogLuvToLinear';
 
@@ -74,21 +46,6 @@ ColorSpaceNode.getEncodingComponents = function (encoding) {
 
     case sRGBEncoding:
       return ['sRGB'];
-
-    case RGBEEncoding:
-      return ['RGBE'];
-
-    case RGBM7Encoding:
-      return ['RGBM', new FloatNode(7.0).setReadonly(true)];
-
-    case RGBM16Encoding:
-      return ['RGBM', new FloatNode(16.0).setReadonly(true)];
-
-    case RGBDEncoding:
-      return ['RGBD', new FloatNode(256.0).setReadonly(true)];
-
-    case GammaEncoding:
-      return ['Gamma', new ExpressionNode('float( GAMMA_FACTOR )', 'f')];
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-stdlib",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "private": false,
   "description": "stand-alone library of threejs examples",
   "main": "index.cjs.js",

package/shaders/GammaCorrectionShader.js

@@ -9,8 +9,7 @@ const GammaCorrectionShader = {
     }
   },
   vertexShader: ['varying vec2 vUv;', 'void main() {', '	vUv = uv;', '	gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );', '}'].join('\n'),
-  fragmentShader: ['uniform sampler2D tDiffuse;', 'varying vec2 vUv;', 'void main() {', '	vec4 tex = texture2D( tDiffuse, vUv );', '	gl_FragColor = LinearTosRGB( tex );', // optional: LinearToGamma( tex, float( GAMMA_FACTOR ) );
-  '}'].join('\n')
+  fragmentShader: ['uniform sampler2D tDiffuse;', 'varying vec2 vUv;', 'void main() {', '	vec4 tex = texture2D( tDiffuse, vUv );', '	gl_FragColor = LinearTosRGB( tex );', '}'].join('\n')
 };
 
 export { GammaCorrectionShader };