summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmytro Dadyka <d.dadyka@samsung.com>2015-03-03 11:28:56 +0900
committerChunEon Park <chuneon.park@samsung.com>2015-03-03 11:28:56 +0900
commit731e6f469c1d51e15e470524d10aed68a04d7547 (patch)
treeafa621fbaef4ead10023e5d3c9933bb5ef4a8239
parentfcd354aa848201f0f703e0c8e5ea0e9e6897025b (diff)
[Evas: Evas_3D] Fix mesh API.
Reviewers: cedric Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2075
-rw-r--r--src/lib/evas/canvas/evas_3d_mesh.c11
-rw-r--r--src/lib/evas/canvas/evas_3d_mesh.eo138
2 files changed, 76 insertions, 73 deletions
diff --git a/src/lib/evas/canvas/evas_3d_mesh.c b/src/lib/evas/canvas/evas_3d_mesh.c
index 27006f46a8..5e6253f7d3 100644
--- a/src/lib/evas/canvas/evas_3d_mesh.c
+++ b/src/lib/evas/canvas/evas_3d_mesh.c
@@ -286,7 +286,7 @@ _evas_3d_mesh_vertex_count_set(Eo *obj, Evas_3D_Mesh_Data *pd, unsigned int coun
286 eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_MESH_VERTEX_COUNT, NULL)); 286 eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_MESH_VERTEX_COUNT, NULL));
287} 287}
288 288
289EOLIAN static int 289EOLIAN static unsigned int
290_evas_3d_mesh_vertex_count_get(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd) 290_evas_3d_mesh_vertex_count_get(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd)
291{ 291{
292 return pd->vertex_count; 292 return pd->vertex_count;
@@ -970,13 +970,12 @@ _evas_3d_mesh_color_pick_enable_get(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd)
970{ 970{
971 return pd->color_pick_enabled; 971 return pd->color_pick_enabled;
972} 972}
973EOLIAN static Eina_Bool 973EOLIAN static void
974_evas_3d_mesh_color_pick_enable_set(Eo *obj, Evas_3D_Mesh_Data *pd, Eina_Bool _enabled) 974_evas_3d_mesh_color_pick_enable_set(Eo *obj, Evas_3D_Mesh_Data *pd, Eina_Bool enabled)
975{ 975{
976 if (pd->color_pick_enabled != _enabled) 976 if (pd->color_pick_enabled != enabled)
977 pd->color_pick_enabled = _enabled; 977 pd->color_pick_enabled = enabled;
978 eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_MESH_COLOR_PICK, NULL)); 978 eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_MESH_COLOR_PICK, NULL));
979 return EINA_TRUE;
980} 979}
981 980
982#include "canvas/evas_3d_mesh.eo.c" 981#include "canvas/evas_3d_mesh.eo.c"
diff --git a/src/lib/evas/canvas/evas_3d_mesh.eo b/src/lib/evas/canvas/evas_3d_mesh.eo
index a23654aa39..7965cd647d 100644
--- a/src/lib/evas/canvas/evas_3d_mesh.eo
+++ b/src/lib/evas/canvas/evas_3d_mesh.eo
@@ -261,34 +261,6 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface, Efl.File)
261 } 261 }
262 } 262 }
263 263
264 vertex_count_set {
265 /*@
266 Set the vertex count of the given mesh.
267
268 Each key frame should have same vertex count to be properly interpolated.
269 Key frames have their own vertex data and the data should have more vertices
270 than the mesh's vertex count.
271
272 Default vertex count is 0.
273
274 @ingroup Evas_3D_Mesh
275 */
276 params {
277 @in uint count; /*@ Vertex count.*/
278 }
279 }
280
281 vertex_count_get @const {
282 /*@
283 Get the vertex count of the given mesh.
284
285 @see evas_3d_mesh_vertex_count_set()
286
287 @ingroup Evas_3D_Mesh
288 */
289 return: int;
290 }
291
292 fog_color_set { 264 fog_color_set {
293 /* 265 /*
294 Set the fog color and density for the given mesh. 266 Set the fog color and density for the given mesh.
@@ -334,45 +306,6 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface, Efl.File)
334 @out Evas_3D_Blend_Func dfactor; /*@ Pointer to receive destination blendin factors key.*/ 306 @out Evas_3D_Blend_Func dfactor; /*@ Pointer to receive destination blendin factors key.*/
335 } 307 }
336 } 308 }
337 fog_enable_set {
338 /*
339 Enable or disable fog effect for given mesh.
340 @ingroup Evas_3D_Mesh
341 */
342 params {
343 @in bool enabled; /*@ The red component of the fog color.*/
344 }
345 }
346 fog_enable_get {
347 /*
348 Get fog effect status for the given mesh.
349 @ingroup Evas_3D_Mesh
350 */
351 return: bool;
352 params {
353 }
354 }
355 color_pick_enable_get @const {
356 /*
357 Get status of color picking of the mesh.
358
359 @ingroup Evas_3D_Mesh
360 */
361 return: bool;
362 params {
363 }
364 }
365 color_pick_enable_set {
366 /*
367 Set posibility color picking.
368
369 @ingroup Evas_3D_Mesh
370 */
371 return: bool;
372 params {
373 @in bool _enabled; /*@ Posibility flag */
374 }
375 }
376 } 309 }
377 properties { 310 properties {
378 shade_mode { 311 shade_mode {
@@ -398,6 +331,77 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface, Efl.File)
398 Evas_3D_Shade_Mode mode; /*@ The shade mode.*/ 331 Evas_3D_Shade_Mode mode; /*@ The shade mode.*/
399 } 332 }
400 } 333 }
334 color_pick_enable {
335 set {
336 /**
337 * Set posibility color picking.
338 *
339 * @ingroup Evas_3D_Mesh
340 */
341 }
342 get {
343 /**
344 * Get status of color picking of the mesh.
345 *
346 * @see color_pick_enable_set()
347 *
348 * @ingroup Evas_3D_Mesh
349 */
350 }
351 values {
352 Eina_Bool enabled; /*@ Posibility flag */
353 }
354 }
355 vertex_count {
356 set {
357 /**
358 * Set the vertex count of the given mesh.
359 *
360 * Each key frame should have same vertex count to be properly interpolated.
361 * Key frames have their own vertex data and the data should have more vertices
362 * than the mesh's vertex count.
363
364 * Default vertex count is 0.
365
366 * @ingroup Evas_3D_Mesh
367 */
368 }
369 get {
370 /**
371 * Get the vertex count of the given mesh.
372 *
373 * @see evas_3d_mesh_vertex_count_set()
374 *
375 * @ingroup Evas_3D_Mesh
376 */
377 }
378 values {
379 uint count; /*@ Vertex count.*/
380 }
381 }
382 fog_enable {
383 set {
384 /**
385 * Enable or disable fog effect for given mesh.
386 *
387 * Default fog is disabled.
388 *
389 * @ingroup Evas_3D_Mesh
390 */
391 }
392 get {
393 /**
394 * Get the enable status of fog effect for given mesh
395 *
396 * @see fog_enable_set()
397 *
398 * @ingroup Evas_3D_Mesh
399 */
400 }
401 values {
402 Eina_Bool enabled; /*@ Fog enabled status.*/
403 }
404 }
401 blending_enable { 405 blending_enable {
402 set { 406 set {
403 /** 407 /**