Merge pull request #7 from nicolaichuk/master

- Added .slfx/.sfx file extensions
- Added MPLex
- Added support for parsing white space after '#' symbols
- Added some more colour settings

.gitignore

@@ -3,4 +3,8 @@ NShaderVS.sln.DotSettings.user
 NShaderVS/obj/
 NShaderVS/bin/
 *.vtcache
-*.user
+*.user
+/.vs
+/NShaderVS/packages.config
+/packages/
+/NShaderVS/Fakes/

NShaderCommon/GLSLKeywords.map

@@ -1,4 +1,4 @@
 INTRINSIC= abs	acos	all	any	asin	atan	ceil	clamp	cos	cross	degrees	dFdx	dFdy	distance	dot	equal	exp	exp2	faceforward	floor	fract	ftransform	fwidth	greaterThan	greaterThanEqual	inversesqrt	length	lessThan	lessThanEqual	log	log2	matrixcompmult	max	min	mix	mod	noise1	noise2	noise3	noise4	normalize	not	notEqual	pow	radians	reflect	refract	shadow1D	shadow1DLod	shadow1DProj	shadow1DProjLod	shadow2D	shadow2DLod	shadow2DProj	shadow2DProjLod	sign	sin	smoothstep	sqrt	step	tan	texelFetch	texelFetchOffset	texture1D	texture1DLod	texture1DProj	texture1DProjLod	texture2D	texture2DLod	texture2DProj	texture2DProjLod	texture3D	texture3DLod	texture3DProj	texture3DProjLod	textureCube	textureCubeLod	textureGrad	textureGradOffset	textureLod	textureLodOffset	textureOffset	textureProj	textureProjGrad	textureProjGradOffset	textureProjLod	textureProjLodOffset	textureProjOffset	textureSize imageLoad imageStore	barrier	memoryBarrierShared	groupMemoryBarrier	memoryBarrierImage	memoryBarrierBuffer
 KEYWORD= active	asm	attribute	break	case	cast	centroid	class	common	const	continue	default	discard	do	else	enum	extern	external	false	filter	fixed	flat	for	foreach	goto	highp	if	in	inline	inout	input	interface	invariant	layout	lowp	mediump	namespace	noinline	noperspective	out	output	packed	partition	patch	precision	public	return	row_major	sample	sizeof	smooth	static	struct	subroutine	superp	switch	template	this	true	typedef	uniform	union	using	varying	volatile	while	false	true	shared	readonly writeonly	coherent volatile restrict
-KEYWORD_SPECIAL= gl_BackColor	gl_BackLightModelProduct	gl_BackLightProduct	gl_BackMaterial	gl_BackSecondaryColor	gl_ClipPlane	gl_ClipVertex	gl_Color	gl_DepthRange	gl_DepthRangeParameters	gl_EyePlaneQ	gl_EyePlaneR	gl_EyePlaneS	gl_EyePlaneT	gl_Fog	gl_FogCoord	gl_FogFragCoord	gl_FogParameters	gl_FragColor	gl_FragCoord	gl_FragData	gl_FragDepth	gl_FrontColor	gl_FrontFacing	gl_FrontLightModelProduct	gl_FrontLightProduct	gl_FrontMaterial	gl_FrontSecondaryColor	gl_LightModel	gl_LightModelParameters	gl_LightModelProducts	gl_LightProducts	gl_LightSource	gl_LightSourceParameters	gl_MaterialParameters	gl_MaxClipPlanes	gl_MaxCombinedTextureImageUnits	gl_MaxDrawBuffers	gl_MaxFragmentUniformComponents	gl_MaxLights	gl_MaxTextureCoords	gl_MaxTextureImageUnits	gl_MaxTextureUnits	gl_MaxVaryingFloats	gl_MaxVertexAttribs	gl_MaxVertexTextureImageUnits	gl_MaxVertexUniformComponents	gl_ModelViewMatrix	gl_ModelViewMatrixInverse	gl_ModelViewMatrixInverseTranspose	gl_ModelViewMatrixTranspose	gl_ModelViewProjectionMatrix	gl_ModelViewProjectionMatrixInverse	gl_ModelViewProjectionMatrixInverseTranspose	gl_ModelViewProjectionMatrixTranspose	gl_MultiTexCoord0	gl_MultiTexCoord1	gl_MultiTexCoord10	gl_MultiTexCoord11	gl_MultiTexCoord2	gl_MultiTexCoord3	gl_MultiTexCoord4	gl_MultiTexCoord5	gl_MultiTexCoord6	gl_MultiTexCoord7	gl_MultiTexCoord8	gl_MultiTexCoord9	gl_Normal	gl_NormalMatrix	gl_NormalScale	gl_ObjectPlaneQ	gl_ObjectPlaneR	gl_ObjectPlaneS	gl_ObjectPlaneT	gl_Point	gl_PointParameters	gl_PointSize	gl_Position	gl_ProjectionMatrix	gl_ProjectionMatrixInverse	gl_ProjectionMatrixInverseTranspose	gl_ProjectionMatrixTranspose	gl_SecondaryColor	gl_TexCoord	gl_TextureEnvColor	gl_TextureMatrix	gl_TextureMatrixInverse	gl_TextureMatrixInverseTranspose	gl_TextureMatrixTranspose	gl_Vertex	gl_NumWorkGroups	gl_WorkGroupSize	gl_WorkGroupID	gl_LocalInvocationID	gl_GlobalInvocationID	gl_LocalInvocationIndex
+KEYWORD_SPECIAL= gl_BackColor	gl_BackLightModelProduct	gl_BackLightProduct	gl_BackMaterial	gl_BackSecondaryColor	gl_ClipDistance	gl_ClipPlane	gl_ClipVertex	gl_Color	gl_DepthRange	gl_DepthRangeParameters	gl_EyePlaneQ	gl_EyePlaneR	gl_EyePlaneS	gl_EyePlaneT	gl_Fog	gl_FogCoord	gl_FogFragCoord	gl_FogParameters	gl_FragColor	gl_FragCoord	gl_FragData	gl_FragDepth	gl_FrontColor	gl_FrontFacing	gl_FrontLightModelProduct	gl_FrontLightProduct	gl_FrontMaterial	gl_FrontSecondaryColor	gl_GlobalInvocationID	gl_in	gl_InstanceID	gl_InvocationID	gl_Layer?	gl_LightModel	gl_LightModelParameters	gl_LightModelProducts	gl_LightProducts	gl_LightSource	gl_LightSourceParameters	gl_LocalInvocationID	gl_LocalInvocationIndex	gl_MaterialParameters	gl_MaxClipPlanes	gl_MaxCombinedTextureImageUnits	gl_MaxDrawBuffers	gl_MaxFragmentUniformComponents	gl_MaxLights	gl_MaxPatchVertices	gl_MaxTextureCoords	gl_MaxTextureImageUnits	gl_MaxTextureUnits	gl_MaxVaryingFloats	gl_MaxVertexAttribs	gl_MaxVertexTextureImageUnits	gl_MaxVertexUniformComponents	gl_ModelViewMatrix	gl_ModelViewMatrixInverse	gl_ModelViewMatrixInverseTranspose	gl_ModelViewMatrixTranspose	gl_ModelViewProjectionMatrix	gl_ModelViewProjectionMatrixInverse	gl_ModelViewProjectionMatrixInverseTranspose	gl_ModelViewProjectionMatrixTranspose	gl_MultiTexCoord0	gl_MultiTexCoord1	gl_MultiTexCoord10	gl_MultiTexCoord11	gl_MultiTexCoord2	gl_MultiTexCoord3	gl_MultiTexCoord4	gl_MultiTexCoord5	gl_MultiTexCoord6	gl_MultiTexCoord7	gl_MultiTexCoord8	gl_MultiTexCoord9	gl_Normal	gl_NormalMatrix	gl_NormalScale	gl_NumSamples	gl_NumWorkGroups	gl_out	gl_ObjectPlaneQ	gl_ObjectPlaneR	gl_ObjectPlaneS	gl_ObjectPlaneT	gl_PatchVerticesIn?	gl_PrimitiveID	gl_PrimitiveIDIn?	gl_Point	gl_PointCoord?		gl_PointParameters	gl_PointSize	gl_Position	gl_ProjectionMatrix	gl_ProjectionMatrixInverse	gl_ProjectionMatrixInverseTranspose	gl_ProjectionMatrixTranspose	gl_SampleID	gl_SampleMaskIn	gl_SamplePosition	gl_SecondaryColor	gl_TessCoord	gl_TessLevelInner	gl_TessLevelOuter	gl_TexCoord	gl_TextureEnvColor	gl_TextureMatrix	gl_TextureMatrixInverse	gl_TextureMatrixInverseTranspose	gl_TextureMatrixTranspose	gl_Vertex	 gl_VertexID	gl_ViewportIndex	gl_WorkGroupID	gl_WorkGroupSize
 TYPE= bool	bvec2	bvec3	bvec4	dmat2	dmat2x2	dmat2x3	dmat2x4	dmat3	dmat3x2	dmat3x3	dmat3x4	dmat4	dmat4x2	dmat4x3	dmat4x4	double	dvec2	dvec3	dvec4	float	fvec2	fvec3	fvec4	half	hvec2	hvec3	hvec4	int	isampler1D	isampler1DArray	isampler2D	isampler2DArray	isampler2DMS	isampler2DMSArray	isampler2DRect	isampler3D	isamplerBuffer	isamplerCube	isamplerCubeArray	ivec2	ivec3	ivec4	long	mat2	mat2x2	mat2x3	mat2x4	mat3	mat3x2	mat3x3	mat3x4	mat4	mat4x2	mat4x3	mat4x4	sampler1D	sampler1DArray	sampler1DArrayShadow	sampler1DShadow	sampler2D	sampler2DArray	sampler2DArrayShadow	sampler2DMS	sampler2DMSArray	sampler2DRect	sampler2DRectShadow	sampler2DShadow	sampler3D	sampler3DRect	samplerBuffer	samplerCube	samplerCubeArray	samplerCubeArrayShadow	samplerCubeShadow	short	uint	unsigned	usampler1D	usampler1DArray	usampler2D	usampler2DArray	usampler2DMS	usampler2DMSArray	usampler2DRect	usampler3D	usamplerBuffer	usamplerCube	usamplerCubeArray	uvec2	uvec3	uvec4	vec2	vec3	vec4	void	image2D	uimage2D	imageCube	buffer