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

classref: Fix arg name for is_action_pressed/released 

Also position TEXTURE_SPHERE constant properly.
This commit is contained in:
Rémi Verschelde 2016-07-08 23:07:09 +02:00
parent 288355afe9
commit a15de80942
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/variant_call.cpp
View File

@ -1667,10 +1667,10 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl
ADDFUNC0(INPUT_EVENT,BOOL,InputEvent,is_pressed,varray()); 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,STRING,"action",varray());
ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_pressed,STRING,"is_action_pressed",varray()); ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_pressed,STRING,"action",varray());
ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_released,STRING,"is_action_released",varray()); ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_released,STRING,"action",varray());
ADDFUNC0(INPUT_EVENT,BOOL,InputEvent,is_echo,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 */ /* REGISTER CONSTRUCTORS */
@ -1689,7 +1689,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::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_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_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); _VariantCall::add_constructor(_VariantCall::Color_init2,Variant::COLOR,"r",Variant::REAL,"g",Variant::REAL,"b",Variant::REAL);

40
doc/base/classes.xml
View File

@ -12874,8 +12874,6 @@
<constant name="PARAM_MAX" value="8"> <constant name="PARAM_MAX" value="8">
Maximum amount of parameters. Maximum amount of parameters.
</constant> </constant>
<constant name="TEXCOORD_SPHERE" value="3">
</constant>
<constant name="TEXCOORD_UV" value="0"> <constant name="TEXCOORD_UV" value="0">
Read texture coordinates from the UV array. Read texture coordinates from the UV array.
</constant> </constant>
@ -12885,6 +12883,8 @@
<constant name="TEXCOORD_UV2" value="2"> <constant name="TEXCOORD_UV2" value="2">
Read texture coordinates from the UV2 array. Read texture coordinates from the UV2 array.
</constant> </constant>
<constant name="TEXCOORD_SPHERE" value="3">
</constant>
<constant name="FLAG_USE_ALPHA" value="0"> <constant name="FLAG_USE_ALPHA" value="0">
</constant> </constant>
<constant name="FLAG_USE_COLOR_ARRAY" value="1"> <constant name="FLAG_USE_COLOR_ARRAY" value="1">
@ -15974,7 +15974,7 @@
<method name="is_action_pressed"> <method name="is_action_pressed">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_pressed" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -15982,7 +15982,7 @@
<method name="is_action_released"> <method name="is_action_released">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_released" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -16062,7 +16062,7 @@
<method name="is_action_pressed"> <method name="is_action_pressed">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_pressed" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -16070,7 +16070,7 @@
<method name="is_action_released"> <method name="is_action_released">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_released" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -16142,7 +16142,7 @@
<method name="is_action_pressed"> <method name="is_action_pressed">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_pressed" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -16150,7 +16150,7 @@
<method name="is_action_released"> <method name="is_action_released">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_released" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -16228,7 +16228,7 @@
<method name="is_action_pressed"> <method name="is_action_pressed">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_pressed" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -16236,7 +16236,7 @@
<method name="is_action_released"> <method name="is_action_released">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_released" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -16312,7 +16312,7 @@
<method name="is_action_pressed"> <method name="is_action_pressed">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_pressed" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -16320,7 +16320,7 @@
<method name="is_action_released"> <method name="is_action_released">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_released" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -16408,7 +16408,7 @@
<method name="is_action_pressed"> <method name="is_action_pressed">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_pressed" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -16416,7 +16416,7 @@
<method name="is_action_released"> <method name="is_action_released">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_released" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -16516,7 +16516,7 @@
<method name="is_action_pressed"> <method name="is_action_pressed">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_pressed" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -16524,7 +16524,7 @@
<method name="is_action_released"> <method name="is_action_released">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_released" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -16630,7 +16630,7 @@
<method name="is_action_pressed"> <method name="is_action_pressed">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_pressed" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -16638,7 +16638,7 @@
<method name="is_action_released"> <method name="is_action_released">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_released" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -16730,7 +16730,7 @@
<method name="is_action_pressed"> <method name="is_action_pressed">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_pressed" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>
@ -16738,7 +16738,7 @@
<method name="is_action_released"> <method name="is_action_released">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="is_action_released" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<description> <description>
</description> </description>

2
scene/resources/material.cpp
View File

@ -406,10 +406,10 @@ void FixedMaterial::_bind_methods() {
BIND_CONSTANT( PARAM_SHADE_PARAM ); BIND_CONSTANT( PARAM_SHADE_PARAM );
BIND_CONSTANT( PARAM_MAX ); BIND_CONSTANT( PARAM_MAX );
BIND_CONSTANT( TEXCOORD_SPHERE );
BIND_CONSTANT( TEXCOORD_UV ); BIND_CONSTANT( TEXCOORD_UV );
BIND_CONSTANT( TEXCOORD_UV_TRANSFORM ); BIND_CONSTANT( TEXCOORD_UV_TRANSFORM );
BIND_CONSTANT( TEXCOORD_UV2 ); BIND_CONSTANT( TEXCOORD_UV2 );
BIND_CONSTANT( TEXCOORD_SPHERE );
BIND_CONSTANT( FLAG_USE_ALPHA ); BIND_CONSTANT( FLAG_USE_ALPHA );
BIND_CONSTANT( FLAG_USE_COLOR_ARRAY ); BIND_CONSTANT( FLAG_USE_COLOR_ARRAY );