Robert Bragg [Wed, 25 Nov 2009 20:37:01 +0000 (20:37 +0000)]
picking: avoid redundant picking geometry for the stage.
The stage's pick id can be written to the framebuffer when we call
cogl_clear so there's no need for the stage to also chain up in it's pick
function resulting in clutter-actor.c also emitting a rectangle for the
stage.
Robert Bragg [Fri, 27 Nov 2009 00:28:39 +0000 (00:28 +0000)]
tests: rename cogl conformance tests so they can be clearly identified
All Cogl conformance tests are now prefixed 'test-cogl-'
Robert Bragg [Thu, 26 Nov 2009 19:06:35 +0000 (19:06 +0000)]
cogl: deprecate cogl_draw_buffer API and replace with a cogl_framebuffer API
cogl_push_draw_buffer, cogl_set_draw_buffer and cogl_pop_draw_buffer are now
deprecated and new code should use the new cogl_framebuffer_* API instead.
Code that previously did:
cogl_push_draw_buffer ();
cogl_set_draw_buffer (COGL_OFFSCREEN_BUFFER, buffer);
/* draw */
cogl_pop_draw_buffer ();
should now be re-written as:
cogl_push_framebuffer (buffer);
/* draw */
cogl_pop_framebuffer ();
As can be seen from the example above the rename has been used as an
opportunity to remove the redundant target argument from
cogl_set_draw_buffer; it now only takes one call to redirect to an offscreen
buffer, and finally the term framebuffer may be a bit more familiar to
anyone coming from an OpenGL background.
Robert Bragg [Thu, 26 Nov 2009 17:47:17 +0000 (17:47 +0000)]
cogl_offscreen: deprecate cogl_offscreen_ref/unref.
New code should use cogl_handle_ref/unref
Neil Roberts [Wed, 25 Nov 2009 13:39:45 +0000 (13:39 +0000)]
cogl: Use a vtable for the texture backends instead of a type and switch
Instead of storing an enum with the backend type for each texture and
then using a switch statement to decide which function to call, we
should store pointers to all of the functions in a struct and have
each texture point to that struct. This is potentially slightly faster
when there are more backends and it makes implementing new backends
easier because it's more obvious which functions have to be
implemented.
Robert Bragg [Wed, 25 Nov 2009 02:47:52 +0000 (02:47 +0000)]
offscreen: cogl_offscreen_new_to_texture now supports GL_TEXTURE_RECTANGLE_ARB
cogl_offscreen_new_to_texture previously bailed out if the given texture's
GL target was anything but GL_TEXTURE_2D, but it now also allows
foreign GL_TEXTURE_RECTANGLE_ARB textures.
Thanks to Owen for reporting this issue, ref:
https://bugzilla.gnome.org/show_bug.cgi?id=601032
Robert Bragg [Tue, 24 Nov 2009 18:24:07 +0000 (18:24 +0000)]
debug: remove the COGL_DEBUG=client-side-matrices option
Cogl only supports client side matrices so this debug option is no longer
useful.
Robert Bragg [Wed, 11 Nov 2009 12:50:48 +0000 (12:50 +0000)]
[cogl-material] Adds cogl_material_copy() API
cogl_material_copy can be used to create a new CoglHandle referencing a copy
of some given material.
From now on we will advise that developers always aim to use this function
instead of cogl_material_new() when creating a material that is in any way
derived from another.
By using cogl_material_copy, Cogl can maintain an ancestry for each material
and keep track of "similar" materials. The plan is that Cogl will use this
information to minimize the cost of GPU state transitions.
Robert Bragg [Wed, 11 Nov 2009 12:52:08 +0000 (12:52 +0000)]
[cogl] remove unused gles/cogl-utils.[c,h]
The only function in gles/cogl-utils.c was cogl_util_next_p2() and it's
redundant since we also have a cogl/cogl-utils.[c,h]
Robert Bragg [Mon, 23 Nov 2009 11:30:32 +0000 (11:30 +0000)]
docs: Don't document cogl_flush_gl_state as public API
This function was #if 0'd before we released Clutter 1.0 so there's no
implementation of it. At some point we thought it might assist with
developers breaking out into raw OpenGL. Breaking out to raw GL is a
difficult problem though so we decided instead we will wait for a specific
use case to arrise before trying to support it.
Emmanuele Bassi [Tue, 24 Nov 2009 16:59:24 +0000 (16:59 +0000)]
animation: Keep a weak reference on actors
Actors, unlike objects, can effectively go away whilst being
animated - usually because of an explicit destoy().
The Animation created by clutter_actor_animate() and friends
should keep a weak reference on the actor and eventually
get rid of the animation itself in case the actor goes away
whilst being animated.
Neil Roberts [Thu, 19 Nov 2009 16:07:38 +0000 (16:07 +0000)]
Minor fix to cogl material
_cogl_material_get_layer expects a CoglMaterial* pointer but it was
being called with a CoglHandle. This doesn't matter because the
CoglHandle is actually just the CoglMaterial* pointer anyway but it
breaks the ability to change the _cogl_material_pointer_from_handle
macro.
Emmanuele Bassi [Thu, 19 Nov 2009 14:30:01 +0000 (14:30 +0000)]
docs: Add indices to the Cogl API reference
The Clutter API reference has an index of the symbols for each minor
version, and a list of deprecated symbols. The Cogl API reference
should have the same layout.
Emmanuele Bassi [Thu, 19 Nov 2009 13:55:10 +0000 (13:55 +0000)]
docs: Increase consistency in Cogl documentation
Emmanuele Bassi [Thu, 19 Nov 2009 13:33:26 +0000 (13:33 +0000)]
docs: Documentation fixes for CoglMatrix
Clean up the references, the docbook tags, and the style to fit in
with the rest of the API references for Cogl and Clutter.
Emmanuele Bassi [Thu, 19 Nov 2009 13:33:08 +0000 (13:33 +0000)]
Whitespace fix for cogl-color.h
Emmanuele Bassi [Thu, 19 Nov 2009 13:31:38 +0000 (13:31 +0000)]
docs: Documentation fixes for CoglMaterial
Clean up the references, the docbook tags, and the style to fit in
with the rest of the API references for Cogl and Clutter.
Emmanuele Bassi [Thu, 19 Nov 2009 13:29:02 +0000 (13:29 +0000)]
docs: Documentation fixes for CoglBitmap
• Use the same style for the Cogl API reference as the one used for
the Clutter API reference.
• Fix the introspection annotations for cogl_bitmap_get_size_from_file()
Emmanuele Bassi [Thu, 19 Nov 2009 12:34:06 +0000 (12:34 +0000)]
docs: Fix Cogl API reference build
• Ignore all the private header files
• Add all missing/unused symbols
• Remove deprecated symbols from 0.*
Emmanuele Bassi [Thu, 19 Nov 2009 12:32:59 +0000 (12:32 +0000)]
docs: Remove non-gtk-doc annotations
The imported Mesa matrix code has some documentation annotations
that make gtk-doc very angry. Since it's all private anyway we
can safely make gtk-doc ignore the offending stuff.
Neil Roberts [Thu, 19 Nov 2009 11:51:21 +0000 (11:51 +0000)]
docs: Fix the 'Since' annotation for some functions
The 'Since' annotation needs to have a colon after it or gtk-doc won't
pick it up.
Neil Roberts [Wed, 18 Nov 2009 19:09:10 +0000 (19:09 +0000)]
cogl: Use APIENTRY for GL function pointer declarations
This matters for platforms such as Windows that use a different
calling covention from the default for GL functions.
Neil Roberts [Wed, 18 Nov 2009 19:23:57 +0000 (19:23 +0000)]
build: Fix out-of-tree builds for cogl-defines.h
$(COGL_DRIVER)/cogl-defines.h is generated in the configure script so
it ends up in the build directory. Therefore the build rule for
cogl/cogl-defines.h should depend on the file in $(builddir) not
$(srcdir).
Emmanuele Bassi [Wed, 18 Nov 2009 18:04:13 +0000 (18:04 +0000)]
docs: Clean up deprecation notices
The deprecation notices in gtk-doc should also refer to the
release that added the deprecation, and if the deprecated
symbol has been replaced by something else then the new symbol
should be correctly referenced.
Emmanuele Bassi [Wed, 18 Nov 2009 17:35:07 +0000 (17:35 +0000)]
build: Make cogl.h not conditional on driver defines
The main COGL header cogl.h is currently created at configure time
because it conditionally includes the driver-dependent defines. This
sometimes leads to a stale cogl.h with old definitions which can
break the build until you clean out the whole tree and start from
scratch.
We can generate a stable cogl-defines.h at build time from the
equivalent driver-dependent header and let cogl.h include that
file instead.
Neil Roberts [Wed, 18 Nov 2009 17:16:38 +0000 (17:16 +0000)]
test-npot-texture: Add some verbose notes
This just adds some verbose output stating whether Cogl thinks that
NPOT textures are supported.
Neil Roberts [Wed, 18 Nov 2009 14:21:22 +0000 (14:21 +0000)]
disable-npots: Don't allow the GL version to be 2.0
Cogl now assumes non-power-of-two textures are supported if the GL
version is >= 2.0 so the disable-npots utility should also change the
GL version.
Emmanuele Bassi [Wed, 18 Nov 2009 15:21:09 +0000 (15:21 +0000)]
build: Fix EXTRA_DIST and MAINTAINERCLEANFILES rules
Emmanuele Bassi [Wed, 18 Nov 2009 15:11:56 +0000 (15:11 +0000)]
Update README file
Emmanuele Bassi [Wed, 18 Nov 2009 15:06:37 +0000 (15:06 +0000)]
docs: Update the "writing a backend" documentation
The documentation on how a ClutterBackend and stage are implemented
is a wee bit out of date.
Emmanuele Bassi [Wed, 18 Nov 2009 14:56:59 +0000 (14:56 +0000)]
Remove clutter.symbols
The symbols file is unused since Clutter 0.6, and the win32 backend
does not depend on it anymore.
Emmanuele Bassi [Wed, 18 Nov 2009 14:56:25 +0000 (14:56 +0000)]
Rename ChangeLog.SVN
Emmanuele Bassi [Wed, 18 Nov 2009 14:37:43 +0000 (14:37 +0000)]
build: Add cogl-matrix-private.h to the dist
Emmanuele Bassi [Wed, 18 Nov 2009 14:34:33 +0000 (14:34 +0000)]
build: Add cogl-feature-functions.h to the dist
Emmanuele Bassi [Wed, 18 Nov 2009 14:21:08 +0000 (14:21 +0000)]
build: Generate per-cycle ChangeLog files
We should generate a ChangeLog for each minor version cycle, starting
from the Git import date (since before that we used ChangeLog-style
commit messages that don't really look good with the Git ones).
For this reason we can take Cairo's Makefile.am.changelog file and,
after tweaking it to fit our use case, let it generate the correct
ChangeLogs on dist.
Emmanuele Bassi [Wed, 18 Nov 2009 12:20:53 +0000 (12:20 +0000)]
build: Move ChangeLog rules in a separate file
The ChangeLog creation rules should be moved to their own file, to
make it easier to fix or change them in the future.
Neil Roberts [Wed, 18 Nov 2009 13:23:10 +0000 (13:23 +0000)]
cogl: Add the missing terminators for the arrays of feature functions
_cogl_feature_check expects the array of function names to be
terminated with a NULL pointer but I forgot to add this. This was
causing crashes depending on what happened to be in memory after the
array.
Christian Persch [Tue, 17 Nov 2009 19:43:39 +0000 (20:43 +0100)]
Pass the interned string value to the binding callback
http://bugzilla.openedhand.com/show_bug.cgi?id=1891
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
Neil Roberts [Tue, 17 Nov 2009 18:06:31 +0000 (18:06 +0000)]
cogl: Use the GL_EXT_blend_{func,equation}_separate extensions
We should use these extensions to check for glBlendFuncSeparate and
glBlendEquationSeparate as well as checking the GL version number.
Neil Roberts [Tue, 17 Nov 2009 17:22:22 +0000 (17:22 +0000)]
cogl: Don't bother checking for NPOTs or VBOs on later GLs
For VBOs, we don't need to check for the extension if the GL version
is greater than 1.5. Non-power-of-two textures are given in 2.0.
We could also assume shader support in GL 2.0 except that the function
names are different from those in the extension so it wouldn't work
well with the current mechanism.
Emmanuele Bassi [Tue, 17 Nov 2009 15:32:00 +0000 (15:32 +0000)]
build: Clean up the configure summary
Split out into section the configuration report, and clean
up the reported settings - including when experimental features
have been enabled.
Neil Roberts [Tue, 17 Nov 2009 13:52:40 +0000 (13:52 +0000)]
cogl: Make it easier to add checks for GL extensions
Previously if you need to depend on a new GL feature you had to:
- Add typedefs for all of the functions in cogl-defines.h.in
- Add function pointers for each of the functions in
cogl-context-driver.h
- Add an initializer for the function pointers in
cogl-context-driver.c
- Add a check for the extension and all of the functions in
cogl_features_init. If the extension is available under multiple
names then you have to duplicate the checks.
This is quite tedious and error prone. This patch moves all of the
features and their functions into a list of macro invocations in
cogl-feature-functions.h. The macros can be redefined to implement all
of the above tasks from the same header.
The features are described in a struct with a pointer to a table of
functions. A new function takes the feature description from this
struct and checks for its availability. The feature can take a list of
extension names with a list of alternate namespaces (such as "EXT" or
"ARB"). It can also detect the feature from a particular version of
GL.
The typedefs are now gone and instead the function pointer in the Cogl
context just directly contains the type.
Some of the functions in the context were previously declared with the
'ARB' extension. This has been removed so that now all the functions
have no suffix. This makes more sense when the extension could
potentially be merged into GL core as well.
Emmanuele Bassi [Sat, 14 Nov 2009 13:03:59 +0000 (13:03 +0000)]
docs: Detail the Clutter debugging flags
Neil Roberts [Fri, 13 Nov 2009 17:23:13 +0000 (17:23 +0000)]
win32: Remove the check for GL 1.2
Since
568c29ba4 the GL version is now validated further up in
ClutterStage via Cogl so there is no need for the Win32 backend to do
it.
Neil Roberts [Wed, 11 Nov 2009 16:42:53 +0000 (16:42 +0000)]
Use the GL_ARB_multitexture extension on GL 1.2
Cogl requires multi-texturing support. This is only available as an
extension in GL 1.2 so we should check for it before accepting the
driver.
http://bugzilla.openedhand.com/show_bug.cgi?id=1875
Neil Roberts [Wed, 11 Nov 2009 13:38:52 +0000 (13:38 +0000)]
cogl-material: Fallback to BlendFunc if BlendFuncSeparate is unavailable
glBlendFuncSeparate is only available in OpenGL 1.4. If we
conditionally check for this then Clutter will work with OpenGL 1.2.
http://bugzilla.openedhand.com/show_bug.cgi?id=1875
Neil Roberts [Wed, 11 Nov 2009 13:26:54 +0000 (13:26 +0000)]
Validate that the GL version is >= 1.2
There is a new internal Cogl function called _cogl_check_driver_valid
which looks at the value of the GL_VERSION string to determine whether
the driver is supported. Clutter now calls this after the stage is
realized. If it fails then the stage is marked as unrealized and a
warning is shown.
_cogl_features_init now also checks the version number before getting
the function pointers for glBlendFuncSeparate and
glBlendEquationSeparate. It is not safe to just check for the presence
of the functions because some drivers may define the function without
fully implementing the spec.
The GLES version of _cogl_check_driver_valid just always returns TRUE
because there are no version requirements yet.
Eventually the function could also check for mandatory extensions if
there were any.
http://bugzilla.openedhand.com/show_bug.cgi?id=1875
Samuel Degrande [Tue, 27 Oct 2009 10:18:49 +0000 (11:18 +0100)]
Can no more include clutter-stage.h inside clutter-win32.h
http://bugzilla.openedhand.com/show_bug.cgi?id=1847
Signed-off-by: Neil Roberts <neil@linux.intel.com>
Samuel Degrande [Mon, 26 Oct 2009 15:28:36 +0000 (16:28 +0100)]
Adapt win32 backend to the semantic change of StageWindow
http://bugzilla.openedhand.com/show_bug.cgi?id=1847
Signed-off-by: Neil Roberts <neil@linux.intel.com>
Emmanuele Bassi [Fri, 13 Nov 2009 15:27:18 +0000 (15:27 +0000)]
tests: Add instructions to test-box-layout
Neil Roberts [Fri, 13 Nov 2009 13:39:24 +0000 (13:39 +0000)]
Clear pending events for a stage when it is destroyed
We can not process events for a stage that has been destroyed so we
should make sure that the events for the stage are removed from the
global event queue during dispose.
http://bugzilla.openedhand.com/show_bug.cgi?id=1882
Emmanuele Bassi [Fri, 13 Nov 2009 14:43:57 +0000 (14:43 +0000)]
docs: Document the AnimationMode definition
Both ClutterAlpha:mode and ClutterAnimation:mode can be defined using:
• an integer id
• the "nick" field of the AnimationMode GEnumValue
• a custom, tweener-like string
All these methods should be documented.
Emmanuele Bassi [Fri, 13 Nov 2009 14:10:29 +0000 (14:10 +0000)]
tests: Add unit for Animation definitions
Verify that an Animation can be defined using ClutterScript.
No initial/final state of the animation, yet.
Emmanuele Bassi [Fri, 13 Nov 2009 14:08:49 +0000 (14:08 +0000)]
Whitespace fixes
Emmanuele Bassi [Fri, 13 Nov 2009 14:07:25 +0000 (14:07 +0000)]
tests: Print out parser errors if present
If the conformance test for the Script parser throws an error
and we've enabled verbosity then we should print out the error
message before aborting.
Emmanuele Bassi [Fri, 13 Nov 2009 13:21:47 +0000 (13:21 +0000)]
animation: Override parsing :mode
Like in ClutterAlpha, ClutterAnimation:mode must be overridden when
parsing a Script definition, as we accept both a numeric id and the
string id for easing modes.
Neil Roberts [Mon, 5 Oct 2009 12:37:11 +0000 (13:37 +0100)]
[cogl-primitives] Don't clear the whole stencil buffer
When _cogl_add_path_to_stencil_buffer is used to draw a path we don't
need to clear the entire stencil buffer. Instead it can clear just the
bounding box of the path. This adds an extra parameter called
'need_clear' which is only set if the stencil buffer is being used for
clipping.
http://bugzilla.openedhand.com/show_bug.cgi?id=1829
Neil Roberts [Thu, 12 Nov 2009 17:00:15 +0000 (17:00 +0000)]
Remove _cogl_flush_matrix_stacks from cogl-internal.h
The definition for this function was removed in f7d64e5abvoid so it
should be removed from the header too.
Emmanuele Bassi [Wed, 11 Nov 2009 10:32:39 +0000 (10:32 +0000)]
cogl: Declare cogl_is_bitmap()
The function is automatically defined by the CoglHandle type
definition macro, but it still requires to be declared in the
header file to be used.
Neil Roberts [Mon, 9 Nov 2009 12:12:27 +0000 (12:12 +0000)]
Revert changes to test-cogl-primitives.c from
272e227109
These changes caused the test to try to load redhand.png but this no
longer works since the TESTS_DATADIR changes in
0b4899ef23. The only
use of the hand is commented out anyway so it looks like the changes
were intended for temporary debugging.
Damien Lespiau [Mon, 9 Nov 2009 13:05:40 +0000 (13:05 +0000)]
build: Make the glib-mkenums generated files depend on their templates
With this, if one changes the underlying template files, we run
glib-mkenums again to generate updated glib_enum_[ch] files.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
Emmanuele Bassi [Mon, 9 Nov 2009 16:44:34 +0000 (16:44 +0000)]
build: Fix --with-imagebackend configure switch
An overeager search and replace broke the image backend command
line switch for the configure script.
Neil Roberts [Mon, 9 Nov 2009 11:50:16 +0000 (11:50 +0000)]
cogl: Add an initialiser for enable_flags in cogl_begin_gl
This fixes a warning about an uninitialised value. It could also
potentially fix some crashes for example if the enable_flags value
happened to include a bit for enabling a vertex array if no vertex
buffer pointer was set.
Emmanuele Bassi [Mon, 9 Nov 2009 11:07:27 +0000 (11:07 +0000)]
text: Add a NULL preedit string check
This commit avoids a critical warning introduced by commit
bc51b8ca47ac90e52ab6a27ff791ea97d53f4648
Raymond Liu [Mon, 9 Nov 2009 08:42:15 +0000 (16:42 +0800)]
Fix cursor position in preedit status
http://bugzilla.openedhand.com/show_bug.cgi?id=1871
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
Emmanuele Bassi [Fri, 6 Nov 2009 15:06:39 +0000 (15:06 +0000)]
Clean up cogl.h template
The inclusion order is mostly random, and it should really be
in alphabetic order, just like clutter.h.
Also, cogl-vertex-buffer.h is included twice.
Tim Horton [Fri, 6 Nov 2009 11:57:43 +0000 (11:57 +0000)]
osx: CGBitmapContextCreate can't make 24bpp, alphaless offscreen pixmaps
While loading a JPEG from disk (with clutter_texture_new_from_file),
I got the following:
<Error>: CGBitmapContextCreate: unsupported parameter combination: 8
integer bits/component; 24 bits/pixel; 3-component colorspace;
kCGImageAlphaNone; 3072 bytes/row.
<Error>: CGContextDrawImage: invalid context
Looking around, I found that CGBitmapContextCreate can't make 24bpp
offscreen pixmaps without an alpha channel...
This fixes the bug, and seems to not break other things...
http://bugzilla.openedhand.com/show_bug.cgi?id=1159
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
Emmanuele Bassi [Fri, 6 Nov 2009 14:07:46 +0000 (14:07 +0000)]
script: Coding style clean-ups
Emmanuele Bassi [Fri, 6 Nov 2009 14:07:26 +0000 (14:07 +0000)]
script: Document private functions
Emmanuele Bassi [Fri, 6 Nov 2009 14:04:36 +0000 (14:04 +0000)]
Do not pass flags to g_module_open(NULL)
The flags are ignored when opening the main module, so we
should pass 0 to avoid confusion when reading the source.
Emmanuele Bassi [Fri, 6 Nov 2009 11:50:22 +0000 (11:50 +0000)]
Merge branch 'josh-osx-fixes'
* josh-osx-fixes:
osx: Fix a warning on Snow Leopard
docs: Fix OS X docs to install Ports in correct order
osx: Implement the updated ClutterStageWindow interface
Joshua Lock [Thu, 5 Nov 2009 15:50:21 +0000 (15:50 +0000)]
tests: Remove a spurious #include
The test-backface-culling has what looks like a stray #include in which
stops the test compiling for backends without GdkPixbuf. Remove it.
http://bugzilla.openedhand.com/show_bug.cgi?id=1867
Joshua Lock [Thu, 5 Nov 2009 15:48:25 +0000 (15:48 +0000)]
osx: Fix a warning on Snow Leopard
Apple where nice and changed API between releases. This patch checks the
version of the compilation environment and tries to use the right parameter
type.
http://bugzilla.openedhand.com/show_bug.cgi?id=1866
Joshua Lock [Thu, 5 Nov 2009 15:31:56 +0000 (15:31 +0000)]
docs: Fix OS X docs to install Ports in correct order
The order in which the MacPorts are installed is important otherwise we open
the user up to a world of pain.
This patch also tweaks the OS X docs to follow the formatting of the rest of
the docs and to discuss the option of GtkDoc.
http://bugzilla.openedhand.com/show_bug.cgi?id=1865
Joshua Lock [Thu, 5 Nov 2009 15:44:32 +0000 (15:44 +0000)]
osx: Implement the updated ClutterStageWindow interface
In the new Clutter world backend stage implementations should be lightweight
objects implementing the ClutterStageWindow interface and not ClutterActor
subclasses.
This patch performs various cut-n-pastes to acheive that for the OSX backend
http://bugzilla.openedhand.com/show_bug.cgi?id=1864
Emmanuele Bassi [Fri, 6 Nov 2009 11:33:32 +0000 (11:33 +0000)]
behaviour: Implement the implicit alpha parsing
ClutterBehaviour should implement the Scriptable interface
and parse ClutterAlpha when implicitly defined, instead of
having this ad hoc code inside ClutterScriptParser itself.
After all, only ClutterBehaviour supports Alpha defined
implicitly.
Emmanuele Bassi [Fri, 6 Nov 2009 11:32:28 +0000 (11:32 +0000)]
conform: Add unit for properties holding objects
Exercise the definition of GObjects for properties defined using
GParamSpecObject.
Emmanuele Bassi [Fri, 6 Nov 2009 11:17:42 +0000 (11:17 +0000)]
script: Generic assignment of properties requiring objects
The ClutterScriptParser should do most of the heavy-lifting for
parsing a JSON object member defining another JSON object into
a GObject property defined using a GParamSpecObject.
Emmanuele Bassi [Fri, 6 Nov 2009 10:53:43 +0000 (10:53 +0000)]
conformance: Add unit on the implicit alpha definition
Exercise the implicit alpha and timeline definition to catch
regressions in the ClutterScript parser code.
Emmanuele Bassi [Fri, 6 Nov 2009 10:17:30 +0000 (10:17 +0000)]
script: Apply properties when constructing implicit timelines
The object construction is done in two passes, now, so we must do both
passes when parsing implicit timelines from a fake ObjectInfo.
Robert Bragg [Thu, 5 Nov 2009 16:50:24 +0000 (16:50 +0000)]
Remove all internal use of deprecated cogl_clip_* API
cogl_clip_push, and cogl_clip_push_window_rect which are now deprecated were
used in various places internally so this just switches to using the
replacement functions.
Robert Bragg [Thu, 5 Nov 2009 10:56:24 +0000 (10:56 +0000)]
[clip-stack] stop using deprecated cogl_clip_push_window_rect API
try_pushing_rect_as_window_rect now uses the new
cogl_clip_push_window_rectangle API.
Robert Bragg [Wed, 4 Nov 2009 19:31:43 +0000 (19:31 +0000)]
[cogl-clip] deprecate parts and cleanup the API
cogl_clip_push() which accepts a rectangle in model space shouldn't have
been defined to take x,y,width,height arguments because this isn't consistant
with other Cogl API dealing with model space rectangles. If you are using a
coordinate system with the origin at the center and the y+ extending up,
then x,y,width,height isn't as natural as (x0,y0)(x1,y1). This API has
now been replace with cogl_clip_push_rectangle()
(As a general note: the Cogl API should only use the x,y,width,height style
when the appropriate coordinate space is defined by Cogl to have a top left
origin. E.g. window coordinates, or potentially texture coordinates)
cogl_clip_push_window_rect() shouldn't have been defined to take float
arguments since we only clip with integral pixel precision. We also
shouldn't have abbreviated "rectangle". This API has been replaced with
cogl_clip_push_window_rectangle()
cogl_clip_ensure() wasn't documented at all in Clutter 1.0 and probably
no one even knew it existed. This API isn't useful, and so it's now
deprecated. If no one complains we may remove the API altogether for
Clutter 1.2.
cogl_clip_stack_save() and cogl_clip_stack_restore() were originally added
to allow us to save/restore the clip when switching to/from offscreen
rendering. Now that offscreen draw buffers are defined to own their clip
state and the state will be automatically saved and restored this API is now
redundant and so deprecated.
Robert Bragg [Wed, 4 Nov 2009 20:17:56 +0000 (20:17 +0000)]
[clip-stack] Internally track model space clip rects as (x0,y0)(x1,y1) pairs
Don't track the rectangles as x0,y0,width,height. This is in preparation
for some API tidy up.
Robert Bragg [Wed, 4 Nov 2009 19:42:17 +0000 (19:42 +0000)]
[clip-stack] move lots of supporting code from cogl.c to cogl-clip-stack.c
There was quite a bit of code in cogl.c that was only used to support
cogl-clip-stack.c, so this has now been moved to cogl-clip-stack.c
Robert Bragg [Wed, 4 Nov 2009 16:55:18 +0000 (16:55 +0000)]
[debug] Adds a COGL_DEBUG=force-scanline-paths
For a long time now the GLES driver for Cogl has supported a fallback
scanline rasterizer for filling paths when no stencil buffer is available,
but now that we build the same cogl-primitives code for GL and GLES I
thought it may sometimes be useful for debugging to force Cogl to use the
scanline rasterizer instead of the current stencil buffer approach.
Emmanuele Bassi [Thu, 5 Nov 2009 17:30:33 +0000 (17:30 +0000)]
tests: Clean up interactive test build
The build for interactive tests creates symbolic links for the data
under tests/data; it also uses symbolic links for creating "binaries"
for each interactive test. This is less than ideal, though.
Instead, the tests should build a path to the data files by using
a pre-processor define like TESTS_DATADIR; both g_build_filename() and
pre-processor string concatenation can be used to generate a valid
file name with the full path to the files.
The build system should also create wrapper scripts, just like we
do inside the conformance test suite, to be able to launch single
tests.
Emmanuele Bassi [Thu, 5 Nov 2009 12:24:37 +0000 (12:24 +0000)]
layout: Add layout properties introspection
In order to know if a layout property exists and retrieve its
description in form of a GParamSpec, we need a wrapper API inside
ClutterLayoutManager. This allows introspecting a LayoutManager
sub-class and eventually serialize and deserialize it.
Emmanuele Bassi [Thu, 5 Nov 2009 12:23:49 +0000 (12:23 +0000)]
box-layout: Add get_child_meta_type() override
Return the GType of ClutterBoxChild.
Emmanuele Bassi [Thu, 5 Nov 2009 12:23:22 +0000 (12:23 +0000)]
bin-layout: Add get_child_meta_type() override
Return the GType of ClutterBinLayer.
Emmanuele Bassi [Thu, 5 Nov 2009 11:57:06 +0000 (11:57 +0000)]
layout: Add LayoutManager::get_child_meta_type()
In order to inspect a LayoutManager using LayoutMeta we need a
virtual function that returns the GType of the LayoutMeta used.
Emmanuele Bassi [Wed, 4 Nov 2009 16:45:44 +0000 (16:45 +0000)]
script: Allow parsing child properties
The ClutterScript parser needs to be extended to parse child properties
and apply them after an actor has been added to a container. In order to
distinguish child properties from regular GObject properties we can use
the "child::" prefix, e.g.:
{
"type" : "ClutterRectangle",
"id" : "child-01",
"child::has-focus" : true,
...
}
Parsing child properties can be deferred to the ClutterScriptable
interface, just like regular properties.
Robert Bragg [Sat, 17 Oct 2009 03:06:56 +0000 (04:06 +0100)]
[cogl-primitives] Get rid of driver specific cogl-primitives code
These files were practically identical, except the gles code had additional
support for filling paths without a stencil buffer. All the driver code has
now been moved into cogl/cogl-primitives.c
Emmanuele Bassi [Wed, 4 Nov 2009 15:21:03 +0000 (15:21 +0000)]
script: Clean up Color parsing rules
All the ClutterColor parsing rules should be coalesced inside
clutter_script_parse_color(): object, array and string notations
are the canonical ways of defining a ClutterColor inside a
ClutterScript definition. Having a single function in charge of
the parsing cleans up the code.
Emmanuele Bassi [Wed, 4 Nov 2009 15:20:12 +0000 (15:20 +0000)]
script: Simplify boxed types parsing
We should use the typed accessors for complex JSON types, and
be more liberal in what we accept.
Emmanuele Bassi [Wed, 4 Nov 2009 14:05:13 +0000 (14:05 +0000)]
script: Separate construction from properties application
Currently, ClutterScriptParser will construct the object (using the
construct-only and construct parameters), apply the properties from
the ClutterScript definition, and eventuall will add children and
behaviours.
The construction phase should be more compartimentalized: the objects
should be constructed first and eventual children and behaviours
added. Then, once an object is requested or when the parsing process
has terminated, all the properties should be applied.
This change allows us to set up the actors before setting their
non-construct properties.
Emmanuele Bassi [Wed, 4 Nov 2009 13:32:26 +0000 (13:32 +0000)]
script: Move all parser code inside ClutterScriptParser
ClutterScript is currently a mix of parser-related code and
the ClutterScript object. All the parser-related code should
be moved inside a private class, ClutterScriptParser, inheriting
from JsonParser.
Emmanuele Bassi [Wed, 4 Nov 2009 11:50:45 +0000 (11:50 +0000)]
conform: Add the beginnings of a ClutterScript test suite
ClutterScript is a very complicated piece of machinery, with a
parser that has custom variations on top of the basic JSON
format; it could also be extended in the future, so if we don't
want to introduce regressions or break existing ClutterScript
definitions, we'd better have a conformance test suite.
Emmanuele Bassi [Wed, 4 Nov 2009 11:47:09 +0000 (11:47 +0000)]
tests: Allow getting data files from the tests/data directory
The units under the conformance test suite should be able to use
external files. Linking the files in tests/conform like the
interactive tests do seems like a hack piled on top of a hack, so
instead we should provide a programmatic way for a conformance
test unit to get the full path of a file, regardless of where the
tests/data directory is.
We can use a define to get the full path of tests/data and then
a function using g_build_filename() to construct the path to the
file we want.
Emmanuele Bassi [Wed, 4 Nov 2009 11:05:25 +0000 (11:05 +0000)]
Add new conformance tests to the ignore list