asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #13294 from RaXaR/master

Browse source 
Added overloads of vector parameters for shader Trig functions.
This commit is contained in:
Rémi Verschelde 2017-11-27 00:58:14 +01:00 committed by GitHub
commit 8dc89e787c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
servers/visual/shader_language.cpp
View file

@ -1352,15 +1352,54 @@ const ShaderLanguage::BuiltinFuncDef ShaderLanguage::builtin_func_defs[] = {
//builtins - trigonometry //builtins - trigonometry
{ "sin", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } }, { "sin", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } },
{ "sin", TYPE_VEC2, { TYPE_VEC2, TYPE_VOID } },
{ "sin", TYPE_VEC3, { TYPE_VEC3, TYPE_VOID } },
{ "sin", TYPE_VEC4, { TYPE_VEC4, TYPE_VOID } },
{ "cos", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } }, { "cos", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } },
{ "cos", TYPE_VEC2, { TYPE_VEC2, TYPE_VOID } },
{ "cos", TYPE_VEC3, { TYPE_VEC3, TYPE_VOID } },
{ "cos", TYPE_VEC4, { TYPE_VEC4, TYPE_VOID } },
{ "tan", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } }, { "tan", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } },
{ "tan", TYPE_VEC2, { TYPE_VEC2, TYPE_VOID } },
{ "tan", TYPE_VEC3, { TYPE_VEC3, TYPE_VOID } },
{ "tan", TYPE_VEC4, { TYPE_VEC4, TYPE_VOID } },
{ "asin", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } }, { "asin", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } },
{ "asin", TYPE_VEC2, { TYPE_VEC2, TYPE_VOID } },
{ "asin", TYPE_VEC3, { TYPE_VEC3, TYPE_VOID } },
{ "asin", TYPE_VEC4, { TYPE_VEC4, TYPE_VOID } },
{ "acos", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } }, { "acos", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } },
{ "acos", TYPE_VEC2, { TYPE_VEC2, TYPE_VOID } },
{ "acos", TYPE_VEC3, { TYPE_VEC3, TYPE_VOID } },
{ "acos", TYPE_VEC4, { TYPE_VEC4, TYPE_VOID } },
{ "atan", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } }, { "atan", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } },
{ "atan", TYPE_VEC2, { TYPE_VEC2, TYPE_VOID } },
{ "atan", TYPE_VEC3, { TYPE_VEC3, TYPE_VOID } },
{ "atan", TYPE_VEC4, { TYPE_VEC4, TYPE_VOID } },
{ "atan", TYPE_FLOAT, { TYPE_FLOAT, TYPE_FLOAT, TYPE_VOID } }, { "atan", TYPE_FLOAT, { TYPE_FLOAT, TYPE_FLOAT, TYPE_VOID } },
{ "atan", TYPE_VEC2, { TYPE_VEC2, TYPE_VEC2, TYPE_VOID } },
{ "atan", TYPE_VEC3, { TYPE_VEC3, TYPE_VEC3, TYPE_VOID } },
{ "atan", TYPE_VEC4, { TYPE_VEC4, TYPE_VEC4, TYPE_VOID } },
{ "sinh", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } }, { "sinh", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } },
{ "sinh", TYPE_VEC2, { TYPE_VEC2, TYPE_VOID } },
{ "sinh", TYPE_VEC3, { TYPE_VEC3, TYPE_VOID } },
{ "sinh", TYPE_VEC4, { TYPE_VEC4, TYPE_VOID } },
{ "cosh", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } }, { "cosh", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } },
{ "cosh", TYPE_VEC2, { TYPE_VEC2, TYPE_VOID } },
{ "cosh", TYPE_VEC3, { TYPE_VEC3, TYPE_VOID } },
{ "cosh", TYPE_VEC4, { TYPE_VEC4, TYPE_VOID } },
{ "tanh", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } }, { "tanh", TYPE_FLOAT, { TYPE_FLOAT, TYPE_VOID } },
{ "tanh", TYPE_VEC2, { TYPE_VEC2, TYPE_VOID } },
{ "tanh", TYPE_VEC3, { TYPE_VEC3, TYPE_VOID } },
{ "tanh", TYPE_VEC4, { TYPE_VEC4, TYPE_VOID } },
//builtins - exponential //builtins - exponential
{ "pow", TYPE_FLOAT, { TYPE_FLOAT, TYPE_FLOAT, TYPE_VOID } }, { "pow", TYPE_FLOAT, { TYPE_FLOAT, TYPE_FLOAT, TYPE_VOID } },
{ "pow", TYPE_VEC2, { TYPE_VEC2, TYPE_VEC2, TYPE_VOID } }, { "pow", TYPE_VEC2, { TYPE_VEC2, TYPE_VEC2, TYPE_VOID } },