cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=35773988e5a0583dc9c854d32766a2c3dd02a2f6
commit 35773988e5a0583dc9c854d32766a2c3dd02a2f6 Author: Bogdan Devichev <[email protected]> Date: Wed Mar 18 11:46:55 2015 +0100 evas: add evas-common.h to dist and move resources of parallax-occlusion to comon directory. Reviewers: Hermet, raster, cedric Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2044 Signed-off-by: Cedric BAIL <[email protected]> --- src/examples/evas/Makefile.am | 7 ++++++- src/examples/evas/evas-3d-parallax-occlusion.c | 19 +++++++++++++++---- .../evas/{ => resources/images}/four_NM_height.tga | Bin src/examples/evas/{ => resources/images}/rocks.jpg | Bin .../evas/{ => resources/images}/rocks_NM_height.tga | Bin src/examples/evas/{ => resources/images}/wood.jpg | Bin 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am index d02dd34..80604ec 100644 --- a/src/examples/evas/Makefile.am +++ b/src/examples/evas/Makefile.am @@ -334,6 +334,10 @@ resources/images/cube1.png \ resources/images/normal_lego.png \ resources/images/sonic.png \ resources/images/sweet_home_reversed.png \ +resources/images/wood.jpg \ +resources/images/rocks.jpg \ +resources/images/four_NM_height.tga \ +resources/images/rocks_NM_height.tga \ resources/models/mesh_for_mmap.eet \ resources/models/mesh_for_mmap.md2 \ resources/models/mesh_for_mmap.obj \ @@ -351,7 +355,8 @@ resources/models/sweet_home.obj \ resources/models/sweet_home_only_vertex_coords.obj \ resources/models/sweet_home_without_normals.obj \ resources/models/sweet_home_without_tex_coords.obj \ -Makefile.examples +Makefile.examples \ +evas-common.h examples: $(EXTRA_PROGRAMS) $(EDJS) diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c index ca25b1f..b92f5a7 100644 --- a/src/examples/evas/evas-3d-parallax-occlusion.c +++ b/src/examples/evas/evas-3d-parallax-occlusion.c @@ -8,18 +8,29 @@ * @endverbatim */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#else +#define PACKAGE_EXAMPLES_DIR "." #define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT +#endif #include <Eo.h> #include <Evas.h> #include <Ecore.h> #include <Ecore_Evas.h> #include "evas-3d-primitives.h" +#include "evas-common.h" #define WIDTH 400 #define HEIGHT 400 +static const char *rock_diffuse = PACKAGE_EXAMPLES_DIR EVAS_MODEL_FOLDER "rocks.jpg"; +static const char *rock_n_and_height_map = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "rocks_NM_height.tga"; +static const char *wood_diffuse = PACKAGE_EXAMPLES_DIR EVAS_MODEL_FOLDER "wood.jpg"; +static const char *wood_n_and_height_map = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "four_NM_height.tga"; + typedef struct _Scene_Data { Eo *scene; @@ -136,10 +147,10 @@ _mesh_setup(Scene_Data *data) data->texture_rocks = eo_add(EVAS_3D_TEXTURE_CLASS, evas); data->texture_rocks_n = eo_add(EVAS_3D_TEXTURE_CLASS, evas); - eo_do(data->texture_rocks, evas_3d_texture_file_set("rocks.jpg", NULL), + eo_do(data->texture_rocks, evas_3d_texture_file_set(rock_diffuse, NULL), evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, EVAS_3D_WRAP_MODE_REPEAT)); - eo_do(data->texture_rocks_n, evas_3d_texture_file_set("rocks_NM_height.tga", NULL), + eo_do(data->texture_rocks_n, evas_3d_texture_file_set(rock_n_and_height_map, NULL), evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, EVAS_3D_WRAP_MODE_REPEAT)); @@ -162,10 +173,10 @@ _mesh_setup(Scene_Data *data) data->texture_wood = eo_add(EVAS_3D_TEXTURE_CLASS, evas); data->texture_four_n = eo_add(EVAS_3D_TEXTURE_CLASS, evas); - eo_do(data->texture_wood, evas_3d_texture_file_set("wood.jpg", NULL), + eo_do(data->texture_wood, evas_3d_texture_file_set(wood_diffuse, NULL), evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, EVAS_3D_WRAP_MODE_REPEAT)); - eo_do(data->texture_four_n, evas_3d_texture_file_set("four_NM_height.tga", NULL), + eo_do(data->texture_four_n, evas_3d_texture_file_set(wood_n_and_height_map, NULL), evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, EVAS_3D_WRAP_MODE_REPEAT)); diff --git a/src/examples/evas/four_NM_height.tga b/src/examples/evas/resources/images/four_NM_height.tga similarity index 100% rename from src/examples/evas/four_NM_height.tga rename to src/examples/evas/resources/images/four_NM_height.tga diff --git a/src/examples/evas/rocks.jpg b/src/examples/evas/resources/images/rocks.jpg similarity index 100% rename from src/examples/evas/rocks.jpg rename to src/examples/evas/resources/images/rocks.jpg diff --git a/src/examples/evas/rocks_NM_height.tga b/src/examples/evas/resources/images/rocks_NM_height.tga similarity index 100% rename from src/examples/evas/rocks_NM_height.tga rename to src/examples/evas/resources/images/rocks_NM_height.tga diff --git a/src/examples/evas/wood.jpg b/src/examples/evas/resources/images/wood.jpg similarity index 100% rename from src/examples/evas/wood.jpg rename to src/examples/evas/resources/images/wood.jpg --
