aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2016-02-06 22:15:45 +1000
committerDavid Walter Seikel2016-02-06 22:15:45 +1000
commit8392eade4c2f7d82163a472bd74fd16122700f64 (patch)
tree337ebc549b31490d6e185a085f4dbf6ea81e4c7a
parentAdd test terrain support. (diff)
downloadSledjHamr-8392eade4c2f7d82163a472bd74fd16122700f64.zip
SledjHamr-8392eade4c2f7d82163a472bd74fd16122700f64.tar.gz
SledjHamr-8392eade4c2f7d82163a472bd74fd16122700f64.tar.bz2
SledjHamr-8392eade4c2f7d82163a472bd74fd16122700f64.tar.xz
Lights! Cameras! Action?
-rw-r--r--src/extantz/scenri.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/extantz/scenri.c b/src/extantz/scenri.c
index 912aad9..0e495e4 100644
--- a/src/extantz/scenri.c
+++ b/src/extantz/scenri.c
@@ -390,10 +390,8 @@ Scene_Data *scenriAdd(Evas_Object *win)
390 evas_object_resize(scene->image, WIDTH, HEIGHT); 390 evas_object_resize(scene->image, WIDTH, HEIGHT);
391 evas_object_show(scene->image); 391 evas_object_show(scene->image);
392#endif 392#endif
393 elm_object_tooltip_text_set(scene->image, "");
394 elm_object_tooltip_hide(scene->image);
395 scene->camera_node = cameraAdd(evas, scene, scene->image);
396 393
394 // Lights!
397 scene->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas, 395 scene->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas,
398 evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), 396 evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0),
399 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 397 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
@@ -407,6 +405,13 @@ Scene_Data *scenriAdd(Evas_Object *win)
407 ); 405 );
408 eo_do(scene->root_node, evas_canvas3d_node_member_add(scene->light_node)); 406 eo_do(scene->root_node, evas_canvas3d_node_member_add(scene->light_node));
409 407
408 // Cameras!
409 scene->camera_node = cameraAdd(evas, scene, scene->image);
410
411 // Action?
412 elm_object_tooltip_text_set(scene->image, "");
413 elm_object_tooltip_hide(scene->image);
414
410#if USE_ELM_IMG 415#if USE_ELM_IMG
411 eo_do(temp, evas_obj_image_scene_set(scene->scene)); 416 eo_do(temp, evas_obj_image_scene_set(scene->scene));
412 417