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.304 by root, Fri Apr 23 16:30:38 2010 UTC vs.
Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC

… …
99 99
100#define KMOD_LRAM 0x10000 // our extension 100#define KMOD_LRAM 0x10000 // our extension
101 101
102#define TEXID_SPEECH 1 102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2 103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
104 123
105static AV *texture_av; 124static AV *texture_av;
106 125
107static struct 126static struct
108{ 127{
… …
463 482
464 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
465} 484}
466 485
467static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
468minpot (unsigned int n) 493minpot (unsigned int n)
469{ 494{
470 if (!n) 495 if (!n)
471 return 0; 496 return 0;
472 497
… …
555 580
556static void 581static void
557deliantra_main () 582deliantra_main ()
558{ 583{
559 char *argv[] = { 0 }; 584 char *argv[] = { 0 };
560 call_argv ("::main", G_DISCARD | G_VOID, argv); 585 call_argv ("DC::Main::main", G_DISCARD | G_VOID, argv);
561} 586}
562 587
563#ifdef __MACOSX__ 588#ifdef __MACOSX__
564 /* to due surprising braindamage on the side of SDL design, we 589 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main() 590 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which, 591 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 592 * due to shared library magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back. 593 * and which calls our main (== SDL_main) back.
569 */ 594 */
570 extern C_LINKAGE int 595 extern C_LINKAGE int
571 main (int argc, char *argv[]) 596 main (int argc, char *argv[])
572 { 597 {
… …
796 821
797 const_iv (FOW_DARKNESS) 822 const_iv (FOW_DARKNESS)
798# undef const_iv 823# undef const_iv
799 }; 824 };
800 825
801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 826 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803 828
804 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806} 831}
807 832
… …
950SDL_GetAppState () 975SDL_GetAppState ()
951 976
952int 977int
953SDL_GetModState () 978SDL_GetModState ()
954 979
980int
981SDL_WaitEvent ()
982 C_ARGS: 0
983
955void 984void
985SDL_PumpEvents ()
986
987void
956poll_events () 988peep_events ()
957 PPCODE: 989 PPCODE:
958{ 990{
959 SDL_Event ev; 991 SDL_Event ev;
960 992
961 SDL_PumpEvents (); 993 SDL_PumpEvents ();
… …
1111add_font (char *file) 1143add_font (char *file)
1112 CODE: 1144 CODE:
1113 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1145 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1114 OUTPUT: 1146 OUTPUT:
1115 RETVAL 1147 RETVAL
1148
1149void
1150IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1151
1152# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1153void
1154Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1116 1155
1117void 1156void
1118load_image_inline (SV *image_) 1157load_image_inline (SV *image_)
1119 ALIAS: 1158 ALIAS:
1120 load_image_file = 1 1159 load_image_file = 1
… …
2112 ? self->row + y 2151 ? self->row + y
2113 : 0; 2152 : 0;
2114 2153
2115 for (x = x0; x < x1; x++) 2154 for (x = x0; x < x1; x++)
2116 { 2155 {
2117 int r = 32, g = 32, b = 32, a = 192; 2156 unsigned int r = 32, g = 32, b = 32, a = 192;
2118 2157
2119 if (row && row->c0 <= x && x < row->c1) 2158 if (row && row->c0 <= x && x < row->c1)
2120 { 2159 {
2121 mapcell *cell = row->col + (x - row->c0); 2160 mapcell *cell = row->col + (x - row->c0);
2122 2161
… …
2124 { 2163 {
2125 maptex tex = self->tex [cell->tile [z]]; 2164 maptex tex = self->tex [cell->tile [z]];
2126 int a0 = 255 - tex.a; 2165 int a0 = 255 - tex.a;
2127 int a1 = tex.a; 2166 int a1 = tex.a;
2128 2167
2129 r = (r * a0 + tex.r * a1) / 255; 2168 r = div255 (r * a0 + tex.r * a1);
2130 g = (g * a0 + tex.g * a1) / 255; 2169 g = div255 (g * a0 + tex.g * a1);
2131 b = (b * a0 + tex.b * a1) / 255; 2170 b = div255 (b * a0 + tex.b * a1);
2132 a = (a * a0 + tex.a * a1) / 255; 2171 a = div255 (a * a0 + tex.a * a1);
2133 } 2172 }
2134 } 2173 }
2135 2174
2136 *map++ = (r ) 2175 *map++ = (r )
2137 | (g << 8) 2176 | (g << 8)
… …
2144} 2183}
2145 OUTPUT: 2184 OUTPUT:
2146 RETVAL 2185 RETVAL
2147 2186
2148void 2187void
2149draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2188draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2150 CODE: 2189 CODE:
2151{ 2190{
2152 int x, y, z; 2191 int x, y, z;
2153 2192
2154 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2193 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
… …
2238 2277
2239 key.texname = tex.name; 2278 key.texname = tex.name;
2240 arr = rc_array (rc, &key); 2279 arr = rc_array (rc, &key);
2241 } 2280 }
2242 2281
2243 px = (x + 1) * T - tex.w; 2282 px = (x + 1) * Th - tex.w;
2244 py = (y + 1) * T - tex.h; 2283 py = (y + 1) * Tw - tex.h;
2245 2284
2246 if (expect_false (cell->player == player) && expect_false (z == 2)) 2285 if (expect_false (cell->player == player) && expect_false (z == 2))
2247 { 2286 {
2248 pl_x = px; 2287 pl_x = px;
2249 pl_y = py; 2288 pl_y = py;
… …
2302 if (cell->flags & 1) 2341 if (cell->flags & 1)
2303 { 2342 {
2304 rc_key_t key_ov = key; 2343 rc_key_t key_ov = key;
2305 maptex tex = self->tex [TEXID_SPEECH]; 2344 maptex tex = self->tex [TEXID_SPEECH];
2306 rc_array_t *arr; 2345 rc_array_t *arr;
2307 int px = x * T + T * 2 / 32; 2346 int px = x * Tw + Tw * 2 / 32;
2308 int py = y * T - T * 6 / 32; 2347 int py = y * Th - Th * 6 / 32;
2309 2348
2310 key_ov.texname = tex.name; 2349 key_ov.texname = tex.name;
2311 arr = rc_array (rc_ov, &key_ov); 2350 arr = rc_array (rc_ov, &key_ov);
2312 2351
2313 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2352 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2314 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2353 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2315 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2354 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2316 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2355 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2317 } 2356 }
2318 } 2357 }
2319 } 2358 }
2320 } 2359 }
2321 2360
… …
2348 if (!(bits & 0x1000) 2387 if (!(bits & 0x1000)
2349 && skey->level == level 2388 && skey->level == level
2350 && level > smooth_max [skey->x][skey->y]) 2389 && level > smooth_max [skey->x][skey->y])
2351 { 2390 {
2352 maptex tex = self->tex [skey->tile]; 2391 maptex tex = self->tex [skey->tile];
2353 int px = (((int)skey->x) - 1) * T; 2392 int px = (((int)skey->x) - 1) * Tw;
2354 int py = (((int)skey->y) - 1) * T; 2393 int py = (((int)skey->y) - 1) * Th;
2355 int border = bits & 15; 2394 int border = bits & 15;
2356 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2395 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2357 float dx = tex.s * .0625f; // 16 images/row 2396 float dx = tex.s * .0625f; // 16 images/row
2358 float dy = tex.t * .5f ; // 2 images/column 2397 float dy = tex.t * .5f ; // 2 images/column
2359 2398
… …
2372 2411
2373 if (border) 2412 if (border)
2374 { 2413 {
2375 float ox = border * dx; 2414 float ox = border * dx;
2376 2415
2377 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2416 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2378 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2417 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2379 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2418 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2380 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2419 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2381 } 2420 }
2382 2421
2383 if (corner) 2422 if (corner)
2384 { 2423 {
2385 float ox = corner * dx; 2424 float ox = corner * dx;
2386 2425
2387 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2426 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2388 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2427 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2389 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2428 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2390 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2391 } 2430 }
2392 } 2431 }
2393 } 2432 }
2394 } 2433 }
2395 } 2434 }
… …
2436 for (x = 0; x < sw; x++) 2475 for (x = 0; x < sw; x++)
2437 if (row->c0 <= x + mx && x + mx < row->c1) 2476 if (row->c0 <= x + mx && x + mx < row->c1)
2438 { 2477 {
2439 mapcell *cell = row->col + (x + mx - row->c0); 2478 mapcell *cell = row->col + (x + mx - row->c0);
2440 2479
2441 int px = x * T; 2480 int px = x * Tw;
2442 int py = y * T; 2481 int py = y * Th;
2443 2482
2444 if (expect_false (cell->player == player)) 2483 if (expect_false (cell->player == player))
2445 { 2484 {
2446 px += sdx; 2485 px += sdx;
2447 py += sdy; 2486 py += sdy;
2448 } 2487 }
2449 2488
2450 if (cell->stat_hp) 2489 if (cell->stat_hp)
2451 { 2490 {
2452 int width = cell->stat_width * T; 2491 int width = cell->stat_width * Tw;
2453 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2492 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2454 2493
2455 glColor3ub (0, 0, 0); 2494 glColor3ub (0, 0, 0);
2456 glRectf (px + 1, py - thick - 2, 2495 glRectf (px + 1, py - thick - 2,
2457 px + width - 1, py); 2496 px + width - 1, py);
2458 2497
… …
2538 int x, y; 2577 int x, y;
2539 int sw1 = sw + 2; 2578 int sw1 = sw + 2;
2540 int sh1 = sh + 2; 2579 int sh1 = sh + 2;
2541 int sh3 = sh * 3; 2580 int sh3 = sh * 3;
2542 int sw3 = sw * 3; 2581 int sw3 = sw * 3;
2543 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2544 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2582 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2545 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2583 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2584 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2585 memset (darkness1, 0, sw1*sh1);
2546 2586
2547 SvPOK_only (darkness3_sv); 2587 SvPOK_only (darkness3_sv);
2548 SvCUR_set (darkness3_sv, sw3 * sh3); 2588 SvCUR_set (darkness3_sv, sw3 * sh3);
2549 2589
2550 mx += self->x - 1; 2590 mx += self->x - 1;
… …
3129 const_iv (GL_FUNC_SUBTRACT), 3169 const_iv (GL_FUNC_SUBTRACT),
3130 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3170 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3131# undef const_iv 3171# undef const_iv
3132 }; 3172 };
3133 3173
3134 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3174 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3135 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3175 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3136 3176
3137 texture_av = newAV (); 3177 texture_av = newAV ();
3138 AvREAL_off (texture_av); 3178 AvREAL_off (texture_av);
3139} 3179}
3140 3180

Diff Legend

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