godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added conversions between matrixes in shaders 

(cherry picked from commit ca0a6c3fca)
This commit is contained in:
Chaosus 2018-07-25 18:14:52 +03:00 committed by Rémi Verschelde
parent d2bf31bdad
commit 92fb290f69
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
servers/visual/shader_language.cpp
View File

@ -1376,6 +1376,15 @@ const ShaderLanguage::BuiltinFuncDef ShaderLanguage::builtin_func_defs[] = {
{ "bvec4", TYPE_BVEC4, { TYPE_UVEC4, 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
{ "radians", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } },