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.56 by root, Tue May 6 16:55:26 2008 UTC vs.
Revision 1.60 by root, Mon Oct 12 14:00:59 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/** \file 25/** \file
… …
38#include "crc.h" 39#include "crc.h"
39 40
40#define MAX_IMAGE_SIZE 10000 41#define MAX_IMAGE_SIZE 10000
41 42
42/** 43/**
43 * Client tells us what type of faces it wants. Also sets
44 * the caching attribute.
45 *
46 */
47void
48SetFaceMode (char *buf, int len, client *ns)
49{
50 int mask = (atoi (buf) & CF_FACE_CACHE), mode = (atoi (buf) & ~CF_FACE_CACHE);
51
52 if (mode == CF_FACE_NONE)
53 ns->facecache = 1;
54 else if (mode != CF_FACE_PNG)
55 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, "Warning - send unsupported face mode. Will use Png");
56
57 if (mask)
58 ns->facecache = 1;
59}
60
61/**
62 * client requested an image. send it rate-limited 44 * client requested an image. send it rate-limited
63 * before flushing. 45 * before flushing.
64 */ 46 */
65void 47void
66AskFaceCmd (char *buf, int len, client *ns) 48AskFaceCmd (char *buf, int len, client *ns)
… …
82 ix.idx = idx; 64 ix.idx = idx;
83 ix.ofs = d->data.size (); 65 ix.ofs = d->data.size ();
84 66
85 auto (pos, ns->ixface.end ()); 67 auto (pos, ns->ixface.end ());
86 68
87 if (ns->fxix < 2)
88 {
89 // gcfclient does not support prioritising, older cfplus versions
90 // do not support interleaved transfers.
91 if (!ns->ixface.empty ())
92 pos = ns->ixface.end () - 1;
93 }
94 else
95 {
96 // the by far most common case will be to insert 69 // the by far most common case will be to insert
97 // near the end, so little looping. 70 // near the end, so little looping.
98 while (pos != ns->ixface.begin ()) 71 while (pos != ns->ixface.begin ())
72 {
73 --pos;
74
75 // sort within 2k bins, to slightly prefer smaller images
76 if (pri > pos->pri || (pri == pos->pri && (ix.ofs >> 11) <= (pos->ofs >> 11)))
99 { 77 {
100 --pos;
101
102 // sort within 2k bins, to slightly prefer smaller images
103 if (pri > pos->pri || (pri == pos->pri && (ix.ofs >> 11) <= (pos->ofs >> 11)))
104 {
105 ++pos; 78 ++pos;
106 break; 79 break;
107 }
108 } 80 }
109 } 81 }
110 82
111 ns->ixface.insert (pos, ix); 83 ns->ixface.insert (pos, ix);
112 84
113#if 0 85#if 0
114 for (auto (i, ns->ixface.begin ()); i != ns->ixface.end (); ++i) 86 for (auto (i, ns->ixface.begin ()); i != ns->ixface.end (); ++i)
115 fprintf (stderr, "<%d,%d> ", i->pri, i->ofs); 87 fprintf (stderr, "<%d,%d> ", i->pri, i->ofs);
116 fprintf (stderr, "\n"); 88 fprintf (stderr, "\n");
117#endif 89#endif
118}
119
120/**
121 * Tells client the picture it has to use
122 * to smooth a picture number given as argument.
123 */
124void
125AskSmooth (char *buf, int len, client *ns)
126{
127 ns->send_face (atoi (buf), -100);
128 ns->flush_fx ();
129}
130
131// how lame
132static void print_facename (packet &sl, const facedata &d)
133{
134 for (int i = 0; i < CHKSUM_SIZE; ++i)
135 sl.printf ("%02x", d.chksum [i]);
136}
137
138// gcfclient uses the server-provided checksum for comparison, but always
139// writes a broken checksum to its cache file, so we have to provide
140// gcfclient with the same broken (and useless) checksum just to have it
141// cache the image despite its bugs.
142static uint32 gcfclient_checksum (const facedata *d)
143{
144 uint32 csum = 0;
145
146 for (std::string::const_iterator i = d->data.begin ();
147 i != d->data.end ();
148 ++i)
149 {
150 csum = rotate_right (csum);
151 csum += *(uint8 *)&*i;
152 }
153
154 return csum;
155} 90}
156 91
157/** 92/**
158 * Sends a face to a client if they are in pixmap mode 93 * Sends a face to a client if they are in pixmap mode
159 * nothing gets sent in bitmap mode. 94 * nothing gets sent in bitmap mode.
… …
184 if (faces_sent [facenum]) 119 if (faces_sent [facenum])
185 return; 120 return;
186 121
187 faces_sent[facenum] = true; 122 faces_sent[facenum] = true;
188 123
189 // if for some reason we let a client without face caching connect,
190 // we better support that decision here and implement it.
191 if (!facecache)
192 return send_image (facenum);
193
194 if (fxix)
195 {
196 fxface.push_back (facenum); 124 fxface.push_back (facenum);
197 return;
198 }
199
200 const facedata *d = f->data (faceset);
201
202 packet sl;
203
204 if (force_face0)
205 sl << "face " << uint16 (facenum);
206 else if (image2)
207 sl << "face2 " << uint16 (facenum) << uint8 (0) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
208 else
209 sl << "face1 " << uint16 (facenum) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
210
211 // how lame
212 print_facename (sl, *d);
213 send_packet (sl);
214
215 if (EMI_smooth)
216 {
217 if (f->smooth)
218 {
219 send_face (f->smooth);
220
221 packet sl ("smooth");
222
223 sl << uint16 (facenum)
224 << uint16 (f->smooth);
225
226 send_packet (sl);
227 }
228 }
229} 125}
230 126
231void client::flush_fx () 127void client::flush_fx ()
232{ 128{
233 while (!fxface.empty ()) 129 while (!fxface.empty ())
… …
277 send_packet (fx); 173 send_packet (fx);
278 if (sx.length () > 3) send_packet (sx); 174 if (sx.length () > 3) send_packet (sx);
279 } 175 }
280} 176}
281 177
282void
283client::send_image (faceidx facenum)
284{
285 // never send face 0. ever. it does not exist.
286 if (!facenum)
287 return;
288
289 const facedata *d = face_data (facenum, faceset);
290
291 faces_sent[facenum] = true;
292
293 if (!d)
294 {
295 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
296 return;
297 }
298
299 if (force_image_newmap)
300 force_newmap = true;
301
302 packet sl;
303
304 sl << (image2 ? "image2 " : "image ")
305 << uint32 (facenum);
306
307 if (image2)
308 sl << uint8 (0);
309
310 sl << uint32 (d->data.size ())
311 << data (d->data.data (), d->data.size ());
312
313 send_packet (sl);
314}
315
316// send all faces of this object to the client 178// send all faces of this object to the client
317// this uses more bandwidth initially, but makes 179// this uses more bandwidth initially, but makes
318// animations look much smoother, and every client 180// animations look much smoother, and every client
319// is supposed to do client-side caching anyways. 181// is supposed to do client-side caching anyways.
320void 182void
… …
322{ 184{
323 send_face (ob->face, 10); 185 send_face (ob->face, 10);
324 186
325 if (ob->animation_id) 187 if (ob->animation_id)
326 { 188 {
327 animation &anim = animations [ob->animation_id]; 189 const animation &anim = ob->anim ();
328 190
329 for (int i = 0; i < anim.num_animations; i++) 191 for (int i = 0; i < anim.num_animations; i++)
330 send_face (anim.faces [i], -10); 192 send_face (anim.faces [i], -10);
331 } 193 }
332} 194}
… …
434 296
435 sl << uint16 (i) 297 sl << uint16 (i)
436 << uint32 (0) // checksum 298 << uint32 (0) // checksum
437 << uint8 (ns->faceset); 299 << uint8 (ns->faceset);
438 300
439 print_facename (sl, *d); sl << uint8 (0); 301 for (int i = 0; i < CHKSUM_SIZE; ++i)
302 sl.printf ("%02x", d->chksum [i]);
303
304 sl << uint8 (0);
440 } 305 }
441 306
442 /* It would make more sense to catch this pre-emptively in the code above. 307 /* It would make more sense to catch this pre-emptively in the code above.
443 * however, if this really happens, we probably just want to cut down the 308 * however, if this really happens, we probably just want to cut down the
444 * size to less than 1000, since that is what we claim the protocol would 309 * size to less than 1000, since that is what we claim the protocol would

Diff Legend

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