x_ite 4.7.12 → 5.0.0

package/src/x_ite/Browser/Shaders/Shader.js

@@ -48,12 +48,12 @@
 
 
 define ([
-	"x_ite/Browser/Shaders/ShaderSource",
-	"text!assets/shaders/Types.glsl",
-	"x_ite/Browser/Texturing/MultiTextureModeType",
-	"x_ite/Browser/Texturing/MultiTextureSourceType",
-	"x_ite/Browser/Texturing/MultiTextureFunctionType",
-	"x_ite/Browser/Texturing/TextureCoordinateGeneratorModeType",
+   "x_ite/Browser/Shaders/ShaderSource",
+   "text!assets/shaders/Types.glsl",
+   "x_ite/Browser/Texturing/MultiTextureModeType",
+   "x_ite/Browser/Texturing/MultiTextureSourceType",
+   "x_ite/Browser/Texturing/MultiTextureFunctionType",
+   "x_ite/Browser/Texturing/TextureCoordinateGeneratorModeType",
 ],
 function (ShaderSource,
           Types,
@@ -64,157 +64,150 @@ function (ShaderSource,
 {
 "use strict";
 
-	const Shader =
-	{
-		getShaderSource: function (browser, name, source, shadow)
-		{
-			const gl = browser .getContext ();
-
-			source = ShaderSource .get (gl, source);
-
-			const
-				COMMENTS = "\\s+|/\\*[^]*?\\*/|//.*?\\n",
-				VERSION  = "#version\\s+.*?\\n",
-				ANY      = "[^]*";
-
-			const
-				GLSL  = new RegExp ("^((?:" + COMMENTS + ")?(?:" + VERSION + ")?)(" + ANY + ")$"),
-				match = source .match (GLSL);
-
-			if (! match)
-				return source;
-
-			let constants = "";
-
-			constants += "#define X_ITE\n";
-
-			if (browser .getRenderingProperty ("LogarithmicDepthBuffer"))
-				constants += "#define X3D_LOGARITHMIC_DEPTH_BUFFER\n";
-
-			if (gl .getVersion () >= 2 || browser .getExtension ("WEBGL_depth_texture"))
-				constants += "#define X3D_DEPTH_TEXTURE\n";
-
-			if (browser .getMultiTexturing ())
-				constants += "#define X3D_MULTI_TEXTURING\n";
-
-			if (browser .getProjectiveTextureMapping ())
-				constants += "#define X3D_PROJECTIVE_TEXTURE_MAPPING\n";
-
-			if (shadow)
-			{
-				constants += "#define X3D_SHADOWS\n";
-				constants += "#define X3D_PCF_FILTERING\n";
-			}
-
-			let definitions = "";
-
-			definitions += "#define x3d_None 0\n";
-
-			definitions += "#define x3d_Points      0\n";
-			definitions += "#define x3d_Lines       1\n";
-			definitions += "#define x3d_Geometry2D  2\n";
-			definitions += "#define x3d_Geometry3D  3\n";
-
-			definitions += "#define x3d_MaxClipPlanes  " + browser .getMaxClipPlanes () + "\n";
-
-			definitions += "#define x3d_LinearFog        1\n";
-			definitions += "#define x3d_ExponentialFog   2\n";
-			definitions += "#define x3d_Exponential2Fog  3\n";
-
-			definitions += "#define x3d_MaxLights         " + browser .getMaxLights () + "\n";
-			definitions += "#define x3d_DirectionalLight  1\n";
-			definitions += "#define x3d_PointLight        2\n";
-			definitions += "#define x3d_SpotLight         3\n";
-
-			definitions += "#define x3d_MaxTextures                " + browser .getMaxTextures () + "\n";
-			definitions += "#define x3d_TextureType2D              2\n";
-			definitions += "#define x3d_TextureType3D              3\n";
-			definitions += "#define x3d_TextureTypeCubeMapTexture  4\n";
-
-			definitions += "#define x3d_PointColor           0\n";
-			definitions += "#define x3d_TextureColor         1\n";
-			definitions += "#define x3d_TextureAndPointColor 2\n";
-
-			definitions += "#define x3d_Replace                   " + MultiTextureModeType .REPLACE                   + "\n";
-			definitions += "#define x3d_Modulate                  " + MultiTextureModeType .MODULATE                  + "\n";
-			definitions += "#define x3d_Modulate2X                " + MultiTextureModeType .MODULATE2X                + "\n";
-			definitions += "#define x3d_Modulate4X                " + MultiTextureModeType .MODULATE4X                + "\n";
-			definitions += "#define x3d_Add                       " + MultiTextureModeType .ADD                       + "\n";
-			definitions += "#define x3d_AddSigned                 " + MultiTextureModeType .ADDSIGNED                 + "\n";
-			definitions += "#define x3d_AddSigned2X               " + MultiTextureModeType .ADDSIGNED2X               + "\n";
-			definitions += "#define x3d_AddSmooth                 " + MultiTextureModeType .ADDSMOOTH                 + "\n";
-			definitions += "#define x3d_Subtract                  " + MultiTextureModeType .SUBTRACT                  + "\n";
-			definitions += "#define x3d_BlendDiffuseAlpha         " + MultiTextureModeType .BLENDDIFFUSEALPHA         + "\n";
-			definitions += "#define x3d_BlendTextureAlpha         " + MultiTextureModeType .BLENDTEXTUREALPHA         + "\n";
-			definitions += "#define x3d_BlendFactorAlpha          " + MultiTextureModeType .BLENDFACTORALPHA          + "\n";
-			definitions += "#define x3d_BlendCurrentAlpha         " + MultiTextureModeType .BLENDCURRENTALPHA         + "\n";
-			definitions += "#define x3d_ModulateAlphaAddColor     " + MultiTextureModeType .MODULATEALPHA_ADDCOLOR    + "\n";
-			definitions += "#define x3d_ModulateInvAlphaAddColor  " + MultiTextureModeType .MODULATEINVALPHA_ADDCOLOR + "\n";
-			definitions += "#define x3d_ModulateInvColorAddAlpha  " + MultiTextureModeType .MODULATEINVCOLOR_ADDALPHA + "\n";
-			definitions += "#define x3d_DotProduct3               " + MultiTextureModeType .DOTPRODUCT3               + "\n";
-			definitions += "#define x3d_SelectArg1                " + MultiTextureModeType .SELECTARG1                + "\n";
-			definitions += "#define x3d_SelectArg2                " + MultiTextureModeType .SELECTARG2                + "\n";
-			definitions += "#define x3d_Off                       " + MultiTextureModeType .OFF                       + "\n";
-
-			definitions += "#define x3d_Diffuse  " + MultiTextureSourceType .DIFFUSE  + "\n";
-			definitions += "#define x3d_Specular " + MultiTextureSourceType .SPECULAR + "\n";
-			definitions += "#define x3d_Factor   " + MultiTextureSourceType .FACTOR   + "\n";
-
-			definitions += "#define x3d_Complement     " + MultiTextureFunctionType .COMPLEMENT     + "\n";
-			definitions += "#define x3d_AlphaReplicate " + MultiTextureFunctionType .ALPHAREPLICATE + "\n";
-
-			definitions += "#define x3d_Sphere                      " + TextureCoordinateGeneratorModeType .SPHERE                      + "\n";
-			definitions += "#define x3d_CameraSpaceNormal           " + TextureCoordinateGeneratorModeType .CAMERASPACENORMAL           + "\n";
-			definitions += "#define x3d_CameraSpacePosition         " + TextureCoordinateGeneratorModeType .CAMERASPACEPOSITION         + "\n";
-			definitions += "#define x3d_CameraSpaceReflectionVector " + TextureCoordinateGeneratorModeType .CAMERASPACEREFLECTIONVECTOR + "\n";
-			definitions += "#define x3d_SphereLocal                 " + TextureCoordinateGeneratorModeType .SPHERE_LOCAL                + "\n";
-			definitions += "#define x3d_Coord                       " + TextureCoordinateGeneratorModeType .COORD                       + "\n";
-			definitions += "#define x3d_CoordEye                    " + TextureCoordinateGeneratorModeType .COORD_EYE                   + "\n";
-			definitions += "#define x3d_Noise                       " + TextureCoordinateGeneratorModeType .NOISE                       + "\n";
-			definitions += "#define x3d_NoiseEye                    " + TextureCoordinateGeneratorModeType .NOISE_EYE                   + "\n";
-			definitions += "#define x3d_SphereReflect               " + TextureCoordinateGeneratorModeType .SPHERE_REFLECT              + "\n";
-			definitions += "#define x3d_SphereReflectLocal          " + TextureCoordinateGeneratorModeType .SPHERE_REFLECT_LOCAL        + "\n";
-
-			// Legacy
-			definitions += "#define x3d_GeometryPoints  0\n";
-			definitions += "#define x3d_GeometryLines   1\n";
-			definitions += "#define x3d_NoneClipPlane   vec4 (88.0, 51.0, 68.0, 33.0)\n"; // ASCII »X3D!«
-			definitions += "#define x3d_NoneFog         0\n";
-			definitions += "#define x3d_NoneLight       0\n";
-			definitions += "#define x3d_NoneTexture     0\n";
-
-			depreciatedWarning (source, "x3d_GeometryPoints", "x3d_Points");
-			depreciatedWarning (source, "x3d_GeometryLines",  "x3d_Lines");
-			depreciatedWarning (source, "x3d_NoneClipPlane",  "x3d_NumClipPlanes");
-			depreciatedWarning (source, "x3d_NoneFog",        "x3d_None");
-			depreciatedWarning (source, "x3d_NoneLight",      "x3d_NumLights");
-			depreciatedWarning (source, "x3d_NoneTexture",    "x3d_NumTextures");
-
-			// Adjust precision of struct types;
-
-			const
-				matchFloat       = source .match (/\s*precision\s+(lowp|mediump|highp)\s+float\s*;/),
-				matchInt         = source .match (/\s*precision\s+(lowp|mediump|highp)\s+int\s*;/),
-				precisionFloat   = matchFloat ? matchFloat [1] : "mediump",
-				precisionInt     = matchInt   ? matchInt   [1] : "mediump";
-
-			const types = Types
-				.replace (/mediump\s+(float|vec2|vec3|mat3|mat4)/g, precisionFloat + " $1")
-				.replace (/mediump\s+(int)/g,                       precisionInt   + " $1");
-
-			const lines = (match [1] .match (/\n/g) || [ ]) .length + 1;
-
-			return match [1] + constants + definitions + types + "#line " + lines + "\n" + match [2];
-		},
-	};
-
-	function depreciatedWarning (source, depreciated, current)
-	{
-		if (source .indexOf (depreciated) === -1)
-			return;
-
-		console .warn ("Use of '" + depreciated + "' is depreciated, use '" + current + "' instead. See https://create3000.github.io/x_ite/Custom-Shaders.html.");
-	}
-
-	return Shader;
+   const Shader =
+   {
+      getShaderSource: function (browser, name, source, options)
+      {
+         const gl = browser .getContext ();
+
+         source = ShaderSource .get (gl, source);
+
+         const
+            COMMENTS = "\\s+|/\\*[^]*?\\*/|//.*?\\n",
+            VERSION  = "#version\\s+.*?\\n",
+            ANY      = "[^]*";
+
+         const
+            GLSL  = new RegExp ("^((?:" + COMMENTS + ")?(?:" + VERSION + ")?)(" + ANY + ")$"),
+            match = source .match (GLSL);
+
+         if (! match)
+            return source;
+
+         let constants = "";
+
+         constants += "#define X_ITE\n";
+
+         if (browser .getRenderingProperty ("LogarithmicDepthBuffer"))
+            constants += "#define X3D_LOGARITHMIC_DEPTH_BUFFER\n";
+
+         if (gl .getVersion () >= 2 || browser .getExtension ("WEBGL_depth_texture"))
+            constants += "#define X3D_DEPTH_TEXTURE\n";
+
+         if (browser .getMultiTexturing ())
+            constants += "#define X3D_MULTI_TEXTURING\n";
+
+         if (browser .getProjectiveTextureMapping ())
+            constants += "#define X3D_PROJECTIVE_TEXTURE_MAPPING\n";
+
+         for (const option of options)
+            constants += "#define " + option + "\n";
+
+         let definitions = "";
+
+         definitions += "#define x3d_None 0\n";
+
+         definitions += "#define x3d_Points      0\n";
+         definitions += "#define x3d_Lines       1\n";
+         definitions += "#define x3d_Geometry2D  2\n";
+         definitions += "#define x3d_Geometry3D  3\n";
+
+         definitions += "#define x3d_MaxClipPlanes  " + browser .getMaxClipPlanes () + "\n";
+
+         definitions += "#define x3d_LinearFog        1\n";
+         definitions += "#define x3d_ExponentialFog   2\n";
+         definitions += "#define x3d_Exponential2Fog  3\n";
+
+         definitions += "#define x3d_MaxLights         " + browser .getMaxLights () + "\n";
+         definitions += "#define x3d_DirectionalLight  1\n";
+         definitions += "#define x3d_PointLight        2\n";
+         definitions += "#define x3d_SpotLight         3\n";
+
+         definitions += "#define x3d_MaxTextures                " + browser .getMaxTextures () + "\n";
+         definitions += "#define x3d_TextureType2D              2\n";
+         definitions += "#define x3d_TextureType3D              3\n";
+         definitions += "#define x3d_TextureTypeCube  4\n";
+
+         definitions += "#define x3d_Replace                   " + MultiTextureModeType .REPLACE                   + "\n";
+         definitions += "#define x3d_Modulate                  " + MultiTextureModeType .MODULATE                  + "\n";
+         definitions += "#define x3d_Modulate2X                " + MultiTextureModeType .MODULATE2X                + "\n";
+         definitions += "#define x3d_Modulate4X                " + MultiTextureModeType .MODULATE4X                + "\n";
+         definitions += "#define x3d_Add                       " + MultiTextureModeType .ADD                       + "\n";
+         definitions += "#define x3d_AddSigned                 " + MultiTextureModeType .ADDSIGNED                 + "\n";
+         definitions += "#define x3d_AddSigned2X               " + MultiTextureModeType .ADDSIGNED2X               + "\n";
+         definitions += "#define x3d_AddSmooth                 " + MultiTextureModeType .ADDSMOOTH                 + "\n";
+         definitions += "#define x3d_Subtract                  " + MultiTextureModeType .SUBTRACT                  + "\n";
+         definitions += "#define x3d_BlendDiffuseAlpha         " + MultiTextureModeType .BLENDDIFFUSEALPHA         + "\n";
+         definitions += "#define x3d_BlendTextureAlpha         " + MultiTextureModeType .BLENDTEXTUREALPHA         + "\n";
+         definitions += "#define x3d_BlendFactorAlpha          " + MultiTextureModeType .BLENDFACTORALPHA          + "\n";
+         definitions += "#define x3d_BlendCurrentAlpha         " + MultiTextureModeType .BLENDCURRENTALPHA         + "\n";
+         definitions += "#define x3d_ModulateAlphaAddColor     " + MultiTextureModeType .MODULATEALPHA_ADDCOLOR    + "\n";
+         definitions += "#define x3d_ModulateInvAlphaAddColor  " + MultiTextureModeType .MODULATEINVALPHA_ADDCOLOR + "\n";
+         definitions += "#define x3d_ModulateInvColorAddAlpha  " + MultiTextureModeType .MODULATEINVCOLOR_ADDALPHA + "\n";
+         definitions += "#define x3d_DotProduct3               " + MultiTextureModeType .DOTPRODUCT3               + "\n";
+         definitions += "#define x3d_SelectArg1                " + MultiTextureModeType .SELECTARG1                + "\n";
+         definitions += "#define x3d_SelectArg2                " + MultiTextureModeType .SELECTARG2                + "\n";
+         definitions += "#define x3d_Off                       " + MultiTextureModeType .OFF                       + "\n";
+
+         definitions += "#define x3d_Diffuse  " + MultiTextureSourceType .DIFFUSE  + "\n";
+         definitions += "#define x3d_Specular " + MultiTextureSourceType .SPECULAR + "\n";
+         definitions += "#define x3d_Factor   " + MultiTextureSourceType .FACTOR   + "\n";
+
+         definitions += "#define x3d_Complement     " + MultiTextureFunctionType .COMPLEMENT     + "\n";
+         definitions += "#define x3d_AlphaReplicate " + MultiTextureFunctionType .ALPHAREPLICATE + "\n";
+
+         definitions += "#define x3d_Sphere                      " + TextureCoordinateGeneratorModeType .SPHERE                      + "\n";
+         definitions += "#define x3d_CameraSpaceNormal           " + TextureCoordinateGeneratorModeType .CAMERASPACENORMAL           + "\n";
+         definitions += "#define x3d_CameraSpacePosition         " + TextureCoordinateGeneratorModeType .CAMERASPACEPOSITION         + "\n";
+         definitions += "#define x3d_CameraSpaceReflectionVector " + TextureCoordinateGeneratorModeType .CAMERASPACEREFLECTIONVECTOR + "\n";
+         definitions += "#define x3d_SphereLocal                 " + TextureCoordinateGeneratorModeType .SPHERE_LOCAL                + "\n";
+         definitions += "#define x3d_Coord                       " + TextureCoordinateGeneratorModeType .COORD                       + "\n";
+         definitions += "#define x3d_CoordEye                    " + TextureCoordinateGeneratorModeType .COORD_EYE                   + "\n";
+         definitions += "#define x3d_Noise                       " + TextureCoordinateGeneratorModeType .NOISE                       + "\n";
+         definitions += "#define x3d_NoiseEye                    " + TextureCoordinateGeneratorModeType .NOISE_EYE                   + "\n";
+         definitions += "#define x3d_SphereReflect               " + TextureCoordinateGeneratorModeType .SPHERE_REFLECT              + "\n";
+         definitions += "#define x3d_SphereReflectLocal          " + TextureCoordinateGeneratorModeType .SPHERE_REFLECT_LOCAL        + "\n";
+
+         // Legacy
+         definitions += "#define x3d_GeometryPoints  0\n";
+         definitions += "#define x3d_GeometryLines   1\n";
+         definitions += "#define x3d_NoneClipPlane   vec4 (88.0, 51.0, 68.0, 33.0)\n"; // ASCII »X3D!«
+         definitions += "#define x3d_NoneFog         0\n";
+         definitions += "#define x3d_NoneLight       0\n";
+         definitions += "#define x3d_NoneTexture     0\n";
+
+         depreciatedWarning (source, "x3d_GeometryPoints", "x3d_Points");
+         depreciatedWarning (source, "x3d_GeometryLines",  "x3d_Lines");
+         depreciatedWarning (source, "x3d_NoneClipPlane",  "x3d_NumClipPlanes");
+         depreciatedWarning (source, "x3d_NoneFog",        "x3d_None");
+         depreciatedWarning (source, "x3d_NoneLight",      "x3d_NumLights");
+         depreciatedWarning (source, "x3d_NoneTexture",    "x3d_NumTextures");
+
+         // Adjust precision of struct types;
+
+         const
+            matchFloat       = source .match (/\s*precision\s+(lowp|mediump|highp)\s+float\s*;/),
+            matchInt         = source .match (/\s*precision\s+(lowp|mediump|highp)\s+int\s*;/),
+            precisionFloat   = matchFloat ? matchFloat [1] : "mediump",
+            precisionInt     = matchInt   ? matchInt   [1] : "mediump";
+
+         const types = Types
+            .replace (/mediump\s+(float|vec2|vec3|mat3|mat4)/g, precisionFloat + " $1")
+            .replace (/mediump\s+(int)/g,                       precisionInt   + " $1");
+
+         const lines = (match [1] .match (/\n/g) || [ ]) .length + 1;
+
+         return match [1] + constants + definitions + types + "#line " + lines + "\n" + match [2];
+      },
+   };
+
+   function depreciatedWarning (source, depreciated, current)
+   {
+      if (source .indexOf (depreciated) === -1)
+         return;
+
+      console .warn ("Use of '" + depreciated + "' is depreciated, use '" + current + "' instead. See https://create3000.github.io/x_ite/Custom-Shaders.html.");
+   }
+
+   return Shader;
 });

package/src/x_ite/Browser/Shaders/ShaderSource.js

@@ -48,93 +48,111 @@
 
 
 define ([
-	"text!assets/shaders/webgl1/include/ClipPlanes.glsl",
-	"text!assets/shaders/webgl1/include/Fog.glsl",
-	"text!assets/shaders/webgl1/include/Hatch.glsl",
-	"text!assets/shaders/webgl1/include/Pack.glsl",
-	"text!assets/shaders/webgl1/include/Perlin.glsl",
-	"text!assets/shaders/webgl1/include/Shadow.glsl",
-	"text!assets/shaders/webgl1/include/Texture.glsl",
-	"text!assets/shaders/webgl2/include/ClipPlanes.glsl",
-	"text!assets/shaders/webgl2/include/Fog.glsl",
-	"text!assets/shaders/webgl2/include/Hatch.glsl",
-	"text!assets/shaders/webgl2/include/Pack.glsl",
-	"text!assets/shaders/webgl2/include/Perlin.glsl",
-	"text!assets/shaders/webgl2/include/Shadow.glsl",
-	"text!assets/shaders/webgl2/include/Texture.glsl",
+   "text!assets/shaders/webgl1/include/ClipPlanes.glsl",
+   "text!assets/shaders/webgl1/include/Colors.glsl",
+   "text!assets/shaders/webgl1/include/Fog.glsl",
+   "text!assets/shaders/webgl1/include/Hatch.glsl",
+   "text!assets/shaders/webgl1/include/Normal.glsl",
+   "text!assets/shaders/webgl1/include/Pack.glsl",
+   "text!assets/shaders/webgl1/include/Perlin.glsl",
+   "text!assets/shaders/webgl1/include/Shadow.glsl",
+   "text!assets/shaders/webgl1/include/SpotFactor.glsl",
+   "text!assets/shaders/webgl1/include/Texture.glsl",
+   "text!assets/shaders/webgl2/include/ClipPlanes.glsl",
+   "text!assets/shaders/webgl2/include/Colors.glsl",
+   "text!assets/shaders/webgl2/include/Fog.glsl",
+   "text!assets/shaders/webgl2/include/Hatch.glsl",
+   "text!assets/shaders/webgl2/include/Normal.glsl",
+   "text!assets/shaders/webgl2/include/Pack.glsl",
+   "text!assets/shaders/webgl2/include/Perlin.glsl",
+   "text!assets/shaders/webgl2/include/Shadow.glsl",
+   "text!assets/shaders/webgl2/include/SpotFactor.glsl",
+   "text!assets/shaders/webgl2/include/Texture.glsl",
 ],
 function (ClipPlanes1,
+          Colors1,
           Fog1,
           Hatch1,
+          Normal1,
           Pack1,
           Perlin1,
           Shadow1,
+          SpotFactor1,
           Texture1,
           ClipPlanes2,
+          Colors2,
           Fog2,
           Hatch2,
+          Normal2,
           Pack2,
           Perlin2,
           Shadow2,
+          SpotFactor2,
           Texture2)
 {
 "use strict";
 
-	const include = /^#pragma\s+X3D\s+include\s+".*?([^\/]+)\.glsl"\s*$/;
+   const include = /^#pragma\s+X3D\s+include\s+".*?([^\/]+)\.glsl"\s*$/;
 
-	const includes1 = {
-		ClipPlanes: ClipPlanes1,
-		Fog: Fog1,
-		Hatch: Hatch1,
-		Pack: Pack1,
-		Perlin: Perlin1,
-		Shadow: Shadow1,
-		Texture: Texture1,
-	};
+   const includes1 = {
+      ClipPlanes: ClipPlanes1,
+      Colors: Colors1,
+      Fog: Fog1,
+      Hatch: Hatch1,
+      Normal: Normal1,
+      Pack: Pack1,
+      Perlin: Perlin1,
+      Shadow: Shadow1,
+      SpotFactor: SpotFactor1,
+      Texture: Texture1,
+   };
 
-	const includes2 = {
-		ClipPlanes: ClipPlanes2,
-		Fog: Fog2,
-		Hatch: Hatch2,
-		Pack: Pack2,
-		Perlin: Perlin2,
-		Shadow: Shadow2,
-		Texture: Texture2,
-	};
+   const includes2 = {
+      ClipPlanes: ClipPlanes2,
+      Colors: Colors2,
+      Fog: Fog2,
+      Hatch: Hatch2,
+      Normal: Normal2,
+      Pack: Pack2,
+      Perlin: Perlin2,
+      Shadow: Shadow2,
+      SpotFactor: SpotFactor2,
+      Texture: Texture2,
+   };
 
-	const ShaderSource =
-	{
-		get: function (gl, source)
-		{
-			const
-				includes = gl .getVersion () <= 1 ? includes1 : includes2,
-				lines    = source .split ("\n");
+   const ShaderSource =
+   {
+      get: function (gl, source)
+      {
+         const
+            includes = gl .getVersion () <= 1 ? includes1 : includes2,
+            lines    = source .split ("\n");
 
-			source = "";
+         source = "";
 
-			for (let i = 0, length = lines .length; i < length; ++ i)
-			{
-				const
-					line  = lines [i],
-					match = line .match (include);
+         for (let i = 0, length = lines .length; i < length; ++ i)
+         {
+            const
+               line  = lines [i],
+               match = line .match (include);
 
-				if (match)
-				{
-					source += "#line 1\n";
-					source += this .get (gl, includes [match [1]]);
-					source += "\n";
-					source += "#line " + (i + 1) + "\n";
-				}
-				else
-				{
-					source += line;
-					source += "\n";
-				}
-			}
+            if (match)
+            {
+               source += "#line 1\n";
+               source += this .get (gl, includes [match [1]]);
+               source += "\n";
+               source += "#line " + (i + 2) + "\n";
+            }
+            else
+            {
+               source += line;
+               source += "\n";
+            }
+         }
 
-			return source;
-		},
-	};
+         return source;
+      },
+   };
 
-	return ShaderSource;
+   return ShaderSource;
 });