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

Merge pull request #20449 from Chaosus/matrix_conversion 

Added conversions between matrixes in shaders
This commit is contained in:
Juan Linietsky 2018-07-25 12:23:57 -03:00 committed by GitHub
parent 95d9302248 ca0a6c3fca
commit 41a0ecb59b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 } },