[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.202 by root, Tue Jul 17 18:34:24 2007 UTC vs.
Revision 1.207 by root, Fri Jul 20 18:19:45 2007 UTC

 }
 /* SDL should provide this, really. */
 #define SDLK_MODIFIER_MIN 300
 #define SDLK_MODIFIER_MAX 314
+/******************************************************************************/
+static int
+within_widget (SV *widget, NV x, NV y)
+{
+  HV *self;
+  SV **svp;
+  NV wx, ww, wy, wh;
+  if (!SvROK (widget))
+    return 0;
+  self = (HV *)SvRV (widget);
+  if (SvTYPE (self) != SVt_PVHV)
+    return 0;
+  svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
+  if (y < wy)
+    return 0;
+  svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
+  if (y >= wy + wh)
+    return 0;
+  svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
+  if (x < wx)
+    return 0;
+  svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
+  if (x >= wx + ww)
+    return 0;
+  svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
+  if (!svp || !SvTRUE (*svp))
+    return 0;
+  return 1;
+}
 MODULE = CFPlus	PACKAGE = CFPlus
 PROTOTYPES: ENABLE
 #endif
 }
 MODULE = CFPlus	PACKAGE = CFPlus::Font
+PROTOTYPES: DISABLE
 CFPlus::Font
 new_from_file (SV *class, char *path, int id = 0)
 	CODE:
 {
         int count;
 	CODE:
         pango_font_description_free (self);
 void
 make_default (CFPlus::Font self)
+	PROTOTYPE: $
 	CODE:
         default_font = self;
 MODULE = CFPlus	PACKAGE = CFPlus::Layout
+PROTOTYPES: DISABLE
 void
 reset_glyph_cache ()
+	PROTOTYPE:
 	CODE:
         tc_clear ();
 CFPlus::Layout
 new (SV *class)
           flags
         );
 MODULE = CFPlus	PACKAGE = CFPlus::Texture
+PROTOTYPES: ENABLE
 int minpot (int n)
 void
-pad2pot (SV *data_, SV *w_, SV *h_)
+pad (SV *data_, int ow, int oh, int nw, int nh)
 	CODE:
 {
-        int ow = SvIV (w_);
+        if ((nw != ow || nh != oh) && SvOK (data_))
-        int oh = SvIV (h_);
-        if (ow && oh)
           {
-            int nw = minpot (ow);
-            int nh = minpot (oh);
-            if (nw != ow || nh != oh)
-              {
-                if (SvOK (data_))
-                  {
-                    STRLEN datalen;
+            STRLEN datalen;
-                    char *data = SvPVbyte (data_, datalen);
+            char *data = SvPVbyte (data_, datalen);
-                    int bpp = datalen / (ow * oh);
+            int bpp = datalen / (ow * oh);
-                    SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
+            SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
-                    SvPOK_only (result_);
+            SvPOK_only (result_);
-                    SvCUR_set (result_, nw * nh * bpp);
+            SvCUR_set (result_, nw * nh * bpp);
-                    memset (SvPVX (result_), 0, nw * nh * bpp);
+            memset (SvPVX (result_), 0, nw * nh * bpp);
-                    while (oh--)
+            while (oh--)
-                      memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
+              memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
-                    sv_setsv (data_, result_);
+            sv_setsv (data_, result_);
-                  }
-                sv_setiv (w_, nw);
-                sv_setiv (h_, nh);
-              }
           }
 }
 void
 draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
 }
 	OUTPUT:
         RETVAL
 MODULE = CFPlus	PACKAGE = CFPlus::Map
+PROTOTYPES: DISABLE
 CFPlus::Map
 new (SV *class)
 	CODE:
         New (0, RETVAL, 1, struct map);
         glDisable (GL_BLEND);
         glDisable (GL_TEXTURE_2D);
 }
 void
-fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
+fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
 	PPCODE:
 {
         int x, y;
+        int sw1  = sw + 2;
+        int sh1  = sh + 2;
+        int sh3  = sh * 3;
-        int sw4 = (sw + 3) & ~3;
+        int sw34 = (sw * 3 + 3) & ~3;
+        uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
-	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
+        SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
-        uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
+        uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
-        memset (darkness, 255, sw4 * sh);
-        SvPOK_only (darkness_sv);
+        SvPOK_only (darkness3_sv);
-        SvCUR_set (darkness_sv, sw4 * sh);
+        SvCUR_set (darkness3_sv, sw34 * sh3);
-        mx += self->x;
+        mx += self->x - 1;
-        my += self->y;
+        my += self->y - 1;
+        memset (darkness1, 255, sw1 * sh1);
-        for (y = 0; y < sh; y++)
+        for (y = 0; y < sh1; y++)
           if (0 <= y + my && y + my < self->rows)
             {
               maprow *row = self->row + (y + my);
-              for (x = 0; x < sw; x++)
+              for (x = 0; x < sw1; x++)
                 if (row->c0 <= x + mx && x + mx < row->c1)
                   {
                     mapcell *cell = row->col + (x + mx - row->c0);
-                    darkness[y * sw4 + x] = cell->darkness
+                    darkness1 [y * sw1 + x] = cell->darkness
                       ? 255 - (cell->darkness - 1)
                       : 255 - FOW_DARKNESS;
                   }
             }
-        if (smoothing)
-          {
-            SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
-            uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
-            SvPOK_only (darkness2_sv);
-            SvCUR_set (darkness2_sv, sw4 * sh);
-            for (y = 0; y < sh; ++y)
+        for (y = 0; y < sh; ++y)
-              for (x = 0; x < sw4; ++x)
+          for (x = 0; x < sw; ++x)
-                {
+            {
-                  float *f = (float *)matrix;
+              uint8_t d11 = darkness1 [(y    ) * sw1 + x    ];
-                  int dx, dy;
+              uint8_t d21 = darkness1 [(y    ) * sw1 + x + 1];
-                  float sum = 0.f;
+              uint8_t d31 = darkness1 [(y    ) * sw1 + x + 2];
+              uint8_t d12 = darkness1 [(y + 1) * sw1 + x    ];
+              uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
+              uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
+              uint8_t d13 = darkness1 [(y + 2) * sw1 + x    ];
+              uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
+              uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
-                  for (dy = -1; dy <= 1; ++dy)
+              uint8_t r11 = (d11 + d21 + d12) / 3;
-                    for (dx = -1; dx <= 1; ++dx)
+              uint8_t r21 = d21;
-                      {
+              uint8_t r31 = (d21 + d31 + d32) / 3;
-                        unsigned int x2 = x + dx;
-                        unsigned int y2 = y + dy;
-                        sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
+              uint8_t r12 = d12;
-                      }
+              uint8_t r22 = d22;
+              uint8_t r32 = d32;
-                  darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
+              uint8_t r13 = (d13 + d23 + d12) / 3;
-                }
+              uint8_t r23 = d23;
+              uint8_t r33 = (d23 + d33 + d32) / 3;
-            darkness_sv = darkness2_sv;
+              darkness3 [(y * 3    ) * sw34 + (x * 3    )] = MAX (d22, r11);
+              darkness3 [(y * 3    ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
+              darkness3 [(y * 3    ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
+              darkness3 [(y * 3 + 1) * sw34 + (x * 3    )] = MAX (d22, r12);
+              darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
+              darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
+              darkness3 [(y * 3 + 2) * sw34 + (x * 3    )] = MAX (d22, r13);
+              darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
+              darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
-          }
+            }
+        free (darkness1);
         EXTEND (SP, 3);
-        PUSHs (sv_2mortal (newSViv (sw4)));
+        PUSHs (sv_2mortal (newSViv (sw34)));
-        PUSHs (sv_2mortal (newSViv (sh)));
+        PUSHs (sv_2mortal (newSViv (sh3)));
-        PUSHs (darkness_sv);
+        PUSHs (darkness3_sv);
 }
 SV *
 get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
 	CODE:
           }
 }
 MODULE = CFPlus	PACKAGE = CFPlus::MixChunk
+PROTOTYPES: DISABLE
 CFPlus::MixChunk
 new_from_file (SV *class, char *path)
 	CODE:
         RETVAL = Mix_LoadWAV (path);
 	OUTPUT:
 MODULE = CFPlus	PACKAGE = CFPlus::MixMusic
 int
 volume (int volume = -1)
+	PROTOTYPE: ;$
 	CODE:
         RETVAL = Mix_VolumeMusic (volume);
 	OUTPUT:
         RETVAL
         RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
 	OUTPUT:
         RETVAL
 MODULE = CFPlus	PACKAGE = CFPlus::OpenGL
+PROTOTYPES: ENABLE
 BOOT:
 {
   HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
   static const struct {
 	const_iv (GL_ALPHA_TEST),
 	const_iv (GL_NORMALIZE),
 	const_iv (GL_RESCALE_NORMAL),
 	const_iv (GL_FRONT),
 	const_iv (GL_BACK),
+	const_iv (GL_AUX0),
         const_iv (GL_AND),
 	const_iv (GL_ONE),
 	const_iv (GL_ZERO),
 	const_iv (GL_SRC_ALPHA),
 	const_iv (GL_DST_ALPHA),
 	const_iv (GL_QUAD_STRIP),
 	const_iv (GL_TRIANGLES),
 	const_iv (GL_TRIANGLE_STRIP),
 	const_iv (GL_TRIANGLE_FAN),
 	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
+        const_iv (GL_POINT_SMOOTH_HINT),
+        const_iv (GL_LINE_SMOOTH_HINT),
+        const_iv (GL_POLYGON_SMOOTH_HINT),
+        const_iv (GL_GENERATE_MIPMAP_HINT),
         const_iv (GL_FASTEST),
+        const_iv (GL_DONT_CARE),
+        const_iv (GL_NICEST),
         const_iv (GL_V2F),
         const_iv (GL_V3F),
         const_iv (GL_T2F_V3F),
         const_iv (GL_T2F_N3F_V3F),
 #	undef const_iv
 void glEndList ()
 void glCallList (int list)
+MODULE = CFPlus	PACKAGE = CFPlus::UI::Base
+PROTOTYPES: DISABLE
+void
+find_widget (SV *widget, NV x, NV y)
+	PPCODE:
+{
+  	if (within_widget (widget, x, y))
+          XPUSHs (widget);
+}

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.202 by root, Tue Jul 17 18:34:24 2007 UTC vs. Revision 1.207 by root, Fri Jul 20 18:19:45 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.202 by root, Tue Jul 17 18:34:24 2007 UTC vs.
Revision 1.207 by root, Fri Jul 20 18:19:45 2007 UTC