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

clutter: Remove deprecated/clutter-behaviour-scale.c

Browse Source 
https://gitlab.gnome.org/GNOME/mutter/merge_requests/879
This commit is contained in:
Adam Jackson
2019-10-22 12:04:42 -04:00
committed by Georges Basile Stavracas Neto
parent 013b336690
commit 33d1bae03f
8 changed files with 0 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/tests/clutter/interactive/meson.build
View File

@ -19,7 +19,6 @@ clutter_tests_interactive_test_sources = [
'test-texture-async.c',
'test-texture-material.c',
'test-events.c',
'test-scale.c',
'test-actors.c',
'test-shader-effects.c',
'test-script.c',

26
src/tests/clutter/interactive/test-actors.c
View File

@ -20,8 +20,6 @@ typedef struct SuperOH
gint stage_height;
gfloat radius;
ClutterBehaviour *scaler_1;
ClutterBehaviour *scaler_2;
ClutterTimeline *timeline;
} SuperOH;
@ -155,20 +153,9 @@ stop_and_quit (ClutterActor *stage,
clutter_main_quit ();
}
static gdouble
my_sine_wave (ClutterAlpha *alpha,
gpointer dummy G_GNUC_UNUSED)
{
ClutterTimeline *timeline = clutter_alpha_get_timeline (alpha);
gdouble progress = clutter_timeline_get_progress (timeline);
return sin (progress * G_PI);
}
G_MODULE_EXPORT int
test_actors_main (int argc, char *argv[])
{
ClutterAlpha *alpha;
SuperOH *oh;
gint i;
GError *error;
@ -207,12 +194,6 @@ test_actors_main (int argc, char *argv[])
/* fire a callback for frame change */
g_signal_connect (oh->timeline, "new-frame", G_CALLBACK (frame_cb), oh);
/* Set up some behaviours to handle scaling */
alpha = clutter_alpha_new_with_func (oh->timeline, my_sine_wave, NULL, NULL);
oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
real_hand = clutter_texture_new_from_file (file, &error);
if (real_hand == NULL)
@ -283,11 +264,6 @@ test_actors_main (int argc, char *argv[])
g_signal_connect (oh->hand[i], "destroy",
G_CALLBACK (on_hand_destroy),
oh);
if (i % 2)
clutter_behaviour_apply (oh->scaler_1, oh->hand[i]);
else
clutter_behaviour_apply (oh->scaler_2, oh->hand[i]);
}
/* Add the group to the stage */
@ -308,8 +284,6 @@ test_actors_main (int argc, char *argv[])
clutter_timeline_stop (oh->timeline);
/* clean up */
g_object_unref (oh->scaler_1);
g_object_unref (oh->scaler_2);
g_object_unref (oh->timeline);
g_free (oh->hand);
g_free (oh);

26
src/tests/clutter/interactive/test-paint-wrapper.c
View File

@ -28,8 +28,6 @@ typedef struct SuperOH
gint stage_height;
gfloat radius;
ClutterBehaviour *scaler_1;
ClutterBehaviour *scaler_2;
ClutterTimeline *timeline;
guint frame_id;
@ -143,16 +141,6 @@ frame_cb (ClutterTimeline *timeline,
}
}
static gdouble
my_sine_wave (ClutterAlpha *alpha,
gpointer dummy G_GNUC_UNUSED)
{
ClutterTimeline *timeline = clutter_alpha_get_timeline (alpha);
gdouble progress = clutter_timeline_get_progress (timeline);
return sin (progress * G_PI);
}
static void
hand_pre_paint (ClutterActor *actor,
gpointer user_data)
@ -208,7 +196,6 @@ stop_and_quit (ClutterActor *actor,
G_MODULE_EXPORT int
test_paint_wrapper_main (int argc, char *argv[])
{
ClutterAlpha *alpha;
ClutterActor *stage;
ClutterColor stage_color = { 0x61, 0x64, 0x8c, 0xff };
SuperOH *oh;
@ -260,12 +247,6 @@ test_paint_wrapper_main (int argc, char *argv[])
oh->frame_id =
g_signal_connect (oh->timeline, "new-frame", G_CALLBACK (frame_cb), oh);
/* Set up some behaviours to handle scaling */
alpha = clutter_alpha_new_with_func (oh->timeline, my_sine_wave, NULL, NULL);
oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
real_hand = clutter_texture_new_from_file (TESTS_DATADIR
G_DIR_SEPARATOR_S
"redhand.png",
@ -334,11 +315,6 @@ test_paint_wrapper_main (int argc, char *argv[])
/* Add to our group group */
clutter_container_add_actor (CLUTTER_CONTAINER (oh->group), oh->hand[i]);
if (i % 2)
clutter_behaviour_apply (oh->scaler_1, oh->hand[i]);
else
clutter_behaviour_apply (oh->scaler_2, oh->hand[i]);
}
oh->paint_guards = g_malloc0 (sizeof (gboolean) * n_hands);
@ -359,8 +335,6 @@ test_paint_wrapper_main (int argc, char *argv[])
clutter_main ();
g_object_unref (oh->scaler_1);
g_object_unref (oh->scaler_2);
g_object_unref (oh->timeline);
g_free (oh->paint_guards);
g_free (oh->hand);

125
src/tests/clutter/interactive/test-scale.c
View File

@ -1,125 +0,0 @@
#include <stdlib.h>
#include <gmodule.h>
#include <clutter/clutter.h>
static const ClutterGravity gravities[] = {
CLUTTER_GRAVITY_NORTH_EAST,
CLUTTER_GRAVITY_NORTH,
CLUTTER_GRAVITY_NORTH_WEST,
CLUTTER_GRAVITY_WEST,
CLUTTER_GRAVITY_SOUTH_WEST,
CLUTTER_GRAVITY_SOUTH,
CLUTTER_GRAVITY_SOUTH_EAST,
CLUTTER_GRAVITY_EAST,
CLUTTER_GRAVITY_CENTER,
CLUTTER_GRAVITY_NONE
};
static gint gindex = 0;
static ClutterActor *label;
int
test_scale_main (int argc, char *argv[]);
const char *
test_scale_describe (void);
static void
set_next_gravity (ClutterActor *actor)
{
ClutterGravity gravity = gravities[gindex];
GEnumClass *eclass;
GEnumValue *evalue;
clutter_actor_move_anchor_point_from_gravity (actor, gravities[gindex]);
eclass = g_type_class_ref (CLUTTER_TYPE_GRAVITY);
evalue = g_enum_get_value (eclass, gravity);
clutter_text_set_text (CLUTTER_TEXT (label), evalue->value_nick);
g_type_class_unref (eclass);
if (++gindex >= G_N_ELEMENTS (gravities))
gindex = 0;
}
static gdouble
my_ramp_func (ClutterAlpha *alpha,
gpointer unused)
{
ClutterTimeline *timeline = clutter_alpha_get_timeline (alpha);
return clutter_timeline_get_progress (timeline);
}
G_MODULE_EXPORT int
test_scale_main (int argc, char *argv[])
{
ClutterActor *stage, *rect;
ClutterColor rect_color = { 0xff, 0xff, 0xff, 0x99 };
ClutterTimeline *timeline;
ClutterAlpha *alpha;
ClutterBehaviour *behave;
if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
return 1;
stage = clutter_stage_new ();
clutter_stage_set_title (CLUTTER_STAGE (stage), "Scaling");
clutter_actor_set_background_color (stage, CLUTTER_COLOR_Black);
clutter_actor_set_size (stage, 300, 300);
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
rect = clutter_rectangle_new_with_color (&rect_color);
clutter_actor_set_size (rect, 100, 100);
clutter_actor_set_position (rect, 100, 100);
clutter_container_add_actor (CLUTTER_CONTAINER (stage), rect);
label = clutter_text_new_with_text ("Sans 20px", "");
clutter_text_set_color (CLUTTER_TEXT (label), CLUTTER_COLOR_White);
clutter_actor_set_position (label,
clutter_actor_get_x (rect),
clutter_actor_get_y (rect)
+ clutter_actor_get_height (rect));
clutter_container_add_actor (CLUTTER_CONTAINER (stage), label);
rect_color.alpha = 0xff;
rect = clutter_rectangle_new_with_color (&rect_color);
clutter_actor_set_position (rect, 100, 100);
clutter_actor_set_size (rect, 100, 100);
set_next_gravity (rect);
clutter_container_add_actor (CLUTTER_CONTAINER (stage), rect);
timeline = clutter_timeline_new (750);
alpha = clutter_alpha_new_with_func (timeline,
my_ramp_func,
NULL, NULL);
behave = clutter_behaviour_scale_new (alpha,
0.0, 0.0, /* scale start */
1.0, 1.0); /* scale end */
clutter_behaviour_apply (behave, rect);
clutter_timeline_set_repeat_count (timeline, -1);
g_signal_connect_swapped (timeline, "completed",
G_CALLBACK (set_next_gravity), rect);
clutter_timeline_start (timeline);
clutter_actor_show_all (stage);
clutter_main();
g_object_unref (timeline);
g_object_unref (behave);
return EXIT_SUCCESS;
}
G_MODULE_EXPORT const char *
test_scale_describe (void)
{
return "Scaling animation and scaling center changes";
}