Browse Source

Merge pull request #20449 from Chaosus/matrix_conversion

Added conversions between matrixes in shaders
Juan Linietsky 7 years ago
parent
commit
41a0ecb59b
1 changed files with 9 additions and 0 deletions
  1. 9 0
      servers/visual/shader_language.cpp

+ 9 - 0
servers/visual/shader_language.cpp

@@ -1376,6 +1376,15 @@ const ShaderLanguage::BuiltinFuncDef ShaderLanguage::builtin_func_defs[] = {
 	{ "bvec4", TYPE_BVEC4, { TYPE_UVEC4, TYPE_VOID } },
 	{ "bvec4", TYPE_BVEC4, { TYPE_UVEC4, TYPE_VOID } },
 	{ "bvec4", TYPE_BVEC4, { TYPE_VEC4, TYPE_VOID } },
 	{ "bvec4", TYPE_BVEC4, { TYPE_VEC4, TYPE_VOID } },
 
 
+	//conversion between matrixes
+
+	{ "mat2", TYPE_MAT2, { TYPE_MAT3, TYPE_VOID } },
+	{ "mat2", TYPE_MAT2, { TYPE_MAT4, TYPE_VOID } },
+	{ "mat3", TYPE_MAT3, { TYPE_MAT2, TYPE_VOID } },
+	{ "mat3", TYPE_MAT3, { TYPE_MAT4, TYPE_VOID } },
+	{ "mat4", TYPE_MAT4, { TYPE_MAT2, TYPE_VOID } },
+	{ "mat4", TYPE_MAT4, { TYPE_MAT3, TYPE_VOID } },
+
 	//builtins - trigonometry
 	//builtins - trigonometry
 
 
 	{ "radians", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } },
 	{ "radians", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } },