aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas/canvas/evas_canvas3d_node.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/evas/canvas/evas_canvas3d_node.c')
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.c155
1 files changed, 78 insertions, 77 deletions
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c
index a484928318..b665f5756a 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -98,7 +98,7 @@ _evas_canvas3d_node_private_callback_collision(void *data, Eo *obj EINA_UNUSED,
{
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));
+ eo_do(target_node, ret = eo_event_callback_call(target_node, eo_desc, n));
}
return ret;
}
@@ -111,7 +111,7 @@ _evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, Eo *obj EIN
{
Eina_Bool ret = EINA_FALSE;
const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get("clicked");
- eo_do((Eo *)event_info, ret = eo_event_callback_call(eo_desc, event_info));
+ eo_do((Eo *)event_info, ret = eo_event_callback_call((Eo*)event_info, eo_desc, event_info));
return ret;
}
@@ -151,7 +151,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));
+ eo_do(s, evas_canvas3d_object_change(s, EVAS_CANVAS3D_STATE_SCENE_ROOT_NODE, (Evas_Canvas3D_Object *)fdata));
return EINA_TRUE;
}
@@ -160,7 +160,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));
+ eo_do(s, evas_canvas3d_object_change(s, EVAS_CANVAS3D_STATE_SCENE_CAMERA_NODE, (Evas_Canvas3D_Object *)fdata));
return EINA_TRUE;
}
@@ -188,7 +188,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));
+ eo_do(pd->parent, evas_canvas3d_object_change(pd->parent, EVAS_CANVAS3D_STATE_NODE_MEMBER, obj));
}
orientation = (state == EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION)
@@ -202,7 +202,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));
+ eo_do(n, evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, obj));
}
if (orientation && !(pd->billboard_target))
EINA_LIST_FOREACH(pd->members, l, n)
@@ -211,12 +211,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));
+ eo_do(n, 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));
+ eo_do(n, evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION, obj));
}
}
@@ -229,7 +229,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],
+ eo_do(obj, eo_event_callback_add(obj, &evas_canvas3d_node_private_event_desc[tcb],
evas_canvas3d_node_private_callback_functions[tcb], data));
}
@@ -243,7 +243,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],
+ eo_do(obj, eo_event_callback_del(obj, &evas_canvas3d_node_private_event_desc[tcb],
evas_canvas3d_node_private_callback_functions[tcb], NULL));
}
@@ -254,12 +254,12 @@ _node_transform_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
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)
{
@@ -385,14 +385,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());
+ eo_do(pd->data.camera.camera, 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());
+ eo_do(pd->data.light.light, evas_canvas3d_object_update(pd->data.light.light));
}
}
else if (pd->type == EVAS_CANVAS3D_NODE_TYPE_MESH)
@@ -401,7 +401,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());
+ eo_do(m, evas_canvas3d_object_update(m));
}
}
@@ -518,10 +518,10 @@ _pack_meshes_vertex_data(Evas_Canvas3D_Node *node, Evas_Vec3 **vertices, int *co
Evas_Real pos_weight;
*count = 0;
- eo_do(node, m = (Eina_List *)evas_canvas3d_node_mesh_list_get());
+ eo_do(node, 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));
+ eo_do(node, 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;
@@ -544,7 +544,7 @@ _pack_meshes_vertex_data(Evas_Canvas3D_Node *node, Evas_Vec3 **vertices, int *co
EINA_LIST_FOREACH(m, l, mesh)
{
- eo_do(node, frame = evas_canvas3d_node_mesh_frame_get(mesh));
+ eo_do(node, 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;
@@ -593,12 +593,12 @@ _update_node_shapes(Evas_Canvas3D_Node *node)
}
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_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_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));
if ( transform_orientation_dirty || transform_scale_dirty || mesh_geom_dirty)
{
@@ -641,15 +641,15 @@ _node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
const Eo_Event_Description *eo_desc = NULL;
eo_do(node,
- need_recalc = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION),
- need_recalc |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION),
- need_recalc |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION),
- need_recalc |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION),
- need_recalc |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE),
- need_recalc |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE),
- need_recalc |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY),
- need_recalc |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_MESH_FRAME),
- need_recalc |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_MEMBER));
+ need_recalc = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION),
+ need_recalc |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION),
+ need_recalc |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION),
+ need_recalc |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION),
+ need_recalc |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE),
+ need_recalc |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE),
+ need_recalc |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY),
+ need_recalc |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_MESH_FRAME),
+ need_recalc |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_MEMBER));
if (!need_recalc) return EINA_TRUE;
@@ -664,7 +664,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_do(node, eo_event_callback_call(node, eo_desc, (void *)node));
return EINA_TRUE;
}
@@ -720,7 +720,7 @@ _node_free(Evas_Canvas3D_Object *obj)
if (pd->parent)
{
- eo_do(pd->parent, evas_canvas3d_node_member_del(obj));
+ eo_do(pd->parent, evas_canvas3d_node_member_del(pd->parent, obj));
}
if (pd->type == EVAS_CANVAS3D_NODE_TYPE_MESH && pd->data.mesh.meshes)
@@ -1043,7 +1043,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());
+ eo_do (node, 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);
@@ -1082,7 +1082,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));
+ eo_do(mesh, evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT, 3 * sizeof(float), tangent_data));
free(tangent_data);
}
}
@@ -1113,15 +1113,15 @@ evas_canvas3d_node_color_node_mesh_collect(Evas_Canvas3D_Node *node, void *data)
if (pd->type == EVAS_CANVAS3D_NODE_TYPE_MESH)
{
eo_do(camera,
- visible = evas_canvas3d_camera_node_visible_get(scene_data->camera_node,
+ 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());
+ eo_do (node, 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 (eo_do_ret(mesh, tmp, evas_canvas3d_mesh_color_pick_enable_get(mesh)))
{
color = calloc(1, sizeof(Evas_Color));
@@ -1164,14 +1164,15 @@ 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(eo_obj, MY_CLASS, e, evas_canvas3d_node_constructor(NULL, 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));
+ eo_do(obj, evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_NODE));
evas_vec3_set(&pd->position, 0.0, 0.0, 0.0);
evas_vec4_set(&pd->orientation, 0.0, 0.0, 0.0, 1.0);
@@ -1207,7 +1208,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_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static Evas_Canvas3D_Node_Type
@@ -1235,7 +1236,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));
+ eo_do(pdmember->parent, evas_canvas3d_object_change(pdmember->parent, EVAS_CANVAS3D_STATE_NODE_MEMBER, NULL));
}
else
{
@@ -1248,10 +1249,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));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MEMBER, NULL));
+ eo_do(member, evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, NULL));
+ eo_do(member, evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION, NULL));
+ eo_do(member, evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, NULL));
}
EOLIAN static void
@@ -1269,10 +1270,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));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MEMBER, NULL));
+ eo_do(member, evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, NULL));
+ eo_do(member, evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION, NULL));
+ eo_do(member, evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, NULL));
/* Decrease reference count. */
eo_unref(member);
@@ -1297,7 +1298,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));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION, NULL));
}
EOLIAN static void
@@ -1308,7 +1309,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));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL));
}
EOLIAN static void
@@ -1327,7 +1328,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));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL));
}
EOLIAN static void
@@ -1337,7 +1338,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));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE, NULL));
}
EOLIAN static void
@@ -1358,7 +1359,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());
+ eo_do(obj, evas_canvas3d_object_update(obj));
if (x) *x = pd->position_world.x;
if (y) *y = pd->position_world.y;
@@ -1386,7 +1387,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());
+ eo_do(obj, evas_canvas3d_object_update(obj));
if (x) *x = pd->orientation_world.x;
if (y) *y = pd->orientation_world.y;
@@ -1414,7 +1415,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());
+ eo_do(obj, evas_canvas3d_object_update(obj));
if (x) *x = pd->scale_world.x;
if (y) *y = pd->scale_world.y;
@@ -1426,21 +1427,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));
+ eo_do(obj, 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));
+ eo_do(obj, 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));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE, NULL));
}
EOLIAN static Eina_Bool
@@ -1575,7 +1576,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));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL));
}
EOLIAN static void
@@ -1604,7 +1605,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));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_CAMERA, NULL));
}
EOLIAN static Evas_Canvas3D_Camera *
@@ -1639,7 +1640,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));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_LIGHT, NULL));
}
EOLIAN static Evas_Canvas3D_Light *
@@ -1686,8 +1687,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));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, NULL));
}
EOLIAN static void
@@ -1709,8 +1710,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));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, NULL));
}
EOLIAN static const Eina_List *
@@ -1737,7 +1738,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));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_FRAME, NULL));
}
EOLIAN static int
@@ -1763,7 +1764,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());
+ eo_do(obj, evas_canvas3d_object_update(obj));
if (x) *x = pd->aabb.p0.x;
if (y) *y = pd->aabb.p0.y;
if (z) *z = pd->aabb.p0.z;
@@ -1775,7 +1776,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());
+ eo_do(obj, evas_canvas3d_object_update(obj));
if (x) *x = pd->bsphere.center.x;
if (y) *y = pd->bsphere.center.y;
if (z) *z = pd->bsphere.center.z;
@@ -1789,7 +1790,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));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_PARENT_BILLBOARD, NULL));
}
}