Yay zmike is back!!! Daniel Juyung Seo (SeoZ)
On Fri, May 4, 2012 at 4:52 PM, Enlightenment SVN <no-re...@enlightenment.org> wrote: > Log: > pan effect with artifacts > > Author: discomfitor > Date: 2012-05-04 00:52:42 -0700 (Fri, 04 May 2012) > New Revision: 70755 > Trac: http://trac.enlightenment.org/e/changeset/70755 > > Added: > trunk/PROTO/efx/data/ss.png trunk/PROTO/efx/src/bin/test_pan.c > trunk/PROTO/efx/src/lib/efx_pan.c > Modified: > trunk/PROTO/efx/data/Makefile.am trunk/PROTO/efx/src/bin/Makefile.am > trunk/PROTO/efx/src/lib/Efx.h trunk/PROTO/efx/src/lib/Makefile.am > trunk/PROTO/efx/src/lib/efx.c trunk/PROTO/efx/src/lib/efx_private.h > trunk/PROTO/efx/src/lib/efx_util.c > > Modified: trunk/PROTO/efx/data/Makefile.am > =================================================================== > --- trunk/PROTO/efx/data/Makefile.am 2012-05-04 07:52:36 UTC (rev 70754) > +++ trunk/PROTO/efx/data/Makefile.am 2012-05-04 07:52:42 UTC (rev 70755) > @@ -1,4 +1,4 @@ > MAINTAINERCLEANFILES = Makefile.in > > imagedir = $(datadir)/efx > -dist_image_DATA = mur.jpg > +dist_image_DATA = mur.jpg ss.png > > Modified: trunk/PROTO/efx/src/bin/Makefile.am > =================================================================== > --- trunk/PROTO/efx/src/bin/Makefile.am 2012-05-04 07:52:36 UTC (rev 70754) > +++ trunk/PROTO/efx/src/bin/Makefile.am 2012-05-04 07:52:42 UTC (rev 70755) > @@ -20,6 +20,7 @@ > test_follow \ > test_move \ > test_move_circle \ > +test_pan \ > test_path \ > test_bumpmap > > @@ -41,6 +42,7 @@ > test_move_SOURCES = test_move.c > test_move_circle_SOURCES = test_move_circle.c > test_path_SOURCES = test_path.c > +test_pan_SOURCES = test_pan.c > test_bumpmap_SOURCES = test_bumpmap.c > > endif > > Modified: trunk/PROTO/efx/src/lib/Efx.h > =================================================================== > --- trunk/PROTO/efx/src/lib/Efx.h 2012-05-04 07:52:36 UTC (rev 70754) > +++ trunk/PROTO/efx/src/lib/Efx.h 2012-05-04 07:52:42 UTC (rev 70755) > @@ -54,7 +54,8 @@ > Evas_Point *rotate_center; /**< The current rotation center for the object > */ > double zoom; /**< The current zoom amount of an object */ > Evas_Point *zoom_center; /**< The current zoom center for the object */ > - Evas_Point *move_center; /**< The current move center for the object */ > + Evas_Point *move_center; /**< The current move vertex for the object */ > + Evas_Point *pan_center; /**< The current pan vertex for the object */ > }; > > /** > @@ -234,6 +235,8 @@ > > EAPI Eina_Bool efx_bumpmap(Evas_Object *obj, Evas_Coord x, Evas_Coord y); > > +EAPI Eina_Bool efx_pan_init(Evas_Object *obj); > +EAPI Eina_Bool efx_pan(Evas_Object *obj, Efx_Effect_Speed speed, Evas_Point > *distance, double total_time, Efx_End_Cb cb, const void *data); > #ifdef __cplusplus > } > #endif > > Modified: trunk/PROTO/efx/src/lib/Makefile.am > =================================================================== > --- trunk/PROTO/efx/src/lib/Makefile.am 2012-05-04 07:52:36 UTC (rev 70754) > +++ trunk/PROTO/efx/src/lib/Makefile.am 2012-05-04 07:52:42 UTC (rev 70755) > @@ -8,13 +8,14 @@ > lib_LTLIBRARIES = libefx.la > libefx_la_SOURCES = \ > efx.c \ > +efx_bumpmapping.c \ > efx_helpers.c \ > efx_move.c \ > +efx_pan.c \ > efx_rotate.c \ > efx_spin.c \ > efx_util.c \ > -efx_zoom.c \ > -efx_bumpmapping.c > +efx_zoom.c > > libefx_la_LIBADD = @EFX_DEPS_LIBS@ -lm > libefx_la_LDFLAGS = -no-undefined > > Modified: trunk/PROTO/efx/src/lib/efx.c > =================================================================== > --- trunk/PROTO/efx/src/lib/efx.c 2012-05-04 07:52:36 UTC (rev 70754) > +++ trunk/PROTO/efx/src/lib/efx.c 2012-05-04 07:52:42 UTC (rev 70755) > @@ -64,7 +64,8 @@ > EINA_SAFETY_ON_NULL_RETURN_VAL(follower, EINA_FALSE); > > e = evas_object_data_get(obj, "efx-data"); > - if (!e) return EINA_FALSE; > + if (!e) e = efx_new(obj); > + EINA_SAFETY_ON_NULL_RETURN_VAL(e, EINA_FALSE); > while (e->owner) e = e->owner; > > ef = evas_object_data_get(follower, "efx-data"); > > Modified: trunk/PROTO/efx/src/lib/efx_private.h > =================================================================== > --- trunk/PROTO/efx/src/lib/efx_private.h 2012-05-04 07:52:36 UTC (rev > 70754) > +++ trunk/PROTO/efx/src/lib/efx_private.h 2012-05-04 07:52:42 UTC (rev > 70755) > @@ -34,6 +34,7 @@ > void *zoom_data; > void *move_data; > void *bumpmap_data; > + void *pan_data; > Efx_Map_Data map_data; > Eina_List *followers; > }; > @@ -63,7 +64,9 @@ > { > Evas_Coord x, y, w, h; > evas_object_geometry_get(obj, &x, &y, &w, &h); > - DBG("%p: x=%d,y=%d,w=%d,h=%d", obj, x, y, w, h); > + DBG("%s %p: x=%d,y=%d,w=%d,h=%d", evas_object_visible_get(obj) ? "vis" : > "hid", obj, x, y, w, h); > } > > +#define HIT DBG("HIT") > + > #endif > > Modified: trunk/PROTO/efx/src/lib/efx_util.c > =================================================================== > --- trunk/PROTO/efx/src/lib/efx_util.c 2012-05-04 07:52:36 UTC (rev 70754) > +++ trunk/PROTO/efx/src/lib/efx_util.c 2012-05-04 07:52:42 UTC (rev 70755) > @@ -1,20 +1,5 @@ > #include "efx_private.h" > > -/* glibc acos+asin are broken on some platforms, > - * found these on the wine mailing list > - */ > -static double > -_acos(double x) > -{ > - return atan2f(sqrtf((1 - x) * (1 + x)), x); > -} > - > -static double > -_asin(double x) > -{ > - return atan2f(x, sqrtf((1 - x) * (1 + x))); > -} > - > EAPI void > efx_realize(Evas_Object *obj) > { > > > ------------------------------------------------------------------------------ > Live Security Virtual Conference > Exclusive live event will cover all the ways today's security and > threat landscape has changed and how IT managers can respond. Discussions > will include endpoint security, mobile security and the latest in malware > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
