This email list is read-only. Emails sent to this list will be discarded
----------------------------------
apple/main.c | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
New commits:
commit 84e0c8e02e9a776e2f6ddfaad7ba872aae98c249
Author: Felicia Decker <[EMAIL PROTECTED]>
Date: Tue Aug 12 15:47:22 2008 -0700
testing
commit 38ecd3068abfdf4f4268eb35be6dac6bc68e5beb
Merge: 596e4aeb99657e86f1b0a35c0f5086c9f46d6ce2
79417a8504907eb09ba3cb06346e0767d1bbf7eb
Author: felicia decker <[EMAIL PROTECTED](none)>
Date: Tue Aug 12 15:45:16 2008 -0700
Merge branch 'master' of ssh://[EMAIL
PROTECTED]/home/repos/develop/sample_apps
commit 596e4aeb99657e86f1b0a35c0f5086c9f46d6ce2
Author: felicia decker <[EMAIL PROTECTED](none)>
Date: Tue Aug 12 15:29:27 2008 -0700
Changed path file to point locally.
Diff in this email is a maximum of 400 lines.
diff --git a/apple/main.c b/apple/main.c
index 47e53cd..d78118a 100644
--- a/apple/main.c
+++ b/apple/main.c
@@ -68,54 +68,66 @@ ClutterTimeline *timeline_rotation = NULL;
individually.)
ELLIPSE_X, y_coord_of_center, width of ellipse, height of ellipse
*/
-void add_to_ellipse_behaviour(ClutterTimeline *timeline_rotation, gdouble
start_angle,
- ClutterActor *actor, int line)
+void add_to_ellipse_behaviour(ClutterTimeline *timeline_rotation,
+ gdouble start_angle,
+ ClutterActor *actor, int line)
{
g_return_if_fail(timeline_rotation);
- ClutterAlpha *alpha = clutter_alpha_new_full(
- timeline_rotation, CLUTTER_ALPHA_RAMP_INC, NULL, NULL);
+ ClutterAlpha *alpha = clutter_alpha_new_full(timeline_rotation,
+ CLUTTER_ALPHA_RAMP_INC,
+ NULL, NULL);
ClutterBehaviour *behaviour;
switch(line)
{
case RING1:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 170, 135, 20, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 170, 135, 20, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING2:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 160, 220, 50, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 160, 220, 50, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING3:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 140, 305, 50, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 140, 305, 50, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING4:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 120, 370, 50, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 120, 370, 50, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING5:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 125, 450, 50, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 125, 450, 50, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING6:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 140, 540, 100, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 140, 540, 100, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING7:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 180, 580, 100, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 180, 580, 100, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING8:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 220, 605, 100, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 220, 605, 100, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING9:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 260, 605, 100, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 260, 605, 100, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING10:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 300, 585, 100, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 300, 585, 100, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING11:
behaviour = clutter_behaviour_ellipse_new(
@@ -454,7 +466,7 @@ void init_apples()
int init_stem()
{
GError **error = 0;
- ClutterActor *stem =
clutter_texture_new_from_file("/home/bob/Downloads/sample_apps//apple/apple_stem3.png",
error);
+ ClutterActor *stem = clutter_texture_new_from_file("./apple_stem3.png",
error);
if (stem == NULL) {
fprintf(stderr, "Error: Stem failed to load.\n");
return -1;
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
