aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ClientHamr/extantz/extantz.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/ClientHamr/extantz/extantz.c b/ClientHamr/extantz/extantz.c
index 0cf2ed7..f05441b 100644
--- a/ClientHamr/extantz/extantz.c
+++ b/ClientHamr/extantz/extantz.c
@@ -292,8 +292,7 @@ static const char vertex_shader[] =
292 " gl_FragColor = color + white * dot(light_direction, rotated_normal);\n" 292 " gl_FragColor = color + white * dot(light_direction, rotated_normal);\n"
293 "}\n"; 293 "}\n";
294 294
295static GLuint 295static GLuint load_shader(GLData *gld, GLenum type, const char *shader_src)
296load_shader(GLData *gld, GLenum type, const char *shader_src)
297{ 296{
298 Evas_GL_API *gl = gld->glapi; 297 Evas_GL_API *gl = gld->glapi;
299 GLuint shader; 298 GLuint shader;
@@ -365,7 +364,7 @@ static void _on_camera_input_down(void *data, Evas *evas, Evas_Object *obj, void
365 { 364 {
366 if (gld->move) 365 if (gld->move)
367 { 366 {
368 // TODO - Careful, gld->move MIGHT be read at the other end by another thread. MIGHT, coz I really don't now at what point the camera animate routine is actually called. 367 // TODO - Careful, gld->move MIGHT be read at the other end by another thread. MIGHT, coz I really don't know at what point the camera animate routine is actually called.
369 368
370 // Yes, we are dealing with the horrid Evas keyboard handling FUCKING STRING COMPARES! Soooo ... 369 // Yes, we are dealing with the horrid Evas keyboard handling FUCKING STRING COMPARES! Soooo ...
371 // TODO - make this a hash lookup dammit. 370 // TODO - make this a hash lookup dammit.
@@ -467,7 +466,7 @@ static void _on_camera_input_up(void *data, Evas *evas, Evas_Object *obj, void *
467 { 466 {
468 if (gld->move) 467 if (gld->move)
469 { 468 {
470 // TODO - Careful, gld->move MIGHT be read at the other end by another thread. MIGHT, coz I really don't now at what point the camera animate routine is actually called. 469 // TODO - Careful, gld->move MIGHT be read at the other end by another thread. MIGHT, coz I really don't know at what point the camera animate routine is actually called.
471 470
472 // Yes, we are dealing with the horrid Evas keyboard handling FUCKING STRING COMPARES! Soooo ... 471 // Yes, we are dealing with the horrid Evas keyboard handling FUCKING STRING COMPARES! Soooo ...
473 // TODO - make this a hash lookup dammit. 472 // TODO - make this a hash lookup dammit.
@@ -600,8 +599,7 @@ static void on_pixels(void *data, Evas_Object *obj)
600 gld->resized = 0; 599 gld->resized = 0;
601} 600}
602 601
603static void 602static void on_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
604on_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
605{ 603{
606 // on delete of our object clean up some things that don't get auto 604 // on delete of our object clean up some things that don't get auto
607 // deleted for us as they are not intrinsically bound to the image 605 // deleted for us as they are not intrinsically bound to the image
@@ -933,8 +931,7 @@ static void _grid_sel_cb(void *data, Evas_Object *obj, void *event_info)
933// system(buf); 931// system(buf);
934} 932}
935 933
936static void 934static void fill(Evas_Object *win)
937fill(Evas_Object *win)
938{ 935{
939 Evas_Object *bg, *bx, *ic, *bb, *av, *en, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; 936 Evas_Object *bg, *bx, *ic, *bb, *av, *en, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu;
940 Elm_Object_Item *tb_it, *menu_it, *tab_it; 937 Elm_Object_Item *tb_it, *menu_it, *tab_it;
@@ -1081,8 +1078,7 @@ fill(Evas_Object *win)
1081 evas_object_show(bx); 1078 evas_object_show(bx);
1082} 1079}
1083 1080
1084static void 1081static void cb_mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info)
1085cb_mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info)
1086{ 1082{
1087 Evas_Event_Mouse_Move *ev = event_info; 1083 Evas_Event_Mouse_Move *ev = event_info;
1088 Evas_Object *orig = data; 1084 Evas_Object *orig = data;
@@ -1120,8 +1116,7 @@ cb_mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info)
1120 evas_map_free(p); 1116 evas_map_free(p);
1121} 1117}
1122 1118
1123static void 1119static void create_handles(Evas_Object *obj)
1124create_handles(Evas_Object *obj)
1125{ 1120{
1126 int i; 1121 int i;
1127 Evas_Coord x, y, w, h; 1122 Evas_Coord x, y, w, h;