ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/image.C
(Generate patch)

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.39 by root, Tue Apr 3 00:21:38 2007 UTC vs.
Revision 1.46 by root, Fri Jul 6 03:52:51 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25/** \file 24/** \file
26 * Image related communication 25 * Image related communication
27 * 26 *
… …
191 if (mask) 190 if (mask)
192 ns->facecache = 1; 191 ns->facecache = 1;
193} 192}
194 193
195/** 194/**
196 * Client has requested pixmap that it somehow missed getting. 195 * client requested an image. send it rate-limited
197 * This will be called often if the client is 196 * before flushing.
198 * caching images.
199 */ 197 */
200void 198void
201SendFaceCmd (char *buf, int len, client *ns) 199AskFaceCmd (char *buf, int len, client *ns)
202{ 200{
201 int idx = 0, pri = 0;
202
203 sscanf (buf, "%d %d", &idx, &pri);
204
205 const facedata *d = face_data (idx, ns->faceset);
206
207 if (!d)
208 return; // doh
209
210 client::ixsend ix;
211
212 ix.pri = pri;
213 ix.idx = idx;
214 ix.ofs = d->data.size ();
215
216 auto (pos, ns->ixface.end ());
217
218 if (ns->fxix < 2)
219 {
220 // gcfclient does not support prioritising, older cfplus versions
221 // do not support interleaved transfers.
222 if (!ns->ixface.empty ())
223 pos = ns->ixface.end () - 1;
224 }
225 else
226 {
227 // the by far most common case will be to insert
228 // near the end, so little looping.
229 while (pos != ns->ixface.begin ())
230 {
231 --pos;
232
233 // sort within 2k bins, to slightly prefer smaller images
234 if (pri > pos->pri || (pri == pos->pri && (ix.ofs >> 11) <= (pos->ofs >> 11)))
235 {
236 ++pos;
237 break;
238 }
239 }
240 }
241
242 ns->ixface.insert (pos, ix);
243
244#if 0
245 for (auto (i, ns->ixface.begin ()); i != ns->ixface.end (); ++i)
246 fprintf (stderr, "<%d,%d> ", i->pri, i->ofs);
247 fprintf (stderr, "\n");
248#endif
249}
250
251/**
252 * Tells client the picture it has to use
253 * to smooth a picture number given as argument.
254 */
255void
256AskSmooth (char *buf, int len, client *ns)
257{
203 ns->send_image (atoi (buf)); 258 ns->send_face (atoi (buf));
259 ns->flush_fx ();
204} 260}
205 261
206// how lame 262// how lame
207static void print_facename (packet &sl, const facedata &d) 263static void print_facename (packet &sl, const facedata &d)
208{ 264{
… …
279 335
280 // how lame 336 // how lame
281 print_facename (sl, *d); 337 print_facename (sl, *d);
282 send_packet (sl); 338 send_packet (sl);
283 339
340 if (EMI_smooth)
341 {
284 faceinfo *f = face_info (facenum); 342 faceinfo *f = face_info (facenum);
285 if (f->smooth && EMI_smooth) 343
286 { 344 if (f->smooth)
345 {
287 send_face (f->smooth); 346 send_face (f->smooth);
288 347
289 packet sl ("smooth"); 348 packet sl ("smooth");
290 349
291 sl << uint16 (facenum) 350 sl << uint16 (facenum)
292 << uint16 (f->smooth); 351 << uint16 (f->smooth);
293 352
294 send_packet (sl); 353 send_packet (sl);
354 }
295 } 355 }
296} 356}
297 357
298void client::flush_fx () 358void client::flush_fx ()
299{ 359{
300 while (!fxface.empty ()) 360 while (!fxface.empty ())
301 { 361 {
302 packet sl ("fx"); 362 packet fx ("fx");
363 packet sx ("sx");
303 364
304 do 365 do
305 { 366 {
306 faceidx facenum = fxface.back (); fxface.pop_back (); 367 faceidx facenum = fxface.back (); fxface.pop_back ();
307 368
308 const facedata *d = face_data (facenum, faceset); 369 const facedata *d = face_data (facenum, faceset);
309 370
310 if (d) 371 if (d)
311 { 372 {
312 sl << ber32 (facenum) 373 fx << ber32 (facenum)
313 << data8 (d->chksum, CHKSUM_SIZE); 374 << data8 (d->chksum, CHKSUM_SIZE);
314 375
376 if (smoothing)
377 {
315 faceinfo *f = face_info (facenum); 378 faceinfo *f = face_info (facenum);
379
316 if (f->smooth && EMI_smooth) 380 if (f->smooth)
381 {
382 send_face (f->smooth);
383 sx << ber32 (facenum)
317 sl << ber32 (f->smooth); 384 << ber32 (f->smooth)
385 << ber32 (f->smoothlevel);
386 }
387 }
318 } 388 }
319 } 389 }
320 while (!fxface.empty () && sl.room () > CHKSUM_SIZE + 8 + 8); 390 while (!fxface.empty ()
391 && fx.room () > ber32::size + CHKSUM_SIZE + 1
392 && sx.room () > ber32::size * 3);
321 393
322 send_packet (sl); 394 send_packet (fx);
395 if (sx.length () > 3) send_packet (sx);
323 } 396 }
324} 397}
325 398
326void 399void
327client::send_image (faceidx facenum) 400client::send_image (faceidx facenum)
… …
330 if (!facenum) 403 if (!facenum)
331 return; 404 return;
332 405
333 const facedata *d = face_data (facenum, faceset); 406 const facedata *d = face_data (facenum, faceset);
334 407
408 faces_sent[facenum] = true;
409
335 if (!d) 410 if (!d)
336 { 411 {
337 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum); 412 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
338 return; 413 return;
339 } 414 }
340 415
341 faces_sent[facenum] = true; 416 //TODO: check type here?
342 417
343 if (force_image_newmap) 418 if (force_image_newmap)
344 force_newmap = true; 419 force_newmap = true;
345 420
346 packet sl; 421 packet sl;
… …
387{ 462{
388 /* Do some checking on the anim_num we got. Note that the animations 463 /* Do some checking on the anim_num we got. Note that the animations
389 * are added in contigous order, so if the number is in the valid 464 * are added in contigous order, so if the number is in the valid
390 * range, it must be a valid animation. 465 * range, it must be a valid animation.
391 */ 466 */
392 if (anim_num < 0 || anim_num > num_animations) 467 if (anim_num < 0 || anim_num >= animations.size ())
393 { 468 {
394 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 469 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
395 return; 470 return;
396 } 471 }
397 472

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines