summaryrefslogtreecommitdiff
path: root/src/bin/edje/edje_cc_handlers.c
diff options
context:
space:
mode:
authorOleksandr Shcherbina <o.shcherbina@samsung.com>2015-06-17 16:31:14 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-06-17 17:52:17 +0200
commitd409df1caa38ae7eac87f85ff4113484bc5b2099 (patch)
tree2adcbeadf2f4b2e7f4e7ba327a574c6620c23663 /src/bin/edje/edje_cc_handlers.c
parent9bf6f14a8a59195fe9be004aaff446c51474fc5d (diff)
evas: change interface evas_3d to evas_canvas3d
Summary: Regard to https://phab.enlightenment.org/T2479 it is need for right generation Eolian files Reviewers: cedric Subscribers: cedric, tasn Differential Revision: https://phab.enlightenment.org/D2711 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to '')
-rw-r--r--src/bin/edje/edje_cc_handlers.c98
1 files changed, 49 insertions, 49 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 48bdaafa8c..7b3efd4402 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -554,24 +554,24 @@ static void st_collections_group_nobroadcast(void);
554 Edje_Part_Description_##Type *ed; \ 554 Edje_Part_Description_##Type *ed; \
555 ed = (Edje_Part_Description_##Type*) current_desc; \ 555 ed = (Edje_Part_Description_##Type*) current_desc; \
556 \ 556 \
557 if (ed->type_node.orientation.type <= EVAS_3D_NODE_ORIENTATION_TYPE_LOOK_AT) \ 557 if (ed->type_node.orientation.type <= EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_AT) \
558 { \ 558 { \
559 ed->type_node.orientation.data[0] = FROM_DOUBLE(parse_float(0)); \ 559 ed->type_node.orientation.data[0] = FROM_DOUBLE(parse_float(0)); \
560 ed->type_node.orientation.data[1] = FROM_DOUBLE(parse_float(1)); \ 560 ed->type_node.orientation.data[1] = FROM_DOUBLE(parse_float(1)); \
561 ed->type_node.orientation.data[2] = FROM_DOUBLE(parse_float(2)); \ 561 ed->type_node.orientation.data[2] = FROM_DOUBLE(parse_float(2)); \
562 ed->type_node.orientation.type = EVAS_3D_NODE_ORIENTATION_TYPE_LOOK_AT; \ 562 ed->type_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_AT; \
563 } 563 }
564 564
565#define SET_LOOK2(Type, type_node) \ 565#define SET_LOOK2(Type, type_node) \
566 Edje_Part_Description_##Type *ed; \ 566 Edje_Part_Description_##Type *ed; \
567 ed = (Edje_Part_Description_##Type*) current_desc; \ 567 ed = (Edje_Part_Description_##Type*) current_desc; \
568 \ 568 \
569 if (ed->type_node.orientation.type <= EVAS_3D_NODE_ORIENTATION_TYPE_LOOK_AT) \ 569 if (ed->type_node.orientation.type <= EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_AT) \
570 { \ 570 { \
571 ed->type_node.orientation.data[3] = FROM_DOUBLE(parse_float(0)); \ 571 ed->type_node.orientation.data[3] = FROM_DOUBLE(parse_float(0)); \
572 ed->type_node.orientation.data[4] = FROM_DOUBLE(parse_float(1)); \ 572 ed->type_node.orientation.data[4] = FROM_DOUBLE(parse_float(1)); \
573 ed->type_node.orientation.data[5] = FROM_DOUBLE(parse_float(2)); \ 573 ed->type_node.orientation.data[5] = FROM_DOUBLE(parse_float(2)); \
574 ed->type_node.orientation.type = EVAS_3D_NODE_ORIENTATION_TYPE_LOOK_AT; \ 574 ed->type_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_AT; \
575 } 575 }
576 576
577#define SET_LOOK_TO(list, Type, type_node) \ 577#define SET_LOOK_TO(list, Type, type_node) \
@@ -580,38 +580,38 @@ static void st_collections_group_nobroadcast(void);
580 \ 580 \
581 ed = (Edje_Part_Description_##Type*) current_desc; \ 581 ed = (Edje_Part_Description_##Type*) current_desc; \
582 \ 582 \
583 if (ed->type_node.orientation.type <= EVAS_3D_NODE_ORIENTATION_TYPE_LOOK_TO) \ 583 if (ed->type_node.orientation.type <= EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_TO) \
584 { \ 584 { \
585 name = parse_str(0); \ 585 name = parse_str(0); \
586 data_queue_part_lookup(list, name, &(ed->type_node.orientation.look_to)); \ 586 data_queue_part_lookup(list, name, &(ed->type_node.orientation.look_to)); \
587 free(name); \ 587 free(name); \
588 ed->type_node.orientation.type = EVAS_3D_NODE_ORIENTATION_TYPE_LOOK_TO; \ 588 ed->type_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_TO; \
589 } 589 }
590 590
591#define SET_ANGLE_AXIS(Type, type_node) \ 591#define SET_ANGLE_AXIS(Type, type_node) \
592 Edje_Part_Description_##Type *ed; \ 592 Edje_Part_Description_##Type *ed; \
593 ed = (Edje_Part_Description_##Type*) current_desc; \ 593 ed = (Edje_Part_Description_##Type*) current_desc; \
594 \ 594 \
595 if (ed->type_node.orientation.type <= EVAS_3D_NODE_ORIENTATION_TYPE_ANGLE_AXIS) \ 595 if (ed->type_node.orientation.type <= EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_ANGLE_AXIS) \
596 { \ 596 { \
597 ed->type_node.orientation.data[0] = FROM_DOUBLE(parse_float(0)); \ 597 ed->type_node.orientation.data[0] = FROM_DOUBLE(parse_float(0)); \
598 ed->type_node.orientation.data[1] = FROM_DOUBLE(parse_float(1)); \ 598 ed->type_node.orientation.data[1] = FROM_DOUBLE(parse_float(1)); \
599 ed->type_node.orientation.data[2] = FROM_DOUBLE(parse_float(2)); \ 599 ed->type_node.orientation.data[2] = FROM_DOUBLE(parse_float(2)); \
600 ed->type_node.orientation.data[3] = FROM_DOUBLE(parse_float(3)); \ 600 ed->type_node.orientation.data[3] = FROM_DOUBLE(parse_float(3)); \
601 ed->type_node.orientation.type = EVAS_3D_NODE_ORIENTATION_TYPE_ANGLE_AXIS; \ 601 ed->type_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_ANGLE_AXIS; \
602 } 602 }
603 603
604#define SET_QUATERNION(Type, type_node) \ 604#define SET_QUATERNION(Type, type_node) \
605 Edje_Part_Description_##Type *ed; \ 605 Edje_Part_Description_##Type *ed; \
606 ed = (Edje_Part_Description_##Type*) current_desc; \ 606 ed = (Edje_Part_Description_##Type*) current_desc; \
607 \ 607 \
608 if (ed->type_node.orientation.type <= EVAS_3D_NODE_ORIENTATION_TYPE_QUATERNION) \ 608 if (ed->type_node.orientation.type <= EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_QUATERNION) \
609 { \ 609 { \
610 ed->type_node.orientation.data[1] = FROM_DOUBLE(parse_float(0)); \ 610 ed->type_node.orientation.data[1] = FROM_DOUBLE(parse_float(0)); \
611 ed->type_node.orientation.data[2] = FROM_DOUBLE(parse_float(1)); \ 611 ed->type_node.orientation.data[2] = FROM_DOUBLE(parse_float(1)); \
612 ed->type_node.orientation.data[3] = FROM_DOUBLE(parse_float(2)); \ 612 ed->type_node.orientation.data[3] = FROM_DOUBLE(parse_float(2)); \
613 ed->type_node.orientation.data[0] = FROM_DOUBLE(parse_float(3)); \ 613 ed->type_node.orientation.data[0] = FROM_DOUBLE(parse_float(3)); \
614 ed->type_node.orientation.type = EVAS_3D_NODE_ORIENTATION_TYPE_QUATERNION; \ 614 ed->type_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_QUATERNION; \
615 } 615 }
616 616
617New_Statement_Handler statement_handlers[] = 617New_Statement_Handler statement_handlers[] =
@@ -9484,9 +9484,9 @@ st_collections_group_parts_part_description_position_space(void)
9484 check_arg_count(1); 9484 check_arg_count(1);
9485 9485
9486 space = parse_enum(0, 9486 space = parse_enum(0,
9487 "LOCAL", EVAS_3D_SPACE_LOCAL, 9487 "LOCAL", EVAS_CANVAS3D_SPACE_LOCAL,
9488 "PARENT", EVAS_3D_SPACE_PARENT, 9488 "PARENT", EVAS_CANVAS3D_SPACE_PARENT,
9489 "WORLD", EVAS_3D_SPACE_WORLD, 9489 "WORLD", EVAS_CANVAS3D_SPACE_WORLD,
9490 NULL); 9490 NULL);
9491 9491
9492 switch (current_part->type) 9492 switch (current_part->type)
@@ -9778,11 +9778,11 @@ st_collections_group_parts_part_description_properties_material(void)
9778 check_arg_count(1); 9778 check_arg_count(1);
9779 9779
9780 material_attrib = parse_enum(0, 9780 material_attrib = parse_enum(0,
9781 "AMBIENT", EVAS_3D_MATERIAL_AMBIENT, 9781 "AMBIENT", EVAS_CANVAS3D_MATERIAL_AMBIENT,
9782 "DIFFUSE", EVAS_3D_MATERIAL_DIFFUSE, 9782 "DIFFUSE", EVAS_CANVAS3D_MATERIAL_DIFFUSE,
9783 "SPECULAR", EVAS_3D_MATERIAL_SPECULAR, 9783 "SPECULAR", EVAS_CANVAS3D_MATERIAL_SPECULAR,
9784 "EMISSION", EVAS_3D_MATERIAL_EMISSION, 9784 "EMISSION", EVAS_CANVAS3D_MATERIAL_EMISSION,
9785 "NORMAL", EVAS_3D_MATERIAL_NORMAL, 9785 "NORMAL", EVAS_CANVAS3D_MATERIAL_NORMAL,
9786 NULL); 9786 NULL);
9787 9787
9788 if (current_part->type == EDJE_PART_TYPE_MESH_NODE) 9788 if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
@@ -9888,12 +9888,12 @@ st_collections_group_parts_part_description_properties_shade(void)
9888 check_arg_count(1); 9888 check_arg_count(1);
9889 9889
9890 shade = parse_enum(0, 9890 shade = parse_enum(0,
9891 "VERTEX_COLOR", EVAS_3D_SHADE_MODE_VERTEX_COLOR, 9891 "VERTEX_COLOR", EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR,
9892 "PARENT", EVAS_3D_SHADE_MODE_DIFFUSE, 9892 "PARENT", EVAS_CANVAS3D_SHADE_MODE_DIFFUSE,
9893 "WORLD", EVAS_3D_SHADE_MODE_FLAT, 9893 "WORLD", EVAS_CANVAS3D_SHADE_MODE_FLAT,
9894 "PHONG", EVAS_3D_SHADE_MODE_PHONG, 9894 "PHONG", EVAS_CANVAS3D_SHADE_MODE_PHONG,
9895 "NORMAL_MAP", EVAS_3D_SHADE_MODE_NORMAL_MAP, 9895 "NORMAL_MAP", EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP,
9896 "RENDER", EVAS_3D_SHADE_MODE_SHADOW_MAP_RENDER, 9896 "RENDER", EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER,
9897 NULL); 9897 NULL);
9898 9898
9899 if (current_part->type == EDJE_PART_TYPE_MESH_NODE) 9899 if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
@@ -10256,9 +10256,9 @@ st_collections_group_parts_part_description_texture_wrap1(void)
10256 check_arg_count(1); 10256 check_arg_count(1);
10257 10257
10258 wrap1 = parse_enum(0, 10258 wrap1 = parse_enum(0,
10259 "CLAMP", EVAS_3D_WRAP_MODE_CLAMP, 10259 "CLAMP", EVAS_CANVAS3D_WRAP_MODE_CLAMP,
10260 "REPEAT", EVAS_3D_WRAP_MODE_REPEAT, 10260 "REPEAT", EVAS_CANVAS3D_WRAP_MODE_REPEAT,
10261 "REFLECT", EVAS_3D_WRAP_MODE_REFLECT, 10261 "REFLECT", EVAS_CANVAS3D_WRAP_MODE_REFLECT,
10262 NULL); 10262 NULL);
10263 10263
10264 if (current_part->type == EDJE_PART_TYPE_MESH_NODE) 10264 if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
@@ -10298,9 +10298,9 @@ st_collections_group_parts_part_description_texture_wrap2(void)
10298 check_arg_count(1); 10298 check_arg_count(1);
10299 10299
10300 wrap2 = parse_enum(0, 10300 wrap2 = parse_enum(0,
10301 "CLAMP", EVAS_3D_WRAP_MODE_CLAMP, 10301 "CLAMP", EVAS_CANVAS3D_WRAP_MODE_CLAMP,
10302 "REPEAT", EVAS_3D_WRAP_MODE_REPEAT, 10302 "REPEAT", EVAS_CANVAS3D_WRAP_MODE_REPEAT,
10303 "REFLECT", EVAS_3D_WRAP_MODE_REFLECT, 10303 "REFLECT", EVAS_CANVAS3D_WRAP_MODE_REFLECT,
10304 NULL); 10304 NULL);
10305 10305
10306 if (current_part->type == EDJE_PART_TYPE_MESH_NODE) 10306 if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
@@ -10342,12 +10342,12 @@ st_collections_group_parts_part_description_texture_filter1(void)
10342 check_arg_count(1); 10342 check_arg_count(1);
10343 10343
10344 filter1 = parse_enum(0, 10344 filter1 = parse_enum(0,
10345 "NEAREST", EVAS_3D_TEXTURE_FILTER_NEAREST, 10345 "NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,
10346 "LINEAR", EVAS_3D_TEXTURE_FILTER_LINEAR, 10346 "LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR,
10347 "NEAREST_NEAREST", EVAS_3D_TEXTURE_FILTER_NEAREST_MIPMAP_NEAREST, 10347 "NEAREST_NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST_MIPMAP_NEAREST,
10348 "LINEAR_NEAREST", EVAS_3D_TEXTURE_FILTER_LINEAR_MIPMAP_NEAREST, 10348 "LINEAR_NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR_MIPMAP_NEAREST,
10349 "NEAREST_LINEAR", EVAS_3D_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR, 10349 "NEAREST_LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR,
10350 "LINEAR_LINEAR", EVAS_3D_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR, 10350 "LINEAR_LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR,
10351 NULL); 10351 NULL);
10352 10352
10353 if (current_part->type == EDJE_PART_TYPE_MESH_NODE) 10353 if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
@@ -10389,12 +10389,12 @@ st_collections_group_parts_part_description_texture_filter2(void)
10389 check_arg_count(1); 10389 check_arg_count(1);
10390 10390
10391 filter2 = parse_enum(0, 10391 filter2 = parse_enum(0,
10392 "NEAREST", EVAS_3D_TEXTURE_FILTER_NEAREST, 10392 "NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,
10393 "LINEAR", EVAS_3D_TEXTURE_FILTER_LINEAR, 10393 "LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR,
10394 "NEAREST_NEAREST", EVAS_3D_TEXTURE_FILTER_NEAREST_MIPMAP_NEAREST, 10394 "NEAREST_NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST_MIPMAP_NEAREST,
10395 "LINEAR_NEAREST", EVAS_3D_TEXTURE_FILTER_LINEAR_MIPMAP_NEAREST, 10395 "LINEAR_NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR_MIPMAP_NEAREST,
10396 "NEAREST_LINEAR", EVAS_3D_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR, 10396 "NEAREST_LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR,
10397 "LINEAR_LINEAR", EVAS_3D_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR, 10397 "LINEAR_LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR,
10398 NULL); 10398 NULL);
10399 10399
10400 if (current_part->type == EDJE_PART_TYPE_MESH_NODE) 10400 if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
@@ -10438,13 +10438,13 @@ st_collections_group_parts_part_description_mesh_assembly(void)
10438 check_arg_count(1); 10438 check_arg_count(1);
10439 10439
10440 assembly = parse_enum(0, 10440 assembly = parse_enum(0,
10441 "POINTS", EVAS_3D_VERTEX_ASSEMBLY_POINTS, 10441 "POINTS", EVAS_CANVAS3D_VERTEX_ASSEMBLY_POINTS,
10442 "LINES", EVAS_3D_VERTEX_ASSEMBLY_LINES, 10442 "LINES", EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES,
10443 "LINE_STRIP", EVAS_3D_VERTEX_ASSEMBLY_LINE_STRIP, 10443 "LINE_STRIP", EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINE_STRIP,
10444 "LINE_LOOP", EVAS_3D_VERTEX_ASSEMBLY_LINE_LOOP, 10444 "LINE_LOOP", EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINE_LOOP,
10445 "TRIANGLES", EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES, 10445 "TRIANGLES", EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES,
10446 "TRIANGLE_STRIP", EVAS_3D_VERTEX_ASSEMBLY_TRIANGLE_STRIP, 10446 "TRIANGLE_STRIP", EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLE_STRIP,
10447 "TRIANGLE_FAN", EVAS_3D_VERTEX_ASSEMBLY_TRIANGLE_FAN, 10447 "TRIANGLE_FAN", EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLE_FAN,
10448 NULL); 10448 NULL);
10449 10449
10450 if (current_part->type == EDJE_PART_TYPE_MESH_NODE) 10450 if (current_part->type == EDJE_PART_TYPE_MESH_NODE)