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.305 by root, Sun May 2 21:22:20 2010 UTC vs.
Revision 1.317 by root, Fri Nov 23 12:39:05 2012 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
… …
552 577
553 return mod; 578 return mod;
554} 579}
555 580
556static void 581static void
557deliantra_main () 582deliantra_main (SV *real_main)
558{ 583{
559 char *argv[] = { 0 }; 584 dSP;
560 call_argv ("::main", G_DISCARD | G_VOID, argv); 585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
561} 588}
562 589
563#ifdef __MACOSX__ 590#ifdef __MACOSX__
591 static SV *real_main;
592
564 /* to due surprising braindamage on the side of SDL design, we 593 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main() 594 * 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, 595 * 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, 596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back. 597 * and which calls our main (== SDL_main) back.
569 */ 598 */
570 extern C_LINKAGE int 599 extern C_LINKAGE int
571 main (int argc, char *argv[]) 600 main (int argc, char *argv[])
572 { 601 {
573 deliantra_main (); 602 deliantra_main (real_main);
574 } 603 }
575 604
576 #undef main 605 #undef main
577 606
578 extern C_LINKAGE int main (int argc, char *argv[]); 607 extern C_LINKAGE int main (int argc, char *argv[]);
579 608
580 static void 609 static void
581 SDL_braino (void) 610 SDL_main_hack (SV *real_main_)
582 { 611 {
612 real_main = real_main_;
613
583 char *argv[] = { "deliantra client", 0 }; 614 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv); 615 (main) (1, argv);
585 } 616 }
586#else 617#else
587 static void 618 static void
588 SDL_braino (void) 619 SDL_main_hack (SV *real_main)
589 { 620 {
590 deliantra_main (); 621 deliantra_main (real_main);
591 } 622 }
592#endif 623#endif
593 624
594MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
595 626
… …
796 827
797 const_iv (FOW_DARKNESS) 828 const_iv (FOW_DARKNESS)
798# undef const_iv 829# undef const_iv
799 }; 830 };
800 831
801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 832 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803 834
804 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806} 837}
807 838
… …
846#endif 877#endif
847} 878}
848 879
849char *SDL_GetError () 880char *SDL_GetError ()
850 881
851void SDL_braino () 882void SDL_main_hack (SV *real_main)
883 PROTOTYPE: &
852 884
853int SDL_Init (U32 flags) 885int SDL_Init (U32 flags)
854 886
855int SDL_InitSubSystem (U32 flags) 887int SDL_InitSubSystem (U32 flags)
856 888
… …
925 ); 957 );
926 958
927 if (RETVAL) 959 if (RETVAL)
928 { 960 {
929 av_clear (texture_av); 961 av_clear (texture_av);
930
931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 962#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
933#include "glfunc.h" 963#include "glfunc.h"
934#undef GL_FUNC 964#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB; 965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB; 966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
938 } 967 }
939} 968}
940 OUTPUT: 969 OUTPUT:
941 RETVAL 970 RETVAL
942 971
943void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
944SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
945 977
946char * 978char *
947SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
948 980
… …
950SDL_GetAppState () 982SDL_GetAppState ()
951 983
952int 984int
953SDL_GetModState () 985SDL_GetModState ()
954 986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
955void 991void
992SDL_PumpEvents ()
993
994void
956poll_events () 995peep_events ()
957 PPCODE: 996 PPCODE:
958{ 997{
959 SDL_Event ev; 998 SDL_Event ev;
960 999
961 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
… …
1114 OUTPUT: 1153 OUTPUT:
1115 RETVAL 1154 RETVAL
1116 1155
1117void 1156void
1118IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG) 1157IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1158
1159# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1160void
1161Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1119 1162
1120void 1163void
1121load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
1122 ALIAS: 1165 ALIAS:
1123 load_image_file = 1 1166 load_image_file = 1
… …
1449 1492
1450void 1493void
1451set_height (DC::Layout self, int base_height) 1494set_height (DC::Layout self, int base_height)
1452 CODE: 1495 CODE:
1453 if (self->base_height != base_height) 1496 if (self->base_height != base_height)
1454 { 1497 {
1455 self->base_height = base_height; 1498 self->base_height = base_height;
1456 layout_update_font (self); 1499 layout_update_font (self);
1457 } 1500 }
1458 1501
1459void 1502void
… …
1989 self->y += MAP_EXTEND_Y; 2032 self->y += MAP_EXTEND_Y;
1990 } 2033 }
1991} 2034}
1992 2035
1993SV * 2036SV *
1994map1a_update (DC::Map self, SV *data_, int extmap) 2037map1a_update (DC::Map self, SV *data_)
1995 CODE: 2038 CODE:
1996{ 2039{
1997 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2040 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1998 uint8_t *data_end = (uint8_t *)SvEND (data_); 2041 uint8_t *data_end = (uint8_t *)SvEND (data_);
1999 mapcell *cell; 2042 mapcell *cell;
… …
2020 2063
2021 //TODO: don't trust server data to be in-range(!) 2064 //TODO: don't trust server data to be in-range(!)
2022 2065
2023 if (flags & 8) 2066 if (flags & 8)
2024 { 2067 {
2068 uint8_t ext, cmd;
2069
2025 if (extmap) 2070 do
2026 { 2071 {
2027 uint8_t ext, cmd; 2072 ext = *data++;
2073 cmd = ext & 0x7f;
2028 2074
2029 do 2075 if (cmd < 4)
2076 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2077 else if (cmd == 5) // health
2030 { 2078 {
2031 ext = *data++;
2032 cmd = ext & 0x7f;
2033
2034 if (cmd < 4)
2035 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2036 else if (cmd == 5) // health
2037 {
2038 cell->stat_width = 1; 2079 cell->stat_width = 1;
2039 cell->stat_hp = *data++; 2080 cell->stat_hp = *data++;
2040 }
2041 else if (cmd == 6) // monster width
2042 cell->stat_width = *data++ + 1;
2043 else if (cmd == 0x47)
2044 {
2045 if (*data == 1) cell->player = data [1];
2046 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2047 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2048 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2049
2050 data += *data + 1;
2051 }
2052 else if (cmd == 8) // cell flags
2053 cell->flags = *data++;
2054 else if (ext & 0x40) // unknown, multibyte => skip
2055 data += *data + 1;
2056 else
2057 data++;
2058 } 2081 }
2059 while (ext & 0x80); 2082 else if (cmd == 6) // monster width
2083 cell->stat_width = *data++ + 1;
2084 else if (cmd == 0x47)
2085 {
2086 if (*data == 1) cell->player = data [1];
2087 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2088 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2089 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2090
2091 data += *data + 1;
2092 }
2093 else if (cmd == 8) // cell flags
2094 cell->flags = *data++;
2095 else if (ext & 0x40) // unknown, multibyte => skip
2096 data += *data + 1;
2097 else
2098 data++;
2060 } 2099 }
2061 else 2100 while (ext & 0x80);
2062 cell->darkness = *data++ + 1;
2063 } 2101 }
2064 2102
2065 for (z = 0; z <= 2; ++z) 2103 for (z = 0; z <= 2; ++z)
2066 if (flags & (4 >> z)) 2104 if (flags & (4 >> z))
2067 { 2105 {
… …
2115 ? self->row + y 2153 ? self->row + y
2116 : 0; 2154 : 0;
2117 2155
2118 for (x = x0; x < x1; x++) 2156 for (x = x0; x < x1; x++)
2119 { 2157 {
2120 int r = 32, g = 32, b = 32, a = 192; 2158 unsigned int r = 32, g = 32, b = 32, a = 192;
2121 2159
2122 if (row && row->c0 <= x && x < row->c1) 2160 if (row && row->c0 <= x && x < row->c1)
2123 { 2161 {
2124 mapcell *cell = row->col + (x - row->c0); 2162 mapcell *cell = row->col + (x - row->c0);
2125 2163
… …
2127 { 2165 {
2128 maptex tex = self->tex [cell->tile [z]]; 2166 maptex tex = self->tex [cell->tile [z]];
2129 int a0 = 255 - tex.a; 2167 int a0 = 255 - tex.a;
2130 int a1 = tex.a; 2168 int a1 = tex.a;
2131 2169
2132 r = (r * a0 + tex.r * a1) / 255; 2170 r = div255 (r * a0 + tex.r * a1);
2133 g = (g * a0 + tex.g * a1) / 255; 2171 g = div255 (g * a0 + tex.g * a1);
2134 b = (b * a0 + tex.b * a1) / 255; 2172 b = div255 (b * a0 + tex.b * a1);
2135 a = (a * a0 + tex.a * a1) / 255; 2173 a = div255 (a * a0 + tex.a * a1);
2136 } 2174 }
2137 } 2175 }
2138 2176
2139 *map++ = (r ) 2177 *map++ = (r )
2140 | (g << 8) 2178 | (g << 8)
… …
2147} 2185}
2148 OUTPUT: 2186 OUTPUT:
2149 RETVAL 2187 RETVAL
2150 2188
2151void 2189void
2152draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2190draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2153 CODE: 2191 CODE:
2154{ 2192{
2155 int x, y, z; 2193 int x, y, z;
2156 2194
2157 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2195 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
… …
2241 2279
2242 key.texname = tex.name; 2280 key.texname = tex.name;
2243 arr = rc_array (rc, &key); 2281 arr = rc_array (rc, &key);
2244 } 2282 }
2245 2283
2246 px = (x + 1) * T - tex.w; 2284 px = (x + 1) * Th - tex.w;
2247 py = (y + 1) * T - tex.h; 2285 py = (y + 1) * Tw - tex.h;
2248 2286
2249 if (expect_false (cell->player == player) && expect_false (z == 2)) 2287 if (expect_false (cell->player == player) && expect_false (z == 2))
2250 { 2288 {
2251 pl_x = px; 2289 pl_x = px;
2252 pl_y = py; 2290 pl_y = py;
… …
2305 if (cell->flags & 1) 2343 if (cell->flags & 1)
2306 { 2344 {
2307 rc_key_t key_ov = key; 2345 rc_key_t key_ov = key;
2308 maptex tex = self->tex [TEXID_SPEECH]; 2346 maptex tex = self->tex [TEXID_SPEECH];
2309 rc_array_t *arr; 2347 rc_array_t *arr;
2310 int px = x * T + T * 2 / 32; 2348 int px = x * Tw + Tw * 2 / 32;
2311 int py = y * T - T * 6 / 32; 2349 int py = y * Th - Th * 6 / 32;
2312 2350
2313 key_ov.texname = tex.name; 2351 key_ov.texname = tex.name;
2314 arr = rc_array (rc_ov, &key_ov); 2352 arr = rc_array (rc_ov, &key_ov);
2315 2353
2316 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2354 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2317 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2355 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2318 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2356 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2319 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2357 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2320 } 2358 }
2321 } 2359 }
2322 } 2360 }
2323 } 2361 }
2324 2362
… …
2351 if (!(bits & 0x1000) 2389 if (!(bits & 0x1000)
2352 && skey->level == level 2390 && skey->level == level
2353 && level > smooth_max [skey->x][skey->y]) 2391 && level > smooth_max [skey->x][skey->y])
2354 { 2392 {
2355 maptex tex = self->tex [skey->tile]; 2393 maptex tex = self->tex [skey->tile];
2356 int px = (((int)skey->x) - 1) * T; 2394 int px = (((int)skey->x) - 1) * Tw;
2357 int py = (((int)skey->y) - 1) * T; 2395 int py = (((int)skey->y) - 1) * Th;
2358 int border = bits & 15; 2396 int border = bits & 15;
2359 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2397 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2360 float dx = tex.s * .0625f; // 16 images/row 2398 float dx = tex.s * .0625f; // 16 images/row
2361 float dy = tex.t * .5f ; // 2 images/column 2399 float dy = tex.t * .5f ; // 2 images/column
2362 2400
… …
2375 2413
2376 if (border) 2414 if (border)
2377 { 2415 {
2378 float ox = border * dx; 2416 float ox = border * dx;
2379 2417
2380 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2418 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2381 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2419 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2382 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2420 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2383 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2421 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2384 } 2422 }
2385 2423
2386 if (corner) 2424 if (corner)
2387 { 2425 {
2388 float ox = corner * dx; 2426 float ox = corner * dx;
2389 2427
2390 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2391 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2429 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2392 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2430 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2393 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2431 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2394 } 2432 }
2395 } 2433 }
2396 } 2434 }
2397 } 2435 }
2398 } 2436 }
… …
2439 for (x = 0; x < sw; x++) 2477 for (x = 0; x < sw; x++)
2440 if (row->c0 <= x + mx && x + mx < row->c1) 2478 if (row->c0 <= x + mx && x + mx < row->c1)
2441 { 2479 {
2442 mapcell *cell = row->col + (x + mx - row->c0); 2480 mapcell *cell = row->col + (x + mx - row->c0);
2443 2481
2444 int px = x * T; 2482 int px = x * Tw;
2445 int py = y * T; 2483 int py = y * Th;
2446 2484
2447 if (expect_false (cell->player == player)) 2485 if (expect_false (cell->player == player))
2448 { 2486 {
2449 px += sdx; 2487 px += sdx;
2450 py += sdy; 2488 py += sdy;
2451 } 2489 }
2452 2490
2453 if (cell->stat_hp) 2491 if (cell->stat_hp)
2454 { 2492 {
2455 int width = cell->stat_width * T; 2493 int width = cell->stat_width * Tw;
2456 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2494 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2457 2495
2458 glColor3ub (0, 0, 0); 2496 glColor3ub (0, 0, 0);
2459 glRectf (px + 1, py - thick - 2, 2497 glRectf (px + 1, py - thick - 2,
2460 px + width - 1, py); 2498 px + width - 1, py);
2461 2499
… …
2541 int x, y; 2579 int x, y;
2542 int sw1 = sw + 2; 2580 int sw1 = sw + 2;
2543 int sh1 = sh + 2; 2581 int sh1 = sh + 2;
2544 int sh3 = sh * 3; 2582 int sh3 = sh * 3;
2545 int sw3 = sw * 3; 2583 int sw3 = sw * 3;
2546 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2547 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2584 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2548 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2585 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2586 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2587 memset (darkness1, 0, sw1*sh1);
2549 2588
2550 SvPOK_only (darkness3_sv); 2589 SvPOK_only (darkness3_sv);
2551 SvCUR_set (darkness3_sv, sw3 * sh3); 2590 SvCUR_set (darkness3_sv, sw3 * sh3);
2552 2591
2553 mx += self->x - 1; 2592 mx += self->x - 1;
… …
3132 const_iv (GL_FUNC_SUBTRACT), 3171 const_iv (GL_FUNC_SUBTRACT),
3133 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3172 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3134# undef const_iv 3173# undef const_iv
3135 }; 3174 };
3136 3175
3137 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3176 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3138 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3177 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3139 3178
3140 texture_av = newAV (); 3179 texture_av = newAV ();
3141 AvREAL_off (texture_av); 3180 AvREAL_off (texture_av);
3142} 3181}
3143 3182

Diff Legend

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