[seed] examples: Some clutter-pad cleanups
- From: Robert Carr <racarr src gnome org>
- To: svn-commits-list gnome org
- Subject: [seed] examples: Some clutter-pad cleanups
- Date: Thu, 14 May 2009 08:45:28 -0400 (EDT)
commit 4b5fcd31be2a67943209557b237e0e523f58003f
Author: Johan Euphrosine <proppy aminche com>
Date: Thu May 14 08:45:20 2009 -0400
examples: Some clutter-pad cleanups
---
.../clutter-pad/examples/animated-rectangle.js | 1 -
examples/clutter-pad/examples/spring.js | 2 -
examples/clutter-pad/main.js | 5 +-
modules/cairo/seed-cairo.c | 202 +++++++++++++-------
4 files changed, 138 insertions(+), 72 deletions(-)
diff --git a/examples/clutter-pad/examples/animated-rectangle.js b/examples/clutter-pad/examples/animated-rectangle.js
index 2c90bc3..4dc211b 100644
--- a/examples/clutter-pad/examples/animated-rectangle.js
+++ b/examples/clutter-pad/examples/animated-rectangle.js
@@ -1,4 +1,3 @@
-GObject = imports.gi.GObject;
Clutter = imports.gi.Clutter;
stage = Clutter.Stage.get_default();
diff --git a/examples/clutter-pad/examples/spring.js b/examples/clutter-pad/examples/spring.js
index ab7285a..2c45873 100644
--- a/examples/clutter-pad/examples/spring.js
+++ b/examples/clutter-pad/examples/spring.js
@@ -1,5 +1,3 @@
-GLib = imports.gi.GLib;
-GObject = imports.gi.GObject;
Clutter = imports.gi.Clutter;
stage = Clutter.Stage.get_default();
diff --git a/examples/clutter-pad/main.js b/examples/clutter-pad/main.js
index a0ca858..8c6dfaf 100755
--- a/examples/clutter-pad/main.js
+++ b/examples/clutter-pad/main.js
@@ -21,10 +21,7 @@ function reset_stage()
context = new sandbox.Context();
context.add_globals();
- var children = stage.get_children();
-
- for(var id in children)
- stage.remove_actor(children[id]);
+ stage.remove_all();
stage.color = {alpha: 255};
stage.show_cursor();
diff --git a/modules/cairo/seed-cairo.c b/modules/cairo/seed-cairo.c
index 1504db0..499c8b7 100644
--- a/modules/cairo/seed-cairo.c
+++ b/modules/cairo/seed-cairo.c
@@ -1008,11 +1008,11 @@ seed_cairo_show_page (SeedContext ctx,
static SeedValue
seed_cairo_has_current_point (SeedContext ctx,
- SeedObject function,
- SeedObject this_object,
- gsize argument_count,
- const SeedValue arguments[],
- SeedException *exception)
+ SeedObject function,
+ SeedObject this_object,
+ gsize argument_count,
+ const SeedValue arguments[],
+ SeedException *exception)
{
CHECK_THIS();
cairo_t *cr = seed_object_get_private (this_object);
@@ -1022,11 +1022,11 @@ seed_cairo_has_current_point (SeedContext ctx,
static SeedValue
seed_cairo_get_current_point (SeedContext ctx,
- SeedObject function,
- SeedObject this_object,
- gsize argument_count,
- const SeedValue arguments[],
- SeedException *exception)
+ SeedObject function,
+ SeedObject this_object,
+ gsize argument_count,
+ const SeedValue arguments[],
+ SeedException *exception)
{
SeedValue points[2];
gdouble x, y;
@@ -1042,11 +1042,11 @@ seed_cairo_get_current_point (SeedContext ctx,
static SeedValue
seed_cairo_new_path (SeedContext ctx,
- SeedObject function,
- SeedObject this_object,
- gsize argument_count,
- const SeedValue arguments[],
- SeedException *exception)
+ SeedObject function,
+ SeedObject this_object,
+ gsize argument_count,
+ const SeedValue arguments[],
+ SeedException *exception)
{
CHECK_THIS();
cairo_t *cr = seed_object_get_private (this_object);
@@ -1057,11 +1057,11 @@ seed_cairo_new_path (SeedContext ctx,
static SeedValue
seed_cairo_new_sub_path (SeedContext ctx,
- SeedObject function,
- SeedObject this_object,
- gsize argument_count,
- const SeedValue arguments[],
- SeedException *exception)
+ SeedObject function,
+ SeedObject this_object,
+ gsize argument_count,
+ const SeedValue arguments[],
+ SeedException *exception)
{
CHECK_THIS();
cairo_t *cr = seed_object_get_private (this_object);
@@ -1072,11 +1072,11 @@ seed_cairo_new_sub_path (SeedContext ctx,
static SeedValue
seed_cairo_close_path (SeedContext ctx,
- SeedObject function,
- SeedObject this_object,
- gsize argument_count,
- const SeedValue arguments[],
- SeedException *exception)
+ SeedObject function,
+ SeedObject this_object,
+ gsize argument_count,
+ const SeedValue arguments[],
+ SeedException *exception)
{
CHECK_THIS();
cairo_t *cr = seed_object_get_private (this_object);
@@ -1113,11 +1113,11 @@ seed_cairo_arc (SeedContext ctx,
static SeedValue
seed_cairo_arc_negative (SeedContext ctx,
- SeedObject function,
- SeedObject this_object,
- gsize argument_count,
- const SeedValue arguments[],
- SeedException *exception)
+ SeedObject function,
+ SeedObject this_object,
+ gsize argument_count,
+ const SeedValue arguments[],
+ SeedException *exception)
{
gdouble xc, yc, radius, angle1, angle2;
CHECK_THIS();
@@ -1139,11 +1139,11 @@ seed_cairo_arc_negative (SeedContext ctx,
static SeedValue
seed_cairo_curve_to (SeedContext ctx,
- SeedObject function,
- SeedObject this_object,
- gsize argument_count,
- const SeedValue arguments[],
- SeedException *exception)
+ SeedObject function,
+ SeedObject this_object,
+ gsize argument_count,
+ const SeedValue arguments[],
+ SeedException *exception)
{
gdouble x1,y1,x2,y2,x3,y3;
CHECK_THIS();
@@ -1166,11 +1166,11 @@ seed_cairo_curve_to (SeedContext ctx,
static SeedValue
seed_cairo_rel_curve_to (SeedContext ctx,
- SeedObject function,
- SeedObject this_object,
- gsize argument_count,
- const SeedValue arguments[],
- SeedException *exception)
+ SeedObject function,
+ SeedObject this_object,
+ gsize argument_count,
+ const SeedValue arguments[],
+ SeedException *exception)
{
gdouble x1,y1,x2,y2,x3,y3;
CHECK_THIS();
@@ -1193,11 +1193,11 @@ seed_cairo_rel_curve_to (SeedContext ctx,
static SeedValue
seed_cairo_line_to (SeedContext ctx,
- SeedObject function,
- SeedObject this_object,
- gsize argument_count,
- const SeedValue arguments[],
- SeedException *exception)
+ SeedObject function,
+ SeedObject this_object,
+ gsize argument_count,
+ const SeedValue arguments[],
+ SeedException *exception)
{
gdouble x1,y1;
CHECK_THIS();
@@ -1216,11 +1216,11 @@ seed_cairo_line_to (SeedContext ctx,
static SeedValue
seed_cairo_rel_line_to (SeedContext ctx,
- SeedObject function,
- SeedObject this_object,
- gsize argument_count,
- const SeedValue arguments[],
- SeedException *exception)
+ SeedObject function,
+ SeedObject this_object,
+ gsize argument_count,
+ const SeedValue arguments[],
+ SeedException *exception)
{
gdouble x1,y1;
CHECK_THIS();
@@ -1239,11 +1239,11 @@ seed_cairo_rel_line_to (SeedContext ctx,
static SeedValue
seed_cairo_move_to (SeedContext ctx,
- SeedObject function,
- SeedObject this_object,
- gsize argument_count,
- const SeedValue arguments[],
- SeedException *exception)
+ SeedObject function,
+ SeedObject this_object,
+ gsize argument_count,
+ const SeedValue arguments[],
+ SeedException *exception)
{
gdouble x1,y1;
CHECK_THIS();
@@ -1262,11 +1262,11 @@ seed_cairo_move_to (SeedContext ctx,
static SeedValue
seed_cairo_rel_move_to (SeedContext ctx,
- SeedObject function,
- SeedObject this_object,
- gsize argument_count,
- const SeedValue arguments[],
- SeedException *exception)
+ SeedObject function,
+ SeedObject this_object,
+ gsize argument_count,
+ const SeedValue arguments[],
+ SeedException *exception)
{
gdouble x1,y1;
CHECK_THIS();
@@ -1285,11 +1285,11 @@ seed_cairo_rel_move_to (SeedContext ctx,
static SeedValue
seed_cairo_rectangle (SeedContext ctx,
- SeedObject function,
- SeedObject this_object,
- gsize argument_count,
- const SeedValue arguments[],
- SeedException *exception)
+ SeedObject function,
+ SeedObject this_object,
+ gsize argument_count,
+ const SeedValue arguments[],
+ SeedException *exception)
{
gdouble x1,y1, width, height;
CHECK_THIS();
@@ -1359,6 +1359,75 @@ seed_cairo_path_extents (SeedContext ctx,
return seed_make_array (ctx, jsextents, 4, exception);
}
+static SeedValue
+seed_cairo_translate (SeedContext ctx,
+ SeedObject function,
+ SeedObject this_object,
+ gsize argument_count,
+ const SeedValue arguments[],
+ SeedException *exception)
+{
+ gdouble x1,y1;
+ CHECK_THIS();
+ cairo_t *cr = seed_object_get_private (this_object);
+
+ if (argument_count != 2)
+ {
+ EXPECTED_EXCEPTION ("translate", "2 arguments");
+ }
+ x1 = seed_value_to_double (ctx, arguments[0], exception);
+ y1 = seed_value_to_double (ctx, arguments[1], exception);
+
+ cairo_translate (cr, x1, y1);
+ return seed_make_undefined (ctx);
+}
+
+static SeedValue
+seed_cairo_scale (SeedContext ctx,
+ SeedObject function,
+ SeedObject this_object,
+ gsize argument_count,
+ const SeedValue arguments[],
+ SeedException *exception)
+{
+ gdouble x1,y1;
+ CHECK_THIS();
+ cairo_t *cr = seed_object_get_private (this_object);
+
+ if (argument_count != 2)
+ {
+ EXPECTED_EXCEPTION ("scale", "2 arguments");
+ }
+ x1 = seed_value_to_double (ctx, arguments[0], exception);
+ y1 = seed_value_to_double (ctx, arguments[1], exception);
+
+ cairo_scale (cr, x1, y1);
+ return seed_make_undefined (ctx);
+}
+
+static SeedValue
+seed_cairo_rotate (SeedContext ctx,
+ SeedObject function,
+ SeedObject this_object,
+ gsize argument_count,
+ const SeedValue arguments[],
+ SeedException *exception)
+{
+ gdouble angle;
+ CHECK_THIS();
+ cairo_t *cr = seed_object_get_private (this_object);
+
+ if (argument_count != 2)
+ {
+ EXPECTED_EXCEPTION ("rotate", "1 arguments");
+ }
+ angle = seed_value_to_double (ctx, arguments[0], exception);
+
+
+ cairo_rotate (cr, angle);
+ return seed_make_undefined (ctx);
+}
+
seed_static_function cairo_funcs[] = {
{"save", seed_cairo_save, 0},
@@ -1429,6 +1498,9 @@ seed_static_function cairo_funcs[] = {
{"rel_line_to", seed_cairo_rel_line_to, 0},
{"rel_move_to", seed_cairo_rel_move_to, 0},
{"path_extents", seed_cairo_path_extents, 0},
+ {"translate", seed_cairo_translate, 0},
+ {"scale", seed_cairo_scale, 0},
+ {"rotate", seed_cairo_rotate, 0},
{0, 0, 0}
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]