| … | |
… | |
| 88 | client::handle_command () |
88 | client::handle_command () |
| 89 | { |
89 | { |
| 90 | bool skipping = false; |
90 | bool skipping = false; |
| 91 | |
91 | |
| 92 | while (!cmd_queue.empty () |
92 | while (!cmd_queue.empty () |
| 93 | && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0)) |
93 | && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0.f)) |
| 94 | { |
94 | { |
| 95 | command &cmd = cmd_queue.front (); |
95 | command &cmd = cmd_queue.front (); |
| 96 | |
96 | |
| 97 | if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) |
97 | if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) |
| 98 | { |
98 | { |
| … | |
… | |
| 170 | draw_client_map (pl->ob); |
170 | draw_client_map (pl->ob); |
| 171 | |
171 | |
| 172 | if (update_look) |
172 | if (update_look) |
| 173 | esrv_draw_look (pl->ob); |
173 | esrv_draw_look (pl->ob); |
| 174 | |
174 | |
| 175 | if (askface.empty ()) |
175 | if (askface.empty () && !partial_face_ofs) |
| 176 | { |
176 | { |
| 177 | // regularly send a new face when queue is empty |
177 | // regularly send a new face when queue is empty |
| 178 | if (bg_scrub && !--bg_scrub && enable_bg_scrub) |
178 | if (bg_scrub && !--bg_scrub && enable_bg_scrub) |
| 179 | while (scrub_idx < faces.size () - 1) |
179 | while (scrub_idx < faces.size () - 1) |
| 180 | { |
180 | { |
| 181 | ++scrub_idx; |
181 | ++scrub_idx; |
| 182 | if (!faces_sent [scrub_idx]) |
182 | if (!faces_sent [scrub_idx]) |
| 183 | { |
183 | { |
| 184 | send_face (scrub_idx); |
184 | send_face (scrub_idx); |
|
|
185 | flush_fx (); |
|
|
186 | |
| 185 | bg_scrub = 1; // send up to one face per tick, unless an image was requested |
187 | bg_scrub = 1; // send up to one face per tick, unless an image was requested |
| 186 | break; |
188 | break; |
| 187 | } |
189 | } |
| 188 | } |
190 | } |
| 189 | |
191 | |
| … | |
… | |
| 195 | |
197 | |
| 196 | rate_avail = min (max_rate, rate_avail + max_rate); |
198 | rate_avail = min (max_rate, rate_avail + max_rate); |
| 197 | rate_avail -= ol; |
199 | rate_avail -= ol; |
| 198 | |
200 | |
| 199 | int avail = rate_avail; |
201 | int avail = rate_avail; |
| 200 | |
202 | |
| 201 | // if we can split images, transfer up to mss packets if possible |
203 | // if we can split images, transfer up to mss packets if possible |
|
|
204 | // but never more 768 bytes more. |
| 202 | if (fxix) avail += mss - (ol % mss); |
205 | if (fxix) avail += min (768, mss - (ol % mss)); |
| 203 | |
206 | |
| 204 | fprintf (stderr, "ra %6d a %6d ", rate_avail, avail); |
207 | bg_scrub = BG_SCRUB_RATE; |
| 205 | |
208 | |
| 206 | while (!askface.empty () && avail > 0) |
209 | while (avail > 0) |
| 207 | { |
210 | { |
|
|
211 | if (partial_face_ofs) |
|
|
212 | { |
|
|
213 | if (facedata *d = face_data (partial_face, faceset)) |
|
|
214 | { |
|
|
215 | // 9 bytes is enough for fx_FFFOOO, 40 leaves some room |
|
|
216 | int chunk = min (min (avail - 40, MAXSOCKBUF - 9), partial_face_ofs); |
|
|
217 | |
|
|
218 | if (chunk <= 0) |
|
|
219 | break; |
|
|
220 | |
|
|
221 | partial_face_ofs -= chunk; |
|
|
222 | |
|
|
223 | packet sl ("ix"); |
|
|
224 | |
|
|
225 | sl << ber32 (partial_face) |
|
|
226 | << ber32 (partial_face_ofs) |
|
|
227 | << data (d->data.data () + partial_face_ofs, chunk); |
|
|
228 | |
|
|
229 | send_packet (sl); |
|
|
230 | } |
|
|
231 | else |
|
|
232 | partial_face_ofs = 0; |
|
|
233 | } |
|
|
234 | else if (!askface.empty ()) |
|
|
235 | { |
| 208 | // use a lifo to send most recently requested images |
236 | // use a lifo to send most recently requested images |
| 209 | faceidx face = askface.back (); |
237 | faceidx facenum = askface.back (); |
| 210 | askface.pop_back (); |
238 | askface.pop_back (); |
| 211 | |
239 | |
|
|
240 | if (fxix) |
|
|
241 | { |
|
|
242 | if (facedata *d = face_data (facenum, faceset)) |
|
|
243 | { |
|
|
244 | partial_face = facenum; |
|
|
245 | partial_face_ofs = d->data.size (); |
|
|
246 | } |
|
|
247 | } |
|
|
248 | else |
| 212 | send_image (face); |
249 | send_image (facenum); |
| 213 | |
250 | } |
| 214 | bg_scrub = BG_SCRUB_RATE; |
251 | else |
|
|
252 | break; |
| 215 | |
253 | |
| 216 | int consumed = ol - outputbuffer_len (); |
254 | int consumed = ol - outputbuffer_len (); |
| 217 | avail -= consumed; |
255 | avail -= consumed; |
| 218 | rate_avail -= consumed; |
256 | rate_avail -= consumed; |
| 219 | } |
257 | } |
| 220 | |
|
|
| 221 | fprintf (stderr, "ra %6d a %6d\n", rate_avail, avail); |
|
|
| 222 | |
|
|
| 223 | } |
258 | } |
| 224 | } |
259 | } |
| 225 | |
260 | |
