Converted .glsl files to .glsl.js

examples/files.js

@@ -314,8 +314,8 @@ var files = {
 	],
 	"webgl2": [
 		"webgl2_materials_texture3d",
-		"webgl2_materials_texture3d_volume"
-		// "webgl2_sandbox"
+		"webgl2_materials_texture3d_volume",
+		"webgl2_sandbox"
 	],
 	"webaudio": [
 		"webaudio_orientation",

rollup.config.js

@@ -160,22 +160,28 @@ function glsl() {
 
 		transform( code, id ) {
 
-			if ( /\.glsl$/.test( id ) === false ) return;
-
-			var transformedCode = 'export default ' + JSON.stringify(
-				code
-					.replace( /[ \t]*\/\/.*\n/g, '' ) // remove //
-					.replace( /[ \t]*\/\*[\s\S]*?\*\//g, '' ) // remove /* */
-					.replace( /\n{2,}/g, '\n' ) // # \n+ to \n
-			) + ';';
+			if ( /\.glsl.js$/.test( id ) === false ) return;
+
+			code = code.replace( /\`((.*|\n)*)\`/, function ( match, p1 ) {
+
+				return JSON.stringify(
+					p1
+						.trim()
+						.replace( /[ \t]*\/\/.*\n/g, '' ) // remove //
+						.replace( /[ \t]*\/\*[\s\S]*?\*\//g, '' ) // remove /* */
+						.replace( /\n{2,}/g, '\n' ) // # \n+ to \n
+				);
+
+			} );
+
 			return {
-				code: transformedCode,
+				code: code,
 				map: { mappings: '' }
 			};
 
 		}
 
-	};
+	}
 
 }
 

src/renderers/shaders/ShaderChunk/alphamap_fragment.glsl → src/renderers/shaders/ShaderChunk/alphamap_fragment.glsl.js

@@ -1,5 +1,7 @@
+export default `
 #ifdef USE_ALPHAMAP
 
 	diffuseColor.a *= texture2D( alphaMap, vUv ).g;
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/alphamap_pars_fragment.glsl → src/renderers/shaders/ShaderChunk/alphamap_pars_fragment.glsl.js

@@ -1,5 +1,7 @@
+export default `
 #ifdef USE_ALPHAMAP
 
 	uniform sampler2D alphaMap;
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/alphatest_fragment.glsl → src/renderers/shaders/ShaderChunk/alphatest_fragment.glsl.js

@@ -1,5 +1,7 @@
+export default `
 #ifdef ALPHATEST
 
 	if ( diffuseColor.a < ALPHATEST ) discard;
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/aomap_fragment.glsl → src/renderers/shaders/ShaderChunk/aomap_fragment.glsl.js

@@ -1,3 +1,4 @@
+export default `
 #ifdef USE_AOMAP
 
 	// reads channel R, compatible with a combined OcclusionRoughnessMetallic (RGB) texture
@@ -14,3 +15,4 @@
 	#endif
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/aomap_pars_fragment.glsl → src/renderers/shaders/ShaderChunk/aomap_pars_fragment.glsl.js

@@ -1,6 +1,8 @@
+export default `
 #ifdef USE_AOMAP
 
 	uniform sampler2D aoMap;
 	uniform float aoMapIntensity;
 
-#endif
+#endif
+`;

src/renderers/shaders/ShaderChunk/begin_vertex.glsl → src/renderers/shaders/ShaderChunk/begin_vertex.glsl.js

@@ -1,2 +1,3 @@
-
+export default `
 vec3 transformed = vec3( position );
+`;

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

@@ -1,2 +1,3 @@
-
+export default `
 vec3 objectNormal = vec3( normal );
+`;

src/renderers/shaders/ShaderChunk/bsdfs.glsl → src/renderers/shaders/ShaderChunk/bsdfs.glsl.js

@@ -1,3 +1,4 @@
+export default `
 float punctualLightIntensityToIrradianceFactor( const in float lightDistance, const in float cutoffDistance, const in float decayExponent ) {
 
 #if defined ( PHYSICALLY_CORRECT_LIGHTS )
@@ -293,3 +294,4 @@ float GGXRoughnessToBlinnExponent( const in float ggxRoughness ) {
 float BlinnExponentToGGXRoughness( const in float blinnExponent ) {
 	return sqrt( 2.0 / ( blinnExponent + 2.0 ) );
 }
+`;

src/renderers/shaders/ShaderChunk/bumpmap_pars_fragment.glsl → src/renderers/shaders/ShaderChunk/bumpmap_pars_fragment.glsl.js

@@ -1,3 +1,4 @@
+export default `
 #ifdef USE_BUMPMAP
 
 	uniform sampler2D bumpMap;
@@ -42,3 +43,4 @@
 	}
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/clipping_planes_fragment.glsl → src/renderers/shaders/ShaderChunk/clipping_planes_fragment.glsl.js

@@ -1,3 +1,4 @@
+export default `
 #if NUM_CLIPPING_PLANES > 0
 
 	vec4 plane;
@@ -27,3 +28,4 @@
 	#endif
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/clipping_planes_pars_fragment.glsl → src/renderers/shaders/ShaderChunk/clipping_planes_pars_fragment.glsl.js

@@ -1,3 +1,4 @@
+export default `
 #if NUM_CLIPPING_PLANES > 0
 
 	#if ! defined( PHYSICAL ) && ! defined( PHONG ) && ! defined( MATCAP )
@@ -7,3 +8,4 @@
 	uniform vec4 clippingPlanes[ NUM_CLIPPING_PLANES ];
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/clipping_planes_pars_vertex.glsl → src/renderers/shaders/ShaderChunk/clipping_planes_pars_vertex.glsl.js

@@ -1,3 +1,5 @@
+export default `
 #if NUM_CLIPPING_PLANES > 0 && ! defined( PHYSICAL ) && ! defined( PHONG ) && ! defined( MATCAP )
 	varying vec3 vViewPosition;
 #endif
+`;

src/renderers/shaders/ShaderChunk/clipping_planes_vertex.glsl → src/renderers/shaders/ShaderChunk/clipping_planes_vertex.glsl.js

@@ -1,4 +1,5 @@
+export default `
 #if NUM_CLIPPING_PLANES > 0 && ! defined( PHYSICAL ) && ! defined( PHONG ) && ! defined( MATCAP )
 	vViewPosition = - mvPosition.xyz;
 #endif
-
+`;

src/renderers/shaders/ShaderChunk/color_fragment.glsl → src/renderers/shaders/ShaderChunk/color_fragment.glsl.js

@@ -1,5 +1,7 @@
+export default `
 #ifdef USE_COLOR
 
 	diffuseColor.rgb *= vColor;
 
-#endif
+#endif
+`;

src/renderers/shaders/ShaderChunk/color_pars_fragment.glsl → src/renderers/shaders/ShaderChunk/color_pars_fragment.glsl.js

@@ -1,5 +1,7 @@
+export default `
 #ifdef USE_COLOR
 
 	varying vec3 vColor;
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/color_pars_vertex.glsl → src/renderers/shaders/ShaderChunk/color_pars_vertex.glsl.js

@@ -1,5 +1,7 @@
+export default `
 #ifdef USE_COLOR
 
 	varying vec3 vColor;
 
-#endif
+#endif
+`;

src/renderers/shaders/ShaderChunk/color_vertex.glsl → src/renderers/shaders/ShaderChunk/color_vertex.glsl.js

@@ -1,5 +1,7 @@
+export default `
 #ifdef USE_COLOR
 
 	vColor.xyz = color.xyz;
 
-#endif
+#endif
+`;

src/renderers/shaders/ShaderChunk/common.glsl → src/renderers/shaders/ShaderChunk/common.glsl.js

@@ -1,3 +1,4 @@
+export default `
 #define PI 3.14159265359
 #define PI2 6.28318530718
 #define PI_HALF 1.5707963267949
@@ -93,3 +94,4 @@ float linearToRelativeLuminance( const in vec3 color ) {
 	return dot( weights, color.rgb );
 
 }
+`;

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

@@ -1,3 +1,4 @@
+export default `
 #ifdef ENVMAP_TYPE_CUBE_UV
 
 #define cubeUV_textureSize (1024.0)
@@ -126,3 +127,4 @@ vec4 textureCubeUV( sampler2D envMap, vec3 reflectedDirection, float roughness )
 }
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/defaultnormal_vertex.glsl → src/renderers/shaders/ShaderChunk/defaultnormal_vertex.glsl.js

@@ -1,7 +1,9 @@
+export default `
 vec3 transformedNormal = normalMatrix * objectNormal;
 
 #ifdef FLIP_SIDED
 
 	transformedNormal = - transformedNormal;
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/displacementmap_pars_vertex.glsl → src/renderers/shaders/ShaderChunk/displacementmap_pars_vertex.glsl.js

@@ -1,7 +1,9 @@
+export default `
 #ifdef USE_DISPLACEMENTMAP
 
 	uniform sampler2D displacementMap;
 	uniform float displacementScale;
 	uniform float displacementBias;
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/displacementmap_vertex.glsl → src/renderers/shaders/ShaderChunk/displacementmap_vertex.glsl.js

@@ -1,5 +1,7 @@
+export default `
 #ifdef USE_DISPLACEMENTMAP
 
 	transformed += normalize( objectNormal ) * ( texture2D( displacementMap, uv ).x * displacementScale + displacementBias );
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/dithering_fragment.glsl → src/renderers/shaders/ShaderChunk/dithering_fragment.glsl.js

@@ -1,5 +1,7 @@
+export default `
 #if defined( DITHERING )
 
   gl_FragColor.rgb = dithering( gl_FragColor.rgb );
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/dithering_pars_fragment.glsl → src/renderers/shaders/ShaderChunk/dithering_pars_fragment.glsl.js

@@ -1,3 +1,4 @@
+export default `
 #if defined( DITHERING )
 
 	// based on https://www.shadertoy.com/view/MslGR8
@@ -16,3 +17,4 @@
 	}
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/emissivemap_fragment.glsl → src/renderers/shaders/ShaderChunk/emissivemap_fragment.glsl.js

@@ -1,3 +1,4 @@
+export default `
 #ifdef USE_EMISSIVEMAP
 
 	vec4 emissiveColor = texture2D( emissiveMap, vUv );
@@ -7,3 +8,4 @@
 	totalEmissiveRadiance *= emissiveColor.rgb;
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/emissivemap_pars_fragment.glsl → src/renderers/shaders/ShaderChunk/emissivemap_pars_fragment.glsl.js

@@ -1,5 +1,7 @@
+export default `
 #ifdef USE_EMISSIVEMAP
 
 	uniform sampler2D emissiveMap;
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/encodings_fragment.glsl → src/renderers/shaders/ShaderChunk/encodings_fragment.glsl.js

@@ -1 +1,3 @@
+export default `
   gl_FragColor = linearToOutputTexel( gl_FragColor );
+`;

src/renderers/shaders/ShaderChunk/encodings_pars_fragment.glsl → src/renderers/shaders/ShaderChunk/encodings_pars_fragment.glsl.js

@@ -1,3 +1,4 @@
+export default `
 // 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/
 
 vec4 LinearToLinear( in vec4 value ) {
@@ -81,3 +82,4 @@ vec4 LogLuvToLinear( in vec4 value ) {
 	vec3 vRGB = Xp_Y_XYZp.rgb * cLogLuvInverseM;
 	return vec4( max( vRGB, 0.0 ), 1.0 );
 }
+`;

src/renderers/shaders/ShaderChunk/envmap_fragment.glsl → src/renderers/shaders/ShaderChunk/envmap_fragment.glsl.js

@@ -1,3 +1,4 @@
+export default `
 #ifdef USE_ENVMAP
 
 	#if defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( PHONG )
@@ -70,3 +71,4 @@
 	#endif
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/envmap_pars_fragment.glsl → src/renderers/shaders/ShaderChunk/envmap_pars_fragment.glsl.js

@@ -1,3 +1,4 @@
+export default `
 #if defined( USE_ENVMAP ) || defined( PHYSICAL )
 	uniform float reflectivity;
 	uniform float envMapIntensity;
@@ -24,3 +25,4 @@
 	#endif
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/envmap_pars_vertex.glsl → src/renderers/shaders/ShaderChunk/envmap_pars_vertex.glsl.js

@@ -1,3 +1,4 @@
+export default `
 #ifdef USE_ENVMAP
 
 	#if defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( PHONG )
@@ -11,3 +12,4 @@
 	#endif
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/envmap_physical_pars_fragment.glsl → src/renderers/shaders/ShaderChunk/envmap_physical_pars_fragment.glsl.js

@@ -1,3 +1,4 @@
+export default `
 #if defined( USE_ENVMAP ) && defined( PHYSICAL )
 
 	vec3 getLightProbeIndirectIrradiance( /*const in SpecularLightProbe specularLightProbe,*/ const in GeometricContext geometry, const in int maxMIPLevel ) {
@@ -131,3 +132,4 @@
 	}
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/envmap_vertex.glsl → src/renderers/shaders/ShaderChunk/envmap_vertex.glsl.js

@@ -1,3 +1,4 @@
+export default `
 #ifdef USE_ENVMAP
 
 	#if defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( PHONG )
@@ -23,3 +24,4 @@
 	#endif
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/fog_fragment.glsl → src/renderers/shaders/ShaderChunk/fog_fragment.glsl.js

@@ -1,3 +1,4 @@
+export default `
 #ifdef USE_FOG
 
 	#ifdef FOG_EXP2
@@ -13,3 +14,4 @@
 	gl_FragColor.rgb = mix( gl_FragColor.rgb, fogColor, fogFactor );
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/fog_pars_fragment.glsl → src/renderers/shaders/ShaderChunk/fog_pars_fragment.glsl.js

@@ -1,3 +1,4 @@
+export default `
 #ifdef USE_FOG
 
 	uniform vec3 fogColor;
@@ -15,3 +16,4 @@
 	#endif
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/fog_pars_vertex.glsl → src/renderers/shaders/ShaderChunk/fog_pars_vertex.glsl.js

@@ -1,5 +1,7 @@
+export default `
 #ifdef USE_FOG
 
 	varying float fogDepth;
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/fog_vertex.glsl → src/renderers/shaders/ShaderChunk/fog_vertex.glsl.js

@@ -1,5 +1,7 @@
+export default `
 #ifdef USE_FOG
 
 	fogDepth = -mvPosition.z;
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/gradientmap_pars_fragment.glsl → src/renderers/shaders/ShaderChunk/gradientmap_pars_fragment.glsl.js

@@ -1,3 +1,4 @@
+export default `
 #ifdef TOON
 
 	uniform sampler2D gradientMap;
@@ -22,3 +23,4 @@
 	}
 
 #endif
+`;

src/renderers/shaders/ShaderChunk/lightmap_fragment.glsl → src/renderers/shaders/ShaderChunk/lightmap_fragment.glsl.js

@@ -1,5 +1,7 @@
+export default `
 #ifdef USE_LIGHTMAP
 
 	reflectedLight.indirectDiffuse += PI * texture2D( lightMap, vUv2 ).xyz * lightMapIntensity; // factor of PI should not be present; included here to prevent breakage
 
 #endif
+`;