summaryrefslogtreecommitdiff
path: root/src/lib/edje
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2016-12-20 15:59:46 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-12-20 16:39:30 -0800
commitb3ce8381e2c36732802c4f73f5f98ce8f71b554d (patch)
treef58496bbc621d586114448fb6acda2b9b05246d6 /src/lib/edje
parentdc022d602d3e7d396137bb6bfb290e70880d89dd (diff)
edje: fix float comparison warning in edje calc.
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_calc.c130
1 files changed, 70 insertions, 60 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index dc99493929..277321a246 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -241,7 +241,7 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T
241 break; 241 break;
242 } 242 }
243#endif 243#endif
244 if (npos == ep->description_pos) return; 244 if (EQ(npos, ep->description_pos)) return;
245 245
246 ep->description_pos = npos; 246 ep->description_pos = npos;
247 247
@@ -468,7 +468,7 @@ _edje_part_description_find(Edje *ed, Edje_Real_Part *rp, const char *state_name
468 sizeof (Edje_Part_Description_Common *)); 468 sizeof (Edje_Part_Description_Common *));
469 } 469 }
470 470
471 if (!strcmp(state_name, "default") && state_val == 0.0) 471 if (!strcmp(state_name, "default") && EQ(state_val, ZERO))
472 return _edje_get_description_by_orientation(ed, 472 return _edje_get_description_by_orientation(ed,
473 ep->default_desc, &ep->default_desc_rtl, ep->type); 473 ep->default_desc, &ep->default_desc_rtl, ep->type);
474 474
@@ -495,7 +495,7 @@ _edje_part_description_find(Edje *ed, Edje_Real_Part *rp, const char *state_name
495 { 495 {
496 if (!approximate) 496 if (!approximate)
497 { 497 {
498 if (d->state.value == state_val) 498 if (EQ(d->state.value, state_val))
499 return _edje_get_description_by_orientation(ed, d, 499 return _edje_get_description_by_orientation(ed, d,
500 &ep->other.desc_rtl[i], ep->type); 500 &ep->other.desc_rtl[i], ep->type);
501 else 501 else
@@ -1042,12 +1042,12 @@ _edje_part_dragable_calc(Edje *ed EINA_UNUSED, Edje_Real_Part *ep, FLOAT_T *x, F
1042 1042
1043 dx = FROM_INT(ep->x - ep->drag->confine_to->x); 1043 dx = FROM_INT(ep->x - ep->drag->confine_to->x);
1044 dw = FROM_INT(ep->drag->confine_to->w - ep->w); 1044 dw = FROM_INT(ep->drag->confine_to->w - ep->w);
1045 if (dw != ZERO) dx = DIV(dx, dw); 1045 if (NEQ(dw, ZERO)) dx = DIV(dx, dw);
1046 else dx = ZERO; 1046 else dx = ZERO;
1047 1047
1048 dy = FROM_INT(ep->y - ep->drag->confine_to->y); 1048 dy = FROM_INT(ep->y - ep->drag->confine_to->y);
1049 dh = FROM_INT(ep->drag->confine_to->h - ep->h); 1049 dh = FROM_INT(ep->drag->confine_to->h - ep->h);
1050 if (dh != ZERO) dy = DIV(dy, dh); 1050 if (NEQ(dh, ZERO)) dy = DIV(dy, dh);
1051 else dy = ZERO; 1051 else dy = ZERO;
1052 1052
1053 if (x) *x = tx ? ep->drag->x : dx; 1053 if (x) *x = tx ? ep->drag->x : dx;
@@ -1078,7 +1078,7 @@ _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y)
1078 * value we would set foo to, because it would depend on the 1078 * value we would set foo to, because it would depend on the
1079 * size of the dragable... 1079 * size of the dragable...
1080 */ 1080 */
1081 if (ep->drag->x != x || ep->drag->tmp.x) 1081 if (NEQ(ep->drag->x, x) || ep->drag->tmp.x)
1082 { 1082 {
1083 ep->drag->x = x; 1083 ep->drag->x = x;
1084 ep->drag->tmp.x = 0; 1084 ep->drag->tmp.x = 0;
@@ -1087,7 +1087,7 @@ _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y)
1087 ed->recalc_call = EINA_TRUE; 1087 ed->recalc_call = EINA_TRUE;
1088 } 1088 }
1089 1089
1090 if (ep->drag->y != y || ep->drag->tmp.y) 1090 if (NEQ(ep->drag->y, y) || ep->drag->tmp.y)
1091 { 1091 {
1092 ep->drag->y = y; 1092 ep->drag->y = y;
1093 ep->drag->tmp.y = 0; 1093 ep->drag->tmp.y = 0;
@@ -1566,7 +1566,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
1566 double tmp_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, s * 0.95); 1566 double tmp_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, s * 0.95);
1567 1567
1568 /* Break if we are not making any progress. */ 1568 /* Break if we are not making any progress. */
1569 if (tmp_s == s) 1569 if (EQ(tmp_s, s))
1570 break; 1570 break;
1571 s = tmp_s; 1571 s = tmp_s;
1572 1572
@@ -1657,7 +1657,7 @@ _edje_textblock_recalc_apply(Edje *ed, Edje_Real_Part *ep,
1657 /* FIXME: this is just an hack. */ 1657 /* FIXME: this is just an hack. */
1658 FLOAT_T sc; 1658 FLOAT_T sc;
1659 sc = DIV(ed->scale, ed->file->base_scale); 1659 sc = DIV(ed->scale, ed->file->base_scale);
1660 if (sc == ZERO) sc = DIV(_edje_scale, ed->file->base_scale); 1660 if (EQ(sc, ZERO)) sc = DIV(_edje_scale, ed->file->base_scale);
1661 if (chosen_desc->text.fit_x || chosen_desc->text.fit_y) 1661 if (chosen_desc->text.fit_x || chosen_desc->text.fit_y)
1662 { 1662 {
1663 _edje_part_recalc_single_textblock(sc, ed, ep, chosen_desc, params, 1663 _edje_part_recalc_single_textblock(sc, ed, ep, chosen_desc, params,
@@ -1944,8 +1944,8 @@ _edje_part_recalc_single_min(Edje_Part_Description_Common *desc,
1944 FLOAT_T w; 1944 FLOAT_T w;
1945 FLOAT_T h; 1945 FLOAT_T h;
1946 1946
1947 w = params->eval.w ? params->eval.w : FROM_INT(99999); 1947 w = NEQ(params->eval.w, ZERO) ? params->eval.w : FROM_INT(99999);
1948 h = params->eval.h ? params->eval.h : FROM_INT(99999); 1948 h = NEQ(params->eval.h, ZERO) ? params->eval.h : FROM_INT(99999);
1949 1949
1950 switch (aspect) 1950 switch (aspect)
1951 { 1951 {
@@ -2014,8 +2014,8 @@ _edje_part_recalc_single_max(Edje_Part_Description_Common *desc,
2014 FLOAT_T w; 2014 FLOAT_T w;
2015 FLOAT_T h; 2015 FLOAT_T h;
2016 2016
2017 w = params->eval.w ? params->eval.w : FROM_INT(99999); 2017 w = NEQ(params->eval.w, 0) ? params->eval.w : FROM_INT(99999);
2018 h = params->eval.h ? params->eval.h : FROM_INT(99999); 2018 h = NEQ(params->eval.h, 0) ? params->eval.h : FROM_INT(99999);
2019 2019
2020 switch (aspect) 2020 switch (aspect)
2021 { 2021 {
@@ -2274,7 +2274,7 @@ _edje_part_recalc_single_min_max(FLOAT_T sc,
2274 if (desc->minmul.have) 2274 if (desc->minmul.have)
2275 { 2275 {
2276 FLOAT_T mmw = desc->minmul.w; 2276 FLOAT_T mmw = desc->minmul.w;
2277 if (mmw != FROM_INT(1)) *minw = TO_INT(SCALE(mmw, *minw)); 2277 if (NEQ(mmw, FROM_INT(1))) *minw = TO_INT(SCALE(mmw, *minw));
2278 } 2278 }
2279 } 2279 }
2280 2280
@@ -2319,7 +2319,7 @@ _edje_part_recalc_single_min_max(FLOAT_T sc,
2319 } 2319 }
2320 } 2320 }
2321 if ((ed->calc_only) && (desc->minmul.have) && 2321 if ((ed->calc_only) && (desc->minmul.have) &&
2322 (desc->minmul.w != FROM_INT(1))) *maxw = *minw; 2322 (NEQ(desc->minmul.w, FROM_INT(1)))) *maxw = *minw;
2323 if (*maxw >= 0) 2323 if (*maxw >= 0)
2324 { 2324 {
2325 if (*maxw < *minw) *maxw = *minw; 2325 if (*maxw < *minw) *maxw = *minw;
@@ -2339,7 +2339,7 @@ _edje_part_recalc_single_min_max(FLOAT_T sc,
2339 if (desc->minmul.have) 2339 if (desc->minmul.have)
2340 { 2340 {
2341 FLOAT_T mmh = desc->minmul.h; 2341 FLOAT_T mmh = desc->minmul.h;
2342 if (mmh != FROM_INT(1)) *minh = TO_INT(SCALE(mmh, *minh)); 2342 if (NEQ(mmh, FROM_INT(1))) *minh = TO_INT(SCALE(mmh, *minh));
2343 } 2343 }
2344 } 2344 }
2345 2345
@@ -2384,7 +2384,7 @@ _edje_part_recalc_single_min_max(FLOAT_T sc,
2384 } 2384 }
2385 } 2385 }
2386 if ((ed->calc_only) && (desc->minmul.have) && 2386 if ((ed->calc_only) && (desc->minmul.have) &&
2387 (desc->minmul.h != FROM_INT(1))) *maxh = *minh; 2387 (NEQ(desc->minmul.h, FROM_INT(1)))) *maxh = *minh;
2388 if (*maxh >= 0) 2388 if (*maxh >= 0)
2389 { 2389 {
2390 if (*maxh < *minh) *maxh = *minh; 2390 if (*maxh < *minh) *maxh = *minh;
@@ -2441,7 +2441,7 @@ _edje_part_recalc_single_map(Edje *ed,
2441 light_desc2 = light->param2 ? light->param2->description : NULL; 2441 light_desc2 = light->param2 ? light->param2->description : NULL;
2442 2442
2443 /* take into account CURRENT state also */ 2443 /* take into account CURRENT state also */
2444 if (pos != ZERO && light_desc2) 2444 if (NEQ(pos, ZERO) && light_desc2)
2445 { 2445 {
2446 params_write->light.z = light->param1.description->persp.zplane + 2446 params_write->light.z = light->param1.description->persp.zplane +
2447 TO_INT(SCALE(pos, light_desc2->persp.zplane - light->param1.description->persp.zplane)); 2447 TO_INT(SCALE(pos, light_desc2->persp.zplane - light->param1.description->persp.zplane));
@@ -2479,7 +2479,7 @@ _edje_part_recalc_single_map(Edje *ed,
2479 2479
2480 pos = persp->description_pos; 2480 pos = persp->description_pos;
2481 2481
2482 if (pos != 0 && persp->param2) 2482 if (NEQ(pos, ZERO) && persp->param2)
2483 { 2483 {
2484 params_write->persp.z = persp->param1.description->persp.zplane + 2484 params_write->persp.z = persp->param1.description->persp.zplane +
2485 TO_INT(SCALE(pos, persp->param2->description->persp.zplane - 2485 TO_INT(SCALE(pos, persp->param2->description->persp.zplane -
@@ -2813,7 +2813,7 @@ _edje_part_recalc_single(Edje *ed,
2813 FLOAT_T sc; 2813 FLOAT_T sc;
2814 2814
2815 sc = DIV(ed->scale, ed->file->base_scale); 2815 sc = DIV(ed->scale, ed->file->base_scale);
2816 if (sc == ZERO) sc = DIV(_edje_scale, ed->file->base_scale); 2816 if (EQ(sc, ZERO)) sc = DIV(_edje_scale, ed->file->base_scale);
2817 _edje_part_recalc_single_min_max(sc, ed, ep, desc, &minw, &minh, &maxw, &maxh); 2817 _edje_part_recalc_single_min_max(sc, ed, ep, desc, &minw, &minh, &maxw, &maxh);
2818 if (minw < mmw) minw = mmw; 2818 if (minw < mmw) minw = mmw;
2819 if (minh < mmh) minh = mmh; 2819 if (minh < mmh) minh = mmh;
@@ -2829,7 +2829,7 @@ _edje_part_recalc_single(Edje *ed,
2829 2829
2830 /* check whether this part has fixed value or not*/ 2830 /* check whether this part has fixed value or not*/
2831 if ((rel1_to_x == rel2_to_x) && 2831 if ((rel1_to_x == rel2_to_x) &&
2832 (desc->rel1.relative_x == desc->rel2.relative_x) && 2832 (EQ(desc->rel1.relative_x, desc->rel2.relative_x)) &&
2833 (!chosen_desc->fixed.w)) 2833 (!chosen_desc->fixed.w))
2834 { 2834 {
2835 chosen_desc->fixed.w = 1; 2835 chosen_desc->fixed.w = 1;
@@ -2837,7 +2837,7 @@ _edje_part_recalc_single(Edje *ed,
2837 } 2837 }
2838 2838
2839 if ((rel1_to_y == rel2_to_y) && 2839 if ((rel1_to_y == rel2_to_y) &&
2840 (desc->rel1.relative_y == desc->rel2.relative_y) && 2840 (EQ(desc->rel1.relative_y, desc->rel2.relative_y)) &&
2841 (!chosen_desc->fixed.h)) 2841 (!chosen_desc->fixed.h))
2842 { 2842 {
2843 chosen_desc->fixed.h = 1; 2843 chosen_desc->fixed.h = 1;
@@ -2923,7 +2923,8 @@ _edje_part_recalc_single(Edje *ed,
2923 SET_BORDER_DEFINED(params->type.common->spec.image.t, set->entry->border.t); 2923 SET_BORDER_DEFINED(params->type.common->spec.image.t, set->entry->border.t);
2924 SET_BORDER_DEFINED(params->type.common->spec.image.b, set->entry->border.b); 2924 SET_BORDER_DEFINED(params->type.common->spec.image.b, set->entry->border.b);
2925 2925
2926 SET_BORDER_DEFINED(params->type.common->spec.image.border_scale_by, set->entry->border.scale_by); 2926 params->type.common->spec.image.border_scale_by = NEQ(set->entry->border.scale_by, ZERO) ?
2927 set->entry->border.scale_by : params->type.common->spec.image.border_scale_by;
2927 } 2928 }
2928 2929
2929 break; 2930 break;
@@ -3259,7 +3260,7 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
3259 Edje_Real_Part_Set *set; 3260 Edje_Real_Part_Set *set;
3260 3261
3261 sc = DIV(ed->scale, ed->file->base_scale); 3262 sc = DIV(ed->scale, ed->file->base_scale);
3262 if (sc == ZERO) sc = DIV(_edje_scale, ed->file->base_scale); 3263 if (EQ(sc, ZERO)) sc = DIV(_edje_scale, ed->file->base_scale);
3263 3264
3264 _edje_real_part_image_set(ed, ep, &set, pos); 3265 _edje_real_part_image_set(ed, ep, &set, pos);
3265 3266
@@ -3281,7 +3282,8 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
3281 SET_BORDER_DEFINED(p3->type.common->spec.image.t, set->entry->border.t); 3282 SET_BORDER_DEFINED(p3->type.common->spec.image.t, set->entry->border.t);
3282 SET_BORDER_DEFINED(p3->type.common->spec.image.b, set->entry->border.b); 3283 SET_BORDER_DEFINED(p3->type.common->spec.image.b, set->entry->border.b);
3283 3284
3284 SET_BORDER_DEFINED(p3->type.common->spec.image.border_scale_by, set->entry->border.scale_by); 3285 p3->type.common->spec.image.border_scale_by = NEQ(set->entry->border.scale_by, ZERO) ?
3286 set->entry->border.scale_by : p3->type.common->spec.image.border_scale_by;
3285 } 3287 }
3286 3288
3287 efl_gfx_fill_set(ep->object, p3->type.common->fill.x, p3->type.common->fill.y, p3->type.common->fill.w, p3->type.common->fill.h); 3289 efl_gfx_fill_set(ep->object, p3->type.common->fill.x, p3->type.common->fill.y, p3->type.common->fill.w, p3->type.common->fill.h);
@@ -3455,7 +3457,7 @@ _edje_physics_body_props_update(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *
3455 EPH_CALL(ephysics_body_material_set)(ep->body, pf->ext->physics->material); 3457 EPH_CALL(ephysics_body_material_set)(ep->body, pf->ext->physics->material);
3456 if (!pf->ext->physics->material) 3458 if (!pf->ext->physics->material)
3457 { 3459 {
3458 if (pf->ext->physics->density) 3460 if (NEQ(pf->ext->physics->density, ZERO))
3459 EPH_CALL(ephysics_body_density_set)(ep->body, pf->ext->physics->density); 3461 EPH_CALL(ephysics_body_density_set)(ep->body, pf->ext->physics->density);
3460 else 3462 else
3461 EPH_CALL(ephysics_body_mass_set)(ep->body, pf->ext->physics->mass); 3463 EPH_CALL(ephysics_body_mass_set)(ep->body, pf->ext->physics->mass);
@@ -3596,14 +3598,14 @@ _edje_physics_body_add(Edje *ed, Edje_Real_Part *rp, EPhysics_World *world)
3596 3598
3597#endif 3599#endif
3598 3600
3599#define FINTP(_x1, _x2, _p) \ 3601#define FINTP(_x1, _x2, _p) \
3600 (((_x1) == (_x2)) \ 3602 ((((int)_x1) == ((int)_x2)) \
3601 ? FROM_INT((_x1)) \ 3603 ? FROM_INT((_x1)) \
3602 : ADD(FROM_INT(_x1), \ 3604 : ADD(FROM_INT(_x1), \
3603 SCALE((_p), (_x2) - (_x1)))) 3605 SCALE((_p), (_x2) - (_x1))))
3604 3606
3605#define FFP(_x1, _x2, _p) \ 3607#define FFP(_x1, _x2, _p) \
3606 (((_x1) == (_x2)) \ 3608 (EQ((_x1), (_x2)) \
3607 ? (_x1) \ 3609 ? (_x1) \
3608 : ADD(_x1, MUL(_p, SUB(_x2, _x1)))); 3610 : ADD(_x1, MUL(_p, SUB(_x2, _x1))));
3609 3611
@@ -4395,14 +4397,14 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
4395 4397
4396 /* visible is special */ 4398 /* visible is special */
4397 if ((p1->visible) && (!p2->visible)) 4399 if ((p1->visible) && (!p2->visible))
4398 p3->visible = (pos != FROM_INT(1)); 4400 p3->visible = NEQ(pos, FROM_INT(1));
4399 else if ((!p1->visible) && (p2->visible)) 4401 else if ((!p1->visible) && (p2->visible))
4400 p3->visible = (pos != ZERO); 4402 p3->visible = NEQ(pos, ZERO);
4401 else 4403 else
4402 p3->visible = p1->visible; 4404 p3->visible = p1->visible;
4403 4405
4404 /* clip_to will behave a bit like visible */ 4406 /* clip_to will behave a bit like visible */
4405 if (pos == ZERO) 4407 if (EQ(pos, ZERO))
4406 { 4408 {
4407 if ((p1->ext) && (p1->ext->clip_to)) 4409 if ((p1->ext) && (p1->ext->clip_to))
4408 { 4410 {
@@ -4410,7 +4412,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
4410 p3->ext->clip_to = p1->ext->clip_to; 4412 p3->ext->clip_to = p1->ext->clip_to;
4411 } 4413 }
4412 } 4414 }
4413 else if (pos == FROM_INT(1)) 4415 else if (EQ(pos, FROM_INT(1)))
4414 { 4416 {
4415 if ((p2->ext) && (p2->ext->clip_to)) 4417 if ((p2->ext) && (p2->ext->clip_to))
4416 { 4418 {
@@ -4446,12 +4448,12 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
4446 /* and no_render as well */ 4448 /* and no_render as well */
4447 if ((p1->no_render) && (!p2->no_render)) 4449 if ((p1->no_render) && (!p2->no_render))
4448 { 4450 {
4449 p3->no_render = (pos == FROM_INT(1)); 4451 p3->no_render = EQ(pos, FROM_INT(1));
4450 p3->no_render_apply = 1; 4452 p3->no_render_apply = 1;
4451 } 4453 }
4452 else if ((!p1->no_render) && (p2->no_render)) 4454 else if ((!p1->no_render) && (p2->no_render))
4453 { 4455 {
4454 p3->no_render = (pos == ZERO); 4456 p3->no_render = EQ(pos, ZERO);
4455 p3->no_render_apply = 1; 4457 p3->no_render_apply = 1;
4456 } 4458 }
4457 else if (p1->no_render != ep->part->no_render) 4459 else if (p1->no_render != ep->part->no_render)
@@ -4507,27 +4509,35 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
4507 _edje_calc_params_need_ext(p2); 4509 _edje_calc_params_need_ext(p2);
4508 EINA_COW_CALC_PHYSICS_BEGIN(p3, p3_write) 4510 EINA_COW_CALC_PHYSICS_BEGIN(p3, p3_write)
4509 { 4511 {
4510 p3_write->mass = TO_DOUBLE(FINTP(p1->ext->physics->mass, p2->ext->physics->mass, 4512 p3_write->mass = FFP(p1->ext->physics->mass,
4511 pos)); 4513 p2->ext->physics->mass,
4512 p3_write->restitution = TO_DOUBLE(FINTP(p1->ext->physics->restitution, 4514 pos);
4513 p2->ext->physics->restitution, 4515 p3_write->restitution = FFP(p1->ext->physics->restitution,
4514 pos)); 4516 p2->ext->physics->restitution,
4515 p3_write->friction = TO_DOUBLE(FINTP(p1->ext->physics->friction, 4517 pos);
4516 p2->ext->physics->friction, pos)); 4518 p3_write->friction = FFP(p1->ext->physics->friction,
4517 p3_write->density = TO_DOUBLE(FINTP(p1->ext->physics->density, 4519 p2->ext->physics->friction,
4518 p2->ext->physics->density, pos)); 4520 pos);
4519 p3_write->hardness = TO_DOUBLE(FINTP(p1->ext->physics->hardness, 4521 p3_write->density = FFP(p1->ext->physics->density,
4520 p2->ext->physics->hardness, pos)); 4522 p2->ext->physics->density,
4521 4523 pos);
4522 p3_write->damping.linear = TO_DOUBLE(FINTP(p1->ext->physics->damping.linear, 4524 p3_write->hardness = FFP(p1->ext->physics->hardness,
4523 p2->ext->physics->damping.linear, pos)); 4525 p2->ext->physics->hardness,
4524 p3_write->damping.angular = TO_DOUBLE(FINTP(p1->ext->physics->damping.angular, 4526 pos);
4525 p2->ext->physics->damping.angular, pos)); 4527
4526 4528 p3_write->damping.linear = FFP(p1->ext->physics->damping.linear,
4527 p3_write->sleep.linear = TO_DOUBLE(FINTP(p1->ext->physics->sleep.linear, 4529 p2->ext->physics->damping.linear,
4528 p2->ext->physics->sleep.linear, pos)); 4530 pos);
4529 p3_write->sleep.angular = TO_DOUBLE(FINTP(p1->ext->physics->sleep.angular, 4531 p3_write->damping.angular = FFP(p1->ext->physics->damping.angular,
4530 p2->ext->physics->sleep.angular, pos)); 4532 p2->ext->physics->damping.angular,
4533 pos);
4534
4535 p3_write->sleep.linear = FFP(p1->ext->physics->sleep.linear,
4536 p2->ext->physics->sleep.linear,
4537 pos);
4538 p3_write->sleep.angular = FFP(p1->ext->physics->sleep.angular,
4539 p2->ext->physics->sleep.angular,
4540 pos);
4531 4541
4532 p3_write->z = INTP(p1->ext->physics->z, p2->ext->physics->z, pos); 4542 p3_write->z = INTP(p1->ext->physics->z, p2->ext->physics->z, pos);
4533 p3_write->depth = INTP(p1->ext->physics->depth, p2->ext->physics->depth, pos); 4543 p3_write->depth = INTP(p1->ext->physics->depth, p2->ext->physics->depth, pos);
@@ -4632,9 +4642,9 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
4632 4642
4633 /* mapped is a special case like visible */ 4643 /* mapped is a special case like visible */
4634 if ((p1->mapped) && (!p2->mapped)) 4644 if ((p1->mapped) && (!p2->mapped))
4635 p3->mapped = (pos != FROM_INT(1)); 4645 p3->mapped = NEQ(pos, FROM_INT(1));
4636 else if ((!p1->mapped) && (p2->mapped)) 4646 else if ((!p1->mapped) && (p2->mapped))
4637 p3->mapped = (pos != ZERO); 4647 p3->mapped = NEQ(pos, ZERO);
4638 else 4648 else
4639 p3->mapped = p1->mapped; 4649 p3->mapped = p1->mapped;
4640 4650