godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Added overloads of vector parameters for shader Trig functions.

Browse Source 
Ammend: Removed whitespace from blank lines.
Ammend2: Removed extra spaces in an attempt to make Clang happy. :)
This commit is contained in:
RaXaR
2017-11-26 00:19:16 +02:00
parent 2f3c4c94da
commit b932d8c37a
1 changed files with 39 additions and 0 deletions
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 } },