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

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.67 by root, Tue Jan 3 11:25:37 2012 UTC vs.
Revision 1.78 by root, Sun Nov 18 00:37:11 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001 Mark Wedel
  * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by 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
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
-/** \file
+/*
  * Image related communication
- *
- *  \date 2003-12-02
  *
  * This file deals with the image related communication to the
  * client.  I've located all the functions in this file - this
  * localizes it more, and means that we don't need to declare
  * things like all the structures as globals.
   sscanf (buf, "%d %d", &idx, &pri);
   //TODO: somehow fetch default priority from send_fx here
-  const facedata *d = face_data (idx, ns->faceset);
+  const faceinfo *f = face_info (idx);
-  if (!d)
+  if (!f)
     return; // doh
+  int set = ns->tileset;
+  if (!f->face [set].chksum_len)
+    set = 0;
+  /* cfperl_ix calls cf::face::ix which loads the data */
+  /* and then calls cf::client::send_ix to actually queue the ix */
+  cfperl_ix (ns, set, idx, pri);
+}
+void
+client::ix_send (faceidx idx, sint16 pri, SV *data_sv)
+{
+  STRLEN size;
+  char *data = SvPVbyte (data_sv, size);
-  client::ixsend ix;
+  ixsend ix;
-  ix.pri = pri;
+  ix.pri     = pri;
-  ix.idx = idx;
+  ix.idx     = idx;
-  ix.ofs = d->data.size ();
+  ix.ofs     = size;
+  ix.data    = (uint8 *)data;
+  ix.data_sv = SvREFCNT_inc (data_sv);
-  auto (pos, ns->ixface.end ());
+  auto (pos, ixface.end ());
   // the by far most common case will be to insert
   // near the end, so little looping.
-  while (pos != ns->ixface.begin ())
+  while (pos != 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);
+  ixface.insert (pos, ix);
 #if 0
-  for (auto (i, ns->ixface.begin ()); i != ns->ixface.end (); ++i)
+  for (auto &&i : ixface)
-    fprintf (stderr, "<%d,%d> ",  i->pri, i->ofs);
+    fprintf (stderr, "<%d,%d> ",  i.pri, i.ofs);
   fprintf (stderr, "\n");
 #endif
 }
+void
+client::ix_pop ()
+{
+  ixsend &ix = ixface.back ();
+  SvREFCNT_dec (ix.data_sv);
+  ixface.pop_back ();
+}
 /**
- * Sends a face to a client if they are in pixmap mode
+ * Sends a face offer (fx) to a client.
- * nothing gets sent in bitmap mode.
  * If nocache is true (nonzero), ignore the cache setting from the client -
  * 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.
  */
     {
       LOG (llevError | logBacktrace, "client::send_face (%d) out of bounds??\n", facenum);
       return;
     }
-  // refuse to send non-image faces
+  // refuse to send non-image faces unless requested
   if (!fx_want [f->type])
     return;
   if (faces_sent [facenum])
     return;
-  faces_sent[facenum] = true;
+  faces_sent [facenum] = true;
   fxface.push_back (facenum);
 }
 void client::flush_fx ()
                   fx << ber32 (0)
                      << uint8 (1) << uint8 (type);
                 }
-              const facedata *d = f->data (faceset);
+              const facedata *d = f->data (tileset);
               fx << ber32 (facenum)
                  << data8 (d->chksum, d->chksum_len);
               if (smoothing)
 }
 void
 client::invalidate_face (faceidx idx)
 {
+  if (!faces_sent [idx])
+    return;
   faces_sent [idx] = false;
-  force_newmap = true;
+  send_face (idx);
+  //TODO: check for active ix and abort it.
 }
 void
 client::invalidate_all_faces ()
 {
-  faces_sent.reset ();
+  for (faceidx i = 0; i < faces_sent.size (); ++i)
-  force_newmap = true;
+    invalidate_face (i);
 }

Diff Legend

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

Comparing deliantra/server/socket/image.C (file contents): Revision 1.67 by root, Tue Jan 3 11:25:37 2012 UTC vs. Revision 1.78 by root, Sun Nov 18 00:37:11 2018 UTC

Diff Legend

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.67 by root, Tue Jan 3 11:25:37 2012 UTC vs.
Revision 1.78 by root, Sun Nov 18 00:37:11 2018 UTC