commit 8f50966c7242c4cf5bea71b2f72c7a3360b4154e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 7 14:32:43 2011 +0000
Release Clutter 1.6.8 (stable)
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 56b9951fe837d3313bf9d2a3530254b8796413a2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 7 14:32:26 2011 +0000
Update the NEWS
NEWS | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
commit 95af5bd973a3b5f39555abc60c4b49d0648b2881
Author: Robert Bragg <robert@linux.intel.com>
Date: Thu Mar 3 23:19:30 2011 +0000
util: tune point_in_poly test for polys in screen coords
This makes a change to the original point_in_poly algorithm from:
http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html
The aim was to tune the test so that tests against screen aligned
rectangles are more resilient to some in-precision in how we transformed
that rectangle into screen coordinates. In particular gnome-shell was
finding that for some stage sizes then row 0 of the stage would become a
dead zone when going through the software picking fast-path and this was
because the y position of screen aligned rectangles could end up as
something like 0.00024 and the way the algorithm works it doesn't have
any epsilon/fuz factor to consider that in-precision.
We've avoided introducing an epsilon factor to the comparisons since we
feel there's a risk of changing some semantics in ways that might not be
desirable. One of those is that if you transform two polygons which
share an edge and test a point close to that edge then this algorithm
will currently give a positive result for only one polygon.
Another concern is the way this algorithm resolves the corner case where
the horizontal ray being cast to count edge crossings may cross directly
through a vertex. The solution is based on the "idea of Simulation of
Simplicity" and "pretends to shift the ray infinitesimally down so that
it either clearly intersects, or clearly doesn't touch". I'm not
familiar with the idea myself so I expect a misplaced epsilon is likely
to break that aspect of the algorithm.
The simple solution this patch applies is to pixel align the polygon
vertices which should eradicate most noise due to in-precision.
https://bugzilla.gnome.org/show_bug.cgi?id=641197
clutter/cogl/cogl/cogl-journal.c | 4 +-
clutter/cogl/cogl/cogl-point-in-poly-private.h | 10 +++---
clutter/cogl/cogl/cogl-point-in-poly.c | 41 +++++++++++++++++++++---
3 files changed, 43 insertions(+), 12 deletions(-)
commit 027bddb74ca164046cc3b78de9b6beb9a7b22d03
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 4 23:58:12 2011 +0000
glx: Use g_set_error_literal() where appropriate
(cherry picked from commit 0194e9db2f9a5e43b3d91d07909d16fa414819cc)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/glx/clutter-backend-glx.c | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
commit 1e213667f6587ca852f4930a0e17cb2bef441f8c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 4 23:53:45 2011 +0000
x11: Use g_set_error_literal()
The g_set_error() function takes a format string.
(cherry picked from commit 4f3a4ab01bc5303e988705faec2f3afba0ef28f7)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/x11/clutter-backend-x11.c | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
commit 63142b16808fb1e3d79a0123b0c6cd7eadd40416
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 4 23:56:12 2011 +0000
On error, return FALSE in the post_parse hook
Anything that is not CLUTTER_INIT_SUCCESS is to be considered an error.
This fixes the Clutter initialization sequence to actually error out
on pre-conditions and backend initialization failures.
(cherry picked from commit bed392b9a5cc341a822001cddc91aaa4951a904d)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 2575299bacd925b29576c89e761beed86ae64070
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 4 23:55:02 2011 +0000
Clean up argument parsing GError handling
Pass a GError in, so that clutter_init() can effectively print out a
critical warning on initialization failure, like it used to do in the
olden days.
(cherry picked from commit 8bde5febd1998f7354c658e62a9f88443c75e8eb)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-main.c | 77 +++++++++++++++++++++++++++++------------------
1 files changed, 47 insertions(+), 30 deletions(-)
commit bd5314acbc3e95b7f47ade7be4f12922ade795c3
Author: Neil Roberts <neil@linux.intel.com>
Date: Fri Mar 4 17:04:02 2011 +0000
clutter-offscreen-effect: Use 0,0 as the offset if no actor box
clutter_offscreen_effect_pre_paint was using the unitialized value of
the ‘box’ variable whenever the actor doesn't have a paint
volume. This patch makes it just set the offset to 0,0 instead.
(cherry picked from commit 9e11aa38207173aaa6669ea98211174a13139db1)
clutter/clutter-offscreen-effect.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
commit 4b9b78b5ac859f6a13ab8a0f0aed0b958889dc64
Author: Neil Roberts <neil@linux.intel.com>
Date: Thu Mar 3 16:46:26 2011 +0000
clutter-offscreen-effect: Preserve the old opacity override
When removing the opacity override in the post_paint implementation,
ClutterOffscreenEffect would always set the override back to -1. This
ends up cancelling out the effect of any overrides from outer effects
which means that if any actor has multiple effects attached then it
would apply the opacity multiple times.
To fix this, the effect now preserves the old value of the opacity
override and restores that instead of setting -1.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2541
(cherry picked from commit d306b4bb7d7a9c8b0b02c7e940b66f51ec62e18d)
clutter/clutter-offscreen-effect.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
commit 5e6dbc5e72cfb6639f5032534029bb318f530ac7
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue Mar 1 19:52:43 2011 +0000
clutter-actor: Add an internal _clutter_actor_get_opacity_override
This is needed if an effect wants to temporarily override the paint
opacity. It needs to be able to restore the old opacity override in
the post_paint handler otherwise it would replace the effect of the
opacity override from any outer effects.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2541
(cherry picked from commit 3fab04805ea4b7ae584fcfe425bc8355a64d2c36)
clutter/clutter-actor-private.h | 1 +
clutter/clutter-actor.c | 8 ++++++++
2 files changed, 9 insertions(+), 0 deletions(-)
commit c8e34255d3573d130c0e5cff258dceb91d17f29b
Author: Dioselin <dcourter@vuze.com>
Date: Tue Mar 1 14:05:11 2011 -0800
box: set default paint volume to allocation
http://bugzilla.clutter-project.org/show_bug.cgi?id=2589
(cherry picked from commit cfa32659e495f6736d65e94c92a9c46360bc1620)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-box.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
commit dc90f3c602bb6454642ca4c5ddc30dcde1e22f2e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 1 18:36:55 2011 +0000
effect: Queue a redraw on :enabled changes
ClutterEffect should queue a redraw if the :enabled property of its
parent class ClutterActorMeta changes.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2587
(cherry picked from commit 0be73bf4014074377dca13ae44e32ac47adaafec)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-effect.c | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
commit 6216ccc1224b22cb3c3cd61702dc109f19fff90f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 1 18:36:08 2011 +0000
constraint: Queue a relayout on :enabled changes
ClutterConstraint should queue a relayout if the :enabled property of
its parent class ClutterActorMeta changes.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2587
(cherry picked from commit bd8b09edda35a1531262add8b5429e7868949464)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-constraint.c | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
commit 1f7c834ff4094393e780e818316a698d735bd4fd
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue Feb 22 12:53:15 2011 +0000
tests: Check return value of clutter_init_with_args instead of error
Some of the tests were ignoring the return value of
clutter_init_with_args and instead they would recognise an error by
seeing whether the GError parameter was set. This patch changes it to
check the return value so that it won't give a warning now that
G_GNUC_WARN_UNUSED_RESULT is on that function.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2574
(cherry picked from commit 26ec3efbff6da99bd443cd5b587a980bb7a3a75a)
tests/interactive/test-actor-clone.c | 11 +++++------
tests/interactive/test-actors.c | 11 +++++------
tests/interactive/test-drag.c | 11 +++++------
tests/interactive/test-flow-layout.c | 11 +++++------
tests/interactive/test-paint-wrapper.c | 11 +++++------
tests/micro-bench/test-cogl-perf.c | 11 +++++------
6 files changed, 30 insertions(+), 36 deletions(-)
commit 6548ca37a4a925abe28c514642f84dc0a6ebbb5f
Author: nobled <nobled@dreamwidth.org>
Date: Tue Feb 22 00:44:55 2011 +0000
doc: fix clutter_init() usage in examples
Make sure users get the idea that clutter_init()
has a return value that needs to be checked.
These were fixed via sed magic:
sed -i -s -e "s/clutter_init (.*)/\
if (& != CLUTTER_INIT_SUCCESS)\n return 1/"\
doc/*/*/*.{c,xml} doc/*/*.xml
http://bugzilla.clutter-project.org/show_bug.cgi?id=2574
(cherry picked from commit aece642adb22ed054d1d4bca99eeeeb0b4b80b83)
doc/cookbook/examples/actors-composite-main.c | 3 ++-
doc/cookbook/examples/animations-complex.c | 3 ++-
.../examples/animations-looping-animator.c | 3 ++-
.../examples/animations-looping-implicit.c | 3 ++-
doc/cookbook/examples/animations-looping-state.c | 3 ++-
doc/cookbook/examples/animations-moving-animator.c | 3 ++-
doc/cookbook/examples/animations-moving-implicit.c | 3 ++-
doc/cookbook/examples/animations-moving-state.c | 3 ++-
doc/cookbook/examples/animations-path-circle.c | 3 ++-
doc/cookbook/examples/animations-path-easing.c | 3 ++-
doc/cookbook/examples/animations-path.c | 3 ++-
doc/cookbook/examples/animations-reuse.c | 3 ++-
doc/cookbook/examples/animations-rotating.c | 3 ++-
doc/cookbook/examples/animations-scaling-zoom.c | 3 ++-
doc/cookbook/examples/animations-scaling.c | 3 ++-
doc/cookbook/examples/effects-built-in.c | 3 ++-
doc/cookbook/examples/effects-custom-deform.c | 3 ++-
doc/cookbook/examples/events-buttons-click.c | 3 ++-
doc/cookbook/examples/events-buttons-lasso.c | 3 ++-
doc/cookbook/examples/events-buttons.c | 3 ++-
doc/cookbook/examples/events-mouse-scroll.c | 3 ++-
.../examples/events-pointer-motion-crossing.c | 3 ++-
.../examples/events-pointer-motion-scribbler.c | 3 ++-
.../examples/events-pointer-motion-stacked.c | 3 ++-
doc/cookbook/examples/events-pointer-motion.c | 3 ++-
.../examples/layouts-bind-constraint-allocation.c | 3 ++-
.../examples/layouts-bind-constraint-overlay.c | 3 ++-
.../examples/layouts-bind-constraint-stage.c | 3 ++-
doc/cookbook/examples/layouts-box-menu.c | 3 ++-
.../examples/layouts-box-property-effects.c | 3 ++-
doc/cookbook/examples/layouts-box.c | 3 ++-
.../examples/layouts-stacking-diff-sized-actors.c | 3 ++-
doc/cookbook/examples/layouts-stacking.c | 3 ++-
doc/cookbook/examples/script-signals.c | 3 ++-
doc/cookbook/examples/script-ui.c | 3 ++-
doc/cookbook/examples/text-shadow.c | 3 ++-
doc/cookbook/examples/textures-crossfade-cogl.c | 9 +++++----
.../examples/textures-crossfade-slideshow.c | 3 ++-
doc/cookbook/examples/textures-crossfade.c | 12 +++++++-----
doc/cookbook/examples/textures-reflection.c | 3 ++-
doc/cookbook/examples/textures-split-go.c | 3 ++-
doc/cookbook/examples/textures-sub-texture.c | 3 ++-
doc/cookbook/textures.xml | 6 ++++--
.../clutter/clutter-animation-tutorial.xml | 3 ++-
44 files changed, 98 insertions(+), 52 deletions(-)
commit 090bc96259f9d399b95c913d47f248a2ad752754
Author: nobled <nobled@dreamwidth.org>
Date: Tue Feb 22 00:19:35 2011 +0000
tests: abort if clutter_init fails
This fixes segfaults when something goes wrong during
init, but the test keeps going anyway.
Except for test-easing and test-picking, these were fixed by
sed magic:
sed -i -s -e "s/clutter_init \?(&argc, &argv)/\
if (clutter_init (\&argc, \&argv) != CLUTTER_INIT_SUCCESS)\n\
return 1/" tests/*/*.c
http://bugzilla.clutter-project.org/show_bug.cgi?id=2574
(cherry picked from commit eb906d85ca0fb06f26fab9ea59dbd979d9b243cb)
tests/accessibility/cally-atkcomponent-example.c | 3 ++-
.../accessibility/cally-atkeditabletext-example.c | 3 ++-
tests/accessibility/cally-atkevents-example.c | 3 ++-
tests/accessibility/cally-atktext-example.c | 3 ++-
tests/accessibility/cally-clone-example.c | 3 ++-
tests/interactive/test-animation.c | 3 ++-
tests/interactive/test-animator.c | 3 ++-
tests/interactive/test-behave.c | 3 ++-
tests/interactive/test-bin-layout.c | 3 ++-
tests/interactive/test-binding-pool.c | 3 ++-
tests/interactive/test-box-layout.c | 3 ++-
tests/interactive/test-cairo-flowers.c | 3 ++-
tests/interactive/test-clip.c | 3 ++-
tests/interactive/test-cogl-multitexture.c | 3 ++-
tests/interactive/test-cogl-offscreen.c | 3 ++-
tests/interactive/test-cogl-point-sprites.c | 3 ++-
tests/interactive/test-cogl-primitives.c | 3 ++-
tests/interactive/test-cogl-shader-arbfp.c | 3 ++-
tests/interactive/test-cogl-shader-glsl.c | 3 ++-
tests/interactive/test-cogl-tex-convert.c | 3 ++-
tests/interactive/test-cogl-tex-foreign.c | 3 ++-
tests/interactive/test-cogl-tex-getset.c | 3 ++-
tests/interactive/test-cogl-tex-polygon.c | 3 ++-
tests/interactive/test-cogl-tex-tile.c | 3 ++-
tests/interactive/test-cogl-vertex-buffer.c | 3 ++-
tests/interactive/test-constraints.c | 3 ++-
tests/interactive/test-depth.c | 3 ++-
tests/interactive/test-devices.c | 3 ++-
tests/interactive/test-easing.c | 14 ++++++++------
tests/interactive/test-events.c | 3 ++-
tests/interactive/test-fbo.c | 3 ++-
tests/interactive/test-fullscreen.c | 3 ++-
tests/interactive/test-grab.c | 3 ++-
tests/interactive/test-layout.c | 3 ++-
tests/interactive/test-model.c | 3 ++-
tests/interactive/test-multistage.c | 3 ++-
tests/interactive/test-path-constraint.c | 3 ++-
tests/interactive/test-pixmap.c | 3 ++-
tests/interactive/test-scale.c | 3 ++-
tests/interactive/test-script.c | 3 ++-
tests/interactive/test-scrolling.c | 3 ++-
tests/interactive/test-shader-effects.c | 3 ++-
tests/interactive/test-shader.c | 3 ++-
tests/interactive/test-snap-constraint.c | 3 ++-
tests/interactive/test-stage-read-pixels.c | 3 ++-
tests/interactive/test-stage-sizing.c | 3 ++-
tests/interactive/test-state-animator.c | 3 ++-
tests/interactive/test-state.c | 3 ++-
tests/interactive/test-table-layout.c | 3 ++-
tests/interactive/test-text-field.c | 3 ++-
tests/interactive/test-text.c | 3 ++-
tests/interactive/test-texture-async.c | 3 ++-
tests/interactive/test-texture-material.c | 3 ++-
tests/interactive/test-texture-quality.c | 3 ++-
tests/interactive/test-textures.c | 3 ++-
tests/interactive/test-threads.c | 3 ++-
tests/interactive/test-unproject.c | 3 ++-
tests/micro-bench/test-picking.c | 12 +++++++-----
tests/micro-bench/test-random-text.c | 3 ++-
tests/micro-bench/test-text-perf.c | 3 ++-
tests/micro-bench/test-text.c | 3 ++-
61 files changed, 133 insertions(+), 70 deletions(-)
commit daa6d67cc048fec90a54846d8adf403ee2a60257
Author: Neil Roberts <neil@linux.intel.com>
Date: Thu Feb 24 20:30:30 2011 +0000
Add a conformance test for atlas migration
This adds a conformance test which creates a lot of textures with
increasing size and destroys them again a number of times in order to
cause a few atlas migrations. The last time the textures are created
they are all read back and the data is verified to confirm that the
atlas migration successfully preserved the data.
tests/conform/Makefile.am | 1 +
tests/conform/test-cogl-atlas-migration.c | 133 +++++++++++++++++++++++++++++
tests/conform/test-conform-main.c | 1 +
3 files changed, 135 insertions(+), 0 deletions(-)
commit 4dd20f2678195524dd147db3fe902d0a93de3df0
Author: Neil Roberts <neil@linux.intel.com>
Date: Thu Feb 24 18:42:47 2011 +0000
cogl-blit: Disable blending when using texture render
When using a pipeline and the journal to blit images between
framebuffers, it should disable blending. Otherwise it will end up
blending the source texture with uninitialised garbage in the
destination texture.
clutter/cogl/cogl/cogl-blit.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
commit f4ca82fc6d571c3b37e270ed05a373885498a0dc
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Feb 23 00:07:12 2011 +0000
build: Remove MAINTAINERCLEANFILES from ChangeLog rules
build/autotools/Makefile.am.changelog | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
commit 8bb81f008dd5848f0f1105306372c4e263a1407a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 22 18:32:01 2011 +0000
build: Remove maintainer-clean rule
The maintainer-clean files list is horribly out of date, nobody is
maintaining it, and it's honestly easier to use `git clean -xdf`
instead to clean untracked files.
Makefile.am | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
commit b3e4db4c738756f05ef7a02306f0d25f158797ab
Merge: 4442ddd 74de3cf
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 21 18:09:06 2011 +0000
Merge remote-tracking branch 'elliot/cookbook-effects-custom-deform'
* elliot/cookbook-effects-custom-deform:
docs: Add effects chapter, with introduction and first recipe
commit 4442ddde8290a7ec447a070b624437579f678d56
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 21 17:13:37 2011 +0000
text: Round up the size
Converting from Pango units to pixels by using the C conventions might
cause us to lose a pixel; since we're doing the same for the height, we
should use ceilf() to round up the width and the line height.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2573
clutter/clutter-text.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
commit 74de3cfdf3af819c94c1eb52a68491f1e32b120b
Author: Elliot Smith <elliot.smith@intel.com>
Date: Mon Feb 21 16:43:34 2011 +0000
docs: Add effects chapter, with introduction and first recipe
Add an effects chapter which gives a broad overview of
the abstract classes in the effects API, plus a short
example of how to apply one of the stock Clutter
effects (ClutterColorizeEffect).
The recipe explains how to create a custom ClutterDeformEffect
to produce a page fold (code based on ClutterPageTurnEffect).
The example code includes the effect class plus a small
application to apply it to a texture.
doc/cookbook/Makefile.am | 5 +
doc/cookbook/clutter-cookbook.xml.in | 1 +
doc/cookbook/effects.xml | 769 ++++++++++++++++++++
doc/cookbook/examples/Makefile.am | 4 +
doc/cookbook/examples/cb-page-fold-effect.c | 250 +++++++
doc/cookbook/examples/cb-page-fold-effect.h | 49 ++
doc/cookbook/examples/effects-built-in.c | 58 ++
doc/cookbook/examples/effects-custom-deform.c | 119 +++
doc/cookbook/images/effects-built-in.png | Bin 0 -> 92584 bytes
.../images/effects-custom-deform-back-material.png | Bin 0 -> 49860 bytes
doc/cookbook/images/effects-custom-deform.png | Bin 0 -> 91751 bytes
doc/cookbook/videos/effects-custom-deform.ogv | Bin 0 -> 91983 bytes
12 files changed, 1255 insertions(+), 0 deletions(-)
commit 91740fd4df02d5ce313f1cdd3e3b5dd869628516
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 21 16:41:28 2011 +0000
docs: Mention the cookbook in the README
In the "Resources" section, along with the API references.
README.in | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
commit 23c81f8817c7b3b4c3d47fcc1bac99cf9bb3b4ac
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 21 16:40:50 2011 +0000
docs: Remove last mention of SDL from the README
We don't support SDL since forever, now. Just get rid of it, before it
confuses somebody.
README.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit b31cf80807035c00434fe3d7d66b93929c34d529
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 21 14:19:47 2011 +0000
Post-release version bump to 1.6.7
configure.ac | 4 +-
po/clutter-1.0.pot | 268 ++++++++++++++++++++++++++--------------------------
po/de.po | 266 ++++++++++++++++++++++++++--------------------------
po/fr.po | 266 ++++++++++++++++++++++++++--------------------------
po/id.po | 266 ++++++++++++++++++++++++++--------------------------
po/it.po | 266 ++++++++++++++++++++++++++--------------------------
po/pl.po | 266 ++++++++++++++++++++++++++--------------------------
po/zh_CN.po | 266 ++++++++++++++++++++++++++--------------------------
8 files changed, 934 insertions(+), 934 deletions(-)