Evas: Refactor model's savers and loaders.

Summary:
Move common part to a separated document.
Make code more readable using smaller functions. (from Task T2713)

I did it again because somehow test is passing now. It seems like this test suite is unstable.
Please, let me know if there are any errors after running distcheck.

Reviewers: cedric, raster, Hermet, stefan_schmidt

Subscribers: jpeg, artem.popov

Differential Revision: https://phab.enlightenment.org/D3420

2 files changed, 79 insertions, 242 deletions

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 f5b1b6b..e049e2c 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
@@ -127,5 +127,3 @@ evas_model_load_file_eet(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
 
    _evas_canvas3d_eet_file_free(eet_file);
 }
-
-
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
index 1beef18..971e951 100644
--- a/src/modules/evas/model_loaders/ply/evas_model_load_ply.c
+++ b/src/modules/evas/model_loaders/ply/evas_model_load_ply.c
@@ -1,44 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include "stdio.h"
-#include "evas_common_private.h"
-#include "evas_private.h"
-#include <Eina.h>
-
-/* set value to position [x][y] to array name which have. */
-#define ARRAY_2D(name, x, y, count_y) (*(name + x * count_y + y))
-
-/* Structures for reading data from file. */
-typedef struct _PLY_Header    PLY_Header;
-
-struct _PLY_Header
-{
-   int vertices_count;
-   int triangles_count;
-   Eina_Bool existence_of_geometries;
-   Eina_Bool existence_of_normals;
-   Eina_Bool existence_of_texcoords;
-   Eina_Bool existence_of_colors;
-};
-
-/* create new header */
-static inline PLY_Header
-_new_ply_header()
-{
-   PLY_Header header;
-
-   header.vertices_count = 0;
-   header.triangles_count = 0;
-   header.existence_of_geometries = EINA_FALSE;
-   header.existence_of_normals = EINA_FALSE;
-   header.existence_of_texcoords = EINA_FALSE;
-   header.existence_of_colors = EINA_FALSE;
-
-   return header;
-}
+#include "evas_model_load_save_common.h"
 
 static inline char *
 _to_next_line(char *current)
@@ -81,8 +41,8 @@ _read_data(float *array, int place, int count, char *current, float divider)
    return current;
 }
 
-static inline PLY_Header
-_read_header(char *map)//Check properties of mesh in .ply file.
+static inline Eina_Bool
+_read_ply_header(char *map, Evas_Model_Load_Save_Header *header)
 {
    eina_init();
 
@@ -90,30 +50,29 @@ _read_header(char *map)//Check properties of mesh in .ply file.
    int vertex_lines, triangles = 0, vertices_in_current_face = 0;
    char **helping_pointer;
    char *current;
-   PLY_Header header;
 
-   header = _new_ply_header();
    helping_pointer = eina_str_split(map, "vertex ", 0);
 
    if (helping_pointer == NULL)
      {
         ERR("File have not kayword vertex. It is necessary.");
-        return header;
+        return EINA_FALSE;
      }
 
-   sscanf(helping_pointer[1], "%d", &header.vertices_count);
+   sscanf(helping_pointer[1], "%d", &header->vertices_count);
+
    free(helping_pointer);
    helping_pointer = eina_str_split(map, "end_header\n", 0);
 
    if (helping_pointer == NULL)
      {
         ERR("File have not kayword end_header. It is necessary.");
-        return header;
+        return EINA_FALSE;
      }
 
    current = helping_pointer[1];
 
-   vertex_lines = header.vertices_count;
+   vertex_lines = header->vertices_count;
    while (*current != '\0')
      {
         if (vertex_lines == 1)
@@ -139,8 +98,7 @@ _read_header(char *map)//Check properties of mesh in .ply file.
         current++;
      }
 
-   header.triangles_count = triangles;
-   free(helping_pointer);
+   header->indices_count = 3 * triangles;
 
       /* analyse flags used when file was saved in blender */
    helping_pointer = eina_str_split(map, "property float ", 0);
@@ -148,243 +106,124 @@ _read_header(char *map)//Check properties of mesh in .ply file.
    if ((helping_pointer[1] != NULL) && (*helping_pointer[1] == 'x') &&
        (helping_pointer[2] != NULL) && (*helping_pointer[2] == 'y') &&
        (helping_pointer[3] != NULL) && (*helping_pointer[3] == 'z'))
-     header.existence_of_geometries = EINA_TRUE;
-   else return header;
+     header->existence_of_positions = EINA_TRUE;
+   else return EINA_FALSE;
 
    if ((helping_pointer[4] != NULL) && (*helping_pointer[4] == 'n') &&
        (helping_pointer[5] != NULL) && (*helping_pointer[5] == 'n') &&
        (helping_pointer[6] != NULL) && (*helping_pointer[6] == 'n'))
-     header.existence_of_normals = EINA_TRUE;
+     header->existence_of_normals = EINA_TRUE;
 
-   if ((header.existence_of_normals &&
+   if ((header->existence_of_normals &&
        ((helping_pointer[7] != NULL) && (*helping_pointer[7] == 's') &&
        (helping_pointer[8] != NULL) && (*helping_pointer[8] == 't'))) ||
-       (!header.existence_of_normals &&
+       (!header->existence_of_normals &&
        ((helping_pointer[4] != NULL) && (*helping_pointer[4] == 's') &&
        (helping_pointer[5] != NULL) && (*helping_pointer[5] == 't'))))
-     header.existence_of_texcoords = EINA_TRUE;
+     header->existence_of_tex_coords = EINA_TRUE;
 
    helping_pointer = eina_str_split(map, "property uchar ", 0);
 
    if ((helping_pointer[1] != NULL) && (*helping_pointer[1] == 'r') &&
        (helping_pointer[2] != NULL) && (*helping_pointer[2] == 'g') &&
        (helping_pointer[3] != NULL) && (*helping_pointer[3] == 'b'))
-     header.existence_of_colors = EINA_TRUE;
-
-   free(helping_pointer);
-
-   return header;
-}
-
-void
-evas_model_load_file_ply(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
-{
-   Evas_Canvas3D_Mesh_Data *pd;
-   int i = 0, j = 0, count_of_triangles_in_line = 0;
-   float *pos, *nor, *tex, *col;
-   int stride_pos, stride_nor, stride_tex, stride_col;
-   char *current, *map;
-   PLY_Header header;
-   float *_vertices_ply = NULL, *_normals_ply = NULL;
-   float *_tex_coords_ply = NULL, *_colors_ply = NULL;
-   char **helping_pointer;
-
-   map = eina_file_map_all(file, EINA_FILE_SEQUENTIAL);
+     header->existence_of_colors = EINA_TRUE;
 
-   if (map == NULL)
-     {
-        ERR("Failed to create map from file %s\n", eina_file_filename_get(file));
-        return;
-     }
-
-   header = _read_header(map);
-
-   if (!header.existence_of_geometries)
+   if (!header->existence_of_positions)
      {
         ERR("File have not x, y, or z field as the first 3 float fields. They are necessary.");
-        return;
+        return EINA_FALSE;
      }
 
-   helping_pointer = eina_str_split(map, "end_header\n", 0);
-
-   if (helping_pointer == NULL)
-     {
-        ERR("File have not kayword end_header. It is necessary.");
-        return;
-     }
-
-   current = helping_pointer[1];
-
-   _vertices_ply = malloc(header.vertices_count * 3 * sizeof(float));
-   if (header.existence_of_normals)
-     _normals_ply = malloc(header.vertices_count * 3 * sizeof(float));
-   if (header.existence_of_texcoords)
-     _tex_coords_ply = malloc(header.vertices_count * 2 * sizeof(float));
-   if (header.existence_of_colors)
-     _colors_ply = malloc(header.vertices_count * 3 * sizeof(float));
-   unsigned short *_indices = malloc(header.triangles_count * 3 * sizeof(unsigned short));
-
-   if ((header.existence_of_geometries && (_vertices_ply == NULL)) ||
-       (header.existence_of_normals && (_normals_ply == NULL)) ||
-       (header.existence_of_texcoords && (_tex_coords_ply == NULL)) ||
-       (header.existence_of_colors && (_colors_ply == NULL)) ||
-       (_indices == NULL))
-     {
-        ERR("Allocate memory is failed.");
-        free(_vertices_ply);
-        free(_normals_ply);
-        free(_tex_coords_ply);
-        free(_colors_ply);
-        free(_indices);
-        return;
-     }
+   free(helping_pointer);
+   return EINA_TRUE;
+}
 
+static inline void
+_read_ply_vertex_data(Evas_Model_Load_Save_Header header,
+                      char **current,
+                      Evas_Model_Load_Save_Data data)
+{
+   int i;
    for (i = 0; i < header.vertices_count; i++)
      {
-        current = _read_data(_vertices_ply, i, 3, current, 1.0);
+        *current = _read_data(data.positions, i, 3, *current, 1.0);
         if (header.existence_of_normals)
-          current = _read_data(_normals_ply, i, 3, current, 1.0);
-        if (header.existence_of_texcoords)
-          current = _read_data(_tex_coords_ply, i, 2, current, 1.0);
+          *current = _read_data(data.normals, i, 3, *current, 1.0);
+        if (header.existence_of_tex_coords)
+          *current = _read_data(data.tex_coords, i, 2, *current, 1.0);
         if (header.existence_of_colors)
-          current = _read_data(_colors_ply, i, 3, current, 255.0);
-        current = _to_begin_of_line(current);
+          *current = _read_data(data.colors, i, 3, *current, 255.0);
+        *current = _to_begin_of_line(*current);
      }
+}
 
-   for (i = 0; i < header.triangles_count * 3;)
+static inline void
+_read_ply_indices_data(Evas_Model_Load_Save_Header header,
+                       char **current,
+                       Evas_Model_Load_Save_Data data)
+{
+   int i, j, count_of_triangles_in_line = 0;
+
+   for (i = 0; i < header.indices_count;)
      {
-        sscanf (current,"%d", &count_of_triangles_in_line);
+        sscanf (*current,"%d", &count_of_triangles_in_line);
         count_of_triangles_in_line -= 2;
-        current = _to_next_number(current, 1);
+        *current = _to_next_number(*current, 1);
 
-        sscanf (current,"%hu", _indices + i);
+        sscanf (*current,"%hu", data.indices + i);
 
         for (j = 0; j < count_of_triangles_in_line; j++)
           {
              if (j > 0)
-               _indices[i] = _indices[i - 3];
-             current = _to_next_number(current, 1);
-             sscanf (current,"%hu %hu",
-                     _indices + i + 1,
-                     _indices + i + 2);
+               data.indices[i] = data.indices[i - 3];
+             *current = _to_next_number(*current, 1);
+             sscanf (*current,"%hu %hu",
+                     data.indices + i + 1,
+                     data.indices + i + 2);
              i+=3;
           }
-        current = _to_next_line(current);
+        *current = _to_next_line(*current);
      }
+}
 
-   /* prepare of mesh and take pointers to data which must be read */
-   eo_do(mesh,
-         evas_canvas3d_mesh_vertex_count_set(header.vertices_count),
-         evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
-         evas_canvas3d_mesh_frame_add(0),
-         evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL),
-         evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,   0, NULL),
-         evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL),
-         evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,    0, NULL),
-
-         pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
-         nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
-         tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD),
-         col = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR),
-
-         stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
-         stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
-         stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD),
-         stride_col = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR));
-
-   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;
-   if (stride_col == 0) stride_col = sizeof(float) * 4;
-
-
-   for (j = 0; j < header.vertices_count; j++)
-     {
-        float *p, *n, *t, *c;
-
-        p = (float *)((char *)pos + stride_pos * j);
-        n = (float *)((char *)nor + stride_nor * j);
-        t = (float *)((char *)tex + stride_tex * j);
-        c = (float *)((char *)col + stride_col * j);
-
-
-        p[0] = ARRAY_2D(_vertices_ply, j, 0, 3);
-        p[1] = ARRAY_2D(_vertices_ply, j, 1, 3);
-        p[2] = ARRAY_2D(_vertices_ply, j, 2, 3);
-
-        if (header.existence_of_normals)
-          {
-             n[0] = ARRAY_2D(_normals_ply, j, 0, 3);
-             n[1] = ARRAY_2D(_normals_ply, j, 1, 3);
-             n[2] = ARRAY_2D(_normals_ply, j, 2, 3);
-          }
-        else
-          {
-             n[0] = 0.0;
-             n[1] = 0.0;
-             n[2] = 0.0;
-          }
-
-        if (header.existence_of_texcoords)
-          {
-             t[0] = ARRAY_2D(_tex_coords_ply, j, 0, 2);
-             t[1] = ARRAY_2D(_tex_coords_ply, j, 1, 2);
-          }
-        else
-          {
-             t[0] = 0.0;
-             t[1] = 0.0;
-          }
+void
+evas_model_load_file_ply(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
+{
+   char *current = NULL, *map = NULL;
+   Evas_Model_Load_Save_Header header;
+   Evas_Model_Load_Save_Data data;
+   Evas_Model_Load_Save_Stride stride;
 
-        if (header.existence_of_colors)
-          {
-             c[0] = ARRAY_2D(_colors_ply, j, 0, 3);
-             c[1] = ARRAY_2D(_colors_ply, j, 1, 3);
-             c[2] = ARRAY_2D(_colors_ply, j, 2, 3);
-             c[3] = 1.0;
-          }
-        else
-          {
-             c[0] = 0.0;
-             c[1] = 0.0;
-             c[2] = 0.0;
-             c[3] = 1.0;
-          }
+   map = eina_file_map_all(file, EINA_FILE_SEQUENTIAL);
+   if (map == NULL)
+     {
+        ERR("Failed to create map from file %s\n", eina_file_filename_get(file));
+        return;
      }
 
-   eo_do(mesh,
-         evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
-                                                header.triangles_count * 3,
-                                                _indices));
+   header = evas_model_load_save_header_new();
+   if(!_read_ply_header(map, &header)) return;
 
-   free(helping_pointer);
-   free(_vertices_ply);
-   if (header.existence_of_normals)
-     free(_normals_ply);
-   if (header.existence_of_texcoords)
-     free(_tex_coords_ply);
-   if (header.existence_of_colors)
-     free(_colors_ply);
-   free(_indices);
-
-        /* Unmap vertex buffer. */
-   eo_do(mesh,
-         evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
-         evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
-         evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD),
-         evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR));
-
-   pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
-
-   if (!evas_canvas3d_mesh_aabb_add_to_frame(pd, 0, stride_pos))
+   if (!evas_model_load_allocate_data_due_to_header(header, &data))
      {
-        ERR("Axis-Aligned Bounding Box wan't added in frame %d ", 0);
+        ERR("Memory allocation is failed.");
+        return;
      }
 
+   current = eina_str_split(map, "end_header\n", 0)[1];
+   _read_ply_vertex_data(header, &current, data);
+   _read_ply_indices_data(header, &current, data);
+   evas_model_load_vertex_data_to_mesh(mesh, header, data, &stride);
+   evas_model_load_indices_data_to_mesh(mesh, header, data);
+   evas_model_load_vertex_data_unmap(mesh, 0, header);
+   evas_model_load_aabb_add_to_frame(mesh, 0, stride);
+
    if (map)
      {
         eina_file_map_free(file, map);
         map = NULL;
      }
-}
 
+   evas_model_load_save_data_free(header, &data);
+}