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.203 by root, Thu Jul 19 13:45:16 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
1263pad (SV *data_, int ow, int oh, int nw, int nh) 1311pad (SV *data_, int ow, int oh, int nw, int nh)
1264 CODE: 1312 CODE:
… …
1340} 1388}
1341 OUTPUT: 1389 OUTPUT:
1342 RETVAL 1390 RETVAL
1343 1391
1344MODULE = CFPlus PACKAGE = CFPlus::Map 1392MODULE = CFPlus PACKAGE = CFPlus::Map
1393
1394PROTOTYPES: DISABLE
1345 1395
1346CFPlus::Map 1396CFPlus::Map
1347new (SV *class) 1397new (SV *class)
1348 CODE: 1398 CODE:
1349 New (0, RETVAL, 1, struct map); 1399 New (0, RETVAL, 1, struct map);
… …
1960 glDisable (GL_BLEND); 2010 glDisable (GL_BLEND);
1961 glDisable (GL_TEXTURE_2D); 2011 glDisable (GL_TEXTURE_2D);
1962} 2012}
1963 2013
1964void 2014void
1965fow_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)
1966 PPCODE: 2016 PPCODE:
1967{ 2017{
1968 int x, y; 2018 int x, y;
2019 int sw1 = sw + 2;
2020 int sh1 = sh + 2;
2021 int sh3 = sh * 3;
1969 int sw4 = (sw + 3) & ~3; 2022 int sw34 = (sw * 3 + 3) & ~3;
2023 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1970 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2024 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1971 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2025 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1972 2026
1973 memset (darkness, 255, sw4 * sh);
1974 SvPOK_only (darkness_sv); 2027 SvPOK_only (darkness3_sv);
1975 SvCUR_set (darkness_sv, sw4 * sh); 2028 SvCUR_set (darkness3_sv, sw34 * sh3);
1976 2029
1977 mx += self->x; 2030 mx += self->x - 1;
1978 my += self->y; 2031 my += self->y - 1;
1979 2032
2033 memset (darkness1, 255, sw1 * sh1);
2034
1980 for (y = 0; y < sh; y++) 2035 for (y = 0; y < sh1; y++)
1981 if (0 <= y + my && y + my < self->rows) 2036 if (0 <= y + my && y + my < self->rows)
1982 { 2037 {
1983 maprow *row = self->row + (y + my); 2038 maprow *row = self->row + (y + my);
1984 2039
1985 for (x = 0; x < sw; x++) 2040 for (x = 0; x < sw1; x++)
1986 if (row->c0 <= x + mx && x + mx < row->c1) 2041 if (row->c0 <= x + mx && x + mx < row->c1)
1987 { 2042 {
1988 mapcell *cell = row->col + (x + mx - row->c0); 2043 mapcell *cell = row->col + (x + mx - row->c0);
1989 2044
1990 darkness[y * sw4 + x] = cell->darkness 2045 darkness1 [y * sw1 + x] = cell->darkness
1991 ? 255 - (cell->darkness - 1) 2046 ? 255 - (cell->darkness - 1)
1992 : 255 - FOW_DARKNESS; 2047 : 255 - FOW_DARKNESS;
1993 } 2048 }
1994 } 2049 }
1995 2050
1996 if (smoothing)
1997 {
1998 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
1999 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2000
2001 SvPOK_only (darkness2_sv);
2002 SvCUR_set (darkness2_sv, sw4 * sh);
2003
2004 for (y = 0; y < sh; ++y) 2051 for (y = 0; y < sh; ++y)
2005 for (x = 0; x < sw4; ++x) 2052 for (x = 0; x < sw; ++x)
2006 { 2053 {
2007 float *f = (float *)matrix; 2054 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2008 int dx, dy; 2055 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2009 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];
2010 2063
2011 for (dy = -1; dy <= 1; ++dy) 2064 uint8_t r11 = (d11 + d21 + d12) / 3;
2012 for (dx = -1; dx <= 1; ++dx) 2065 uint8_t r21 = d21;
2013 { 2066 uint8_t r31 = (d21 + d31 + d32) / 3;
2014 unsigned int x2 = x + dx;
2015 unsigned int y2 = y + dy;
2016 2067
2017 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++; 2068 uint8_t r12 = d12;
2018 } 2069 uint8_t r22 = d22;
2070 uint8_t r32 = d32;
2019 2071
2020 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum; 2072 uint8_t r13 = (d13 + d23 + d12) / 3;
2021 } 2073 uint8_t r23 = d23;
2074 uint8_t r33 = (d23 + d33 + d32) / 3;
2022 2075
2023 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);
2024 } 2085 }
2086
2087 free (darkness1);
2025 2088
2026 EXTEND (SP, 3); 2089 EXTEND (SP, 3);
2027 PUSHs (sv_2mortal (newSViv (sw4))); 2090 PUSHs (sv_2mortal (newSViv (sw34)));
2028 PUSHs (sv_2mortal (newSViv (sh))); 2091 PUSHs (sv_2mortal (newSViv (sh3)));
2029 PUSHs (darkness_sv); 2092 PUSHs (darkness3_sv);
2030} 2093}
2031 2094
2032SV * 2095SV *
2033get_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)
2034 CODE: 2097 CODE:
… …
2168 } 2231 }
2169} 2232}
2170 2233
2171MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2234MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2172 2235
2236PROTOTYPES: DISABLE
2237
2173CFPlus::MixChunk 2238CFPlus::MixChunk
2174new_from_file (SV *class, char *path) 2239new_from_file (SV *class, char *path)
2175 CODE: 2240 CODE:
2176 RETVAL = Mix_LoadWAV (path); 2241 RETVAL = Mix_LoadWAV (path);
2177 OUTPUT: 2242 OUTPUT:
… …
2198 2263
2199MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2264MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2200 2265
2201int 2266int
2202volume (int volume = -1) 2267volume (int volume = -1)
2268 PROTOTYPE: ;$
2203 CODE: 2269 CODE:
2204 RETVAL = Mix_VolumeMusic (volume); 2270 RETVAL = Mix_VolumeMusic (volume);
2205 OUTPUT: 2271 OUTPUT:
2206 RETVAL 2272 RETVAL
2207 2273
… …
2237 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2303 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2238 OUTPUT: 2304 OUTPUT:
2239 RETVAL 2305 RETVAL
2240 2306
2241MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2307MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2308
2309PROTOTYPES: ENABLE
2242 2310
2243BOOT: 2311BOOT:
2244{ 2312{
2245 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2313 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
2246 static const struct { 2314 static const struct {
… …
2262 const_iv (GL_ALPHA_TEST), 2330 const_iv (GL_ALPHA_TEST),
2263 const_iv (GL_NORMALIZE), 2331 const_iv (GL_NORMALIZE),
2264 const_iv (GL_RESCALE_NORMAL), 2332 const_iv (GL_RESCALE_NORMAL),
2265 const_iv (GL_FRONT), 2333 const_iv (GL_FRONT),
2266 const_iv (GL_BACK), 2334 const_iv (GL_BACK),
2335 const_iv (GL_AUX0),
2267 const_iv (GL_AND), 2336 const_iv (GL_AND),
2268 const_iv (GL_ONE), 2337 const_iv (GL_ONE),
2269 const_iv (GL_ZERO), 2338 const_iv (GL_ZERO),
2270 const_iv (GL_SRC_ALPHA), 2339 const_iv (GL_SRC_ALPHA),
2271 const_iv (GL_DST_ALPHA), 2340 const_iv (GL_DST_ALPHA),
… …
2317 const_iv (GL_COLOR_LOGIC_OP), 2386 const_iv (GL_COLOR_LOGIC_OP),
2318 const_iv (GL_SEPARABLE_2D), 2387 const_iv (GL_SEPARABLE_2D),
2319 const_iv (GL_CONVOLUTION_2D), 2388 const_iv (GL_CONVOLUTION_2D),
2320 const_iv (GL_CONVOLUTION_BORDER_MODE), 2389 const_iv (GL_CONVOLUTION_BORDER_MODE),
2321 const_iv (GL_CONSTANT_BORDER), 2390 const_iv (GL_CONSTANT_BORDER),
2391 const_iv (GL_POINTS),
2322 const_iv (GL_LINES), 2392 const_iv (GL_LINES),
2323 const_iv (GL_LINE_STRIP), 2393 const_iv (GL_LINE_STRIP),
2324 const_iv (GL_LINE_LOOP), 2394 const_iv (GL_LINE_LOOP),
2325 const_iv (GL_QUADS), 2395 const_iv (GL_QUADS),
2326 const_iv (GL_QUAD_STRIP), 2396 const_iv (GL_QUAD_STRIP),
2327 const_iv (GL_TRIANGLES), 2397 const_iv (GL_TRIANGLES),
2328 const_iv (GL_TRIANGLE_STRIP), 2398 const_iv (GL_TRIANGLE_STRIP),
2329 const_iv (GL_TRIANGLE_FAN), 2399 const_iv (GL_TRIANGLE_FAN),
2400 const_iv (GL_POLYGON),
2330 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),
2331 const_iv (GL_FASTEST), 2406 const_iv (GL_FASTEST),
2407 const_iv (GL_DONT_CARE),
2408 const_iv (GL_NICEST),
2332 const_iv (GL_V2F), 2409 const_iv (GL_V2F),
2333 const_iv (GL_V3F), 2410 const_iv (GL_V3F),
2334 const_iv (GL_T2F_V3F), 2411 const_iv (GL_T2F_V3F),
2335 const_iv (GL_T2F_N3F_V3F), 2412 const_iv (GL_T2F_N3F_V3F),
2336# undef const_iv 2413# undef const_iv
… …
2423void 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_)
2424 2501
2425# near_ and far_ are due to microsofts buggy "c" compiler 2502# near_ and far_ are due to microsofts buggy "c" compiler
2426void 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_)
2427 2504
2505PROTOTYPES: DISABLE
2506
2428void glViewport (int x, int y, int width, int height) 2507void glViewport (int x, int y, int width, int height)
2429 2508
2430void glScissor (int x, int y, int width, int height) 2509void glScissor (int x, int y, int width, int height)
2431 2510
2432void glTranslate (float x, float y, float z = 0.) 2511void glTranslate (float x, float y, float z = 0.)
… …
2439 2518
2440void glRotate (float angle, float x, float y, float z) 2519void glRotate (float angle, float x, float y, float z)
2441 CODE: 2520 CODE:
2442 glRotatef (angle, x, y, z); 2521 glRotatef (angle, x, y, z);
2443 2522
2444void glBegin (int mode)
2445
2446void glEnd ()
2447
2448void glColor (float r, float g, float b, float a = 1.0) 2523void glColor (float r, float g, float b, float a = 1.0)
2449 PROTOTYPE: @
2450 ALIAS: 2524 ALIAS:
2451 glColor_premultiply = 1 2525 glColor_premultiply = 1
2452 CODE: 2526 CODE:
2453 if (ix) 2527 if (ix)
2454 { 2528 {
… …
2457 b *= a; 2531 b *= a;
2458 } 2532 }
2459 // microsoft visual "c" rounds instead of truncating... 2533 // microsoft visual "c" rounds instead of truncating...
2460 glColor4f (r, g, b, a); 2534 glColor4f (r, g, b, a);
2461 2535
2462void glInterleavedArrays (int format, int stride, char *data)
2463
2464void glDrawElements (int mode, int count, int type, char *indices)
2465
2466# 1.2 void glDrawRangeElements (int mode, int start, int end
2467
2468void glRasterPos (float x, float y, float z = 0.) 2536void glRasterPos (float x, float y, float z = 0.)
2469 CODE: 2537 CODE:
2470 glRasterPos3f (0, 0, z); 2538 glRasterPos3f (0, 0, z);
2471 glBitmap (0, 0, 0, 0, x, y, 0); 2539 glBitmap (0, 0, 0, 0, x, y, 0);
2472 2540
… …
2476 2544
2477void glTexCoord (float s, float t) 2545void glTexCoord (float s, float t)
2478 CODE: 2546 CODE:
2479 glTexCoord2f (s, t); 2547 glTexCoord2f (s, t);
2480 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
2481void glTexEnv (int target, int pname, float param) 2565void glTexEnv (int target, int pname, float param)
2482 CODE: 2566 CODE:
2483 glTexEnvf (target, pname, param); 2567 glTexEnvf (target, pname, param);
2484 2568
2485void glTexParameter (int target, int pname, float param) 2569void glTexParameter (int target, int pname, float param)
… …
2537 2621
2538void glEndList () 2622void glEndList ()
2539 2623
2540void glCallList (int list) 2624void glCallList (int list)
2541 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