From 2fd8f1aaa3dd0444fea3ad943984a862ac52630c Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Thu, 29 May 2014 23:34:56 +1000 Subject: Half arsed generic stuffs creation. --- src/extantz/Evas_3D_demo.c | 354 ++++++++++++++++++++++++++++++++++----------- src/extantz/extantz.c | 3 +- src/extantz/extantz.h | 9 ++ src/libraries/love.h | 2 +- 4 files changed, 279 insertions(+), 89 deletions(-) (limited to 'src') diff --git a/src/extantz/Evas_3D_demo.c b/src/extantz/Evas_3D_demo.c index 371bba7..2d3d46e 100644 --- a/src/extantz/Evas_3D_demo.c +++ b/src/extantz/Evas_3D_demo.c @@ -232,17 +232,14 @@ _sphere_init(int precision) } } -Eina_Bool _animate_scene(globals *ourGlobals) +static void _animateCube(ExtantzStuffs *stuffs) { static float angle = 0.0f; - static float earthAngle = 0.0f; static int frame = 0; static int inc = 1; - static int sonicFrame = 0; + Evas_3D_Mesh *m; - Scene_Data *scene = ourGlobals->scene; - - // Animate cube. + eina_accessor_data_get(stuffs->aMesh, 0, (void **) &m); angle += 0.5; if (angle > 360.0) angle -= 360.0f; @@ -250,10 +247,24 @@ Eina_Bool _animate_scene(globals *ourGlobals) if (frame >= 20) inc = -1; else if (frame <= 0) inc = 1; - eo_do(scene->mesh_node, + eo_do(stuffs->mesh_node, evas_3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0), - evas_3d_node_mesh_frame_set(scene->mesh, frame) - ); + evas_3d_node_mesh_frame_set(m, frame) + ); +} + +Eina_Bool _animate_scene(globals *ourGlobals) +{ + static float earthAngle = 0.0f; + static int sonicFrame = 0; + ExtantzStuffs *e; + + Scene_Data *scene = ourGlobals->scene; + + EINA_CLIST_FOR_EACH_ENTRY(e, &ourGlobals->stuffs, ExtantzStuffs, node) + { + if (e->animateStuffs) e->animateStuffs(e); + } // Animate sonic. sonicFrame += 32; @@ -266,88 +277,12 @@ Eina_Bool _animate_scene(globals *ourGlobals) earthAngle += 0.3; if (earthAngle > 360.0) earthAngle -= 360.0f; eo_do(scene->mesh3_node, - evas_3d_node_orientation_angle_axis_set(angle, 0.0, 1.0, 0.0) + evas_3d_node_orientation_angle_axis_set(earthAngle, 0.0, 1.0, 0.0) ); return EINA_TRUE; } -static void _cube_setup(globals *ourGlobals, Scene_Data *scene) -{ - char buf[PATH_MAX]; - - // Setup cube materials. - scene->texture0 = eo_add(EVAS_3D_TEXTURE_CLASS, ourGlobals->evas, - evas_3d_texture_data_set(EVAS_3D_COLOR_FORMAT_RGBA, EVAS_3D_PIXEL_FORMAT_8888, 4, 4, &pixels0[0]) - ); - - scene->texture1 = eo_add(EVAS_3D_TEXTURE_CLASS, ourGlobals->evas, - evas_3d_texture_data_set(EVAS_3D_COLOR_FORMAT_RGBA, EVAS_3D_PIXEL_FORMAT_8888, 4, 4, &pixels1[0]) - ); - - snprintf(buf, sizeof(buf), "%s/normal_lego.png", prefix_data_get()); - scene->texture_normal = eo_add(EVAS_3D_TEXTURE_CLASS, ourGlobals->evas, - evas_3d_texture_file_set(buf, NULL) - ); - - scene->material0 = eo_add(EVAS_3D_MATERIAL_CLASS, ourGlobals->evas, - evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), - evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), - evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), - evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), - - evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), - evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), - evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_3d_material_shininess_set(100.0), - evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, scene->texture0) - ); - - scene->material1 = eo_add(EVAS_3D_MATERIAL_CLASS, ourGlobals->evas, - evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), - evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), - evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), - evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), - - evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), - evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), - evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_3d_material_shininess_set(100.0), - - evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, scene->texture1), - evas_3d_material_texture_set(EVAS_3D_MATERIAL_NORMAL, scene->texture_normal) - ); - - // Setup CUBE mesh. - scene->mesh = eo_add(EVAS_3D_MESH_CLASS, ourGlobals->evas, - evas_3d_mesh_vertex_count_set(24), - evas_3d_mesh_frame_add(0), - - evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_POSITION, 12 * sizeof(float), &cube_vertices[ 0]), - evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_NORMAL, 12 * sizeof(float), &cube_vertices[ 3]), - evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_COLOR, 12 * sizeof(float), &cube_vertices[ 6]), - evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]), - - evas_3d_mesh_index_data_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]), - evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES), - - evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_NORMAL_MAP), - - evas_3d_mesh_frame_material_set(0, scene->material0), - - evas_3d_mesh_frame_add(20), - evas_3d_mesh_frame_material_set(20, scene->material1) - ); - - scene->mesh_node = eo_add_custom(EVAS_3D_NODE_CLASS, ourGlobals->evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH), - eo_key_data_set("Name", "cube", NULL), - evas_3d_node_position_set(0.0, 4.0, 10.0), - evas_3d_node_mesh_add(scene->mesh) - ); - - eo_do(scene->root_node, evas_3d_node_member_add(scene->mesh_node)); -} - static void _sonic_setup(globals *ourGlobals, Scene_Data *scene) { char buf[PATH_MAX]; @@ -443,12 +378,257 @@ static void _earth_setup(globals *ourGlobals, Scene_Data *scene) eo_do(scene->root_node, evas_3d_node_member_add(scene->mesh3_node)); } +/* For now lets just pretend we got stuffs sent from our love. + +Stuffs = +{ + name = "Test sim", + description = 'onefangs test SledjHamr sim.', +-- owner = '12345678-1234-4321-abcd-0123456789ab', + details = + { + stuffs = + { + Mesh = + { + fileName = 'onefang%27s%20test%20bed.omg', + pos = {0.0, 4.0, 10.0}, + size = {1.0, 1.0, 1.0}, + rot = {1.0, 0.0, 0.0, 0.0}, + }, + Mesh = + { + fileName = 'sonic.omg', + pos = {0.0, 0.0, 0.0}, + size = {1.0, 1.0, 1.0}, + rot = {-0.7071067811865475, 0.0, 0.0, 0.7071067811865475}, + }, + Mesh = + { + fileName = 'earth.omg', + pos = {0.0, 0.0, 0.0}, + size = {1.0, 1.0, 1.0}, + rot = {1.0, 0.0, 0.0, 0.0}, + }, + }, + }, +} + + +Stuffs = +{ + name = "onefang's test bed", + description = 'Just a pretend bed with MLP scripts for testing SledjHamr.', +-- owner = '12345678-1234-4321-abcd-0123456789ab', + details = + { + Mesh = + { + kind = 'cube', + materials = {'normal_lego.png'}, + }, + }, +} + + +Stuffs = +{ + name = "onefang's left testicle", + description = 'Just a pretend world for testing SledjHamr.', +-- owner = '12345678-1234-4321-abcd-0123456789ab', + details = + { + Mesh = + { + kind = 'sphere', +-- insert prim parameters here + materials = {'EarthDiffuse.png'}, + }, + }, +} + + +Stuffs = +{ + name = "Sonic the bed hog.", + description = 'Just a pretend avatar for testing SledjHamr.', +-- owner = '12345678-1234-4321-abcd-0123456789ab', + details = + { + Mesh = + { + fileName = 'sonic.md2', + materials = {'sonic.png'}, + }, + }, +} + +*/ + +void stuffs_setup(ExtantzStuffs *stuffs, globals *ourGlobals, Scene_Data *scene, int fake) +{ + char buf[PATH_MAX]; + Material *m; + Evas_3D_Texture *t, *t1, *ti; + Evas_3D_Material *mi, *mj; + Evas_3D_Mesh *me; + + // TODO - using Eina arrays of any sort seems a bit heavy, might be better to just count and realloc? + stuffs->materials = eina_array_new(3); + stuffs->mesh = eina_array_new(3); + stuffs->textures = eina_array_new(3); + stuffs->aMaterial = eina_array_accessor_new(stuffs->materials); + stuffs->aMesh = eina_array_accessor_new(stuffs->mesh); + stuffs->aTexture = eina_array_accessor_new(stuffs->textures); + +// TODO - These examples just don't fit neatly into anything I can whip up quickly as a data format. +// So just fake it for now, and expand the data format later. + + // Textures + if (1 == fake) + { + t = eo_add(EVAS_3D_TEXTURE_CLASS, ourGlobals->evas, + evas_3d_texture_data_set(EVAS_3D_COLOR_FORMAT_RGBA, EVAS_3D_PIXEL_FORMAT_8888, 4, 4, &pixels0[0]) + ); + eina_array_push(stuffs->textures, t); + + t1 = eo_add(EVAS_3D_TEXTURE_CLASS, ourGlobals->evas, + evas_3d_texture_data_set(EVAS_3D_COLOR_FORMAT_RGBA, EVAS_3D_PIXEL_FORMAT_8888, 4, 4, &pixels1[0]) + ); + eina_array_push(stuffs->textures, t1); + } + else if (2 == fake) + { + } + else if (3 == fake) + { + } + + EINA_INARRAY_FOREACH(stuffs->stuffs.details.mesh->materials, m) + { + snprintf(buf, sizeof(buf), "%s/%s", prefix_data_get(), m->texture); + ti = eo_add(EVAS_3D_TEXTURE_CLASS, ourGlobals->evas, evas_3d_texture_file_set(buf, NULL)); + eina_array_push(stuffs->textures, ti); + } + + // Materials. + if (1 == fake) + { + eina_accessor_data_get(stuffs->aTexture, 0, (void **) &t); + mi = eo_add(EVAS_3D_MATERIAL_CLASS, ourGlobals->evas, + evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), + evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), + evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), + evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), + + evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), + evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), + evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), + evas_3d_material_shininess_set(100.0), + evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, t) + ); + eina_array_push(stuffs->materials, mi); + + eina_accessor_data_get(stuffs->aTexture, 1, (void **) &t1); + eina_accessor_data_get(stuffs->aTexture, 2, (void **) &ti); + mj = eo_add(EVAS_3D_MATERIAL_CLASS, ourGlobals->evas, + evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), + evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), + evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), + evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), + + evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), + evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), + evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), + evas_3d_material_shininess_set(100.0), + + evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, t1), + evas_3d_material_texture_set(EVAS_3D_MATERIAL_NORMAL, ti) + ); + eina_array_push(stuffs->materials, mj); + } + else if (2 == fake) + { + } + else if (3 == fake) + { + } + + // Meshes + // TODO - Write real generic cube and sphere stuff later. + if (MT_CUBE == stuffs->stuffs.details.mesh->type) + { + eina_accessor_data_get(stuffs->aMaterial, 0, (void **) &mi); + eina_accessor_data_get(stuffs->aMaterial, 1, (void **) &mj); + me = eo_add(EVAS_3D_MESH_CLASS, ourGlobals->evas, + evas_3d_mesh_vertex_count_set(24), + evas_3d_mesh_frame_add(0), + + evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_POSITION, 12 * sizeof(float), &cube_vertices[ 0]), + evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_NORMAL, 12 * sizeof(float), &cube_vertices[ 3]), + evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_COLOR, 12 * sizeof(float), &cube_vertices[ 6]), + evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]), + + evas_3d_mesh_index_data_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]), + evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES), + + evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_NORMAL_MAP), + + evas_3d_mesh_frame_material_set(0, mi), + + evas_3d_mesh_frame_add(20), + evas_3d_mesh_frame_material_set(20, mj) + ); + eina_array_push(stuffs->mesh, me); + stuffs->animateStuffs = (aniStuffs) _animateCube; + } + else if (MT_CUBE == stuffs->stuffs.details.mesh->type) + { + } + else + { + } + + eina_accessor_data_get(stuffs->aMesh, 0, (void **) &me); + stuffs->mesh_node = eo_add_custom(EVAS_3D_NODE_CLASS, ourGlobals->evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH), + eo_key_data_set("Name", stuffs->stuffs.name, NULL), + evas_3d_node_position_set(stuffs->stuffs.details.mesh->pos.x, stuffs->stuffs.details.mesh->pos.y, stuffs->stuffs.details.mesh->pos.z), + evas_3d_node_mesh_add(me) + ); + + eo_do(scene->root_node, evas_3d_node_member_add(stuffs->mesh_node)); + eina_clist_add_head(&(ourGlobals->stuffs), &(stuffs->node)); +} + +Material bedMat; +Mesh bedMesh; +ExtantzStuffs eStuffs; void Evas_3D_Demo_add(globals *ourGlobals) { + + bedMat.face = -1; // face -1 means "all of them I think". + bedMat.type = TT_NORMAL; + sprintf(bedMat.texture, "normal_lego.png"); + + sprintf(bedMesh.fileName, "onefang%%27s%%20test%%20bed.omg"); + bedMesh.type = MT_CUBE; + bedMesh.pos.x = 0.0; bedMesh.pos.y = 4.0; bedMesh.pos.z = 10.0; + bedMesh.rot.x = 1.0; bedMesh.rot.y = 0.0; bedMesh.rot.z = 0.0; bedMesh.rot.w = 0.0; + bedMesh.materials = eina_inarray_new(sizeof(Material), 1); + bedMesh.materials = eina_inarray_new(sizeof(Mesh), 1); + eina_inarray_push(bedMesh.materials, &bedMat); + + sprintf(eStuffs.stuffs.UUID, FAKE_UUID); + sprintf(eStuffs.stuffs.name, "onefang's test bed"); + sprintf(eStuffs.stuffs.description, "Just a pretend bed with MLP scripts for testing SledjHamr."); + sprintf(eStuffs.stuffs.owner, "12345678-1234-4321-abcd-0123456789ab"); + eStuffs.stuffs.details.mesh = &bedMesh; + ourGlobals->scene = scenriAdd(ourGlobals->win); - _cube_setup(ourGlobals, ourGlobals->scene); + stuffs_setup(&eStuffs, ourGlobals, ourGlobals->scene, 1); + _sonic_setup(ourGlobals, ourGlobals->scene); _earth_setup(ourGlobals, ourGlobals->scene); } diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index 4f5d9ea..d8a265c 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c @@ -145,7 +145,7 @@ static void _onWorldClick(void *data, Evas *e EINA_UNUSED, Evas_Object *o, void char *name = NULL; name = evas_object_data_get(n, "Name"); - if (strcmp("cube", name) == 0) + if (strcmp("onefang's test bed", name) == 0) { char SID[64]; @@ -587,6 +587,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) if (!ephysics_init()) return 1; + eina_clist_init(&(ourGlobals.stuffs)); gld = &ourGlobals.gld; gldata_init(gld); diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h index 57fb273..17379a6 100644 --- a/src/extantz/extantz.h +++ b/src/extantz/extantz.h @@ -163,6 +163,8 @@ typedef struct _Scene_Data Evas_Object_Event_Cb clickCb; } Scene_Data; +typedef void (* aniStuffs)(void *stuffs); + typedef struct _extantzStuffs { Stuffs stuffs; @@ -171,8 +173,14 @@ typedef struct _extantzStuffs Eina_Array *mesh; // Evas_3D_Mesh Eina_Array *materials; // Evas_3D_Material Eina_Array *textures; // Evas_3D_Texture + Eina_Accessor *aMesh; + Eina_Accessor *aMaterial; + Eina_Accessor *aTexture; + aniStuffs animateStuffs; + Eina_Clist node; } ExtantzStuffs; + // Elm GL view related data here. typedef struct _GLData { @@ -237,6 +245,7 @@ typedef struct _globals GLData gld; Scene_Data *scene; + Eina_Clist stuffs; EPhysics_World *world; diff --git a/src/libraries/love.h b/src/libraries/love.h index c7f243f..26fbe06 100644 --- a/src/libraries/love.h +++ b/src/libraries/love.h @@ -141,7 +141,7 @@ typedef struct _mesh typedef struct _stuffs { - char UUID[45], *name, *description, owner[45]; + char UUID[45], name[PATH_MAX], description[PATH_MAX], owner[45]; //type union { -- cgit v1.1