2006-08-28 17:11:15 +00:00
|
|
|
/*
|
|
|
|
* Clutter.
|
|
|
|
*
|
|
|
|
* An OpenGL based 'interactive canvas' library.
|
|
|
|
*
|
|
|
|
* Authored By Matthew Allum <mallum@openedhand.com>
|
|
|
|
* Jorn Baayen <jorn@openedhand.com>
|
2006-11-15 23:37:53 +00:00
|
|
|
* Emmanuele Bassi <ebassi@openedhand.com>
|
2007-05-16 11:32:50 +00:00
|
|
|
* Tomas Frydrych <tf@openedhand.com>
|
2006-08-28 17:11:15 +00:00
|
|
|
*
|
2007-05-16 11:32:50 +00:00
|
|
|
* Copyright (C) 2006, 2007 OpenedHand
|
2006-08-28 17:11:15 +00:00
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* SECTION:clutter-alpha
|
|
|
|
* @short_description: A class for calculating an alpha value as a function
|
|
|
|
* of time.
|
|
|
|
*
|
2006-11-17 18:45:31 +00:00
|
|
|
* #ClutterAlpha is a class for calculating an integer value between
|
2008-11-18 12:42:05 +00:00
|
|
|
* 0 and %CLUTTER_ALPHA_MAX_ALPHA as a function of time.
|
|
|
|
*
|
|
|
|
* A #ClutterAlpha binds a #ClutterTimeline to a progress function which
|
|
|
|
* translates the time T into an adimensional factor alpha. The factor can
|
|
|
|
* then be used to drive a #ClutterBehaviour, which will translate the
|
|
|
|
* alpha value into something meaningful for a #ClutterActor.
|
|
|
|
*
|
|
|
|
* You should provide a #ClutterTimeline and bind it to the #ClutterAlpha
|
2009-01-16 13:42:06 +00:00
|
|
|
* instance using clutter_alpha_set_timeline(). You should also set an
|
|
|
|
* "animation mode", either by using the #ClutterAnimatioMode values that
|
|
|
|
* Clutter itself provides or by registering custom functions.
|
|
|
|
*
|
|
|
|
* Instead of a #ClutterAnimationMode you may provide a function returning
|
|
|
|
* the alpha value depending on the progress of the timeline, using
|
|
|
|
* clutter_alpha_set_func() or clutter_alpha_set_closure(). The alpha
|
|
|
|
* function will be executed each time a new frame in the #ClutterTimeline
|
|
|
|
* is reached.
|
2008-11-18 12:42:05 +00:00
|
|
|
*
|
|
|
|
* Since the alpha function is controlled by the timeline instance, you can
|
|
|
|
* pause, stop or resume the #ClutterAlpha from calling the alpha function by
|
|
|
|
* using the appropriate functions of the #ClutterTimeline object.
|
2006-11-17 18:45:31 +00:00
|
|
|
*
|
|
|
|
* #ClutterAlpha is used to "drive" a #ClutterBehaviour instance.
|
2006-11-17 19:17:40 +00:00
|
|
|
*
|
2008-02-08 13:52:11 +00:00
|
|
|
* <figure id="alpha-functions">
|
|
|
|
* <title>Graphic representation of some alpha functions</title>
|
|
|
|
* <graphic fileref="alpha-func.png" format="PNG"/>
|
|
|
|
* </figure>
|
|
|
|
*
|
2006-11-17 19:17:40 +00:00
|
|
|
* Since: 0.2
|
2006-08-28 17:11:15 +00:00
|
|
|
*/
|
|
|
|
|
2006-11-15 23:37:53 +00:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
2006-08-28 17:11:15 +00:00
|
|
|
|
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com>
* configure.ac: Enable debug messages also when
--enable-debug is set to "minimum".
* clutter/Makefile.am:
* clutter/clutter-debug.h: Move all debugging macros inside
this private header; make all debug macros depend on the
CLUTTER_ENABLE_DEBUG compile time define, controlled by
the --enable-debug configure switch; add G_LOG_DOMAIN define.
* clutter/clutter-main.c: Clean up the debug stuff; add
command line argument parsing using GOption; the debug
messages now are triggered like this:
CLUTTER_DEBUG=section:section:... clutter-app
or like this:
clutter-app --clutter-debug=section:section:...
where "section" is one of the sections listed in clutter-main.c,
or "all", for all sections; each section is bound to a flag,
which can be used to define a domain when adding a debug note
using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is
just a wrapper around that, under the CLUTTER_DEBUG_MISC domain;
CLUTTER_NOTE() is used like this:
CLUTTER_NOTE (DOMAIN, log-function);
where log function is g_printerr(), g_message(), g_warning(),
g_critical() or directly g_log() - for instance:
CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph));
will print the warning only if the "pango" flag has been
set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug
command line argument.
similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps
command line switch; also, the --display and --screen command
line switches have been added: the first overrides the DISPLAY
envvar and the second controls the X screen used by Clutter to
get the root window on the display.
* clutter/clutter-main.h:
* clutter/clutter-main.c: Add extended support for GOption
in Clutter; use clutter_init_with_args() to let Clutter
parse your own command line arguments; use instead
clutter_get_option_group() to get the GOptionGroup used by
Clutter if you want to do the parsing yourself with
g_option_context_parse(). The init sequence has been verified,
updated and moved into common functions where possible.
* clutter/pango/pangoclutter-render.c:
* clutter/*.c: Include "clutter-debug.h" where needed; use
CLUTTER_NOTE() instead of CLUTTER_DBG().
* examples/super-oh.c: Use the new clutter_init_with_args()
function, and add a --num-hands command line switch to
the SuperOH example code controlling the number of hands at
runtime.
2006-11-21 21:27:53 +00:00
|
|
|
#include <math.h>
|
|
|
|
|
2006-08-28 17:11:15 +00:00
|
|
|
#include "clutter-alpha.h"
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
#include "clutter-debug.h"
|
|
|
|
#include "clutter-enum-types.h"
|
2006-08-28 17:11:15 +00:00
|
|
|
#include "clutter-main.h"
|
|
|
|
#include "clutter-marshal.h"
|
2006-11-21 Emmanuele Bassi <ebassi@openedhand.com>
* configure.ac: Enable debug messages also when
--enable-debug is set to "minimum".
* clutter/Makefile.am:
* clutter/clutter-debug.h: Move all debugging macros inside
this private header; make all debug macros depend on the
CLUTTER_ENABLE_DEBUG compile time define, controlled by
the --enable-debug configure switch; add G_LOG_DOMAIN define.
* clutter/clutter-main.c: Clean up the debug stuff; add
command line argument parsing using GOption; the debug
messages now are triggered like this:
CLUTTER_DEBUG=section:section:... clutter-app
or like this:
clutter-app --clutter-debug=section:section:...
where "section" is one of the sections listed in clutter-main.c,
or "all", for all sections; each section is bound to a flag,
which can be used to define a domain when adding a debug note
using the CLUTTER_NOTE() macro; the old CLUTTER_DBG() macro is
just a wrapper around that, under the CLUTTER_DEBUG_MISC domain;
CLUTTER_NOTE() is used like this:
CLUTTER_NOTE (DOMAIN, log-function);
where log function is g_printerr(), g_message(), g_warning(),
g_critical() or directly g_log() - for instance:
CLUTTER_NOTE (PANGO, g_warning ("Cache miss: %d", glyph));
will print the warning only if the "pango" flag has been
set to the CLUTTER_DEBUG envvar or passed to the --clutter-debug
command line argument.
similar to CLUTTER_SHOW_FPS, there's also the --clutter-show-fps
command line switch; also, the --display and --screen command
line switches have been added: the first overrides the DISPLAY
envvar and the second controls the X screen used by Clutter to
get the root window on the display.
* clutter/clutter-main.h:
* clutter/clutter-main.c: Add extended support for GOption
in Clutter; use clutter_init_with_args() to let Clutter
parse your own command line arguments; use instead
clutter_get_option_group() to get the GOptionGroup used by
Clutter if you want to do the parsing yourself with
g_option_context_parse(). The init sequence has been verified,
updated and moved into common functions where possible.
* clutter/pango/pangoclutter-render.c:
* clutter/*.c: Include "clutter-debug.h" where needed; use
CLUTTER_NOTE() instead of CLUTTER_DBG().
* examples/super-oh.c: Use the new clutter_init_with_args()
function, and add a --num-hands command line switch to
the SuperOH example code controlling the number of hands at
runtime.
2006-11-21 21:27:53 +00:00
|
|
|
#include "clutter-private.h"
|
2006-08-28 17:11:15 +00:00
|
|
|
|
2008-04-03 03:09:28 +00:00
|
|
|
G_DEFINE_TYPE (ClutterAlpha, clutter_alpha, G_TYPE_INITIALLY_UNOWNED);
|
2006-08-28 17:11:15 +00:00
|
|
|
|
2006-11-15 23:37:53 +00:00
|
|
|
|
2006-11-14 14:12:56 +00:00
|
|
|
struct _ClutterAlphaPrivate
|
2006-08-28 17:11:15 +00:00
|
|
|
{
|
|
|
|
ClutterTimeline *timeline;
|
2006-11-15 23:37:53 +00:00
|
|
|
guint timeline_new_frame_id;
|
|
|
|
|
|
|
|
guint32 alpha;
|
2008-04-18 15:03:30 +00:00
|
|
|
|
|
|
|
GClosure *closure;
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
|
2009-01-16 13:42:06 +00:00
|
|
|
gulong mode;
|
2006-08-28 17:11:15 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
enum
|
|
|
|
{
|
|
|
|
PROP_0,
|
2006-11-15 23:37:53 +00:00
|
|
|
|
2006-08-28 17:11:15 +00:00
|
|
|
PROP_TIMELINE,
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
PROP_ALPHA,
|
|
|
|
PROP_MODE
|
2006-08-28 17:11:15 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
|
|
|
timeline_new_frame_cb (ClutterTimeline *timeline,
|
|
|
|
guint current_frame_num,
|
|
|
|
ClutterAlpha *alpha)
|
|
|
|
{
|
2006-11-15 23:37:53 +00:00
|
|
|
ClutterAlphaPrivate *priv = alpha->priv;
|
2006-08-28 17:11:15 +00:00
|
|
|
|
2006-11-15 23:37:53 +00:00
|
|
|
/* Update alpha value and notify */
|
2008-09-23 09:41:08 +00:00
|
|
|
priv->alpha = clutter_alpha_get_alpha (alpha);
|
|
|
|
g_object_notify (G_OBJECT (alpha), "alpha");
|
2006-08-28 17:11:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_alpha_set_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec)
|
|
|
|
{
|
2006-11-15 23:37:53 +00:00
|
|
|
ClutterAlpha *alpha;
|
2006-09-08 20:57:31 +00:00
|
|
|
ClutterAlphaPrivate *priv;
|
|
|
|
|
2006-11-15 23:37:53 +00:00
|
|
|
alpha = CLUTTER_ALPHA (object);
|
2006-09-08 20:57:31 +00:00
|
|
|
priv = alpha->priv;
|
2006-08-28 17:11:15 +00:00
|
|
|
|
|
|
|
switch (prop_id)
|
|
|
|
{
|
|
|
|
case PROP_TIMELINE:
|
|
|
|
clutter_alpha_set_timeline (alpha, g_value_get_object (value));
|
|
|
|
break;
|
2009-01-16 13:42:06 +00:00
|
|
|
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
case PROP_MODE:
|
2009-01-16 13:42:06 +00:00
|
|
|
clutter_alpha_set_mode (alpha, g_value_get_ulong (value));
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
break;
|
2009-01-16 13:42:06 +00:00
|
|
|
|
2006-08-28 17:11:15 +00:00
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_alpha_get_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec)
|
|
|
|
{
|
2006-09-08 20:57:31 +00:00
|
|
|
ClutterAlpha *alpha;
|
2006-08-28 17:11:15 +00:00
|
|
|
ClutterAlphaPrivate *priv;
|
|
|
|
|
2006-11-15 23:37:53 +00:00
|
|
|
alpha = CLUTTER_ALPHA (object);
|
2006-09-08 20:57:31 +00:00
|
|
|
priv = alpha->priv;
|
2006-08-28 17:11:15 +00:00
|
|
|
|
|
|
|
switch (prop_id)
|
|
|
|
{
|
|
|
|
case PROP_TIMELINE:
|
|
|
|
g_value_set_object (value, priv->timeline);
|
|
|
|
break;
|
2009-01-16 13:42:06 +00:00
|
|
|
|
2006-08-28 17:11:15 +00:00
|
|
|
case PROP_ALPHA:
|
2006-08-29 Jorn Baayen <jorn@openedhand.com>
* clutter/clutter-behaviour.c: (_clutter_behaviour_finalize),
(_clutter_behaviour_set_property),
(_clutter_behaviour_get_property), (clutter_behaviour_class_init),
(clutter_behaviour_init), (clutter_behaviour_apply),
(clutter_behaviour_remove), (clutter_behaviour_remove_all),
(clutter_behaviour_actors_foreach):
* clutter/clutter-behaviour.h:
* clutter/clutter-behaviours.c:
(clutter_behaviour_property_change),
(clutter_behaviour_opacity_dispose),
(clutter_behaviour_opacity_finalize),
(clutter_behaviour_opacity_class_init),
(clutter_behaviour_opacity_init):
* clutter/clutter-behaviours.h:
* clutter/clutter-marshal.list:
* examples/behave.c: (main):
Behaviours track generic GObject properties.
* clutter/clutter-video-texture.h:
Remove signal prototypes - they are already specified in
clutter-media.h.
2006-08-29 13:20:29 +00:00
|
|
|
g_value_set_uint (value, priv->alpha);
|
2006-08-28 17:11:15 +00:00
|
|
|
break;
|
2009-01-16 13:42:06 +00:00
|
|
|
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
case PROP_MODE:
|
2009-01-16 13:42:06 +00:00
|
|
|
g_value_set_ulong (value, priv->mode);
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
break;
|
2009-01-16 13:42:06 +00:00
|
|
|
|
2006-08-28 17:11:15 +00:00
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_alpha_finalize (GObject *object)
|
|
|
|
{
|
2006-11-15 23:37:53 +00:00
|
|
|
ClutterAlphaPrivate *priv = CLUTTER_ALPHA (object)->priv;
|
|
|
|
|
2008-04-18 15:03:30 +00:00
|
|
|
if (priv->closure)
|
2008-09-23 09:41:08 +00:00
|
|
|
g_closure_unref (priv->closure);
|
2006-11-15 23:37:53 +00:00
|
|
|
|
2006-08-28 17:11:15 +00:00
|
|
|
G_OBJECT_CLASS (clutter_alpha_parent_class)->finalize (object);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_alpha_dispose (GObject *object)
|
|
|
|
{
|
2006-09-08 20:57:31 +00:00
|
|
|
ClutterAlpha *self = CLUTTER_ALPHA(object);
|
2006-08-28 17:11:15 +00:00
|
|
|
|
|
|
|
clutter_alpha_set_timeline (self, NULL);
|
|
|
|
|
|
|
|
G_OBJECT_CLASS (clutter_alpha_parent_class)->dispose (object);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_alpha_class_init (ClutterAlphaClass *klass)
|
|
|
|
{
|
2006-11-15 23:37:53 +00:00
|
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
2006-08-28 17:11:15 +00:00
|
|
|
|
|
|
|
object_class->set_property = clutter_alpha_set_property;
|
|
|
|
object_class->get_property = clutter_alpha_get_property;
|
|
|
|
object_class->finalize = clutter_alpha_finalize;
|
|
|
|
object_class->dispose = clutter_alpha_dispose;
|
|
|
|
|
|
|
|
g_type_class_add_private (klass, sizeof (ClutterAlphaPrivate));
|
|
|
|
|
2006-11-15 23:37:53 +00:00
|
|
|
/**
|
|
|
|
* ClutterAlpha:timeline:
|
|
|
|
*
|
|
|
|
* A #ClutterTimeline instance used to drive the alpha function.
|
2006-11-17 19:17:40 +00:00
|
|
|
*
|
|
|
|
* Since: 0.2
|
2006-11-15 23:37:53 +00:00
|
|
|
*/
|
|
|
|
g_object_class_install_property (object_class,
|
|
|
|
PROP_TIMELINE,
|
|
|
|
g_param_spec_object ("timeline",
|
|
|
|
"Timeline",
|
|
|
|
"Timeline",
|
|
|
|
CLUTTER_TYPE_TIMELINE,
|
2006-12-04 16:26:35 +00:00
|
|
|
CLUTTER_PARAM_READWRITE));
|
2006-11-15 23:37:53 +00:00
|
|
|
/**
|
|
|
|
* ClutterAlpha:alpha:
|
|
|
|
*
|
|
|
|
* The alpha value as computed by the alpha function.
|
2006-11-17 19:17:40 +00:00
|
|
|
*
|
|
|
|
* Since: 0.2
|
2006-11-15 23:37:53 +00:00
|
|
|
*/
|
|
|
|
g_object_class_install_property (object_class,
|
|
|
|
PROP_ALPHA,
|
|
|
|
g_param_spec_uint ("alpha",
|
|
|
|
"Alpha value",
|
|
|
|
"Alpha value",
|
|
|
|
0,
|
|
|
|
CLUTTER_ALPHA_MAX_ALPHA,
|
|
|
|
0,
|
2006-12-04 16:26:35 +00:00
|
|
|
CLUTTER_PARAM_READABLE));
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
/**
|
|
|
|
* ClutterAlpha:mode:
|
|
|
|
*
|
2009-01-16 13:42:06 +00:00
|
|
|
* The progress function logical id - either a value from the
|
|
|
|
* #ClutterAnimationMode enumeration or a value returned by
|
|
|
|
* clutter_alpha_register_func().
|
|
|
|
*
|
|
|
|
* If %CLUTTER_CUSTOM_MODE is used then the function set using
|
|
|
|
* clutter_alpha_set_closure() or clutter_alpha_set_func()
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
* will be used.
|
|
|
|
*
|
|
|
|
* Since: 1.0
|
|
|
|
*/
|
|
|
|
g_object_class_install_property (object_class,
|
|
|
|
PROP_MODE,
|
2009-01-16 13:42:06 +00:00
|
|
|
g_param_spec_ulong ("mode",
|
|
|
|
"Mode",
|
|
|
|
"Progress mode",
|
|
|
|
0, G_MAXULONG,
|
|
|
|
CLUTTER_CUSTOM_MODE,
|
|
|
|
G_PARAM_CONSTRUCT |
|
|
|
|
CLUTTER_PARAM_READWRITE));
|
2006-08-28 17:11:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_alpha_init (ClutterAlpha *self)
|
|
|
|
{
|
2006-11-15 23:37:53 +00:00
|
|
|
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
|
|
|
|
CLUTTER_TYPE_ALPHA,
|
|
|
|
ClutterAlphaPrivate);
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
|
|
|
|
self->priv->mode = CLUTTER_CUSTOM_MODE;
|
2006-08-28 17:11:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-09-08 20:57:31 +00:00
|
|
|
* clutter_alpha_get_alpha:
|
2006-08-28 17:11:15 +00:00
|
|
|
* @alpha: A #ClutterAlpha
|
|
|
|
*
|
|
|
|
* Query the current alpha value.
|
|
|
|
*
|
2006-09-08 20:57:31 +00:00
|
|
|
* Return Value: The current alpha value for the alpha
|
2006-11-17 19:17:40 +00:00
|
|
|
*
|
|
|
|
* Since: 0.2
|
2006-08-28 17:11:15 +00:00
|
|
|
*/
|
2006-11-15 23:37:53 +00:00
|
|
|
guint32
|
2006-09-08 20:57:31 +00:00
|
|
|
clutter_alpha_get_alpha (ClutterAlpha *alpha)
|
2006-08-28 17:11:15 +00:00
|
|
|
{
|
2008-09-23 09:41:08 +00:00
|
|
|
ClutterAlphaPrivate *priv;
|
|
|
|
guint32 retval = 0;
|
|
|
|
|
|
|
|
g_return_val_if_fail (CLUTTER_IS_ALPHA (alpha), 0);
|
|
|
|
|
|
|
|
priv = alpha->priv;
|
|
|
|
|
|
|
|
if (G_LIKELY (priv->closure))
|
|
|
|
{
|
|
|
|
GValue params = { 0, };
|
|
|
|
GValue result_value = { 0, };
|
|
|
|
|
|
|
|
g_object_ref (alpha);
|
|
|
|
|
|
|
|
g_value_init (&result_value, G_TYPE_UINT);
|
|
|
|
|
|
|
|
g_value_init (¶ms, CLUTTER_TYPE_ALPHA);
|
|
|
|
g_value_set_object (¶ms, alpha);
|
|
|
|
|
|
|
|
g_closure_invoke (priv->closure,
|
|
|
|
&result_value,
|
|
|
|
1,
|
|
|
|
¶ms,
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
retval = g_value_get_uint (&result_value);
|
|
|
|
|
|
|
|
g_value_unset (&result_value);
|
|
|
|
g_value_unset (¶ms);
|
|
|
|
|
|
|
|
g_object_unref (alpha);
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
2006-08-28 17:11:15 +00:00
|
|
|
}
|
|
|
|
|
2008-04-18 15:03:30 +00:00
|
|
|
/**
|
|
|
|
* clutter_alpha_set_closure:
|
|
|
|
* @alpha: A #ClutterAlpha
|
|
|
|
* @closure: A #GClosure
|
|
|
|
*
|
2009-01-16 14:53:42 +00:00
|
|
|
* Sets the #GClosure used to compute the alpha value at each
|
|
|
|
* frame of the #ClutterTimeline bound to @alpha.
|
2008-04-18 15:03:30 +00:00
|
|
|
*
|
|
|
|
* Since: 0.8
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
clutter_alpha_set_closure (ClutterAlpha *alpha,
|
|
|
|
GClosure *closure)
|
|
|
|
{
|
|
|
|
ClutterAlphaPrivate *priv;
|
|
|
|
|
|
|
|
g_return_if_fail (CLUTTER_IS_ALPHA (alpha));
|
|
|
|
g_return_if_fail (closure != NULL);
|
|
|
|
|
|
|
|
priv = alpha->priv;
|
|
|
|
|
|
|
|
if (priv->closure)
|
|
|
|
g_closure_unref (priv->closure);
|
|
|
|
|
|
|
|
priv->closure = g_closure_ref (closure);
|
|
|
|
g_closure_sink (closure);
|
|
|
|
|
|
|
|
if (G_CLOSURE_NEEDS_MARSHAL (closure))
|
|
|
|
{
|
|
|
|
GClosureMarshal marshal = clutter_marshal_UINT__VOID;
|
|
|
|
|
|
|
|
g_closure_set_marshal (closure, marshal);
|
|
|
|
}
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
|
|
|
|
priv->mode = CLUTTER_CUSTOM_MODE;
|
|
|
|
g_object_notify (G_OBJECT (alpha), "mode");
|
2008-04-18 15:03:30 +00:00
|
|
|
}
|
|
|
|
|
2006-08-28 17:11:15 +00:00
|
|
|
/**
|
|
|
|
* clutter_alpha_set_func:
|
|
|
|
* @alpha: A #ClutterAlpha
|
2008-11-18 12:42:05 +00:00
|
|
|
* @func: A #ClutterAlphaFunc
|
2006-11-15 23:37:53 +00:00
|
|
|
* @data: user data to be passed to the alpha function, or %NULL
|
|
|
|
* @destroy: notify function used when disposing the alpha function
|
2006-08-28 17:11:15 +00:00
|
|
|
*
|
2006-11-15 23:37:53 +00:00
|
|
|
* Sets the #ClutterAlphaFunc function used to compute
|
|
|
|
* the alpha value at each frame of the #ClutterTimeline
|
|
|
|
* bound to @alpha.
|
2006-11-17 19:17:40 +00:00
|
|
|
*
|
2009-01-16 14:53:42 +00:00
|
|
|
* This function will not register @func as a global alpha function.
|
|
|
|
*
|
2006-11-17 19:17:40 +00:00
|
|
|
* Since: 0.2
|
2006-08-28 17:11:15 +00:00
|
|
|
*/
|
|
|
|
void
|
2006-09-08 20:57:31 +00:00
|
|
|
clutter_alpha_set_func (ClutterAlpha *alpha,
|
2006-11-15 23:37:53 +00:00
|
|
|
ClutterAlphaFunc func,
|
|
|
|
gpointer data,
|
|
|
|
GDestroyNotify destroy)
|
2006-08-28 17:11:15 +00:00
|
|
|
{
|
2008-04-18 15:03:30 +00:00
|
|
|
GClosure *closure;
|
2006-11-15 23:37:53 +00:00
|
|
|
|
|
|
|
g_return_if_fail (CLUTTER_IS_ALPHA (alpha));
|
2008-09-23 09:41:08 +00:00
|
|
|
g_return_if_fail (func != NULL);
|
2006-11-15 23:37:53 +00:00
|
|
|
|
2008-04-18 15:03:30 +00:00
|
|
|
closure = g_cclosure_new (G_CALLBACK (func), data, (GClosureNotify) destroy);
|
|
|
|
clutter_alpha_set_closure (alpha, closure);
|
2006-08-28 17:11:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* clutter_alpha_set_timeline:
|
|
|
|
* @alpha: A #ClutterAlpha
|
2006-09-08 20:57:31 +00:00
|
|
|
* @timeline: A #ClutterTimeline
|
2006-08-28 17:11:15 +00:00
|
|
|
*
|
2006-09-08 20:57:31 +00:00
|
|
|
* Binds @alpha to @timeline.
|
2006-11-17 19:17:40 +00:00
|
|
|
*
|
|
|
|
* Since: 0.2
|
2006-08-28 17:11:15 +00:00
|
|
|
*/
|
|
|
|
void
|
2006-11-15 23:37:53 +00:00
|
|
|
clutter_alpha_set_timeline (ClutterAlpha *alpha,
|
2006-08-28 17:11:15 +00:00
|
|
|
ClutterTimeline *timeline)
|
|
|
|
{
|
2006-11-15 23:37:53 +00:00
|
|
|
ClutterAlphaPrivate *priv;
|
|
|
|
|
|
|
|
g_return_if_fail (CLUTTER_IS_ALPHA (alpha));
|
|
|
|
g_return_if_fail (timeline == NULL || CLUTTER_IS_TIMELINE (timeline));
|
|
|
|
|
|
|
|
priv = alpha->priv;
|
|
|
|
|
2009-01-05 12:05:51 +00:00
|
|
|
if (priv->timeline == timeline)
|
|
|
|
return;
|
|
|
|
|
2006-11-15 23:37:53 +00:00
|
|
|
if (priv->timeline)
|
2006-08-28 17:11:15 +00:00
|
|
|
{
|
2006-11-15 23:37:53 +00:00
|
|
|
g_signal_handlers_disconnect_by_func (priv->timeline,
|
|
|
|
timeline_new_frame_cb,
|
|
|
|
alpha);
|
2006-08-28 17:11:15 +00:00
|
|
|
|
2006-11-15 23:37:53 +00:00
|
|
|
g_object_unref (priv->timeline);
|
|
|
|
priv->timeline = NULL;
|
2006-08-28 17:11:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (timeline)
|
|
|
|
{
|
2006-11-15 23:37:53 +00:00
|
|
|
priv->timeline = g_object_ref (timeline);
|
2006-08-28 17:11:15 +00:00
|
|
|
|
2006-11-15 23:37:53 +00:00
|
|
|
g_signal_connect (priv->timeline, "new-frame",
|
|
|
|
G_CALLBACK (timeline_new_frame_cb),
|
|
|
|
alpha);
|
2006-08-28 17:11:15 +00:00
|
|
|
}
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
|
|
|
|
g_object_notify (G_OBJECT (alpha), "timeline");
|
2006-08-28 17:11:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* clutter_alpha_get_timeline:
|
|
|
|
* @alpha: A #ClutterAlpha
|
|
|
|
*
|
2006-11-17 18:45:31 +00:00
|
|
|
* Gets the #ClutterTimeline bound to @alpha.
|
|
|
|
*
|
|
|
|
* Return value: a #ClutterTimeline instance
|
2006-11-17 19:17:40 +00:00
|
|
|
*
|
|
|
|
* Since: 0.2
|
2006-08-28 17:11:15 +00:00
|
|
|
*/
|
|
|
|
ClutterTimeline *
|
|
|
|
clutter_alpha_get_timeline (ClutterAlpha *alpha)
|
|
|
|
{
|
2006-11-14 14:12:56 +00:00
|
|
|
g_return_val_if_fail (CLUTTER_IS_ALPHA (alpha), NULL);
|
|
|
|
|
2006-08-28 17:11:15 +00:00
|
|
|
return alpha->priv->timeline;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* clutter_alpha_new:
|
2006-11-15 23:37:53 +00:00
|
|
|
*
|
|
|
|
* Creates a new #ClutterAlpha instance. You must set a function
|
|
|
|
* to compute the alpha value using clutter_alpha_set_func() and
|
|
|
|
* bind a #ClutterTimeline object to the #ClutterAlpha instance
|
|
|
|
* using clutter_alpha_set_timeline().
|
|
|
|
*
|
|
|
|
* You should use the newly created #ClutterAlpha instance inside
|
|
|
|
* a #ClutterBehaviour object.
|
|
|
|
*
|
|
|
|
* Return value: the newly created empty #ClutterAlpha instance.
|
2006-11-17 19:17:40 +00:00
|
|
|
*
|
|
|
|
* Since: 0.2
|
2006-11-15 23:37:53 +00:00
|
|
|
*/
|
|
|
|
ClutterAlpha *
|
|
|
|
clutter_alpha_new (void)
|
|
|
|
{
|
|
|
|
return g_object_new (CLUTTER_TYPE_ALPHA, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* clutter_alpha_new_full:
|
2006-09-08 20:57:31 +00:00
|
|
|
* @timeline: #ClutterTimeline timeline
|
2009-01-16 13:42:06 +00:00
|
|
|
* @mode: animation mode
|
2006-08-28 17:11:15 +00:00
|
|
|
*
|
2006-11-17 18:45:31 +00:00
|
|
|
* Creates a new #ClutterAlpha instance and sets the timeline
|
2009-01-16 13:42:06 +00:00
|
|
|
* and animation mode.
|
|
|
|
*
|
|
|
|
* See also clutter_alpha_set_timeline() and clutter_alpha_set_mode().
|
2006-08-28 17:11:15 +00:00
|
|
|
*
|
2006-11-17 18:45:31 +00:00
|
|
|
* Return Value: the newly created #ClutterAlpha
|
2006-11-17 19:17:40 +00:00
|
|
|
*
|
2009-01-16 14:53:42 +00:00
|
|
|
* Since: 1.0
|
2006-08-28 17:11:15 +00:00
|
|
|
*/
|
2006-11-15 23:37:53 +00:00
|
|
|
ClutterAlpha *
|
2009-01-16 13:42:06 +00:00
|
|
|
clutter_alpha_new_full (ClutterTimeline *timeline,
|
|
|
|
gulong mode)
|
2006-08-28 17:11:15 +00:00
|
|
|
{
|
2006-11-14 14:12:56 +00:00
|
|
|
g_return_val_if_fail (CLUTTER_IS_TIMELINE (timeline), NULL);
|
2009-01-16 13:42:06 +00:00
|
|
|
g_return_val_if_fail (mode != CLUTTER_ANIMATION_LAST, NULL);
|
2006-11-15 23:37:53 +00:00
|
|
|
|
2009-01-16 13:42:06 +00:00
|
|
|
return g_object_new (CLUTTER_TYPE_ALPHA,
|
|
|
|
"timeline", timeline,
|
|
|
|
"mode", mode,
|
|
|
|
NULL);
|
2006-11-15 23:37:53 +00:00
|
|
|
}
|
|
|
|
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
/**
|
2009-01-16 13:42:06 +00:00
|
|
|
* clutter_alpha_new_with_func:
|
|
|
|
* @timeline: a #ClutterTimeline
|
|
|
|
* @func: a #ClutterAlphaFunc
|
|
|
|
* @data: data to pass to the function, or %NULL
|
|
|
|
* @destroy: function to call when removing the alpha function, or %NULL
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
*
|
2009-01-16 13:42:06 +00:00
|
|
|
* Creates a new #ClutterAlpha instances and sets the timeline
|
|
|
|
* and the alpha function.
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
*
|
2009-01-16 14:53:42 +00:00
|
|
|
* This function will not register @func as a global alpha function.
|
|
|
|
*
|
|
|
|
* See also clutter_alpha_set_timeline() and clutter_alpha_set_func().
|
|
|
|
*
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
* Return value: the newly created #ClutterAlpha
|
|
|
|
*
|
|
|
|
* Since: 1.0
|
|
|
|
*/
|
|
|
|
ClutterAlpha *
|
2009-01-16 13:42:06 +00:00
|
|
|
clutter_alpha_new_with_func (ClutterTimeline *timeline,
|
|
|
|
ClutterAlphaFunc func,
|
|
|
|
gpointer data,
|
|
|
|
GDestroyNotify destroy)
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
{
|
2009-01-16 13:42:06 +00:00
|
|
|
ClutterAlpha *retval;
|
|
|
|
|
|
|
|
g_return_val_if_fail (CLUTTER_IS_TIMELINE (timeline), NULL);
|
|
|
|
g_return_val_if_fail (func != NULL, NULL);
|
|
|
|
|
|
|
|
retval = clutter_alpha_new ();
|
|
|
|
clutter_alpha_set_timeline (retval, timeline);
|
|
|
|
clutter_alpha_set_func (retval, func, data, destroy);
|
|
|
|
|
|
|
|
return retval;
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* clutter_alpha_get_mode:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
*
|
|
|
|
* Retrieves the #ClutterAnimatioMode used by @alpha.
|
|
|
|
*
|
|
|
|
* Return value: the animation mode
|
|
|
|
*
|
|
|
|
* Since: 1.0
|
|
|
|
*/
|
2009-01-16 13:42:06 +00:00
|
|
|
gulong
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
clutter_alpha_get_mode (ClutterAlpha *alpha)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (CLUTTER_IS_ALPHA (alpha), CLUTTER_CUSTOM_MODE);
|
|
|
|
|
|
|
|
return alpha->priv->mode;
|
|
|
|
}
|
|
|
|
|
2009-01-16 13:42:06 +00:00
|
|
|
/* static enum/function mapping table for the animation modes
|
|
|
|
* we provide internally
|
|
|
|
*
|
|
|
|
* XXX - keep in sync with ClutterAnimationMode
|
|
|
|
*/
|
2008-11-18 12:42:05 +00:00
|
|
|
static const struct {
|
2009-01-16 13:42:06 +00:00
|
|
|
gulong mode;
|
2008-11-18 12:42:05 +00:00
|
|
|
ClutterAlphaFunc func;
|
|
|
|
} animation_modes[] = {
|
|
|
|
{ CLUTTER_CUSTOM_MODE, NULL },
|
|
|
|
{ CLUTTER_LINEAR, clutter_ramp_inc_func },
|
|
|
|
{ CLUTTER_SINE_IN, clutter_sine_in_func },
|
|
|
|
{ CLUTTER_SINE_OUT, clutter_sine_out_func },
|
|
|
|
{ CLUTTER_SINE_IN_OUT, clutter_sine_in_out_func },
|
|
|
|
{ CLUTTER_EASE_IN, clutter_ease_in_func },
|
|
|
|
{ CLUTTER_EASE_OUT, clutter_ease_out_func },
|
|
|
|
{ CLUTTER_EASE_IN_OUT, clutter_ease_in_out_func },
|
|
|
|
{ CLUTTER_EXPO_IN, clutter_exp_in_func },
|
|
|
|
{ CLUTTER_EXPO_OUT, clutter_exp_out_func },
|
|
|
|
{ CLUTTER_EXPO_IN_OUT, clutter_exp_in_out_func },
|
2009-01-16 13:42:06 +00:00
|
|
|
{ CLUTTER_SMOOTH_IN_OUT, clutter_smoothstep_inc_func },
|
|
|
|
{ CLUTTER_ANIMATION_LAST, NULL },
|
2008-11-18 12:42:05 +00:00
|
|
|
};
|
|
|
|
|
2009-01-16 13:42:06 +00:00
|
|
|
typedef struct _AlphaData {
|
|
|
|
guint closure_set : 1;
|
|
|
|
|
|
|
|
ClutterAlphaFunc func;
|
|
|
|
gpointer data;
|
|
|
|
|
|
|
|
GClosure *closure;
|
|
|
|
} AlphaData;
|
|
|
|
|
|
|
|
static GPtrArray *clutter_alphas = NULL;
|
|
|
|
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
/**
|
|
|
|
* clutter_alpha_set_mode:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @mode: a #ClutterAnimationMode
|
|
|
|
*
|
|
|
|
* Sets the progress function of @alpha using the symbolic value
|
2009-01-16 13:42:06 +00:00
|
|
|
* of @mode, as taken by the #ClutterAnimationMode enumeration or
|
|
|
|
* using the value returned by clutter_alpha_register_func().
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
*
|
|
|
|
* Since: 1.0
|
|
|
|
*/
|
|
|
|
void
|
2009-01-16 13:42:06 +00:00
|
|
|
clutter_alpha_set_mode (ClutterAlpha *alpha,
|
|
|
|
gulong mode)
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
{
|
|
|
|
ClutterAlphaPrivate *priv;
|
|
|
|
|
|
|
|
g_return_if_fail (CLUTTER_IS_ALPHA (alpha));
|
2009-01-16 13:42:06 +00:00
|
|
|
g_return_if_fail (mode != CLUTTER_ANIMATION_LAST);
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
|
|
|
|
priv = alpha->priv;
|
|
|
|
|
2009-01-16 13:42:06 +00:00
|
|
|
if (mode < CLUTTER_ANIMATION_LAST)
|
|
|
|
{
|
|
|
|
/* sanity check to avoid getting an out of sync
|
|
|
|
* enum/function mapping
|
|
|
|
*/
|
|
|
|
g_assert (animation_modes[mode].mode == mode);
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
|
2009-01-16 13:42:06 +00:00
|
|
|
if (G_LIKELY (animation_modes[mode].func != NULL))
|
|
|
|
clutter_alpha_set_func (alpha, animation_modes[mode].func, NULL, NULL);
|
|
|
|
|
|
|
|
priv->mode = mode;
|
|
|
|
}
|
|
|
|
else if (mode > CLUTTER_ANIMATION_LAST)
|
|
|
|
{
|
|
|
|
AlphaData *alpha_data = NULL;
|
|
|
|
gulong real_index = 0;
|
|
|
|
|
|
|
|
if (G_UNLIKELY (clutter_alphas == NULL))
|
|
|
|
{
|
|
|
|
g_warning ("No alpha functions defined for ClutterAlpha to use. "
|
|
|
|
"Use clutter_alpha_register_func() to register an "
|
|
|
|
"alpha function.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
real_index = mode - CLUTTER_ANIMATION_LAST - 1;
|
|
|
|
|
|
|
|
alpha_data = g_ptr_array_index (clutter_alphas, real_index);
|
|
|
|
if (G_UNLIKELY (alpha_data == NULL))
|
|
|
|
{
|
|
|
|
g_warning ("No alpha function registered for mode %lu.",
|
|
|
|
mode);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (alpha_data->closure_set)
|
|
|
|
clutter_alpha_set_closure (alpha, alpha_data->closure);
|
|
|
|
else
|
|
|
|
clutter_alpha_set_func (alpha, alpha_data->func,
|
|
|
|
alpha_data->data,
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
priv->mode = mode;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
g_assert_not_reached ();
|
2009-01-05 12:47:10 +00:00
|
|
|
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
g_object_notify (G_OBJECT (alpha), "mode");
|
|
|
|
}
|
|
|
|
|
2007-11-23 13:11:10 +00:00
|
|
|
/**
|
2009-01-16 13:42:06 +00:00
|
|
|
* clutter_alpha_register_func:
|
|
|
|
* @func: a #ClutterAlphaFunc
|
|
|
|
* @data: user data to pass to @func, or %NULL
|
2007-11-23 13:11:10 +00:00
|
|
|
*
|
2009-01-16 13:42:06 +00:00
|
|
|
* Registers a global alpha function and returns its logical id
|
|
|
|
* to be used by clutter_alpha_set_mode() or by #ClutterAnimation.
|
2007-11-23 13:11:10 +00:00
|
|
|
*
|
2009-01-16 13:42:06 +00:00
|
|
|
* The logical id is always greater than %CLUTTER_ANIMATION_LAST.
|
|
|
|
*
|
|
|
|
* Return value: the logical id of the alpha function
|
|
|
|
*
|
|
|
|
* Since: 1.0
|
|
|
|
*/
|
|
|
|
gulong
|
|
|
|
clutter_alpha_register_func (ClutterAlphaFunc func,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
AlphaData *alpha_data;
|
|
|
|
|
|
|
|
g_return_val_if_fail (func != NULL, 0);
|
|
|
|
|
|
|
|
alpha_data = g_slice_new (AlphaData);
|
|
|
|
alpha_data->closure_set = FALSE;
|
|
|
|
alpha_data->func = func;
|
|
|
|
alpha_data->data = data;
|
|
|
|
|
|
|
|
if (G_UNLIKELY (clutter_alphas == NULL))
|
|
|
|
clutter_alphas = g_ptr_array_new ();
|
|
|
|
|
|
|
|
g_ptr_array_add (clutter_alphas, alpha_data);
|
|
|
|
|
|
|
|
return clutter_alphas->len + CLUTTER_ANIMATION_LAST;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* clutter_alpha_register_closure:
|
|
|
|
* @closure: a #GClosure
|
|
|
|
*
|
|
|
|
* #GClosure variant of clutter_alpha_register_func().
|
|
|
|
*
|
|
|
|
* Registers a global alpha function and returns its logical id
|
|
|
|
* to be used by clutter_alpha_set_mode() or by #ClutterAnimation.
|
|
|
|
*
|
|
|
|
* The logical id is always greater than %CLUTTER_ANIMATION_LAST.
|
|
|
|
*
|
|
|
|
* Return value: the logical id of the alpha function
|
|
|
|
*
|
|
|
|
* Since: 1.0
|
2007-11-23 13:11:10 +00:00
|
|
|
*/
|
2009-01-16 13:42:06 +00:00
|
|
|
gulong
|
|
|
|
clutter_alpha_register_closure (GClosure *closure)
|
|
|
|
{
|
|
|
|
AlphaData *data;
|
|
|
|
|
|
|
|
g_return_val_if_fail (closure != NULL, 0);
|
|
|
|
|
|
|
|
data = g_slice_new (AlphaData);
|
|
|
|
data->closure_set = TRUE;
|
|
|
|
data->closure = closure;
|
|
|
|
|
|
|
|
if (G_UNLIKELY (clutter_alphas == NULL))
|
|
|
|
clutter_alphas = g_ptr_array_new ();
|
|
|
|
|
|
|
|
g_ptr_array_add (clutter_alphas, data);
|
|
|
|
|
|
|
|
return clutter_alphas->len + CLUTTER_ANIMATION_LAST;
|
|
|
|
}
|
2007-11-23 13:11:10 +00:00
|
|
|
|
2006-11-17 18:45:31 +00:00
|
|
|
/**
|
|
|
|
* clutter_ramp_inc_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused argument
|
|
|
|
*
|
|
|
|
* Convenience alpha function for a monotonic increasing ramp. You
|
|
|
|
* can use this function as the alpha function for clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value.
|
2006-11-17 19:17:40 +00:00
|
|
|
*
|
|
|
|
* Since: 0.2
|
2006-11-17 18:45:31 +00:00
|
|
|
*/
|
2006-11-15 23:37:53 +00:00
|
|
|
guint32
|
|
|
|
clutter_ramp_inc_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline;
|
|
|
|
gint current_frame_num, n_frames;
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
|
|
|
|
current_frame_num = clutter_timeline_get_current_frame (timeline);
|
|
|
|
n_frames = clutter_timeline_get_n_frames (timeline);
|
|
|
|
|
|
|
|
return (current_frame_num * CLUTTER_ALPHA_MAX_ALPHA) / n_frames;
|
|
|
|
}
|
|
|
|
|
2007-11-23 13:11:10 +00:00
|
|
|
/**
|
|
|
|
* CLUTTER_ALPHA_RAMP_DEC:
|
|
|
|
*
|
|
|
|
* Convenience symbol for clutter_ramp_dec_func().
|
|
|
|
*
|
|
|
|
* Since: 0.2
|
|
|
|
*/
|
|
|
|
|
2006-11-17 18:45:31 +00:00
|
|
|
/**
|
|
|
|
* clutter_ramp_dec_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused argument
|
|
|
|
*
|
|
|
|
* Convenience alpha function for a monotonic decreasing ramp. You
|
|
|
|
* can use this function as the alpha function for clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value.
|
2006-11-17 19:17:40 +00:00
|
|
|
*
|
|
|
|
* Since: 0.2
|
2006-11-17 18:45:31 +00:00
|
|
|
*/
|
2006-11-15 23:37:53 +00:00
|
|
|
guint32
|
|
|
|
clutter_ramp_dec_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline;
|
|
|
|
gint current_frame_num, n_frames;
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
|
|
|
|
current_frame_num = clutter_timeline_get_current_frame (timeline);
|
|
|
|
n_frames = clutter_timeline_get_n_frames (timeline);
|
|
|
|
|
|
|
|
return (n_frames - current_frame_num)
|
|
|
|
* CLUTTER_ALPHA_MAX_ALPHA
|
|
|
|
/ n_frames;
|
|
|
|
}
|
|
|
|
|
2007-11-23 13:11:10 +00:00
|
|
|
/**
|
|
|
|
* CLUTTER_ALPHA_RAMP:
|
|
|
|
*
|
|
|
|
* Convenience symbol for clutter_ramp_func().
|
|
|
|
*
|
|
|
|
* Since: 0.2
|
|
|
|
*/
|
|
|
|
|
2006-11-17 18:45:31 +00:00
|
|
|
/**
|
|
|
|
* clutter_ramp_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused argument
|
|
|
|
*
|
|
|
|
* Convenience alpha function for a full ramp function (increase for
|
|
|
|
* half the time, decrease for the remaining half). You can use this
|
|
|
|
* function as the alpha function for clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value.
|
2006-11-17 19:17:40 +00:00
|
|
|
*
|
|
|
|
* Since: 0.2
|
2006-11-17 18:45:31 +00:00
|
|
|
*/
|
2006-11-15 23:37:53 +00:00
|
|
|
guint32
|
|
|
|
clutter_ramp_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline;
|
|
|
|
gint current_frame_num, n_frames;
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
|
|
|
|
current_frame_num = clutter_timeline_get_current_frame (timeline);
|
|
|
|
n_frames = clutter_timeline_get_n_frames (timeline);
|
|
|
|
|
|
|
|
if (current_frame_num > (n_frames / 2))
|
|
|
|
{
|
|
|
|
return (n_frames - current_frame_num)
|
|
|
|
* CLUTTER_ALPHA_MAX_ALPHA
|
|
|
|
/ (n_frames / 2);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return current_frame_num
|
|
|
|
* CLUTTER_ALPHA_MAX_ALPHA
|
|
|
|
/ (n_frames / 2);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-16 08:14:53 +00:00
|
|
|
static guint32
|
|
|
|
sincx1024_func (ClutterAlpha *alpha,
|
|
|
|
ClutterAngle angle,
|
|
|
|
ClutterFixed offset)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline;
|
|
|
|
gint current_frame_num, n_frames;
|
|
|
|
ClutterAngle x;
|
2008-10-30 16:37:55 +00:00
|
|
|
ClutterFixed sine;
|
2007-01-16 08:14:53 +00:00
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
|
|
|
|
current_frame_num = clutter_timeline_get_current_frame (timeline);
|
|
|
|
n_frames = clutter_timeline_get_n_frames (timeline);
|
|
|
|
|
|
|
|
x = angle * current_frame_num / n_frames;
|
|
|
|
|
2007-01-30 19:35:19 +00:00
|
|
|
x -= (512 * 512 / angle);
|
|
|
|
|
2008-10-30 16:37:55 +00:00
|
|
|
sine = ((cogl_angle_sin (x) + offset) / 2)
|
|
|
|
* CLUTTER_ALPHA_MAX_ALPHA;
|
2007-01-16 08:14:53 +00:00
|
|
|
|
2008-11-06 10:54:31 +00:00
|
|
|
sine = sine >> COGL_FIXED_Q;
|
|
|
|
|
|
|
|
return sine;
|
2007-01-16 08:14:53 +00:00
|
|
|
}
|
2008-10-30 16:37:55 +00:00
|
|
|
|
2007-01-16 08:14:53 +00:00
|
|
|
#if 0
|
|
|
|
/*
|
|
|
|
* The following two functions are left in place for reference
|
|
|
|
* purposes.
|
|
|
|
*/
|
2007-01-15 18:37:12 +00:00
|
|
|
static guint32
|
|
|
|
sincx_func (ClutterAlpha *alpha,
|
2007-01-15 19:43:09 +00:00
|
|
|
ClutterFixed angle,
|
|
|
|
ClutterFixed offset)
|
2007-01-15 18:37:12 +00:00
|
|
|
{
|
2007-01-15 19:43:09 +00:00
|
|
|
ClutterTimeline *timeline;
|
|
|
|
gint current_frame_num, n_frames;
|
|
|
|
ClutterFixed x, sine;
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
|
|
|
|
current_frame_num = clutter_timeline_get_current_frame (timeline);
|
|
|
|
n_frames = clutter_timeline_get_n_frames (timeline);
|
|
|
|
|
|
|
|
x = angle * current_frame_num / n_frames;
|
2008-10-30 16:37:55 +00:00
|
|
|
x = COGL_FIXED_FAST_MUL (x, COGL_FIXED_PI)
|
|
|
|
- COGL_FIXED_FAST_DIV (COGL_FIXED_PI, angle);
|
2007-01-15 19:43:09 +00:00
|
|
|
|
2008-10-30 16:37:55 +00:00
|
|
|
sine = (cogl_fixed_sin (x) + offset) / 2;
|
2007-01-15 19:43:09 +00:00
|
|
|
|
2008-10-30 16:37:55 +00:00
|
|
|
CLUTTER_NOTE (ALPHA, "sine: %2f\n", COGL_FIXED_TO_DOUBLE (sine));
|
2007-01-15 19:43:09 +00:00
|
|
|
|
2008-10-30 16:37:55 +00:00
|
|
|
return COGL_FIXED_TO_INT (sine * CLUTTER_ALPHA_MAX_ALPHA);
|
2007-01-15 18:37:12 +00:00
|
|
|
}
|
|
|
|
|
2007-01-30 19:35:19 +00:00
|
|
|
/* NB: angle is not in radians but in muliples of PI, i.e., 2.0
|
|
|
|
* represents full circle.
|
|
|
|
*/
|
2007-01-04 19:56:01 +00:00
|
|
|
static guint32
|
|
|
|
sinc_func (ClutterAlpha *alpha,
|
|
|
|
float angle,
|
|
|
|
float offset)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline;
|
|
|
|
gint current_frame_num, n_frames;
|
|
|
|
gdouble x, sine;
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
|
|
|
|
current_frame_num = clutter_timeline_get_current_frame (timeline);
|
|
|
|
n_frames = clutter_timeline_get_n_frames (timeline);
|
|
|
|
|
|
|
|
/* FIXME: fixed point, and fixed point sine() */
|
|
|
|
|
2008-06-30 16:15:53 +00:00
|
|
|
x = (gdouble) (current_frame_num * angle * G_PI) / n_frames ;
|
|
|
|
sine = (sin (x - (G_PI / angle)) + offset) * 0.5f;
|
2007-01-04 19:56:01 +00:00
|
|
|
|
2007-01-30 19:35:19 +00:00
|
|
|
CLUTTER_NOTE (ALPHA, "sine: %2f\n",sine);
|
2007-01-04 19:56:01 +00:00
|
|
|
|
2008-10-30 16:37:55 +00:00
|
|
|
return COGL_FLOAT_TO_INT ((sine * (gdouble) CLUTTER_ALPHA_MAX_ALPHA));
|
2007-01-04 19:56:01 +00:00
|
|
|
}
|
2007-01-16 08:14:53 +00:00
|
|
|
#endif
|
2007-01-19 16:04:06 +00:00
|
|
|
|
2007-11-23 13:11:10 +00:00
|
|
|
/**
|
|
|
|
* CLUTTER_ALPHA_SINE:
|
|
|
|
*
|
|
|
|
* Convenience symbol for clutter_sine_func().
|
|
|
|
*
|
|
|
|
* Since: 0.2
|
|
|
|
*/
|
|
|
|
|
2006-11-17 18:45:31 +00:00
|
|
|
/**
|
|
|
|
* clutter_sine_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused argument
|
|
|
|
*
|
|
|
|
* Convenience alpha function for a sine wave. You can use this
|
|
|
|
* function as the alpha function for clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value.
|
2006-11-17 19:17:40 +00:00
|
|
|
*
|
|
|
|
* Since: 0.2
|
2006-11-17 18:45:31 +00:00
|
|
|
*/
|
2006-11-15 23:37:53 +00:00
|
|
|
guint32
|
|
|
|
clutter_sine_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
2007-01-15 19:43:09 +00:00
|
|
|
#if 0
|
2007-01-30 19:35:19 +00:00
|
|
|
return sinc_func (alpha, 2.0, 1.0);
|
2007-01-15 19:43:09 +00:00
|
|
|
#else
|
2007-01-30 19:35:19 +00:00
|
|
|
/* 2.0 above represents full circle */
|
2008-10-30 16:37:55 +00:00
|
|
|
return sincx1024_func (alpha, 1024, COGL_FIXED_1);
|
2007-01-15 19:43:09 +00:00
|
|
|
#endif
|
2007-01-04 19:56:01 +00:00
|
|
|
}
|
2006-11-15 23:37:53 +00:00
|
|
|
|
2007-11-23 13:11:10 +00:00
|
|
|
/**
|
|
|
|
* CLUTTER_ALPHA_SINE_INC:
|
|
|
|
*
|
|
|
|
* Convenience symbol for clutter_sine_inc_func().
|
|
|
|
*
|
|
|
|
* Since: 0.2
|
|
|
|
*/
|
|
|
|
|
2007-01-04 19:56:01 +00:00
|
|
|
/**
|
|
|
|
* clutter_sine_inc_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused argument
|
|
|
|
*
|
2007-05-17 12:03:43 +00:00
|
|
|
* Convenience alpha function for a sine wave over interval [0, pi / 2].
|
2007-05-16 13:46:54 +00:00
|
|
|
* You can use this function as the alpha function for
|
|
|
|
* clutter_alpha_set_func().
|
2007-01-04 19:56:01 +00:00
|
|
|
*
|
|
|
|
* Return value: an alpha value.
|
|
|
|
*
|
|
|
|
* Since: 0.2
|
|
|
|
*/
|
|
|
|
guint32
|
|
|
|
clutter_sine_inc_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
2007-05-16 13:46:54 +00:00
|
|
|
ClutterTimeline * timeline;
|
|
|
|
gint frame;
|
|
|
|
gint n_frames;
|
|
|
|
ClutterAngle x;
|
|
|
|
ClutterFixed sine;
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
frame = clutter_timeline_get_current_frame (timeline);
|
|
|
|
n_frames = clutter_timeline_get_n_frames (timeline);
|
|
|
|
|
|
|
|
x = 256 * frame / n_frames;
|
|
|
|
|
2008-10-30 16:37:55 +00:00
|
|
|
sine = cogl_angle_sin (x) * CLUTTER_ALPHA_MAX_ALPHA;
|
2007-05-16 13:46:54 +00:00
|
|
|
|
2008-11-06 10:54:31 +00:00
|
|
|
return ((guint32) sine) >> COGL_FIXED_Q;
|
2007-05-16 13:46:54 +00:00
|
|
|
}
|
|
|
|
|
2007-11-23 13:11:10 +00:00
|
|
|
/**
|
|
|
|
* CLUTTER_ALPHA_SINE_DEC:
|
|
|
|
*
|
|
|
|
* Convenience symbol for clutter_sine_dec_func().
|
|
|
|
*
|
|
|
|
* Since: 0.2
|
|
|
|
*/
|
|
|
|
|
2007-05-16 13:46:54 +00:00
|
|
|
/**
|
|
|
|
* clutter_sine_dec_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused argument
|
|
|
|
*
|
2007-05-17 12:03:43 +00:00
|
|
|
* Convenience alpha function for a sine wave over interval [pi / 2, pi].
|
2007-05-16 13:46:54 +00:00
|
|
|
* You can use this function as the alpha function for
|
|
|
|
* clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value.
|
|
|
|
*
|
|
|
|
* Since: 0.4
|
|
|
|
*/
|
|
|
|
guint32
|
|
|
|
clutter_sine_dec_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
ClutterTimeline * timeline;
|
|
|
|
gint frame;
|
|
|
|
gint n_frames;
|
|
|
|
ClutterAngle x;
|
|
|
|
ClutterFixed sine;
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
frame = clutter_timeline_get_current_frame (timeline);
|
|
|
|
n_frames = clutter_timeline_get_n_frames (timeline);
|
|
|
|
|
|
|
|
x = 256 * frame / n_frames + 256;
|
|
|
|
|
2008-10-30 16:37:55 +00:00
|
|
|
sine = cogl_angle_sin (x) * CLUTTER_ALPHA_MAX_ALPHA;
|
2007-05-16 13:46:54 +00:00
|
|
|
|
2008-11-06 10:54:31 +00:00
|
|
|
return ((guint32) sine) >> COGL_FIXED_Q;
|
2006-08-28 17:11:15 +00:00
|
|
|
}
|
2007-01-30 16:51:49 +00:00
|
|
|
|
2007-11-23 13:11:10 +00:00
|
|
|
/**
|
|
|
|
* CLUTTER_ALPHA_SINE_HALF:
|
|
|
|
*
|
|
|
|
* Convenience symbol for clutter_sine_half_func().
|
|
|
|
*
|
|
|
|
* Since: 0.4
|
|
|
|
*/
|
|
|
|
|
2007-05-16 13:53:39 +00:00
|
|
|
/**
|
|
|
|
* clutter_sine_half_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused argument
|
|
|
|
*
|
2007-05-17 12:03:43 +00:00
|
|
|
* Convenience alpha function for a sine wave over interval [0, pi].
|
2007-05-16 13:53:39 +00:00
|
|
|
* You can use this function as the alpha function for
|
|
|
|
* clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value.
|
|
|
|
*
|
|
|
|
* Since: 0.4
|
|
|
|
*/
|
|
|
|
guint32
|
|
|
|
clutter_sine_half_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
ClutterTimeline *timeline;
|
|
|
|
gint frame;
|
|
|
|
gint n_frames;
|
|
|
|
ClutterAngle x;
|
|
|
|
ClutterFixed sine;
|
2007-05-16 13:53:39 +00:00
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
frame = clutter_timeline_get_current_frame (timeline);
|
|
|
|
n_frames = clutter_timeline_get_n_frames (timeline);
|
|
|
|
|
|
|
|
x = 512 * frame / n_frames;
|
|
|
|
|
2008-10-30 16:37:55 +00:00
|
|
|
sine = cogl_angle_sin (x) * CLUTTER_ALPHA_MAX_ALPHA;
|
2007-05-16 13:53:39 +00:00
|
|
|
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
return ((guint32) sine) >> COGL_FIXED_Q;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* clutter_sine_in_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused argument
|
|
|
|
*
|
|
|
|
* Convenience alpha function for (sin(x) + 1) over the
|
|
|
|
* interval [-pi/2, 0].
|
|
|
|
*
|
|
|
|
* You can use this function as the alpha function for
|
|
|
|
* clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value.
|
|
|
|
*
|
|
|
|
* Since: 1.0
|
|
|
|
*/
|
|
|
|
guint32
|
|
|
|
clutter_sine_in_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline;
|
|
|
|
gint frame;
|
|
|
|
gint n_frames;
|
|
|
|
ClutterAngle x;
|
|
|
|
ClutterFixed sine;
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
frame = clutter_timeline_get_current_frame (timeline);
|
|
|
|
n_frames = clutter_timeline_get_n_frames (timeline);
|
|
|
|
|
|
|
|
/* XXX- if we use 768 we overflow */
|
|
|
|
x = 256 * frame / n_frames + 767;
|
|
|
|
|
|
|
|
sine = (cogl_angle_sin (x) + 1) * CLUTTER_ALPHA_MAX_ALPHA;
|
|
|
|
|
|
|
|
return ((guint32) sine) >> COGL_FIXED_Q;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* clutter_sine_in_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused argument
|
|
|
|
*
|
|
|
|
* Convenience alpha function for sin(x) over the interval [0, pi/2].
|
|
|
|
*
|
|
|
|
* You can use this function as the alpha function for
|
|
|
|
* clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value.
|
|
|
|
*
|
|
|
|
* Since: 1.0
|
|
|
|
*/
|
|
|
|
guint32
|
|
|
|
clutter_sine_out_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline;
|
|
|
|
gint frame;
|
|
|
|
gint n_frames;
|
|
|
|
ClutterAngle x;
|
|
|
|
ClutterFixed sine;
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
frame = clutter_timeline_get_current_frame (timeline);
|
|
|
|
n_frames = clutter_timeline_get_n_frames (timeline);
|
|
|
|
|
|
|
|
x = 256 * frame / n_frames;
|
|
|
|
|
|
|
|
sine = cogl_angle_sin (x) * CLUTTER_ALPHA_MAX_ALPHA;
|
|
|
|
|
|
|
|
return ((guint32) sine) >> COGL_FIXED_Q;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* clutter_sine_in_out_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused argument
|
|
|
|
*
|
|
|
|
* Convenience alpha function for (sin(x) + 1) / 2 over the
|
|
|
|
* interval [-pi/2, pi/2].
|
|
|
|
*
|
|
|
|
* You can use this function as the alpha function for
|
|
|
|
* clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value.
|
|
|
|
*
|
|
|
|
* Since: 1.0
|
|
|
|
*/
|
|
|
|
guint32
|
|
|
|
clutter_sine_in_out_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline;
|
|
|
|
gint frame;
|
|
|
|
gint n_frames;
|
|
|
|
ClutterAngle x;
|
|
|
|
ClutterFixed sine;
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
frame = clutter_timeline_get_current_frame (timeline);
|
|
|
|
n_frames = clutter_timeline_get_n_frames (timeline);
|
|
|
|
|
|
|
|
x = -256 * frame / n_frames + 256;
|
|
|
|
|
|
|
|
sine = (cogl_angle_sin (x) + 1) / 2 * CLUTTER_ALPHA_MAX_ALPHA;
|
|
|
|
|
|
|
|
return ((guint32) sine) >> COGL_FIXED_Q;
|
2007-05-16 13:53:39 +00:00
|
|
|
}
|
|
|
|
|
2007-11-23 13:11:10 +00:00
|
|
|
/**
|
|
|
|
* CLUTTER_ALPHA_SQUARE:
|
|
|
|
*
|
|
|
|
* Convenience symbol for clutter_square_func().
|
|
|
|
*
|
|
|
|
* Since: 0.4
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
*
|
|
|
|
* Deprecated: 1.0: Use clutter_square_func() instead
|
2007-11-23 13:11:10 +00:00
|
|
|
*/
|
|
|
|
|
2007-01-30 16:51:49 +00:00
|
|
|
/**
|
|
|
|
* clutter_square_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused argument
|
|
|
|
*
|
|
|
|
* Convenience alpha function for a square wave. You can use this
|
|
|
|
* function as the alpha function for clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value
|
|
|
|
*
|
|
|
|
* Since: 0.4
|
|
|
|
*/
|
|
|
|
guint32
|
|
|
|
clutter_square_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline;
|
|
|
|
gint current_frame_num, n_frames;
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
|
|
|
|
current_frame_num = clutter_timeline_get_current_frame (timeline);
|
|
|
|
n_frames = clutter_timeline_get_n_frames (timeline);
|
|
|
|
|
|
|
|
return (current_frame_num > (n_frames / 2)) ? CLUTTER_ALPHA_MAX_ALPHA
|
|
|
|
: 0;
|
|
|
|
}
|
2007-05-16 11:32:50 +00:00
|
|
|
|
2007-11-23 13:11:10 +00:00
|
|
|
/**
|
|
|
|
* CLUTTER_ALPHA_SMOOTHSTEP_INC:
|
|
|
|
*
|
|
|
|
* Convenience symbol for clutter_smoothstep_inc_func().
|
|
|
|
*
|
|
|
|
* Since: 0.4
|
|
|
|
*/
|
2007-05-16 11:32:50 +00:00
|
|
|
|
|
|
|
/**
|
2007-05-30 10:52:06 +00:00
|
|
|
* clutter_smoothstep_inc_func:
|
2007-05-16 11:32:50 +00:00
|
|
|
* @alpha: a #ClutterAlpha
|
2007-05-30 10:52:06 +00:00
|
|
|
* @dummy: unused
|
2007-05-16 11:32:50 +00:00
|
|
|
*
|
|
|
|
* Convenience alpha function for a smoothstep curve. You can use this
|
|
|
|
* function as the alpha function for clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value
|
|
|
|
*
|
|
|
|
* Since: 0.4
|
|
|
|
*/
|
|
|
|
guint32
|
2007-05-30 10:52:06 +00:00
|
|
|
clutter_smoothstep_inc_func (ClutterAlpha *alpha,
|
2007-07-04 12:29:44 +00:00
|
|
|
gpointer dummy)
|
2007-05-16 11:32:50 +00:00
|
|
|
{
|
2007-05-25 10:56:09 +00:00
|
|
|
ClutterTimeline *timeline;
|
2007-05-16 11:32:50 +00:00
|
|
|
gint frame;
|
|
|
|
gint n_frames;
|
2007-08-15 13:29:43 +00:00
|
|
|
guint32 r;
|
|
|
|
guint32 x;
|
2007-05-16 11:32:50 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The smoothstep function uses f(x) = -2x^3 + 3x^2 where x is from <0,1>,
|
|
|
|
* and precission is critical -- we use 8.24 fixed format for this operation.
|
|
|
|
* The earlier operations involve division, which we cannot do in 8.24 for
|
|
|
|
* numbers in <0,1> we use ClutterFixed.
|
|
|
|
*/
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
frame = clutter_timeline_get_current_frame (timeline);
|
|
|
|
n_frames = clutter_timeline_get_n_frames (timeline);
|
|
|
|
|
|
|
|
/*
|
2007-05-30 10:52:06 +00:00
|
|
|
* Convert x to 8.24 for next step.
|
2007-05-16 11:32:50 +00:00
|
|
|
*/
|
2008-10-30 16:37:55 +00:00
|
|
|
x = COGL_FIXED_FAST_DIV (frame, n_frames) << 8;
|
2007-05-16 11:32:50 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* f(x) = -2x^3 + 3x^2
|
|
|
|
*
|
|
|
|
* Convert result to ClutterFixed to avoid overflow in next step.
|
|
|
|
*/
|
|
|
|
r = ((x >> 12) * (x >> 12) * 3 - (x >> 15) * (x >> 16) * (x >> 16)) >> 8;
|
|
|
|
|
2008-10-30 16:37:55 +00:00
|
|
|
return COGL_FIXED_TO_INT (r * CLUTTER_ALPHA_MAX_ALPHA);
|
2007-05-16 11:32:50 +00:00
|
|
|
}
|
2007-05-17 07:09:24 +00:00
|
|
|
|
2007-11-23 13:11:10 +00:00
|
|
|
/**
|
|
|
|
* CLUTTER_ALPHA_SMOOTHSTEP_DEC:
|
|
|
|
*
|
|
|
|
* Convenience symbol for clutter_smoothstep_dec_func().
|
|
|
|
*
|
|
|
|
* Since: 0.4
|
|
|
|
*/
|
|
|
|
|
2007-05-30 10:52:06 +00:00
|
|
|
/**
|
|
|
|
* clutter_smoothstep_dec_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused
|
|
|
|
*
|
|
|
|
* Convenience alpha function for a downward smoothstep curve. You can use
|
|
|
|
* this function as the alpha function for clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value
|
|
|
|
*
|
|
|
|
* Since: 0.4
|
|
|
|
*/
|
|
|
|
guint32
|
|
|
|
clutter_smoothstep_dec_func (ClutterAlpha *alpha,
|
2007-07-04 12:29:44 +00:00
|
|
|
gpointer dummy)
|
2007-05-30 10:52:06 +00:00
|
|
|
{
|
|
|
|
return CLUTTER_ALPHA_MAX_ALPHA - clutter_smoothstep_inc_func (alpha, dummy);
|
|
|
|
}
|
|
|
|
|
2007-11-23 13:11:10 +00:00
|
|
|
/**
|
|
|
|
* CLUTTER_ALPHA_EXP_INC:
|
|
|
|
*
|
|
|
|
* Convenience symbol for clutter_exp_inc_func()
|
|
|
|
*
|
|
|
|
* Since: 0.4
|
|
|
|
*/
|
|
|
|
|
2007-05-17 07:09:24 +00:00
|
|
|
/**
|
|
|
|
* clutter_exp_inc_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused argument
|
|
|
|
*
|
|
|
|
* Convenience alpha function for a 2^x curve. You can use this function as the
|
|
|
|
* alpha function for clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value.
|
|
|
|
*
|
|
|
|
* Since: 0.4
|
|
|
|
*/
|
|
|
|
guint32
|
|
|
|
clutter_exp_inc_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
ClutterTimeline * timeline;
|
|
|
|
gint frame;
|
|
|
|
gint n_frames;
|
|
|
|
ClutterFixed x;
|
|
|
|
ClutterFixed x_alpha_max = 0x100000;
|
|
|
|
guint32 result;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Choose x_alpha_max such that
|
|
|
|
*
|
|
|
|
* (2^x_alpha_max) - 1 == CLUTTER_ALPHA_MAX_ALPHA
|
|
|
|
*/
|
|
|
|
#if CLUTTER_ALPHA_MAX_ALPHA != 0xffff
|
|
|
|
#error Adjust x_alpha_max to match CLUTTER_ALPHA_MAX_ALPHA
|
|
|
|
#endif
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
frame = clutter_timeline_get_current_frame (timeline);
|
|
|
|
n_frames = clutter_timeline_get_n_frames (timeline);
|
|
|
|
|
|
|
|
x = x_alpha_max * frame / n_frames;
|
|
|
|
|
2008-10-30 16:37:55 +00:00
|
|
|
result = CLAMP (cogl_fixed_pow2 (x) - 1, 0, CLUTTER_ALPHA_MAX_ALPHA);
|
2007-05-17 07:09:24 +00:00
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2007-11-23 13:11:10 +00:00
|
|
|
/**
|
|
|
|
* CLUTTER_ALPHA_EXP_DEC:
|
|
|
|
*
|
|
|
|
* Convenience symbold for clutter_exp_dec_func().
|
|
|
|
*
|
|
|
|
* Since: 0.4
|
|
|
|
*/
|
2007-05-17 07:09:24 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* clutter_exp_dec_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused argument
|
|
|
|
*
|
|
|
|
* Convenience alpha function for a decreasing 2^x curve. You can use this
|
|
|
|
* function as the alpha function for clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value.
|
|
|
|
*
|
|
|
|
* Since: 0.4
|
|
|
|
*/
|
|
|
|
guint32
|
|
|
|
clutter_exp_dec_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
ClutterTimeline * timeline;
|
|
|
|
gint frame;
|
|
|
|
gint n_frames;
|
|
|
|
ClutterFixed x;
|
|
|
|
ClutterFixed x_alpha_max = 0x100000;
|
|
|
|
guint32 result;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Choose x_alpha_max such that
|
|
|
|
*
|
|
|
|
* (2^x_alpha_max) - 1 == CLUTTER_ALPHA_MAX_ALPHA
|
|
|
|
*/
|
|
|
|
#if CLUTTER_ALPHA_MAX_ALPHA != 0xffff
|
|
|
|
#error Adjust x_alpha_max to match CLUTTER_ALPHA_MAX_ALPHA
|
|
|
|
#endif
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
frame = clutter_timeline_get_current_frame (timeline);
|
|
|
|
n_frames = clutter_timeline_get_n_frames (timeline);
|
|
|
|
|
|
|
|
x = (x_alpha_max * (n_frames - frame)) / n_frames;
|
|
|
|
|
2008-10-30 16:37:55 +00:00
|
|
|
result = CLAMP (cogl_fixed_pow2 (x) - 1, 0, CLUTTER_ALPHA_MAX_ALPHA);
|
2007-05-17 07:09:24 +00:00
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
|
|
|
|
static inline gdouble
|
|
|
|
clutter_cubic_bezier (ClutterAlpha *alpha,
|
|
|
|
gdouble x_1,
|
|
|
|
gdouble y_1,
|
|
|
|
gdouble x_2,
|
|
|
|
gdouble y_2)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline;
|
|
|
|
gdouble t, b_t, res;
|
|
|
|
|
|
|
|
/* the cubic bezier has a parametric form of:
|
|
|
|
*
|
|
|
|
* B(t) = (1 - t)^3 * P_0
|
|
|
|
* + 3t * (1 - t)^2 * P_1
|
|
|
|
* + 3t^2 * (1 - t) * P_2
|
2008-12-18 12:20:46 +00:00
|
|
|
* + t^3 * P_3 (with t included in [0, 1])
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
*
|
|
|
|
* the P_0 and P_3 points are set to (0, 0) and (1, 1) respectively,
|
|
|
|
* and the curve never passes through P_1 and P_2 - with these two
|
|
|
|
* points merely acting as control points for the curve starting
|
|
|
|
* from P_0 and ending at P_3.
|
|
|
|
*
|
|
|
|
* since the starting point is (0, 0) we can simplify the previous
|
|
|
|
* parametric form to:
|
|
|
|
*
|
|
|
|
* B(t) = 3t * (1 - t)^2 * P_1
|
|
|
|
* + 3t^2 * (1 - t) * P_2
|
2008-12-18 12:20:46 +00:00
|
|
|
* + t^3 * P_3 (with t included in [0, 1])
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
*
|
|
|
|
* and, similarly, since the final point is (1, 1) we can simplify
|
|
|
|
* it further to:
|
|
|
|
*
|
|
|
|
* B(t) = 3t * (1 - t)^2 * P_1
|
|
|
|
* + 3t^2 * (1 - t) * P_2
|
2008-12-18 12:20:46 +00:00
|
|
|
* + t^3 (with t included in [0, 1])
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
*
|
|
|
|
* since an alpha function has only a time parameter and we have two
|
|
|
|
* coordinates for each point, we pass the time as the first
|
|
|
|
* coordinate for the point and then we solve the cubic beziér curve
|
|
|
|
* for the second coordinate at the same point.
|
|
|
|
*/
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
t = clutter_timeline_get_progress (timeline);
|
|
|
|
|
|
|
|
b_t = 3 * t * pow (1 - t, 2) * x_1
|
|
|
|
+ 3 * pow (t, 2) * (1 - t) * x_2
|
2008-12-18 12:20:46 +00:00
|
|
|
+ pow (t, 3);
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
|
|
|
|
res = 3 * b_t * pow (1 - b_t, 2) * y_1
|
|
|
|
+ 3 * pow (b_t, 2) * (1 - b_t) * y_2
|
2008-12-18 12:20:46 +00:00
|
|
|
+ pow (b_t, 3);
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 09:50:03 +00:00
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* clutter_ease_in_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused argument
|
|
|
|
*
|
|
|
|
* Convenience alpha function for a cubic Beziér curve with control
|
|
|
|
* points at (0.42, 0) and (1, 0). You can use this function as the
|
|
|
|
* alpha function for clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value.
|
|
|
|
*
|
|
|
|
* Since: 1.0
|
|
|
|
*/
|
|
|
|
guint32
|
|
|
|
clutter_ease_in_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
gdouble res;
|
|
|
|
|
|
|
|
res = clutter_cubic_bezier (alpha, 0.42, 0, 1, 0);
|
|
|
|
|
|
|
|
return CLAMP (res * CLUTTER_ALPHA_MAX_ALPHA, 0, CLUTTER_ALPHA_MAX_ALPHA);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* clutter_ease_out_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused argument
|
|
|
|
*
|
|
|
|
* Convenience alpha function for a cubic Beziér curve with control
|
|
|
|
* points at (0, 0) and (0.58, 1). You can use this function as the
|
|
|
|
* alpha function for clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value.
|
|
|
|
*
|
|
|
|
* Since: 1.0
|
|
|
|
*/
|
|
|
|
guint32
|
|
|
|
clutter_ease_out_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
gdouble res;
|
|
|
|
|
|
|
|
res = clutter_cubic_bezier (alpha, 0, 0, 0.58, 1);
|
|
|
|
|
|
|
|
return CLAMP (res * CLUTTER_ALPHA_MAX_ALPHA, 0, CLUTTER_ALPHA_MAX_ALPHA);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* clutter_ease_in_out_func:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @dummy: unused argument
|
|
|
|
*
|
|
|
|
* Convenience alpha function for a cubic Beziér curve with control
|
|
|
|
* points at (0.42, 0) and (0.58, 1). You can use this function as
|
|
|
|
* the alpha function for clutter_alpha_set_func().
|
|
|
|
*
|
|
|
|
* Return value: an alpha value.
|
|
|
|
*
|
|
|
|
* Since: 1.0
|
|
|
|
*/
|
|
|
|
guint32
|
|
|
|
clutter_ease_in_out_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
gdouble res;
|
|
|
|
|
|
|
|
res = clutter_cubic_bezier (alpha, 0.42, 0, 0.58, 1);
|
|
|
|
|
|
|
|
return CLAMP (res * CLUTTER_ALPHA_MAX_ALPHA, 0, CLUTTER_ALPHA_MAX_ALPHA);
|
|
|
|
}
|
2008-11-18 12:42:05 +00:00
|
|
|
|
|
|
|
guint32
|
|
|
|
clutter_exp_in_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline;
|
|
|
|
gdouble progress, res;
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
progress = clutter_timeline_get_progress (timeline);
|
|
|
|
|
|
|
|
res = pow (2, 10 * (progress - 1));
|
|
|
|
res = CLAMP (res * CLUTTER_ALPHA_MAX_ALPHA, 0, CLUTTER_ALPHA_MAX_ALPHA);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
guint32
|
|
|
|
clutter_exp_out_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline;
|
|
|
|
gdouble progress, res;
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
progress = clutter_timeline_get_progress (timeline);
|
|
|
|
|
|
|
|
res = -pow (2, (-10 * progress)) + 1;
|
|
|
|
res = CLAMP (res * CLUTTER_ALPHA_MAX_ALPHA, 0, CLUTTER_ALPHA_MAX_ALPHA);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
guint32
|
|
|
|
clutter_exp_in_out_func (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline;
|
|
|
|
gdouble progress, res;
|
|
|
|
|
|
|
|
timeline = clutter_alpha_get_timeline (alpha);
|
|
|
|
progress = clutter_timeline_get_progress (timeline);
|
|
|
|
|
|
|
|
if (progress < 0.5)
|
|
|
|
res = 0.5 * pow (2, (10 * (progress - 1)));
|
|
|
|
else
|
|
|
|
res = 0.5 * -pow (2, (-10 * progress)) + 1;
|
|
|
|
|
|
|
|
res = CLAMP (res * CLUTTER_ALPHA_MAX_ALPHA, 0, CLUTTER_ALPHA_MAX_ALPHA);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|