diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c index 0a57e285fa..a4482726c3 100644 --- a/src/benchmarks/eo/class_simple.c +++ b/src/benchmarks/eo/class_simple.c @@ -15,7 +15,7 @@ _other_call(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, Eo *other, int ti { if (times > 0) { - eo_do(other, simple_other_call(obj, times-1)); + simple_other_call(other, obj, times-1); } } diff --git a/src/benchmarks/eo/eo_bench_callbacks.c b/src/benchmarks/eo/eo_bench_callbacks.c index 5f675598f3..ab779f8417 100644 --- a/src/benchmarks/eo/eo_bench_callbacks.c +++ b/src/benchmarks/eo/eo_bench_callbacks.c @@ -21,7 +21,7 @@ bench_eo_callbacks_add(int request) for (i = 0 ; i < request ; i++) { - eo_do(obj, eo_event_callback_priority_add(SIMPLE_FOO, (short) i, _cb, NULL)); + eo_event_callback_priority_add(obj, SIMPLE_FOO, (short) i, _cb, NULL); } eo_unref(obj); @@ -57,7 +57,7 @@ bench_eo_callbacks_call(int request) for (j = 0 ; j < i ; j++) { - eo_do(obj[i], eo_event_callback_priority_add(SIMPLE_FOO, (short) j, _cb, NULL)); + eo_event_callback_priority_add(obj[i], SIMPLE_FOO, (short) j, _cb, NULL); } } @@ -66,7 +66,7 @@ bench_eo_callbacks_call(int request) for (j = 0 ; j < (int) (distribution[i] * request) ; j++) { /* Miss finding the callbacks on purpose, so we measure worst case scenario. */ - eo_do(obj[i], eo_event_callback_call(SIMPLE_BAR, NULL)); + eo_event_callback_call(obj[i], SIMPLE_BAR, NULL); } } diff --git a/src/benchmarks/eo/eo_bench_eo_do.c b/src/benchmarks/eo/eo_bench_eo_do.c index 2bcdc4246e..9f84535254 100644 --- a/src/benchmarks/eo/eo_bench_eo_do.c +++ b/src/benchmarks/eo/eo_bench_eo_do.c @@ -13,7 +13,7 @@ bench_eo_do_simple(int request) Eo *obj = eo_add(SIMPLE_CLASS, NULL); for (i = 0 ; i < request ; i++) { - eo_do(obj, simple_a_set(i)); + simple_a_set(obj, i); } eo_unref(obj); @@ -27,8 +27,8 @@ bench_eo_do_two_objs(int request) Eo *obj2 = eo_add(SIMPLE_CLASS, NULL); for (i = 0 ; i < request ; i++) { - eo_do(obj, simple_a_set(i)); - eo_do(obj2, simple_a_set(i)); + simple_a_set(obj, i); + simple_a_set(obj2, i); } eo_unref(obj); @@ -43,7 +43,7 @@ bench_eo_do_two_objs_growing_stack(int request) Eo *obj2 = eo_add(SIMPLE_CLASS, NULL); for (i = 0 ; i < request ; i++) { - eo_do(obj, simple_other_call(obj2, 20)); + simple_other_call(obj, obj2, 20); } eo_unref(obj); @@ -55,7 +55,7 @@ static const Eo_Class *cur_klass; static void _a_set(Eo *obj, void *class_data EINA_UNUSED, int a) { - eo_do_super(obj, cur_klass, simple_a_set(a)); + simple_a_set(eo_super(obj, cur_klass), a); } static Eo_Op_Description op_desc[] = { @@ -81,7 +81,7 @@ bench_eo_do_super(int request) Eo *obj = eo_add(cur_klass, NULL); for (i = 0 ; i < request ; i++) { - eo_do(obj, simple_a_set(i)); + simple_a_set(obj, i); } eo_unref(obj); diff --git a/src/examples/ecore/ecore_audio_custom.c b/src/examples/ecore/ecore_audio_custom.c index 735533517a..2570a9e20d 100644 --- a/src/examples/ecore/ecore_audio_custom.c +++ b/src/examples/ecore/ecore_audio_custom.c @@ -25,7 +25,7 @@ int read_cb(void *data EINA_UNUSED, Eo *eo_obj, void *buf, int len) float *val = buf; int i; - eo_do(eo_obj, ecore_audio_obj_volume_get(&volume)); + ecore_audio_obj_volume_get(eo_obj, &volume); for(i=0; i", bread)) - eo_do(in, ecore_audio_obj_in_seek(10, SEEK_CUR, &pos)); + ecore_audio_obj_in_seek(in, 10, SEEK_CUR, &pos); min = pos / 60; - eo_do(in, ecore_audio_obj_name_get(&name)); - eo_do(in, ecore_audio_obj_in_length_get(&length)); + ecore_audio_obj_name_get(in, &name); + ecore_audio_obj_in_length_get(in, &length); printf("Position: %2im %5.02fs (%0.2f%%) - %s\n", min, pos - min * 60, pos/length*100, name); } @@ -53,7 +53,7 @@ handle_cmd(char *cmd, size_t bread) else if (!strncmp(cmd, "n", bread)) { in = eina_list_data_get(out_inputs); - eo_do(out, ret = ecore_audio_obj_out_input_detach(in)); + ret = ecore_audio_obj_out_input_detach(out, in); if (!ret) printf("Could not detach input\n"); @@ -63,11 +63,11 @@ handle_cmd(char *cmd, size_t bread) { in = (Eo *)eina_list_data_get(inputs); - eo_do(in, ecore_audio_obj_name_get(&name), - ecore_audio_obj_in_length_get(&length)); + ecore_audio_obj_name_get(in, &name); + ecore_audio_obj_in_length_get(in, &length); printf("Start: %s (%0.2fs)\n", name, length); - eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); + ret = ecore_audio_obj_out_input_attach(out, in); if (!ret) printf("Could not attach input %s\n", name); } @@ -84,11 +84,11 @@ handle_cmd(char *cmd, size_t bread) { in = (Eo *)eina_list_data_get(inputs); - eo_do(in, ecore_audio_obj_name_get(&name), - ecore_audio_obj_in_length_get(&length)); + ecore_audio_obj_name_get(in, &name); + ecore_audio_obj_in_length_get(in, &length); printf("Start: %s (%0.2fs)\n", name, length); - eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); + ret = ecore_audio_obj_out_input_attach(out, in); if (!ret) printf("Could not attach input %s\n", name); } @@ -98,25 +98,25 @@ handle_cmd(char *cmd, size_t bread) EINA_LIST_FOREACH(out_inputs, input, in) { Eina_Bool loop; - eo_do(in, ecore_audio_obj_in_looped_get(&loop), - ecore_audio_obj_name_get(&name)); + ecore_audio_obj_in_looped_get(in, &loop); + ecore_audio_obj_name_get(in, &name); printf("%s song %s\n", !loop?"Looping":"Not looping", name); - eo_do(in, ecore_audio_obj_in_looped_set(!loop)); + ecore_audio_obj_in_looped_set(in, !loop); } } else if (!strncmp(cmd, "+", bread)) { if (volume < 1.5) volume += 0.01; - eo_do(out, ecore_audio_obj_volume_set(volume)); + ecore_audio_obj_volume_set(out, volume); printf("Volume: %3.0f%%\n", volume * 100); } else if (!strncmp(cmd, "-", bread)) { if (volume > 0) volume -= 0.01; - eo_do(out, ecore_audio_obj_volume_set(volume)); + ecore_audio_obj_volume_set(out, volume); printf("Volume: %3.0f%%\n", volume * 100); } else if (!strncmp(cmd, "*", bread)) @@ -124,11 +124,11 @@ handle_cmd(char *cmd, size_t bread) double speed; EINA_LIST_FOREACH(out_inputs, input, in) { - eo_do(in, ecore_audio_obj_in_speed_get(&speed)); + ecore_audio_obj_in_speed_get(in, &speed); if (speed < 2.0) speed += 0.01; - eo_do(in, ecore_audio_obj_in_speed_set(speed), - ecore_audio_obj_name_get(&name)); + ecore_audio_obj_in_speed_set(in, speed); + ecore_audio_obj_name_get(in, &name); printf("Speed: %3.0f%% (%s)\n", speed * 100, name); } } @@ -137,11 +137,11 @@ handle_cmd(char *cmd, size_t bread) double speed; EINA_LIST_FOREACH(out_inputs, input, in) { - eo_do(in, ecore_audio_obj_in_speed_get(&speed)); + ecore_audio_obj_in_speed_get(in, &speed); if (speed > 0.5) speed -= 0.01; - eo_do(in, ecore_audio_obj_in_speed_set(speed), - ecore_audio_obj_name_get(&name)); + ecore_audio_obj_in_speed_set(in, speed); + ecore_audio_obj_name_get(in, &name); printf("Speed: %3.0f%% (%s)\n", speed * 100, name); } } @@ -149,11 +149,11 @@ handle_cmd(char *cmd, size_t bread) { EINA_LIST_FOREACH(out_inputs, input, in) { - eo_do(in, ecore_audio_obj_paused_get(&paused), - ecore_audio_obj_name_get(&name), - ecore_audio_obj_in_remaining_get(&length)); + ecore_audio_obj_paused_get(in, &paused); + ecore_audio_obj_name_get(in, &name); + ecore_audio_obj_in_remaining_get(in, &length); printf("%s %s\n%0.2f remaining\n", !paused ? "Paused" : "Unpaused", name, length); - eo_do(in, ecore_audio_obj_paused_set(!paused)); + ecore_audio_obj_paused_set(in, !paused); } } else if (!strncmp(cmd, "q", bread)) @@ -196,11 +196,11 @@ static Eina_Bool _play_finished(void *data EINA_UNUSED, const Eo_Event *event) const char *name; Eina_Bool ret; - eo_do(event->obj, ecore_audio_obj_name_get(&name)); + ecore_audio_obj_name_get(event->obj, &name); printf("Done: %s\n", name); inputs = eina_list_remove(inputs, event->obj); - eo_do(out, ret = ecore_audio_obj_out_input_detach(event->obj)); + ret = ecore_audio_obj_out_input_detach(out, event->obj); eo_del(event->obj); if (!ret) @@ -212,9 +212,9 @@ static Eina_Bool _play_finished(void *data EINA_UNUSED, const Eo_Event *event) const char *name; Eo *in = (Eo *)eina_list_data_get(inputs); - eo_do(in, ecore_audio_obj_name_get(&name)); + ecore_audio_obj_name_get(in, &name); printf("Start: %s\n", name); - eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); + ret = ecore_audio_obj_out_input_attach(out, in); if (!ret) printf("Could not attach input %s\n", name); } @@ -266,13 +266,13 @@ main(int argc, const char *argv[]) { if (!strncmp(val, "freq=", 5)) { freq = atoi(&val[5]); - eo_do(in, eo_key_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &freq)); + eo_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq); } else if (!strncmp(val, "duration=", 9)) { - eo_do(in, ecore_audio_obj_in_length_set(atof(&val[9]))); + ecore_audio_obj_in_length_set(in, atof(&val[9])); } } free(tmp); - eo_do(in, ecore_audio_obj_name_set(argv[i])); + ecore_audio_obj_name_set(in, argv[i]); } else { @@ -283,15 +283,15 @@ main(int argc, const char *argv[]) goto end; } tmp = strdup(argv[i]); - eo_do(in, ecore_audio_obj_name_set(basename(tmp))); + ecore_audio_obj_name_set(in, basename(tmp)); free(tmp); - eo_do(in, ret = ecore_audio_obj_source_set(argv[i])); + ret = ecore_audio_obj_source_set(in, argv[i]); if (!ret) { printf("Could not set %s as input\n", argv[i]); continue; } } - eo_do(in, eo_event_callback_add(ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL)); + eo_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL); inputs = eina_list_append(inputs, in); } @@ -302,13 +302,13 @@ main(int argc, const char *argv[]) if (!in) return 1; - eo_do(in, ecore_audio_obj_name_get(&name), - ecore_audio_obj_in_length_get(&length)); + ecore_audio_obj_name_get(in, &name); + ecore_audio_obj_in_length_get(in, &length); printf("Start: %s (%0.2fs)\n", name, length); out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL); - eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); + ret = ecore_audio_obj_out_input_attach(out, in); if (!ret) printf("Could not attach input %s\n", name); diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c index 9d3162a0fe..fceed59045 100644 --- a/src/examples/ecore/ecore_audio_to_ogg.c +++ b/src/examples/ecore/ecore_audio_to_ogg.c @@ -20,10 +20,10 @@ static Eina_Bool _play_finished(void *data EINA_UNUSED, const Eo_Event *event) const char *name; Eo *out; - eo_do(event->obj, ecore_audio_obj_name_get(&name)); + ecore_audio_obj_name_get(event->obj, &name); printf("Done: %s\n", name); - eo_do(event->obj, ecore_audio_obj_in_output_get(&out)); + ecore_audio_obj_in_output_get(event->obj, &out); eo_del(event->obj); eo_del(out); @@ -50,18 +50,18 @@ main(int argc, char *argv[]) in = eo_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL); - eo_do(in, ecore_audio_obj_name_set(basename(argv[1]))); - eo_do(in, ret = ecore_audio_obj_source_set(argv[1])); + ecore_audio_obj_name_set(in, basename(argv[1])); + ret = ecore_audio_obj_source_set(in, argv[1]); if (!ret) { printf("Could not set %s as input\n", argv[1]); eo_del(in); return 1; } - eo_do(in, eo_event_callback_add(ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL)); + eo_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL); out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL); - eo_do(out, ret = ecore_audio_obj_source_set(argv[2])); + ret = ecore_audio_obj_source_set(out, argv[2]); if (!ret) { printf("Could not set %s as output\n", argv[2]); eo_del(in); @@ -69,7 +69,7 @@ main(int argc, char *argv[]) return 1; } - eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); + ret = ecore_audio_obj_out_input_attach(out, in); if (!ret) { printf("Could not attach input\n"); eo_del(out); diff --git a/src/examples/ecore/ecore_idler_example.c b/src/examples/ecore/ecore_idler_example.c index 681d95f1cb..aa749d9a81 100644 --- a/src/examples/ecore/ecore_idler_example.c +++ b/src/examples/ecore/ecore_idler_example.c @@ -110,7 +110,7 @@ main(void) ctxt.enterer = ecore_idle_enterer_add(_enterer_cb, &ctxt); ctxt.exiter = ecore_idle_exiter_add(_exiter_cb, &ctxt); ctxt.idler = ecore_idler_add(_idler_cb, &ctxt); -// ctxt.idler = eo_add(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(_idler_cb, &ctxt)); +// ctxt.idler = eo_add(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(eoid, _idler_cb, &ctxt)); ctxt.handler = ecore_event_handler_add(_event_type, _event_handler_cb, &ctxt); diff --git a/src/examples/ecore/ecore_poller_example.c b/src/examples/ecore/ecore_poller_example.c index c3d8f69f95..e60c20a90d 100644 --- a/src/examples/ecore/ecore_poller_example.c +++ b/src/examples/ecore/ecore_poller_example.c @@ -48,12 +48,9 @@ main(void) poller2 = ecore_poller_add(ECORE_POLLER_CORE, 8, _poller_print_cb, str2); poller3 = ecore_poller_add(ECORE_POLLER_CORE, 30, _poller_quit_cb, str3); -// poller1 = eo_add(ECORE_POLLER_CLASS, NULL, -// ecore_poller_constructor(ECORE_POLLER_CORE, 4, _poller_print_cb, str1)); -// poller2 = eo_add(ECORE_POLLER_CLASS, NULL, -// ecore_poller_constructor(ECORE_POLLER_CORE, 8, _poller_print_cb, str2)); -// poller3 = eo_add(ECORE_POLLER_CLASS, NULL, -// ecore_poller_constructor(ECORE_POLLER_CORE, 20, _poller_quit_cb, str3)); +// poller1 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eoid, ECORE_POLLER_CORE, 4, _poller_print_cb, str1)); +// poller2 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eoid, ECORE_POLLER_CORE, 8, _poller_print_cb, str2)); +// poller3 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eoid, ECORE_POLLER_CORE, 20, _poller_quit_cb, str3)); ecore_main_loop_begin(); @@ -61,7 +58,7 @@ main(void) printf("changing poller2 interval to 16\n"); ecore_poller_poller_interval_set(poller2, 16); -// eo_do(poller2, ecore_poller_interval_set(16, NULL)); +// ecore_poller_interval_set(poller2, 16, NULL); ecore_main_loop_begin(); // eo_unref(poller1); diff --git a/src/examples/edje/edje-text.c b/src/examples/edje/edje-text.c index 7fc830c428..21efb05422 100644 --- a/src/examples/edje/edje-text.c +++ b/src/examples/edje/edje-text.c @@ -55,7 +55,7 @@ _on_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *o EINA_ fprintf(stderr, "Setting lang of this edje object to '%s'\n", lang[lang_idx]); env = getenv("LANGUAGE"); setenv("LANGUAGE", lang[lang_idx], 1); - eo_do(o, edje_obj_language_set(lang[lang_idx])); + edje_obj_language_set(o, lang[lang_idx]); setenv("LANGUAGE", env, 1); } @@ -108,7 +108,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40); evas_object_show(edje_obj); setenv("LANGUAGE", "en_IN", 1); - eo_do(edje_obj, edje_obj_language_set("en_IN")); + edje_obj_language_set(edje_obj, "en_IN"); edje_object_text_change_cb_set(edje_obj, _on_text_change, NULL); edje_object_part_text_set(edje_obj, "part_two", "Click here"); edje_object_part_text_select_allow_set(edje_obj, "part_two", EINA_TRUE); @@ -123,7 +123,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) evas_object_move(edje_obj_one, 0, 50); evas_object_resize(edje_obj_one, WIDTH - 40, HEIGHT - 40); evas_object_show(edje_obj_one); - eo_do(edje_obj_one, edje_obj_language_set("en_IN")); + edje_obj_language_set(edje_obj_one, "en_IN"); edje_object_text_change_cb_set(edje_obj_one, _on_text_change, NULL); edje_object_part_text_set(edje_obj_one, "part_two", "Click here"); edje_object_part_text_select_allow_set(edje_obj_one, "part_two", EINA_TRUE); diff --git a/src/examples/eldbus/dbusmodel.c b/src/examples/eldbus/dbusmodel.c index a3e77e3305..b34799b4c5 100644 --- a/src/examples/eldbus/dbusmodel.c +++ b/src/examples/eldbus/dbusmodel.c @@ -29,9 +29,8 @@ _event_interface_load_status_cb(void *data EINA_UNUSED, Eo *model, if (EFL_MODEL_LOAD_STATUS_LOADED != actual_load->status) return EINA_TRUE; - eo_do(model, - name = eldbus_model_proxy_name_get(), - efl_model_properties_get(&properties_list)); + name = eldbus_model_proxy_name_get(model); + efl_model_properties_get(model, &properties_list); printf(" -> %s\n", name); if (eina_array_count(properties_list)) @@ -39,7 +38,7 @@ _event_interface_load_status_cb(void *data EINA_UNUSED, Eo *model, EINA_ARRAY_ITER_NEXT(properties_list, i, property, iterator) { - eo_do(model, efl_model_property_get(property, &property_value)); + efl_model_property_get(model, property, &property_value); if (property_value) { prop_str = eina_value_to_string(property_value); @@ -70,7 +69,7 @@ _event_load_status_cb(void *data EINA_UNUSED, Eo *model, if (EFL_MODEL_LOAD_STATUS_LOADED != actual_load->status) return EINA_TRUE; - eo_do(model, efl_model_children_count_get(&children_count)); + efl_model_children_count_get(model, &children_count); if (children_count == 0) { printf("Don't find Interfaces\n"); @@ -78,12 +77,12 @@ _event_load_status_cb(void *data EINA_UNUSED, Eo *model, return EINA_FALSE; } - eo_do(model, efl_model_children_slice_get(0, 0, &accessor)); + efl_model_children_slice_get(model, 0, 0, &accessor); printf("\nInterfaces:\n"); EINA_ACCESSOR_FOREACH(accessor, i, child) { - eo_do(child, eo_event_callback_add(EFL_MODEL_BASE_EVENT_LOAD_STATUS, _event_interface_load_status_cb, NULL)); - eo_do(child, efl_model_load()); + eo_event_callback_add(child, EFL_MODEL_BASE_EVENT_LOAD_STATUS, _event_interface_load_status_cb, NULL); + efl_model_load(child); } return EINA_FALSE; @@ -103,17 +102,14 @@ main(int argc, char **argv EINA_UNUSED) if (argc > 1) bus = argv[1]; if (argc > 2) path = argv[2]; - root = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, - eldbus_model_object_constructor(ELDBUS_CONNECTION_TYPE_SESSION, - NULL, EINA_FALSE, bus, path)); + root = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, bus, path)); - eo_do(root, - eo_event_callback_add(EFL_MODEL_BASE_EVENT_LOAD_STATUS, _event_load_status_cb, NULL), - efl_model_load()); + eo_event_callback_add(root, EFL_MODEL_BASE_EVENT_LOAD_STATUS, _event_load_status_cb, NULL); + efl_model_load(root); ecore_main_loop_begin(); - eo_do(root, eo_event_callback_del(EFL_MODEL_BASE_EVENT_LOAD_STATUS, _event_load_status_cb, NULL)); + eo_event_callback_del(root, EFL_MODEL_BASE_EVENT_LOAD_STATUS, _event_load_status_cb, NULL); eo_unref(root); } diff --git a/src/examples/emotion/emotion_basic_example.c b/src/examples/emotion/emotion_basic_example.c index 2e7abea696..9675f6b498 100644 --- a/src/examples/emotion/emotion_basic_example.c +++ b/src/examples/emotion/emotion_basic_example.c @@ -65,8 +65,8 @@ main(int argc, const char *argv[]) em = emotion_object_add(e); emotion_object_init(em, NULL); - eo_do(em, eo_event_callback_add - (EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL)); + eo_event_callback_add + (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); emotion_object_file_set(em, filename); diff --git a/src/examples/emotion/emotion_border_example.c b/src/examples/emotion/emotion_border_example.c index 22eca25cf1..ea3c07d637 100644 --- a/src/examples/emotion/emotion_border_example.c +++ b/src/examples/emotion/emotion_border_example.c @@ -33,8 +33,7 @@ _create_emotion_object(Evas *e) emotion_object_init(em, "gstreamer1"); - eo_do(em, eo_event_callback_add( - EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL)); + eo_event_callback_add(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); return em; } @@ -241,7 +240,7 @@ main(int argc, const char *argv[]) ecore_evas_data_set(ee, "emotion", em); - eo_do(em, eo_event_callback_array_add(emotion_object_example_callbacks, NULL)); + eo_event_callback_array_add(em, emotion_object_example_callbacks, NULL); evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em); evas_object_focus_set(bg, EINA_TRUE); diff --git a/src/examples/emotion/emotion_generic_example.c b/src/examples/emotion/emotion_generic_example.c index 6ea7dd95da..cdbfe6e1a2 100644 --- a/src/examples/emotion/emotion_generic_example.c +++ b/src/examples/emotion/emotion_generic_example.c @@ -45,10 +45,10 @@ _create_emotion_object(Evas *e) emotion_object_init(em, "generic"); - eo_do(em, eo_event_callback_add - (EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL)); - eo_do(em, eo_event_callback_add - (EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_stopped_cb, NULL)); + eo_event_callback_add + (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); + eo_event_callback_add + (em, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_stopped_cb, NULL); return em; } @@ -227,7 +227,7 @@ main(int argc, const char *argv[]) evas_object_resize(em, WIDTH, HEIGHT); evas_object_show(em); - eo_do(em, eo_event_callback_array_add(emotion_object_example_callbacks, NULL)); + eo_event_callback_array_add(em, emotion_object_example_callbacks, NULL); evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em); evas_object_focus_set(bg, EINA_TRUE); diff --git a/src/examples/emotion/emotion_generic_subtitle_example.c b/src/examples/emotion/emotion_generic_subtitle_example.c index 03b8aab8c6..1d32f777a6 100644 --- a/src/examples/emotion/emotion_generic_subtitle_example.c +++ b/src/examples/emotion/emotion_generic_subtitle_example.c @@ -80,8 +80,8 @@ main(int argc, const char *argv[]) if (subtitle_filename) emotion_object_video_subtitle_file_set(em, subtitle_filename); - eo_do(em, eo_event_callback_add - (EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL)); + eo_event_callback_add + (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); emotion_object_file_set(em, filename); diff --git a/src/examples/emotion/emotion_signals_example.c b/src/examples/emotion/emotion_signals_example.c index 3c56c40924..b84c47d899 100644 --- a/src/examples/emotion/emotion_signals_example.c +++ b/src/examples/emotion/emotion_signals_example.c @@ -68,8 +68,7 @@ _position_update_cb(void *data EINA_UNUSED, Eo *o, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) { printf(">>> Emotion object first position update.\n"); - eo_do(o, eo_event_callback_del(EMOTION_OBJECT_EVENT_POSITION_UPDATE, - _position_update_cb, NULL)); + eo_event_callback_del(o, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL); _display_info(o); return EINA_TRUE; @@ -80,8 +79,7 @@ _frame_decode_cb(void *data EINA_UNUSED, Eo *o, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) { printf(">>> Emotion object first frame decode.\n"); - eo_do(o, eo_event_callback_del(EMOTION_OBJECT_EVENT_FRAME_DECODE, - _frame_decode_cb, NULL)); + eo_event_callback_del(o, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL); _display_info(o); return EINA_TRUE; @@ -121,8 +119,8 @@ static const Eo_Callback_Array_Item emotion_object_example_callbacks[] = { static void _setup_emotion_callbacks(Evas_Object *o) { - eo_do(o, eo_event_callback_add - (EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL)); + eo_event_callback_add + (o, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); } int diff --git a/src/examples/eo/evas/evas_elw_box.c b/src/examples/eo/evas/evas_elw_box.c index 96df326e99..c352027b91 100644 --- a/src/examples/eo/evas/evas_elw_box.c +++ b/src/examples/eo/evas/evas_elw_box.c @@ -30,7 +30,7 @@ _pack_end(Eo *obj EINA_UNUSED, void *class_data, va_list *list) static void _constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_constructor()); + eo_constructor(eo_super(obj, MY_CLASS)); Widget_Data *wd = class_data; diff --git a/src/examples/eo/evas/evas_elw_boxedbutton.c b/src/examples/eo/evas/evas_elw_boxedbutton.c index 44fc2605c8..62842771ab 100644 --- a/src/examples/eo/evas/evas_elw_boxedbutton.c +++ b/src/examples/eo/evas/evas_elw_boxedbutton.c @@ -20,14 +20,14 @@ typedef struct static void _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_constructor()); + eo_constructor(eo_super(obj, MY_CLASS)); Eo *bt = eo_add(ELW_BUTTON_CLASS, obj); - eo_do(obj, eo_composite_attach(bt)); - eo_do(bt, eo_event_callback_forwarder_add(EV_CLICKED, obj)); - eo_do(bt, exevas_obj_visibility_set(EINA_TRUE)); + eo_composite_attach(obj, bt); + eo_event_callback_forwarder_add(bt, EV_CLICKED, obj); + exevas_obj_visibility_set(bt, EINA_TRUE); - eo_do(obj, elw_box_pack_end(bt)); + elw_box_pack_end(obj, bt); eo_unref(bt); } diff --git a/src/examples/eo/evas/evas_elw_button.c b/src/examples/eo/evas/evas_elw_button.c index 7067171dc4..7dee7bb175 100644 --- a/src/examples/eo/evas/evas_elw_button.c +++ b/src/examples/eo/evas/evas_elw_button.c @@ -28,7 +28,7 @@ _position_set(Eo *obj, void *class_data EINA_UNUSED, va_list *list) x = va_arg(*list, Evas_Coord); y = va_arg(*list, Evas_Coord); printf("But set position %d,%d\n", x, y); - eo_do_super(obj, MY_CLASS, exevas_obj_position_set(x, y)); + exevas_obj_position_set(eo_super(obj, MY_CLASS), x, y); } static void @@ -46,13 +46,13 @@ _btn_clicked(void *data, Evas_Object *evas_obj, void *event_info) (void) evas_obj; (void) event_info; Eo *obj = data; - eo_do(obj, eo_event_callback_call(EV_CLICKED, NULL, NULL)); + eo_event_callback_call(obj, EV_CLICKED, NULL, NULL); } static void _constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_constructor()); + eo_constructor(eo_super(obj, MY_CLASS)); Widget_Data *wd = class_data; @@ -68,7 +68,7 @@ _constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED) static void _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); //Widget_Data *wd = class_data; /* FIXME: Commented out because it's automatically done because our tree diff --git a/src/examples/eo/evas/evas_elw_win.c b/src/examples/eo/evas/evas_elw_win.c index e5a917d781..d4e830f513 100644 --- a/src/examples/eo/evas/evas_elw_win.c +++ b/src/examples/eo/evas/evas_elw_win.c @@ -29,7 +29,7 @@ my_win_del(void *data, Evas_Object *obj, void *event_info) static void _constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_constructor()); + eo_constructor(eo_super(obj, MY_CLASS)); Widget_Data *wd = class_data; diff --git a/src/examples/eo/evas/evas_evas_obj.c b/src/examples/eo/evas/evas_evas_obj.c index 768d3d4ea6..1a26ddfda6 100644 --- a/src/examples/eo/evas/evas_evas_obj.c +++ b/src/examples/eo/evas/evas_evas_obj.c @@ -82,18 +82,18 @@ _child_add(Eo *obj, void *class_data, va_list *list) static void _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_constructor()); + eo_constructor(eo_super(obj, MY_CLASS)); /* Add type check. */ Eo *parent = eo_parent_get(obj); if (parent) - eo_do(parent, exevas_obj_child_add(obj)); + exevas_obj_child_add(parent, obj); } static void _destructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); Widget_Data *wd = class_data; diff --git a/src/examples/eo/evas/evas_evas_obj.h b/src/examples/eo/evas/evas_evas_obj.h index 61cf7201ef..5490c6989e 100644 --- a/src/examples/eo/evas/evas_evas_obj.h +++ b/src/examples/eo/evas/evas_evas_obj.h @@ -76,7 +76,7 @@ static inline Evas_Object * eo_evas_object_get(const Eo *obj) { void *data; - eo_do((Eo *) obj, eo_key_data_get(EXEVAS_OBJ_STR, &data)); + eo_key_data_get((Eo *) obj, EXEVAS_OBJ_STR, &data); return data; } @@ -84,7 +84,7 @@ eo_evas_object_get(const Eo *obj) static inline void eo_evas_object_set(Eo *obj, Evas_Object *evas_obj) { - eo_do(obj, eo_key_data_set(EXEVAS_OBJ_STR, evas_obj)); + eo_key_data_set(obj, EXEVAS_OBJ_STR, evas_obj); } #endif diff --git a/src/examples/eo/evas/evas_test.c b/src/examples/eo/evas/evas_test.c index dca7a94ff3..50691e64bb 100644 --- a/src/examples/eo/evas/evas_test.c +++ b/src/examples/eo/evas/evas_test.c @@ -32,27 +32,28 @@ main(int argc, char *argv[]) eo_init(); Eo *win = eo_add(ELW_WIN_CLASS, NULL); - eo_do(win, exevas_obj_size_set(winw, winh), exevas_obj_visibility_set(EINA_TRUE)); + exevas_obj_size_set(win, winw, winh); + exevas_obj_visibility_set(win, EINA_TRUE); Eo *bt = eo_add(ELW_BUTTON_CLASS, win); - eo_do(bt, exevas_obj_position_set(25, 25), - exevas_obj_size_set(50, 50), - exevas_obj_color_set(255, 0, 0, 255), - elw_button_text_set("Click"), - exevas_obj_visibility_set(EINA_TRUE)); - eo_do(bt, eo_event_callback_add(EV_CLICKED, _btn_clicked_cb, "btn")); + exevas_obj_position_set(bt, 25, 25); + exevas_obj_size_set(bt, 50, 50); + exevas_obj_color_set(bt, 255, 0, 0, 255); + elw_button_text_set(bt, "Click"); + exevas_obj_visibility_set(bt, EINA_TRUE); + eo_event_callback_add(bt, EV_CLICKED, _btn_clicked_cb, "btn"); int r, g, b, a; - eo_do(bt, exevas_obj_color_get(&r, &g, &b, &a)); + exevas_obj_color_get(bt, &r, &g, &b, &a); printf("RGBa(%d, %d, %d, %d)\n", r, g, b, a); Eo *bx = eo_add(ELW_BOXEDBUTTON_CLASS, win); - eo_do(bx, exevas_obj_position_set(100, 100), - exevas_obj_size_set(70, 70), - exevas_obj_color_set(0, 0, 255, 255), - elw_button_text_set("Click2"), - exevas_obj_visibility_set(EINA_TRUE)); - eo_do(bx, eo_event_callback_add(EV_CLICKED, _btn_clicked_cb, "bxedbtn")); + exevas_obj_position_set(bx, 100, 100); + exevas_obj_size_set(bx, 70, 70); + exevas_obj_color_set(bx, 0, 0, 255, 255); + elw_button_text_set(bx, "Click2"); + exevas_obj_visibility_set(bx, EINA_TRUE); + eo_event_callback_add(bx, EV_CLICKED, _btn_clicked_cb, "bxedbtn"); elm_run(); diff --git a/src/examples/eo/isa/eo_isa_mixin.c b/src/examples/eo/isa/eo_isa_mixin.c index ce45601a95..2a5c13b2ef 100644 --- a/src/examples/eo/isa/eo_isa_mixin.c +++ b/src/examples/eo/isa/eo_isa_mixin.c @@ -13,7 +13,7 @@ _a_square_get(Eo *obj, void *class_data EINA_UNUSED) { int a; - eo_do(obj, a = simple_a_get()); + a = simple_a_get(obj); printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); return a * a; } diff --git a/src/examples/eo/simple/simple_main.c b/src/examples/eo/simple/simple_main.c index 2ee7ee44ca..fc6d060933 100644 --- a/src/examples/eo/simple/simple_main.c +++ b/src/examples/eo/simple/simple_main.c @@ -14,13 +14,13 @@ main(int argc, char *argv[]) Eo *obj = eo_add(SIMPLE_CLASS, NULL); - eo_do(obj, simple_a_set(4)); + simple_a_set(obj, 4); int a = 0, a2 = 0, a3 = 0; - eo_do(obj, a = simple_a_get(), - a3 = interface_a_power_3_get(), - a2 = mixin_a_square_get()); + a = simple_a_get(obj); + a3 = interface_a_power_3_get(obj); + a2 = mixin_a_square_get(obj); printf("Got %d %d %d\n", a, a2, a3); diff --git a/src/examples/eo/simple/simple_mixin.c b/src/examples/eo/simple/simple_mixin.c index 5831ce022b..db5b90e802 100644 --- a/src/examples/eo/simple/simple_mixin.c +++ b/src/examples/eo/simple/simple_mixin.c @@ -13,7 +13,7 @@ _a_square_get(Eo *obj, void *class_data EINA_UNUSED) { int a; - eo_do(obj, a = simple_a_get()); + a = simple_a_get(obj); printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); return a * a; } diff --git a/src/examples/eolian_cxx/colourable.c b/src/examples/eolian_cxx/colourable.c index 655d63c5c2..0c132c4509 100644 --- a/src/examples/eolian_cxx/colourable.c +++ b/src/examples/eolian_cxx/colourable.c @@ -35,7 +35,7 @@ _colourable_eo_base_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED) = eina_log_domain_register("colourable", EINA_COLOR_BLUE); } DBG("_colourable_constructor(%p, %p)\n", obj, MY_CLASS); - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } void @@ -47,7 +47,7 @@ _colourable_eo_base_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED) _colourable_impl_logdomain = 0; } DBG("_colourable_destructor()\n"); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } void @@ -63,7 +63,7 @@ _colourable_rgb_24bits_constructor(Eo *obj, Colourable_Data *self, int rgb) self->g = (rgb & 0x0000ff00) >> 8; self->b = rgb & 0x000000ff; DBG("_colourable_rgb_24bits_constructor(0x%.6x)\n", (int)rgb); - eo_do_super(obj, MY_CLASS, eo_constructor()); + eo_constructor(eo_super(obj, MY_CLASS)); } void diff --git a/src/examples/eolian_cxx/colourablesquare.c b/src/examples/eolian_cxx/colourablesquare.c index 87bc419816..0804d361dc 100644 --- a/src/examples/eolian_cxx/colourablesquare.c +++ b/src/examples/eolian_cxx/colourablesquare.c @@ -35,7 +35,7 @@ _colourablesquare_size_constructor(Eo *obj, ColourableSquare_Data *self, int siz } self->size = size; DBG("_colourablesquare_constructor(%d)\n", size); - eo_do_super(obj, MY_CLASS, eo_constructor()); + eo_constructor(eo_super(obj, MY_CLASS)); } static int diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c index c8d906c881..d02668bed0 100644 --- a/src/examples/evas/evas-3d-aabb.c +++ b/src/examples/evas/evas-3d-aabb.c @@ -57,7 +57,7 @@ _animate_scene(void *data) { static int frame = 0; - eo_do((Evas_Canvas3D_Node *)data, evas_canvas3d_node_mesh_frame_set(mesh, frame)); + evas_canvas3d_node_mesh_frame_set((Evas_Canvas3D_Node *)data, mesh, frame); _redraw_aabb(); @@ -84,22 +84,22 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void { case 1: { - eo_do(node, evas_canvas3d_node_orientation_angle_axis_set(90, 1.0, 0.0, 0.0)); + evas_canvas3d_node_orientation_angle_axis_set(node, 90, 1.0, 0.0, 0.0); break; } case 2: { - eo_do(node, evas_canvas3d_node_orientation_angle_axis_set(90, 0.0, 1.0, 0.0)); + evas_canvas3d_node_orientation_angle_axis_set(node, 90, 0.0, 1.0, 0.0); break; } case 3: { - eo_do(node, evas_canvas3d_node_orientation_angle_axis_set(90, 0.0, 0.0, 1.0)); + evas_canvas3d_node_orientation_angle_axis_set(node, 90, 0.0, 0.0, 1.0); break; } case 4: { - eo_do(node, evas_canvas3d_node_orientation_angle_axis_set(90, 1.0, 1.0, 0.0)); + evas_canvas3d_node_orientation_angle_axis_set(node, 90, 1.0, 1.0, 0.0); break; } } @@ -111,8 +111,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - eo_do(background, efl_gfx_size_set(w, h)); - eo_do(image, efl_gfx_size_set(w, h)); + efl_gfx_size_set(background, w, h); + efl_gfx_size_set(image, w, h); } static Eina_Bool @@ -120,9 +120,9 @@ _redraw_aabb() { Evas_Real x0, y0, z0, x1, y1, z1; - eo_do(mesh_node, evas_canvas3d_node_bounding_box_get(&x0, &y0, &z0, &x1, &y1, &z1)); - eo_do(mesh_box_node, evas_canvas3d_node_position_set((x0 + x1)/2, (y0 + y1)/2, (z0 + z1)/2), - evas_canvas3d_node_scale_set(x1 - x0, y1 - y0, z1 - z0)); + evas_canvas3d_node_bounding_box_get(mesh_node, &x0, &y0, &z0, &x1, &y1, &z1); + evas_canvas3d_node_position_set(mesh_box_node, (x0 + x1)/2, (y0 + y1)/2, (z0 + z1)/2); + evas_canvas3d_node_scale_set(mesh_box_node, x1 - x0, y1 - y0, z1 - z0); return EINA_TRUE; } @@ -144,118 +144,87 @@ main(void) scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(camera, - evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0)); + evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0); camera_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(camera_node, - evas_canvas3d_node_camera_set(camera)); - eo_do(root_node, - evas_canvas3d_node_member_add(camera_node)); - eo_do(camera_node, - evas_canvas3d_node_position_set(100.0, 50.0, 20.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + evas_canvas3d_node_camera_set(camera_node, camera); + evas_canvas3d_node_member_add(root_node, camera_node); + evas_canvas3d_node_position_set(camera_node, 100.0, 50.0, 20.0); + evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0); light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(light, - evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_directional_set(EINA_TRUE)); + evas_canvas3d_light_ambient_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_directional_set(light, EINA_TRUE); light_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(light_node, - evas_canvas3d_node_light_set(light), - evas_canvas3d_node_position_set(1000.0, 0.0, 1000.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(root_node, - evas_canvas3d_node_member_add(light_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_light_set(light_node, light); + evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0); + evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(root_node, light_node); mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(mesh, - efl_file_set(model_path, NULL), - evas_canvas3d_mesh_frame_material_set(0, material), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); + efl_file_set(mesh, model_path, NULL); + evas_canvas3d_mesh_frame_material_set(mesh, 0, material); + evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); - eo_do(texture, - evas_canvas3d_texture_file_set(image_path, NULL), - evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, - EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, - EVAS_CANVAS3D_WRAP_MODE_REPEAT)); - eo_do(material, - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, - 0.01, 0.01, 0.01, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, - 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, - 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(50.0)); + evas_canvas3d_texture_file_set(texture, image_path, NULL); + evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); + evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); + evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.01, 0.01, 0.01, 1.0); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(material, 50.0); - mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - mesh_box_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); + mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + mesh_box_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); material_box = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(material_box, evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE)); + evas_canvas3d_material_enable_set(material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(cube, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE)); + evas_canvas3d_primitive_form_set(cube, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE); mesh_box = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(mesh_box, - evas_canvas3d_mesh_from_primitive_set(0, cube), - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR), - evas_canvas3d_mesh_frame_material_set(0, material_box)); + evas_canvas3d_mesh_from_primitive_set(mesh_box, 0, cube); + evas_canvas3d_mesh_vertex_assembly_set(mesh_box, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES); + evas_canvas3d_mesh_shade_mode_set(mesh_box, EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR); + evas_canvas3d_mesh_frame_material_set(mesh_box, 0, material_box); _redraw_aabb(); - eo_do(root_node, - evas_canvas3d_node_member_add(mesh_box_node)); - eo_do(mesh_box_node, - evas_canvas3d_node_mesh_add(mesh_box)); + evas_canvas3d_node_member_add(root_node, mesh_box_node); + evas_canvas3d_node_mesh_add(mesh_box_node, mesh_box); - eo_do(root_node, - evas_canvas3d_node_member_add(mesh_node)); - eo_do(mesh_node, - evas_canvas3d_node_mesh_add(mesh)); + evas_canvas3d_node_member_add(root_node, mesh_node); + evas_canvas3d_node_mesh_add(mesh_node, mesh); - eo_do(scene, - evas_canvas3d_scene_root_node_set(root_node), - evas_canvas3d_scene_camera_node_set(camera_node), - evas_canvas3d_scene_size_set(WIDTH, HEIGHT)); + evas_canvas3d_scene_root_node_set(scene, root_node); + evas_canvas3d_scene_camera_node_set(scene, camera_node); + evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); background = eo_add(EVAS_RECTANGLE_CLASS, evas); - eo_do(background, - efl_gfx_color_set(0, 0, 0, 255), - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_color_set(background, 0, 0, 0, 255); + efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_visible_set(background, EINA_TRUE); image = evas_object_image_filled_add(evas); - eo_do(image, - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_visible_set(image, EINA_TRUE); evas_object_focus_set(image, EINA_TRUE); - eo_do(image, evas_obj_image_scene_set(scene)); + evas_obj_image_scene_set(image, scene); evas_object_event_callback_add(image, EVAS_CALLBACK_KEY_DOWN, _on_key_down, mesh_node); diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c index 98bd74afb5..db7c7a1590 100644 --- a/src/examples/evas/evas-3d-blending.c +++ b/src/examples/evas/evas-3d-blending.c @@ -102,7 +102,7 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void func2 = EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA_SATURATE; if(func2 > EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA_SATURATE) func2 = EVAS_CANVAS3D_BLEND_FUNC_ZERO; - eo_do(scene->mesh1, evas_canvas3d_mesh_blending_func_set(func1, func2)); + evas_canvas3d_mesh_blending_func_set(scene->mesh1, func1, func2); printf("sfactor = %s, dfactor = %s\n", blend_func_names[func1], blend_func_names[func2]); } @@ -121,8 +121,8 @@ _on_canvas_resize(Ecore_Evas *ee) ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); evas_object_resize(background, w, h); - eo_do(background, efl_gfx_size_set(w, h)); - eo_do(image, efl_gfx_size_set(w, h)); + efl_gfx_size_set(background, w, h); + efl_gfx_size_set(image, w, h); } static Eina_Bool @@ -133,8 +133,7 @@ _animate_scene(void *data) angle += 0.02; - eo_do(scene->mesh_node, - evas_canvas3d_node_position_set(3 * sin(angle), 0.0, 3 * cos(angle))); + evas_canvas3d_node_position_set(scene->mesh_node, 3 * sin(angle), 0.0, 3 * cos(angle)); if (angle > 2 * M_PI) angle = 0; @@ -146,49 +145,40 @@ _camera_setup(Scene_Data *data) { data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(data->camera, - evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0)); + evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); data->camera_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(data->camera_node, - evas_canvas3d_node_camera_set(data->camera), - evas_canvas3d_node_position_set(0.0, 0.0, 10.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); + evas_canvas3d_node_camera_set(data->camera_node, data->camera); + evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); + evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node)); + evas_canvas3d_node_member_add(data->root_node, data->camera_node); } static void _light_setup(Scene_Data *data) { data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(data->light, - evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); + evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); data->light_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(data->light_node, - evas_canvas3d_node_light_set(data->light), - evas_canvas3d_node_position_set(0.0, 0.0, 10.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_light_set(data->light_node, data->light); + evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); + evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(data->root_node, data->light_node); } static void _set_ball(Eo *mesh, Eo *sphere, Evas_Canvas3D_Material *material) { - eo_do(mesh, - evas_canvas3d_mesh_from_primitive_set(0, sphere), - evas_canvas3d_mesh_frame_material_set(0, material), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); + evas_canvas3d_mesh_from_primitive_set(mesh, 0, sphere); + evas_canvas3d_mesh_frame_material_set(mesh, 0, material); + evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); } static void @@ -196,32 +186,27 @@ _mesh_setup(Scene_Data *data) { data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(data->material, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 1.0, 0.2, 0.2, 0.2), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 0.0, 0.0, 0.2), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2), - evas_canvas3d_material_shininess_set(100.0)); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 1.0, 0.2, 0.2, 0.2); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 0.0, 0.0, 0.2); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2); + evas_canvas3d_material_shininess_set(data->material, 100.0); data->material1 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(data->material1, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.0, 0.2, 0.2, 0.2), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.0, 0.0, 1.0, 0.2), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2), - evas_canvas3d_material_shininess_set(100.0)); + evas_canvas3d_material_enable_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_color_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.0, 0.2, 0.2, 0.2); + evas_canvas3d_material_color_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.0, 0.0, 1.0, 0.2); + evas_canvas3d_material_color_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2); + evas_canvas3d_material_shininess_set(data->material1, 100.0); data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(data->sphere, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE), - evas_canvas3d_primitive_precision_set(50)); + evas_canvas3d_primitive_form_set(data->sphere, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE); + evas_canvas3d_primitive_precision_set(data->sphere, 50); data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); data->mesh1 = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); @@ -230,27 +215,23 @@ _mesh_setup(Scene_Data *data) _set_ball(data->mesh1, data->sphere, data->material1); data->mesh_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node)); - eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh)); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node); + evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); data->mesh_node1 = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node1)); - eo_do(data->mesh_node1, evas_canvas3d_node_mesh_add(data->mesh1)); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node1); + evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1); - eo_do(data->mesh1, evas_canvas3d_mesh_blending_enable_set(EINA_TRUE), - evas_canvas3d_mesh_blending_func_set(func1, func2)); + evas_canvas3d_mesh_blending_enable_set(data->mesh1, EINA_TRUE); + evas_canvas3d_mesh_blending_func_set(data->mesh1, func1, func2); - eo_do(data->mesh_node, - evas_canvas3d_node_scale_set(2.0, 2.0, 2.0)); + evas_canvas3d_node_scale_set(data->mesh_node, 2.0, 2.0, 2.0); - eo_do(data->mesh_node1, - evas_canvas3d_node_scale_set(5.0, 5.0, 5.0)); + evas_canvas3d_node_scale_set(data->mesh_node1, 5.0, 5.0, 5.0); } static void @@ -258,21 +239,18 @@ _scene_setup(Scene_Data *data) { data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - eo_do(data->scene, - evas_canvas3d_scene_size_set(WIDTH, HEIGHT); - evas_canvas3d_scene_background_color_set(0.5, 0.5, 0.5, 1)); + evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); + evas_canvas3d_scene_background_color_set(data->scene, 0.5, 0.5, 0.5, 1); data->root_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); _mesh_setup(data); - eo_do(data->scene, - evas_canvas3d_scene_root_node_set(data->root_node), - evas_canvas3d_scene_camera_node_set(data->camera_node)); + evas_canvas3d_scene_root_node_set(data->scene, data->root_node); + evas_canvas3d_scene_camera_node_set(data->scene, data->camera_node); } int @@ -312,7 +290,7 @@ main(void) evas_object_focus_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ - eo_do(image, evas_obj_image_scene_set(data.scene)); + evas_obj_image_scene_set(image, data.scene); /* Add animation timer callback. */ diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c index f3cf3b4c79..885a53bd81 100644 --- a/src/examples/evas/evas-3d-colorpick.c +++ b/src/examples/evas/evas-3d-colorpick.c @@ -119,8 +119,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - eo_do(bg, efl_gfx_size_set(w, h)); - eo_do(image, efl_gfx_size_set(w, h)); + efl_gfx_size_set(bg, w, h); + efl_gfx_size_set(image, w, h); } static Eina_Bool @@ -129,7 +129,7 @@ _animate_sphere(void *data) static int angle = 0.0; Eo *n = (Eo*)(((Test_object *)data)->node); Evas_Real s = ((Test_object *)data)->speed; - eo_do(n, evas_canvas3d_node_orientation_angle_axis_set(angle, s, s - 1, s + 1)); + evas_canvas3d_node_orientation_angle_axis_set(n, angle, s, s - 1, s + 1); angle++; if (angle > 360) angle = 0.0; return EINA_TRUE; @@ -141,9 +141,8 @@ void _recalculate_position() Evas_Real x1, y1, shiftx = 0, shifty = 0; Test_object *m; - eo_do(((Test_object *)eina_list_nth(globalscene.spheres, 0))->node, - evas_canvas3d_object_update(), - evas_canvas3d_node_bounding_box_get(NULL, NULL, NULL, &x1, &y1, NULL)); + evas_canvas3d_object_update(((Test_object *)eina_list_nth(globalscene.spheres, 0))->node); + evas_canvas3d_node_bounding_box_get(((Test_object *)eina_list_nth(globalscene.spheres, 0))->node, NULL, NULL, NULL, &x1, &y1, NULL); for (i = 0; i < globalscene.row; ++i) { @@ -152,7 +151,7 @@ void _recalculate_position() { shifty = (j * 2 - globalscene.col) * y1; m = (Test_object *)eina_list_nth(globalscene.spheres, count); - eo_do(m->node, evas_canvas3d_node_position_set(shifty, 0.0, shiftx)); + evas_canvas3d_node_position_set(m->node, shifty, 0.0, shiftx); count++; } } @@ -167,31 +166,29 @@ _on_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Test_object * item; if (!strcmp(ev->key, "Down")) { - eo_do(globalscene.camera_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z), - evas_canvas3d_node_position_set(x, y, (z - 5))); + evas_canvas3d_node_position_get(globalscene.camera_node, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); + evas_canvas3d_node_position_set(globalscene.camera_node, x, y, (z - 5)); } else if (!strcmp(ev->key, "Up")) { - eo_do(globalscene.camera_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z), - evas_canvas3d_node_position_set(x, y, (z + 5))); + evas_canvas3d_node_position_get(globalscene.camera_node, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); + evas_canvas3d_node_position_set(globalscene.camera_node, x, y, (z + 5)); } else if (!strcmp(ev->key, "Left")) { - eo_do(((Test_object *)eina_list_nth(globalscene.spheres, 0))->node, - evas_canvas3d_node_scale_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z)); + evas_canvas3d_node_scale_get(((Test_object *)eina_list_nth(globalscene.spheres, 0))->node, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); EINA_LIST_FOREACH(globalscene.spheres, l, item) { - eo_do(item->node, evas_canvas3d_node_scale_set((x - SCALE_UNIT), (y - SCALE_UNIT), (z - SCALE_UNIT))); + evas_canvas3d_node_scale_set(item->node, (x - SCALE_UNIT), (y - SCALE_UNIT), (z - SCALE_UNIT)); } _recalculate_position(); } else if (!strcmp(ev->key, "Right")) { - eo_do(((Test_object *)eina_list_nth(globalscene.spheres, 0))->node, - evas_canvas3d_node_scale_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z)); + evas_canvas3d_node_scale_get(((Test_object *)eina_list_nth(globalscene.spheres, 0))->node, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); EINA_LIST_FOREACH(globalscene.spheres, l, item) { - eo_do(item->node, evas_canvas3d_node_scale_set((x + SCALE_UNIT), (y + SCALE_UNIT), (z + SCALE_UNIT))); + evas_canvas3d_node_scale_set(item->node, (x + SCALE_UNIT), (y + SCALE_UNIT), (z + SCALE_UNIT)); } _recalculate_position(); } @@ -212,27 +209,26 @@ _on_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *eo EINA Eina_Bool flag; if (ev->button == 1) { - eo_do(globalscene.scene, evas_canvas3d_scene_color_pick_enable_set(EINA_TRUE)); - eo_do(globalscene.scene, - flag = evas_canvas3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, NULL, NULL)); + evas_canvas3d_scene_color_pick_enable_set(globalscene.scene, EINA_TRUE); + flag = evas_canvas3d_scene_pick(globalscene.scene, ev->canvas.x, ev->canvas.y, &n, &m, NULL, NULL); time = clock() - time; diff_sec = ((float)time) / CLOCKS_PER_SEC / 10; if (flag) { fprintf(stdout, "Boom! Time expended for color pick: %2.7f .\n", diff_sec); - eo_do(n, evas_canvas3d_node_scale_set(VEC_3(SMALL_SCALE))); + evas_canvas3d_node_scale_set(n, VEC_3(SMALL_SCALE)); } } else { - eo_do(globalscene.scene, evas_canvas3d_scene_color_pick_enable_set(EINA_FALSE)); - eo_do(globalscene.scene, flag = evas_canvas3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, &s, &t)); + evas_canvas3d_scene_color_pick_enable_set(globalscene.scene, EINA_FALSE); + flag = evas_canvas3d_scene_pick(globalscene.scene, ev->canvas.x, ev->canvas.y, &n, &m, &s, &t); time = clock() - time; diff_sec = ((float)time) / CLOCKS_PER_SEC / 10; if (flag) { fprintf(stdout, "Boom! Time expended for geometry pick: %2.7f .\n", diff_sec); - eo_do(n, evas_canvas3d_node_scale_set(VEC_3(BIG_SCALE))); + evas_canvas3d_node_scale_set(n, VEC_3(BIG_SCALE)); } } } @@ -244,36 +240,27 @@ _init_sphere(void *this, const char *texture) sphere->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); sphere->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); sphere->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(sphere->primitive, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE), - evas_canvas3d_primitive_precision_set(50)); - eo_do(sphere->mesh, - evas_canvas3d_mesh_from_primitive_set(0, sphere->primitive), - evas_canvas3d_mesh_frame_material_set(0, sphere->material), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); + evas_canvas3d_primitive_form_set(sphere->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE); + evas_canvas3d_primitive_precision_set(sphere->primitive, 50); + evas_canvas3d_mesh_from_primitive_set(sphere->mesh, 0, sphere->primitive); + evas_canvas3d_mesh_frame_material_set(sphere->mesh, 0, sphere->material); + evas_canvas3d_mesh_shade_mode_set(sphere->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); - eo_do(sphere->mesh, evas_canvas3d_mesh_color_pick_enable_set(EINA_TRUE)); + evas_canvas3d_mesh_color_pick_enable_set(sphere->mesh, EINA_TRUE); sphere->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); - eo_do(sphere->texture, - evas_canvas3d_texture_file_set(texture, NULL), - evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, - EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, - EVAS_CANVAS3D_WRAP_MODE_REPEAT)); - eo_do(sphere->material, - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, sphere->texture), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, - 0.01, 0.01, 0.01, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, - 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, - 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(50.0)); + evas_canvas3d_texture_file_set(sphere->texture, texture, NULL); + evas_canvas3d_texture_filter_set(sphere->texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); + evas_canvas3d_texture_wrap_set(sphere->texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); + evas_canvas3d_material_texture_set(sphere->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, sphere->texture); + evas_canvas3d_material_enable_set(sphere->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(sphere->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(sphere->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_enable_set(sphere->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); + evas_canvas3d_material_color_set(sphere->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.01, 0.01, 0.01, 1.0); + evas_canvas3d_material_color_set(sphere->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_color_set(sphere->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(sphere->material, 50.0); return EINA_TRUE; } @@ -287,41 +274,29 @@ _init_scene(const char *texture) globalscene.scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - globalscene.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + globalscene.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); globalscene.camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(globalscene.camera, - evas_canvas3d_camera_projection_perspective_set(30.0, 1.0, 1.0, 1000.0)); + evas_canvas3d_camera_projection_perspective_set(globalscene.camera, 30.0, 1.0, 1.0, 1000.0); globalscene.camera_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(globalscene.camera_node, - evas_canvas3d_node_camera_set(globalscene.camera)); - eo_do(globalscene.root_node, - evas_canvas3d_node_member_add(globalscene.camera_node)); - eo_do(globalscene.camera_node, - evas_canvas3d_node_position_set(0.0, 30.0, 800.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, -1000.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + evas_canvas3d_node_camera_set(globalscene.camera_node, globalscene.camera); + evas_canvas3d_node_member_add(globalscene.root_node, globalscene.camera_node); + evas_canvas3d_node_position_set(globalscene.camera_node, 0.0, 30.0, 800.0); + evas_canvas3d_node_look_at_set(globalscene.camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, -1000.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); globalscene.light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(globalscene.light, - evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_directional_set(EINA_TRUE)); + evas_canvas3d_light_ambient_set(globalscene.light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_diffuse_set(globalscene.light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(globalscene.light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_directional_set(globalscene.light, EINA_TRUE); globalscene.light_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(globalscene.light_node, - evas_canvas3d_node_light_set(globalscene.light), - evas_canvas3d_node_position_set(100.0, 50.0, 300.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 1.0, 1.0, 1.0)); - eo_do(globalscene.root_node, - evas_canvas3d_node_member_add(globalscene.light_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_light_set(globalscene.light_node, globalscene.light); + evas_canvas3d_node_position_set(globalscene.light_node, 100.0, 50.0, 300.0); + evas_canvas3d_node_look_at_set(globalscene.light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 1.0, 1.0, 1.0); + evas_canvas3d_node_member_add(globalscene.root_node, globalscene.light_node); tmp = 0.01; for (i = 0; i < globalscene.col * globalscene.row; i++) @@ -338,24 +313,22 @@ _init_scene(const char *texture) m->material = spheretmp->material; m->texture = spheretmp->texture; } - m->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); + m->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); m->speed = tmp; m->sphere_animate = _animate_sphere; m->animate = ecore_timer_add(m->speed, m->sphere_animate, m); - eo_do(globalscene.root_node, evas_canvas3d_node_member_add(m->node)); - eo_do(m->node, evas_canvas3d_node_mesh_add(m->mesh), - evas_canvas3d_node_scale_set(VEC_3(INIT_SCALE))); + evas_canvas3d_node_member_add(globalscene.root_node, m->node); + evas_canvas3d_node_mesh_add(m->node, m->mesh); + evas_canvas3d_node_scale_set(m->node, VEC_3(INIT_SCALE)); globalscene.spheres = eina_list_append(globalscene.spheres, m); tmp += 0.01; } _recalculate_position(); - eo_do(globalscene.scene, - evas_canvas3d_scene_root_node_set(globalscene.root_node), - evas_canvas3d_scene_camera_node_set(globalscene.camera_node), - evas_canvas3d_scene_size_set(WIDTH, HEIGHT)); + evas_canvas3d_scene_root_node_set(globalscene.scene, globalscene.root_node); + evas_canvas3d_scene_camera_node_set(globalscene.scene, globalscene.camera_node); + evas_canvas3d_scene_size_set(globalscene.scene, WIDTH, HEIGHT); return EINA_TRUE; } @@ -410,11 +383,10 @@ int main(int argc, char **argv) image = evas_object_image_filled_add(evas); - eo_do(image, - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_visible_set(image, EINA_TRUE); evas_object_focus_set(image, EINA_TRUE); - eo_do(image, evas_obj_image_scene_set(globalscene.scene)); + evas_obj_image_scene_set(image, globalscene.scene); r = evas_object_key_grab(image, "Down", 0, 0, EINA_TRUE); r = evas_object_key_grab(image, "Up", 0, 0, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c index eec0234960..e393c14deb 100644 --- a/src/examples/evas/evas-3d-cube-rotate.c +++ b/src/examples/evas/evas-3d-cube-rotate.c @@ -89,7 +89,7 @@ _rotate_x_reload(Evas_Canvas3D_Scene *eo_scene, Evas_Event_Mouse_Down *ev, Evas_ Evas_Real s, t; int mouse_diff; - eo_do(eo_scene, evas_canvas3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, &s, &t)); + evas_canvas3d_scene_pick(eo_scene, ev->canvas.x, ev->canvas.y, &n, &m, &s, &t); if ((n == node) && (m == mesh)) { @@ -140,7 +140,7 @@ _animate_scene(void *data) angle += sc->angle; - eo_do(sc->mesh_node, evas_canvas3d_node_orientation_angle_axis_set(angle, 0, 1.0, 0.0)); + evas_canvas3d_node_orientation_angle_axis_set(sc->mesh_node, angle, 0, 1.0, 0.0); return EINA_TRUE; } @@ -149,39 +149,32 @@ static void _camera_setup(Scene_Data *data) { data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(data->camera, - evas_canvas3d_camera_projection_perspective_set(20.0, 1.0, 2.0, 50.0)); + evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0); - data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(data->camera_node, - evas_canvas3d_node_camera_set(data->camera), - evas_canvas3d_node_position_set(3.0, 3.0, 10.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); + data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + evas_canvas3d_node_camera_set(data->camera_node, data->camera); + evas_canvas3d_node_position_set(data->camera_node, 3.0, 3.0, 10.0); + evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node)); + evas_canvas3d_node_member_add(data->root_node, data->camera_node); } static void _light_setup(Scene_Data *data) { - data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS,evas); + data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(data->light, - evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); + evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); - data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(data->light_node, - evas_canvas3d_node_light_set(data->light), - evas_canvas3d_node_position_set(5.0, 5.0, 10.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); + evas_canvas3d_node_light_set(data->light_node, data->light); + evas_canvas3d_node_position_set(data->light_node, 5.0, 5.0, 10.0); + evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node)); + evas_canvas3d_node_member_add(data->root_node, data->light_node); } static void @@ -190,51 +183,44 @@ _mesh_setup(Scene_Data *data) /* Setup material. */ data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(data->material, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(100.0)); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(data->material, 100.0); /* Setup primitive */ data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(data->cube, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE)); + evas_canvas3d_primitive_form_set(data->cube, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE); /* Setup mesh. */ data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(data->mesh, - evas_canvas3d_mesh_from_primitive_set(0, data->cube), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG), - evas_canvas3d_mesh_frame_material_set(0, data->material)); + evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube); + evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); + evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); - data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(data->root_node, - evas_canvas3d_node_member_add(data->mesh_node)); - eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh)); + data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node); + evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); } static void _scene_setup(Scene_Data *data) { scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); - eo_do(scene, - evas_canvas3d_scene_size_set(WIDTH, HEIGHT), - evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0)); + evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); + evas_canvas3d_scene_background_color_set(scene, 0.0, 0.0, 0.0, 0.0); _camera_setup(data); _light_setup(data); _mesh_setup(data); - eo_do(scene, - evas_canvas3d_scene_root_node_set(data->root_node), - evas_canvas3d_scene_camera_node_set(data->camera_node)); + evas_canvas3d_scene_root_node_set(scene, data->root_node); + evas_canvas3d_scene_camera_node_set(scene, data->camera_node); data->mouse_old_x = 0; data->mouse_diff_x = 0; @@ -276,8 +262,7 @@ main(void) evas_object_show(image); /* Set the image object as render target for 3D scene. */ - eo_do(image, - evas_obj_image_scene_set(scene)); + evas_obj_image_scene_set(image, scene); evas_object_focus_set(image, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c index d3bcbbe6b5..6f6f4208c2 100644 --- a/src/examples/evas/evas-3d-cube.c +++ b/src/examples/evas/evas-3d-cube.c @@ -110,8 +110,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - eo_do(background, efl_gfx_size_set(w, h)); - eo_do(image, efl_gfx_size_set(w, h)); + efl_gfx_size_set(background, w, h); + efl_gfx_size_set(image, w, h); } static Eina_Bool @@ -122,8 +122,7 @@ _animate_scene(void *data) angle += 0.5; - eo_do(scene->mesh_node, - evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0)); + evas_canvas3d_node_orientation_angle_axis_set(scene->mesh_node, angle, 1.0, 1.0, 1.0); /* Rotate */ if (angle > 360.0) angle -= 360.0f; @@ -136,38 +135,30 @@ _camera_setup(Scene_Data *data) { data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(data->camera, - evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0)); + evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); data->camera_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(data->camera_node, - evas_canvas3d_node_camera_set(data->camera), - evas_canvas3d_node_position_set(0.0, 0.0, 10.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + evas_canvas3d_node_camera_set(data->camera_node, data->camera); + evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); + evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(data->root_node, data->camera_node); } static void _light_setup(Scene_Data *data) { data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(data->light, - evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); + evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); data->light_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(data->light_node, - evas_canvas3d_node_light_set(data->light), - evas_canvas3d_node_position_set(0.0, 0.0, 10.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_light_set(data->light_node, data->light); + evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); + evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(data->root_node, data->light_node); } static void _mesh_setup(Scene_Data *data) @@ -175,65 +166,49 @@ _mesh_setup(Scene_Data *data) /* Setup material. */ data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(data->material, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(100.0)); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(data->material, 100.0); /* Setup mesh. */ data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(data->mesh, - evas_canvas3d_mesh_vertex_count_set(24), - evas_canvas3d_mesh_frame_add(0), - - evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, - 12 * sizeof(float), &cube_vertices[ 0]), - evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, - 12 * sizeof(float), &cube_vertices[ 3]), - evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, - 12 * sizeof(float), &cube_vertices[ 6]), - evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, - 12 * sizeof(float), &cube_vertices[10]), - - evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, - 36, &cube_indices[0]), - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), - - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG), - - evas_canvas3d_mesh_frame_material_set(0, data->material)); + evas_canvas3d_mesh_vertex_count_set(data->mesh, 24); + evas_canvas3d_mesh_frame_add(data->mesh, 0); + evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]); + evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 12 * sizeof(float), &cube_vertices[ 3]); + evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, 12 * sizeof(float), &cube_vertices[ 6]); + evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]); + evas_canvas3d_mesh_index_data_set(data->mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]); + evas_canvas3d_mesh_vertex_assembly_set(data->mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); + evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); + evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); data->mesh_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node)); - eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node); + evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); } static void _scene_setup(Scene_Data *data) { data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - eo_do(data->scene, - evas_canvas3d_scene_size_set(WIDTH, HEIGHT); - evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0)); + evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); + evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); data->root_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); _mesh_setup(data); - eo_do(data->scene, - evas_canvas3d_scene_root_node_set(data->root_node), - evas_canvas3d_scene_camera_node_set(data->camera_node)); + evas_canvas3d_scene_root_node_set(data->scene, data->root_node); + evas_canvas3d_scene_camera_node_set(data->scene, data->camera_node); } int @@ -259,19 +234,17 @@ main(void) /* Add a background rectangle objects. */ background = eo_add(EVAS_RECTANGLE_CLASS, evas); - eo_do(background, - efl_gfx_color_set(0, 0, 0, 255), - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_color_set(background, 0, 0, 0, 255); + efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = evas_object_image_filled_add(evas); - eo_do(image, - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ - eo_do(image, evas_obj_image_scene_set(data.scene)); + evas_obj_image_scene_set(image, data.scene); /* Add animation timer callback. */ ecore_timer_add(0.016, _animate_scene, &data); diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c index a2dd1febf5..e46c2f7c64 100644 --- a/src/examples/evas/evas-3d-cube2.c +++ b/src/examples/evas/evas-3d-cube2.c @@ -79,8 +79,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - eo_do(background, efl_gfx_size_set(w, h)); - eo_do(image, efl_gfx_size_set(w, h)); + efl_gfx_size_set(background, w, h); + efl_gfx_size_set(image, w, h); } static Eina_Bool @@ -93,8 +93,7 @@ _animate_scene(void *data) angle += 0.2; - eo_do(scene->mesh_node, - evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0)); + evas_canvas3d_node_orientation_angle_axis_set(scene->mesh_node, angle, 1.0, 1.0, 1.0); /* Rotate */ if (angle > 360.0) angle -= 360.0f; @@ -104,7 +103,7 @@ _animate_scene(void *data) if (frame >= 20) inc = -1; else if (frame <= 0) inc = 1; - eo_do(scene->mesh_node, evas_canvas3d_node_mesh_frame_set(scene->mesh, frame)); + evas_canvas3d_node_mesh_frame_set(scene->mesh_node, scene->mesh, frame); return EINA_TRUE; } @@ -113,39 +112,30 @@ static void _camera_setup(Scene_Data *data) { data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(data->camera, - evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0)); + evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); data->camera_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(data->camera_node, - evas_canvas3d_node_camera_set(data->camera), - evas_canvas3d_node_position_set(0.0, 0.0, 3.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(data->root_node, - evas_canvas3d_node_member_add(data->camera_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + evas_canvas3d_node_camera_set(data->camera_node, data->camera); + evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 3.0); + evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(data->root_node, data->camera_node); } static void _light_setup(Scene_Data *data) { data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(data->light, - evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); + evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); data->light_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(data->light_node, - evas_canvas3d_node_light_set(data->light), - evas_canvas3d_node_position_set(0.0, 0.0, 10.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_light_set(data->light_node, data->light); + evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); + evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(data->root_node, data->light_node); } static void @@ -155,86 +145,70 @@ _mesh_setup(Scene_Data *data) data->material0 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); data->material1 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(data->material0, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), + evas_canvas3d_material_enable_set(data->material0, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material0, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material0, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material0, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); + evas_canvas3d_material_color_set(data->material0, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_material_color_set(data->material0, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0); + evas_canvas3d_material_color_set(data->material0, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(data->material0, 100.0); - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(100.0)); - - eo_do(data->material1, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), - - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(100.0)); + evas_canvas3d_material_enable_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); + evas_canvas3d_material_color_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_material_color_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0); + evas_canvas3d_material_color_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(data->material1, 100.0); data->texture0 = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); data->texture1 = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); data->texture_normal = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); - eo_do(data->texture0, - evas_canvas3d_texture_data_set(EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels0[0])); - eo_do(data->texture1, - evas_canvas3d_texture_data_set(EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels1[0])); - eo_do(data->texture_normal, - evas_canvas3d_texture_file_set(normal_map_path, NULL)); + evas_canvas3d_texture_data_set(data->texture0, EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels0[0]); + evas_canvas3d_texture_data_set(data->texture1, EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels1[0]); + evas_canvas3d_texture_file_set(data->texture_normal, normal_map_path, NULL); - eo_do(data->material0, - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture0)); - eo_do(data->material1, - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture1)); - eo_do(data->material1, - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, data->texture_normal)); + evas_canvas3d_material_texture_set(data->material0, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture0); + evas_canvas3d_material_texture_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture1); + evas_canvas3d_material_texture_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, data->texture_normal); /* Set data of primitive */ data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(data->cube, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE)); + evas_canvas3d_primitive_form_set(data->cube, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE); /* Setup mesh. */ data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(data->mesh, - evas_canvas3d_mesh_from_primitive_set(0, data->cube), - evas_canvas3d_mesh_frame_material_set(0, data->material0), - evas_canvas3d_mesh_frame_add(20), - evas_canvas3d_mesh_frame_material_set(20, data->material1), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP)); + evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube); + evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material0); + evas_canvas3d_mesh_frame_add(data->mesh, 20); + evas_canvas3d_mesh_frame_material_set(data->mesh, 20, data->material1); + evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP); data->mesh_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node)); - eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node); + evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); } static void _scene_setup(Scene_Data *data) { data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - eo_do(data->scene, - evas_canvas3d_scene_size_set(WIDTH, HEIGHT), - evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0)); + evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); + evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); data->root_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); _mesh_setup(data); - eo_do(data->scene, - evas_canvas3d_scene_root_node_set(data->root_node), - evas_canvas3d_scene_camera_node_set(data->camera_node)); + evas_canvas3d_scene_root_node_set(data->scene, data->root_node); + evas_canvas3d_scene_camera_node_set(data->scene, data->camera_node); } int @@ -261,19 +235,17 @@ main(void) /* Add a background rectangle objects. */ background = eo_add(EVAS_RECTANGLE_CLASS, evas); - eo_do(background, - efl_gfx_color_set(0, 0, 0, 255), - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_color_set(background, 0, 0, 0, 255); + efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = evas_object_image_filled_add(evas); - eo_do(image, - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ - eo_do(image, evas_obj_image_scene_set(data.scene)); + evas_obj_image_scene_set(image, data.scene); /* Add animation timer callback. */ ecore_timer_add(0.01, _animate_scene, &data); diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c index 9067825e00..dc09191e05 100644 --- a/src/examples/evas/evas-3d-eet.c +++ b/src/examples/evas/evas-3d-eet.c @@ -58,8 +58,7 @@ _animate_eet(void *data) { angle += 0.5; - eo_do((Evas_Canvas3D_Node *)data, - evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0)); + evas_canvas3d_node_orientation_angle_axis_set((Evas_Canvas3D_Node *)data, angle, 1.0, 1.0, 1.0); /* Rotate */ if (angle > 360.0) angle -= 360.0f; @@ -72,7 +71,7 @@ _animate_md2(void *data) { static int frame = 0; - eo_do((Evas_Canvas3D_Node *)data, evas_canvas3d_node_mesh_frame_set(mesh, frame)); + evas_canvas3d_node_mesh_frame_set((Evas_Canvas3D_Node *)data, mesh, frame); frame += 32; @@ -93,8 +92,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - eo_do(background, efl_gfx_size_set(w, h)); - eo_do(image, efl_gfx_size_set(w, h)); + efl_gfx_size_set(background, w, h); + efl_gfx_size_set(image, w, h); } int @@ -119,113 +118,86 @@ main(void) scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); /* Add the root node for the scene. */ - root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); /* Add the camera. */ camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(camera, - evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0)); + evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0); - camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(camera_node, - evas_canvas3d_node_camera_set(camera)); - eo_do(root_node, - evas_canvas3d_node_member_add(camera_node)); - eo_do(camera_node, - evas_canvas3d_node_position_set(200.0, 0.0, 40.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0)); + camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + evas_canvas3d_node_camera_set(camera_node, camera); + evas_canvas3d_node_member_add(root_node, camera_node); + evas_canvas3d_node_position_set(camera_node, 200.0, 0.0, 40.0); + evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0); /* Add the light. */ light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(light, - evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_directional_set(EINA_TRUE)); + evas_canvas3d_light_ambient_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_directional_set(light, EINA_TRUE); - light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(light_node, - evas_canvas3d_node_light_set(light), - evas_canvas3d_node_position_set(1000.0, 0.0, 1000.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(root_node, - evas_canvas3d_node_member_add(light_node)); + light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_light_set(light_node, light); + evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0); + evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(root_node, light_node); /* Add the meshes. */ mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); mesh2 = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(mesh, - efl_file_set(input_model_path, NULL), - evas_canvas3d_mesh_frame_material_set(0, material), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); + efl_file_set(mesh, input_model_path, NULL); + evas_canvas3d_mesh_frame_material_set(mesh, 0, material); + evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); - eo_do(material, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, - 0.50, 0.50, 0.00, 0.30), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, - 0.00, 0.50, 0.50, 0.30), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, - 0.50, 0.00, 0.50, 0.30), - evas_canvas3d_material_shininess_set(50.0)); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.50, 0.50, 0.00, 0.30); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.00, 0.50, 0.50, 0.30); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.50, 0.00, 0.50, 0.30); + evas_canvas3d_material_shininess_set(material, 50.0); if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES)) fprintf(stderr, "Failed to create folder %s\n\n", PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES); - eo_do(mesh, efl_file_save(output_model_path, NULL, NULL)); + efl_file_save(mesh, output_model_path, NULL, NULL); - eo_do(mesh2, - efl_file_set(output_model_path, NULL), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); + efl_file_set(mesh2, output_model_path, NULL); + evas_canvas3d_mesh_shade_mode_set(mesh2, EVAS_CANVAS3D_SHADE_MODE_PHONG); - mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); + mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(root_node, - evas_canvas3d_node_member_add(mesh_node)); - eo_do(mesh_node, - evas_canvas3d_node_mesh_add(mesh), - evas_canvas3d_node_position_set(0.0, -40.0, 0.0)); + evas_canvas3d_node_member_add(root_node, mesh_node); + evas_canvas3d_node_mesh_add(mesh_node, mesh); + evas_canvas3d_node_position_set(mesh_node, 0.0, -40.0, 0.0); - mesh_node2 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(root_node, - evas_canvas3d_node_member_add(mesh_node2)); - eo_do(mesh_node2, - evas_canvas3d_node_mesh_add(mesh2), - evas_canvas3d_node_position_set(0.0, 40.0, 0.0)); + mesh_node2 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_member_add(root_node, mesh_node2); + evas_canvas3d_node_mesh_add(mesh_node2, mesh2); + evas_canvas3d_node_position_set(mesh_node2, 0.0, 40.0, 0.0); /* Set up scene. */ - eo_do(scene, - evas_canvas3d_scene_root_node_set(root_node), - evas_canvas3d_scene_camera_node_set(camera_node), - evas_canvas3d_scene_size_set(WIDTH, HEIGHT)); + evas_canvas3d_scene_root_node_set(scene, root_node); + evas_canvas3d_scene_camera_node_set(scene, camera_node); + evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); /* Add a background rectangle objects. */ background = eo_add(EVAS_RECTANGLE_CLASS, evas); - eo_do(background, - efl_gfx_color_set(0, 0, 0, 255), - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_color_set(background, 0, 0, 0, 255); + efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = evas_object_image_filled_add(evas); - eo_do(image, - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ - eo_do(image, evas_obj_image_scene_set(scene)); + evas_obj_image_scene_set(image, scene); ecore_timer_add(0.01, _animate_md2, mesh_node); ecore_timer_add(0.01, _animate_eet, mesh_node2); diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c index 5d191e800f..33bd05cc8c 100644 --- a/src/examples/evas/evas-3d-fog.c +++ b/src/examples/evas/evas-3d-fog.c @@ -59,8 +59,8 @@ _on_canvas_resize(Ecore_Evas *ee) ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); evas_object_resize(background, w, h); - eo_do(background, efl_gfx_size_set(w, h)); - eo_do(image, efl_gfx_size_set(w, h)); + efl_gfx_size_set(background, w, h); + efl_gfx_size_set(image, w, h); } static Eina_Bool @@ -71,8 +71,7 @@ _animate_scene(void *data) angle += 0.5; - eo_do(scene->animation_node, - evas_canvas3d_node_orientation_angle_axis_set(angle, 0.0, 1.0, 0.0)); + evas_canvas3d_node_orientation_angle_axis_set(scene->animation_node, angle, 0.0, 1.0, 0.0); if (angle > 360.0) angle -= 360.0f; @@ -84,49 +83,40 @@ _camera_setup(Scene_Data *data) { data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(data->camera, - evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0)); + evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); data->camera_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(data->camera_node, - evas_canvas3d_node_camera_set(data->camera), - evas_canvas3d_node_position_set(0.0, 0.0, 7.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); + evas_canvas3d_node_camera_set(data->camera_node, data->camera); + evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 7.0); + evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node)); + evas_canvas3d_node_member_add(data->root_node, data->camera_node); } static void _light_setup(Scene_Data *data) { data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(data->light, - evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); + evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); data->light_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(data->light_node, - evas_canvas3d_node_light_set(data->light), - evas_canvas3d_node_position_set(0.0, 0.0, 10.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_light_set(data->light_node, data->light); + evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); + evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(data->root_node, data->light_node); } static void _set_ball(Eo *mesh, Eo *sphere, Evas_Canvas3D_Material *material) { - eo_do(mesh, - evas_canvas3d_mesh_from_primitive_set(0, sphere), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG), - evas_canvas3d_mesh_frame_material_set(0, material)); + evas_canvas3d_mesh_from_primitive_set(mesh, 0, sphere); + evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); + evas_canvas3d_mesh_frame_material_set(mesh, 0, material); } @@ -135,20 +125,17 @@ _mesh_setup(Scene_Data *data) { data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(data->material, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(100.0)); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(data->material, 100.0); data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(data->sphere, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE), - evas_canvas3d_primitive_precision_set(50)); + evas_canvas3d_primitive_form_set(data->sphere, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE); + evas_canvas3d_primitive_precision_set(data->sphere, 50); data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); data->mesh1 = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); @@ -157,28 +144,27 @@ _mesh_setup(Scene_Data *data) _set_ball(data->mesh1, data->sphere, data->material); data->animation_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); data->mesh_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(data->animation_node, evas_canvas3d_node_member_add(data->mesh_node)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->animation_node)); - eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh), - evas_canvas3d_node_position_set(0.0, 0.0, 3.0)); + evas_canvas3d_node_member_add(data->animation_node, data->mesh_node); + evas_canvas3d_node_member_add(data->root_node, data->animation_node); + evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); + evas_canvas3d_node_position_set(data->mesh_node, 0.0, 0.0, 3.0); data->mesh_node1 = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node1)); - eo_do(data->mesh_node1, evas_canvas3d_node_mesh_add(data->mesh1), - evas_canvas3d_node_scale_set(3, 3, 3)); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node1); + evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1); + evas_canvas3d_node_scale_set(data->mesh_node1, 3, 3, 3); - eo_do(data->mesh, evas_canvas3d_mesh_fog_enable_set(EINA_TRUE), evas_canvas3d_mesh_fog_color_set(FOG_COLOR, FOG_FACTOR)); - eo_do(data->mesh1, evas_canvas3d_mesh_fog_enable_set(EINA_TRUE), evas_canvas3d_mesh_fog_color_set(FOG_COLOR, FOG_FACTOR)); + evas_canvas3d_mesh_fog_enable_set(data->mesh, EINA_TRUE); + evas_canvas3d_mesh_fog_color_set(data->mesh, FOG_COLOR, FOG_FACTOR); + evas_canvas3d_mesh_fog_enable_set(data->mesh1, EINA_TRUE); + evas_canvas3d_mesh_fog_color_set(data->mesh1, FOG_COLOR, FOG_FACTOR); } static void @@ -186,21 +172,18 @@ _scene_setup(Scene_Data *data) { data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - eo_do(data->scene, - evas_canvas3d_scene_size_set(WIDTH, HEIGHT); - evas_canvas3d_scene_background_color_set(FOG_COLOR, 1)); + evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); + evas_canvas3d_scene_background_color_set(data->scene, FOG_COLOR, 1); data->root_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); _mesh_setup(data); - eo_do(data->scene, - evas_canvas3d_scene_root_node_set(data->root_node), - evas_canvas3d_scene_camera_node_set(data->camera_node)); + evas_canvas3d_scene_root_node_set(data->scene, data->root_node); + evas_canvas3d_scene_camera_node_set(data->scene, data->camera_node); } int @@ -227,20 +210,18 @@ main(void) /* Add a background rectangle objects. */ background = eo_add(EVAS_RECTANGLE_CLASS, evas); - eo_do(background, - efl_gfx_color_set(0, 0, 0, 255), - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_color_set(background, 0, 0, 0, 255); + efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = evas_object_image_filled_add(evas); - eo_do(image, - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ - eo_do(image, evas_obj_image_scene_set(data.scene)); + evas_obj_image_scene_set(image, data.scene); /* Add animation timer callback. */ ecore_animator_frametime_set(0.008); diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c index 94d43f28e3..4e1323f5b4 100644 --- a/src/examples/evas/evas-3d-frustum.c +++ b/src/examples/evas/evas-3d-frustum.c @@ -100,18 +100,17 @@ _redraw_bounding_object(void *data) Eo *current_mesh; Eina_List *meshes = NULL, *l; - eo_do(scene->mesh_node, meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get()); + meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(scene->mesh_node); EINA_LIST_FOREACH(meshes, l, current_mesh) { - eo_do(scene->mesh_node, evas_canvas3d_node_mesh_del(current_mesh)); + evas_canvas3d_node_mesh_del(scene->mesh_node, current_mesh); } switch (key) { case EVAS_CANVAS3D_FRUSTUM_MODE_BSPHERE: { - eo_do(scene->mesh_node_model, - evas_canvas3d_node_bounding_sphere_get(&x0, &y0, &z0, &rad)); + evas_canvas3d_node_bounding_sphere_get(scene->mesh_node_model, &x0, &y0, &z0, &rad); current_mesh = scene->mesh_sphere; px = x0; py = y0; @@ -121,9 +120,7 @@ _redraw_bounding_object(void *data) } case EVAS_CANVAS3D_FRUSTUM_MODE_AABB: { - eo_do(scene->mesh_node_model, - evas_canvas3d_node_bounding_box_get(&x0, &y0, &z0, - &x1, &y1, &z1)); + evas_canvas3d_node_bounding_box_get(scene->mesh_node_model, &x0, &y0, &z0, &x1, &y1, &z1); current_mesh = scene->mesh_aabb; px = (x1 + x0) / 2; py = (y1 + y0) / 2; @@ -135,8 +132,7 @@ _redraw_bounding_object(void *data) } case EVAS_CANVAS3D_FRUSTUM_MODE_CENTRAL_POINT: { - eo_do(scene->mesh_node_model, - evas_canvas3d_node_bounding_sphere_get(&x0, &y0, &z0, &rad)); + evas_canvas3d_node_bounding_sphere_get(scene->mesh_node_model, &x0, &y0, &z0, &rad); current_mesh = scene->mesh_sphere; px = x0; py = y0; @@ -148,10 +144,9 @@ _redraw_bounding_object(void *data) return ECORE_CALLBACK_RENEW; } - eo_do(scene->mesh_node, - evas_canvas3d_node_mesh_add(current_mesh), - evas_canvas3d_node_position_set(px, py, pz), - evas_canvas3d_node_scale_set(sx, sy, sz)); + evas_canvas3d_node_mesh_add(scene->mesh_node, current_mesh); + evas_canvas3d_node_position_set(scene->mesh_node, px, py, pz); + evas_canvas3d_node_scale_set(scene->mesh_node, sx, sy, sz); return ECORE_CALLBACK_RENEW; } @@ -166,109 +161,97 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void if (!strcmp("w", ev->key)) { ffar += 20; - eo_do(scene->camera, evas_canvas3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar)); + evas_canvas3d_camera_projection_frustum_set(scene->camera, fleft, fright, fbottom, fup, fnear, ffar); } else if(!strcmp("s", ev->key)) { ffar -= 20; - eo_do(scene->camera, evas_canvas3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar)); + evas_canvas3d_camera_projection_frustum_set(scene->camera, fleft, fright, fbottom, fup, fnear, ffar); } else if(!strcmp("t", ev->key)) { fnear += 2; - eo_do(scene->camera, evas_canvas3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar)); + evas_canvas3d_camera_projection_frustum_set(scene->camera, fleft, fright, fbottom, fup, fnear, ffar); } else if(!strcmp("g", ev->key)) { fnear -= 2; - eo_do(scene->camera, evas_canvas3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar)); + evas_canvas3d_camera_projection_frustum_set(scene->camera, fleft, fright, fbottom, fup, fnear, ffar); } else if(!strcmp("i", ev->key)) { obj_y++; - eo_do(scene->mesh_node_model, - evas_canvas3d_node_position_set(obj_x, obj_y, obj_z)); + evas_canvas3d_node_position_set(scene->mesh_node_model, obj_x, obj_y, obj_z); } else if(!strcmp("k", ev->key)) { obj_y--; - eo_do(scene->mesh_node_model, - evas_canvas3d_node_position_set(obj_x, obj_y, obj_z)); + evas_canvas3d_node_position_set(scene->mesh_node_model, obj_x, obj_y, obj_z); } else if(!strcmp("o", ev->key)) { obj_z++; - eo_do(scene->mesh_node_model, - evas_canvas3d_node_position_set(obj_x, obj_y, obj_z)); + evas_canvas3d_node_position_set(scene->mesh_node_model, obj_x, obj_y, obj_z); } else if(!strcmp("u", ev->key)) { obj_z--; - eo_do(scene->mesh_node_model, - evas_canvas3d_node_position_set(obj_x, obj_y, obj_z)); + evas_canvas3d_node_position_set(scene->mesh_node_model, obj_x, obj_y, obj_z); } else if(!strcmp("l", ev->key)) { obj_x++; - eo_do(scene->mesh_node_model, - evas_canvas3d_node_position_set(obj_x, obj_y, obj_z)); + evas_canvas3d_node_position_set(scene->mesh_node_model, obj_x, obj_y, obj_z); } else if(!strcmp("j", ev->key)) { obj_x--; - eo_do(scene->mesh_node_model, - evas_canvas3d_node_position_set(obj_x, obj_y, obj_z)); + evas_canvas3d_node_position_set(scene->mesh_node_model, obj_x, obj_y, obj_z); } else if(!strcmp("z", ev->key)) { obj_sc_y+=0.02; - eo_do(scene->mesh_node_model, - evas_canvas3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z)); + evas_canvas3d_node_scale_set(scene->mesh_node_model, obj_sc_x, obj_sc_y, obj_sc_z); } else if(!strcmp("Z", ev->key)) { obj_sc_y-=0.02; - eo_do(scene->mesh_node_model, - evas_canvas3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z)); + evas_canvas3d_node_scale_set(scene->mesh_node_model, obj_sc_x, obj_sc_y, obj_sc_z); } else if(!strcmp("x", ev->key)) { obj_sc_z+=0.02; - eo_do(scene->mesh_node_model, - evas_canvas3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z)); + evas_canvas3d_node_scale_set(scene->mesh_node_model, obj_sc_x, obj_sc_y, obj_sc_z); } else if(!strcmp("X", ev->key)) { obj_sc_z-=0.02; - eo_do(scene->mesh_node_model, - evas_canvas3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z)); + evas_canvas3d_node_scale_set(scene->mesh_node_model, obj_sc_x, obj_sc_y, obj_sc_z); } else if(!strcmp("c", ev->key)) { obj_sc_x+=0.02; - eo_do(scene->mesh_node_model, - evas_canvas3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z)); + evas_canvas3d_node_scale_set(scene->mesh_node_model, obj_sc_x, obj_sc_y, obj_sc_z); } else if(!strcmp("C", ev->key)) { obj_sc_x-=0.02; - eo_do(scene->mesh_node_model, - evas_canvas3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z)); + evas_canvas3d_node_scale_set(scene->mesh_node_model, obj_sc_x, obj_sc_y, obj_sc_z); } else if(!strcmp("Return", ev->key)) { - eo_do(scene->camera, evas_canvas3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar)); + evas_canvas3d_camera_projection_frustum_set(scene->camera, fleft, fright, fbottom, fup, fnear, ffar); } else if (!strcmp("1", ev->key)) { - eo_do(scene->camera_node, evas_canvas3d_node_position_set(0.0, 0.0, 300.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); + evas_canvas3d_node_position_set(scene->camera_node, 0.0, 0.0, 300.0); + evas_canvas3d_node_look_at_set(scene->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); fprintf(stdout, "Changed position and view of camera\n"); } else if (!strcmp("2", ev->key)) { - eo_do(scene->camera_node, evas_canvas3d_node_position_set(300.0, 300.0, 300.0); - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); + evas_canvas3d_node_position_set(scene->camera_node, 300.0, 300.0, 300.0); + evas_canvas3d_node_look_at_set(scene->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); fprintf(stdout, "Changed position and view of camera\n"); } else if (!strcmp("3", ev->key)) @@ -289,7 +272,7 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void } _redraw_bounding_object(data); - eo_do(scene->camera, frustum = evas_canvas3d_camera_node_visible_get(scene->camera_node, scene->mesh_node_model, key)); + frustum = evas_canvas3d_camera_node_visible_get(scene->camera, scene->camera_node, scene->mesh_node_model, key); fprintf(stdout, "far - %f frustum - %d radius - %f\n", ffar, frustum, radius); } @@ -297,35 +280,30 @@ static void _camera_setup(Scene_Data *data) { data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(data->camera_node, - evas_canvas3d_node_camera_set(data->camera), - evas_canvas3d_node_position_set(0.0, 0.0, 300.0); - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); + data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + evas_canvas3d_node_camera_set(data->camera_node, data->camera); + evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 300.0); + evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); - eo_do(data->camera, evas_canvas3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar)); + evas_canvas3d_camera_projection_frustum_set(data->camera, fleft, fright, fbottom, fup, fnear, ffar); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node)); + evas_canvas3d_node_member_add(data->root_node, data->camera_node); } static void _light_setup(Scene_Data *data) { data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(data->light, - evas_canvas3d_light_ambient_set( 0.2, 0.2, 0.2, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); + evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); - data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS,evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(data->light_node, - evas_canvas3d_node_light_set(data->light), - evas_canvas3d_node_position_set(0.0, 0.0, 200.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0)); + data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_light_set(data->light_node, data->light); + evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 200.0); + evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node)); + evas_canvas3d_node_member_add(data->root_node, data->light_node); } static void @@ -333,43 +311,37 @@ _mesh_setup(Scene_Data *data) { data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(data->material, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(100.0)); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(data->material, 100.0); data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(data->cube, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE)); + evas_canvas3d_primitive_form_set(data->cube, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE); data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(data->sphere, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE), - evas_canvas3d_primitive_precision_set(20)); + evas_canvas3d_primitive_form_set(data->sphere, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE); + evas_canvas3d_primitive_precision_set(data->sphere, 20); data->mesh_aabb = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(data->mesh_aabb, - evas_canvas3d_mesh_from_primitive_set(0, data->cube), - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE), - evas_canvas3d_mesh_frame_material_set(0, data->material)); + evas_canvas3d_mesh_from_primitive_set(data->mesh_aabb, 0, data->cube); + evas_canvas3d_mesh_vertex_assembly_set(data->mesh_aabb, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES); + evas_canvas3d_mesh_shade_mode_set(data->mesh_aabb, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); + evas_canvas3d_mesh_frame_material_set(data->mesh_aabb, 0, data->material); data->mesh_sphere = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(data->mesh_sphere, - evas_canvas3d_mesh_from_primitive_set(0, data->sphere), - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE), - evas_canvas3d_mesh_frame_material_set(0, data->material)); + evas_canvas3d_mesh_from_primitive_set(data->mesh_sphere, 0, data->sphere); + evas_canvas3d_mesh_vertex_assembly_set(data->mesh_sphere, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES); + evas_canvas3d_mesh_shade_mode_set(data->mesh_sphere, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); + evas_canvas3d_mesh_frame_material_set(data->mesh_sphere, 0, data->material); data->mesh_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node)); - eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh_aabb)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node); + evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh_aabb); } static void @@ -379,27 +351,24 @@ _mesh_setup_model(Scene_Data *data) data->material_model = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); data->texture_model = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); - eo_do(data->texture_model, - evas_canvas3d_texture_file_set(texture_path, NULL), - evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT)); + evas_canvas3d_texture_file_set(data->texture_model, texture_path, NULL); + evas_canvas3d_texture_filter_set(data->texture_model, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); + evas_canvas3d_texture_wrap_set(data->texture_model, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); - eo_do(data->material_model, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.01, 0.01, 0.01, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_texture_set( EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture_model), - evas_canvas3d_material_shininess_set(100.0)); + evas_canvas3d_material_enable_set(data->material_model, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material_model, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material_model, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material_model, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material_model, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); + evas_canvas3d_material_color_set(data->material_model, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.01, 0.01, 0.01, 1.0); + evas_canvas3d_material_color_set(data->material_model, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_color_set(data->material_model, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_texture_set(data->material_model, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture_model); + evas_canvas3d_material_shininess_set(data->material_model, 100.0); - eo_do(data->mesh_model, - efl_file_set(mesh_path, NULL), - evas_canvas3d_mesh_frame_material_set(0, data->material_model), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE)); + efl_file_set(data->mesh_model, mesh_path, NULL); + evas_canvas3d_mesh_frame_material_set(data->mesh_model, 0, data->material_model); + evas_canvas3d_mesh_shade_mode_set(data->mesh_model, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); } static void @@ -407,29 +376,25 @@ _scene_setup(Scene_Data *data) { data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); _light_setup(data); _mesh_setup_model(data); _camera_setup(data); - data->mesh_node_model = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(data->mesh_node_model, - evas_canvas3d_node_position_set(obj_x, obj_y, obj_z), - evas_canvas3d_node_orientation_angle_axis_set(-90, 1.0, 0.0, 0.0), - evas_canvas3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node_model)); - eo_do(data->mesh_node_model, evas_canvas3d_node_mesh_add(data->mesh_model)); + data->mesh_node_model = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_position_set(data->mesh_node_model, obj_x, obj_y, obj_z); + evas_canvas3d_node_orientation_angle_axis_set(data->mesh_node_model, -90, 1.0, 0.0, 0.0); + evas_canvas3d_node_scale_set(data->mesh_node_model, obj_sc_x, obj_sc_y, obj_sc_z); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node_model); + evas_canvas3d_node_mesh_add(data->mesh_node_model, data->mesh_model); _mesh_setup(data); - eo_do(data->scene, - evas_canvas3d_scene_size_set( WIDTH, HEIGHT), - evas_canvas3d_scene_background_color_set(0.5, 0.5, 0.5, 0.0), - evas_canvas3d_scene_root_node_set(data->root_node); - evas_canvas3d_scene_camera_node_set(data->camera_node)); + evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); + evas_canvas3d_scene_background_color_set(data->scene, 0.5, 0.5, 0.5, 0.0); + evas_canvas3d_scene_root_node_set(data->scene, data->root_node); + evas_canvas3d_scene_camera_node_set(data->scene, data->camera_node); } int @@ -466,7 +431,7 @@ main(void) evas_object_show(image); evas_object_focus_set(image, EINA_TRUE); - eo_do(image, evas_obj_image_scene_set(data.scene)); + evas_obj_image_scene_set(image, data.scene); _redraw_bounding_object(&data); _show_help(); diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c index 31748dc2e6..487788437c 100644 --- a/src/examples/evas/evas-3d-hull.c +++ b/src/examples/evas/evas-3d-hull.c @@ -85,58 +85,52 @@ int rr; #define MODEL_MESH_INIT(name, model, shade) \ data->mesh_##name = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); \ - eo_do(data->mesh_##name, \ - efl_file_set(model, NULL), \ - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), \ - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_##shade), \ - evas_canvas3d_mesh_frame_material_set(0, data->material)); + efl_file_set(data->mesh_##name, model, NULL); \ + evas_canvas3d_mesh_vertex_assembly_set(data->mesh_##name, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); \ + evas_canvas3d_mesh_shade_mode_set(data->mesh_##name, EVAS_CANVAS3D_SHADE_MODE_##shade); \ + evas_canvas3d_mesh_frame_material_set(data->mesh_##name, 0, data->material); #define CONVEX_HULL_MESH_INIT(name) \ vert = eina_inarray_new(sizeof(float), 1); \ ind = eina_inarray_new(sizeof(unsigned short int), 1);\ - eo_do(data->mesh_##name, \ - evas_canvas3d_mesh_convex_hull_data_get(0, vert, ind)); \ + evas_canvas3d_mesh_convex_hull_data_get(data->mesh_##name, 0, vert, ind); \ vertex = (float*) vert->members;\ index = ind->members;\ data->mesh_##name##_ch = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); \ - eo_do(data->mesh_##name##_ch, \ - evas_canvas3d_mesh_vertex_count_set((vert->len / 10)), \ - evas_canvas3d_mesh_frame_add(0), \ - evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, \ - 10 * sizeof(float), &vertex[ 0]), \ - evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, \ - 10 * sizeof(float), &vertex[ 3]), \ - evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, \ - 10 * sizeof(float), &vertex[ 6]), \ - evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \ - ind->len, &index[0]), \ - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), \ - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR), \ - evas_canvas3d_mesh_frame_material_set(0, data->material)); \ + evas_canvas3d_mesh_vertex_count_set(data->mesh_##name##_ch, (vert->len / 10)); \ + evas_canvas3d_mesh_frame_add(data->mesh_##name##_ch, 0); \ + evas_canvas3d_mesh_frame_vertex_data_copy_set(data->mesh_##name##_ch, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, \ + 10 * sizeof(float), &vertex[ 0]); \ + evas_canvas3d_mesh_frame_vertex_data_copy_set(data->mesh_##name##_ch, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, \ + 10 * sizeof(float), &vertex[ 3]); \ + evas_canvas3d_mesh_frame_vertex_data_copy_set(data->mesh_##name##_ch, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, \ + 10 * sizeof(float), &vertex[ 6]); \ + evas_canvas3d_mesh_index_data_copy_set(data->mesh_##name##_ch, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \ + ind->len, &index[0]); \ + evas_canvas3d_mesh_vertex_assembly_set(data->mesh_##name##_ch, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); \ + evas_canvas3d_mesh_shade_mode_set(data->mesh_##name##_ch, EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR); \ + evas_canvas3d_mesh_frame_material_set(data->mesh_##name##_ch, 0, data->material); \ free(vert); \ free(ind); #define SWITCH_MESH(index, name, scale) \ case index: \ { \ - eo_do(scene->mesh_node, list = evas_canvas3d_node_mesh_list_get()); \ + list = evas_canvas3d_node_mesh_list_get(scene->mesh_node); \ mesh = eina_list_nth(list, 0); \ - eo_do(scene->mesh_node, \ - evas_canvas3d_node_mesh_del(mesh), \ - evas_canvas3d_node_mesh_add(scene->mesh_##name), \ - evas_canvas3d_node_scale_set(scale, scale, scale)); \ - eo_do(scene->mesh_node_convex_hull, list = evas_canvas3d_node_mesh_list_get()); \ + evas_canvas3d_node_mesh_del(scene->mesh_node, mesh); \ + evas_canvas3d_node_mesh_add(scene->mesh_node, scene->mesh_##name); \ + evas_canvas3d_node_scale_set(scene->mesh_node, scale, scale, scale); \ + list = evas_canvas3d_node_mesh_list_get(scene->mesh_node_convex_hull); \ mesh = eina_list_nth(list, 0); \ - eo_do(scene->mesh_node_convex_hull, \ - evas_canvas3d_node_mesh_del(mesh), \ - evas_canvas3d_node_mesh_add(scene->mesh_##name##_ch), \ - evas_canvas3d_node_scale_set(scale, scale, scale)); \ - eo_do(scene->mesh_node_blender, list = evas_canvas3d_node_mesh_list_get()); \ + evas_canvas3d_node_mesh_del(scene->mesh_node_convex_hull, mesh); \ + evas_canvas3d_node_mesh_add(scene->mesh_node_convex_hull, scene->mesh_##name##_ch); \ + evas_canvas3d_node_scale_set(scene->mesh_node_convex_hull, scale, scale, scale); \ + list = evas_canvas3d_node_mesh_list_get(scene->mesh_node_blender); \ mesh = eina_list_nth(list, 0); \ - eo_do(scene->mesh_node_blender, \ - evas_canvas3d_node_mesh_del(mesh), \ - evas_canvas3d_node_mesh_add(scene->mesh_blender_##name), \ - evas_canvas3d_node_scale_set(scale, scale, scale)); \ + evas_canvas3d_node_mesh_del(scene->mesh_node_blender, mesh); \ + evas_canvas3d_node_mesh_add(scene->mesh_node_blender, scene->mesh_blender_##name); \ + evas_canvas3d_node_scale_set(scene->mesh_node_blender, scale, scale, scale); \ _print_result(scene->mesh_##name##_ch, scene->mesh_blender_test_##name); \ break; \ } @@ -174,12 +168,12 @@ static void _print_result(Evas_Canvas3D_Mesh *mesh, Evas_Canvas3D_Mesh *convex_mesh) { int v_count = 0; - eo_do(mesh, v_count = evas_canvas3d_mesh_vertex_count_get()); + v_count = evas_canvas3d_mesh_vertex_count_get(mesh); printf("Vertex count is %d for convex hull\n", v_count); - eo_do(convex_mesh, v_count = evas_canvas3d_mesh_vertex_count_get()); + v_count = evas_canvas3d_mesh_vertex_count_get(convex_mesh); printf("Vertex count is %d for blender convex hull\n\n", v_count); @@ -199,8 +193,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - eo_do(background, efl_gfx_size_set(w, h)); - eo_do(image, efl_gfx_size_set(w, h)); + efl_gfx_size_set(background, w, h); + efl_gfx_size_set(image, w, h); } static Eina_Bool @@ -213,14 +207,11 @@ _animate_scene(void *data) if (angle >= 360.0) angle = 0.0; - eo_do(scene->mesh_node, - evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0)); + evas_canvas3d_node_orientation_angle_axis_set(scene->mesh_node, angle, 1.0, 1.0, 1.0); - eo_do(scene->mesh_node_convex_hull, - evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0)); + evas_canvas3d_node_orientation_angle_axis_set(scene->mesh_node_convex_hull, angle, 1.0, 1.0, 1.0); - eo_do(scene->mesh_node_blender, - evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0)); + evas_canvas3d_node_orientation_angle_axis_set(scene->mesh_node_blender, angle, 1.0, 1.0, 1.0); return EINA_TRUE; } @@ -266,38 +257,30 @@ _camera_setup(Scene_Data *data) { data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(data->camera, - evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0)); + evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); data->camera_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(data->camera_node, - evas_canvas3d_node_camera_set(data->camera), - evas_canvas3d_node_position_set(0.0, 0.0, 10.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + evas_canvas3d_node_camera_set(data->camera_node, data->camera); + evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); + evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(data->root_node, data->camera_node); } static void _light_setup(Scene_Data *data) { data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(data->light, - evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); + evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); data->light_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(data->light_node, - evas_canvas3d_node_light_set(data->light), - evas_canvas3d_node_position_set(0.0, 0.0, 10.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_light_set(data->light_node, data->light); + evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); + evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(data->root_node, data->light_node); } static void @@ -311,51 +294,41 @@ _mesh_setup(Scene_Data *data) /* Setup material. */ data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(data->material, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(100.0)); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(data->material, 100.0); /* Setup mesh sphere */ primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(primitive, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE), - evas_canvas3d_primitive_precision_set(10)); + evas_canvas3d_primitive_form_set(primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE); + evas_canvas3d_primitive_precision_set(primitive, 10); data->mesh_sphere = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(data->mesh_sphere, evas_canvas3d_mesh_from_primitive_set(0, primitive)); - eo_do(data->mesh_sphere, - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), - - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG), - - evas_canvas3d_mesh_frame_material_set(0, data->material)); + evas_canvas3d_mesh_from_primitive_set(data->mesh_sphere, 0, primitive); + evas_canvas3d_mesh_vertex_assembly_set(data->mesh_sphere, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); + evas_canvas3d_mesh_shade_mode_set(data->mesh_sphere, EVAS_CANVAS3D_SHADE_MODE_PHONG); + evas_canvas3d_mesh_frame_material_set(data->mesh_sphere, 0, data->material); /* Setup mesh torus */ data->mesh_torus = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(primitive, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_TORUS), - evas_canvas3d_primitive_precision_set(50)); - eo_do(data->mesh_torus, evas_canvas3d_mesh_from_primitive_set(0, primitive)); - eo_do(data->mesh_torus, - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG), - evas_canvas3d_mesh_frame_material_set(0, data->material)); + evas_canvas3d_primitive_form_set(primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_TORUS); + evas_canvas3d_primitive_precision_set(primitive, 50); + evas_canvas3d_mesh_from_primitive_set(data->mesh_torus, 0, primitive); + evas_canvas3d_mesh_vertex_assembly_set(data->mesh_torus, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); + evas_canvas3d_mesh_shade_mode_set(data->mesh_torus, EVAS_CANVAS3D_SHADE_MODE_PHONG); + evas_canvas3d_mesh_frame_material_set(data->mesh_torus, 0, data->material); /* Setup mesh cube */ data->mesh_cube = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(primitive, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE), - evas_canvas3d_primitive_precision_set(50)); - eo_do(data->mesh_cube, evas_canvas3d_mesh_from_primitive_set(0, primitive)); - eo_do(data->mesh_cube, - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG), - evas_canvas3d_mesh_frame_material_set(0, data->material)); + evas_canvas3d_primitive_form_set(primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE); + evas_canvas3d_primitive_precision_set(primitive, 50); + evas_canvas3d_mesh_from_primitive_set(data->mesh_cube, 0, primitive); + evas_canvas3d_mesh_vertex_assembly_set(data->mesh_cube, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); + evas_canvas3d_mesh_shade_mode_set(data->mesh_cube, EVAS_CANVAS3D_SHADE_MODE_PHONG); + evas_canvas3d_mesh_frame_material_set(data->mesh_cube, 0, data->material); MODEL_MESH_INIT(plain, plain, PHONG) MODEL_MESH_INIT(column, column, PHONG) @@ -382,13 +355,11 @@ _mesh_setup(Scene_Data *data) MODEL_MESH_INIT(blender_test_sonic, sonic_test, DIFFUSE) data->mesh_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node)); - eo_do(data->mesh_node, - evas_canvas3d_node_mesh_add(data->mesh_sphere), - evas_canvas3d_node_scale_set(SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE), - evas_canvas3d_node_position_set(3.0, 0.0, 0.0)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node); + evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh_sphere); + evas_canvas3d_node_scale_set(data->mesh_node, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE); + evas_canvas3d_node_position_set(data->mesh_node, 3.0, 0.0, 0.0); CONVEX_HULL_MESH_INIT(sphere) CONVEX_HULL_MESH_INIT(torus) @@ -402,43 +373,36 @@ _mesh_setup(Scene_Data *data) _print_result(data->mesh_sphere_ch, data->mesh_blender_test_sphere); data->mesh_node_convex_hull = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node_convex_hull)); - eo_do(data->mesh_node_convex_hull, - evas_canvas3d_node_position_set(0.0, 0.0, 0.0), - evas_canvas3d_node_scale_set(SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE), - evas_canvas3d_node_mesh_add(data->mesh_sphere_ch)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node_convex_hull); + evas_canvas3d_node_position_set(data->mesh_node_convex_hull, 0.0, 0.0, 0.0); + evas_canvas3d_node_scale_set(data->mesh_node_convex_hull, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE); + evas_canvas3d_node_mesh_add(data->mesh_node_convex_hull, data->mesh_sphere_ch); data->mesh_node_blender = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node_blender)); - eo_do(data->mesh_node_blender, - evas_canvas3d_node_position_set(-3.0, 0.0, 0.0), - evas_canvas3d_node_scale_set(SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE), - evas_canvas3d_node_mesh_add(data->mesh_blender_sphere)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node_blender); + evas_canvas3d_node_position_set(data->mesh_node_blender, -3.0, 0.0, 0.0); + evas_canvas3d_node_scale_set(data->mesh_node_blender, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE); + evas_canvas3d_node_mesh_add(data->mesh_node_blender, data->mesh_blender_sphere); } static void _scene_setup(Scene_Data *data) { data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - eo_do(data->scene, - evas_canvas3d_scene_size_set(WIDTH, HEIGHT); - evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0)); + evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); + evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); data->root_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); _mesh_setup(data); - eo_do(data->scene, - evas_canvas3d_scene_root_node_set(data->root_node), - evas_canvas3d_scene_camera_node_set(data->camera_node)); + evas_canvas3d_scene_root_node_set(data->scene, data->root_node); + evas_canvas3d_scene_camera_node_set(data->scene, data->camera_node); } int @@ -468,22 +432,20 @@ main(void) /* Add a background rectangle objects. */ background = eo_add(EVAS_RECTANGLE_CLASS, evas); - eo_do(background, - efl_gfx_color_set(0, 0, 0, 255), - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_color_set(background, 0, 0, 0, 255); + efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = evas_object_image_filled_add(evas); - eo_do(image, - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_visible_set(image, EINA_TRUE); evas_object_show(image), evas_object_focus_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ - eo_do(image, evas_obj_image_scene_set(data.scene)); + evas_obj_image_scene_set(image, data.scene); evas_object_event_callback_add(image, EVAS_CALLBACK_KEY_DOWN, _key_down, &data); diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c index 9409efc5b7..e19dfd6630 100644 --- a/src/examples/evas/evas-3d-md2.c +++ b/src/examples/evas/evas-3d-md2.c @@ -47,7 +47,7 @@ _animate_scene(void *data) { static int frame = 0; - eo_do((Evas_Canvas3D_Node *)data, evas_canvas3d_node_mesh_frame_set(mesh, frame)); + evas_canvas3d_node_mesh_frame_set((Evas_Canvas3D_Node *)data, mesh, frame); frame += 32; @@ -68,8 +68,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - eo_do(background, efl_gfx_size_set(w, h)); - eo_do(image, efl_gfx_size_set(w, h)); + efl_gfx_size_set(background, w, h); + efl_gfx_size_set(image, w, h); } int @@ -94,102 +94,76 @@ main(void) scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); /* Add the root node for the scene. */ - root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); /* Add the camera. */ camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(camera, - evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0)); + evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0); camera_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(camera_node, - evas_canvas3d_node_camera_set(camera)); - eo_do(root_node, - evas_canvas3d_node_member_add(camera_node)); - eo_do(camera_node, - evas_canvas3d_node_position_set(100.0, 0.0, 20.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + evas_canvas3d_node_camera_set(camera_node, camera); + evas_canvas3d_node_member_add(root_node, camera_node); + evas_canvas3d_node_position_set(camera_node, 100.0, 0.0, 20.0); + evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0); /* Add the light. */ light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(light, - evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_directional_set(EINA_TRUE)); + evas_canvas3d_light_ambient_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_directional_set(light, EINA_TRUE); light_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(light_node, - evas_canvas3d_node_light_set(light), - evas_canvas3d_node_position_set(1000.0, 0.0, 1000.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(root_node, - evas_canvas3d_node_member_add(light_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_light_set(light_node, light); + evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0); + evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(root_node, light_node); /* Add the mesh. */ mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(mesh, - efl_file_set(model_path, NULL), - evas_canvas3d_mesh_frame_material_set(0, material), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); + efl_file_set(mesh, model_path, NULL); + evas_canvas3d_mesh_frame_material_set(mesh, 0, material); + evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); - eo_do(texture, - evas_canvas3d_texture_file_set(image_path, NULL), - evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, - EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, - EVAS_CANVAS3D_WRAP_MODE_REPEAT)); - eo_do(material, - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, - 0.01, 0.01, 0.01, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, - 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, - 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(50.0)); + evas_canvas3d_texture_file_set(texture, image_path, NULL); + evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); + evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); + evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.01, 0.01, 0.01, 1.0); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(material, 50.0); - mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(root_node, - evas_canvas3d_node_member_add(mesh_node)); - eo_do(mesh_node, - evas_canvas3d_node_mesh_add(mesh)); + mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_member_add(root_node, mesh_node); + evas_canvas3d_node_mesh_add(mesh_node, mesh); /* Set up scene. */ - eo_do(scene, - evas_canvas3d_scene_root_node_set(root_node), - evas_canvas3d_scene_camera_node_set(camera_node), - evas_canvas3d_scene_size_set(WIDTH, HEIGHT)); + evas_canvas3d_scene_root_node_set(scene, root_node); + evas_canvas3d_scene_camera_node_set(scene, camera_node); + evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); /* Add a background rectangle objects. */ background = eo_add(EVAS_RECTANGLE_CLASS, evas); - eo_do(background, - efl_gfx_color_set(0, 0, 0, 255), - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_color_set(background, 0, 0, 0, 255); + efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = evas_object_image_filled_add(evas); - eo_do(image, - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ - eo_do(image, evas_obj_image_scene_set(scene)); + evas_obj_image_scene_set(image, scene); ecore_timer_add(0.01, _animate_scene, mesh_node); diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c index 39f6d34a6b..000204d2e8 100644 --- a/src/examples/evas/evas-3d-mmap-set.c +++ b/src/examples/evas/evas-3d-mmap-set.c @@ -33,24 +33,22 @@ snprintf(buffer, PATH_MAX, "%s%s", template_path, #extention); \ extention##_file = eina_file_open(buffer , 0); \ mesh_##extention = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); \ - eo_do(mesh_##extention, \ - efl_file_mmap_set(extention##_file, NULL), \ - evas_canvas3d_mesh_frame_material_set(0, material), \ - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); \ - node_##extention = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, \ - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); \ - eo_do(root_node, evas_canvas3d_node_member_add(node_##extention)); \ - eo_do(node_##extention, evas_canvas3d_node_mesh_add(mesh_##extention), \ - evas_canvas3d_node_position_set(initial_node_data[number * 10], \ - initial_node_data[number * 10 + 1], \ - initial_node_data[number * 10 + 2]), \ - evas_canvas3d_node_scale_set(initial_node_data[number * 10 + 3], \ - initial_node_data[number * 10 + 4], \ - initial_node_data[number * 10 + 5]), \ - evas_canvas3d_node_orientation_angle_axis_set(initial_node_data[number * 10 + 6], \ - initial_node_data[number * 10 + 7], \ - initial_node_data[number * 10 + 8], \ - initial_node_data[number * 10 + 9]));\ + efl_file_mmap_set(mesh_##extention, extention##_file, NULL); \ + evas_canvas3d_mesh_frame_material_set(mesh_##extention, 0, material); \ + evas_canvas3d_mesh_shade_mode_set(mesh_##extention, EVAS_CANVAS3D_SHADE_MODE_PHONG); \ + node_##extention = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ + evas_canvas3d_node_member_add(root_node, node_##extention); \ + evas_canvas3d_node_mesh_add(node_##extention, mesh_##extention); \ + evas_canvas3d_node_position_set(node_##extention, initial_node_data[number * 10], \ + initial_node_data[number * 10 + 1], \ + initial_node_data[number * 10 + 2]); \ + evas_canvas3d_node_scale_set(node_##extention, initial_node_data[number * 10 + 3], \ + initial_node_data[number * 10 + 4], \ + initial_node_data[number * 10 + 5]); \ + evas_canvas3d_node_orientation_angle_axis_set(node_##extention, initial_node_data[number * 10 + 6], \ + initial_node_data[number * 10 + 7], \ + initial_node_data[number * 10 + 8], \ + initial_node_data[number * 10 + 9]);\ ecore_timer_add(0.01, _animate_##extention, node_##extention); static const char *template_path = PACKAGE_EXAMPLES_DIR EVAS_MODEL_FOLDER "/mesh_for_mmap."; @@ -100,9 +98,8 @@ _animate_obj(void *data) obj_animation_parameter += obj_animation_velocity; float oap = obj_animation_parameter/200; - eo_do((Evas_Canvas3D_Node *)data, - evas_canvas3d_node_scale_set(oap, oap, oap), - evas_canvas3d_node_orientation_angle_axis_set(obj_animation_parameter, 0.0, 1.0, 0.0)); + evas_canvas3d_node_scale_set((Evas_Canvas3D_Node *)data, oap, oap, oap); + evas_canvas3d_node_orientation_angle_axis_set((Evas_Canvas3D_Node *)data, obj_animation_parameter, 0.0, 1.0, 0.0); if (obj_animation_parameter >= 360.0 || obj_animation_parameter <= 0.0) obj_animation_velocity *= -1.0; @@ -115,8 +112,7 @@ _animate_eet(void *data) { eet_animation_parameter += eet_animation_velocity; - eo_do((Evas_Canvas3D_Node *)data, - evas_canvas3d_node_orientation_angle_axis_set(eet_animation_parameter, 1.0, 0.0, 0.0)); + evas_canvas3d_node_orientation_angle_axis_set((Evas_Canvas3D_Node *)data, eet_animation_parameter, 1.0, 0.0, 0.0); eet_animation_velocity = sin(eet_animation_parameter / 180 * M_PI) + 1.1; return EINA_TRUE; @@ -127,8 +123,7 @@ _animate_ply(void *data) { ply_animation_parameter += ply_animation_velocity; - eo_do((Evas_Canvas3D_Node *)data, - evas_canvas3d_node_orientation_angle_axis_set(ply_animation_parameter, 1.0, 0.0, 0.0)); + evas_canvas3d_node_orientation_angle_axis_set((Evas_Canvas3D_Node *)data, ply_animation_parameter, 1.0, 0.0, 0.0); if (ply_animation_parameter > 360.0) ply_animation_parameter -= 180.0f; @@ -140,8 +135,7 @@ _animate_md2(void *data) { md2_animation_parameter += md2_animation_velocity; - eo_do((Evas_Canvas3D_Node *)data, - evas_canvas3d_node_mesh_frame_set(mesh_md2, md2_animation_parameter)); + evas_canvas3d_node_mesh_frame_set((Evas_Canvas3D_Node *)data, mesh_md2, md2_animation_parameter); if (md2_animation_parameter >= 360.0 || md2_animation_parameter <= 0.0) md2_animation_velocity *= -1.0; @@ -161,8 +155,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - eo_do(background, efl_gfx_size_set(w, h)); - eo_do(image, efl_gfx_size_set(w, h)); + efl_gfx_size_set(background, w, h); + efl_gfx_size_set(image, w, h); } int @@ -190,58 +184,42 @@ main(void) scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); /* Add the root node for the scene. */ - root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); /* Add the camera. */ camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(camera, - evas_canvas3d_camera_projection_perspective_set(10.0, 1.0, 1.0, 500.0)); + evas_canvas3d_camera_projection_perspective_set(camera, 10.0, 1.0, 1.0, 500.0); camera_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(camera_node, - evas_canvas3d_node_camera_set(camera)); - eo_do(root_node, - evas_canvas3d_node_member_add(camera_node)); - eo_do(camera_node, - evas_canvas3d_node_position_set(0.0, 0.0, 100.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + evas_canvas3d_node_camera_set(camera_node, camera); + evas_canvas3d_node_member_add(root_node, camera_node); + evas_canvas3d_node_position_set(camera_node, 0.0, 0.0, 100.0); + evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); /* Add the light. */ light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(light, - evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_directional_set(EINA_TRUE)); + evas_canvas3d_light_ambient_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_directional_set(light, EINA_TRUE); light_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(light_node, - evas_canvas3d_node_light_set(light), - evas_canvas3d_node_position_set(1.0, 0.0, 100.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(root_node, - evas_canvas3d_node_member_add(light_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_light_set(light_node, light); + evas_canvas3d_node_position_set(light_node, 1.0, 0.0, 100.0); + evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(root_node, light_node); material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(material, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, - 0.01, 0.01, 0.01, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, - 1.0, 1.0, 0.0, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, - 0.5, 0.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(50.0)); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.01, 0.01, 0.01, 1.0); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 0.0, 1.0); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.5, 0.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(material, 50.0); /* Add the meshes */ LOAD_AND_ADD_MESH(obj, 0); @@ -250,26 +228,23 @@ main(void) LOAD_AND_ADD_MESH(md2, 3); /* Set up scene. */ - eo_do(scene, - evas_canvas3d_scene_root_node_set(root_node), - evas_canvas3d_scene_camera_node_set(camera_node), - evas_canvas3d_scene_size_set(WIDTH, HEIGHT)); + evas_canvas3d_scene_root_node_set(scene, root_node); + evas_canvas3d_scene_camera_node_set(scene, camera_node); + evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); /* Add a background rectangle objects. */ background = eo_add(EVAS_RECTANGLE_CLASS, evas); - eo_do(background, - efl_gfx_color_set(20, 20, 200, 255), - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_color_set(background, 20, 20, 200, 255); + efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = evas_object_image_filled_add(evas); - eo_do(image, - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ - eo_do(image, evas_obj_image_scene_set(scene)); + evas_obj_image_scene_set(image, scene); /* Enter main loop. */ ecore_main_loop_begin(); diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c index 0d40a4125a..b9a6b69bd1 100644 --- a/src/examples/evas/evas-3d-obj.c +++ b/src/examples/evas/evas-3d-obj.c @@ -46,49 +46,43 @@ #define ADD_OBJ_MESH(path, Y, Z, num, shade_mode, name_of_material) \ mesh[num] = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); \ snprintf(full_file_path, PATH_MAX, "%s%s", path, ".obj"); \ - eo_do(mesh[num], \ - efl_file_set(full_file_path, NULL), \ - evas_canvas3d_mesh_frame_material_set(0, name_of_material), \ - evas_canvas3d_mesh_shade_mode_set(shade_mode)); \ - mesh_node[num] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, \ - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); \ - eo_do(root_node, \ - evas_canvas3d_node_member_add(mesh_node[num])); \ - eo_do(mesh_node[num], \ - evas_canvas3d_node_mesh_add(mesh[num]), \ - evas_canvas3d_node_position_set(0, Y, Z)); \ + efl_file_set(mesh[num], full_file_path, NULL); \ + evas_canvas3d_mesh_frame_material_set(mesh[num], 0, name_of_material); \ + evas_canvas3d_mesh_shade_mode_set(mesh[num], shade_mode); \ + mesh_node[num] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ + evas_canvas3d_node_member_add(root_node, mesh_node[num]); \ + evas_canvas3d_node_mesh_add(mesh_node[num], mesh[num]); \ + evas_canvas3d_node_position_set(mesh_node[num], 0, Y, Z); \ #define ADD_OBJ_MESH_AND_SAVED_COPY(path, Y, Z, num, shade_mode, name_of_material)\ snprintf(buffer, PATH_MAX, "%s%s", input_template, #path); \ ADD_OBJ_MESH(buffer, Y, Z, num, shade_mode, name_of_material) \ snprintf(buffer, PATH_MAX, "%s%s%s", output_template, #path, ".obj"); \ - eo_do(mesh[num], efl_file_save(buffer, NULL, NULL)); \ + efl_file_save(mesh[num], buffer, NULL, NULL); \ snprintf(buffer, PATH_MAX, "%s%s", output_template, #path); \ ADD_OBJ_MESH(buffer, Y + COPY_OFFSET, Z, num + 4, shade_mode, name_of_material) #define ADD_TEXTURE(name, path) \ name = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); \ - eo_do(name, \ - evas_canvas3d_texture_file_set(path, NULL), \ - evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \ - EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), \ - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, \ - EVAS_CANVAS3D_WRAP_MODE_REPEAT)); + evas_canvas3d_texture_file_set(name, path, NULL); \ + evas_canvas3d_texture_filter_set(name, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \ + EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); \ + evas_canvas3d_texture_wrap_set(name, EVAS_CANVAS3D_WRAP_MODE_REPEAT, \ + EVAS_CANVAS3D_WRAP_MODE_REPEAT); #define ADD_MATERIAL(name) \ name = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); \ - eo_do(name, \ - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), \ - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), \ - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),\ - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), \ - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, \ - COL_RED, 0.5), \ - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, \ - COL_GREEN, 0.5), \ - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, \ - COL_BLUE, 0.5), \ - evas_canvas3d_material_shininess_set(100.0)); + evas_canvas3d_material_enable_set(name, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); \ + evas_canvas3d_material_enable_set(name, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); \ + evas_canvas3d_material_enable_set(name, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); \ + evas_canvas3d_material_enable_set(name, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); \ + evas_canvas3d_material_color_set(name, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, \ + COL_RED, 0.5); \ + evas_canvas3d_material_color_set(name, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, \ + COL_GREEN, 0.5); \ + evas_canvas3d_material_color_set(name, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, \ + COL_BLUE, 0.5); \ + evas_canvas3d_material_shininess_set(name, 100.0); static const char *texture_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/sweet_home_reversed.png"; static const char *output_template = PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES "/saved_"; @@ -118,8 +112,7 @@ _animate_scene(void *data) { angle += 0.2; - eo_do((Evas_Canvas3D_Node *)data, - evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, -1.0)); + evas_canvas3d_node_orientation_angle_axis_set((Evas_Canvas3D_Node *)data, angle, 1.0, 1.0, -1.0); /* Rotate */ if (angle > 360.0) angle -= 360.0f; @@ -139,8 +132,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - eo_do(background, efl_gfx_size_set(w, h)); - eo_do(image, efl_gfx_size_set(w, h)); + efl_gfx_size_set(background, w, h); + efl_gfx_size_set(image, w, h); } int @@ -167,51 +160,38 @@ main(void) scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); /* Add the root node for the scene. */ - root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); /* Add the camera. */ camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(camera, - evas_canvas3d_camera_projection_perspective_set(20.0, 1.0, 1.0, 500.0)); + evas_canvas3d_camera_projection_perspective_set(camera, 20.0, 1.0, 1.0, 500.0); camera_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(camera_node, - evas_canvas3d_node_camera_set(camera)); - eo_do(root_node, - evas_canvas3d_node_member_add(camera_node)); - eo_do(camera_node, - evas_canvas3d_node_position_set(100.0, 0.0, 0.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + evas_canvas3d_node_camera_set(camera_node, camera); + evas_canvas3d_node_member_add(root_node, camera_node); + evas_canvas3d_node_position_set(camera_node, 100.0, 0.0, 0.0); + evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0); /* Add the light. */ light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(light, - evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_directional_set(EINA_TRUE)); + evas_canvas3d_light_ambient_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_directional_set(light, EINA_TRUE); light_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(light_node, - evas_canvas3d_node_light_set(light), - evas_canvas3d_node_position_set(10.0, 0.0, 0.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(root_node, - evas_canvas3d_node_member_add(light_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_light_set(light_node, light); + evas_canvas3d_node_position_set(light_node, 10.0, 0.0, 0.0); + evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(root_node, light_node); ADD_TEXTURE(texture, texture_path) ADD_MATERIAL(material) ADD_MATERIAL(material_with_tex) - eo_do(material_with_tex, - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture)); + evas_canvas3d_material_texture_set(material_with_tex, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture); if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES)) fprintf(stderr, "Failed to create folder %s\n\n", @@ -227,26 +207,23 @@ main(void) EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER, NULL) /* Set up scene. */ - eo_do(scene, - evas_canvas3d_scene_root_node_set(root_node), - evas_canvas3d_scene_camera_node_set(camera_node), - evas_canvas3d_scene_size_set(WIDTH, HEIGHT)); + evas_canvas3d_scene_root_node_set(scene, root_node); + evas_canvas3d_scene_camera_node_set(scene, camera_node); + evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); /* Add a background rectangle MESHES. */ background = eo_add(EVAS_RECTANGLE_CLASS, evas); - eo_do(background, - efl_gfx_color_set(0, 0, 0, 255), - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_color_set(background, 0, 0, 0, 255); + efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = evas_object_image_filled_add(evas); - eo_do(image, - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ - eo_do(image, evas_obj_image_scene_set(scene)); + evas_obj_image_scene_set(image, scene); for (i = 0; i < NUMBER_OF_MESHES; i++) ecore_timer_add(ANIM_SPEED, _animate_scene, mesh_node[i]); diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c index fd1e8ce18b..ff20dfe20e 100644 --- a/src/examples/evas/evas-3d-parallax-occlusion.c +++ b/src/examples/evas/evas-3d-parallax-occlusion.c @@ -62,10 +62,10 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void Evas_Event_Key_Down *ev = event_info; if (!strcmp("n", ev->key)) - eo_do(scene->mesh, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP)); + evas_canvas3d_mesh_shade_mode_set(scene->mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP); if (!strcmp("p", ev->key)) - eo_do(scene->mesh, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION)); + evas_canvas3d_mesh_shade_mode_set(scene->mesh, EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION); } static void @@ -80,8 +80,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - eo_do(background, efl_gfx_size_set(w, h)); - eo_do(image, efl_gfx_size_set(w, h)); + efl_gfx_size_set(background, w, h); + efl_gfx_size_set(image, w, h); } static Eina_Bool @@ -92,10 +92,9 @@ _animate_scene(void *data) angle += 0.5; - eo_do(scene->mesh_node, - evas_canvas3d_node_orientation_angle_axis_set(angle, 0.0, 1.0, 0.0)); + evas_canvas3d_node_orientation_angle_axis_set(scene->mesh_node, angle, 0.0, 1.0, 0.0); - eo_do(scene->mesh_node, evas_canvas3d_node_mesh_frame_set(scene->mesh, 50 * (1 + sin(angle / 180.0 * M_PI)))); + evas_canvas3d_node_mesh_frame_set(scene->mesh_node, scene->mesh, 50 * (1 + sin(angle / 180.0 * M_PI))); /* Rotate */ if (angle > 360.0) angle = 0.0f; @@ -107,36 +106,28 @@ _camera_setup(Scene_Data *data) { data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(data->camera, - evas_canvas3d_camera_projection_perspective_set(30.0, 1.0, 2.0, 50.0)); + evas_canvas3d_camera_projection_perspective_set(data->camera, 30.0, 1.0, 2.0, 50.0); - data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(data->camera_node, - evas_canvas3d_node_camera_set(data->camera), - evas_canvas3d_node_position_set(0.0, 0.0, 10.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node)); + data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + evas_canvas3d_node_camera_set(data->camera_node, data->camera); + evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); + evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(data->root_node, data->camera_node); } static void _light_setup(Scene_Data *data) { data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(data->light, - evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); + evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); - data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(data->light_node, - evas_canvas3d_node_light_set(data->light), - evas_canvas3d_node_position_set(-20.0, 20.0, 50.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node)); + data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_light_set(data->light_node, data->light); + evas_canvas3d_node_position_set(data->light_node, -20.0, 20.0, 50.0); + evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(data->root_node, data->light_node); } static void @@ -147,95 +138,80 @@ _mesh_setup(Scene_Data *data) data->texture_rocks = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); data->texture_rocks_n = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); - eo_do(data->texture_rocks, evas_canvas3d_texture_file_set(rock_diffuse, NULL), - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, - EVAS_CANVAS3D_WRAP_MODE_REPEAT)); - eo_do(data->texture_rocks_n, evas_canvas3d_texture_file_set(rock_n_and_height_map, NULL), - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, - EVAS_CANVAS3D_WRAP_MODE_REPEAT)); + evas_canvas3d_texture_file_set(data->texture_rocks, rock_diffuse, NULL); + evas_canvas3d_texture_wrap_set(data->texture_rocks, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); + evas_canvas3d_texture_file_set(data->texture_rocks_n, rock_n_and_height_map, NULL); + evas_canvas3d_texture_wrap_set(data->texture_rocks_n, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); - eo_do(data->material_rocks, - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, data->texture_rocks_n), - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture_rocks), - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, data->texture_rocks), - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, data->texture_rocks), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.1, 0.1, 0.1, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(100.0)); + evas_canvas3d_material_texture_set(data->material_rocks, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, data->texture_rocks_n); + evas_canvas3d_material_texture_set(data->material_rocks, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture_rocks); + evas_canvas3d_material_texture_set(data->material_rocks, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, data->texture_rocks); + evas_canvas3d_material_texture_set(data->material_rocks, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, data->texture_rocks); + evas_canvas3d_material_enable_set(data->material_rocks, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material_rocks, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material_rocks, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material_rocks, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_color_set(data->material_rocks, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.1, 0.1, 0.1, 1.0); + evas_canvas3d_material_color_set(data->material_rocks, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_color_set(data->material_rocks, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(data->material_rocks, 100.0); data->material_wood = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); data->texture_wood = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); data->texture_four_n = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); - eo_do(data->texture_wood, evas_canvas3d_texture_file_set(wood_diffuse, NULL), - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, - EVAS_CANVAS3D_WRAP_MODE_REPEAT)); - eo_do(data->texture_four_n, evas_canvas3d_texture_file_set(wood_n_and_height_map, NULL), - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, - EVAS_CANVAS3D_WRAP_MODE_REPEAT)); + evas_canvas3d_texture_file_set(data->texture_wood, wood_diffuse, NULL); + evas_canvas3d_texture_wrap_set(data->texture_wood, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); + evas_canvas3d_texture_file_set(data->texture_four_n, wood_n_and_height_map, NULL); + evas_canvas3d_texture_wrap_set(data->texture_four_n, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); - eo_do(data->material_wood, - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, data->texture_four_n), - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture_wood), - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, data->texture_wood), - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, data->texture_wood), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.1, 0.1, 0.1, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(100.0)); + evas_canvas3d_material_texture_set(data->material_wood, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, data->texture_four_n); + evas_canvas3d_material_texture_set(data->material_wood, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture_wood); + evas_canvas3d_material_texture_set(data->material_wood, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, data->texture_wood); + evas_canvas3d_material_texture_set(data->material_wood, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, data->texture_wood); + evas_canvas3d_material_enable_set(data->material_wood, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material_wood, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material_wood, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material_wood, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_color_set(data->material_wood, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.1, 0.1, 0.1, 1.0); + evas_canvas3d_material_color_set(data->material_wood, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_color_set(data->material_wood, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(data->material_wood, 100.0); /* Set data of primitive */ data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(data->cube, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE)); + evas_canvas3d_primitive_form_set(data->cube, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE); /* Setup mesh. */ data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(data->mesh, - evas_canvas3d_mesh_from_primitive_set(0, data->cube), - evas_canvas3d_mesh_from_primitive_set(100, data->cube), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION), - evas_canvas3d_mesh_frame_material_set(0, data->material_rocks)); + evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube); + evas_canvas3d_mesh_from_primitive_set(data->mesh, 100, data->cube); + evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION); + evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material_rocks); - eo_do(data->mesh, - evas_canvas3d_mesh_frame_material_set(100, data->material_wood)); + evas_canvas3d_mesh_frame_material_set(data->mesh, 100, data->material_wood); - data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node)); - eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh), - evas_canvas3d_node_scale_set(3, 3, 3)); + data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node); + evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); + evas_canvas3d_node_scale_set(data->mesh_node, 3, 3, 3); } static void _scene_setup(Scene_Data *data) { data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - eo_do(data->scene, - evas_canvas3d_scene_size_set(WIDTH, HEIGHT); - evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0)); + evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); + evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); - data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); _mesh_setup(data); - eo_do(data->scene, - evas_canvas3d_scene_root_node_set(data->root_node), - evas_canvas3d_scene_camera_node_set(data->camera_node)); + evas_canvas3d_scene_root_node_set(data->scene, data->root_node); + evas_canvas3d_scene_camera_node_set(data->scene, data->camera_node); } int @@ -262,20 +238,18 @@ main(void) /* Add a background rectangle objects. */ background = eo_add(EVAS_RECTANGLE_CLASS, evas); - eo_do(background, - efl_gfx_color_set(0, 0, 0, 255), - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_color_set(background, 0, 0, 0, 255); + efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = evas_object_image_filled_add(evas); - eo_do(image, - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE), - evas_object_focus_set(image, EINA_TRUE)); + efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_visible_set(image, EINA_TRUE); + evas_object_focus_set(image, image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ - eo_do(image, evas_obj_image_scene_set(data.scene)); + evas_obj_image_scene_set(image, data.scene); /* Add animation timer callback. */ ecore_timer_add(0.01, _animate_scene, &data); diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c index db8389ae36..1ae79a8cc9 100644 --- a/src/examples/evas/evas-3d-pick.c +++ b/src/examples/evas/evas-3d-pick.c @@ -51,8 +51,7 @@ _animate_scene(void *data) angle += 0.3; - eo_do((Evas_Canvas3D_Node *)data, - evas_canvas3d_node_orientation_angle_axis_set(angle, 0.0, 1.0, 0.0)); + evas_canvas3d_node_orientation_angle_axis_set((Evas_Canvas3D_Node *)data, angle, 0.0, 1.0, 0.0); /* Rotate */ if (angle > 360.0) angle -= 360.0f; @@ -96,12 +95,12 @@ _on_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, obj_x = ev->canvas.x - x; obj_y = ev->canvas.y - y; - eo_do(scene, evas_canvas3d_scene_size_get(&scene_w, &scene_h)); + evas_canvas3d_scene_size_get(scene, &scene_w, &scene_h); scene_x = obj_x * scene_w / (Evas_Real)w; scene_y = obj_y * scene_h / (Evas_Real)h; - eo_do(scene, pick = evas_canvas3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t)); + pick = evas_canvas3d_scene_pick(scene, scene_x, scene_y, &n, &m, &s, &t); if (pick) printf("Picked : "); else printf("Not picked : "); @@ -136,80 +135,62 @@ main(void) scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); /* Add the root node for the scene. */ - root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); /* Add the camera. */ camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(camera, - evas_canvas3d_camera_projection_perspective_set(30.0, 1.0, 1.0, 100.0)); + evas_canvas3d_camera_projection_perspective_set(camera, 30.0, 1.0, 1.0, 100.0); camera_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(camera_node, - evas_canvas3d_node_camera_set(camera), - evas_canvas3d_node_position_set(0.0, 0.0, 2.5), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(root_node, evas_canvas3d_node_member_add(camera_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + evas_canvas3d_node_camera_set(camera_node, camera); + evas_canvas3d_node_position_set(camera_node, 0.0, 0.0, 2.5); + evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(root_node, camera_node); sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(sphere, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE), - evas_canvas3d_primitive_precision_set(50)); + evas_canvas3d_primitive_form_set(sphere, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE); + evas_canvas3d_primitive_precision_set(sphere, 50); mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(mesh, evas_canvas3d_mesh_from_primitive_set(0, sphere)); + evas_canvas3d_mesh_from_primitive_set(mesh, 0, sphere); material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); - eo_do(texture_diffuse, - evas_canvas3d_texture_file_set(image_path, NULL), - evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR, - EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR)); - eo_do(material, - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, - texture_diffuse), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), + evas_canvas3d_texture_file_set(texture_diffuse, image_path, NULL); + evas_canvas3d_texture_filter_set(texture_diffuse, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR); + evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture_diffuse); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.01, 0.01, 0.01, 1.0); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(material, 50.0); - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.01, 0.01, 0.01, - 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, - 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, - 1.0), - evas_canvas3d_material_shininess_set(50.0)); + mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); - mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - - eo_do(root_node, evas_canvas3d_node_member_add(mesh_node)); - eo_do(mesh_node, evas_canvas3d_node_mesh_add(mesh)); - eo_do(mesh, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE), - evas_canvas3d_mesh_frame_material_set(0, material)); + evas_canvas3d_node_member_add(root_node, mesh_node); + evas_canvas3d_node_mesh_add(mesh_node, mesh); + evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); + evas_canvas3d_mesh_frame_material_set(mesh, 0, material); /* Set up scene. */ - eo_do(scene, - evas_canvas3d_scene_root_node_set(root_node), - evas_canvas3d_scene_camera_node_set(camera_node), - evas_canvas3d_scene_size_set(WIDTH, HEIGHT)); + evas_canvas3d_scene_root_node_set(scene, root_node); + evas_canvas3d_scene_camera_node_set(scene, camera_node); + evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); /* Add evas objects. */ background = eo_add(EVAS_RECTANGLE_CLASS, evas); - eo_do(background, - efl_gfx_color_set(0, 0, 0, 255), - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_color_set(background, 0, 0, 0, 255); + efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_visible_set(background, EINA_TRUE); image = evas_object_image_filled_add(evas); - eo_do(image, - evas_obj_image_scene_set(scene), - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + evas_obj_image_scene_set(image, scene); + efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_visible_set(image, EINA_TRUE); evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN, _on_mouse_down, NULL); diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c index 25e3288aab..b34b2cc313 100644 --- a/src/examples/evas/evas-3d-ply.c +++ b/src/examples/evas/evas-3d-ply.c @@ -78,7 +78,7 @@ _animate_scene(void *data) { angle += 0.2; - eo_do((Evas_Canvas3D_Node *)data, evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0)); + evas_canvas3d_node_orientation_angle_axis_set((Evas_Canvas3D_Node *)data, angle, 1.0, 1.0, 1.0); /* Rotate */ if (angle > 360.0) angle -= 360.0f; @@ -98,8 +98,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - eo_do(background, efl_gfx_size_set(w, h)); - eo_do(image, efl_gfx_size_set(w, h)); + efl_gfx_size_set(background, w, h); + efl_gfx_size_set(image, w, h); } int @@ -133,63 +133,44 @@ main(void) scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); /* Add the root node for the scene. */ - root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); /* Add the camera. */ camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(camera, - evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0)); + evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0); - camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(camera_node, - evas_canvas3d_node_camera_set(camera)); - eo_do(root_node, - evas_canvas3d_node_member_add(camera_node)); - eo_do(camera_node, - evas_canvas3d_node_position_set(15.0, 0.0, 0.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0)); + camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + evas_canvas3d_node_camera_set(camera_node, camera); + evas_canvas3d_node_member_add(root_node, camera_node); + evas_canvas3d_node_position_set(camera_node, 15.0, 0.0, 0.0); + evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0); /* Add the light. */ light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(light, - evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_directional_set(EINA_TRUE)); + evas_canvas3d_light_ambient_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_directional_set(light, EINA_TRUE); - light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(light_node, - evas_canvas3d_node_light_set(light), - evas_canvas3d_node_position_set(1000.0, 0.0, 1000.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(root_node, - evas_canvas3d_node_member_add(light_node)); + light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_light_set(light_node, light); + evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0); + evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(root_node, light_node); material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); - eo_do(texture, - evas_canvas3d_texture_file_set(image_path, NULL), - evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, - EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, - EVAS_CANVAS3D_WRAP_MODE_REPEAT)); - eo_do(material, - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, - 0.01, 0.01, 0.01, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, - 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, - 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(50.0)); + evas_canvas3d_texture_file_set(texture, image_path, NULL); + evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); + evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); + evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.01, 0.01, 0.01, 1.0); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(material, 50.0); if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES)) fprintf(stderr, "Failed to create folder %s\n\n", @@ -201,51 +182,44 @@ main(void) mesh[i] = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); snprintf(buffer, PATH_MAX, "%s%s", input_template, file_name[i % 8]); - eo_do(mesh[i], - efl_file_set(buffer, NULL), - evas_canvas3d_mesh_frame_material_set(0, material), - evas_canvas3d_mesh_shade_mode_set(draw_mode[(i % 8)])); + efl_file_set(mesh[i], buffer, NULL); + evas_canvas3d_mesh_frame_material_set(mesh[i], 0, material); + evas_canvas3d_mesh_shade_mode_set(mesh[i], draw_mode[(i % 8)]); snprintf(buffer, PATH_MAX, "%s%s", output_template, file_name[i % 8]); - eo_do(mesh[i], efl_file_save(buffer, NULL, NULL)); + efl_file_save(mesh[i], buffer, NULL, NULL); if (i > 15) { - eo_do(mesh[i], - efl_file_set(buffer, NULL), - evas_canvas3d_mesh_frame_material_set(0, material), - evas_canvas3d_mesh_shade_mode_set(draw_mode[(i % 8)])); + efl_file_set(mesh[i], buffer, NULL); + evas_canvas3d_mesh_frame_material_set(mesh[i], 0, material); + evas_canvas3d_mesh_shade_mode_set(mesh[i], draw_mode[(i % 8)]); } - mesh_node[i] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(root_node, evas_canvas3d_node_member_add(mesh_node[i])); - eo_do(mesh_node[i], - evas_canvas3d_node_mesh_add(mesh[i]), - evas_canvas3d_node_position_set(0, ((i % 4) * 4) + ((i / 16) * 1) - 6.5, (((i % 16) / 4) * 4) - 6)); + mesh_node[i] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_member_add(root_node, mesh_node[i]); + evas_canvas3d_node_mesh_add(mesh_node[i], mesh[i]); + evas_canvas3d_node_position_set(mesh_node[i], 0, ((i % 4) * 4) + ((i / 16) * 1) - 6.5, (((i % 16) / 4) * 4) - 6); } /* Set up scene. */ - eo_do(scene, - evas_canvas3d_scene_root_node_set(root_node), - evas_canvas3d_scene_camera_node_set(camera_node), - evas_canvas3d_scene_size_set(WIDTH, HEIGHT)); + evas_canvas3d_scene_root_node_set(scene, root_node); + evas_canvas3d_scene_camera_node_set(scene, camera_node); + evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); /* Add a background rectangle objects. */ background = eo_add(EVAS_RECTANGLE_CLASS, evas); - eo_do(background, - efl_gfx_color_set(100, 100, 100, 255), - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_color_set(background, 100, 100, 100, 255); + efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = evas_object_image_filled_add(evas); - eo_do(image, - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ - eo_do(image, evas_obj_image_scene_set(scene)); + evas_obj_image_scene_set(image, scene); ecore_animator_frametime_set(0.03); for (i = 0; i < NUMBER_OF_MESHES; i++) diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c index 48d85e474d..901c52bd54 100644 --- a/src/examples/evas/evas-3d-proxy.c +++ b/src/examples/evas/evas-3d-proxy.c @@ -56,8 +56,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - eo_do(background, efl_gfx_size_set(w, h)); - eo_do(image, efl_gfx_size_set(w, h)); + efl_gfx_size_set(background, w, h); + efl_gfx_size_set(image, w, h); } static Eina_Bool @@ -70,15 +70,13 @@ _animate_scene(void *data) angle += 0.5; - eo_do(scene->mesh_node, - evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0)); + evas_canvas3d_node_orientation_angle_axis_set(scene->mesh_node, angle, 1.0, 1.0, 1.0); /* Rotate */ if (angle > 360.0) angle -= 360.0f; - eo_do(source, - pixels = evas_obj_image_data_get(EINA_TRUE), - stride = evas_obj_image_stride_get()); + pixels = evas_obj_image_data_get(source, EINA_TRUE); + stride = evas_obj_image_stride_get(source); for (i = 0; i < IMG_HEIGHT; i++) { @@ -90,9 +88,8 @@ _animate_scene(void *data) } } - eo_do(source, - evas_obj_image_data_set(pixels), - evas_obj_image_data_update_add(0, 0, IMG_WIDTH, IMG_HEIGHT)); + evas_obj_image_data_set(source, pixels); + evas_obj_image_data_update_add(source, 0, 0, IMG_WIDTH, IMG_HEIGHT); return EINA_TRUE; } @@ -101,39 +98,30 @@ static void _camera_setup(Scene_Data *data) { data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(data->camera, - evas_canvas3d_camera_projection_perspective_set(30.0, 1.0, 2.0, 50.0)); + evas_canvas3d_camera_projection_perspective_set(data->camera, 30.0, 1.0, 2.0, 50.0); data->camera_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(data->camera_node, - evas_canvas3d_node_camera_set(data->camera), - evas_canvas3d_node_position_set(0.0, 0.0, 5.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(data->root_node, - evas_canvas3d_node_member_add(data->camera_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + evas_canvas3d_node_camera_set(data->camera_node, data->camera); + evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 5.0); + evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(data->root_node, data->camera_node); } static void _light_setup(Scene_Data *data) { data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(data->light, - evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); + evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); data->light_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(data->light_node, - evas_canvas3d_node_light_set(data->light), - evas_canvas3d_node_position_set(0.0, 0.0, 10.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_light_set(data->light_node, data->light); + evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); + evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); + evas_canvas3d_node_member_add(data->root_node, data->light_node); } static void @@ -143,61 +131,51 @@ _mesh_setup(Scene_Data *data) data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); data->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); - eo_do(data->texture, - evas_canvas3d_texture_source_set(source), - evas_canvas3d_texture_source_visible_set(EINA_TRUE)); + evas_canvas3d_texture_source_set(data->texture, source); + evas_canvas3d_texture_source_visible_set(data->texture, EINA_TRUE); - eo_do(data->material, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(100.0), - - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture)); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0); + evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(data->material, 100.0); + evas_canvas3d_material_texture_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture); /* Set data of primitive */ data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(data->cube, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE)); + evas_canvas3d_primitive_form_set(data->cube, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE); /* Setup mesh. */ data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(data->mesh, - evas_canvas3d_mesh_from_primitive_set(0, data->cube), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_FLAT), - evas_canvas3d_mesh_frame_material_set(0, data->material)); + evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube); + evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_FLAT); + evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); data->mesh_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node)); - eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh)); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node); + evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); } static void _scene_setup(Scene_Data *data) { data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - eo_do(data->scene, - evas_canvas3d_scene_size_set(WIDTH, HEIGHT), - evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0)); + evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); + evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); data->root_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); _mesh_setup(data); - eo_do(data->scene, - evas_canvas3d_scene_root_node_set(data->root_node), - evas_canvas3d_scene_camera_node_set(data->camera_node)); + evas_canvas3d_scene_root_node_set(data->scene, data->root_node); + evas_canvas3d_scene_camera_node_set(data->scene, data->camera_node); } int @@ -222,30 +200,27 @@ main(void) /* Add a background rectangle objects. */ background = eo_add(EVAS_RECTANGLE_CLASS, evas); - eo_do(background, - efl_gfx_color_set(0, 0, 0, 255), - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_color_set(background, 0, 0, 0, 255); + efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_visible_set(background, EINA_TRUE); /* Add a background image. */ source = evas_object_image_filled_add(evas); - eo_do(source, - efl_gfx_view_size_set(IMG_WIDTH, IMG_HEIGHT), - efl_gfx_position_set((WIDTH / 2), (HEIGHT / 2)), - efl_gfx_size_set((WIDTH / 2), (HEIGHT / 2)), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_view_size_set(source, IMG_WIDTH, IMG_HEIGHT); + efl_gfx_position_set(source, (WIDTH / 2), (HEIGHT / 2)); + efl_gfx_size_set(source, (WIDTH / 2), (HEIGHT / 2)); + efl_gfx_visible_set(source, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = evas_object_image_filled_add(evas); - eo_do(image, - efl_gfx_size_set((WIDTH / 2), (HEIGHT / 2)), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_size_set(image, (WIDTH / 2), (HEIGHT / 2)); + efl_gfx_visible_set(image, EINA_TRUE); /* Setup scene */ _scene_setup(&data); /* Set the image object as render target for 3D scene. */ - eo_do(image, evas_obj_image_scene_set(data.scene)); + evas_obj_image_scene_set(image, data.scene); /* Add animation timer callback. */ ecore_timer_add(0.016, _animate_scene, &data); diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c index 8fe1495d81..f70d7e41a8 100644 --- a/src/examples/evas/evas-3d-shadows.c +++ b/src/examples/evas/evas-3d-shadows.c @@ -84,20 +84,20 @@ _cb_clicked(void *data EINA_UNUSED, const Eo_Event *event) Eina_List *meshes = NULL, *l; Evas_Canvas3D_Mesh *m; Evas_Canvas3D_Node *billboard = NULL; - eo_do((Evas_Canvas3D_Node *)event->event_info, meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get()); + meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get((Evas_Canvas3D_Node *)event->event_info); EINA_LIST_FOREACH(meshes, l, m) { - eo_do(m, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE)); + evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); } if (choosed_node != (Evas_Canvas3D_Node *)event->event_info) { - eo_do(choosed_node, billboard = evas_canvas3d_node_billboard_target_get()); + billboard = evas_canvas3d_node_billboard_target_get(choosed_node); if (!billboard) { - eo_do(choosed_node, meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get()); + meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(choosed_node); EINA_LIST_FOREACH(meshes, l, m) { - eo_do(m, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); + evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG); } } choosed_node = (Evas_Canvas3D_Node *)event->event_info; @@ -111,10 +111,10 @@ _cb_collision(void *data EINA_UNUSED, const Eo_Event *event) { Eina_List *meshes = NULL, *l; Evas_Canvas3D_Mesh *m; - eo_do((Evas_Canvas3D_Node *)event->event_info, meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get()); + meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get((Evas_Canvas3D_Node *)event->event_info); EINA_LIST_FOREACH(meshes, l, m) { - eo_do(m, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE)); + evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); } return EINA_TRUE; @@ -142,20 +142,15 @@ _animate_scene(void *data) Scene_Data *scene = (Scene_Data *)data; if (scene->init) { - eo_do(scene->mediator, - evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z)); - eo_do(scene->mediator, - evas_canvas3d_node_position_set(sin(angle) * 20 , y , cos(angle) * 20), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 3.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 5.0, 0.0)); + evas_canvas3d_node_position_get(scene->mediator, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); + evas_canvas3d_node_position_set(scene->mediator, sin(angle) * 20, y, cos(angle) * 20); + evas_canvas3d_node_look_at_set(scene->mediator, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 3.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 5.0, 0.0); angle += 0.005; if (angle > 360) angle = 0.0; } else - eo_do(scene->mediator, - evas_canvas3d_node_position_set(0.0, 6.0, 12.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 3.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 5.0, 0.0)); + evas_canvas3d_node_position_set(scene->mediator, 0.0, 6.0, 12.0); + evas_canvas3d_node_look_at_set(scene->mediator, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 3.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 5.0, 0.0); return EINA_TRUE; } @@ -172,8 +167,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - eo_do(background, efl_gfx_size_set(w, h)); - eo_do(image, efl_gfx_size_set(w, h)); + efl_gfx_size_set(background, w, h); + efl_gfx_size_set(image, w, h); } static void @@ -181,83 +176,70 @@ _body_material_set(Body_3D *body, float r, float g, float b) { body->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(body->material, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), + evas_canvas3d_material_enable_set(body->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(body->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(body->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_color_set(body->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, r, g, b, 1.0); + evas_canvas3d_material_color_set(body->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, r, g, b, 1.0); + evas_canvas3d_material_color_set(body->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(body->material, 100.0); - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, r, g, b, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, r, g, b, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(100.0)); - - eo_do(body->mesh, - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG), - evas_canvas3d_mesh_frame_material_set(0, body->material)); + evas_canvas3d_mesh_shade_mode_set(body->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); + evas_canvas3d_mesh_frame_material_set(body->mesh, 0, body->material); } static void _sphere_setup(Body_3D *sphere) { sphere->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(sphere->primitive, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE), - evas_canvas3d_primitive_precision_set(50)); + evas_canvas3d_primitive_form_set(sphere->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE); + evas_canvas3d_primitive_precision_set(sphere->primitive, 50); sphere->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(sphere->mesh, - evas_canvas3d_mesh_from_primitive_set(0, sphere->primitive)); + evas_canvas3d_mesh_from_primitive_set(sphere->mesh, 0, sphere->primitive); _body_material_set(sphere, 1, 0.0, 0.0); - sphere->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH), - evas_canvas3d_node_position_set(3.0, 3.0, 0.0)); - eo_do(sphere->node, evas_canvas3d_node_mesh_add(sphere->mesh)); + sphere->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eoid, 3.0, 3.0, 0.0)); + evas_canvas3d_node_mesh_add(sphere->node, sphere->mesh); } static void _cone_setup(Body_3D *cone) { cone->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(cone->primitive, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CONE), - evas_canvas3d_primitive_precision_set(50)); + evas_canvas3d_primitive_form_set(cone->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_CONE); + evas_canvas3d_primitive_precision_set(cone->primitive, 50); cone->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(cone->mesh, - evas_canvas3d_mesh_from_primitive_set(0, cone->primitive)); + evas_canvas3d_mesh_from_primitive_set(cone->mesh, 0, cone->primitive); _body_material_set(cone, 0.8, 0.5, 0.5); cone->node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(cone->node, evas_canvas3d_node_mesh_add(cone->mesh), - evas_canvas3d_node_orientation_angle_axis_set(-90.0, 1.0, 0.0, 0.0), - evas_canvas3d_node_position_set(-4.0, 0.0, -3.0)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_mesh_add(cone->node, cone->mesh); + evas_canvas3d_node_orientation_angle_axis_set(cone->node, -90.0, 1.0, 0.0, 0.0); + evas_canvas3d_node_position_set(cone->node, -4.0, 0.0, -3.0); } static void _cylinder_setup(Body_3D *cylinder) { cylinder->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(cylinder->primitive, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CYLINDER), - evas_canvas3d_primitive_precision_set(50)); + evas_canvas3d_primitive_form_set(cylinder->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_CYLINDER); + evas_canvas3d_primitive_precision_set(cylinder->primitive, 50); cylinder->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(cylinder->mesh, - evas_canvas3d_mesh_from_primitive_set(0, cylinder->primitive)); + evas_canvas3d_mesh_from_primitive_set(cylinder->mesh, 0, cylinder->primitive); _body_material_set(cylinder, 0.0, 0.0, 1.0); cylinder->node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(cylinder->node, evas_canvas3d_node_mesh_add(cylinder->mesh), - evas_canvas3d_node_orientation_angle_axis_set(-90.0, 1.0, 0.0, 0.0), - evas_canvas3d_node_position_set(-2.0, 3.0, 1.0)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_mesh_add(cylinder->node, cylinder->mesh); + evas_canvas3d_node_orientation_angle_axis_set(cylinder->node, -90.0, 1.0, 0.0, 0.0); + evas_canvas3d_node_position_set(cylinder->node, -2.0, 3.0, 1.0); } static void @@ -265,228 +247,184 @@ _fence_setup(Body_3D *fence) { Eo *texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); - eo_do(texture, evas_canvas3d_texture_atlas_enable_set(EINA_FALSE)); - eo_do(texture, - evas_canvas3d_texture_file_set(PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/grid.png", NULL), - evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, - EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, - EVAS_CANVAS3D_WRAP_MODE_REPEAT)); + evas_canvas3d_texture_atlas_enable_set(texture, EINA_FALSE); + evas_canvas3d_texture_file_set(texture, PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/grid.png", NULL); + evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); + evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); Eo *texture1 = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); - eo_do(texture1, evas_canvas3d_texture_atlas_enable_set(EINA_FALSE)); - eo_do(texture1, - evas_canvas3d_texture_file_set(PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/grid_n.png", NULL), - evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, - EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, - EVAS_CANVAS3D_WRAP_MODE_REPEAT)); + evas_canvas3d_texture_atlas_enable_set(texture1, EINA_FALSE); + evas_canvas3d_texture_file_set(texture1, PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/grid_n.png", NULL); + evas_canvas3d_texture_filter_set(texture1, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); + evas_canvas3d_texture_wrap_set(texture1, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); fence->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(fence->material, - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture), - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, texture), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, texture1), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(100.0)); + evas_canvas3d_material_texture_set(fence->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture); + evas_canvas3d_material_texture_set(fence->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, texture); + evas_canvas3d_material_enable_set(fence->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(fence->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(fence->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_enable_set(fence->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); + evas_canvas3d_material_texture_set(fence->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, texture1); + evas_canvas3d_material_color_set(fence->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_color_set(fence->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_color_set(fence->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(fence->material, 100.0); fence->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(fence->primitive, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CYLINDER), - evas_canvas3d_primitive_mode_set(EVAS_CANVAS3D_PRIMITIVE_MODE_WITHOUT_BASE), - evas_canvas3d_primitive_tex_scale_set(160.0, 12.0), - evas_canvas3d_primitive_precision_set(50)); + evas_canvas3d_primitive_form_set(fence->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_CYLINDER); + evas_canvas3d_primitive_mode_set(fence->primitive, EVAS_CANVAS3D_PRIMITIVE_MODE_WITHOUT_BASE); + evas_canvas3d_primitive_tex_scale_set(fence->primitive, 160.0, 12.0); + evas_canvas3d_primitive_precision_set(fence->primitive, 50); fence->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(fence->mesh, - evas_canvas3d_mesh_from_primitive_set(0, fence->primitive)); + evas_canvas3d_mesh_from_primitive_set(fence->mesh, 0, fence->primitive); - eo_do(fence->mesh, - evas_canvas3d_mesh_frame_material_set(0, fence->material), - evas_canvas3d_mesh_alpha_func_set(EVAS_CANVAS3D_COMPARISON_GREATER, 0), - evas_canvas3d_mesh_alpha_test_enable_set(EINA_TRUE), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP)); + evas_canvas3d_mesh_frame_material_set(fence->mesh, 0, fence->material); + evas_canvas3d_mesh_alpha_func_set(fence->mesh, EVAS_CANVAS3D_COMPARISON_GREATER, 0); + evas_canvas3d_mesh_alpha_test_enable_set(fence->mesh, EINA_TRUE); + evas_canvas3d_mesh_shade_mode_set(fence->mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP); fence->node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(fence->node, evas_canvas3d_node_mesh_add(fence->mesh), - evas_canvas3d_node_orientation_angle_axis_set(-90.0, 1.0, 0.0, 0.0), - evas_canvas3d_node_scale_set(10.0, 10.0, 5.0), - evas_canvas3d_node_position_set(0.0, -1.0, -2.0)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_mesh_add(fence->node, fence->mesh); + evas_canvas3d_node_orientation_angle_axis_set(fence->node, -90.0, 1.0, 0.0, 0.0); + evas_canvas3d_node_scale_set(fence->node, 10.0, 10.0, 5.0); + evas_canvas3d_node_position_set(fence->node, 0.0, -1.0, -2.0); } static void _square_setup(Body_3D *square) { square->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(square->primitive, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SQUARE)); + evas_canvas3d_primitive_form_set(square->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_SQUARE); square->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(square->mesh, - evas_canvas3d_mesh_from_primitive_set(0, square->primitive)); + evas_canvas3d_mesh_from_primitive_set(square->mesh, 0, square->primitive); _body_material_set(square, 0.4, 0.4, 0.4); square->node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(square->node, evas_canvas3d_node_mesh_add(square->mesh), - evas_canvas3d_node_position_set(0.0, -1.0, 0.0), - evas_canvas3d_node_scale_set(30.0, 30.0, 30.0), - evas_canvas3d_node_orientation_angle_axis_set(90.0, 1.0, 0.0, 0.0)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_mesh_add(square->node, square->mesh); + evas_canvas3d_node_position_set(square->node, 0.0, -1.0, 0.0); + evas_canvas3d_node_scale_set(square->node, 30.0, 30.0, 30.0); + evas_canvas3d_node_orientation_angle_axis_set(square->node, 90.0, 1.0, 0.0, 0.0); } static void _box_setup(Body_3D *box) { box->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(box->primitive, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE)); + evas_canvas3d_primitive_form_set(box->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE); box->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(box->mesh, - evas_canvas3d_mesh_from_primitive_set(0, box->primitive)); + evas_canvas3d_mesh_from_primitive_set(box->mesh, 0, box->primitive); _body_material_set(box, 0, 1, 0); - box->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(box->node, evas_canvas3d_node_mesh_add(box->mesh), - evas_canvas3d_node_position_set(3.0, 0.0, -3.0)); + box->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_mesh_add(box->node, box->mesh); + evas_canvas3d_node_position_set(box->node, 3.0, 0.0, -3.0); } static void _model_setup(Body_3D *model) { model->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); - eo_do(model->texture, - evas_canvas3d_texture_file_set(image_path, NULL), - evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, - EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, - EVAS_CANVAS3D_WRAP_MODE_REPEAT)); + evas_canvas3d_texture_file_set(model->texture, image_path, NULL); + evas_canvas3d_texture_filter_set(model->texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); + evas_canvas3d_texture_wrap_set(model->texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); model->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(model->material, - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, model->texture), - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, model->texture), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - evas_canvas3d_material_shininess_set(100.0)); + evas_canvas3d_material_texture_set(model->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, model->texture); + evas_canvas3d_material_texture_set(model->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, model->texture); + evas_canvas3d_material_enable_set(model->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(model->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(model->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_shininess_set(model->material, 100.0); model->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(model->mesh, - efl_file_set(model_path, NULL), - evas_canvas3d_mesh_frame_material_set(0, model->material), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); + efl_file_set(model->mesh, model_path, NULL); + evas_canvas3d_mesh_frame_material_set(model->mesh, 0, model->material); + evas_canvas3d_mesh_shade_mode_set(model->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); model->node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(model->node, evas_canvas3d_node_mesh_add(model->mesh), - evas_canvas3d_node_scale_set(0.1, 0.1, 0.1), - evas_canvas3d_node_orientation_angle_axis_set(120.0, -0.577, -0.577, -0.577)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_mesh_add(model->node, model->mesh); + evas_canvas3d_node_scale_set(model->node, 0.1, 0.1, 0.1); + evas_canvas3d_node_orientation_angle_axis_set(model->node, 120.0, -0.577, -0.577, -0.577); } static void _billboard_setup(Scene_Data *data) { data->billboard.texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); - eo_do(data->billboard.texture, - evas_canvas3d_texture_file_set(b_image_path, NULL), - evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, - EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, - EVAS_CANVAS3D_WRAP_MODE_REPEAT)); + evas_canvas3d_texture_file_set(data->billboard.texture, b_image_path, NULL); + evas_canvas3d_texture_filter_set(data->billboard.texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); + evas_canvas3d_texture_wrap_set(data->billboard.texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); data->billboard.primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(data->billboard.primitive, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SQUARE)); + evas_canvas3d_primitive_form_set(data->billboard.primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_SQUARE); data->billboard.mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - eo_do(data->billboard.mesh, - evas_canvas3d_mesh_from_primitive_set(0, data->billboard.primitive)); + evas_canvas3d_mesh_from_primitive_set(data->billboard.mesh, 0, data->billboard.primitive); _body_material_set(&(data->billboard), 1.0, 1.0, 1.0); - eo_do(data->billboard.material, - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->billboard.texture)); + evas_canvas3d_material_texture_set(data->billboard.material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->billboard.texture); - eo_do(data->billboard.mesh, - evas_canvas3d_mesh_frame_material_set(0, data->billboard.material), - evas_canvas3d_mesh_alpha_func_set(EVAS_CANVAS3D_COMPARISON_GREATER, 0), - evas_canvas3d_mesh_alpha_test_enable_set(EINA_TRUE), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE), - evas_canvas3d_mesh_blending_enable_set(EINA_TRUE), - evas_canvas3d_mesh_blending_func_set(EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, - EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA)); + evas_canvas3d_mesh_frame_material_set(data->billboard.mesh, 0, data->billboard.material); + evas_canvas3d_mesh_alpha_func_set(data->billboard.mesh, EVAS_CANVAS3D_COMPARISON_GREATER, 0); + evas_canvas3d_mesh_alpha_test_enable_set(data->billboard.mesh, EINA_TRUE); + evas_canvas3d_mesh_shade_mode_set(data->billboard.mesh, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); + evas_canvas3d_mesh_blending_enable_set(data->billboard.mesh, EINA_TRUE); + evas_canvas3d_mesh_blending_func_set(data->billboard.mesh, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA); - data->billboard.node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(data->billboard.node, - evas_canvas3d_node_mesh_add(data->billboard.mesh), - evas_canvas3d_node_position_set(0.0, 2.0, 0.0), - evas_canvas3d_node_scale_set(2.2, 4.6, 4.0)); + data->billboard.node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_mesh_add(data->billboard.node, data->billboard.mesh); + evas_canvas3d_node_position_set(data->billboard.node, 0.0, 2.0, 0.0); + evas_canvas3d_node_scale_set(data->billboard.node, 2.2, 4.6, 4.0); - eo_do(data->billboard.node, - evas_canvas3d_node_billboard_target_set(data->mediator)); + evas_canvas3d_node_billboard_target_set(data->billboard.node, data->mediator); } static void _camera_setup(Scene_Data *data) { data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - data->mediator = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + data->mediator = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); - eo_do(data->camera, - evas_canvas3d_camera_projection_perspective_set(50.0, 1.0, 2.0, 100.0)); + evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 2.0, 100.0); data->camera_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(data->camera_node, - evas_canvas3d_node_camera_set(data->camera)); + evas_canvas3d_node_camera_set(data->camera_node, data->camera); - eo_do(data->mediator, - evas_canvas3d_node_position_set(0.0, 6.0, 12.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 3.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 5.0, 0.0)); + evas_canvas3d_node_position_set(data->mediator, 0.0, 6.0, 12.0); + evas_canvas3d_node_look_at_set(data->mediator, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 3.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 5.0, 0.0); - eo_do(data->mediator, evas_canvas3d_node_member_add(data->camera_node)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->mediator)); + evas_canvas3d_node_member_add(data->mediator, data->camera_node); + evas_canvas3d_node_member_add(data->root_node, data->mediator); } static void _light_setup(Scene_Data *data) { data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(data->light, - evas_canvas3d_light_ambient_set(AMBIENT_LIGHT, 1.0), - evas_canvas3d_light_diffuse_set(DIFFUSE_LIGHT, 1.0), - evas_canvas3d_light_specular_set(SPECULAR_LIGHT, 1.0), - evas_canvas3d_light_spot_cutoff_set(20), - evas_canvas3d_light_projection_perspective_set(40.0, 1.0, 2.0, 1000.0)); + evas_canvas3d_light_ambient_set(data->light, AMBIENT_LIGHT, 1.0); + evas_canvas3d_light_diffuse_set(data->light, DIFFUSE_LIGHT, 1.0); + evas_canvas3d_light_specular_set(data->light, SPECULAR_LIGHT, 1.0); + evas_canvas3d_light_spot_cutoff_set(data->light, 20); + evas_canvas3d_light_projection_perspective_set(data->light, 40.0, 1.0, 2.0, 1000.0); data->light_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(data->light_node, - evas_canvas3d_node_light_set(data->light), - evas_canvas3d_node_position_set(50.0, 50.0, 70.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 15.0, 0.0, -5.0, - EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_light_set(data->light_node, data->light); + evas_canvas3d_node_position_set(data->light_node, 50.0, 50.0, 70.0); + evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 15.0, 0.0, -5.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0); + evas_canvas3d_node_member_add(data->root_node, data->light_node); } static void @@ -496,13 +434,11 @@ _scene_setup(Scene_Data *data) data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - eo_do(data->scene, - evas_canvas3d_scene_size_set(WIDTH, HEIGHT); - evas_canvas3d_scene_background_color_set(BG_COLOR, 1)); + evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); + evas_canvas3d_scene_background_color_set(data->scene, BG_COLOR, 1); data->root_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); @@ -517,19 +453,17 @@ _scene_setup(Scene_Data *data) _fence_setup(&data->fence); _billboard_setup(data); - eo_do(data->root_node, - evas_canvas3d_node_member_add(data->sphere.node), - evas_canvas3d_node_member_add(data->cube.node), - evas_canvas3d_node_member_add(data->cylinder.node), - evas_canvas3d_node_member_add(data->square.node), - evas_canvas3d_node_member_add(data->model.node), - evas_canvas3d_node_member_add(data->cone.node), - evas_canvas3d_node_member_add(data->fence.node)); + evas_canvas3d_node_member_add(data->root_node, data->sphere.node); + evas_canvas3d_node_member_add(data->root_node, data->cube.node); + evas_canvas3d_node_member_add(data->root_node, data->cylinder.node); + evas_canvas3d_node_member_add(data->root_node, data->square.node); + evas_canvas3d_node_member_add(data->root_node, data->model.node); + evas_canvas3d_node_member_add(data->root_node, data->cone.node); + evas_canvas3d_node_member_add(data->root_node, data->fence.node); - eo_do(data->scene, - evas_canvas3d_scene_root_node_set(data->root_node), - evas_canvas3d_scene_camera_node_set(data->camera_node), - evas_canvas3d_scene_shadows_enable_set(EINA_TRUE)); + evas_canvas3d_scene_root_node_set(data->scene, data->root_node); + evas_canvas3d_scene_camera_node_set(data->scene, data->camera_node); + evas_canvas3d_scene_shadows_enable_set(data->scene, EINA_TRUE); } static void @@ -540,66 +474,66 @@ _on_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *eo EINA_U if (!strcmp("w", ev->key)) { Evas_Real x, y, z; - eo_do(choosed_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z)); - eo_do(choosed_node, evas_canvas3d_node_position_set(x, y + STEP, z)); + evas_canvas3d_node_position_get(choosed_node, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); + evas_canvas3d_node_position_set(choosed_node, x, y + STEP, z); } else if(!strcmp("s", ev->key)) { Evas_Real x, y, z; - eo_do(choosed_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z)); - eo_do(choosed_node, evas_canvas3d_node_position_set(x, y - STEP, z)); + evas_canvas3d_node_position_get(choosed_node, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); + evas_canvas3d_node_position_set(choosed_node, x, y - STEP, z); } else if(!strcmp("a", ev->key)) { Evas_Real x, y, z; - eo_do(choosed_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z)); - eo_do(choosed_node, evas_canvas3d_node_position_set(x - STEP, y, z)); + evas_canvas3d_node_position_get(choosed_node, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); + evas_canvas3d_node_position_set(choosed_node, x - STEP, y, z); } else if(!strcmp("d", ev->key)) { Evas_Real x, y, z; - eo_do(choosed_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z)); - eo_do(choosed_node, evas_canvas3d_node_position_set(x + STEP, y, z)); + evas_canvas3d_node_position_get(choosed_node, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); + evas_canvas3d_node_position_set(choosed_node, x + STEP, y, z); } else if(!strcmp("q", ev->key)) { Evas_Real x, y, z; - eo_do(choosed_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z)); - eo_do(choosed_node, evas_canvas3d_node_position_set(x, y, z - STEP)); + evas_canvas3d_node_position_get(choosed_node, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); + evas_canvas3d_node_position_set(choosed_node, x, y, z - STEP); } else if(!strcmp("e", ev->key)) { Evas_Real x, y, z; - eo_do(choosed_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z)); - eo_do(choosed_node, evas_canvas3d_node_position_set(x, y, z + STEP)); + evas_canvas3d_node_position_get(choosed_node, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); + evas_canvas3d_node_position_set(choosed_node, x, y, z + STEP); } else if(!strcmp("1", ev->key)) { - eo_do(scene->root_node, evas_canvas3d_node_member_del(scene->model.node)); - eo_do(scene->root_node, evas_canvas3d_node_member_add(scene->billboard.node)); + evas_canvas3d_node_member_del(scene->root_node, scene->model.node); + evas_canvas3d_node_member_add(scene->root_node, scene->billboard.node); } else if(!strcmp("2", ev->key)) { - eo_do(scene->root_node, evas_canvas3d_node_member_add(scene->model.node)); - eo_do(scene->root_node, evas_canvas3d_node_member_del(scene->billboard.node)); + evas_canvas3d_node_member_add(scene->root_node, scene->model.node); + evas_canvas3d_node_member_del(scene->root_node, scene->billboard.node); } else if(!strcmp("Up", ev->key)) { Evas_Real x, y, z; - eo_do(scene->camera_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z)); - eo_do(scene->camera_node, evas_canvas3d_node_position_set(x, y, z + STEP)); + evas_canvas3d_node_position_get(scene->camera_node, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); + evas_canvas3d_node_position_set(scene->camera_node, x, y, z + STEP); } else if(!strcmp("Down", ev->key)) { Evas_Real x, y, z; - eo_do(scene->camera_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z)); - eo_do(scene->camera_node, evas_canvas3d_node_position_set(x, y, z - STEP)); + evas_canvas3d_node_position_get(scene->camera_node, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); + evas_canvas3d_node_position_set(scene->camera_node, x, y, z - STEP); } else if (!strcmp("i", ev->key)) { scene->init = !scene->init; - eo_do(scene->model.node, evas_canvas3d_node_position_set(0.0, 0.0, 0.0)); - eo_do(scene->billboard.node, evas_canvas3d_node_position_set(0.0, 2.0, 0.0)); + evas_canvas3d_node_position_set(scene->model.node, 0.0, 0.0, 0.0); + evas_canvas3d_node_position_set(scene->billboard.node, 0.0, 2.0, 0.0); } else { @@ -611,30 +545,30 @@ static void _init(Scene_Data *data) { Eina_List *meshes = NULL, *l; Evas_Canvas3D_Mesh *m; - eo_do(data->sphere.node, meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get()); + meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->sphere.node); EINA_LIST_FOREACH(meshes, l, m) { - eo_do(m, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); + evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG); } - eo_do(data->cube.node, meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get()); + meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->cube.node); EINA_LIST_FOREACH(meshes, l, m) { - eo_do(m, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); + evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG); } - eo_do(data->cylinder.node, meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get()); + meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->cylinder.node); EINA_LIST_FOREACH(meshes, l, m) { - eo_do(m, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); + evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG); } - eo_do(data->model.node, meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get()); + meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->model.node); EINA_LIST_FOREACH(meshes, l, m) { - eo_do(m, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); + evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG); } - eo_do(data->cone.node, meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get()); + meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->cone.node); EINA_LIST_FOREACH(meshes, l, m) { - eo_do(m, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); + evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG); } } @@ -651,7 +585,7 @@ _on_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, voi _init(d); return; } - eo_do(d->scene, evas_canvas3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, &s, &t)); + evas_canvas3d_scene_pick(d->scene, ev->canvas.x, ev->canvas.y, &n, &m, &s, &t); } int @@ -677,20 +611,18 @@ main(void) /* Add a background rectangle objects. */ background = eo_add(EVAS_RECTANGLE_CLASS, evas); - eo_do(background, - efl_gfx_color_set(0, 0, 0, 255), - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_color_set(background, 0, 0, 0, 255); + efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = evas_object_image_filled_add(evas); - eo_do(image, - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_visible_set(image, EINA_TRUE); evas_object_focus_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ - eo_do(image, evas_obj_image_scene_set(data.scene)); + evas_obj_image_scene_set(image, data.scene); nodes1 = eina_list_append(nodes1, data.sphere.node); nodes2 = eina_list_append(nodes2, data.sphere.node); @@ -698,14 +630,14 @@ main(void) nodes2 = eina_list_append(nodes2, data.cone.node); /*Set callbacks*/ - eo_do(data.cube.node, eo_event_callback_add(EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL)); - eo_do(data.cube.node, eo_event_callback_add(EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes2)); + eo_event_callback_add(data.cube.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL); + eo_event_callback_add(data.cube.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes2); - eo_do(data.model.node, eo_event_callback_add(EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL)); - eo_do(data.model.node, eo_event_callback_add(EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes1)); + eo_event_callback_add(data.model.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL); + eo_event_callback_add(data.model.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes1); - eo_do(data.billboard.node, eo_event_callback_add(EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL)); - eo_do(data.billboard.node, eo_event_callback_add(EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes1)); + eo_event_callback_add(data.billboard.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL); + eo_event_callback_add(data.billboard.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes1); evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN, _on_mouse_down, &data); evas_object_event_callback_add(image, EVAS_CALLBACK_KEY_DOWN, _on_key_down, &data); diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c index 9f17ee8313..bcd825cb97 100644 --- a/src/examples/evas/evas-object-manipulation-eo.c +++ b/src/examples/evas/evas-object-manipulation-eo.c @@ -59,7 +59,7 @@ _canvas_resize_cb(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - eo_do(d.bg, efl_gfx_size_set(w, h)); + efl_gfx_size_set(d.bg, w, h); } static void @@ -80,7 +80,7 @@ _on_keydown(void *data EINA_UNUSED, { int alpha, r, g, b; - eo_do(d.clipper, efl_gfx_color_get(&r, &g, &b, &alpha)); + efl_gfx_color_get(d.clipper, &r, &g, &b, &alpha); evas_color_argb_unpremul(alpha, &r, &g, &b); alpha -= 20; @@ -88,7 +88,7 @@ _on_keydown(void *data EINA_UNUSED, alpha = 255; evas_color_argb_premul(alpha, &r, &g, &b); - eo_do(d.clipper, efl_gfx_color_set(r, g, b, alpha)); + efl_gfx_color_set(d.clipper, r, g, b, alpha); fprintf(stdout, "Changing clipper's opacity: %d%%\n", (int)((alpha / 255.0) * 100)); @@ -102,7 +102,7 @@ _on_keydown(void *data EINA_UNUSED, fprintf(stdout, "Changing clipper's color to"); - eo_do(d.clipper, efl_gfx_color_get(&r, &g, &b, &alpha)); + efl_gfx_color_get(d.clipper, &r, &g, &b, &alpha); evas_color_argb_unpremul(alpha, &r, &g, &b); if (g > 0) @@ -117,7 +117,7 @@ _on_keydown(void *data EINA_UNUSED, } evas_color_argb_premul(alpha, &r, &g, &b); - eo_do(d.clipper, efl_gfx_color_set(r, g, b, alpha)); + efl_gfx_color_set(d.clipper, r, g, b, alpha); return; } @@ -126,15 +126,15 @@ _on_keydown(void *data EINA_UNUSED, fprintf(stdout, "Toggling clipping "); Evas_Object *clip = NULL; - eo_do(d.img, clip = evas_obj_clip_get()); + clip = evas_obj_clip_get(d.img); if (clip == d.clipper) { - eo_do(d.img, evas_obj_clip_unset()); + evas_obj_clip_unset(d.img); fprintf(stdout, "off\n"); } else { - eo_do(d.img, evas_obj_clip_set(d.clipper)); + evas_obj_clip_set(d.img, d.clipper); fprintf(stdout, "on\n"); } return; @@ -145,8 +145,8 @@ _on_keydown(void *data EINA_UNUSED, Eina_Bool visibility; /* Don't use "get"-"set" expressions in one eo_do call, * if you pass parameter to "set" by value. */ - eo_do(d.clipper, visibility = efl_gfx_visible_get()); - eo_do(d.clipper, efl_gfx_visible_set(!visibility)); + visibility = efl_gfx_visible_get(d.clipper); + efl_gfx_visible_set(d.clipper, !visibility); fprintf(stdout, "Clipper is now %s\n", visibility ? "hidden" : "visible"); return; } @@ -177,12 +177,15 @@ main(void) d.bg = eo_add(EVAS_RECTANGLE_CLASS, d.canvas); /* Eo-styled way to perform actions on an object*/ - eo_do(d.bg, evas_obj_name_set("background rectangle"), - efl_gfx_color_set(255, 255, 255, 255), /* white bg */ - efl_gfx_position_set(0, 0), /* at canvas' origin */ - efl_gfx_size_set(WIDTH, HEIGHT), /* covers full canvas */ - efl_gfx_visible_set(EINA_TRUE), - evas_obj_focus_set(EINA_TRUE)); + evas_obj_name_set(d.bg, "background rectangle"); + efl_gfx_color_set(d.bg, 255, 255, 255, 255); + /* white bg */ + efl_gfx_position_set(d.bg, 0, 0); + /* at canvas' origin */ + efl_gfx_size_set(d.bg, WIDTH, HEIGHT); + /* covers full canvas */ + efl_gfx_visible_set(d.bg, EINA_TRUE); + evas_obj_focus_set(d.bg, EINA_TRUE); evas_object_event_callback_add( d.bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, NULL); @@ -194,9 +197,9 @@ main(void) * So it's possible to decrement refcount, and 'image' object * will be deleted automatically by parent.*/ - eo_do(d.img, evas_obj_image_filled_set(EINA_TRUE), - efl_file_set(img_path, NULL), - err = evas_obj_image_load_error_get()); + evas_obj_image_filled_set(d.img, EINA_TRUE); + efl_file_set(d.img, img_path, NULL); + err = evas_obj_image_load_error_get(d.img); if (err != EVAS_LOAD_ERROR_NONE) { @@ -204,20 +207,20 @@ main(void) } else { - eo_do(d.img, efl_gfx_position_set(0, 0), - efl_gfx_size_set(WIDTH, HEIGHT), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_position_set(d.img, 0, 0); + efl_gfx_size_set(d.img, WIDTH, HEIGHT); + efl_gfx_visible_set(d.img, EINA_TRUE); const char *type = NULL; - eo_do(d.img, type = evas_obj_type_get()); + type = evas_obj_type_get(d.img); fprintf(stdout, "Image object added, type is: %s\n", type); } /* border on the image's clipper, here just to emphasize its position */ d.clipper_border = eo_add(EVAS_IMAGE_CLASS, d.canvas); - eo_do(d.clipper_border, evas_obj_image_filled_set(EINA_TRUE), - efl_file_set(border_img_path, NULL), - err = evas_obj_image_load_error_get()); + evas_obj_image_filled_set(d.clipper_border, EINA_TRUE); + efl_file_set(d.clipper_border, border_img_path, NULL); + err = evas_obj_image_load_error_get(d.clipper_border); if (err != EVAS_LOAD_ERROR_NONE) { @@ -225,24 +228,22 @@ main(void) } else { - eo_do(d.clipper_border, - evas_obj_image_border_set(3, 3, 3, 3), - evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_NONE), - efl_gfx_position_set((WIDTH / 4) -3, (HEIGHT / 4) - 3), - efl_gfx_size_set((WIDTH / 2) + 6, (HEIGHT / 2) + 6), - efl_gfx_visible_set(EINA_TRUE)); + evas_obj_image_border_set(d.clipper_border, 3, 3, 3, 3); + evas_obj_image_border_center_fill_set(d.clipper_border, EVAS_BORDER_FILL_NONE); + efl_gfx_position_set(d.clipper_border, (WIDTH / 4) -3, (HEIGHT / 4) - 3); + efl_gfx_size_set(d.clipper_border, (WIDTH / 2) + 6, (HEIGHT / 2) + 6); + efl_gfx_visible_set(d.clipper_border, EINA_TRUE); } /* solid white clipper (note that it's the default color for a * rectangle) - it won't change clippees' colors, then (multiplying * by 255) */ d.clipper = eo_add(EVAS_RECTANGLE_CLASS, d.canvas); - eo_do(d.clipper, - efl_gfx_position_set( WIDTH / 4, HEIGHT / 4), - efl_gfx_size_set(WIDTH / 2, HEIGHT / 2), - efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_position_set(d.clipper, WIDTH / 4, HEIGHT / 4); + efl_gfx_size_set(d.clipper, WIDTH / 2, HEIGHT / 2); + efl_gfx_visible_set(d.clipper, EINA_TRUE); - eo_do(d.img, evas_obj_clip_set(d.clipper)); + evas_obj_clip_set(d.img, d.clipper); fprintf(stdout, "%s", commands); diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c index 17416ebfaa..2c0c7026b0 100644 --- a/src/examples/evas/evas-vg-simple.c +++ b/src/examples/evas/evas-vg-simple.c @@ -447,21 +447,17 @@ vector_set(int x, int y, int w, int h) eina_matrix3_rotate(&matrix, radian); root = evas_object_vg_root_node_get(d.vg); - //eo_do(root, evas_vg_node_transformation_set(&matrix)); + //evas_vg_node_transformation_set(root, &matrix); - Efl_VG *bg = eo_add(EFL_VG_SHAPE_CLASS, root, - efl_vg_name_set("bg")); + Efl_VG *bg = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "bg")); _rect_add(bg, 0, 0 , vg_w, vg_h); evas_vg_node_origin_set(bg, 0,0); evas_vg_shape_stroke_width_set(bg, 1.0); evas_vg_node_color_set(bg, 80, 80, 80, 80); - Efl_VG *shape = eo_add(EFL_VG_SHAPE_CLASS, root, - efl_vg_name_set("shape")); - Efl_VG *rgradient = eo_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL, - efl_vg_name_set("rgradient")); - Efl_VG *lgradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL, - efl_vg_name_set("lgradient")); + Efl_VG *shape = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "shape")); + Efl_VG *rgradient = eo_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL, efl_vg_name_set(eoid, "rgradient")); + Efl_VG *lgradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL, efl_vg_name_set(eoid, "lgradient")); _arcto(shape, 0, 0, 100, 100, 25, 330); @@ -502,8 +498,7 @@ vector_set(int x, int y, int w, int h) evas_vg_node_color_set(shape, 0, 0, 255, 255); evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 128); - Efl_VG *rect = eo_add(EFL_VG_SHAPE_CLASS, root, - efl_vg_name_set("rect")); + Efl_VG *rect = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "rect")); _rect_add(rect, 0, 0, 100, 100); evas_vg_node_origin_set(rect, 100, 100); evas_vg_shape_fill_set(rect, lgradient); @@ -511,8 +506,7 @@ vector_set(int x, int y, int w, int h) evas_vg_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND); evas_vg_shape_stroke_color_set(rect, 255, 255, 255, 255); - Efl_VG *rect1 = eo_add(EFL_VG_SHAPE_CLASS, root, - efl_vg_name_set("rect1")); + Efl_VG *rect1 = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "rect1")); _rect_add(rect1, 0, 0, 70, 70); evas_vg_node_origin_set(rect1, 50, 70); evas_vg_shape_stroke_scale_set(rect1, 2); @@ -520,8 +514,7 @@ vector_set(int x, int y, int w, int h) evas_vg_shape_stroke_join_set(rect1, EFL_GFX_JOIN_ROUND); evas_vg_shape_stroke_color_set(rect1, 0, 100, 80, 100); - Efl_VG *circle = eo_add(EFL_VG_SHAPE_CLASS, root, - efl_vg_name_set("circle")); + Efl_VG *circle = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "circle")); _arcto(circle, 0, 0, 250, 100, 30, 300); evas_vg_shape_fill_set(circle, lgradient); //evas_vg_node_transformation_set(&matrix), @@ -529,35 +522,30 @@ vector_set(int x, int y, int w, int h) evas_vg_node_color_set(circle, 50, 0, 0, 50); // Foreground - Efl_VG *fg = eo_add(EFL_VG_SHAPE_CLASS, root, - efl_vg_name_set("fg")); + Efl_VG *fg = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "fg")); _rect_add(fg, 0, 0, vg_w, vg_h); evas_vg_node_origin_set(fg, 0, 0); evas_vg_shape_stroke_width_set(fg, 5.0); evas_vg_shape_stroke_join_set(fg, EFL_GFX_JOIN_ROUND); evas_vg_shape_stroke_color_set(fg, 70, 70, 0, 70); - Efl_VG *tst = eo_add(EFL_VG_SHAPE_CLASS, root, - efl_vg_name_set("tst")); + Efl_VG *tst = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "tst")); evas_vg_shape_shape_append_rect(tst, 50, 25, 200, 200, 3, 5); evas_vg_node_color_set(tst, 0, 0, 200, 200); evas_vg_shape_stroke_width_set(tst, 2); evas_vg_shape_stroke_color_set(tst, 255, 0, 0, 255); - Efl_VG *vc = eo_add(EFL_VG_SHAPE_CLASS, root, - efl_vg_name_set("vc")); + Efl_VG *vc = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "vc")); evas_vg_shape_shape_append_circle(vc, 100, 100, 23); evas_vg_node_color_set(vc, 0, 200, 0, 255); evas_vg_shape_stroke_width_set(vc, 4); evas_vg_shape_stroke_color_set(vc, 255, 0, 0, 255); - beginning = eo_add(EFL_VG_CONTAINER_CLASS, NULL, - efl_vg_dup(root)); - end = eo_add(EFL_VG_CONTAINER_CLASS, NULL, - efl_vg_dup(root)); + beginning = eo_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(eoid, root)); + end = eo_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(eoid, root)); - eo_do(end, circle = efl_vg_container_child_get("circle")); - eo_do(circle, efl_vg_transformation_set(&matrix)); + circle = efl_vg_container_child_get(end, "circle"); + efl_vg_transformation_set(circle, &matrix); } static Eina_Bool @@ -578,7 +566,7 @@ _anim(void *data EINA_UNUSED) pos = ecore_animator_pos_map((now - start_time) / 3, ECORE_POS_MAP_SINUSOIDAL, 0, 0); - eo_do(root, efl_vg_interpolate(beginning, end, pos)); + efl_vg_interpolate(root, beginning, end, pos); return EINA_TRUE; } @@ -600,7 +588,7 @@ _keydown(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *o EINA_UNU ecore_animator_del(anim); anim = NULL; } - /* eo_do(root, efl_vg_interpolate(beginning, end, 0.5)); */ + /* efl_vg_interpolate(root, beginning, end, 0.5); */ } fprintf(stderr, "key: [%s]\n", ev->key); } diff --git a/src/examples/evas/shooter/evas-3d-shooter-header.c b/src/examples/evas/shooter/evas-3d-shooter-header.c index 894df546f0..ee608ba2f9 100644 --- a/src/examples/evas/shooter/evas-3d-shooter-header.c +++ b/src/examples/evas/shooter/evas-3d-shooter-header.c @@ -14,7 +14,7 @@ evas_box3_set(Box3 *box, Evas_Real x0, Evas_Real y0, Evas_Real z0, Evas_Real x1, void _scale(Evas_Canvas3D_Node *node, Evas_Real scale) { - eo_do(node, evas_canvas3d_node_scale_set(1.0 * scale, 1.0 * scale, 1.0 * scale)); + evas_canvas3d_node_scale_set(node, 1.0 * scale, 1.0 * scale, 1.0 * scale); } float @@ -27,21 +27,17 @@ void _camera_setup(Scene_Data *data) { data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - eo_do(data->camera, - evas_canvas3d_camera_projection_perspective_set(65.0, 1.0, 1.0, 300.0)); + evas_canvas3d_camera_projection_perspective_set(data->camera, 65.0, 1.0, 1.0, 300.0); - data->mediator_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); - data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + data->mediator_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); + data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->mediator_node)); - eo_do(data->mediator_node, evas_canvas3d_node_member_add(data->camera_node)); + evas_canvas3d_node_member_add(data->root_node, data->mediator_node); + evas_canvas3d_node_member_add(data->mediator_node, data->camera_node); - eo_do(data->camera_node, - evas_canvas3d_node_camera_set(data->camera), - evas_canvas3d_node_position_set(20.0, 80.0, 30.0); - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); + evas_canvas3d_node_camera_set(data->camera_node, data->camera); + evas_canvas3d_node_position_set(data->camera_node, 20.0, 80.0, 30.0); + evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); } void @@ -49,21 +45,18 @@ _light_setup(Scene_Data *data) { data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); - eo_do(data->light, - evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), - evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_canvas3d_light_specular_set(0.2, 0.2, 0.2, 1.0), - evas_canvas3d_light_projection_perspective_set(100.0, 1.0, 1.0, 200.0)); + evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_light_specular_set(data->light, 0.2, 0.2, 0.2, 1.0); + evas_canvas3d_light_projection_perspective_set(data->light, 100.0, 1.0, 1.0, 200.0); - data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); - eo_do(data->light_node, - evas_canvas3d_node_light_set(data->light), - evas_canvas3d_node_position_set(-30.0, 70.0, 0.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0)); + evas_canvas3d_node_light_set(data->light_node, data->light); + evas_canvas3d_node_position_set(data->light_node, -30.0, 70.0, 0.0); + evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0); - eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node)); + evas_canvas3d_node_member_add(data->root_node, data->light_node); } Eina_Bool _mesh_aabb(Evas_Canvas3D_Mesh **mesh, Scene_Data *scene, int index) @@ -96,15 +89,12 @@ Eina_Bool _mesh_aabb(Evas_Canvas3D_Mesh **mesh, Scene_Data *scene, int index) else if (fmod(index, 12) == 11) node = scene->mesh_node_snake; - eo_do(node, - evas_canvas3d_node_bounding_sphere_get(&x0, &y0, &z0, &r)); + evas_canvas3d_node_bounding_sphere_get(node, &x0, &y0, &z0, &r); - eo_do(scene->mesh_node_ball, - evas_canvas3d_node_scale_set(r, r, r), - evas_canvas3d_node_position_set(x0, y0, z0)); + evas_canvas3d_node_scale_set(scene->mesh_node_ball, r, r, r); + evas_canvas3d_node_position_set(scene->mesh_node_ball, x0, y0, z0); - eo_do(node, - evas_canvas3d_node_bounding_box_get(&x0, &y0, &z0, &x1, &y1, &z1)); + evas_canvas3d_node_bounding_box_get(node, &x0, &y0, &z0, &x1, &y1, &z1); float vertixes[] = { @@ -151,10 +141,9 @@ Eina_Bool _mesh_aabb(Evas_Canvas3D_Mesh **mesh, Scene_Data *scene, int index) if (*mesh) { - eo_do(*mesh, - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES), - evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 6 * sizeof(float), &vertixes[ 0]), - evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 48, &indixes[0])); + evas_canvas3d_mesh_vertex_assembly_set(*mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES); + evas_canvas3d_mesh_frame_vertex_data_copy_set(*mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 6 * sizeof(float), &vertixes[ 0]); + evas_canvas3d_mesh_index_data_copy_set(*mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 48, &indixes[0]); return EINA_TRUE; } @@ -183,8 +172,7 @@ Eina_Bool _horizontal_circle_resolution(Evas_Canvas3D_Node *node, Evas_Real x, E { Evas_Real x0, y0, z0, x1, y1, z1; - eo_do(node, - evas_canvas3d_node_bounding_box_get(&x0, &y0, &z0, &x1, &y1, &z1)); + evas_canvas3d_node_bounding_box_get(node, &x0, &y0, &z0, &x1, &y1, &z1); if (((x0 - x) * (x0 - x)) + ((z0 - z) * (z0 - z)) < r * r) return EINA_FALSE; if (((x0 - x) * (x0 - x)) + ((z1 - z) * (z1 - z)) < r * r) return EINA_FALSE; @@ -207,10 +195,8 @@ Eina_Bool _horizontal_circle_object_resolution(Evas_Canvas3D_Node *node, Evas_Ca { Evas_Real x0, y0, z0, x1, y1, z1, x, y, z; - eo_do(node2, - evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_WORLD, &x, &y, &z)); - eo_do(node, - evas_canvas3d_node_bounding_box_get(&x0, &y0, &z0, &x1, &y1, &z1)); + evas_canvas3d_node_position_get(node2, EVAS_CANVAS3D_SPACE_WORLD, &x, &y, &z); + evas_canvas3d_node_bounding_box_get(node, &x0, &y0, &z0, &x1, &y1, &z1); if (((x0 - x) * (x0 - x)) + ((z0 - z) * (z0 - z)) < r * r) return EINA_FALSE; if (((x0 - x) * (x0 - x)) + ((z1 - z) * (z1 - z)) < r * r) return EINA_FALSE; @@ -233,8 +219,7 @@ Eina_Bool _horizontal_circle_position_resolution(Evas_Canvas3D_Node *node, Evas_ { Evas_Real x0, y0, z0; - eo_do(node, - evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x0, &y0, &z0)); + evas_canvas3d_node_position_get(node, EVAS_CANVAS3D_SPACE_PARENT, &x0, &y0, &z0); if (((x0 - x) * (x0 - x)) + ((z0 - z) * (z0 - z)) < r * r) return EINA_FALSE; @@ -245,8 +230,7 @@ Eina_Bool _horizontal_position_resolution(Evas_Canvas3D_Node *node, Evas_Real x, { Evas_Real x0, y0, z0, x1, y1, z1; - eo_do(node, - evas_canvas3d_node_bounding_box_get(&x0, &y0, &z0, &x1, &y1, &z1)); + evas_canvas3d_node_bounding_box_get(node, &x0, &y0, &z0, &x1, &y1, &z1); if ((x > x0) && (x < x1) && (z > z0) && (z < z1)) return EINA_FALSE; @@ -266,8 +250,7 @@ Eina_Bool _horizontal_object_resolution(Evas_Canvas3D_Node *node, Evas_Real x1, { Evas_Real x3, y3, z3, x4, y4, z4; - eo_do(node, - evas_canvas3d_node_bounding_box_get(&x3, &y3, &z3, &x4, &y4, &z4)); + evas_canvas3d_node_bounding_box_get(node, &x3, &y3, &z3, &x4, &y4, &z4); if ((x4 + x_move < x1) || (x4 + x_move > x2) || (z4 + z_move < z1) || (z4 + z_move > z2)) @@ -285,8 +268,7 @@ Eina_Bool _horizontal_frame_resolution(Evas_Canvas3D_Node *node, Evas_Real x1, E *x_move = 0; *z_move = 0; - eo_do(node, - evas_canvas3d_node_bounding_box_get(&x3, &y3, &z3, &x4, &y4, &z4)); + evas_canvas3d_node_bounding_box_get(node, &x3, &y3, &z3, &x4, &y4, &z4); if (x3 < x1) *x_move = x1 - x3; @@ -364,14 +346,11 @@ _set_ball(Eo *mesh, int p) _generate_square_grid(indices, p); - eo_do(mesh, evas_canvas3d_mesh_vertex_count_set(vcount), - evas_canvas3d_mesh_frame_add(0); - evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, - sizeof(vec3), &vertices[0]); - evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, - sizeof(vec3), &normals[0]); - evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, - icount , &indices[0])); + evas_canvas3d_mesh_vertex_count_set(mesh, vcount); + evas_canvas3d_mesh_frame_add(mesh, 0); + evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, sizeof(vec3), &vertices[0]); + evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, sizeof(vec3), &normals[0]); + evas_canvas3d_mesh_index_data_copy_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, icount, &indices[0]); free(vertices); free(normals); diff --git a/src/examples/evas/shooter/evas-3d-shooter-macros.h b/src/examples/evas/shooter/evas-3d-shooter-macros.h index e19a507f17..cae6417ea2 100644 --- a/src/examples/evas/shooter/evas-3d-shooter-macros.h +++ b/src/examples/evas/shooter/evas-3d-shooter-macros.h @@ -110,111 +110,98 @@ typedef struct _vec2 #define ENABLE_FOG(mesh) \ - eo_do(mesh, evas_canvas3d_mesh_fog_enable_set(EINA_TRUE), \ - evas_canvas3d_mesh_fog_color_set(FOG_COLOR, FOG_FACTOR)); + evas_canvas3d_mesh_fog_enable_set(mesh, EINA_TRUE); \ + evas_canvas3d_mesh_fog_color_set(mesh, FOG_COLOR, FOG_FACTOR); #define DISABLE_FOG(mesh) \ - eo_do(mesh, evas_canvas3d_mesh_fog_enable_set(EINA_FALSE)); + evas_canvas3d_mesh_fog_enable_set(mesh, EINA_FALSE); #define ENABLE_NORMAL(mesh) \ - eo_do(mesh, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP)); + evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP); #define DISABLE_NORMAL(mesh) \ - eo_do(mesh, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); + evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); #define ADD_MESH(Object, Name, a, d, s) \ data->material_##Object = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); \ \ - eo_do(data->material_##Object, \ - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), \ - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), \ - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), \ - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), \ - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, a, a, a, 1.0), \ - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, d, d, d, 1.0), \ - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, s, s, s, 1.0), \ - evas_canvas3d_material_shininess_set(50.0)); \ + evas_canvas3d_material_enable_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); \ + evas_canvas3d_material_enable_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); \ + evas_canvas3d_material_enable_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); \ + evas_canvas3d_material_enable_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); \ + evas_canvas3d_material_color_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, a, a, a, 1.0); \ + evas_canvas3d_material_color_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, d, d, d, 1.0); \ + evas_canvas3d_material_color_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, s, s, s, 1.0); \ + evas_canvas3d_material_shininess_set(data->material_##Object, 50.0); \ \ data->mesh_##Name = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); #define SETUP_DEFAULT_MESH(Object, Name, Shade_Mode) \ - eo_do(data->mesh_##Name, \ - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_##Shade_Mode), \ - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), \ - evas_canvas3d_mesh_frame_material_set(0, data->material_##Object)); + evas_canvas3d_mesh_shade_mode_set(data->mesh_##Name, EVAS_CANVAS3D_SHADE_MODE_##Shade_Mode); \ + evas_canvas3d_mesh_vertex_assembly_set(data->mesh_##Name, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); \ + evas_canvas3d_mesh_frame_material_set(data->mesh_##Name, 0, data->material_##Object); #define SETUP_MESH_NODE(Name) \ - data->mesh_node_##Name = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, \ - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); \ + data->mesh_node_##Name = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ \ - eo_do(data->mesh_node_##Name, \ - evas_canvas3d_node_mesh_add(data->mesh_##Name)); + evas_canvas3d_node_mesh_add(data->mesh_node_##Name, data->mesh_##Name); #define MATERIAL_TEXTURE_SET(Object, Name, file, image) \ - eo_do(data->mesh_##Name, \ - efl_file_set(file, NULL)); \ + efl_file_set(data->mesh_##Name, file, NULL); \ \ SETUP_DEFAULT_MESH(Object, Name, PHONG) \ data->texture_diffuse_##Object = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); \ \ - eo_do(data->texture_diffuse_##Object, \ - evas_canvas3d_texture_atlas_enable_set(EINA_FALSE), \ - evas_canvas3d_texture_file_set(image, NULL), \ - evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \ - EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), \ - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT)); \ + evas_canvas3d_texture_atlas_enable_set(data->texture_diffuse_##Object, EINA_FALSE); \ + evas_canvas3d_texture_file_set(data->texture_diffuse_##Object, image, NULL); \ + evas_canvas3d_texture_filter_set(data->texture_diffuse_##Object, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \ + EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); \ + evas_canvas3d_texture_wrap_set(data->texture_diffuse_##Object, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); \ \ - eo_do(data->material_##Object, \ - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, \ - data->texture_diffuse_##Object), \ - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, \ - data->texture_diffuse_##Object)); + evas_canvas3d_material_texture_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, \ + data->texture_diffuse_##Object); \ + evas_canvas3d_material_texture_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, \ + data->texture_diffuse_##Object); #define CUBE_TEXTURE_SET(Object, Name, vertex, image) \ - eo_do(data->mesh_##Name, \ - evas_canvas3d_mesh_from_primitive_set(0, data->cube_primitive), \ - evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, \ - 2 * sizeof(float), vertex)); \ + evas_canvas3d_mesh_from_primitive_set(data->mesh_##Name, 0, data->cube_primitive); \ + evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_##Name, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, \ + 2 * sizeof(float), vertex); \ SETUP_DEFAULT_MESH(Object, Name, NORMAL_MAP) \ data->texture_diffuse_##Object = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); \ \ - eo_do(data->texture_diffuse_##Object, \ - evas_canvas3d_texture_atlas_enable_set(EINA_FALSE), \ - evas_canvas3d_texture_file_set(image, NULL), \ - evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \ - EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), \ - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT)); \ + evas_canvas3d_texture_atlas_enable_set(data->texture_diffuse_##Object, EINA_FALSE); \ + evas_canvas3d_texture_file_set(data->texture_diffuse_##Object, image, NULL); \ + evas_canvas3d_texture_filter_set(data->texture_diffuse_##Object, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \ + EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); \ + evas_canvas3d_texture_wrap_set(data->texture_diffuse_##Object, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); \ \ - eo_do(data->material_##Object, \ - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, \ - data->texture_diffuse_##Object), \ - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, \ - data->texture_diffuse_##Object)); + evas_canvas3d_material_texture_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, \ + data->texture_diffuse_##Object); \ + evas_canvas3d_material_texture_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, \ + data->texture_diffuse_##Object); #define NORMAL_SET(Object, Name, normal) \ data->texture_normal_##Object = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); \ \ - eo_do(data->texture_normal_##Object, \ - evas_canvas3d_texture_atlas_enable_set(EINA_FALSE), \ - evas_canvas3d_texture_file_set(normal, NULL), \ - evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \ - EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), \ - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT)); \ + evas_canvas3d_texture_atlas_enable_set(data->texture_normal_##Object, EINA_FALSE); \ + evas_canvas3d_texture_file_set(data->texture_normal_##Object, normal, NULL); \ + evas_canvas3d_texture_filter_set(data->texture_normal_##Object, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \ + EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); \ + evas_canvas3d_texture_wrap_set(data->texture_normal_##Object, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); \ \ - eo_do(data->material_##Object, \ - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, \ - data->texture_normal_##Object)); \ + evas_canvas3d_material_texture_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, \ + data->texture_normal_##Object); \ \ - eo_do(data->mesh_##Name, \ - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP)); + evas_canvas3d_mesh_shade_mode_set(data->mesh_##Name, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP); #define TEXTCOORDS_SET(Name, fb1, fb2, lr1, lr2, tb1, tb2) \ static float Name##_textcoords[] = \ diff --git a/src/examples/evas/shooter/evas-3d-shooter.c b/src/examples/evas/shooter/evas-3d-shooter.c index fac65a3412..9ea9ceb1a4 100644 --- a/src/examples/evas/shooter/evas-3d-shooter.c +++ b/src/examples/evas/shooter/evas-3d-shooter.c @@ -115,8 +115,7 @@ _key_down(void *data, { if (space_move == 0.0) { - eo_do(scene->mesh_node_tommy, - evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z)); + evas_canvas3d_node_position_get(scene->mesh_node_tommy, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); old_space_position = y; space_move = JUMP; } @@ -134,19 +133,15 @@ _key_down(void *data, if (!scene->blending) { scene->blending = EINA_TRUE; - eo_do(scene->texture_diffuse_carpet, - evas_canvas3d_texture_file_set(gazebo_t_trans_path, NULL)); - eo_do(scene->mesh_carpet, - evas_canvas3d_mesh_blending_enable_set(EINA_TRUE), - evas_canvas3d_mesh_blending_func_set(EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA)); + evas_canvas3d_texture_file_set(scene->texture_diffuse_carpet, gazebo_t_trans_path, NULL); + evas_canvas3d_mesh_blending_enable_set(scene->mesh_carpet, EINA_TRUE); + evas_canvas3d_mesh_blending_func_set(scene->mesh_carpet, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA); } else { scene->blending = EINA_FALSE; - eo_do(scene->texture_diffuse_carpet, - evas_canvas3d_texture_file_set(gazebo_t_path, NULL)); - eo_do(scene->mesh_carpet, - evas_canvas3d_mesh_blending_enable_set(EINA_FALSE)); + evas_canvas3d_texture_file_set(scene->texture_diffuse_carpet, gazebo_t_path, NULL); + evas_canvas3d_mesh_blending_enable_set(scene->mesh_carpet, EINA_FALSE); } } else if (!strcmp(ev->key, "S")) @@ -154,14 +149,12 @@ _key_down(void *data, if (!scene->blending) { scene->blending = EINA_TRUE; - eo_do(global_scene, - evas_canvas3d_scene_shadows_enable_set(EINA_TRUE)); + evas_canvas3d_scene_shadows_enable_set(global_scene, EINA_TRUE); } else { scene->blending = EINA_FALSE; - eo_do(global_scene, - evas_canvas3d_scene_shadows_enable_set(EINA_FALSE)); + evas_canvas3d_scene_shadows_enable_set(global_scene, EINA_FALSE); } } else if (!strcmp(ev->key, "F")) @@ -257,13 +250,11 @@ _key_down(void *data, } } else if (!strcmp(ev->key, "F1")) - eo_do(scene->camera_node, - evas_canvas3d_node_position_set(0.0, 80.0, 30.0); - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); + evas_canvas3d_node_position_set(scene->camera_node, 0.0, 80.0, 30.0); + evas_canvas3d_node_look_at_set(scene->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); else if (!strcmp(ev->key, "F2")) - eo_do(scene->camera_node, - evas_canvas3d_node_position_set(-2.0, 0.0, 4.0), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, -100.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); + evas_canvas3d_node_position_set(scene->camera_node, -2.0, 0.0, 4.0); + evas_canvas3d_node_look_at_set(scene->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, -100.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); else if (!strcmp(ev->key, "A")) aabb_index++; } @@ -308,27 +299,22 @@ _animate_camera(void *data) x_move_lateral = camera_move * sin((angle_camera + 90) * TO_RADIAN); z_move_lateral = camera_move * cos((angle_camera + 90) * TO_RADIAN); - eo_do(scene->mediator_node, - evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_WORLD, &x, &y, &z)); + evas_canvas3d_node_position_get(scene->mediator_node, EVAS_CANVAS3D_SPACE_WORLD, &x, &y, &z); - eo_do(scene->mesh_node_world, - evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x1, &y1, &z1)); + evas_canvas3d_node_position_get(scene->mesh_node_world, EVAS_CANVAS3D_SPACE_PARENT, &x1, &y1, &z1); - eo_do(scene->mesh_node_tommy, - evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x2, &y2, &z2)); + evas_canvas3d_node_position_get(scene->mesh_node_tommy, EVAS_CANVAS3D_SPACE_PARENT, &x2, &y2, &z2); if (fall_speed != 0) { if (y - fall_speed < 0) { - eo_do(scene->mediator_node, - evas_canvas3d_node_position_set(x, 0, z)); + evas_canvas3d_node_position_set(scene->mediator_node, x, 0, z); fall_speed = 0.0; } else { - eo_do(scene->mediator_node, - evas_canvas3d_node_position_set(x, y - fall_speed, z)); + evas_canvas3d_node_position_set(scene->mediator_node, x, y - fall_speed, z); fall_speed += FALL_SPEED_UP; } } @@ -354,10 +340,8 @@ _animate_camera(void *data) _horizontal_circle_position_resolution(scene->mesh_node_column[2], x + x_move, z + z_move, SOLDIER_RADIUS) && _horizontal_circle_position_resolution(scene->mesh_node_column[3], x + x_move, z + z_move, SOLDIER_RADIUS)) { - eo_do(scene->mediator_node, - evas_canvas3d_node_position_set(x + x_move, y, z + z_move)); - eo_do(scene->mesh_node_world, - evas_canvas3d_node_position_set(x1 + x_move, y1, z1 + z_move)); + evas_canvas3d_node_position_set(scene->mediator_node, x + x_move, y, z + z_move); + evas_canvas3d_node_position_set(scene->mesh_node_world, x1 + x_move, y1, z1 + z_move); } } else if ((SOLDIER_FRAME_X1 < x + x_move_lateral) && (x + x_move_lateral < SOLDIER_FRAME_X2) && @@ -381,27 +365,22 @@ _animate_camera(void *data) _horizontal_circle_position_resolution(scene->mesh_node_column[2], x + x_move_lateral, z + z_move_lateral, SOLDIER_RADIUS) && _horizontal_circle_position_resolution(scene->mesh_node_column[3], x + x_move_lateral, z + z_move_lateral, SOLDIER_RADIUS)) { - eo_do(scene->mediator_node, - evas_canvas3d_node_position_set(x + x_move_lateral, y, z + z_move_lateral)); - eo_do(scene->mesh_node_world, - evas_canvas3d_node_position_set(x1 + x_move_lateral, y1, z1 + z_move_lateral)); + evas_canvas3d_node_position_set(scene->mediator_node, x + x_move_lateral, y, z + z_move_lateral); + evas_canvas3d_node_position_set(scene->mesh_node_world, x1 + x_move_lateral, y1, z1 + z_move_lateral); } } - eo_do(scene->mediator_node, - evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z)); + evas_canvas3d_node_position_get(scene->mediator_node, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); if (!_horizontal_position_resolution(scene->mesh_node_level[step_indicator+1], x, z)) { - eo_do(scene->mediator_node, - evas_canvas3d_node_position_set(x, y + STEP, z)); + evas_canvas3d_node_position_set(scene->mediator_node, x, y + STEP, z); old_space_position += STEP; step_indicator++; } else if (!_horizontal_position_resolution(scene->mesh_node_level[step_indicator-1], x, z) && step_indicator > 0) { - eo_do(scene->mediator_node, - evas_canvas3d_node_position_set(x, y - STEP, z)); + evas_canvas3d_node_position_set(scene->mediator_node, x, y - STEP, z); old_space_position -= STEP; step_indicator--; } @@ -411,14 +390,11 @@ _animate_camera(void *data) step_indicator = 0; } - eo_do(scene->mediator_node, - evas_canvas3d_node_orientation_angle_axis_set(angle_camera, 0, 1.0, 0.0), - evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z)); + evas_canvas3d_node_orientation_angle_axis_set(scene->mediator_node, angle_camera, 0, 1.0, 0.0); + evas_canvas3d_node_position_get(scene->mediator_node, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); - eo_do(scene->mesh_node_warrior, - evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x1, &y1, &z1)); - eo_do(scene->mesh_node_snake, - evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x2, &y2, &z2)); + evas_canvas3d_node_position_get(scene->mesh_node_warrior, EVAS_CANVAS3D_SPACE_PARENT, &x1, &y1, &z1); + evas_canvas3d_node_position_get(scene->mesh_node_snake, EVAS_CANVAS3D_SPACE_PARENT, &x2, &y2, &z2); float snake_x = (x2 - x) / _distance(x, z, x2, z2); float snake_z = (z2 - z) / _distance(x, z, x2, z2); @@ -432,11 +408,9 @@ _animate_camera(void *data) _horizontal_circle_object_resolution(scene->mesh_node_warrior, scene->mesh_node_column[2], COLUMN_RADIUS) && _horizontal_circle_object_resolution(scene->mesh_node_warrior, scene->mesh_node_column[3], COLUMN_RADIUS) && _horizontal_circle_object_resolution(scene->mesh_node_level[0], scene->mesh_node_warrior, COLUMN_RADIUS)) - eo_do(scene->mesh_node_warrior, - evas_canvas3d_node_position_set((x - x1) * WARRIOR_SPEED + x1, y1, (z - z1) * WARRIOR_SPEED + z1)); + evas_canvas3d_node_position_set(scene->mesh_node_warrior, (x - x1) * WARRIOR_SPEED + x1, y1, (z - z1) * WARRIOR_SPEED + z1); else - eo_do(scene->mesh_node_warrior, - evas_canvas3d_node_position_set((z - z1) * WARRIOR_SPEED2 + x1, y1, -(x - x1) * WARRIOR_SPEED2 + z1)); + evas_canvas3d_node_position_set(scene->mesh_node_warrior, (z - z1) * WARRIOR_SPEED2 + x1, y1, -(x - x1) * WARRIOR_SPEED2 + z1); } /* if soldier is looking at the snake */ @@ -447,44 +421,34 @@ _animate_camera(void *data) { if ((_horizontal_object_resolution(scene->mesh_node_snake, SNAKE_FRAME_X1, SNAKE_FRAME_Z1, SNAKE_FRAME_X2, SNAKE_FRAME_Z2, snake_z * SNAKE_SPEED, -snake_x * SNAKE_SPEED))) - eo_do(scene->mesh_node_snake, - evas_canvas3d_node_position_set(snake_z * SNAKE_SPEED + x2, y2, -snake_x * SNAKE_SPEED + z2)); + evas_canvas3d_node_position_set(scene->mesh_node_snake, snake_z * SNAKE_SPEED + x2, y2, -snake_x * SNAKE_SPEED + z2); else if (_horizontal_circle_resolution(scene->mesh_node_snake, (x2 - x) * SNAKE_SPEED2 + x, (z2 - z) * SNAKE_SPEED2 + z, SOLDIER_RADIUS)) - eo_do(scene->mesh_node_snake, - evas_canvas3d_node_position_set((x - x2) * SNAKE_SPEED2 + x2, y2, (z - z2) * SNAKE_SPEED2 + z2)); + evas_canvas3d_node_position_set(scene->mesh_node_snake, (x - x2) * SNAKE_SPEED2 + x2, y2, (z - z2) * SNAKE_SPEED2 + z2); } /* if snake is located at the right hand of the soldier */ else { if ((_horizontal_object_resolution(scene->mesh_node_snake, SNAKE_FRAME_X1, SNAKE_FRAME_Z1, SNAKE_FRAME_X2, SNAKE_FRAME_Z2, -snake_z * SNAKE_SPEED, snake_x * SNAKE_SPEED))) - eo_do(scene->mesh_node_snake, - evas_canvas3d_node_position_set(-snake_z * SNAKE_SPEED + x2, y2, snake_x * SNAKE_SPEED + z2)); + evas_canvas3d_node_position_set(scene->mesh_node_snake, -snake_z * SNAKE_SPEED + x2, y2, snake_x * SNAKE_SPEED + z2); else if (_horizontal_circle_resolution(scene->mesh_node_snake, (x2 - x) * SNAKE_SPEED2 + x, (z2 - z) * SNAKE_SPEED2 + z, SOLDIER_RADIUS)) - eo_do(scene->mesh_node_snake, - evas_canvas3d_node_position_set((x - x2) * SNAKE_SPEED2 + x2, y2, (z - z2) * SNAKE_SPEED2 + z2)); + evas_canvas3d_node_position_set(scene->mesh_node_snake, (x - x2) * SNAKE_SPEED2 + x2, y2, (z - z2) * SNAKE_SPEED2 + z2); } } else if (_horizontal_circle_resolution(scene->mesh_node_snake, (x2 - x) * SNAKE_SPEED2 + x, (z2 - z) * SNAKE_SPEED2 + z, SOLDIER_RADIUS)) - eo_do(scene->mesh_node_snake, - evas_canvas3d_node_position_set((x - x2) * SNAKE_SPEED2 + x2, y2, (z - z2) * SNAKE_SPEED2 + z2)); + evas_canvas3d_node_position_set(scene->mesh_node_snake, (x - x2) * SNAKE_SPEED2 + x2, y2, (z - z2) * SNAKE_SPEED2 + z2); - eo_do(scene->mesh_node_snake, - evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x2, &y2, &z2)); + evas_canvas3d_node_position_get(scene->mesh_node_snake, EVAS_CANVAS3D_SPACE_PARENT, &x2, &y2, &z2); - eo_do(scene->mesh_node_warrior, - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1000.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, - (z - z1) / _distance(x, z, x1, z1), 0, (x1 - x) / _distance(x, z, x1, z1))); + evas_canvas3d_node_look_at_set(scene->mesh_node_warrior, EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1000.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, (z - z1) / _distance(x, z, x1, z1), 0, (x1 - x) / _distance(x, z, x1, z1)); - eo_do(scene->mesh_node_snake, - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 2 * x2 - x, y2, 2 * z2 - z, EVAS_CANVAS3D_SPACE_PARENT, 0, 1, 0)); + evas_canvas3d_node_look_at_set(scene->mesh_node_snake, EVAS_CANVAS3D_SPACE_PARENT, 2 * x2 - x, y2, 2 * z2 - z, EVAS_CANVAS3D_SPACE_PARENT, 0, 1, 0); if (!_horizontal_frame_resolution(scene->mesh_node_snake, SNAKE_FRAME_X1, SNAKE_FRAME_Z1, SNAKE_FRAME_X2, SNAKE_FRAME_Z2, &x_move, &z_move)) - eo_do(scene->mesh_node_snake, - evas_canvas3d_node_position_set(x2 + x_move, y2, z2 + z_move)); + evas_canvas3d_node_position_set(scene->mesh_node_snake, x2 + x_move, y2, z2 + z_move); return EINA_TRUE; } @@ -509,22 +473,18 @@ _animate_scene_gun(void *data) /* rocket and gun movement */ angle_eagle += d_angle_eagle; - eo_do(scene->mesh_node_eagle, - frame_eagle = evas_canvas3d_node_mesh_frame_get(scene->mesh_eagle)); + frame_eagle = evas_canvas3d_node_mesh_frame_get(scene->mesh_node_eagle, scene->mesh_eagle); if (frame_eagle > 19500) frame_eagle = 0; frame_eagle += 150; - eo_do(scene->mesh_node_snake, - frame_snake = evas_canvas3d_node_mesh_frame_get(scene->mesh_snake)); + frame_snake = evas_canvas3d_node_mesh_frame_get(scene->mesh_node_snake, scene->mesh_snake); if (frame_snake > 16000) frame_snake = 0; frame_snake += 64; - eo_do(scene->mesh_node_eagle, - evas_canvas3d_node_orientation_angle_axis_set(angle_eagle, 0.0, 1.0, 0.0), - /* equation of eagle flight */ - evas_canvas3d_node_position_set(38 * sin((angle_eagle + 90) * TO_RADIAN), 20 + 20 * sin(angle_eagle * TO_RADIAN), - -10 + 20.0 * cos((angle_eagle + 90) * TO_RADIAN)), - evas_canvas3d_node_mesh_frame_set(scene->mesh_eagle, frame_eagle)); + evas_canvas3d_node_orientation_angle_axis_set(scene->mesh_node_eagle, angle_eagle, 0.0, 1.0, 0.0); + /* equation of eagle flight */ + evas_canvas3d_node_position_set(scene->mesh_node_eagle, 38 * sin((angle_eagle + 90) * TO_RADIAN), 20 + 20 * sin(angle_eagle * TO_RADIAN), -10 + 20.0 * cos((angle_eagle + 90) * TO_RADIAN)); + evas_canvas3d_node_mesh_frame_set(scene->mesh_node_eagle, scene->mesh_eagle, frame_eagle); for (i = 0; i < 10; i ++) { @@ -536,15 +496,13 @@ _animate_scene_gun(void *data) else if (rocket_indicator[i] == 1) { _scale(scene->mesh_node_rocket[i], 0.4); - eo_do(scene->material_rocket[i], - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.8, 0.8, 0.8, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.2, 0.2, 0.0, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.5, 0.5, 0.5, 1.0)); + evas_canvas3d_material_color_set(scene->material_rocket[i], EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.8, 0.8, 0.8, 1.0); + evas_canvas3d_material_color_set(scene->material_rocket[i], EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.2, 0.2, 0.0, 1.0); + evas_canvas3d_material_color_set(scene->material_rocket[i], EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.5, 0.5, 0.5, 1.0); rocket_indicator[i] = 2; - eo_do(scene->mesh_node_rocket[i], - evas_canvas3d_node_position_set(ROCKET_POS_X, ROCKET_POS_Y, ROCKET_POS_Z)); + evas_canvas3d_node_position_set(scene->mesh_node_rocket[i], ROCKET_POS_X, ROCKET_POS_Y, ROCKET_POS_Z); rocket_parametr[i] = 0; } else if (rocket_indicator[i] == 2) @@ -552,33 +510,27 @@ _animate_scene_gun(void *data) rocket_parametr[i] += ROCKET_SPEED; /* equation of rocket flight */ - eo_do(scene->mesh_node_rocket[i], - evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_WORLD, &x, &y, &z)); + evas_canvas3d_node_position_get(scene->mesh_node_rocket[i], EVAS_CANVAS3D_SPACE_WORLD, &x, &y, &z); if ((ROCKET_FRAME_X1 < x) && (x < ROCKET_FRAME_X2) && (ROCKET_FRAME_Z1 < z) && (z < ROCKET_FRAME_Z2)) - eo_do(scene->mesh_node_rocket[i], - evas_canvas3d_node_position_set(ROCKET_POS_X, ROCKET_POS_Y, ROCKET_POS_Z - rocket_parametr[i])); + evas_canvas3d_node_position_set(scene->mesh_node_rocket[i], ROCKET_POS_X, ROCKET_POS_Y, ROCKET_POS_Z - rocket_parametr[i]); else rocket_indicator[i] = 3; /* the way to stop the rocket */ - eo_do(scene->mesh_node_warrior, - evas_canvas3d_node_bounding_box_get(&x, &y, &z, &x1, &y1, &z1)); + evas_canvas3d_node_bounding_box_get(scene->mesh_node_warrior, &x, &y, &z, &x1, &y1, &z1); evas_box3_set(&boxy, x, y, z, x1, y1, z1); - eo_do(scene->mesh_node_rocket[i], - evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z)); + evas_canvas3d_node_position_get(scene->mesh_node_rocket[i], EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); - eo_do(scene->mediator_node, - evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x1, &y1, &z1)); + evas_canvas3d_node_position_get(scene->mediator_node, EVAS_CANVAS3D_SPACE_PARENT, &x1, &y1, &z1); if (((z * sinus + x * cosinus + x1) >= boxy.p0.x) && ((z * sinus + x * cosinus + x1) <= boxy.p1.x) && ((z * cosinus - x * sinus + z1) >= boxy.p0.z) && ((z * cosinus - x * sinus + z1) <= boxy.p1.z)) { - eo_do(scene->material_rocket[i], - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.8, 0.8, 0.8, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.9, 0.1, 0.1, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.5, 0.5, 0.5, 1.0)); + evas_canvas3d_material_color_set(scene->material_rocket[i], EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.8, 0.8, 0.8, 1.0); + evas_canvas3d_material_color_set(scene->material_rocket[i], EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.9, 0.1, 0.1, 1.0); + evas_canvas3d_material_color_set(scene->material_rocket[i], EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.5, 0.5, 0.5, 1.0); _scale(scene->mesh_node_rocket[i], 4.5); rocket_indicator[i] = 3; @@ -589,18 +541,14 @@ _animate_scene_gun(void *data) if (tommy_indicator == 1) { tommy_indicator = 2; - eo_do(scene->mesh_node_tommy, - evas_canvas3d_node_position_set(TOMMY_POS_X, TOMMY_POS_Y, TOMMY_POS_Z)); + evas_canvas3d_node_position_set(scene->mesh_node_tommy, TOMMY_POS_X, TOMMY_POS_Y, TOMMY_POS_Z); tommy_parametr = 0.0; } /* parametric equations of gun movement, (GUN_DIR_X, GUN_DIR_Y, GUN_DIR_Z) is direction vector */ else if (tommy_indicator == 2) { tommy_parametr += GUN_SPEED; - eo_do(scene->mesh_node_tommy, - evas_canvas3d_node_position_set(TOMMY_POS_X + GUN_DIR_X * tommy_parametr, - TOMMY_POS_Y + GUN_DIR_Y * tommy_parametr, - TOMMY_POS_Z + GUN_DIR_Z * tommy_parametr)); + evas_canvas3d_node_position_set(scene->mesh_node_tommy, TOMMY_POS_X + GUN_DIR_X * tommy_parametr, TOMMY_POS_Y + GUN_DIR_Y * tommy_parametr, TOMMY_POS_Z + GUN_DIR_Z * tommy_parametr); if (TOMMY_POS_Z + GUN_DIR_Z * tommy_parametr >= -8.3) tommy_indicator = 3; @@ -608,13 +556,9 @@ _animate_scene_gun(void *data) else if (tommy_indicator == 3) { tommy_parametr-= GUN_SPEED / 2; - eo_do(scene->mesh_node_tommy, - evas_canvas3d_node_position_set(TOMMY_POS_X + GUN_DIR_X * tommy_parametr, - TOMMY_POS_Y + GUN_DIR_Y * tommy_parametr, - TOMMY_POS_Z + GUN_DIR_Z * tommy_parametr)); + evas_canvas3d_node_position_set(scene->mesh_node_tommy, TOMMY_POS_X + GUN_DIR_X * tommy_parametr, TOMMY_POS_Y + GUN_DIR_Y * tommy_parametr, TOMMY_POS_Z + GUN_DIR_Z * tommy_parametr); - eo_do(scene->mesh_node_tommy, - evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z)); + evas_canvas3d_node_position_get(scene->mesh_node_tommy, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); if (z <= TOMMY_POS_Z) { tommy_indicator = 4; @@ -624,59 +568,44 @@ _animate_scene_gun(void *data) if (angle_eagle > 360.0) angle -= 360.0f; - eo_do(scene->mesh_node_warrior, - evas_canvas3d_node_mesh_frame_set(scene->mesh_warrior, frame)); + evas_canvas3d_node_mesh_frame_set(scene->mesh_node_warrior, scene->mesh_warrior, frame); - eo_do(scene->mesh_node_snake, - evas_canvas3d_node_mesh_frame_set(scene->mesh_snake, frame_snake)); + evas_canvas3d_node_mesh_frame_set(scene->mesh_node_snake, scene->mesh_snake, frame_snake); if (space_move && (soldier_mode == 0)) { - eo_do(scene->mesh_node_soldier, - evas_canvas3d_node_mesh_add(scene->mesh_soldier_jump), - evas_canvas3d_node_mesh_del(scene->mesh_soldier), - evas_canvas3d_node_mesh_frame_set(scene->mesh_soldier_jump, 0)); + evas_canvas3d_node_mesh_add(scene->mesh_node_soldier, scene->mesh_soldier_jump); + evas_canvas3d_node_mesh_del(scene->mesh_node_soldier, scene->mesh_soldier); + evas_canvas3d_node_mesh_frame_set(scene->mesh_node_soldier, scene->mesh_soldier_jump, 0); soldier_mode = 1; - eo_do(scene->mesh_node_tommy, - evas_canvas3d_node_position_set(TOMMY_JUMP_X, TOMMY_JUMP_Y, TOMMY_JUMP_Z), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 1000.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, - 0, 0, 1)); + evas_canvas3d_node_position_set(scene->mesh_node_tommy, TOMMY_JUMP_X, TOMMY_JUMP_Y, TOMMY_JUMP_Z); + evas_canvas3d_node_look_at_set(scene->mesh_node_tommy, EVAS_CANVAS3D_SPACE_PARENT, 1000.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0, 0, 1); } else if (soldier_mode == 1) { - eo_do(scene->mesh_node_soldier, - frame_soldier = evas_canvas3d_node_mesh_frame_get(scene->mesh_soldier_jump)); + frame_soldier = evas_canvas3d_node_mesh_frame_get(scene->mesh_node_soldier, scene->mesh_soldier_jump); frame_soldier += 124; - eo_do(scene->mesh_node_soldier, - evas_canvas3d_node_mesh_frame_set(scene->mesh_soldier_jump, frame_soldier)); + evas_canvas3d_node_mesh_frame_set(scene->mesh_node_soldier, scene->mesh_soldier_jump, frame_soldier); if (frame_soldier < 2480) - eo_do(scene->mesh_node_tommy, - evas_canvas3d_node_position_set(TOMMY_JUMP_X, TOMMY_JUMP_Y + 4.5 * frame_soldier / 2480, TOMMY_JUMP_Z)); + evas_canvas3d_node_position_set(scene->mesh_node_tommy, TOMMY_JUMP_X, TOMMY_JUMP_Y + 4.5 * frame_soldier / 2480, TOMMY_JUMP_Z); else - eo_do(scene->mesh_node_tommy, - evas_canvas3d_node_position_set(TOMMY_JUMP_X, TOMMY_JUMP_Y + 4.5 * (4960 - frame_soldier) / 2480, TOMMY_JUMP_Z)); + evas_canvas3d_node_position_set(scene->mesh_node_tommy, TOMMY_JUMP_X, TOMMY_JUMP_Y + 4.5 * (4960 - frame_soldier) / 2480, TOMMY_JUMP_Z); if (frame_soldier > 4960) { - eo_do(scene->mesh_node_soldier, - evas_canvas3d_node_mesh_del(scene->mesh_soldier_jump)); - eo_do(scene->mesh_node_soldier, - evas_canvas3d_node_mesh_add(scene->mesh_soldier), - evas_canvas3d_node_mesh_frame_set(scene->mesh_soldier, 0)); + evas_canvas3d_node_mesh_del(scene->mesh_node_soldier, scene->mesh_soldier_jump); + evas_canvas3d_node_mesh_add(scene->mesh_node_soldier, scene->mesh_soldier); + evas_canvas3d_node_mesh_frame_set(scene->mesh_node_soldier, scene->mesh_soldier, 0); soldier_mode = 0; - eo_do(scene->mesh_node_tommy, - evas_canvas3d_node_position_set(TOMMY_POS_X, TOMMY_POS_Y, TOMMY_POS_Z), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1000.0, 0.0, - EVAS_CANVAS3D_SPACE_PARENT, 2, 0, 1.5)); + evas_canvas3d_node_position_set(scene->mesh_node_tommy, TOMMY_POS_X, TOMMY_POS_Y, TOMMY_POS_Z); + evas_canvas3d_node_look_at_set(scene->mesh_node_tommy, EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1000.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 2, 0, 1.5); } } else if (camera_move) { - eo_do(scene->mesh_node_soldier, - frame_soldier = evas_canvas3d_node_mesh_frame_get(scene->mesh_soldier)); + frame_soldier = evas_canvas3d_node_mesh_frame_get(scene->mesh_node_soldier, scene->mesh_soldier); frame_soldier += 124; if (frame_soldier > 6200) frame_soldier = 0; - eo_do(scene->mesh_node_soldier, - evas_canvas3d_node_mesh_frame_set(scene->mesh_soldier, frame_soldier)); + evas_canvas3d_node_mesh_frame_set(scene->mesh_node_soldier, scene->mesh_soldier, frame_soldier); } /* create bounding box */ @@ -723,8 +652,7 @@ _reload_camera(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, voi Evas_Canvas3D_Mesh *m; Evas_Real s, t; - eo_do(global_scene, - evas_canvas3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, &s, &t)); + evas_canvas3d_scene_pick(global_scene, ev->canvas.x, ev->canvas.y, &n, &m, &s, &t); d_angle_camera = 0; if (n || m) @@ -772,14 +700,12 @@ _mesh_setup_gun_planet(Scene_Data *data) /* Setup material and texture for world. */ ADD_MESH(world, world, 0.5, 0.5, 1.0); - eo_do(data->mesh_world, - evas_canvas3d_mesh_from_primitive_set(0, data->sphere_primitive)); + evas_canvas3d_mesh_from_primitive_set(data->mesh_world, 0, data->sphere_primitive); SETUP_DEFAULT_MESH(world, world, DIFFUSE); SETUP_MESH_NODE(world); - eo_do(data->mesh_node_world, - evas_canvas3d_node_scale_set(350, 350, 350), - evas_canvas3d_node_position_set(0.0, 0.0, 0.0)); + evas_canvas3d_node_scale_set(data->mesh_node_world, 350, 350, 350); + evas_canvas3d_node_position_set(data->mesh_node_world, 0.0, 0.0, 0.0); /* Setup material and texture for player */ @@ -788,14 +714,11 @@ _mesh_setup_gun_planet(Scene_Data *data) SETUP_MESH_NODE(soldier) - eo_do(data->mesh_node_soldier, - evas_canvas3d_node_position_set(0, -10, 0), - evas_canvas3d_node_scale_set(5, 5, 5)); + evas_canvas3d_node_position_set(data->mesh_node_soldier, 0, -10, 0); + evas_canvas3d_node_scale_set(data->mesh_node_soldier, 5, 5, 5); - eo_do(data->mesh_node_soldier, - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, -10.0, -100.0, EVAS_CANVAS3D_SPACE_PARENT, - 0, 1, 0), - evas_canvas3d_node_mesh_frame_set(data->mesh_soldier, 0)); + evas_canvas3d_node_look_at_set(data->mesh_node_soldier, EVAS_CANVAS3D_SPACE_PARENT, 0.0, -10.0, -100.0, EVAS_CANVAS3D_SPACE_PARENT, 0, 1, 0); + evas_canvas3d_node_mesh_frame_set(data->mesh_node_soldier, data->mesh_soldier, 0); ADD_MESH(soldier, soldier_jump, 1.0, 1.0, 1.0) MATERIAL_TEXTURE_SET(soldier, soldier_jump, soldier_jump_path, soldier_tex_path) @@ -804,17 +727,14 @@ _mesh_setup_gun_planet(Scene_Data *data) ADD_MESH(tommy, tommy, 0.0, 0.3, 1.0) SETUP_MESH_NODE(tommy) - eo_do(data->mesh_tommy, - efl_file_set(gun_path, NULL), - efl_file_save("try.obj", NULL, NULL), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG), - evas_canvas3d_mesh_frame_material_set(0, data->material_tommy)); + efl_file_set(data->mesh_tommy, gun_path, NULL); + efl_file_save(data->mesh_tommy, "try.obj", NULL, NULL); + evas_canvas3d_mesh_shade_mode_set(data->mesh_tommy, EVAS_CANVAS3D_SHADE_MODE_PHONG); + evas_canvas3d_mesh_frame_material_set(data->mesh_tommy, 0, data->material_tommy); - eo_do(data->mesh_node_tommy, - evas_canvas3d_node_scale_set(1.5, 1.5, 1.5), - evas_canvas3d_node_position_set(TOMMY_POS_X, TOMMY_POS_Y, TOMMY_POS_Z), - evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1000.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, - 2, 0, 1.5)); + evas_canvas3d_node_scale_set(data->mesh_node_tommy, 1.5, 1.5, 1.5); + evas_canvas3d_node_position_set(data->mesh_node_tommy, TOMMY_POS_X, TOMMY_POS_Y, TOMMY_POS_Z); + evas_canvas3d_node_look_at_set(data->mesh_node_tommy, EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1000.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 2, 0, 1.5); /* Setup material and texture for gazebo */ @@ -823,10 +743,9 @@ _mesh_setup_gun_planet(Scene_Data *data) MATERIAL_TEXTURE_SET(gazebo, gazebo, gazebo_bot_path, gazebo_b_path) NORMAL_SET(gazebo, gazebo, gazebo_b_n_path) - eo_do(data->mesh_node_gazebo, - evas_canvas3d_node_scale_set(0.18, 0.18, 0.18), - evas_canvas3d_node_orientation_angle_axis_set(180, 0.0, 1.0, 0.0), - evas_canvas3d_node_position_set(-20, -10, -35)); + evas_canvas3d_node_scale_set(data->mesh_node_gazebo, 0.18, 0.18, 0.18); + evas_canvas3d_node_orientation_angle_axis_set(data->mesh_node_gazebo, 180, 0.0, 1.0, 0.0); + evas_canvas3d_node_position_set(data->mesh_node_gazebo, -20, -10, -35); /* Setup material and texture for carpet */ @@ -837,38 +756,32 @@ _mesh_setup_gun_planet(Scene_Data *data) if (data->blending) { - eo_do(data->texture_diffuse_carpet, - evas_canvas3d_texture_atlas_enable_set(EINA_FALSE), - evas_canvas3d_texture_file_set(gazebo_t_trans_path, NULL)); - eo_do(data->mesh_carpet, - evas_canvas3d_mesh_blending_enable_set(EINA_TRUE), - evas_canvas3d_mesh_blending_func_set(EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA)); + evas_canvas3d_texture_atlas_enable_set(data->texture_diffuse_carpet, EINA_FALSE); + evas_canvas3d_texture_file_set(data->texture_diffuse_carpet, gazebo_t_trans_path, NULL); + evas_canvas3d_mesh_blending_enable_set(data->mesh_carpet, EINA_TRUE); + evas_canvas3d_mesh_blending_func_set(data->mesh_carpet, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA); } - eo_do(data->mesh_node_carpet, - evas_canvas3d_node_scale_set(0.18, 0.18, 0.18), - evas_canvas3d_node_position_set(-20, -10, -35)); + evas_canvas3d_node_scale_set(data->mesh_node_carpet, 0.18, 0.18, 0.18); + evas_canvas3d_node_position_set(data->mesh_node_carpet, -20, -10, -35); /* Setup material and texture for eagle. */ ADD_MESH(eagle, eagle, 0.01, 1.0, 1.0) SETUP_MESH_NODE(eagle) MATERIAL_TEXTURE_SET(eagle, eagle, eagle_path, eagle_tex_path) - eo_do(data->mesh_node_eagle, - evas_canvas3d_node_scale_set(0.1, 0.1, 0.1), - evas_canvas3d_node_position_set(-20, 20, 0)); + evas_canvas3d_node_scale_set(data->mesh_node_eagle, 0.1, 0.1, 0.1); + evas_canvas3d_node_position_set(data->mesh_node_eagle, -20, 20, 0); /* Set material for bounding box */ ADD_MESH(cube, cube, 0.01, 1.0, 1.0) - eo_do(data->mesh_cube, evas_canvas3d_mesh_frame_add(0)); + evas_canvas3d_mesh_frame_add(data->mesh_cube, 0); SETUP_DEFAULT_MESH(cube, cube, DIFFUSE); SETUP_MESH_NODE(cube) - eo_do(data->mesh_cube, - evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, - 36, &cube_indices[0]), - evas_canvas3d_mesh_vertex_count_set(24), - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES)); + evas_canvas3d_mesh_index_data_set(data->mesh_cube, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]); + evas_canvas3d_mesh_vertex_count_set(data->mesh_cube, 24); + evas_canvas3d_mesh_vertex_assembly_set(data->mesh_cube, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES); /* Setup mesh for column carpet */ @@ -878,30 +791,27 @@ _mesh_setup_gun_planet(Scene_Data *data) CUBE_TEXTURE_SET(column_c, column_c, cube_textcoords, red_brick_path) NORMAL_SET(column_c, column_c, red_brick_n_path) - eo_do(data->mesh_node_column_c, - evas_canvas3d_node_orientation_angle_axis_set(90, 0, 1.0, 0.0), - evas_canvas3d_node_scale_set(96.0, 1.6 , 4.8 ), - evas_canvas3d_node_position_set(10 , 9.0, -12)); + evas_canvas3d_node_orientation_angle_axis_set(data->mesh_node_column_c, 90, 0, 1.0, 0.0); + evas_canvas3d_node_scale_set(data->mesh_node_column_c, 96.0, 1.6, 4.8); + evas_canvas3d_node_position_set(data->mesh_node_column_c, 10, 9.0, -12); /* Setup mesh for bounding sphere */ data->material_ball = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(data->material_ball, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.0, 5.0, 1.0, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(50.0)); + evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_color_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_color_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.0, 5.0, 1.0, 1.0); + evas_canvas3d_material_color_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(data->material_ball, 50.0); data->mesh_ball = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); _set_ball(data->mesh_ball, 10); - eo_do(data->mesh_ball, - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE), - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES), - evas_canvas3d_mesh_frame_material_set(0, data->material_ball)); + evas_canvas3d_mesh_shade_mode_set(data->mesh_ball, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); + evas_canvas3d_mesh_vertex_assembly_set(data->mesh_ball, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES); + evas_canvas3d_mesh_frame_material_set(data->mesh_ball, 0, data->material_ball); SETUP_MESH_NODE(ball) @@ -921,26 +831,22 @@ _mesh_setup_wall(Scene_Data *data, int index) /* placing of wall carpet on the floor grid */ if (index == 0) - eo_do(data->mesh_node_wall[index], - evas_canvas3d_node_scale_set(6.7 * 19.5, 20.0, 2.0), - evas_canvas3d_node_position_set(-39.7 + 18.6 * 3, 0.0, -60.3)); + evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 6.7 * 19.5, 20.0, 2.0); + evas_canvas3d_node_position_set(data->mesh_node_wall[index], -39.7 + 18.6 * 3, 0.0, -60.3); else if (index == 1) { - eo_do(data->mesh_node_wall[index], - evas_canvas3d_node_scale_set(5 * 19.5, 20.0, 2.0), - evas_canvas3d_node_position_set(81.2, 0.0, -51.5 + 19.5 * 2), - evas_canvas3d_node_orientation_angle_axis_set(90, 0, 1.0, 0.0)); + evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 5 * 19.5, 20.0, 2.0); + evas_canvas3d_node_position_set(data->mesh_node_wall[index], 81.2, 0.0, -51.5 + 19.5 * 2); + evas_canvas3d_node_orientation_angle_axis_set(data->mesh_node_wall[index], 90, 0, 1.0, 0.0); } else if (index == 2) - eo_do(data->mesh_node_wall[index], - evas_canvas3d_node_scale_set(6.7 * 19.5, 20.0, 2.0), - evas_canvas3d_node_position_set(-39.7 + 18.6*3, 0.0, 35.3)); + evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 6.7 * 19.5, 20.0, 2.0); + evas_canvas3d_node_position_set(data->mesh_node_wall[index], -39.7 + 18.6*3, 0.0, 35.3); else if (index == 3) { - eo_do(data->mesh_node_wall[index], - evas_canvas3d_node_scale_set(5* 19.5, 20.0, 2.0), - evas_canvas3d_node_position_set(-48.4, 0.0, -51.5 + 19.5 * 2), - evas_canvas3d_node_orientation_angle_axis_set(90, 0, 1.0, 0.0)); + evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 5* 19.5, 20.0, 2.0); + evas_canvas3d_node_position_set(data->mesh_node_wall[index], -48.4, 0.0, -51.5 + 19.5 * 2); + evas_canvas3d_node_orientation_angle_axis_set(data->mesh_node_wall[index], 90, 0, 1.0, 0.0); } } @@ -951,48 +857,40 @@ _mesh_setup_column(Scene_Data *data, int index) data->material_column = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - eo_do(data->material_column, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.4, 0.4, 0.4, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.6, 0.6, 0.6, 1.0), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_canvas3d_material_shininess_set(50.0)); + evas_canvas3d_material_enable_set(data->material_column, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material_column, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material_column, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); + evas_canvas3d_material_enable_set(data->material_column, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); + evas_canvas3d_material_color_set(data->material_column, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.4, 0.4, 0.4, 1.0); + evas_canvas3d_material_color_set(data->material_column, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.6, 0.6, 0.6, 1.0); + evas_canvas3d_material_color_set(data->material_column, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); + evas_canvas3d_material_shininess_set(data->material_column, 50.0); data->mesh_column[index] = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); SETUP_MESH_NODE(column[index]) - eo_do(data->mesh_column[index], - evas_canvas3d_mesh_from_primitive_set(0, data->cylinder_primitive), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE), - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), - evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG), - evas_canvas3d_mesh_frame_material_set(0, data->material_column)); + evas_canvas3d_mesh_from_primitive_set(data->mesh_column[index], 0, data->cylinder_primitive); + evas_canvas3d_mesh_shade_mode_set(data->mesh_column[index], EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); + evas_canvas3d_mesh_vertex_assembly_set(data->mesh_column[index], EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); + evas_canvas3d_mesh_shade_mode_set(data->mesh_column[index], EVAS_CANVAS3D_SHADE_MODE_PHONG); + evas_canvas3d_mesh_frame_material_set(data->mesh_column[index], 0, data->material_column); data->texture_diffuse_column = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); - eo_do(data->texture_diffuse_column, - evas_canvas3d_texture_file_set(red_brick_path, NULL), - evas_canvas3d_texture_atlas_enable_set(EINA_FALSE), - evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, - EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), - evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT)); + evas_canvas3d_texture_file_set(data->texture_diffuse_column, red_brick_path, NULL); + evas_canvas3d_texture_atlas_enable_set(data->texture_diffuse_column, EINA_FALSE); + evas_canvas3d_texture_filter_set(data->texture_diffuse_column, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); + evas_canvas3d_texture_wrap_set(data->texture_diffuse_column, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); - eo_do(data->material_column, - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, - data->texture_diffuse_column), - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, - data->texture_diffuse_column)); + evas_canvas3d_material_texture_set(data->material_column, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture_diffuse_column); + evas_canvas3d_material_texture_set(data->material_column, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, data->texture_diffuse_column); NORMAL_SET(column, column[index], red_brick_n_path) - eo_do(data->mesh_node_column[index], - evas_canvas3d_node_scale_set(2.2, 2.2, 19.0), - evas_canvas3d_node_position_set(10 , 0, -45 + 21.25 * index), - evas_canvas3d_node_orientation_angle_axis_set(90, 1.0, 0.0, 0.0)); + evas_canvas3d_node_scale_set(data->mesh_node_column[index], 2.2, 2.2, 19.0); + evas_canvas3d_node_position_set(data->mesh_node_column[index], 10, 0, -45 + 21.25 * index); + evas_canvas3d_node_orientation_angle_axis_set(data->mesh_node_column[index], 90, 1.0, 0.0, 0.0); } void @@ -1007,9 +905,8 @@ _mesh_setup_grass(Scene_Data *data) NORMAL_SET(grass, grass, gray_brick_n_path) /* placing of grass carpet on the floor grid */ - eo_do(data->mesh_node_grass, - evas_canvas3d_node_scale_set(130.0, 1.0, 96.0), - evas_canvas3d_node_position_set(16.5, -10.0, -12)); + evas_canvas3d_node_scale_set(data->mesh_node_grass, 130.0, 1.0, 96.0); + evas_canvas3d_node_position_set(data->mesh_node_grass, 16.5, -10.0, -12); } void @@ -1024,9 +921,8 @@ _mesh_setup(Scene_Data *data, float h EINA_UNUSED, float w EINA_UNUSED, float d CUBE_TEXTURE_SET(level[0], level[index], isource, red_brick_path) NORMAL_SET(level[0], level[index], red_brick_n_path) - eo_do(data->mesh_node_level[index], - evas_canvas3d_node_scale_set(19.5, 20.0, 2.0), - evas_canvas3d_node_position_set(50, 0, -15)); + evas_canvas3d_node_scale_set(data->mesh_node_level[index], 19.5, 20.0, 2.0); + evas_canvas3d_node_position_set(data->mesh_node_level[index], 50, 0, -15); } else { @@ -1035,9 +931,8 @@ _mesh_setup(Scene_Data *data, float h EINA_UNUSED, float w EINA_UNUSED, float d CUBE_TEXTURE_SET(level[1], level[index], isource, gray_brick_path) NORMAL_SET(level[1], level[index], gray_brick_n_path) - eo_do(data->mesh_node_level[index], - evas_canvas3d_node_scale_set(2.0, 2.0, 8.0), - evas_canvas3d_node_position_set(40 + (2 * index), -10 + (2 * index), -10)); + evas_canvas3d_node_scale_set(data->mesh_node_level[index], 2.0, 2.0, 8.0); + evas_canvas3d_node_position_set(data->mesh_node_level[index], 40 + (2 * index), -10 + (2 * index), -10); } } @@ -1050,9 +945,8 @@ _mesh_setup_warrior(Scene_Data *data) SETUP_MESH_NODE(warrior) MATERIAL_TEXTURE_SET(warrior, warrior, warrior_path, warrior_tex_path) - eo_do(data->mesh_node_warrior, - evas_canvas3d_node_position_set(57, -10, 0), - evas_canvas3d_node_scale_set(0.15, 0.15, 0.15)); + evas_canvas3d_node_position_set(data->mesh_node_warrior, 57, -10, 0); + evas_canvas3d_node_scale_set(data->mesh_node_warrior, 0.15, 0.15, 0.15); } void @@ -1063,23 +957,20 @@ _mesh_setup_snake(Scene_Data *data) MATERIAL_TEXTURE_SET(snake, snake, snake_path, snake_tex_path) NORMAL_SET(snake, snake, snake_tex_n_path) - eo_do(data->mesh_node_snake, - evas_canvas3d_node_position_set(20, -10, 20), - evas_canvas3d_node_scale_set(4.0, 4.0, 4.0)); + evas_canvas3d_node_position_set(data->mesh_node_snake, 20, -10, 20); + evas_canvas3d_node_scale_set(data->mesh_node_snake, 4.0, 4.0, 4.0); } void _mesh_setup_rocket(Scene_Data *data, int index) { ADD_MESH(rocket[index], rocket[index], 0.8, 0.2, 0.5); - eo_do(data->mesh_rocket[index], - evas_canvas3d_mesh_from_primitive_set(0, data->sphere_primitive)); + evas_canvas3d_mesh_from_primitive_set(data->mesh_rocket[index], 0, data->sphere_primitive); SETUP_DEFAULT_MESH(rocket[index], rocket[index], DIFFUSE); SETUP_MESH_NODE(rocket[index]); - eo_do(data->mesh_node_rocket[index], - evas_canvas3d_node_scale_set(1, 1, 1), - evas_canvas3d_node_position_set(ROCKET_POS_X, ROCKET_POS_Y, ROCKET_POS_Z)); + evas_canvas3d_node_scale_set(data->mesh_node_rocket[index], 1, 1, 1); + evas_canvas3d_node_position_set(data->mesh_node_rocket[index], ROCKET_POS_X, ROCKET_POS_Y, ROCKET_POS_Z); } void @@ -1091,23 +982,19 @@ _scene_setup(Scene_Data *data) motion_vec[i] = 0; data->cube_primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(data->cube_primitive, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE), - evas_canvas3d_primitive_precision_set(10)); + evas_canvas3d_primitive_form_set(data->cube_primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE); + evas_canvas3d_primitive_precision_set(data->cube_primitive, 10); data->sphere_primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(data->sphere_primitive, - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE), - evas_canvas3d_primitive_precision_set(50)); + evas_canvas3d_primitive_form_set(data->sphere_primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE); + evas_canvas3d_primitive_precision_set(data->sphere_primitive, 50); global_scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - eo_do(global_scene, - evas_canvas3d_scene_size_set(WIDTH, HEIGHT), - evas_canvas3d_scene_background_color_set(0.5, 0.5, 0.9, 0.0)); + evas_canvas3d_scene_size_set(global_scene, WIDTH, HEIGHT); + evas_canvas3d_scene_background_color_set(global_scene, 0.5, 0.5, 0.9, 0.0); - data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); + data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); @@ -1118,11 +1005,10 @@ _scene_setup(Scene_Data *data) _mesh_setup_rocket(data, i); data->cylinder_primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - eo_do(data->cylinder_primitive, - evas_canvas3d_primitive_mode_set(EVAS_CANVAS3D_PRIMITIVE_MODE_WITHOUT_BASE), - evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CYLINDER), - evas_canvas3d_primitive_tex_scale_set(1.0, 1.0), - evas_canvas3d_primitive_precision_set(50)); + evas_canvas3d_primitive_mode_set(data->cylinder_primitive, EVAS_CANVAS3D_PRIMITIVE_MODE_WITHOUT_BASE); + evas_canvas3d_primitive_form_set(data->cylinder_primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_CYLINDER); + evas_canvas3d_primitive_tex_scale_set(data->cylinder_primitive, 1.0, 1.0); + evas_canvas3d_primitive_precision_set(data->cylinder_primitive, 50); for ( i = 0; i < 4; i++) _mesh_setup_column(data, i); @@ -1143,12 +1029,11 @@ _scene_setup(Scene_Data *data) _mesh_aabb(&data->mesh_cube, data, aabb_index); - eo_do(global_scene, - evas_canvas3d_scene_root_node_set(data->root_node), - evas_canvas3d_scene_camera_node_set(data->camera_node)); + evas_canvas3d_scene_root_node_set(global_scene, data->root_node); + evas_canvas3d_scene_camera_node_set(global_scene, data->camera_node); if (data->shadow) - eo_do(global_scene,evas_canvas3d_scene_shadows_enable_set(EINA_TRUE)); + evas_canvas3d_scene_shadows_enable_set(global_scene, EINA_TRUE); if (data->fog) { @@ -1174,40 +1059,33 @@ _scene_setup(Scene_Data *data) } } - data->carp_mediator_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); + data->carp_mediator_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); - eo_do(data->carp_mediator_node, - evas_canvas3d_node_member_add(data->mesh_node_carpet)); + evas_canvas3d_node_member_add(data->carp_mediator_node, data->mesh_node_carpet); - eo_do(data->mediator_node, - evas_canvas3d_node_member_add(data->mesh_node_soldier), - evas_canvas3d_node_member_add(data->mesh_node_tommy)); + evas_canvas3d_node_member_add(data->mediator_node, data->mesh_node_soldier); + evas_canvas3d_node_member_add(data->mediator_node, data->mesh_node_tommy); for (i = 0; i < 10; i++) - eo_do(data->mediator_node, - evas_canvas3d_node_member_add(data->mesh_node_rocket[i])); + evas_canvas3d_node_member_add(data->mediator_node, data->mesh_node_rocket[i]); - eo_do(data->root_node, - evas_canvas3d_node_member_add(data->carp_mediator_node), - evas_canvas3d_node_member_add(data->mesh_node_world), - evas_canvas3d_node_member_add(data->mesh_node_gazebo), - evas_canvas3d_node_member_add(data->mesh_node_eagle), - evas_canvas3d_node_member_add(data->mesh_node_cube), - evas_canvas3d_node_member_add(data->mesh_node_column_c), - evas_canvas3d_node_member_add(data->mesh_node_ball), - evas_canvas3d_node_member_add(data->mesh_node_grass), - evas_canvas3d_node_member_add(data->mesh_node_warrior), - evas_canvas3d_node_member_add(data->mesh_node_snake)); + evas_canvas3d_node_member_add(data->root_node, data->carp_mediator_node); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node_world); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node_gazebo); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node_eagle); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node_cube); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node_column_c); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node_ball); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node_grass); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node_warrior); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node_snake); for (i = 0; i < 4; i++) - eo_do(data->root_node, - evas_canvas3d_node_member_add(data->mesh_node_wall[i]), - evas_canvas3d_node_member_add(data->mesh_node_column[i])); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node_wall[i]); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node_column[i]); for (i = 0; i < 10; i++) - eo_do(data->root_node, - evas_canvas3d_node_member_add(data->mesh_node_level[i])); + evas_canvas3d_node_member_add(data->root_node, data->mesh_node_level[i]); } int @@ -1263,8 +1141,7 @@ main(int argc, char *argv[]) evas_object_show(image); /* Set the image object as render target for 3D scene. */ - eo_do(image, - evas_obj_image_scene_set(global_scene)); + evas_obj_image_scene_set(image, global_scene); evas_object_focus_set(image, EINA_TRUE); diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c index a5f4d9dc5d..d54e92f315 100644 --- a/src/lib/ecore/ecore_anim.c +++ b/src/lib/ecore/ecore_anim.c @@ -319,7 +319,7 @@ _do_tick(void) eina_inlist_remove(EINA_INLIST_GET(animators), EINA_INLIST_GET(animator)); - eo_do(animator->obj, eo_parent_set(NULL)); + eo_parent_set(animator->obj, NULL); if (eo_destructed_is(animator->obj)) eo_manual_free(animator->obj); else @@ -372,8 +372,7 @@ ecore_animator_add(Ecore_Task_Cb func, { Ecore_Animator *animator = NULL; - animator = eo_add(MY_CLASS, _ecore_parent, - ecore_animator_constructor(func, data)); + animator = eo_add(MY_CLASS, _ecore_parent, ecore_animator_constructor(eoid, func, data)); return animator; } @@ -389,8 +388,7 @@ ecore_animator_timeline_add(double runtime, const void *data) { Ecore_Animator *animator; - animator = eo_add(MY_CLASS, _ecore_parent, - ecore_animator_timeline_constructor(runtime, func, data)); + animator = eo_add(MY_CLASS, _ecore_parent, ecore_animator_timeline_constructor(eoid, runtime, func, data)); return animator; } @@ -682,7 +680,7 @@ _ecore_animator_eo_base_destructor(Eo *obj, Ecore_Animator_Data *pd) pd->delete_me = EINA_TRUE; animators_delete_me++; - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } EOLIAN static Eo * @@ -693,7 +691,7 @@ _ecore_animator_eo_base_finalize(Eo *obj, Ecore_Animator_Data *pd) return NULL; } - return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); + return eo_finalize(eo_super(obj, MY_CLASS)); } EAPI void @@ -718,7 +716,7 @@ EAPI void ecore_animator_freeze(Ecore_Animator *animator) { ECORE_ANIMATOR_CHECK(animator); - eo_do(animator, eo_event_freeze()); + eo_event_freeze(animator); } EOLIAN static void @@ -738,7 +736,7 @@ EAPI void ecore_animator_thaw(Ecore_Animator *animator) { ECORE_ANIMATOR_CHECK(animator); - eo_do(animator, eo_event_thaw()); + eo_event_thaw(animator); } EOLIAN static void @@ -813,7 +811,7 @@ _ecore_animator_shutdown(void) if (animator->suspended) animators_suspended--; animators = (Ecore_Animator_Data *)eina_inlist_remove(EINA_INLIST_GET(animators), EINA_INLIST_GET(animators)); - eo_do(animator->obj, eo_parent_set(NULL)); + eo_parent_set(animator->obj, NULL); if (eo_destructed_is(animator->obj)) eo_manual_free(animator->obj); else diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c index e31f96e4bc..75c577b67f 100644 --- a/src/lib/ecore/ecore_exe.c +++ b/src/lib/ecore/ecore_exe.c @@ -67,7 +67,7 @@ ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data) { - Ecore_Exe *ret = eo_add(MY_CLASS, NULL, ecore_obj_exe_command_set(exe_cmd, flags)); + Ecore_Exe *ret = eo_add(MY_CLASS, NULL, ecore_obj_exe_command_set(eoid, exe_cmd, flags)); if (ret) { Ecore_Exe_Data *pd = eo_data_scope_get(ret, MY_CLASS); @@ -95,7 +95,7 @@ EOLIAN static Eo * _ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); - eo_do_super(obj, MY_CLASS, obj = eo_finalize()); + obj = eo_finalize(eo_super(obj, MY_CLASS)); if (!obj) return obj; @@ -216,7 +216,7 @@ ecore_exe_free(Ecore_Exe *obj) EOLIAN static void _ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe) { - eo_do_super(obj, ECORE_EXE_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, ECORE_EXE_CLASS)); _impl_ecore_exe_eo_base_destructor(obj, exe); } @@ -247,7 +247,7 @@ ecore_exe_cmd_get(const Ecore_Exe *obj) EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); const char *ret = NULL; - eo_do(obj, ecore_obj_exe_command_get(&ret, NULL)); + ecore_obj_exe_command_get(obj, &ret, NULL); return ret; } @@ -292,13 +292,13 @@ ecore_exe_flags_get(const Ecore_Exe *obj) EAPI void ecore_exe_pause(Ecore_Exe *obj) { - eo_do(obj, efl_control_suspend_set(EINA_TRUE)); + efl_control_suspend_set(obj, EINA_TRUE); } EAPI void ecore_exe_continue(Ecore_Exe *obj) { - eo_do(obj, efl_control_suspend_set(EINA_FALSE)); + efl_control_suspend_set(obj, EINA_FALSE); } EOLIAN static void diff --git a/src/lib/ecore/ecore_exe_posix.c b/src/lib/ecore/ecore_exe_posix.c index e416e23b6d..7c503a6e9a 100644 --- a/src/lib/ecore/ecore_exe_posix.c +++ b/src/lib/ecore/ecore_exe_posix.c @@ -1171,7 +1171,7 @@ _ecore_exe_data_generic_handler(void *data, ecore_event_add(event_type, e, _ecore_exe_event_exe_data_free, NULL); - eo_do(obj, eo_event_callback_call(eo_event, e)); + eo_event_callback_call(obj, eo_event, e); } } } diff --git a/src/lib/ecore/ecore_exe_win32.c b/src/lib/ecore/ecore_exe_win32.c index 42cc5ceb23..bc4041492f 100644 --- a/src/lib/ecore/ecore_exe_win32.c +++ b/src/lib/ecore/ecore_exe_win32.c @@ -158,7 +158,7 @@ _ecore_exe_pipe_read_thread_cb(void *data) ecore_event_add(ECORE_EXE_EVENT_DATA, event_data, _ecore_exe_event_exe_data_free, NULL); - eo_do(obj, eo_event_callback_call(ECORE_EXE_EVENT_DATA_GET, event_data)); + eo_event_callback_call(obj, ECORE_EXE_EVENT_DATA_GET, event_data); } current_buf = NULL; @@ -228,7 +228,7 @@ _ecore_exe_pipe_error_thread_cb(void *data) ecore_event_add(ECORE_EXE_EVENT_ERROR, event_data, _ecore_exe_event_exe_data_free, NULL); - eo_do(obj, eo_event_callback_call(ECORE_EXE_EVENT_DATA_ERROR, event_data)); + eo_event_callback_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data); } current_buf = NULL; diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c index 6c40158207..a7cbfa5704 100644 --- a/src/lib/ecore/ecore_idle_enterer.c +++ b/src/lib/ecore/ecore_idle_enterer.c @@ -61,7 +61,7 @@ ecore_idle_enterer_add(Ecore_Task_Cb func, const void *data) { Ecore_Idle_Enterer *ie = NULL; - ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_after_constructor(func, data)); + ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_after_constructor(eoid, func, data)); return ie; } @@ -78,7 +78,7 @@ ecore_idle_enterer_before_add(Ecore_Task_Cb func, const void *data) { Ecore_Idle_Enterer *ie = NULL; - ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_before_constructor(func, data)); + ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_before_constructor(eoid, func, data)); return ie; } @@ -117,7 +117,7 @@ _ecore_idle_enterer_eo_base_destructor(Eo *obj, Ecore_Idle_Enterer_Data *idle_en idle_enterer->delete_me = 1; idle_enterers_delete_me = 1; - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } EOLIAN static Eo * @@ -128,7 +128,7 @@ _ecore_idle_enterer_eo_base_finalize(Eo *obj, Ecore_Idle_Enterer_Data *idle_ente return NULL; } - return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); + return eo_finalize(eo_super(obj, MY_CLASS)); } void @@ -139,7 +139,7 @@ _ecore_idle_enterer_shutdown(void) { idle_enterers = (Ecore_Idle_Enterer_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(idle_enterers)); - eo_do(ie->obj, eo_parent_set(NULL)); + eo_parent_set(ie->obj, NULL); if (eo_destructed_is(ie->obj)) eo_manual_free(ie->obj); else @@ -201,7 +201,7 @@ _ecore_idle_enterer_call(void) idle_enterers = (Ecore_Idle_Enterer_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(ie)); - eo_do(ie->obj, eo_parent_set(NULL)); + eo_parent_set(ie->obj, NULL); if (eo_destructed_is(ie->obj)) eo_manual_free(ie->obj); else diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c index d4e6962795..5074b13009 100644 --- a/src/lib/ecore/ecore_idle_exiter.c +++ b/src/lib/ecore/ecore_idle_exiter.c @@ -37,7 +37,7 @@ ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data) { Ecore_Idle_Exiter *ie = NULL; - ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_exiter_constructor(func, data)); + ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_exiter_constructor(eoid, func, data)); return ie; } @@ -88,7 +88,7 @@ _ecore_idle_exiter_eo_base_finalize(Eo *obj, Ecore_Idle_Exiter_Data *idle_exiter return NULL; } - return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); + return eo_finalize(eo_super(obj, MY_CLASS)); } EOLIAN static void @@ -98,7 +98,7 @@ _ecore_idle_exiter_eo_base_destructor(Eo *obj, Ecore_Idle_Exiter_Data *idle_exit idle_exiter->delete_me = 1; idle_exiters_delete_me = 1; - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } void @@ -109,7 +109,7 @@ _ecore_idle_exiter_shutdown(void) { idle_exiters = (Ecore_Idle_Exiter_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(idle_exiters)); - eo_do(ie->obj, eo_parent_set(NULL)); + eo_parent_set(ie->obj, NULL); if (eo_destructed_is(ie->obj)) eo_manual_free(ie->obj); else @@ -172,7 +172,7 @@ _ecore_idle_exiter_call(void) idle_exiters = (Ecore_Idle_Exiter_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(ie)); - eo_do(ie->obj, eo_parent_set(NULL)); + eo_parent_set(ie->obj, NULL); if (eo_destructed_is(ie->obj)) eo_manual_free(ie->obj); else diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c index 6cd3ba1e7a..f68d424488 100644 --- a/src/lib/ecore/ecore_idler.c +++ b/src/lib/ecore/ecore_idler.c @@ -35,7 +35,7 @@ EAPI Ecore_Idler * ecore_idler_add(Ecore_Task_Cb func, const void *data) { - return eo_add(MY_CLASS, _ecore_parent, ecore_idler_constructor(func, data)); + return eo_add(MY_CLASS, _ecore_parent, ecore_idler_constructor(eoid, func, data)); } EOLIAN static void @@ -86,7 +86,7 @@ _ecore_idler_eo_base_destructor(Eo *obj, Ecore_Idler_Data *idler) idler->delete_me = 1; idlers_delete_me = 1; - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } EOLIAN static Eo * @@ -97,7 +97,7 @@ _ecore_idler_eo_base_finalize(Eo *obj, Ecore_Idler_Data *idler) return NULL; } - return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); + return eo_finalize(eo_super(obj, MY_CLASS)); } void @@ -108,7 +108,7 @@ _ecore_idler_shutdown(void) { idlers = (Ecore_Idler_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(idlers)); - eo_do(ie->obj, eo_parent_set(NULL)); + eo_parent_set(ie->obj, NULL); if (eo_destructed_is(ie->obj)) eo_manual_free(ie->obj); else @@ -167,7 +167,7 @@ _ecore_idler_all_call(void) idlers = (Ecore_Idler_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(ie)); - eo_do(ie->obj, eo_parent_set(NULL)); + eo_parent_set(ie->obj, NULL); if (eo_destructed_is(ie->obj)) eo_manual_free(ie->obj); else diff --git a/src/lib/ecore/ecore_job.c b/src/lib/ecore/ecore_job.c index ed988ab66c..1f459c7940 100644 --- a/src/lib/ecore/ecore_job.c +++ b/src/lib/ecore/ecore_job.c @@ -49,7 +49,7 @@ EAPI Ecore_Job * ecore_job_add(Ecore_Cb func, const void *data) { - Ecore_Job *job = eo_add(MY_CLASS, _ecore_parent, ecore_job_constructor(func, data)); + Ecore_Job *job = eo_add(MY_CLASS, _ecore_parent, ecore_job_constructor(eoid, func, data)); return job; } @@ -88,7 +88,7 @@ ecore_job_del(Ecore_Job *obj) Ecore_Job_Data *job = eo_data_scope_get(obj, MY_CLASS); data = job->data; ecore_event_del(job->event); - eo_do(obj, eo_parent_set(NULL)); + eo_parent_set(obj, NULL); return data; } @@ -96,7 +96,7 @@ EOLIAN static void _ecore_job_eo_base_destructor(Eo *obj, Ecore_Job_Data *_pd EINA_UNUSED) { /*FIXME: check if ecore_event_del should be called from here*/ - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } EOLIAN static Eo * @@ -107,7 +107,7 @@ _ecore_job_eo_base_finalize(Eo *obj, Ecore_Job_Data *pd) return NULL; } - return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); + return eo_finalize(eo_super(obj, MY_CLASS)); } static Eina_Bool @@ -126,7 +126,7 @@ static void _ecore_job_event_free(void *data, void *job EINA_UNUSED) { - eo_do(data, eo_parent_set(NULL)); + eo_parent_set(data, NULL); Ecore_Job *obj = data; diff --git a/src/lib/ecore/ecore_poller.c b/src/lib/ecore/ecore_poller.c index 348a734dd7..79f2a78f0b 100644 --- a/src/lib/ecore/ecore_poller.c +++ b/src/lib/ecore/ecore_poller.c @@ -173,7 +173,7 @@ _ecore_poller_cb_timer(void *data EINA_UNUSED) { pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(poller)); - eo_do(poller->obj, eo_parent_set(NULL)); + eo_parent_set(poller->obj, NULL); if (eo_destructed_is(poller->obj)) eo_manual_free(poller->obj); else @@ -237,8 +237,7 @@ ecore_poller_add(Ecore_Poller_Type type EINA_UNUSED, const void *data) { Ecore_Poller *poller; - poller = eo_add(MY_CLASS, _ecore_parent, - ecore_poller_constructor(type, interval, func, data)); + poller = eo_add(MY_CLASS, _ecore_parent, ecore_poller_constructor(eoid, type, interval, func, data)); return poller; } @@ -352,7 +351,7 @@ ecore_poller_del(Ecore_Poller *obj) data = poller->data; pollers[poller->ibit] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller)); - eo_do(poller->obj, eo_parent_set(NULL)); + eo_parent_set(poller->obj, NULL); if (eo_destructed_is(poller->obj)) eo_manual_free(obj); else @@ -371,7 +370,7 @@ _ecore_poller_eo_base_destructor(Eo *obj, Ecore_Poller_Data *pd) poller_delete_count++; } - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } EOLIAN static Eo * @@ -382,7 +381,7 @@ _ecore_poller_eo_base_finalize(Eo *obj, Ecore_Poller_Data *pd) return NULL; } - return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); + return eo_finalize(eo_super(obj, MY_CLASS)); } void @@ -396,7 +395,7 @@ _ecore_poller_shutdown(void) while ((poller = pollers[i])) { pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(pollers[i])); - eo_do(poller->obj, eo_parent_set(NULL)); + eo_parent_set(poller->obj, NULL); if (eo_destructed_is(poller->obj)) eo_manual_free(poller->obj); else diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c index 11a6ad1924..7343a7f726 100644 --- a/src/lib/ecore/ecore_timer.c +++ b/src/lib/ecore/ecore_timer.c @@ -93,7 +93,7 @@ ecore_timer_add(double in, Ecore_Timer *timer = NULL; EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); - timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_constructor(in, func, data)); + timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_constructor(eoid, in, func, data)); return timer; } @@ -232,7 +232,7 @@ EAPI void ecore_timer_freeze(Ecore_Timer *timer) { ECORE_TIMER_CHECK(timer); - eo_do(timer, eo_event_freeze()); + eo_event_freeze(timer); } EOLIAN static void @@ -261,7 +261,7 @@ ecore_timer_freeze_get(Ecore_Timer *timer) { int r = 0; - eo_do(timer, r = eo_event_freeze_count_get()); + r = eo_event_freeze_count_get(timer); return !!r; } @@ -277,7 +277,7 @@ EAPI void ecore_timer_thaw(Ecore_Timer *timer) { ECORE_TIMER_CHECK(timer); - eo_do(timer, eo_event_thaw()); + eo_event_thaw(timer); } EOLIAN static void @@ -357,7 +357,7 @@ _ecore_timer_loop_add(double in, const void *data) { Ecore_Timer *timer = NULL; - timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_loop_constructor(in, func, data)); + timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_loop_constructor(eoid, in, func, data)); return timer; } @@ -397,7 +397,7 @@ _ecore_timer_del(Ecore_Timer *obj) if (timer->delete_me) timers_delete_me--; - eo_do(obj, eo_parent_set(NULL)); + eo_parent_set(obj, NULL); if (eo_destructed_is(obj)) eo_manual_free(obj); @@ -421,7 +421,7 @@ _ecore_timer_eo_base_destructor(Eo *obj, Ecore_Timer_Data *pd) timers_delete_me++; } - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } EOLIAN static Eo * @@ -432,7 +432,7 @@ _ecore_timer_eo_base_finalize(Eo *obj, Ecore_Timer_Data *pd) return NULL; } - return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); + return eo_finalize(eo_super(obj, MY_CLASS)); } void @@ -445,7 +445,7 @@ _ecore_timer_shutdown(void) timers = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timers)); eo_data_unref(timer->obj, timer); - eo_do(timer->obj, eo_parent_set(NULL)); + eo_parent_set(timer->obj, NULL); if (eo_destructed_is(timer->obj)) eo_manual_free(timer->obj); else @@ -457,7 +457,7 @@ _ecore_timer_shutdown(void) suspended = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(suspended)); eo_data_unref(timer->obj, timer); - eo_do(timer->obj, eo_parent_set(NULL)); + eo_parent_set(timer->obj, NULL); if (eo_destructed_is(timer->obj)) eo_manual_free(timer->obj); else @@ -489,7 +489,7 @@ _ecore_timer_cleanup(void) timers = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer)); eo_data_unref(timer->obj, timer); - eo_do(timer->obj, eo_parent_set(NULL)); + eo_parent_set(timer->obj, NULL); if (eo_destructed_is(timer->obj)) eo_manual_free(timer->obj); else @@ -514,7 +514,7 @@ _ecore_timer_cleanup(void) suspended = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer)); eo_data_unref(timer->obj, timer); - eo_do(timer->obj, eo_parent_set(NULL)); + eo_parent_set(timer->obj, NULL); if (eo_destructed_is(timer->obj)) eo_manual_free(timer->obj); else diff --git a/src/lib/ecore_audio/ecore_audio_obj.c b/src/lib/ecore_audio/ecore_audio_obj.c index 3607cd9fca..bef68c8b46 100644 --- a/src/lib/ecore_audio/ecore_audio_obj.c +++ b/src/lib/ecore_audio/ecore_audio_obj.c @@ -58,7 +58,7 @@ EOLIAN static Eo * _ecore_audio_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Object *obj) { obj->volume = 1.0; - return eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + return eo_constructor(eo_super(eo_obj, MY_CLASS)); } #include "ecore_audio.eo.c" diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c index a6afa18781..c69bd2fc74 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in.c +++ b/src/lib/ecore_audio/ecore_audio_obj_in.c @@ -27,7 +27,7 @@ _ecore_audio_in_speed_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, double obj->speed = speed; - eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL)); + eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL); } EOLIAN static double @@ -41,7 +41,7 @@ _ecore_audio_in_samplerate_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, i { obj->samplerate = samplerate; - eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL)); + eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL); } EOLIAN static int @@ -89,7 +89,7 @@ _ecore_audio_in_remaining_get(Eo *eo_obj, Ecore_Audio_Input *obj) if (!obj->seekable) return -1; else { double ret = 0.0; - eo_do(eo_obj, ret = ecore_audio_obj_in_seek(0, SEEK_CUR)); + ret = ecore_audio_obj_in_seek(eo_obj, 0, SEEK_CUR); return obj->length - ret; } } @@ -104,14 +104,14 @@ _ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len) memset(buf, 0, len); len_read = len; } else { - eo_do(eo_obj, len_read = ecore_audio_obj_in_read_internal(buf, len)); + len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len); if (len_read == 0) { if (!obj->looped || !obj->seekable) { - eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL)); + eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL); } else { - eo_do(eo_obj, ecore_audio_obj_in_seek(0, SEEK_SET)); - eo_do(eo_obj, len_read = ecore_audio_obj_in_read_internal(buf, len)); - eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL)); + ecore_audio_obj_in_seek(eo_obj, 0, SEEK_SET); + len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len); + eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL); } } @@ -173,7 +173,7 @@ _ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Au EOLIAN static Eo * _ecore_audio_in_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Input *obj) { - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); obj->speed = 1.0; @@ -184,9 +184,9 @@ EOLIAN static void _ecore_audio_in_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Input *obj) { if(obj->output) - eo_do(obj->output, ecore_audio_obj_out_input_detach(eo_obj)); + ecore_audio_obj_out_input_detach(obj->output, eo_obj); - eo_do_super(eo_obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(eo_obj, MY_CLASS)); } #include "ecore_audio_in.eo.c" diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c index 599ae27391..cefe28b021 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c +++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c @@ -205,7 +205,7 @@ _ecore_audio_in_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Da if (ea_obj->vio) _free_vio(ea_obj); - eo_do_super(eo_obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(eo_obj, MY_CLASS)); } #include "ecore_audio_in_sndfile.eo.c" diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c index 2b097f66f1..ff35a982a2 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c +++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c @@ -90,7 +90,7 @@ _ecore_audio_in_tone_eo_base_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data * if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) { obj->freq = *(int *)val; } else { - eo_do_super(eo_obj, MY_CLASS, eo_key_data_set(key, val)); + eo_key_data_set(eo_super(eo_obj, MY_CLASS), key, val); } } @@ -102,7 +102,7 @@ _ecore_audio_in_tone_eo_base_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data * return (void *) (intptr_t) obj->freq; } else { void *ret = NULL; - eo_do_super(eo_obj, MY_CLASS, ret = eo_key_data_get(key)); + ret = eo_key_data_get(eo_super(eo_obj, MY_CLASS), key); return ret; } } @@ -112,7 +112,7 @@ _ecore_audio_in_tone_eo_base_constructor(Eo *eo_obj, Ecore_Audio_In_Tone_Data *o { Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); in_obj->channels = 1; in_obj->samplerate = 44100; diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c b/src/lib/ecore_audio/ecore_audio_obj_out.c index 0414d668b5..c34245fa49 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out.c @@ -34,7 +34,7 @@ static Eina_Bool _write_cb(void *data) /* FIXME: Multiple inputs */ in = eina_list_data_get(out_obj->inputs); - eo_do(in, bread = ecore_audio_obj_in_read(buf, 4*1024)); + bread = ecore_audio_obj_in_read(in, buf, 4*1024); if (bread == 0) { ea_obj->paused = EINA_TRUE; @@ -61,7 +61,7 @@ _ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Output *obj, Eo *input) if (in->output == eo_obj) return EINA_FALSE; - if (in->output) eo_do(in->output, ecore_audio_obj_out_input_detach(input)); + if (in->output) ecore_audio_obj_out_input_detach(in->output, input); in->output = eo_obj; /* TODO: Send event */ @@ -132,7 +132,7 @@ _ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UN EOLIAN static Eo * _ecore_audio_out_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Output *obj) { - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); obj->need_writer = EINA_TRUE; @@ -146,10 +146,10 @@ _ecore_audio_out_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Output *obj) Eo *in; EINA_LIST_FOREACH_SAFE(obj->inputs, cur, tmp, in) { - eo_do(eo_obj, ecore_audio_obj_out_input_detach(in)); + ecore_audio_obj_out_input_detach(eo_obj, in); } - eo_do_super(eo_obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(eo_obj, MY_CLASS)); } #include "ecore_audio_out.eo.c" diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c b/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c index 1d2ead4566..aa0d76b5a0 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c @@ -185,7 +185,7 @@ _audio_io_proc_cb(AudioObjectID obj_id EINA_UNUSED, if (helper->fake_stereo) { - eo_do(helper->input, bread = ecore_audio_obj_in_read(buf, size * 2)); + bread = ecore_audio_obj_in_read(helper->input, buf, size * 2); for (k = bread - 1; k >= 0; --k) { @@ -196,7 +196,7 @@ _audio_io_proc_cb(AudioObjectID obj_id EINA_UNUSED, } else { - eo_do(helper->input, bread = ecore_audio_obj_in_read(buf, size * 4)); + bread = ecore_audio_obj_in_read(helper->input, buf, size * 4); bread /= 4; } @@ -219,7 +219,7 @@ EOLIAN static void _ecore_audio_out_core_audio_ecore_audio_volume_set(Eo *obj, Ecore_Audio_Out_Core_Audio_Data *sd EINA_UNUSED, double volume) { // TODO Change volume of playing inputs - eo_do_super(obj, MY_CLASS, ecore_audio_obj_volume_set(volume)); + ecore_audio_obj_volume_set(eo_super(obj, MY_CLASS), volume); } EOLIAN static Eina_Bool @@ -230,7 +230,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_attach(Eo *obj, Ecore_Audio_Ou OSStatus err; Eina_Bool chk; - eo_do_super(obj, MY_CLASS, chk = ecore_audio_obj_out_input_attach(input)); + chk = ecore_audio_obj_out_input_attach(eo_super(obj, MY_CLASS), input); if (EINA_UNLIKELY(!chk)) { ERR("Failed to attach input (eo_do_super)"); @@ -266,10 +266,10 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_attach(Eo *obj, Ecore_Audio_Ou } /* Forward samplerate to CoreAudio */ - eo_do(input, helper->format.mSampleRate = ecore_audio_obj_in_samplerate_get()); + helper->format.mSampleRate = ecore_audio_obj_in_samplerate_get(input); /* Set channels. If only 1 channel, emulate stereo */ - eo_do(input, channels = ecore_audio_obj_in_channels_get()); + channels = ecore_audio_obj_in_channels_get(input); if (channels == 1) { DBG("Fake stereo enabled for input %p", input); @@ -303,7 +303,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_attach(Eo *obj, Ecore_Audio_Ou } /* Keep track of data for deallocation */ - eo_do(input, eo_key_data_set("coreaudio_data", helper)); + eo_key_data_set(input, "coreaudio_data", helper); /* Start playing */ helper->is_playing = EINA_TRUE; @@ -322,7 +322,7 @@ free_proc_id: free_helper: free(helper); detach: - eo_do_super(obj, MY_CLASS, ecore_audio_obj_out_input_detach(input)); + ecore_audio_obj_out_input_detach(eo_super(obj, MY_CLASS), input); return_failure: return EINA_FALSE; } @@ -335,10 +335,10 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_detach(Eo *obj, Ecore_Audio_Ou DBG("Detach"); /* Free helper */ - eo_do(input, data = eo_key_data_get("coreaudio_data")); + data = eo_key_data_get(input, "coreaudio_data"); _core_audio_helper_free(data); - eo_do_super(obj, MY_CLASS, ret = ecore_audio_obj_out_input_detach(input)); + ret = ecore_audio_obj_out_input_detach(eo_super(obj, MY_CLASS), input); return ret; } diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c index 2c869fd1f4..95aa0c0254 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c @@ -61,10 +61,10 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_ pa_cvolume_set(&pa_volume, 2, volume * PA_VOLUME_NORM); - eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_volume_set(volume)); + ecore_audio_obj_volume_set(eo_super(eo_obj, MY_CLASS), volume); EINA_LIST_FOREACH(out_obj->inputs, input, in) { - eo_do(in, stream = eo_key_data_get("pulse_data")); + stream = eo_key_data_get(in, "pulse_data"); idx = pa_stream_get_index(stream); pa_operation_unref(pa_context_set_sink_input_volume(class_vars.context, idx, &pa_volume, NULL, NULL)); } @@ -81,7 +81,7 @@ static void _write_cb(pa_stream *stream, size_t len, void *data) pa_stream_begin_write(stream, &buf, &wlen); - eo_do(in, bread = ecore_audio_obj_in_read(buf, wlen)); + bread = ecore_audio_obj_in_read(in, buf, wlen); pa_stream_write(stream, buf, bread, NULL, 0, PA_SEEK_RELATIVE); if (bread < (int)len) @@ -96,10 +96,10 @@ static Eina_Bool _update_samplerate_cb(void *data EINA_UNUSED, const Eo_Event *e int samplerate = 0; double speed = 0; - eo_do(event->obj, samplerate = ecore_audio_obj_in_samplerate_get()); - eo_do(event->obj, speed = ecore_audio_obj_in_speed_get()); + samplerate = ecore_audio_obj_in_samplerate_get(event->obj); + speed = ecore_audio_obj_in_speed_get(event->obj); - eo_do(event->obj, stream = eo_key_data_get("pulse_data")); + stream = eo_key_data_get(event->obj, "pulse_data"); pa_operation_unref(pa_stream_update_sample_rate(stream, samplerate * speed, NULL, NULL)); @@ -115,28 +115,28 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in) Eina_Bool ret = EINA_FALSE; Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); - eo_do_super(eo_obj, MY_CLASS, ret = ecore_audio_obj_out_input_attach(in)); + ret = ecore_audio_obj_out_input_attach(eo_super(eo_obj, MY_CLASS), in); if (!ret) return EINA_FALSE; ss.format = PA_SAMPLE_FLOAT32LE; - eo_do(in, ss.rate = ecore_audio_obj_in_samplerate_get()); - eo_do(in, speed = ecore_audio_obj_in_speed_get()); - eo_do(in, ss.channels = ecore_audio_obj_in_channels_get()); - eo_do(in, name = ecore_audio_obj_name_get()); + ss.rate = ecore_audio_obj_in_samplerate_get(in); + speed = ecore_audio_obj_in_speed_get(in); + ss.channels = ecore_audio_obj_in_channels_get(in); + name = ecore_audio_obj_name_get(in); ss.rate = ss.rate * speed; stream = pa_stream_new(class_vars.context, name, &ss, NULL); if (!stream) { ERR("Could not create stream"); - eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_out_input_detach(in)); + ecore_audio_obj_out_input_detach(eo_super(eo_obj, MY_CLASS), in); return EINA_FALSE; } - eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj)); + eo_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj); - eo_do(in, eo_key_data_set("pulse_data", stream)); + eo_key_data_set(in, "pulse_data", stream); pa_stream_set_write_callback(stream, _write_cb, in); @@ -151,7 +151,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in) static Eina_Bool _delayed_attach_cb(void *data, const Eo_Event *event) { Eo *in = data; - eo_do(event->obj, eo_event_callback_del(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in)); + eo_event_callback_del(event->obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in); _input_attach_internal(event->obj, in); @@ -165,7 +165,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Out_ if (class_vars.state != PA_CONTEXT_READY) { DBG("Delaying input_attach because PA context is not ready."); - eo_do(eo_obj, eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in)); + eo_event_callback_add(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in); } else { retval = _input_attach_internal(eo_obj, in); } @@ -186,11 +186,11 @@ _ecore_audio_out_pulse_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_ Eina_Bool ret2 = EINA_FALSE; pa_operation *op; - eo_do_super(eo_obj, MY_CLASS, ret2 = ecore_audio_obj_out_input_detach(in)); + ret2 = ecore_audio_obj_out_input_detach(eo_super(eo_obj, MY_CLASS), in); if (!ret2) return EINA_FALSE; - eo_do(in, stream = eo_key_data_get("pulse_data")); + stream = eo_key_data_get(in, "pulse_data"); pa_stream_set_write_callback(stream, NULL, NULL); op = pa_stream_drain(stream, _drain_cb, NULL); @@ -221,12 +221,12 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED) if (state == PA_CONTEXT_READY) { DBG("PA context ready."); EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { - eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL)); + eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL); } } else if ((state == PA_CONTEXT_FAILED) || (state == PA_CONTEXT_TERMINATED)) { DBG("PA context fail."); EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { - eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL)); + eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL); } } else { DBG("Connection state %i", state); @@ -252,7 +252,7 @@ static void _state_job(void *data EINA_UNUSED) } // the callback here can delete things in the list.. EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { - eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL)); + eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL); } // now unref everything safely EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) { @@ -269,7 +269,7 @@ _ecore_audio_out_pulse_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Dat char **argv; Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); out_obj->need_writer = EINA_FALSE; @@ -296,7 +296,7 @@ EOLIAN static void _ecore_audio_out_pulse_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED) { class_vars.outputs = eina_list_remove(class_vars.outputs, eo_obj); - eo_do_super(eo_obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(eo_obj, MY_CLASS)); } #include "ecore_audio_out_pulse.eo.c" diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c index d986b67dbf..e24cfeb0f7 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c @@ -43,7 +43,7 @@ static Eina_Bool _write_cb(void *data) /* TODO: Support mixing of multiple inputs */ in = eina_list_data_get(out_obj->inputs); - eo_do(in, bread = ecore_audio_obj_in_read(buf, 4*1024)); + bread = ecore_audio_obj_in_read(in, buf, 4*1024); if (bread == 0) { sf_write_sync(obj->handle); @@ -66,19 +66,19 @@ _ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Ou Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); Eina_Bool ret2 = EINA_FALSE; - eo_do_super(eo_obj, MY_CLASS, ret2 = ecore_audio_obj_out_input_attach(in)); + ret2 = ecore_audio_obj_out_input_attach(eo_super(eo_obj, MY_CLASS), in); if (!ret2) return EINA_FALSE; - eo_do(in, obj->sfinfo.samplerate = ecore_audio_obj_in_samplerate_get()); - eo_do(in, obj->sfinfo.channels = ecore_audio_obj_in_channels_get()); + obj->sfinfo.samplerate = ecore_audio_obj_in_samplerate_get(in); + obj->sfinfo.channels = ecore_audio_obj_in_channels_get(in); obj->handle = sf_open(ea_obj->source, SFM_WRITE, &obj->sfinfo); if (!obj->handle) { eina_stringshare_del(ea_obj->source); ea_obj->source = NULL; - eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_out_input_detach(in)); + ecore_audio_obj_out_input_detach(eo_super(eo_obj, MY_CLASS), in); return EINA_FALSE; } @@ -163,9 +163,9 @@ _ecore_audio_out_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile { Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); - eo_do(eo_obj, ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_OGG)); + ecore_audio_obj_format_set(eo_obj, ECORE_AUDIO_FORMAT_OGG); // FIXME: Use writer from output out_obj->need_writer = EINA_FALSE; @@ -182,7 +182,7 @@ _ecore_audio_out_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_ if (out_obj->write_idler) ecore_idler_del(out_obj->write_idler); - eo_do_super(eo_obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(eo_obj, MY_CLASS)); } #include "ecore_audio_out_sndfile.eo.c" diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c index a08a15186a..8dd9d822cc 100644 --- a/src/lib/ecore_con/ecore_con.c +++ b/src/lib/ecore_con/ecore_con.c @@ -109,7 +109,7 @@ static const char *_ecore_con_pretty_ip(struct sockaddr *client_addr); #define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \ Eina_Bool finalized; \ - if (eo_do_ret(obj, finalized, eo_finalized_get())) \ + if (eo_finalized_get(obj)) \ { \ ERR("This function is only allowed during construction."); \ return; \ @@ -306,10 +306,7 @@ _efl_network_base_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const ch if (!name || !done_cb) return EINA_FALSE; - obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, - efl_network_server_connection_type_set(ECORE_CON_REMOTE_TCP), - efl_network_server_name_set(name), - efl_network_base_port_set(1025)); + obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eoid, ECORE_CON_REMOTE_TCP), efl_network_server_name_set(eoid, name), efl_network_base_port_set(eoid, 1025)); lk = malloc(sizeof (Ecore_Con_Lookup)); if (!lk) @@ -363,10 +360,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type, /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */ /* remote system socket: TCP/IP: [name]:[port] */ - obj = eo_add(EFL_NETWORK_SERVER_CLASS, NULL, - efl_network_server_connection_type_set(compl_type), - efl_network_server_name_set(name), - efl_network_base_port_set(port)); + obj = eo_add(EFL_NETWORK_SERVER_CLASS, NULL, efl_network_server_connection_type_set(eoid, compl_type), efl_network_server_name_set(eoid, name), efl_network_base_port_set(eoid, port)); ecore_con_server_data_set(obj, (void *) data); @@ -376,7 +370,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type, EOLIAN static Eo * _efl_network_server_eo_base_constructor(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr) { - obj = eo_do_super_ret(obj, EFL_NETWORK_SERVER_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS)); svr->fd = -1; svr->reject_excess_clients = EINA_FALSE; @@ -392,7 +386,7 @@ _efl_network_server_eo_base_finalize(Ecore_Con_Server *obj, Efl_Network_Server_D Ecore_Con_Type compl_type = svr->type; Ecore_Con_Type type; - eo_do_super(obj, EFL_NETWORK_SERVER_CLASS, eo_finalize()); + eo_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS)); svr->created = EINA_TRUE; svr->ppid = getpid(); @@ -462,10 +456,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type, /* local user socket: FILE: ~/.ecore/[name]/[port] */ /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */ /* remote system socket: TCP/IP: [name]:[port] */ - obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, - efl_network_server_connection_type_set(compl_type), - efl_network_server_name_set(name), - efl_network_base_port_set(port)); + obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eoid, compl_type), efl_network_server_name_set(eoid, name), efl_network_base_port_set(eoid, port)); ecore_con_server_data_set(obj, (void *) data); @@ -481,7 +472,7 @@ _efl_network_connector_eo_base_finalize(Ecore_Con_Server *obj, void *pd EINA_UNU /* XXX: We intentionally put SERVER class here and not connector, as we'd * like to skip that one. */ - eo_do_super(obj, EFL_NETWORK_SERVER_CLASS, eo_finalize()); + eo_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS)); svr->use_cert = (compl_type & ECORE_CON_SSL & ECORE_CON_LOAD_CERT) == ECORE_CON_LOAD_CERT; svr->disable_proxy = (compl_type & ECORE_CON_SUPER_SSL & ECORE_CON_NO_PROXY) == ECORE_CON_NO_PROXY; @@ -548,7 +539,7 @@ error: EAPI void ecore_con_server_timeout_set(Ecore_Con *obj, double timeout) { - eo_do((Ecore_Con *)obj, efl_network_base_timeout_set(timeout)); + efl_network_base_timeout_set((Ecore_Con *)obj, timeout); } EOLIAN static void @@ -566,7 +557,7 @@ EAPI double ecore_con_server_timeout_get(const Ecore_Con *obj) { double ret; - return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_timeout_get()); + return efl_network_base_timeout_get((Ecore_Con *)obj); } EOLIAN static double @@ -620,7 +611,7 @@ EAPI Eina_Bool ecore_con_server_connected_get(const Ecore_Con *obj) { Eina_Bool ret; - return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_connected_get()); + return efl_network_base_connected_get((Ecore_Con *)obj); } EOLIAN static Eina_Bool @@ -670,7 +661,7 @@ EAPI int ecore_con_server_port_get(const Ecore_Con *obj) { int ret; - return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_port_get()); + return efl_network_base_port_get((Ecore_Con *)obj); } EOLIAN static void @@ -691,7 +682,7 @@ EAPI int ecore_con_server_send(Ecore_Con *obj, const void *data, int size) { int ret; - return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_send(data, size)); + return efl_network_base_send((Ecore_Con *)obj, data, size); } EOLIAN static int @@ -748,7 +739,7 @@ EAPI const char * ecore_con_server_ip_get(const Ecore_Con *obj) { const char *ret; - return eo_do_ret(obj, ret, efl_network_base_ip_get()); + return efl_network_base_ip_get(obj); } EOLIAN static const char * @@ -761,7 +752,7 @@ EAPI double ecore_con_server_uptime_get(const Ecore_Con *obj) { double ret; - return eo_do_ret(obj, ret, efl_network_base_uptime_get()); + return efl_network_base_uptime_get(obj); } EOLIAN static double @@ -773,7 +764,7 @@ _efl_network_server_efl_network_base_uptime_get(Eo *obj EINA_UNUSED, Efl_Network EAPI void ecore_con_server_flush(Ecore_Con *obj) { - eo_do((Ecore_Con *)obj, efl_network_base_flush()); + efl_network_base_flush((Ecore_Con *)obj); } EOLIAN static void @@ -803,7 +794,7 @@ EAPI int ecore_con_client_send(Ecore_Con *obj, const void *data, int size) { int ret; - return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_send(data, size)); + return efl_network_base_send((Ecore_Con *)obj, data, size); } EOLIAN static int @@ -871,7 +862,7 @@ EAPI Eina_Bool ecore_con_client_connected_get(const Ecore_Con *obj) { Eina_Bool ret; - return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_connected_get()); + return efl_network_base_connected_get((Ecore_Con *)obj); } EOLIAN static void @@ -885,7 +876,7 @@ _efl_network_client_efl_network_base_timeout_set(Eo *obj, Efl_Network_Client_Dat EAPI void ecore_con_client_timeout_set(Ecore_Con *obj, double timeout) { - eo_do((Ecore_Con *)obj, efl_network_base_timeout_set(timeout)); + efl_network_base_timeout_set((Ecore_Con *)obj, timeout); } EOLIAN static double @@ -898,7 +889,7 @@ EAPI double ecore_con_client_timeout_get(const Ecore_Con *obj) { double ret; - return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_timeout_get()); + return efl_network_base_timeout_get((Ecore_Con *)obj); } EAPI void * @@ -950,7 +941,7 @@ EAPI const char * ecore_con_client_ip_get(const Ecore_Con *obj) { const char *ret; - return eo_do_ret(obj, ret, efl_network_base_ip_get()); + return efl_network_base_ip_get(obj); } EOLIAN static int @@ -978,7 +969,7 @@ EAPI int ecore_con_client_port_get(const Ecore_Con *obj) { int ret; - return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_port_get()); + return efl_network_base_port_get((Ecore_Con *)obj); } EOLIAN static double @@ -991,7 +982,7 @@ EAPI double ecore_con_client_uptime_get(const Ecore_Con *obj) { double ret; - return eo_do_ret(obj, ret, efl_network_base_uptime_get()); + return efl_network_base_uptime_get(obj); } EOLIAN static void @@ -1003,14 +994,14 @@ _efl_network_client_efl_network_base_flush(Eo *obj, Efl_Network_Client_Data *cl EAPI void ecore_con_client_flush(Ecore_Con *obj) { - eo_do((Ecore_Con *)obj, efl_network_base_flush()); + efl_network_base_flush((Ecore_Con *)obj); } EAPI int ecore_con_server_fd_get(const Ecore_Con *obj) { int ret; - return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_fd_get()); + return efl_network_base_fd_get((Ecore_Con *)obj); } EOLIAN static int @@ -1031,7 +1022,7 @@ EAPI int ecore_con_client_fd_get(const Ecore_Con *obj) { int ret; - return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_fd_get()); + return efl_network_base_fd_get((Ecore_Con *)obj); } /** @@ -1077,7 +1068,7 @@ ecore_con_event_server_add(Ecore_Con_Server *obj) if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE; ecore_event_add(ev, e, _ecore_con_event_server_add_free, NULL); - eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_CONNECTION_UPGRADED, NULL)); + eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_CONNECTION_UPGRADED, NULL); _ecore_con_event_count++; } @@ -1156,7 +1147,7 @@ ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num, Ecore_Con_Event_Data_Received event_info = { NULL, 0 }; event_info.data = e->data; event_info.size = e->size; - eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_DATA_RECEIVED, &event_info)); + eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_DATA_RECEIVED, &event_info); } _ecore_con_event_count++; } @@ -1181,7 +1172,7 @@ ecore_con_event_client_add(Ecore_Con_Client *obj) if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE; ecore_event_add(ev, e, (Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server); - eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_CONNECTION_UPGRADED, NULL)); + eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_CONNECTION_UPGRADED, NULL); _ecore_con_event_count++; } @@ -1263,7 +1254,7 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num, Ecore_Con_Event_Data_Received event_info = { NULL, 0 }; event_info.data = e->data; event_info.size = e->size; - eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_DATA_RECEIVED, &event_info)); + eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_DATA_RECEIVED, &event_info); } _ecore_con_event_count++; } @@ -1289,7 +1280,7 @@ _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool dupl DBG("%s", error); svr->event_count = eina_list_append(svr->event_count, e); ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL); - eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_CONNECTION_ERROR, e->error)); + eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_CONNECTION_ERROR, e->error); _ecore_con_event_count++; } @@ -1310,7 +1301,7 @@ ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error) cl->event_count = eina_list_append(cl->event_count, e); host_server->event_count = eina_list_append(host_server->event_count, e); ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server); - eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_CONNECTION_ERROR, e->error)); + eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_CONNECTION_ERROR, e->error); _ecore_con_event_count++; } @@ -1397,7 +1388,7 @@ _efl_network_server_eo_base_destructor(Eo *obj, Efl_Network_Server_Data *svr) servers = eina_list_remove(servers, obj); svr->data = NULL; - eo_do_super(obj, EFL_NETWORK_SERVER_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS)); end: return; } @@ -1460,7 +1451,7 @@ _efl_network_client_eo_base_destructor(Eo *obj, Efl_Network_Client_Data *cl) eina_stringshare_del(cl->ip); cl->data = NULL; - eo_do_super(obj, EFL_NETWORK_CLIENT_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, EFL_NETWORK_CLIENT_CLASS)); } static Eina_Bool diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c index 9720b5799f..800770c636 100644 --- a/src/lib/ecore_con/ecore_con_eet.c +++ b/src/lib/ecore_con/ecore_con_eet.c @@ -580,7 +580,7 @@ _ecore_con_eet_base_register(Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Data *pd, c EOLIAN static Eo_Base * _ecore_con_eet_server_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED) { - obj = eo_do_super_ret(obj, ECORE_CON_EET_SERVER_OBJ_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS)); if (!obj) return NULL; @@ -615,13 +615,13 @@ _ecore_con_eet_server_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Server_Obj_D ecore_event_handler_del(pd->handler_del); ecore_event_handler_del(pd->handler_data); - eo_do_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS)); } EOLIAN static Eo_Base * _ecore_con_eet_client_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED) { - obj = eo_do_super_ret(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS)); if (!obj) return NULL; @@ -654,13 +654,13 @@ _ecore_con_eet_client_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Client_Obj_D ecore_event_handler_del(pd->handler_del); ecore_event_handler_del(pd->handler_data); - eo_do_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS)); } EOLIAN static Eo_Base * _ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd) { - obj = eo_do_super_ret(obj, ECORE_CON_EET_BASE_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS)); if (!obj) return NULL; @@ -675,7 +675,7 @@ _ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd) EOLIAN static void _ecore_con_eet_base_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd) { - eo_do_super(obj, ECORE_CON_EET_BASE_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS)); eet_data_descriptor_free(pd->edd); eet_data_descriptor_free(pd->matching); @@ -722,8 +722,7 @@ ecore_con_eet_server_new(Ecore_Con_Server *server) if (!server) return NULL; - ece_obj = eo_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL, - ecore_con_eet_base_server_set(server)); + ece_obj = eo_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(eoid, server)); return ece_obj; } @@ -735,8 +734,7 @@ ecore_con_eet_client_new(Ecore_Con_Server *server) if (!server) return NULL; - ece_obj = eo_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL, - ecore_con_eet_base_server_set(server)); + ece_obj = eo_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(eoid, server)); return ece_obj; } @@ -750,31 +748,31 @@ ecore_con_eet_server_free(Ecore_Con_Eet *r) EAPI void ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd) { - eo_do(ece, ecore_con_eet_base_register(name, edd)); + ecore_con_eet_base_register(ece, name, edd); } EAPI void ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data) { - eo_do(ece, ecore_con_eet_base_data_callback_set(name, func, data)); + ecore_con_eet_base_data_callback_set(ece, name, func, data); } EAPI void ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name) { - eo_do(ece, ecore_con_eet_base_data_callback_del(name)); + ecore_con_eet_base_data_callback_del(ece, name); } EAPI void ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data) { - eo_do(ece, ecore_con_eet_base_raw_data_callback_set(name, func, data)); + ecore_con_eet_base_raw_data_callback_set(ece, name, func, data); } EAPI void ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name) { - eo_do(ece, ecore_con_eet_base_raw_data_callback_del(name)); + ecore_con_eet_base_raw_data_callback_del(ece, name); } EAPI void @@ -920,7 +918,7 @@ ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_S EAPI void ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data) { - eo_do(ece,eo_key_data_set(ECORE_CON_EET_DATA_KEY, data)); + eo_key_data_set(ece, ECORE_CON_EET_DATA_KEY, data); } EAPI const void * @@ -928,7 +926,7 @@ ecore_con_eet_data_get(Ecore_Con_Eet *ece) { const void *temp; - return eo_do_ret(ece, temp, eo_key_data_get(ECORE_CON_EET_DATA_KEY)); + return eo_key_data_get(ece, ECORE_CON_EET_DATA_KEY); } EAPI Ecore_Con_Eet * @@ -941,15 +939,13 @@ ecore_con_eet_reply(Ecore_Con_Reply *reply) EAPI void ecore_con_eet_send(Ecore_Con_Reply *reply, const char *name, void *value) { - eo_do(reply->ece, ecore_con_eet_base_send(reply, name, value)); + ecore_con_eet_base_send(reply->ece, reply, name, value); } EAPI void ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const char *section, void *value, unsigned int length) { - eo_do(reply->ece, - ecore_con_eet_base_raw_send(reply, protocol_name, section, value, - length)); + ecore_con_eet_base_raw_send(reply->ece, reply, protocol_name, section, value, length); } #include "ecore_con_eet_base.eo.c" diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c index 0b84b90d45..fd05522dd4 100644 --- a/src/lib/ecore_con/ecore_con_legacy.c +++ b/src/lib/ecore_con/ecore_con_legacy.c @@ -5,7 +5,7 @@ EAPI Eina_Bool ecore_con_url_url_set(Ecore_Con_Url *obj, const char *url) { Eina_Bool ret; - eo_do((Ecore_Con_Url *)obj, ret = efl_network_url_set(url)); + ret = efl_network_url_set((Ecore_Con_Url *)obj, url); return ret; } @@ -13,7 +13,7 @@ EAPI const char * ecore_con_url_url_get(const Ecore_Con_Url *obj) { const char * ret; - eo_do((Ecore_Con_Url *)obj, ret = efl_network_url_get()); + ret = efl_network_url_get((Ecore_Con_Url *)obj); return ret; } diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c index 049d4f2a7e..000bf4d016 100644 --- a/src/lib/ecore_con/ecore_con_url.c +++ b/src/lib/ecore_con/ecore_con_url.c @@ -225,12 +225,9 @@ EAPI Ecore_Con_Url * ecore_con_url_new(const char *url) { Ecore_Con_Url *url_obj; - url_obj = eo_add(EFL_NETWORK_URL_CLASS, NULL, - efl_network_url_set(url)); + url_obj = eo_add(EFL_NETWORK_URL_CLASS, NULL, efl_network_url_set(eoid, url)); - eo_do(url_obj, - eo_event_callback_array_add(efl_network_url_event_table_callbacks(), - NULL)); + eo_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(), NULL); return url_obj; } @@ -238,7 +235,7 @@ ecore_con_url_new(const char *url) EOLIAN static Eo * _efl_network_url_eo_base_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con EINA_UNUSED) { - url_obj = eo_do_super_ret(url_obj, MY_CLASS, url_obj, eo_constructor()); + url_obj = eo_constructor(eo_super(url_obj, MY_CLASS)); if (!_init_count || !_c_init()) { @@ -338,7 +335,7 @@ _efl_network_url_eo_base_finalize(Efl_Network_Url *url_obj, Efl_Network_Url_Data */ _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_CONNECTTIMEOUT, 30); _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_FOLLOWLOCATION, 1); - return eo_do_super_ret(url_obj, MY_CLASS, url_obj, eo_finalize()); + return eo_finalize(eo_super(url_obj, MY_CLASS)); } EAPI Ecore_Con_Url * @@ -375,9 +372,7 @@ ecore_con_url_free(Ecore_Con_Url *url_obj) if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS)) return; - eo_do(url_obj, - eo_event_callback_array_del(efl_network_url_event_table_callbacks(), - NULL)); + eo_event_callback_array_del(url_obj, efl_network_url_event_table_callbacks(), NULL); eo_del(url_obj); } @@ -400,7 +395,7 @@ _ecore_con_url_free_internal(Ecore_Con_Url *url_obj) EOLIAN static void _efl_network_url_eo_base_destructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con) { - eo_do_super(url_obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(url_obj, MY_CLASS)); if (!_c) return; if (url_con->curl_easy) @@ -1145,7 +1140,7 @@ _ecore_con_url_event_url_complete(Ecore_Con_Url *url_obj, CURLMsg *curlmsg) e.status = status; e.url_con = url_obj; url_con->event_count++; - eo_do(url_obj, eo_event_callback_call(EFL_NETWORK_URL_EVENT_COMPLETE, &e)); + eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e); } static void @@ -1206,7 +1201,7 @@ _ecore_con_url_data_cb(void *buffer, size_t size, size_t nitems, void *userp) e.size = real_size; e.data = buffer; url_con->event_count++; - eo_do(url_obj, eo_event_callback_call(EFL_NETWORK_URL_EVENT_DATA, &e)); + eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e); } else { @@ -1265,7 +1260,7 @@ _ecore_con_url_progress_cb(void *clientp, double dltotal, double dlnow, double u e.up.total = ultotal; e.up.now = ulnow; url_con->event_count++; - eo_do(url_obj, eo_event_callback_call(EFL_NETWORK_URL_EVENT_PROGRESS, &e)); + eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e); return 0; } diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index 7b5a3a5851..2a135f95b5 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c @@ -3087,7 +3087,7 @@ ecore_evas_animator_tick(Ecore_Evas *ee, Eina_Rectangle *viewport) a.update_area = *viewport; } - eo_do(ee->evas, eo_event_callback_call(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, &a)); + eo_event_callback_call(ee->evas, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, &a); // FIXME: We do not support partial animator in the subcanvas EINA_LIST_FOREACH(ee->sub_ecore_evas, l, subee) @@ -3219,7 +3219,7 @@ _ecore_evas_register(Ecore_Evas *ee) ecore_evases = (Ecore_Evas *)eina_inlist_prepend (EINA_INLIST_GET(ecore_evases), EINA_INLIST_GET(ee)); - eo_do(ee->evas, eo_event_callback_array_add(animator_watch(), ee)); + eo_event_callback_array_add(ee->evas, animator_watch(), ee); #ifdef RENDER_SYNC ecore_evas_first = EINA_TRUE; diff --git a/src/lib/ector/cairo/ector_cairo_private.h b/src/lib/ector/cairo/ector_cairo_private.h index 4b9ac0cdc5..1b38e34cff 100644 --- a/src/lib/ector/cairo/ector_cairo_private.h +++ b/src/lib/ector/cairo/ector_cairo_private.h @@ -65,7 +65,7 @@ _ector_cairo_symbol_get(Ector_Renderer_Generic_Base_Data *base, { void *sym; - eo_do(base->surface, sym = ector_cairo_surface_symbol_get(name)); + sym = ector_cairo_surface_symbol_get(base->surface, name); return sym; } diff --git a/src/lib/ector/cairo/ector_cairo_software_surface.c b/src/lib/ector/cairo/ector_cairo_software_surface.c index ef4100f561..2ce001e9f4 100644 --- a/src/lib/ector/cairo/ector_cairo_software_surface.c +++ b/src/lib/ector/cairo/ector_cairo_software_surface.c @@ -18,8 +18,7 @@ _ector_cairo_symbol_get(Eo *ector_surface, const char *name) { void *sym; - eo_do(ector_surface, - sym = ector_cairo_surface_symbol_get(name)); + sym = ector_cairo_surface_symbol_get(ector_surface, name); return sym; } @@ -74,9 +73,7 @@ _ector_cairo_software_surface_ector_generic_buffer_pixels_set(Eo *obj, Ector_Cai cairo_surface_destroy(pd->surface); pd->surface = NULL; - eo_do_super(obj, MY_CLASS, - ok = ector_buffer_pixels_set(pixels, width, height, stride, - cspace, writable, l, r, t, b)); + ok = ector_buffer_pixels_set(eo_super(obj, MY_CLASS), pixels, width, height, stride, cspace, writable, l, r, t, b); if (ok && pixels) { @@ -90,7 +87,7 @@ _ector_cairo_software_surface_ector_generic_buffer_pixels_set(Eo *obj, Ector_Cai end: /* evas_common_cpu_end_opt(); // do we need this? */ - eo_do(obj, ector_cairo_surface_context_set(ctx)); + ector_cairo_surface_context_set(obj, ctx); return ok; } @@ -105,7 +102,7 @@ _ector_cairo_software_surface_surface_get(Eo *obj EINA_UNUSED, Ector_Cairo_Softw static Eo_Base * _ector_cairo_software_surface_eo_base_constructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd) { - eo_do_super(obj, MY_CLASS, obj = eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); if (!obj) return NULL; pd->base = eo_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); @@ -118,7 +115,7 @@ EOLIAN static void _ector_cairo_software_surface_eo_base_destructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd) { eo_data_unref(obj, pd->base); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } #include "ector_cairo_software_surface.eo.c" diff --git a/src/lib/ector/cairo/ector_cairo_surface.c b/src/lib/ector/cairo/ector_cairo_surface.c index 12538e7763..3cc47e3460 100644 --- a/src/lib/ector/cairo/ector_cairo_surface.c +++ b/src/lib/ector/cairo/ector_cairo_surface.c @@ -62,14 +62,11 @@ _ector_cairo_surface_ector_generic_surface_renderer_factory_new(Eo *obj, const Eo_Class *type) { if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN) - return eo_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, - ector_renderer_surface_set(obj)); + return eo_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN) - return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, NULL, - ector_renderer_surface_set(obj)); + return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN) - return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, NULL, - ector_renderer_surface_set(obj)); + return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); ERR("Couldn't find class for type: %s\n", eo_class_name_get(type)); return NULL; @@ -124,7 +121,7 @@ _ector_cairo_surface_eo_base_constructor(Eo *obj, USE(obj, cairo_image_surface_create, NULL); USE(obj, cairo_create, NULL); - eo_do_super(obj, ECTOR_CAIRO_SURFACE_CLASS, obj = eo_constructor()); + obj = eo_constructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS)); if (!obj) return NULL; _cairo_count++; @@ -138,7 +135,7 @@ static void _ector_cairo_surface_eo_base_destructor(Eo *obj EINA_UNUSED, Ector_Cairo_Surface_Data *pd EINA_UNUSED) { - eo_do_super(obj, ECTOR_CAIRO_SURFACE_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS)); if (--_cairo_count) return ; if (_cairo_so) eina_module_free(_cairo_so); diff --git a/src/lib/ector/cairo/ector_renderer_cairo_base.c b/src/lib/ector/cairo/ector_renderer_cairo_base.c index 24acfa071e..1afc3d587f 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_base.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_base.c @@ -182,7 +182,7 @@ _ector_renderer_cairo_base_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED, static Eo * _ector_renderer_cairo_base_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Base_Data *pd EINA_UNUSED) { - eo_do_super(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS, obj = eo_constructor()); + obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS)); if (!obj) return NULL; pd->generic = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); @@ -193,7 +193,7 @@ _ector_renderer_cairo_base_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Bas static Eo_Base * _ector_renderer_cairo_base_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Base_Data *pd) { - eo_do_super(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS, obj = eo_finalize()); + obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS)); if (!obj) return NULL; USE(pd->generic, cairo_matrix_init, NULL); @@ -223,7 +223,7 @@ _ector_renderer_cairo_base_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Base free(pd->m); - eo_do_super(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS)); } #include "ector_renderer_cairo_base.eo.c" diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c index 21ec2c3053..1d9c72da78 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c @@ -48,7 +48,7 @@ static Eina_Bool _ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_Cairo_Gradient_Linear_Data *pd) { - eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, ector_renderer_prepare()); + ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS)); if (!pd->parent) { @@ -78,7 +78,7 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_draw(Eo *obj, pat = _ector_renderer_cairo_gradient_linear_prepare(obj, gld, gd, mul_col); if (!pat) return EINA_FALSE; - eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, ector_renderer_draw(op, clips, mul_col)); + ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS), op, clips, mul_col); cairo_rectangle(pd->parent->cairo, gld->start.x, gld->start.y, gld->end.x - gld->start.x, @@ -134,7 +134,7 @@ _ector_renderer_cairo_gradient_linear_eo_base_finalize(Eo *obj, Ector_Renderer_C { Ector_Renderer_Generic_Base_Data *base; - eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, obj = eo_finalize()); + obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS)); if (!obj) return NULL; base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); @@ -161,7 +161,7 @@ _ector_renderer_cairo_gradient_linear_eo_base_destructor(Eo *obj, base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); eo_data_xunref(base->surface, pd->parent, obj); - eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS)); } static void @@ -170,8 +170,7 @@ _ector_renderer_cairo_gradient_linear_efl_gfx_gradient_base_stop_set(Eo *obj, const Efl_Gfx_Gradient_Stop *colors, unsigned int length) { - eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, - efl_gfx_gradient_stop_set(colors, length)); + efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS), colors, length); } static unsigned int @@ -181,8 +180,7 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_crc_get(Eo *ob Ector_Renderer_Generic_Gradient_Data *gd; unsigned int crc; - eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, - crc = ector_renderer_crc_get()); + crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS)); gld = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN); gd = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN); diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c index 6c4906c4ea..b075f886b2 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c @@ -34,7 +34,7 @@ struct _Ector_Renderer_Cairo_Gradient_Radial_Data static Eina_Bool _ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd) { - eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, ector_renderer_prepare()); + ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS)); if (!pd->parent) { @@ -82,7 +82,7 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_draw(Eo *obj, pat = _ector_renderer_cairo_gradient_radial_prepare(obj, grd, gd, mul_col); if (!pat) return EINA_FALSE; - eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, ector_renderer_draw(op, clips, mul_col)); + ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS), op, clips, mul_col); cairo_arc(pd->parent->cairo, grd->radial.x, grd->radial.y, @@ -139,7 +139,7 @@ _ector_renderer_cairo_gradient_radial_eo_base_finalize(Eo *obj, Ector_Renderer_C { Ector_Renderer_Generic_Base_Data *base; - eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, obj = eo_finalize()); + obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS)); if (!obj) return NULL; base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); @@ -165,7 +165,7 @@ _ector_renderer_cairo_gradient_radial_eo_base_destructor(Eo *obj, base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); eo_data_xunref(base->surface, pd->parent, obj); - eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS)); } static void @@ -174,8 +174,7 @@ _ector_renderer_cairo_gradient_radial_efl_gfx_gradient_base_stop_set(Eo *obj, const Efl_Gfx_Gradient_Stop *colors, unsigned int length) { - eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, - efl_gfx_gradient_stop_set(colors, length)); + efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS), colors, length); } static unsigned int @@ -185,8 +184,7 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_crc_get(Eo *ob Ector_Renderer_Generic_Gradient_Data *gd; unsigned int crc; - eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, - crc = ector_renderer_crc_get()); + crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS)); grd = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN); gd = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN); diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c index 2292155425..99e3016b87 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c @@ -92,14 +92,14 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_prepare(Eo *obj, Ector_R const Efl_Gfx_Path_Command *cmds = NULL; const double *pts = NULL; - eo_do_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, ector_renderer_prepare()); + ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS)); if (pd->shape->fill) - eo_do(pd->shape->fill, ector_renderer_prepare()); + ector_renderer_prepare(pd->shape->fill); if (pd->shape->stroke.fill) - eo_do(pd->shape->stroke.fill, ector_renderer_prepare()); + ector_renderer_prepare(pd->shape->stroke.fill); if (pd->shape->stroke.marker) - eo_do(pd->shape->stroke.marker, ector_renderer_prepare()); + ector_renderer_prepare(pd->shape->stroke.marker); // shouldn't that be moved to the cairo base object if (!pd->parent) @@ -110,7 +110,7 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_prepare(Eo *obj, Ector_R pd->parent = eo_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj); } - eo_do(obj, efl_gfx_shape_path_get(&cmds, &pts)); + efl_gfx_shape_path_get(obj, &cmds, &pts); if (!pd->path && cmds) { cairo_new_path(pd->parent->cairo); @@ -163,26 +163,26 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Rend cairo_save(pd->parent->cairo); - eo_do_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, ector_renderer_draw(op, clips, mul_col)); + ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS), op, clips, mul_col); cairo_new_path(pd->parent->cairo); cairo_append_path(pd->parent->cairo, pd->path); - eo_do(obj, fill_rule = efl_gfx_shape_fill_rule_get()); + fill_rule = efl_gfx_shape_fill_rule_get(obj); if (fill_rule == EFL_GFX_FILL_RULE_ODD_EVEN) cairo_set_fill_rule(pd->parent->cairo, CAIRO_FILL_RULE_EVEN_ODD); else cairo_set_fill_rule(pd->parent->cairo, CAIRO_FILL_RULE_WINDING); if (pd->shape->fill) - eo_do(pd->shape->fill, ector_renderer_cairo_base_fill(mul_col)); + ector_renderer_cairo_base_fill(pd->shape->fill, mul_col); if (pd->shape->stroke.fill || pd->public_shape->stroke.color.a > 0) { cairo_fill_preserve(pd->parent->cairo); if (pd->shape->stroke.fill) - eo_do(pd->shape->stroke.fill, ector_renderer_cairo_base_fill(mul_col)); + ector_renderer_cairo_base_fill(pd->shape->stroke.fill, mul_col); else { r = (((pd->public_shape->stroke.color.r * R_VAL(&mul_col)) + 0xff) >> 8); @@ -240,7 +240,7 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_bounds_get(Eo *obj, Ector_Renderer_Cairo_Base_Data *bd; // FIXME: It should be possible to actually ask cairo about that - eo_do(obj, efl_gfx_shape_bounds_get(r)); + efl_gfx_shape_bounds_get(obj, r); bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS); r->x += bd->generic->origin.x; @@ -250,7 +250,7 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_bounds_get(Eo *obj, Eo * _ector_renderer_cairo_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd) { - eo_do_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, obj = eo_constructor()); + obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS)); if (!obj) return NULL; @@ -258,8 +258,7 @@ _ector_renderer_cairo_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Sh pd->shape = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_SHAPE_MIXIN, obj); pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); - eo_do(obj, - eo_event_callback_add(EFL_GFX_PATH_CHANGED, _ector_renderer_cairo_shape_path_changed, pd)); + eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_cairo_shape_path_changed, pd); return obj; } @@ -267,7 +266,7 @@ _ector_renderer_cairo_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Sh static Eo_Base * _ector_renderer_cairo_shape_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd) { - eo_do_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, obj = eo_finalize()); + obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS)); if (!obj) return NULL; USE(pd->base, cairo_path_destroy, NULL); @@ -300,7 +299,7 @@ _ector_renderer_cairo_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Sha //FIXME, As base class destructor can't call destructor of mixin class. // call explicit API to free shape data. - eo_do(obj, efl_gfx_shape_reset()); + efl_gfx_shape_reset(obj); base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); eo_data_xunref(base->surface, pd->parent, obj); @@ -308,7 +307,7 @@ _ector_renderer_cairo_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Sha eo_data_xunref(obj, pd->shape, obj); eo_data_xunref(obj, pd->base, obj); - eo_do_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS)); if (pd->path) cairo_path_destroy(pd->path); } @@ -319,8 +318,7 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_crc_get(Eo *obj, { unsigned int crc; - eo_do_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, - crc = ector_renderer_crc_get()); + crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS)); crc = eina_crc((void*) &pd->shape->stroke.marker, sizeof (pd->shape->stroke.marker), crc, EINA_FALSE); crc = eina_crc((void*) &pd->public_shape->stroke.scale, sizeof (pd->public_shape->stroke.scale) * 3, crc, EINA_FALSE); // scale, width, centered diff --git a/src/lib/ector/ector_private.h b/src/lib/ector/ector_private.h index 7278566427..013b1de9be 100644 --- a/src/lib/ector/ector_private.h +++ b/src/lib/ector/ector_private.h @@ -134,7 +134,7 @@ _renderer_crc_get(Eo *obj, unsigned int crc) { unsigned int id; - eo_do(obj, id = ector_renderer_crc_get()); + id = ector_renderer_crc_get(obj); crc = eina_crc((void*) &id, sizeof (id), crc, EINA_FALSE); return crc; } diff --git a/src/lib/ector/ector_renderer_generic_base.c b/src/lib/ector/ector_renderer_generic_base.c index 66423bff9a..085d945677 100644 --- a/src/lib/ector/ector_renderer_generic_base.c +++ b/src/lib/ector/ector_renderer_generic_base.c @@ -15,7 +15,7 @@ _ector_renderer_generic_base_eo_base_destructor(Eo *obj, Ector_Renderer_Generic_ if (pd->m) free(pd->m); eo_unref(pd->surface); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } static Eo_Base * @@ -27,7 +27,7 @@ _ector_renderer_generic_base_eo_base_finalize(Eo *obj, Ector_Renderer_Generic_Ba return NULL; } pd->finalized = EINA_TRUE; - return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); + return eo_finalize(eo_super(obj, MY_CLASS)); } static Ector_Generic_Surface * @@ -163,7 +163,7 @@ _ector_renderer_generic_base_prepare(Eo *obj EINA_UNUSED, Ector_Renderer_Generic_Base_Data *pd) { if (pd->mask) - eo_do(pd->mask, ector_renderer_prepare()); + ector_renderer_prepare(pd->mask); return EINA_TRUE; } diff --git a/src/lib/ector/ector_renderer_generic_buffer.c b/src/lib/ector/ector_renderer_generic_buffer.c index 0814dedfc9..5359970867 100644 --- a/src/lib/ector/ector_renderer_generic_buffer.c +++ b/src/lib/ector/ector_renderer_generic_buffer.c @@ -59,7 +59,7 @@ _ector_renderer_generic_buffer_eo_base_constructor(Eo *obj, Ector_Renderer_Gener { Eo_Base *ret; - eo_do_super(obj, MY_CLASS, ret = eo_constructor()); + ret = eo_constructor(eo_super(obj, MY_CLASS)); pd->fill.spread = EFL_GFX_FILL_REPEAT; return ret; diff --git a/src/lib/ector/gl/ector_gl_surface.c b/src/lib/ector/gl/ector_gl_surface.c index 14302e3bf4..2ad665306b 100644 --- a/src/lib/ector/gl/ector_gl_surface.c +++ b/src/lib/ector/gl/ector_gl_surface.c @@ -45,14 +45,11 @@ _ector_gl_surface_ector_generic_surface_renderer_factory_new(Eo *obj, const Eo_Class *type) { if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN) - return eo_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, - ector_renderer_surface_set(obj)); + return eo_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN) - return eo_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, - ector_renderer_surface_set(obj)); + return eo_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN) - return eo_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, - ector_renderer_surface_set(obj)); + return eo_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); ERR("Couldn't find class for type: %s\n", eo_class_name_get(type)); return NULL; @@ -77,7 +74,7 @@ _ector_gl_surface_push(Eo *obj, { unsigned int prog; - eo_do(obj, prog = ector_gl_surface_shader_get(flags)); + prog = ector_gl_surface_shader_get(obj, flags); // FIXME: Not using mapp/unmap buffer yet, nor any pipe // FIXME: Move some of the state change to surface drawing start ? @@ -328,7 +325,7 @@ _ector_gl_surface_shader_get(Eo *obj EINA_UNUSED, Ector_GL_Surface_Data *pd EINA static void _ector_gl_surface_eo_base_destructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UNUSED) { - eo_do_super(obj, ECTOR_GL_SURFACE_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS)); eina_hash_free(shader_cache); shader_cache = NULL; @@ -341,7 +338,7 @@ _ector_gl_surface_eo_base_constructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UN { Eina_Strbuf *file_path = NULL; - eo_do_super(obj, ECTOR_GL_SURFACE_CLASS, obj = eo_constructor()); + obj = eo_constructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS)); if (!obj) return NULL; if (shader_cache) return obj; diff --git a/src/lib/ector/gl/ector_renderer_gl_base.c b/src/lib/ector/gl/ector_renderer_gl_base.c index a659d3dfb6..75829cf576 100644 --- a/src/lib/ector/gl/ector_renderer_gl_base.c +++ b/src/lib/ector/gl/ector_renderer_gl_base.c @@ -31,8 +31,7 @@ _ector_renderer_gl_base_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED, { Eina_Bool r; - eo_do(pd->base->surface, - r = ector_gl_surface_state_define(op, clips)); + r = ector_gl_surface_state_define(pd->base->surface, op, clips); return r; } @@ -40,7 +39,7 @@ _ector_renderer_gl_base_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED, static Eo_Base * _ector_renderer_gl_base_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Base_Data *pd) { - eo_do_super(obj, ECTOR_RENDERER_GL_BASE_CLASS, obj = eo_constructor()); + obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_BASE_CLASS)); if (!obj) return NULL; pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c index 6920ac1ad1..5bff84437e 100644 --- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c +++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c @@ -31,8 +31,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_generic_base_prepare(Eo *obj, static Eina_Bool _ector_renderer_gl_gradient_linear_ector_renderer_generic_base_draw(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col) { - eo_do_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, - ector_renderer_draw(op, clips, mul_col)); + ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), op, clips, mul_col); // FIXME: draw something ! (void) pd; @@ -70,7 +69,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_gl_base_fill(Eo *obj, Ector_Re static Eo_Base * _ector_renderer_gl_gradient_linear_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd) { - eo_do_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, obj = eo_constructor()); + obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS)); if (!obj) return NULL; @@ -92,8 +91,7 @@ _ector_renderer_gl_gradient_linear_eo_base_destructor(Eo *obj, Ector_Renderer_GL static void _ector_renderer_gl_gradient_linear_efl_gfx_gradient_base_stop_set(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd EINA_UNUSED, const Efl_Gfx_Gradient_Stop *colors, unsigned int length) { - eo_do_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, - efl_gfx_gradient_stop_set(colors, length)); + efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), colors, length); } static unsigned int @@ -101,8 +99,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_generic_base_crc_get(Eo *obj, { unsigned int crc; - eo_do_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, - crc = ector_renderer_crc_get()); + crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS)); crc = eina_crc((void*) pd->gradient->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); if (pd->gradient->colors_count) diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c index 9d7d65c886..9ba402fc60 100644 --- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c +++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c @@ -30,8 +30,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_generic_base_prepare(Eo *obj, static Eina_Bool _ector_renderer_gl_gradient_radial_ector_renderer_generic_base_draw(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col) { - eo_do_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, - ector_renderer_draw(op, clips, mul_col)); + ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), op, clips, mul_col); // FIXME: draw something ! (void) pd; @@ -70,8 +69,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_generic_base_crc_get(Eo *obj, { unsigned int crc; - eo_do_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, - crc = ector_renderer_crc_get()); + crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS)); crc = eina_crc((void*) pd->gradient->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); if (pd->gradient->colors_count) @@ -84,7 +82,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_generic_base_crc_get(Eo *obj, static Eo_Base * _ector_renderer_gl_gradient_radial_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd) { - eo_do_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, obj = eo_constructor()); + obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS)); if (!obj) return NULL; @@ -106,8 +104,7 @@ _ector_renderer_gl_gradient_radial_eo_base_destructor(Eo *obj, Ector_Renderer_GL static void _ector_renderer_gl_gradient_radial_efl_gfx_gradient_base_stop_set(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd EINA_UNUSED, const Efl_Gfx_Gradient_Stop *colors, unsigned int length) { - eo_do_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, - efl_gfx_gradient_stop_set(colors, length)); + efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), colors, length); } #include "ector_renderer_gl_gradient_radial.eo.c" diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.c b/src/lib/ector/gl/ector_renderer_gl_shape.c index b0927128cd..59aaadf057 100644 --- a/src/lib/ector/gl/ector_renderer_gl_shape.c +++ b/src/lib/ector/gl/ector_renderer_gl_shape.c @@ -39,9 +39,9 @@ _ector_renderer_gl_shape_ector_renderer_generic_base_prepare(Eo *obj, Ector_Rend if (pd->vertex) return EINA_TRUE; - eo_do_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS, r = ector_renderer_prepare()); + r = ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS)); - eo_do(obj, ector_renderer_bounds_get(&bounding_box)); + ector_renderer_bounds_get(obj, &bounding_box); pd->vertex = malloc(sizeof (GLshort) * 6 * 3); @@ -74,7 +74,7 @@ _ector_renderer_gl_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Rendere { uint64_t flags = 0; - eo_do_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS, ector_renderer_draw(op, clips, mul_col)); + ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS), op, clips, mul_col); // FIXME: adjust flags content correctly // FIXME: should not ignore clips (idea is that the geometry will be cliped here and the @@ -82,12 +82,11 @@ _ector_renderer_gl_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Rendere if (pd->shape->fill) { - eo_do(pd->shape->fill, ector_renderer_gl_base_fill(flags, pd->vertex, 6, mul_col)); + ector_renderer_gl_base_fill(pd->shape->fill, flags, pd->vertex, 6, mul_col); } else { - eo_do(pd->base->surface, - ector_gl_surface_push(flags, pd->vertex, 6, mul_col)); + ector_gl_surface_push(pd->base->surface, flags, pd->vertex, 6, mul_col); } return EINA_TRUE; @@ -110,7 +109,7 @@ _ector_renderer_gl_shape_ector_renderer_gl_base_fill(Eo *obj EINA_UNUSED, static void _ector_renderer_gl_shape_ector_renderer_generic_base_bounds_get(Eo *obj, Ector_Renderer_GL_Shape_Data *pd, Eina_Rectangle *r) { - eo_do(obj, efl_gfx_shape_bounds_get(r)); + efl_gfx_shape_bounds_get(obj, r); r->x += pd->base->origin.x; r->y += pd->base->origin.y; @@ -121,8 +120,7 @@ _ector_renderer_gl_shape_ector_renderer_generic_base_crc_get(Eo *obj, Ector_Rend { unsigned int crc; - eo_do_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS, - crc = ector_renderer_crc_get()); + crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS)); // This code should be shared with other implementation crc = eina_crc((void*) &pd->shape->stroke.marker, sizeof (pd->shape->stroke.marker), crc, EINA_FALSE); @@ -145,7 +143,7 @@ _ector_renderer_gl_shape_ector_renderer_generic_base_crc_get(Eo *obj, Ector_Rend static Eo_Base * _ector_renderer_gl_shape_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Shape_Data *pd) { - eo_do_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS, obj = eo_constructor()); + obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS)); if (!obj) return NULL; @@ -153,8 +151,7 @@ _ector_renderer_gl_shape_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Shape_Da pd->shape = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_SHAPE_MIXIN, obj); pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); - eo_do(obj, - eo_event_callback_add(EFL_GFX_PATH_CHANGED, _ector_renderer_gl_shape_path_changed, pd)); + eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_gl_shape_path_changed, pd); return obj; } diff --git a/src/lib/ector/software/ector_renderer_software_buffer.c b/src/lib/ector/software/ector_renderer_software_buffer.c index cfd13c0aa0..d07c1971b1 100644 --- a/src/lib/ector/software/ector_renderer_software_buffer.c +++ b/src/lib/ector/software/ector_renderer_software_buffer.c @@ -54,7 +54,7 @@ _ector_renderer_software_buffer_ector_renderer_generic_base_crc_get(Eo *obj, Ect Ector_Software_Buffer_Base_Data *buffer = eo_data_scope_get(pd->eo_buffer, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); unsigned int crc; - eo_do_super(obj, MY_CLASS, crc = ector_renderer_crc_get()); + crc = ector_renderer_crc_get(eo_super(obj, MY_CLASS)); crc = eina_crc((const char *) buffer, sizeof(*buffer), crc, EINA_FALSE); if (pd->surface) crc = eina_crc((const char *) pd->surface, sizeof(*pd->surface), crc, EINA_FALSE); @@ -66,7 +66,7 @@ EOLIAN static void _ector_renderer_software_buffer_eo_base_destructor(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd) { eo_data_xunref(pd->base->surface, pd->surface, obj); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } #include "ector_renderer_software_buffer.eo.c" diff --git a/src/lib/ector/software/ector_renderer_software_gradient_linear.c b/src/lib/ector/software/ector_renderer_software_gradient_linear.c index 3a35a08a5f..46ec2e5bf7 100644 --- a/src/lib/ector/software/ector_renderer_software_gradient_linear.c +++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.c @@ -66,7 +66,7 @@ static Eo * _ector_renderer_software_gradient_linear_eo_base_constructor(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd) { - obj = eo_do_super_ret(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS)); if (!obj) return NULL; pd->gd = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN, obj); @@ -89,14 +89,13 @@ _ector_renderer_software_gradient_linear_eo_base_destructor(Eo *obj, eo_data_xunref(obj, pd->gd, obj); eo_data_xunref(obj, pd->gld, obj); - eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS)); } void _ector_renderer_software_gradient_linear_efl_gfx_gradient_base_stop_set(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd, const Efl_Gfx_Gradient_Stop *colors, unsigned int length) { - eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, - efl_gfx_gradient_stop_set(colors, length)); + efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS), colors, length); destroy_color_table(pd); } @@ -106,8 +105,7 @@ _ector_renderer_software_gradient_linear_ector_renderer_generic_base_crc_get(Eo { unsigned int crc; - eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, - crc = ector_renderer_crc_get()); + crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS)); crc = eina_crc((void*) pd->gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); if (pd->gd->colors_count) diff --git a/src/lib/ector/software/ector_renderer_software_gradient_radial.c b/src/lib/ector/software/ector_renderer_software_gradient_radial.c index 6f7f5dd3b2..64d0a9df1f 100644 --- a/src/lib/ector/software/ector_renderer_software_gradient_radial.c +++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.c @@ -76,7 +76,7 @@ Eo * _ector_renderer_software_gradient_radial_eo_base_constructor(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd) { - obj = eo_do_super_ret(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS)); pd->gd = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN, obj); pd->gld = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN, obj); @@ -97,14 +97,13 @@ _ector_renderer_software_gradient_radial_eo_base_destructor(Eo *obj, eo_data_xunref(obj, pd->gd, obj); eo_data_xunref(obj, pd->gld, obj); - eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS)); } void _ector_renderer_software_gradient_radial_efl_gfx_gradient_base_stop_set(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd, const Efl_Gfx_Gradient_Stop *colors, unsigned int length) { - eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, - efl_gfx_gradient_stop_set(colors, length)); + efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS), colors, length); destroy_color_table(pd); } @@ -114,8 +113,7 @@ _ector_renderer_software_gradient_radial_ector_renderer_generic_base_crc_get(Eo { unsigned int crc; - eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, - crc = ector_renderer_crc_get()); + crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS)); crc = eina_crc((void*) pd->gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); if (pd->gd->colors_count) diff --git a/src/lib/ector/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c index beaf043da8..978ccaae5d 100644 --- a/src/lib/ector/software/ector_renderer_software_shape.c +++ b/src/lib/ector/software/ector_renderer_software_shape.c @@ -520,9 +520,8 @@ _update_rle(Eo *obj, Ector_Renderer_Software_Shape_Data *pd) Efl_Gfx_Fill_Rule fill_rule; Outline *outline, *dash_outline; - eo_do(obj, - efl_gfx_shape_path_get(&cmds, &pts), - fill_rule = efl_gfx_shape_fill_rule_get()); + efl_gfx_shape_path_get(obj, &cmds, &pts); + fill_rule = efl_gfx_shape_fill_rule_get(obj); if (cmds && (_generate_stroke_data(pd) || _generate_shape_data(pd))) { outline = _outline_create(); @@ -577,11 +576,11 @@ _ector_renderer_software_shape_ector_renderer_generic_base_prepare(Eo *obj, { // FIXME: shouldn't that be part of the shape generic implementation ? if (pd->shape->fill) - eo_do(pd->shape->fill, ector_renderer_prepare()); + ector_renderer_prepare(pd->shape->fill); if (pd->shape->stroke.fill) - eo_do(pd->shape->stroke.fill, ector_renderer_prepare()); + ector_renderer_prepare(pd->shape->stroke.fill); if (pd->shape->stroke.marker) - eo_do(pd->shape->stroke.marker, ector_renderer_prepare()); + ector_renderer_prepare(pd->shape->stroke.marker); // shouldn't that be moved to the software base object if (!pd->surface) @@ -611,7 +610,7 @@ _ector_renderer_software_shape_ector_renderer_generic_base_draw(Eo *obj, if (pd->shape->fill) { - eo_do(pd->shape->fill, ector_renderer_software_base_fill()); + ector_renderer_software_base_fill(pd->shape->fill); ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer, x, y, mul_col, op, pd->shape_data); @@ -633,7 +632,7 @@ _ector_renderer_software_shape_ector_renderer_generic_base_draw(Eo *obj, if (pd->shape->stroke.fill) { - eo_do(pd->shape->stroke.fill, ector_renderer_software_base_fill()); + ector_renderer_software_base_fill(pd->shape->stroke.fill); ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer, x, y, mul_col, op, pd->outline_data); @@ -676,7 +675,7 @@ _ector_renderer_software_shape_efl_gfx_shape_path_set(Eo *obj, pd->shape_data = NULL; pd->outline_data = NULL; - eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, efl_gfx_shape_path_set(op, points)); + efl_gfx_shape_path_set(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS), op, points); } @@ -697,14 +696,13 @@ _ector_renderer_software_shape_path_changed(void *data, const Eo_Event *event EI static Eo * _ector_renderer_software_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Software_Shape_Data *pd) { - eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, obj = eo_constructor()); + obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS)); if (!obj) return NULL; pd->public_shape = eo_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj); pd->shape = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_SHAPE_MIXIN, obj); pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); - eo_do(obj, - eo_event_callback_add(EFL_GFX_PATH_CHANGED, _ector_renderer_software_shape_path_changed, pd)); + eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_software_shape_path_changed, pd); return obj; } @@ -714,7 +712,7 @@ _ector_renderer_software_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Softwa { //FIXME, As base class destructor can't call destructor of mixin class. // call explicit API to free shape data. - eo_do(obj, efl_gfx_shape_reset()); + efl_gfx_shape_reset(obj); if (pd->shape_data) ector_software_rasterizer_destroy_rle_data(pd->shape_data); if (pd->outline_data) ector_software_rasterizer_destroy_rle_data(pd->outline_data); @@ -722,7 +720,7 @@ _ector_renderer_software_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Softwa eo_data_xunref(pd->base->surface, pd->surface, obj); eo_data_xunref(obj, pd->shape, obj); eo_data_xunref(obj, pd->base, obj); - eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS)); } @@ -732,7 +730,7 @@ _ector_renderer_software_shape_ector_renderer_generic_base_crc_get(Eo *obj, { unsigned int crc; - eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, crc = ector_renderer_crc_get()); + crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS)); crc = eina_crc((void*) &pd->shape->stroke.marker, sizeof (pd->shape->stroke.marker), diff --git a/src/lib/ector/software/ector_software_buffer.c b/src/lib/ector/software/ector_software_buffer.c index b846761de1..ecbac54373 100644 --- a/src/lib/ector/software/ector_software_buffer.c +++ b/src/lib/ector/software/ector_software_buffer.c @@ -69,7 +69,7 @@ _ector_software_buffer_base_pixels_clear(Eo *obj, Ector_Software_Buffer_Base_Dat return; } - eo_do(obj, eo_event_callback_call(ECTOR_GENERIC_BUFFER_EVENT_DETACHED, pd->pixels.u8)); + eo_event_callback_call(obj, ECTOR_GENERIC_BUFFER_EVENT_DETACHED, pd->pixels.u8); if (!pd->nofree) { free(pd->pixels.u8); @@ -336,7 +336,7 @@ EOLIAN static Eo_Base * _ector_software_buffer_eo_base_constructor(Eo *obj, void *data EINA_UNUSED) { Ector_Software_Buffer_Base_Data *pd; - eo_do_super(obj, MY_CLASS, obj = eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); pd = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); pd->generic = eo_data_ref(obj, ECTOR_GENERIC_BUFFER_MIXIN); pd->generic->eo = obj; @@ -349,7 +349,7 @@ _ector_software_buffer_eo_base_destructor(Eo *obj, void *data EINA_UNUSED) Ector_Software_Buffer_Base_Data *pd = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); _ector_software_buffer_base_pixels_clear(obj, pd); eo_data_unref(obj, pd->generic); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); if (pd->internal.maps) { ERR("Pixel data is still mapped during destroy! Check your code!"); diff --git a/src/lib/ector/software/ector_software_rasterizer.c b/src/lib/ector/software/ector_software_rasterizer.c index a25a039490..f3b31f5c72 100644 --- a/src/lib/ector/software/ector_software_rasterizer.c +++ b/src/lib/ector/software/ector_software_rasterizer.c @@ -102,9 +102,9 @@ _blend_image_argb(int count, const SW_FT_Span *spans, void *user_data) while (length) { l = MIN(length, data->buffer->generic->w); - eo_do(data->buffer->generic->eo, src8 = ector_buffer_span_get(0, sy, l, EFL_GFX_COLORSPACE_ARGB8888, NULL)); + src8 = ector_buffer_span_get(data->buffer->generic->eo, 0, sy, l, EFL_GFX_COLORSPACE_ARGB8888, NULL); comp_func(target, (uint32_t *) src8, l, data->mul_col, spans->coverage); - eo_do(data->buffer->generic->eo, ector_buffer_span_free(src8)); + ector_buffer_span_free(data->buffer->generic->eo, src8); target += l; length -= l; } diff --git a/src/lib/ector/software/ector_software_surface.c b/src/lib/ector/software/ector_software_surface.c index 6ad79053ae..f67b1947d2 100644 --- a/src/lib/ector/software/ector_software_surface.c +++ b/src/lib/ector/software/ector_software_surface.c @@ -16,17 +16,13 @@ _ector_software_surface_ector_generic_surface_renderer_factory_new(Eo *obj, const Eo_Class *type) { if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN) - return eo_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, - ector_renderer_surface_set(obj)); + return eo_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN) - return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, - ector_renderer_surface_set(obj)); + return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN) - return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, - ector_renderer_surface_set(obj)); + return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); else if (type == ECTOR_RENDERER_GENERIC_BUFFER_MIXIN) - return eo_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, - ector_renderer_surface_set(obj)); + return eo_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); ERR("Couldn't find class for type: %s\n", eo_class_name_get(type)); return NULL; } @@ -34,7 +30,7 @@ _ector_software_surface_ector_generic_surface_renderer_factory_new(Eo *obj, static Eo * _ector_software_surface_eo_base_constructor(Eo *obj, Ector_Software_Surface_Data *pd) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); pd->rasterizer = (Software_Rasterizer *) calloc(1, sizeof(Software_Rasterizer)); ector_software_rasterizer_init(pd->rasterizer); pd->rasterizer->fill_data.raster_buffer = eo_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); @@ -48,7 +44,7 @@ _ector_software_surface_eo_base_destructor(Eo *obj, Ector_Software_Surface_Data eo_data_unref(obj, pd->rasterizer->fill_data.raster_buffer); free(pd->rasterizer); pd->rasterizer = NULL; - eo_do_super(obj, ECTOR_SOFTWARE_SURFACE_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, ECTOR_SOFTWARE_SURFACE_CLASS)); } static void diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c index 8678933664..c0e08b5cd6 100644 --- a/src/lib/edje/edje_callbacks.c +++ b/src/lib/edje/edje_callbacks.c @@ -460,28 +460,28 @@ EO_CALLBACKS_ARRAY_DEFINE(edje_focus_callbacks, void _edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp) { - eo_do(obj, eo_event_callback_array_add(edje_callbacks(), ed)); + eo_event_callback_array_add(obj, edje_callbacks(), ed); evas_object_data_set(obj, "real_part", rp); } void _edje_callbacks_del(Evas_Object *obj, Edje *ed) { - eo_do(obj, eo_event_callback_array_del(edje_callbacks(), ed)); + eo_event_callback_array_del(obj, edje_callbacks(), ed); evas_object_data_del(obj, "real_part"); } void _edje_callbacks_focus_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp) { - eo_do(obj, eo_event_callback_array_add(edje_focus_callbacks(), ed)); + eo_event_callback_array_add(obj, edje_focus_callbacks(), ed); evas_object_data_set(obj, "real_part", rp); } void _edje_callbacks_focus_del(Evas_Object *obj, Edje *ed) { - eo_do(obj, eo_event_callback_array_del(edje_focus_callbacks(), ed)); + eo_event_callback_array_del(obj, edje_focus_callbacks(), ed); evas_object_data_del(obj, "real_part"); } diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 8bacc49a5b..3934392965 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -152,7 +152,7 @@ _edje_edit_evas_object_smart_del(Eo *obj, Edje_Edit *eed) { _edje_edit_data_clean(eed); - eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); + evas_obj_smart_del(eo_super(obj, MY_CLASS)); } static void @@ -190,7 +190,7 @@ _edje_edit_efl_file_file_set(Eo *obj, Edje_Edit *eed, const char *file, const ch * groups). */ Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, MY_CLASS, int_ret = efl_file_set(file, group)); + int_ret = efl_file_set(eo_super(obj, MY_CLASS), file, group); if (!int_ret) return ret; @@ -240,13 +240,13 @@ _edje_edit_eo_base_constructor(Eo *obj, Edje_Edit *eed) { eed->base = eo_data_ref(obj, EDJE_OBJECT_CLASS); - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } EOLIAN static void _edje_edit_eo_base_destructor(Eo *obj, Edje_Edit *class_data EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); eo_data_unref(obj, class_data); } diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c index be94d784df..87bbbf0afd 100644 --- a/src/lib/edje/edje_load.c +++ b/src/lib/edje/edje_load.c @@ -793,35 +793,30 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch Evas_Canvas3D_Material *material = NULL; Edje_Part_Description_Mesh_Node *pd_mesh_node; - rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); + rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, ed->base->evas); - eo_do(rp->node, evas_canvas3d_node_mesh_add(mesh)); + evas_canvas3d_node_mesh_add(rp->node, mesh); pd_mesh_node = (Edje_Part_Description_Mesh_Node*) rp->chosen_description; if (pd_mesh_node->mesh_node.mesh.primitive == EVAS_CANVAS3D_MESH_PRIMITIVE_NONE) { - eo_do(mesh, - efl_file_set(ed->file->model_dir->entries[pd_mesh_node->mesh_node.mesh.id].entry, NULL)); + efl_file_set(mesh, ed->file->model_dir->entries[pd_mesh_node->mesh_node.mesh.id].entry, NULL); } else { - eo_do(mesh, - evas_canvas3d_mesh_frame_add(0)); + evas_canvas3d_mesh_frame_add(mesh, 0); } material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, ed->base->evas); - eo_do(mesh, - evas_canvas3d_mesh_frame_material_set(0, material)); + evas_canvas3d_mesh_frame_material_set(mesh, 0, material); if (pd_mesh_node->mesh_node.texture.need_texture && pd_mesh_node->mesh_node.texture.textured) { Evas_Canvas3D_Texture *texture = NULL; texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, ed->base->evas); - eo_do(material, - evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture)); + evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture); } rp->object = NULL; } @@ -831,10 +826,9 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch { Evas_Canvas3D_Light *light = NULL; - rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, ed->base->evas); - eo_do(rp->node, evas_canvas3d_node_light_set(light)); + evas_canvas3d_node_light_set(rp->node, light); rp->object = NULL; break; @@ -844,10 +838,9 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch { Evas_Canvas3D_Camera *camera = NULL; - rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, - evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, ed->base->evas); - eo_do(rp->node, evas_canvas3d_node_camera_set(camera)); + evas_canvas3d_node_camera_set(rp->node, camera); rp->object = evas_object_image_filled_add(ed->base->evas); evas_object_resize(rp->object, ed->collection->scene_size.width, ed->collection->scene_size.height); @@ -869,7 +862,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch } if (ep->no_render) - eo_do(rp->object, evas_obj_no_render_set(1)); + evas_obj_no_render_set(rp->object, 1); if (st_nested && st_nested->nested_children_count) /* Add this to list of children */ { @@ -922,9 +915,8 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch evas_object_pass_events_set(rp->object, 1); evas_object_pointer_mode_set(rp->object, EVAS_OBJECT_POINTER_MODE_NOGRAB); } - eo_do(rp->object, - evas_obj_anti_alias_set(ep->anti_alias), - evas_obj_precise_is_inside_set(ep->precise_is_inside)); + evas_obj_anti_alias_set(rp->object, ep->anti_alias); + evas_obj_precise_is_inside_set(rp->object, ep->precise_is_inside); } if (rp->part->clip_to_id < 0) evas_object_clip_set(rp->object, ed->base->clipper); @@ -1718,7 +1710,7 @@ _edje_file_del(Edje *ed) free(runp); } _edje_animators = eina_list_remove(_edje_animators, ed); - eo_do(ed->obj, eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed)); + eo_event_callback_del(ed->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed); ecore_animator_del(ed->animator); ed->animator = NULL; diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c index 273f6aa891..df981573f0 100644 --- a/src/lib/edje/edje_multisense.c +++ b/src/lib/edje/edje_multisense.c @@ -202,18 +202,13 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c eet_data->vio.tell = eet_snd_file_tell; eet_data->offset = 0; - in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL, - ecore_audio_obj_name_set(snd_id_str), - ecore_audio_obj_in_speed_set(speed), - ecore_audio_obj_vio_set(&eet_data->vio, eet_data, _free), - eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL)); + in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL, ecore_audio_obj_name_set(eoid, snd_id_str), ecore_audio_obj_in_speed_set(eoid, speed), ecore_audio_obj_vio_set(eoid, &eet_data->vio, eet_data, _free), eo_event_callback_add(eoid, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL)); if (!out) { #if HAVE_COREAUDIO out = eo_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL); #elif HAVE_PULSE - out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, - eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL)); + out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, eo_event_callback_add(eoid, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL)); #endif if (out) outs++; } @@ -227,7 +222,7 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c eo_del(in); return EINA_FALSE; } - eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); + ret = ecore_audio_obj_out_input_attach(out, in); if (!ret) { ERR("Could not attach input"); @@ -275,23 +270,22 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const if (!strcmp(tone->name, tone_name)) { in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL); - eo_do(in, ecore_audio_obj_name_set("tone")); - eo_do(in, eo_key_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &tone->value)); - eo_do(in, ecore_audio_obj_in_length_set(duration)); - eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL)); + ecore_audio_obj_name_set(in, "tone"); + eo_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &tone->value); + ecore_audio_obj_in_length_set(in, duration); + eo_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL); if (!out) { #if HAVE_COREAUDIO out = eo_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL); #elif HAVE_PULSE - out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, - eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL)); + out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, eo_event_callback_add(eoid, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL)); #endif if (out) outs++; } - eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); + ret = ecore_audio_obj_out_input_attach(out, in); if (!ret) { ERR("Could not attach input"); diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c index 8f601bfa66..aa99063a00 100644 --- a/src/lib/edje/edje_program.c +++ b/src/lib/edje/edje_program.c @@ -267,7 +267,7 @@ edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const ch { if (!obj) return NULL; void *ret = NULL; - eo_do(obj, ret = edje_obj_signal_callback_del(emission, source, (Edje_Signal_Cb)func, NULL)); + ret = edje_obj_signal_callback_del(obj, emission, source, (Edje_Signal_Cb)func, NULL); return ret; } @@ -296,7 +296,7 @@ edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, con { if (!obj) return NULL; void *ret = NULL; - eo_do(obj, ret = edje_obj_signal_callback_del(emission, source, func, data)); + ret = edje_obj_signal_callback_del(obj, emission, source, func, data); return ret; } @@ -433,7 +433,7 @@ _edje_program_run_cleanup(Edje *ed, Edje_Running_Program *runp) ed->actions = eina_list_remove(ed->actions, runp); if (!ed->actions) { - eo_do(ed->obj, eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed)); + eo_event_callback_del(ed->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed); ecore_animator_del(ed->animator); ed->animator = NULL; } @@ -737,7 +737,7 @@ low_mem_current: if (!ed->actions) { if (ed->canvas_animator) - eo_do(ed->obj, eo_event_callback_add(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed)); + eo_event_callback_add(ed->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed); else ed->animator = ecore_animator_add(_edje_animator_cb, ed); } diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index fd06cc2b55..e571ecf48a 100644 --- a/src/lib/edje/edje_smart.c +++ b/src/lib/edje/edje_smart.c @@ -34,11 +34,11 @@ _edje_object_eo_base_constructor(Eo *obj, Edje *ed) ed->base = eo_data_ref(obj, EVAS_SMART_CLIPPED_CLASS); ed->duration_scale = 1.0; - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); - eo_do(obj, evas_obj_type_set(MY_CLASS_NAME_LEGACY)); + obj = eo_constructor(eo_super(obj, MY_CLASS)); + evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); _edje_lib_ref(); - eo_do(obj, parent = eo_parent_get()); + parent = eo_parent_get(obj); e = evas_object_evas_get(parent); tmp = ecore_evas_ecore_evas_get(e); @@ -50,23 +50,23 @@ _edje_object_eo_base_constructor(Eo *obj, Edje *ed) EOLIAN static void _edje_object_eo_base_destructor(Eo *obj, Edje *class_data) { - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); eo_data_unref(obj, class_data->base); } EOLIAN static void _edje_object_eo_base_dbg_info_get(Eo *eo_obj, Edje *_pd EINA_UNUSED, Eo_Dbg_Info *root) EINA_ARG_NONNULL(3) { - eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); + eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); const char *file, *edje_group; - eo_do(eo_obj, efl_file_get(&file, &edje_group)); + efl_file_get(eo_obj, &file, &edje_group); EO_DBG_INFO_APPEND(group, "File", EINA_VALUE_TYPE_STRING, file); EO_DBG_INFO_APPEND(group, "Group", EINA_VALUE_TYPE_STRING, edje_group); Edje_Load_Error error = EDJE_LOAD_ERROR_NONE; - eo_do(eo_obj, error = edje_obj_load_error_get()); + error = edje_obj_load_error_get(eo_obj); if (error != EDJE_LOAD_ERROR_NONE) { EO_DBG_INFO_APPEND(group, "Error", EINA_VALUE_TYPE_STRING, @@ -110,7 +110,7 @@ _edje_object_evas_object_smart_add(Eo *obj, Edje *ed) evas_event_freeze(tev); - eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); + evas_obj_smart_add(eo_super(obj, MY_CLASS)); ed->is_rtl = EINA_FALSE; ed->have_objects = EINA_TRUE; @@ -291,7 +291,7 @@ _edje_object_evas_object_smart_show(Eo *obj, Edje *ed) Eina_List *l; Edje *edg; - eo_do_super(obj, MY_CLASS, evas_obj_smart_show()); + evas_obj_smart_show(eo_super(obj, MY_CLASS)); if (evas_object_visible_get(obj)) return; if (_edje_lua_script_only(ed)) { @@ -319,7 +319,7 @@ _edje_object_evas_object_smart_hide(Eo *obj, Edje *ed) Eina_List *l; Edje *edg; - eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); + evas_obj_smart_hide(eo_super(obj, MY_CLASS)); if (!evas_object_visible_get(obj)) return; if (_edje_lua_script_only(ed)) { @@ -403,32 +403,32 @@ edje_object_mmap_set(Edje_Object *obj, const Eina_File *file, const char *group) { Eina_Bool ret; - return eo_do_ret(obj, ret, efl_file_mmap_set(file, group)); + return efl_file_mmap_set(obj, file, group); } EAPI Eina_Bool edje_object_file_set(Edje_Object *obj, const char *file, const char *group) { Eina_Bool ret = 0; - eo_do(obj, ret = efl_file_set(file, group)); + ret = efl_file_set(obj, file, group); return ret; } EAPI void edje_object_file_get(const Edje_Object *obj, const char **file, const char **group) { - eo_do((Edje_Object *)obj, efl_file_get(file, group)); + efl_file_get((Edje_Object *)obj, file, group); } EOLIAN static void _edje_object_evas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Direction dir) { - eo_do_super(obj, MY_CLASS, evas_obj_paragraph_direction_set(dir)); + evas_obj_paragraph_direction_set(eo_super(obj, MY_CLASS), dir); /* Make it dirty to recalculate edje. It needs to move text objects according to new paragraph direction */ ed->dirty = EINA_TRUE; - eo_do(obj, evas_obj_smart_need_recalculate_set(1)); + evas_obj_smart_need_recalculate_set(obj, 1); } #include "edje_object.eo.c" diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index 6b91c03c14..d1add9b23d 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -6313,9 +6313,8 @@ _edje_real_part_swallow(Edje *ed, else evas_object_pass_events_set(obj_swallow, 1); _edje_callbacks_focus_add(rp->typedata.swallow->swallowed_object, ed, rp); - eo_do(obj_swallow, - evas_obj_anti_alias_set(rp->part->anti_alias), - evas_obj_precise_is_inside_set(rp->part->precise_is_inside)); + evas_obj_anti_alias_set(obj_swallow, rp->part->anti_alias); + evas_obj_precise_is_inside_set(obj_swallow, rp->part->precise_is_inside); ed->dirty = EINA_TRUE; ed->recalc_call = EINA_TRUE; diff --git a/src/lib/efl/interfaces/efl_gfx_shape.c b/src/lib/efl/interfaces/efl_gfx_shape.c index 9fe4d9eb33..6a23dd4d36 100644 --- a/src/lib/efl/interfaces/efl_gfx_shape.c +++ b/src/lib/efl/interfaces/efl_gfx_shape.c @@ -185,9 +185,8 @@ _efl_gfx_shape_path_set(Eo *obj, Efl_Gfx_Shape_Data *pd, &pd->current_ctrl.x, &pd->current_ctrl.y); end: - eo_do(obj, - eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL), - eo_event_callback_call(EFL_GFX_CHANGED, NULL)); + eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL); + eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL); } static void @@ -301,15 +300,14 @@ struct _Efl_Gfx_Property static inline void _efl_gfx_property_get(const Eo *obj, Efl_Gfx_Property *property) { - eo_do(obj, - property->scale = efl_gfx_shape_stroke_scale_get(), - efl_gfx_shape_stroke_color_get(&property->r, &property->g, &property->b, &property->a), - efl_gfx_color_get(&property->fr, &property->fg, &property->fb, &property->fa), - property->w = efl_gfx_shape_stroke_width_get(), - property->centered = efl_gfx_shape_stroke_location_get(), - efl_gfx_shape_stroke_dash_get(&property->dash, &property->dash_length), - property->c = efl_gfx_shape_stroke_cap_get(), - property->j = efl_gfx_shape_stroke_join_get()); + property->scale = efl_gfx_shape_stroke_scale_get(obj); + efl_gfx_shape_stroke_color_get(obj, &property->r, &property->g, &property->b, &property->a); + efl_gfx_color_get(obj, &property->fr, &property->fg, &property->fb, &property->fa); + property->w = efl_gfx_shape_stroke_width_get(obj); + property->centered = efl_gfx_shape_stroke_location_get(obj); + efl_gfx_shape_stroke_dash_get(obj, &property->dash, &property->dash_length); + property->c = efl_gfx_shape_stroke_cap_get(obj); + property->j = efl_gfx_shape_stroke_join_get(obj); } static Eina_Bool @@ -398,24 +396,16 @@ _efl_gfx_shape_interpolate(Eo *obj, Efl_Gfx_Shape_Data *pd, } - eo_do(obj, - efl_gfx_shape_stroke_scale_set(interpolate(property_to.scale, property_from.scale, pos_map)), - efl_gfx_shape_stroke_color_set(interpolatei(property_to.r, property_from.r, pos_map), - interpolatei(property_to.g, property_from.g, pos_map), - interpolatei(property_to.b, property_from.b, pos_map), - interpolatei(property_to.a, property_from.a, pos_map)), - efl_gfx_color_set(interpolatei(property_to.fr, property_from.fr, pos_map), - interpolatei(property_to.fg, property_from.fg, pos_map), - interpolatei(property_to.fb, property_from.fb, pos_map), - interpolatei(property_to.fa, property_from.fa, pos_map)), - efl_gfx_shape_stroke_width_set(interpolate(property_to.w, property_from.w, pos_map)), - efl_gfx_shape_stroke_location_set(interpolate(property_to.centered, property_from.centered, pos_map)), - efl_gfx_shape_stroke_dash_set(dash, property_to.dash_length), - efl_gfx_shape_stroke_cap_set(pos_map < 0.5 ? property_from.c : property_to.c), - efl_gfx_shape_stroke_join_set(pos_map < 0.5 ? property_from.j : property_to.j), - - eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL), - eo_event_callback_call(EFL_GFX_CHANGED, NULL)); + efl_gfx_shape_stroke_scale_set(obj, interpolate(property_to.scale, property_from.scale, pos_map)); + efl_gfx_shape_stroke_color_set(obj, interpolatei(property_to.r, property_from.r, pos_map), interpolatei(property_to.g, property_from.g, pos_map), interpolatei(property_to.b, property_from.b, pos_map), interpolatei(property_to.a, property_from.a, pos_map)); + efl_gfx_color_set(obj, interpolatei(property_to.fr, property_from.fr, pos_map), interpolatei(property_to.fg, property_from.fg, pos_map), interpolatei(property_to.fb, property_from.fb, pos_map), interpolatei(property_to.fa, property_from.fa, pos_map)); + efl_gfx_shape_stroke_width_set(obj, interpolate(property_to.w, property_from.w, pos_map)); + efl_gfx_shape_stroke_location_set(obj, interpolate(property_to.centered, property_from.centered, pos_map)); + efl_gfx_shape_stroke_dash_set(obj, dash, property_to.dash_length); + efl_gfx_shape_stroke_cap_set(obj, pos_map < 0.5 ? property_from.c : property_to.c); + efl_gfx_shape_stroke_join_set(obj, pos_map < 0.5 ? property_from.j : property_to.j); + eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL); + eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL); return EINA_TRUE; } @@ -449,9 +439,8 @@ _efl_gfx_shape_reset(Eo *obj, Efl_Gfx_Shape_Data *pd) pd->current_ctrl.x = 0; pd->current_ctrl.y = 0; pd->convex = EINA_FALSE; - eo_do(obj, - eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL), - eo_event_callback_call(EFL_GFX_CHANGED, NULL)); + eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL); + eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL); } static void @@ -470,9 +459,8 @@ _efl_gfx_shape_append_move_to(Eo *obj, Efl_Gfx_Shape_Data *pd, pd->current.x = x; pd->current.y = y; - eo_do(obj, - eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL), - eo_event_callback_call(EFL_GFX_CHANGED, NULL)); + eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL); + eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL); } static void @@ -491,9 +479,8 @@ _efl_gfx_shape_append_line_to(Eo *obj, Efl_Gfx_Shape_Data *pd, pd->current.x = x; pd->current.y = y; - eo_do(obj, - eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL), - eo_event_callback_call(EFL_GFX_CHANGED, NULL)); + eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL); + eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL); } static void @@ -520,9 +507,8 @@ _efl_gfx_shape_append_cubic_to(Eo *obj, Efl_Gfx_Shape_Data *pd, pd->current_ctrl.x = ctrl_x1; pd->current_ctrl.y = ctrl_y1; - eo_do(obj, - eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL), - eo_event_callback_call(EFL_GFX_CHANGED, NULL)); + eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL); + eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL); } static void @@ -1090,9 +1076,8 @@ _efl_gfx_shape_append_close(Eo *obj, Efl_Gfx_Shape_Data *pd) efl_gfx_path_grow(EFL_GFX_PATH_COMMAND_TYPE_CLOSE, pd, &offset_point); - eo_do(obj, - eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL), - eo_event_callback_call(EFL_GFX_CHANGED, NULL)); + eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL); + eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL); } static void @@ -1815,9 +1800,8 @@ _efl_gfx_shape_dup(Eo *obj, Efl_Gfx_Shape_Data *pd, const Eo *dup_from) _efl_gfx_shape_stroke_dash_set(obj, pd, from->public.stroke.dash, from->public.stroke.dash_length); _efl_gfx_shape_path_set(obj, pd, from->commands, from->points); - eo_do(obj, - eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL), - eo_event_callback_call(EFL_GFX_CHANGED, NULL)); + eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL); + eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL); } #include "interfaces/efl_gfx_shape.eo.c" diff --git a/src/lib/efl/interfaces/efl_model_common.c b/src/lib/efl/interfaces/efl_model_common.c index 5f3e057b87..90d515c1c7 100644 --- a/src/lib/efl/interfaces/efl_model_common.c +++ b/src/lib/efl/interfaces/efl_model_common.c @@ -43,7 +43,7 @@ efl_model_load_set(Efl_Model_Base *model, Efl_Model_Load *load, Efl_Model_Load_S if (load->status != new_load.status) { load->status = new_load.status; - eo_do(model, eo_event_callback_call(EFL_MODEL_BASE_EVENT_LOAD_STATUS, load)); + eo_event_callback_call(model, EFL_MODEL_BASE_EVENT_LOAD_STATUS, load); } } @@ -77,7 +77,7 @@ EAPI void efl_model_error_notify(Efl_Model_Base *model) { Efl_Model_Load load = {.status = EFL_MODEL_LOAD_STATUS_ERROR}; - eo_do(model, eo_event_callback_call(EFL_MODEL_BASE_EVENT_LOAD_STATUS, &load)); + eo_event_callback_call(model, EFL_MODEL_BASE_EVENT_LOAD_STATUS, &load); } EAPI void @@ -90,7 +90,7 @@ efl_model_property_changed_notify(Efl_Model_Base *model, const char *property) EINA_SAFETY_ON_FALSE_GOTO(ret, on_error); Efl_Model_Property_Event evt = {.changed_properties = changed_properties}; - eo_do(model, eo_event_callback_call(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt)); + eo_event_callback_call(model, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt); on_error: eina_array_free(changed_properties); @@ -106,7 +106,7 @@ efl_model_property_invalidated_notify(Efl_Model_Base *model, const char *propert EINA_SAFETY_ON_FALSE_GOTO(ret, on_error); Efl_Model_Property_Event evt = {.invalidated_properties = invalidated_properties}; - eo_do(model, eo_event_callback_call(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt)); + eo_event_callback_call(model, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt); on_error: eina_array_free(invalidated_properties); diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c index 5ff288ea0b..1d96750cc3 100644 --- a/src/lib/eio/eio_model.c +++ b/src/lib/eio/eio_model.c @@ -51,7 +51,7 @@ _load_set(Eio_Model_Data *priv, Efl_Model_Load_Status status) if (priv->load.status != load.status) { priv->load.status = load.status; - eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_LOAD_STATUS, &load)); + eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_LOAD_STATUS, &load); } } @@ -75,7 +75,7 @@ _eio_stat_done_cb(void *data, Eio_File *handler EINA_UNUSED, const Eina_Stat *st eina_value_set(priv->properties_value[EIO_MODEL_PROP_SIZE], eio_file_size(stat)); evt.changed_properties = priv->properties_name; - eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt)); + eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt); _load_set(priv, EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES); @@ -112,7 +112,7 @@ _eio_move_done_cb(void *data, Eio_File *handler EINA_UNUSED) eina_array_push(properties, _eio_model_prop_names[EIO_MODEL_PROP_FILENAME]); evt.changed_properties = properties; - eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt)); + eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt); eina_array_free(properties); } @@ -147,16 +147,16 @@ _efl_model_evt_added_ecore_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void Efl_Model_Children_Event cevt; Eina_Value path; - cevt.child = eo_add_ref(EIO_MODEL_CLASS, priv->obj, eio_model_path_set(evt->filename)); + cevt.child = eo_add_ref(EIO_MODEL_CLASS, priv->obj, eio_model_path_set(eoid, evt->filename)); priv->children_list = eina_list_append(priv->children_list, cevt.child); cevt.index = eina_list_count(priv->children_list); eina_value_setup(&path, EINA_VALUE_TYPE_STRING); eina_value_set(&path, evt->filename); - eo_do(cevt.child, eio_model_children_filter_set(priv->filter_cb, priv->filter_userdata)); + eio_model_children_filter_set(cevt.child, priv->filter_cb, priv->filter_userdata); eina_value_flush(&path); - eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_CHILD_ADDED, &cevt)); + eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_CHILD_ADDED, &cevt); return EINA_TRUE; } @@ -185,7 +185,7 @@ _efl_model_evt_deleted_ecore_cb(void *data EINA_UNUSED, int type EINA_UNUSED, vo cevt.index = i; cevt.child = cur->data; - eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_CHILD_REMOVED, &cevt)); + eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_CHILD_REMOVED, &cevt); priv->children_list = eina_list_remove_list(priv->children_list, cur); eo_unref(cevt.child); @@ -407,10 +407,10 @@ _eio_main_children_load_cb(void *data, Eio_File *handler EINA_UNUSED, const Eina Eio_Model_Data *priv = data; EINA_SAFETY_ON_NULL_RETURN(priv); - child = eo_add(MY_CLASS, NULL, eio_model_path_set(info->path)); + child = eo_add(MY_CLASS, NULL, eio_model_path_set(eoid, info->path)); eina_spinlock_take(&priv->filter_lock); if (priv->filter_cb) - eo_do(child, eio_model_children_filter_set(priv->filter_cb, priv->filter_userdata)); + eio_model_children_filter_set(child, priv->filter_cb, priv->filter_userdata); eina_spinlock_release(&priv->filter_lock); priv->children_list = eina_list_append(priv->children_list, child); @@ -426,7 +426,7 @@ _eio_done_children_load_cb(void *data, Eio_File *handler EINA_UNUSED) count = eina_list_count(priv->children_list); _load_set(priv, EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN); - eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, &count)); + eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, &count); } static void @@ -626,7 +626,7 @@ _eio_model_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED, Eio_Model_Data static Eo * _eio_model_eo_base_constructor(Eo *obj, Eio_Model_Data *priv) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); unsigned int i; priv->obj = obj; @@ -684,7 +684,7 @@ _eio_model_eo_base_destructor(Eo *obj , Eio_Model_Data *priv) eo_unref(child); free(priv->path); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } #include "eio_model.eo.c" diff --git a/src/lib/eldbus/eldbus_model_arguments.c b/src/lib/eldbus/eldbus_model_arguments.c index 36682b65b9..50bbc80e8d 100644 --- a/src/lib/eldbus/eldbus_model_arguments.c +++ b/src/lib/eldbus/eldbus_model_arguments.c @@ -30,7 +30,7 @@ _eldbus_model_arguments_hash_free(Eina_Value *value) static Eo_Base* _eldbus_model_arguments_eo_base_constructor(Eo *obj, Eldbus_Model_Arguments_Data *pd) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); pd->obj = obj; pd->load.status = EFL_MODEL_LOAD_STATUS_UNLOADED; @@ -68,7 +68,7 @@ _eldbus_model_arguments_eo_base_destructor(Eo *obj, Eldbus_Model_Arguments_Data eina_stringshare_del(pd->name); eldbus_proxy_unref(pd->proxy); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } static Efl_Model_Load_Status @@ -184,8 +184,8 @@ _eldbus_model_arguments_efl_model_base_property_get(Eo *obj EINA_UNUSED, static void _eldbus_model_arguments_efl_model_base_load(Eo *obj, Eldbus_Model_Arguments_Data *pd EINA_UNUSED) { - eo_do(obj, efl_model_properties_load()); - eo_do(obj, efl_model_children_load()); + efl_model_properties_load(obj); + efl_model_children_load(obj); } static Efl_Model_Load_Status @@ -329,7 +329,7 @@ eldbus_model_arguments_process_arguments(Eldbus_Model_Arguments_Data *pd, if (eina_array_count(changed_properties)) { Efl_Model_Property_Event evt = {.changed_properties = changed_properties}; - eo_do(pd->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt)); + eo_event_callback_call(pd->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt); } result = EINA_TRUE; diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c index 6325a5ac0b..ebd758be2b 100644 --- a/src/lib/eldbus/eldbus_model_connection.c +++ b/src/lib/eldbus/eldbus_model_connection.c @@ -20,7 +20,7 @@ static void _eldbus_model_connection_clear(Eldbus_Model_Connection_Data *); static Eo_Base* _eldbus_model_connection_eo_base_constructor(Eo *obj, Eldbus_Model_Connection_Data *pd) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); pd->obj = obj; pd->load.status = EFL_MODEL_LOAD_STATUS_UNLOADED; @@ -55,7 +55,7 @@ _eldbus_model_connection_eo_base_destructor(Eo *obj, Eldbus_Model_Connection_Dat _eldbus_model_connection_clear(pd); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } static Efl_Model_Load_Status @@ -345,8 +345,7 @@ _eldbus_model_connection_names_list_cb(void *data, { DBG("(%p): bus = %s", pd->obj, bus); - Eo *child = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, - eldbus_model_object_connection_constructor(pd->connection, bus, "/")); + Eo *child = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_connection_constructor(eoid, pd->connection, bus, "/")); pd->children_list = eina_list_append(pd->children_list, child); } @@ -355,7 +354,7 @@ _eldbus_model_connection_names_list_cb(void *data, count = eina_list_count(pd->children_list); if (count) - eo_do(pd->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, &count)); + eo_event_callback_call(pd->obj, EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, &count); } #include "eldbus_model_connection.eo.c" diff --git a/src/lib/eldbus/eldbus_model_method.c b/src/lib/eldbus/eldbus_model_method.c index 7c0c3d60e2..d62b8eb9c7 100644 --- a/src/lib/eldbus/eldbus_model_method.c +++ b/src/lib/eldbus/eldbus_model_method.c @@ -19,7 +19,7 @@ static void _eldbus_model_method_call_cb(void *, const Eldbus_Message *, Eldbus_ static Eo_Base* _eldbus_model_method_eo_base_constructor(Eo *obj, Eldbus_Model_Method_Data *pd) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); pd->obj = obj; pd->method = NULL; @@ -35,7 +35,7 @@ _eldbus_model_method_constructor(Eo *obj EINA_UNUSED, EINA_SAFETY_ON_NULL_RETURN(proxy); EINA_SAFETY_ON_NULL_RETURN(method); - eo_do_super(obj, MY_CLASS, eldbus_model_arguments_constructor(proxy, method->name, method->arguments)); + eldbus_model_arguments_constructor(eo_super(obj, MY_CLASS), proxy, method->name, method->arguments); pd->method = method; } @@ -96,7 +96,7 @@ _eldbus_model_method_call_cb(void *data, const Eldbus_Message *msg, Eldbus_Pendi Eldbus_Model_Arguments_Data *args_data = eo_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS); if (eldbus_model_arguments_process_arguments(args_data, msg, pending)) - eo_do(pd->obj, eo_event_callback_call(ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL, NULL)); + eo_event_callback_call(pd->obj, ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL, NULL); } #include "eldbus_model_method.eo.c" diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c index 115330e956..240d657e77 100644 --- a/src/lib/eldbus/eldbus_model_object.c +++ b/src/lib/eldbus/eldbus_model_object.c @@ -26,7 +26,7 @@ static void _eldbus_model_object_create_children(Eldbus_Model_Object_Data *, Eld static Eo_Base* _eldbus_model_object_eo_base_constructor(Eo *obj, Eldbus_Model_Object_Data *pd) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); pd->obj = obj; pd->load.status = EFL_MODEL_LOAD_STATUS_UNLOADED; @@ -90,7 +90,7 @@ _eldbus_model_object_eo_base_destructor(Eo *obj, Eldbus_Model_Object_Data *pd) _eldbus_model_object_clear(pd); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } static Efl_Model_Load_Status @@ -462,7 +462,7 @@ _eldbus_model_object_introspect_cb(void *data, count = eina_list_count(pd->children_list); if (count) - eo_do(pd->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, &count)); + eo_event_callback_call(pd->obj, EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, &count); } } @@ -532,8 +532,7 @@ _eldbus_model_object_create_children(Eldbus_Model_Object_Data *pd, Eldbus_Object WRN("(%p) Creating child: bus = %s, path = %s, interface = %s", pd->obj, pd->bus, current_path, interface->name); // TODO: increment reference to keep 'interface' in memory - child = eo_add_ref(ELDBUS_MODEL_PROXY_CLASS, NULL, - eldbus_model_proxy_constructor(object, interface)); + child = eo_add_ref(ELDBUS_MODEL_PROXY_CLASS, NULL, eldbus_model_proxy_constructor(eoid, object, interface)); pd->children_list = eina_list_append(pd->children_list, child); } diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c index fd385a6bfe..2e660f4116 100644 --- a/src/lib/eldbus/eldbus_model_proxy.c +++ b/src/lib/eldbus/eldbus_model_proxy.c @@ -47,7 +47,7 @@ _eldbus_model_proxy_hash_free(Eina_Value *value) static Eo_Base* _eldbus_model_proxy_eo_base_constructor(Eo *obj, Eldbus_Model_Proxy_Data *pd) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); pd->obj = obj; pd->load.status = EFL_MODEL_LOAD_STATUS_UNLOADED; @@ -88,7 +88,7 @@ _eldbus_model_proxy_eo_base_destructor(Eo *obj, Eldbus_Model_Proxy_Data *pd) eina_stringshare_del(pd->name); eldbus_object_unref(pd->object); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } static Efl_Model_Load_Status @@ -294,7 +294,7 @@ _eldbus_model_proxy_efl_model_base_children_load(Eo *obj EINA_UNUSED, Eldbus_Mod count = eina_list_count(pd->children_list); if (count) - eo_do(pd->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, &count)); + eo_event_callback_call(pd->obj, EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, &count); } static void @@ -325,8 +325,7 @@ _eldbus_model_proxy_create_methods_children(Eldbus_Model_Proxy_Data *pd) INF("(%p) Creating method child: bus = %s, path = %s, method = %s::%s", pd->obj, bus, path, interface_name, method_name); - child = eo_add(ELDBUS_MODEL_METHOD_CLASS, NULL, - eldbus_model_method_constructor(pd->proxy, method)); + child = eo_add(ELDBUS_MODEL_METHOD_CLASS, NULL, eldbus_model_method_constructor(eoid, pd->proxy, method)); pd->children_list = eina_list_append(pd->children_list, child); } @@ -360,8 +359,7 @@ _eldbus_model_proxy_create_signals_children(Eldbus_Model_Proxy_Data *pd) DBG("(%p) Creating signal child: bus = %s, path = %s, signal = %s::%s", pd->obj, bus, path, interface_name, signal_name); - child = eo_add(ELDBUS_MODEL_SIGNAL_CLASS, NULL, - eldbus_model_signal_constructor(pd->proxy, signal)); + child = eo_add(ELDBUS_MODEL_SIGNAL_CLASS, NULL, eldbus_model_signal_constructor(eoid, pd->proxy, signal)); pd->children_list = eina_list_append(pd->children_list, child); } @@ -587,7 +585,7 @@ _eldbus_model_proxy_property_get_all_cb(void *data, .changed_properties = changed_properties }; - eo_do(pd->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt)); + eo_event_callback_call(pd->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt); } efl_model_load_set(pd->obj, &pd->load, EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES); @@ -628,7 +626,7 @@ _eldbus_model_proxy_property_set_cb(void *data, Efl_Model_Property_Event evt = { .changed_properties = pd->properties_array }; - eo_do(pd->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt)); + eo_event_callback_call(pd->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt); efl_model_property_changed_notify(pd->obj, property_set_data->property); } diff --git a/src/lib/eldbus/eldbus_model_signal.c b/src/lib/eldbus/eldbus_model_signal.c index 4ef32bb906..406c451398 100644 --- a/src/lib/eldbus/eldbus_model_signal.c +++ b/src/lib/eldbus/eldbus_model_signal.c @@ -18,7 +18,7 @@ static void _eldbus_model_signal_callback_del(Eldbus_Model_Signal_Data *); static Eo_Base* _eldbus_model_signal_eo_base_constructor(Eo *obj, Eldbus_Model_Signal_Data *pd) { - eo_do_super(obj, MY_CLASS, eo_constructor()); + eo_constructor(eo_super(obj, MY_CLASS)); pd->obj = obj; pd->handler = NULL; @@ -35,7 +35,7 @@ _eldbus_model_signal_constructor(Eo *obj EINA_UNUSED, EINA_SAFETY_ON_NULL_RETURN(proxy); EINA_SAFETY_ON_NULL_RETURN(signal); - eo_do_super(obj, MY_CLASS, eldbus_model_arguments_constructor(proxy, signal->name, signal->arguments)); + eldbus_model_arguments_constructor(eo_super(obj, MY_CLASS), proxy, signal->name, signal->arguments); pd->signal = signal; } @@ -45,7 +45,7 @@ _eldbus_model_signal_eo_base_destructor(Eo *obj, Eldbus_Model_Signal_Data *pd) { _eldbus_model_signal_callback_del(pd); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } static void @@ -59,14 +59,14 @@ _eldbus_model_signal_efl_model_base_properties_load(Eo *obj, Eldbus_Model_Signal _eldbus_model_signal_callback_add(pd); - eo_do_super(obj, MY_CLASS, efl_model_properties_load()); + efl_model_properties_load(eo_super(obj, MY_CLASS)); } static void _eldbus_model_signal_efl_model_base_unload(Eo *obj EINA_UNUSED, Eldbus_Model_Signal_Data *pd) { _eldbus_model_signal_callback_del(pd); - eo_do_super(obj, MY_CLASS, efl_model_unload()); + efl_model_unload(eo_super(obj, MY_CLASS)); } static void diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c index 26b440d840..231a81efac 100644 --- a/src/lib/emotion/emotion_smart.c +++ b/src/lib/emotion/emotion_smart.c @@ -243,8 +243,8 @@ emotion_object_add(Evas *evas) EOLIAN static Eo * _emotion_object_eo_base_constructor(Eo *obj, Emotion_Object_Data *pd EINA_UNUSED) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); - eo_do(obj, evas_obj_type_set(E_OBJ_NAME)); + obj = eo_constructor(eo_super(obj, MY_CLASS)); + evas_obj_type_set(obj, E_OBJ_NAME); return obj; } @@ -350,7 +350,7 @@ EAPI Eina_Bool emotion_object_file_set(Evas_Object *obj, const char *file) { Eina_Bool ret; - return eo_do_ret(obj, ret, efl_file_set(file, NULL)); + return efl_file_set(obj, file, NULL); } EOLIAN static Eina_Bool @@ -413,7 +413,7 @@ EAPI const char * emotion_object_file_get(const Evas_Object *obj) { const char *file = NULL; - eo_do(obj, efl_file_get(&file, NULL)); + efl_file_get(obj, &file, NULL); return file; } @@ -624,7 +624,7 @@ emotion_object_keep_aspect_get(const Evas_Object *obj) EAPI void emotion_object_play_set(Evas_Object *obj, Eina_Bool play) { - eo_do(obj, efl_player_play_set(play)); + efl_player_play_set(obj, play); } EOLIAN static void @@ -649,7 +649,7 @@ EAPI Eina_Bool emotion_object_play_get(const Evas_Object *obj) { Eina_Bool ret; - return eo_do_ret(obj, ret, efl_player_play_get()); + return efl_player_play_get(obj); } EOLIAN static Eina_Bool @@ -662,7 +662,7 @@ _emotion_object_efl_player_play_get(Eo *obj EINA_UNUSED, Emotion_Object_Data *sd EAPI void emotion_object_position_set(Evas_Object *obj, double sec) { - eo_do(obj, efl_player_position_set(sec)); + efl_player_position_set(obj, sec); } EOLIAN static void @@ -688,7 +688,7 @@ EAPI double emotion_object_position_get(const Evas_Object *obj) { double ret; - return eo_do_ret(obj, ret, efl_player_position_get()); + return efl_player_position_get(obj); } EOLIAN static double @@ -713,7 +713,7 @@ EAPI Eina_Bool emotion_object_seekable_get(const Evas_Object *obj) { Eina_Bool ret; - return eo_do_ret(obj, ret, efl_player_seekable_get()); + return efl_player_seekable_get(obj); } EAPI Eina_Bool @@ -740,7 +740,7 @@ EAPI double emotion_object_play_length_get(const Evas_Object *obj) { double ret; - return eo_do_ret(obj, ret, efl_player_length_get()); + return efl_player_length_get(obj); } EAPI void @@ -749,7 +749,7 @@ emotion_object_size_get(const Evas_Object *obj, int *iw, int *ih) if (iw) *iw = 0; if (ih) *ih = 0; - eo_do(obj, efl_image_load_size_get(iw, ih)); + efl_image_load_size_get(obj, iw, ih); } EOLIAN static void @@ -762,7 +762,7 @@ _emotion_object_efl_image_load_size_get(Eo *obj EINA_UNUSED, Emotion_Object_Data EAPI void emotion_object_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth) { - eo_do(obj, efl_image_smooth_scale_set(smooth)); + efl_image_smooth_scale_set(obj, smooth); } EOLIAN static void @@ -775,7 +775,7 @@ EAPI Eina_Bool emotion_object_smooth_scale_get(const Evas_Object *obj) { Eina_Bool ret; - return eo_do_ret(obj, ret, efl_image_smooth_scale_get()); + return efl_image_smooth_scale_get(obj); } EOLIAN static Eina_Bool @@ -788,7 +788,7 @@ EAPI double emotion_object_ratio_get(const Evas_Object *obj) { double ret; - return eo_do_ret(obj, ret, efl_image_ratio_get()); + return efl_image_ratio_get(obj); } EOLIAN static double @@ -814,7 +814,7 @@ emotion_object_event_simple_send(Evas_Object *obj, Emotion_Event ev) EAPI void emotion_object_audio_volume_set(Evas_Object *obj, double vol) { - eo_do(obj, efl_player_audio_volume_set(vol)); + efl_player_audio_volume_set(obj, vol); } EOLIAN static void @@ -829,7 +829,7 @@ EAPI double emotion_object_audio_volume_get(const Evas_Object *obj) { double ret; - return eo_do_ret(obj, ret, efl_player_audio_volume_get()); + return efl_player_audio_volume_get(obj); } EOLIAN static double @@ -842,7 +842,7 @@ _emotion_object_efl_player_audio_volume_get(Eo *obj EINA_UNUSED, Emotion_Object_ EAPI void emotion_object_audio_mute_set(Evas_Object *obj, Eina_Bool mute) { - eo_do(obj, efl_player_audio_mute_set(mute)); + efl_player_audio_mute_set(obj, mute); } EOLIAN static void @@ -857,7 +857,7 @@ EAPI Eina_Bool emotion_object_audio_mute_get(const Evas_Object *obj) { Eina_Bool ret; - return eo_do_ret(obj, ret, efl_player_audio_mute_get()); + return efl_player_audio_mute_get(obj); } EOLIAN static Eina_Bool @@ -1148,7 +1148,7 @@ EAPI double emotion_object_progress_status_get(const Evas_Object *obj) { double ret; - return eo_do_ret(obj, ret, efl_player_progress_get()); + return efl_player_progress_get(obj); } EOLIAN static double @@ -1318,8 +1318,7 @@ _eio_load_xattr_done(void *data, Eio_File *handler, double xattr_double) Emotion_Object_Data *sd = data; emotion_object_position_set(evas_object_smart_parent_get(sd->obj), xattr_double); - eo_do(evas_object_smart_parent_get(sd->obj), - eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_LOAD_SUCCEED, NULL)); + eo_event_callback_call(evas_object_smart_parent_get(sd->obj), EMOTION_OBJECT_EVENT_POSITION_LOAD_SUCCEED, NULL); _eio_load_xattr_cleanup(sd, handler); } @@ -1328,8 +1327,7 @@ _eio_load_xattr_error(void *data, Eio_File *handler, int err EINA_UNUSED) { Emotion_Object_Data *sd = data; - eo_do(evas_object_smart_parent_get(sd->obj), - eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_LOAD_FAILED, NULL)); + eo_event_callback_call(evas_object_smart_parent_get(sd->obj), EMOTION_OBJECT_EVENT_POSITION_LOAD_FAILED, NULL); _eio_load_xattr_cleanup(sd, handler); } #endif @@ -1364,10 +1362,10 @@ emotion_object_last_position_load(Evas_Object *obj) if (eina_xattr_double_get(tmp, "user.e.time_seek", &xattr)) { emotion_object_position_set(obj, xattr); - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_LOAD_SUCCEED, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_LOAD_SUCCEED, NULL); } else - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_LOAD_FAILED, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_LOAD_FAILED, NULL); #endif } @@ -1390,7 +1388,7 @@ _eio_save_xattr_done(void *data, Eio_File *handler) { Emotion_Object_Data *sd = data; - eo_do(sd->obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_SAVE_SUCCEED, NULL)); + eo_event_callback_call(sd->obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_SUCCEED, NULL); _eio_save_xattr_cleanup(sd, handler); } @@ -1399,7 +1397,7 @@ _eio_save_xattr_error(void *data, Eio_File *handler, int err EINA_UNUSED) { Emotion_Object_Data *sd = data; - eo_do(sd->obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_SAVE_FAILED, NULL)); + eo_event_callback_call(sd->obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_FAILED, NULL); _eio_save_xattr_cleanup(sd, handler); } #endif @@ -1429,9 +1427,9 @@ emotion_object_last_position_save(Evas_Object *obj) sd); #else if (eina_xattr_double_set(tmp, "user.e.time_seek", emotion_object_position_get(obj), 0)) - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_SAVE_SUCCEED, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_SUCCEED, NULL); else - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_SAVE_FAILED, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_FAILED, NULL); #endif } @@ -1493,7 +1491,7 @@ _emotion_frame_anim(void *data) _emotion_video_pos_update(obj, emotion_engine_instance_pos_get(sd->engine_instance), emotion_engine_instance_len_get(sd->engine_instance)); - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL); return EINA_FALSE; } @@ -1517,10 +1515,8 @@ _emotion_video_pos_update(Evas_Object *obj, double pos, double len) if (len != sd->len) nlen = 1; sd->pos = pos; sd->len = len; - if (npos) eo_do(obj, - eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_UPDATE, NULL)); - if (nlen) eo_do(obj, - eo_event_callback_call(EMOTION_OBJECT_EVENT_LENGTH_CHANGE, NULL)); + if (npos) eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_UPDATE, NULL); + if (nlen) eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_LENGTH_CHANGE, NULL); } EAPI void @@ -1549,7 +1545,7 @@ _emotion_frame_resize(Evas_Object *obj, int w, int h, double ratio) if (changed) { evas_object_size_hint_request_set(obj, w, h); - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_FRAME_RESIZE, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_FRAME_RESIZE, NULL); evas_object_geometry_get(obj, NULL, NULL, &w, &h); _emotion_object_aspect_border_apply(obj, sd, w, h); } @@ -1573,7 +1569,7 @@ _emotion_decode_stop(Evas_Object *obj) if (sd->play) { sd->play = 0; - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_DECODE_STOP, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_DECODE_STOP, NULL); } } @@ -1589,26 +1585,26 @@ _emotion_open_done(Evas_Object *obj) emotion_object_position_set(obj, sd->remember_jump); if (sd->remember_play != sd->play) emotion_object_play_set(obj, sd->remember_play); - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_OPEN_DONE, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_OPEN_DONE, NULL); } EAPI void _emotion_playback_started(Evas_Object *obj) { - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, NULL); } EAPI void _emotion_playback_finished(Evas_Object *obj) { - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, NULL); } EAPI void _emotion_audio_level_change(Evas_Object *obj) { - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_AUDIO_LEVEL_CHANGE, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_AUDIO_LEVEL_CHANGE, NULL); } EAPI void @@ -1617,7 +1613,7 @@ _emotion_channels_change(Evas_Object *obj) Emotion_Object_Data *sd; E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_CHANNELS_CHANGE, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_CHANNELS_CHANGE, NULL); } EAPI void @@ -1627,7 +1623,7 @@ _emotion_title_set(Evas_Object *obj, char *title) E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); eina_stringshare_replace(&sd->title, title); - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_TITLE_CHANGE, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_TITLE_CHANGE, NULL); } @@ -1639,7 +1635,7 @@ _emotion_progress_set(Evas_Object *obj, char *info, double st) E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); eina_stringshare_replace(&sd->progress.info, info); sd->progress.stat = st; - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, NULL); } EAPI void @@ -1650,7 +1646,7 @@ _emotion_file_ref_set(Evas_Object *obj, const char *file, int num) E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); eina_stringshare_replace(&sd->ref.file, file); sd->ref.num = num; - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_REF_CHANGE, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_REF_CHANGE, NULL); } EAPI void @@ -1660,7 +1656,7 @@ _emotion_spu_button_num_set(Evas_Object *obj, int num) E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); sd->spu.button_num = num; - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_BUTTON_NUM_CHANGE, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_BUTTON_NUM_CHANGE, NULL); } EAPI void @@ -1670,7 +1666,7 @@ _emotion_spu_button_set(Evas_Object *obj, int button) E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); sd->spu.button = button; - eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_BUTTON_CHANGE, NULL)); + eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_BUTTON_CHANGE, NULL); } EAPI void diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c index acf588341e..5af26b38b3 100644 --- a/src/lib/eo/eo_base_class.c +++ b/src/lib/eo/eo_base_class.c @@ -66,7 +66,7 @@ _eo_base_key_data_set(Eo *obj, Eo_Base_Data *pd, if (!key) return; - eo_do(obj, eo_key_data_del(key); ); + eo_key_data_del(obj, key); node = malloc(sizeof(Eo_Generic_Data_Node)); if (!node) return; @@ -103,9 +103,9 @@ _eo_base_parent_set(Eo *obj, Eo_Base_Data *pd, Eo *parent_id) if (pd->parent == parent_id) return; - if (eo_do_ret(obj, tmp, eo_composite_part_is()) && pd->parent) + if (eo_composite_part_is(obj) && pd->parent) { - eo_do(pd->parent, eo_composite_detach(obj)); + eo_composite_detach(pd->parent, obj); } if (pd->parent) @@ -574,7 +574,7 @@ _eo_base_event_callback_priority_add(Eo *obj, Eo_Base_Data *pd, cb->priority = priority; _eo_callbacks_sorted_insert(pd, cb); - eo_do(obj, eo_event_callback_call(EO_BASE_EVENT_CALLBACK_ADD, (void *)arr)); + eo_event_callback_call(obj, EO_BASE_EVENT_CALLBACK_ADD, (void *)arr); return EINA_TRUE; } @@ -597,7 +597,7 @@ _eo_base_event_callback_del(Eo *obj, Eo_Base_Data *pd, cb->delete_me = EINA_TRUE; pd->deletions_waiting = EINA_TRUE; _eo_callbacks_clear(pd); - eo_do(obj, eo_event_callback_call(EO_BASE_EVENT_CALLBACK_DEL, (void *)arr); ); + eo_event_callback_call(obj, EO_BASE_EVENT_CALLBACK_DEL, (void *)arr); return EINA_TRUE; } } @@ -627,7 +627,7 @@ _eo_base_event_callback_array_priority_add(Eo *obj, Eo_Base_Data *pd, cb->func_array = EINA_TRUE; _eo_callbacks_sorted_insert(pd, cb); - eo_do(obj, eo_event_callback_call(EO_BASE_EVENT_CALLBACK_ADD, (void *)array); ); + eo_event_callback_call(obj, EO_BASE_EVENT_CALLBACK_ADD, (void *)array); return EINA_TRUE; } @@ -648,7 +648,7 @@ _eo_base_event_callback_array_del(Eo *obj, Eo_Base_Data *pd, pd->deletions_waiting = EINA_TRUE; _eo_callbacks_clear(pd); - eo_do(obj, eo_event_callback_call(EO_BASE_EVENT_CALLBACK_DEL, (void *)array); ); + eo_event_callback_call(obj, EO_BASE_EVENT_CALLBACK_DEL, (void *)array); return EINA_TRUE; } } @@ -738,7 +738,7 @@ _eo_event_forwarder_callback(void *data, const Eo_Event *event) Eo *new_obj = (Eo *) data; Eina_Bool ret = EINA_FALSE; - eo_do(new_obj, ret = eo_event_callback_call(event->desc, event->event_info); ); + ret = eo_event_callback_call(new_obj, event->desc, event->event_info); return ret; } @@ -752,7 +752,7 @@ _eo_base_event_callback_forwarder_add(Eo *obj, Eo_Base_Data *pd EINA_UNUSED, /* FIXME: Add it EO_MAGIC_RETURN(new_obj, EO_EINA_MAGIC); */ - eo_do(obj, eo_event_callback_add(desc, _eo_event_forwarder_callback, new_obj); ); + eo_event_callback_add(obj, desc, _eo_event_forwarder_callback, new_obj); } EOLIAN static void @@ -763,7 +763,7 @@ _eo_base_event_callback_forwarder_del(Eo *obj, Eo_Base_Data *pd EINA_UNUSED, /* FIXME: Add it EO_MAGIC_RETURN(new_obj, EO_EINA_MAGIC); */ - eo_do(obj, eo_event_callback_del(desc, _eo_event_forwarder_callback, new_obj); ); + eo_event_callback_del(obj, desc, _eo_event_forwarder_callback, new_obj); } EOLIAN static void @@ -838,7 +838,7 @@ _eo_base_composite_attach(Eo *parent_id, Eo_Base_Data *pd EINA_UNUSED, Eo *comp_ comp_obj->composite = EINA_TRUE; parent->composite_objects = eina_list_prepend(parent->composite_objects, comp_obj_id); - eo_do(comp_obj_id, eo_parent_set(parent_id)); + eo_parent_set(comp_obj_id, parent_id); return EINA_TRUE; } @@ -854,7 +854,7 @@ _eo_base_composite_detach(Eo *parent_id, Eo_Base_Data *pd EINA_UNUSED, Eo *comp_ comp_obj->composite = EINA_FALSE; parent->composite_objects = eina_list_remove(parent->composite_objects, comp_obj_id); - eo_do(comp_obj_id, eo_parent_set(NULL)); + eo_parent_set(comp_obj_id, NULL); return EINA_TRUE; } @@ -990,14 +990,14 @@ _eo_base_destructor(Eo *obj, Eo_Base_Data *pd) while (pd->children) { child = eina_list_data_get(pd->children); - eo_do(child, eo_parent_set(NULL)); + eo_parent_set(child, NULL); } if (pd->parent) { ERR("Object '%p' still has a parent at the time of destruction.", obj); eo_ref(obj); - eo_do(obj, eo_parent_set(NULL)); + eo_parent_set(obj, NULL); } _eo_generic_data_del_all(pd); diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index 8db7adc5fd..6f2108f810 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -1685,11 +1685,10 @@ EAPI Evas_Object *evas_object_rectangle_add(Evas *e) EINA_WARN_UNUSED_RESULT EIN * Efl_Gfx_Path_Command *path_cmd = NULL; * double *points = NULL; * efl_gfx_path_append_circle(&path_cmd, &points); - * eo_do(shape, - * evas_vg_node_origin_set(10, 10), - * efl_gfx_shape_stroke_width_set(1.0), - * evas_vg_node_color_set(128, 128, 128, 80), - * efl_gfx_shape_path_set(path_cmd, points)); + * * evas_vg_node_origin_set(shape, 10, 10); + * * efl_gfx_shape_stroke_width_set(shape, 1.0); + * * evas_vg_node_color_set(shape, 128, 128, 128, 80); + * * efl_gfx_shape_path_set(shape, path_cmd, points); * @endcode * * @since 1.14 diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index d4d578932c..db08309982 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -128,8 +128,7 @@ evas_object_event_callback_all_del(Evas_Object *eo_obj) if (!obj->callbacks) return; EINA_INLIST_FOREACH_SAFE(obj->callbacks, itr, info) { - eo_do(eo_obj, eo_event_callback_del( - _legacy_evas_callback_table[info->type], _eo_evas_object_cb, info)); + eo_event_callback_del(eo_obj, _legacy_evas_callback_table[info->type], _eo_evas_object_cb, info); obj->callbacks = eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info)); @@ -155,8 +154,7 @@ evas_event_callback_all_del(Evas *eo_e) EINA_INLIST_FOREACH_SAFE(e->callbacks, itr, info) { - eo_do(eo_e, eo_event_callback_del( - _legacy_evas_callback_table[info->type], _eo_evas_cb, info)); + eo_event_callback_del(eo_e, _legacy_evas_callback_table[info->type], _eo_evas_cb, info); e->callbacks = eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info)); @@ -173,7 +171,7 @@ evas_event_callback_cleanup(Evas *eo_e) void evas_event_callback_call(Evas *eo_e, Evas_Callback_Type type, void *event_info) { - eo_do(eo_e, eo_event_callback_call(_legacy_evas_callback_table[type], event_info)); + eo_event_callback_call(eo_e, _legacy_evas_callback_table[type], event_info); } void @@ -239,7 +237,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data break; } - eo_do(eo_obj, eo_event_callback_call(_legacy_evas_callback_table[type], event_info)); + eo_event_callback_call(eo_obj, _legacy_evas_callback_table[type], event_info); if (type == EVAS_CALLBACK_MOUSE_DOWN) { @@ -291,7 +289,7 @@ evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type cb_info->type = type; const Eo_Event_Description *desc = _legacy_evas_callback_table[type]; - eo_do(eo_obj, eo_event_callback_priority_add(desc, priority, _eo_evas_object_cb, cb_info)); + eo_event_callback_priority_add(eo_obj, desc, priority, _eo_evas_object_cb, cb_info); obj->callbacks = eina_inlist_append(obj->callbacks, EINA_INLIST_GET(cb_info)); @@ -317,8 +315,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva if ((info->func == func) && (info->type == type)) { void *tmp = info->data; - eo_do(eo_obj, eo_event_callback_del( - _legacy_evas_callback_table[type], _eo_evas_object_cb, info)); + eo_event_callback_del(eo_obj, _legacy_evas_callback_table[type], _eo_evas_object_cb, info); obj->callbacks = eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info)); @@ -349,8 +346,7 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type if ((info->func == func) && (info->type == type) && info->data == data) { void *tmp = info->data; - eo_do(eo_obj, eo_event_callback_del( - _legacy_evas_callback_table[type], _eo_evas_object_cb, info)); + eo_event_callback_del(eo_obj, _legacy_evas_callback_table[type], _eo_evas_object_cb, info); obj->callbacks = eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info)); @@ -385,7 +381,7 @@ evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callb cb_info->type = type; const Eo_Event_Description *desc = _legacy_evas_callback_table[type]; - eo_do(eo_e, eo_event_callback_priority_add(desc, priority, _eo_evas_cb, cb_info)); + eo_event_callback_priority_add(eo_e, desc, priority, _eo_evas_cb, cb_info); e->callbacks = eina_inlist_append(e->callbacks, EINA_INLIST_GET(cb_info)); } @@ -410,8 +406,7 @@ evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func) if ((info->func == func) && (info->type == type)) { void *tmp = info->data; - eo_do(eo_e, eo_event_callback_del( - _legacy_evas_callback_table[type], _eo_evas_cb, info)); + eo_event_callback_del(eo_e, _legacy_evas_callback_table[type], _eo_evas_cb, info); e->callbacks = eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info)); @@ -442,8 +437,7 @@ evas_event_callback_del_full(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb if ((info->func == func) && (info->type == type) && (info->data == data)) { void *tmp = info->data; - eo_do(eo_e, eo_event_callback_del( - _legacy_evas_callback_table[type], _eo_evas_cb, info)); + eo_event_callback_del(eo_e, _legacy_evas_callback_table[type], _eo_evas_cb, info); e->callbacks = eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info)); diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.c b/src/lib/evas/canvas/evas_canvas3d_camera.c index c8ed312d23..d631df6917 100644 --- a/src/lib/evas/canvas/evas_canvas3d_camera.c +++ b/src/lib/evas/canvas/evas_canvas3d_camera.c @@ -8,7 +8,7 @@ _camera_node_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data EINA_UNUSED, void *fdata) { Evas_Canvas3D_Node *n = *(Evas_Canvas3D_Node **)key; - eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_CAMERA, (Evas_Canvas3D_Object *)fdata)); + evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_CAMERA, (Evas_Canvas3D_Object *)fdata); return EINA_TRUE; } @@ -66,8 +66,8 @@ EOLIAN static Eo * _evas_canvas3d_camera_eo_base_constructor(Eo *obj, Evas_Canvas3D_Camera_Data *pd EINA_UNUSED) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); - eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_CAMERA)); + obj = eo_constructor(eo_super(obj, MY_CLASS)); + evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_CAMERA); return obj; } @@ -92,7 +92,7 @@ _evas_canvas3d_camera_eo_base_destructor(Eo *obj, eina_hash_free(pd->nodes); } - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } EAPI Evas_Canvas3D_Camera * @@ -110,7 +110,7 @@ _evas_canvas3d_camera_projection_matrix_set(Eo *obj, Evas_Canvas3D_Camera_Data * const Evas_Real *matrix) { eina_matrix4_array_set(&pd->projection, matrix); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL); } EOLIAN static void @@ -133,7 +133,7 @@ _evas_canvas3d_camera_projection_perspective_set(Eo *obj, Evas_Canvas3D_Camera_D xmax = ymax * aspect; evas_mat4_frustum_set(&pd->projection, -xmax, xmax, -ymax, ymax, dnear, dfar); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL); } EOLIAN static void @@ -143,7 +143,7 @@ _evas_canvas3d_camera_projection_frustum_set(Eo *obj, Evas_Canvas3D_Camera_Data Evas_Real dnear, Evas_Real dfar) { evas_mat4_frustum_set(&pd->projection, left, right, bottom, top, dnear, dfar); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL); } EOLIAN static void @@ -153,7 +153,7 @@ _evas_canvas3d_camera_projection_ortho_set(Eo *obj, Evas_Canvas3D_Camera_Data *p Evas_Real dnear, Evas_Real dfar) { eina_matrix4_ortho_set(&pd->projection, left, right, bottom, top, dnear, dfar); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL); } EOLIAN static Eina_Bool diff --git a/src/lib/evas/canvas/evas_canvas3d_light.c b/src/lib/evas/canvas/evas_canvas3d_light.c index 2d7facd175..11e9c81965 100644 --- a/src/lib/evas/canvas/evas_canvas3d_light.c +++ b/src/lib/evas/canvas/evas_canvas3d_light.c @@ -8,7 +8,7 @@ _light_node_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data EINA_UNUSED, void *fdata) { Evas_Canvas3D_Node *n = *(Evas_Canvas3D_Node **)key; - eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_LIGHT, (Evas_Canvas3D_Object *)fdata)); + evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_LIGHT, (Evas_Canvas3D_Object *)fdata); return EINA_TRUE; } @@ -79,8 +79,8 @@ evas_canvas3d_light_add(Evas *e) EOLIAN static Eo * _evas_canvas3d_light_eo_base_constructor(Eo *obj, Evas_Canvas3D_Light_Data *pd) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); - eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_LIGHT)); + obj = eo_constructor(eo_super(obj, MY_CLASS)); + evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_LIGHT); evas_color_set(&pd->ambient, 0.0, 0.0, 0.0, 1.0); evas_color_set(&pd->diffuse, 1.0, 1.0, 1.0, 1.0); evas_color_set(&pd->specular, 1.0, 1.0, 1.0, 1.0); @@ -115,7 +115,7 @@ _evas_canvas3d_light_eo_base_destructor(Eo *obj, Evas_Canvas3D_Light_Data *pd) eina_hash_free(pd->nodes); } - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } @@ -125,7 +125,7 @@ _evas_canvas3d_light_directional_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Eina if (pd->directional != directional) { pd->directional = directional; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_ANY, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_ANY, NULL); } } @@ -143,7 +143,7 @@ _evas_canvas3d_light_ambient_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas_Rea pd->ambient.b = b; pd->ambient.a = a; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_AMBIENT, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_AMBIENT, NULL); } EOLIAN static void @@ -163,7 +163,7 @@ _evas_canvas3d_light_diffuse_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas_Rea pd->diffuse.b = b; pd->diffuse.a = a; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_DIFFUSE, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_DIFFUSE, NULL); } EOLIAN static void @@ -183,7 +183,7 @@ _evas_canvas3d_light_specular_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas_Re pd->specular.b = b; pd->specular.a = a; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_SPECULAR, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_SPECULAR, NULL); } EOLIAN static void @@ -199,7 +199,7 @@ EOLIAN static void _evas_canvas3d_light_spot_exponent_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas_Real exponent) { pd->spot_exp = exponent; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_SPOT_EXP, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_SPOT_EXP, NULL); } EOLIAN static Evas_Real @@ -213,7 +213,7 @@ _evas_canvas3d_light_spot_cutoff_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas { pd->spot_cutoff = cutoff; pd->spot_cutoff_cos = cos(cutoff * M_PI / 180.0); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_SPOT_CUTOFF, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_SPOT_CUTOFF, NULL); } EOLIAN static Evas_Real @@ -228,7 +228,7 @@ _evas_canvas3d_light_attenuation_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas pd->atten_const = constant; pd->atten_linear = linear; pd->atten_quad = quadratic; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_ATTENUATION, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_ATTENUATION, NULL); } EOLIAN static void @@ -245,7 +245,7 @@ _evas_canvas3d_light_attenuation_enable_set(Eo *obj, Evas_Canvas3D_Light_Data *p if (pd->enable_attenuation != enable) { pd->enable_attenuation = enable; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_ATTENUATION, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_ATTENUATION, NULL); } } @@ -260,7 +260,7 @@ _evas_canvas3d_light_projection_matrix_set(Eo *obj, Evas_Canvas3D_Light_Data *pd const Evas_Real *matrix) { eina_matrix4_array_set(&pd->projection, matrix); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_PROJECTION, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_PROJECTION, NULL); } EOLIAN static void @@ -283,7 +283,7 @@ _evas_canvas3d_light_projection_perspective_set(Eo *obj, Evas_Canvas3D_Light_Dat xmax = ymax * aspect; evas_mat4_frustum_set(&pd->projection, -xmax, xmax, -ymax, ymax, dnear, dfar); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_PROJECTION, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_PROJECTION, NULL); } EOLIAN static void @@ -293,7 +293,7 @@ _evas_canvas3d_light_projection_frustum_set(Eo *obj, Evas_Canvas3D_Light_Data *p Evas_Real dnear, Evas_Real dfar) { evas_mat4_frustum_set(&pd->projection, left, right, bottom, top, dnear, dfar); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_PROJECTION, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_PROJECTION, NULL); } EOLIAN static void @@ -303,7 +303,7 @@ _evas_canvas3d_light_projection_ortho_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas_Real dnear, Evas_Real dfar) { eina_matrix4_ortho_set(&pd->projection, left, right, bottom, top, dnear, dfar); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_PROJECTION, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_PROJECTION, NULL); } diff --git a/src/lib/evas/canvas/evas_canvas3d_material.c b/src/lib/evas/canvas/evas_canvas3d_material.c index 8ce248670a..5070d44450 100644 --- a/src/lib/evas/canvas/evas_canvas3d_material.c +++ b/src/lib/evas/canvas/evas_canvas3d_material.c @@ -8,7 +8,7 @@ _material_mesh_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data EINA_UNUSED, void *fdata) { Evas_Canvas3D_Mesh *m = *(Evas_Canvas3D_Mesh **)key; - eo_do(m, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_MATERIAL, (Evas_Canvas3D_Object *)fdata)); + evas_canvas3d_object_change(m, EVAS_CANVAS3D_STATE_MESH_MATERIAL, (Evas_Canvas3D_Object *)fdata); return EINA_TRUE; } @@ -29,7 +29,7 @@ _evas_canvas3d_material_evas_canvas3d_object_update_notify(Eo *obj EINA_UNUSED, { if (pd->attribs[i].texture) { - eo_do(pd->attribs[i].texture, evas_canvas3d_object_update()); + evas_canvas3d_object_update(pd->attribs[i].texture); } } } @@ -91,8 +91,8 @@ evas_canvas3d_material_add(Evas *e) EOLIAN static Eo * _evas_canvas3d_material_eo_base_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_Material_Data *pd) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); - eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_MATERIAL)); + obj = eo_constructor(eo_super(obj, MY_CLASS)); + evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MATERIAL); evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].color, 0.2, 0.2, 0.2, 1.0); evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE].color, 0.8, 0.8, 0.8, 1.0); @@ -136,7 +136,7 @@ _evas_canvas3d_material_eo_base_destructor(Eo *obj, Evas_Canvas3D_Material_Data evas_canvas3d_texture_material_del(pd->attribs[i].texture, obj); } } - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } EOLIAN static void @@ -155,7 +155,7 @@ EOLIAN static void _evas_canvas3d_material_color_set(Eo *obj, Evas_Canvas3D_Material_Data *pd, Evas_Canvas3D_Material_Attrib attrib, Evas_Real r, Evas_Real g, Evas_Real b, Evas_Real a) { evas_color_set(&pd->attribs[attrib].color, r, g, b, a); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MATERIAL_COLOR, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MATERIAL_COLOR, NULL); } EOLIAN static void @@ -195,7 +195,7 @@ _evas_canvas3d_material_texture_set(Eo *obj, Evas_Canvas3D_Material_Data *pd, Ev eo_ref(texture); } - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MATERIAL_TEXTURE, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MATERIAL_TEXTURE, NULL); } EOLIAN static Evas_Canvas3D_Texture * diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c index 84403c3983..d19a1fc39a 100644 --- a/src/lib/evas/canvas/evas_canvas3d_mesh.c +++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c @@ -163,7 +163,7 @@ _mesh_node_geometry_change_notify(const Eina_Hash *hash EINA_UNUSED, const void void *data EINA_UNUSED, void *fdata) { Evas_Canvas3D_Node *n = *(Evas_Canvas3D_Node **)key; - eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, (Evas_Canvas3D_Object *)fdata)); + evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, (Evas_Canvas3D_Object *)fdata); return EINA_TRUE; } @@ -172,7 +172,7 @@ _mesh_node_material_change_notify(const Eina_Hash *hash EINA_UNUSED, const void void *data EINA_UNUSED, void *fdata) { Evas_Canvas3D_Node *n = *(Evas_Canvas3D_Node **)key; - eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, (Evas_Canvas3D_Object *)fdata)); + evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, (Evas_Canvas3D_Object *)fdata); return EINA_TRUE; } @@ -201,7 +201,7 @@ _evas_canvas3d_mesh_evas_canvas3d_object_update_notify(Eo *obj EINA_UNUSED, Evas { if (f->material) { - eo_do(f->material, evas_canvas3d_object_update()); + evas_canvas3d_object_update(f->material); } } } @@ -261,8 +261,8 @@ evas_canvas3d_mesh_add(Evas *e) EOLIAN static Eo * _evas_canvas3d_mesh_eo_base_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); - eo_do (obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_MESH)); + obj = eo_constructor(eo_super(obj, MY_CLASS)); + evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MESH); _mesh_init(pd); return obj; @@ -272,7 +272,7 @@ EOLIAN static void _evas_canvas3d_mesh_eo_base_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd) { _mesh_fini(pd); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } EOLIAN static void @@ -281,7 +281,7 @@ _evas_canvas3d_mesh_shade_mode_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data if (pd->shade_mode != mode) { pd->shade_mode = mode; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_SHADE_MODE, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_SHADE_MODE, NULL); } } @@ -295,7 +295,7 @@ EOLIAN static void _evas_canvas3d_mesh_vertex_count_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, unsigned int count) { pd->vertex_count = count; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_VERTEX_COUNT, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_VERTEX_COUNT, NULL); } EOLIAN static unsigned int @@ -333,7 +333,7 @@ _evas_canvas3d_mesh_frame_add(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, int frame) f->frame = frame; pd->frames = eina_list_append(pd->frames, f); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_FRAME, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_FRAME, NULL); } EOLIAN static void @@ -349,7 +349,7 @@ _evas_canvas3d_mesh_frame_del(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, int frame) pd->frames = eina_list_remove(pd->frames, f); evas_canvas3d_mesh_frame_free(f); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_FRAME, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_FRAME, NULL); } EOLIAN static void @@ -374,7 +374,7 @@ _evas_canvas3d_mesh_frame_material_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, int f->material = material; eo_ref(material); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_MATERIAL, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_MATERIAL, NULL); evas_canvas3d_material_mesh_add(material, obj); } @@ -477,7 +477,7 @@ _evas_canvas3d_mesh_frame_vertex_data_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, f->vertices[attrib].owns_data = EINA_FALSE; f->vertices[attrib].element_count = element_count; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_VERTEX_DATA, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_VERTEX_DATA, NULL); } EOLIAN static void @@ -601,7 +601,7 @@ _evas_canvas3d_mesh_frame_vertex_data_copy_set(Eo *obj, Evas_Canvas3D_Mesh_Data ERR("Axis-Aligned Bounding Box wasn't added in frame %d ", frame); } - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_VERTEX_DATA, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_VERTEX_DATA, NULL); } EOLIAN static void * @@ -671,7 +671,7 @@ _evas_canvas3d_mesh_index_data_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas_Ca pd->indices = (void *)indices; pd->owns_indices = EINA_FALSE; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_INDEX_DATA, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_INDEX_DATA, NULL); } EOLIAN static void @@ -758,7 +758,7 @@ EOLIAN static void _evas_canvas3d_mesh_vertex_assembly_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas_Canvas3D_Vertex_Assembly assembly) { pd->assembly = assembly; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_VERTEX_ASSEMBLY, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_VERTEX_ASSEMBLY, NULL); } EOLIAN static Evas_Canvas3D_Vertex_Assembly @@ -771,7 +771,7 @@ EOLIAN static void _evas_canvas3d_mesh_fog_color_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas_Real r, Evas_Real g, Evas_Real b, Evas_Real a) { evas_color_set(&pd->fog_color, r, g, b, a); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_FOG, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_FOG, NULL); } EOLIAN static void @@ -788,7 +788,7 @@ EOLIAN static void _evas_canvas3d_mesh_fog_enable_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Eina_Bool enabled) { pd->fog_enabled = enabled; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_FOG, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_FOG, NULL); } EOLIAN static Eina_Bool @@ -801,7 +801,7 @@ EOLIAN static void _evas_canvas3d_mesh_blending_enable_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Eina_Bool blending) { pd->blending = blending; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_BLENDING, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_BLENDING, NULL); } EOLIAN static Eina_Bool @@ -815,7 +815,7 @@ _evas_canvas3d_mesh_blending_func_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas { pd->blend_sfactor = sfactor; pd->blend_dfactor = dfactor; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_BLENDING, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_BLENDING, NULL); } EOLIAN static void @@ -834,7 +834,7 @@ _evas_canvas3d_mesh_alpha_func_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas_Ca return; pd->alpha_comparison = comparison; pd->alpha_ref_value = ref_value; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_ALPHA_TEST, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_ALPHA_TEST, NULL); } EOLIAN static void @@ -850,7 +850,7 @@ EOLIAN static void _evas_canvas3d_mesh_alpha_test_enable_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Eina_Bool enabled) { pd->alpha_test_enabled = enabled; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_ALPHA_TEST, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_ALPHA_TEST, NULL); } EOLIAN static Eina_Bool @@ -1087,7 +1087,7 @@ _evas_canvas3d_mesh_color_pick_enable_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, { if (pd->color_pick_enabled != enabled) pd->color_pick_enabled = enabled; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_COLOR_PICK, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_COLOR_PICK, NULL); } EOLIAN static void @@ -1098,7 +1098,7 @@ _evas_canvas3d_mesh_shadows_edges_filtering_set(Eo *obj, Evas_Canvas3D_Mesh_Data pd->shadows_edges_filtering_level = blur_level; if (edges_size >= 0) pd->shadows_edges_size = edges_size; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_SHADOWS_EDGES_FILTERING, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_SHADOWS_EDGES_FILTERING, NULL); } EOLIAN static void @@ -1116,7 +1116,7 @@ _evas_canvas3d_mesh_shadows_constant_bias_set(Eo *obj EINA_UNUSED, Evas_Canvas3D if (pd->shadows_constant_bias != bias) { pd->shadows_constant_bias = bias; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_SHADOWS_CONSTANT_BIAS, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_SHADOWS_CONSTANT_BIAS, NULL); } } diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c index 965e0906ac..010d161201 100644 --- a/src/lib/evas/canvas/evas_canvas3d_node.c +++ b/src/lib/evas/canvas/evas_canvas3d_node.c @@ -70,7 +70,7 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event { pd = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS); if (box_intersection_box(&pd_target->aabb, &pd->aabb)) - eo_do(target_node, ret = eo_event_callback_call(eo_desc, n)); + ret = eo_event_callback_call(target_node, eo_desc, n); } return ret; } @@ -81,7 +81,7 @@ _evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, const Eo_Ev { Eina_Bool ret = EINA_FALSE; const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get("clicked"); - eo_do((Eo *)event->event_info, ret = eo_event_callback_call(eo_desc, event->event_info)); + ret = eo_event_callback_call((Eo *)event->event_info, eo_desc, event->event_info); return ret; } @@ -121,7 +121,7 @@ _node_scene_root_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *ke void *data EINA_UNUSED, void *fdata) { Evas_Canvas3D_Scene *s = *(Evas_Canvas3D_Scene **)key; - eo_do(s, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_ROOT_NODE, (Evas_Canvas3D_Object *)fdata)); + evas_canvas3d_object_change(s, EVAS_CANVAS3D_STATE_SCENE_ROOT_NODE, (Evas_Canvas3D_Object *)fdata); return EINA_TRUE; } @@ -130,7 +130,7 @@ _node_scene_camera_change_notify(const Eina_Hash *hash EINA_UNUSED, const void * void *data EINA_UNUSED, void *fdata) { Evas_Canvas3D_Scene *s = *(Evas_Canvas3D_Scene **)key; - eo_do(s, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_CAMERA_NODE, (Evas_Canvas3D_Object *)fdata)); + evas_canvas3d_object_change(s, EVAS_CANVAS3D_STATE_SCENE_CAMERA_NODE, (Evas_Canvas3D_Object *)fdata); return EINA_TRUE; } @@ -158,7 +158,7 @@ _evas_canvas3d_node_evas_canvas3d_object_change_notify(Eo *obj, Evas_Canvas3D_No /* Notify parent that a member has changed. */ if (pd->parent && !parent_change) { - eo_do(pd->parent, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MEMBER, obj)); + evas_canvas3d_object_change(pd->parent, EVAS_CANVAS3D_STATE_NODE_MEMBER, obj); } orientation = (state == EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION) @@ -172,7 +172,7 @@ _evas_canvas3d_node_evas_canvas3d_object_change_notify(Eo *obj, Evas_Canvas3D_No if (scale) EINA_LIST_FOREACH(pd->members, l, n) { - eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, obj)); + evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, obj); } if (orientation && !(pd->billboard_target)) EINA_LIST_FOREACH(pd->members, l, n) @@ -181,12 +181,12 @@ _evas_canvas3d_node_evas_canvas3d_object_change_notify(Eo *obj, Evas_Canvas3D_No Evas_Canvas3D_Node_Data *pdm = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS); if (pdm->billboard_target) continue; - eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, obj)); + evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, obj); } if (position) EINA_LIST_FOREACH(pd->members, l, n) { - eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION, obj)); + evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION, obj); } } @@ -199,8 +199,7 @@ _evas_canvas3d_node_evas_canvas3d_object_callback_register(Eo *obj, Evas_Canvas3 GET_CALLBACK_TYPE(tcb, event) if (tcb != PRIVATE_CALLBACK_NONE) - eo_do(obj, eo_event_callback_add(&evas_canvas3d_node_private_event_desc[tcb], - evas_canvas3d_node_private_callback_functions[tcb], data)); + eo_event_callback_add(obj, &evas_canvas3d_node_private_event_desc[tcb], evas_canvas3d_node_private_callback_functions[tcb], data); } @@ -213,8 +212,7 @@ _evas_canvas3d_node_evas_canvas3d_object_callback_unregister(Eo *obj, Evas_Canva GET_CALLBACK_TYPE(tcb, event) if (tcb != PRIVATE_CALLBACK_NONE) - eo_do(obj, eo_event_callback_del(&evas_canvas3d_node_private_event_desc[tcb], - evas_canvas3d_node_private_callback_functions[tcb], NULL)); + eo_event_callback_del(obj, &evas_canvas3d_node_private_event_desc[tcb], evas_canvas3d_node_private_callback_functions[tcb], NULL); } static Eina_Bool @@ -223,13 +221,12 @@ _node_transform_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED) Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS); Eina_Bool transform_dirty = EINA_FALSE, parent_dirty = EINA_FALSE; - eo_do(node, - transform_dirty = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION), - transform_dirty|= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION), - transform_dirty|= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE), - parent_dirty = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION), - parent_dirty |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION), - parent_dirty |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE)); + transform_dirty = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION); + transform_dirty|= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION); + transform_dirty|= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE); + parent_dirty = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION); + parent_dirty |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION); + parent_dirty |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE); if (transform_dirty || parent_dirty) { @@ -355,14 +352,14 @@ _node_item_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED) { if (pd->data.camera.camera) { - eo_do(pd->data.camera.camera, evas_canvas3d_object_update()); + evas_canvas3d_object_update(pd->data.camera.camera); } } else if (pd->type == EVAS_CANVAS3D_NODE_TYPE_LIGHT) { if (pd->data.light.light) { - eo_do(pd->data.light.light, evas_canvas3d_object_update()); + evas_canvas3d_object_update(pd->data.light.light); } } else if (pd->type == EVAS_CANVAS3D_NODE_TYPE_MESH) @@ -371,7 +368,7 @@ _node_item_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED) Evas_Canvas3D_Mesh *m; EINA_LIST_FOREACH(pd->data.mesh.meshes, l, m) { - eo_do(m, evas_canvas3d_object_update()); + evas_canvas3d_object_update(m); } } @@ -390,10 +387,10 @@ _pack_meshes_vertex_data(Evas_Canvas3D_Node *node, Eina_Vector3 **vertices, int Evas_Real pos_weight; *count = 0; - eo_do(node, m = (Eina_List *)evas_canvas3d_node_mesh_list_get()); + m = (Eina_List *)evas_canvas3d_node_mesh_list_get(node); EINA_LIST_FOREACH(m, l, mesh) { - eo_do(node, frame = evas_canvas3d_node_mesh_frame_get(mesh)); + frame = evas_canvas3d_node_mesh_frame_get(node, mesh); evas_canvas3d_mesh_interpolate_vertex_buffer_get(mesh, frame, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, &pos0, &pos1, &pos_weight); if(!pos0.data) continue; @@ -416,7 +413,7 @@ _pack_meshes_vertex_data(Evas_Canvas3D_Node *node, Eina_Vector3 **vertices, int EINA_LIST_FOREACH(m, l, mesh) { - eo_do(node, frame = evas_canvas3d_node_mesh_frame_get(mesh)); + frame = evas_canvas3d_node_mesh_frame_get(node, mesh); evas_canvas3d_mesh_interpolate_vertex_buffer_get(mesh, frame, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, &pos0, &pos1, &pos_weight); if(!pos0.data) continue; @@ -461,15 +458,14 @@ _update_node_shapes(Evas_Canvas3D_Node *node) return; } - eo_do(node, - transform_orientation_dirty = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION), - transform_orientation_dirty |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION), - transform_position_dirty = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION), - transform_position_dirty |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION), - transform_scale_dirty = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE), - transform_scale_dirty |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE), - mesh_geom_dirty = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY), - mesh_geom_dirty |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_MESH_FRAME)); + transform_orientation_dirty = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION); + transform_orientation_dirty |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION); + transform_position_dirty = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION); + transform_position_dirty |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION); + transform_scale_dirty = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE); + transform_scale_dirty |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE); + mesh_geom_dirty = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY); + mesh_geom_dirty |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_MESH_FRAME); _pack_meshes_vertex_data(node, &vertices, &count); @@ -510,7 +506,7 @@ node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED) evas_build_sphere(&pd->aabb, &pd->bsphere); eo_desc = eo_base_legacy_only_event_description_get("collision,private"); - eo_do(node, eo_event_callback_call(eo_desc, (void *)node)); + eo_event_callback_call(node, eo_desc, (void *)node); return EINA_TRUE; } @@ -569,7 +565,7 @@ _node_free(Evas_Canvas3D_Object *obj) if (pd->parent) { - eo_do(pd->parent, evas_canvas3d_node_member_del(obj)); + evas_canvas3d_node_member_del(pd->parent, obj); } if (pd->type == EVAS_CANVAS3D_NODE_TYPE_MESH && pd->data.mesh.meshes) @@ -898,7 +894,7 @@ evas_canvas3d_node_mesh_collect(Evas_Canvas3D_Node *node, void *data) scene_data->mesh_nodes = eina_list_append(scene_data->mesh_nodes, node); /* calculation of tangent space for all meshes */ - eo_do (node, list_meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get()); + list_meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(node); EINA_LIST_FOREACH(list_meshes, l, mesh) { mesh_pd = eo_data_scope_get(mesh, MY_CLASS); @@ -937,7 +933,7 @@ evas_canvas3d_node_mesh_collect(Evas_Canvas3D_Node *node, void *data) evas_tangent_space_get(vertex_data, tex_data, normal_data, index, mesh_pd->vertex_count, mesh_pd->index_count, stride, tex_stride, normal_stride, &tangent_data); - eo_do(mesh, evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT, 3 * sizeof(float), tangent_data)); + evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT, 3 * sizeof(float), tangent_data); free(tangent_data); } } @@ -967,16 +963,14 @@ evas_canvas3d_node_color_node_mesh_collect(Evas_Canvas3D_Node *node, void *data) Eina_Array *arr; if (pd->type == EVAS_CANVAS3D_NODE_TYPE_MESH) { - eo_do(camera, - visible = evas_canvas3d_camera_node_visible_get(scene_data->camera_node, - node, EVAS_CANVAS3D_FRUSTUM_MODE_BSPHERE)); + visible = evas_canvas3d_camera_node_visible_get(camera, scene_data->camera_node, node, EVAS_CANVAS3D_FRUSTUM_MODE_BSPHERE); if (visible) { - eo_do (node, list_meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get()); + list_meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(node); EINA_LIST_FOREACH(list_meshes, l, mesh) { Eina_Bool tmp; - if (eo_do_ret(mesh, tmp, evas_canvas3d_mesh_color_pick_enable_get())) + if (evas_canvas3d_mesh_color_pick_enable_get(mesh)) { color = calloc(1, sizeof(Evas_Color)); @@ -1019,14 +1013,14 @@ evas_canvas3d_node_add(Evas *e, Evas_Canvas3D_Node_Type type) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = eo_add(MY_CLASS, e, evas_canvas3d_node_constructor(type)); + Evas_Object *eo_obj = eo_add(MY_CLASS, e, evas_canvas3d_node_constructor(eoid, type)); return eo_obj; } EOLIAN static void _evas_canvas3d_node_constructor(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Node_Type type) { - eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_NODE)); + evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_NODE); eina_vector3_set(&pd->position, 0.0, 0.0, 0.0); eina_quaternion_set(&pd->orientation, 0.0, 0.0, 0.0, 1.0); @@ -1062,7 +1056,7 @@ _evas_canvas3d_node_eo_base_destructor(Eo *obj, Evas_Canvas3D_Node_Data *pd EINA { _node_free(obj); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } EOLIAN static Evas_Canvas3D_Node_Type @@ -1090,7 +1084,7 @@ _evas_canvas3d_node_member_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas pdmemberparent->members = eina_list_remove(pdmemberparent->members, member); /* Mark changed. */ - eo_do(pdmember->parent, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MEMBER, NULL)); + evas_canvas3d_object_change(pdmember->parent, EVAS_CANVAS3D_STATE_NODE_MEMBER, NULL); } else { @@ -1103,10 +1097,10 @@ _evas_canvas3d_node_member_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas pdmember->parent = obj; /* Mark changed. */ - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MEMBER, NULL)); - eo_do(member, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, NULL)); - eo_do(member, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION, NULL)); - eo_do(member, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MEMBER, NULL); + evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, NULL); + evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION, NULL); + evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, NULL); } EOLIAN static void @@ -1124,10 +1118,10 @@ _evas_canvas3d_node_member_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas pdmember->parent = NULL; /* Mark modified object as changed. */ - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MEMBER, NULL)); - eo_do(member, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, NULL)); - eo_do(member, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION, NULL)); - eo_do(member, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MEMBER, NULL); + evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, NULL); + evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION, NULL); + evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, NULL); /* Decrease reference count. */ eo_unref(member); @@ -1152,7 +1146,7 @@ _evas_canvas3d_node_position_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Real pd->position.y = y; pd->position.z = z; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION, NULL); } EOLIAN static void @@ -1163,7 +1157,7 @@ _evas_canvas3d_node_orientation_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_R pd->orientation.z = z; pd->orientation.w = w; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL); } EOLIAN static void @@ -1182,7 +1176,7 @@ _evas_canvas3d_node_orientation_angle_axis_set(Eo *obj, Evas_Canvas3D_Node_Data pd->orientation.y = s * axis.y; pd->orientation.z = s * axis.z; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL); } EOLIAN static void @@ -1192,7 +1186,7 @@ _evas_canvas3d_node_scale_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Real x, pd->scale.y = y; pd->scale.z = z; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE, NULL); } EOLIAN static void @@ -1213,7 +1207,7 @@ _evas_canvas3d_node_position_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd, Eva } else if (space == EVAS_CANVAS3D_SPACE_WORLD) { - eo_do(obj, evas_canvas3d_object_update()); + evas_canvas3d_object_update(obj); if (x) *x = pd->position_world.x; if (y) *y = pd->position_world.y; @@ -1241,7 +1235,7 @@ _evas_canvas3d_node_orientation_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd, } else if (space == EVAS_CANVAS3D_SPACE_WORLD) { - eo_do(obj, evas_canvas3d_object_update()); + evas_canvas3d_object_update(obj); if (x) *x = pd->orientation_world.x; if (y) *y = pd->orientation_world.y; @@ -1269,7 +1263,7 @@ _evas_canvas3d_node_scale_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_C } else if (space == EVAS_CANVAS3D_SPACE_WORLD) { - eo_do(obj, evas_canvas3d_object_update()); + evas_canvas3d_object_update(obj); if (x) *x = pd->scale_world.x; if (y) *y = pd->scale_world.y; @@ -1281,21 +1275,21 @@ EOLIAN static void _evas_canvas3d_node_position_inherit_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Eina_Bool inherit) { pd->position_inherit = inherit; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION, NULL); } EOLIAN static void _evas_canvas3d_node_orientation_inherit_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Eina_Bool inherit) { pd->orientation_inherit = inherit; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL); } EOLIAN static void _evas_canvas3d_node_scale_inherit_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Eina_Bool inherit) { pd->scale_inherit = inherit; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE, NULL); } EOLIAN static Eina_Bool @@ -1430,7 +1424,7 @@ _evas_canvas3d_node_look_at_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, _look_at_set(pd, &target, &up); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL); } EOLIAN static void @@ -1459,7 +1453,7 @@ _evas_canvas3d_node_camera_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas evas_canvas3d_camera_node_add(camera, obj); /* Mark changed. */ - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_CAMERA, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_CAMERA, NULL); } EOLIAN static Evas_Canvas3D_Camera * @@ -1494,7 +1488,7 @@ _evas_canvas3d_node_light_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3 evas_canvas3d_light_node_add(light, obj); /* Mark changed. */ - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_LIGHT, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_LIGHT, NULL); } EOLIAN static Evas_Canvas3D_Light * @@ -1541,8 +1535,8 @@ _evas_canvas3d_node_mesh_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D evas_canvas3d_mesh_node_add(mesh, obj); /* Mark changed. */ - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, NULL)); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, NULL); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, NULL); } EOLIAN static void @@ -1564,8 +1558,8 @@ _evas_canvas3d_node_mesh_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D evas_canvas3d_mesh_node_del(mesh, obj); eo_unref(mesh); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, NULL)); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, NULL); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, NULL); } EOLIAN static const Eina_List * @@ -1592,7 +1586,7 @@ _evas_canvas3d_node_mesh_frame_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Ca } nm->frame = frame; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MESH_FRAME, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_FRAME, NULL); } EOLIAN static int @@ -1618,7 +1612,7 @@ _evas_canvas3d_node_mesh_frame_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data EOLIAN static void _evas_canvas3d_node_bounding_box_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd, Evas_Real *x, Evas_Real *y, Evas_Real *z, Evas_Real *x2, Evas_Real *y2, Evas_Real *z2) { - eo_do(obj, evas_canvas3d_object_update()); + evas_canvas3d_object_update(obj); evas_canvas3d_node_tree_traverse(obj, EVAS_CANVAS3D_TREE_TRAVERSE_LEVEL_ORDER, EINA_FALSE, node_aabb_update, NULL); @@ -1633,7 +1627,7 @@ _evas_canvas3d_node_bounding_box_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Dat EOLIAN static void _evas_canvas3d_node_bounding_sphere_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd, Evas_Real *x, Evas_Real *y, Evas_Real *z, Evas_Real *r) { - eo_do(obj, evas_canvas3d_object_update()); + evas_canvas3d_object_update(obj); evas_canvas3d_node_tree_traverse(obj, EVAS_CANVAS3D_TREE_TRAVERSE_LEVEL_ORDER, EINA_FALSE, node_aabb_update, NULL); @@ -1650,7 +1644,7 @@ _evas_canvas3d_node_billboard_target_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node if (pd->billboard_target != target) { pd->billboard_target = target; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_BILLBOARD, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_PARENT_BILLBOARD, NULL); } } diff --git a/src/lib/evas/canvas/evas_canvas3d_object.c b/src/lib/evas/canvas/evas_canvas3d_object.c index e9604fa589..04b03190f7 100644 --- a/src/lib/evas/canvas/evas_canvas3d_object.c +++ b/src/lib/evas/canvas/evas_canvas3d_object.c @@ -7,8 +7,8 @@ EOLIAN static Eo * _evas_canvas3d_object_eo_base_constructor(Eo *obj, Evas_Canvas3D_Object_Data *pd) { Eo *e = NULL; - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); - eo_do(obj, e = eo_parent_get()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); + e = eo_parent_get(obj); pd->evas = e; pd->type = EVAS_CANVAS3D_OBJECT_TYPE_INVALID; memset(&pd->dirty[0], 0x00, sizeof(Eina_Bool) * EVAS_CANVAS3D_STATE_MAX); @@ -50,7 +50,7 @@ _evas_canvas3d_object_change(Eo *obj, Evas_Canvas3D_Object_Data *pd, Evas_Canvas pd->dirty[state] = EINA_TRUE; pd->dirty[EVAS_CANVAS3D_STATE_ANY] = EINA_TRUE; - eo_do(obj, evas_canvas3d_object_change_notify(state, ref)); + evas_canvas3d_object_change_notify(obj, state, ref); } EOLIAN static void @@ -59,7 +59,7 @@ _evas_canvas3d_object_update(Eo *obj, Evas_Canvas3D_Object_Data *pd) if (!pd->dirty[EVAS_CANVAS3D_STATE_ANY]) return; - eo_do(obj, evas_canvas3d_object_update_notify()); + evas_canvas3d_object_update_notify(obj); memset(&pd->dirty[0], 0x00, sizeof(Eina_Bool) * EVAS_CANVAS3D_STATE_MAX); } @@ -74,8 +74,8 @@ _evas_canvas3d_object_eo_base_event_callback_priority_add(Eo *obj, { Eina_Bool r = EINA_FALSE; - eo_do_super(obj, MY_CLASS, r = eo_event_callback_priority_add(desc, priority, func, user_data)); - eo_do(obj, evas_canvas3d_object_callback_register(desc->name, user_data)); + r = eo_event_callback_priority_add(eo_super(obj, MY_CLASS), desc, priority, func, user_data); + evas_canvas3d_object_callback_register(obj, desc->name, user_data); return r; } @@ -87,8 +87,8 @@ _evas_canvas3d_object_eo_base_event_callback_del(Eo *obj, Evas_Canvas3D_Object_D const void *user_data) { Eina_Bool r = EINA_FALSE; - eo_do_super(obj, MY_CLASS, r = eo_event_callback_del(desc, func, user_data)); - if (r) eo_do(obj, evas_canvas3d_object_callback_unregister(desc->name)); + r = eo_event_callback_del(eo_super(obj, MY_CLASS), desc, func, user_data); + if (r) evas_canvas3d_object_callback_unregister(obj, desc->name); return r; } diff --git a/src/lib/evas/canvas/evas_canvas3d_primitive.c b/src/lib/evas/canvas/evas_canvas3d_primitive.c index 28e747ce5a..76dcdd6746 100644 --- a/src/lib/evas/canvas/evas_canvas3d_primitive.c +++ b/src/lib/evas/canvas/evas_canvas3d_primitive.c @@ -27,8 +27,8 @@ evas_canvas3d_primitive_add(Evas *e) EOLIAN static Eo * _evas_canvas3d_primitive_eo_base_constructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); - eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_PRIMITIVE)); + obj = eo_constructor(eo_super(obj, MY_CLASS)); + evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_PRIMITIVE); _primitive_init(pd); return obj; @@ -37,7 +37,7 @@ _evas_canvas3d_primitive_eo_base_constructor(Eo *obj, Evas_Canvas3D_Primitive_Da EOLIAN static void _evas_canvas3d_primitive_eo_base_destructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } EOLIAN static void diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.c b/src/lib/evas/canvas/evas_canvas3d_scene.c index 3030704853..c7b229e8ac 100644 --- a/src/lib/evas/canvas/evas_canvas3d_scene.c +++ b/src/lib/evas/canvas/evas_canvas3d_scene.c @@ -44,15 +44,15 @@ _evas_canvas3d_scene_evas_canvas3d_object_update_notify(Eo *obj EINA_UNUSED, Eva { if (pd->root_node) { - eo_do(pd->root_node, evas_canvas3d_object_update()); + evas_canvas3d_object_update(pd->root_node); } if (pd->camera_node) { - eo_do(pd->camera_node, evas_canvas3d_object_update()); + evas_canvas3d_object_update(pd->camera_node); } - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_UPDATED, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_SCENE_UPDATED, NULL); } EAPI Evas_Canvas3D_Scene * @@ -68,8 +68,8 @@ evas_canvas3d_scene_add(Evas *e) EOLIAN static Eo * _evas_canvas3d_scene_eo_base_constructor(Eo *obj, Evas_Canvas3D_Scene_Data *pd) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); - eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_SCENE)); + obj = eo_constructor(eo_super(obj, MY_CLASS)); + evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_SCENE); evas_color_set(&pd->bg_color, 0.0, 0.0, 0.0, 0.0); pd->shadows_enabled = EINA_FALSE; pd->color_pick_enabled = EINA_FALSE; @@ -101,7 +101,7 @@ _evas_canvas3d_scene_root_node_set(Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_C evas_canvas3d_node_scene_root_add(node, obj); } - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_ROOT_NODE, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_SCENE_ROOT_NODE, NULL); } EOLIAN static Evas_Canvas3D_Node * @@ -130,7 +130,7 @@ _evas_canvas3d_scene_camera_node_set(Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas evas_canvas3d_node_scene_camera_add(node, obj); } - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_CAMERA_NODE, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_SCENE_CAMERA_NODE, NULL); } EOLIAN static Evas_Canvas3D_Node * @@ -144,7 +144,7 @@ _evas_canvas3d_scene_size_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd, { pd->w = w; pd->h = h; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_SIZE, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_SCENE_SIZE, NULL); } EOLIAN static void @@ -159,7 +159,7 @@ _evas_canvas3d_scene_background_color_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Sce Evas_Real r, Evas_Real g, Evas_Real b, Evas_Real a) { evas_color_set(&pd->bg_color, r, g, b, a); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_BACKGROUND_COLOR, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_SCENE_BACKGROUND_COLOR, NULL); } EOLIAN static void @@ -635,7 +635,7 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real scene_data.shadows_enabled = pd->shadows_enabled; scene_data.camera_node = pd->camera_node; scene_data.color_pick_enabled = pd->color_pick_enabled; - eo_do(obj, update_scene = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_SCENE_UPDATED)); + update_scene = evas_canvas3d_object_dirty_get(obj, EVAS_CANVAS3D_STATE_SCENE_UPDATED); if (update_scene) { if (pd->node_mesh_colors) @@ -675,7 +675,7 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real /*Calling callback clicked*/ eo_desc = eo_base_legacy_only_event_description_get("clicked,private"); - eo_do(picked_node, eo_event_callback_call(eo_desc, picked_node)); + eo_event_callback_call(picked_node, eo_desc, picked_node); return EINA_TRUE; } @@ -691,7 +691,7 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real return EINA_FALSE; } /* Update the scene graph. */ - eo_do(obj, evas_canvas3d_object_update()); + evas_canvas3d_object_update(obj); pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS); pd_camera = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS); eina_matrix4_multiply(&data.matrix_vp, @@ -714,7 +714,7 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real /*Calling callback clicked*/ eo_desc = eo_base_legacy_only_event_description_get("clicked,private"); - eo_do(data.node, eo_event_callback_call(eo_desc, data.node)); + eo_event_callback_call(data.node, eo_desc, data.node); return EINA_TRUE; } @@ -737,7 +737,7 @@ _evas_canvas3d_scene_exist(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Rea data.t = 0.0; /* Update the scene graph. */ - eo_do(obj, evas_canvas3d_object_update()); + evas_canvas3d_object_update(obj); pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS); pd_camera = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS); eina_matrix4_multiply(&data.matrix_vp, @@ -763,18 +763,18 @@ _evas_canvas3d_scene_pick_member_list_get(const Eo *obj, Evas_Canvas3D_Scene_Dat Eina_Bool pick = EINA_FALSE; /* Check pick for given scene. */ - eo_do(obj, pick = evas_canvas3d_scene_pick(x, y, NULL, NULL, NULL, NULL)); + pick = evas_canvas3d_scene_pick(obj, x, y, NULL, NULL, NULL, NULL); if (!pick) return NULL; /* Get all members from root node. */ - eo_do(pd->root_node, list = evas_canvas3d_node_member_list_get()); + list = evas_canvas3d_node_member_list_get(pd->root_node); EINA_LIST_FOREACH(list, l, node) { Evas_Canvas3D_Node *exists; - if (eo_do_ret(obj, exists, evas_canvas3d_scene_exist(x, y, node))) + if (evas_canvas3d_scene_exist(obj, x, y, node)) picked_nodes = eina_list_append(picked_nodes, l); } @@ -791,7 +791,7 @@ EOLIAN static void _evas_canvas3d_scene_shadows_enable_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd, Eina_Bool _shadows_enabled) { pd->shadows_enabled = _shadows_enabled; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_SHADOWS_ENABLED, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_SCENE_SHADOWS_ENABLED, NULL); } EOLIAN static Eina_Bool @@ -806,7 +806,7 @@ _evas_canvas3d_scene_color_pick_enable_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Sc if (pd->color_pick_enabled != _enabled) pd->color_pick_enabled = _enabled; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_UPDATED, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_SCENE_UPDATED, NULL); return EINA_TRUE; } @@ -816,7 +816,7 @@ _evas_canvas3d_scene_shadows_depth_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_ { pd->depth_offset = depth_offset; pd->depth_constant = depth_constant; - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_SHADOWS_DEPTH, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_SCENE_SHADOWS_DEPTH, NULL); } EOLIAN static void diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.c b/src/lib/evas/canvas/evas_canvas3d_texture.c index e01762d3b7..664de1c9c1 100644 --- a/src/lib/evas/canvas/evas_canvas3d_texture.c +++ b/src/lib/evas/canvas/evas_canvas3d_texture.c @@ -54,7 +54,7 @@ _texture_proxy_subrender(Evas_Canvas3D_Texture *obj) { /* Code taken from _proxy_subrender() in file evas_object_image.c */ Eo *evas = NULL; - eo_do(obj, evas = evas_common_evas_get()); + evas = evas_common_evas_get(obj); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(obj, MY_CLASS); Evas_Object_Protected_Data *source; @@ -165,7 +165,7 @@ _texture_fini(Evas_Canvas3D_Texture *obj) void *data = NULL; Evas_Canvas3D_Material_Data *material = NULL; - eo_do(obj, evas = evas_common_evas_get()); + evas = evas_common_evas_get(obj); Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(obj, MY_CLASS); if (pd->engine_data) @@ -206,7 +206,7 @@ _texture_material_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *k void *data EINA_UNUSED, void *fdata) { Evas_Canvas3D_Material *m = *(Evas_Canvas3D_Material **)key; - eo_do(m, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MATERIAL_TEXTURE, (Evas_Canvas3D_Object *)fdata)); + evas_canvas3d_object_change(m, EVAS_CANVAS3D_STATE_MATERIAL_TEXTURE, (Evas_Canvas3D_Object *)fdata); return EINA_TRUE; } @@ -224,7 +224,7 @@ _evas_canvas3d_texture_evas_canvas3d_object_update_notify(Eo *obj, Evas_Canvas3D if (pd->source) { Eo *evas = NULL; - eo_do(obj, evas = evas_common_evas_get()); + evas = evas_common_evas_get(obj); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); Evas_Object_Protected_Data *src = eo_data_scope_get(pd->source, EVAS_OBJECT_CLASS); @@ -321,10 +321,10 @@ evas_canvas3d_texture_add(Evas *e) EOLIAN static Eo * _evas_canvas3d_texture_eo_base_constructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); pd->atlas_enable = EINA_TRUE; - eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_TEXTURE)); + evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_TEXTURE); return obj; } @@ -333,7 +333,7 @@ EOLIAN static void _evas_canvas3d_texture_eo_base_destructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED) { _texture_fini(obj); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } EOLIAN static void @@ -343,7 +343,7 @@ _evas_canvas3d_texture_data_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, { Eo *evas = NULL; void *image = NULL; - eo_do(obj, evas = evas_common_evas_get()); + evas = evas_common_evas_get(obj); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (!pd->engine_data && e->engine.func->texture_new) @@ -366,7 +366,7 @@ _evas_canvas3d_texture_data_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, pd->engine_data, image); e->engine.func->image_free(e->engine.data.output, image); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_TEXTURE_DATA, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_TEXTURE_DATA, NULL); } EOLIAN static void @@ -378,7 +378,7 @@ _evas_canvas3d_texture_file_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, const c Eo *evas = NULL; void *image; - eo_do(obj, evas = evas_common_evas_get()); + evas = evas_common_evas_get(obj); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (!pd->engine_data && e->engine.func->texture_new) @@ -399,14 +399,14 @@ _evas_canvas3d_texture_file_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, const c image); e->engine.func->image_free(e->engine.data.output, image); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_TEXTURE_DATA, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_TEXTURE_DATA, NULL); } EAPI void _evas_canvas3d_texture_source_set(Eo *obj , Evas_Canvas3D_Texture_Data *pd, Evas_Object *source) { Eo *evas = NULL; - eo_do(obj, evas = evas_common_evas_get()); + evas = evas_common_evas_get(obj); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); Evas_Object_Protected_Data *src; @@ -441,7 +441,7 @@ _evas_canvas3d_texture_source_set(Eo *obj , Evas_Canvas3D_Texture_Data *pd, Evas pd->engine_data = e->engine.func->texture_new(e->engine.data.output, pd->atlas_enable); _texture_proxy_set(obj, source, src); - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_TEXTURE_DATA, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_TEXTURE_DATA, NULL); } EOLIAN static void @@ -483,7 +483,7 @@ _evas_canvas3d_texture_color_format_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D { Evas_Colorspace format = -1; Eo *evas = NULL; - eo_do(obj, evas = evas_common_evas_get()); + evas = evas_common_evas_get(obj); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (e->engine.func->image_colorspace_get && @@ -502,7 +502,7 @@ EOLIAN static void _evas_canvas3d_texture_size_get(const Eo *obj, Evas_Canvas3D_Texture_Data *pd, int *w, int *h) { Eo *evas = NULL; - eo_do(obj, evas = evas_common_evas_get()); + evas = evas_common_evas_get(obj); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (e->engine.func->texture_size_get) { @@ -515,21 +515,21 @@ EOLIAN static void _evas_canvas3d_texture_wrap_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Wrap_Mode s, Evas_Canvas3D_Wrap_Mode t) { Eo *evas = NULL; - eo_do(obj, evas = evas_common_evas_get()); + evas = evas_common_evas_get(obj); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (e->engine.func->texture_wrap_set) { e->engine.func->texture_wrap_set(e->engine.data.output, pd->engine_data, s, t); } - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_TEXTURE_WRAP, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_TEXTURE_WRAP, NULL); } EOLIAN static void _evas_canvas3d_texture_wrap_get(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Wrap_Mode *s, Evas_Canvas3D_Wrap_Mode *t) { Eo *evas = NULL; - eo_do(obj, evas = evas_common_evas_get()); + evas = evas_common_evas_get(obj); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (e->engine.func->texture_wrap_set) { @@ -542,21 +542,21 @@ EOLIAN static void _evas_canvas3d_texture_filter_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Texture_Filter min, Evas_Canvas3D_Texture_Filter mag) { Eo *evas = NULL; - eo_do(obj, evas = evas_common_evas_get()); + evas = evas_common_evas_get(obj); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (e->engine.func->texture_filter_set) { e->engine.func->texture_filter_set(e->engine.data.output, pd->engine_data, min, mag); } - eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_TEXTURE_FILTER, NULL)); + evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_TEXTURE_FILTER, NULL); } EOLIAN static void _evas_canvas3d_texture_filter_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Texture_Filter *min, Evas_Canvas3D_Texture_Filter *mag) { Eo *evas = NULL; - eo_do(obj, evas = evas_common_evas_get()); + evas = evas_common_evas_get(obj); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (e->engine.func->texture_filter_get) { diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c index 48bfd5c490..f1c5e4b1c3 100644 --- a/src/lib/evas/canvas/evas_clip.c +++ b/src/lib/evas/canvas/evas_clip.c @@ -279,7 +279,7 @@ _evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object * } if (obj->is_smart) { - eo_do(eo_obj, evas_obj_smart_clip_set(eo_clip)); + evas_obj_smart_clip_set(eo_obj, eo_clip); } if (obj->cur->clipper) { @@ -327,7 +327,7 @@ _evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object * state_write->clipper = NULL; EINA_COW_STATE_WRITE_END(obj, state_write, cur); if (obj->prev->clipper != old_clip) - eo_do(old_clip->object, eo_event_callback_del(EO_BASE_EVENT_DEL, _clipper_del_cb, eo_obj)); + eo_event_callback_del(old_clip->object, EO_BASE_EVENT_DEL, _clipper_del_cb, eo_obj); } /* image object clipper */ @@ -359,7 +359,7 @@ _evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object * state_write->clipper = clip; EINA_COW_STATE_WRITE_END(obj, state_write, cur); if (obj->prev->clipper != clip) - eo_do(clip->object, eo_event_callback_add(EO_BASE_EVENT_DEL, _clipper_del_cb, eo_obj)); + eo_event_callback_add(clip->object, EO_BASE_EVENT_DEL, _clipper_del_cb, eo_obj); clip->clip.cache_clipees_answer = eina_list_free(clip->clip.cache_clipees_answer); clip->clip.clipees = eina_list_append(clip->clip.clipees, obj); @@ -413,7 +413,7 @@ _evas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj) if (evas_object_intercept_call_clip_unset(eo_obj, obj)) return; if (obj->is_smart) { - eo_do(eo_obj, evas_obj_smart_clip_unset()); + evas_obj_smart_clip_unset(eo_obj); } if (obj->cur->clipper) { @@ -456,7 +456,7 @@ _evas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj) state_write->clipper = NULL; EINA_COW_STATE_WRITE_END(obj, state_write, cur); if (obj->prev->clipper != old_clip) - eo_do(old_clip->object, eo_event_callback_del(EO_BASE_EVENT_DEL, _clipper_del_cb, eo_obj)); + eo_event_callback_del(old_clip->object, EO_BASE_EVENT_DEL, _clipper_del_cb, eo_obj); } evas_object_change(eo_obj, obj); @@ -510,7 +510,7 @@ _evas_object_clip_prev_reset(Evas_Object_Protected_Data *obj, Eina_Bool cur_prev EINA_COW_STATE_WRITE_END(obj, state_write, prev); } if (clip != obj->cur->clipper) - eo_do(clip->object, eo_event_callback_del(EO_BASE_EVENT_DEL, _clipper_del_cb, obj->object)); + eo_event_callback_del(clip->object, EO_BASE_EVENT_DEL, _clipper_del_cb, obj->object); } } diff --git a/src/lib/evas/canvas/evas_data.c b/src/lib/evas/canvas/evas_data.c index 38bc53741b..e991e065ad 100644 --- a/src/lib/evas/canvas/evas_data.c +++ b/src/lib/evas/canvas/evas_data.c @@ -8,7 +8,7 @@ evas_object_data_set(Evas_Object *obj, const char *key, const void *data) MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return; MAGIC_CHECK_END(); - eo_do(obj, eo_key_data_set(key, data)); + eo_key_data_set(obj, key, data); } EAPI void * @@ -18,7 +18,7 @@ evas_object_data_get(const Evas_Object *obj, const char *key) return NULL; MAGIC_CHECK_END(); void *data = NULL; - eo_do((Evas_Object *)obj, data = eo_key_data_get(key)); + data = eo_key_data_get((Evas_Object *)obj, key); return data; } @@ -29,6 +29,7 @@ evas_object_data_del(Evas_Object *obj, const char *key) return NULL; MAGIC_CHECK_END(); void *data = NULL; - eo_do(obj, data = eo_key_data_get(key), eo_key_data_del(key)); + data = eo_key_data_get(obj, key); + eo_key_data_del(obj, key); return data; } diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c index 0ef5e919e0..08bc9bb951 100644 --- a/src/lib/evas/canvas/evas_events.c +++ b/src/lib/evas/canvas/evas_events.c @@ -939,7 +939,7 @@ evas_event_freeze(Evas *eo_e) MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); return; MAGIC_CHECK_END(); - eo_do(eo_e, eo_event_freeze()); + eo_event_freeze(eo_e); } EAPI void @@ -948,13 +948,13 @@ evas_event_thaw(Evas *eo_e) MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); return; MAGIC_CHECK_END(); - eo_do(eo_e, eo_event_thaw()); + eo_event_thaw(eo_e); } EOLIAN void _evas_canvas_eo_base_event_freeze(Eo *eo_e, Evas_Public_Data *e) { - eo_do_super(eo_e, EVAS_CANVAS_CLASS, eo_event_freeze()); + eo_event_freeze(eo_super(eo_e, EVAS_CANVAS_CLASS)); e->is_frozen = EINA_TRUE; } @@ -962,10 +962,8 @@ EOLIAN void _evas_canvas_eo_base_event_thaw(Eo *eo_e, Evas_Public_Data *e) { int fcount = -1; - eo_do_super(eo_e, EVAS_CANVAS_CLASS, - eo_event_thaw()); - eo_do_super(eo_e, EVAS_CANVAS_CLASS, - fcount = eo_event_freeze_count_get()); + eo_event_thaw(eo_super(eo_e, EVAS_CANVAS_CLASS)); + fcount = eo_event_freeze_count_get(eo_super(eo_e, EVAS_CANVAS_CLASS)); if (0 == fcount) { Evas_Layer *lay; @@ -993,7 +991,7 @@ evas_event_freeze_get(const Evas *eo_e) return 0; MAGIC_CHECK_END(); int ret = 0; - eo_do((Eo *)eo_e, ret = eo_event_freeze_count_get()); + ret = eo_event_freeze_count_get((Eo *)eo_e); return ret; } diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c index 2322fec5d9..09336652e2 100644 --- a/src/lib/evas/canvas/evas_filter_mixin.c +++ b/src/lib/evas/canvas/evas_filter_mixin.c @@ -54,9 +54,8 @@ _filter_end_sync(Evas_Filter_Context *ctx, Evas_Object_Protected_Data *obj, if (!success) { ERR("Filter failed at runtime!"); - eo_do(eo_obj, - evas_filter_invalid_set(EINA_TRUE); - evas_filter_dirty()); + evas_filter_invalid_set(eo_obj, EINA_TRUE); + evas_filter_dirty(eo_obj); evas_object_change(eo_obj, obj); evas_object_clip_dirty(eo_obj, obj); evas_object_coords_recalc(eo_obj, obj); @@ -272,8 +271,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj, { // Post render callback is not required anymore Evas *e = obj->layer->evas->evas; - eo_do(e, eo_event_callback_del(EVAS_CANVAS_EVENT_RENDER_POST, - _render_post_cb, eo_obj)); + eo_event_callback_del(e, EVAS_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj); pd->has_cb = EINA_FALSE; } @@ -324,7 +322,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj, // Request rendering from the object itself (child class) evas_filter_program_padding_get(pd->data->chain, &l, &r, &t, &b); - eo_do(eo_obj, ok = evas_filter_input_render(filter, drawctx, l, r, t, b, do_async)); + ok = evas_filter_input_render(eo_obj, filter, drawctx, l, r, t, b, do_async); if (!ok) ERR("Filter input render failed."); ENFN->context_free(ENDT, drawctx); @@ -333,8 +331,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj, if (do_async && !pd->has_cb) { Evas *e = obj->layer->evas->evas; - eo_do(e, eo_event_callback_add(EVAS_CANVAS_EVENT_RENDER_POST, - _render_post_cb, eo_obj)); + eo_event_callback_add(e, EVAS_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj); pd->has_cb = EINA_TRUE; } evas_filter_context_post_run_callback_set(filter, _filter_cb, eo_obj); @@ -382,7 +379,7 @@ _evas_filter_efl_gfx_filter_filter_program_set(Eo *eo_obj, Evas_Filter_Data *pd, eina_stringshare_replace(&fcow->name, name); if (code) { - eo_do(eo_obj, alpha = evas_filter_input_alpha()); + alpha = evas_filter_input_alpha(eo_obj); pgm = evas_filter_program_new(fcow->name, alpha); evas_filter_program_source_set_all(pgm, fcow->sources); evas_filter_program_data_set_all(pgm, fcow->data); @@ -405,7 +402,7 @@ _evas_filter_efl_gfx_filter_filter_program_set(Eo *eo_obj, Evas_Filter_Data *pd, FCOW_END(fcow, pd); // Update object - eo_do(eo_obj, evas_filter_dirty()); + evas_filter_dirty(eo_obj); evas_object_change(eo_obj, obj); evas_object_clip_dirty(eo_obj, obj); evas_object_coords_recalc(eo_obj, obj); @@ -499,7 +496,7 @@ update: FCOW_END(fcow, pd); } - eo_do(eo_obj, evas_filter_dirty()); + evas_filter_dirty(eo_obj); evas_object_change(eo_obj, obj); evas_object_clip_dirty(eo_obj, obj); evas_object_coords_recalc(eo_obj, obj); @@ -546,7 +543,7 @@ _evas_filter_efl_gfx_filter_filter_state_set(Eo *eo_obj, Evas_Filter_Data *pd, } // Mark as changed - eo_do(eo_obj, evas_filter_dirty()); + evas_filter_dirty(eo_obj); evas_object_change(eo_obj, obj); evas_object_clip_dirty(eo_obj, obj); evas_object_coords_recalc(eo_obj, obj); @@ -609,7 +606,7 @@ _evas_filter_eo_base_constructor(Eo *eo_obj, Evas_Filter_Data *pd) { Eo *obj = NULL; - eo_do_super(eo_obj, MY_CLASS, obj = eo_constructor()); + obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); pd->data = eina_cow_alloc(evas_object_filter_cow); SLKI(pd->lck); @@ -650,12 +647,11 @@ finish: if (pd->has_cb) { Evas *e = obj->layer->evas->evas; - eo_do(e, eo_event_callback_del(EVAS_CANVAS_EVENT_RENDER_POST, - _render_post_cb, eo_obj)); + eo_event_callback_del(e, EVAS_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj); } SLKD(pd->lck); - eo_do_super(eo_obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(eo_obj, MY_CLASS)); } EOLIAN static void diff --git a/src/lib/evas/canvas/evas_focus.c b/src/lib/evas/canvas/evas_focus.c index 880791bdd2..daa76aed49 100644 --- a/src/lib/evas/canvas/evas_focus.c +++ b/src/lib/evas/canvas/evas_focus.c @@ -24,7 +24,7 @@ _evas_object_focus_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool fo if (focus) { if (obj->layer->evas->focused) - eo_do(obj->layer->evas->focused, evas_obj_focus_set(0)); + evas_obj_focus_set(obj->layer->evas->focused, 0); if (obj->layer->evas->focused) goto end; obj->focused = 1; diff --git a/src/lib/evas/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c index 3731078a04..8412bcc93a 100644 --- a/src/lib/evas/canvas/evas_layer.c +++ b/src/lib/evas/canvas/evas_layer.c @@ -181,7 +181,7 @@ _evas_object_layer_set_child(Evas_Object *eo_obj, Evas_Object *par, short l) EAPI void evas_object_layer_set(Evas_Object *obj, short l) { - eo_do((Evas_Object *)obj, efl_gfx_stack_layer_set(l)); + efl_gfx_stack_layer_set((Evas_Object *)obj, l); } EOLIAN void @@ -249,7 +249,7 @@ evas_object_layer_get(const Evas_Object *obj) { short ret; - return eo_do_ret((Evas_Object *)obj, ret, efl_gfx_stack_layer_get()); + return efl_gfx_stack_layer_get((Evas_Object *)obj); } EOLIAN short diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index bdafc3128c..38e901a957 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -158,7 +158,7 @@ evas_new(void) EOLIAN static Eo * _evas_canvas_eo_base_constructor(Eo *eo_obj, Evas_Public_Data *e) { - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); e->evas = eo_obj; e->output.render_method = RENDER_METHOD_INVALID; @@ -320,7 +320,7 @@ _evas_canvas_eo_base_destructor(Eo *eo_e, Evas_Public_Data *e) eina_spinlock_free(&(e->render.lock)); e->magic = 0; - eo_do_super(eo_e, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(eo_e, MY_CLASS)); } EOLIAN static void diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index 3b664c1478..55e7ca5943 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -125,7 +125,7 @@ _on_child_del(void *data, const Eo_Event *event) Evas_Object *box = data; Evas_Object *ret = NULL; - eo_do(box, ret = evas_obj_box_internal_remove(event->obj)); + ret = evas_obj_box_internal_remove(box, event->obj); if (!ret) ERR("child removal failed"); evas_object_smart_changed(box); @@ -157,7 +157,7 @@ _evas_object_box_option_new(Evas_Object *o, Evas_Object_Box_Data *priv EINA_UNUS { Evas_Object_Box_Option *opt = NULL; - eo_do(o, opt = evas_obj_box_internal_option_new(child)); + opt = evas_obj_box_internal_option_new(o, child); if (!opt) { ERR("option_new failed"); @@ -177,7 +177,7 @@ static const Eo_Callback_Array_Item evas_object_box_callbacks[] = { static void _evas_object_box_child_callbacks_unregister(Evas_Object *obj, Evas_Object *parent) { - eo_do(obj, eo_event_callback_array_del(evas_object_box_callbacks, parent)); + eo_event_callback_array_del(obj, evas_object_box_callbacks, parent); } static Evas_Object_Box_Option * @@ -185,7 +185,7 @@ _evas_object_box_option_callbacks_register(Evas_Object *o, Evas_Object_Box_Data { Evas_Object *obj = opt->obj; - eo_do(obj, eo_event_callback_array_add(evas_object_box_callbacks, o)); + eo_event_callback_array_add(obj, evas_object_box_callbacks, o); return opt; } @@ -221,7 +221,7 @@ _evas_box_internal_append(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child) priv->children = eina_list_append(priv->children, opt); priv->children_changed = EINA_TRUE; - eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, opt)); + eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt); return opt; } @@ -237,7 +237,7 @@ _evas_box_internal_prepend(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child priv->children = eina_list_prepend(priv->children, opt); priv->children_changed = EINA_TRUE; - eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, opt)); + eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt); return opt; } @@ -261,7 +261,7 @@ _evas_box_internal_insert_before(Eo *o, Evas_Object_Box_Data *priv, Evas_Object priv->children = eina_list_prepend_relative (priv->children, new_opt, opt); priv->children_changed = EINA_TRUE; - eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, new_opt)); + eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt); return new_opt; } } @@ -288,7 +288,7 @@ _evas_box_internal_insert_after(Eo *o, Evas_Object_Box_Data *priv, Evas_Object * priv->children = eina_list_append_relative (priv->children, new_opt, opt); priv->children_changed = EINA_TRUE; - eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, new_opt)); + eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt); return new_opt; } } @@ -311,7 +311,7 @@ _evas_box_internal_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *chi priv->children = eina_list_prepend(priv->children, new_opt); priv->children_changed = EINA_TRUE; - eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, new_opt)); + eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt); return new_opt; } @@ -330,7 +330,7 @@ _evas_box_internal_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *chi priv->children = eina_list_prepend_relative (priv->children, new_opt, opt); priv->children_changed = EINA_TRUE; - eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, new_opt)); + eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt); return new_opt; } } @@ -350,9 +350,9 @@ _evas_box_internal_remove(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child) if (obj == child) { priv->children = eina_list_remove(priv->children, opt); - eo_do(o, evas_obj_box_internal_option_free(opt)); + evas_obj_box_internal_option_free(o, opt); priv->children_changed = EINA_TRUE; - eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_REMOVED, obj)); + eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj); return obj; } @@ -378,16 +378,16 @@ _evas_box_internal_remove_at(Eo *o, Evas_Object_Box_Data *priv, unsigned int pos obj = opt->obj; priv->children = eina_list_remove_list(priv->children, node); - eo_do(o, evas_obj_box_internal_option_free(opt)); + evas_obj_box_internal_option_free(o, opt); priv->children_changed = EINA_TRUE; - eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_REMOVED, obj)); + eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj); return obj; } EOLIAN static void _evas_box_evas_object_smart_add(Eo *o, Evas_Object_Box_Data *priv) { - eo_do_super(o, MY_CLASS, evas_obj_smart_add()); + evas_obj_smart_add(eo_super(o, MY_CLASS)); evas_object_event_callback_add (o, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_hints_changed, o); @@ -412,14 +412,14 @@ _evas_box_evas_object_smart_del(Eo *o, Evas_Object_Box_Data *priv) Evas_Object_Box_Option *opt = l->data; _evas_object_box_child_callbacks_unregister(opt->obj, o); - eo_do(o, evas_obj_box_internal_option_free(opt)); + evas_obj_box_internal_option_free(o, opt); l = eina_list_remove_list(l, l); } if (priv->layout.data && priv->layout.free_data) priv->layout.free_data(priv->layout.data); - eo_do_super(o, MY_CLASS, evas_obj_smart_del()); + evas_obj_smart_del(eo_super(o, MY_CLASS)); } EOLIAN static void @@ -465,10 +465,9 @@ evas_object_box_add(Evas *evas) EOLIAN static Eo * _evas_box_eo_base_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNUSED) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); - eo_do(obj, - evas_obj_smart_callbacks_descriptions_set(_signals), - evas_obj_type_set(MY_CLASS_NAME_LEGACY)); + obj = eo_constructor(eo_super(obj, MY_CLASS)); + evas_obj_smart_callbacks_descriptions_set(obj, _signals); + evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); return obj; } @@ -1696,7 +1695,7 @@ _evas_box_append(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child) if (!child || (evas_object_smart_parent_get(child) == o)) return NULL; - eo_do(o, opt = evas_obj_box_internal_append(child)); + opt = evas_obj_box_internal_append(o, child); if (opt) { @@ -1715,7 +1714,7 @@ _evas_box_prepend(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child) if (!child) return NULL; - eo_do(o, opt = evas_obj_box_internal_prepend(child)); + opt = evas_obj_box_internal_prepend(o, child); if (opt) { @@ -1733,7 +1732,7 @@ _evas_box_insert_before(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child, c if (!child) return NULL; - eo_do(o, opt = evas_obj_box_internal_insert_before(child, reference)); + opt = evas_obj_box_internal_insert_before(o, child, reference); if (opt) { @@ -1752,7 +1751,7 @@ _evas_box_insert_after(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child, co if (!child) return NULL; - eo_do(o, opt = evas_obj_box_internal_insert_after(child, reference)); + opt = evas_obj_box_internal_insert_after(o, child, reference); if (opt) { @@ -1771,7 +1770,7 @@ _evas_box_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child, unsig if (!child) return NULL; - eo_do(o, opt = evas_obj_box_internal_insert_at(child, pos)); + opt = evas_obj_box_internal_insert_at(o, child, pos); if (opt) { @@ -1788,7 +1787,7 @@ _evas_box_remove(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Evas_Object *chil { Evas_Object *obj = NULL; - eo_do(o, obj = evas_obj_box_internal_remove(child)); + obj = evas_obj_box_internal_remove(o, child); if (obj) { @@ -1806,7 +1805,7 @@ _evas_box_remove_at(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, unsigned int p { Evas_Object *obj = NULL; - eo_do(o, obj = evas_obj_box_internal_remove_at(pos)); + obj = evas_obj_box_internal_remove_at(o, pos); if (obj) { @@ -1829,7 +1828,7 @@ _evas_box_remove_all(Eo *o, Evas_Object_Box_Data *priv, Eina_Bool clear) Evas_Object_Box_Option *opt = priv->children->data; Evas_Object *obj = NULL; - eo_do(o, obj = evas_obj_box_internal_remove(opt->obj)); + obj = evas_obj_box_internal_remove(o, opt->obj); if (obj) { _evas_object_box_child_callbacks_unregister(obj, o); @@ -1931,7 +1930,7 @@ EAPI Eina_Bool evas_object_box_option_property_vset(Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args) { Eina_Bool ret = EINA_FALSE; - eo_do(o, ret = evas_obj_box_option_property_vset(opt, property, (va_list *) &args)); + ret = evas_obj_box_option_property_vset(o, opt, property, (va_list *) &args); return ret; } @@ -1958,7 +1957,7 @@ EAPI Eina_Bool evas_object_box_option_property_vget(const Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args) { Eina_Bool ret = EINA_FALSE; - eo_do((Eo *)o, ret = evas_obj_box_option_property_vget(opt, property, (va_list *) &args)); + ret = evas_obj_box_option_property_vget((Eo *)o, opt, property, (va_list *) &args); return ret; } diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c index 4c1b95a6ca..0374b132f2 100644 --- a/src/lib/evas/canvas/evas_object_grid.c +++ b/src/lib/evas/canvas/evas_object_grid.c @@ -272,8 +272,8 @@ evas_object_grid_add(Evas *evas) EOLIAN static Eo * _evas_grid_eo_base_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSED) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); - eo_do(obj, evas_obj_smart_attach(_evas_object_grid_smart_class_new())); + obj = eo_constructor(eo_super(obj, MY_CLASS)); + evas_obj_smart_attach(obj, _evas_object_grid_smart_class_new()); return obj; // return evas_object_smart_add(evas, _evas_object_grid_smart_class_new()); diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index ed2e604bd6..fc4a68010c 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -350,7 +350,7 @@ _evas_image_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o) Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Colorspace cspace; - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); evas_object_image_init(eo_obj); @@ -407,7 +407,7 @@ evas_object_image_memfile_set(Evas_Object *eo_obj, void *data, int size, char *f f = eina_file_virtualize(NULL, data, size, EINA_TRUE); if (!f) return ; - eo_do(eo_obj, efl_file_mmap_set(f, key)); + efl_file_mmap_set(eo_obj, f, key); eina_file_close(f); } @@ -732,7 +732,7 @@ EAPI Eina_Bool evas_object_image_source_unset(Evas_Object *eo_obj) { Eina_Bool result = EINA_FALSE; - eo_do(eo_obj, result = evas_obj_image_source_set(NULL)); + result = evas_obj_image_source_set(eo_obj, NULL); return result; } @@ -786,7 +786,7 @@ _evas_image_source_events_get(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED) EOLIAN static void _evas_image_eo_base_dbg_info_get(Eo *eo_obj, Evas_Image_Data *o, Eo_Dbg_Info *root) { - eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); + eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); const char *file, *key; @@ -804,7 +804,7 @@ _evas_image_eo_base_dbg_info_get(Eo *eo_obj, Evas_Image_Data *o, Eo_Dbg_Info *ro if (evas_object_image_load_error_get(eo_obj) != EVAS_LOAD_ERROR_NONE) { Evas_Load_Error error = EVAS_LOAD_ERROR_GENERIC; - eo_do(eo_obj, error = evas_obj_image_load_error_get()); + error = evas_obj_image_load_error_get(eo_obj); EO_DBG_INFO_APPEND(group, "Load Error", EINA_VALUE_TYPE_STRING, evas_load_error_str(error)); } @@ -986,7 +986,7 @@ evas_object_image_fill_set(Evas_Image *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) { - eo_do((Evas_Image *)obj, efl_gfx_fill_set(x, y, w, h)); + efl_gfx_fill_set((Evas_Image *)obj, x, y, w, h); } EOLIAN static void @@ -1025,7 +1025,7 @@ evas_object_image_fill_get(const Evas_Image *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { - eo_do((Evas_Image *)obj, efl_gfx_fill_get(x, y, w, h)); + efl_gfx_fill_get((Evas_Image *)obj, x, y, w, h); } EOLIAN static void @@ -1041,7 +1041,7 @@ _evas_image_efl_gfx_fill_fill_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, EAPI void evas_object_image_fill_spread_set(Evas_Image *obj, Evas_Fill_Spread spread) { - eo_do((Evas_Image *)obj, efl_gfx_fill_spread_set(spread)); + efl_gfx_fill_spread_set((Evas_Image *)obj, spread); } EOLIAN static void @@ -1066,7 +1066,7 @@ evas_object_image_fill_spread_get(const Evas_Image *obj) { Evas_Fill_Spread ret; - return eo_do_ret((Evas_Image *)obj, ret, efl_gfx_fill_spread_get()); + return efl_gfx_fill_spread_get((Evas_Image *)obj); } EOLIAN static Efl_Gfx_Fill_Spread @@ -1079,7 +1079,7 @@ _evas_image_efl_gfx_fill_fill_spread_get(Eo *eo_obj EINA_UNUSED, EAPI void evas_object_image_size_set(Evas_Image *obj, int w, int h) { - eo_do((Evas_Image *)obj, efl_gfx_view_size_set(w, h)); + efl_gfx_view_size_set((Evas_Image *)obj, w, h); } EOLIAN static void @@ -1149,7 +1149,7 @@ _evas_image_efl_gfx_view_size_set(Eo *eo_obj, Evas_Image_Data *o, int w, int h) EAPI void evas_object_image_size_get(const Evas_Image *obj, int *w, int *h) { - eo_do((Evas_Image *)obj, efl_gfx_view_size_get(w, h)); + efl_gfx_view_size_get((Evas_Image *)obj, w, h); } EOLIAN static void @@ -1383,9 +1383,9 @@ evas_object_image_preload(Evas_Object *eo_obj, Eina_Bool cancel) return; MAGIC_CHECK_END(); if (cancel) - eo_do(eo_obj, evas_obj_image_preload_cancel()); + evas_obj_image_preload_cancel(eo_obj); else - eo_do(eo_obj, evas_obj_image_preload_begin()); + evas_obj_image_preload_begin(eo_obj); } static void @@ -2188,7 +2188,7 @@ evas_object_image_native_surface_set(Evas_Object *eo_obj, Evas_Native_Surface *s if (surf) // We need to unset native surf on del to remove shared hash refs evas_object_event_callback_add (eo_obj, EVAS_CALLBACK_DEL, _on_image_native_surface_del, NULL); - eo_do(eo_obj, evas_obj_image_native_surface_set(surf)); + evas_obj_image_native_surface_set(eo_obj, surf); } EOLIAN static void @@ -2766,7 +2766,7 @@ _3d_render(Evas *eo_e, Evas_Object *eo_obj EINA_UNUSED, scene_data.depth_constant = pd_scene->depth_constant; /* Phase 1 - Update scene graph tree. */ - eo_do(scene, evas_canvas3d_object_update()); + evas_canvas3d_object_update(scene); /* Phase 2 - Do frustum culling and get visible model nodes. */ evas_canvas3d_node_tree_traverse(pd_scene->root_node, @@ -2964,7 +2964,7 @@ _evas_image_eo_base_destructor(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED) evas_object_image_video_surface_set(eo_obj, NULL); evas_object_image_free(eo_obj, obj); - eo_do_super(eo_obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(eo_obj, MY_CLASS)); } void @@ -3408,7 +3408,7 @@ _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data *obj, if (oi->has_filter) { void *output_buffer = NULL; - eo_do(source->object, output_buffer = evas_filter_output_buffer_get()); + output_buffer = evas_filter_output_buffer_get(source->object); if (output_buffer) pixels = output_buffer; } @@ -3749,7 +3749,7 @@ evas_object_image_render_pre(Evas_Object *eo_obj, Evas_Canvas3D_Scene *scene = o->cur->scene; Eina_Bool dirty; - eo_do(scene, dirty = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_ANY)); + dirty = evas_canvas3d_object_dirty_get(scene, EVAS_CANVAS3D_STATE_ANY); if (dirty) { evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj); @@ -4913,64 +4913,64 @@ _evas_object_image_surface_get(Evas_Object *eo, Evas_Object_Protected_Data *obj) EAPI void evas_object_image_file_set(Eo *obj, const char *file, const char *key) { - eo_do((Eo *) obj, efl_file_set(file, key)); + efl_file_set((Eo *) obj, file, key); } EAPI void evas_object_image_file_get(const Eo *obj, const char **file, const char **key) { - eo_do((Eo *) obj, efl_file_get(file, key)); + efl_file_get((Eo *) obj, file, key); } EAPI void evas_object_image_mmap_set(Evas_Image *obj, const Eina_File *f, const char *key) { - eo_do((Evas_Image *)obj, efl_file_mmap_set(f, key)); + efl_file_mmap_set((Evas_Image *)obj, f, key); } EAPI void evas_object_image_mmap_get(const Evas_Image *obj, const Eina_File **f, const char **key) { - eo_do((Evas_Image *)obj, efl_file_mmap_get(f, key)); + efl_file_mmap_get((Evas_Image *)obj, f, key); } EAPI Eina_Bool evas_object_image_save(const Eo *obj, const char *file, const char *key, const char *flags) { Eina_Bool ret; - return eo_do_ret((Eo *) obj, ret, efl_file_save(file, key, flags)); + return efl_file_save((Eo *) obj, file, key, flags); } EAPI Eina_Bool evas_object_image_animated_get(const Eo *obj) { Eina_Bool ret; - return eo_do_ret((Eo *) obj, ret, efl_image_animated_get()); + return efl_image_animated_get((Eo *) obj); } EAPI void evas_object_image_load_size_set(Eo *obj, int w, int h) { - eo_do((Eo *) obj, efl_image_load_size_set(w, h)); + efl_image_load_size_set((Eo *) obj, w, h); } EAPI void evas_object_image_load_size_get(const Eo *obj, int *w, int *h) { - eo_do((Eo *) obj, efl_image_load_size_get(w, h)); + efl_image_load_size_get((Eo *) obj, w, h); } EAPI void evas_object_image_smooth_scale_set(Eo *obj, Eina_Bool smooth_scale) { - eo_do((Eo *) obj, efl_image_smooth_scale_set(smooth_scale)); + efl_image_smooth_scale_set((Eo *) obj, smooth_scale); } EAPI Eina_Bool evas_object_image_smooth_scale_get(const Eo *obj) { Eina_Bool ret; - return eo_do_ret((Eo *) obj, ret, efl_image_smooth_scale_get()); + return efl_image_smooth_scale_get((Eo *) obj); } EOLIAN static void @@ -4978,7 +4978,7 @@ _evas_image_efl_gfx_filter_filter_program_set(Eo *obj, Evas_Image_Data *pd EINA_ const char *code, const char *name) { pd->has_filter = (code != NULL); - eo_do_super(obj, MY_CLASS, efl_gfx_filter_program_set(code, name)); + efl_gfx_filter_program_set(eo_super(obj, MY_CLASS), code, name); } #include "canvas/evas_image.eo.c" diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c index bc4209ea20..26dd5c7acb 100644 --- a/src/lib/evas/canvas/evas_object_line.c +++ b/src/lib/evas/canvas/evas_object_line.c @@ -220,7 +220,7 @@ _evas_line_eo_base_constructor(Eo *eo_obj, Evas_Line_Data *class_data EINA_UNUSE { Evas_Line_Data *o; - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); evas_object_line_init(eo_obj); diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index 9d90cf5efe..2536973828 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -87,8 +87,7 @@ _animator_repeater(void *data, const Eo_Event *event) { Evas_Object_Protected_Data *obj = data; - eo_do(obj->object, - eo_event_callback_call(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, event->event_info)); + eo_event_callback_call(obj->object, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, event->event_info); DBG("Emitting animator tick on %p.", obj->object); return EO_CALLBACK_CONTINUE; @@ -107,8 +106,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event) { if (obj->animator_ref++ > 0) break; - eo_do(obj->layer->evas->evas, - eo_event_callback_add(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _animator_repeater, obj)); + eo_event_callback_add(obj->layer->evas->evas, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _animator_repeater, obj); INF("Registering an animator tick on canvas %p for object %p.", obj->layer->evas->evas, obj->object); } @@ -134,8 +132,7 @@ _check_event_catcher_del(void *data, const Eo_Event *event) { if ((--obj->animator_ref) > 0) break; - eo_do(obj->layer->evas->evas, - eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _animator_repeater, obj)); + eo_event_callback_del(obj->layer->evas->evas, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _animator_repeater, obj); INF("Unregistering an animator tick on canvas %p for object %p.", obj->layer->evas->evas, obj->object); } @@ -157,11 +154,11 @@ _evas_object_eo_base_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) { Eo *parent = NULL; - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); - eo_do(eo_obj, evas_obj_type_set(MY_CLASS_NAME)); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); + evas_obj_type_set(eo_obj, MY_CLASS_NAME); eo_manual_free_set(eo_obj, EINA_TRUE); - eo_do(eo_obj, parent = eo_parent_get()); + parent = eo_parent_get(eo_obj); if (!obj || !_init_cow() || !eo_isa(parent, EVAS_COMMON_INTERFACE_INTERFACE)) { @@ -180,7 +177,7 @@ _evas_object_eo_base_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) evas_object_inject(eo_obj, obj, evas_object_evas_get(parent)); - eo_do(eo_obj, eo_event_callback_array_add(event_catcher_watch(), obj)); + eo_event_callback_array_add(eo_obj, event_catcher_watch(), obj); return eo_obj; } @@ -358,7 +355,7 @@ evas_object_change(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) } EINA_LIST_FOREACH(obj->proxy->proxy_textures, l, texture) { - eo_do(texture, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_TEXTURE_DATA, NULL)); + evas_canvas3d_object_change(texture, EVAS_CANVAS3D_STATE_TEXTURE_DATA, NULL); } if (obj->smart.parent) { @@ -795,7 +792,7 @@ _evas_object_eo_base_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) if (eo_isa(proxy, EVAS_IMAGE_CLASS)) evas_object_image_source_unset(proxy); else if (eo_isa(proxy, EVAS_TEXT_CLASS)) - eo_do(proxy, efl_gfx_filter_source_set(NULL, eo_obj)); + efl_gfx_filter_source_set(proxy, NULL, eo_obj); } /* Eina_Cow has no way to know if we are going to really change something @@ -806,7 +803,7 @@ _evas_object_eo_base_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) Evas_Object_Proxy_Data, proxy_src) { EINA_LIST_FREE(proxy_src->proxy_textures, texture) - eo_do(texture, evas_canvas3d_texture_source_set(NULL)); + evas_canvas3d_texture_source_set(texture, NULL); } EINA_COW_WRITE_END(evas_object_proxy_cow, obj->proxy, proxy_src); } @@ -827,7 +824,7 @@ end: evas_object_event_callback_all_del(eo_obj); evas_object_event_callback_cleanup(eo_obj); - eo_do_super(eo_obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(eo_obj, MY_CLASS)); } EAPI void @@ -836,15 +833,14 @@ evas_object_geometry_set(Evas_Object *eo_obj, Evas_Coord x, Evas_Coord y, Evas_C MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return; MAGIC_CHECK_END(); - eo_do(eo_obj, - efl_gfx_position_set(x, y), - efl_gfx_size_set(w, h)); + efl_gfx_position_set(eo_obj, x, y); + efl_gfx_size_set(eo_obj, w, h); } EAPI void evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y) { - eo_do((Evas_Object *)obj, efl_gfx_position_set(x, y)); + efl_gfx_position_set((Evas_Object *)obj, x, y); } EOLIAN static void @@ -893,7 +889,7 @@ _evas_object_efl_gfx_base_position_set(Eo *eo_obj, Evas_Object_Protected_Data *o if (obj->is_smart) { - eo_do(eo_obj, evas_obj_smart_move(x, y)); + evas_obj_smart_move(eo_obj, x, y); } EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur) @@ -935,7 +931,7 @@ _evas_object_efl_gfx_base_position_set(Eo *eo_obj, Evas_Object_Protected_Data *o EAPI void evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { - eo_do((Evas_Object *)obj, efl_gfx_size_set(w, h)); + efl_gfx_size_set((Evas_Object *)obj, w, h); } EOLIAN static void @@ -975,7 +971,7 @@ _evas_object_efl_gfx_base_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, if (obj->is_smart) { - eo_do(eo_obj, evas_obj_smart_resize(w, h)); + evas_obj_smart_resize(eo_obj, w, h); } EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur) @@ -1024,7 +1020,8 @@ evas_object_geometry_get(const Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y if (x) *x = 0; if (y) *y = 0; if (w) *w = 0; if (h) *h = 0; return; MAGIC_CHECK_END(); - eo_do((Eo *)eo_obj, efl_gfx_position_get(x, y), efl_gfx_size_get(w, h)); + efl_gfx_position_get((Eo *)eo_obj, x, y); + efl_gfx_size_get((Eo *)eo_obj, w, h); } EOLIAN static void @@ -1291,14 +1288,14 @@ evas_object_show(Evas_Object *eo_obj) MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return; MAGIC_CHECK_END(); - eo_do(eo_obj, efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_visible_set(eo_obj, EINA_TRUE); } EAPI void evas_object_hide(Evas_Object *eo_obj) { if (!eo_obj) return; - eo_do(eo_obj, efl_gfx_visible_set(EINA_FALSE)); + efl_gfx_visible_set(eo_obj, EINA_FALSE); } EAPI Eina_Bool @@ -1306,7 +1303,7 @@ evas_object_visible_get(const Evas_Object *obj) { Eina_Bool ret; - return eo_do_ret((Evas_Object *)obj, ret, efl_gfx_visible_get()); + return efl_gfx_visible_get((Evas_Object *)obj); } static void @@ -1331,7 +1328,7 @@ _show(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) if (evas_object_intercept_call_show(eo_obj, obj)) return; if (obj->is_smart) { - eo_do(eo_obj, evas_obj_smart_show()); + evas_obj_smart_show(eo_obj); } EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur) { @@ -1380,7 +1377,7 @@ _hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) if (evas_object_intercept_call_hide(eo_obj, obj)) return; if (obj->is_smart) { - eo_do(eo_obj, evas_obj_smart_hide()); + evas_obj_smart_hide(eo_obj); } EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur) @@ -1498,7 +1495,7 @@ _evas_object_efl_gfx_base_visible_get(Eo *eo_obj EINA_UNUSED, EAPI void evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a) { - eo_do((Evas_Object *)obj, efl_gfx_color_set(r, g, b, a)); + efl_gfx_color_set((Evas_Object *)obj, r, g, b, a); } EOLIAN static void @@ -1530,7 +1527,7 @@ _evas_object_efl_gfx_base_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, if (evas_object_intercept_call_color_set(eo_obj, obj, r, g, b, a)) return; if (obj->is_smart) { - eo_do(eo_obj, evas_obj_smart_color_set(r, g, b, a)); + evas_obj_smart_color_set(eo_obj, r, g, b, a); } if ((obj->cur->color.r == r) && (obj->cur->color.g == g) && @@ -1572,7 +1569,7 @@ _evas_object_efl_gfx_base_color_part_set(Eo *obj, Evas_Object_Protected_Data *pd EAPI void evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) { - eo_do((Evas_Object *)obj, efl_gfx_color_get(r, g, b, a)); + efl_gfx_color_get((Evas_Object *)obj, r, g, b, a); } EOLIAN static void @@ -1677,7 +1674,7 @@ _evas_object_render_op_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *o EOLIAN static void _evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Eo_Dbg_Info *root) { - eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); + eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); Eo_Dbg_Info *node; const char *name; @@ -1699,25 +1696,24 @@ _evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EI Eina_Bool repeat_event; Eina_Bool clipees_has; - eo_do(eo_obj, - visible = efl_gfx_visible_get(), - layer = efl_gfx_stack_layer_get(), - name = evas_obj_name_get(), - efl_gfx_position_get(&x, &y), - efl_gfx_size_get(&w, &h), - scale = evas_obj_scale_get(), - evas_obj_size_hint_min_get(&minw, &minh), - evas_obj_size_hint_max_get(&maxw, &maxh), - evas_obj_size_hint_request_get(&requestw, &requesth), - evas_obj_size_hint_align_get(&dblx, &dbly), - evas_obj_size_hint_weight_get(&dblw, &dblh), - efl_gfx_color_get(&r, &g, &b, &a), - focus = evas_obj_focus_get(), - m = evas_obj_pointer_mode_get(), - pass_event = evas_obj_pass_events_get(), - repeat_event = evas_obj_repeat_events_get(), - propagate_event = evas_obj_propagate_events_get(), - clipees_has = evas_obj_clipees_has()); + visible = efl_gfx_visible_get(eo_obj); + layer = efl_gfx_stack_layer_get(eo_obj); + name = evas_obj_name_get(eo_obj); + efl_gfx_position_get(eo_obj, &x, &y); + efl_gfx_size_get(eo_obj, &w, &h); + scale = evas_obj_scale_get(eo_obj); + evas_obj_size_hint_min_get(eo_obj, &minw, &minh); + evas_obj_size_hint_max_get(eo_obj, &maxw, &maxh); + evas_obj_size_hint_request_get(eo_obj, &requestw, &requesth); + evas_obj_size_hint_align_get(eo_obj, &dblx, &dbly); + evas_obj_size_hint_weight_get(eo_obj, &dblw, &dblh); + efl_gfx_color_get(eo_obj, &r, &g, &b, &a); + focus = evas_obj_focus_get(eo_obj); + m = evas_obj_pointer_mode_get(eo_obj); + pass_event = evas_obj_pass_events_get(eo_obj); + repeat_event = evas_obj_repeat_events_get(eo_obj); + propagate_event = evas_obj_propagate_events_get(eo_obj); + clipees_has = evas_obj_clipees_has(eo_obj); EO_DBG_INFO_APPEND(group, "Visibility", EINA_VALUE_TYPE_CHAR, visible); @@ -1792,7 +1788,7 @@ _evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EI EO_DBG_INFO_APPEND(group, "Has clipees", EINA_VALUE_TYPE_CHAR, clipees_has); Evas_Object *clipper = NULL; - eo_do(eo_obj, clipper = evas_obj_clip_get()); + clipper = evas_obj_clip_get(eo_obj); EO_DBG_INFO_APPEND(group, "Clipper", EINA_VALUE_TYPE_UINT64, (uintptr_t) clipper); const Evas_Map *map = evas_object_map_get(eo_obj); @@ -1868,8 +1864,7 @@ evas_object_top_at_pointer_get(const Evas *eo_e) Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Object *ret = NULL; if (!e) return NULL; - eo_do((Eo *)eo_e, ret = evas_canvas_object_top_at_xy_get(e->pointer.x, e->pointer.y, EINA_TRUE, - EINA_TRUE)); + ret = evas_canvas_object_top_at_xy_get((Eo *)eo_e, e->pointer.x, e->pointer.y, EINA_TRUE, EINA_TRUE); return ret; } diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c index a583c6dbe1..a154e37cd2 100644 --- a/src/lib/evas/canvas/evas_object_polygon.c +++ b/src/lib/evas/canvas/evas_object_polygon.c @@ -105,7 +105,7 @@ evas_object_polygon_add(Evas *e) EOLIAN static Eo * _evas_polygon_eo_base_constructor(Eo *eo_obj, Evas_Polygon_Data *class_data EINA_UNUSED) { - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); evas_object_polygon_init(eo_obj); @@ -280,7 +280,7 @@ _evas_polygon_eo_base_destructor(Eo *eo_obj, Evas_Polygon_Data *_pd EINA_UNUSED) Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_polygon_free(eo_obj, obj, obj->private_data); - eo_do_super(eo_obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(eo_obj, MY_CLASS)); } static void diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c index a22c990275..37f8266eb1 100644 --- a/src/lib/evas/canvas/evas_object_rectangle.c +++ b/src/lib/evas/canvas/evas_object_rectangle.c @@ -102,7 +102,7 @@ evas_object_rectangle_add(Evas *e) EOLIAN static Eo * _evas_rectangle_eo_base_constructor(Eo *eo_obj, Evas_Rectangle_Data *class_data EINA_UNUSED) { - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); evas_object_rectangle_init(eo_obj); diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index b3da505f12..44c18f197f 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -204,7 +204,7 @@ evas_object_smart_member_add(Evas_Object *eo_obj, Evas_Object *smart_obj) MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return; MAGIC_CHECK_END(); - eo_do(smart_obj, evas_obj_smart_member_add(eo_obj)); + evas_obj_smart_member_add(smart_obj, eo_obj); } EOLIAN static void @@ -293,7 +293,7 @@ evas_object_smart_member_del(Evas_Object *eo_obj) if (!obj->smart.parent) return; Evas_Object *smart_obj = obj->smart.parent; - eo_do(smart_obj, evas_obj_smart_member_del(eo_obj)); + evas_obj_smart_member_del(smart_obj, eo_obj); } EOLIAN static void @@ -571,7 +571,7 @@ evas_object_smart_add(Evas *eo_e, Evas_Smart *s) return NULL; MAGIC_CHECK_END(); eo_obj = eo_add(EVAS_OBJECT_SMART_CLASS, eo_e); - eo_do(eo_obj, evas_obj_smart_attach(s)); + evas_obj_smart_attach(eo_obj, s); return eo_obj; } @@ -584,12 +584,11 @@ _evas_object_smart_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data E smart->object = eo_obj; smart->inherit_paragraph_direction = EINA_TRUE; - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); evas_object_smart_init(eo_obj); - eo_do(eo_obj, - evas_obj_type_set(MY_CLASS_NAME_LEGACY), - evas_obj_smart_add()); + evas_obj_type_set(eo_obj, MY_CLASS_NAME_LEGACY); + evas_obj_smart_add(eo_obj); return eo_obj; } @@ -709,7 +708,7 @@ _evas_object_smart_attach(Eo *eo_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Sma } } - eo_do(eo_obj, evas_obj_smart_add()); + evas_obj_smart_add(eo_obj); } EAPI void @@ -741,7 +740,7 @@ evas_object_smart_callback_priority_add(Evas_Object *eo_obj, const char *event, o->callbacks = eina_inlist_append(o->callbacks, EINA_INLIST_GET(cb_info)); - eo_do(eo_obj, eo_event_callback_priority_add(eo_desc, priority, _eo_evas_smart_cb, cb_info)); + eo_event_callback_priority_add(eo_obj, eo_desc, priority, _eo_evas_smart_cb, cb_info); } EAPI void * @@ -764,8 +763,7 @@ evas_object_smart_callback_del(Evas_Object *eo_obj, const char *event, Evas_Smar if ((info->func == func) && (info->event == eo_desc)) { void *tmp = info->data; - eo_do(eo_obj, eo_event_callback_del( - eo_desc, _eo_evas_smart_cb, info)); + eo_event_callback_del(eo_obj, eo_desc, _eo_evas_smart_cb, info); o->callbacks = eina_inlist_remove(o->callbacks, EINA_INLIST_GET(info)); @@ -796,8 +794,7 @@ evas_object_smart_callback_del_full(Evas_Object *eo_obj, const char *event, Evas if ((info->func == func) && (info->event == eo_desc) && (info->data == data)) { void *tmp = info->data; - eo_do(eo_obj, eo_event_callback_del( - eo_desc, _eo_evas_smart_cb, info)); + eo_event_callback_del(eo_obj, eo_desc, _eo_evas_smart_cb, info); o->callbacks = eina_inlist_remove(o->callbacks, EINA_INLIST_GET(info)); @@ -817,7 +814,7 @@ evas_object_smart_callback_call(Evas_Object *eo_obj, const char *event, void *ev if (!event) return; const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get(event); - eo_do(eo_obj, eo_event_callback_call(eo_desc, event_info)); + eo_event_callback_call(eo_obj, eo_desc, event_info); } EOLIAN static Eina_Bool @@ -980,7 +977,7 @@ evas_call_smarts_calculate(Evas *eo_e) if (obj->smart.smart && obj->smart.smart->smart_class->calculate) obj->smart.smart->smart_class->calculate(obj->object); else - eo_do(obj->object, evas_obj_smart_calculate()); + evas_obj_smart_calculate(obj->object); } } @@ -1003,7 +1000,7 @@ _evas_object_smart_changed(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_async_block(obj); evas_object_change(eo_obj, obj); - eo_do(eo_obj, evas_obj_smart_need_recalculate_set(1)); + evas_obj_smart_need_recalculate_set(eo_obj, 1); } Eina_Bool @@ -1049,7 +1046,7 @@ evas_object_smart_del(Evas_Object *eo_obj) if (s && s->smart_class->del) s->smart_class->del(eo_obj); else - eo_do(eo_obj, evas_obj_smart_del()); + evas_obj_smart_del(eo_obj); if (obj->smart.parent) evas_object_smart_member_del(eo_obj); if (s) @@ -1243,14 +1240,13 @@ evas_object_smart_cleanup(Evas_Object *eo_obj) while (o->callbacks) { _eo_evas_smart_cb_info *info = (_eo_evas_smart_cb_info *)o->callbacks; - eo_do(eo_obj, eo_event_callback_del( - info->event, _eo_evas_smart_cb, info)); + eo_event_callback_del(eo_obj, info->event, _eo_evas_smart_cb, info); o->callbacks = eina_inlist_remove(o->callbacks, EINA_INLIST_GET(info)); free(info); } evas_smart_cb_descriptions_resize(&o->callbacks_descriptions, 0); - eo_do(eo_obj, evas_obj_smart_data_set(NULL)); + evas_obj_smart_data_set(eo_obj, NULL); } obj->smart.parent = NULL; diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c index 6d4effd2d8..c066e039d5 100644 --- a/src/lib/evas/canvas/evas_object_smart_clipped.c +++ b/src/lib/evas/canvas/evas_object_smart_clipped.c @@ -195,7 +195,7 @@ evas_object_smart_clipped_smart_member_add(Evas_Object *eo_obj, Evas_Object *mem EOLIAN static void _evas_smart_clipped_evas_object_smart_member_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member) { - eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_add(member)); + evas_obj_smart_member_add(eo_super(eo_obj, MY_CLASS), member); evas_object_smart_clipped_smart_member_add(eo_obj, member); } @@ -214,7 +214,7 @@ EOLIAN static void _evas_smart_clipped_evas_object_smart_member_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member) { evas_object_smart_clipped_smart_member_del(eo_obj, member); - eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_del(member)); + evas_obj_smart_member_del(eo_super(eo_obj, MY_CLASS), member); } EAPI void @@ -253,7 +253,7 @@ evas_object_smart_clipped_class_get(void) EOLIAN static Eo * _evas_smart_clipped_eo_base_constructor(Eo *obj, Evas_Object_Smart_Clipped_Data *class_data EINA_UNUSED) { - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } #include "canvas/evas_smart_clipped.eo.c" diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index 158237a812..60a83fddbe 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -272,13 +272,13 @@ static const Eo_Callback_Array_Item evas_object_table_callbacks[] = { static void _evas_object_table_child_connect(Evas_Object *o, Evas_Object *child) { - eo_do(child, eo_event_callback_array_add(evas_object_table_callbacks, o)); + eo_event_callback_array_add(child, evas_object_table_callbacks, o); } static void _evas_object_table_child_disconnect(Evas_Object *o, Evas_Object *child) { - eo_do(child, eo_event_callback_array_del(evas_object_table_callbacks, o)); + eo_event_callback_array_del(child, evas_object_table_callbacks, o); } static void @@ -899,7 +899,7 @@ _evas_table_evas_object_smart_add(Eo *obj, Evas_Table_Data *priv) priv->expand_h = 0; priv->expand_v = 0; - eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); + evas_obj_smart_add(eo_super(obj, MY_CLASS)); } EOLIAN static void @@ -923,7 +923,7 @@ _evas_table_evas_object_smart_del(Eo *obj, Evas_Table_Data *priv) priv->cache = NULL; } - eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); + evas_obj_smart_del(eo_super(obj, MY_CLASS)); } EOLIAN static void @@ -971,8 +971,8 @@ evas_object_table_add(Evas *evas) EOLIAN static Eo * _evas_table_eo_base_constructor(Eo *obj, Evas_Table_Data *class_data EINA_UNUSED) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); - eo_do(obj, evas_obj_type_set(MY_CLASS_NAME_LEGACY)); + obj = eo_constructor(eo_super(obj, MY_CLASS)); + evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); return obj; } @@ -1397,7 +1397,7 @@ _evas_table_mirrored_set(Eo *o, Evas_Table_Data *priv, Eina_Bool mirrored) if (priv->is_mirrored != mirrored) { priv->is_mirrored = mirrored; - eo_do(o, evas_obj_smart_calculate()); + evas_obj_smart_calculate(o); } } diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index 0820b60d55..419dd491f9 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -379,7 +379,7 @@ evas_object_text_add(Evas *e) EOLIAN static Eo * _evas_text_eo_base_constructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED) { - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); evas_object_text_init(eo_obj); return eo_obj; @@ -477,7 +477,7 @@ _evas_text_efl_text_properties_font_set(Eo *eo_obj, Evas_Text_Data *o, const cha _evas_object_text_recalc(eo_obj, o->cur.text); o->changed = 1; if (o->has_filter) - eo_do(eo_obj, evas_filter_changed_set(EINA_TRUE)); + evas_filter_changed_set(eo_obj, EINA_TRUE); evas_object_change(eo_obj, obj); evas_object_clip_dirty(eo_obj, obj); evas_object_coords_recalc(eo_obj, obj); @@ -673,7 +673,7 @@ _evas_object_text_pad_get(const Eo *eo_obj, Evas_Text_Data *o, int *l, int *r, i if (!o->has_filter) evas_text_style_pad_get(o->cur.style, l, r, t, b); else - eo_do(eo_obj, efl_gfx_filter_padding_get(l, r, t, b)); + efl_gfx_filter_padding_get(eo_obj, l, r, t, b); } /** @@ -999,7 +999,7 @@ _evas_text_ellipsis_set(Eo *eo_obj, Evas_Text_Data *o, double ellipsis) o->cur.ellipsis = ellipsis; o->changed = 1; if (o->has_filter) - eo_do(eo_obj, evas_filter_changed_set(EINA_TRUE)); + evas_filter_changed_set(eo_obj, EINA_TRUE); evas_object_change(eo_obj, obj); evas_object_clip_dirty(eo_obj, obj); } @@ -1013,19 +1013,19 @@ _evas_text_ellipsis_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o) EOLIAN static void _evas_text_eo_base_dbg_info_get(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED, Eo_Dbg_Info *root) { - eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); + eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); const char *text; int size; - eo_do(eo_obj, efl_text_properties_font_get(&text, &size)); + efl_text_properties_font_get(eo_obj, &text, &size); EO_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text); EO_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size); - eo_do(eo_obj, text = efl_text_properties_font_source_get()); + text = efl_text_properties_font_source_get(eo_obj); EO_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text); - eo_do(eo_obj, text = efl_text_get()); + text = efl_text_get(eo_obj); EO_DBG_INFO_APPEND(group, "Text", EINA_VALUE_TYPE_STRING, text); } @@ -1058,7 +1058,7 @@ _evas_text_efl_text_text_set(Eo *eo_obj, Evas_Text_Data *o, const char *_text) o->changed = 1; if (o->has_filter) - eo_do(eo_obj, evas_filter_changed_set(EINA_TRUE)); + evas_filter_changed_set(eo_obj, EINA_TRUE); evas_object_change(eo_obj, obj); evas_object_clip_dirty(eo_obj, obj); evas_object_coords_recalc(eo_obj, obj); @@ -1305,8 +1305,7 @@ _evas_text_style_set(Eo *eo_obj, Evas_Text_Data *o, Evas_Text_Style_Type style) if (o->items) w = obj->cur->geometry.w + (l - pl) + (r - pr); h = obj->cur->geometry.h + (t - pt) + (b - pb); - eo_do_super(eo_obj, MY_CLASS, - efl_gfx_size_set(w, h)); + efl_gfx_size_set(eo_super(eo_obj, MY_CLASS), w, h); evas_object_change(eo_obj, obj); } @@ -1610,7 +1609,7 @@ _evas_text_eo_base_destructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED) { Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_text_free(eo_obj, obj); - eo_do_super(eo_obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(eo_obj, MY_CLASS)); } static void @@ -2189,7 +2188,7 @@ _evas_object_text_rehint(Evas_Object *eo_obj) _evas_object_text_recalc(eo_obj, o->cur.text); o->changed = 1; if (o->has_filter) - eo_do(eo_obj, evas_filter_changed_set(EINA_TRUE)); + evas_filter_changed_set(eo_obj, EINA_TRUE); evas_object_change(eo_obj, obj); evas_object_clip_dirty(eo_obj, obj); evas_object_coords_recalc(eo_obj, obj); @@ -2271,13 +2270,11 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text) int min; min = w + l + r < obj->cur->geometry.w || obj->cur->geometry.w == 0 ? w + l + r : obj->cur->geometry.w; - eo_do_super(eo_obj, MY_CLASS, - efl_gfx_size_set(min, h + t + b)); + efl_gfx_size_set(eo_super(eo_obj, MY_CLASS), min, h + t + b); } else { - eo_do_super(eo_obj, MY_CLASS, - efl_gfx_size_set(w + l + r, h + t + b)); + efl_gfx_size_set(eo_super(eo_obj, MY_CLASS), w + l + r, h + t + b); } //// obj->cur->cache.geometry.validity = 0; } @@ -2285,8 +2282,7 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text) { int t = 0, b = 0, l = 0, r = 0; _evas_object_text_pad_get(eo_obj, o, &l, &r, &t, &b); - eo_do_super(eo_obj, MY_CLASS, - efl_gfx_size_set(0, o->max_ascent + o->max_descent + t + b)); + efl_gfx_size_set(eo_super(eo_obj, MY_CLASS), 0, o->max_ascent + o->max_descent + t + b); //// obj->cur->cache.geometry.validity = 0; } o->last_computed.w = obj->cur->geometry.w; @@ -2299,47 +2295,47 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text) EAPI void evas_object_text_font_source_set(Eo *obj, const char *font_source) { - eo_do((Eo *) obj, efl_text_properties_font_source_set(font_source)); + efl_text_properties_font_source_set((Eo *) obj, font_source); } EAPI const char * evas_object_text_font_source_get(const Eo *obj) { const char *font_source = 0; - eo_do((Eo *) obj, font_source = efl_text_properties_font_source_get()); + font_source = efl_text_properties_font_source_get((Eo *) obj); return font_source; } EAPI void evas_object_text_font_set(Eo *obj, const char *font, Evas_Font_Size size) { - eo_do((Eo *) obj, efl_text_properties_font_set(font, size)); + efl_text_properties_font_set((Eo *) obj, font, size); } EAPI void evas_object_text_font_get(const Eo *obj, const char **font, Evas_Font_Size *size) { - eo_do((Eo *) obj, efl_text_properties_font_get(font, size)); + efl_text_properties_font_get((Eo *) obj, font, size); } EAPI void evas_object_text_text_set(Eo *obj, const char *text) { - eo_do((Eo *) obj, efl_text_set(text)); + efl_text_set((Eo *) obj, text); } EAPI const char * evas_object_text_text_get(const Eo *obj) { const char *ret; - return eo_do_ret((Eo *) obj, ret, efl_text_get()); + return efl_text_get((Eo *) obj); } EOLIAN static void _evas_text_efl_gfx_filter_filter_program_set(Eo *obj, Evas_Text_Data *pd EINA_UNUSED, const char *code, const char *name) { pd->has_filter = (code != NULL); - eo_do_super(obj, MY_CLASS, efl_gfx_filter_program_set(code, name)); + efl_gfx_filter_program_set(eo_super(obj, MY_CLASS), code, name); } EAPI void diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 5a46004f51..8066f08732 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -6263,7 +6263,7 @@ _evas_textblock_eo_base_constructor(Eo *eo_obj, Evas_Textblock_Data *class_data Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Textblock_Data *o; - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); /* set up methods (compulsory) */ obj->func = &object_func; @@ -7350,8 +7350,9 @@ _obstacle_update(Evas_Textblock_Obstacle *obs, Eo *eo_obj) Evas_Coord ox, oy, ow, oh; Eo *eo_obs = obs->eo_obs; - eo_do(eo_obs, efl_gfx_position_get(&ox, &oy), efl_gfx_size_get(&ow, &oh)); - eo_do(eo_obj, efl_gfx_position_get(&x, &y)); + efl_gfx_position_get(eo_obs, &ox, &oy); + efl_gfx_size_get(eo_obs, &ow, &oh); + efl_gfx_position_get(eo_obj, &x, &y); obs->x = ox - x; obs->y = oy - y; @@ -7411,8 +7412,7 @@ _obstacle_del_cb(void *data, const Eo_Event *event) static void _obstacle_clear(Eo *eo_obj, Evas_Textblock_Obstacle *obs) { - eo_do(obs->eo_obs, eo_event_callback_del(EVAS_OBJECT_EVENT_DEL, - _obstacle_del_cb, eo_obj)); + eo_event_callback_del(obs->eo_obs, EVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj); } static void @@ -7448,8 +7448,7 @@ _evas_textblock_obstacle_add(Eo *eo_obj, if (!obs) return EINA_FALSE; obs->eo_obs = eo_obs; - eo_do(eo_obs, eo_event_callback_add(EVAS_OBJECT_EVENT_DEL,_obstacle_del_cb, - eo_obj)); + eo_event_callback_add(eo_obs, EVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj); obj->obstacles = eina_list_append(obj->obstacles, obs); _obstacle_update(obs, eo_obj); @@ -7499,7 +7498,7 @@ _layout_item_obstacle_get(Ctxt *c, Evas_Object_Textblock_Item *it) EINA_LIST_FOREACH(c->o->obstacles, i, obs) { Eina_Bool is_visible; - eo_do(obs->eo_obs, is_visible = efl_gfx_visible_get()); + is_visible = efl_gfx_visible_get(obs->eo_obs); if (!is_visible) continue; if ((obs->y < c->y + it->h) && @@ -11553,7 +11552,7 @@ _evas_textblock_line_number_geometry_get(const Eo *eo_obj, Evas_Textblock_Data * static void _evas_object_textblock_clear_all(Evas_Object *eo_obj) { - eo_do(eo_obj, evas_obj_textblock_clear()); + evas_obj_textblock_clear(eo_obj); } EOLIAN static void @@ -11883,7 +11882,7 @@ _evas_textblock_style_insets_get(Eo *eo_obj, Evas_Textblock_Data *o, Evas_Coord EOLIAN static void _evas_textblock_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNUSED, Eo_Dbg_Info *root) { - eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); + eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); if (!root) return; Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); Eo_Dbg_Info *node; @@ -11893,9 +11892,9 @@ _evas_textblock_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNU char shorttext[48]; const Evas_Textblock_Style *ts = NULL; - eo_do(eo_obj, ts = evas_obj_textblock_style_get()); + ts = evas_obj_textblock_style_get(eo_obj); style = evas_textblock_style_get(ts); - eo_do(eo_obj, text = evas_obj_textblock_text_markup_get()); + text = evas_obj_textblock_text_markup_get(eo_obj); strncpy(shorttext, text, 38); if (shorttext[37]) strcpy(shorttext + 37, "\xe2\x80\xa6"); /* HORIZONTAL ELLIPSIS */ @@ -11905,7 +11904,7 @@ _evas_textblock_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNU { int w, h; - eo_do(eo_obj, evas_obj_textblock_size_formatted_get(&w, &h)); + evas_obj_textblock_size_formatted_get(eo_obj, &w, &h); node = EO_DBG_INFO_LIST_APPEND(group, "Formatted size"); EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w); EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h); @@ -11913,7 +11912,7 @@ _evas_textblock_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNU { int w, h; - eo_do(eo_obj, evas_obj_textblock_size_native_get(&w, &h)); + evas_obj_textblock_size_native_get(eo_obj, &w, &h); node = EO_DBG_INFO_LIST_APPEND(group, "Native size"); EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w); EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h); @@ -11949,7 +11948,7 @@ EOLIAN static void _evas_textblock_eo_base_destructor(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNUSED) { evas_object_textblock_free(eo_obj); - eo_do_super(eo_obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(eo_obj, MY_CLASS)); } static void diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c index bc2f9d9f53..8742a4c2de 100644 --- a/src/lib/evas/canvas/evas_object_textgrid.c +++ b/src/lib/evas/canvas/evas_object_textgrid.c @@ -480,7 +480,7 @@ _evas_textgrid_eo_base_destructor(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED) Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_textgrid_free(eo_obj, obj); eo_data_unref(eo_obj, obj->private_data); - eo_do_super(eo_obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(eo_obj, MY_CLASS)); } static void @@ -1063,7 +1063,7 @@ evas_object_textgrid_add(Evas *e) EOLIAN static Eo * _evas_textgrid_eo_base_constructor(Eo *eo_obj, Evas_Textgrid_Data *class_data EINA_UNUSED) { - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); evas_object_textgrid_init(eo_obj); @@ -1493,22 +1493,22 @@ _evas_textgrid_update_add(Eo *eo_obj, Evas_Textgrid_Data *o, int x, int y, int w EOLIAN static void _evas_textgrid_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED, Eo_Dbg_Info *root) { - eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); + eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); Eo_Dbg_Info *node; const char *text; int size; - eo_do(eo_obj, efl_text_properties_font_get(&text, &size)); + efl_text_properties_font_get(eo_obj, &text, &size); EO_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text); EO_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size); - eo_do(eo_obj, text = efl_text_properties_font_source_get()); + text = efl_text_properties_font_source_get(eo_obj); EO_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text); { int w, h; - eo_do(eo_obj, evas_obj_textgrid_size_get(&w, &h)); + evas_obj_textgrid_size_get(eo_obj, &w, &h); node = EO_DBG_INFO_LIST_APPEND(group, "Grid size"); EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w); EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h); @@ -1518,27 +1518,27 @@ _evas_textgrid_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSE EAPI void evas_object_textgrid_font_source_set(Eo *obj, const char *font_source) { - eo_do((Eo *) obj, efl_text_properties_font_source_set(font_source)); + efl_text_properties_font_source_set((Eo *) obj, font_source); } EAPI const char * evas_object_textgrid_font_source_get(const Eo *obj) { const char *font_source = NULL; - eo_do((Eo *) obj, font_source = efl_text_properties_font_source_get()); + font_source = efl_text_properties_font_source_get((Eo *) obj); return font_source; } EAPI void evas_object_textgrid_font_set(Eo *obj, const char *font_name, Evas_Font_Size font_size) { - eo_do((Eo *) obj, efl_text_properties_font_set(font_name, font_size)); + efl_text_properties_font_set((Eo *) obj, font_name, font_size); } EAPI void evas_object_textgrid_font_get(const Eo *obj, const char **font_name, Evas_Font_Size *font_size) { - eo_do((Eo *) obj, efl_text_properties_font_get(font_name, font_size)); + efl_text_properties_font_get((Eo *) obj, font_name, font_size); } #include "canvas/evas_textgrid.eo.c" diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/evas_object_vg.c index 7d96eeb37d..929b584871 100644 --- a/src/lib/evas/canvas/evas_object_vg.c +++ b/src/lib/evas/canvas/evas_object_vg.c @@ -117,11 +117,11 @@ _evas_vg_eo_base_destructor(Eo *eo_obj, Evas_VG_Data *pd) if (pd->engine_data) obj->layer->evas->engine.func->ector_free(pd->engine_data); - eo_do(e, eo_event_callback_del(EVAS_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd)); + eo_event_callback_del(e, EVAS_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd); eo_unref(pd->root); pd->root = NULL; - eo_do_super(eo_obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(eo_obj, MY_CLASS)); } Eo * @@ -129,7 +129,7 @@ _evas_vg_eo_base_constructor(Eo *eo_obj, Evas_VG_Data *pd) { Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); /* set up methods (compulsory) */ obj->func = &object_func; @@ -152,7 +152,7 @@ _evas_vg_eo_base_finalize(Eo *obj, Evas_VG_Data *pd) // TODO: If we start to have to many Evas_Object_VG per canvas, it may be nice // to actually have one event per canvas and one array per canvas to. - eo_do(e, eo_event_callback_add(EVAS_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd)); + eo_event_callback_add(e, EVAS_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd); return obj; } diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c index 1558a90ed8..73c902c20f 100644 --- a/src/lib/evas/canvas/evas_out.c +++ b/src/lib/evas/canvas/evas_out.c @@ -29,11 +29,11 @@ _evas_out_eo_base_constructor(Eo *eo_obj, Evas_Out_Data *eo_dat) Eo *eo_parent = NULL; Evas_Public_Data *e; - eo_do(eo_obj, eo_parent = eo_parent_get()); + eo_parent = eo_parent_get(eo_obj); e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS); evas_canvas_async_block(e); - eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor()); + eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); if (!e) return NULL; e->outputs = eina_list_append(e->outputs, eo_obj); @@ -57,7 +57,7 @@ _evas_out_eo_base_destructor(Eo *eo_obj, Evas_Out_Data *eo_dat) Eo *eo_parent = NULL; Evas_Public_Data *e; - eo_do(eo_obj, eo_parent = eo_parent_get()); + eo_parent = eo_parent_get(eo_obj); e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS); evas_canvas_async_block(e); if (!e) return; @@ -66,7 +66,7 @@ _evas_out_eo_base_destructor(Eo *eo_obj, Evas_Out_Data *eo_dat) // e->engine.func->output_free(eo_dat->output); e->engine.func->info_free(eo_parent, eo_dat->info); e->outputs = eina_list_remove(e->outputs, eo_obj); - eo_do_super(eo_obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(eo_obj, MY_CLASS)); } EOLIAN static void @@ -74,7 +74,7 @@ _evas_out_view_set(Eo *eo_e, Evas_Out_Data *eo_dat, Evas_Coord x, Evas_Coord y, { Eo *eo_parent = NULL; Evas_Public_Data *e; - eo_do(eo_e, eo_parent = eo_parent_get()); + eo_parent = eo_parent_get(eo_e); e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS); evas_canvas_async_block(e); eo_dat->x = x; @@ -99,7 +99,7 @@ _evas_out_engine_info_set(Eo *eo_e, Evas_Out_Data *eo_dat, Evas_Engine_Info *inf { Eo *eo_parent = NULL; Evas_Public_Data *e; - eo_do(eo_e, eo_parent = eo_parent_get()); + eo_parent = eo_parent_get(eo_e); e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS); evas_canvas_async_block(e); if (eo_dat->info != info) return EINA_FALSE; diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c index b3497ee754..bc59739447 100644 --- a/src/lib/evas/canvas/evas_render.c +++ b/src/lib/evas/canvas/evas_render.c @@ -1872,7 +1872,7 @@ evas_render_proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_ ENFN->context_free(ENDT, ctx); if (eo_isa(eo_proxy, EVAS_IMAGE_CLASS)) - eo_do(eo_proxy, source_clip = evas_obj_image_source_clip_get()); + source_clip = evas_obj_image_source_clip_get(eo_proxy); Evas_Proxy_Render_Data proxy_render_data = { .eo_proxy = eo_proxy, @@ -2214,10 +2214,10 @@ _cb_always_call(Evas *eo_e, Evas_Callback_Type type, void *event_info) { int freeze_num = 0, i; - eo_do(eo_e, freeze_num = eo_event_freeze_count_get()); - for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_thaw()); + freeze_num = eo_event_freeze_count_get(eo_e); + for (i = 0; i < freeze_num; i++) eo_event_thaw(eo_e); evas_event_callback_call(eo_e, type, event_info); - for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_freeze()); + for (i = 0; i < freeze_num; i++) eo_event_freeze(eo_e); } static Eina_Bool diff --git a/src/lib/evas/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c index 84fa6d8a51..b5de2463d5 100644 --- a/src/lib/evas/canvas/evas_stack.c +++ b/src/lib/evas/canvas/evas_stack.c @@ -40,7 +40,7 @@ evas_object_below_get_internal(const Evas_Object_Protected_Data *obj) EAPI void evas_object_raise(Evas_Object *obj) { - eo_do((Evas_Object *)obj, efl_gfx_stack_raise()); + efl_gfx_stack_raise((Evas_Object *)obj); } EOLIAN void @@ -93,7 +93,7 @@ _evas_object_efl_gfx_stack_raise(Eo *eo_obj, Evas_Object_Protected_Data *obj) EAPI void evas_object_lower(Evas_Object *obj) { - eo_do((Evas_Object *)obj, efl_gfx_stack_lower()); + efl_gfx_stack_lower((Evas_Object *)obj); } EOLIAN void @@ -147,7 +147,7 @@ _evas_object_efl_gfx_stack_lower(Eo *eo_obj, Evas_Object_Protected_Data *obj) EAPI void evas_object_stack_above(Evas_Object *obj, Evas_Object *above) { - eo_do((Evas_Object *)obj, efl_gfx_stack_above(above)); + efl_gfx_stack_above((Evas_Object *)obj, above); } EOLIAN void @@ -229,7 +229,7 @@ _evas_object_efl_gfx_stack_stack_above(Eo *eo_obj, Evas_Object_Protected_Data *o EAPI void evas_object_stack_below(Evas_Object *obj, Evas_Object *below) { - eo_do((Evas_Object *)obj, efl_gfx_stack_below(below)); + efl_gfx_stack_below((Evas_Object *)obj, below); } EOLIAN void @@ -313,7 +313,7 @@ evas_object_above_get(const Evas_Object *obj) { Evas_Object *ret; - return eo_do_ret((Evas_Object *)obj, ret, efl_gfx_stack_above_get()); + return efl_gfx_stack_above_get((Evas_Object *)obj); } EOLIAN Efl_Gfx_Stack * @@ -344,7 +344,7 @@ evas_object_below_get(const Evas_Object *obj) { Evas_Object *ret; - return eo_do_ret((Evas_Object *)obj, ret, efl_gfx_stack_below_get()); + return efl_gfx_stack_below_get((Evas_Object *)obj); } EOLIAN Efl_Gfx_Stack * diff --git a/src/lib/evas/canvas/evas_vg_container.c b/src/lib/evas/canvas/evas_vg_container.c index fbaa8bc753..7d766a55da 100644 --- a/src/lib/evas/canvas/evas_vg_container.c +++ b/src/lib/evas/canvas/evas_vg_container.c @@ -33,7 +33,7 @@ _efl_vg_container_eo_base_constructor(Eo *obj, pd->names = eina_hash_stringshared_new(NULL); - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS); nd->render_pre = _efl_vg_container_render_pre; @@ -46,7 +46,7 @@ static void _efl_vg_container_eo_base_destructor(Eo *obj, Efl_VG_Container_Data *pd EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); eina_hash_free(pd->names); pd->names = NULL; @@ -68,12 +68,12 @@ _efl_vg_container_efl_vg_base_bounds_get(Eo *obj EINA_UNUSED, { if (first) { - eo_do(child, efl_vg_bounds_get(r)); + efl_vg_bounds_get(child, r); first = EINA_FALSE; } else { - eo_do(child, efl_vg_bounds_get(&s)); + efl_vg_bounds_get(child, &s); eina_rectangle_union(r, &s); } } @@ -109,7 +109,7 @@ _efl_vg_container_efl_vg_base_interpolate(Eo *obj, Eina_Hash_Tuple *tuple; Eina_Bool r; - eo_do_super(obj, EFL_VG_CONTAINER_CLASS, r = efl_vg_interpolate(from, to, pos_map)); + r = efl_vg_interpolate(eo_super(obj, EFL_VG_CONTAINER_CLASS), from, to, pos_map); if (!r) return EINA_FALSE; @@ -128,7 +128,7 @@ _efl_vg_container_efl_vg_base_interpolate(Eo *obj, if (!toc || !fromc) continue ; if (eo_class_get(toc) != eo_class_get(fromc)) continue ; - eo_do(cc, r &= efl_vg_interpolate(fromc, toc, pos_map)); + r &= efl_vg_interpolate(cc, fromc, toc, pos_map); } eina_iterator_free(it); @@ -144,7 +144,7 @@ _efl_vg_container_efl_vg_base_dup(Eo *obj, Eina_List *l; Eo *child; - eo_do_super(obj, EFL_VG_CONTAINER_CLASS, efl_vg_dup(from)); + efl_vg_dup(eo_super(obj, EFL_VG_CONTAINER_CLASS), from); fromd = eo_data_scope_get(from, EFL_VG_CONTAINER_CLASS); @@ -155,7 +155,7 @@ _efl_vg_container_efl_vg_base_dup(Eo *obj, { // By setting parent, we automatically reference // this new object as a child of obj. Magic at work ! - (void) eo_add_ref(eo_class_get(child), obj, efl_vg_dup(child)); + (void) eo_add_ref(eo_class_get(child), obj, efl_vg_dup(eoid, child)); } } diff --git a/src/lib/evas/canvas/evas_vg_gradient.c b/src/lib/evas/canvas/evas_vg_gradient.c index dff4738575..047ba72e7e 100644 --- a/src/lib/evas/canvas/evas_vg_gradient.c +++ b/src/lib/evas/canvas/evas_vg_gradient.c @@ -63,7 +63,7 @@ _efl_vg_gradient_efl_vg_base_interpolate(Eo *obj, double from_map; Eina_Bool r; - eo_do_super(obj, EFL_VG_GRADIENT_CLASS, r = efl_vg_interpolate(from, to, pos_map)); + r = efl_vg_interpolate(eo_super(obj, EFL_VG_GRADIENT_CLASS), from, to, pos_map); fromd = eo_data_scope_get(from, EFL_VG_GRADIENT_CLASS); tod = eo_data_scope_get(to, EFL_VG_GRADIENT_CLASS); @@ -101,31 +101,30 @@ _efl_vg_gradient_efl_vg_base_dup(Eo *obj, { Efl_VG_Gradient_Data *fromd; - eo_do_super(obj, EFL_VG_GRADIENT_CLASS, efl_vg_dup(from)); + efl_vg_dup(eo_super(obj, EFL_VG_GRADIENT_CLASS), from); fromd = eo_data_scope_get(from, EFL_VG_GRADIENT_CLASS); - eo_do(obj, - efl_gfx_gradient_stop_set(fromd->colors, fromd->colors_count), - efl_gfx_gradient_spread_set(fromd->s)); + efl_gfx_gradient_stop_set(obj, fromd->colors, fromd->colors_count); + efl_gfx_gradient_spread_set(obj, fromd->s); } EAPI void evas_vg_gradient_stop_set(Eo *obj, const Efl_Gfx_Gradient_Stop *colors, unsigned int length) { - eo_do(obj, efl_gfx_gradient_stop_set(colors, length)); + efl_gfx_gradient_stop_set(obj, colors, length); } EAPI void evas_vg_gradient_stop_get(Eo *obj, const Efl_Gfx_Gradient_Stop **colors, unsigned int *length) { - eo_do(obj, efl_gfx_gradient_stop_get(colors, length)); + efl_gfx_gradient_stop_get(obj, colors, length); } EAPI void evas_vg_gradient_spread_set(Eo *obj, Efl_Gfx_Gradient_Spread s) { - eo_do(obj, efl_gfx_gradient_spread_set(s)); + efl_gfx_gradient_spread_set(obj, s); } EAPI Efl_Gfx_Gradient_Spread @@ -133,7 +132,7 @@ evas_vg_gradient_spread_get(Eo *obj) { Efl_Gfx_Gradient_Spread ret; - return eo_do_ret(obj, ret, efl_gfx_gradient_spread_get()); + return efl_gfx_gradient_spread_get(obj); } #include "efl_vg_gradient.eo.c" diff --git a/src/lib/evas/canvas/evas_vg_gradient_linear.c b/src/lib/evas/canvas/evas_vg_gradient_linear.c index 7234d4bb22..471556f351 100644 --- a/src/lib/evas/canvas/evas_vg_gradient_linear.c +++ b/src/lib/evas/canvas/evas_vg_gradient_linear.c @@ -73,19 +73,18 @@ _efl_vg_gradient_linear_render_pre(Eo *obj, if (!nd->renderer) { - eo_do(s, nd->renderer = ector_surface_renderer_factory_new(ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN)); + nd->renderer = ector_surface_renderer_factory_new(s, ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN); } - eo_do(nd->renderer, - ector_renderer_transformation_set(current), - ector_renderer_origin_set(nd->x, nd->y), - ector_renderer_color_set(nd->r, nd->g, nd->b, nd->a), - ector_renderer_visibility_set(nd->visibility), - efl_gfx_gradient_stop_set(gd->colors, gd->colors_count), - efl_gfx_gradient_spread_set(gd->s), - efl_gfx_gradient_linear_start_set(pd->start.x, pd->start.y), - efl_gfx_gradient_linear_end_set(pd->end.x, pd->end.y), - ector_renderer_prepare()); + ector_renderer_transformation_set(nd->renderer, current); + ector_renderer_origin_set(nd->renderer, nd->x, nd->y); + ector_renderer_color_set(nd->renderer, nd->r, nd->g, nd->b, nd->a); + ector_renderer_visibility_set(nd->renderer, nd->visibility); + efl_gfx_gradient_stop_set(nd->renderer, gd->colors, gd->colors_count); + efl_gfx_gradient_spread_set(nd->renderer, gd->s); + efl_gfx_gradient_linear_start_set(nd->renderer, pd->start.x, pd->start.y); + efl_gfx_gradient_linear_end_set(nd->renderer, pd->end.x, pd->end.y); + ector_renderer_prepare(nd->renderer); } static Eo * @@ -94,7 +93,7 @@ _efl_vg_gradient_linear_eo_base_constructor(Eo *obj, { Efl_VG_Base_Data *nd; - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS); nd->render_pre = _efl_vg_gradient_linear_render_pre; @@ -106,7 +105,7 @@ _efl_vg_gradient_linear_eo_base_constructor(Eo *obj, static void _efl_vg_gradient_linear_eo_base_destructor(Eo *obj, Efl_VG_Gradient_Linear_Data *pd EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } static void @@ -130,7 +129,7 @@ _efl_vg_gradient_linear_efl_vg_base_interpolate(Eo *obj, double from_map; Eina_Bool r; - eo_do_super(obj, EFL_VG_GRADIENT_LINEAR_CLASS, r = efl_vg_interpolate(from, to, pos_map)); + r = efl_vg_interpolate(eo_super(obj, EFL_VG_GRADIENT_LINEAR_CLASS), from, to, pos_map); if (!r) return EINA_FALSE; @@ -158,37 +157,36 @@ _efl_vg_gradient_linear_efl_vg_base_dup(Eo *obj, { Efl_VG_Gradient_Linear_Data *fromd; - eo_do_super(obj, EFL_VG_GRADIENT_LINEAR_CLASS, efl_vg_dup(from)); + efl_vg_dup(eo_super(obj, EFL_VG_GRADIENT_LINEAR_CLASS), from); fromd = eo_data_scope_get(from, EFL_VG_GRADIENT_LINEAR_CLASS); - eo_do(obj, - efl_gfx_gradient_linear_start_set(fromd->start.x, fromd->start.y), - efl_gfx_gradient_linear_end_set(fromd->end.x, fromd->end.y)); + efl_gfx_gradient_linear_start_set(obj, fromd->start.x, fromd->start.y); + efl_gfx_gradient_linear_end_set(obj, fromd->end.x, fromd->end.y); } EAPI void evas_vg_gradient_linear_start_set(Eo *obj, double x, double y) { - eo_do(obj, efl_gfx_gradient_linear_start_set(x, y)); + efl_gfx_gradient_linear_start_set(obj, x, y); } EAPI void evas_vg_gradient_linear_start_get(Eo *obj, double *x, double *y) { - eo_do(obj, efl_gfx_gradient_linear_start_get(x, y)); + efl_gfx_gradient_linear_start_get(obj, x, y); } EAPI void evas_vg_gradient_linear_end_set(Eo *obj, double x, double y) { - eo_do(obj, efl_gfx_gradient_linear_end_set(x, y)); + efl_gfx_gradient_linear_end_set(obj, x, y); } EAPI void evas_vg_gradient_linear_end_get(Eo *obj, double *x, double *y) { - eo_do(obj, efl_gfx_gradient_linear_end_get(x, y)); + efl_gfx_gradient_linear_end_get(obj, x, y); } #include "efl_vg_gradient_linear.eo.c" diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.c b/src/lib/evas/canvas/evas_vg_gradient_radial.c index d6d62c5857..84d00bf7bb 100644 --- a/src/lib/evas/canvas/evas_vg_gradient_radial.c +++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c @@ -89,20 +89,19 @@ _efl_vg_gradient_radial_render_pre(Eo *obj, if (!nd->renderer) { - eo_do(s, nd->renderer = ector_surface_renderer_factory_new(ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN)); + nd->renderer = ector_surface_renderer_factory_new(s, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN); } - eo_do(nd->renderer, - ector_renderer_transformation_set(current), - ector_renderer_origin_set(nd->x, nd->y), - ector_renderer_color_set(nd->r, nd->g, nd->b, nd->a), - ector_renderer_visibility_set(nd->visibility), - efl_gfx_gradient_stop_set(gd->colors, gd->colors_count), - efl_gfx_gradient_spread_set(gd->s), - efl_gfx_gradient_radial_center_set(pd->center.x, pd->center.y), - efl_gfx_gradient_radial_focal_set(pd->focal.x, pd->focal.y), - efl_gfx_gradient_radial_radius_set(pd->radius), - ector_renderer_prepare()); + ector_renderer_transformation_set(nd->renderer, current); + ector_renderer_origin_set(nd->renderer, nd->x, nd->y); + ector_renderer_color_set(nd->renderer, nd->r, nd->g, nd->b, nd->a); + ector_renderer_visibility_set(nd->renderer, nd->visibility); + efl_gfx_gradient_stop_set(nd->renderer, gd->colors, gd->colors_count); + efl_gfx_gradient_spread_set(nd->renderer, gd->s); + efl_gfx_gradient_radial_center_set(nd->renderer, pd->center.x, pd->center.y); + efl_gfx_gradient_radial_focal_set(nd->renderer, pd->focal.x, pd->focal.y); + efl_gfx_gradient_radial_radius_set(nd->renderer, pd->radius); + ector_renderer_prepare(nd->renderer); } static Eo * @@ -110,7 +109,7 @@ _efl_vg_gradient_radial_eo_base_constructor(Eo *obj, Efl_VG_Gradient_Radial_Data { Efl_VG_Base_Data *nd; - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS); nd->render_pre = _efl_vg_gradient_radial_render_pre; @@ -123,7 +122,7 @@ static void _efl_vg_gradient_radial_eo_base_destructor(Eo *obj, Efl_VG_Gradient_Radial_Data *pd EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } static void @@ -148,7 +147,7 @@ _efl_vg_gradient_radial_efl_vg_base_interpolate(Eo *obj, double from_map; Eina_Bool r; - eo_do_super(obj, EFL_VG_GRADIENT_RADIAL_CLASS, r = efl_vg_interpolate(from, to, pos_map)); + r = efl_vg_interpolate(eo_super(obj, EFL_VG_GRADIENT_RADIAL_CLASS), from, to, pos_map); if (!r) return EINA_FALSE; @@ -177,32 +176,31 @@ _efl_vg_gradient_radial_efl_vg_base_dup(Eo *obj, { Efl_VG_Gradient_Radial_Data *fromd; - eo_do_super(obj, EFL_VG_GRADIENT_RADIAL_CLASS, efl_vg_dup(from)); + efl_vg_dup(eo_super(obj, EFL_VG_GRADIENT_RADIAL_CLASS), from); fromd = eo_data_scope_get(from, EFL_VG_GRADIENT_RADIAL_CLASS); - eo_do(obj, - efl_gfx_gradient_radial_focal_set(fromd->focal.x, fromd->focal.y), - efl_gfx_gradient_radial_center_set(fromd->center.x, fromd->center.y), - efl_gfx_gradient_radial_radius_set(fromd->radius)); + efl_gfx_gradient_radial_focal_set(obj, fromd->focal.x, fromd->focal.y); + efl_gfx_gradient_radial_center_set(obj, fromd->center.x, fromd->center.y); + efl_gfx_gradient_radial_radius_set(obj, fromd->radius); } EAPI void evas_vg_gradient_radial_center_set(Eo *obj, double x, double y) { - eo_do(obj, efl_gfx_gradient_radial_center_set(x, y)); + efl_gfx_gradient_radial_center_set(obj, x, y); } EAPI void evas_vg_gradient_radial_center_get(Eo *obj, double *x, double *y) { - eo_do(obj, efl_gfx_gradient_radial_center_get(x, y)); + efl_gfx_gradient_radial_center_get(obj, x, y); } EAPI void evas_vg_gradient_radial_radius_set(Eo *obj, double r) { - eo_do(obj, efl_gfx_gradient_radial_radius_set(r)); + efl_gfx_gradient_radial_radius_set(obj, r); } EAPI double @@ -210,19 +208,19 @@ evas_vg_gradient_radial_radius_get(Eo *obj) { double ret; - return eo_do_ret(obj, ret, efl_gfx_gradient_radial_radius_get()); + return efl_gfx_gradient_radial_radius_get(obj); } EAPI void evas_vg_gradient_radial_focal_set(Eo *obj, double x, double y) { - eo_do(obj, efl_gfx_gradient_radial_focal_set(x, y)); + efl_gfx_gradient_radial_focal_set(obj, x, y); } EAPI void evas_vg_gradient_radial_focal_get(Eo *obj, double *x, double *y) { - eo_do(obj, efl_gfx_gradient_radial_focal_get(x, y)); + efl_gfx_gradient_radial_focal_get(obj, x, y); } #include "efl_vg_gradient_radial.eo.c" diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c index e53d29516b..d9c561ba6c 100644 --- a/src/lib/evas/canvas/evas_vg_node.c +++ b/src/lib/evas/canvas/evas_vg_node.c @@ -26,8 +26,8 @@ _efl_vg_base_property_changed(void *data, const Eo_Event *event) if (pd->changed) return EINA_TRUE; pd->changed = EINA_TRUE; - eo_do(event->obj, parent = eo_parent_get()); - eo_do(parent, eo_event_callback_call(event->desc, event->event_info)); + parent = eo_parent_get(event->obj); + eo_event_callback_call(parent, event->desc, event->event_info); return EINA_TRUE; } @@ -215,7 +215,7 @@ _efl_vg_base_efl_gfx_base_size_get(Eo *obj, { Eina_Rectangle r = { 0, 0, 0, 0 }; - eo_do(obj, efl_vg_bounds_get(&r)); + efl_vg_bounds_get(obj, &r); if (w) *w = r.w; if (h) *h = r.h; } @@ -227,7 +227,7 @@ _efl_vg_base_parent_checked_get(Eo *obj, Efl_VG_Container_Data **cd) { *cd = NULL; - eo_do(obj, *parent = eo_parent_get()); + *parent = eo_parent_get(obj); if (eo_isa(*parent, EFL_VG_CONTAINER_CLASS)) { @@ -263,14 +263,14 @@ _efl_vg_base_eo_base_constructor(Eo *obj, Efl_VG_Container_Data *cd = NULL; Eo *parent; - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); if (!_efl_vg_base_parent_checked_get(obj, &parent, &cd)) { ERR("Failed"); return NULL; } - eo_do(obj, eo_event_callback_add(EFL_GFX_CHANGED, _efl_vg_base_property_changed, pd)); + eo_event_callback_add(obj, EFL_GFX_CHANGED, _efl_vg_base_property_changed, pd); pd->changed = EINA_TRUE; return obj; @@ -296,7 +296,7 @@ _efl_vg_base_eo_base_destructor(Eo *obj, Efl_VG_Base_Data *pd) pd->intp = NULL; } - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } static void @@ -380,7 +380,7 @@ _efl_vg_base_eo_base_parent_set(Eo *obj, if (pd->name) eina_hash_del(old_cd->names, pd->name, obj); } - eo_do_super(obj, MY_CLASS, eo_parent_set(parent)); + eo_parent_set(eo_super(obj, MY_CLASS), parent); if (cd) { cd->children = eina_list_append(cd->children, obj); @@ -405,7 +405,7 @@ _efl_vg_base_efl_gfx_stack_raise(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED) Eina_List *lookup, *next; Eo *parent; - eo_do(obj, parent = eo_parent_get()); + parent = eo_parent_get(obj); if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error; cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS); @@ -435,7 +435,7 @@ _efl_vg_base_efl_gfx_stack_stack_above(Eo *obj, Eina_List *lookup, *ref; Eo *parent; - eo_do(obj, parent = eo_parent_get()); + parent = eo_parent_get(obj); if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error; cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS); @@ -465,7 +465,7 @@ _efl_vg_base_efl_gfx_stack_stack_below(Eo *obj, Eina_List *lookup, *ref; Eo *parent; - eo_do(obj, parent = eo_parent_get()); + parent = eo_parent_get(obj); if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error; cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS); @@ -493,7 +493,7 @@ _efl_vg_base_efl_gfx_stack_lower(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED) Eina_List *lookup, *prev; Eo *parent; - eo_do(obj, parent = eo_parent_get()); + parent = eo_parent_get(obj); if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error; cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS); @@ -522,7 +522,7 @@ _efl_vg_base_root_parent_get(Eo *obj) if (eo_isa(obj, EFL_VG_ROOT_NODE_CLASS)) return obj; - eo_do(obj, parent = eo_parent_get()); + parent = eo_parent_get(obj); if (!parent) return NULL; return _efl_vg_base_root_parent_get(parent); @@ -533,7 +533,7 @@ _efl_vg_base_walk_down_at(Eo *root, Eina_Array *a, Eina_Rectangle *r) { Eina_Rectangle bounds; - eo_do(root, efl_vg_bounds_get(&bounds)); + efl_vg_bounds_get(root, &bounds); if (!eina_rectangles_intersect(&bounds, r)) return ; eina_array_push(a, root); @@ -571,7 +571,7 @@ _efl_vg_base_efl_gfx_stack_below_get(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED) Eina_Array_Iterator iterator; unsigned int i; - eo_do(obj, efl_vg_bounds_get(&r)); + efl_vg_bounds_get(obj, &r); eina_array_step_set(&a, sizeof (Eina_Array), 8); @@ -601,7 +601,7 @@ _efl_vg_base_efl_gfx_stack_above_get(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED) Eina_Array_Iterator iterator; unsigned int i; - eo_do(obj, efl_vg_bounds_get(&r)); + efl_vg_bounds_get(obj, &r); eina_array_step_set(&a, sizeof (Eina_Array), 8); @@ -727,8 +727,7 @@ _efl_vg_base_interpolate(Eo *obj, if (fromd->mask && tod->mask && pd->mask) { - eo_do(pd->mask, - r &= efl_vg_interpolate(fromd->mask, tod->mask, pos_map)); + r &= efl_vg_interpolate(pd->mask, fromd->mask, tod->mask, pos_map); } _efl_vg_base_changed(obj); @@ -779,9 +778,7 @@ _efl_vg_base_dup(Eo *obj, Efl_VG_Base_Data *pd, const Efl_VG_Base *from) _efl_vg_clean_object(&pd->mask); if (fromd->mask) { - pd->mask = eo_add(eo_class_get(fromd->mask), - obj, - efl_vg_dup(pd->mask)); + pd->mask = eo_add(eo_class_get(fromd->mask), obj, efl_vg_dup(eoid, pd->mask)); } pd->x = fromd->x; @@ -800,65 +797,63 @@ evas_vg_node_visible_get(Eo *obj) { Eina_Bool ret; - return eo_do_ret(obj, ret, efl_gfx_visible_get()); + return efl_gfx_visible_get(obj); } EAPI void evas_vg_node_visible_set(Eo *obj, Eina_Bool v) { - eo_do(obj, efl_gfx_visible_set(v)); + efl_gfx_visible_set(obj, v); } EAPI void evas_vg_node_color_get(Eo *obj, int *r, int *g, int *b, int *a) { - eo_do(obj, efl_gfx_color_get(r, g, b, a)); + efl_gfx_color_get(obj, r, g, b, a); } EAPI void evas_vg_node_color_set(Eo *obj, int r, int g, int b, int a) { - eo_do(obj, efl_gfx_color_set(r, g, b, a)); + efl_gfx_color_set(obj, r, g, b, a); } EAPI void evas_vg_node_geometry_get(Eo *obj, int *x, int *y, int *w, int *h) { - eo_do(obj, - efl_gfx_position_get(x, y), - efl_gfx_size_get(w, h)); + efl_gfx_position_get(obj, x, y); + efl_gfx_size_get(obj, w, h); } EAPI void evas_vg_node_geometry_set(Eo *obj, int x, int y, int w, int h) { - eo_do(obj, - efl_gfx_position_set(x, y), - efl_gfx_size_set(w, h)); + efl_gfx_position_set(obj, x, y); + efl_gfx_size_set(obj, w, h); } EAPI void evas_vg_node_stack_below(Eo *obj, Eo *below) { - eo_do(obj, efl_gfx_stack_below(below)); + efl_gfx_stack_below(obj, below); } EAPI void evas_vg_node_stack_above(Eo *obj, Eo *above) { - eo_do(obj, efl_gfx_stack_above(above)); + efl_gfx_stack_above(obj, above); } EAPI void evas_vg_node_raise(Eo *obj) { - eo_do(obj, efl_gfx_stack_raise()); + efl_gfx_stack_raise(obj); } EAPI void evas_vg_node_lower(Eo *obj) { - eo_do(obj, efl_gfx_stack_lower()); + efl_gfx_stack_lower(obj); } #include "efl_vg_base.eo.c" diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h index 102de5b078..e995a3c76c 100644 --- a/src/lib/evas/canvas/evas_vg_private.h +++ b/src/lib/evas/canvas/evas_vg_private.h @@ -70,7 +70,7 @@ _evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m) static inline void _efl_vg_base_changed(Eo *obj) { - eo_do(obj, eo_event_callback_call(EFL_GFX_CHANGED, NULL)); + eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL); } static inline void * diff --git a/src/lib/evas/canvas/evas_vg_root_node.c b/src/lib/evas/canvas/evas_vg_root_node.c index f35d0d6e1e..23ee1945b4 100644 --- a/src/lib/evas/canvas/evas_vg_root_node.c +++ b/src/lib/evas/canvas/evas_vg_root_node.c @@ -51,7 +51,7 @@ _efl_vg_root_node_eo_base_parent_set(Eo *obj, Eo *parent) { // Nice little hack, jump over parent parent_set in Efl_VG_Root - eo_do_super(obj, EFL_VG_BASE_CLASS, eo_parent_set(parent)); + eo_parent_set(eo_super(obj, EFL_VG_BASE_CLASS), parent); if (parent && !eo_isa(parent, EVAS_VG_CLASS)) { ERR("Parent of VG_ROOT_NODE must be a VG_CLASS"); @@ -78,10 +78,9 @@ _efl_vg_root_node_eo_base_constructor(Eo *obj, cd->names = eina_hash_stringshared_new(NULL); // Nice little hack, jump over parent constructor in Efl_VG_Root - obj = eo_do_super_ret(obj, EFL_VG_BASE_CLASS, obj, eo_constructor()); - eo_do(obj, - parent = eo_parent_get(), - efl_vg_name_set("root")); + obj = eo_constructor(eo_super(obj, EFL_VG_BASE_CLASS)); + parent = eo_parent_get(obj); + efl_vg_name_set(obj, "root"); if (!eo_isa(parent, EVAS_VG_CLASS)) { ERR("Parent of VG_ROOT_NODE must be a VG_CLASS"); return NULL; @@ -91,7 +90,7 @@ _efl_vg_root_node_eo_base_constructor(Eo *obj, nd->render_pre = _evas_vg_root_node_render_pre; nd->data = cd; - eo_do(obj, eo_event_callback_add(EFL_GFX_CHANGED, _evas_vg_root_node_changed, pd)); + eo_event_callback_add(obj, EFL_GFX_CHANGED, _evas_vg_root_node_changed, pd); return obj; } diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c index 84c0d79719..906f2420db 100644 --- a/src/lib/evas/canvas/evas_vg_shape.c +++ b/src/lib/evas/canvas/evas_vg_shape.c @@ -22,7 +22,7 @@ _efl_vg_shape_efl_vg_base_bounds_get(Eo *obj, Eina_Rectangle *r) { // FIXME: Use the renderer bounding box when it has been created instead of an estimation - eo_do(obj, efl_gfx_shape_bounds_get(r)); + efl_gfx_shape_bounds_get(obj, r); } static void @@ -53,12 +53,11 @@ _efl_vg_shape_efl_gfx_base_color_part_set(Eo *obj, Efl_VG_Shape_Data *pd EINA_UN if (part && !strcmp(part, "stroke")) { - eo_do(obj, efl_gfx_shape_stroke_color_set(r, g, b, a)); + efl_gfx_shape_stroke_color_set(obj, r, g, b, a); return EINA_TRUE; } - eo_do_super(obj, EFL_VG_SHAPE_CLASS, - ret = efl_gfx_color_part_set(part, r, g, b, a)); + ret = efl_gfx_color_part_set(eo_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a); return ret; } @@ -72,12 +71,11 @@ _efl_vg_shape_efl_gfx_base_color_part_get(Eo *obj, Efl_VG_Shape_Data *pd EINA_UN if (part && !strcmp(part, "stroke")) { - eo_do(obj, efl_gfx_shape_stroke_color_get(r, g, b, a)); + efl_gfx_shape_stroke_color_get(obj, r, g, b, a); return EINA_TRUE; } - eo_do_super(obj, EFL_VG_SHAPE_CLASS, - ret = efl_gfx_color_part_get(part, r, g, b, a)); + ret = efl_gfx_color_part_get(eo_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a); return ret; } @@ -147,20 +145,19 @@ _efl_vg_shape_render_pre(Eo *obj EINA_UNUSED, if (!nd->renderer) { - eo_do(s, nd->renderer = ector_surface_renderer_factory_new(ECTOR_RENDERER_GENERIC_SHAPE_MIXIN)); + nd->renderer = ector_surface_renderer_factory_new(s, ECTOR_RENDERER_GENERIC_SHAPE_MIXIN); } - eo_do(nd->renderer, - ector_renderer_transformation_set(current), - ector_renderer_origin_set(xn, yn), - ector_renderer_color_set(nd->r, nd->g, nd->b, nd->a), - ector_renderer_visibility_set(nd->visibility), - ector_renderer_mask_set(mask ? mask->renderer : NULL), - ector_renderer_shape_fill_set(fill ? fill->renderer : NULL), - ector_renderer_shape_stroke_fill_set(stroke_fill ? stroke_fill->renderer : NULL), - ector_renderer_shape_stroke_marker_set(stroke_marker ? stroke_marker->renderer : NULL), - efl_gfx_shape_dup(obj), - ector_renderer_prepare()); + ector_renderer_transformation_set(nd->renderer, current); + ector_renderer_origin_set(nd->renderer, xn, yn); + ector_renderer_color_set(nd->renderer, nd->r, nd->g, nd->b, nd->a); + ector_renderer_visibility_set(nd->renderer, nd->visibility); + ector_renderer_mask_set(nd->renderer, mask ? mask->renderer : NULL); + ector_renderer_shape_fill_set(nd->renderer, fill ? fill->renderer : NULL); + ector_renderer_shape_stroke_fill_set(nd->renderer, stroke_fill ? stroke_fill->renderer : NULL); + ector_renderer_shape_stroke_marker_set(nd->renderer, stroke_marker ? stroke_marker->renderer : NULL); + efl_gfx_shape_dup(nd->renderer, obj); + ector_renderer_prepare(nd->renderer); } static Eo * @@ -168,13 +165,12 @@ _efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd) { Efl_VG_Base_Data *nd; - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); - eo_do(obj, - efl_gfx_shape_stroke_scale_set(1), - efl_gfx_shape_stroke_location_set(0.5), - efl_gfx_shape_stroke_cap_set(EFL_GFX_CAP_BUTT), - efl_gfx_shape_stroke_join_set(EFL_GFX_JOIN_MITER)); + efl_gfx_shape_stroke_scale_set(obj, 1); + efl_gfx_shape_stroke_location_set(obj, 0.5); + efl_gfx_shape_stroke_cap_set(obj, EFL_GFX_CAP_BUTT); + efl_gfx_shape_stroke_join_set(obj, EFL_GFX_JOIN_MITER); nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS); nd->render_pre = _efl_vg_shape_render_pre; @@ -186,7 +182,7 @@ _efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd) static void _efl_vg_shape_eo_base_destructor(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } static Eina_Bool @@ -201,23 +197,21 @@ _efl_vg_shape_efl_vg_base_interpolate(Eo *obj, fromd = eo_data_scope_get(from, EFL_VG_SHAPE_CLASS); tod = eo_data_scope_get(to, EFL_VG_SHAPE_CLASS); - eo_do_super(obj, MY_CLASS, r = efl_vg_interpolate(from, to, pos_map)); + r = efl_vg_interpolate(eo_super(obj, MY_CLASS), from, to, pos_map); - eo_do(obj, r &= efl_gfx_shape_interpolate(from, to, pos_map)); + r &= efl_gfx_shape_interpolate(obj, from, to, pos_map); if (fromd->fill && tod->fill && pd->fill) { - eo_do(pd->fill, r &= efl_vg_interpolate(fromd->fill, tod->fill, pos_map)); + r &= efl_vg_interpolate(pd->fill, fromd->fill, tod->fill, pos_map); } if (fromd->stroke.fill && tod->stroke.fill && pd->stroke.fill) { - eo_do(pd->stroke.fill, - r &= efl_vg_interpolate(fromd->stroke.fill, tod->stroke.fill, pos_map)); + r &= efl_vg_interpolate(pd->stroke.fill, fromd->stroke.fill, tod->stroke.fill, pos_map); } if (fromd->stroke.marker && tod->stroke.marker && pd->stroke.marker) { - eo_do(pd->stroke.marker, - r &= efl_vg_interpolate(fromd->stroke.marker, tod->stroke.marker, pos_map)); + r &= efl_vg_interpolate(pd->stroke.marker, fromd->stroke.marker, tod->stroke.marker, pos_map); } return r; @@ -230,38 +224,31 @@ _efl_vg_shape_efl_vg_base_dup(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED, const Eo *parent; Eo *fill = NULL, *stroke_fill = NULL, *stroke_marker = NULL; - eo_do_super(obj, MY_CLASS, efl_vg_dup(from)); + efl_vg_dup(eo_super(obj, MY_CLASS), from); - eo_do(obj, parent = eo_parent_get()); + parent = eo_parent_get(obj); fromd = eo_data_scope_get(from, MY_CLASS); if (fromd->fill) { - fill = eo_add(eo_class_get(fromd->fill), - parent, - efl_vg_dup(fromd->fill)); + fill = eo_add(eo_class_get(fromd->fill), parent, efl_vg_dup(eoid, fromd->fill)); } if (fromd->stroke.fill) { - stroke_fill = eo_add(eo_class_get(fromd->stroke.fill), - parent, - efl_vg_dup(fromd->stroke.fill)); + stroke_fill = eo_add(eo_class_get(fromd->stroke.fill), parent, efl_vg_dup(eoid, fromd->stroke.fill)); } if (fromd->stroke.marker) { - stroke_marker = eo_add(eo_class_get(fromd->stroke.marker), - parent, - efl_vg_dup(fromd->stroke.marker)); + stroke_marker = eo_add(eo_class_get(fromd->stroke.marker), parent, efl_vg_dup(eoid, fromd->stroke.marker)); } - eo_do(obj, - efl_vg_shape_fill_set(fill), - efl_vg_shape_stroke_fill_set(stroke_fill), - efl_vg_shape_stroke_marker_set(stroke_marker), - efl_gfx_shape_dup(from)); + efl_vg_shape_fill_set(obj, fill); + efl_vg_shape_stroke_fill_set(obj, stroke_fill); + efl_vg_shape_stroke_marker_set(obj, stroke_marker); + efl_gfx_shape_dup(obj, from); } EAPI double @@ -269,25 +256,25 @@ evas_vg_shape_stroke_scale_get(Eo *obj) { double ret; - return eo_do_ret(obj, ret, efl_gfx_shape_stroke_scale_get()); + return efl_gfx_shape_stroke_scale_get(obj); } EAPI void evas_vg_shape_stroke_scale_set(Eo *obj, double s) { - eo_do(obj, efl_gfx_shape_stroke_scale_set(s)); + efl_gfx_shape_stroke_scale_set(obj, s); } EAPI void evas_vg_shape_stroke_color_get(Eo *obj, int *r, int *g, int *b, int *a) { - eo_do(obj, efl_gfx_shape_stroke_color_get(r, g, b, a)); + efl_gfx_shape_stroke_color_get(obj, r, g, b, a); } EAPI void evas_vg_shape_stroke_color_set(Eo *obj, int r, int g, int b, int a) { - eo_do(obj, efl_gfx_shape_stroke_color_set(r, g, b, a)); + efl_gfx_shape_stroke_color_set(obj, r, g, b, a); } EAPI double @@ -295,13 +282,13 @@ evas_vg_shape_stroke_width_get(Eo *obj) { double ret; - return eo_do_ret(obj, ret, efl_gfx_shape_stroke_width_get()); + return efl_gfx_shape_stroke_width_get(obj); } EAPI void evas_vg_shape_stroke_width_set(Eo *obj, double w) { - eo_do(obj, efl_gfx_shape_stroke_width_set(w)); + efl_gfx_shape_stroke_width_set(obj, w); } EAPI double @@ -309,25 +296,25 @@ evas_vg_shape_stroke_location_get(Eo *obj) { double ret; - return eo_do_ret(obj, ret, efl_gfx_shape_stroke_location_get()); + return efl_gfx_shape_stroke_location_get(obj); } EAPI void evas_vg_shape_stroke_location_set(Eo *obj, double centered) { - eo_do(obj, efl_gfx_shape_stroke_location_set(centered)); + efl_gfx_shape_stroke_location_set(obj, centered); } EAPI void evas_vg_shape_stroke_dash_get(Eo *obj, const Efl_Gfx_Dash **dash, unsigned int *length) { - eo_do(obj, efl_gfx_shape_stroke_dash_get(dash, length)); + efl_gfx_shape_stroke_dash_get(obj, dash, length); } EAPI void evas_vg_shape_stroke_dash_set(Eo *obj, const Efl_Gfx_Dash *dash, unsigned int length) { - eo_do(obj, efl_gfx_shape_stroke_dash_set(dash, length)); + efl_gfx_shape_stroke_dash_set(obj, dash, length); } EAPI Efl_Gfx_Cap @@ -335,13 +322,13 @@ evas_vg_shape_stroke_cap_get(Eo *obj) { Efl_Gfx_Cap ret; - return eo_do_ret(obj, ret, efl_gfx_shape_stroke_cap_get()); + return efl_gfx_shape_stroke_cap_get(obj); } EAPI void evas_vg_shape_stroke_cap_set(Eo *obj, Efl_Gfx_Cap c) { - eo_do(obj, efl_gfx_shape_stroke_cap_set(c)); + efl_gfx_shape_stroke_cap_set(obj, c); } EAPI Efl_Gfx_Join @@ -349,121 +336,121 @@ evas_vg_shape_stroke_join_get(Eo *obj) { Efl_Gfx_Join ret; - return eo_do_ret(obj, ret, efl_gfx_shape_stroke_join_get()); + return efl_gfx_shape_stroke_join_get(obj); } EAPI void evas_vg_shape_stroke_join_set(Eo *obj, Efl_Gfx_Join j) { - eo_do(obj, efl_gfx_shape_stroke_join_set(j)); + efl_gfx_shape_stroke_join_set(obj, j); } EAPI void evas_vg_shape_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points) { - eo_do(obj, efl_gfx_shape_path_set(op, points)); + efl_gfx_shape_path_set(obj, op, points); } EAPI void evas_vg_shape_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double **points) { - eo_do(obj, efl_gfx_shape_path_get(op, points)); + efl_gfx_shape_path_get(obj, op, points); } EAPI void evas_vg_shape_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int *points) { - eo_do(obj, efl_gfx_shape_path_length_get(commands, points)); + efl_gfx_shape_path_length_get(obj, commands, points); } EAPI void evas_vg_shape_shape_current_get(Eo *obj, double *x, double *y) { - eo_do(obj, efl_gfx_shape_current_get(x, y)); + efl_gfx_shape_current_get(obj, x, y); } EAPI void evas_vg_shape_shape_current_ctrl_get(Eo *obj, double *x, double *y) { - eo_do(obj, efl_gfx_shape_current_ctrl_get(x, y)); + efl_gfx_shape_current_ctrl_get(obj, x, y); } EAPI void evas_vg_shape_shape_dup(Eo *obj, Eo *dup_from) { - eo_do(obj, efl_gfx_shape_dup(dup_from)); + efl_gfx_shape_dup(obj, dup_from); } EAPI void evas_vg_shape_shape_reset(Eo *obj) { - eo_do(obj, efl_gfx_shape_reset()); + efl_gfx_shape_reset(obj); } EAPI void evas_vg_shape_shape_append_move_to(Eo *obj, double x, double y) { - eo_do(obj, efl_gfx_shape_append_move_to(x, y)); + efl_gfx_shape_append_move_to(obj, x, y); } EAPI void evas_vg_shape_shape_append_line_to(Eo *obj, double x, double y) { - eo_do(obj, efl_gfx_shape_append_line_to(x, y)); + efl_gfx_shape_append_line_to(obj, x, y); } EAPI void evas_vg_shape_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y) { - eo_do(obj, efl_gfx_shape_append_quadratic_to(x, y, ctrl_x, ctrl_y)); + efl_gfx_shape_append_quadratic_to(obj, x, y, ctrl_x, ctrl_y); } EAPI void evas_vg_shape_shape_append_squadratic_to(Eo *obj, double x, double y) { - eo_do(obj, efl_gfx_shape_append_squadratic_to(x, y)); + efl_gfx_shape_append_squadratic_to(obj, x, y); } EAPI void evas_vg_shape_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1) { - eo_do(obj, efl_gfx_shape_append_cubic_to(x, y, ctrl_x0, ctrl_y0, ctrl_x1, ctrl_y1)); + efl_gfx_shape_append_cubic_to(obj, x, y, ctrl_x0, ctrl_y0, ctrl_x1, ctrl_y1); } EAPI void evas_vg_shape_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y) { - eo_do(obj, efl_gfx_shape_append_scubic_to(x, y, ctrl_x, ctrl_y)); + efl_gfx_shape_append_scubic_to(obj, x, y, ctrl_x, ctrl_y); } EAPI void evas_vg_shape_shape_append_arc_to(Eo *obj, double x, double y, double rx, double ry, double angle, Eina_Bool large_arc, Eina_Bool sweep) { - eo_do(obj, efl_gfx_shape_append_arc_to(x, y, rx, ry, angle, large_arc, sweep)); + efl_gfx_shape_append_arc_to(obj, x, y, rx, ry, angle, large_arc, sweep); } EAPI void evas_vg_shape_shape_append_close(Eo *obj) { - eo_do(obj, efl_gfx_shape_append_close()); + efl_gfx_shape_append_close(obj); } EAPI void evas_vg_shape_shape_append_circle(Eo *obj, double x, double y, double radius) { - eo_do(obj, efl_gfx_shape_append_circle(x, y, radius)); + efl_gfx_shape_append_circle(obj, x, y, radius); } EAPI void evas_vg_shape_shape_append_rect(Eo *obj, double x, double y, double w, double h, double rx, double ry) { - eo_do(obj, efl_gfx_shape_append_rect(x, y, w, h, rx, ry)); + efl_gfx_shape_append_rect(obj, x, y, w, h, rx, ry); } EAPI void evas_vg_shape_shape_append_svg_path(Eo *obj, const char *svg_path_data) { - eo_do(obj, efl_gfx_shape_append_svg_path(svg_path_data)); + efl_gfx_shape_append_svg_path(obj, svg_path_data); } EAPI Eina_Bool @@ -471,7 +458,7 @@ evas_vg_shape_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double po { Eina_Bool ret; - return eo_do_ret(obj, ret, efl_gfx_shape_interpolate(from, to, pos_map)); + return efl_gfx_shape_interpolate(obj, from, to, pos_map); } EAPI Eina_Bool @@ -479,7 +466,7 @@ evas_vg_shape_shape_equal_commands(Eo *obj, const Eo *with) { Eina_Bool ret; - return eo_do_ret(obj, ret, efl_gfx_shape_equal_commands(with)); + return efl_gfx_shape_equal_commands(obj, with); } EAPI Efl_VG* diff --git a/src/lib/evas/canvas/render2/evas_render2.c b/src/lib/evas/canvas/render2/evas_render2.c index 04549589bb..72a913291a 100644 --- a/src/lib/evas/canvas/render2/evas_render2.c +++ b/src/lib/evas/canvas/render2/evas_render2.c @@ -32,10 +32,10 @@ _always_call(Eo *eo_e, Evas_Callback_Type type, void *event_info) { int freeze_num = 0, i; - eo_do(eo_e, freeze_num = eo_event_freeze_count_get()); - for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_thaw()); + freeze_num = eo_event_freeze_count_get(eo_e); + for (i = 0; i < freeze_num; i++) eo_event_thaw(eo_e); evas_event_callback_call(eo_e, type, event_info); - for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_freeze()); + for (i = 0; i < freeze_num; i++) eo_event_freeze(eo_e); } // a list of canvases currently rendering diff --git a/src/lib/evas/canvas/render2/evas_render2_old.c b/src/lib/evas/canvas/render2/evas_render2_old.c index 4b30543381..490399b19d 100644 --- a/src/lib/evas/canvas/render2/evas_render2_old.c +++ b/src/lib/evas/canvas/render2/evas_render2_old.c @@ -119,10 +119,10 @@ _evas_render2_always_call(Eo *eo_e, Evas_Callback_Type type, void *event_info) { int freeze_num = 0, i; - eo_do(eo_e, freeze_num = eo_event_freeze_count_get()); - for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_thaw()); + freeze_num = eo_event_freeze_count_get(eo_e); + for (i = 0; i < freeze_num; i++) eo_event_thaw(eo_e); evas_event_callback_call(eo_e, type, event_info); - for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_freeze()); + for (i = 0; i < freeze_num; i++) eo_event_freeze(eo_e); } static void diff --git a/src/lib/evas/common3d/primitives/primitive_common.c b/src/lib/evas/common3d/primitives/primitive_common.c index b80d1dc29b..1bea0682c6 100644 --- a/src/lib/evas/common3d/primitives/primitive_common.c +++ b/src/lib/evas/common3d/primitives/primitive_common.c @@ -11,10 +11,9 @@ void _set_vertex_data_from_array(Evas_Canvas3D_Mesh *mesh, { float *address, *out; int stride, i, j; - eo_do(mesh, - evas_canvas3d_mesh_frame_vertex_data_copy_set(frame, attr, 0, NULL), - address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(frame, attr), - stride = evas_canvas3d_mesh_frame_vertex_stride_get(frame, attr)); + evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, frame, attr, 0, NULL); + address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, frame, attr); + stride = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, frame, attr); if (stride == 0) stride = sizeof(float) * attr_count; for (i = 0; i < vcount; i++) { @@ -22,8 +21,7 @@ void _set_vertex_data_from_array(Evas_Canvas3D_Mesh *mesh, for (j = 0; j < attr_count; j++) out[j] = data[start + (line * i) + j]; } - eo_do(mesh, - evas_canvas3d_mesh_frame_vertex_data_unmap(frame, attr)); + evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, frame, attr); } void @@ -35,10 +33,9 @@ _set_vec3_vertex_data(Evas_Canvas3D_Mesh *mesh, { float *address, *out; int stride, i; - eo_do(mesh, - evas_canvas3d_mesh_frame_vertex_data_copy_set(frame, attr, 0, NULL), - address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(frame, attr), - stride = evas_canvas3d_mesh_frame_vertex_stride_get(frame, attr)); + evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, frame, attr, 0, NULL); + address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, frame, attr); + stride = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, frame, attr); if (stride == 0) stride = sizeof(float) * 3; for (i = 0; i < vcount; i++) { @@ -48,8 +45,7 @@ _set_vec3_vertex_data(Evas_Canvas3D_Mesh *mesh, out[2] = data[i].z; } free(data); - eo_do(mesh, - evas_canvas3d_mesh_frame_vertex_data_unmap(frame, attr)); + evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, frame, attr); } void @@ -61,10 +57,9 @@ _set_vec2_vertex_data(Evas_Canvas3D_Mesh *mesh, { float *address, *out; int stride, i; - eo_do(mesh, - evas_canvas3d_mesh_frame_vertex_data_copy_set(frame, attr, 0, NULL), - address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(frame, attr), - stride = evas_canvas3d_mesh_frame_vertex_stride_get(frame, attr)); + evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, frame, attr, 0, NULL); + address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, frame, attr); + stride = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, frame, attr); if (stride == 0) stride = sizeof(float) * 2; for (i = 0; i < vcount; i++) { @@ -73,8 +68,7 @@ _set_vec2_vertex_data(Evas_Canvas3D_Mesh *mesh, out[1] = data[i].y; } free(data); - eo_do(mesh, - evas_canvas3d_mesh_frame_vertex_data_unmap(frame, attr)); + evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, frame, attr); } void diff --git a/src/lib/evas/common3d/primitives/primitive_common.h b/src/lib/evas/common3d/primitives/primitive_common.h index 6c0dcf23f4..1cf4d916fb 100644 --- a/src/lib/evas/common3d/primitives/primitive_common.h +++ b/src/lib/evas/common3d/primitives/primitive_common.h @@ -18,15 +18,12 @@ #define SET_VERTEX_DATA(frame) \ Eina_Bool frame_exist; \ - eo_do(mesh, \ - frame_exist = evas_canvas3d_mesh_frame_exist(frame)); \ + frame_exist = evas_canvas3d_mesh_frame_exist(mesh, frame); \ if (!frame_exist) \ - eo_do(mesh, \ - evas_canvas3d_mesh_frame_add(frame)); \ - eo_do(mesh, \ - evas_canvas3d_mesh_vertex_count_set(vcount), \ - evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \ - icount, &indices[0])); \ + evas_canvas3d_mesh_frame_add(mesh, frame); \ + evas_canvas3d_mesh_vertex_count_set(mesh, vcount); \ + evas_canvas3d_mesh_index_data_copy_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \ + icount, &indices[0]); \ _set_vec3_vertex_data(mesh, frame, vcount, vertices, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION); \ _set_vec3_vertex_data(mesh, frame, vcount, normals, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL); \ _set_vec2_vertex_data(mesh, frame, vcount, tex_coord, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD); \ @@ -35,15 +32,12 @@ #define SET_VERTEX_DATA_FROM_ARRAY(mesh, frame, varray, vcount, indices, icount) \ Eina_Bool frame_exist; \ - eo_do(mesh, \ - frame_exist = evas_canvas3d_mesh_frame_exist(frame)); \ + frame_exist = evas_canvas3d_mesh_frame_exist(mesh, frame); \ if (!frame_exist) \ - eo_do(mesh, \ - evas_canvas3d_mesh_frame_add(frame)); \ - eo_do(mesh, \ - evas_canvas3d_mesh_vertex_count_set(vcount), \ - evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \ - icount, &indices[0])); \ + evas_canvas3d_mesh_frame_add(mesh, frame); \ + evas_canvas3d_mesh_vertex_count_set(mesh, vcount); \ + evas_canvas3d_mesh_index_data_copy_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \ + icount, &indices[0]); \ _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, \ 0, 3, 15, vcount); \ _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, \ diff --git a/src/lib/evas/common3d/save_load/evas_model_load_save_common.c b/src/lib/evas/common3d/save_load/evas_model_load_save_common.c index 190ba5982c..42fd47cf66 100644 --- a/src/lib/evas/common3d/save_load/evas_model_load_save_common.c +++ b/src/lib/evas/common3d/save_load/evas_model_load_save_common.c @@ -48,9 +48,8 @@ evas_model_load_vertex_data_unmap(Evas_Canvas3D_Mesh *mesh, #define UNMAP_IF_EXIST(existence, vertex_data_type) \ if (existence) \ { \ - eo_do(mesh, \ - evas_canvas3d_mesh_frame_vertex_data_unmap(frame, \ - vertex_data_type)); \ + evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, frame, \ + vertex_data_type); \ } UNMAP_IF_EXIST(header.existence_of_positions, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION) UNMAP_IF_EXIST(header.existence_of_normals, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL) @@ -79,18 +78,16 @@ evas_model_load_vertex_data_to_mesh(Evas_Canvas3D_Mesh *mesh, Evas_Model_Load_Save_Data map; int i, j; - eo_do(mesh, - evas_canvas3d_mesh_vertex_count_set(header.vertices_count), - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), - evas_canvas3d_mesh_frame_add(0)); + evas_canvas3d_mesh_vertex_count_set(mesh, header.vertices_count); + evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); + evas_canvas3d_mesh_frame_add(mesh, 0); #define VERTEX_DATA_MAP(name, vertex_data_type, default_size) \ if (header.existence_of_##name) \ { \ - eo_do(mesh, \ - evas_canvas3d_mesh_frame_vertex_data_copy_set(0, vertex_data_type, 0, NULL), \ - map.name = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, vertex_data_type), \ - stride->name = evas_canvas3d_mesh_frame_vertex_stride_get(0, vertex_data_type)); \ + evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, vertex_data_type, 0, NULL); \ + map.name = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, vertex_data_type); \ + stride->name = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, vertex_data_type); \ if (stride->name == 0) stride->name = sizeof(float) * default_size; \ } VERTEX_DATA_MAP(positions, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 3) @@ -125,10 +122,7 @@ evas_model_load_indices_data_to_mesh(Evas_Canvas3D_Mesh *mesh, Evas_Model_Load_Save_Header header, Evas_Model_Load_Save_Data data) { - eo_do(mesh, - evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, - header.indices_count, - data.indices)); + evas_canvas3d_mesh_index_data_copy_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, header.indices_count, data.indices); } Eina_Bool diff --git a/src/lib/evas/filters/evas_filter.c b/src/lib/evas/filters/evas_filter.c index 301b25ad0b..fef55f492d 100644 --- a/src/lib/evas/filters/evas_filter.c +++ b/src/lib/evas/filters/evas_filter.c @@ -42,7 +42,7 @@ _evas_image_get(Ector_Buffer *buf) if (!buf) return NULL; /* FIXME: This MAY return RGBA_Image because engine_image_set MAY pass an * RGBA_Image... Baaaaah */ - eo_do(buf, evas_ector_buffer_engine_image_get(NULL, &image)); + evas_ector_buffer_engine_image_get(buf, NULL, &image); return image; } diff --git a/src/lib/evas/filters/evas_filter_blend.c b/src/lib/evas/filters/evas_filter_blend.c index 9030e80e58..a8191e693d 100644 --- a/src/lib/evas/filters/evas_filter_blend.c +++ b/src/lib/evas/filters/evas_filter_blend.c @@ -185,11 +185,11 @@ _filter_blend_cpu_generic_do(Evas_Filter_Command *cmd, draw_func image_draw) sx = 0; sy = 0; - eo_do(cmd->input->buffer, ector_buffer_size_get(&sw, &sh)); + ector_buffer_size_get(cmd->input->buffer, &sw, &sh); dx = cmd->draw.ox; dy = cmd->draw.oy; - eo_do(cmd->output->buffer, ector_buffer_size_get(&dw, &dh)); + ector_buffer_size_get(cmd->output->buffer, &dw, &dh); if ((dw <= 0) || (dh <= 0) || (sw <= 0) || (sh <= 0)) return EINA_TRUE; @@ -229,8 +229,8 @@ _filter_blend_cpu_generic_do(Evas_Filter_Command *cmd, draw_func image_draw) sx, sy, sw, sh, dx, dy, dw, dh, image_draw); end: - if (src) eo_do(src_fb->buffer, ector_buffer_unmap(src, src_len)); - if (dst) eo_do(cmd->output->buffer, ector_buffer_unmap(dst, dst_len)); + if (src) ector_buffer_unmap(src_fb->buffer, src, src_len); + if (dst) ector_buffer_unmap(cmd->output->buffer, dst, dst_len); return ret; } diff --git a/src/lib/evas/filters/evas_filter_blur.c b/src/lib/evas/filters/evas_filter_blur.c index 3eb59d4f0b..5c2de1ae9c 100644 --- a/src/lib/evas/filters/evas_filter_blur.c +++ b/src/lib/evas/filters/evas_filter_blur.c @@ -222,8 +222,8 @@ _box_blur_apply(Evas_Filter_Command *cmd, Eina_Bool vert, Eina_Bool rgba) } else ret = EINA_FALSE; - eo_do(cmd->input->buffer, ector_buffer_unmap(src, src_len)); - eo_do(cmd->output->buffer, ector_buffer_unmap(dst, dst_len)); + ector_buffer_unmap(cmd->input->buffer, src, src_len); + ector_buffer_unmap(cmd->output->buffer, dst, dst_len); return ret; } @@ -347,8 +347,8 @@ _gaussian_blur_apply(Evas_Filter_Command *cmd, Eina_Bool vert, Eina_Bool rgba) } else ret = EINA_FALSE; - eo_do(cmd->input->buffer, ector_buffer_unmap(src, src_len)); - eo_do(cmd->output->buffer, ector_buffer_unmap(dst, dst_len)); + ector_buffer_unmap(cmd->input->buffer, src, src_len); + ector_buffer_unmap(cmd->output->buffer, dst, dst_len); return ret; } diff --git a/src/lib/evas/filters/evas_filter_bump.c b/src/lib/evas/filters/evas_filter_bump.c index f89ec3c2ad..c7f12cb35b 100644 --- a/src/lib/evas/filters/evas_filter_bump.c +++ b/src/lib/evas/filters/evas_filter_bump.c @@ -224,9 +224,9 @@ _bump_map_cpu_alpha_alpha(Evas_Filter_Command *cmd) ret = EINA_TRUE; end: - eo_do(cmd->input->buffer, ector_buffer_unmap(src_map, slen)); - eo_do(cmd->mask->buffer, ector_buffer_unmap(map_map, mlen)); - eo_do(cmd->output->buffer, ector_buffer_unmap(dst_map, dlen)); + ector_buffer_unmap(cmd->input->buffer, src_map, slen); + ector_buffer_unmap(cmd->mask->buffer, map_map, mlen); + ector_buffer_unmap(cmd->output->buffer, dst_map, dlen); free(phong); return ret; } @@ -404,8 +404,8 @@ _bump_map_cpu_alpha_rgba(Evas_Filter_Command *cmd) ret = EINA_TRUE; end: - eo_do(cmd->input->buffer, ector_buffer_unmap(src_map, slen)); - eo_do(cmd->mask->buffer, ector_buffer_unmap(map_map, mlen)); - eo_do(cmd->output->buffer, ector_buffer_unmap(dst_map, dlen)); + ector_buffer_unmap(cmd->input->buffer, src_map, slen); + ector_buffer_unmap(cmd->mask->buffer, map_map, mlen); + ector_buffer_unmap(cmd->output->buffer, dst_map, dlen); return ret; } diff --git a/src/lib/evas/filters/evas_filter_curve.c b/src/lib/evas/filters/evas_filter_curve.c index 9950121ec3..2ab9f70627 100644 --- a/src/lib/evas/filters/evas_filter_curve.c +++ b/src/lib/evas/filters/evas_filter_curve.c @@ -85,8 +85,8 @@ premul: ret = EINA_TRUE; end: - eo_do(cmd->input->buffer, ector_buffer_unmap(src_map, src_len)); - eo_do(cmd->output->buffer, ector_buffer_unmap(dst_map, dst_len)); + ector_buffer_unmap(cmd->input->buffer, src_map, src_len); + ector_buffer_unmap(cmd->output->buffer, dst_map, dst_len); return ret; } @@ -112,8 +112,8 @@ _filter_curve_cpu_alpha(Evas_Filter_Command *cmd) ret = EINA_TRUE; end: - eo_do(cmd->input->buffer, ector_buffer_unmap(src_map, src_len)); - eo_do(cmd->output->buffer, ector_buffer_unmap(dst_map, dst_len)); + ector_buffer_unmap(cmd->input->buffer, src_map, src_len); + ector_buffer_unmap(cmd->output->buffer, dst_map, dst_len); return ret; } diff --git a/src/lib/evas/filters/evas_filter_displace.c b/src/lib/evas/filters/evas_filter_displace.c index 5722c7b51b..01df460658 100644 --- a/src/lib/evas/filters/evas_filter_displace.c +++ b/src/lib/evas/filters/evas_filter_displace.c @@ -242,9 +242,9 @@ _filter_displace_cpu_alpha(Evas_Filter_Command *cmd) ret = EINA_TRUE; end: - eo_do(cmd->input->buffer, ector_buffer_unmap(src, src_len)); - eo_do(cmd->output->buffer, ector_buffer_unmap(dst, dst_len)); - eo_do(map_fb->buffer, ector_buffer_unmap(map_start, map_len)); + ector_buffer_unmap(cmd->input->buffer, src, src_len); + ector_buffer_unmap(cmd->output->buffer, dst, dst_len); + ector_buffer_unmap(map_fb->buffer, map_start, map_len); return ret; } @@ -303,9 +303,9 @@ _filter_displace_cpu_rgba(Evas_Filter_Command *cmd) ret = EINA_TRUE; end: - eo_do(cmd->input->buffer, ector_buffer_unmap(src, src_len)); - eo_do(cmd->output->buffer, ector_buffer_unmap(dst, dst_len)); - eo_do(map_fb->buffer, ector_buffer_unmap(map_start, map_len)); + ector_buffer_unmap(cmd->input->buffer, src, src_len); + ector_buffer_unmap(cmd->output->buffer, dst, dst_len); + ector_buffer_unmap(map_fb->buffer, map_start, map_len); return ret; } diff --git a/src/lib/evas/filters/evas_filter_fill.c b/src/lib/evas/filters/evas_filter_fill.c index e7090d9913..0958dcfb81 100644 --- a/src/lib/evas/filters/evas_filter_fill.c +++ b/src/lib/evas/filters/evas_filter_fill.c @@ -53,7 +53,7 @@ _fill_cpu(Evas_Filter_Command *cmd) } } - eo_do(fb->buffer, ector_buffer_unmap(ptr, len)); + ector_buffer_unmap(fb->buffer, ptr, len); return EINA_TRUE; } diff --git a/src/lib/evas/filters/evas_filter_mask.c b/src/lib/evas/filters/evas_filter_mask.c index 9f5b683606..c6d08dd182 100644 --- a/src/lib/evas/filters/evas_filter_mask.c +++ b/src/lib/evas/filters/evas_filter_mask.c @@ -146,9 +146,9 @@ _mask_cpu_alpha_alpha_alpha(Evas_Filter_Command *cmd) ret = EINA_TRUE; end: - eo_do(cmd->input->buffer, ector_buffer_unmap(src_map, src_len)); - eo_do(msk_fb->buffer, ector_buffer_unmap(msk_map, msk_len)); - eo_do(cmd->output->buffer, ector_buffer_unmap(dst_map, dst_len)); + ector_buffer_unmap(cmd->input->buffer, src_map, src_len); + ector_buffer_unmap(msk_fb->buffer, msk_map, msk_len); + ector_buffer_unmap(cmd->output->buffer, dst_map, dst_len); return ret; } @@ -261,9 +261,9 @@ _mask_cpu_alpha_rgba_rgba(Evas_Filter_Command *cmd) ret = EINA_TRUE; end: - eo_do(cmd->input->buffer, ector_buffer_unmap(src_map, src_len)); - eo_do(msk_fb->buffer, ector_buffer_unmap(msk_map, msk_len)); - eo_do(cmd->output->buffer, ector_buffer_unmap(dst_map, dst_len)); + ector_buffer_unmap(cmd->input->buffer, src_map, src_len); + ector_buffer_unmap(msk_fb->buffer, msk_map, msk_len); + ector_buffer_unmap(cmd->output->buffer, dst_map, dst_len); return ret; } @@ -351,9 +351,9 @@ _mask_cpu_alpha_alpha_rgba(Evas_Filter_Command *cmd) ret = EINA_TRUE; end: - eo_do(cmd->input->buffer, ector_buffer_unmap(src_map, src_len)); - eo_do(msk_fb->buffer, ector_buffer_unmap(msk_map, msk_len)); - eo_do(cmd->output->buffer, ector_buffer_unmap(dst_map, dst_len)); + ector_buffer_unmap(cmd->input->buffer, src_map, src_len); + ector_buffer_unmap(msk_fb->buffer, msk_map, msk_len); + ector_buffer_unmap(cmd->output->buffer, dst_map, dst_len); return ret; } @@ -429,8 +429,8 @@ _mask_cpu_rgba_rgba_rgba(Evas_Filter_Command *cmd) ret = EINA_TRUE; end: - eo_do(cmd->input->buffer, ector_buffer_unmap(src_map, src_len)); - eo_do(msk_fb->buffer, ector_buffer_unmap(msk_map, msk_len)); - eo_do(cmd->output->buffer, ector_buffer_unmap(dst_map, dst_len)); + ector_buffer_unmap(cmd->input->buffer, src_map, src_len); + ector_buffer_unmap(msk_fb->buffer, msk_map, msk_len); + ector_buffer_unmap(cmd->output->buffer, dst_map, dst_len); return ret; } diff --git a/src/lib/evas/filters/evas_filter_parser.c b/src/lib/evas/filters/evas_filter_parser.c index f78c7c084c..2b2c4c0f8a 100644 --- a/src/lib/evas/filters/evas_filter_parser.c +++ b/src/lib/evas/filters/evas_filter_parser.c @@ -2993,31 +2993,14 @@ evas_filter_program_state_set(Evas_Filter_Program *pgm, Evas_Object *eo_obj, pgm->state.next.name = next_state; pgm->state.next.value = next_val; - eo_do(eo_obj, - efl_gfx_color_get(&pgm->state.color.r, - &pgm->state.color.g, - &pgm->state.color.b, - &pgm->state.color.a)); + efl_gfx_color_get(eo_obj, &pgm->state.color.r, &pgm->state.color.g, &pgm->state.color.b, &pgm->state.color.a); if (eo_isa(eo_obj, EVAS_TEXT_CLASS)) { - eo_do(eo_obj, - evas_obj_text_shadow_color_get(&pgm->state.text.shadow.r, - &pgm->state.text.shadow.g, - &pgm->state.text.shadow.b, - &pgm->state.text.shadow.a), - evas_obj_text_outline_color_get(&pgm->state.text.outline.r, - &pgm->state.text.outline.g, - &pgm->state.text.outline.b, - &pgm->state.text.outline.a), - evas_obj_text_glow_color_get(&pgm->state.text.glow.r, - &pgm->state.text.glow.g, - &pgm->state.text.glow.b, - &pgm->state.text.glow.a), - evas_obj_text_glow2_color_get(&pgm->state.text.glow2.r, - &pgm->state.text.glow2.g, - &pgm->state.text.glow2.b, - &pgm->state.text.glow2.a)); + evas_obj_text_shadow_color_get(eo_obj, &pgm->state.text.shadow.r, &pgm->state.text.shadow.g, &pgm->state.text.shadow.b, &pgm->state.text.shadow.a); + evas_obj_text_outline_color_get(eo_obj, &pgm->state.text.outline.r, &pgm->state.text.outline.g, &pgm->state.text.outline.b, &pgm->state.text.outline.a); + evas_obj_text_glow_color_get(eo_obj, &pgm->state.text.glow.r, &pgm->state.text.glow.g, &pgm->state.text.glow.b, &pgm->state.text.glow.a); + evas_obj_text_glow2_color_get(eo_obj, &pgm->state.text.glow2.r, &pgm->state.text.glow2.g, &pgm->state.text.glow2.b, &pgm->state.text.glow2.a); } if (memcmp(&old_state, &pgm->state, sizeof(Evas_Filter_Program_State)) != 0) diff --git a/src/lib/evas/filters/evas_filter_private.h b/src/lib/evas/filters/evas_filter_private.h index e111fb2367..c4aee71fc9 100644 --- a/src/lib/evas/filters/evas_filter_private.h +++ b/src/lib/evas/filters/evas_filter_private.h @@ -282,8 +282,8 @@ _buffer_map_all(Ector_Buffer *buf, unsigned int *len, Ector_Buffer_Access_Flag m void *ret = NULL; int w, h; if (!buf) return NULL; - eo_do(buf, ector_buffer_size_get(&w, &h); - ret = ector_buffer_map(len, mode, 0, 0, w, h, cspace, stride)); + ector_buffer_size_get(buf, &w, &h); + ret = ector_buffer_map(buf, len, mode, 0, 0, w, h, cspace, stride); return ret; } diff --git a/src/lib/evas/filters/evas_filter_transform.c b/src/lib/evas/filters/evas_filter_transform.c index 704b8e8fdc..0cc3b2d966 100644 --- a/src/lib/evas/filters/evas_filter_transform.c +++ b/src/lib/evas/filters/evas_filter_transform.c @@ -116,8 +116,8 @@ _vflip_cpu(Evas_Filter_Command *cmd) ret = EINA_TRUE; end: - eo_do(cmd->input->buffer, ector_buffer_unmap(in, src_len)); - eo_do(cmd->output->buffer, ector_buffer_unmap(out, dst_len)); + ector_buffer_unmap(cmd->input->buffer, in, src_len); + ector_buffer_unmap(cmd->output->buffer, out, dst_len); return ret; } diff --git a/src/lib/evas/filters/evas_filter_utils.c b/src/lib/evas/filters/evas_filter_utils.c index ec843016a7..486532ea9f 100644 --- a/src/lib/evas/filters/evas_filter_utils.c +++ b/src/lib/evas/filters/evas_filter_utils.c @@ -62,9 +62,9 @@ evas_filter_buffer_scaled_get(Evas_Filter_Context *ctx, } end: - if (src_map) eo_do(src->buffer, ector_buffer_unmap(src_map, src_len)); + if (src_map) ector_buffer_unmap(src->buffer, src_map, src_len); if ((dst) && (dst_map)) - eo_do(dst->buffer, ector_buffer_unmap(dst_map, dst_len)); + ector_buffer_unmap(dst->buffer, dst_map, dst_len); DEBUG_TIME_END(); return dst; } diff --git a/src/modules/ethumb/emotion/emotion.c b/src/modules/ethumb/emotion/emotion.c index 792b0dba6c..e9a9eeee67 100644 --- a/src/modules/ethumb/emotion/emotion.c +++ b/src/modules/ethumb/emotion/emotion.c @@ -214,12 +214,9 @@ _finish_thumb_generation(struct _emotion_plugin *_plugin, int success) { int r = 0; - eo_do(_plugin->video, eo_event_callback_del( - EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin)); - eo_do(_plugin->video, eo_event_callback_del( - EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, _plugin)); - eo_do(_plugin->video, eo_event_callback_del( - EMOTION_OBJECT_EVENT_DECODE_STOP, _video_stopped_cb, _plugin)); + eo_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin); + eo_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, _plugin); + eo_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_DECODE_STOP, _video_stopped_cb, _plugin); emotion_object_play_set(_plugin->video, 0); @@ -263,8 +260,7 @@ _frame_grab_single(void *data) ethumb_image_save(e); - eo_do(_plugin->video, eo_event_callback_del( - EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin)); + eo_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin); emotion_object_play_set(_plugin->video, 0); @@ -407,12 +403,12 @@ _thumb_generate(Ethumb *e) _plugin->pcount = 1; _resize_movie(_plugin); - eo_do(o, eo_event_callback_add - (EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, _plugin)); - eo_do(o, eo_event_callback_add - (EMOTION_OBJECT_EVENT_FRAME_RESIZE,_frame_resized_cb, _plugin)); - eo_do(o, eo_event_callback_add - (EMOTION_OBJECT_EVENT_DECODE_STOP, _video_stopped_cb, _plugin)); + eo_event_callback_add + (o, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, _plugin); + eo_event_callback_add + (o, EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin); + eo_event_callback_add + (o, EMOTION_OBJECT_EVENT_DECODE_STOP, _video_stopped_cb, _plugin); if (f == ETHUMB_THUMB_EET) { diff --git a/src/modules/evas/engines/gl_common/evas_gl_preload.c b/src/modules/evas/engines/gl_common/evas_gl_preload.c index e566cb780b..52a8429092 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_preload.c +++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c @@ -105,7 +105,7 @@ _evas_gl_preload_main_loop_wakeup(void) if (async->tex) { EINA_LIST_FREE(async->tex->targets, target) - eo_do(target, evas_obj_image_pixels_dirty_set(EINA_TRUE)); + evas_obj_image_pixels_dirty_set(target, EINA_TRUE); } async->im->cache_entry.flags.preload_done = 0; if (async->tex) @@ -314,8 +314,7 @@ evas_gl_preload_target_register(Evas_GL_Texture *tex, Eo *target) { EINA_SAFETY_ON_NULL_RETURN(tex); - eo_do(target, - eo_event_callback_add(EO_BASE_EVENT_DEL, _evas_gl_preload_target_die, tex)); + eo_event_callback_add(target, EO_BASE_EVENT_DEL, _evas_gl_preload_target_die, tex); tex->targets = eina_list_append(tex->targets, target); tex->references++; } @@ -328,8 +327,7 @@ evas_gl_preload_target_unregister(Evas_GL_Texture *tex, Eo *target) EINA_SAFETY_ON_NULL_RETURN(tex); - eo_do(target, - eo_event_callback_del(EO_BASE_EVENT_DEL, _evas_gl_preload_target_die, tex)); + eo_event_callback_del(target, EO_BASE_EVENT_DEL, _evas_gl_preload_target_die, tex); EINA_LIST_FOREACH(tex->targets, l, o) if (o == target) diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c index dc68f1c52b..09e6a08ef9 100644 --- a/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c +++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c @@ -88,13 +88,7 @@ _evas_ector_gl_image_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas_Ect } pd->image = ENFN->image_ref(ENDT, im); - eo_do(obj, ector_gl_buffer_base_attach(im->tex->pt->texture, - im->tex->pt->fb, - (Efl_Gfx_Colorspace) evas_gl_common_gl_format_to_colorspace(im->tex->pt->format), - im->tex->w, im->tex->h, - im->tex->x, im->tex->y, - im->tex->pt->w, im->tex->pt->h, - l, r, t, b)); + ector_gl_buffer_base_attach(obj, im->tex->pt->texture, im->tex->pt->fb, (Efl_Gfx_Colorspace) evas_gl_common_gl_format_to_colorspace(im->tex->pt->format), im->tex->w, im->tex->h, im->tex->x, im->tex->y, im->tex->pt->w, im->tex->pt->h, l, r, t, b); } else { @@ -239,7 +233,7 @@ _evas_ector_gl_image_buffer_ector_generic_buffer_span_free(Eo *obj, Evas_Ector_G EOLIAN static Eo_Base * _evas_ector_gl_image_buffer_eo_base_constructor(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd) { - eo_do_super(obj, MY_CLASS, obj = eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); pd->base = eo_data_ref(obj, ECTOR_GL_BUFFER_BASE_MIXIN); pd->base->generic = eo_data_ref(obj, ECTOR_GENERIC_BUFFER_MIXIN); pd->base->generic->eo = obj; @@ -252,7 +246,7 @@ _evas_ector_gl_image_buffer_eo_base_finalize(Eo *obj, Evas_Ector_GL_Image_Buffer EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL); pd->base->generic->immutable = EINA_TRUE; - return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); + return eo_finalize(eo_super(obj, MY_CLASS)); } EOLIAN static void @@ -264,7 +258,7 @@ _evas_ector_gl_image_buffer_eo_base_destructor(Eo *obj, Evas_Ector_GL_Image_Buff eo_data_unref(obj, pd->base); ENFN->image_free(ENDT, pd->image); eo_xunref(pd->evas, obj); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } #include "evas_ector_gl_image_buffer.eo.c" diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c index 4fb6723bd6..73c66a3d53 100644 --- a/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c +++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c @@ -34,7 +34,7 @@ _evas_ector_gl_rgbaimage_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas Eina_Bool b; EINA_SAFETY_ON_NULL_RETURN(image); - if (eo_do_ret(obj, b, eo_finalized_get())) + if (eo_finalized_get(obj)) { CRI("engine_image must be set at construction time only"); return; @@ -51,10 +51,7 @@ _evas_ector_gl_rgbaimage_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas pd->image = im; if (!pd->image) return; - eo_do(obj, ector_buffer_pixels_set(im->image.data, - im->cache_entry.w, im->cache_entry.h, 0, - (Efl_Gfx_Colorspace) im->cache_entry.space, - EINA_TRUE, 0, 0, 0, 0)); + ector_buffer_pixels_set(obj, im->image.data, im->cache_entry.w, im->cache_entry.h, 0, (Efl_Gfx_Colorspace) im->cache_entry.space, EINA_TRUE, 0, 0, 0, 0); } EOLIAN static void @@ -93,7 +90,7 @@ end: EOLIAN static Eo * _evas_ector_gl_rgbaimage_buffer_eo_base_constructor(Eo *obj, Evas_Ector_GL_RGBAImage_Buffer_Data *pd) { - eo_do_super(obj, MY_CLASS, obj = eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); pd->base = eo_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj); return obj; } @@ -104,7 +101,7 @@ _evas_ector_gl_rgbaimage_buffer_eo_base_finalize(Eo *obj, Evas_Ector_GL_RGBAImag EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL); pd->base->generic->immutable = EINA_TRUE; - return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); + return eo_finalize(eo_super(obj, MY_CLASS)); } EOLIAN static void @@ -116,7 +113,7 @@ _evas_ector_gl_rgbaimage_buffer_eo_base_destructor(Eo *obj, Evas_Ector_GL_RGBAIm ENFN->image_free(ENDT, pd->glim); evas_cache_image_drop(&pd->image->cache_entry); eo_xunref(pd->evas, obj); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } #include "evas_ector_gl_rgbaimage_buffer.eo.c" diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c index ddedadd777..d296cf660e 100644 --- a/src/modules/evas/engines/gl_generic/evas_engine.c +++ b/src/modules/evas/engines/gl_generic/evas_engine.c @@ -2477,15 +2477,13 @@ eng_ector_buffer_wrap(void *data EINA_UNUSED, Evas *evas, void *engine_image, Ei { RGBA_Image *im = engine_image; - buf = eo_add(EVAS_ECTOR_GL_RGBAIMAGE_BUFFER_CLASS, evas, - evas_ector_buffer_engine_image_set(evas, im)); + buf = eo_add(EVAS_ECTOR_GL_RGBAIMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eoid, evas, im)); } else { Evas_GL_Image *im = engine_image; - buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, - evas_ector_buffer_engine_image_set(evas, im)); + buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eoid, evas, im)); } return buf; } @@ -2546,8 +2544,7 @@ eng_ector_buffer_new(void *data, Evas *evas, void *pixels, gc = re->window_gl_context_get(re->software.ob); im = evas_gl_common_image_surface_new(gc, iw, ih, EINA_TRUE); - buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, - evas_ector_buffer_engine_image_set(evas, im)); + buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eoid, evas, im)); im->references--; } return buf; @@ -2623,11 +2620,8 @@ eng_ector_renderer_draw(void *data, void *context, void *surface, void *engine_d if (eina_array_count(c) == 0) eina_array_push(c, eina_rectangle_new(clip.x, clip.y, clip.w, clip.h)); - eo_do(renderer, - ector_renderer_draw(_evas_render_op_to_ector_rop(gc->dc->render_op), - c, - // mul_col will be applied by GL during ector_end - 0xffffffff)); + ector_renderer_draw(renderer, _evas_render_op_to_ector_rop(gc->dc->render_op), c, // mul_col will be applied by GL during ector_end + 0xffffffff); while ((r = eina_array_pop(c))) eina_rectangle_free(r); @@ -2704,16 +2698,14 @@ eng_ector_begin(void *data, void *context EINA_UNUSED, Ector_Surface *ector, } } memset(buffer->software, 0, sizeof (unsigned int) * w * h); - eo_do(ector, - ector_buffer_pixels_set(buffer->software, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, - EINA_TRUE, 0, 0, 0, 0), - ector_surface_reference_point_set(x, y)); + ector_buffer_pixels_set(ector, buffer->software, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, EINA_TRUE, 0, 0, 0, 0); + ector_surface_reference_point_set(ector, x, y); } else { evas_gl_common_context_flush(gl_context); - eo_do(ector, ector_surface_reference_point_set(x, y)); + ector_surface_reference_point_set(ector, x, y); } } @@ -2734,7 +2726,7 @@ eng_ector_end(void *data, void *context EINA_UNUSED, Ector_Surface *ector, w = gl_context->w; h = gl_context->h; mul_use = gl_context->dc->mul.use; - eo_do(ector, ector_buffer_pixels_set(NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0)); + ector_buffer_pixels_set(ector, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0); eng_image_data_put(data, buffer->gl, buffer->software); if (!mul_use) diff --git a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c index d46b2c1119..bf00a1b2b3 100644 --- a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c +++ b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c @@ -28,7 +28,7 @@ _evas_ector_software_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas_Ect Eina_Bool b; EINA_SAFETY_ON_NULL_RETURN(image); - if (eo_do_ret(obj, b, eo_finalized_get())) + if (eo_finalized_get(obj)) { CRI("engine_image must be set at construction time only"); return; @@ -45,10 +45,7 @@ _evas_ector_software_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas_Ect pd->image = im; if (!pd->image) return; - eo_do(obj, ector_buffer_pixels_set(im->image.data, - im->cache_entry.w, im->cache_entry.h, 0, - (Efl_Gfx_Colorspace) im->cache_entry.space, - EINA_TRUE, 0, 0, 0, 0)); + ector_buffer_pixels_set(obj, im->image.data, im->cache_entry.w, im->cache_entry.h, 0, (Efl_Gfx_Colorspace) im->cache_entry.space, EINA_TRUE, 0, 0, 0, 0); } EOLIAN static void @@ -72,7 +69,7 @@ _evas_ector_software_buffer_evas_ector_buffer_engine_image_get(Eo *obj EINA_UNUS EOLIAN static Eo * _evas_ector_software_buffer_eo_base_constructor(Eo *obj, Evas_Ector_Software_Buffer_Data *pd) { - eo_do_super(obj, MY_CLASS, obj = eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); pd->base = eo_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj); return obj; } @@ -83,7 +80,7 @@ _evas_ector_software_buffer_eo_base_finalize(Eo *obj, Evas_Ector_Software_Buffer EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL); pd->base->generic->immutable = EINA_TRUE; - return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); + return eo_finalize(eo_super(obj, MY_CLASS)); } EOLIAN static void @@ -92,7 +89,7 @@ _evas_ector_software_buffer_eo_base_destructor(Eo *obj, Evas_Ector_Software_Buff eo_data_xunref(obj, pd->base, obj); evas_cache_image_drop(&pd->image->cache_entry); eo_xunref(pd->evas, obj); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } #include "evas_ector_buffer.eo.c" diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c index e1478143cf..f2018a626b 100644 --- a/src/modules/evas/engines/software_generic/evas_engine.c +++ b/src/modules/evas/engines/software_generic/evas_engine.c @@ -3765,8 +3765,7 @@ eng_ector_buffer_wrap(void *data EINA_UNUSED, Evas *e, void *engine_image, Eina_ if (!ie) return NULL; - buf = eo_add(EVAS_ECTOR_SOFTWARE_BUFFER_CLASS, e, - evas_ector_buffer_engine_image_set(e, ie)); + buf = eo_add(EVAS_ECTOR_SOFTWARE_BUFFER_CLASS, e, evas_ector_buffer_engine_image_set(eoid, e, ie)); return buf; } @@ -3785,9 +3784,7 @@ eng_ector_buffer_new(void *data EINA_UNUSED, Evas *evas, void *pixels, if ((flags & (ECTOR_BUFFER_FLAG_RENDERABLE | ECTOR_BUFFER_FLAG_DRAWABLE)) == 0) { - buf = eo_add(ECTOR_SOFTWARE_BUFFER_CLASS, evas, - ector_buffer_pixels_set(pixels, width, height, stride, cspace, - writeable, l, r, t, b)); + buf = eo_add(ECTOR_SOFTWARE_BUFFER_CLASS, evas, ector_buffer_pixels_set(eoid, pixels, width, height, stride, cspace, writeable, l, r, t, b)); } else { @@ -3854,10 +3851,7 @@ _draw_thread_ector_draw(void *data) { Evas_Thread_Command_Ector *ector = data; - eo_do(ector->r, - ector_renderer_draw(ector->render_op, - ector->clips, - ector->mul_col)); + ector_renderer_draw(ector->r, ector->render_op, ector->clips, ector->mul_col); _draw_thread_ector_cleanup(ector); } @@ -3971,10 +3965,8 @@ _draw_thread_ector_surface_set(void *data) y = ector_surface->y; } - eo_do(ector_surface->ector, - ector_buffer_pixels_set(pixels, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, - EINA_TRUE, 0, 0, 0, 0), - ector_surface_reference_point_set(x, y)); + ector_buffer_pixels_set(ector_surface->ector, pixels, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, EINA_TRUE, 0, 0, 0, 0); + ector_surface_reference_point_set(ector_surface->ector, x, y); eina_mempool_free(_mp_command_ector_surface, ector_surface); } @@ -4018,10 +4010,8 @@ eng_ector_begin(void *data EINA_UNUSED, void *context EINA_UNUSED, Ector_Surface w = sf->cache_entry.w; h = sf->cache_entry.h; - eo_do(ector, - ector_buffer_pixels_set(pixels, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, - EINA_TRUE, 0, 0, 0, 0), - ector_surface_reference_point_set(x, y)); + ector_buffer_pixels_set(ector, pixels, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, EINA_TRUE, 0, 0, 0, 0); + ector_surface_reference_point_set(ector, x, y); } } @@ -4042,7 +4032,7 @@ eng_ector_end(void *data EINA_UNUSED, void *context EINA_UNUSED, Ector_Surface * } else { - eo_do(ector, ector_renderer_surface_set(NULL)); + ector_renderer_surface_set(ector, NULL); evas_common_cpu_end_opt(); } } diff --git a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c index e67f3bf2ff..c17e984634 100644 --- a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c +++ b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c @@ -15,22 +15,18 @@ _set_geometry_to_mesh_from_eet_file(Evas_Canvas3D_Mesh *mesh, float *pos, *nor, *tex; int stride_pos, stride_nor, stride_tex, j; - eo_do(mesh, - evas_canvas3d_mesh_vertex_count_set(eet_mesh->geometries->vertices_count), - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), - evas_canvas3d_mesh_frame_add(0), - - evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL), - evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL), - evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL), - - pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION), - nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL), - tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD), - - stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION), - stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL), - stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD)); + evas_canvas3d_mesh_vertex_count_set(mesh, eet_mesh->geometries->vertices_count); + evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); + evas_canvas3d_mesh_frame_add(mesh, 0); + evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL); + evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL); + evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL); + pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION); + nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL); + tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD); + stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION); + stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL); + stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD); if (stride_pos == 0) stride_pos = sizeof(float) * 3; if (stride_nor == 0) stride_nor = sizeof(float) * 3; @@ -58,10 +54,9 @@ _set_geometry_to_mesh_from_eet_file(Evas_Canvas3D_Mesh *mesh, } /* unmap vertex buffer */ - eo_do(mesh, - evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION), - evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL), - evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD)); + evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION); + evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL); + evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD); } void @@ -72,32 +67,16 @@ _set_material_to_mesh_from_eet_file(Evas_Canvas3D_Mesh *mesh, Eo *material = NULL; material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, pd->evas); - eo_do(material, - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, - !!(eet_mesh->materials->colors[0].a > 0)), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, - !!(eet_mesh->materials->colors[1].a > 0)), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, - !!(eet_mesh->materials->colors[2].a > 0)), - evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, - eet_mesh->materials->colors[0].r, - eet_mesh->materials->colors[0].g, - eet_mesh->materials->colors[0].b, - eet_mesh->materials->colors[0].a), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, - eet_mesh->materials->colors[1].r, - eet_mesh->materials->colors[1].g, - eet_mesh->materials->colors[1].b, - eet_mesh->materials->colors[1].a), - evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, - eet_mesh->materials->colors[2].r, - eet_mesh->materials->colors[2].g, - eet_mesh->materials->colors[2].b, - eet_mesh->materials->colors[2].a), - evas_canvas3d_material_shininess_set(eet_mesh->materials->shininess)); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, !!(eet_mesh->materials->colors[0].a > 0)); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, !!(eet_mesh->materials->colors[1].a > 0)); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, !!(eet_mesh->materials->colors[2].a > 0)); + evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, eet_mesh->materials->colors[0].r, eet_mesh->materials->colors[0].g, eet_mesh->materials->colors[0].b, eet_mesh->materials->colors[0].a); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, eet_mesh->materials->colors[1].r, eet_mesh->materials->colors[1].g, eet_mesh->materials->colors[1].b, eet_mesh->materials->colors[1].a); + evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, eet_mesh->materials->colors[2].r, eet_mesh->materials->colors[2].g, eet_mesh->materials->colors[2].b, eet_mesh->materials->colors[2].a); + evas_canvas3d_material_shininess_set(material, eet_mesh->materials->shininess); - eo_do(mesh, evas_canvas3d_mesh_frame_material_set(0, material)); + evas_canvas3d_mesh_frame_material_set(mesh, 0, material); } void diff --git a/src/modules/evas/model_loaders/md2/evas_model_load_md2.c b/src/modules/evas/model_loaders/md2/evas_model_load_md2.c index 530b4d5e01..40a2aa6ac1 100644 --- a/src/modules/evas/model_loaders/md2/evas_model_load_md2.c +++ b/src/modules/evas/model_loaders/md2/evas_model_load_md2.c @@ -337,9 +337,8 @@ evas_model_load_file_md2(Evas_Canvas3D_Mesh *mesh, Eina_File *file) s_scale = 1.0 / (float)(loader.skin_width - 1); t_scale = 1.0 / (float)(loader.skin_height - 1); - eo_do(mesh, - evas_canvas3d_mesh_vertex_count_set(loader.triangle_count * 3), - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES)); + evas_canvas3d_mesh_vertex_count_set(mesh, loader.triangle_count * 3); + evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); /* Load frames */ for (i = 0; i < loader.frame_count; i++) @@ -347,23 +346,19 @@ evas_model_load_file_md2(Evas_Canvas3D_Mesh *mesh, Eina_File *file) const MD2_Frame *frame = (const MD2_Frame *)(loader.frames + loader.frame_size * i); int f = i * MD2_FRAME_SCALE; - eo_do(mesh, - /* Add a mesh frame. */ - evas_canvas3d_mesh_frame_add(f), - - /* Allocate vertex buffer for the frame. */ - evas_canvas3d_mesh_frame_vertex_data_copy_set(f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL), - evas_canvas3d_mesh_frame_vertex_data_copy_set(f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL), - evas_canvas3d_mesh_frame_vertex_data_copy_set(f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL), - - /* Map vertex buffer. */ - pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION), - nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL), - tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD), - - stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION), - stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL), - stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD)); + /* Add a mesh frame. */ + evas_canvas3d_mesh_frame_add(mesh, f); + /* Allocate vertex buffer for the frame. */ + evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL); + evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL); + evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL); + /* Map vertex buffer. */ + pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION); + nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL); + tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD); + stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION); + stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL); + stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD); if (stride_pos == 0) stride_pos = sizeof(float) * 3; @@ -404,10 +399,9 @@ evas_model_load_file_md2(Evas_Canvas3D_Mesh *mesh, Eina_File *file) } /* Unmap vertex buffer. */ - eo_do(mesh, - evas_canvas3d_mesh_frame_vertex_data_unmap(f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION), - evas_canvas3d_mesh_frame_vertex_data_unmap(f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL), - evas_canvas3d_mesh_frame_vertex_data_unmap(f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD)); + evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION); + evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL); + evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD); pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); diff --git a/src/modules/evas/model_loaders/obj/evas_model_load_obj.c b/src/modules/evas/model_loaders/obj/evas_model_load_obj.c index bd5777f4d3..718b8c91ef 100644 --- a/src/modules/evas/model_loaders/obj/evas_model_load_obj.c +++ b/src/modules/evas/model_loaders/obj/evas_model_load_obj.c @@ -372,25 +372,22 @@ evas_model_load_file_obj(Evas_Canvas3D_Mesh *mesh, Eina_File *file) } /* prepare of mesh and take pointers to data which must be read */ - eo_do(mesh, - evas_canvas3d_mesh_vertex_count_set(counts._triangles_counter * 3), - evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), - evas_canvas3d_mesh_frame_add(0), - evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL), - pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION), - stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION)); + evas_canvas3d_mesh_vertex_count_set(mesh, counts._triangles_counter * 3); + evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); + evas_canvas3d_mesh_frame_add(mesh, 0); + evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL); + pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION); + stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION); if (counts.existence_of_normal) - eo_do(mesh, - evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL), - nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL), - stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL)); + evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL); + nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL); + stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL); if (counts.existence_of_tex_point) - eo_do(mesh, - evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL), - tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD), - stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD)); + evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL); + tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD); + stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD); if (stride_pos == 0) stride_pos = sizeof(float) * 3; if ((counts.existence_of_normal) && (stride_nor == 0)) @@ -437,11 +434,11 @@ evas_model_load_file_obj(Evas_Canvas3D_Mesh *mesh, Eina_File *file) free(_triangles); /* Unmap vertex buffer. */ - eo_do(mesh, evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION)); + evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION); if (counts.existence_of_normal) - eo_do(mesh, evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL)); + evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL); if (counts.existence_of_tex_point) - eo_do(mesh, evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD)); + evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD); Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); diff --git a/src/tests/ecore/ecore_test_animator.c b/src/tests/ecore/ecore_test_animator.c index 98c7192a74..e2f17bcd9c 100644 --- a/src/tests/ecore/ecore_test_animator.c +++ b/src/tests/ecore/ecore_test_animator.c @@ -30,7 +30,7 @@ START_TEST(ecore_test_animators) fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n"); ecore_animator_frametime_set(interval1); - animator = eo_add(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(1, _anim_cb, &interval1)); + animator = eo_add(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(eoid, 1, _anim_cb, &interval1)); fail_if(!animator); @@ -38,7 +38,7 @@ START_TEST(ecore_test_animators) ecore_animator_frametime_set(interval2); prev = 0; - animator = eo_add(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(1, _anim_cb, &interval2)); + animator = eo_add(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(eoid, 1, _anim_cb, &interval2)); fail_if(!animator); ecore_main_loop_begin(); diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c index fe2f325434..0240903e0b 100644 --- a/src/tests/ecore/ecore_test_ecore_audio.c +++ b/src/tests/ecore/ecore_test_ecore_audio.c @@ -34,7 +34,7 @@ static Eina_Bool _finished_cb(void *data EINA_UNUSED, const Eo_Event *event EINA static Eina_Bool _looped_cb(void *data EINA_UNUSED, const Eo_Event *event) { - eo_do(event->obj, ecore_audio_obj_in_looped_set(EINA_FALSE)); + ecore_audio_obj_in_looped_set(event->obj, EINA_FALSE); return EINA_TRUE; } @@ -47,10 +47,10 @@ _seek_vol(void *data) Eo *in = data; Eo *out = NULL; - eo_do(in, out = ecore_audio_obj_in_output_get()); + out = ecore_audio_obj_in_output_get(in); - eo_do(out, ecore_audio_obj_volume_set(0.4)); - eo_do(in, len = ecore_audio_obj_in_seek(-0.3, SEEK_END)); + ecore_audio_obj_volume_set(out, 0.4); + len = ecore_audio_obj_in_seek(in, -0.3, SEEK_END); fail_if(len < 0); return EINA_FALSE; @@ -65,8 +65,8 @@ START_TEST(ecore_test_ecore_audio_obj_pulse) in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL); fail_if(!in); - eo_do(in, ecore_audio_obj_name_set("modem.wav")); - eo_do(in, ret = ecore_audio_obj_source_set(TESTS_SRC_DIR"/modem.wav")); + ecore_audio_obj_name_set(in, "modem.wav"); + ret = ecore_audio_obj_source_set(in, TESTS_SRC_DIR"/modem.wav"); fail_if(!ret); out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL); @@ -74,10 +74,10 @@ START_TEST(ecore_test_ecore_audio_obj_pulse) ecore_timer_add(0.3, _seek_vol, in); - eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED, _finished_cb, NULL)); - eo_do(out, eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _failed_cb, &pulse_context_failed)); + eo_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _finished_cb, NULL); + eo_event_callback_add(out, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _failed_cb, &pulse_context_failed); - eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); + ret = ecore_audio_obj_out_input_attach(out, in); fail_if(!ret); ecore_main_loop_begin(); @@ -114,17 +114,17 @@ START_TEST(ecore_test_ecore_audio_cleanup) in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL); fail_if(!in); - eo_do(in, eo_key_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &freq)); - eo_do(in, ecore_audio_obj_in_length_set(2)); + eo_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq); + ecore_audio_obj_in_length_set(in, 2); out = eo_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL); fail_if(!out); - eo_do(out, ret = ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_OGG)); + ret = ecore_audio_obj_format_set(out, ECORE_AUDIO_FORMAT_OGG); fail_if(!ret); - eo_do(out, ret = ecore_audio_obj_source_set(TESTS_BUILD_DIR"/tmp.ogg")); + ret = ecore_audio_obj_source_set(out, TESTS_BUILD_DIR"/tmp.ogg"); fail_if(!ret); - eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); + ret = ecore_audio_obj_out_input_attach(out, in); fail_if(!ret); ecore_idler_add(_idle_del, in); @@ -146,75 +146,75 @@ START_TEST(ecore_test_ecore_audio_obj_tone) in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL); fail_if(!in); - eo_do(in, ecore_audio_obj_name_set("tone")); + ecore_audio_obj_name_set(in, "tone"); - eo_do(in, channel = ecore_audio_obj_in_channels_get()); + channel = ecore_audio_obj_in_channels_get(in); fail_if(channel != 1); - eo_do(in, rate = ecore_audio_obj_in_samplerate_get()); + rate = ecore_audio_obj_in_samplerate_get(in); fail_if(rate != 44100); - eo_do(in, len = ecore_audio_obj_in_length_get()); + len = ecore_audio_obj_in_length_get(in); fail_if(len != 1); - eo_do(in, ecore_audio_obj_in_length_set(2.5)); - eo_do(in, len = ecore_audio_obj_in_length_get()); + ecore_audio_obj_in_length_set(in, 2.5); + len = ecore_audio_obj_in_length_get(in); fail_if(len != 2.5); - eo_do(in, ecore_audio_obj_in_looped_set(EINA_TRUE)); + ecore_audio_obj_in_looped_set(in, EINA_TRUE); - eo_do(in, len = ecore_audio_obj_in_remaining_get()); + len = ecore_audio_obj_in_remaining_get(in); fail_if(len != 2.5); - eo_do(in, freq = (intptr_t) eo_key_data_get(ECORE_AUDIO_ATTR_TONE_FREQ)); + freq = (intptr_t) eo_key_data_get(in, ECORE_AUDIO_ATTR_TONE_FREQ); fail_if(freq != 1000); freq = 2000; - eo_do(in, eo_key_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &freq)); + eo_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq); - eo_do(in, freq = (intptr_t) eo_key_data_get(ECORE_AUDIO_ATTR_TONE_FREQ)); + freq = (intptr_t) eo_key_data_get(in, ECORE_AUDIO_ATTR_TONE_FREQ); fail_if(freq != 2000); - eo_do(in, eo_key_data_set("foo", "bar")); - eo_do(in, tmp = eo_key_data_get("foo")); + eo_key_data_set(in, "foo", "bar"); + tmp = eo_key_data_get(in, "foo"); ck_assert_str_eq(tmp, "bar"); - eo_do(in, len = ecore_audio_obj_in_seek(5.0, SEEK_SET)); + len = ecore_audio_obj_in_seek(in, 5.0, SEEK_SET); fail_if(len != -1); - eo_do(in, len = ecore_audio_obj_in_seek(1.0, 42)); + len = ecore_audio_obj_in_seek(in, 1.0, 42); fail_if(len != -1); - eo_do(in, len = ecore_audio_obj_in_seek(1.0, SEEK_SET)); + len = ecore_audio_obj_in_seek(in, 1.0, SEEK_SET); fail_if(len != 1.0); - eo_do(in, len = ecore_audio_obj_in_remaining_get()); + len = ecore_audio_obj_in_remaining_get(in); fail_if(len != 1.5); - eo_do(in, len = ecore_audio_obj_in_seek(1.0, SEEK_CUR)); + len = ecore_audio_obj_in_seek(in, 1.0, SEEK_CUR); fail_if(len != 2.0); - eo_do(in, len = ecore_audio_obj_in_remaining_get()); + len = ecore_audio_obj_in_remaining_get(in); fail_if(len != 0.5); - eo_do(in, len = ecore_audio_obj_in_seek(-1.0, SEEK_END)); + len = ecore_audio_obj_in_seek(in, -1.0, SEEK_END); fail_if(len != 1.5); - eo_do(in, len = ecore_audio_obj_in_remaining_get()); + len = ecore_audio_obj_in_remaining_get(in); fail_if(len != 1.0); out = eo_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL); fail_if(!out); - eo_do(out, ecore_audio_obj_name_set("tmp.wav")); - eo_do(out, ret = ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_WAV)); + ecore_audio_obj_name_set(out, "tmp.wav"); + ret = ecore_audio_obj_format_set(out, ECORE_AUDIO_FORMAT_WAV); fail_if(!ret); - eo_do(out, ret = ecore_audio_obj_source_set(TESTS_BUILD_DIR"/tmp.wav")); + ret = ecore_audio_obj_source_set(out, TESTS_BUILD_DIR"/tmp.wav"); fail_if(!ret); - eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); + ret = ecore_audio_obj_out_input_attach(out, in); fail_if(!ret); - eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_LOOPED, _looped_cb, NULL)); - eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED, _finished_cb, NULL)); + eo_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_LOOPED, _looped_cb, NULL); + eo_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _finished_cb, NULL); ecore_main_loop_begin(); @@ -238,73 +238,73 @@ START_TEST(ecore_test_ecore_audio_obj_sndfile) in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL); fail_if(!in); - eo_do(in, fmt = ecore_audio_obj_format_get()); + fmt = ecore_audio_obj_format_get(in); fail_if(fmt != ECORE_AUDIO_FORMAT_AUTO); - eo_do(in, ret = ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_FLAC)); + ret = ecore_audio_obj_format_set(in, ECORE_AUDIO_FORMAT_FLAC); fail_if(!ret); - eo_do(in, fmt = ecore_audio_obj_format_get()); + fmt = ecore_audio_obj_format_get(in); fail_if(fmt != ECORE_AUDIO_FORMAT_FLAC); - eo_do(in, ret = ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_AUTO)); + ret = ecore_audio_obj_format_set(in, ECORE_AUDIO_FORMAT_AUTO); fail_if(!ret); - eo_do(in, ecore_audio_obj_name_set("sms.ogg")); - eo_do(in, ret = ecore_audio_obj_source_set(TESTS_SRC_DIR"/sms.ogg")); + ecore_audio_obj_name_set(in, "sms.ogg"); + ret = ecore_audio_obj_source_set(in, TESTS_SRC_DIR"/sms.ogg"); fail_if(!ret); - eo_do(in, src = ecore_audio_obj_source_get()); + src = ecore_audio_obj_source_get(in); ck_assert_str_eq(src, TESTS_SRC_DIR"/sms.ogg"); - eo_do(in, fmt = ecore_audio_obj_format_get()); + fmt = ecore_audio_obj_format_get(in); fail_if(fmt != ECORE_AUDIO_FORMAT_OGG); - eo_do(in, channel = ecore_audio_obj_in_channels_get()); + channel = ecore_audio_obj_in_channels_get(in); fail_if(channel != 2); - eo_do(in, rate = ecore_audio_obj_in_samplerate_get()); + rate = ecore_audio_obj_in_samplerate_get(in); fail_if(rate != 44100); - eo_do(in, len = ecore_audio_obj_in_length_get()); + len = ecore_audio_obj_in_length_get(in); fail_if(len == 0); - eo_do(in, rem = ecore_audio_obj_in_remaining_get()); + rem = ecore_audio_obj_in_remaining_get(in); fail_if(len != rem); - eo_do(in, fmt = ecore_audio_obj_format_get()); + fmt = ecore_audio_obj_format_get(in); fail_if(fmt != ECORE_AUDIO_FORMAT_OGG); - eo_do(in, len = ecore_audio_obj_in_seek(0.5, SEEK_SET)); + len = ecore_audio_obj_in_seek(in, 0.5, SEEK_SET); fail_if(len != 0.5); - eo_do(in, len = ecore_audio_obj_in_seek(0.5, SEEK_CUR)); + len = ecore_audio_obj_in_seek(in, 0.5, SEEK_CUR); fail_if(len != 1.0); - eo_do(in, len = ecore_audio_obj_in_seek(-1.0, SEEK_END)); + len = ecore_audio_obj_in_seek(in, -1.0, SEEK_END); fail_if(fabs(rem - 1 - len) > 0.1); out = eo_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL); fail_if(!out); - eo_do(out, ecore_audio_obj_name_set("tmp.wav")); - eo_do(out, ret = ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_WAV)); + ecore_audio_obj_name_set(out, "tmp.wav"); + ret = ecore_audio_obj_format_set(out, ECORE_AUDIO_FORMAT_WAV); fail_if(!ret); - eo_do(out, fmt = ecore_audio_obj_format_get()); + fmt = ecore_audio_obj_format_get(out); fail_if(fmt != ECORE_AUDIO_FORMAT_WAV); -// eo_do(out, ret = ecore_audio_obj_source_set("/tmp/file/does/not/exist/hopefully.wav")); +// ret = ecore_audio_obj_source_set(out, "/tmp/file/does/not/exist/hopefully.wav"); // fail_if(ret); - eo_do(out, ret = ecore_audio_obj_source_set(TESTS_BUILD_DIR"/tmp.wav")); + ret = ecore_audio_obj_source_set(out, TESTS_BUILD_DIR"/tmp.wav"); fail_if(!ret); - eo_do(out, src = ecore_audio_obj_source_get()); + src = ecore_audio_obj_source_get(out); ck_assert_str_eq(src, TESTS_BUILD_DIR"/tmp.wav"); - eo_do(out, ret = ecore_audio_obj_out_input_attach(in)); + ret = ecore_audio_obj_out_input_attach(out, in); fail_if(!ret); - eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED, _finished_cb, NULL)); + eo_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _finished_cb, NULL); ecore_main_loop_begin(); @@ -330,47 +330,47 @@ START_TEST(ecore_test_ecore_audio_obj_in_out) fail_if(!in2); fail_if(!out); - eo_do(in, out2 = ecore_audio_obj_in_output_get()); + out2 = ecore_audio_obj_in_output_get(in); fail_if(out2); - eo_do(out, in3 = ecore_audio_obj_out_inputs_get()); + in3 = ecore_audio_obj_out_inputs_get(out); fail_if(eina_list_count(in3) != 0); - eo_do(out, attached = ecore_audio_obj_out_input_attach(in)); + attached = ecore_audio_obj_out_input_attach(out, in); fail_if(!attached); - eo_do(out, attached = ecore_audio_obj_out_input_attach(in)); + attached = ecore_audio_obj_out_input_attach(out, in); fail_if(attached); - eo_do(in, out2 = ecore_audio_obj_in_output_get()); + out2 = ecore_audio_obj_in_output_get(in); fail_if(out2 != out); - eo_do(out, in3 = ecore_audio_obj_out_inputs_get()); + in3 = ecore_audio_obj_out_inputs_get(out); fail_if(eina_list_count(in3) != 1); fail_if(eina_list_data_get(in3) != in); - eo_do(out, attached = ecore_audio_obj_out_input_attach(in2)); + attached = ecore_audio_obj_out_input_attach(out, in2); fail_if(!attached); - eo_do(out, in3 = ecore_audio_obj_out_inputs_get()); + in3 = ecore_audio_obj_out_inputs_get(out); fail_if(eina_list_count(in3) != 2); fail_if(eina_list_data_get(in3) != in); eo_del(in2); - eo_do(out, in3 = ecore_audio_obj_out_inputs_get()); + in3 = ecore_audio_obj_out_inputs_get(out); fail_if(eina_list_count(in3) != 1); fail_if(eina_list_data_get(in3) != in); eo_del(out); - eo_do(in, out2 = ecore_audio_obj_in_output_get()); + out2 = ecore_audio_obj_in_output_get(in); fail_if(out2); @@ -426,10 +426,10 @@ START_TEST(ecore_test_ecore_audio_obj_vio) out = eo_add(ECORE_AUDIO_OUT_CLASS, NULL); fail_if(!out); - eo_do(in, ecore_audio_obj_vio_set(&in_vio, NULL, NULL)); - eo_do(out, ecore_audio_obj_vio_set(&out_vio, NULL, NULL)); + ecore_audio_obj_vio_set(in, &in_vio, NULL, NULL); + ecore_audio_obj_vio_set(out, &out_vio, NULL, NULL); - eo_do(out, ecore_audio_obj_out_input_attach(in)); + ecore_audio_obj_out_input_attach(out, in); ecore_main_loop_begin(); @@ -462,71 +462,71 @@ START_TEST(ecore_test_ecore_audio_obj_in) fail_if(!in); - eo_do(in, ecore_audio_obj_vio_set(&vio, &freed, _myfree)); + ecore_audio_obj_vio_set(in, &vio, &freed, _myfree); fail_if(freed); - eo_do(in, ecore_audio_obj_vio_set(NULL, NULL, NULL)); + ecore_audio_obj_vio_set(in, NULL, NULL, NULL); fail_if(!freed); - eo_do(in, speed = ecore_audio_obj_in_speed_get()); + speed = ecore_audio_obj_in_speed_get(in); fail_if(speed != 1.0); - eo_do(in, ecore_audio_obj_in_speed_set(2.5)); + ecore_audio_obj_in_speed_set(in, 2.5); - eo_do(in, speed = ecore_audio_obj_in_speed_get()); + speed = ecore_audio_obj_in_speed_get(in); fail_if(speed != 2.5); - eo_do(in, ecore_audio_obj_in_speed_set(0)); + ecore_audio_obj_in_speed_set(in, 0); - eo_do(in, speed = ecore_audio_obj_in_speed_get()); + speed = ecore_audio_obj_in_speed_get(in); fail_if(speed != 0.2); - eo_do(in, ecore_audio_obj_in_speed_set(10)); + ecore_audio_obj_in_speed_set(in, 10); - eo_do(in, speed = ecore_audio_obj_in_speed_get()); + speed = ecore_audio_obj_in_speed_get(in); fail_if(speed != 5.0); - eo_do(in, samplerate = ecore_audio_obj_in_samplerate_get()); + samplerate = ecore_audio_obj_in_samplerate_get(in); fail_if(samplerate != 0); - eo_do(in, ecore_audio_obj_in_samplerate_set(1234)); + ecore_audio_obj_in_samplerate_set(in, 1234); - eo_do(in, samplerate = ecore_audio_obj_in_samplerate_get()); + samplerate = ecore_audio_obj_in_samplerate_get(in); fail_if(samplerate != 1234); - eo_do(in, channels = ecore_audio_obj_in_channels_get()); + channels = ecore_audio_obj_in_channels_get(in); fail_if(channels != 0); - eo_do(in, ecore_audio_obj_in_channels_set(2)); + ecore_audio_obj_in_channels_set(in, 2); - eo_do(in, channels = ecore_audio_obj_in_channels_get()); + channels = ecore_audio_obj_in_channels_get(in); fail_if(channels != 2); - eo_do(in, looped = ecore_audio_obj_in_looped_get()); + looped = ecore_audio_obj_in_looped_get(in); fail_if(looped); - eo_do(in, ecore_audio_obj_in_looped_set(EINA_TRUE)); + ecore_audio_obj_in_looped_set(in, EINA_TRUE); - eo_do(in, looped = ecore_audio_obj_in_looped_get()); + looped = ecore_audio_obj_in_looped_get(in); fail_if(!looped); - eo_do(in, length = ecore_audio_obj_in_length_get()); + length = ecore_audio_obj_in_length_get(in); fail_if(length != 0); - eo_do(in, length = ecore_audio_obj_in_remaining_get()); + length = ecore_audio_obj_in_remaining_get(in); fail_if(length != -1); memset(buf, 0xaa, 10); - eo_do(in, read = ecore_audio_obj_in_read(buf, 10)); + read = ecore_audio_obj_in_read(in, buf, 10); fail_if(read != 0); for (i=0; i<10; i++) { fail_if(buf[i] != 0xaa); } - eo_do(in, ecore_audio_obj_paused_set(EINA_TRUE)); + ecore_audio_obj_paused_set(in, EINA_TRUE); - eo_do(in, read = ecore_audio_obj_in_read(buf, 10)); + read = ecore_audio_obj_in_read(in, buf, 10); fail_if(read != 10); for (i=0; i<10; i++) { @@ -556,29 +556,29 @@ START_TEST(ecore_test_ecore_audio_obj) fail_if(!obj); - eo_do(obj, name = ecore_audio_obj_name_get()); + name = ecore_audio_obj_name_get(obj); fail_if(name); - eo_do(obj, ecore_audio_obj_name_set("In1")); - eo_do(obj, name = ecore_audio_obj_name_get()); + ecore_audio_obj_name_set(obj, "In1"); + name = ecore_audio_obj_name_get(obj); ck_assert_str_eq(name, "In1"); - eo_do(obj, ecore_audio_obj_name_get()); + ecore_audio_obj_name_get(obj); - eo_do(obj, paused = ecore_audio_obj_paused_get()); + paused = ecore_audio_obj_paused_get(obj); fail_if(paused); - eo_do(obj, ecore_audio_obj_paused_set(EINA_TRUE)); - eo_do(obj, paused = ecore_audio_obj_paused_get()); + ecore_audio_obj_paused_set(obj, EINA_TRUE); + paused = ecore_audio_obj_paused_get(obj); fail_if(!paused); - eo_do(obj, volume = ecore_audio_obj_volume_get()); + volume = ecore_audio_obj_volume_get(obj); fail_if(volume != 1.0); - eo_do(obj, ecore_audio_obj_volume_set(0.5)); - eo_do(obj, volume = ecore_audio_obj_volume_get()); + ecore_audio_obj_volume_set(obj, 0.5); + volume = ecore_audio_obj_volume_get(obj); fail_if(volume != 0.5); eo_del(obj); diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c index b406bad1de..e28329f1dd 100644 --- a/src/tests/edje/edje_test_edje.c +++ b/src/tests/edje/edje_test_edje.c @@ -192,15 +192,15 @@ START_TEST(edje_test_masking) /* check value of no_render flag as seen from evas land */ sub = edje_object_part_object_get(obj, "mask"); - fail_if(!eo_do_ret(sub, b, evas_obj_no_render_get())); + fail_if(!evas_obj_no_render_get(sub)); /* check that text has a clip (based on description.clip_to) */ sub = edje_object_part_object_get(obj, "text"); - fail_if(!eo_do_ret(sub, clip2, evas_obj_clip_get())); + fail_if(!evas_obj_clip_get(sub)); /* test description.clip_to override */ sub = edje_object_part_object_get(obj, "noclip"); - clip2 = eo_do_ret(sub, clip2, evas_obj_clip_get()); + clip2 = evas_obj_clip_get(sub); fail_if(clip != clip2); EDJE_TEST_FREE_EVAS(); @@ -224,23 +224,23 @@ START_TEST(edje_test_filters) /* check value of no_render flag as seen from evas land */ sub = edje_object_part_object_get(obj, "mask"); - fail_if(!eo_do_ret(sub, b, evas_obj_no_render_get())); + fail_if(!evas_obj_no_render_get(sub)); /* check no_render inheritance */ sub = edje_object_part_object_get(obj, "mask2"); - fail_if(eo_do_ret(sub, b, evas_obj_no_render_get())); + fail_if(evas_obj_no_render_get(sub)); sub = edje_object_part_object_get(obj, "mask3"); - fail_if(!eo_do_ret(sub, b, evas_obj_no_render_get())); + fail_if(!evas_obj_no_render_get(sub)); /* text part: check filter status */ text = edje_object_part_object_get(obj, "text"); fail_if(!text); - eo_do(text, efl_gfx_filter_program_get(&prg, &name)); + efl_gfx_filter_program_get(text, &prg, &name); fail_if(!prg); fail_if(!name || strcmp(name, "filterfile")); - eo_do(text, src = efl_gfx_filter_source_get("mask")); + src = efl_gfx_filter_source_get(text, "mask"); fail_if(!src); // TODO: Verify properly that the filter runs well @@ -265,7 +265,7 @@ START_TEST(edje_test_snapshot) /* check value of no_render flag as seen from evas land */ sub = edje_object_part_object_get(obj, "snap"); - fail_if(!eo_do_ret(sub, b, evas_obj_image_snapshot_get())); + fail_if(!evas_obj_image_snapshot_get(sub)); // TODO: Verify that evas snapshot actually works (and has a filter) diff --git a/src/tests/eina_cxx/simple.c b/src/tests/eina_cxx/simple.c index 8a742e189c..a40eb27ba5 100644 --- a/src/tests/eina_cxx/simple.c +++ b/src/tests/eina_cxx/simple.c @@ -14,7 +14,7 @@ static Eo *_simple_eo_base_constructor(Eo *obj, void *pd EINA_UNUSED) { - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } #include "simple.eo.c" diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c index 56e6dd6ac8..5873d7ab83 100644 --- a/src/tests/eio/eio_model_test_file.c +++ b/src/tests/eio/eio_model_test_file.c @@ -84,26 +84,26 @@ _load_status_cb(void *data EINA_UNUSED, const Eo_Event *event) char *str; printf("Model is Loaded\n"); - eo_do(event->obj, status = efl_model_property_get("filename", &value_prop)); + status = efl_model_property_get(event->obj, "filename", &value_prop); str = eina_value_to_string(value_prop); printf("efl_model_loaded filename %s, status=%d\n", str, status); free(str); - eo_do(event->obj, status = efl_model_property_get("size", &value_prop)); + status = efl_model_property_get(event->obj, "size", &value_prop); str = eina_value_to_string(value_prop); printf("efl_model_loaded size %s, status=%d\n", str, status); free(str); - eo_do(event->obj, status = efl_model_property_get("mtime", &value_prop)); + status = efl_model_property_get(event->obj, "mtime", &value_prop); str = eina_value_to_string(value_prop); printf("efl_model_loaded mtime %s, status=%d\n", str, status); free(str); - eo_do(event->obj, efl_model_children_count_get(&total)); + efl_model_children_count_get(event->obj, &total); printf("efl_model_test count %d\n", (int)total); /**< get full list */ - eo_do(event->obj, status = efl_model_children_slice_get(0 ,0 ,(Eina_Accessor **)&accessor)); + status = efl_model_children_slice_get(event->obj, 0, 0, (Eina_Accessor **)&accessor); eina_accessor_free(accessor); ecore_main_loop_quit(); } @@ -143,7 +143,7 @@ _children_count_cb(void *data EINA_UNUSED, const Eo_Event *event) fprintf(stdout, "Children count number=%d\n", *len); reqs.children = *len; - eo_do(event->obj, efl_model_children_count_get(&total)); + efl_model_children_count_get(event->obj, &total); fprintf(stdout, "New total children count number=%d\n", *len); return EINA_TRUE; @@ -165,27 +165,27 @@ START_TEST(eio_model_test_test_file) fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n"); fail_if(!eio_init(), "ERROR: Cannot init EIO!\n"); - filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(EFL_MODEL_TEST_FILENAME_PATH)); + filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eoid, EFL_MODEL_TEST_FILENAME_PATH)); fail_if(!filemodel, "ERROR: Cannot init model!\n"); - eo_do(filemodel, eo_event_callback_add(EFL_MODEL_BASE_EVENT_LOAD_STATUS, _load_status_cb, NULL)); - eo_do(filemodel, eo_event_callback_add(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _properties_change_cb, NULL)); - eo_do(filemodel, eo_event_callback_add(EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, _children_count_cb, NULL)); + eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_LOAD_STATUS, _load_status_cb, NULL); + eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _properties_change_cb, NULL); + eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, _children_count_cb, NULL); - eo_do(filemodel, efl_model_load()); + efl_model_load(filemodel); handler = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, exit_func, NULL); ecore_main_loop_begin(); - eo_do(filemodel, status = efl_model_property_get("filename", &value_prop)); + status = efl_model_property_get(filemodel, "filename", &value_prop); str = eina_value_to_string(value_prop); printf("efl_model_test filename %s, load status %d\n", str, status); free(str); i = 0; - eo_do(filemodel, efl_model_properties_get(&properties_list)); + efl_model_properties_get(filemodel, &properties_list); EINA_ARRAY_ITER_NEXT(properties_list, i, str, iterator) { fprintf(stdout, "Returned property list %d: %s\n", i, str); diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c index 4f26a8e675..b718edd137 100644 --- a/src/tests/eio/eio_model_test_monitor_add.c +++ b/src/tests/eio/eio_model_test_monitor_add.c @@ -29,7 +29,7 @@ _load_monitor_status_cb(void *data, const Eo_Event *event) if (!(st->status & EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES)) return EINA_TRUE; - eo_do(event->obj, efl_model_property_get("path", &value_prop)); + efl_model_property_get(event->obj, "path", &value_prop); fail_if(!value_prop, "ERROR: Cannot get property!\n"); str = eina_value_to_string(value_prop); @@ -38,9 +38,9 @@ _load_monitor_status_cb(void *data, const Eo_Event *event) if(temp_filename && strcmp(str, temp_filename) == 0) { fprintf(stderr, "is child that we want\n"); - eo_do(event->obj, eo_event_callback_del(EFL_MODEL_BASE_EVENT_LOAD_STATUS, _load_monitor_status_cb, data)); + eo_event_callback_del(event->obj, EFL_MODEL_BASE_EVENT_LOAD_STATUS, _load_monitor_status_cb, data); children_added = EINA_TRUE; - eo_do(parent, efl_model_child_del(event->obj)); + efl_model_child_del(parent, event->obj); } return EINA_FALSE; @@ -54,13 +54,13 @@ _children_removed_cb(void *data EINA_UNUSED, const Eo_Event *event) Efl_Model_Children_Event* evt = event->event_info; Eina_Bool b; - eo_do(evt->child, b = efl_model_load_status_get() & EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES); + b = efl_model_load_status_get(evt->child); if(b) { const Eina_Value* value_prop = NULL; const char* str = NULL; - eo_do(evt->child, efl_model_property_get("path", &value_prop)); + efl_model_property_get(evt->child, "path", &value_prop); fail_if(!value_prop, "ERROR: Cannot get property!\n"); str = eina_value_to_string(value_prop); @@ -79,8 +79,8 @@ _children_added_cb(void *data EINA_UNUSED, const Eo_Event *event) if (evt == NULL) return EINA_TRUE; - eo_do(evt->child, eo_event_callback_add(EFL_MODEL_BASE_EVENT_LOAD_STATUS, _load_monitor_status_cb, event->obj)); - eo_do(evt->child, efl_model_load()); + eo_event_callback_add(evt->child, EFL_MODEL_BASE_EVENT_LOAD_STATUS, _load_monitor_status_cb, event->obj); + efl_model_load(evt->child); return EINA_TRUE; } @@ -98,7 +98,7 @@ _children_count_cb(void *data EINA_UNUSED, const Eo_Event *event) fprintf(stderr, "Children count number=%d\n", *len); /**< get full list */ - eo_do(event->obj, status = efl_model_children_slice_get(0 ,0 ,(Eina_Accessor **)&accessor)); + status = efl_model_children_slice_get(event->obj, 0, 0, (Eina_Accessor **)&accessor); if(accessor != NULL) { EINA_ACCESSOR_FOREACH(accessor, i, child) {} @@ -125,14 +125,14 @@ START_TEST(eio_model_test_test_monitor_add) tmpdir = eina_environment_tmp_get(); - filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(tmpdir)); + filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eoid, tmpdir)); fail_if(!filemodel, "ERROR: Cannot init model!\n"); - eo_do(filemodel, eo_event_callback_add(EFL_MODEL_BASE_EVENT_CHILD_ADDED, _children_added_cb, NULL)); - eo_do(filemodel, eo_event_callback_add(EFL_MODEL_BASE_EVENT_CHILD_REMOVED, _children_removed_cb, NULL)); - eo_do(filemodel, eo_event_callback_add(EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, _children_count_cb, NULL)); + eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_CHILD_ADDED, _children_added_cb, NULL); + eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_CHILD_REMOVED, _children_removed_cb, NULL); + eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, _children_count_cb, NULL); - eo_do(filemodel, efl_model_load()); + efl_model_load(filemodel); ecore_main_loop_begin(); diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c index adba9f5802..5439217e46 100644 --- a/src/tests/eldbus/eldbus_test_eldbus_model.c +++ b/src/tests/eldbus/eldbus_test_eldbus_model.c @@ -24,9 +24,9 @@ _eo_event_quit_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) void efl_model_wait_for_event(Eo *obj, const Eo_Event_Description* event) { - eo_do(obj, eo_event_callback_add(event, _eo_event_quit_cb, NULL)); + eo_event_callback_add(obj, event, _eo_event_quit_cb, NULL); ecore_main_loop_begin(); - eo_do(obj, eo_event_callback_del(event, _eo_event_quit_cb, NULL)); + eo_event_callback_del(obj, event, _eo_event_quit_cb, NULL); } static Eina_Bool @@ -49,13 +49,13 @@ void efl_model_wait_for_load_status(Efl_Model_Base *efl_model, Efl_Model_Load_Status expected_status) { Efl_Model_Load_Status actual_status; - eo_do(efl_model, actual_status = efl_model_load_status_get()); + actual_status = efl_model_load_status_get(efl_model); if (expected_status == actual_status) return; - eo_do(efl_model, eo_event_callback_add(EFL_MODEL_BASE_EVENT_LOAD_STATUS, _event_load_status_quit_cb, (void*)expected_status)); + eo_event_callback_add(efl_model, EFL_MODEL_BASE_EVENT_LOAD_STATUS, _event_load_status_quit_cb, (void*)expected_status); ecore_main_loop_begin(); - eo_do(efl_model, eo_event_callback_del(EFL_MODEL_BASE_EVENT_LOAD_STATUS, _event_load_status_quit_cb, (void*)expected_status)); + eo_event_callback_del(efl_model, EFL_MODEL_BASE_EVENT_LOAD_STATUS, _event_load_status_quit_cb, (void*)expected_status); } Efl_Model_Base * @@ -63,7 +63,7 @@ efl_model_nth_child_get(Efl_Model_Base *efl_model, unsigned int n) { Eina_Accessor *accessor; Efl_Model_Load_Status status; - eo_do(efl_model, status = efl_model_children_slice_get(n, 1, &accessor)); + status = efl_model_children_slice_get(efl_model, n, 1, &accessor); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_ne(NULL, accessor); Eo *child = NULL; @@ -83,7 +83,7 @@ efl_model_first_child_get(Efl_Model_Base *efl_model) void efl_model_load_and_wait_for_load_status(Eo *obj, Efl_Model_Load_Status expected_status) { - eo_do(obj, efl_model_load()); + efl_model_load(obj); efl_model_wait_for_load_status(obj, expected_status); } @@ -106,7 +106,7 @@ check_property(Eo *object, const char *property_name, const char *expected_value { Eina_Value const* property_value; Efl_Model_Load_Status status; - eo_do(object, status = efl_model_property_get(property_name, &property_value)); + status = efl_model_property_get(object, property_name, &property_value); ck_assert_msg(EFL_MODEL_LOAD_STATUS_ERROR != status, "Nonexistent property: %s", property_name); ck_assert_ptr_ne(NULL, property_value); char *actual_value = eina_value_to_string(property_value); @@ -123,10 +123,7 @@ check_property(Eo *object, const char *property_name, const char *expected_value Eo * create_connection(void) { - Eo *connection = eo_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, NULL, - eldbus_model_connection_constructor(ELDBUS_CONNECTION_TYPE_SESSION, - NULL, - EINA_FALSE)); + Eo *connection = eo_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, NULL, eldbus_model_connection_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE)); ck_assert_ptr_ne(NULL, connection); return connection; } @@ -142,12 +139,7 @@ create_and_load_connection(void) Eo * create_object(void) { - Eo *object = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, - eldbus_model_object_constructor(ELDBUS_CONNECTION_TYPE_SESSION, - NULL, - EINA_FALSE, - ELDBUS_FDO_BUS, - ELDBUS_FDO_PATH)); + Eo *object = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, ELDBUS_FDO_BUS, ELDBUS_FDO_PATH)); ck_assert_ptr_ne(NULL, object); return object; } @@ -164,7 +156,7 @@ void check_efl_model_load_status_get(Efl_Model_Base *efl_model, Efl_Model_Load_Status expected_load_status) { Efl_Model_Load_Status actual_load_status; - eo_do(efl_model, actual_load_status = efl_model_load_status_get()); + actual_load_status = efl_model_load_status_get(efl_model); ck_assert_int_eq(expected_load_status, actual_load_status); } @@ -172,7 +164,7 @@ void check_efl_model_children_count_eq(Efl_Model_Base *efl_model, unsigned int expected_children_count) { unsigned int actual_children_count = 0; - eo_do(efl_model, efl_model_children_count_get(&actual_children_count)); + efl_model_children_count_get(efl_model, &actual_children_count); ck_assert_int_eq(expected_children_count, actual_children_count); } @@ -181,7 +173,7 @@ check_efl_model_children_count_ge(Efl_Model_Base *efl_model, unsigned int minimu { unsigned int actual_children_count = 0; Efl_Model_Load_Status status; - eo_do(efl_model, status = efl_model_children_count_get(&actual_children_count)); + status = efl_model_children_count_get(efl_model, &actual_children_count); // A minimum count only exists if model have EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN ck_assert((EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN & status) == EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN); @@ -193,13 +185,13 @@ check_efl_model_children_slice_get(Efl_Model_Base *efl_model) { unsigned int count = 0; Efl_Model_Load_Status status; - eo_do(efl_model, status = efl_model_children_count_get(&count)); + status = efl_model_children_count_get(efl_model, &count); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_msg(count, "There must be at least 1 child to test"); // Test slice all Eina_Accessor *accessor; - eo_do(efl_model, status = efl_model_children_slice_get(0, 0, &accessor)); + status = efl_model_children_slice_get(efl_model, 0, 0, &accessor); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_ne(NULL, accessor); // Get first child @@ -221,7 +213,7 @@ check_efl_model_children_slice_get(Efl_Model_Base *efl_model) // Test slice first child Eo *child = NULL; - eo_do(efl_model, status = efl_model_children_slice_get(1, 1, &accessor)); + status = efl_model_children_slice_get(efl_model, 1, 1, &accessor); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_ne(NULL, accessor); ret = eina_accessor_data_get(accessor, 0, (void**)&child); @@ -233,7 +225,7 @@ check_efl_model_children_slice_get(Efl_Model_Base *efl_model) eina_accessor_free(accessor); // Test slice last child - eo_do(efl_model, status = efl_model_children_slice_get(count, 1, &accessor)); + status = efl_model_children_slice_get(efl_model, count, 1, &accessor); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_ne(NULL, accessor); ret = eina_accessor_data_get(accessor, 0, (void**)&child); @@ -245,7 +237,7 @@ check_efl_model_children_slice_get(Efl_Model_Base *efl_model) eina_accessor_free(accessor); // Test slice nonexistent element - eo_do(efl_model, status = efl_model_children_slice_get(count + 1, 1, &accessor)); + status = efl_model_children_slice_get(efl_model, count + 1, 1, &accessor); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_eq(NULL, accessor); } @@ -284,7 +276,7 @@ START_TEST(proxy) efl_model_load_and_wait_for_load_status(root, EFL_MODEL_LOAD_STATUS_LOADED); Eina_Accessor *accessor = NULL; - eo_do(root, efl_model_children_slice_get(0, 0, &accessor)); + efl_model_children_slice_get(root, 0, 0, &accessor); ck_assert_ptr_ne(NULL, accessor); unsigned int i; @@ -314,7 +306,7 @@ eldbus_model_proxy_from_object_get(Eldbus_Model_Object *object, const char *inte { Eina_Accessor *accessor; Efl_Model_Load_Status status; - eo_do(object, status = efl_model_children_slice_get(0, 0, &accessor)); + status = efl_model_children_slice_get(object, 0, 0, &accessor); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_ne(NULL, accessor); @@ -323,7 +315,7 @@ eldbus_model_proxy_from_object_get(Eldbus_Model_Object *object, const char *inte EINA_ACCESSOR_FOREACH(accessor, i, proxy) { const char *name; - eo_do(proxy, name = eldbus_model_proxy_name_get()); + name = eldbus_model_proxy_name_get(proxy); ck_assert_ptr_ne(NULL, name); if (strcmp(name, interface_name) == 0) goto end; @@ -340,7 +332,7 @@ _eldbus_model_arguments_from_proxy_get(Eldbus_Model_Proxy *proxy, const char *me { Eina_Accessor *accessor; Efl_Model_Load_Status status; - eo_do(proxy, status = efl_model_children_slice_get(0, 0, &accessor)); + status = efl_model_children_slice_get(proxy, 0, 0, &accessor); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_ne(NULL, accessor); @@ -352,7 +344,7 @@ _eldbus_model_arguments_from_proxy_get(Eldbus_Model_Proxy *proxy, const char *me continue; const char *name; - eo_do(child, name = eldbus_model_arguments_name_get()); + name = eldbus_model_arguments_name_get(child); ck_assert_ptr_ne(NULL, name); if (strcmp(name, method_name) == 0) goto end; @@ -381,7 +373,7 @@ check_efl_model_property_int_eq(Efl_Model_Base *efl_model, const char *property, { Eina_Value const* property_value; Efl_Model_Load_Status status; - eo_do(efl_model, status = efl_model_property_get(property, &property_value)); + status = efl_model_property_get(efl_model, property, &property_value); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_ne(NULL, property_value); @@ -400,7 +392,7 @@ check_efl_model_property_int_set(Efl_Model_Base *efl_model, const char *property eina_value_setup(&eina_value, EINA_VALUE_TYPE_INT); eina_value_set(&eina_value, value); Efl_Model_Load_Status status; - eo_do(efl_model, status = efl_model_property_set(property, &eina_value)); + status = efl_model_property_set(efl_model, property, &eina_value); eina_value_flush(&eina_value); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); } diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_connection.c b/src/tests/eldbus/eldbus_test_eldbus_model_connection.c index ffcc7950a3..f3b1915493 100644 --- a/src/tests/eldbus/eldbus_test_eldbus_model_connection.c +++ b/src/tests/eldbus/eldbus_test_eldbus_model_connection.c @@ -43,7 +43,7 @@ START_TEST(properties_get) { Eina_Array *properties = NULL; Efl_Model_Load_Status status; - eo_do(connection, status = efl_model_properties_get(&properties)); + status = efl_model_properties_get(connection, &properties); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_ne(NULL, properties); @@ -52,7 +52,7 @@ START_TEST(properties_get) ck_assert_int_eq(expected_properties_count, actual_properties_count); // Unloaded connection populates its properties - eo_do(unloaded_connection, status = efl_model_properties_get(&properties)); + status = efl_model_properties_get(unloaded_connection, &properties); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_UNLOADED, status); ck_assert_ptr_ne(NULL, properties); @@ -65,12 +65,12 @@ START_TEST(property_get) { Eina_Value const* property_value; Efl_Model_Load_Status status; - eo_do(connection, status = efl_model_property_get(UNIQUE_NAME_PROPERTY, &property_value)); + status = efl_model_property_get(connection, UNIQUE_NAME_PROPERTY, &property_value); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_ne(NULL, property_value); // Nonexistent property must return EFL_MODEL_LOAD_STATUS_ERROR - eo_do(connection, status = efl_model_property_get("nonexistent", &property_value)); + status = efl_model_property_get(connection, "nonexistent", &property_value); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); } END_TEST @@ -82,19 +82,19 @@ START_TEST(property_set) eina_value_setup(&value, EINA_VALUE_TYPE_INT); eina_value_set(&value, 1); Efl_Model_Load_Status status; - eo_do(connection, status = efl_model_property_set("nonexistent", &value)); + status = efl_model_property_set(connection, "nonexistent", &value); eina_value_flush(&value); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); // UNIQUE_NAME_PROPERTY is read-only - eo_do(connection, status = efl_model_property_set(UNIQUE_NAME_PROPERTY, &value)); + status = efl_model_property_set(connection, UNIQUE_NAME_PROPERTY, &value); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); // The model must be loaded to be able to set its properties const char *expected_value = "unloaded"; eina_value_setup(&value, EINA_VALUE_TYPE_STRING); eina_value_set(&value, expected_value); - eo_do(unloaded_connection, status = efl_model_property_set(UNIQUE_NAME_PROPERTY, &value)); + status = efl_model_property_set(unloaded_connection, UNIQUE_NAME_PROPERTY, &value); eina_value_flush(&value); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); } @@ -120,7 +120,7 @@ START_TEST(children_slice_get) // Unloaded connection must return EFL_MODEL_LOAD_STATUS_UNLOADED Eina_Accessor *accessor; Efl_Model_Load_Status status; - eo_do(unloaded_connection, status = efl_model_children_slice_get(0, 0, &accessor)); + status = efl_model_children_slice_get(unloaded_connection, 0, 0, &accessor); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_UNLOADED, status); ck_assert_ptr_eq(NULL, accessor); } @@ -129,7 +129,7 @@ END_TEST START_TEST(unload) { check_efl_model_load_status_get(connection, EFL_MODEL_LOAD_STATUS_LOADED); - eo_do(connection, efl_model_unload()); + efl_model_unload(connection); check_efl_model_load_status_get(connection, EFL_MODEL_LOAD_STATUS_UNLOADED); check_efl_model_children_count_eq(connection, 0); @@ -138,14 +138,14 @@ END_TEST START_TEST(properties_load) { - eo_do(unloaded_connection, efl_model_properties_load()); + efl_model_properties_load(unloaded_connection); check_efl_model_load_status_get(unloaded_connection, EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES); } END_TEST START_TEST(children_load) { - eo_do(unloaded_connection, efl_model_children_load()); + efl_model_children_load(unloaded_connection); check_efl_model_load_status_get(unloaded_connection, EFL_MODEL_LOAD_STATUS_LOADING_CHILDREN); @@ -160,7 +160,7 @@ END_TEST START_TEST(child_add) { Eo *child; - eo_do(connection, child = efl_model_child_add()); + child = efl_model_child_add(connection); ck_assert_ptr_eq(NULL, child); } END_TEST @@ -169,15 +169,15 @@ START_TEST(child_del) { unsigned int expected_children_count = 0; Efl_Model_Load_Status status; - eo_do(connection, status = efl_model_children_count_get(&expected_children_count)); + status = efl_model_children_count_get(connection, &expected_children_count); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); Eo *child = efl_model_first_child_get(connection); - eo_do(connection, status = efl_model_child_del(child)); + status = efl_model_child_del(connection, child); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); unsigned int actual_children_count = 0; - eo_do(connection, status = efl_model_children_count_get(&actual_children_count)); + status = efl_model_children_count_get(connection, &actual_children_count); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_int_le(expected_children_count, actual_children_count); diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_method.c b/src/tests/eldbus/eldbus_test_eldbus_model_method.c index e4f7a814e1..51ed4afc34 100644 --- a/src/tests/eldbus/eldbus_test_eldbus_model_method.c +++ b/src/tests/eldbus/eldbus_test_eldbus_model_method.c @@ -29,12 +29,7 @@ _setup(void) fake_server = fake_server_start(&fake_server_data); - fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, - eldbus_model_object_constructor(ELDBUS_CONNECTION_TYPE_SESSION, - NULL, - EINA_FALSE, - FAKE_SERVER_BUS, - FAKE_SERVER_PATH)); + fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); ck_assert_ptr_ne(NULL, fake_server_object); efl_model_load_and_wait_for_load_status(fake_server_object, EFL_MODEL_LOAD_STATUS_LOADED); @@ -70,7 +65,7 @@ START_TEST(properties_get) { Eina_Array *properties = NULL; Efl_Model_Load_Status status; - eo_do(method, status = efl_model_properties_get(&properties)); + status = efl_model_properties_get(method, &properties); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_ne(NULL, properties); @@ -85,14 +80,14 @@ START_TEST(property_get) // Input only property returns error Eina_Value const* dummy; Efl_Model_Load_Status status; - eo_do(method, status = efl_model_property_get(ARGUMENT_A, &dummy)); + status = efl_model_property_get(method, ARGUMENT_A, &dummy); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); - eo_do(method, status = efl_model_property_get(ARGUMENT_RESULT, &dummy)); + status = efl_model_property_get(method, ARGUMENT_RESULT, &dummy); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); // Nonexistent property returns error - eo_do(method, status = efl_model_property_get("nonexistent", &dummy)); + status = efl_model_property_get(method, "nonexistent", &dummy); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); } END_TEST @@ -102,7 +97,7 @@ START_TEST(property_set) // Output argument returns error Eina_Value dummy = {0}; Efl_Model_Load_Status status; - eo_do(method, status = efl_model_property_set(ARGUMENT_RESULT, &dummy)); + status = efl_model_property_set(method, ARGUMENT_RESULT, &dummy); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); } END_TEST @@ -123,7 +118,7 @@ START_TEST(children_slice_get) { Eina_Accessor *accessor; Efl_Model_Load_Status status; - eo_do(method, status = efl_model_children_slice_get(1, 1, &accessor)); + status = efl_model_children_slice_get(method, 1, 1, &accessor); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_eq(NULL, accessor); } @@ -133,7 +128,7 @@ static void _check_unload(void) { check_efl_model_load_status_get(method, EFL_MODEL_LOAD_STATUS_LOADED); - eo_do(method, efl_model_unload()); + efl_model_unload(method); check_efl_model_load_status_get(method, EFL_MODEL_LOAD_STATUS_UNLOADED); check_efl_model_children_count_eq(method, 0); @@ -149,7 +144,7 @@ START_TEST(properties_load) { _check_unload(); - eo_do(method, efl_model_properties_load()); + efl_model_properties_load(method); efl_model_wait_for_load_status(method, EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES); check_efl_model_load_status_get(method, EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES); @@ -160,7 +155,7 @@ START_TEST(children_load) { _check_unload(); - eo_do(method, efl_model_children_load()); + efl_model_children_load(method); efl_model_wait_for_load_status(method, EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN); check_efl_model_load_status_get(method, EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN); @@ -172,7 +167,7 @@ END_TEST START_TEST(child_add) { Eo *child; - eo_do(method, child = efl_model_child_add()); + child = efl_model_child_add(method); ck_assert_ptr_eq(NULL, child); } END_TEST @@ -182,7 +177,7 @@ START_TEST(child_del) // efl_model_child_del always returns ERROR Eo *child = NULL; Efl_Model_Load_Status status; - eo_do(method, status = efl_model_child_del(child)); + status = efl_model_child_del(method, child); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); } END_TEST @@ -193,7 +188,7 @@ START_TEST(call) check_efl_model_property_int_set(method, ARGUMENT_B, 87654321); Efl_Model_Load_Status status; - eo_do(method, status = eldbus_model_method_call()); + status = eldbus_model_method_call(method); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); efl_model_wait_for_event(method, ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL); diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_object.c b/src/tests/eldbus/eldbus_test_eldbus_model_object.c index c1f12485d9..faa64a7ef8 100644 --- a/src/tests/eldbus/eldbus_test_eldbus_model_object.c +++ b/src/tests/eldbus/eldbus_test_eldbus_model_object.c @@ -43,7 +43,7 @@ START_TEST(properties_get) { Eina_Array *properties = NULL; Efl_Model_Load_Status status; - eo_do(object, status = efl_model_properties_get(&properties)); + status = efl_model_properties_get(object, &properties); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_ne(NULL, properties); @@ -52,7 +52,7 @@ START_TEST(properties_get) ck_assert_int_eq(expected_properties_count, actual_properties_count); // Unloaded object populates its properties - eo_do(unloaded_object, status = efl_model_properties_get(&properties)); + status = efl_model_properties_get(unloaded_object, &properties); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_UNLOADED, status); ck_assert_ptr_ne(NULL, properties); @@ -65,11 +65,11 @@ START_TEST(property_get) { const Eina_Value* property_value; Efl_Model_Load_Status status; - eo_do(object, status = efl_model_property_get(UNIQUE_NAME_PROPERTY, &property_value)); + status = efl_model_property_get(object, UNIQUE_NAME_PROPERTY, &property_value); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); // Nonexistent property must return EFL_MODEL_LOAD_STATUS_ERROR - eo_do(object, status = efl_model_property_get("nonexistent", &property_value)); + status = efl_model_property_get(object, "nonexistent", &property_value); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); } END_TEST @@ -81,19 +81,19 @@ START_TEST(property_set) eina_value_setup(&value, EINA_VALUE_TYPE_INT); eina_value_set(&value, 1); Efl_Model_Load_Status status; - eo_do(object, status = efl_model_property_set("nonexistent", &value)); + status = efl_model_property_set(object, "nonexistent", &value); eina_value_flush(&value); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); // UNIQUE_NAME_PROPERTY is read-only - eo_do(object, status = efl_model_property_set(UNIQUE_NAME_PROPERTY, &value)); + status = efl_model_property_set(object, UNIQUE_NAME_PROPERTY, &value); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); // The model must be loaded to be able to set its properties const char *expected_value = "unloaded"; eina_value_setup(&value, EINA_VALUE_TYPE_STRING); eina_value_set(&value, expected_value); - eo_do(unloaded_object, status = efl_model_property_set(UNIQUE_NAME_PROPERTY, &value)); + status = efl_model_property_set(unloaded_object, UNIQUE_NAME_PROPERTY, &value); eina_value_flush(&value); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); } @@ -119,7 +119,7 @@ START_TEST(children_slice_get) // Unloaded object must return EFL_MODEL_LOAD_STATUS_UNLOADED Eina_Accessor *accessor; Efl_Model_Load_Status status; - eo_do(unloaded_object, status = efl_model_children_slice_get(0, 0, &accessor)); + status = efl_model_children_slice_get(unloaded_object, 0, 0, &accessor); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_UNLOADED, status); ck_assert_ptr_eq(NULL, accessor); } @@ -128,7 +128,7 @@ END_TEST START_TEST(unload) { check_efl_model_load_status_get(object, EFL_MODEL_LOAD_STATUS_LOADED); - eo_do(object, efl_model_unload()); + efl_model_unload(object); check_efl_model_load_status_get(object, EFL_MODEL_LOAD_STATUS_UNLOADED); check_efl_model_children_count_eq(object, 0); @@ -137,14 +137,14 @@ END_TEST START_TEST(properties_load) { - eo_do(unloaded_object, efl_model_properties_load()); + efl_model_properties_load(unloaded_object); check_efl_model_load_status_get(unloaded_object, EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES); } END_TEST START_TEST(children_load) { - eo_do(unloaded_object, efl_model_children_load()); + efl_model_children_load(unloaded_object); check_efl_model_load_status_get(unloaded_object, EFL_MODEL_LOAD_STATUS_LOADING_CHILDREN); @@ -159,7 +159,7 @@ END_TEST START_TEST(child_add) { Eo *child; - eo_do(object, child = efl_model_child_add()); + child = efl_model_child_add(object); ck_assert_ptr_eq(NULL, child); } END_TEST @@ -168,15 +168,15 @@ START_TEST(child_del) { unsigned int expected_children_count = 0; Efl_Model_Load_Status status; - eo_do(object, status = efl_model_children_count_get(&expected_children_count)); + status = efl_model_children_count_get(object, &expected_children_count); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); Eo *child = efl_model_first_child_get(object); - eo_do(object, status = efl_model_child_del(child)); + status = efl_model_child_del(object, child); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); unsigned int actual_children_count = 0; - eo_do(object, status = efl_model_children_count_get(&actual_children_count)); + status = efl_model_children_count_get(object, &actual_children_count); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_int_le(expected_children_count, actual_children_count); diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c index 98ce124d1e..741ee95b7e 100644 --- a/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c +++ b/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c @@ -51,13 +51,13 @@ START_TEST(properties_get) // ELDBUS_FDO_INTERFACE have no properties Eina_Array *properties = NULL; Efl_Model_Load_Status status; - eo_do(dbus_proxy, status = efl_model_properties_get(&properties)); + status = efl_model_properties_get(dbus_proxy, &properties); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_ne(NULL, properties); ck_assert_int_eq(0, eina_array_count(properties)); // Must be loaded to get the properties - eo_do(unloaded_dbus_proxy, status = efl_model_properties_get(&properties)); + status = efl_model_properties_get(unloaded_dbus_proxy, &properties); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); } END_TEST @@ -67,7 +67,7 @@ START_TEST(property_get) // Nonexistent property must return EFL_MODEL_LOAD_STATUS_ERROR const Eina_Value* property_value; Efl_Model_Load_Status status; - eo_do(dbus_proxy, status = efl_model_property_get("nonexistent", &property_value)); + status = efl_model_property_get(dbus_proxy, "nonexistent", &property_value); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); } END_TEST @@ -79,7 +79,7 @@ START_TEST(property_set) eina_value_setup(&value, EINA_VALUE_TYPE_INT); eina_value_set(&value, 1); Efl_Model_Load_Status status; - eo_do(dbus_proxy, status = efl_model_property_set("nonexistent", &value)); + status = efl_model_property_set(dbus_proxy, "nonexistent", &value); eina_value_flush(&value); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); } @@ -105,7 +105,7 @@ START_TEST(children_slice_get) // Unloaded dbus_proxy must return EFL_MODEL_LOAD_STATUS_UNLOADED Eina_Accessor *accessor; Efl_Model_Load_Status status; - eo_do(unloaded_dbus_proxy, status = efl_model_children_slice_get(0, 0, &accessor)); + status = efl_model_children_slice_get(unloaded_dbus_proxy, 0, 0, &accessor); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_UNLOADED, status); ck_assert_ptr_eq(NULL, accessor); } @@ -114,7 +114,7 @@ END_TEST START_TEST(unload) { check_efl_model_load_status_get(dbus_proxy, EFL_MODEL_LOAD_STATUS_LOADED); - eo_do(dbus_proxy, efl_model_unload()); + efl_model_unload(dbus_proxy); check_efl_model_load_status_get(dbus_proxy, EFL_MODEL_LOAD_STATUS_UNLOADED); check_efl_model_children_count_eq(dbus_proxy, 0); @@ -123,14 +123,14 @@ END_TEST START_TEST(properties_load) { - eo_do(unloaded_dbus_proxy, efl_model_properties_load()); + efl_model_properties_load(unloaded_dbus_proxy); check_efl_model_load_status_get(unloaded_dbus_proxy, EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES); } END_TEST START_TEST(children_load) { - eo_do(unloaded_dbus_proxy, efl_model_children_load()); + efl_model_children_load(unloaded_dbus_proxy); efl_model_wait_for_load_status(unloaded_dbus_proxy, EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN); @@ -143,7 +143,7 @@ END_TEST START_TEST(child_add) { Eo *child; - eo_do(dbus_proxy, child = efl_model_child_add()); + child = efl_model_child_add(dbus_proxy); ck_assert_ptr_eq(NULL, child); } END_TEST @@ -152,15 +152,15 @@ START_TEST(child_del) { unsigned int expected_children_count = 0; Efl_Model_Load_Status status; - eo_do(dbus_proxy, status = efl_model_children_count_get(&expected_children_count)); + status = efl_model_children_count_get(dbus_proxy, &expected_children_count); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); Eo *child = efl_model_first_child_get(dbus_proxy); - eo_do(dbus_proxy, status = efl_model_child_del(child)); + status = efl_model_child_del(dbus_proxy, child); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); unsigned int actual_children_count = 0; - eo_do(dbus_proxy, status = efl_model_children_count_get(&actual_children_count)); + status = efl_model_children_count_get(dbus_proxy, &actual_children_count); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_int_le(expected_children_count, actual_children_count); diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c index 3185f2ec68..7c3187430e 100644 --- a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c +++ b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c @@ -27,12 +27,7 @@ _setup(void) fake_server = fake_server_start(&fake_server_data); - fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, - eldbus_model_object_constructor(ELDBUS_CONNECTION_TYPE_SESSION, - NULL, - EINA_FALSE, - FAKE_SERVER_BUS, - FAKE_SERVER_PATH)); + fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); ck_assert_ptr_ne(NULL, fake_server_object); efl_model_load_and_wait_for_load_status(fake_server_object, EFL_MODEL_LOAD_STATUS_LOADED); @@ -68,7 +63,7 @@ START_TEST(properties_get) { Eina_Array *properties = NULL; Efl_Model_Load_Status status; - eo_do(pong_signal, status = efl_model_properties_get(&properties)); + status = efl_model_properties_get(pong_signal, &properties); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_ne(NULL, properties); @@ -83,12 +78,12 @@ START_TEST(property_get) // Signal properties always have output direction Eina_Value const* dummy; Efl_Model_Load_Status status; - eo_do(pong_signal, status = efl_model_property_get(ARGUMENT_A, &dummy)); + status = efl_model_property_get(pong_signal, ARGUMENT_A, &dummy); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_ne(NULL, dummy); // Nonexistent property must return EFL_MODEL_LOAD_STATUS_ERROR - eo_do(pong_signal, status = efl_model_property_get("nonexistent", &dummy)); + status = efl_model_property_get(pong_signal, "nonexistent", &dummy); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); } END_TEST @@ -98,7 +93,7 @@ START_TEST(property_set) // Signals have output arguments only. All returns error Eina_Value dummy = {0}; Efl_Model_Load_Status status; - eo_do(pong_signal, status = efl_model_property_set(ARGUMENT_A, &dummy)); + status = efl_model_property_set(pong_signal, ARGUMENT_A, &dummy); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); } END_TEST @@ -119,7 +114,7 @@ START_TEST(children_slice_get) { Eina_Accessor *accessor; Efl_Model_Load_Status status; - eo_do(pong_signal, status = efl_model_children_slice_get(1, 1, &accessor)); + status = efl_model_children_slice_get(pong_signal, 1, 1, &accessor); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_eq(NULL, accessor); } @@ -129,7 +124,7 @@ static void _check_unload(void) { check_efl_model_load_status_get(pong_signal, EFL_MODEL_LOAD_STATUS_LOADED); - eo_do(pong_signal, efl_model_unload()); + efl_model_unload(pong_signal); check_efl_model_load_status_get(pong_signal, EFL_MODEL_LOAD_STATUS_UNLOADED); check_efl_model_children_count_eq(pong_signal, 0); @@ -145,7 +140,7 @@ START_TEST(properties_load) { _check_unload(); - eo_do(pong_signal, efl_model_properties_load()); + efl_model_properties_load(pong_signal); efl_model_wait_for_load_status(pong_signal, EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES); check_efl_model_load_status_get(pong_signal, EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES); @@ -156,7 +151,7 @@ START_TEST(children_load) { _check_unload(); - eo_do(pong_signal, efl_model_children_load()); + efl_model_children_load(pong_signal); efl_model_wait_for_load_status(pong_signal, EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN); check_efl_model_load_status_get(pong_signal, EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN); @@ -168,7 +163,7 @@ END_TEST START_TEST(child_add) { Eo *child; - eo_do(pong_signal, child = efl_model_child_add()); + child = efl_model_child_add(pong_signal); ck_assert_ptr_eq(NULL, child); } END_TEST @@ -178,7 +173,7 @@ START_TEST(child_del) // efl_model_child_del always returns ERROR Eo *child = NULL; Efl_Model_Load_Status status; - eo_do(pong_signal, status = efl_model_child_del(child)); + status = efl_model_child_del(pong_signal, child); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); } END_TEST @@ -193,7 +188,7 @@ START_TEST(signals) check_efl_model_property_int_set(ping_method, ARGUMENT_A, 99); Efl_Model_Load_Status status; - eo_do(ping_method, status = eldbus_model_method_call()); + status = eldbus_model_method_call(ping_method); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); efl_model_wait_for_event(pong_signal, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED); diff --git a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c index 7a12d326b1..09ef4cc9ca 100644 --- a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c +++ b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c @@ -33,12 +33,7 @@ _setup(void) }; fake_server = fake_server_start(&fake_server_data); - fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, - eldbus_model_object_constructor(ELDBUS_CONNECTION_TYPE_SESSION, - NULL, - EINA_FALSE, - FAKE_SERVER_BUS, - FAKE_SERVER_PATH)); + fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); ck_assert_ptr_ne(NULL, fake_server_object); efl_model_load_and_wait_for_load_status(fake_server_object, EFL_MODEL_LOAD_STATUS_LOADED); @@ -70,7 +65,7 @@ START_TEST(properties_get) { Eina_Array *properties = NULL; Efl_Model_Load_Status status; - eo_do(fake_server_proxy, status = efl_model_properties_get(&properties)); + status = efl_model_properties_get(fake_server_proxy, &properties); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_ptr_ne(NULL, properties); @@ -90,7 +85,7 @@ START_TEST(property_get) // Write-only property returns error const Eina_Value *dummy; Efl_Model_Load_Status status; - eo_do(fake_server_proxy, status = efl_model_property_get(FAKE_SERVER_WRITEONLY_PROPERTY, &dummy)); + status = efl_model_property_get(fake_server_proxy, FAKE_SERVER_WRITEONLY_PROPERTY, &dummy); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); _teardown(); @@ -104,7 +99,7 @@ _check_property_set(const char *property_name, int expected_property_value, int eina_value_setup(&value, EINA_VALUE_TYPE_INT); eina_value_set(&value, expected_property_value); Efl_Model_Load_Status status; - eo_do(fake_server_proxy, status = efl_model_property_set(property_name, &value)); + status = efl_model_property_set(fake_server_proxy, property_name, &value); eina_value_flush(&value); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); @@ -121,7 +116,7 @@ START_TEST(property_set) // Read-only property returns error Eina_Value dummy = {0}; Efl_Model_Load_Status status; - eo_do(fake_server_proxy, status = efl_model_property_set(FAKE_SERVER_READONLY_PROPERTY, &dummy)); + status = efl_model_property_set(fake_server_proxy, FAKE_SERVER_READONLY_PROPERTY, &dummy); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); _teardown(); @@ -149,9 +144,9 @@ START_TEST(children_slice_get) Eldbus_Model_Arguments *method2 = efl_model_nth_child_get(fake_server_proxy, 2); Eldbus_Model_Arguments *signal1 = efl_model_nth_child_get(fake_server_proxy, 3); - const char *actual_method1_name = eo_do_ret(method1, actual_method1_name, eldbus_model_arguments_name_get()); - const char *actual_method2_name = eo_do_ret(method2, actual_method2_name, eldbus_model_arguments_name_get()); - const char *actual_signal1_name = eo_do_ret(signal1, actual_signal1_name, eldbus_model_arguments_name_get()); + const char *actual_method1_name = eldbus_model_arguments_name_get(method1); + const char *actual_method2_name = eldbus_model_arguments_name_get(method2); + const char *actual_signal1_name = eldbus_model_arguments_name_get(signal1); ck_assert_ptr_ne(NULL, actual_method1_name); ck_assert_ptr_ne(NULL, actual_method2_name); @@ -173,7 +168,7 @@ static void _check_unload(void) { check_efl_model_load_status_get(fake_server_proxy, EFL_MODEL_LOAD_STATUS_LOADED); - eo_do(fake_server_proxy, efl_model_unload()); + efl_model_unload(fake_server_proxy); check_efl_model_load_status_get(fake_server_proxy, EFL_MODEL_LOAD_STATUS_UNLOADED); check_efl_model_children_count_eq(fake_server_proxy, 0); @@ -191,7 +186,7 @@ START_TEST(properties_load) { _check_unload(); - eo_do(fake_server_proxy, efl_model_properties_load()); + efl_model_properties_load(fake_server_proxy); efl_model_wait_for_load_status(fake_server_proxy, EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES); check_efl_model_load_status_get(fake_server_proxy, EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES); @@ -204,7 +199,7 @@ START_TEST(children_load) { _check_unload(); - eo_do(fake_server_proxy, efl_model_children_load()); + efl_model_children_load(fake_server_proxy); efl_model_wait_for_load_status(fake_server_proxy, EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN); check_efl_model_load_status_get(fake_server_proxy, EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN); @@ -217,7 +212,7 @@ END_TEST START_TEST(child_add) { - Eo *child = eo_do_ret(fake_server_proxy, child, efl_model_child_add()); + Eo *child = efl_model_child_add(fake_server_proxy); ck_assert_ptr_eq(NULL, child); _teardown(); @@ -229,16 +224,16 @@ START_TEST(child_del) // Tests that it is not possible to delete children unsigned int expected_children_count = 0; Efl_Model_Load_Status status; - eo_do(fake_server_proxy, status = efl_model_children_count_get(&expected_children_count)); + status = efl_model_children_count_get(fake_server_proxy, &expected_children_count); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); // efl_model_child_del always returns ERROR Eo *child = efl_model_first_child_get(fake_server_proxy); - eo_do(fake_server_proxy, status = efl_model_child_del(child)); + status = efl_model_child_del(fake_server_proxy, child); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_ERROR, status); unsigned int actual_children_count = 0; - eo_do(fake_server_proxy, status = efl_model_children_count_get(&actual_children_count)); + status = efl_model_children_count_get(fake_server_proxy, &actual_children_count); ck_assert_int_eq(EFL_MODEL_LOAD_STATUS_LOADED, status); ck_assert_int_le(expected_children_count, actual_children_count); diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c index 4efbfc988b..f88e045836 100644 --- a/src/tests/emotion/emotion_test_main-eo.c +++ b/src/tests/emotion/emotion_test_main-eo.c @@ -76,7 +76,7 @@ static const char *theme_file = NULL; static void bg_resize(Evas_Coord w, Evas_Coord h) { - eo_do(o_bg, efl_gfx_size_set(w, h)); + efl_gfx_size_set(o_bg, w, h); } static void @@ -84,8 +84,7 @@ main_resize(Ecore_Evas *ee) { Evas_Coord w, h; - eo_do(ecore_evas_get(ee), - evas_canvas_output_viewport_get(NULL, NULL, &w, &h)); + evas_canvas_output_viewport_get(ecore_evas_get(ee), NULL, NULL, &w, &h); bg_resize(w, h); } @@ -113,15 +112,13 @@ static void bg_setup(void) { o_bg = eo_add(EDJE_OBJECT_CLASS, evas); - eo_do(o_bg, efl_file_set(theme_file, "background"), - efl_gfx_position_set(0, 0), - efl_gfx_size_set(startw, starth), - efl_gfx_stack_layer_set(-999), - efl_gfx_visible_set(EINA_TRUE), - evas_obj_focus_set(EINA_TRUE), - - eo_event_callback_add(EVAS_OBJECT_EVENT_KEY_DOWN, - bg_key_down, NULL)); + efl_file_set(o_bg, theme_file, "background"); + efl_gfx_position_set(o_bg, 0, 0); + efl_gfx_size_set(o_bg, startw, starth); + efl_gfx_stack_layer_set(o_bg, -999); + efl_gfx_visible_set(o_bg, EINA_TRUE); + evas_obj_focus_set(o_bg, EINA_TRUE); + eo_event_callback_add(o_bg, EVAS_OBJECT_EVENT_KEY_DOWN, bg_key_down, NULL); } static void @@ -309,7 +306,7 @@ video_obj_time_changed(Evas_Object *obj, Evas_Object *edje) pos = emotion_object_position_get(obj); len = emotion_object_play_length_get(obj); scale = (len > 0.0) ? pos / len : 0.0; - eo_do(edje, edje_obj_part_drag_value_set("video_progress", scale, 0.0)); + edje_obj_part_drag_value_set(edje, "video_progress", scale, 0.0); lh = len / 3600; lm = len / 60 - (lh * 60); @@ -323,7 +320,7 @@ video_obj_time_changed(Evas_Object *obj, Evas_Object *edje) snprintf(buf, sizeof(buf), "%i:%02i:%02i.%02i / %i:%02i:%02i", ph, pm, ps, pf, lh, lm, ls); - eo_do(edje, edje_obj_part_text_set("video_progress_txt", buf)); + edje_obj_part_text_set(edje, "video_progress_txt", buf); } static Eina_Bool @@ -356,12 +353,11 @@ video_obj_frame_resize_cb(void *data, const Eo_Event *event) printf("HANDLE %ix%i @ %3.3f\n", iw, ih, ratio); if (ratio > 0.0) iw = (ih * ratio) + 0.5; evas_object_size_hint_min_set(event->obj, iw, ih); - eo_do(oe, edje_obj_part_swallow( "video_swallow", event->obj), - edje_obj_size_min_calc(&w, &h), - efl_gfx_size_set(w, h) - ); - eo_do(event->obj, evas_obj_size_hint_min_set(0, 0)); - eo_do(oe, edje_obj_part_swallow( "video_swallow", event->obj)); + edje_obj_part_swallow(oe, "video_swallow", event->obj); + edje_obj_size_min_calc(oe, &w, &h); + efl_gfx_size_set(oe, w, h); + evas_obj_size_hint_min_set(event->obj, 0, 0); + edje_obj_part_swallow(oe, "video_swallow", event->obj); return EINA_TRUE; } @@ -459,7 +455,7 @@ video_obj_signal_play_cb(void *data, Evas_Object *o, const char *emission EINA_U { Evas_Object *ov = data; emotion_object_play_set(ov, EINA_TRUE); - eo_do(o, edje_obj_signal_emit("video_state", "play")); + edje_obj_signal_emit(o, "video_state", "play"); } static void @@ -467,7 +463,7 @@ video_obj_signal_pause_cb(void *data, Evas_Object *o, const char *emission EINA_ { Evas_Object *ov = data; emotion_object_play_set(ov, EINA_FALSE); - eo_do(o, edje_obj_signal_emit("video_state", "pause")); + edje_obj_signal_emit(o, "video_state", "pause"); } static void @@ -476,7 +472,7 @@ video_obj_signal_stop_cb(void *data, Evas_Object *o, const char *emission EINA_U Evas_Object *ov = data; emotion_object_play_set(ov, EINA_FALSE); emotion_object_position_set(ov, 0.0); - eo_do(o, edje_obj_signal_emit("video_state", "stop")); + edje_obj_signal_emit(o, "video_state", "stop"); } static void @@ -486,7 +482,7 @@ video_obj_signal_jump_cb(void *data, Evas_Object *o, const char *emission EINA_U double len; double x, y; - eo_do(o, edje_obj_part_drag_value_get(source, &x, &y)); + edje_obj_part_drag_value_get(o, source, &x, &y); len = emotion_object_play_length_get(ov); emotion_object_position_set(ov, x * len); } @@ -499,11 +495,11 @@ video_obj_signal_alpha_cb(void *data, Evas_Object *o, const char *emission EINA_ double x, y; char buf[256]; - eo_do(o, edje_obj_part_drag_value_get(source, &x, &y)); + edje_obj_part_drag_value_get(o, source, &x, &y); alpha = 255 * y; - eo_do(ov, efl_gfx_color_set(alpha, alpha, alpha, alpha)); + efl_gfx_color_set(ov, alpha, alpha, alpha, alpha); snprintf(buf, sizeof(buf), "alpha %.0f", alpha); - eo_do(o, edje_obj_part_text_set("video_alpha_txt", buf)); + edje_obj_part_text_set(o, "video_alpha_txt", buf); } static void @@ -513,10 +509,10 @@ video_obj_signal_vol_cb(void *data, Evas_Object *o, const char *emission EINA_UN double vol; char buf[256]; - eo_do(o, edje_obj_part_drag_value_get(source, NULL, &vol)); + edje_obj_part_drag_value_get(o, source, NULL, &vol); emotion_object_audio_volume_set(ov, vol); snprintf(buf, sizeof(buf), "vol %.2f", vol); - eo_do(o, edje_obj_part_text_set("video_volume_txt", buf)); + edje_obj_part_text_set(o, "video_volume_txt", buf); } static void @@ -525,14 +521,13 @@ video_obj_signal_frame_move_start_cb(void *data EINA_UNUSED, Evas_Object *o, con Frame_Data *fd; Evas_Coord x, y; - eo_do(o, fd = eo_key_data_get("frame_data")); + fd = eo_key_data_get(o, "frame_data"); if (!fd) return; fd->moving = 1; - eo_do(evas_object_evas_get(o), - evas_canvas_pointer_canvas_xy_get(&x, &y)); + evas_canvas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); fd->x = x; fd->y = y; - eo_do(o, efl_gfx_stack_raise()); + efl_gfx_stack_raise(o); } static void @@ -540,7 +535,7 @@ video_obj_signal_frame_move_stop_cb(void *data EINA_UNUSED, Evas_Object *o, cons { Frame_Data *fd; - eo_do(o, fd = eo_key_data_get("frame_data")); + fd = eo_key_data_get(o, "frame_data"); if (!fd) return; fd->moving = 0; } @@ -551,14 +546,13 @@ video_obj_signal_frame_resize_start_cb(void *data EINA_UNUSED, Evas_Object *o, c Frame_Data *fd; Evas_Coord x, y; - eo_do(o, fd = eo_key_data_get("frame_data")); + fd = eo_key_data_get(o, "frame_data"); if (!fd) return; fd->resizing = 1; - eo_do(evas_object_evas_get(o), - evas_canvas_pointer_canvas_xy_get(&x, &y)); + evas_canvas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); fd->x = x; fd->y = y; - eo_do(o, efl_gfx_stack_raise()); + efl_gfx_stack_raise(o); } static void @@ -566,7 +560,7 @@ video_obj_signal_frame_resize_stop_cb(void *data EINA_UNUSED, Evas_Object *o, co { Frame_Data *fd; - eo_do(o, fd = eo_key_data_get("frame_data")); + fd = eo_key_data_get(o, "frame_data"); if (!fd) return; fd->resizing = 0; } @@ -576,18 +570,15 @@ video_obj_signal_frame_move_cb(void *data EINA_UNUSED, Evas_Object *o, const cha { Frame_Data *fd; - eo_do(o, fd = eo_key_data_get("frame_data")); + fd = eo_key_data_get(o, "frame_data"); if (!fd) return; if (fd->moving) { Evas_Coord x, y, ox, oy; - eo_do(evas_object_evas_get(o), - evas_canvas_pointer_canvas_xy_get(&x, &y)); - eo_do(o, - efl_gfx_position_get(&ox, &oy), - efl_gfx_position_set(ox + (x - fd->x), oy + (y - fd->y)) - ); + evas_canvas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); + efl_gfx_position_get(o, &ox, &oy); + efl_gfx_position_set(o, ox + (x - fd->x), oy + (y - fd->y)); fd->x = x; fd->y = y; } @@ -595,9 +586,8 @@ video_obj_signal_frame_move_cb(void *data EINA_UNUSED, Evas_Object *o, const cha { Evas_Coord x, y, ow, oh; - eo_do(evas_object_evas_get(o), - evas_canvas_pointer_canvas_xy_get(&x, &y)); - eo_do(o, efl_gfx_size_get(&ow, &oh)); + evas_canvas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); + efl_gfx_size_get(o, &ow, &oh); evas_object_resize(o, ow + (x - fd->x), oh + (y - fd->y)); fd->x = x; fd->y = y; @@ -650,43 +640,35 @@ init_video_object(const char *module_filename, const char *filename) if (!fd) exit(1); oe = eo_add(EDJE_OBJECT_CLASS, evas); - eo_do(oe, - eo_event_callback_add(EVAS_OBJECT_EVENT_FREE, _oe_free_cb, fd), - eo_key_data_set("frame_data", fd), - efl_file_set(theme_file, - reflex ? "video_controller/reflex" : "video_controller"), - edje_obj_part_swallow("video_swallow", o)); + eo_event_callback_add(oe, EVAS_OBJECT_EVENT_FREE, _oe_free_cb, fd); + eo_key_data_set(oe, "frame_data", fd); + efl_file_set(oe, theme_file, reflex ? "video_controller/reflex" : "video_controller"); + edje_obj_part_swallow(oe, "video_swallow", o); offset = 20 * (eina_list_count(video_objs) - 1); - eo_do(oe, - efl_gfx_position_set(offset, offset), - edje_obj_size_min_calc(&w, &h), - efl_gfx_size_set(w, h)); + efl_gfx_position_set(oe, offset, offset); + edje_obj_size_min_calc(oe, &w, &h); + efl_gfx_size_set(oe, w, h); - eo_do(o, eo_event_callback_array_add(emotion_object_test_callbacks, oe)); + eo_event_callback_array_add(o, emotion_object_test_callbacks, oe); - eo_do(oe, - edje_obj_signal_callback_add("video_control", "play", video_obj_signal_play_cb, o), - edje_obj_signal_callback_add("video_control", "pause", video_obj_signal_pause_cb, o), - edje_obj_signal_callback_add("video_control", "stop", video_obj_signal_stop_cb, o), - edje_obj_signal_callback_add("drag", "video_progress", video_obj_signal_jump_cb, o), - edje_obj_signal_callback_add("drag", "video_alpha", video_obj_signal_alpha_cb, o), - edje_obj_signal_callback_add("drag", "video_volume", video_obj_signal_vol_cb, o), - - edje_obj_signal_callback_add("frame_move", "start", video_obj_signal_frame_move_start_cb, oe), - edje_obj_signal_callback_add("frame_move", "stop", video_obj_signal_frame_move_stop_cb, oe), - edje_obj_signal_callback_add("frame_resize", "start", video_obj_signal_frame_resize_start_cb, oe), - edje_obj_signal_callback_add("frame_resize", "stop", video_obj_signal_frame_resize_stop_cb, oe), - edje_obj_signal_callback_add("mouse,move", "*", video_obj_signal_frame_move_cb, oe), - - edje_obj_part_drag_value_set("video_alpha", 0.0, 1.0), - edje_obj_part_text_set("video_alpha_txt", "alpha 255"), - edje_obj_part_drag_value_set("video_volume", 0.0, 0.5), - edje_obj_part_text_set("video_volume_txt", "vol 0.50"), - - edje_obj_signal_emit("video_state", "play"), - - efl_gfx_visible_set(EINA_TRUE)); + edje_obj_signal_callback_add(oe, "video_control", "play", video_obj_signal_play_cb, o); + edje_obj_signal_callback_add(oe, "video_control", "pause", video_obj_signal_pause_cb, o); + edje_obj_signal_callback_add(oe, "video_control", "stop", video_obj_signal_stop_cb, o); + edje_obj_signal_callback_add(oe, "drag", "video_progress", video_obj_signal_jump_cb, o); + edje_obj_signal_callback_add(oe, "drag", "video_alpha", video_obj_signal_alpha_cb, o); + edje_obj_signal_callback_add(oe, "drag", "video_volume", video_obj_signal_vol_cb, o); + edje_obj_signal_callback_add(oe, "frame_move", "start", video_obj_signal_frame_move_start_cb, oe); + edje_obj_signal_callback_add(oe, "frame_move", "stop", video_obj_signal_frame_move_stop_cb, oe); + edje_obj_signal_callback_add(oe, "frame_resize", "start", video_obj_signal_frame_resize_start_cb, oe); + edje_obj_signal_callback_add(oe, "frame_resize", "stop", video_obj_signal_frame_resize_stop_cb, oe); + edje_obj_signal_callback_add(oe, "mouse, move", "*", video_obj_signal_frame_move_cb, oe); + edje_obj_part_drag_value_set(oe, "video_alpha", 0.0, 1.0); + edje_obj_part_text_set(oe, "video_alpha_txt", "alpha 255"); + edje_obj_part_drag_value_set(oe, "video_volume", 0.0, 0.5); + edje_obj_part_text_set(oe, "video_volume_txt", "vol 0.50"); + edje_obj_signal_emit(oe, "video_state", "play"); + efl_gfx_visible_set(oe, EINA_TRUE); } int diff --git a/src/tests/eo/access/access_main.c b/src/tests/eo/access/access_main.c index 61cd381167..d8d825bda2 100644 --- a/src/tests/eo/access/access_main.c +++ b/src/tests/eo/access/access_main.c @@ -15,7 +15,8 @@ main(int argc, char *argv[]) Eo *obj = eo_add(INHERIT_CLASS, NULL); - eo_do(obj, simple_a_set(1), inherit_prot_print()); + simple_a_set(obj, 1); + inherit_prot_print(obj); Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS); printf("Pub: %d\n", pd->public_x2); diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c index 55e55e0a57..b4f87661a2 100644 --- a/src/tests/eo/access/access_simple.c +++ b/src/tests/eo/access/access_simple.c @@ -27,7 +27,7 @@ _a_set(Eo *obj, void *class_data, int a) pd->protected.protected_x1 = a + 1; pd->protected.public.public_x2 = a + 2; - eo_do(obj, eo_event_callback_call(EV_A_CHANGED, &pd->a)); + eo_event_callback_call(obj, EV_A_CHANGED, &pd->a); } EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a); diff --git a/src/tests/eo/children/children_main.c b/src/tests/eo/children/children_main.c index 0e0832f8ce..893522872f 100644 --- a/src/tests/eo/children/children_main.c +++ b/src/tests/eo/children/children_main.c @@ -28,7 +28,7 @@ main(int argc, char *argv[]) Eo *child2 = eo_add(SIMPLE_CLASS, parent); Eo *child3 = eo_add(SIMPLE_CLASS, parent); - eo_do(parent, iter = eo_children_iterator_new()); + iter = eo_children_iterator_new(parent); fail_if(!iter); CHECK_ITER_DATA(iter, chld, child1); @@ -40,7 +40,7 @@ main(int argc, char *argv[]) eo_del(child2); - eo_do(parent, iter = eo_children_iterator_new()); + iter = eo_children_iterator_new(parent); fail_if(!iter); CHECK_ITER_DATA(iter, chld, child1); @@ -52,7 +52,7 @@ main(int argc, char *argv[]) eo_del(child1); - eo_do(parent, iter = eo_children_iterator_new()); + iter = eo_children_iterator_new(parent); fail_if(!iter); CHECK_ITER_DATA(iter, chld, child3); @@ -62,7 +62,7 @@ main(int argc, char *argv[]) eo_del(child3); - eo_do(parent, iter = eo_children_iterator_new()); + iter = eo_children_iterator_new(parent); fail_if(iter); eo_unref(parent); diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c index 32116c986a..59ab9560dc 100644 --- a/src/tests/eo/composite_objects/composite_objects_comp.c +++ b/src/tests/eo/composite_objects/composite_objects_comp.c @@ -16,7 +16,7 @@ static int _a_get(Eo *obj, void *class_data EINA_UNUSED) { int a = 0; - eo_do_super(obj, MY_CLASS, a = simple_a_get()); + a = simple_a_get(eo_super(obj, MY_CLASS)); return a; } @@ -25,16 +25,16 @@ static Eo * _constructor(Eo *obj, void *class_data EINA_UNUSED) { Eina_Bool tmp; - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); Eo *simple = eo_add(SIMPLE_CLASS, obj); - eo_do(obj, eo_composite_attach(simple)); - eo_do(simple, eo_event_callback_forwarder_add(EV_A_CHANGED, obj)); + eo_composite_attach(obj, simple); + eo_event_callback_forwarder_add(simple, EV_A_CHANGED, obj); - fail_if(eo_do_ret(obj, tmp, eo_composite_part_is())); - fail_if(!eo_do_ret(simple, tmp, eo_composite_part_is())); + fail_if(eo_composite_part_is(obj)); + fail_if(!eo_composite_part_is(simple)); - eo_do(obj, eo_key_data_set("simple-obj", simple)); + eo_key_data_set(obj, "simple-obj", simple); return obj; } diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c index 5ad11c6ef5..9e90eb412a 100644 --- a/src/tests/eo/composite_objects/composite_objects_main.c +++ b/src/tests/eo/composite_objects/composite_objects_main.c @@ -32,49 +32,49 @@ main(int argc, char *argv[]) eo_init(); Eo *obj = eo_add(COMP_CLASS, NULL); - eo_do(obj, eo_event_callback_add(EV_A_CHANGED, _a_changed_cb, NULL)); + eo_event_callback_add(obj, EV_A_CHANGED, _a_changed_cb, NULL); fail_if(!eo_isa(obj, COMP_CLASS)); fail_if(!eo_isa(obj, SIMPLE_CLASS)); int a = 0; cb_called = EINA_FALSE; - eo_do(obj, simple_a_set(1)); + simple_a_set(obj, 1); fail_if(!cb_called); /* Test functions from all across the chain. */ cb_called = EINA_FALSE; - eo_do(obj, simple_a_set1(1)); + simple_a_set1(obj, 1); fail_if(!cb_called); cb_called = EINA_FALSE; - eo_do(obj, simple_a_set15(1)); + simple_a_set15(obj, 1); fail_if(!cb_called); cb_called = EINA_FALSE; - eo_do(obj, simple_a_set32(1)); + simple_a_set32(obj, 1); fail_if(!cb_called); - eo_do(obj, a = simple_a_get()); + a = simple_a_get(obj); fail_if(a != 1); /* disable the callback forwarder, and fail if it's still called. */ Eo *simple = NULL; - eo_do(obj, simple = eo_key_data_get("simple-obj")); + simple = eo_key_data_get(obj, "simple-obj"); eo_ref(simple); - eo_do(simple, eo_event_callback_forwarder_del(EV_A_CHANGED, obj)); + eo_event_callback_forwarder_del(simple, EV_A_CHANGED, obj); cb_called = EINA_FALSE; - eo_do(obj, simple_a_set(2)); + simple_a_set(obj, 2); fail_if(cb_called); - fail_if(!eo_do_ret(simple, tmp,eo_composite_part_is())); - fail_if(!eo_do_ret(obj, tmp,eo_composite_detach(simple))); - fail_if(eo_do_ret(obj, tmp,eo_composite_detach(simple))); - fail_if(eo_do_ret(simple, tmp,eo_composite_part_is())); - fail_if(!eo_do_ret(obj, tmp,eo_composite_attach(simple))); - fail_if(!eo_do_ret(simple, tmp,eo_composite_part_is())); - fail_if(eo_do_ret(obj, tmp,eo_composite_attach(simple))); + fail_if(!eo_composite_part_is(simple)); + fail_if(!eo_composite_detach(obj, simple)); + fail_if(eo_composite_detach(obj, simple)); + fail_if(eo_composite_part_is(simple)); + fail_if(!eo_composite_attach(obj, simple)); + fail_if(!eo_composite_part_is(simple)); + fail_if(eo_composite_attach(obj, simple)); - fail_if(eo_do_ret(simple, tmp,eo_composite_attach(obj))); + fail_if(eo_composite_attach(simple, obj)); eo_unref(simple); eo_unref(obj); diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c index b9c906e66f..5c64cc0f14 100644 --- a/src/tests/eo/composite_objects/composite_objects_simple.c +++ b/src/tests/eo/composite_objects/composite_objects_simple.c @@ -17,7 +17,7 @@ _a_set(Eo *obj, void *class_data, int a) printf("%s %d\n", eo_class_name_get(MY_CLASS), a); pd->a = a; - eo_do(obj, eo_event_callback_call(EV_A_CHANGED, &pd->a)); + eo_event_callback_call(obj, EV_A_CHANGED, &pd->a); } static int diff --git a/src/tests/eo/constructors/constructors_main.c b/src/tests/eo/constructors/constructors_main.c index cab5e7ffba..5844e46624 100644 --- a/src/tests/eo/constructors/constructors_main.c +++ b/src/tests/eo/constructors/constructors_main.c @@ -28,10 +28,13 @@ main(int argc, char *argv[]) fail_if(my_init_count != 2); - eo_do(obj, simple_a_set(1), simple_b_set(2)); + simple_a_set(obj, 1); + simple_b_set(obj, 2); int a = 0, b = 0; - eo_do(obj, a = simple_a_get(), b = simple_b_get(), mixin_add_and_print(5)); + a = simple_a_get(obj); + b = simple_b_get(obj); + mixin_add_and_print(obj, 5); fail_if(a != 1); fail_if(b != 2); @@ -69,19 +72,18 @@ main(int argc, char *argv[]) obj = eo_add(SIMPLE_CLASS, NULL); fail_if(!obj); fail_if(my_init_count != 2); - eo_do(obj, a = simple_a_get()); + a = simple_a_get(obj); fail_if(a != 0); my_init_count = 0; - obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(7)); + obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eoid, 7)); fail_if(!obj); fail_if(my_init_count != 2); - eo_do(obj, a = simple_a_get();); + a = simple_a_get(obj); fail_if(a != 7); my_init_count = 0; - obj = eo_add(SIMPLE_CLASS, NULL, simple_b_set(6), simple_a_set(-1), - b = simple_b_get()); + obj = eo_add(SIMPLE_CLASS, NULL, simple_b_set(eoid, 6), simple_a_set(eoid, -1), b = simple_b_get(eoid)); fail_if(obj); fail_if(b != 6); fail_if(my_init_count != 0); diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c index 10213b1b09..b2e523b042 100644 --- a/src/tests/eo/constructors/constructors_mixin.c +++ b/src/tests/eo/constructors/constructors_mixin.c @@ -12,7 +12,8 @@ static void _add_and_print_set(Eo *obj, void *class_data EINA_UNUSED, int x) { int a = 0, b = 0; - eo_do(obj, a = simple_a_get(), b = simple_b_get()); + a = simple_a_get(obj); + b = simple_b_get(obj); printf("%s %d\n", __func__, a + b + x); } @@ -23,13 +24,13 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED) { my_init_count++; - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } static void _destructor(Eo *obj, void *class_data EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); my_init_count--; } diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c index d28748539a..370ca60f9c 100644 --- a/src/tests/eo/constructors/constructors_simple.c +++ b/src/tests/eo/constructors/constructors_simple.c @@ -44,7 +44,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED) { my_init_count++; - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } static Eo* @@ -53,7 +53,7 @@ _finalize(Eo *obj, void *class_data EINA_UNUSED) Eo *ret; Private_Data *pd = class_data; - eo_do_super(obj, MY_CLASS, ret = eo_finalize()); + ret = eo_finalize(eo_super(obj, MY_CLASS)); if (pd->a < 0) { @@ -66,7 +66,7 @@ _finalize(Eo *obj, void *class_data EINA_UNUSED) static void _destructor(Eo *obj, void *class_data EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); my_init_count--; } diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c index e0c6804465..b1e59f8eb4 100644 --- a/src/tests/eo/constructors/constructors_simple2.c +++ b/src/tests/eo/constructors/constructors_simple2.c @@ -11,7 +11,7 @@ static Eo * _constructor(Eo *obj, void *class_data EINA_UNUSED) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); return NULL; } diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c index 9f4355dfa7..f3e12b8df7 100644 --- a/src/tests/eo/constructors/constructors_simple6.c +++ b/src/tests/eo/constructors/constructors_simple6.c @@ -11,7 +11,7 @@ static void _destructor(Eo *obj, void *class_data EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } static Eo_Op_Description op_descs [] = { diff --git a/src/tests/eo/constructors/constructors_simple7.c b/src/tests/eo/constructors/constructors_simple7.c index d3ec9ea4c0..c821d2559a 100644 --- a/src/tests/eo/constructors/constructors_simple7.c +++ b/src/tests/eo/constructors/constructors_simple7.c @@ -15,7 +15,7 @@ static Eo * _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { /* FIXME: Actually test it. */ - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } static Eo_Op_Description op_descs [] = { diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c index e250ee3d2c..b4602aac00 100644 --- a/src/tests/eo/function_overrides/function_overrides_inherit2.c +++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c @@ -15,11 +15,11 @@ static void _a_set(Eo *obj, void *class_data EINA_UNUSED, int a) { printf("%s %d\n", eo_class_name_get(MY_CLASS), a); - eo_do(obj, simple_a_print()); - eo_do_super(obj, MY_CLASS, simple_a_set(a + 1)); + simple_a_print(obj); + simple_a_set(eo_super(obj, MY_CLASS), a + 1); Eina_Bool called = EINA_FALSE; - eo_do_super(obj, MY_CLASS, called = simple_a_print()); + called = simple_a_print(eo_super(obj, MY_CLASS)); fail_if(!called); } @@ -28,7 +28,7 @@ _print(Eo *obj, void *class_data EINA_UNUSED) { Eina_Bool called = EINA_FALSE; printf("Hey\n"); - eo_do_super(obj, MY_CLASS, called = inherit2_print()); + called = inherit2_print(eo_super(obj, MY_CLASS)); fail_if(called); return EINA_TRUE; @@ -47,10 +47,10 @@ _class_print(Eo_Class *klass, void *data EINA_UNUSED) { Eina_Bool called = EINA_FALSE; printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); - eo_do_super(klass, MY_CLASS, called = simple_class_print()); + called = simple_class_print(eo_super(klass, MY_CLASS)); fail_if(!called); - eo_do_super(klass, MY_CLASS, called = simple_class_print2()); + called = simple_class_print2(eo_super(klass, MY_CLASS)); fail_if(!called); return EINA_TRUE; diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c index 2f96d590ee..4c23281587 100644 --- a/src/tests/eo/function_overrides/function_overrides_inherit3.c +++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c @@ -13,7 +13,7 @@ static void _a_set(Eo *obj, void *class_data EINA_UNUSED, int a) { printf("%s %d\n", eo_class_name_get(MY_CLASS), a); - eo_do_super(obj, MY_CLASS, simple_a_set(a + 1)); + simple_a_set(eo_super(obj, MY_CLASS), a + 1); } static Eo_Op_Description op_descs[] = { diff --git a/src/tests/eo/function_overrides/function_overrides_main.c b/src/tests/eo/function_overrides/function_overrides_main.c index 920595c077..b2aa840897 100644 --- a/src/tests/eo/function_overrides/function_overrides_main.c +++ b/src/tests/eo/function_overrides/function_overrides_main.c @@ -20,7 +20,7 @@ main(int argc, char *argv[]) Eina_Bool called = EINA_FALSE; Eo *obj = eo_add(INHERIT2_CLASS, NULL); - eo_do(obj, simple_a_set(1)); + simple_a_set(obj, 1); Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS); fail_if(pd->a != 2); @@ -28,47 +28,48 @@ main(int argc, char *argv[]) obj = eo_add(INHERIT3_CLASS, NULL); - eo_do(obj, simple_a_set(1)); + simple_a_set(obj, 1); pd = eo_data_scope_get(obj, SIMPLE_CLASS); fail_if(pd->a != 3); eo_unref(obj); obj = eo_add(INHERIT2_CLASS, NULL); - eo_do(obj, called = inherit2_print()); + called = inherit2_print(obj); fail_if(!called); - eo_do(obj, called = inherit2_print(), called = inherit2_print()); + called = inherit2_print(obj); + called = inherit2_print(obj); fail_if(!called); eo_unref(obj); obj = eo_add(SIMPLE_CLASS, NULL); - eo_do(obj, called = inherit2_print()); + called = inherit2_print(obj); fail_if(called); #ifdef EO_DEBUG - eo_do(obj, called = simple_class_print()); + called = simple_class_print(obj); fail_if(called); #endif - eo_do(SIMPLE_CLASS, called = simple_class_print()); + called = simple_class_print(SIMPLE_CLASS); fail_if(!called); - eo_do(INHERIT_CLASS, called = simple_class_print()); + called = simple_class_print(INHERIT_CLASS); fail_if(!called); - eo_do(INHERIT2_CLASS, called = simple_class_print()); + called = simple_class_print(INHERIT2_CLASS); fail_if(!called); - eo_do(INHERIT3_CLASS, called = simple_class_print()); + called = simple_class_print(INHERIT3_CLASS); fail_if(!called); #ifdef EO_DEBUG - eo_do(SIMPLE_CLASS, called = simple_a_print()); + called = simple_a_print(SIMPLE_CLASS); fail_if(called); #endif - eo_do_super(obj, SIMPLE_CLASS, eo_constructor()); - eo_do_super(obj, SIMPLE_CLASS, eo_destructor()); + eo_constructor(eo_super(obj, SIMPLE_CLASS)); + eo_destructor(eo_super(obj, SIMPLE_CLASS)); eo_unref(obj); diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c index dc5f0dd4a1..57942f7efe 100644 --- a/src/tests/eo/function_overrides/function_overrides_simple.c +++ b/src/tests/eo/function_overrides/function_overrides_simple.c @@ -34,10 +34,10 @@ _class_print(Eo_Class *klass, void *class_data EINA_UNUSED) { printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); Eina_Bool called = EINA_FALSE; - eo_do_super(klass, MY_CLASS, called = simple_class_print()); + called = simple_class_print(eo_super(klass, MY_CLASS)); fail_if(called); - eo_do_super(klass, MY_CLASS, called = simple_class_print2()); + called = simple_class_print2(eo_super(klass, MY_CLASS)); fail_if(called); return EINA_TRUE; diff --git a/src/tests/eo/interface/interface_main.c b/src/tests/eo/interface/interface_main.c index 40936d42e7..a85f030963 100644 --- a/src/tests/eo/interface/interface_main.c +++ b/src/tests/eo/interface/interface_main.c @@ -18,16 +18,21 @@ main(int argc, char *argv[]) Eo *obj = eo_add(SIMPLE_CLASS, NULL); - eo_do(obj, simple_a_set(1), simple_b_set(2)); + simple_a_set(obj, 1); + simple_b_set(obj, 2); int a = 0, b = 0, sum = 0; - eo_do(obj, a = simple_a_get(), b = simple_b_get(), sum = interface_ab_sum_get()); + a = simple_a_get(obj); + b = simple_b_get(obj); + sum = interface_ab_sum_get(obj); fail_if(sum != a + b); sum = 0; - eo_do(obj, sum = interface_ab_sum_get(), sum = interface_ab_sum_get()); + sum = interface_ab_sum_get(obj); + sum = interface_ab_sum_get(obj); fail_if(sum != a + b); - eo_do(obj, sum = interface2_ab_sum_get2(), sum = interface2_ab_sum_get2()); + sum = interface2_ab_sum_get2(obj); + sum = interface2_ab_sum_get2(obj); fail_if(sum != a + b + 1); eo_unref(obj); diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c index cad7f24000..589274f6d6 100644 --- a/src/tests/eo/interface/interface_simple.c +++ b/src/tests/eo/interface/interface_simple.c @@ -40,7 +40,8 @@ static int _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED) { int a = 0, b = 0; - eo_do(obj, a = simple_a_get(), b = simple_b_get()); + a = simple_a_get(obj); + b = simple_b_get(obj); printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); return a + b; } @@ -49,7 +50,8 @@ static int _ab_sum_get2(Eo *obj, void *class_data EINA_UNUSED) { int a = 0, b = 0; - eo_do(obj, a = simple_a_get(), b = simple_b_get()); + a = simple_a_get(obj); + b = simple_b_get(obj); printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); return a + b + 1; } diff --git a/src/tests/eo/mixin/mixin_inherit.c b/src/tests/eo/mixin/mixin_inherit.c index 8098c1c220..b583bef8af 100644 --- a/src/tests/eo/mixin/mixin_inherit.c +++ b/src/tests/eo/mixin/mixin_inherit.c @@ -13,7 +13,7 @@ static int _a_get(Eo *obj, void *class_data EINA_UNUSED) { int ret = 0; - eo_do_super(obj, MY_CLASS, ret = simple_a_get()); + ret = simple_a_get(eo_super(obj, MY_CLASS)); printf("%s %d\n", __func__, ret); return ret; diff --git a/src/tests/eo/mixin/mixin_main.c b/src/tests/eo/mixin/mixin_main.c index 6ab6af288e..d3c1dbf2ac 100644 --- a/src/tests/eo/mixin/mixin_main.c +++ b/src/tests/eo/mixin/mixin_main.c @@ -20,13 +20,17 @@ main(int argc, char *argv[]) Eo *obj = eo_add(SIMPLE_CLASS, NULL); - eo_do(obj, simple_a_set(1), simple_b_set(2)); + simple_a_set(obj, 1); + simple_b_set(obj, 2); int a = 0, b = 0, sum = 0; - eo_do(obj, a = simple_a_get(), b = simple_b_get(), sum = mixin_ab_sum_get()); + a = simple_a_get(obj); + b = simple_b_get(obj); + sum = mixin_ab_sum_get(obj); fail_if(sum != a + b + 2); /* 2 for the two mixins... */ - eo_do(obj, sum = mixin_ab_sum_get(), sum = mixin_ab_sum_get()); + sum = mixin_ab_sum_get(obj); + sum = mixin_ab_sum_get(obj); Mixin2_Public_Data *pd2 = eo_data_scope_get(obj, MIXIN2_CLASS); fail_if(pd2->count != 6); @@ -37,7 +41,8 @@ main(int argc, char *argv[]) eo_unref(obj); obj = eo_add(INHERIT_CLASS, NULL); - eo_do(obj, simple_a_set(5), a = simple_a_get()); + simple_a_set(obj, 5); + a = simple_a_get(obj); printf("%d\n", a); fail_if(a != 5); diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c index d8569d4982..427293e707 100644 --- a/src/tests/eo/mixin/mixin_mixin.c +++ b/src/tests/eo/mixin/mixin_mixin.c @@ -12,7 +12,8 @@ static int _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED) { int a = 0, b = 0; - eo_do(obj, a = simple_a_get(), b = simple_b_get()); + a = simple_a_get(obj); + b = simple_b_get(obj); printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); return a + b; } @@ -20,13 +21,13 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED) static Eo * _constructor(Eo *obj, void *class_data EINA_UNUSED) { - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } static void _destructor(Eo *obj, void *class_data EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } EAPI EO_FUNC_BODY(mixin_ab_sum_get, int, 0); diff --git a/src/tests/eo/mixin/mixin_mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c index 7aff72bde1..93f30f6156 100644 --- a/src/tests/eo/mixin/mixin_mixin2.c +++ b/src/tests/eo/mixin/mixin_mixin2.c @@ -18,14 +18,15 @@ _ab_sum_get(Eo *obj, void *class_data) Mixin2_Public_Data *pd = (Mixin2_Public_Data *) class_data; int sum = 0; printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); - eo_do_super(obj, MY_CLASS, sum = mixin_ab_sum_get()); + sum = mixin_ab_sum_get(eo_super(obj, MY_CLASS)); ++sum; pd->count += 2; { int _a = 0, _b = 0; - eo_do(obj, _a = simple_a_get(), _b = simple_b_get()); + _a = simple_a_get(obj); + _b = simple_b_get(obj); fail_if(sum != _a + _b + 1); } @@ -35,14 +36,14 @@ _ab_sum_get(Eo *obj, void *class_data) static Eo * _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); return obj; } static void _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } static Eo_Op_Description op_descs[] = { diff --git a/src/tests/eo/mixin/mixin_mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c index d5c2ed7adf..2a946e420e 100644 --- a/src/tests/eo/mixin/mixin_mixin3.c +++ b/src/tests/eo/mixin/mixin_mixin3.c @@ -18,14 +18,15 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED) Mixin3_Public_Data *pd = (Mixin3_Public_Data *) class_data; int sum = 0; printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); - eo_do_super(obj, MY_CLASS, sum = mixin_ab_sum_get()); + sum = mixin_ab_sum_get(eo_super(obj, MY_CLASS)); ++sum; pd->count += 3; { int _a = 0, _b = 0; - eo_do(obj, _a = simple_a_get(), _b = simple_b_get()); + _a = simple_a_get(obj); + _b = simple_b_get(obj); fail_if(sum != _a + _b + 2); } @@ -35,13 +36,13 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED) static Eo * _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } static void _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } static Eo_Op_Description op_descs[] = { diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c index 4fcfaef2fe..5d40331b03 100644 --- a/src/tests/eo/signals/signals_main.c +++ b/src/tests/eo/signals/signals_main.c @@ -23,8 +23,8 @@ _a_changed_cb(void *data, const Eo_Event *event) cb_count++; - eo_do(event->obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423)); - eo_do(event->obj, eo_event_callback_del(EV_A_CHANGED, _null_cb, (void *) 23423)); + eo_event_callback_priority_add(event->obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423); + eo_event_callback_del(event->obj, EV_A_CHANGED, _null_cb, (void *) 23423); /* Stop as we reached the 3rd one. */ return (cb_count != 3); @@ -41,132 +41,132 @@ main(int argc, char *argv[]) Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS); /* The order of these two is undetermined. */ - eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2)); - eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1)); + eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2); + eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1); /* This will be called afterwards. */ - eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_DEFAULT, _a_changed_cb, (void *) 3)); + eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_DEFAULT, _a_changed_cb, (void *) 3); /* This will never be called because the previous callback returns NULL. */ - eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_AFTER, _a_changed_cb, (void *) 4)); + eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_AFTER, _a_changed_cb, (void *) 4); - eo_do(obj, simple_a_set(1)); + simple_a_set(obj, 1); fail_if(cb_count != 3); - eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 3)); + eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 3); fail_if(pd->cb_count != 3); - eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 12)); + eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 12); fail_if(pd->cb_count != 3); - eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 4)); + eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 4); fail_if(pd->cb_count != 2); - eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 2)); + eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 2); fail_if(pd->cb_count != 1); - eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 1)); + eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 1); fail_if(pd->cb_count != 0); /* Freeze/thaw. */ int fcount = 0; cb_count = 0; - eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1)); + eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1); fail_if(pd->cb_count != 1); - eo_do(obj, fcount = eo_event_freeze_count_get()); + fcount = eo_event_freeze_count_get(obj); fail_if(fcount != 0); - eo_do(obj, eo_event_freeze()); - eo_do(obj, fcount = eo_event_freeze_count_get()); + eo_event_freeze(obj); + fcount = eo_event_freeze_count_get(obj); fail_if(fcount != 1); - eo_do(obj, eo_event_freeze()); - eo_do(obj, fcount = eo_event_freeze_count_get()); + eo_event_freeze(obj); + fcount = eo_event_freeze_count_get(obj); fail_if(fcount != 2); - eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2)); + eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2); fail_if(pd->cb_count != 2); - eo_do(obj, simple_a_set(2)); + simple_a_set(obj, 2); fail_if(cb_count != 0); - eo_do(obj, eo_event_thaw()); - eo_do(obj, fcount = eo_event_freeze_count_get()); + eo_event_thaw(obj); + fcount = eo_event_freeze_count_get(obj); fail_if(fcount != 1); - eo_do(obj, eo_event_thaw()); - eo_do(obj, fcount = eo_event_freeze_count_get()); + eo_event_thaw(obj); + fcount = eo_event_freeze_count_get(obj); fail_if(fcount != 0); - eo_do(obj, simple_a_set(3)); + simple_a_set(obj, 3); fail_if(cb_count != 2); cb_count = 0; - eo_do(obj, eo_event_thaw()); - eo_do(obj, fcount = eo_event_freeze_count_get()); + eo_event_thaw(obj); + fcount = eo_event_freeze_count_get(obj); fail_if(fcount != 0); - eo_do(obj, eo_event_freeze()); - eo_do(obj, fcount = eo_event_freeze_count_get()); + eo_event_freeze(obj); + fcount = eo_event_freeze_count_get(obj); fail_if(fcount != 1); - eo_do(obj, simple_a_set(2)); + simple_a_set(obj, 2); fail_if(cb_count != 0); - eo_do(obj, eo_event_thaw()); - eo_do(obj, fcount = eo_event_freeze_count_get()); + eo_event_thaw(obj); + fcount = eo_event_freeze_count_get(obj); fail_if(fcount != 0); - eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 1)); + eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 1); fail_if(pd->cb_count != 1); - eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 2)); + eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 2); fail_if(pd->cb_count != 0); /* Global Freeze/thaw. */ fcount = 0; cb_count = 0; pd->cb_count = 0; - eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1)); + eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1); fail_if(pd->cb_count != 1); - eo_do(EO_CLASS, fcount = eo_event_global_freeze_count_get()); + fcount = eo_event_global_freeze_count_get(EO_CLASS); fail_if(fcount != 0); - eo_do(EO_CLASS, eo_event_global_freeze()); - eo_do(EO_CLASS, fcount = eo_event_global_freeze_count_get()); + eo_event_global_freeze(EO_CLASS); + fcount = eo_event_global_freeze_count_get(EO_CLASS); fail_if(fcount != 1); - eo_do(EO_CLASS, eo_event_global_freeze()); - eo_do(EO_CLASS, fcount = eo_event_global_freeze_count_get()); + eo_event_global_freeze(EO_CLASS); + fcount = eo_event_global_freeze_count_get(EO_CLASS); fail_if(fcount != 2); - eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2)); + eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2); fail_if(pd->cb_count != 2); - eo_do(obj, simple_a_set(2)); + simple_a_set(obj, 2); fail_if(cb_count != 0); - eo_do(EO_CLASS, eo_event_global_thaw()); - eo_do(EO_CLASS, fcount = eo_event_global_freeze_count_get()); + eo_event_global_thaw(EO_CLASS); + fcount = eo_event_global_freeze_count_get(EO_CLASS); fail_if(fcount != 1); - eo_do(EO_CLASS, eo_event_global_thaw()); - eo_do(EO_CLASS, fcount = eo_event_global_freeze_count_get()); + eo_event_global_thaw(EO_CLASS); + fcount = eo_event_global_freeze_count_get(EO_CLASS); fail_if(fcount != 0); - eo_do(obj, simple_a_set(3)); + simple_a_set(obj, 3); fail_if(cb_count != 2); cb_count = 0; - eo_do(EO_CLASS, eo_event_global_thaw()); - eo_do(EO_CLASS, fcount = eo_event_global_freeze_count_get()); + eo_event_global_thaw(EO_CLASS); + fcount = eo_event_global_freeze_count_get(EO_CLASS); fail_if(fcount != 0); - eo_do(EO_CLASS, eo_event_global_freeze()); - eo_do(EO_CLASS, fcount = eo_event_global_freeze_count_get()); + eo_event_global_freeze(EO_CLASS); + fcount = eo_event_global_freeze_count_get(EO_CLASS); fail_if(fcount != 1); - eo_do(obj, simple_a_set(2)); + simple_a_set(obj, 2); fail_if(cb_count != 0); - eo_do(EO_CLASS, eo_event_global_thaw()); - eo_do(EO_CLASS, fcount = eo_event_global_freeze_count_get()); + eo_event_global_thaw(EO_CLASS); + fcount = eo_event_global_freeze_count_get(EO_CLASS); fail_if(fcount != 0); diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c index d3145e574e..8a70f5fca2 100644 --- a/src/tests/eo/signals/signals_simple.c +++ b/src/tests/eo/signals/signals_simple.c @@ -23,7 +23,7 @@ _a_set(Eo *obj, void *class_data, int a) pd->a = a; printf("%s %d\n", __func__, pd->a); - eo_do(obj, eo_event_callback_call(EV_A_CHANGED, &pd->a)); + eo_event_callback_call(obj, EV_A_CHANGED, &pd->a); } Eina_Bool @@ -59,12 +59,12 @@ _cb_deled(void *data, const Eo_Event *event) static Eo * _constructor(Eo *obj, void *class_data EINA_UNUSED) { - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); - eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_ADD, _cb_added, NULL)); - eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_DEL, _cb_deled, NULL)); + eo_event_callback_add(obj, EO_BASE_EVENT_CALLBACK_ADD, _cb_added, NULL); + eo_event_callback_add(obj, EO_BASE_EVENT_CALLBACK_DEL, _cb_deled, NULL); - eo_do(obj, eo_key_data_set("cb_count", NULL)); + eo_key_data_set(obj, "cb_count", NULL); return obj; } diff --git a/src/tests/eo/suite/eo_test_call_errors.c b/src/tests/eo/suite/eo_test_call_errors.c index 48d8a55dfb..551c58deae 100644 --- a/src/tests/eo/suite/eo_test_call_errors.c +++ b/src/tests/eo/suite/eo_test_call_errors.c @@ -21,7 +21,7 @@ START_TEST(eo_pure_virtual_fct_call) fail_if(!obj); TEST_EO_ERROR("_eo_call_resolve", "in %s:%d: you called a pure virtual func '%s' (%d) of class '%s'."); - eo_do(obj, simple_pure_virtual()); + simple_pure_virtual(obj); fail_unless(ctx.did); eo_unref(obj); @@ -39,7 +39,7 @@ START_TEST(eo_api_not_implemented_call) fail_if(!obj); TEST_EO_ERROR("_eo_api_op_id_get", "Unable to resolve op for api func %p"); - eo_do(obj, simple_no_implementation()); + simple_no_implementation(obj); fail_unless(ctx.did); eo_unref(obj); @@ -57,7 +57,7 @@ START_TEST(eo_op_not_found_in_super) fail_if(!obj); TEST_EO_ERROR("_eo_call_resolve", "in %s:%d: func '%s' (%d) could not be resolved for class '%s' for super of '%s'."); - eo_do_super(obj, SIMPLE_CLASS, simple_a_set(10)); + simple_a_set(eo_super(obj, SIMPLE_CLASS), 10); fail_unless(ctx.did); eo_unref(obj); diff --git a/src/tests/eo/suite/eo_test_class_behaviour_errors.c b/src/tests/eo/suite/eo_test_class_behaviour_errors.c index 83628f69df..12c478f454 100644 --- a/src/tests/eo/suite/eo_test_class_behaviour_errors.c +++ b/src/tests/eo/suite/eo_test_class_behaviour_errors.c @@ -16,7 +16,7 @@ const Eo_Class *klass; static void _destructor_unref(Eo *obj, void *class_data EINA_UNUSED) { - eo_do_super(obj, klass, eo_destructor()); + eo_destructor(eo_super(obj, klass)); /* this triggers an eo stack overflow if not correctly protected */ eo_unref(obj); diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c index cb4cb72c98..1fe449a002 100644 --- a/src/tests/eo/suite/eo_test_class_simple.c +++ b/src/tests/eo/suite/eo_test_class_simple.c @@ -20,7 +20,7 @@ _a_set(Eo *obj EINA_UNUSED, void *class_data, int a) printf("%s %d\n", eo_class_name_get(MY_CLASS), a); pd->a = a; - eo_do(obj, eo_event_callback_call(EV_A_CHANGED, &pd->a)); + eo_event_callback_call(obj, EV_A_CHANGED, &pd->a); } static int @@ -67,7 +67,7 @@ _recursive(Eo *obj, void *class_data EINA_UNUSED, int n) if (count < n) { count++; - eo_do(obj, simple_recursive(n)); + simple_recursive(obj, n); } else count = 0; @@ -76,7 +76,7 @@ _recursive(Eo *obj, void *class_data EINA_UNUSED, int n) static void _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, Eo_Dbg_Info *root) { - eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); + eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, "Test list"); EO_DBG_INFO_APPEND(group, "Test", EINA_VALUE_TYPE_INT, 8); } diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c index 5add8d3d13..4dd7f75bd2 100644 --- a/src/tests/eo/suite/eo_test_general.c +++ b/src/tests/eo/suite/eo_test_general.c @@ -22,8 +22,8 @@ START_TEST(eo_simple) obj = eo_add(SIMPLE_CLASS, NULL); fail_if(!obj); - eo_do(obj, eo_constructor()); - eo_do(obj, eo_destructor()); + eo_constructor(obj); + eo_destructor(obj); eo_unref(obj); eo_shutdown(); @@ -36,7 +36,7 @@ START_TEST(eo_stack) Eo *obj = eo_add(SIMPLE_CLASS, NULL); fail_if(!obj); - eo_do(obj, simple_recursive(123)); + simple_recursive(obj, 123); eo_unref(obj); @@ -103,25 +103,25 @@ START_TEST(eo_signals) Eo *obj = eo_add(SIMPLE_CLASS, NULL); Eina_Bool r; - eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_ADD, _eo_signals_cb_added_deled, callbacks)); - eo_do(obj, r = eo_event_callback_add(EO_BASE_EVENT_CALLBACK_DEL, _eo_signals_cb_added_deled, callbacks)); + eo_event_callback_add(obj, EO_BASE_EVENT_CALLBACK_ADD, _eo_signals_cb_added_deled, callbacks); + r = eo_event_callback_add(obj, EO_BASE_EVENT_CALLBACK_DEL, _eo_signals_cb_added_deled, callbacks); fail_if(!r); - eo_do(obj, eo_event_callback_array_priority_add(callbacks, -100, (void *) 1)); - eo_do(obj, eo_event_callback_array_add(callbacks, (void *) 3)); - eo_do(obj, r = eo_event_callback_array_priority_add(callbacks, -50, (void *) 2)); + eo_event_callback_array_priority_add(obj, callbacks, -100, (void *) 1); + eo_event_callback_array_add(obj, callbacks, (void *) 3); + r = eo_event_callback_array_priority_add(obj, callbacks, -50, (void *) 2); fail_if(!r); - eo_do(obj, simple_a_set(1)); + simple_a_set(obj, 1); ck_assert_int_eq(_eo_signals_cb_flag, 0x3); - eo_do(obj, eo_event_callback_array_del(callbacks, (void *) 1)); - eo_do(obj, eo_event_callback_array_del(callbacks, (void *) 2)); - eo_do(obj, r = eo_event_callback_array_del(callbacks, (void *) 3)); + eo_event_callback_array_del(obj, callbacks, (void *) 1); + eo_event_callback_array_del(obj, callbacks, (void *) 2); + r = eo_event_callback_array_del(obj, callbacks, (void *) 3); fail_if(!r); /* Try to delete something that doesn't exist. */ - eo_do(obj, r = eo_event_callback_array_del(callbacks, (void *) 4)); + r = eo_event_callback_array_del(obj, callbacks, (void *) 4); fail_if(r); _eo_signals_cb_flag = 0; - eo_do(obj, simple_a_set(1)); + simple_a_set(obj, 1); ck_assert_int_eq(_eo_signals_cb_flag, 0x0); eo_unref(obj); @@ -140,21 +140,21 @@ START_TEST(eo_signals) /* Call Eo event with legacy and non-legacy callbacks. */ _eo_signals_cb_current = 0; - eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED2, -1000, _eo_signals_a_changed_never, (void *) 1)); - eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, -100, _eo_signals_a_changed_cb, (void *) 1)); - eo_do(obj, eo_event_callback_add(a_desc, _eo_signals_a_changed_cb2, NULL)); - eo_do(obj, simple_a_set(1)); + eo_event_callback_priority_add(obj, EV_A_CHANGED2, -1000, _eo_signals_a_changed_never, (void *) 1); + eo_event_callback_priority_add(obj, EV_A_CHANGED, -100, _eo_signals_a_changed_cb, (void *) 1); + eo_event_callback_add(obj, a_desc, _eo_signals_a_changed_cb2, NULL); + simple_a_set(obj, 1); ck_assert_int_eq(_eo_signals_cb_flag, 0x3); /* We don't need this one anymore. */ - eo_do(obj, r = eo_event_callback_del(EV_A_CHANGED2, _eo_signals_a_changed_never, (void *) 1)); + r = eo_event_callback_del(obj, EV_A_CHANGED2, _eo_signals_a_changed_never, (void *) 1); fail_if(!r); /* Call legacy event with legacy and non-legacy callbacks. */ int a = 3; _eo_signals_cb_current = 0; _eo_signals_cb_flag = 0; - eo_do(obj, eo_event_callback_call(a_desc, &a)); + eo_event_callback_call(obj, a_desc, &a); ck_assert_int_eq(_eo_signals_cb_flag, 0x3); } eo_unref(obj); @@ -292,9 +292,9 @@ START_TEST(eo_composite_tests) Eo *obj2 = eo_add(SIMPLE_CLASS, NULL); fail_if(!obj2); - eo_do(obj, eo_composite_attach(obj2)); - eo_do(obj2, eo_parent_set(NULL)); - fail_if(eo_do_ret(obj2, tmp, eo_composite_part_is())); + eo_composite_attach(obj, obj2); + eo_parent_set(obj2, NULL); + fail_if(eo_composite_part_is(obj2)); eo_unref(obj2); eo_unref(obj); @@ -312,13 +312,13 @@ _man_con(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED) { if (_man_should_con) eo_manual_free_set(obj, EINA_TRUE); - return eo_do_super_ret(obj, cur_klass, obj, eo_constructor()); + return eo_constructor(eo_super(obj, cur_klass)); } static void _man_des(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, cur_klass, eo_destructor()); + eo_destructor(eo_super(obj, cur_klass)); if (_man_should_des) eo_manual_free_set(obj, EINA_FALSE); } @@ -454,7 +454,7 @@ START_TEST(eo_refs) obj2 = eo_ref(eo_add(SIMPLE_CLASS, obj)); Eo *wref = NULL; - eo_do(obj2, eo_wref_add(&wref)); + eo_wref_add(obj2, &wref); fail_if(!wref); eo_unref(obj2); @@ -479,18 +479,18 @@ START_TEST(eo_refs) obj2 = eo_ref(eo_add(SIMPLE_CLASS, obj)); obj3 = eo_ref(eo_add(SIMPLE_CLASS, NULL)); - eo_do(obj2, eo_parent_set(obj3)); - eo_do(obj3, eo_parent_set(obj)); + eo_parent_set(obj2, obj3); + eo_parent_set(obj3, obj); ck_assert_int_eq(eo_ref_get(obj2), 2); ck_assert_int_eq(eo_ref_get(obj3), 2); - eo_do(obj2, eo_parent_set(NULL)); - eo_do(obj3, eo_parent_set(NULL)); + eo_parent_set(obj2, NULL); + eo_parent_set(obj3, NULL); ck_assert_int_eq(eo_ref_get(obj2), 1); ck_assert_int_eq(eo_ref_get(obj3), 1); - eo_do(obj2, eo_parent_set(obj)); - eo_do(obj3, eo_parent_set(obj)); + eo_parent_set(obj2, obj); + eo_parent_set(obj3, obj); ck_assert_int_eq(eo_ref_get(obj2), 1); ck_assert_int_eq(eo_ref_get(obj3), 1); @@ -522,14 +522,14 @@ START_TEST(eo_weak_reference) Eo *obj = eo_add(SIMPLE_CLASS, NULL); Eo *obj2 = eo_add(SIMPLE_CLASS, NULL); Eo *wref = NULL, *wref2 = NULL, *wref3 = NULL; - eo_do(obj, eo_wref_add(&wref)); + eo_wref_add(obj, &wref); fail_if(!wref); eo_unref(obj); fail_if(wref); obj = eo_add(SIMPLE_CLASS, NULL); - eo_do(obj, eo_wref_add(&wref)); + eo_wref_add(obj, &wref); eo_ref(obj); fail_if(!wref); @@ -542,35 +542,41 @@ START_TEST(eo_weak_reference) obj = eo_add(SIMPLE_CLASS, NULL); - eo_do(obj, eo_wref_add(&wref)); - eo_do(obj, eo_wref_del(&wref)); + eo_wref_add(obj, &wref); + eo_wref_del(obj, &wref); fail_if(wref); - eo_do(obj, eo_wref_add(&wref)); - eo_do(obj2, eo_wref_del(&wref)); + eo_wref_add(obj, &wref); + eo_wref_del(obj2, &wref); fail_if(!wref); eo_wref_del_safe(&wref); fail_if(wref); wref = obj; - eo_do(obj, eo_wref_del(&wref)); + eo_wref_del(obj, &wref); fail_if(wref); wref = wref2 = wref3 = NULL; - eo_do(obj, eo_wref_add(&wref), eo_wref_add(&wref2), eo_wref_add(&wref3)); + eo_wref_add(obj, &wref); + eo_wref_add(obj, &wref2); + eo_wref_add(obj, &wref3); fail_if(!wref); fail_if(!wref2); fail_if(!wref3); - eo_do(obj, eo_wref_del(&wref), eo_wref_del(&wref2), eo_wref_del(&wref3)); + eo_wref_del(obj, &wref); + eo_wref_del(obj, &wref2); + eo_wref_del(obj, &wref3); fail_if(wref); fail_if(wref2); fail_if(wref3); - eo_do(obj, eo_wref_add(&wref2), eo_wref_add(&wref3)); + eo_wref_add(obj, &wref2); + eo_wref_add(obj, &wref3); wref = obj; - eo_do(obj, eo_wref_del(&wref)); + eo_wref_del(obj, &wref); fail_if(wref); - eo_do(obj, eo_wref_del(&wref2), eo_wref_del(&wref3)); + eo_wref_del(obj, &wref2); + eo_wref_del(obj, &wref3); eo_unref(obj); eo_unref(obj2); @@ -586,30 +592,30 @@ START_TEST(eo_generic_data) Eo *obj = eo_add(SIMPLE_CLASS, NULL); void *data = NULL; - eo_do(obj, eo_key_data_set("test1", (void *) 1)); - eo_do(obj, data = eo_key_data_get("test1")); + eo_key_data_set(obj, "test1", (void *) 1); + data = eo_key_data_get(obj, "test1"); fail_if(1 != (intptr_t) data); - eo_do(obj, eo_key_data_del("test1")); - eo_do(obj, data = eo_key_data_get("test1")); + eo_key_data_del(obj, "test1"); + data = eo_key_data_get(obj, "test1"); fail_if(data); - eo_do(obj, eo_key_data_set("test1", (void *) 1)); - eo_do(obj, eo_key_data_set("test2", (void *) 2)); - eo_do(obj, data = eo_key_data_get("test1")); + eo_key_data_set(obj, "test1", (void *) 1); + eo_key_data_set(obj, "test2", (void *) 2); + data = eo_key_data_get(obj, "test1"); fail_if(1 != (intptr_t) data); - eo_do(obj, data = eo_key_data_get("test2")); + data = eo_key_data_get(obj, "test2"); fail_if(2 != (intptr_t) data); - eo_do(obj, data = eo_key_data_get("test2")); + data = eo_key_data_get(obj, "test2"); fail_if(2 != (intptr_t) data); - eo_do(obj, eo_key_data_del("test2")); - eo_do(obj, data = eo_key_data_get("test2")); + eo_key_data_del(obj, "test2"); + data = eo_key_data_get(obj, "test2"); fail_if(data); - eo_do(obj, data = eo_key_data_get("test1")); + data = eo_key_data_get(obj, "test1"); fail_if(1 != (intptr_t) data); - eo_do(obj, eo_key_data_del("test1")); - eo_do(obj, data = eo_key_data_get("test1")); + eo_key_data_del(obj, "test1"); + data = eo_key_data_get(obj, "test1"); fail_if(data); eo_unref(obj); @@ -643,21 +649,22 @@ START_TEST(eo_magic_checks) obj = eo_add(SIMPLE_CLASS, NULL); fail_if(!obj); - eo_do((Eo *) buf, simple_a_set(++i), a = simple_a_get()); + simple_a_set((Eo *) buf, ++i); + a = simple_a_get((Eo *) buf); ck_assert_int_ne(i, a); - eo_do_super((Eo *) buf, SIMPLE_CLASS, simple_a_set(++i)); - eo_do_super((Eo *) buf, SIMPLE_CLASS, a = simple_a_get()); + simple_a_set(eo_super((Eo *) buf, SIMPLE_CLASS), ++i); + a = simple_a_get(eo_super((Eo *) buf, SIMPLE_CLASS)); ck_assert_int_ne(i, a); - eo_do_super(obj, (const Eo_Class *) buf, simple_a_set(++i)); - eo_do_super(obj, (const Eo_Class *) buf, a = simple_a_get()); + simple_a_set(eo_super(obj, (const Eo_Class *) buf), ++i); + a = simple_a_get(eo_super(obj, (const Eo_Class *) buf)); ck_assert_int_ne(i, a); fail_if(eo_class_get((Eo *) buf)); fail_if(eo_class_name_get((Eo_Class*) buf)); fail_if(eo_class_get(obj) != SIMPLE_CLASS); fail_if(eo_class_get(SIMPLE_CLASS) != EO_ABSTRACT_CLASS_CLASS); - eo_do((Eo_Class *) buf, simple_a_set(1)); - eo_do_super((Eo_Class *) buf, SIMPLE_CLASS, simple_a_set(++i)); - eo_do_super(SIMPLE_CLASS, (Eo_Class *) buf, simple_a_set(++i)); + simple_a_set((Eo_Class *) buf, 1); + simple_a_set(eo_super((Eo_Class *) buf, SIMPLE_CLASS), ++i); + simple_a_set(eo_super(SIMPLE_CLASS, (Eo_Class *) buf), ++i); fail_if(eo_class_new(NULL, (Eo_Class *) buf), NULL); eo_xref(obj, (Eo *) buf); @@ -674,28 +681,27 @@ START_TEST(eo_magic_checks) fail_if(0 != eo_ref_get((Eo *) buf)); - eo_do((Eo *) buf, - eo_wref_add(&wref), - parent = eo_parent_get()); + eo_wref_add((Eo *) buf, &wref); + parent = eo_parent_get((Eo *) buf); fail_if(wref); fail_if(parent); fail_if(eo_data_scope_get((Eo *) buf, SIMPLE_CLASS)); - eo_do(obj, eo_composite_attach((Eo *) buf)); - eo_do(obj, eo_composite_detach((Eo *) buf)); - eo_do((Eo *) buf, eo_composite_part_is()); + eo_composite_attach(obj, (Eo *) buf); + eo_composite_detach(obj, (Eo *) buf); + eo_composite_part_is((Eo *) buf); - eo_do(obj, eo_event_callback_forwarder_add(NULL, (Eo *) buf)); - eo_do(obj, eo_event_callback_forwarder_del(NULL, (Eo *) buf)); + eo_event_callback_forwarder_add(obj, NULL, (Eo *) buf); + eo_event_callback_forwarder_del(obj, NULL, (Eo *) buf); eo_manual_free_set((Eo *) buf, EINA_TRUE); eo_manual_free((Eo *) buf); eo_destructed_is((Eo *) buf); obj2 = NULL; - eo_do(obj, eo_parent_set((Eo *) buf)); - eo_do(obj, obj2 = eo_parent_get()); + eo_parent_set(obj, (Eo *) buf); + obj2 = eo_parent_get(obj); fail_if(obj2 && (obj2 == (Eo *) buf)); eo_unref(obj); @@ -761,11 +767,15 @@ START_TEST(eo_multiple_do) Eina_Bool ca, cb, cc; ca = cb = cc = EINA_FALSE; - eo_do(obj, ca = simple_a_print(), cb = multi_a_print(), cc = multi_a_print()); + ca = simple_a_print(obj); + cb = multi_a_print(obj); + cc = multi_a_print(obj); fail_if(!(ca && cb && cc)); ca = cb = cc = EINA_FALSE; - eo_do(klass, ca = simple_class_hi_print(), cb = multi_class_hi_print(), cc = multi_class_hi_print()); + ca = simple_class_hi_print(klass); + cb = multi_class_hi_print(klass); + cc = multi_class_hi_print(klass); fail_if(!(ca && cb && cc)); eo_unref(obj); @@ -780,27 +790,27 @@ START_TEST(eo_add_do_and_custom) Eo *obj = NULL; eo_init(); - obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor()); + obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(eoid)); fail_if(!obj); eo_unref(obj); - obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(7)); + obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eoid, 7)); fail_if(!obj); pd = eo_data_scope_get(obj, SIMPLE_CLASS); fail_if(pd->a != 7); eo_unref(obj); - obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(), simple_a_set(7)); + obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(eoid), simple_a_set(eoid, 7)); fail_if(!obj); pd = eo_data_scope_get(obj, SIMPLE_CLASS); fail_if(pd->a != 7); eo_unref(obj); Eina_Bool finalized; - obj = eo_add(SIMPLE_CLASS, NULL, finalized = eo_finalized_get()); + obj = eo_add(SIMPLE_CLASS, NULL, finalized = eo_finalized_get(eoid)); fail_if(finalized); - eo_do(obj, finalized = eo_finalized_get()); + finalized = eo_finalized_get(obj); fail_if(!finalized); eo_unref(obj); @@ -940,7 +950,8 @@ START_TEST(eo_parts) Eo *obj = eo_add(SIMPLE_CLASS, NULL); - eo_do(obj, simple_a_set(3), a = simple_a_get()); + simple_a_set(obj, 3); + a = simple_a_get(obj); ck_assert_int_eq(a, 3); eo_do_part(obj, simple_part_get("test"), @@ -949,7 +960,8 @@ START_TEST(eo_parts) ); ck_assert_int_eq(a, 7); - eo_do(obj, simple_a_set(3), a = simple_a_get()); + simple_a_set(obj, 3); + a = simple_a_get(obj); ck_assert_int_eq(a, 3); /* Faking a call, just asserting NULL as the part to check default values. */ diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c index 82a0b98401..b25b00b672 100644 --- a/src/tests/eo/suite/eo_test_threaded_calls.c +++ b/src/tests/eo/suite/eo_test_threaded_calls.c @@ -94,9 +94,10 @@ _thread_job(void *data, Eina_Thread t EINA_UNUSED) fail_if(EINA_LOCK_SUCCEED != eina_spinlock_take(&locks[0])); } - obj = eo_add(THREAD_TEST_CLASS, NULL, thread_test_constructor(v)); + obj = eo_add(THREAD_TEST_CLASS, NULL, thread_test_constructor(eoid, v)); - eo_do(obj, thread_test_try_swap_stack(), v = thread_test_v_get()); + thread_test_try_swap_stack(obj); + v = thread_test_v_get(obj); fail_if(EINA_LOCK_SUCCEED != eina_spinlock_release(&locks[1])); diff --git a/src/tests/eo/suite/eo_test_value.c b/src/tests/eo/suite/eo_test_value.c index cbc7cd762e..6162389e16 100644 --- a/src/tests/eo/suite/eo_test_value.c +++ b/src/tests/eo/suite/eo_test_value.c @@ -20,7 +20,7 @@ START_TEST(eo_value) Eo *obj = eo_add(SIMPLE_CLASS, NULL); eo_dbg_info = EO_DBG_INFO_LIST_APPEND(NULL, "Root"); - eo_do(obj, eo_dbg_info_get(eo_dbg_info)); + eo_dbg_info_get(obj, eo_dbg_info); fail_if(!eo_dbg_info); ck_assert_str_eq(eo_dbg_info->name, "Root"); str = eina_value_to_string(&eo_dbg_info->value); diff --git a/src/tests/eolian/data/object_impl_add_ref.c b/src/tests/eolian/data/object_impl_add_ref.c index cd1fe29e86..8c45228ba9 100644 --- a/src/tests/eolian/data/object_impl_add_ref.c +++ b/src/tests/eolian/data/object_impl_add_ref.c @@ -16,7 +16,7 @@ _object_impl_base_constructor(Eo *obj, Object_Impl_Data *pd) EOLIAN static void _object_impl_base_destructor(Eo *obj, Object_Impl_Data *pd) { - eo_do_super(obj, OBJECT_IMPL_CLASS, base_destructor()); + base_destructor(eo_super(obj, OBJECT_IMPL_CLASS)); } diff --git a/src/tests/eolian/data/object_impl_ref.c b/src/tests/eolian/data/object_impl_ref.c index 7297c70f5a..709f68023b 100644 --- a/src/tests/eolian/data/object_impl_ref.c +++ b/src/tests/eolian/data/object_impl_ref.c @@ -16,7 +16,7 @@ _object_impl_base_constructor(Eo *obj, Object_Impl_Data *pd) EOLIAN static void _object_impl_base_destructor(Eo *obj, Object_Impl_Data *pd) { - eo_do_super(obj, OBJECT_IMPL_CLASS, base_destructor()); + base_destructor(eo_super(obj, OBJECT_IMPL_CLASS)); } diff --git a/src/tests/eolian_cxx/a.c b/src/tests/eolian_cxx/a.c index 067639f7de..76b0278589 100644 --- a/src/tests/eolian_cxx/a.c +++ b/src/tests/eolian_cxx/a.c @@ -16,7 +16,7 @@ typedef struct _A_Data A_Data; static Eo *_a_eo_base_constructor(Eo *obj EINA_UNUSED, A_Data *pd EINA_UNUSED) { - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } #include "a.eo.c" diff --git a/src/tests/eolian_cxx/b.c b/src/tests/eolian_cxx/b.c index 4efe49491b..ee25d77966 100644 --- a/src/tests/eolian_cxx/b.c +++ b/src/tests/eolian_cxx/b.c @@ -17,7 +17,7 @@ typedef struct _B_Data B_Data; static Eo *_b_eo_base_constructor(Eo *obj EINA_UNUSED, B_Data *pd EINA_UNUSED) { - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } #include "b.eo.c" diff --git a/src/tests/eolian_cxx/c.c b/src/tests/eolian_cxx/c.c index c95e2a364c..d9af17de12 100644 --- a/src/tests/eolian_cxx/c.c +++ b/src/tests/eolian_cxx/c.c @@ -17,7 +17,7 @@ typedef struct _C_Data C_Data; static Eo *_c_eo_base_constructor(Eo *obj EINA_UNUSED, C_Data *pd EINA_UNUSED) { - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } #include "c.eo.c" diff --git a/src/tests/eolian_cxx/callback.c b/src/tests/eolian_cxx/callback.c index c08af8915d..757c5a29c6 100644 --- a/src/tests/eolian_cxx/callback.c +++ b/src/tests/eolian_cxx/callback.c @@ -28,7 +28,7 @@ static Eina_Bool _callback_callback_added(void* data EINA_UNUSED, Eo_Event2 cons static Eo *_callback_eo_base_constructor(Eo *obj, Callback_Data *pd EINA_UNUSED) { pd->callbacks = 0; - obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + obj = eo_constructor(eo_super(obj, MY_CLASS)); eo_event_callback_priority_add(EO_BASE_EVENT_CALLBACK_ADD, EO_CALLBACK_PRIORITY_DEFAULT , &_callback_callback_added, pd); diff --git a/src/tests/eolian_cxx/d.c b/src/tests/eolian_cxx/d.c index e68a29ecc2..d3d219e5c4 100644 --- a/src/tests/eolian_cxx/d.c +++ b/src/tests/eolian_cxx/d.c @@ -19,7 +19,7 @@ typedef struct _D_Data D_Data; static Eo *_d_eo_base_constructor(Eo *obj EINA_UNUSED, D_Data *pd EINA_UNUSED) { - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } #include "d.eo.c" diff --git a/src/tests/eolian_cxx/generic.c b/src/tests/eolian_cxx/generic.c index 81edb672d0..b0a32f6741 100644 --- a/src/tests/eolian_cxx/generic.c +++ b/src/tests/eolian_cxx/generic.c @@ -28,7 +28,7 @@ static Eo *_generic_eo_base_constructor(Eo *obj, Generic_Data *pd) pd->opt_ctor_a_val = 0; pd->opt_ctor_b_cb = NULL; pd->opt_ctor_b_data = NULL; - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } static void _generic_required_ctor_a(Eo *obj EINA_UNUSED, Generic_Data *pd, int value) diff --git a/src/tests/eolian_cxx/simple.c b/src/tests/eolian_cxx/simple.c index 79d4d80c10..924dcc57bc 100644 --- a/src/tests/eolian_cxx/simple.c +++ b/src/tests/eolian_cxx/simple.c @@ -13,7 +13,7 @@ static Eo *_simple_eo_base_constructor(Eo *obj, void *pd EINA_UNUSED) { - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } static Eina_Bool _simple_simple_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED) diff --git a/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c b/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c index 1f454ebbf2..1740e61466 100644 --- a/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c +++ b/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c @@ -23,7 +23,7 @@ EOLIAN static Eo_Base * _constructor_method_class_eo_base_constructor(Eo* obj EINA_UNUSED, Constructor_Method_Class_Data *pd) { pd->fail = EINA_FALSE; - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } EOLIAN static void @@ -50,7 +50,7 @@ _constructor_method_class_eo_base_finalize(Eo *obj, Constructor_Method_Class_Dat if (pd->fail) return NULL; - return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); + return eo_finalize(eo_super(obj, MY_CLASS)); } EOLIAN static Eina_Bool @@ -132,7 +132,7 @@ _constructor_method_class_classoutmethod1(Eo* obj EINA_UNUSED, Constructor_Metho { fprintf(stderr, "classoutmethod1\n"); fflush(stderr); - return eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(one), constructor_method_class_constructor2(two)); + return eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(eoid, one), constructor_method_class_constructor2(eoid, two)); } EOLIAN static void @@ -140,7 +140,7 @@ _constructor_method_class_classoutmethod2(Eo* obj EINA_UNUSED, Constructor_Metho { fprintf(stderr, "classoutmethod2\n"); fflush(stderr); - *out_class = eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(one), constructor_method_class_constructor2(two)); + *out_class = eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(eoid, one), constructor_method_class_constructor2(eoid, two)); } diff --git a/src/tests/eolian_js/eolian_js_test_test_object_impl.c b/src/tests/eolian_js/eolian_js_test_test_object_impl.c index 6f35b7ecdd..89e9d4764f 100644 --- a/src/tests/eolian_js/eolian_js_test_test_object_impl.c +++ b/src/tests/eolian_js/eolian_js_test_test_object_impl.c @@ -29,7 +29,7 @@ _test_object_eo_base_constructor(Eo* obj, Test_Object_Data *pd) fprintf(stdout, "_test_object_eo_base_constructor\n"); pd->a = 0; - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } EOLIAN static Eo * @@ -37,14 +37,14 @@ _test_object_eo_base_finalize(Eo *obj, Test_Object_Data *pd EINA_UNUSED) { fprintf(stdout, "_test_object_eo_base_finalize\n"); - return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); + return eo_finalize(eo_super(obj, MY_CLASS)); } EOLIAN static void _test_object_eo_base_destructor(Eo* obj, Test_Object_Data *pd EINA_UNUSED) { fprintf(stdout, "_test_object_eo_base_destructor\n"); - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } @@ -175,9 +175,9 @@ _test_object_call_event(Eo* obj, Test_Object_Data *pd EINA_UNUSED) { fprintf(stderr, "_test_object_event_call()\n"); fflush(stderr); static Test_Struct_Ex s = {42, TEST_ENUM_EX_THIRD}; - eo_do(obj, eo_event_callback_call(TEST_OBJECT_EVENT_TEST, NULL)); - eo_do(obj, eo_event_callback_call(TEST_OBJECT_EVENT_TEST_STRUCTARG, &s)); - eo_do(obj, eo_event_callback_call(TEST_OBJECT_EVENT_TEST_STRINGARG, "foo")); + eo_event_callback_call(obj, TEST_OBJECT_EVENT_TEST, NULL); + eo_event_callback_call(obj, TEST_OBJECT_EVENT_TEST_STRUCTARG, &s); + eo_event_callback_call(obj, TEST_OBJECT_EVENT_TEST_STRINGARG, "foo"); } EOLIAN static char * diff --git a/src/tests/evas/evas_test_filters.c b/src/tests/evas/evas_test_filters.c index d4d39f85f5..5841fa2d81 100644 --- a/src/tests/evas/evas_test_filters.c +++ b/src/tests/evas/evas_test_filters.c @@ -297,7 +297,7 @@ START_TEST(evas_filter_text_padding_test) // Don't test proxy cases here. if (tc->source) continue; - eo_do(to, efl_gfx_filter_program_set(tc->code, "evas_test_filter")); + efl_gfx_filter_program_set(to, tc->code, "evas_test_filter"); evas_object_text_style_pad_get(to, &l, &r, &t, &b); evas_object_geometry_get(to, NULL, NULL, &W, &H); //fprintf(stderr, "Case %d: %dx%d for padding %d,%d,%d,%d\n", k, W, H, l, r, t, b); @@ -383,18 +383,16 @@ START_TEST(evas_filter_text_render_test) evas_object_move(o, -999, -9999); evas_object_resize(o, 10, 10); evas_object_show(o); - eo_do(to, - efl_gfx_color_set(255, 255, 255, 255), - efl_gfx_filter_source_set(tc->source, o), - efl_gfx_filter_program_set(tc->code, "evas_test_filter")); - eo_do(to, o2 = efl_gfx_filter_source_get(tc->source)); + efl_gfx_color_set(to, 255, 255, 255, 255); + efl_gfx_filter_source_set(to, tc->source, o); + efl_gfx_filter_program_set(to, tc->code, "evas_test_filter"); + o2 = efl_gfx_filter_source_get(to, tc->source); fail_if(o != o2); } else { - eo_do(to, - efl_gfx_color_set(255, 255, 255, 255), - efl_gfx_filter_program_set(tc->code, "evas_test_filter")); + efl_gfx_color_set(to, 255, 255, 255, 255); + efl_gfx_filter_program_set(to, tc->code, "evas_test_filter"); } evas_object_geometry_get(to, NULL, NULL, &w, &h); diff --git a/src/tests/evas/evas_test_mesh.c b/src/tests/evas/evas_test_mesh.c index d70ab3225a..40a2239000 100644 --- a/src/tests/evas/evas_test_mesh.c +++ b/src/tests/evas/evas_test_mesh.c @@ -49,19 +49,19 @@ fail_if(mesh == NULL); \ fail_if(mesh2 == NULL); \ snprintf(buffer, PATH_MAX, "%s%s", tmp, ext); \ - eo_do(mesh, set_ok = efl_file_set(file->path, NULL), \ - save_ok = efl_file_save(buffer, NULL, NULL)); \ + set_ok = efl_file_set(mesh, file->path, NULL); \ + save_ok = efl_file_save(mesh, buffer, NULL, NULL); \ fail_if(!set_ok); \ fail_if(!save_ok); \ - eo_do(mesh2, set_ok = efl_file_set(buffer, NULL)); \ + set_ok = efl_file_set(mesh2, buffer, NULL); \ fail_if(!set_ok); \ res = _compare_meshes(mesh, mesh2); \ fail_if(res == 1); \ - eo_do(mesh, set_ok = efl_file_mmap_set(eina_file_open(file->path, 0), NULL), \ - save_ok = efl_file_save(buffer, NULL, NULL)); \ + set_ok = efl_file_mmap_set(mesh, eina_file_open(file->path, 0), NULL); \ + save_ok = efl_file_save(mesh, buffer, NULL, NULL); \ fail_if(!set_ok); \ fail_if(!save_ok); \ - eo_do(mesh2, set_ok = efl_file_mmap_set(eina_file_open(buffer, 0), NULL)); \ + set_ok = efl_file_mmap_set(mesh2, eina_file_open(buffer, 0), NULL); \ fail_if(!set_ok); \ res = _compare_meshes(mesh, mesh2); \ fail_if(res == 1); \