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.256 by root, Mon Mar 24 00:24:46 2008 UTC vs.
Revision 1.261 by root, Sun Jul 13 12:17:00 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
… …
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 90
82#if 0 91#if 1
83# define PARACHUTE SDL_INIT_NOPARACHUTE 92# define PARACHUTE SDL_INIT_NOPARACHUTE
84#else 93#else
85# define PARACHUTE 0 94# define PARACHUTE 0
86#endif 95#endif
87 96
… …
185 194
186static void 195static void
187layout_update_font (DC__Layout self) 196layout_update_font (DC__Layout self)
188{ 197{
189 /* use a random scale factor to account for unknown descenders, 0.8 works 198 /* use a random scale factor to account for unknown descenders, 0.8 works
190 * reasonably well with bitstream vera 199 * reasonably well with dejavu/bistream fonts
191 */ 200 */
192 PangoFontDescription *font = self->font ? self->font : default_font; 201 PangoFontDescription *font = self->font ? self->font : default_font;
193 202
194 pango_font_description_set_absolute_size (font, 203 pango_font_description_set_absolute_size (font,
195 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 204 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
673 CODE: 682 CODE:
674{ 683{
675 opengl_fontmap = pango_opengl_font_map_new (); 684 opengl_fontmap = pango_opengl_font_map_new ();
676 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 685 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); 686 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
687 /*pango_context_set_font_description (opengl_context, default_font);*/
678#if PANGO_VERSION_CHECK (1, 15, 2) 688#if PANGO_VERSION_CHECK (1, 15, 2)
679 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 689 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 690 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
681#endif 691#endif
682} 692}
… …
915 } 925 }
916 } 926 }
917#endif 927#endif
918} 928}
919 929
920void 930int
921add_font (char *file) 931add_font (char *file)
922 CODE: 932 CODE:
923 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT:
935 RETVAL
924 936
925void 937void
926load_image_inline (SV *image_) 938load_image_inline (SV *image_)
927 ALIAS: 939 ALIAS:
928 load_image_file = 1 940 load_image_file = 1
… …
1684 uint8_t ext, cmd; 1696 uint8_t ext, cmd;
1685 1697
1686 do 1698 do
1687 { 1699 {
1688 ext = *data++; 1700 ext = *data++;
1689 cmd = ext & 0x3f; 1701 cmd = ext & 0x7f;
1690 1702
1691 if (cmd < 4) 1703 if (cmd < 4)
1692 cell->darkness = 255 - ext * 64 + 1; 1704 cell->darkness = 255 - ext * 64 + 1;
1693 else if (cmd == 5) // health 1705 else if (cmd == 5) // health
1694 { 1706 {
… …
1697 } 1709 }
1698 else if (cmd == 6) // monster width 1710 else if (cmd == 6) // monster width
1699 cell->stat_width = *data++ + 1; 1711 cell->stat_width = *data++ + 1;
1700 else if (cmd == 0x47) 1712 else if (cmd == 0x47)
1701 { 1713 {
1702 if (*data == 4) 1714 if (*data == 1) cell->player = data [1];
1703 ; // decode player count 1715 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1716 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1717 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1704 1718
1705 data += *data + 1; 1719 data += *data + 1;
1706 } 1720 }
1707 else if (cmd == 8) // cell flags 1721 else if (cmd == 8) // cell flags
1708 cell->flags = *data++; 1722 cell->flags = *data++;
… …
1800} 1814}
1801 OUTPUT: 1815 OUTPUT:
1802 RETVAL 1816 RETVAL
1803 1817
1804void 1818void
1805draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1819draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1806 CODE: 1820 CODE:
1807{ 1821{
1808 int x, y, z; 1822 int x, y, z;
1809 1823
1810 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1811 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1825 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1812 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1826 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1813 smooth_key skey; 1827 smooth_key skey;
1828 int pl_x, pl_y;
1829 maptex pl_tex;
1830
1831 pl_tex.name = 0;
1814 1832
1815 rc_t *rc = rc_alloc (); 1833 rc_t *rc = rc_alloc ();
1816 rc_key_t key; 1834 rc_key_t key;
1817 rc_array_t *arr; 1835 rc_array_t *arr;
1818 1836
… …
1877 tileid tile = cell->tile [z]; 1895 tileid tile = cell->tile [z];
1878 1896
1879 if (tile) 1897 if (tile)
1880 { 1898 {
1881 maptex tex = self->tex [tile]; 1899 maptex tex = self->tex [tile];
1882 int px, py; 1900 int px = (x + 1) * T - tex.w;
1901 int py = (y + 1) * T - tex.h;
1883 1902
1884 if (key.texname != tex.name) 1903 if (key.texname != tex.name)
1885 { 1904 {
1886 if (!tex.name) 1905 if (!tex.name)
1887 tex = self->tex [2]; /* missing, replace by noface */ 1906 tex = self->tex [2]; /* missing, replace by noface */
1888 1907
1889 key.texname = tex.name; 1908 key.texname = tex.name;
1890 arr = rc_array (rc, &key); 1909 arr = rc_array (rc, &key);
1891 } 1910 }
1892 1911
1893 px = (x + 1) * T - tex.w; 1912 if (expect_false (cell->player == player) && expect_false (z == 2))
1894 py = (y + 1) * T - tex.h; 1913 {
1914 pl_x = px;
1915 pl_y = py;
1916 pl_tex = tex;
1917 continue;
1918 }
1895 1919
1896 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1897 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);
1898 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);
1899 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);
1900 1924
1901 if (cell->flags && z == 2) 1925 if (expect_false (cell->flags) && expect_false (z == 2))
1902 { 1926 {
1903 // overlays such as the speech bubble, probably more to come 1927 // overlays such as the speech bubble, probably more to come
1904 if (cell->flags & 1) 1928 if (cell->flags & 1)
1905 { 1929 {
1906 maptex tex = self->tex [1]; 1930 maptex tex = self->tex [1];
… …
2043 glDisable (GL_TEXTURE_2D); 2067 glDisable (GL_TEXTURE_2D);
2044 key.texname = -1; 2068 key.texname = -1;
2045 } 2069 }
2046 2070
2047 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);
2048 } 2089 }
2049 2090
2050 glDisable (GL_BLEND); 2091 glDisable (GL_BLEND);
2051 rc_free (rc); 2092 rc_free (rc);
2052 2093
… …
2289 else 2330 else
2290 *data++ = 0; 2331 *data++ = 0;
2291 } 2332 }
2292 } 2333 }
2293 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 {
2294 SvPOK_only (data_sv); 2338 SvPOK_only (data_sv);
2295 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 }
2341
2296 RETVAL = data_sv; 2342 RETVAL = data_sv;
2297} 2343}
2298 OUTPUT: 2344 OUTPUT:
2299 RETVAL 2345 RETVAL
2300 2346
2301void 2347void
2302set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2348set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2303 PPCODE: 2349 PPCODE:
2304{ 2350{
2305 int x, y, z; 2351 int x, y, z;
2306 int w, h; 2352 int w, h;
2307 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;
2308 2364
2309 if (*data++ != 0) 2365 if (*data++ != 0)
2310 XSRETURN_EMPTY; /* version mismatch */ 2366 XSRETURN_EMPTY; /* version mismatch */
2311 2367
2312 w = *data++ << 8; w |= *data++; 2368 w = *data++ << 8; w |= *data++;
… …
2327 { 2383 {
2328 maprow *row = map_get_row (self, y); 2384 maprow *row = map_get_row (self, y);
2329 2385
2330 for (x = x0; x < x1; x++) 2386 for (x = x0; x < x1; x++)
2331 { 2387 {
2388 uint8_t flags;
2389
2390 if (data + 7 >= end)
2391 XSRETURN_EMPTY;
2392
2332 uint8_t flags = *data++; 2393 flags = *data++;
2333 2394
2334 if (flags) 2395 if (flags)
2335 { 2396 {
2336 mapcell *cell = row_get_cell (row, x); 2397 mapcell *cell = row_get_cell (row, x);
2337 tileid tile[3] = { 0, 0, 0 }; 2398 tileid tile[3] = { 0, 0, 0 };
… …
2340 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2401 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2341 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2402 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2342 2403
2343 if (cell->darkness == 0) 2404 if (cell->darkness == 0)
2344 { 2405 {
2345 cell->darkness = 0; 2406 /*cell->darkness = 0;*/
2407 EXTEND (SP, 3);
2346 2408
2347 for (z = 0; z <= 2; z++) 2409 for (z = 0; z <= 2; z++)
2348 { 2410 {
2349 tileid t = tile [z]; 2411 tileid t = tile [z];
2350 2412
2351 if (t >= self->texs || (t && !self->tex [t].name)) 2413 if (t >= self->texs || (t && !self->tex [t].name))
2352 { 2414 {
2353 XPUSHs (sv_2mortal (newSViv (t))); 2415 PUSHs (sv_2mortal (newSViv (t)));
2354 need_texid (self, t); 2416 need_texid (self, t);
2355 } 2417 }
2356 2418
2357 cell->tile [z] = t; 2419 cell->tile [z] = t;
2358 } 2420 }

Diff Legend

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