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
|
|
|
*
|
2009-01-20 16:42:49 +00:00
|
|
|
* Copyright (C) 2006, 2007, 2008 OpenedHand
|
2010-03-01 12:56:10 +00:00
|
|
|
* Copyright (C) 2009, 2010 Intel Corp.
|
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
|
2010-03-01 12:56:10 +00:00
|
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
2006-08-28 17:11:15 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* SECTION:clutter-alpha
|
|
|
|
* @short_description: A class for calculating an alpha value as a function
|
|
|
|
* of time.
|
|
|
|
*
|
2009-01-20 16:42:49 +00:00
|
|
|
* #ClutterAlpha is a class for calculating an floating point value
|
|
|
|
* dependent only on the position of a #ClutterTimeline.
|
2008-11-18 12:42:05 +00:00
|
|
|
*
|
|
|
|
* 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
|
2009-03-27 14:28:08 +00:00
|
|
|
* "animation mode", either by using the #ClutterAnimationMode values that
|
2009-01-20 16:42:49 +00:00
|
|
|
* Clutter itself provides or by registering custom functions using
|
|
|
|
* clutter_alpha_register_func().
|
2009-01-16 13:42:06 +00:00
|
|
|
*
|
|
|
|
* 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
|
|
|
*
|
2009-01-20 16:42:49 +00:00
|
|
|
* #ClutterAlpha is used to "drive" a #ClutterBehaviour instance, and it
|
|
|
|
* is internally used by the #ClutterAnimation API.
|
2008-02-08 13:52:11 +00:00
|
|
|
*
|
2009-01-20 18:13:36 +00:00
|
|
|
* <figure id="easing-modes">
|
|
|
|
* <title>Easing modes provided by Clutter</title>
|
|
|
|
* <graphic fileref="easing-modes.png" format="PNG"/>
|
|
|
|
* </figure>
|
|
|
|
*
|
alpha: Allow setting the function in ClutterScript
When defining an Alpha in ClutterScript we should allow setting
the alpha function by using a custom property. This makes it
possible to have both:
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : { "timeline" : "timeline-1", "function" : "alpha_func" },
...
}
And:
{
"id" : "alpha-1",
"type" : "ClutterAlpha",
"timeline" : "timeline-1",
"function" : "alpha_func"
},
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : "alpha-1",
...
}
The latter allows defining a single alpha function for multiple
behaviours.
2009-10-21 14:29:25 +00:00
|
|
|
* <refsect2 id="ClutterAlpha-script">
|
|
|
|
* <title>ClutterAlpha custom properties for #ClutterScript</title>
|
|
|
|
* <para>#ClutterAlpha defines a custom "function" property for
|
|
|
|
* #ClutterScript which allows to reference a custom alpha function
|
|
|
|
* available in the source code. Setting the "function" property
|
|
|
|
* is equivalent to calling clutter_alpha_set_func() with the
|
|
|
|
* specified function name. No user data or #GDestroyNotify is
|
|
|
|
* available to be passed.</para>
|
|
|
|
* <example id="ClutterAlpha-script-example">
|
|
|
|
* <title>Defining a ClutterAlpha in ClutterScript</title>
|
|
|
|
* <para>The following JSON fragment defines a #ClutterAlpha
|
2009-11-13 14:43:57 +00:00
|
|
|
* using a #ClutterTimeline with id "sine-timeline" and an alpha
|
alpha: Allow setting the function in ClutterScript
When defining an Alpha in ClutterScript we should allow setting
the alpha function by using a custom property. This makes it
possible to have both:
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : { "timeline" : "timeline-1", "function" : "alpha_func" },
...
}
And:
{
"id" : "alpha-1",
"type" : "ClutterAlpha",
"timeline" : "timeline-1",
"function" : "alpha_func"
},
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : "alpha-1",
...
}
The latter allows defining a single alpha function for multiple
behaviours.
2009-10-21 14:29:25 +00:00
|
|
|
* function called my_sine_alpha(). The defined #ClutterAlpha
|
|
|
|
* instance can be reused in multiple #ClutterBehaviour
|
2009-11-13 14:43:57 +00:00
|
|
|
* definitions or for #ClutterAnimation definitions.</para>
|
alpha: Allow setting the function in ClutterScript
When defining an Alpha in ClutterScript we should allow setting
the alpha function by using a custom property. This makes it
possible to have both:
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : { "timeline" : "timeline-1", "function" : "alpha_func" },
...
}
And:
{
"id" : "alpha-1",
"type" : "ClutterAlpha",
"timeline" : "timeline-1",
"function" : "alpha_func"
},
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : "alpha-1",
...
}
The latter allows defining a single alpha function for multiple
behaviours.
2009-10-21 14:29:25 +00:00
|
|
|
* <programlisting>
|
|
|
|
* {
|
|
|
|
* "id" : "sine-alpha",
|
2009-10-21 15:04:12 +00:00
|
|
|
* "timeline" : {
|
|
|
|
* "id" : "sine-timeline",
|
|
|
|
* "duration" : 500,
|
|
|
|
* "loop" : true
|
|
|
|
* },
|
alpha: Allow setting the function in ClutterScript
When defining an Alpha in ClutterScript we should allow setting
the alpha function by using a custom property. This makes it
possible to have both:
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : { "timeline" : "timeline-1", "function" : "alpha_func" },
...
}
And:
{
"id" : "alpha-1",
"type" : "ClutterAlpha",
"timeline" : "timeline-1",
"function" : "alpha_func"
},
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : "alpha-1",
...
}
The latter allows defining a single alpha function for multiple
behaviours.
2009-10-21 14:29:25 +00:00
|
|
|
* "function" : "my_sine_alpha"
|
|
|
|
* }
|
|
|
|
* </programlisting>
|
2009-10-21 16:44:44 +00:00
|
|
|
* </example>
|
2009-11-13 14:43:57 +00:00
|
|
|
* <para>For the way to define the #ClutterAlpha:mode property
|
|
|
|
* inside a ClutterScript fragment, see <link
|
|
|
|
* linkend="clutter-AnimationMode-Script">the corresponding section</link>
|
|
|
|
* in #ClutterAnimation.</para>
|
alpha: Allow setting the function in ClutterScript
When defining an Alpha in ClutterScript we should allow setting
the alpha function by using a custom property. This makes it
possible to have both:
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : { "timeline" : "timeline-1", "function" : "alpha_func" },
...
}
And:
{
"id" : "alpha-1",
"type" : "ClutterAlpha",
"timeline" : "timeline-1",
"function" : "alpha_func"
},
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : "alpha-1",
...
}
The latter allows defining a single alpha function for multiple
behaviours.
2009-10-21 14:29:25 +00:00
|
|
|
* </refsect2>
|
|
|
|
*
|
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>
|
|
|
|
|
alpha: Allow setting the function in ClutterScript
When defining an Alpha in ClutterScript we should allow setting
the alpha function by using a custom property. This makes it
possible to have both:
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : { "timeline" : "timeline-1", "function" : "alpha_func" },
...
}
And:
{
"id" : "alpha-1",
"type" : "ClutterAlpha",
"timeline" : "timeline-1",
"function" : "alpha_func"
},
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : "alpha-1",
...
}
The latter allows defining a single alpha function for multiple
behaviours.
2009-10-21 14:29:25 +00:00
|
|
|
#include <gmodule.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"
|
alpha: Allow setting the function in ClutterScript
When defining an Alpha in ClutterScript we should allow setting
the alpha function by using a custom property. This makes it
possible to have both:
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : { "timeline" : "timeline-1", "function" : "alpha_func" },
...
}
And:
{
"id" : "alpha-1",
"type" : "ClutterAlpha",
"timeline" : "timeline-1",
"function" : "alpha_func"
},
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : "alpha-1",
...
}
The latter allows defining a single alpha function for multiple
behaviours.
2009-10-21 14:29:25 +00:00
|
|
|
#include "clutter-scriptable.h"
|
2009-10-21 15:04:12 +00:00
|
|
|
#include "clutter-script-private.h"
|
2006-08-28 17:11:15 +00:00
|
|
|
|
alpha: Allow setting the function in ClutterScript
When defining an Alpha in ClutterScript we should allow setting
the alpha function by using a custom property. This makes it
possible to have both:
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : { "timeline" : "timeline-1", "function" : "alpha_func" },
...
}
And:
{
"id" : "alpha-1",
"type" : "ClutterAlpha",
"timeline" : "timeline-1",
"function" : "alpha_func"
},
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : "alpha-1",
...
}
The latter allows defining a single alpha function for multiple
behaviours.
2009-10-21 14:29:25 +00:00
|
|
|
static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
|
2006-08-28 17:11:15 +00:00
|
|
|
|
alpha: Allow setting the function in ClutterScript
When defining an Alpha in ClutterScript we should allow setting
the alpha function by using a custom property. This makes it
possible to have both:
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : { "timeline" : "timeline-1", "function" : "alpha_func" },
...
}
And:
{
"id" : "alpha-1",
"type" : "ClutterAlpha",
"timeline" : "timeline-1",
"function" : "alpha_func"
},
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : "alpha-1",
...
}
The latter allows defining a single alpha function for multiple
behaviours.
2009-10-21 14:29:25 +00:00
|
|
|
G_DEFINE_TYPE_WITH_CODE (ClutterAlpha,
|
|
|
|
clutter_alpha,
|
|
|
|
G_TYPE_INITIALLY_UNOWNED,
|
|
|
|
G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
|
|
|
|
clutter_scriptable_iface_init));
|
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;
|
|
|
|
|
2009-01-20 16:42:49 +00:00
|
|
|
gdouble 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)
|
|
|
|
{
|
2010-02-11 15:07:38 +00:00
|
|
|
ClutterAlpha *alpha = CLUTTER_ALPHA (object);
|
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)
|
|
|
|
{
|
2010-02-11 15:07:38 +00:00
|
|
|
ClutterAlphaPrivate *priv = CLUTTER_ALPHA (object)->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:
|
2009-01-20 16:42:49 +00:00
|
|
|
g_value_set_double (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);
|
|
|
|
}
|
|
|
|
|
alpha: Allow setting the function in ClutterScript
When defining an Alpha in ClutterScript we should allow setting
the alpha function by using a custom property. This makes it
possible to have both:
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : { "timeline" : "timeline-1", "function" : "alpha_func" },
...
}
And:
{
"id" : "alpha-1",
"type" : "ClutterAlpha",
"timeline" : "timeline-1",
"function" : "alpha_func"
},
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : "alpha-1",
...
}
The latter allows defining a single alpha function for multiple
behaviours.
2009-10-21 14:29:25 +00:00
|
|
|
static ClutterAlphaFunc
|
|
|
|
resolve_alpha_func (const gchar *name)
|
|
|
|
{
|
|
|
|
static GModule *module = NULL;
|
|
|
|
ClutterAlphaFunc func;
|
|
|
|
|
|
|
|
CLUTTER_NOTE (SCRIPT, "Looking up '%s' alpha function", name);
|
|
|
|
|
|
|
|
if (G_UNLIKELY (module == NULL))
|
2009-11-06 14:04:36 +00:00
|
|
|
module = g_module_open (NULL, 0);
|
alpha: Allow setting the function in ClutterScript
When defining an Alpha in ClutterScript we should allow setting
the alpha function by using a custom property. This makes it
possible to have both:
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : { "timeline" : "timeline-1", "function" : "alpha_func" },
...
}
And:
{
"id" : "alpha-1",
"type" : "ClutterAlpha",
"timeline" : "timeline-1",
"function" : "alpha_func"
},
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : "alpha-1",
...
}
The latter allows defining a single alpha function for multiple
behaviours.
2009-10-21 14:29:25 +00:00
|
|
|
|
|
|
|
if (g_module_symbol (module, name, (gpointer) &func))
|
|
|
|
{
|
|
|
|
CLUTTER_NOTE (SCRIPT, "Found '%s' alpha function in the symbols table",
|
|
|
|
name);
|
|
|
|
return func;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_alpha_set_custom_property (ClutterScriptable *scriptable,
|
|
|
|
ClutterScript *script,
|
|
|
|
const gchar *name,
|
|
|
|
const GValue *value)
|
|
|
|
{
|
|
|
|
if (strncmp (name, "function", 8) == 0)
|
|
|
|
{
|
|
|
|
g_assert (G_VALUE_HOLDS (value, G_TYPE_POINTER));
|
|
|
|
if (g_value_get_pointer (value) != NULL)
|
|
|
|
{
|
|
|
|
clutter_alpha_set_func (CLUTTER_ALPHA (scriptable),
|
|
|
|
g_value_get_pointer (value),
|
|
|
|
NULL, NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
g_object_set_property (G_OBJECT (scriptable), name, value);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
clutter_alpha_parse_custom_node (ClutterScriptable *scriptable,
|
|
|
|
ClutterScript *script,
|
|
|
|
GValue *value,
|
|
|
|
const gchar *name,
|
|
|
|
JsonNode *node)
|
|
|
|
{
|
|
|
|
if (strncmp (name, "function", 8) == 0)
|
|
|
|
{
|
|
|
|
const gchar *func_name = json_node_get_string (node);
|
|
|
|
|
|
|
|
g_value_init (value, G_TYPE_POINTER);
|
|
|
|
g_value_set_pointer (value, resolve_alpha_func (func_name));
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2009-10-21 15:04:12 +00:00
|
|
|
/* we need to do this because we use gulong in place
|
|
|
|
* of ClutterAnimationMode for ClutterAlpha:mode
|
|
|
|
*/
|
|
|
|
if (strncmp (name, "mode", 4) == 0)
|
|
|
|
{
|
2010-02-08 15:45:43 +00:00
|
|
|
gulong mode;
|
2009-10-21 15:04:12 +00:00
|
|
|
|
2010-02-08 15:45:43 +00:00
|
|
|
mode = clutter_script_resolve_animation_mode (node);
|
2009-10-21 15:04:12 +00:00
|
|
|
|
2010-02-08 15:45:43 +00:00
|
|
|
g_value_init (value, G_TYPE_ULONG);
|
|
|
|
g_value_set_ulong (value, mode);
|
2009-10-21 15:04:12 +00:00
|
|
|
|
2010-02-08 15:45:43 +00:00
|
|
|
return TRUE;
|
2009-10-21 15:04:12 +00:00
|
|
|
}
|
|
|
|
|
alpha: Allow setting the function in ClutterScript
When defining an Alpha in ClutterScript we should allow setting
the alpha function by using a custom property. This makes it
possible to have both:
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : { "timeline" : "timeline-1", "function" : "alpha_func" },
...
}
And:
{
"id" : "alpha-1",
"type" : "ClutterAlpha",
"timeline" : "timeline-1",
"function" : "alpha_func"
},
{
"id" : "behaviour-1",
"type" : "ClutterBehaviourDepth",
"alpha" : "alpha-1",
...
}
The latter allows defining a single alpha function for multiple
behaviours.
2009-10-21 14:29:25 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_scriptable_iface_init (ClutterScriptableIface *iface)
|
|
|
|
{
|
|
|
|
iface->parse_custom_node = clutter_alpha_parse_custom_node;
|
|
|
|
iface->set_custom_property = clutter_alpha_set_custom_property;
|
|
|
|
}
|
2006-08-28 17:11:15 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
clutter_alpha_class_init (ClutterAlphaClass *klass)
|
|
|
|
{
|
2006-11-15 23:37:53 +00:00
|
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
2009-01-20 16:42:49 +00:00
|
|
|
GParamSpec *pspec;
|
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
|
|
|
*/
|
2009-01-20 16:42:49 +00:00
|
|
|
pspec = g_param_spec_object ("timeline",
|
|
|
|
"Timeline",
|
|
|
|
"Timeline used by the alpha",
|
|
|
|
CLUTTER_TYPE_TIMELINE,
|
|
|
|
CLUTTER_PARAM_READWRITE);
|
|
|
|
g_object_class_install_property (object_class, PROP_TIMELINE, pspec);
|
|
|
|
|
2006-11-15 23:37:53 +00:00
|
|
|
/**
|
|
|
|
* ClutterAlpha:alpha:
|
|
|
|
*
|
2009-01-20 16:42:49 +00:00
|
|
|
* The alpha value as computed by the alpha function. The linear
|
|
|
|
* interval is 0.0 to 1.0, but the Alpha allows overshooting by
|
|
|
|
* one unit in each direction, so the valid interval is -1.0 to 2.0.
|
2006-11-17 19:17:40 +00:00
|
|
|
*
|
|
|
|
* Since: 0.2
|
2006-11-15 23:37:53 +00:00
|
|
|
*/
|
2009-01-20 16:42:49 +00:00
|
|
|
pspec = g_param_spec_double ("alpha",
|
|
|
|
"Alpha value",
|
|
|
|
"Alpha value",
|
|
|
|
-1.0, 2.0,
|
|
|
|
0.0,
|
|
|
|
CLUTTER_PARAM_READABLE);
|
|
|
|
g_object_class_install_property (object_class, PROP_ALPHA, pspec);
|
|
|
|
|
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
|
|
|
|
*/
|
2009-01-20 16:42:49 +00:00
|
|
|
pspec = g_param_spec_ulong ("mode",
|
|
|
|
"Mode",
|
|
|
|
"Progress mode",
|
|
|
|
0, G_MAXULONG,
|
|
|
|
CLUTTER_CUSTOM_MODE,
|
|
|
|
G_PARAM_CONSTRUCT | CLUTTER_PARAM_READWRITE);
|
|
|
|
g_object_class_install_property (object_class, PROP_MODE, pspec);
|
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;
|
2009-01-20 16:42:49 +00:00
|
|
|
self->priv->alpha = 0.0;
|
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
|
|
|
*/
|
2009-01-20 16:42:49 +00:00
|
|
|
gdouble
|
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;
|
2009-01-20 16:42:49 +00:00
|
|
|
gdouble retval = 0;
|
2008-09-23 09:41:08 +00:00
|
|
|
|
|
|
|
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);
|
|
|
|
|
2009-01-20 16:42:49 +00:00
|
|
|
g_value_init (&result_value, G_TYPE_DOUBLE);
|
2008-09-23 09:41:08 +00:00
|
|
|
|
|
|
|
g_value_init (¶ms, CLUTTER_TYPE_ALPHA);
|
|
|
|
g_value_set_object (¶ms, alpha);
|
|
|
|
|
2009-01-20 16:42:49 +00:00
|
|
|
g_closure_invoke (priv->closure, &result_value, 1, ¶ms, NULL);
|
2008-09-23 09:41:08 +00:00
|
|
|
|
2009-01-20 16:42:49 +00:00
|
|
|
retval = g_value_get_double (&result_value);
|
2008-09-23 09:41:08 +00:00
|
|
|
|
|
|
|
g_value_unset (&result_value);
|
|
|
|
g_value_unset (¶ms);
|
|
|
|
|
|
|
|
g_object_unref (alpha);
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
2006-08-28 17:11:15 +00:00
|
|
|
}
|
|
|
|
|
2009-01-20 17:57:30 +00:00
|
|
|
/*
|
|
|
|
* clutter_alpha_set_closure_internal:
|
|
|
|
* @alpha: a #ClutterAlpha
|
|
|
|
* @closure: a #GClosure
|
|
|
|
*
|
|
|
|
* Sets the @closure for @alpha. This function does not
|
|
|
|
* set the #ClutterAlpha:mode property and does not emit
|
|
|
|
* the #GObject::notify signal for it.
|
|
|
|
*/
|
|
|
|
static inline void
|
|
|
|
clutter_alpha_set_closure_internal (ClutterAlpha *alpha,
|
|
|
|
GClosure *closure)
|
|
|
|
{
|
|
|
|
ClutterAlphaPrivate *priv = alpha->priv;
|
|
|
|
|
|
|
|
if (priv->closure)
|
|
|
|
g_closure_unref (priv->closure);
|
|
|
|
|
|
|
|
/* need to take ownership of the closure before sinking it */
|
|
|
|
priv->closure = g_closure_ref (closure);
|
|
|
|
g_closure_sink (closure);
|
|
|
|
|
|
|
|
/* set the marshaller */
|
|
|
|
if (G_CLOSURE_NEEDS_MARSHAL (closure))
|
|
|
|
{
|
|
|
|
GClosureMarshal marshal = clutter_marshal_DOUBLE__VOID;
|
|
|
|
|
|
|
|
g_closure_set_marshal (closure, marshal);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
|
2009-01-20 17:57:30 +00:00
|
|
|
clutter_alpha_set_closure_internal (alpha, 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
|
|
|
|
|
|
|
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
|
|
|
{
|
2009-01-20 17:57:30 +00:00
|
|
|
ClutterAlphaPrivate *priv;
|
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);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
|
|
|
priv = alpha->priv;
|
|
|
|
|
2008-04-18 15:03:30 +00:00
|
|
|
closure = g_cclosure_new (G_CALLBACK (func), data, (GClosureNotify) destroy);
|
2009-01-20 17:57:30 +00:00
|
|
|
clutter_alpha_set_closure_internal (alpha, closure);
|
|
|
|
|
|
|
|
priv->mode = CLUTTER_CUSTOM_MODE;
|
|
|
|
g_object_notify (G_OBJECT (alpha), "mode");
|
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.
|
|
|
|
*
|
2009-02-17 00:25:20 +00:00
|
|
|
* Return value: (transfer none): 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
|
|
|
|
*
|
2009-03-27 14:28:08 +00:00
|
|
|
* Retrieves the #ClutterAnimationMode used by @alpha.
|
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 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-20 17:57:30 +00:00
|
|
|
static gdouble
|
|
|
|
clutter_linear (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
|
|
|
|
|
|
|
return clutter_timeline_get_progress (timeline);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_quad (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
|
|
|
gdouble progress = clutter_timeline_get_progress (timeline);
|
|
|
|
|
|
|
|
return progress * progress;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_out_quad (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble p = clutter_timeline_get_progress (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
return -1.0 * p * (p - 2);
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_out_quad (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-04-23 10:35:10 +00:00
|
|
|
gdouble p = t / (d / 2);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
if (p < 1)
|
|
|
|
return 0.5 * p * p;
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
p -= 1;
|
|
|
|
|
|
|
|
return -0.5 * (p * (p - 2) - 1);
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_cubic (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble p = clutter_timeline_get_progress (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
return p * p * p;
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_out_cubic (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-04-23 10:35:10 +00:00
|
|
|
gdouble p = t / d - 1;
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
return p * p * p + 1;
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_out_cubic (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-04-23 10:35:10 +00:00
|
|
|
gdouble p = t / (d / 2);
|
|
|
|
|
|
|
|
if (p < 1)
|
|
|
|
return 0.5 * p * p * p;
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
p -= 2;
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
return 0.5 * (p * p * p + 2);
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_quart (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble p = clutter_timeline_get_progress (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
return p * p * p * p;
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_out_quart (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-04-23 10:35:10 +00:00
|
|
|
gdouble p = t / d - 1;
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
return -1.0 * (p * p * p * p - 1);
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_out_quart (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-04-23 10:35:10 +00:00
|
|
|
gdouble p = t / (d / 2);
|
|
|
|
|
|
|
|
if (p < 1)
|
|
|
|
return 0.5 * p * p * p * p;
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
p -= 2;
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
return -0.5 * (p * p * p * p - 2);
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_quint (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble p = clutter_timeline_get_progress (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
return p * p * p * p * p;
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_out_quint (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-04-23 10:35:10 +00:00
|
|
|
gdouble p = t / d - 1;
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
return p * p * p * p * p + 1;
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_out_quint (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-04-23 10:35:10 +00:00
|
|
|
gdouble p = t / (d / 2);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
if (p < 1)
|
|
|
|
return 0.5 * p * p * p * p * p;
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
p -= 2;
|
|
|
|
|
|
|
|
return 0.5 * (p * p * p * p * p + 2);
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_sine (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
|
|
|
return -1.0 * cos (t / d * G_PI_2) + 1.0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_out_sine (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
|
|
|
return sin (t / d * G_PI_2);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_out_sine (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
|
|
|
return -0.5 * (cos (G_PI * t / d) - 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_expo (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
|
|
|
return (t == 0) ? 0.0 : pow (2, 10 * (t / d - 1));
|
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_out_expo (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
|
|
|
return (t == d) ? 1.0 : -pow (2, -10 * t / d) + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_out_expo (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-04-23 10:35:10 +00:00
|
|
|
gdouble p;
|
2009-01-20 17:57:30 +00:00
|
|
|
|
|
|
|
if (t == 0)
|
|
|
|
return 0.0;
|
|
|
|
|
|
|
|
if (t == d)
|
|
|
|
return 1.0;
|
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
p = t / (d / 2);
|
|
|
|
|
|
|
|
if (p < 1)
|
|
|
|
return 0.5 * pow (2, 10 * (p - 1));
|
|
|
|
|
|
|
|
p -= 1;
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
return 0.5 * (-pow (2, -10 * p) + 2);
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_circ (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble p = clutter_timeline_get_progress (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
return -1.0 * (sqrt (1 - p * p) - 1);
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_out_circ (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-04-23 10:35:10 +00:00
|
|
|
gdouble p = t / d - 1;
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
return sqrt (1 - p * p);
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_out_circ (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-04-23 10:35:10 +00:00
|
|
|
gdouble p = t / (d / 2);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
if (p < 1)
|
|
|
|
return -0.5 * (sqrt (1 - p * p) - 1);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
p -= 2;
|
|
|
|
|
|
|
|
return 0.5 * (sqrt (1 - p * p) + 1);
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_elastic (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
gdouble p = d * .3;
|
|
|
|
gdouble s = p / 4;
|
2009-04-23 10:35:10 +00:00
|
|
|
gdouble q = t / d;
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
if (q == 1)
|
2009-01-20 17:57:30 +00:00
|
|
|
return 1.0;
|
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
q -= 1;
|
|
|
|
|
|
|
|
return -(pow (2, 10 * q) * sin ((q * d - s) * (2 * G_PI) / p));
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_out_elastic (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
gdouble p = d * .3;
|
|
|
|
gdouble s = p / 4;
|
2009-04-23 10:35:10 +00:00
|
|
|
gdouble q = t / d;
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
if (q == 1)
|
2009-01-20 17:57:30 +00:00
|
|
|
return 1.0;
|
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
return pow (2, -10 * q) * sin ((q * d - s) * (2 * G_PI) / p) + 1.0;
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_out_elastic (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
gdouble p = d * (.3 * 1.5);
|
|
|
|
gdouble s = p / 4;
|
2009-04-23 10:35:10 +00:00
|
|
|
gdouble q = t / (d / 2);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
if (q == 2)
|
2009-01-20 17:57:30 +00:00
|
|
|
return 1.0;
|
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
if (q < 1)
|
|
|
|
{
|
|
|
|
q -= 1;
|
|
|
|
|
|
|
|
return -.5 * (pow (2, 10 * q) * sin ((q * d - s) * (2 * G_PI) / p));
|
|
|
|
}
|
2009-01-20 17:57:30 +00:00
|
|
|
else
|
|
|
|
{
|
2009-04-23 10:35:10 +00:00
|
|
|
q -= 1;
|
|
|
|
|
|
|
|
return pow (2, -10 * q)
|
|
|
|
* sin ((q * d - s) * (2 * G_PI) / p)
|
2009-01-20 17:57:30 +00:00
|
|
|
* .5 + 1.0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_back (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble p = clutter_timeline_get_progress (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
return p * p * ((1.70158 + 1) * p - 1.70158);
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_out_back (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-04-23 10:35:10 +00:00
|
|
|
gdouble p = t / d - 1;
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
return p * p * ((1.70158 + 1) * p + 1.70158) + 1;
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_out_back (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-04-23 10:35:10 +00:00
|
|
|
gdouble p = t / (d / 2);
|
|
|
|
gdouble s = 1.70158 * 1.525;
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
if (p < 1)
|
|
|
|
return 0.5 * (p * p * ((s + 1) * p - s));
|
2009-01-20 17:57:30 +00:00
|
|
|
|
2009-04-23 10:35:10 +00:00
|
|
|
p -= 2;
|
|
|
|
|
|
|
|
return 0.5 * (p * p * ((s + 1) * p + s) + 2);
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
ease_out_bounce_internal (gdouble t,
|
|
|
|
gdouble d)
|
|
|
|
{
|
2009-04-23 10:35:10 +00:00
|
|
|
gdouble p = t / d;
|
|
|
|
|
|
|
|
if (p < (1 / 2.75))
|
|
|
|
return 7.5625 * p * p;
|
|
|
|
else if (p < (2 / 2.75))
|
|
|
|
{
|
|
|
|
p -= (1.5 / 2.75);
|
|
|
|
|
|
|
|
return 7.5625 * p * p + .75;
|
|
|
|
}
|
|
|
|
else if (p < (2.5 / 2.75))
|
|
|
|
{
|
|
|
|
p -= (2.25 / 2.75);
|
|
|
|
|
|
|
|
return 7.5625 * p * p + .9375;
|
|
|
|
}
|
2009-01-20 17:57:30 +00:00
|
|
|
else
|
2009-04-23 10:35:10 +00:00
|
|
|
{
|
|
|
|
p -= (2.625 / 2.75);
|
|
|
|
|
|
|
|
return 7.5625 * p * p + .984375;
|
|
|
|
}
|
2009-01-20 17:57:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
ease_in_bounce_internal (gdouble t,
|
|
|
|
gdouble d)
|
|
|
|
{
|
|
|
|
return 1.0 - ease_out_bounce_internal (d - t, d);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_bounce (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
|
|
|
return ease_in_bounce_internal (t, d);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_out_bounce (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
|
|
|
return ease_out_bounce_internal (t, d);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gdouble
|
|
|
|
clutter_ease_in_out_bounce (ClutterAlpha *alpha,
|
|
|
|
gpointer dummy G_GNUC_UNUSED)
|
|
|
|
{
|
|
|
|
ClutterTimeline *timeline = alpha->priv->timeline;
|
2009-06-04 12:05:12 +00:00
|
|
|
gdouble t = clutter_timeline_get_elapsed_time (timeline);
|
|
|
|
gdouble d = clutter_timeline_get_duration (timeline);
|
2009-01-20 17:57:30 +00:00
|
|
|
|
|
|
|
if (t < d / 2)
|
|
|
|
return ease_in_bounce_internal (t * 2, d) * 0.5;
|
|
|
|
else
|
|
|
|
return ease_out_bounce_internal (t * 2 - d, d) * 0.5 + 1.0 * 0.5;
|
|
|
|
}
|
|
|
|
|
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[] = {
|
2009-01-20 17:57:30 +00:00
|
|
|
{ CLUTTER_CUSTOM_MODE, NULL },
|
|
|
|
|
|
|
|
{ CLUTTER_LINEAR, clutter_linear },
|
|
|
|
{ CLUTTER_EASE_IN_QUAD, clutter_ease_in_quad },
|
|
|
|
{ CLUTTER_EASE_OUT_QUAD, clutter_ease_out_quad },
|
|
|
|
{ CLUTTER_EASE_IN_OUT_QUAD, clutter_ease_in_out_quad },
|
|
|
|
{ CLUTTER_EASE_IN_CUBIC, clutter_ease_in_cubic },
|
|
|
|
{ CLUTTER_EASE_OUT_CUBIC, clutter_ease_out_cubic },
|
|
|
|
{ CLUTTER_EASE_IN_OUT_CUBIC, clutter_ease_in_out_cubic },
|
|
|
|
{ CLUTTER_EASE_IN_QUART, clutter_ease_in_quart },
|
|
|
|
{ CLUTTER_EASE_OUT_QUART, clutter_ease_out_quart },
|
|
|
|
{ CLUTTER_EASE_IN_OUT_QUART, clutter_ease_in_out_quart },
|
|
|
|
{ CLUTTER_EASE_IN_QUINT, clutter_ease_in_quint },
|
|
|
|
{ CLUTTER_EASE_OUT_QUINT, clutter_ease_out_quint },
|
|
|
|
{ CLUTTER_EASE_IN_OUT_QUINT, clutter_ease_in_out_quint },
|
|
|
|
{ CLUTTER_EASE_IN_SINE, clutter_ease_in_sine },
|
|
|
|
{ CLUTTER_EASE_OUT_SINE, clutter_ease_out_sine },
|
|
|
|
{ CLUTTER_EASE_IN_OUT_SINE, clutter_ease_in_out_sine },
|
|
|
|
{ CLUTTER_EASE_IN_EXPO, clutter_ease_in_expo },
|
|
|
|
{ CLUTTER_EASE_OUT_EXPO, clutter_ease_out_expo },
|
|
|
|
{ CLUTTER_EASE_IN_OUT_EXPO, clutter_ease_in_out_expo },
|
|
|
|
{ CLUTTER_EASE_IN_CIRC, clutter_ease_in_circ },
|
|
|
|
{ CLUTTER_EASE_OUT_CIRC, clutter_ease_out_circ },
|
|
|
|
{ CLUTTER_EASE_IN_OUT_CIRC, clutter_ease_in_out_circ },
|
|
|
|
{ CLUTTER_EASE_IN_ELASTIC, clutter_ease_in_elastic },
|
|
|
|
{ CLUTTER_EASE_OUT_ELASTIC, clutter_ease_out_elastic },
|
|
|
|
{ CLUTTER_EASE_IN_OUT_ELASTIC, clutter_ease_in_out_elastic },
|
|
|
|
{ CLUTTER_EASE_IN_BACK, clutter_ease_in_back },
|
|
|
|
{ CLUTTER_EASE_OUT_BACK, clutter_ease_out_back },
|
|
|
|
{ CLUTTER_EASE_IN_OUT_BACK, clutter_ease_in_out_back },
|
|
|
|
{ CLUTTER_EASE_IN_BOUNCE, clutter_ease_in_bounce },
|
|
|
|
{ CLUTTER_EASE_OUT_BOUNCE, clutter_ease_out_bounce },
|
|
|
|
{ CLUTTER_EASE_IN_OUT_BOUNCE, clutter_ease_in_out_bounce },
|
|
|
|
|
|
|
|
{ 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-20 17:57:30 +00:00
|
|
|
if (mode == CLUTTER_CUSTOM_MODE)
|
|
|
|
{
|
|
|
|
priv->mode = mode;
|
|
|
|
}
|
|
|
|
else if (mode < CLUTTER_ANIMATION_LAST)
|
2009-01-16 13:42:06 +00:00
|
|
|
{
|
2009-01-20 17:57:30 +00:00
|
|
|
GClosure *closure;
|
|
|
|
|
2009-01-16 13:42:06 +00:00
|
|
|
/* sanity check to avoid getting an out of sync
|
|
|
|
* enum/function mapping
|
|
|
|
*/
|
|
|
|
g_assert (animation_modes[mode].mode == mode);
|
2009-01-20 17:57:30 +00:00
|
|
|
g_assert (animation_modes[mode].func != 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-20 17:57:30 +00:00
|
|
|
closure = g_cclosure_new (G_CALLBACK (animation_modes[mode].func),
|
|
|
|
NULL,
|
|
|
|
NULL);
|
|
|
|
clutter_alpha_set_closure_internal (alpha, closure);
|
2009-01-16 13:42:06 +00:00
|
|
|
|
|
|
|
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
|
2009-01-20 17:57:30 +00:00
|
|
|
{
|
|
|
|
GClosure *closure;
|
|
|
|
|
|
|
|
closure = g_cclosure_new (G_CALLBACK (alpha_data->func),
|
|
|
|
alpha_data->data,
|
|
|
|
NULL);
|
|
|
|
clutter_alpha_set_closure_internal (alpha, closure);
|
|
|
|
}
|
2009-01-16 13:42:06 +00:00
|
|
|
|
|
|
|
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");
|
|
|
|
}
|
|
|
|
|
2009-01-20 17:57:30 +00:00
|
|
|
static gulong
|
|
|
|
register_alpha_internal (AlphaData *alpha_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;
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
|
2009-01-20 17:57:30 +00:00
|
|
|
return register_alpha_internal (alpha_data);
|
2009-01-16 13:42:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* 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)
|
|
|
|
{
|
2009-01-20 17:57:30 +00:00
|
|
|
AlphaData *alpha_data;
|
2009-01-16 13:42:06 +00:00
|
|
|
|
|
|
|
g_return_val_if_fail (closure != NULL, 0);
|
|
|
|
|
2009-01-20 17:57:30 +00:00
|
|
|
alpha_data = g_slice_new (AlphaData);
|
|
|
|
alpha_data->closure_set = TRUE;
|
|
|
|
alpha_data->closure = closure;
|
2009-01-16 13:42:06 +00:00
|
|
|
|
2009-01-20 17:57:30 +00:00
|
|
|
return register_alpha_internal (alpha_data);
|
2009-01-16 13:42:06 +00:00
|
|
|
}
|