brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2007-10-09 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-script.c (clutter_script_get_object): Construct
	the requested object if it hasn't been already. This allows
	referencing objects within the same snippet.

	* tests/test-script.c: Declare a timeline and use it inside
	multiple behaviours; apply multiple behaviours to various
	actors, then retrieve the timeline to start it when the test
	runs.
This commit is contained in:
Emmanuele Bassi
2007-10-09 16:21:04 +00:00
parent 0d7184db20
commit b0569d0f27
3 changed files with 52 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/clutter-script.c
View File

@ -196,12 +196,14 @@ resolve_alpha_func (const gchar *name)
{
c = name[i];
/* skip if uppercase, first or previous is uppercase */
if ((c == g_ascii_toupper (c) &&
if ((c == '-') ||
(c == g_ascii_toupper (c) &&
i > 0 && name[i-1] != g_ascii_toupper (name[i-1])) ||
(i > 2 && name[i] == g_ascii_toupper (name[i]) &&
name[i-1] == g_ascii_toupper (name[i-1]) &&
name[i-2] == g_ascii_toupper (name[i-2])))
g_string_append_c (symbol_name, '_');
g_string_append_c (symbol_name, g_ascii_tolower (c));
}
g_string_append (symbol_name, "_func");
@ -210,7 +212,7 @@ resolve_alpha_func (const gchar *name)
if (!g_module_symbol (module, symbol, (gpointer)&func))
func = NULL;
g_free (symbol);
return func;
@ -1145,7 +1147,7 @@ clutter_script_get_object (ClutterScript *script,
if (!oinfo)
return NULL;
return oinfo->object;
return clutter_script_construct_object (script, oinfo);
}
static GList *