Shader: Add support for logical and/or

include/Nazara/Shader/Ast/Enums.hpp

@@ -34,16 +34,18 @@ namespace Nz
 
 		enum class BinaryType
 		{
-			Add,       //< +
-			CompEq,    //< ==
-			CompGe,    //< >=
-			CompGt,    //< >
-			CompLe,    //< <=
-			CompLt,    //< <
-			CompNe,    //< <=
-			Divide,    //< /
-			Multiply,  //< *
-			Subtract,  //< -
+			Add,        //< +
+			CompEq,     //< ==
+			CompGe,     //< >=
+			CompGt,     //< >
+			CompLe,     //< <=
+			CompLt,     //< <
+			CompNe,     //< <=
+			Divide,     //< /
+			Multiply,   //< *
+			LogicalAnd, //< &&
+			LogicalOr,  //< ||
+			Subtract,   //< -
 		};
 
 		enum class BuiltinEntry

include/Nazara/Shader/ShaderLangTokenList.hpp

@@ -36,6 +36,8 @@ NAZARA_SHADERLANG_TOKEN(If)
 NAZARA_SHADERLANG_TOKEN(LessThan)
 NAZARA_SHADERLANG_TOKEN(LessThanEqual)
 NAZARA_SHADERLANG_TOKEN(Let)
+NAZARA_SHADERLANG_TOKEN(LogicalAnd)
+NAZARA_SHADERLANG_TOKEN(LogicalOr)
 NAZARA_SHADERLANG_TOKEN(Multiply)
 NAZARA_SHADERLANG_TOKEN(Minus)
 NAZARA_SHADERLANG_TOKEN(NotEqual)