[Bf-blender-cvs] [05deec3] master: Code cleanup: rename easing functions with BLI_easing_ prefix
Campbell Barton
noreply at git.blender.org
Tue Mar 25 00:12:05 CET 2014
Commit: 05deec3204a91984180a4458c956f490dc10d260
Author: Campbell Barton
Date: Tue Mar 25 09:57:37 2014 +1100
https://developer.blender.org/rB05deec3204a91984180a4458c956f490dc10d260
Code cleanup: rename easing functions with BLI_easing_ prefix
===================================================================
M source/blender/blenkernel/intern/fcurve.c
M source/blender/blenlib/BLI_easing.h
M source/blender/blenlib/intern/easing.c
===================================================================
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index dc5a6aa..7079525 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -2126,20 +2126,20 @@ static float fcurve_eval_keyframes(FCurve *fcu, BezTriple *bezts, float evaltime
case BEZT_IPO_LIN:
/* linear - simply linearly interpolate between values of the two keyframes */
- cvalue = LinearEase(time, begin, change, duration);
+ cvalue = BLI_easing_linear_ease(time, begin, change, duration);
break;
/* easing ............................................ */
case BEZT_IPO_BACK:
switch (prevbezt->easing) {
case BEZT_IPO_EASE_IN:
- cvalue = BackEaseIn(time, begin, change, duration, prevbezt->back);
+ cvalue = BLI_easing_back_ease_in(time, begin, change, duration, prevbezt->back);
break;
case BEZT_IPO_EASE_OUT:
- cvalue = BackEaseOut(time, begin, change, duration, prevbezt->back);
+ cvalue = BLI_easing_back_ease_out(time, begin, change, duration, prevbezt->back);
break;
case BEZT_IPO_EASE_IN_OUT:
- cvalue = BackEaseInOut(time, begin, change, duration, prevbezt->back);
+ cvalue = BLI_easing_back_ease_in_out(time, begin, change, duration, prevbezt->back);
break;
}
break;
@@ -2147,13 +2147,13 @@ static float fcurve_eval_keyframes(FCurve *fcu, BezTriple *bezts, float evaltime
case BEZT_IPO_BOUNCE:
switch (prevbezt->easing) {
case BEZT_IPO_EASE_IN:
- cvalue = BounceEaseIn(time, begin, change, duration);
+ cvalue = BLI_easing_bounce_ease_in(time, begin, change, duration);
break;
case BEZT_IPO_EASE_OUT:
- cvalue = BounceEaseOut(time, begin, change, duration);
+ cvalue = BLI_easing_bounce_ease_out(time, begin, change, duration);
break;
case BEZT_IPO_EASE_IN_OUT:
- cvalue = BounceEaseInOut(time, begin, change, duration);
+ cvalue = BLI_easing_bounce_ease_in_out(time, begin, change, duration);
break;
}
break;
@@ -2161,13 +2161,13 @@ static float fcurve_eval_keyframes(FCurve *fcu, BezTriple *bezts, float evaltime
case BEZT_IPO_CIRC:
switch (prevbezt->easing) {
case BEZT_IPO_EASE_IN:
- cvalue = CircEaseIn(time, begin, change, duration);
+ cvalue = BLI_easing_circ_ease_in(time, begin, change, duration);
break;
case BEZT_IPO_EASE_OUT:
- cvalue = CircEaseOut(time, begin, change, duration);
+ cvalue = BLI_easing_circ_ease_out(time, begin, change, duration);
break;
case BEZT_IPO_EASE_IN_OUT:
- cvalue = CircEaseInOut(time, begin, change, duration);
+ cvalue = BLI_easing_circ_ease_in_out(time, begin, change, duration);
break;
}
break;
@@ -2175,13 +2175,13 @@ static float fcurve_eval_keyframes(FCurve *fcu, BezTriple *bezts, float evaltime
case BEZT_IPO_CUBIC:
switch (prevbezt->easing) {
case BEZT_IPO_EASE_IN:
- cvalue = CubicEaseIn(time, begin, change, duration);
+ cvalue = BLI_easing_cubic_ease_in(time, begin, change, duration);
break;
case BEZT_IPO_EASE_OUT:
- cvalue = CubicEaseOut(time, begin, change, duration);
+ cvalue = BLI_easing_cubic_ease_out(time, begin, change, duration);
break;
case BEZT_IPO_EASE_IN_OUT:
- cvalue = CubicEaseInOut(time, begin, change, duration);
+ cvalue = BLI_easing_cubic_ease_in_out(time, begin, change, duration);
break;
}
break;
@@ -2189,13 +2189,13 @@ static float fcurve_eval_keyframes(FCurve *fcu, BezTriple *bezts, float evaltime
case BEZT_IPO_ELASTIC:
switch (prevbezt->easing) {
case BEZT_IPO_EASE_IN:
- cvalue = ElasticEaseIn(time, begin, change, duration, amplitude, period);
+ cvalue = BLI_easing_elastic_ease_in(time, begin, change, duration, amplitude, period);
break;
case BEZT_IPO_EASE_OUT:
- cvalue = ElasticEaseOut(time, begin, change, duration, amplitude, period);
+ cvalue = BLI_easing_elastic_ease_out(time, begin, change, duration, amplitude, period);
break;
case BEZT_IPO_EASE_IN_OUT:
- cvalue = ElasticEaseInOut(time, begin, change, duration, amplitude, period);
+ cvalue = BLI_easing_elastic_ease_in_out(time, begin, change, duration, amplitude, period);
break;
}
break;
@@ -2203,13 +2203,13 @@ static float fcurve_eval_keyframes(FCurve *fcu, BezTriple *bezts, float evaltime
case BEZT_IPO_EXPO:
switch (prevbezt->easing) {
case BEZT_IPO_EASE_IN:
- cvalue = ExpoEaseIn(time, begin, change, duration);
+ cvalue = BLI_easing_expo_ease_in(time, begin, change, duration);
break;
case BEZT_IPO_EASE_OUT:
- cvalue = ExpoEaseOut(time, begin, change, duration);
+ cvalue = BLI_easing_expo_ease_out(time, begin, change, duration);
break;
case BEZT_IPO_EASE_IN_OUT:
- cvalue = ExpoEaseInOut(time, begin, change, duration);
+ cvalue = BLI_easing_expo_ease_in_out(time, begin, change, duration);
break;
}
break;
@@ -2217,13 +2217,13 @@ static float fcurve_eval_keyframes(FCurve *fcu, BezTriple *bezts, float evaltime
case BEZT_IPO_QUAD:
switch (prevbezt->easing) {
case BEZT_IPO_EASE_IN:
- cvalue = QuadEaseIn(time, begin, change, duration);
+ cvalue = BLI_easing_quad_ease_in(time, begin, change, duration);
break;
case BEZT_IPO_EASE_OUT:
- cvalue = QuadEaseOut(time, begin, change, duration);
+ cvalue = BLI_easing_quad_ease_out(time, begin, change, duration);
break;
case BEZT_IPO_EASE_IN_OUT:
- cvalue = QuadEaseInOut(time, begin, change, duration);
+ cvalue = BLI_easing_quad_ease_in_out(time, begin, change, duration);
break;
}
break;
@@ -2231,13 +2231,13 @@ static float fcurve_eval_keyframes(FCurve *fcu, BezTriple *bezts, float evaltime
case BEZT_IPO_QUART:
switch (prevbezt->easing) {
case BEZT_IPO_EASE_IN:
- cvalue = QuartEaseIn(time, begin, change, duration);
+ cvalue = BLI_easing_quart_ease_in(time, begin, change, duration);
break;
case BEZT_IPO_EASE_OUT:
- cvalue = QuartEaseOut(time, begin, change, duration);
+ cvalue = BLI_easing_quart_ease_out(time, begin, change, duration);
break;
case BEZT_IPO_EASE_IN_OUT:
- cvalue = QuartEaseInOut(time, begin, change, duration);
+ cvalue = BLI_easing_quart_ease_in_out(time, begin, change, duration);
break;
}
break;
@@ -2245,13 +2245,13 @@ static float fcurve_eval_keyframes(FCurve *fcu, BezTriple *bezts, float evaltime
case BEZT_IPO_QUINT:
switch (prevbezt->easing) {
case BEZT_IPO_EASE_IN:
- cvalue = QuintEaseIn(time, begin, change, duration);
+ cvalue = BLI_easing_quint_ease_in(time, begin, change, duration);
break;
case BEZT_IPO_EASE_OUT:
- cvalue = QuintEaseOut(time, begin, change, duration);
+ cvalue = BLI_easing_quint_ease_out(time, begin, change, duration);
break;
case BEZT_IPO_EASE_IN_OUT:
- cvalue = QuintEaseInOut(time, begin, change, duration);
+ cvalue = BLI_easing_quint_ease_in_out(time, begin, change, duration);
break;
}
break;
@@ -2259,13 +2259,13 @@ static float fcurve_eval_keyframes(FCurve *fcu, BezTriple *bezts, float evaltime
case BEZT_IPO_SINE:
switch (prevbezt->easing) {
case BEZT_IPO_EASE_IN:
- cvalue = SineEaseIn(time, begin, change, duration);
+ cvalue = BLI_easing_sine_ease_in(time, begin, change, duration);
break;
case BEZT_IPO_EASE_OUT:
- cvalue = SineEaseOut(time, begin, change, duration);
+ cvalue = BLI_easing_sine_ease_out(time, begin, change, duration);
break;
case BEZT_IPO_EASE_IN_OUT:
- cvalue = SineEaseInOut(time, begin, change, duration);
+ cvalue = BLI_easing_sine_ease_in_out(time, begin, change, duration);
break;
}
break;
diff --git a/source/blender/blenlib/BLI_easing.h b/source/blender/blenlib/BLI_easing.h
index 4b3bc86..0f9f73f 100644
--- a/source/blender/blenlib/BLI_easing.h
+++ b/source/blender/blenlib/BLI_easing.h
@@ -39,37 +39,37 @@
extern "C" {
#endif
-float BackEaseIn(float time, float begin, float change, float duration, float overshoot);
-float BackEaseOut(float time, float begin, float change, float duration, float overshoot);
-float BackEaseInOut(float time, float begin, float change, float duration, float overshoot);
-float BounceEaseOut(float time, float begin, float change, float duration);
-float BounceEaseIn(float time, float begin, float change, float duration);
-float BounceEaseInOut(float time, float begin, float change, float duration);
-float CircEaseIn(float time, float begin, float change, float duration);
-float CircEaseOut(float time, float begin, float change, float duration);
-float CircEaseInOut(float time, float begin, float change, float duration);
-float CubicEaseIn(float time, float begin, float change, float duration);
-float CubicEaseOut(float time, float begin, float change, float duration);
-float CubicEaseInOut(float time, float begin, float change, float duration);
-float ElasticEaseIn(float time, float begin, float change, float duration, float amplitude, float period);
-float ElasticEaseOut(float time, float begin, float change, float duration, float amplitude, float period);
-float ElasticEaseInOut(float time, float begin, float change, float duration, float amplitude, float period);
-float ExpoEaseIn(float time, float begin, float change, float duration);
-float ExpoEaseOut(float time, float begin, float change, float duration);
-float ExpoEaseInOut(float time, float begin, float change, float duration);
-float LinearEase(float time, float begin, float change, float duration);
-float QuadEaseIn(float time, float begin, float change, float duration);
-float QuadEa
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list