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.

(cherry picked from commit a15de80942)
This commit is contained in:
Rémi Verschelde 2016-07-08 23:07:09 +02:00
parent a9a8bb281d
commit 192688e7eb
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/variant_call.cpp
View File

@ -1587,8 +1587,8 @@ _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());

40
doc/base/classes.xml
View File

@ -11701,8 +11701,6 @@ This approximation makes straight segments between each point, then subdivides t
<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>
@ -11712,6 +11710,8 @@ This approximation makes straight segments between each point, then subdivides t
<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">
@ -14666,7 +14666,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -14674,7 +14674,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -14754,7 +14754,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -14762,7 +14762,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -14834,7 +14834,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -14842,7 +14842,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -14920,7 +14920,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -14928,7 +14928,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -15004,7 +15004,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -15012,7 +15012,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -15100,7 +15100,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -15108,7 +15108,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -15208,7 +15208,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -15216,7 +15216,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -15322,7 +15322,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -15330,7 +15330,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -15422,7 +15422,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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>
@ -15430,7 +15430,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<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 );