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.61 by root, Wed Nov 4 13:46:37 2009 UTC vs.
Revision 1.72 by root, Sun Nov 11 04:29:11 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * 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 Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * 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>
23 */ 23 */
24 24
25/** \file 25/** \file
26 * Image related communication 26 * Image related communication
… …
56 const facedata *d = face_data (idx, ns->faceset); 56 const facedata *d = face_data (idx, ns->faceset);
57 57
58 if (!d) 58 if (!d)
59 return; // doh 59 return; // doh
60 60
61 /* cfperl_ix calls cf::face::ix which loads the data */
62 /* and then calls cf::client::send_ix to actually queue the ix */
63 cfperl_ix (ns, idx, pri, d->size, d->fofs);
64}
65
66void
67client::ix_send (faceidx idx, sint16 pri, SV *data_sv)
68{
69 STRLEN size;
70 char *data = SvPVbyte (data_sv, size);
61 client::ixsend ix; 71 ixsend ix;
62 72
63 ix.pri = pri; 73 ix.pri = pri;
64 ix.idx = idx; 74 ix.idx = idx;
65 ix.ofs = d->data.size (); 75 ix.ofs = size;
76 ix.data = (uint8 *)data;
77 ix.data_sv = SvREFCNT_inc (data_sv);
66 78
67 auto (pos, ns->ixface.end ()); 79 auto (pos, ixface.end ());
68 80
69 // the by far most common case will be to insert 81 // the by far most common case will be to insert
70 // near the end, so little looping. 82 // near the end, so little looping.
71 while (pos != ns->ixface.begin ()) 83 while (pos != ixface.begin ())
72 { 84 {
73 --pos; 85 --pos;
74 86
75 // sort within 2k bins, to slightly prefer smaller images 87 // sort within 2k bins, to slightly prefer smaller images
76 if (pri > pos->pri || (pri == pos->pri && (ix.ofs >> 11) <= (pos->ofs >> 11))) 88 if (pri > pos->pri || (pri == pos->pri && (ix.ofs >> 11) <= (pos->ofs >> 11)))
… …
78 ++pos; 90 ++pos;
79 break; 91 break;
80 } 92 }
81 } 93 }
82 94
83 ns->ixface.insert (pos, ix); 95 ixface.insert (pos, ix);
84 96
85#if 0 97#if 0
86 for (auto (i, ns->ixface.begin ()); i != ns->ixface.end (); ++i) 98 for (auto (i, ixface.begin ()); i != ixface.end (); ++i)
87 fprintf (stderr, "<%d,%d> ", i->pri, i->ofs); 99 fprintf (stderr, "<%d,%d> ", i->pri, i->ofs);
88 fprintf (stderr, "\n"); 100 fprintf (stderr, "\n");
89#endif 101#endif
90} 102}
91 103
104void
105client::ix_pop ()
106{
107 ixsend &ix = ixface.back ();
108
109 SvREFCNT_dec (ix.data_sv);
110
111 ixface.pop_back ();
112}
113
92/** 114/**
93 * Sends a face to a client if they are in pixmap mode 115 * Sends a face offer (fx) to a client.
94 * nothing gets sent in bitmap mode.
95 * If nocache is true (nonzero), ignore the cache setting from the client - 116 * If nocache is true (nonzero), ignore the cache setting from the client -
96 * this is needed for the askface, in which we really do want to send the 117 * this is needed for the askface, in which we really do want to send the
97 * face (and askface is the only place that should be setting it). Otherwise, 118 * face (and askface is the only place that should be setting it). Otherwise,
98 * we look at the facecache, and if set, send the image name. 119 * we look at the facecache, and if set, send the image name.
99 */ 120 */
… …
110 { 131 {
111 LOG (llevError | logBacktrace, "client::send_face (%d) out of bounds??\n", facenum); 132 LOG (llevError | logBacktrace, "client::send_face (%d) out of bounds??\n", facenum);
112 return; 133 return;
113 } 134 }
114 135
115 // refuse to send non-image faces 136 // refuse to send non-image faces unless requested
116 if (!fx_want [f->type]) 137 if (!fx_want [f->type])
117 return; 138 return;
118 139
119 if (faces_sent [facenum]) 140 if (faces_sent [facenum])
120 return; 141 return;
121 142
122 faces_sent[facenum] = true; 143 faces_sent [facenum] = true;
123 144
124 fxface.push_back (facenum); 145 fxface.push_back (facenum);
125} 146}
126 147
127void client::flush_fx () 148void client::flush_fx ()
… …
147 } 168 }
148 169
149 const facedata *d = f->data (faceset); 170 const facedata *d = f->data (faceset);
150 171
151 fx << ber32 (facenum) 172 fx << ber32 (facenum)
152 << data8 (d->chksum, CHKSUM_SIZE); 173 << data8 (d->chksum, d->chksum_len);
153 174
154 if (smoothing) 175 if (smoothing)
155 { 176 {
156 faceinfo *f = face_info (facenum); 177 faceinfo *f = face_info (facenum);
157 178
… …
165 } 186 }
166 } 187 }
167 } 188 }
168 } 189 }
169 while (!fxface.empty () 190 while (!fxface.empty ()
170 && fx.room () > ber32::size + CHKSUM_SIZE + 1 + 3 /* type switch */ 191 && fx.room () > ber32::size + CHKSUM_MAXLEN + 1 + 3 /* type switch */
171 && sx.room () > ber32::size * 3); 192 && sx.room () > ber32::size * 3);
172 193
173 send_packet (fx); 194 send_packet (fx);
174 if (sx.length () > 3) send_packet (sx); 195 if (sx.length () > 3) send_packet (sx);
175 } 196 }
… …
230 send_packet (sl); 251 send_packet (sl);
231 252
232 anims_sent[anim_num] = 1; 253 anims_sent[anim_num] = 1;
233} 254}
234 255
256void
257client::invalidate_face (faceidx idx)
258{
259 faces_sent [idx] = false;
260 force_newmap = true;
261}
262
263void
264client::invalidate_all_faces ()
265{
266 faces_sent.reset ();
267 force_newmap = true;
268}
269

Diff Legend

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