ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.202 by root, Tue Jul 17 18:34:24 2007 UTC vs.
Revision 1.204 by root, Thu Jul 19 14:54:50 2007 UTC

… …
1258MODULE = CFPlus PACKAGE = CFPlus::Texture 1258MODULE = CFPlus PACKAGE = CFPlus::Texture
1259 1259
1260int minpot (int n) 1260int minpot (int n)
1261 1261
1262void 1262void
1263pad2pot (SV *data_, SV *w_, SV *h_) 1263pad (SV *data_, int ow, int oh, int nw, int nh)
1264 CODE: 1264 CODE:
1265{ 1265{
1266 int ow = SvIV (w_); 1266 if ((nw != ow || nh != oh) && SvOK (data_))
1267 int oh = SvIV (h_);
1268
1269 if (ow && oh)
1270 { 1267 {
1271 int nw = minpot (ow);
1272 int nh = minpot (oh);
1273
1274 if (nw != ow || nh != oh)
1275 {
1276 if (SvOK (data_))
1277 {
1278 STRLEN datalen; 1268 STRLEN datalen;
1279 char *data = SvPVbyte (data_, datalen); 1269 char *data = SvPVbyte (data_, datalen);
1280 int bpp = datalen / (ow * oh); 1270 int bpp = datalen / (ow * oh);
1281 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1271 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1282 1272
1283 SvPOK_only (result_); 1273 SvPOK_only (result_);
1284 SvCUR_set (result_, nw * nh * bpp); 1274 SvCUR_set (result_, nw * nh * bpp);
1285 1275
1286 memset (SvPVX (result_), 0, nw * nh * bpp); 1276 memset (SvPVX (result_), 0, nw * nh * bpp);
1287 while (oh--) 1277 while (oh--)
1288 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1278 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1289 1279
1290 sv_setsv (data_, result_); 1280 sv_setsv (data_, result_);
1291 }
1292
1293 sv_setiv (w_, nw);
1294 sv_setiv (h_, nh);
1295 }
1296 } 1281 }
1297} 1282}
1298 1283
1299void 1284void
1300draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1285draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1975 glDisable (GL_BLEND); 1960 glDisable (GL_BLEND);
1976 glDisable (GL_TEXTURE_2D); 1961 glDisable (GL_TEXTURE_2D);
1977} 1962}
1978 1963
1979void 1964void
1980fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix) 1965fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1981 PPCODE: 1966 PPCODE:
1982{ 1967{
1983 int x, y; 1968 int x, y;
1969 int sw1 = sw + 2;
1970 int sh1 = sh + 2;
1971 int sh3 = sh * 3;
1984 int sw4 = (sw + 3) & ~3; 1972 int sw34 = (sw * 3 + 3) & ~3;
1973 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1985 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1974 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1986 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1975 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1987 1976
1988 memset (darkness, 255, sw4 * sh);
1989 SvPOK_only (darkness_sv); 1977 SvPOK_only (darkness3_sv);
1990 SvCUR_set (darkness_sv, sw4 * sh); 1978 SvCUR_set (darkness3_sv, sw34 * sh3);
1991 1979
1992 mx += self->x; 1980 mx += self->x - 1;
1993 my += self->y; 1981 my += self->y - 1;
1994 1982
1983 memset (darkness1, 255, sw1 * sh1);
1984
1995 for (y = 0; y < sh; y++) 1985 for (y = 0; y < sh1; y++)
1996 if (0 <= y + my && y + my < self->rows) 1986 if (0 <= y + my && y + my < self->rows)
1997 { 1987 {
1998 maprow *row = self->row + (y + my); 1988 maprow *row = self->row + (y + my);
1999 1989
2000 for (x = 0; x < sw; x++) 1990 for (x = 0; x < sw1; x++)
2001 if (row->c0 <= x + mx && x + mx < row->c1) 1991 if (row->c0 <= x + mx && x + mx < row->c1)
2002 { 1992 {
2003 mapcell *cell = row->col + (x + mx - row->c0); 1993 mapcell *cell = row->col + (x + mx - row->c0);
2004 1994
2005 darkness[y * sw4 + x] = cell->darkness 1995 darkness1 [y * sw1 + x] = cell->darkness
2006 ? 255 - (cell->darkness - 1) 1996 ? 255 - (cell->darkness - 1)
2007 : 255 - FOW_DARKNESS; 1997 : 255 - FOW_DARKNESS;
2008 } 1998 }
2009 } 1999 }
2010 2000
2011 if (smoothing)
2012 {
2013 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
2014 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2015
2016 SvPOK_only (darkness2_sv);
2017 SvCUR_set (darkness2_sv, sw4 * sh);
2018
2019 for (y = 0; y < sh; ++y) 2001 for (y = 0; y < sh; ++y)
2020 for (x = 0; x < sw4; ++x) 2002 for (x = 0; x < sw; ++x)
2021 { 2003 {
2022 float *f = (float *)matrix; 2004 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2023 int dx, dy; 2005 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2024 float sum = 0.f; 2006 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2007 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2008 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2009 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2010 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2011 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2012 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2025 2013
2026 for (dy = -1; dy <= 1; ++dy) 2014 uint8_t r11 = (d11 + d21 + d12) / 3;
2027 for (dx = -1; dx <= 1; ++dx) 2015 uint8_t r21 = d21;
2028 { 2016 uint8_t r31 = (d21 + d31 + d32) / 3;
2029 unsigned int x2 = x + dx;
2030 unsigned int y2 = y + dy;
2031 2017
2032 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++; 2018 uint8_t r12 = d12;
2033 } 2019 uint8_t r22 = d22;
2020 uint8_t r32 = d32;
2034 2021
2035 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum; 2022 uint8_t r13 = (d13 + d23 + d12) / 3;
2036 } 2023 uint8_t r23 = d23;
2024 uint8_t r33 = (d23 + d33 + d32) / 3;
2037 2025
2038 darkness_sv = darkness2_sv; 2026 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2027 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2028 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2029 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2030 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2031 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2032 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2033 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2034 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2039 } 2035 }
2036
2037 free (darkness1);
2040 2038
2041 EXTEND (SP, 3); 2039 EXTEND (SP, 3);
2042 PUSHs (sv_2mortal (newSViv (sw4))); 2040 PUSHs (sv_2mortal (newSViv (sw34)));
2043 PUSHs (sv_2mortal (newSViv (sh))); 2041 PUSHs (sv_2mortal (newSViv (sh3)));
2044 PUSHs (darkness_sv); 2042 PUSHs (darkness3_sv);
2045} 2043}
2046 2044
2047SV * 2045SV *
2048get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2046get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
2049 CODE: 2047 CODE:

Diff Legend

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