Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
b61fedbb
Unverified
Commit
b61fedbb
authored
Mar 06, 2020
by
Rémi Verschelde
Committed by
GitHub
Mar 06, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #36844 from Chaosus/tween_remove_bool
Removed boolean return type from majority of method in Tween
parents
da05ca67
d5bff588
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
38 deletions
+38
-38
Tween.xml
doc/classes/Tween.xml
+18
-18
tween.cpp
scene/animation/tween.cpp
+0
-0
tween.h
scene/animation/tween.h
+20
-20
No files found.
doc/classes/Tween.xml
View file @
b61fedbb
...
...
@@ -21,7 +21,7 @@
</tutorials>
<methods>
<method
name=
"follow_method"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<argument
index=
"0"
name=
"object"
type=
"Object"
>
</argument>
...
...
@@ -47,7 +47,7 @@
</description>
</method>
<method
name=
"follow_property"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<argument
index=
"0"
name=
"object"
type=
"Object"
>
</argument>
...
...
@@ -80,7 +80,7 @@
</description>
</method>
<method
name=
"interpolate_callback"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<argument
index=
"0"
name=
"object"
type=
"Object"
>
</argument>
...
...
@@ -103,7 +103,7 @@
</description>
</method>
<method
name=
"interpolate_deferred_callback"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<argument
index=
"0"
name=
"object"
type=
"Object"
>
</argument>
...
...
@@ -126,7 +126,7 @@
</description>
</method>
<method
name=
"interpolate_method"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<argument
index=
"0"
name=
"object"
type=
"Object"
>
</argument>
...
...
@@ -150,7 +150,7 @@
</description>
</method>
<method
name=
"interpolate_property"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<argument
index=
"0"
name=
"object"
type=
"Object"
>
</argument>
...
...
@@ -182,7 +182,7 @@
</description>
</method>
<method
name=
"remove"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<argument
index=
"0"
name=
"object"
type=
"Object"
>
</argument>
...
...
@@ -193,14 +193,14 @@
</description>
</method>
<method
name=
"remove_all"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<description>
Stops animation and removes all tweens.
</description>
</method>
<method
name=
"reset"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<argument
index=
"0"
name=
"object"
type=
"Object"
>
</argument>
...
...
@@ -211,14 +211,14 @@
</description>
</method>
<method
name=
"reset_all"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<description>
Resets all tweens to their initial values (the ones given, not those before the tween).
</description>
</method>
<method
name=
"resume"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<argument
index=
"0"
name=
"object"
type=
"Object"
>
</argument>
...
...
@@ -229,14 +229,14 @@
</description>
</method>
<method
name=
"resume_all"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<description>
Continues animating all stopped tweens.
</description>
</method>
<method
name=
"seek"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<argument
index=
"0"
name=
"time"
type=
"float"
>
</argument>
...
...
@@ -254,14 +254,14 @@
</description>
</method>
<method
name=
"start"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<description>
Starts the tween. You can define animations both before and after this.
</description>
</method>
<method
name=
"stop"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<argument
index=
"0"
name=
"object"
type=
"Object"
>
</argument>
...
...
@@ -272,14 +272,14 @@
</description>
</method>
<method
name=
"stop_all"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<description>
Stops animating all tweens.
</description>
</method>
<method
name=
"targeting_method"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<argument
index=
"0"
name=
"object"
type=
"Object"
>
</argument>
...
...
@@ -305,7 +305,7 @@
</description>
</method>
<method
name=
"targeting_property"
>
<return
type=
"
bool
"
>
<return
type=
"
void
"
>
</return>
<argument
index=
"0"
name=
"object"
type=
"Object"
>
</argument>
...
...
scene/animation/tween.cpp
View file @
b61fedbb
This diff is collapsed.
Click to expand it.
scene/animation/tween.h
View file @
b61fedbb
...
...
@@ -142,7 +142,7 @@ private:
void
_tween_process
(
float
p_delta
);
void
_remove_by_uid
(
int
uid
);
void
_push_interpolate_data
(
InterpolateData
&
p_data
);
bool
_build_interpolation
(
InterpolateType
p_interpolation_type
,
Object
*
p_object
,
NodePath
*
p_property
,
StringName
*
p_method
,
Variant
p_initial_val
,
Variant
p_final_val
,
real_t
p_duration
,
TransitionType
p_trans_type
,
EaseType
p_ease_type
,
real_t
p_delay
);
void
_build_interpolation
(
InterpolateType
p_interpolation_type
,
Object
*
p_object
,
NodePath
*
p_property
,
StringName
*
p_method
,
Variant
p_initial_val
,
Variant
p_final_val
,
real_t
p_duration
,
TransitionType
p_trans_type
,
EaseType
p_ease_type
,
real_t
p_delay
);
protected
:
bool
_set
(
const
StringName
&
p_name
,
const
Variant
&
p_value
);
...
...
@@ -165,28 +165,28 @@ public:
void
set_speed_scale
(
float
p_speed
);
float
get_speed_scale
()
const
;
bool
start
();
bool
reset
(
Object
*
p_object
,
StringName
p_key
);
bool
reset_all
();
bool
stop
(
Object
*
p_object
,
StringName
p_key
);
bool
stop_all
();
bool
resume
(
Object
*
p_object
,
StringName
p_key
);
bool
resume_all
();
bool
remove
(
Object
*
p_object
,
StringName
p_key
);
bool
remove_all
();
bool
seek
(
real_t
p_time
);
void
start
();
void
reset
(
Object
*
p_object
,
StringName
p_key
);
void
reset_all
();
void
stop
(
Object
*
p_object
,
StringName
p_key
);
void
stop_all
();
void
resume
(
Object
*
p_object
,
StringName
p_key
);
void
resume_all
();
void
remove
(
Object
*
p_object
,
StringName
p_key
);
void
remove_all
();
void
seek
(
real_t
p_time
);
real_t
tell
()
const
;
real_t
get_runtime
()
const
;
bool
interpolate_property
(
Object
*
p_object
,
NodePath
p_property
,
Variant
p_initial_val
,
Variant
p_final_val
,
real_t
p_duration
,
TransitionType
p_trans_type
=
TRANS_LINEAR
,
EaseType
p_ease_type
=
EASE_IN_OUT
,
real_t
p_delay
=
0
);
bool
interpolate_method
(
Object
*
p_object
,
StringName
p_method
,
Variant
p_initial_val
,
Variant
p_final_val
,
real_t
p_duration
,
TransitionType
p_trans_type
=
TRANS_LINEAR
,
EaseType
p_ease_type
=
EASE_IN_OUT
,
real_t
p_delay
=
0
);
bool
interpolate_callback
(
Object
*
p_object
,
real_t
p_duration
,
String
p_callback
,
VARIANT_ARG_DECLARE
);
bool
interpolate_deferred_callback
(
Object
*
p_object
,
real_t
p_duration
,
String
p_callback
,
VARIANT_ARG_DECLARE
);
bool
follow_property
(
Object
*
p_object
,
NodePath
p_property
,
Variant
p_initial_val
,
Object
*
p_target
,
NodePath
p_target_property
,
real_t
p_duration
,
TransitionType
p_trans_type
=
TRANS_LINEAR
,
EaseType
p_ease_type
=
EASE_IN_OUT
,
real_t
p_delay
=
0
);
bool
follow_method
(
Object
*
p_object
,
StringName
p_method
,
Variant
p_initial_val
,
Object
*
p_target
,
StringName
p_target_method
,
real_t
p_duration
,
TransitionType
p_trans_type
=
TRANS_LINEAR
,
EaseType
p_ease_type
=
EASE_IN_OUT
,
real_t
p_delay
=
0
);
bool
targeting_property
(
Object
*
p_object
,
NodePath
p_property
,
Object
*
p_initial
,
NodePath
p_initial_property
,
Variant
p_final_val
,
real_t
p_duration
,
TransitionType
p_trans_type
=
TRANS_LINEAR
,
EaseType
p_ease_type
=
EASE_IN_OUT
,
real_t
p_delay
=
0
);
bool
targeting_method
(
Object
*
p_object
,
StringName
p_method
,
Object
*
p_initial
,
StringName
p_initial_method
,
Variant
p_final_val
,
real_t
p_duration
,
TransitionType
p_trans_type
=
TRANS_LINEAR
,
EaseType
p_ease_type
=
EASE_IN_OUT
,
real_t
p_delay
=
0
);
void
interpolate_property
(
Object
*
p_object
,
NodePath
p_property
,
Variant
p_initial_val
,
Variant
p_final_val
,
real_t
p_duration
,
TransitionType
p_trans_type
=
TRANS_LINEAR
,
EaseType
p_ease_type
=
EASE_IN_OUT
,
real_t
p_delay
=
0
);
void
interpolate_method
(
Object
*
p_object
,
StringName
p_method
,
Variant
p_initial_val
,
Variant
p_final_val
,
real_t
p_duration
,
TransitionType
p_trans_type
=
TRANS_LINEAR
,
EaseType
p_ease_type
=
EASE_IN_OUT
,
real_t
p_delay
=
0
);
void
interpolate_callback
(
Object
*
p_object
,
real_t
p_duration
,
String
p_callback
,
VARIANT_ARG_DECLARE
);
void
interpolate_deferred_callback
(
Object
*
p_object
,
real_t
p_duration
,
String
p_callback
,
VARIANT_ARG_DECLARE
);
void
follow_property
(
Object
*
p_object
,
NodePath
p_property
,
Variant
p_initial_val
,
Object
*
p_target
,
NodePath
p_target_property
,
real_t
p_duration
,
TransitionType
p_trans_type
=
TRANS_LINEAR
,
EaseType
p_ease_type
=
EASE_IN_OUT
,
real_t
p_delay
=
0
);
void
follow_method
(
Object
*
p_object
,
StringName
p_method
,
Variant
p_initial_val
,
Object
*
p_target
,
StringName
p_target_method
,
real_t
p_duration
,
TransitionType
p_trans_type
=
TRANS_LINEAR
,
EaseType
p_ease_type
=
EASE_IN_OUT
,
real_t
p_delay
=
0
);
void
targeting_property
(
Object
*
p_object
,
NodePath
p_property
,
Object
*
p_initial
,
NodePath
p_initial_property
,
Variant
p_final_val
,
real_t
p_duration
,
TransitionType
p_trans_type
=
TRANS_LINEAR
,
EaseType
p_ease_type
=
EASE_IN_OUT
,
real_t
p_delay
=
0
);
void
targeting_method
(
Object
*
p_object
,
StringName
p_method
,
Object
*
p_initial
,
StringName
p_initial_method
,
Variant
p_final_val
,
real_t
p_duration
,
TransitionType
p_trans_type
=
TRANS_LINEAR
,
EaseType
p_ease_type
=
EASE_IN_OUT
,
real_t
p_delay
=
0
);
Tween
();
~
Tween
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment