aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/extantz
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-12-26 19:20:15 +1000
committerDavid Walter Seikel2014-12-26 19:20:15 +1000
commit64cc747f267fdde1c0044bd1b944afc0604f01e2 (patch)
treed95815a83209fbd728f643a4f0e57a8ad5c3f108 /src/extantz
parentSome notes about trees. (diff)
downloadSledjHamr-64cc747f267fdde1c0044bd1b944afc0604f01e2.zip
SledjHamr-64cc747f267fdde1c0044bd1b944afc0604f01e2.tar.gz
SledjHamr-64cc747f267fdde1c0044bd1b944afc0604f01e2.tar.bz2
SledjHamr-64cc747f267fdde1c0044bd1b944afc0604f01e2.tar.xz
Bring it up to date with EFL changes. Though more are needed.
Diffstat (limited to 'src/extantz')
-rw-r--r--src/extantz/camera.c2
-rw-r--r--src/extantz/scenri.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/extantz/camera.c b/src/extantz/camera.c
index 9ba76bf..adbae6f 100644
--- a/src/extantz/camera.c
+++ b/src/extantz/camera.c
@@ -228,7 +228,7 @@ Evas_3D_Node *cameraAdd(Evas *evas, Scene_Data *scene, Evas_Object *image)
228 evas_3d_camera_projection_perspective_set(90.0, 1.0, 1.0, 1024.0) 228 evas_3d_camera_projection_perspective_set(90.0, 1.0, 1.0, 1024.0)
229 ); 229 );
230 230
231 result = eo_add_custom(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA), 231 result = eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA),
232 evas_3d_node_camera_set(camera), 232 evas_3d_node_camera_set(camera),
233 evas_3d_node_position_set(0.0, 20.0, 30.0), 233 evas_3d_node_position_set(0.0, 20.0, 30.0),
234// evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 20.0, EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0), 234// evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 20.0, EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0),
diff --git a/src/extantz/scenri.c b/src/extantz/scenri.c
index 42a7987..e6462a0 100644
--- a/src/extantz/scenri.c
+++ b/src/extantz/scenri.c
@@ -361,7 +361,7 @@ Scene_Data *scenriAdd(Evas_Object *win)
361 eina_clist_init(&(scene->stuffs)); 361 eina_clist_init(&(scene->stuffs));
362 eina_clist_init(&(scene->loading)); 362 eina_clist_init(&(scene->loading));
363 363
364 scene->root_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 364 scene->root_node = eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
365 365
366 scene->scene = eo_add(EVAS_3D_SCENE_CLASS, evas, 366 scene->scene = eo_add(EVAS_3D_SCENE_CLASS, evas,
367 evas_3d_scene_root_node_set(scene->root_node), 367 evas_3d_scene_root_node_set(scene->root_node),
@@ -389,7 +389,7 @@ Scene_Data *scenriAdd(Evas_Object *win)
389 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0), 389 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0),
390 evas_3d_light_directional_set(EINA_TRUE) 390 evas_3d_light_directional_set(EINA_TRUE)
391 ); 391 );
392 scene->light_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT), 392 scene->light_node = eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT),
393 evas_3d_node_light_set(scene->light), 393 evas_3d_node_light_set(scene->light),
394 evas_3d_node_position_set(1000.0, 0.0, 1000.0), 394 evas_3d_node_position_set(1000.0, 0.0, 1000.0),
395 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) 395 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)
@@ -860,7 +860,7 @@ void stuffsSetup(ExtantzStuffs *stuffs, Scene_Data *scene, int fake)
860 eina_accessor_data_get(stuffs->aMaterial, 0, (void **) &mi); 860 eina_accessor_data_get(stuffs->aMaterial, 0, (void **) &mi);
861 snprintf(buf, sizeof(buf), "%s/%s", prefix_data_get(), stuffs->stuffs.details.mesh->fileName); 861 snprintf(buf, sizeof(buf), "%s/%s", prefix_data_get(), stuffs->stuffs.details.mesh->fileName);
862 me = eo_add(EVAS_3D_MESH_CLASS, scene->evas, 862 me = eo_add(EVAS_3D_MESH_CLASS, scene->evas,
863 evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_MD2, buf, NULL), 863 efl_file_set(buf, NULL),
864 evas_3d_mesh_frame_material_set(0, mi), 864 evas_3d_mesh_frame_material_set(0, mi),
865 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG) 865 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)
866 ); 866 );
@@ -868,7 +868,7 @@ void stuffsSetup(ExtantzStuffs *stuffs, Scene_Data *scene, int fake)
868 } 868 }
869 869
870 eina_accessor_data_get(stuffs->aMesh, 0, (void **) &me); 870 eina_accessor_data_get(stuffs->aMesh, 0, (void **) &me);
871 stuffs->mesh_node = eo_add_custom(EVAS_3D_NODE_CLASS, scene->evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH), 871 stuffs->mesh_node = eo_add(EVAS_3D_NODE_CLASS, scene->evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH),
872 eo_key_data_set("Name", stuffs->stuffs.name, NULL), 872 eo_key_data_set("Name", stuffs->stuffs.name, NULL),
873 evas_3d_node_position_set(stuffs->stuffs.details.mesh->pos.x, stuffs->stuffs.details.mesh->pos.y, stuffs->stuffs.details.mesh->pos.z), 873 evas_3d_node_position_set(stuffs->stuffs.details.mesh->pos.x, stuffs->stuffs.details.mesh->pos.y, stuffs->stuffs.details.mesh->pos.z),
874 evas_3d_node_orientation_set(stuffs->stuffs.details.mesh->rot.x, stuffs->stuffs.details.mesh->rot.y, stuffs->stuffs.details.mesh->rot.z, stuffs->stuffs.details.mesh->rot.w), 874 evas_3d_node_orientation_set(stuffs->stuffs.details.mesh->rot.x, stuffs->stuffs.details.mesh->rot.y, stuffs->stuffs.details.mesh->rot.z, stuffs->stuffs.details.mesh->rot.w),