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.208 by root, Sat Jul 21 16:07:53 2007 UTC

… …
432} 432}
433 433
434/* SDL should provide this, really. */ 434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 436#define SDLK_MODIFIER_MAX 314
437
438/******************************************************************************/
439
440static int
441within_widget (SV *widget, NV x, NV y)
442{
443 HV *self;
444 SV **svp;
445 NV wx, ww, wy, wh;
446
447 if (!SvROK (widget))
448 return 0;
449
450 self = (HV *)SvRV (widget);
451
452 if (SvTYPE (self) != SVt_PVHV)
453 return 0;
454
455 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
456 if (y < wy)
457 return 0;
458
459 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
460 if (y >= wy + wh)
461 return 0;
462
463 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
464 if (x < wx)
465 return 0;
466
467 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
468 if (x >= wx + ww)
469 return 0;
470
471 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
472 if (!svp || !SvTRUE (*svp))
473 return 0;
474
475 return 1;
476}
437 477
438MODULE = CFPlus PACKAGE = CFPlus 478MODULE = CFPlus PACKAGE = CFPlus
439 479
440PROTOTYPES: ENABLE 480PROTOTYPES: ENABLE
441 481
… …
933#endif 973#endif
934} 974}
935 975
936MODULE = CFPlus PACKAGE = CFPlus::Font 976MODULE = CFPlus PACKAGE = CFPlus::Font
937 977
978PROTOTYPES: DISABLE
979
938CFPlus::Font 980CFPlus::Font
939new_from_file (SV *class, char *path, int id = 0) 981new_from_file (SV *class, char *path, int id = 0)
940 CODE: 982 CODE:
941{ 983{
942 int count; 984 int count;
… …
952 CODE: 994 CODE:
953 pango_font_description_free (self); 995 pango_font_description_free (self);
954 996
955void 997void
956make_default (CFPlus::Font self) 998make_default (CFPlus::Font self)
999 PROTOTYPE: $
957 CODE: 1000 CODE:
958 default_font = self; 1001 default_font = self;
959 1002
960MODULE = CFPlus PACKAGE = CFPlus::Layout 1003MODULE = CFPlus PACKAGE = CFPlus::Layout
961 1004
1005PROTOTYPES: DISABLE
1006
962void 1007void
963reset_glyph_cache () 1008reset_glyph_cache ()
1009 PROTOTYPE:
964 CODE: 1010 CODE:
965 tc_clear (); 1011 tc_clear ();
966 1012
967CFPlus::Layout 1013CFPlus::Layout
968new (SV *class) 1014new (SV *class)
… …
1255 flags 1301 flags
1256 ); 1302 );
1257 1303
1258MODULE = CFPlus PACKAGE = CFPlus::Texture 1304MODULE = CFPlus PACKAGE = CFPlus::Texture
1259 1305
1306PROTOTYPES: ENABLE
1307
1260int minpot (int n) 1308int minpot (int n)
1261 1309
1262void 1310void
1263pad2pot (SV *data_, SV *w_, SV *h_) 1311pad (SV *data_, int ow, int oh, int nw, int nh)
1264 CODE: 1312 CODE:
1265{ 1313{
1266 int ow = SvIV (w_); 1314 if ((nw != ow || nh != oh) && SvOK (data_))
1267 int oh = SvIV (h_);
1268
1269 if (ow && oh)
1270 { 1315 {
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; 1316 STRLEN datalen;
1279 char *data = SvPVbyte (data_, datalen); 1317 char *data = SvPVbyte (data_, datalen);
1280 int bpp = datalen / (ow * oh); 1318 int bpp = datalen / (ow * oh);
1281 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1319 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1282 1320
1283 SvPOK_only (result_); 1321 SvPOK_only (result_);
1284 SvCUR_set (result_, nw * nh * bpp); 1322 SvCUR_set (result_, nw * nh * bpp);
1285 1323
1286 memset (SvPVX (result_), 0, nw * nh * bpp); 1324 memset (SvPVX (result_), 0, nw * nh * bpp);
1287 while (oh--) 1325 while (oh--)
1288 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1326 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1289 1327
1290 sv_setsv (data_, result_); 1328 sv_setsv (data_, result_);
1291 }
1292
1293 sv_setiv (w_, nw);
1294 sv_setiv (h_, nh);
1295 }
1296 } 1329 }
1297} 1330}
1298 1331
1299void 1332void
1300draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1333draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1355} 1388}
1356 OUTPUT: 1389 OUTPUT:
1357 RETVAL 1390 RETVAL
1358 1391
1359MODULE = CFPlus PACKAGE = CFPlus::Map 1392MODULE = CFPlus PACKAGE = CFPlus::Map
1393
1394PROTOTYPES: DISABLE
1360 1395
1361CFPlus::Map 1396CFPlus::Map
1362new (SV *class) 1397new (SV *class)
1363 CODE: 1398 CODE:
1364 New (0, RETVAL, 1, struct map); 1399 New (0, RETVAL, 1, struct map);
… …
1975 glDisable (GL_BLEND); 2010 glDisable (GL_BLEND);
1976 glDisable (GL_TEXTURE_2D); 2011 glDisable (GL_TEXTURE_2D);
1977} 2012}
1978 2013
1979void 2014void
1980fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix) 2015fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1981 PPCODE: 2016 PPCODE:
1982{ 2017{
1983 int x, y; 2018 int x, y;
2019 int sw1 = sw + 2;
2020 int sh1 = sh + 2;
2021 int sh3 = sh * 3;
1984 int sw4 = (sw + 3) & ~3; 2022 int sw34 = (sw * 3 + 3) & ~3;
2023 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1985 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2024 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1986 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2025 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1987 2026
1988 memset (darkness, 255, sw4 * sh);
1989 SvPOK_only (darkness_sv); 2027 SvPOK_only (darkness3_sv);
1990 SvCUR_set (darkness_sv, sw4 * sh); 2028 SvCUR_set (darkness3_sv, sw34 * sh3);
1991 2029
1992 mx += self->x; 2030 mx += self->x - 1;
1993 my += self->y; 2031 my += self->y - 1;
1994 2032
2033 memset (darkness1, 255, sw1 * sh1);
2034
1995 for (y = 0; y < sh; y++) 2035 for (y = 0; y < sh1; y++)
1996 if (0 <= y + my && y + my < self->rows) 2036 if (0 <= y + my && y + my < self->rows)
1997 { 2037 {
1998 maprow *row = self->row + (y + my); 2038 maprow *row = self->row + (y + my);
1999 2039
2000 for (x = 0; x < sw; x++) 2040 for (x = 0; x < sw1; x++)
2001 if (row->c0 <= x + mx && x + mx < row->c1) 2041 if (row->c0 <= x + mx && x + mx < row->c1)
2002 { 2042 {
2003 mapcell *cell = row->col + (x + mx - row->c0); 2043 mapcell *cell = row->col + (x + mx - row->c0);
2004 2044
2005 darkness[y * sw4 + x] = cell->darkness 2045 darkness1 [y * sw1 + x] = cell->darkness
2006 ? 255 - (cell->darkness - 1) 2046 ? 255 - (cell->darkness - 1)
2007 : 255 - FOW_DARKNESS; 2047 : 255 - FOW_DARKNESS;
2008 } 2048 }
2009 } 2049 }
2010 2050
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) 2051 for (y = 0; y < sh; ++y)
2020 for (x = 0; x < sw4; ++x) 2052 for (x = 0; x < sw; ++x)
2021 { 2053 {
2022 float *f = (float *)matrix; 2054 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2023 int dx, dy; 2055 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2024 float sum = 0.f; 2056 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2057 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2058 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2059 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2060 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2061 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2062 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2025 2063
2026 for (dy = -1; dy <= 1; ++dy) 2064 uint8_t r11 = (d11 + d21 + d12) / 3;
2027 for (dx = -1; dx <= 1; ++dx) 2065 uint8_t r21 = d21;
2028 { 2066 uint8_t r31 = (d21 + d31 + d32) / 3;
2029 unsigned int x2 = x + dx;
2030 unsigned int y2 = y + dy;
2031 2067
2032 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++; 2068 uint8_t r12 = d12;
2033 } 2069 uint8_t r22 = d22;
2070 uint8_t r32 = d32;
2034 2071
2035 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum; 2072 uint8_t r13 = (d13 + d23 + d12) / 3;
2036 } 2073 uint8_t r23 = d23;
2074 uint8_t r33 = (d23 + d33 + d32) / 3;
2037 2075
2038 darkness_sv = darkness2_sv; 2076 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2077 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2078 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2079 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2080 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2081 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2082 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2083 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2084 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2039 } 2085 }
2086
2087 free (darkness1);
2040 2088
2041 EXTEND (SP, 3); 2089 EXTEND (SP, 3);
2042 PUSHs (sv_2mortal (newSViv (sw4))); 2090 PUSHs (sv_2mortal (newSViv (sw34)));
2043 PUSHs (sv_2mortal (newSViv (sh))); 2091 PUSHs (sv_2mortal (newSViv (sh3)));
2044 PUSHs (darkness_sv); 2092 PUSHs (darkness3_sv);
2045} 2093}
2046 2094
2047SV * 2095SV *
2048get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2096get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
2049 CODE: 2097 CODE:
… …
2183 } 2231 }
2184} 2232}
2185 2233
2186MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2234MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2187 2235
2236PROTOTYPES: DISABLE
2237
2188CFPlus::MixChunk 2238CFPlus::MixChunk
2189new_from_file (SV *class, char *path) 2239new_from_file (SV *class, char *path)
2190 CODE: 2240 CODE:
2191 RETVAL = Mix_LoadWAV (path); 2241 RETVAL = Mix_LoadWAV (path);
2192 OUTPUT: 2242 OUTPUT:
… …
2213 2263
2214MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2264MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2215 2265
2216int 2266int
2217volume (int volume = -1) 2267volume (int volume = -1)
2268 PROTOTYPE: ;$
2218 CODE: 2269 CODE:
2219 RETVAL = Mix_VolumeMusic (volume); 2270 RETVAL = Mix_VolumeMusic (volume);
2220 OUTPUT: 2271 OUTPUT:
2221 RETVAL 2272 RETVAL
2222 2273
… …
2252 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2303 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2253 OUTPUT: 2304 OUTPUT:
2254 RETVAL 2305 RETVAL
2255 2306
2256MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2307MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2308
2309PROTOTYPES: ENABLE
2257 2310
2258BOOT: 2311BOOT:
2259{ 2312{
2260 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2313 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
2261 static const struct { 2314 static const struct {
… …
2277 const_iv (GL_ALPHA_TEST), 2330 const_iv (GL_ALPHA_TEST),
2278 const_iv (GL_NORMALIZE), 2331 const_iv (GL_NORMALIZE),
2279 const_iv (GL_RESCALE_NORMAL), 2332 const_iv (GL_RESCALE_NORMAL),
2280 const_iv (GL_FRONT), 2333 const_iv (GL_FRONT),
2281 const_iv (GL_BACK), 2334 const_iv (GL_BACK),
2335 const_iv (GL_AUX0),
2282 const_iv (GL_AND), 2336 const_iv (GL_AND),
2283 const_iv (GL_ONE), 2337 const_iv (GL_ONE),
2284 const_iv (GL_ZERO), 2338 const_iv (GL_ZERO),
2285 const_iv (GL_SRC_ALPHA), 2339 const_iv (GL_SRC_ALPHA),
2286 const_iv (GL_DST_ALPHA), 2340 const_iv (GL_DST_ALPHA),
… …
2332 const_iv (GL_COLOR_LOGIC_OP), 2386 const_iv (GL_COLOR_LOGIC_OP),
2333 const_iv (GL_SEPARABLE_2D), 2387 const_iv (GL_SEPARABLE_2D),
2334 const_iv (GL_CONVOLUTION_2D), 2388 const_iv (GL_CONVOLUTION_2D),
2335 const_iv (GL_CONVOLUTION_BORDER_MODE), 2389 const_iv (GL_CONVOLUTION_BORDER_MODE),
2336 const_iv (GL_CONSTANT_BORDER), 2390 const_iv (GL_CONSTANT_BORDER),
2391 const_iv (GL_POINTS),
2337 const_iv (GL_LINES), 2392 const_iv (GL_LINES),
2338 const_iv (GL_LINE_STRIP), 2393 const_iv (GL_LINE_STRIP),
2339 const_iv (GL_LINE_LOOP), 2394 const_iv (GL_LINE_LOOP),
2340 const_iv (GL_QUADS), 2395 const_iv (GL_QUADS),
2341 const_iv (GL_QUAD_STRIP), 2396 const_iv (GL_QUAD_STRIP),
2342 const_iv (GL_TRIANGLES), 2397 const_iv (GL_TRIANGLES),
2343 const_iv (GL_TRIANGLE_STRIP), 2398 const_iv (GL_TRIANGLE_STRIP),
2344 const_iv (GL_TRIANGLE_FAN), 2399 const_iv (GL_TRIANGLE_FAN),
2400 const_iv (GL_POLYGON),
2345 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2401 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2402 const_iv (GL_POINT_SMOOTH_HINT),
2403 const_iv (GL_LINE_SMOOTH_HINT),
2404 const_iv (GL_POLYGON_SMOOTH_HINT),
2405 const_iv (GL_GENERATE_MIPMAP_HINT),
2346 const_iv (GL_FASTEST), 2406 const_iv (GL_FASTEST),
2407 const_iv (GL_DONT_CARE),
2408 const_iv (GL_NICEST),
2347 const_iv (GL_V2F), 2409 const_iv (GL_V2F),
2348 const_iv (GL_V3F), 2410 const_iv (GL_V3F),
2349 const_iv (GL_T2F_V3F), 2411 const_iv (GL_T2F_V3F),
2350 const_iv (GL_T2F_N3F_V3F), 2412 const_iv (GL_T2F_N3F_V3F),
2351# undef const_iv 2413# undef const_iv
… …
2438void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2500void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2439 2501
2440# near_ and far_ are due to microsofts buggy "c" compiler 2502# near_ and far_ are due to microsofts buggy "c" compiler
2441void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2503void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2442 2504
2505PROTOTYPES: DISABLE
2506
2443void glViewport (int x, int y, int width, int height) 2507void glViewport (int x, int y, int width, int height)
2444 2508
2445void glScissor (int x, int y, int width, int height) 2509void glScissor (int x, int y, int width, int height)
2446 2510
2447void glTranslate (float x, float y, float z = 0.) 2511void glTranslate (float x, float y, float z = 0.)
… …
2454 2518
2455void glRotate (float angle, float x, float y, float z) 2519void glRotate (float angle, float x, float y, float z)
2456 CODE: 2520 CODE:
2457 glRotatef (angle, x, y, z); 2521 glRotatef (angle, x, y, z);
2458 2522
2459void glBegin (int mode)
2460
2461void glEnd ()
2462
2463void glColor (float r, float g, float b, float a = 1.0) 2523void glColor (float r, float g, float b, float a = 1.0)
2464 PROTOTYPE: @
2465 ALIAS: 2524 ALIAS:
2466 glColor_premultiply = 1 2525 glColor_premultiply = 1
2467 CODE: 2526 CODE:
2468 if (ix) 2527 if (ix)
2469 { 2528 {
… …
2472 b *= a; 2531 b *= a;
2473 } 2532 }
2474 // microsoft visual "c" rounds instead of truncating... 2533 // microsoft visual "c" rounds instead of truncating...
2475 glColor4f (r, g, b, a); 2534 glColor4f (r, g, b, a);
2476 2535
2477void glInterleavedArrays (int format, int stride, char *data)
2478
2479void glDrawElements (int mode, int count, int type, char *indices)
2480
2481# 1.2 void glDrawRangeElements (int mode, int start, int end
2482
2483void glRasterPos (float x, float y, float z = 0.) 2536void glRasterPos (float x, float y, float z = 0.)
2484 CODE: 2537 CODE:
2485 glRasterPos3f (0, 0, z); 2538 glRasterPos3f (0, 0, z);
2486 glBitmap (0, 0, 0, 0, x, y, 0); 2539 glBitmap (0, 0, 0, 0, x, y, 0);
2487 2540
… …
2491 2544
2492void glTexCoord (float s, float t) 2545void glTexCoord (float s, float t)
2493 CODE: 2546 CODE:
2494 glTexCoord2f (s, t); 2547 glTexCoord2f (s, t);
2495 2548
2549PROTOTYPES: ENABLE
2550
2551void glBegin (int mode)
2552
2553void glEnd ()
2554
2555void glPointSize (GLfloat size)
2556
2557void glLineWidth (GLfloat width)
2558
2559void glInterleavedArrays (int format, int stride, char *data)
2560
2561void glDrawElements (int mode, int count, int type, char *indices)
2562
2563# 1.2 void glDrawRangeElements (int mode, int start, int end
2564
2496void glTexEnv (int target, int pname, float param) 2565void glTexEnv (int target, int pname, float param)
2497 CODE: 2566 CODE:
2498 glTexEnvf (target, pname, param); 2567 glTexEnvf (target, pname, param);
2499 2568
2500void glTexParameter (int target, int pname, float param) 2569void glTexParameter (int target, int pname, float param)
… …
2552 2621
2553void glEndList () 2622void glEndList ()
2554 2623
2555void glCallList (int list) 2624void glCallList (int list)
2556 2625
2626MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2627
2628PROTOTYPES: DISABLE
2629
2630void
2631find_widget (SV *widget, NV x, NV y)
2632 PPCODE:
2633{
2634 if (within_widget (widget, x, y))
2635 XPUSHs (widget);
2636}
2637

Diff Legend

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