summaryrefslogtreecommitdiffstats
path: root/core/variant.h
diff options
context:
space:
mode:
authorJosh Grams <josh@qualdan.com>2016-02-17 22:34:49 -0500
committerJosh Grams <josh@qualdan.com>2016-03-01 07:37:36 -0500
commit391ce81c5ea037ffcbc525434673f4edd55a7d7e (patch)
treefbb1ea115bd472306be53c02186ff0941961e0dd /core/variant.h
parenta12c63ef9e6332d0003228e1d8d79a57ef3995fb (diff)
downloadredot-engine-391ce81c5ea037ffcbc525434673f4edd55a7d7e.tar.gz
AnimationTreePlayer: blend value tracks (closes #2299)
Variant: - zero() sets a Variant to the appropriate type of zero value - blend() blends part of one Variant on top of another.
Diffstat (limited to 'core/variant.h')
-rw-r--r--core/variant.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/variant.h b/core/variant.h
index b58c781bdd..d8813c4937 100644
--- a/core/variant.h
+++ b/core/variant.h
@@ -372,6 +372,8 @@ public:
return res;
}
+ void zero();
+ static void blend(const Variant& a, const Variant& b, float c,Variant &r_dst);
static void interpolate(const Variant& a, const Variant& b, float c,Variant &r_dst);
struct CallError {