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.255 by root, Sun Jan 6 18:25:59 2008 UTC vs.
Revision 1.263 by root, Fri Jul 18 21:18:42 2008 UTC

… …
65# include <netinet/in.h> 65# include <netinet/in.h>
66# include <netinet/tcp.h> 66# include <netinet/tcp.h>
67# include <inttypes.h> 67# include <inttypes.h>
68#endif 68#endif
69 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 80
72#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
73 82
74#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
… …
76 85
77#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
78 87
79/* mask out modifiers we are not interested in */ 88/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81
82#if 0
83# define PARACHUTE SDL_INIT_NOPARACHUTE
84#else
85# define PARACHUTE 0
86#endif
87 90
88static AV *texture_av; 91static AV *texture_av;
89 92
90static struct 93static struct
91{ 94{
… …
185 188
186static void 189static void
187layout_update_font (DC__Layout self) 190layout_update_font (DC__Layout self)
188{ 191{
189 /* use a random scale factor to account for unknown descenders, 0.8 works 192 /* use a random scale factor to account for unknown descenders, 0.8 works
190 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
191 */ 194 */
192 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
193 196
194 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
195 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
635 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 640 const_iv (KMOD_MODE),
638 641
639 const_iv (MIX_DEFAULT_FORMAT), 642 const_iv (MIX_DEFAULT_FORMAT),
643
644 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD),
640# undef const_iv 652# undef const_iv
641 }; 653 };
642 654
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 655 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 656 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
673 CODE: 685 CODE:
674{ 686{
675 opengl_fontmap = pango_opengl_font_map_new (); 687 opengl_fontmap = pango_opengl_font_map_new ();
676 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 688 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 689 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
690 /*pango_context_set_font_description (opengl_context, default_font);*/
678#if PANGO_VERSION_CHECK (1, 15, 2) 691#if PANGO_VERSION_CHECK (1, 15, 2)
679 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 692 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 693 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
681#endif 694#endif
682} 695}
683 696
684char *
685SDL_GetError () 697char *SDL_GetError ()
686 698
687int 699int SDL_Init (U32 flags)
688SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
689 700
690void 701int SDL_InitSubSystem (U32 flags)
702
703void SDL_QuitSubSystem (U32 flags)
704
691SDL_Quit () 705void SDL_Quit ()
692 706
693void 707void
694SDL_ListModes (int rgb, int alpha) 708SDL_ListModes (int rgb, int alpha)
695 PPCODE: 709 PPCODE:
696{ 710{
… …
718 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 732 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
719 733
720 if (m && m != (SDL_Rect **)-1) 734 if (m && m != (SDL_Rect **)-1)
721 while (*m) 735 while (*m)
722 { 736 {
723 if ((*m)->w >= 800 && (*m)->h >= 480)
724 {
725 AV *av = newAV (); 737 AV *av = newAV ();
726 av_push (av, newSViv ((*m)->w)); 738 av_push (av, newSViv ((*m)->w));
727 av_push (av, newSViv ((*m)->h)); 739 av_push (av, newSViv ((*m)->h));
728 av_push (av, newSViv (rgb)); 740 av_push (av, newSViv (rgb));
729 av_push (av, newSViv (alpha)); 741 av_push (av, newSViv (alpha));
730 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 742 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
731 }
732 743
733 ++m; 744 ++m;
734 } 745 }
735} 746}
736 747
… …
769char * 780char *
770SDL_GetKeyName (int sym) 781SDL_GetKeyName (int sym)
771 782
772int 783int
773SDL_GetAppState () 784SDL_GetAppState ()
785
786int
787SDL_GetModState ()
774 788
775void 789void
776poll_events () 790poll_events ()
777 PPCODE: 791 PPCODE:
778{ 792{
… …
912 } 926 }
913 } 927 }
914#endif 928#endif
915} 929}
916 930
917void 931int
918add_font (char *file) 932add_font (char *file)
919 CODE: 933 CODE:
920 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 934 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
935 OUTPUT:
936 RETVAL
921 937
922void 938void
923load_image_inline (SV *image_) 939load_image_inline (SV *image_)
924 ALIAS: 940 ALIAS:
925 load_image_file = 1 941 load_image_file = 1
… …
1681 uint8_t ext, cmd; 1697 uint8_t ext, cmd;
1682 1698
1683 do 1699 do
1684 { 1700 {
1685 ext = *data++; 1701 ext = *data++;
1686 cmd = ext & 0x3f; 1702 cmd = ext & 0x7f;
1687 1703
1688 if (cmd < 4) 1704 if (cmd < 4)
1689 cell->darkness = 255 - ext * 64 + 1; 1705 cell->darkness = 255 - ext * 64 + 1;
1690 else if (cmd == 5) // health 1706 else if (cmd == 5) // health
1691 { 1707 {
… …
1694 } 1710 }
1695 else if (cmd == 6) // monster width 1711 else if (cmd == 6) // monster width
1696 cell->stat_width = *data++ + 1; 1712 cell->stat_width = *data++ + 1;
1697 else if (cmd == 0x47) 1713 else if (cmd == 0x47)
1698 { 1714 {
1699 if (*data == 4) 1715 if (*data == 1) cell->player = data [1];
1700 ; // decode player count 1716 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1717 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1718 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1701 1719
1702 data += *data + 1; 1720 data += *data + 1;
1703 } 1721 }
1704 else if (cmd == 8) // cell flags 1722 else if (cmd == 8) // cell flags
1705 cell->flags = *data++; 1723 cell->flags = *data++;
… …
1797} 1815}
1798 OUTPUT: 1816 OUTPUT:
1799 RETVAL 1817 RETVAL
1800 1818
1801void 1819void
1802draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1820draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1803 CODE: 1821 CODE:
1804{ 1822{
1805 int x, y, z; 1823 int x, y, z;
1806 1824
1807 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1825 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1808 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1826 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1809 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1827 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1810 smooth_key skey; 1828 smooth_key skey;
1811 1829 int pl_x, pl_y;
1830 maptex pl_tex;
1812 rc_t *rc = rc_alloc (); 1831 rc_t *rc = rc_alloc ();
1813 rc_key_t key; 1832 rc_key_t key;
1814 rc_array_t *arr; 1833 rc_array_t *arr;
1834
1835 pl_tex.name = 0;
1815 1836
1816 // thats current max. sorry. 1837 // thats current max. sorry.
1817 if (sw > 255) sw = 255; 1838 if (sw > 255) sw = 255;
1818 if (sh > 255) sh = 255; 1839 if (sh > 255) sh = 255;
1819 1840
… …
1874 tileid tile = cell->tile [z]; 1895 tileid tile = cell->tile [z];
1875 1896
1876 if (tile) 1897 if (tile)
1877 { 1898 {
1878 maptex tex = self->tex [tile]; 1899 maptex tex = self->tex [tile];
1879 int px, py; 1900 int px = (x + 1) * T - tex.w;
1901 int py = (y + 1) * T - tex.h;
1880 1902
1881 if (key.texname != tex.name) 1903 if (key.texname != tex.name)
1882 { 1904 {
1883 if (!tex.name) 1905 if (!tex.name)
1884 tex = self->tex [2]; /* missing, replace by noface */ 1906 tex = self->tex [2]; /* missing, replace by noface */
1885 1907
1886 key.texname = tex.name; 1908 key.texname = tex.name;
1887 arr = rc_array (rc, &key); 1909 arr = rc_array (rc, &key);
1888 } 1910 }
1889 1911
1890 px = (x + 1) * T - tex.w; 1912 if (expect_false (cell->player == player) && expect_false (z == 2))
1891 py = (y + 1) * T - tex.h; 1913 {
1914 pl_x = px;
1915 pl_y = py;
1916 pl_tex = tex;
1917 continue;
1918 }
1892 1919
1893 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1894 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1921 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1895 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 1922 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1896 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 1923 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1897 1924
1898 if (cell->flags && z == 2) 1925 if (expect_false (cell->flags) && expect_false (z == 2))
1899 { 1926 {
1900 // overlays such as the speech bubble, probably more to come 1927 // overlays such as the speech bubble, probably more to come
1901 if (cell->flags & 1) 1928 if (cell->flags & 1)
1902 { 1929 {
1903 maptex tex = self->tex [1]; 1930 maptex tex = self->tex [1];
… …
2040 glDisable (GL_TEXTURE_2D); 2067 glDisable (GL_TEXTURE_2D);
2041 key.texname = -1; 2068 key.texname = -1;
2042 } 2069 }
2043 2070
2044 hv_clear (smooth); 2071 hv_clear (smooth);
2072 }
2073
2074 if (pl_tex.name)
2075 {
2076 maptex tex = pl_tex;
2077 int px = pl_x + pdx;
2078 int py = pl_y + pdy;
2079
2080 key.texname = tex.name;
2081 arr = rc_array (rc, &key);
2082
2083 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2084 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2085 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2086 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2087
2088 rc_draw (rc);
2045 } 2089 }
2046 2090
2047 glDisable (GL_BLEND); 2091 glDisable (GL_BLEND);
2048 rc_free (rc); 2092 rc_free (rc);
2049 2093
… …
2286 else 2330 else
2287 *data++ = 0; 2331 *data++ = 0;
2288 } 2332 }
2289 } 2333 }
2290 2334
2335 /* if size is w*h + 5 then no data has been found */
2336 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2337 {
2291 SvPOK_only (data_sv); 2338 SvPOK_only (data_sv);
2292 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 }
2341
2293 RETVAL = data_sv; 2342 RETVAL = data_sv;
2294} 2343}
2295 OUTPUT: 2344 OUTPUT:
2296 RETVAL 2345 RETVAL
2297 2346
2298void 2347void
2299set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2348set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2300 PPCODE: 2349 PPCODE:
2301{ 2350{
2302 int x, y, z; 2351 int x, y, z;
2303 int w, h; 2352 int w, h;
2304 int x1, y1; 2353 int x1, y1;
2354 STRLEN len;
2355 uint8_t *data, *end;
2356
2357 len = SvLEN (data_sv);
2358 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2359 data = SvPVbyte_nolen (data_sv);
2360 end = data + len + 8;
2361
2362 if (len < 5)
2363 XSRETURN_EMPTY;
2305 2364
2306 if (*data++ != 0) 2365 if (*data++ != 0)
2307 XSRETURN_EMPTY; /* version mismatch */ 2366 XSRETURN_EMPTY; /* version mismatch */
2308 2367
2309 w = *data++ << 8; w |= *data++; 2368 w = *data++ << 8; w |= *data++;
… …
2324 { 2383 {
2325 maprow *row = map_get_row (self, y); 2384 maprow *row = map_get_row (self, y);
2326 2385
2327 for (x = x0; x < x1; x++) 2386 for (x = x0; x < x1; x++)
2328 { 2387 {
2388 uint8_t flags;
2389
2390 if (data + 7 >= end)
2391 XSRETURN_EMPTY;
2392
2329 uint8_t flags = *data++; 2393 flags = *data++;
2330 2394
2331 if (flags) 2395 if (flags)
2332 { 2396 {
2333 mapcell *cell = row_get_cell (row, x); 2397 mapcell *cell = row_get_cell (row, x);
2334 tileid tile[3] = { 0, 0, 0 }; 2398 tileid tile[3] = { 0, 0, 0 };
… …
2337 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2401 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2338 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2402 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2339 2403
2340 if (cell->darkness == 0) 2404 if (cell->darkness == 0)
2341 { 2405 {
2342 cell->darkness = 0; 2406 /*cell->darkness = 0;*/
2407 EXTEND (SP, 3);
2343 2408
2344 for (z = 0; z <= 2; z++) 2409 for (z = 0; z <= 2; z++)
2345 { 2410 {
2346 tileid t = tile [z]; 2411 tileid t = tile [z];
2347 2412
2348 if (t >= self->texs || (t && !self->tex [t].name)) 2413 if (t >= self->texs || (t && !self->tex [t].name))
2349 { 2414 {
2350 XPUSHs (sv_2mortal (newSViv (t))); 2415 PUSHs (sv_2mortal (newSViv (t)));
2351 need_texid (self, t); 2416 need_texid (self, t);
2352 } 2417 }
2353 2418
2354 cell->tile [z] = t; 2419 cell->tile [z] = t;
2355 } 2420 }

Diff Legend

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