mirror of
https://github.com/brl/mutter.git
synced 2024-11-23 16:40:41 -05:00
d6d208da7d
With the recent change to internal floating point values, ClutterUnit has become a redundant type, defined to be a float. All integer entry points are being internally converted to floating point values to be passed to the GL pipeline with the least amount of conversion. ClutterUnit is thus exposed as just a "pixel with fractionary bits", and not -- as users might think -- as generic, resolution and device independent units. not that it was the case, but a definitive amount of people was convinced it did provide this "feature", and was flummoxed about the mere existence of this type. So, having ClutterUnit exposed in the public API doubles the entry points and has the following disadvantages: - we have to maintain twice the amount of entry points in ClutterActor - we still do an integer-to-float implicit conversion - we introduce a weird impedance between pixels and "pixels with fractionary bits" - language bindings will have to choose what to bind, and resort to manually overriding the API + *except* for language bindings based on GObject-Introspection, as they cannot do manual overrides, thus will replicate the entire set of entry points For these reason, we should coalesces every Actor entry point for pixels and for ClutterUnit into a single entry point taking a float, like: void clutter_actor_set_x (ClutterActor *self, gfloat x); void clutter_actor_get_size (ClutterActor *self, gfloat *width, gfloat *height); gfloat clutter_actor_get_height (ClutterActor *self); etc. The issues I have identified are: - we'll have a two cases of compiler warnings: - printf() format of the return values from %d to %f - clutter_actor_get_size() taking floats instead of unsigned ints - we'll have a problem with varargs when passing an integer instead of a floating point value, except on 64bit platforms where the size of a float is the same as the size of an int To be clear: the *intent* of the API should not change -- we still use pixels everywhere -- but: - we remove ambiguity in the API with regard to pixels and units - we remove entry points we get to maintain for the whole 1.0 version of the API - we make things simpler to bind for both manual language bindings and automatic (gobject-introspection based) ones - we have the simplest API possible while still exposing the capabilities of the underlying GL implementation
199 lines
5.0 KiB
C
199 lines
5.0 KiB
C
#include <stdlib.h>
|
|
#include <glib.h>
|
|
#include <clutter/clutter.h>
|
|
|
|
#include "test-conform-common.h"
|
|
|
|
/* We ask for 1 frame per millisecond.
|
|
* Whenever this rate can't be achieved then the timeline
|
|
* will interpolate the number frames that should have
|
|
* passed between timeouts. */
|
|
#define TEST_TIMELINE_FPS 1000
|
|
#define TEST_TIMELINE_FRAME_COUNT 5000
|
|
|
|
/* We are at the mercy of the system scheduler so this
|
|
* may not be a very reliable tolerance. */
|
|
#define TEST_ERROR_TOLERANCE 20
|
|
|
|
typedef struct _TestState
|
|
{
|
|
ClutterTimeline *timeline;
|
|
GTimeVal start_time;
|
|
guint new_frame_counter;
|
|
gint expected_frame;
|
|
gint completion_count;
|
|
gboolean passed;
|
|
guint source_id;
|
|
GTimeVal prev_tick;
|
|
gulong msecs_delta;
|
|
} TestState;
|
|
|
|
|
|
static void
|
|
new_frame_cb (ClutterTimeline *timeline,
|
|
gint frame_num,
|
|
TestState *state)
|
|
{
|
|
GTimeVal current_time;
|
|
gint current_frame;
|
|
glong msec_diff;
|
|
gint loop_overflow = 0;
|
|
static gint step = 1;
|
|
|
|
g_get_current_time (¤t_time);
|
|
|
|
current_frame = clutter_timeline_get_current_frame (state->timeline);
|
|
|
|
msec_diff = (current_time.tv_sec - state->start_time.tv_sec) * 1000;
|
|
msec_diff += (current_time.tv_usec - state->start_time.tv_usec)/1000;
|
|
|
|
/* If we expect to have interpolated past the end of the timeline
|
|
* we keep track of the overflow so we can determine when
|
|
* the next timeout will happen. We then clip expected_frames
|
|
* to TEST_TIMELINE_FRAME_COUNT since clutter-timeline
|
|
* semantics guaranty this frame is always signaled before
|
|
* looping */
|
|
if (state->expected_frame > TEST_TIMELINE_FRAME_COUNT)
|
|
{
|
|
loop_overflow = state->expected_frame - TEST_TIMELINE_FRAME_COUNT;
|
|
state->expected_frame = TEST_TIMELINE_FRAME_COUNT;
|
|
}
|
|
|
|
if (current_frame >= (state->expected_frame-TEST_ERROR_TOLERANCE)
|
|
&& current_frame <= (state->expected_frame+TEST_ERROR_TOLERANCE))
|
|
{
|
|
g_test_message ("\nelapsed milliseconds=%-5li "
|
|
"expected frame=%-4i actual frame=%-4i (OK)\n",
|
|
msec_diff,
|
|
state->expected_frame,
|
|
current_frame);
|
|
}
|
|
else
|
|
{
|
|
g_test_message ("\nelapsed milliseconds=%-5li "
|
|
"expected frame=%-4i actual frame=%-4i (FAILED)\n",
|
|
msec_diff,
|
|
state->expected_frame,
|
|
current_frame);
|
|
state->passed = FALSE;
|
|
}
|
|
|
|
if (step>0)
|
|
{
|
|
state->expected_frame = current_frame + (TEST_TIMELINE_FPS / 4);
|
|
g_test_message ("Sleeping for 250ms "
|
|
"so next frame should be (%i + %i) = %i\n",
|
|
current_frame,
|
|
(TEST_TIMELINE_FPS / 4),
|
|
state->expected_frame);
|
|
g_usleep (250000);
|
|
}
|
|
else
|
|
{
|
|
state->expected_frame = current_frame + TEST_TIMELINE_FPS;
|
|
g_test_message ("Sleeping for 1sec "
|
|
"so next frame should be (%i + %i) = %i\n",
|
|
current_frame,
|
|
TEST_TIMELINE_FPS,
|
|
state->expected_frame);
|
|
g_usleep (1000000);
|
|
}
|
|
|
|
if (current_frame >= TEST_TIMELINE_FRAME_COUNT)
|
|
{
|
|
state->expected_frame += loop_overflow;
|
|
state->expected_frame -= TEST_TIMELINE_FRAME_COUNT;
|
|
g_test_message ("End of timeline reached: "
|
|
"Wrapping expected frame too %i\n",
|
|
state->expected_frame);
|
|
}
|
|
|
|
state->new_frame_counter++;
|
|
step = -step;
|
|
}
|
|
|
|
|
|
static void
|
|
completed_cb (ClutterTimeline *timeline,
|
|
TestState *state)
|
|
{
|
|
state->completion_count++;
|
|
|
|
if (state->completion_count == 2)
|
|
{
|
|
if (state->passed)
|
|
{
|
|
g_test_message ("Passed\n");
|
|
clutter_main_quit ();
|
|
}
|
|
else
|
|
{
|
|
g_test_message ("Failed\n");
|
|
exit (EXIT_FAILURE);
|
|
}
|
|
}
|
|
}
|
|
|
|
static gboolean
|
|
frame_tick (gpointer data)
|
|
{
|
|
TestState *state = data;
|
|
GTimeVal cur_tick = { 0, };
|
|
gulong msecs;
|
|
|
|
g_get_current_time (&cur_tick);
|
|
|
|
if (state->prev_tick.tv_sec == 0)
|
|
state->prev_tick = cur_tick;
|
|
|
|
msecs = (cur_tick.tv_sec - state->prev_tick.tv_sec) * 1000
|
|
+ (cur_tick.tv_usec - state->prev_tick.tv_usec) / 1000;
|
|
|
|
if (clutter_timeline_is_playing (state->timeline))
|
|
clutter_timeline_advance_delta (state->timeline, msecs);
|
|
|
|
state->msecs_delta = msecs;
|
|
state->prev_tick = cur_tick;
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
void
|
|
test_timeline_interpolate (TestConformSimpleFixture *fixture,
|
|
gconstpointer data)
|
|
{
|
|
TestState state;
|
|
|
|
state.timeline =
|
|
clutter_timeline_new (TEST_TIMELINE_FRAME_COUNT,
|
|
TEST_TIMELINE_FPS);
|
|
clutter_timeline_set_loop (state.timeline, TRUE);
|
|
g_signal_connect (G_OBJECT(state.timeline),
|
|
"new-frame",
|
|
G_CALLBACK(new_frame_cb),
|
|
&state);
|
|
g_signal_connect (G_OBJECT(state.timeline),
|
|
"completed",
|
|
G_CALLBACK(completed_cb),
|
|
&state);
|
|
|
|
state.completion_count = 0;
|
|
state.new_frame_counter = 0;
|
|
state.passed = TRUE;
|
|
state.expected_frame = 0;
|
|
state.prev_tick.tv_sec = 0;
|
|
state.prev_tick.tv_usec = 0;
|
|
state.msecs_delta = 0;
|
|
|
|
state.source_id =
|
|
clutter_threads_add_frame_source (60, frame_tick, &state);
|
|
|
|
g_get_current_time (&state.start_time);
|
|
clutter_timeline_start (state.timeline);
|
|
|
|
clutter_main();
|
|
|
|
g_source_remove (state.source_id);
|
|
g_object_unref (state.timeline);
|
|
}
|