# HG changeset patch # User Thinker K.F. Li # Date 1302676705 -28800 # Node ID 5d89aa30310cfc7ec5f1d90b19545f8c258e1afe # Parent 6644ef3d75ebf92f32670bcadc24789e10ce9445 Revert changeset #2bcacd29d95f to remove unncessary functions diff -r 6644ef3d75eb -r 5d89aa30310c nodejs/coord.cc --- a/nodejs/coord.cc Wed Apr 13 14:36:32 2011 +0800 +++ b/nodejs/coord.cc Wed Apr 13 14:38:25 2011 +0800 @@ -341,74 +341,6 @@ return Number::New(opacity); } -#define cc(i) (coord_get_matrix(coord)[i]) -static void -xnjsmb_coord_set_y(Handle self, coord_t *coord, Handle value, const char **str) -{ - Handle js_rt; - redraw_man_t *rdman; - co_aix y,ty; - co_aix xx,yy; - - js_rt = GET(self, "mbrt")->ToObject(); - ASSERT(js_rt != NULL); - rdman = xnjsmb_rt_rdman(js_rt); - - - ty = value->NumberValue(); - xx = GET(self,"_x")->ToNumber()->NumberValue(); - yy = GET(self,"_y")->ToNumber()->NumberValue(); - y = ty-cc(3)*xx-cc(4)*yy; - coord_get_matrix(coord)[5] = y; - rdman_coord_changed(rdman, coord); -} - -static Handle -xnjsmb_coord_get_y(Handle self, coord_t *coord, - const char **err) { - co_aix y; - co_aix xx,yy; - - xx = GET(self,"_x")->ToNumber()->NumberValue(); - yy = GET(self,"_y")->ToNumber()->NumberValue(); - - y = cc(3)*xx+cc(4)*yy+cc(5); - return Number::New(y); -} -static void -xnjsmb_coord_set_x(Handle self, coord_t *coord, Handle value, const char **str) -{ - Handle js_rt; - redraw_man_t *rdman; - co_aix x,tx; - co_aix xx,yy; - - xx = GET(self,"_x")->ToNumber()->NumberValue(); - yy = GET(self,"_y")->ToNumber()->NumberValue(); - js_rt = GET(self, "mbrt")->ToObject(); - ASSERT(js_rt != NULL); - rdman = xnjsmb_rt_rdman(js_rt); - - tx = value->NumberValue(); - x = tx-cc(0)*xx-cc(1)*yy; - coord_get_matrix(coord)[2] = x; - rdman_coord_changed(rdman, coord); -} - -static Handle -xnjsmb_coord_get_x(Handle self, coord_t *coord, - const char **err) { - co_aix x; - co_aix xx,yy; - - xx = GET(self,"_x")->ToNumber()->NumberValue(); - yy = GET(self,"_y")->ToNumber()->NumberValue(); - - x = cc(0)*xx+cc(1)*yy+cc(2); - return Number::New(x); -} -#undef m - #include "coord-inc.h" /*! \brief This function used by \ref xnjsmb_mb_rt to wrap coord object. diff -r 6644ef3d75eb -r 5d89aa30310c nodejs/coord.m4 --- a/nodejs/coord.m4 Wed Apr 13 14:36:32 2011 +0800 +++ b/nodejs/coord.m4 Wed Apr 13 14:38:25 2011 +0800 @@ -1,10 +1,6 @@ define([PROJ_PREFIX], [xnjsmb_auto_])dnl STRUCT([coord], [coord_t], - [ - ACCESSOR([opacity], [xnjsmb_coord_get_opacity],[xnjsmb_coord_set_opacity]), - ACCESSOR([x], [xnjsmb_coord_get_x],[xnjsmb_coord_set_x]), - ACCESSOR([y], [xnjsmb_coord_get_y],[xnjsmb_coord_set_y]), - ], + [ACCESSOR([opacity], [xnjsmb_coord_get_opacity],[xnjsmb_coord_set_opacity])], [METHOD([add_shape], [xnjsmb_coord_add_shape], (SELF, OBJ([shape], [shape], [shape_t]), ERR), 1, []), METHOD([remove], [xnjsmb_coord_remove], (SELF), 0, []),