--- deliantra/server/socket/image.C 2007/07/01 05:00:20 1.44 +++ deliantra/server/socket/image.C 2007/08/30 08:34:40 1.54 @@ -37,139 +37,6 @@ #include "crc.h" -#define MAX_FACE_SETS 20 /**< Maximum number of image sets the program will handle */ - -/** Information about one image */ -typedef struct FaceInfo -{ - uint8 *data; /**< image data */ - uint16 datalen; /**< length of the xpm data */ - uint32 checksum; /**< Checksum of face data */ -} FaceInfo; - -/** Information about one face set */ -typedef struct -{ - char *prefix; /**< */ - char *fullname; - - uint8 fallback; /**< faceset to use when an image is not found in this faceset */ - char *size; - char *extension; - char *comment; - - FaceInfo *faces; /**< images in this faceset */ -} FaceSets; - -static FaceSets facesets[MAX_FACE_SETS]; /**< All facesets */ - -/** - * Checks specified faceset is valid - * \param fsn faceset number - */ -int -is_valid_faceset (int fsn) -{ - if (fsn >= 0 && fsn < MAX_FACE_SETS && facesets[fsn].prefix) - return TRUE; - return FALSE; -} - -/** - * Frees all faceset information - */ -void -free_socket_images (void) -{ - int num, q; - - for (num = 0; num < MAX_FACE_SETS; num++) - { - if (facesets[num].prefix) - { - for (q = 0; q < faces.size (); q++) - if (facesets[num].faces[q].data) - free (facesets[num].faces[q].data); - - free (facesets[num].prefix); - free (facesets[num].fullname); - free (facesets[num].size); - free (facesets[num].extension); - free (facesets[num].comment); - free (facesets[num].faces); - } - } -} - -/** - * This returns the set we will actually use when sending - * a face. This is used because the image files may be sparse. - * This function is recursive. imageno is the face number we are - * trying to send - * - * If face is not found in specified faceset, tries with 'fallback' faceset. - * - * \param faceset faceset to check - * \param imageno image number - * - */ -static int -get_face_fallback (int faceset, int imageno) -{ - /* faceset 0 is supposed to have every image, so just return. Doing - * so also prevents infinite loops in the case if it not having - * the face, but in that case, we are likely to crash when we try - * to access the data, but that is probably preferable to an infinite - * loop. - */ - if (faceset == 0) - return 0; - - if (!facesets[faceset].prefix) - { - LOG (llevError, "get_face_fallback called with unused set (%d)?\n", faceset); - return 0; /* use default set */ - } - - if (facesets[faceset].faces[imageno].data) - return faceset; - - return get_face_fallback (facesets[faceset].fallback, imageno); -} - -/** - * Checks fallback are correctly defined. - * This is a simple recursive function that makes sure the fallbacks - * are all proper (eg, the fall back to defined sets, and also - * eventually fall back to 0). At the top level, togo is set to MAX_FACE_SETS, - * if togo gets to zero, it means we have a loop. - * This is only run when we first load the facesets. - */ -static void -check_faceset_fallback (int faceset, int togo) -{ - int fallback = facesets[faceset].fallback; - - /* proper case - falls back to base set */ - if (fallback == 0) - return; - - if (!facesets[fallback].prefix) - { - LOG (llevError, "Face set %d falls to non set faceset %d\n", faceset, fallback); - abort (); - } - - togo--; - if (togo == 0) - { - LOG (llevError, "Infinite loop found in facesets. aborting.\n"); - abort (); - } - - check_faceset_fallback (fallback, togo); -} - #define MAX_IMAGE_SIZE 10000 /** @@ -202,6 +69,8 @@ sscanf (buf, "%d %d", &idx, &pri); + //TODO: somehow fetch default priority from send_fx here + const facedata *d = face_data (idx, ns->faceset); if (!d) @@ -213,14 +82,39 @@ ix.idx = idx; ix.ofs = d->data.size (); - // the by far most common case will be to insert - // right at the end, so no looping. - auto (i, ns->ixface.end ()); - for (; i != ns->ixface.begin (); ) - if (pri >= (--i)->pri) - break; + auto (pos, ns->ixface.end ()); - ns->ixface.insert (i, ix); + if (ns->fxix < 2) + { + // gcfclient does not support prioritising, older cfplus versions + // do not support interleaved transfers. + if (!ns->ixface.empty ()) + pos = ns->ixface.end () - 1; + } + else + { + // the by far most common case will be to insert + // near the end, so little looping. + while (pos != ns->ixface.begin ()) + { + --pos; + + // sort within 2k bins, to slightly prefer smaller images + if (pri > pos->pri || (pri == pos->pri && (ix.ofs >> 11) <= (pos->ofs >> 11))) + { + ++pos; + break; + } + } + } + + ns->ixface.insert (pos, ix); + +#if 0 + for (auto (i, ns->ixface.begin ()); i != ns->ixface.end (); ++i) + fprintf (stderr, "<%d,%d> ", i->pri, i->ofs); + fprintf (stderr, "\n"); +#endif } /** @@ -230,7 +124,7 @@ void AskSmooth (char *buf, int len, client *ns) { - ns->send_face (atoi (buf)); + ns->send_face (atoi (buf), -100); ns->flush_fx (); } @@ -269,21 +163,25 @@ * we look at the facecache, and if set, send the image name. */ void -client::send_face (faceidx facenum) +client::send_face (faceidx facenum, int pri) { // never send face 0. ever. it does not exist. if (!facenum) return; - const facedata *d = face_data (facenum, faceset); + faceinfo *f = face_info (facenum); - if (!d) + if (!f) { - LOG (llevError, "client::send_face (%d) out of bounds??\n", facenum); + LOG (llevError | logBacktrace, "client::send_face (%d) out of bounds??\n", facenum); return; } - if (faces_sent[facenum]) + // refuse to send non-image faces + if (!fx_want [f->type]) + return; + + if (faces_sent [facenum]) return; faces_sent[facenum] = true; @@ -299,6 +197,8 @@ return; } + const facedata *d = f->data (faceset); + packet sl; if (force_face0) @@ -314,8 +214,6 @@ if (EMI_smooth) { - faceinfo *f = face_info (facenum); - if (f->smooth) { send_face (f->smooth); @@ -336,15 +234,24 @@ { packet fx ("fx"); packet sx ("sx"); + int type = 0; do { faceidx facenum = fxface.back (); fxface.pop_back (); - const facedata *d = face_data (facenum, faceset); - - if (d) + if (const faceinfo *f = face_info (facenum)) { + if (f->type != type) + { + type = f->type; + + fx << ber32 (0) + << uint8 (1) << uint8 (type); + } + + const facedata *d = f->data (faceset); + fx << ber32 (facenum) << data8 (d->chksum, CHKSUM_SIZE); @@ -354,7 +261,8 @@ if (f->smooth) { - send_face (f->smooth); + send_face (f->smooth, -110); + sx << ber32 (facenum) << ber32 (f->smooth) << ber32 (f->smoothlevel); @@ -363,7 +271,7 @@ } } while (!fxface.empty () - && fx.room () > ber32::size + CHKSUM_SIZE + 1 + && fx.room () > ber32::size + CHKSUM_SIZE + 1 + 3 /* type switch */ && sx.room () > ber32::size * 3); send_packet (fx); @@ -388,8 +296,6 @@ return; } - //TODO: check type here? - if (force_image_newmap) force_newmap = true; @@ -414,14 +320,14 @@ void client::send_faces (object *ob) { - send_face (ob->face); + send_face (ob->face, 10); if (ob->animation_id) { animation &anim = animations [ob->animation_id]; for (int i = 0; i < anim.num_animations; i++) - send_face (anim.faces [i]); + send_face (anim.faces [i], -10); } } @@ -455,7 +361,7 @@ */ for (int i = 0; i < animations[anim_num].num_animations; i++) { - send_face (animations[anim_num].faces[i]); + send_face (animations[anim_num].faces[i], -20); sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ } @@ -516,20 +422,22 @@ sl.printf ("replyinfo image_sums %d %d ", start, stop); for (int i = start; i <= stop && i < faces.size (); i++) - { - ns->faces_sent[i] = true; + if (const faceinfo *f = face_info (i)) + if (ns->fx_want [f->type]) + { + ns->faces_sent[i] = true; - const facedata *d = face_data (i, ns->faceset); + const facedata *d = f->data (ns->faceset); - if (sl.room () < 2 + 4 + 1 + d->data.size () + 1) - break; + if (sl.room () < 2 + 4 + 1 + d->data.size () + 1) + break; - sl << uint16 (i) - << uint32 (0) // checksum - << uint8 (ns->faceset); + sl << uint16 (i) + << uint32 (0) // checksum + << uint8 (ns->faceset); - print_facename (sl, *d); sl << uint8 (0); - } + print_facename (sl, *d); sl << uint8 (0); + } /* It would make more sense to catch this pre-emptively in the code above. * however, if this really happens, we probably just want to cut down the @@ -537,7 +445,7 @@ * support. */ //TODO: taken care of above, should simply abort or make sure the above code is correct - if (sl.length () >= MAXSOCKBUF) + if (sl.length () > MAXSOCKBUF) { LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF); abort ();