summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_canvas3d_material.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/evas/canvas/evas_canvas3d_material.c')
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_material.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/evas/canvas/evas_canvas3d_material.c b/src/lib/evas/canvas/evas_canvas3d_material.c
index 8ce2486..5070d44 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,
8 void *data EINA_UNUSED, void *fdata) 8 void *data EINA_UNUSED, void *fdata)
9{ 9{
10 Evas_Canvas3D_Mesh *m = *(Evas_Canvas3D_Mesh **)key; 10 Evas_Canvas3D_Mesh *m = *(Evas_Canvas3D_Mesh **)key;
11 eo_do(m, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_MATERIAL, (Evas_Canvas3D_Object *)fdata)); 11 evas_canvas3d_object_change(m, EVAS_CANVAS3D_STATE_MESH_MATERIAL, (Evas_Canvas3D_Object *)fdata);
12 return EINA_TRUE; 12 return EINA_TRUE;
13} 13}
14 14
@@ -29,7 +29,7 @@ _evas_canvas3d_material_evas_canvas3d_object_update_notify(Eo *obj EINA_UNUSED,
29 { 29 {
30 if (pd->attribs[i].texture) 30 if (pd->attribs[i].texture)
31 { 31 {
32 eo_do(pd->attribs[i].texture, evas_canvas3d_object_update()); 32 evas_canvas3d_object_update(pd->attribs[i].texture);
33 } 33 }
34 } 34 }
35 } 35 }
@@ -91,8 +91,8 @@ evas_canvas3d_material_add(Evas *e)
91EOLIAN static Eo * 91EOLIAN static Eo *
92_evas_canvas3d_material_eo_base_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_Material_Data *pd) 92_evas_canvas3d_material_eo_base_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_Material_Data *pd)
93{ 93{
94 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 94 obj = eo_constructor(eo_super(obj, MY_CLASS));
95 eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_MATERIAL)); 95 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MATERIAL);
96 96
97 evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].color, 0.2, 0.2, 0.2, 1.0); 97 evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].color, 0.2, 0.2, 0.2, 1.0);
98 evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE].color, 0.8, 0.8, 0.8, 1.0); 98 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
136 evas_canvas3d_texture_material_del(pd->attribs[i].texture, obj); 136 evas_canvas3d_texture_material_del(pd->attribs[i].texture, obj);
137 } 137 }
138 } 138 }
139 eo_do_super(obj, MY_CLASS, eo_destructor()); 139 eo_destructor(eo_super(obj, MY_CLASS));
140} 140}
141 141
142EOLIAN static void 142EOLIAN static void
@@ -155,7 +155,7 @@ EOLIAN static void
155_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) 155_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)
156{ 156{
157 evas_color_set(&pd->attribs[attrib].color, r, g, b, a); 157 evas_color_set(&pd->attribs[attrib].color, r, g, b, a);
158 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MATERIAL_COLOR, NULL)); 158 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MATERIAL_COLOR, NULL);
159} 159}
160 160
161EOLIAN static void 161EOLIAN static void
@@ -195,7 +195,7 @@ _evas_canvas3d_material_texture_set(Eo *obj, Evas_Canvas3D_Material_Data *pd, Ev
195 eo_ref(texture); 195 eo_ref(texture);
196 } 196 }
197 197
198 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MATERIAL_TEXTURE, NULL)); 198 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MATERIAL_TEXTURE, NULL);
199} 199}
200 200
201EOLIAN static Evas_Canvas3D_Texture * 201EOLIAN static Evas_Canvas3D_Texture *