From 192688e7ebd7885a1311055328a3530fd86d6eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 8 Jul 2016 23:07:09 +0200 Subject: [PATCH] classref: Fix arg name for is_action_pressed/released Also position TEXTURE_SPHERE constant properly. (cherry picked from commit a15de809429171e93556db6e9d7010a2b3d61f18) --- core/variant_call.cpp | 8 ++++---- doc/base/classes.xml | 40 ++++++++++++++++++------------------ scene/resources/material.cpp | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/core/variant_call.cpp b/core/variant_call.cpp index 483d2573eb0..0928bb18b76 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -1587,10 +1587,10 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl ADDFUNC0(INPUT_EVENT,BOOL,InputEvent,is_pressed,varray()); ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action,STRING,"action",varray()); - ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_pressed,STRING,"is_action_pressed",varray()); - ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_released,STRING,"is_action_released",varray()); + ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_pressed,STRING,"action",varray()); + ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_released,STRING,"action",varray()); ADDFUNC0(INPUT_EVENT,BOOL,InputEvent,is_echo,varray()); - ADDFUNC2(INPUT_EVENT,NIL,InputEvent,set_as_action,STRING,"action",BOOL,"pressed",varray()); + ADDFUNC2(INPUT_EVENT,NIL,InputEvent,set_as_action,STRING,"action",BOOL,"pressed",varray()); /* REGISTER CONSTRUCTORS */ @@ -1609,7 +1609,7 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl _VariantCall::add_constructor(_VariantCall::Plane_init3,Variant::PLANE,"normal",Variant::VECTOR3,"d",Variant::REAL); _VariantCall::add_constructor(_VariantCall::Quat_init1,Variant::QUAT,"x",Variant::REAL,"y",Variant::REAL,"z",Variant::REAL,"w",Variant::REAL); - _VariantCall::add_constructor(_VariantCall::Quat_init2,Variant::QUAT,"axis",Variant::VECTOR3,"angle",Variant::REAL); + _VariantCall::add_constructor(_VariantCall::Quat_init2,Variant::QUAT,"axis",Variant::VECTOR3,"angle",Variant::REAL); _VariantCall::add_constructor(_VariantCall::Color_init1,Variant::COLOR,"r",Variant::REAL,"g",Variant::REAL,"b",Variant::REAL,"a",Variant::REAL); _VariantCall::add_constructor(_VariantCall::Color_init2,Variant::COLOR,"r",Variant::REAL,"g",Variant::REAL,"b",Variant::REAL); diff --git a/doc/base/classes.xml b/doc/base/classes.xml index d77908366a9..36dffb576e4 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -11701,8 +11701,6 @@ This approximation makes straight segments between each point, then subdivides t Maximum amount of parameters. - - Read texture coordinates from the UV array. @@ -11712,6 +11710,8 @@ This approximation makes straight segments between each point, then subdivides t Read texture coordinates from the UV2 array. + + @@ -14666,7 +14666,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -14674,7 +14674,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -14754,7 +14754,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -14762,7 +14762,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -14834,7 +14834,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -14842,7 +14842,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -14920,7 +14920,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -14928,7 +14928,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -15004,7 +15004,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -15012,7 +15012,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -15100,7 +15100,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -15108,7 +15108,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -15208,7 +15208,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -15216,7 +15216,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -15322,7 +15322,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -15330,7 +15330,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -15422,7 +15422,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + @@ -15430,7 +15430,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8) - + diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index e56314c1f87..f6213f74e81 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -406,10 +406,10 @@ void FixedMaterial::_bind_methods() { BIND_CONSTANT( PARAM_SHADE_PARAM ); BIND_CONSTANT( PARAM_MAX ); - BIND_CONSTANT( TEXCOORD_SPHERE ); BIND_CONSTANT( TEXCOORD_UV ); BIND_CONSTANT( TEXCOORD_UV_TRANSFORM ); BIND_CONSTANT( TEXCOORD_UV2 ); + BIND_CONSTANT( TEXCOORD_SPHERE ); BIND_CONSTANT( FLAG_USE_ALPHA ); BIND_CONSTANT( FLAG_USE_COLOR_ARRAY );