[EGIT] [tools/enventor] master 01/01: lib/edc_parser: add more candidate popup keywords
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=caeec62fdbda0fb1ed439e9b2ebd14910e01ea88 commit caeec62fdbda0fb1ed439e9b2ebd14910e01ea88 Author: ChunEon Park her...@hermet.pe.kr Date: Tue Dec 23 18:24:14 2014 +0900 lib/edc_parser: add more candidate popup keywords --- src/lib/edc_parser.c | 42 ++ 1 file changed, 42 insertions(+) diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c index 577ccac..71c12aa 100644 --- a/src/lib/edc_parser.c +++ b/src/lib/edc_parser.c @@ -483,6 +483,48 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED) attr.value.append_str = ATTR_APPEND_SEMICOLON; eina_inarray_push(td-attrs, attr); + Eina_Array *smooth = eina_array_new(1); + eina_array_push(smooth, eina_stringshare_add(Smooth:)); + + memset(attr, 0x00, sizeof(parser_attr)); + attr.keyword = eina_stringshare_add(smooth); + attr.value.strs = smooth; + attr.value.cnt = 1; + attr.value.min = 0; + attr.value.max = 1; + attr.value.type = ATTR_VALUE_BOOLEAN; + attr.value.prepend_str = ATTR_PREPEND_COLON; + attr.value.append_str = ATTR_APPEND_SEMICOLON; + eina_inarray_push(td-attrs, attr); + + Eina_Array *visible = eina_array_new(1); + eina_array_push(visible, eina_stringshare_add(Visibility:)); + + memset(attr, 0x00, sizeof(parser_attr)); + attr.keyword = eina_stringshare_add(visible); + attr.value.strs = visible; + attr.value.cnt = 1; + attr.value.min = 0; + attr.value.max = 1; + attr.value.type = ATTR_VALUE_BOOLEAN; + attr.value.prepend_str = ATTR_PREPEND_COLON; + attr.value.append_str = ATTR_APPEND_SEMICOLON; + eina_inarray_push(td-attrs, attr); + + Eina_Array *onoff = eina_array_new(1); + eina_array_push(onoff, eina_stringshare_add(Map:)); + + memset(attr, 0x00, sizeof(parser_attr)); + attr.keyword = eina_stringshare_add(on); + attr.value.strs = onoff; + attr.value.cnt = 1; + attr.value.min = 0; + attr.value.max = 1; + attr.value.type = ATTR_VALUE_BOOLEAN; + attr.value.prepend_str = ATTR_PREPEND_COLON; + attr.value.append_str = ATTR_APPEND_SEMICOLON; + eina_inarray_push(td-attrs, attr); + Eina_Array *xy = eina_array_new(2); eina_array_push(xy, eina_stringshare_add(X:)); eina_array_push(xy, eina_stringshare_add(Y:)); --
[EGIT] [tools/enventor] master 01/01: lib/liveview: clip the content if it's over the maximum view size.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=1cd13a93f9100bf16e705e340dd49127c660fc15
commit 1cd13a93f9100bf16e705e340dd49127c660fc15
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Dec 23 18:37:48 2014 +0900
lib/liveview: clip the content if it's over the maximum view size.
---
data/themes/default/layout_common.edc | 8
1 file changed, 8 insertions(+)
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index 8564cc1..f9d823d 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -1450,6 +1450,13 @@ group { name: live_edit_layout;
group { name: viewer_layout_bg;
parts {
+ part { name: clipper;
+ type: RECT;
+ description { state: default 0.0;
+rel1.to: bg;
+rel2.to: bg;
+ }
+ }
part { name: bg;
type: IMAGE;
description { state: default 0.0;
@@ -1464,6 +1471,7 @@ group { name: viewer_layout_bg;
}
part { name: elm.swallow.content;
type: SWALLOW;
+ clip_to: clipper;
description { state: default 0.0;
}
}
--
[E-devel] PATCH: duplicated XDG_DATA_DIRS fix
If you run: echo $XDG_DATA_DIRS | tr ':' '\n' | sort you will see that you have a duplicated one So I did this commit http://pastebin.com/9BUnzrHu which works on both e17 and master branches, where it fixes the problem, as we can see in https://www.enlightenment.org/ss/e-54998c1c35fdd0.34968942.jpg Lacking of time that somebody checks the commit before to do any push I ended to pushing it only to my own remote (everybody on christmas? yeah i should go too!) So... what do you think? I should push this commit? anything to change? Thanatermesis -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Windows issue with Eina_Thread type
So if I understood correctly, I should replace in src/lib/eina/eina_thread.h: typedef unsigned long int Eina_Thread; by : typedef uintptr_t Eina_Thread; like Nash suggested ? Regards, Michelle Le Grand - Mail original - De: Nicolas Aguirre aguirre.nico...@gmail.com À: Enlightenment developer list enlightenment-devel@lists.sourceforge.net Envoyé: Vendredi 19 Décembre 2014 09:03:49 Objet: Re: [E-devel] Windows issue with Eina_Thread type 2014-12-19 3:00 GMT+01:00 Carsten Haitzler ras...@rasterman.com: i'd go for the abi break. votes? +1 -- Nicolas Aguirre Mail: aguirre.nico...@gmail.com Web: http://www.calaos.fr Blog: http://dev.enlightenment.fr/~captainigloo/ -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [Video Bug Report] Opera / Chrome crash more often under Enlightenment DR19
happens under gnome shell too. as such chrome just stops running its mainloop - i don't know why it stops running it. lubuntu too. it happens all over the place. it may be that certain de's cause chrome to behave differently and thus exhibit this issue, but there isn't some bug for us to go hunting down - we have no idea. opera uses the same chrome blink web core as chrome - so issue is likely in the same code. it happens sometimes to me - but not so often. each time though chrome seems to just be stuck internally, when i looked. Hey guys! Guess what?! I disabled the Chromium option: [ ] Use system title bar and border And it is working for more than 24H without a single crash! Sorry about the buzz here on E-Dev list... Cheers! Thiago -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [Video Bug Report] Opera / Chrome crash more often under Enlightenment DR19
Damn it... It just crashed again... \o/ On 23 December 2014 at 15:45, Martinx - ジェームズ thiagocmarti...@gmail.com wrote: happens under gnome shell too. as such chrome just stops running its mainloop - i don't know why it stops running it. lubuntu too. it happens all over the place. it may be that certain de's cause chrome to behave differently and thus exhibit this issue, but there isn't some bug for us to go hunting down - we have no idea. opera uses the same chrome blink web core as chrome - so issue is likely in the same code. it happens sometimes to me - but not so often. each time though chrome seems to just be stuck internally, when i looked. Hey guys! Guess what?! I disabled the Chromium option: [ ] Use system title bar and border And it is working for more than 24H without a single crash! Sorry about the buzz here on E-Dev list... Cheers! Thiago -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 15/15: gitignore: don't track generated file.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=bb74ded8c8179237e5ddf86bc9058d5b4d226326 commit bb74ded8c8179237e5ddf86bc9058d5b4d226326 Author: Cedric BAIL ced...@osg.samsung.com Date: Tue Dec 23 22:37:23 2014 +0100 gitignore: don't track generated file. --- src/examples/evas/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/examples/evas/.gitignore b/src/examples/evas/.gitignore index b1477a9..e3bf5dc 100644 --- a/src/examples/evas/.gitignore +++ b/src/examples/evas/.gitignore @@ -35,4 +35,4 @@ /saved_Sonic_EET.eet /evas_3d_blending /evas_map_aa - \ No newline at end of file +/evas_3d_mmap --
[EGIT] [core/efl] master 11/15: evas: a _mmap version of the file_set is added.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=dd605257984478674d2a5d4946a870f167e2bf69
commit dd605257984478674d2a5d4946a870f167e2bf69
Author: Bogdan Devichev b.devic...@samsung.com
Date: Fri Dec 12 17:23:49 2014 +0200
evas: a _mmap version of the file_set is added.
---
src/examples/evas/evas-3d-mmap-set.c | 250 ++
src/examples/evas/sonic.eet | Bin 0 - 132670 bytes
src/lib/evas/canvas/evas_3d_mesh.c| 14 +-
src/lib/evas/canvas/evas_3d_mesh.eo | 15 ++
src/lib/evas/common/evas_model_load.c | 60 +---
src/lib/evas/include/evas_private.h | 3 +-
src/tests/evas/evas_test_mesh.c | 5 +
7 files changed, 329 insertions(+), 18 deletions(-)
diff --git a/src/examples/evas/evas-3d-mmap-set.c
b/src/examples/evas/evas-3d-mmap-set.c
new file mode 100644
index 000..b474e48
--- /dev/null
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -0,0 +1,250 @@
+/**
+* Simple Evas example illustrating import from mmap.
+*
+* Open files to Eina_Files.
+* Read meshes from Eina_Files.
+* Show the results.
+*
+* @verbatim
+* gcc -o evas-3d-mmap-set evas-3d-mmap-set.c `pkg-config --libs --cflags evas
ecore ecore-evas eina eo`
+* @endverbatim
+*/
+//TODO This example will be cool in nearest future
+
+#define EFL_EO_API_SUPPORT
+#define EFL_BETA_API_SUPPORT
+
+#include Eo.h
+#include Evas.h
+#include Ecore.h
+#include Ecore_Evas.h
+
+#define WIDTH 400
+#define HEIGHT 400
+
+Ecore_Evas *ecore_evas = NULL;
+Evas *evas = NULL;
+Eo *background = NULL;
+Eo *image = NULL;
+
+Eo *scene = NULL;
+Eo *root_node = NULL;
+Eo *camera_node = NULL;
+Eo *light_node = NULL;
+Eo *camera = NULL;
+Eo *mesh_node_obj = NULL;
+Eo *mesh_obj = NULL;
+Eo *mesh_node_ply = NULL;
+Eo *mesh_ply = NULL;
+Eo *mesh_node_eet = NULL;
+Eo *mesh_eet = NULL;
+Eo *mesh_node_md2 = NULL;
+Eo *mesh_md2 = NULL;
+Eo *material = NULL;
+Eo *light = NULL;
+
+static float angle = 0;
+
+static Eina_Bool
+_animate_scene(void *data)
+{
+ angle += 0.5;
+
+ eo_do((Evas_3D_Node *)data, evas_3d_node_orientation_angle_axis_set(angle,
1.0, 1.0, 1.0));
+
+ /* Rotate */
+ if (angle 360.0) angle -= 360.0f;
+
+ return EINA_TRUE;
+}
+
+static void
+_on_delete(Ecore_Evas *ee EINA_UNUSED)
+{
+ ecore_main_loop_quit();
+}
+
+static void
+_on_canvas_resize(Ecore_Evas *ee)
+{
+ int w, h;
+
+ ecore_evas_geometry_get(ee, NULL, NULL, w, h);
+ eo_do(background, evas_obj_size_set(w, h));
+ eo_do(image, evas_obj_size_set(w, h));
+}
+
+int
+main(void)
+{
+ //Unless Evas 3D supports Software renderer, we set gl backened forcely.
+ setenv(ECORE_EVAS_ENGINE, opengl_x11, 1);
+
+ if (!ecore_evas_init()) return 0;
+
+ ecore_evas = ecore_evas_new(NULL, 10, 10, WIDTH, HEIGHT, NULL);
+
+ if (!ecore_evas) return 0;
+
+ Eina_File *obj_file;
+ Eina_File *ply_file;
+ Eina_File *eet_file;
+ Eina_File *md2_file;
+
+ obj_file = eina_file_open(man_mesh.obj, 0);
+ ply_file = eina_file_open(ply_files/Normal_UVs_Colors.ply, 0);
+ eet_file = eina_file_open(sonic.eet, 0);
+ md2_file = eina_file_open(sonic.md2, 0);
+
+ ecore_evas_callback_delete_request_set(ecore_evas, _on_delete);
+ ecore_evas_callback_resize_set(ecore_evas, _on_canvas_resize);
+ ecore_evas_show(ecore_evas);
+
+ evas = ecore_evas_get(ecore_evas);
+
+ /* Add a scene object .*/
+ scene = eo_add(EVAS_3D_SCENE_CLASS, evas);
+
+ /* Add the root node for the scene. */
+ root_node = eo_add(EVAS_3D_NODE_CLASS, evas,
+ evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
+
+ /* Add the camera. */
+ camera = eo_add(EVAS_3D_CAMERA_CLASS, evas);
+ eo_do(camera,
+ evas_3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0));
+
+ camera_node =
+ eo_add(EVAS_3D_NODE_CLASS, evas,
+evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA));
+ eo_do(camera_node,
+ evas_3d_node_camera_set(camera));
+ eo_do(root_node,
+ evas_3d_node_member_add(camera_node));
+ eo_do(camera_node,
+ evas_3d_node_position_set(100.0, 0.0, 20.0),
+ evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 20.0,
+ EVAS_3D_SPACE_PARENT, 0.0, 0.0, 1.0));
+ /* Add the light. */
+ light = eo_add(EVAS_3D_LIGHT_CLASS, evas);
+ eo_do(light,
+ evas_3d_light_ambient_set(1.0, 1.0, 1.0, 1.0),
+ evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
+ evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0),
+ evas_3d_light_directional_set(EINA_TRUE));
+
+ light_node =
+ eo_add(EVAS_3D_NODE_CLASS, evas,
+evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT));
+ eo_do(light_node,
+ evas_3d_node_light_set(light),
+ evas_3d_node_position_set(1000.0, 0.0, 1000.0),
+ evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0,
+ EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0));
+ eo_do(root_node,
+
[EGIT] [core/efl] master 09/15: evas: entry points to modules is Eina_File. Model_Common_Loader is deleted.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=61aab62be0e17fd58405debbc0f6befae66e64c8
commit 61aab62be0e17fd58405debbc0f6befae66e64c8
Author: Bogdan Devichev b.devic...@samsung.com
Date: Wed Dec 10 18:31:20 2014 +0200
evas: entry points to modules is Eina_File. Model_Common_Loader is deleted.
---
src/lib/evas/common/evas_model_load.c | 69 +-
src/lib/evas/include/evas_private.h| 16 ++---
.../evas/model_loaders/eet/evas_model_load_eet.c | 4 +-
.../evas/model_loaders/md2/evas_model_load_md2.c | 33 +++
.../evas/model_loaders/obj/evas_model_load_obj.c | 28 ++---
.../evas/model_loaders/ply/evas_model_load_ply.c | 22 +--
6 files changed, 82 insertions(+), 90 deletions(-)
diff --git a/src/lib/evas/common/evas_model_load.c
b/src/lib/evas/common/evas_model_load.c
index 4ccb30c..0598d31 100644
--- a/src/lib/evas/common/evas_model_load.c
+++ b/src/lib/evas/common/evas_model_load.c
@@ -7,68 +7,28 @@
#include evas_common_private.h
#include evas_private.h
-static inline void
-_model_common_loader_fini(Model_Common_Loader *loader)
-{
- if (loader-map)
- {
-eina_file_map_free(loader-file, loader-map);
-loader-map = NULL;
- }
-
- if (loader-file)
- {
-eina_file_close(loader-file);
-loader-file = NULL;
- }
-}
-
-static inline Eina_Bool
-_model_common_loader_init(Model_Common_Loader *loader, const char *file)
-{
- Eina_File *tmp_file = eina_file_open(file, 0);
- memset(loader, 0x00, sizeof(Model_Common_Loader));
-
- /* Open given file. */
- loader-file = eina_file_dup(tmp_file);
-
- if (loader-file == NULL)
- {
-ERR(Failed to open file %s\n, file);
-goto error;
- }
-
- /* Map the file. */
- loader-map = eina_file_map_all(loader-file, EINA_FILE_SEQUENTIAL);
-
- if (loader-map == NULL)
- {
-ERR(Failed to create map from file %s\n, file);
-goto error;
- }
-
- eina_file_close(tmp_file);
- return EINA_TRUE;
-
-error:
- eina_file_close(tmp_file);
- _model_common_loader_fini(loader);
- return EINA_FALSE;
-}
-
void
evas_common_load_model_to_file(Evas_3D_Mesh *model, const char *file)
{
char *p;
char *loader_type = NULL;
- Model_Common_Loader *loader = malloc(sizeof(Model_Common_Loader));
- if (!_model_common_loader_init(loader, file))
+ Eina_File *tmp_file = eina_file_open(file, 0);
+ Eina_File *e_file = eina_file_dup(tmp_file);
+
+ if (e_file == NULL)
{
+ERR(Failed to open file %s\n, file);
+eina_file_close(tmp_file);
+eina_file_close(e_file);
+e_file = NULL;
+file = NULL;
ERR(Failed to initialize loader.);
return;
}
+ eina_file_close(tmp_file);
+
p = strrchr(file, '.');
if (p)
{
@@ -76,7 +36,7 @@ evas_common_load_model_to_file(Evas_3D_Mesh *model, const
char *file)
#define CHECK_EXTENTION_BY_FILE_NAME(extention)\
if (!strcasecmp(p, #extention))\
{\
- evas_model_load_file_##extention(model, loader); \
+ evas_model_load_file_##extention(model, e_file); \
loader_type = #extention; \
}
CHECK_EXTENTION_BY_FILE_NAME(eet)
@@ -87,7 +47,6 @@ evas_common_load_model_to_file(Evas_3D_Mesh *model, const
char *file)
}
if (!loader_type) ERR(Invalid mesh file type.);
- _model_common_loader_fini(loader);
- free(loader);
+ eina_file_close(e_file);
+ e_file = NULL;
}
-
diff --git a/src/lib/evas/include/evas_private.h
b/src/lib/evas/include/evas_private.h
index 729f647..a0b0f54 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -158,14 +158,6 @@ struct _Evas_3D_File_Eet
Evas_3D_Header_Eet *header;
};//contain mesh data and information about mesh size
-typedef struct _Model_Common_Loader Model_Common_Loader;
-
-struct _Model_Common_Loader
-{
- Eina_File *file;
- char *map;
-};
-
typedef Eina_Bool (*Evas_3D_Node_Func)(Evas_3D_Node *, void *data);
@@ -1657,10 +1649,10 @@ void _evas_3d_eet_file_free(void);
/* Temporary save/load functions */
void evas_common_load_model_to_file(Evas_3D_Mesh *model, const char *file);
void evas_common_save_model_to_file(Evas_3D_Mesh *model, const char *file,
Evas_3D_Mesh_Frame *f);
-void evas_model_load_file_eet(Evas_3D_Mesh *mesh, Model_Common_Loader *loader);
-void evas_model_load_file_md2(Evas_3D_Mesh *mesh, Model_Common_Loader *loader);
-void evas_model_load_file_obj(Evas_3D_Mesh *mesh, Model_Common_Loader *loader);
-void evas_model_load_file_ply(Evas_3D_Mesh *mesh, Model_Common_Loader *loader);
+void evas_model_load_file_eet(Evas_3D_Mesh *mesh, Eina_File *file);
+void evas_model_load_file_md2(Evas_3D_Mesh *mesh, Eina_File *file);
+void
[EGIT] [core/efl] master 10/15: evas: the eet loader use eet_mmap that take an Eina_File instead of eet_open.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=243df1aaba09a05ef65b8666d0a54c6b8f1cd6a2 commit 243df1aaba09a05ef65b8666d0a54c6b8f1cd6a2 Author: Bogdan Devichev b.devic...@samsung.com Date: Thu Dec 11 15:06:44 2014 +0200 evas: the eet loader use eet_mmap that take an Eina_File instead of eet_open. --- src/modules/evas/model_loaders/eet/evas_model_load_eet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c index b393787..815b9f1 100644 --- a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c +++ b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c @@ -109,7 +109,7 @@ evas_model_load_file_eet(Evas_3D_Mesh *mesh, Eina_File *file) Eet_File *ef; _evas_3d_eet_file_init(); - ef = eet_open(eina_file_filename_get(file), EET_FILE_MODE_READ); + ef = eet_mmap(file); eet_file = eet_data_read(ef, _file_descriptor, EVAS_3D_FILE_CACHE_FILE_ENTRY); --
[EGIT] [core/efl] master 13/15: evas: make Evas 3d mesh is inherited from Efl.File (functions file_set and save)
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c471665ac84b159d3cd4587380fae6ac78c33c3b commit c471665ac84b159d3cd4587380fae6ac78c33c3b Author: Bogdan Devichev b.devic...@samsung.com Date: Mon Dec 22 16:16:19 2014 +0200 evas: make Evas 3d mesh is inherited from Efl.File (functions file_set and save) --- src/examples/evas/evas-3d-aabb.c| 4 ++-- src/examples/evas/evas-3d-eet.c | 9 src/examples/evas/evas-3d-frustum.c | 2 +- src/examples/evas/evas-3d-md2.c | 2 +- src/examples/evas/evas-3d-obj.c | 6 ++--- src/examples/evas/evas-3d-ply.c | 18 --- src/examples/evas/evas-3d-shadows.c | 4 ++-- src/examples/evas/shooter/evas-3d-shooter.c | 11 -- src/lib/evas/canvas/evas_3d_mesh.c | 23 +++ src/lib/evas/canvas/evas_3d_mesh.eo | 34 +++-- src/tests/evas/evas_test_mesh.c | 10 - 11 files changed, 49 insertions(+), 74 deletions(-) diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c index 6210fa2..7fd8d98 100644 --- a/src/examples/evas/evas-3d-aabb.c +++ b/src/examples/evas/evas-3d-aabb.c @@ -3,7 +3,7 @@ * @see _mesh_aabb(Evas_3D_Mesh **mesh_b, const Evas_3D_Node *node); * Rotate axises (keys 1-4) for model and bounding box view from another angle. - * Compile with gcc -o evas-3d-aabb evas-3d-aabb.c `pkg-config --libs --cflags evas ecore ecore-evas eo` + * Compile with gcc -o evas-3d-aabb evas-3d-aabb.c `pkg-config --libs --cflags efl evas ecore ecore-evas eo` */ #define EFL_EO_API_SUPPORT @@ -227,7 +227,7 @@ main(void) material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); eo_do(mesh, - evas_3d_mesh_file_set(sonic.md2, NULL), + efl_file_set(sonic.md2, NULL), evas_3d_mesh_frame_material_set(0, material), evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c index 96ab16b..b9c11e4 100644 --- a/src/examples/evas/evas-3d-eet.c +++ b/src/examples/evas/evas-3d-eet.c @@ -9,7 +9,7 @@ * Show it in right side. * * @verbatim -* gcc -o evas-3d-eet evas-3d-eet.c `pkg-config --libs --cflags eina evas ecore ecore-evas eo` +* gcc -o evas-3d-eet evas-3d-eet.c `pkg-config --libs --cflags efl eina evas ecore ecore-evas eo` * @endverbatim */ @@ -151,7 +151,7 @@ main(void) material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); eo_do(mesh, - evas_3d_mesh_file_set(sonic.md2, NULL), + efl_file_set(sonic.md2, NULL), evas_3d_mesh_frame_material_set(0, material), evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); @@ -168,11 +168,10 @@ main(void) 0.50, 0.00, 0.50, 0.30), evas_3d_material_shininess_set(50.0)); - eo_do(mesh, - evas_3d_mesh_save(saved_Sonic_EET.eet, NULL)); + eo_do(mesh, efl_file_save(saved_Sonic_EET.eet, NULL, NULL)); eo_do(mesh2, - evas_3d_mesh_file_set(saved_Sonic_EET.eet, NULL), + efl_file_set(saved_Sonic_EET.eet, NULL), evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c index c231957..3443e26 100644 --- a/src/examples/evas/evas-3d-frustum.c +++ b/src/examples/evas/evas-3d-frustum.c @@ -525,7 +525,7 @@ _mesh_setup_model(Scene_Data *data) evas_3d_material_shininess_set(100.0)); eo_do(data-mesh_model, - evas_3d_mesh_file_set(eagle.md2, NULL), + efl_file_set(eagle.md2, NULL), evas_3d_mesh_frame_material_set(0, data-material_model), evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_DIFFUSE)); } diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c index 4b53c2e..b22c76e 100644 --- a/src/examples/evas/evas-3d-md2.c +++ b/src/examples/evas/evas-3d-md2.c @@ -120,7 +120,7 @@ main(void) material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); eo_do(mesh, - evas_3d_mesh_file_set(sonic.md2, NULL), + efl_file_set(sonic.md2, NULL), evas_3d_mesh_frame_material_set(0, material), evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c index d19a36d..ed6778a 100644 --- a/src/examples/evas/evas-3d-obj.c +++ b/src/examples/evas/evas-3d-obj.c @@ -7,7 +7,7 @@ * and geometry to saved_man.obj. * * @verbatim -* gcc -o evas-3d-obj evas-3d-obj.c `pkg-config --libs --cflags evas ecore ecore-evas` +* gcc -o evas-3d-obj evas-3d-obj.c `pkg-config --libs --cflags efl evas ecore ecore-evas eo` * @endverbatim */ @@ -134,7 +134,7 @@ main(void) material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); eo_do(mesh, - evas_3d_mesh_file_set(man_mesh.obj,
[EGIT] [core/efl] master 07/15: evas: ply_loader and obj_loader work with Eina_File.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e024f861e1aa3ffd74ea6a79ce480242930471dd
commit e024f861e1aa3ffd74ea6a79ce480242930471dd
Author: Bogdan Devichev b.devic...@samsung.com
Date: Wed Dec 3 12:24:03 2014 +0200
evas: ply_loader and obj_loader work with Eina_File.
---
.../evas/model_loaders/obj/evas_model_load_obj.c | 99 +++---
.../evas/model_loaders/ply/evas_model_load_ply.c | 98 ++---
2 files changed, 134 insertions(+), 63 deletions(-)
diff --git a/src/modules/evas/model_loaders/obj/evas_model_load_obj.c
b/src/modules/evas/model_loaders/obj/evas_model_load_obj.c
index 3697746..359d299 100644
--- a/src/modules/evas/model_loaders/obj/evas_model_load_obj.c
+++ b/src/modules/evas/model_loaders/obj/evas_model_load_obj.c
@@ -7,6 +7,7 @@
#include evas_common_private.h
#include evas_private.h
+//TODO Increase of stability (reading .obj file saved with any flags).
/* set value to position [x][y] to array name which have. */
#define ARRAY_2D(name, x, y, count_y) (*(name + x * count_y + y))
@@ -37,29 +38,56 @@ struct _OBJ_Counts
Eina_Bool existence_of_tex_point;
};
-static inline char*
-_file_to_buf(const char *file, long *length)//prepare text file for reading
+typedef struct _OBJ_Loader
{
- FILE *file_for_print;
- char *buf;
- int unused __attribute__((unused));//this variable fixes warning ignoring
return value of fread
-
- *length = 0;
- file_for_print = fopen(file, rb);
- if (!file_for_print) return NULL;
- fseek(file_for_print, 0, SEEK_END);//set file_for_print to the end of file
- *length = ftell(file_for_print);//set current position of file_for_print
- if (*length 0)
+ Eina_File *file;
+ char *map;
+} OBJ_Loader;
+
+static inline void
+_obj_loader_fini(OBJ_Loader *loader)
+{
+ if (loader-map)
+ {
+eina_file_map_free(loader-file, loader-map);
+loader-map = NULL;
+ }
+
+ if (loader-file)
{
-fclose(file_for_print);
-return NULL;
+eina_file_close(loader-file);
+loader-file = NULL;
}
- buf = malloc(*length + 1);
- fseek(file_for_print, 0, SEEK_SET);//set file_for_print to the begining of
file
- unused = fread(buf, *length, 1, file_for_print);
- fclose(file_for_print);
- buf[*length] = '\0';
- return buf;
+}
+
+static inline Eina_Bool
+_obj_loader_init(OBJ_Loader *loader, const char *file)
+{
+ memset(loader, 0x00, sizeof(OBJ_Loader));
+
+ /* Open given file. */
+ loader-file = eina_file_open(file, 0);
+
+ if (loader-file == NULL)
+ {
+ERR(Failed to open file %s\n, file);
+goto error;
+ }
+
+ /* Map the file. */
+ loader-map = eina_file_map_all(loader-file, EINA_FILE_SEQUENTIAL);
+
+ if (loader-map == NULL)
+ {
+ERR(Failed to create map from file %s\n, file);
+goto error;
+ }
+
+ return EINA_TRUE;
+
+error:
+ _obj_loader_fini(loader);
+ return EINA_FALSE;
}
/* create new counter */
@@ -107,11 +135,11 @@ _analyze_face_line(char * face_analyzer,
}
static inline OBJ_Counts
-_count_elements(char *start, long length)//count elements of mesh in .obj
+_count_elements(OBJ_Loader loader)//count elements of mesh in .obj
{
OBJ_Counts counts = _new_count_elements();
- char * current = start;
+ char * current = loader.map;
int polygon_checker = -2;//polygons with n vertices can be represented as
n-2 triangles
Eina_Bool will_check_next_char = EINA_FALSE;
Eina_Bool first_char_is_v = EINA_FALSE;
@@ -120,7 +148,7 @@ _count_elements(char *start, long length)//count elements
of mesh in .obj
long i = 0;
/* count elements of mesh in .obj */
- for (; length i; i++)
+ for (; *current != '\00'; i++)
{
if (will_check_next_char)
{
@@ -204,9 +232,9 @@ _count_elements(char *start, long length)//count elements
of mesh in .obj
void
evas_model_load_file_obj(Evas_3D_Mesh *mesh, const char *file)
{
- long length, i;
- char * start = _file_to_buf(file, length);
- OBJ_Counts counts = _count_elements(start, length);//count elements of mesh
in .obj
+ long i;
+ OBJ_Counts counts;//count elements of mesh in .obj
+ OBJ_Loader loader;
Eina_Bool will_check_next_char = EINA_FALSE;
Eina_Bool first_char_is_v = EINA_FALSE;
Eina_Bool first_char_is_f = EINA_FALSE;
@@ -215,17 +243,26 @@ evas_model_load_file_obj(Evas_3D_Mesh *mesh, const char
*file)
int j, k;
char * current;
+ /* Initialize PLY loader */
+ if (!_obj_loader_init(loader, file))
+ {
+ERR(Failed to initialize PLY loader.);
+return;
+ }
+
+ counts = _count_elements(loader);
+
float *_vertices_obj = malloc(counts._vertex_counter * 3 * sizeof(float));
float *_normales_obj = malloc(counts._normal_counter * 3 * sizeof(float));
float *_tex_coords_obj = malloc(counts._texture_point_counter * 3 *
sizeof(float));
/* triangle has 3 points, every point has
[EGIT] [core/efl] master 02/15: evas: dummies for model_saver_loader are created.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8c09ad1b81b0139b6c97444b232950bd2a0df5e6 commit 8c09ad1b81b0139b6c97444b232950bd2a0df5e6 Author: Bogdan Devichev b.devic...@samsung.com Date: Thu Dec 4 16:34:38 2014 +0200 evas: dummies for model_saver_loader are created. --- src/modules/evas/model_loaders/eet/evas_model_load_eet.c | 1 + src/modules/evas/model_loaders/md2/evas_model_load_md2.c | 1 + src/modules/evas/model_loaders/obj/evas_model_load_obj.c | 1 + src/modules/evas/model_loaders/ply/evas_model_load_ply.c | 1 + src/modules/evas/model_savers/eet/evas_model_save_eet.c | 1 + src/modules/evas/model_savers/obj/evas_model_save_obj.c | 1 + src/modules/evas/model_savers/ply/evas_model_save_ply.c | 1 + 7 files changed, 7 insertions(+) diff --git a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c new file mode 100644 index 000..8940b65 --- /dev/null +++ b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c @@ -0,0 +1 @@ +//dummy of saver/loader diff --git a/src/modules/evas/model_loaders/md2/evas_model_load_md2.c b/src/modules/evas/model_loaders/md2/evas_model_load_md2.c new file mode 100644 index 000..8940b65 --- /dev/null +++ b/src/modules/evas/model_loaders/md2/evas_model_load_md2.c @@ -0,0 +1 @@ +//dummy of saver/loader diff --git a/src/modules/evas/model_loaders/obj/evas_model_load_obj.c b/src/modules/evas/model_loaders/obj/evas_model_load_obj.c new file mode 100644 index 000..8940b65 --- /dev/null +++ b/src/modules/evas/model_loaders/obj/evas_model_load_obj.c @@ -0,0 +1 @@ +//dummy of saver/loader diff --git a/src/modules/evas/model_loaders/ply/evas_model_load_ply.c b/src/modules/evas/model_loaders/ply/evas_model_load_ply.c new file mode 100644 index 000..8940b65 --- /dev/null +++ b/src/modules/evas/model_loaders/ply/evas_model_load_ply.c @@ -0,0 +1 @@ +//dummy of saver/loader diff --git a/src/modules/evas/model_savers/eet/evas_model_save_eet.c b/src/modules/evas/model_savers/eet/evas_model_save_eet.c new file mode 100644 index 000..8940b65 --- /dev/null +++ b/src/modules/evas/model_savers/eet/evas_model_save_eet.c @@ -0,0 +1 @@ +//dummy of saver/loader diff --git a/src/modules/evas/model_savers/obj/evas_model_save_obj.c b/src/modules/evas/model_savers/obj/evas_model_save_obj.c new file mode 100644 index 000..8940b65 --- /dev/null +++ b/src/modules/evas/model_savers/obj/evas_model_save_obj.c @@ -0,0 +1 @@ +//dummy of saver/loader diff --git a/src/modules/evas/model_savers/ply/evas_model_save_ply.c b/src/modules/evas/model_savers/ply/evas_model_save_ply.c new file mode 100644 index 000..8940b65 --- /dev/null +++ b/src/modules/evas/model_savers/ply/evas_model_save_ply.c @@ -0,0 +1 @@ +//dummy of saver/loader --
[EGIT] [core/efl] master 03/15: evas: replace and rename savers/loaders.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9b7e22f5a5a2ee734264265267e2186cbebce65c
commit 9b7e22f5a5a2ee734264265267e2186cbebce65c
Author: Bogdan Devichev b.devic...@samsung.com
Date: Thu Nov 27 13:27:01 2014 +0200
evas: replace and rename savers/loaders.
---
src/Makefile_Evas.am | 21 +-
src/lib/evas/canvas/evas_3d_mesh_loader_eet.c | 131 --
src/lib/evas/canvas/evas_3d_mesh_loader_md2.c | 446
src/lib/evas/canvas/evas_3d_mesh_loader_obj.c | 401 --
src/lib/evas/canvas/evas_3d_mesh_loader_ply.c | 401 --
src/lib/evas/canvas/evas_3d_mesh_saver_eet.c | 197 -
src/lib/evas/canvas/evas_3d_mesh_saver_obj.c | 137 ---
src/lib/evas/canvas/evas_3d_mesh_saver_ply.c | 61 ---
.../evas/model_loaders/eet/evas_model_load_eet.c | 132 +-
.../evas/model_loaders/md2/evas_model_load_md2.c | 447 -
.../evas/model_loaders/obj/evas_model_load_obj.c | 402 +-
.../evas/model_loaders/ply/evas_model_load_ply.c | 402 +-
.../evas/model_savers/eet/evas_model_save_eet.c| 198 -
.../evas/model_savers/obj/evas_model_save_obj.c| 138 ++-
.../evas/model_savers/ply/evas_model_save_ply.c| 62 ++-
15 files changed, 1786 insertions(+), 1790 deletions(-)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index b40ce7d..57bdc67 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -188,15 +188,18 @@ lib/evas/canvas/evas_3d_camera.c \
lib/evas/canvas/evas_3d_light.c \
lib/evas/canvas/evas_3d_mesh.c \
lib/evas/canvas/evas_3d_texture.c \
-lib/evas/canvas/evas_3d_material.c \
-lib/evas/canvas/evas_3d_mesh_loader_md2.c \
-lib/evas/canvas/evas_3d_mesh_loader_obj.c \
-lib/evas/canvas/evas_3d_mesh_saver_obj.c \
-lib/evas/canvas/evas_3d_mesh_loader_eet.c \
-lib/evas/canvas/evas_3d_mesh_saver_eet.c \
-lib/evas/canvas/evas_3d_eet.c \
-lib/evas/canvas/evas_3d_mesh_loader_ply.c \
-lib/evas/canvas/evas_3d_mesh_saver_ply.c
+lib/evas/canvas/evas_3d_material.c
+
+# Model savers/loaders (will be replaced to modules in next commits)
+lib_evas_libevas_la_SOURCES += \
+modules/evas/model_loaders/eet/evas_model_load_eet.c \
+modules/evas/model_loaders/md2/evas_model_load_md2.c \
+modules/evas/model_loaders/obj/evas_model_load_obj.c \
+modules/evas/model_loaders/ply/evas_model_load_ply.c \
+modules/evas/model_savers/eet/evas_model_save_eet.c \
+modules/evas/model_savers/obj/evas_model_save_obj.c \
+modules/evas/model_savers/ply/evas_model_save_ply.c \
+lib/evas/canvas/evas_3d_eet.c
# Engine
lib_evas_libevas_la_SOURCES += \
diff --git a/src/lib/evas/canvas/evas_3d_mesh_loader_eet.c
b/src/lib/evas/canvas/evas_3d_mesh_loader_eet.c
deleted file mode 100644
index 26c3569..000
--- a/src/lib/evas/canvas/evas_3d_mesh_loader_eet.c
+++ /dev/null
@@ -1,131 +0,0 @@
-#ifdef HAVE_CONFIG_H
- #include config.h
-#endif
-
-#include Eo.h
-#include stdio.h
-#include evas_common_private.h
-#include evas_private.h
-
-extern Evas_3D_File_Eet* eet_file;
-extern const char EVAS_3D_FILE_CACHE_FILE_ENTRY[];
-extern Eet_Data_Descriptor *_file_descriptor;
-
-void
-_set_geometry_to_mesh_from_eet_file(Evas_3D_Mesh *mesh,
-Evas_3D_Mesh_Eet *eet_mesh)
-{
- float *pos, *nor, *tex;
- int stride_pos, stride_nor, stride_tex, j;
-
- eo_do(mesh,
- evas_3d_mesh_vertex_count_set(eet_mesh-geometries-vertices_count),
- evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES),
- evas_3d_mesh_frame_add(0),
-
- evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_POSITION,
0, NULL),
- evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_NORMAL,
0, NULL),
- evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_TEXCOORD,
0, NULL),
-
- pos = (float *)evas_3d_mesh_frame_vertex_data_map(0,
EVAS_3D_VERTEX_POSITION),
- nor = (float *)evas_3d_mesh_frame_vertex_data_map(0,
EVAS_3D_VERTEX_NORMAL),
- tex = (float *)evas_3d_mesh_frame_vertex_data_map(0,
EVAS_3D_VERTEX_TEXCOORD),
-
- stride_pos = evas_3d_mesh_frame_vertex_stride_get(0,
EVAS_3D_VERTEX_POSITION),
- stride_nor = evas_3d_mesh_frame_vertex_stride_get(0,
EVAS_3D_VERTEX_NORMAL),
- stride_tex = evas_3d_mesh_frame_vertex_stride_get(0,
EVAS_3D_VERTEX_TEXCOORD));
-
- if (stride_pos == 0) stride_pos = sizeof(float) * 3;
- if (stride_nor == 0) stride_nor = sizeof(float) * 3;
- if (stride_tex == 0) stride_tex = sizeof(float) * 2;
-
-/* set data to vertex buffer */
- for (j = 0; j eet_mesh-geometries-vertices_count; j++)
- {
-float *p, *n, *t;
-
-p = (float *)((char *)pos + stride_pos * j);
-n = (float *)((char *)nor + stride_nor * j);
-t = (float *)((char *)tex + stride_tex * j);
-
-p[0] =
[EGIT] [core/efl] master 08/15: evas: entry points to modules is new struct with Eina_file, not const char *file.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=17baa3fa6f87227fdba4caaea5e5c2a39257f5bb
commit 17baa3fa6f87227fdba4caaea5e5c2a39257f5bb
Author: Bogdan Devichev b.devic...@samsung.com
Date: Tue Dec 9 17:25:01 2014 +0200
evas: entry points to modules is new struct with Eina_file, not const char
*file.
---
src/lib/evas/common/evas_model_load.c | 67 +--
src/lib/evas/include/evas_private.h| 17 +++--
.../evas/model_loaders/eet/evas_model_load_eet.c | 5 +-
.../evas/model_loaders/md2/evas_model_load_md2.c | 77 +++---
.../evas/model_loaders/obj/evas_model_load_obj.c | 73 ++--
.../evas/model_loaders/ply/evas_model_load_ply.c | 70 ++--
6 files changed, 111 insertions(+), 198 deletions(-)
diff --git a/src/lib/evas/common/evas_model_load.c
b/src/lib/evas/common/evas_model_load.c
index 7350377..4ccb30c 100644
--- a/src/lib/evas/common/evas_model_load.c
+++ b/src/lib/evas/common/evas_model_load.c
@@ -7,12 +7,67 @@
#include evas_common_private.h
#include evas_private.h
+static inline void
+_model_common_loader_fini(Model_Common_Loader *loader)
+{
+ if (loader-map)
+ {
+eina_file_map_free(loader-file, loader-map);
+loader-map = NULL;
+ }
+
+ if (loader-file)
+ {
+eina_file_close(loader-file);
+loader-file = NULL;
+ }
+}
+
+static inline Eina_Bool
+_model_common_loader_init(Model_Common_Loader *loader, const char *file)
+{
+ Eina_File *tmp_file = eina_file_open(file, 0);
+ memset(loader, 0x00, sizeof(Model_Common_Loader));
+
+ /* Open given file. */
+ loader-file = eina_file_dup(tmp_file);
+
+ if (loader-file == NULL)
+ {
+ERR(Failed to open file %s\n, file);
+goto error;
+ }
+
+ /* Map the file. */
+ loader-map = eina_file_map_all(loader-file, EINA_FILE_SEQUENTIAL);
+
+ if (loader-map == NULL)
+ {
+ERR(Failed to create map from file %s\n, file);
+goto error;
+ }
+
+ eina_file_close(tmp_file);
+ return EINA_TRUE;
+
+error:
+ eina_file_close(tmp_file);
+ _model_common_loader_fini(loader);
+ return EINA_FALSE;
+}
void
evas_common_load_model_to_file(Evas_3D_Mesh *model, const char *file)
{
char *p;
- char *loader = NULL;
+ char *loader_type = NULL;
+ Model_Common_Loader *loader = malloc(sizeof(Model_Common_Loader));
+
+ if (!_model_common_loader_init(loader, file))
+ {
+ERR(Failed to initialize loader.);
+return;
+ }
p = strrchr(file, '.');
if (p)
@@ -21,8 +76,8 @@ evas_common_load_model_to_file(Evas_3D_Mesh *model, const
char *file)
#define CHECK_EXTENTION_BY_FILE_NAME(extention)\
if (!strcasecmp(p, #extention))\
{\
- evas_model_load_file_##extention(model, file);\
- loader = #extention; \
+ evas_model_load_file_##extention(model, loader); \
+ loader_type = #extention; \
}
CHECK_EXTENTION_BY_FILE_NAME(eet)
CHECK_EXTENTION_BY_FILE_NAME(md2)
@@ -30,5 +85,9 @@ evas_common_load_model_to_file(Evas_3D_Mesh *model, const
char *file)
CHECK_EXTENTION_BY_FILE_NAME(ply)
#undef CHECK_EXTENTION_BY_FILE_NAME
}
- if (!loader) ERR(Invalid mesh file type.);
+ if (!loader_type) ERR(Invalid mesh file type.);
+
+ _model_common_loader_fini(loader);
+ free(loader);
}
+
diff --git a/src/lib/evas/include/evas_private.h
b/src/lib/evas/include/evas_private.h
index b8bec02..729f647 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -158,6 +158,14 @@ struct _Evas_3D_File_Eet
Evas_3D_Header_Eet *header;
};//contain mesh data and information about mesh size
+typedef struct _Model_Common_Loader Model_Common_Loader;
+
+struct _Model_Common_Loader
+{
+ Eina_File *file;
+ char *map;
+};
+
typedef Eina_Bool (*Evas_3D_Node_Func)(Evas_3D_Node *, void *data);
@@ -1649,10 +1657,10 @@ void _evas_3d_eet_file_free(void);
/* Temporary save/load functions */
void evas_common_load_model_to_file(Evas_3D_Mesh *model, const char *file);
void evas_common_save_model_to_file(Evas_3D_Mesh *model, const char *file,
Evas_3D_Mesh_Frame *f);
-void evas_model_load_file_eet(Evas_3D_Mesh *mesh, const char *file);
-void evas_model_load_file_md2(Evas_3D_Mesh *mesh, const char *file);
-void evas_model_load_file_obj(Evas_3D_Mesh *mesh, const char *file);
-void evas_model_load_file_ply(Evas_3D_Mesh *mesh, const char *file);
+void evas_model_load_file_eet(Evas_3D_Mesh *mesh, Model_Common_Loader *loader);
+void evas_model_load_file_md2(Evas_3D_Mesh *mesh, Model_Common_Loader *loader);
+void evas_model_load_file_obj(Evas_3D_Mesh *mesh, Model_Common_Loader *loader);
+void
[EGIT] [core/efl] master 05/15: evas: Evas_3D_Mesh_File_Type sank into oblivion. Changing entry point to model_save_load. Changing API in examples.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=aaddf1a963c7e3b8aef18c4f366c8e9f8bf43e66 commit aaddf1a963c7e3b8aef18c4f366c8e9f8bf43e66 Author: Bogdan Devichev b.devic...@samsung.com Date: Thu Nov 27 17:19:24 2014 +0200 evas: Evas_3D_Mesh_File_Type sank into oblivion. Changing entry point to model_save_load. Changing API in examples. --- src/examples/evas/evas-3d-aabb.c| 2 +- src/examples/evas/evas-3d-eet.c | 7 +++--- src/examples/evas/evas-3d-frustum.c | 2 +- src/examples/evas/evas-3d-md2.c | 2 +- src/examples/evas/evas-3d-obj.c | 4 +-- src/examples/evas/evas-3d-ply.c | 6 ++--- src/examples/evas/evas-3d-shadows.c | 2 +- src/examples/evas/shooter/evas-3d-shooter.c | 6 ++--- src/lib/evas/Evas_Eo.h | 15 src/lib/evas/canvas/evas_3d_mesh.c | 9 --- src/lib/evas/canvas/evas_3d_mesh.eo | 2 -- src/lib/evas/common/evas_model_load.c | 38 ++--- src/lib/evas/common/evas_model_save.c | 34 ++ src/lib/evas/include/evas_private.h | 4 +-- 14 files changed, 59 insertions(+), 74 deletions(-) diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c index c26cda5..6210fa2 100644 --- a/src/examples/evas/evas-3d-aabb.c +++ b/src/examples/evas/evas-3d-aabb.c @@ -227,7 +227,7 @@ main(void) material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); eo_do(mesh, - evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_MD2, sonic.md2, NULL), + evas_3d_mesh_file_set(sonic.md2, NULL), evas_3d_mesh_frame_material_set(0, material), evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c index e4b7c14..96ab16b 100644 --- a/src/examples/evas/evas-3d-eet.c +++ b/src/examples/evas/evas-3d-eet.c @@ -151,7 +151,7 @@ main(void) material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); eo_do(mesh, - evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_MD2, sonic.md2, NULL), + evas_3d_mesh_file_set(sonic.md2, NULL), evas_3d_mesh_frame_material_set(0, material), evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); @@ -169,11 +169,10 @@ main(void) evas_3d_material_shininess_set(50.0)); eo_do(mesh, - evas_3d_mesh_save(EVAS_3D_MESH_FILE_TYPE_EET, - saved_Sonic_EET.eet, NULL)); + evas_3d_mesh_save(saved_Sonic_EET.eet, NULL)); eo_do(mesh2, - evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_EET, saved_Sonic_EET.eet, NULL), + evas_3d_mesh_file_set(saved_Sonic_EET.eet, NULL), evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c index 2ca525a..c231957 100644 --- a/src/examples/evas/evas-3d-frustum.c +++ b/src/examples/evas/evas-3d-frustum.c @@ -525,7 +525,7 @@ _mesh_setup_model(Scene_Data *data) evas_3d_material_shininess_set(100.0)); eo_do(data-mesh_model, - evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_MD2, eagle.md2, NULL), + evas_3d_mesh_file_set(eagle.md2, NULL), evas_3d_mesh_frame_material_set(0, data-material_model), evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_DIFFUSE)); } diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c index 26f8e71..4b53c2e 100644 --- a/src/examples/evas/evas-3d-md2.c +++ b/src/examples/evas/evas-3d-md2.c @@ -120,7 +120,7 @@ main(void) material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); eo_do(mesh, - evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_MD2, sonic.md2, NULL), + evas_3d_mesh_file_set(sonic.md2, NULL), evas_3d_mesh_frame_material_set(0, material), evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c index 0fced88..2634502 100644 --- a/src/examples/evas/evas-3d-obj.c +++ b/src/examples/evas/evas-3d-obj.c @@ -134,7 +134,7 @@ main(void) material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); eo_do(mesh, - evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_OBJ, man_mesh.obj, NULL), + evas_3d_mesh_file_set(man_mesh.obj, NULL), evas_3d_mesh_frame_material_set(0, material), evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); @@ -159,7 +159,7 @@ main(void) 1.0, 1.0, 1.0, 1.0), evas_3d_material_shininess_set(50.0)); - eo_do(mesh, evas_3d_mesh_save(EVAS_3D_MESH_FILE_TYPE_OBJ, saved_man, NULL)); + eo_do(mesh, evas_3d_mesh_save(saved_man, NULL)); mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
[EGIT] [core/efl] master 14/15: autotools: build new evas_3d_mmap examples.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0153e782c1a2b8e226e5c6a0f5cfd76909487d11 commit 0153e782c1a2b8e226e5c6a0f5cfd76909487d11 Author: Cedric BAIL ced...@osg.samsung.com Date: Tue Dec 23 22:36:36 2014 +0100 autotools: build new evas_3d_mmap examples. --- src/examples/evas/Makefile.am | 5 + 1 file changed, 5 insertions(+) diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am index e486fc5..7ead1fc 100644 --- a/src/examples/evas/Makefile.am +++ b/src/examples/evas/Makefile.am @@ -254,6 +254,11 @@ evas_3d_blending_SOURCES = evas-3d-blending.c evas_3d_blending_LDADD = $(ECORE_EVAS_COMMON_LDADD) @EFL_PTHREAD_LIBS@ evas_3d_blending_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS) +EXTRA_PROGRAMS += evas_3d_mmap +evas_3d_mmap_SOURCES = evas-3d-mmap-set.c +evas_3d_mmap_LDADD = $(ECORE_EVAS_COMMON_LDADD) @EFL_PTHREAD_LIBS@ +evas_3d_mmap_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS) + EXTRA_PROGRAMS += evas_gl evas_gl_SOURCES = evas-gl.c evas_gl_LDADD = $(ECORE_EVAS_COMMON_LDADD) @EFL_PTHREAD_LIBS@ --
[EGIT] [core/efl] master 04/15: evas: add lib/evas/common/evas_model_action.c. Functions are renamed similar to functions in image_save_load process.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=02c85b9fe8d9acb2802210eb65bca450f21c5712
commit 02c85b9fe8d9acb2802210eb65bca450f21c5712
Author: Bogdan Devichev b.devic...@samsung.com
Date: Thu Nov 27 15:16:03 2014 +0200
evas: add lib/evas/common/evas_model_action.c. Functions are renamed
similar to functions in image_save_load process.
---
src/Makefile_Evas.am | 2 ++
src/lib/evas/canvas/evas_3d_mesh.c | 35 ++
src/lib/evas/common/evas_model_load.c | 34 +
src/lib/evas/common/evas_model_save.c | 32
src/lib/evas/include/evas_private.h| 11 +++
.../evas/model_loaders/eet/evas_model_load_eet.c | 2 +-
.../evas/model_loaders/md2/evas_model_load_md2.c | 2 +-
.../evas/model_loaders/obj/evas_model_load_obj.c | 2 +-
.../evas/model_loaders/ply/evas_model_load_ply.c | 2 +-
.../evas/model_savers/eet/evas_model_save_eet.c| 6 ++--
.../evas/model_savers/obj/evas_model_save_obj.c| 2 +-
.../evas/model_savers/ply/evas_model_save_ply.c| 2 +-
12 files changed, 90 insertions(+), 42 deletions(-)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 57bdc67..6de4860 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -234,6 +234,8 @@ lib/evas/common/evas_image_save.c \
lib/evas/common/evas_image_main.c \
lib/evas/common/evas_image_data.c \
lib/evas/common/evas_image_scalecache.c \
+lib/evas/common/evas_model_load.c \
+lib/evas/common/evas_model_save.c \
lib/evas/common/evas_line_main.c \
lib/evas/common/evas_polygon_main.c \
lib/evas/common/evas_rectangle_main.c \
diff --git a/src/lib/evas/canvas/evas_3d_mesh.c
b/src/lib/evas/canvas/evas_3d_mesh.c
index 81b9117..572da9d 100644
--- a/src/lib/evas/canvas/evas_3d_mesh.c
+++ b/src/lib/evas/canvas/evas_3d_mesh.c
@@ -809,24 +809,7 @@ _evas_3d_mesh_file_set(Eo *obj, Evas_3D_Mesh_Data *pd,
Evas_3D_Mesh_File_Type ty
if (file == NULL) return;
- switch (type)
- {
- case EVAS_3D_MESH_FILE_TYPE_MD2:
-evas_3d_mesh_file_md2_set(obj, file);
-break;
- case EVAS_3D_MESH_FILE_TYPE_OBJ:
-evas_3d_mesh_file_obj_set(obj, file);
-break;
- case EVAS_3D_MESH_FILE_TYPE_EET:
-evas_3d_mesh_file_eet_set(obj, file);
-break;
- case EVAS_3D_MESH_FILE_TYPE_PLY:
-evas_3d_mesh_file_ply_set(obj, file);
-break;
- default:
-ERR(Invalid mesh file type.);
-break;
- }
+ evas_common_load_model_to_file(obj, file, type);
}
EOLIAN static void
@@ -843,21 +826,7 @@ _evas_3d_mesh_save(Eo *obj, Evas_3D_Mesh_Data *pd,
Evas_3D_Mesh_File_Type type,
return;
}
- switch (type)
- {
- case EVAS_3D_MESH_FILE_TYPE_OBJ:
-evas_3d_mesh_save_obj(obj, file, f);//file without extension!
-break;
- case EVAS_3D_MESH_FILE_TYPE_EET:
-evas_3d_mesh_save_eet(obj, file, f);
-break;
- case EVAS_3D_MESH_FILE_TYPE_PLY:
-evas_3d_mesh_save_ply(obj, file, f);
-break;
- default:
-ERR(Invalid mesh file type.);
-break;
- }
+ evas_common_save_model_to_file(obj, file, f, type);
}
static inline void
diff --git a/src/lib/evas/common/evas_model_load.c
b/src/lib/evas/common/evas_model_load.c
new file mode 100644
index 000..1f35cb0
--- /dev/null
+++ b/src/lib/evas/common/evas_model_load.c
@@ -0,0 +1,34 @@
+#ifdef HAVE_CONFIG_H
+# include config.h
+#endif
+
+#include evas_options.h
+
+#include evas_common_private.h
+#include evas_private.h
+
+
+void
+evas_common_load_model_to_file(Evas_3D_Mesh *model,
+ const char *file,
+ Evas_3D_Mesh_File_Type type)
+{
+ switch (type)
+ {
+ case EVAS_3D_MESH_FILE_TYPE_MD2:
+evas_model_load_file_md2(model, file);
+break;
+ case EVAS_3D_MESH_FILE_TYPE_OBJ:
+evas_model_load_file_obj(model, file);
+break;
+ case EVAS_3D_MESH_FILE_TYPE_EET:
+evas_model_load_file_eet(model, file);
+break;
+ case EVAS_3D_MESH_FILE_TYPE_PLY:
+evas_model_load_file_ply(model, file);
+break;
+ default:
+ERR(Invalid mesh file type.);
+break;
+ }
+}
diff --git a/src/lib/evas/common/evas_model_save.c
b/src/lib/evas/common/evas_model_save.c
new file mode 100644
index 000..85b9b41
--- /dev/null
+++ b/src/lib/evas/common/evas_model_save.c
@@ -0,0 +1,32 @@
+#ifdef HAVE_CONFIG_H
+# include config.h
+#endif
+
+#include evas_options.h
+
+#include evas_common_private.h
+#include evas_private.h
+
+
+void
+evas_common_save_model_to_file(Evas_3D_Mesh *model,
+ const char *file,
+ Evas_3D_Mesh_Frame *f,
+ Evas_3D_Mesh_File_Type type)
+{
+ switch (type)
+ {
+ case
[EGIT] [core/efl] master 01/15: evas: preparation of places for model_saver_loader separated from image_saver_loader.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=043055fc8eb3d7db11856f4d142f5e0e3262b3a6
commit 043055fc8eb3d7db11856f4d142f5e0e3262b3a6
Author: Bogdan Devichev b.devic...@samsung.com
Date: Wed Nov 26 18:50:43 2014 +0200
evas: preparation of places for model_saver_loader separated from
image_saver_loader.
---
spec/efl.spec.in | 8 +-
src/Makefile_Evas.am | 460 ++---
src/lib/evas/file/evas_module.c| 4 +-
.../bmp/evas_image_load_bmp.c | 0
.../dds/evas_image_load_dds.c | 0
.../evas/{loaders = image_loaders}/dds/s3tc.h | 0
.../{loaders = image_loaders}/dds/s3tc_decoder.c | 0
.../eet/evas_image_load_eet.c | 0
.../generic/evas_image_load_generic.c | 0
.../gif/evas_image_load_gif.c | 0
.../ico/evas_image_load_ico.c | 0
.../jp2k/evas_image_load_jp2k.c| 0
.../jpeg/evas_image_load_jpeg.c| 0
.../pmaps/evas_image_load_pmaps.c | 0
.../png/evas_image_load_png.c | 0
.../psd/evas_image_load_psd.c | 0
.../tga/evas_image_load_tga.c | 0
.../tgv/evas_image_load_tgv.c | 0
.../tiff/evas_image_load_tiff.c| 0
.../wbmp/evas_image_load_wbmp.c| 0
.../webp/evas_image_load_webp.c| 0
.../xpm/evas_image_load_xpm.c | 0
.../eet/evas_image_save_eet.c | 0
.../jpeg/evas_image_save_jpeg.c| 0
.../png/evas_image_save_png.c | 0
.../tgv/evas_image_save_tgv.c | 0
.../tiff/evas_image_save_tiff.c| 0
.../webp/evas_image_save_webp.c| 0
28 files changed, 236 insertions(+), 236 deletions(-)
diff --git a/spec/efl.spec.in b/spec/efl.spec.in
index 9c087a8..1bd474b 100644
--- a/spec/efl.spec.in
+++ b/spec/efl.spec.in
@@ -97,8 +97,8 @@ test x$RPM_BUILD_ROOT != x/ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.so.*
%{_libdir}/evas/cserve2/loaders/*/linux-gnu-*/*.so
%{_libdir}/evas/modules/engines/*/linux-gnu-*/*.so
-%{_libdir}/evas/modules/loaders/*/linux-gnu-*/*.so
-%{_libdir}/evas/modules/savers/*/linux-gnu-*/*.so
+%{_libdir}/evas/modules/image_loaders/*/linux-gnu-*/*.so
+%{_libdir}/evas/modules/image_savers/*/linux-gnu-*/*.so
%{_libdir}/ecore/*/*.so
%{_libdir}/ecore_evas/*/*/*/*.so
%{_libexecdir}/*
@@ -115,8 +115,8 @@ test x$RPM_BUILD_ROOT != x/ rm -rf $RPM_BUILD_ROOT
%{_libdir}/ecore_evas/*/*/*/*.la
%{_libdir}/evas/cserve2/loaders/*/linux-gnu-*/*.la
%{_libdir}/evas/modules/engines/*/linux-gnu-*/*.la
-%{_libdir}/evas/modules/loaders/*/linux-gnu-*/*.la
-%{_libdir}/evas/modules/savers/*/linux-gnu-*/*.la
+%{_libdir}/evas/modules/image_loaders/*/linux-gnu-*/*.la
+%{_libdir}/evas/modules/image_savers/*/linux-gnu-*/*.la
%{_datadir}/embryo/
%{_datadir}/evas/
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index a625ec6..b40ce7d 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -1240,503 +1240,503 @@ bin_evas_dummy_slave_LDADD = \
endif
-### Loaders and savers
+### loaders and savers
if BUILD_LOADER_BMP
if EVAS_STATIC_BUILD_BMP
-lib_evas_libevas_la_SOURCES += modules/evas/loaders/bmp/evas_image_load_bmp.c
+lib_evas_libevas_la_SOURCES +=
modules/evas/image_loaders/bmp/evas_image_load_bmp.c
lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_bmp_cflags@
lib_evas_libevas_la_LIBADD += @evas_image_loader_bmp_libs@
if EVAS_CSERVE2
-bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/loaders/bmp/evas_image_load_bmp.c
+bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/image_loaders/bmp/evas_image_load_bmp.c
bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_bmp_cflags@
bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_bmp_libs@
endif
else
-loaderbmppkgdir = $(libdir)/evas/modules/loaders/bmp/$(MODULE_ARCH)
-loaderbmppkg_LTLIBRARIES = modules/evas/loaders/bmp/module.la
-modules_evas_loaders_bmp_module_la_SOURCES =
modules/evas/loaders/bmp/evas_image_load_bmp.c
-modules_evas_loaders_bmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+loaderbmppkgdir = $(libdir)/evas/modules/image_loaders/bmp/$(MODULE_ARCH)
+loaderbmppkg_LTLIBRARIES = modules/evas/image_loaders/bmp/module.la
+modules_evas_image_loaders_bmp_module_la_SOURCES =
modules/evas/image_loaders/bmp/evas_image_load_bmp.c
+modules_evas_image_loaders_bmp_module_la_CPPFLAGS =
-I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
@EVAS_CFLAGS@ \
@evas_image_loader_bmp_cflags@
-modules_evas_loaders_bmp_module_la_LIBADD = \
+modules_evas_image_loaders_bmp_module_la_LIBADD = \
@USE_EVAS_LIBS@ \
@evas_image_loader_bmp_libs@
[EGIT] [core/efl] master 06/15: evas: test cases are changed according to changes of API in step 4. Specific logic in obj_saver is removed for standardization of API.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4acbae69472662feef7a88aedd19ce6ad4d0ebe1
commit 4acbae69472662feef7a88aedd19ce6ad4d0ebe1
Author: Bogdan Devichev b.devic...@samsung.com
Date: Fri Nov 28 18:48:35 2014 +0200
evas: test cases are changed according to changes of API in step 4.
Specific logic in obj_saver is removed for standardization of API.
---
src/examples/evas/evas-3d-obj.c| 2 +-
.../evas/model_savers/obj/evas_model_save_obj.c| 39 +-
src/tests/evas/evas_test_mesh.c| 17 +-
3 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index 2634502..d19a36d 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -159,7 +159,7 @@ main(void)
1.0, 1.0, 1.0, 1.0),
evas_3d_material_shininess_set(50.0));
- eo_do(mesh, evas_3d_mesh_save(saved_man, NULL));
+ eo_do(mesh, evas_3d_mesh_save(saved_man.obj, NULL));
mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
diff --git a/src/modules/evas/model_savers/obj/evas_model_save_obj.c
b/src/modules/evas/model_savers/obj/evas_model_save_obj.c
index 35773e3..1cc7e8a 100644
--- a/src/modules/evas/model_savers/obj/evas_model_save_obj.c
+++ b/src/modules/evas/model_savers/obj/evas_model_save_obj.c
@@ -9,17 +9,11 @@
#include evas_private.h
#define OPEN_FILE(extension)\
- int length=strlen(file);\
- char * extension = .#extension;\
- char * _##extension##_file_name = (char *)malloc(length+4);\
- strcpy(_##extension##_file_name,file);\
- strcpy(_##extension##_file_name+length,extension);\
FILE * _##extension##_file = fopen(_##extension##_file_name, w+);\
- free(_##extension##_file_name);
#define SAVE_GEOMETRICS(a, format)\
vb = f-vertices[a];\
- fprintf(_obj_file, o %s\n,file);\
+ fprintf(_obj_file, o %s\n,_obj_file_name);\
if (vb-data == NULL)\
{\
ERR(Reading of geometrics is failed.);\
@@ -34,7 +28,7 @@
}
static void
-_save_mesh(Evas_3D_Mesh_Data *pd, const char *file, Evas_3D_Mesh_Frame *f)
+_save_mesh(Evas_3D_Mesh_Data *pd, const char *_obj_file_name,
Evas_3D_Mesh_Frame *f)
{
Evas_3D_Vertex_Buffer *vb;
time_t current_time;
@@ -45,7 +39,7 @@ _save_mesh(Evas_3D_Mesh_Data *pd, const char *file,
Evas_3D_Mesh_Frame *f)
OPEN_FILE(obj)
if (!_obj_file)
{
-ERR(File open '%s' for save failed, file);
+ERR(File open '%s' for save failed, _obj_file_name);
return;
}
fprintf(_obj_file, # Evas_3D saver OBJ v0.03 \n);//_obj_file created in
macro
@@ -69,7 +63,7 @@ _save_mesh(Evas_3D_Mesh_Data *pd, const char *file,
Evas_3D_Mesh_Frame *f)
}
fprintf(_obj_file,# Current time is %s \n, c_time_string);
- fprintf(_obj_file,mtllib %s.mtl \n\n, file);
+ fprintf(_obj_file,mtllib %s.mtl \n\n, _obj_file_name);
/* Adding geometrics to file. */
if (f == NULL)
@@ -95,14 +89,14 @@ _save_mesh(Evas_3D_Mesh_Data *pd, const char *file,
Evas_3D_Mesh_Frame *f)
}
static void
-_save_material(Evas_3D_Mesh_Data *pd EINA_UNUSED, const char *file,
Evas_3D_Mesh_Frame *f)
+_save_material(Evas_3D_Mesh_Data *pd EINA_UNUSED, const char *_mtl_file_name,
Evas_3D_Mesh_Frame *f)
{
Evas_3D_Material_Data *mat = eo_data_scope_get(f-material,
EVAS_3D_MATERIAL_CLASS);
OPEN_FILE(mtl)
if (!_mtl_file)
{
-ERR(File open '%s' for save failed, file);
+ERR(File open '%s' for save failed, _mtl_file_name);
return;
}
fprintf(_mtl_file, # Evas_3D saver OBJ v0.03 \n);//_mtl_file created in
macro
@@ -129,9 +123,24 @@ _save_material(Evas_3D_Mesh_Data *pd EINA_UNUSED, const
char *file, Evas_3D_Mesh
}
void
-evas_model_save_file_obj(Evas_3D_Mesh *mesh, const char *file,
Evas_3D_Mesh_Frame *f)
+evas_model_save_file_obj(Evas_3D_Mesh *mesh, const char *_obj_file_name,
Evas_3D_Mesh_Frame *f)
{
+ int len;
+ char *without_extention, *_mtl_extension, *_mtl_file_name;
+
+ len = strlen(_obj_file_name);
+ without_extention = (char*)malloc((len - 4) * sizeof(char));
+ _mtl_extension = .mtl;
+ _mtl_file_name = (char *)malloc(len * sizeof(char));
+
+ memcpy(without_extention, _obj_file_name, len-4);
+ strcpy(_mtl_file_name, without_extention);
+ strcpy(_mtl_file_name + len - 4, _mtl_extension);
+
Evas_3D_Mesh_Data *pd = eo_data_scope_get(mesh, EVAS_3D_MESH_CLASS);
- _save_mesh(pd, file, f);
- _save_material(pd, file, f);
+ _save_mesh(pd, _obj_file_name, f);
+ _save_material(pd, _mtl_file_name, f);
+
+ free(without_extention);
+ free(_mtl_file_name);
}
diff --git a/src/tests/evas/evas_test_mesh.c b/src/tests/evas/evas_test_mesh.c
index 7bfa613..dde1dd3 100644
--- a/src/tests/evas/evas_test_mesh.c
+++
Re: [E-devel] Windows issue with Eina_Thread type
On Tue, 23 Dec 2014 18:35:20 +0100 (CET) Michelle Legrand michelle.legr...@openwide.fr said: So if I understood correctly, I should replace in src/lib/eina/eina_thread.h: typedef unsigned long int Eina_Thread; by : typedef uintptr_t Eina_Thread; like Nash suggested ? or just unsigned long long - which in any sane world will always be 64bit. Regards, Michelle Le Grand - Mail original - De: Nicolas Aguirre aguirre.nico...@gmail.com À: Enlightenment developer list enlightenment-devel@lists.sourceforge.net Envoyé: Vendredi 19 Décembre 2014 09:03:49 Objet: Re: [E-devel] Windows issue with Eina_Thread type 2014-12-19 3:00 GMT+01:00 Carsten Haitzler ras...@rasterman.com: i'd go for the abi break. votes? +1 -- Nicolas Aguirre Mail: aguirre.nico...@gmail.com Web: http://www.calaos.fr Blog: http://dev.enlightenment.fr/~captainigloo/ -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Windows issue with Eina_Thread type
On Wed, 24 Dec 2014 08:19:40 +0900 Carsten Haitzler (The Rasterman) ras...@rasterman.com wrote: On Tue, 23 Dec 2014 18:35:20 +0100 (CET) Michelle Legrand michelle.legr...@openwide.fr said: So if I understood correctly, I should replace in src/lib/eina/eina_thread.h: typedef unsigned long int Eina_Thread; by : typedef uintptr_t Eina_Thread; like Nash suggested ? or just unsigned long long - which in any sane world will always be 64bit. Windows isn't sane. - Mail original - De: Nicolas Aguirre aguirre.nico...@gmail.com À: Enlightenment developer list enlightenment-devel@lists.sourceforge.net Envoyé: Vendredi 19 Décembre 2014 09:03:49 Objet: Re: [E-devel] Windows issue with Eina_Thread type 2014-12-19 3:00 GMT+01:00 Carsten Haitzler ras...@rasterman.com: i'd go for the abi break. votes? +1 -- Nicolas Aguirre Mail: aguirre.nico...@gmail.com Web: http://www.calaos.fr Blog: http://dev.enlightenment.fr/~captainigloo/ -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- A big old stinking pile of genius that no one wants coz there are too many silver coated monkeys in the world. signature.asc Description: PGP signature -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Windows issue with Eina_Thread type
On Wed, 24 Dec 2014 09:46:03 +1000 David Seikel onef...@gmail.com said: On Wed, 24 Dec 2014 08:19:40 +0900 Carsten Haitzler (The Rasterman) ras...@rasterman.com wrote: On Tue, 23 Dec 2014 18:35:20 +0100 (CET) Michelle Legrand michelle.legr...@openwide.fr said: So if I understood correctly, I should replace in src/lib/eina/eina_thread.h: typedef unsigned long int Eina_Thread; by : typedef uintptr_t Eina_Thread; like Nash suggested ? or just unsigned long long - which in any sane world will always be 64bit. Windows isn't sane. it'll be 64bit on windows. long will not. long long will. - Mail original - De: Nicolas Aguirre aguirre.nico...@gmail.com À: Enlightenment developer list enlightenment-devel@lists.sourceforge.net Envoyé: Vendredi 19 Décembre 2014 09:03:49 Objet: Re: [E-devel] Windows issue with Eina_Thread type 2014-12-19 3:00 GMT+01:00 Carsten Haitzler ras...@rasterman.com: i'd go for the abi break. votes? +1 -- Nicolas Aguirre Mail: aguirre.nico...@gmail.com Web: http://www.calaos.fr Blog: http://dev.enlightenment.fr/~captainigloo/ -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- A big old stinking pile of genius that no one wants coz there are too many silver coated monkeys in the world. -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Windows issue with Eina_Thread type
You don't always need a 64bit number, you need a int which is the size of a pointer. Hence why I suggested uintptr_t (or intptr_t for that matter). On 23 December 2014 at 15:19, Carsten Haitzler ras...@rasterman.com wrote: On Tue, 23 Dec 2014 18:35:20 +0100 (CET) Michelle Legrand michelle.legr...@openwide.fr said: So if I understood correctly, I should replace in src/lib/eina/eina_thread.h: typedef unsigned long int Eina_Thread; by : typedef uintptr_t Eina_Thread; like Nash suggested ? or just unsigned long long - which in any sane world will always be 64bit. Regards, Michelle Le Grand - Mail original - De: Nicolas Aguirre aguirre.nico...@gmail.com À: Enlightenment developer list enlightenment-devel@lists.sourceforge.net Envoyé: Vendredi 19 Décembre 2014 09:03:49 Objet: Re: [E-devel] Windows issue with Eina_Thread type 2014-12-19 3:00 GMT+01:00 Carsten Haitzler ras...@rasterman.com: i'd go for the abi break. votes? +1 -- Nicolas Aguirre Mail: aguirre.nico...@gmail.com Web: http://www.calaos.fr Blog: http://dev.enlightenment.fr/~captainigloo/ -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Windows issue with Eina_Thread type
On Wed, 24 Dec 2014 08:55:02 +0900 Carsten Haitzler (The Rasterman) ras...@rasterman.com wrote: On Wed, 24 Dec 2014 09:46:03 +1000 David Seikel onef...@gmail.com said: On Wed, 24 Dec 2014 08:19:40 +0900 Carsten Haitzler (The Rasterman) ras...@rasterman.com wrote: On Tue, 23 Dec 2014 18:35:20 +0100 (CET) Michelle Legrand michelle.legr...@openwide.fr said: So if I understood correctly, I should replace in src/lib/eina/eina_thread.h: typedef unsigned long int Eina_Thread; by : typedef uintptr_t Eina_Thread; like Nash suggested ? or just unsigned long long - which in any sane world will always be 64bit. Windows isn't sane. it'll be 64bit on windows. long will not. long long will. Probably true, I haven't looked. I was just saying that you can't expect Windows to be sane. So any sane world doesn't apply. If Windows ever does anything sane, it's entirely by accident. - Mail original - De: Nicolas Aguirre aguirre.nico...@gmail.com À: Enlightenment developer list enlightenment-devel@lists.sourceforge.net Envoyé: Vendredi 19 Décembre 2014 09:03:49 Objet: Re: [E-devel] Windows issue with Eina_Thread type 2014-12-19 3:00 GMT+01:00 Carsten Haitzler ras...@rasterman.com: i'd go for the abi break. votes? +1 -- Nicolas Aguirre Mail: aguirre.nico...@gmail.com Web: http://www.calaos.fr Blog: http://dev.enlightenment.fr/~captainigloo/ -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- A big old stinking pile of genius that no one wants coz there are too many silver coated monkeys in the world. -- A big old stinking pile of genius that no one wants coz there are too many silver coated monkeys in the world. signature.asc Description: PGP signature -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] PATCH: duplicated XDG_DATA_DIRS fix
Hi, Not sure how you got /usr/share to be duplicated, it is not the case here... On Wed, Dec 24, 2014 at 1:13 AM, Thanatermesis thanatermesis.e...@gmail.com wrote: If you run: echo $XDG_DATA_DIRS | tr ':' '\n' | sort you will see that you have a duplicated one % echo $XDG_DATA_DIRS | tr ':' '\n' | sort /opt/e/share /opt/e/share/enlightenment /usr/local/share /usr/share So I did this commit http://pastebin.com/9BUnzrHu which works on both e17 and master branches, where it fixes the problem, as we can see in https://www.enlightenment.org/ss/e-54998c1c35fdd0.34968942.jpg Lacking of time that somebody checks the commit before to do any push I ended to pushing it only to my own remote (everybody on christmas? yeah i should go too!) So... what do you think? I should push this commit? anything to change? Did you have /usr as prefix for EFL but not for E? Also, you should remove 'p' in the first snprintf line :) So... is it really bad to have duplicates in XDG_DATA_DIRS? If it is, then something smarter than just checking for /usr should probably be implemented. Best regards, -- Jean-Philippe André -- Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] elementary-1.12 01/01: elm_colorselector: Fix layout broken in ELM_COLORSELECTOR_ALL mode
hermet pushed a commit to branch elementary-1.12. http://git.enlightenment.org/core/elementary.git/commit/?id=addb4c1973cbaf8d47b94f95ddfc327bab5a0b05 commit addb4c1973cbaf8d47b94f95ddfc327bab5a0b05 Author: Jee-Yong Um jc9...@samsung.com Date: Tue Dec 23 09:52:44 2014 +0900 elm_colorselector: Fix layout broken in ELM_COLORSELECTOR_ALL mode Summary: Fix layout broken in ELM_COLORSELECTOR_ALL mode due to missing part for layout sizing evaluation @fix Reviewers: Hermet Reviewed By: Hermet Subscribers: Hermet Differential Revision: https://phab.enlightenment.org/D1802 --- src/lib/elm_colorselector.c | 4 1 file changed, 4 insertions(+) diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c index e0763a4..e53491b 100644 --- a/src/lib/elm_colorselector.c +++ b/src/lib/elm_colorselector.c @@ -1238,6 +1238,10 @@ _elm_colorselector_elm_layout_sizing_eval(Eo *obj, Elm_Colorselector_Data *sd) _full_sizing_eval(obj); break; + case ELM_COLORSELECTOR_ALL: +_full_sizing_eval(obj); +break; + default: return; } --
[EGIT] [core/elementary] master 01/01: image: fix clipped image issue if x or y is less than zero
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2e213f0270f217949a11141f45fef12cfeadaf0b
commit 2e213f0270f217949a11141f45fef12cfeadaf0b
Author: jiin.moon jiin.m...@samsung.com
Date: Wed Dec 24 14:07:32 2014 +0900
image: fix clipped image issue if x or y is less than zero
Summary:
After applying clipping patch about image on outside,
the width or height of the image be decreased
if x or y of an image is less than zero.
The way to calculate width/height has changed.
This fixes a side effect added in 2839881f37ea85b3469d8fd37cfaa4f9d67458fa
Reviewers: Hermet
Differential Revision: https://phab.enlightenment.org/D1810
---
AUTHORS | 1 +
src/lib/elm_image.c | 14 --
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 34e5d98..0a80fa5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -161,3 +161,4 @@ yinsc shouchen@samsung.com
Woochan Lee wc0917@samsung.com
Vitalii Vorobiov vi.vorob...@samsung.com
Jee-Yong Um con...@gmail.com
+Ji-In Moon jiin.m...@samsung.com
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index 9bc14ac..a3eb116 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -131,8 +131,7 @@ _elm_image_internal_sizing_eval(Evas_Object *obj,
Elm_Image_Data *sd)
else
{
double alignh = 0.5, alignv = 0.5;
-int iw = 0, ih = 0;
-
+int iw = 0, ih = 0, offset_w = 0, offset_h = 0;
evas_object_image_size_get(sd-img, iw, ih);
iw = ((double)iw) * sd-scale;
@@ -178,14 +177,17 @@ _elm_image_internal_sizing_eval(Evas_Object *obj,
Elm_Image_Data *sd)
if (alignh == EVAS_HINT_FILL) alignh = 0.5;
if (alignv == EVAS_HINT_FILL) alignv = 0.5;
-x = sd-img_x + ((sd-img_w - w) * alignh);
-y = sd-img_y + ((sd-img_h - h) * alignv);
+offset_w = ((sd-img_w - w) * alignh);
+offset_h = ((sd-img_h - h) * alignv);
+
+x = sd-img_x + offset_w;
+y = sd-img_y + offset_h;
evas_object_move(sd-img, x, y);
evas_object_image_fill_set(sd-img, 0, 0, w, h);
-if (x 0) w += x;
-if (y 0) h += y;
+if (offset_w 0) w += offset_w;
+if (offset_h 0) h += offset_h;
evas_object_resize(sd-img, w, h);
}
--
[EGIT] [core/elementary] elementary-1.12 01/01: image: fix clipped image issue if x or y is less than zero
hermet pushed a commit to branch elementary-1.12.
http://git.enlightenment.org/core/elementary.git/commit/?id=d41671b7797e52fb79683300b8624ee95bbf50d0
commit d41671b7797e52fb79683300b8624ee95bbf50d0
Author: jiin.moon jiin.m...@samsung.com
Date: Wed Dec 24 14:07:32 2014 +0900
image: fix clipped image issue if x or y is less than zero
Summary:
After applying clipping patch about image on outside,
the width or height of the image be decreased
if x or y of an image is less than zero.
The way to calculate width/height has changed.
This fixes a side effect added in 2839881f37ea85b3469d8fd37cfaa4f9d67458fa
Reviewers: Hermet
Differential Revision: https://phab.enlightenment.org/D1810
Conflicts:
src/lib/elm_image.c
---
AUTHORS | 1 +
src/lib/elm_image.c | 14 --
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 5a6f1d8..4129b71 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -160,3 +160,4 @@ Kabeer Khan kabeer.k...@samsung.com
yinsc shouchen@samsung.com
Woochan Lee wc0917@samsung.com
Jee-Yong Um con...@gmail.com
+Ji-In Moon jiin.m...@samsung.com
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index e7076b8..a3eb116 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -131,8 +131,7 @@ _elm_image_internal_sizing_eval(Evas_Object *obj,
Elm_Image_Data *sd)
else
{
double alignh = 0.5, alignv = 0.5;
-int iw = 0, ih = 0;
-
+int iw = 0, ih = 0, offset_w = 0, offset_h = 0;
evas_object_image_size_get(sd-img, iw, ih);
iw = ((double)iw) * sd-scale;
@@ -178,14 +177,17 @@ _elm_image_internal_sizing_eval(Evas_Object *obj,
Elm_Image_Data *sd)
if (alignh == EVAS_HINT_FILL) alignh = 0.5;
if (alignv == EVAS_HINT_FILL) alignv = 0.5;
-x = sd-img_x + ((sd-img_w - w) * alignh);
-y = sd-img_y + ((sd-img_h - h) * alignv);
+offset_w = ((sd-img_w - w) * alignh);
+offset_h = ((sd-img_h - h) * alignv);
+
+x = sd-img_x + offset_w;
+y = sd-img_y + offset_h;
evas_object_move(sd-img, x, y);
evas_object_image_fill_set(sd-img, 0, 0, w, h);
-if (x 0) w+=x;
-if (y 0) h+=y;
+if (offset_w 0) w += offset_w;
+if (offset_h 0) h += offset_h;
evas_object_resize(sd-img, w, h);
}
--
[EGIT] [core/efl] master 01/01: edje/edje_calc: clean up code
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=956754ee5752aa8f1f0bfc0676ebedc8b8b46f08
commit 956754ee5752aa8f1f0bfc0676ebedc8b8b46f08
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Dec 24 14:51:03 2014 +0900
edje/edje_calc: clean up code
remove duplicated.
---
src/lib/edje/edje_calc.c | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index f6d75e6..faa1f95 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3987,19 +3987,17 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int
flags, Edje_Calc_Params *sta
_edje_map_prop_set(map, pf, chosen_desc, ep, mo);
- if (ep-nested_smart)
- { /* Apply map to smart obj holding nested parts */
- eo_do(ep-nested_smart,
+ Evas_Object *map_obj;
+
+ /* Apply map to smart obj holding nested parts */
+ if (ep-nested_smart) map_obj = ep-nested_smart;
+ else map_obj = mo;
+ if (map_obj)
+ {
+ eo_do(map_obj,
evas_obj_map_set(map),
evas_obj_map_enable_set(EINA_TRUE));
}
- else
- {
- if (mo)
-eo_do(mo,
- evas_obj_map_set(map),
- evas_obj_map_enable_set(EINA_TRUE));
- }
}
else
{
--
[EGIT] [tools/enventor] master 01/01: syntax_color: add anti_alias keyword
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=8b27ad269cb6b10063dae25d37fc732b3a27dda7
commit 8b27ad269cb6b10063dae25d37fc732b3a27dda7
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Dec 24 16:31:27 2014 +0900
syntax_color: add anti_alias keyword
---
data/color/color.src | 1 +
1 file changed, 1 insertion(+)
diff --git a/data/color/color.src b/data/color/color.src
index 332fca6..b6c88ca 100644
--- a/data/color/color.src
+++ b/data/color/color.src
@@ -66,6 +66,7 @@ group syntax_color_group struct {
value key string: after;
value key string: alias;
value key string: align;
+value key string: anti_alias;
value key string: aspect_mode;
value key string: aspect_preference;
value key string: aspect;
--
[EGIT] [core/efl] master 01/01: edje: support anti_alias option
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=382c41e42d6338b3a8db8914c8a056e2243a611f
commit 382c41e42d6338b3a8db8914c8a056e2243a611f
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Dec 24 16:29:49 2014 +0900
edje: support anti_alias option
set anti_alias in part section.
default is enabled.
part { name: test;
type: XXX;
anti_alias: 0;
...
}
@feature
---
src/bin/edje/edje_cc_handlers.c | 22 ++
src/bin/edje/edje_data_convert.c | 1 +
src/lib/edje/edje_calc.c | 1 -
src/lib/edje/edje_data.c | 1 +
src/lib/edje/edje_edit.c | 1 +
src/lib/edje/edje_load.c | 5 +++--
src/lib/edje/edje_private.h | 1 +
src/lib/edje/edje_util.c | 6 +++---
8 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 7cc08a0..d1aa9ec 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -244,6 +244,7 @@ static void
st_collections_group_parts_part_insert_before(void);
static void st_collections_group_parts_part_insert_after(void);
static void st_collections_group_parts_part_effect(void);
static void st_collections_group_parts_part_mouse_events(void);
+static void st_collections_group_parts_part_anti_alias(void);
static void st_collections_group_parts_part_repeat_events(void);
static void st_collections_group_parts_part_ignore_flags(void);
static void st_collections_group_parts_part_scale(void);
@@ -575,6 +576,7 @@ New_Statement_Handler statement_handlers[] =
{collections.group.parts.part.insert_after,
st_collections_group_parts_part_insert_after},
{collections.group.parts.part.effect,
st_collections_group_parts_part_effect},
{collections.group.parts.part.mouse_events,
st_collections_group_parts_part_mouse_events},
+ {collections.group.parts.part.anti_alias,
st_collections_group_parts_part_anti_alias},
{collections.group.parts.part.repeat_events,
st_collections_group_parts_part_repeat_events},
{collections.group.parts.part.ignore_flags,
st_collections_group_parts_part_ignore_flags},
{collections.group.parts.part.scale,
st_collections_group_parts_part_scale},
@@ -3049,6 +3051,7 @@ _part_copy(Edje_Part *ep, Edje_Part *ep2)
ep-type = ep2-type;
ep-mouse_events = ep2-mouse_events;
+ ep-anti_alias = ep2-anti_alias;
ep-repeat_events = ep2-repeat_events;
ep-ignore_flags = ep2-ignore_flags;
ep-scale = ep2-scale;
@@ -4087,6 +4090,7 @@ edje_cc_handlers_part_make(int id)
ep-id = id;
ep-type = EDJE_PART_TYPE_IMAGE;
ep-mouse_events = pcp-default_mouse_events;
+ ep-anti_alias = 1;
ep-repeat_events = 0;
ep-ignore_flags = EVAS_EVENT_FLAG_NONE;
ep-scale = 0;
@@ -4799,6 +4803,24 @@ st_collections_group_parts_part_nomouse(void)
/**
@page edcref
@property
+anti_alias
+@parameters
+[1 or 0]
+@effect
+Takes a boolean value specifying whether part is anti_alias (1) or not
+(0). The default value is 1.
+@endproperty
+*/
+static void
+st_collections_group_parts_part_anti_alias(void)
+{
+ check_arg_count(1);
+ current_part-anti_alias = parse_bool(0);
+}
+
+/**
+@page edcref
+@property
repeat_events
@parameters
[1 or 0]
diff --git a/src/bin/edje/edje_data_convert.c b/src/bin/edje/edje_data_convert.c
index 3d451bb..ac7d52d 100644
--- a/src/bin/edje/edje_data_convert.c
+++ b/src/bin/edje/edje_data_convert.c
@@ -396,6 +396,7 @@ _edje_edd_old_init(void)
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part, Old_Edje_Part,
type, type, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part, Old_Edje_Part,
effect, effect, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part, Old_Edje_Part,
mouse_events, mouse_events, EET_T_UCHAR);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part, Old_Edje_Part,
anti_alias, anti_alias, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part, Old_Edje_Part,
repeat_events, repeat_events, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part, Old_Edje_Part,
ignore_flags, ignore_flags, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part, Old_Edje_Part,
scale, scale, EET_T_UCHAR);
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index faa1f95..eab8ab1 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -580,7 +580,6 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep,
const char *d1, doubl
epd2 = _edje_part_description_find(ed, ep, d2, v2, EINA_TRUE);
epdi = (Edje_Part_Description_Image*) epd2;
-
/* There is an animation if both description are different or if
description is an image with tweens */
if (epd2 (epd1 != epd2 || (ep-part-type == EDJE_PART_TYPE_IMAGE
