enlightenment
/
efl
8
7
Fork 11
Code Issues 14 Pull Requests 4 Projects Releases Wiki Activity

edje: modify some embryo forces func names for

Browse Source 
consistency

Since embryo functions names are verb_subject, not subject_verb.
So forces_clear -> clear_forces ...



SVN revision: 80398
devs/devilhorns/wayland_egl
Bruno Dilly 11 years ago
parent 200ce279ab
commit bc9821c1ff
3 changed files with 19 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      legacy/edje/data/include/edje.inc
  2. 6
      legacy/edje/src/examples/physics_actions.edc
  3. 24
      legacy/edje/src/lib/edje_embryo.c

8
legacy/edje/data/include/edje.inc
Unescape View File

@ -230,7 +230,7 @@ native play_tone (tone_name[], Float:duration);
*
* physics_force(PART:"logo", 0, 240, 0);
* physics_torque(PART:"logo", 0, 0, 2.2);
* physics_forces_clear(PART:"logo");
* physics_clear_forces(PART:"logo");
*
* physics_set_velocity(PART:"logo", 40.5, 0, 0);
* physics_set_ang_velocity(PART:"logo", 0, 0, -3);
@ -240,10 +240,10 @@ native physics_impulse (part_id, Float:x, Float:y, Float:z);
native physics_torque_impulse (part_id, Float:x, Float:y, Float:z);
native physics_torque (part_id, Float:x, Float:y, Float:z);
native physics_torques_get (part_id, &Float:x, &Float:y, &Float:z);
native physics_get_torques (part_id, &Float:x, &Float:y, &Float:z);
native physics_force (part_id, Float:x, Float:y, Float:z);
native physics_forces_get (part_id, &Float:x, &Float:y, &Float:z);
native physics_forces_clear (part_id);
native physics_get_forces (part_id, &Float:x, &Float:y, &Float:z);
native physics_clear_forces (part_id);
native physics_set_velocity (part_id, Float:x, Float:y, Float:z);
native physics_get_velocity (part_id, &Float:x, &Float:y, &Float:z);

6
legacy/edje/src/examples/physics_actions.edc
Unescape View File

@ -115,7 +115,7 @@ collections {
getsarg(2, name, sizeof(name));
pid = get_part_id(name);
if (!pid) return;
physics_forces_clear(pid);
physics_clear_forces(pid);
}
else if ((id == ID_FORCES_GET) && (type == MSG_STRING)) {
new Float:x, Float:y, Float:z;
@ -123,7 +123,7 @@ collections {
getsarg(2, name, sizeof(name));
pid = get_part_id(name);
if (!pid) return;
physics_forces_get(pid, x, y, z);
physics_get_forces(pid, x, y, z);
send_message(MSG_FLOAT_SET, id, x, y, z);
}
else if ((id == ID_TORQUES_GET) && (type == MSG_STRING)) {
@ -132,7 +132,7 @@ collections {
getsarg(2, name, sizeof(name));
pid = get_part_id(name);
if (!pid) return;
physics_torques_get(pid, x, y, z);
physics_get_torques(pid, x, y, z);
send_message(MSG_FLOAT_SET, id, x, y, z);
}
else if ((id == ID_VEL_SET) && (type == MSG_FLOAT_SET)) {

24
legacy/edje/src/lib/edje_embryo.c
Unescape View File

@ -204,9 +204,9 @@
* physics_torque_impulse(part_id, Float:x, Float:y, Float:z)
* physics_force(part_id, Float:x, Float:y, Float:z)
* physics_torque(part_id, Float:x, Float:y, Float:z)
* physics_forces_clear(part_id)
* physics_forces_get(part_id, &Float:x, &Float:y, &Float:z)
* physics_torques_get(part_id, &Float:x, &Float:y, &Float:z)
* physics_clear_forces(part_id)
* physics_get_forces(part_id, &Float:x, &Float:y, &Float:z)
* physics_get_torques(part_id, &Float:x, &Float:y, &Float:z)
* physics_set_velocity(part_id, Float:x, Float:y, Float:z)
* physics_get_velocity(part_id, &Float:x, &Float:y, &Float:z)
* physics_set_ang_velocity(part_id, Float:x, Float:y, Float:z)
@ -3135,9 +3135,9 @@ _edje_embryo_fn_physics_torque(Embryo_Program *ep, Embryo_Cell *params)
ep, params, ephysics_body_torque_apply);
}
/* physics_forces_clear(part_id) */
/* physics_clear_forces(part_id) */
static Embryo_Cell
_edje_embryo_fn_physics_forces_clear(Embryo_Program *ep, Embryo_Cell *params)
_edje_embryo_fn_physics_clear_forces(Embryo_Program *ep, Embryo_Cell *params)
{
Edje_Real_Part *rp;
int part_id = 0;
@ -3156,17 +3156,17 @@ _edje_embryo_fn_physics_forces_clear(Embryo_Program *ep, Embryo_Cell *params)
return 0;
}
/* physics_forces_get(part_id, &Float:x, &Float:y, &Float:z) */
/* physics_get_forces(part_id, &Float:x, &Float:y, &Float:z) */
static Embryo_Cell
_edje_embryo_fn_physics_forces_get(Embryo_Program *ep, Embryo_Cell *params)
_edje_embryo_fn_physics_get_forces(Embryo_Program *ep, Embryo_Cell *params)
{
return _edje_embryo_fn_physics_components_get(
ep, params, ephysics_body_forces_get);
}
/* physics_torques_get(part_id, &Float:x, &Float:y, &Float:z) */
/* physics_get_torques(part_id, &Float:x, &Float:y, &Float:z) */
static Embryo_Cell
_edje_embryo_fn_physics_torques_get(Embryo_Program *ep, Embryo_Cell *params)
_edje_embryo_fn_physics_get_torques(Embryo_Program *ep, Embryo_Cell *params)
{
return _edje_embryo_fn_physics_components_get(
ep, params, ephysics_body_torques_get);
@ -3326,9 +3326,9 @@ _edje_embryo_script_init(Edje_Part_Collection *edc)
embryo_program_native_call_add(ep, "physics_torque_impulse", _edje_embryo_fn_physics_torque_impulse);
embryo_program_native_call_add(ep, "physics_force", _edje_embryo_fn_physics_force);
embryo_program_native_call_add(ep, "physics_torque", _edje_embryo_fn_physics_torque);
embryo_program_native_call_add(ep, "physics_forces_clear", _edje_embryo_fn_physics_forces_clear);
embryo_program_native_call_add(ep, "physics_forces_get", _edje_embryo_fn_physics_forces_get);
embryo_program_native_call_add(ep, "physics_torques_get", _edje_embryo_fn_physics_torques_get);
embryo_program_native_call_add(ep, "physics_clear_forces", _edje_embryo_fn_physics_clear_forces);
embryo_program_native_call_add(ep, "physics_get_forces", _edje_embryo_fn_physics_get_forces);
embryo_program_native_call_add(ep, "physics_get_torques", _edje_embryo_fn_physics_get_torques);
embryo_program_native_call_add(ep, "physics_set_velocity", _edje_embryo_fn_physics_set_velocity);
embryo_program_native_call_add(ep, "physics_get_velocity", _edje_embryo_fn_physics_get_velocity);
embryo_program_native_call_add(ep, "physics_set_ang_velocity", _edje_embryo_fn_physics_set_ang_velocity);

Write Preview
Loading…
Cancel
Save