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.201 by root, Tue Jul 17 17:39:06 2007 UTC vs.
Revision 1.208 by root, Sat Jul 21 16:07:53 2007 UTC

… …
26#include <string.h> 26#include <string.h>
27#include <stdio.h> 27#include <stdio.h>
28#include <stdlib.h> 28#include <stdlib.h>
29 29
30#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
31#include <SDL_endian.h> 32#include <SDL_endian.h>
32#include <SDL_image.h> 33#include <SDL_image.h>
33#include <SDL_mixer.h> 34#include <SDL_mixer.h>
34#include <SDL_opengl.h> 35#include <SDL_opengl.h>
35 36
… …
431} 432}
432 433
433/* SDL should provide this, really. */ 434/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300 435#define SDLK_MODIFIER_MIN 300
435#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}
436 477
437MODULE = CFPlus PACKAGE = CFPlus 478MODULE = CFPlus PACKAGE = CFPlus
438 479
439PROTOTYPES: ENABLE 480PROTOTYPES: ENABLE
440 481
… …
932#endif 973#endif
933} 974}
934 975
935MODULE = CFPlus PACKAGE = CFPlus::Font 976MODULE = CFPlus PACKAGE = CFPlus::Font
936 977
978PROTOTYPES: DISABLE
979
937CFPlus::Font 980CFPlus::Font
938new_from_file (SV *class, char *path, int id = 0) 981new_from_file (SV *class, char *path, int id = 0)
939 CODE: 982 CODE:
940{ 983{
941 int count; 984 int count;
… …
951 CODE: 994 CODE:
952 pango_font_description_free (self); 995 pango_font_description_free (self);
953 996
954void 997void
955make_default (CFPlus::Font self) 998make_default (CFPlus::Font self)
999 PROTOTYPE: $
956 CODE: 1000 CODE:
957 default_font = self; 1001 default_font = self;
958 1002
959MODULE = CFPlus PACKAGE = CFPlus::Layout 1003MODULE = CFPlus PACKAGE = CFPlus::Layout
960 1004
1005PROTOTYPES: DISABLE
1006
961void 1007void
962reset_glyph_cache () 1008reset_glyph_cache ()
1009 PROTOTYPE:
963 CODE: 1010 CODE:
964 tc_clear (); 1011 tc_clear ();
965 1012
966CFPlus::Layout 1013CFPlus::Layout
967new (SV *class) 1014new (SV *class)
… …
1254 flags 1301 flags
1255 ); 1302 );
1256 1303
1257MODULE = CFPlus PACKAGE = CFPlus::Texture 1304MODULE = CFPlus PACKAGE = CFPlus::Texture
1258 1305
1306PROTOTYPES: ENABLE
1307
1259int minpot (int n) 1308int minpot (int n)
1260 1309
1261void 1310void
1262pad2pot (SV *data_, SV *w_, SV *h_) 1311pad (SV *data_, int ow, int oh, int nw, int nh)
1263 CODE: 1312 CODE:
1264{ 1313{
1265 int ow = SvIV (w_); 1314 if ((nw != ow || nh != oh) && SvOK (data_))
1266 int oh = SvIV (h_);
1267
1268 if (ow && oh)
1269 { 1315 {
1270 int nw = minpot (ow);
1271 int nh = minpot (oh);
1272
1273 if (nw != ow || nh != oh)
1274 {
1275 if (SvOK (data_))
1276 {
1277 STRLEN datalen; 1316 STRLEN datalen;
1278 char *data = SvPVbyte (data_, datalen); 1317 char *data = SvPVbyte (data_, datalen);
1279 int bpp = datalen / (ow * oh); 1318 int bpp = datalen / (ow * oh);
1280 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1319 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1281 1320
1282 SvPOK_only (result_); 1321 SvPOK_only (result_);
1283 SvCUR_set (result_, nw * nh * bpp); 1322 SvCUR_set (result_, nw * nh * bpp);
1284 1323
1285 memset (SvPVX (result_), 0, nw * nh * bpp); 1324 memset (SvPVX (result_), 0, nw * nh * bpp);
1286 while (oh--) 1325 while (oh--)
1287 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);
1288 1327
1289 sv_setsv (data_, result_); 1328 sv_setsv (data_, result_);
1290 }
1291
1292 sv_setiv (w_, nw);
1293 sv_setiv (h_, nh);
1294 }
1295 } 1329 }
1296} 1330}
1297 1331
1298void 1332void
1299draw_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.)
… …
1354} 1388}
1355 OUTPUT: 1389 OUTPUT:
1356 RETVAL 1390 RETVAL
1357 1391
1358MODULE = CFPlus PACKAGE = CFPlus::Map 1392MODULE = CFPlus PACKAGE = CFPlus::Map
1393
1394PROTOTYPES: DISABLE
1359 1395
1360CFPlus::Map 1396CFPlus::Map
1361new (SV *class) 1397new (SV *class)
1362 CODE: 1398 CODE:
1363 New (0, RETVAL, 1, struct map); 1399 New (0, RETVAL, 1, struct map);
… …
1974 glDisable (GL_BLEND); 2010 glDisable (GL_BLEND);
1975 glDisable (GL_TEXTURE_2D); 2011 glDisable (GL_TEXTURE_2D);
1976} 2012}
1977 2013
1978void 2014void
1979fow_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)
1980 PPCODE: 2016 PPCODE:
1981{ 2017{
1982 int x, y; 2018 int x, y;
2019 int sw1 = sw + 2;
2020 int sh1 = sh + 2;
2021 int sh3 = sh * 3;
1983 int sw4 = (sw + 3) & ~3; 2022 int sw34 = (sw * 3 + 3) & ~3;
2023 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1984 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2024 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1985 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2025 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1986 2026
1987 memset (darkness, 255, sw4 * sh);
1988 SvPOK_only (darkness_sv); 2027 SvPOK_only (darkness3_sv);
1989 SvCUR_set (darkness_sv, sw4 * sh); 2028 SvCUR_set (darkness3_sv, sw34 * sh3);
1990 2029
1991 mx += self->x; 2030 mx += self->x - 1;
1992 my += self->y; 2031 my += self->y - 1;
1993 2032
2033 memset (darkness1, 255, sw1 * sh1);
2034
1994 for (y = 0; y < sh; y++) 2035 for (y = 0; y < sh1; y++)
1995 if (0 <= y + my && y + my < self->rows) 2036 if (0 <= y + my && y + my < self->rows)
1996 { 2037 {
1997 maprow *row = self->row + (y + my); 2038 maprow *row = self->row + (y + my);
1998 2039
1999 for (x = 0; x < sw; x++) 2040 for (x = 0; x < sw1; x++)
2000 if (row->c0 <= x + mx && x + mx < row->c1) 2041 if (row->c0 <= x + mx && x + mx < row->c1)
2001 { 2042 {
2002 mapcell *cell = row->col + (x + mx - row->c0); 2043 mapcell *cell = row->col + (x + mx - row->c0);
2003 2044
2004 darkness[y * sw4 + x] = cell->darkness 2045 darkness1 [y * sw1 + x] = cell->darkness
2005 ? 255 - (cell->darkness - 1) 2046 ? 255 - (cell->darkness - 1)
2006 : 255 - FOW_DARKNESS; 2047 : 255 - FOW_DARKNESS;
2007 } 2048 }
2008 } 2049 }
2009 2050
2010 if (smoothing)
2011 {
2012 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
2013 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2014
2015 SvPOK_only (darkness2_sv);
2016 SvCUR_set (darkness2_sv, sw4 * sh);
2017
2018 for (y = 0; y < sh; ++y) 2051 for (y = 0; y < sh; ++y)
2019 for (x = 0; x < sw4; ++x) 2052 for (x = 0; x < sw; ++x)
2020 { 2053 {
2021 float *f = (float *)matrix; 2054 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2022 int dx, dy; 2055 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2023 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];
2024 2063
2025 for (dy = -1; dy <= 1; ++dy) 2064 uint8_t r11 = (d11 + d21 + d12) / 3;
2026 for (dx = -1; dx <= 1; ++dx) 2065 uint8_t r21 = d21;
2027 { 2066 uint8_t r31 = (d21 + d31 + d32) / 3;
2028 unsigned int x2 = x + dx;
2029 unsigned int y2 = y + dy;
2030 2067
2031 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++; 2068 uint8_t r12 = d12;
2032 } 2069 uint8_t r22 = d22;
2070 uint8_t r32 = d32;
2033 2071
2034 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum; 2072 uint8_t r13 = (d13 + d23 + d12) / 3;
2035 } 2073 uint8_t r23 = d23;
2074 uint8_t r33 = (d23 + d33 + d32) / 3;
2036 2075
2037 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);
2038 } 2085 }
2086
2087 free (darkness1);
2039 2088
2040 EXTEND (SP, 3); 2089 EXTEND (SP, 3);
2041 PUSHs (sv_2mortal (newSViv (sw4))); 2090 PUSHs (sv_2mortal (newSViv (sw34)));
2042 PUSHs (sv_2mortal (newSViv (sh))); 2091 PUSHs (sv_2mortal (newSViv (sh3)));
2043 PUSHs (darkness_sv); 2092 PUSHs (darkness3_sv);
2044} 2093}
2045 2094
2046SV * 2095SV *
2047get_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)
2048 CODE: 2097 CODE:
… …
2182 } 2231 }
2183} 2232}
2184 2233
2185MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2234MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2186 2235
2236PROTOTYPES: DISABLE
2237
2187CFPlus::MixChunk 2238CFPlus::MixChunk
2188new_from_file (SV *class, char *path) 2239new_from_file (SV *class, char *path)
2189 CODE: 2240 CODE:
2190 RETVAL = Mix_LoadWAV (path); 2241 RETVAL = Mix_LoadWAV (path);
2191 OUTPUT: 2242 OUTPUT:
… …
2212 2263
2213MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2264MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2214 2265
2215int 2266int
2216volume (int volume = -1) 2267volume (int volume = -1)
2268 PROTOTYPE: ;$
2217 CODE: 2269 CODE:
2218 RETVAL = Mix_VolumeMusic (volume); 2270 RETVAL = Mix_VolumeMusic (volume);
2219 OUTPUT: 2271 OUTPUT:
2220 RETVAL 2272 RETVAL
2221 2273
… …
2251 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2303 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2252 OUTPUT: 2304 OUTPUT:
2253 RETVAL 2305 RETVAL
2254 2306
2255MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2307MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2308
2309PROTOTYPES: ENABLE
2256 2310
2257BOOT: 2311BOOT:
2258{ 2312{
2259 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2313 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
2260 static const struct { 2314 static const struct {
… …
2276 const_iv (GL_ALPHA_TEST), 2330 const_iv (GL_ALPHA_TEST),
2277 const_iv (GL_NORMALIZE), 2331 const_iv (GL_NORMALIZE),
2278 const_iv (GL_RESCALE_NORMAL), 2332 const_iv (GL_RESCALE_NORMAL),
2279 const_iv (GL_FRONT), 2333 const_iv (GL_FRONT),
2280 const_iv (GL_BACK), 2334 const_iv (GL_BACK),
2335 const_iv (GL_AUX0),
2281 const_iv (GL_AND), 2336 const_iv (GL_AND),
2282 const_iv (GL_ONE), 2337 const_iv (GL_ONE),
2283 const_iv (GL_ZERO), 2338 const_iv (GL_ZERO),
2284 const_iv (GL_SRC_ALPHA), 2339 const_iv (GL_SRC_ALPHA),
2285 const_iv (GL_DST_ALPHA), 2340 const_iv (GL_DST_ALPHA),
… …
2331 const_iv (GL_COLOR_LOGIC_OP), 2386 const_iv (GL_COLOR_LOGIC_OP),
2332 const_iv (GL_SEPARABLE_2D), 2387 const_iv (GL_SEPARABLE_2D),
2333 const_iv (GL_CONVOLUTION_2D), 2388 const_iv (GL_CONVOLUTION_2D),
2334 const_iv (GL_CONVOLUTION_BORDER_MODE), 2389 const_iv (GL_CONVOLUTION_BORDER_MODE),
2335 const_iv (GL_CONSTANT_BORDER), 2390 const_iv (GL_CONSTANT_BORDER),
2391 const_iv (GL_POINTS),
2336 const_iv (GL_LINES), 2392 const_iv (GL_LINES),
2337 const_iv (GL_LINE_STRIP), 2393 const_iv (GL_LINE_STRIP),
2338 const_iv (GL_LINE_LOOP), 2394 const_iv (GL_LINE_LOOP),
2339 const_iv (GL_QUADS), 2395 const_iv (GL_QUADS),
2340 const_iv (GL_QUAD_STRIP), 2396 const_iv (GL_QUAD_STRIP),
2341 const_iv (GL_TRIANGLES), 2397 const_iv (GL_TRIANGLES),
2342 const_iv (GL_TRIANGLE_STRIP), 2398 const_iv (GL_TRIANGLE_STRIP),
2343 const_iv (GL_TRIANGLE_FAN), 2399 const_iv (GL_TRIANGLE_FAN),
2400 const_iv (GL_POLYGON),
2344 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),
2345 const_iv (GL_FASTEST), 2406 const_iv (GL_FASTEST),
2407 const_iv (GL_DONT_CARE),
2408 const_iv (GL_NICEST),
2346 const_iv (GL_V2F), 2409 const_iv (GL_V2F),
2347 const_iv (GL_V3F), 2410 const_iv (GL_V3F),
2348 const_iv (GL_T2F_V3F), 2411 const_iv (GL_T2F_V3F),
2349 const_iv (GL_T2F_N3F_V3F), 2412 const_iv (GL_T2F_N3F_V3F),
2350# undef const_iv 2413# undef const_iv
… …
2437void 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_)
2438 2501
2439# near_ and far_ are due to microsofts buggy "c" compiler 2502# near_ and far_ are due to microsofts buggy "c" compiler
2440void 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_)
2441 2504
2505PROTOTYPES: DISABLE
2506
2442void glViewport (int x, int y, int width, int height) 2507void glViewport (int x, int y, int width, int height)
2443 2508
2444void glScissor (int x, int y, int width, int height) 2509void glScissor (int x, int y, int width, int height)
2445 2510
2446void glTranslate (float x, float y, float z = 0.) 2511void glTranslate (float x, float y, float z = 0.)
… …
2453 2518
2454void glRotate (float angle, float x, float y, float z) 2519void glRotate (float angle, float x, float y, float z)
2455 CODE: 2520 CODE:
2456 glRotatef (angle, x, y, z); 2521 glRotatef (angle, x, y, z);
2457 2522
2458void glBegin (int mode)
2459
2460void glEnd ()
2461
2462void glColor (float r, float g, float b, float a = 1.0) 2523void glColor (float r, float g, float b, float a = 1.0)
2463 PROTOTYPE: @
2464 ALIAS: 2524 ALIAS:
2465 glColor_premultiply = 1 2525 glColor_premultiply = 1
2466 CODE: 2526 CODE:
2467 if (ix) 2527 if (ix)
2468 { 2528 {
… …
2471 b *= a; 2531 b *= a;
2472 } 2532 }
2473 // microsoft visual "c" rounds instead of truncating... 2533 // microsoft visual "c" rounds instead of truncating...
2474 glColor4f (r, g, b, a); 2534 glColor4f (r, g, b, a);
2475 2535
2476void glInterleavedArrays (int format, int stride, char *data)
2477
2478void glDrawElements (int mode, int count, int type, char *indices)
2479
2480# 1.2 void glDrawRangeElements (int mode, int start, int end
2481
2482void glRasterPos (float x, float y, float z = 0.) 2536void glRasterPos (float x, float y, float z = 0.)
2483 CODE: 2537 CODE:
2484 glRasterPos3f (0, 0, z); 2538 glRasterPos3f (0, 0, z);
2485 glBitmap (0, 0, 0, 0, x, y, 0); 2539 glBitmap (0, 0, 0, 0, x, y, 0);
2486 2540
… …
2490 2544
2491void glTexCoord (float s, float t) 2545void glTexCoord (float s, float t)
2492 CODE: 2546 CODE:
2493 glTexCoord2f (s, t); 2547 glTexCoord2f (s, t);
2494 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
2495void glTexEnv (int target, int pname, float param) 2565void glTexEnv (int target, int pname, float param)
2496 CODE: 2566 CODE:
2497 glTexEnvf (target, pname, param); 2567 glTexEnvf (target, pname, param);
2498 2568
2499void glTexParameter (int target, int pname, float param) 2569void glTexParameter (int target, int pname, float param)
… …
2551 2621
2552void glEndList () 2622void glEndList ()
2553 2623
2554void glCallList (int list) 2624void glCallList (int list)
2555 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