diff options
author | David Walter Seikel | 2016-01-03 20:35:53 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-01-03 20:35:53 +1000 |
commit | 72093df9fdf281ccd581baf5993bdc2ec6957342 (patch) | |
tree | 5e071b445f7a8713776df6defb794549d9d16b7f /src/extantz | |
parent | Re-enable the web browser I had forgotten disabling. (diff) | |
download | SledjHamr-72093df9fdf281ccd581baf5993bdc2ec6957342.zip SledjHamr-72093df9fdf281ccd581baf5993bdc2ec6957342.tar.gz SledjHamr-72093df9fdf281ccd581baf5993bdc2ec6957342.tar.bz2 SledjHamr-72093df9fdf281ccd581baf5993bdc2ec6957342.tar.xz |
Clean up logging, removing most of the printf's.
Diffstat (limited to 'src/extantz')
-rw-r--r-- | src/extantz/camera.c | 10 | ||||
-rw-r--r-- | src/extantz/extantz.c | 6 | ||||
-rw-r--r-- | src/extantz/gears.c | 5 |
3 files changed, 9 insertions, 12 deletions
diff --git a/src/extantz/camera.c b/src/extantz/camera.c index 4bcf64c..123285c 100644 --- a/src/extantz/camera.c +++ b/src/extantz/camera.c | |||
@@ -92,9 +92,9 @@ static void _on_camera_input_down(void *data, Evas *evas, Evas_Object *obj, void | |||
92 | else if (0 == strcmp(ev->key, "Home")) move->x = -2.0; | 92 | else if (0 == strcmp(ev->key, "Home")) move->x = -2.0; |
93 | else if (0 == strcmp(ev->key, "End")) move->x = 2.0; | 93 | else if (0 == strcmp(ev->key, "End")) move->x = 2.0; |
94 | else if (0 == strcmp(ev->key, "space")) move->jump = 1.0; | 94 | else if (0 == strcmp(ev->key, "space")) move->jump = 1.0; |
95 | else printf("Unexpected down keystroke - %s\n", ev->key); | 95 | else PW("Unexpected down keystroke - %s", ev->key); |
96 | } | 96 | } |
97 | else printf("Camera input not ready\n"); | 97 | else PE("Camera input not ready"); |
98 | } | 98 | } |
99 | 99 | ||
100 | /* SL / OS camera controls | 100 | /* SL / OS camera controls |
@@ -184,9 +184,9 @@ static void _on_camera_input_up(void *data, Evas *evas, Evas_Object *obj, void * | |||
184 | else if (0 == strcmp(ev->key, "Home")) move->x = 0.0; | 184 | else if (0 == strcmp(ev->key, "Home")) move->x = 0.0; |
185 | else if (0 == strcmp(ev->key, "End")) move->x = 0.0; | 185 | else if (0 == strcmp(ev->key, "End")) move->x = 0.0; |
186 | else if (0 == strcmp(ev->key, "space")) move->jump = 0.0; | 186 | else if (0 == strcmp(ev->key, "space")) move->jump = 0.0; |
187 | else printf("Unexpected up keystroke - %s\n", ev->key); | 187 | else PW("Unexpected up keystroke - %s", ev->key); |
188 | } | 188 | } |
189 | else printf("Camera input not ready\n"); | 189 | else PE("Camera input not ready"); |
190 | } | 190 | } |
191 | 191 | ||
192 | /* While it's true that image is an Elm image, seems this Elm input event callback doesn't work. | 192 | /* While it's true that image is an Elm image, seems this Elm input event callback doesn't work. |
@@ -212,7 +212,7 @@ static Eina_Bool _cb_event_GL(void *data, Evas_Object *obj, Evas_Object *src, Ev | |||
212 | } | 212 | } |
213 | 213 | ||
214 | default : | 214 | default : |
215 | printf("Unknown GL input event.\n"); | 215 | PE("Unknown GL input event."); |
216 | } | 216 | } |
217 | 217 | ||
218 | return processed; | 218 | return processed; |
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index c2dadba..840dfec 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -42,7 +42,6 @@ static Eina_Bool clientParser(void *data, Connection *connection, char *SID, cha | |||
42 | || (0 == strncmp(command, "llSay(", 6)) | 42 | || (0 == strncmp(command, "llSay(", 6)) |
43 | || (0 == strncmp(command, "llShout(", 8))) | 43 | || (0 == strncmp(command, "llShout(", 8))) |
44 | { | 44 | { |
45 | |||
46 | sprintf(buf, "%s: %s", SID, command); | 45 | sprintf(buf, "%s: %s", SID, command); |
47 | if (ourGlobals->purkle) | 46 | if (ourGlobals->purkle) |
48 | { | 47 | { |
@@ -53,7 +52,7 @@ static Eina_Bool clientParser(void *data, Connection *connection, char *SID, cha | |||
53 | push_lua(ourGlobals->purkle->L, "@ ( $ )", _P, "append", buf, 0); | 52 | push_lua(ourGlobals->purkle->L, "@ ( $ )", _P, "append", buf, 0); |
54 | } | 53 | } |
55 | else | 54 | else |
56 | PW("No purkle to put - %s", buf); | 55 | PE("No purkle to put - %s", buf); |
57 | } | 56 | } |
58 | else if (0 == strncmp(command, "llDialog(", 9)) | 57 | else if (0 == strncmp(command, "llDialog(", 9)) |
59 | { | 58 | { |
@@ -69,7 +68,6 @@ static Eina_Bool clientParser(void *data, Connection *connection, char *SID, cha | |||
69 | } | 68 | } |
70 | else | 69 | else |
71 | PE("No LSLGuiMess to send - %s", command); | 70 | PE("No LSLGuiMess to send - %s", command); |
72 | |||
73 | } | 71 | } |
74 | else if (0 == strncmp(command, "loadSim(", 8)) | 72 | else if (0 == strncmp(command, "loadSim(", 8)) |
75 | { | 73 | { |
@@ -556,7 +554,7 @@ static Eina_Bool _makeLove(void *data) | |||
556 | ecore_job_add((Ecore_Cb) _makeFiles, ourGlobals); | 554 | ecore_job_add((Ecore_Cb) _makeFiles, ourGlobals); |
557 | // ecore_timer_add(0.1, _makeFiles, ourGlobals); | 555 | // ecore_timer_add(0.1, _makeFiles, ourGlobals); |
558 | 556 | ||
559 | PD("About to try connecting to a love server."); | 557 | // PD("About to try connecting to a love server."); |
560 | reachOut("love", "./love", "127.0.0.1", 8211 + 1, ourGlobals, (Ecore_Event_Handler_Cb) _add, /*(Ecore_Event_Handler_Cb) _data*/ NULL, (Ecore_Event_Handler_Cb) _del, clientParser); | 558 | reachOut("love", "./love", "127.0.0.1", 8211 + 1, ourGlobals, (Ecore_Event_Handler_Cb) _add, /*(Ecore_Event_Handler_Cb) _data*/ NULL, (Ecore_Event_Handler_Cb) _del, clientParser); |
561 | 559 | ||
562 | return ECORE_CALLBACK_CANCEL; | 560 | return ECORE_CALLBACK_CANCEL; |
diff --git a/src/extantz/gears.c b/src/extantz/gears.c index 68f817e..9998357 100644 --- a/src/extantz/gears.c +++ b/src/extantz/gears.c | |||
@@ -279,8 +279,7 @@ static GLuint load_shader(GLData *gld, GLenum type, const char *shader_src) | |||
279 | if (info) | 279 | if (info) |
280 | { | 280 | { |
281 | gl->glGetShaderInfoLog(shader, len, NULL, info); | 281 | gl->glGetShaderInfoLog(shader, len, NULL, info); |
282 | printf("Error compiling shader:\n" | 282 | PE("Error compiling shader: %s", info); |
283 | "%s\n", info); | ||
284 | free(info); | 283 | free(info); |
285 | } | 284 | } |
286 | } | 285 | } |
@@ -332,7 +331,7 @@ void gears_init(GLData *gld) | |||
332 | if (info) | 331 | if (info) |
333 | { | 332 | { |
334 | gld->glApi->glGetProgramInfoLog(gld->program, len, NULL, info); | 333 | gld->glApi->glGetProgramInfoLog(gld->program, len, NULL, info); |
335 | printf("Error linking program:\n%s\n", info); | 334 | PE("Error linking program: %s", info); |
336 | free(info); | 335 | free(info); |
337 | } | 336 | } |
338 | } | 337 | } |