[ViewVC] Diff of: cvs/deliantra/server/socket/image.C

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.29 by root, Wed Mar 14 00:07:26 2007 UTC vs.
Revision 1.48 by root, Thu Jul 12 18:48:20 2007 UTC

 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (C) 2001 Mark Wedel
+ * Copyright (©) 2001,2007 Mark Wedel
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Crossfire TRT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * The author can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 /** \file
  * Image related communication
  *
   if (mask)
     ns->facecache = 1;
 }
 /**
- * Client has requested pixmap that it somehow missed getting.
+ * client requested an image. send it rate-limited
- * This will be called often if the client is
+ * before flushing.
- * caching images.
  */
 void
-SendFaceCmd (char *buf, int len, client *ns)
+AskFaceCmd (char *buf, int len, client *ns)
 {
+  int idx = 0, pri = 0;
+  sscanf (buf, "%d %d", &idx, &pri);
+  const facedata *d = face_data (idx, ns->faceset);
+  if (!d)
+    return; // doh
+  client::ixsend ix;
+  ix.pri = pri;
+  ix.idx = idx;
+  ix.ofs = d->data.size ();
+  auto (pos, ns->ixface.end ());
+  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
+}
+/**
+ * Tells client the picture it has to use
+ * to smooth a picture number given as argument.
+ */
+void
+AskSmooth (char *buf, int len, client *ns)
+{
-  ns->send_face (atoi (buf), 1);
+  ns->send_face (atoi (buf));
+  ns->flush_fx ();
 }
 // how lame
 static void print_facename (packet &sl, const facedata &d)
 {
   for (int i = 0; i < CHKSUM_SIZE; ++i)
     sl.printf ("%02x", d.chksum [i]);
 }
-// gcfclient uses the server-provided checksum for comparison,
+// gcfclient uses the server-provided checksum for comparison, but always
-// but always wrotes a broken checksum to its cache file, so we
+// writes a broken checksum to its cache file, so we have to provide
-// have to provide gcfclient with a useless checksum just to
+// gcfclient with the same broken (and useless) checksum just to have it
-// have to cache the image despite its bugs.
+// cache the image despite its bugs.
 static uint32 gcfclient_checksum (const facedata *d)
 {
   uint32 csum = 0;
   for (std::string::const_iterator i = d->data.begin ();
  * this is needed for the askface, in which we really do want to send the
  * face (and askface is the only place that should be setting it).  Otherwise,
  * we look at the facecache, and if set, send the image name.
  */
 void
-client::send_face (faceidx facenum, bool forced)
+client::send_face (faceidx facenum)
 {
   // never send face 0. ever. it does not exist.
   if (!facenum)
     return;
     {
       LOG (llevError, "client::send_face (%d) out of bounds??\n", facenum);
       return;
     }
+  // refuse tos end non-image faces
+  if (d->type)
+    return;
+  if (!must_send_face (facenum))
+    return;
+  // if for some reason we let a client without face caching connect,
+  // we better support that decision here and implement it.
+  if (!facecache)
+    return send_image (facenum);
+  if (fxix)
+    {
+      fxface.push_back (facenum);
+      return;
+    }
   packet sl;
-  if (facecache && !forced)
-    {
-      if (faces_sent[facenum] & NS_FACESENT_FACE)
-        return;
-      faces_sent[facenum] |= NS_FACESENT_FACE;
-      if (force_face0)
+  if (force_face0)
-        sl << "face " << uint16 (facenum);
+    sl << "face "  << uint16 (facenum);
-      else if (image2)
+  else if (image2)
-        sl << "face2 " << uint16 (facenum) << uint8 (0) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
+    sl << "face2 " << uint16 (facenum) << uint8 (0) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
-      else
-        sl << "face1 " << uint16 (facenum) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
-      // how lame
-      print_facename (sl, *d);
-    }
   else
+    sl << "face1 " << uint16 (facenum) << uint32 (force_bad_checksum ? gcfclient_checksum (d) : 0);
+  // how lame
+  print_facename (sl, *d);
+  send_packet (sl);
+  if (EMI_smooth)
+    {
+      faceinfo *f = face_info (facenum);
+      if (f->smooth)
+        {
+          send_face (f->smooth);
+          packet sl ("smooth");
+          sl << uint16 (facenum)
+             << uint16 (f->smooth);
+          send_packet (sl);
+        }
-    {
+    }
+}
+void client::flush_fx ()
+{
+  while (!fxface.empty ())
+    {
+      packet fx ("fx");
+      packet sx ("sx");
+      do
+        {
+          faceidx facenum = fxface.back (); fxface.pop_back ();
+          const facedata *d = face_data (facenum, faceset);
+          if (d)
+            {
+              fx << ber32 (facenum)
+                 << data8 (d->chksum, CHKSUM_SIZE);
+              if (smoothing)
+                {
+                  faceinfo *f = face_info (facenum);
+                  if (f->smooth)
+                    {
+                      send_face (f->smooth);
+                      sx << ber32 (facenum)
+                         << ber32 (f->smooth)
+                         << ber32 (f->smoothlevel);
+                    }
+                }
+            }
+        }
+      while (!fxface.empty ()
+             && fx.room () > ber32::size + CHKSUM_SIZE + 1
+             && sx.room () > ber32::size * 3);
+      send_packet (fx);
+      if (sx.length () > 3) send_packet (sx);
+    }
+}
+void
+client::send_image (faceidx facenum)
+{
+  // never send face 0. ever. it does not exist.
+  if (!facenum)
+    return;
+  const facedata *d = face_data (facenum, faceset);
+  faces_sent[facenum] = true;
+  if (!d)
+    {
+      LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
+      return;
+    }
+  //TODO: check type here?
+  if (force_image_newmap)
+    force_newmap = true;
+  packet sl;
-      sl << (image2 ? "image2 " : "image ")
+  sl << (image2 ? "image2 " : "image ")
-         << uint32 (facenum);
+     << uint32 (facenum);
-      if (image2)
+  if (image2)
-        sl << uint8 (0);
+    sl << uint8 (0);
-      sl << uint32 (d->data.size ())
+  sl << uint32 (d->data.size ())
-         << data (d->data.data (), d->data.size ());
+     << data (d->data.data (), d->data.size ());
-    }
   send_packet (sl);
 }
 // send all faces of this object to the client
       animation &anim = animations [ob->animation_id];
       for (int i = 0; i < anim.num_animations; i++)
         send_face (anim.faces [i]);
     }
-}
-/**
- * A lot like the old AskSmooth (in fact, now called by AskSmooth).
- * Basically, it makes no sense to wait for the client to request a
- * a piece of data from us that we know the client wants.  So
- * if we know the client wants it, might as well push it to the
- * client.
- */
-void
-client::send_smooth (faceidx face)
-{
-  faceinfo *f = face_info (face);
-  if (!f)
-    return;
-  if (faces_sent[face] & NS_FACESENT_SMOOTH)
-    return;
-  faces_sent[face] |= NS_FACESENT_SMOOTH;
-  /* If we can't find a face, return and set it so we won't try to send this
-   * again.
-   */
-  if (!f->smooth)
-    {
-      LOG (llevError, "could not findsmooth for %d.\n", face);
-      return;
-    }
-  send_face (f->smooth);
-  packet sl ("smooth");
-  sl << uint16 (face)
-     << uint16 (f->smooth);
-  send_packet (sl);
 }
 /**
  * Need to send an animation sequence to the client.
  * We will send appropriate face commands to the client if we haven't
 {
   /* Do some checking on the anim_num we got.  Note that the animations
    * are added in contigous order, so if the number is in the valid
    * range, it must be a valid animation.
    */
-  if (anim_num < 0 || anim_num > num_animations)
+  if (anim_num < 0 || anim_num >= animations.size ())
     {
       LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
       return;
     }
   sl.printf ("replyinfo image_sums %d %d ", start, stop);
   for (int i = start; i <= stop && i < faces.size (); i++)
     {
-      ns->faces_sent[i] |= NS_FACESENT_FACE;
+      ns->faces_sent[i] = true;
       const facedata *d = face_data (i, ns->faceset);
       if (sl.room () < 2 + 4 + 1 + d->data.size () + 1)
         break;

Diff Legend

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

Comparing deliantra/server/socket/image.C (file contents): Revision 1.29 by root, Wed Mar 14 00:07:26 2007 UTC vs. Revision 1.48 by root, Thu Jul 12 18:48:20 2007 UTC

Diff Legend

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.29 by root, Wed Mar 14 00:07:26 2007 UTC vs.
Revision 1.48 by root, Thu Jul 12 18:48:20 2007 UTC