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.243 by root, Thu Dec 27 06:54:36 2007 UTC vs.
Revision 1.265 by root, Fri Jul 18 22:56:11 2008 UTC

… …
46 46
47#include <glib/gmacros.h> 47#include <glib/gmacros.h>
48 48
49#include <pango/pango.h> 49#include <pango/pango.h>
50 50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
61
51#ifndef _WIN32 62#ifndef _WIN32
52# include <sys/types.h> 63# include <sys/types.h>
53# include <sys/socket.h> 64# include <sys/socket.h>
54# include <netinet/in.h> 65# include <netinet/in.h>
55# include <netinet/tcp.h> 66# include <netinet/tcp.h>
56# include <inttypes.h> 67# include <inttypes.h>
57#endif 68#endif
58 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
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 80
61#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
62 82
63#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
65 85
66#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
67 87
68#if 0 88/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else
71# define PARACHUTE 0
72#endif
73 90
74static AV *texture_av; 91static AV *texture_av;
75 92
76static struct 93static struct
77{ 94{
… …
171 188
172static void 189static void
173layout_update_font (DC__Layout self) 190layout_update_font (DC__Layout self)
174{ 191{
175 /* 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
176 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
177 */ 194 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
179 196
180 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
621 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 640 const_iv (KMOD_MODE),
624 641
625 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),
652
653 const_iv (SDL_GL_RED_SIZE),
654 const_iv (SDL_GL_GREEN_SIZE),
655 const_iv (SDL_GL_BLUE_SIZE),
656 const_iv (SDL_GL_ALPHA_SIZE),
657 const_iv (SDL_GL_DOUBLEBUFFER),
658 const_iv (SDL_GL_BUFFER_SIZE),
659 const_iv (SDL_GL_DEPTH_SIZE),
660 const_iv (SDL_GL_STENCIL_SIZE),
661 const_iv (SDL_GL_ACCUM_RED_SIZE),
662 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
663 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL)
626# undef const_iv 670# undef const_iv
627 }; 671 };
628 672
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
659 CODE: 703 CODE:
660{ 704{
661 opengl_fontmap = pango_opengl_font_map_new (); 705 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 706 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 707 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
708 /*pango_context_set_font_description (opengl_context, default_font);*/
709#if PANGO_VERSION_CHECK (1, 15, 2)
710 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
711 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
712#endif
664} 713}
665 714
666char *
667SDL_GetError () 715char *SDL_GetError ()
668 716
669int 717int SDL_Init (U32 flags)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 718
672void 719int SDL_InitSubSystem (U32 flags)
720
721void SDL_QuitSubSystem (U32 flags)
722
673SDL_Quit () 723void SDL_Quit ()
724
725int SDL_GL_SetAttribute (int attr, int value)
726
727int SDL_GL_GetAttribute (int attr)
728 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL))
730 XSRETURN_UNDEF;
731 OUTPUT:
732 RETVAL
674 733
675void 734void
676SDL_ListModes (int rgb, int alpha) 735SDL_ListModes (int rgb, int alpha)
677 PPCODE: 736 PPCODE:
678{ 737{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 749 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 750 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 752
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 753 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 754 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 755
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 757
702 if (m && m != (SDL_Rect **)-1) 758 if (m && m != (SDL_Rect **)-1)
703 while (*m) 759 while (*m)
704 { 760 {
705 if ((*m)->w >= 800 && (*m)->h >= 480) 761 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 762 {
707 AV *av = newAV (); 763 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 764 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 765 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 766 av_push (av, newSViv (rgb));
… …
752SDL_GetKeyName (int sym) 808SDL_GetKeyName (int sym)
753 809
754int 810int
755SDL_GetAppState () 811SDL_GetAppState ()
756 812
813int
814SDL_GetModState ()
815
757void 816void
758poll_events () 817poll_events ()
759 PPCODE: 818 PPCODE:
760{ 819{
761 SDL_Event ev; 820 SDL_Event ev;
… …
770 { 829 {
771 case SDL_KEYDOWN: 830 case SDL_KEYDOWN:
772 case SDL_KEYUP: 831 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 832 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 833 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 834 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 835 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 836 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 837 break;
779 838
780 case SDL_ACTIVEEVENT: 839 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 840 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 858 x = ev.motion.x;
800 y = ev.motion.y; 859 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 860 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 861 }
803 862
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 863 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 864 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 865 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 866 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 867 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 868 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 869 }
811 break; 870 break;
812 871
813 case SDL_MOUSEBUTTONDOWN: 872 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 873 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 874 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 875
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 876 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 877 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 878 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 879 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
894 } 953 }
895 } 954 }
896#endif 955#endif
897} 956}
898 957
899void 958int
900add_font (char *file) 959add_font (char *file)
901 CODE: 960 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 961 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
962 OUTPUT:
963 RETVAL
903 964
904void 965void
905load_image_inline (SV *image_) 966load_image_inline (SV *image_)
906 ALIAS: 967 ALIAS:
907 load_image_file = 1 968 load_image_file = 1
… …
1165{ 1226{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1227 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1228
1168 do 1229 do
1169 { 1230 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1231 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1232
1172 if (run && shape_attr_p (run)) 1233 if (run && shape_attr_p (run))
1173 { 1234 {
1174 PangoRectangle extents; 1235 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1236 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1279int 1340int
1280descent (DC::Layout self) 1341descent (DC::Layout self)
1281 CODE: 1342 CODE:
1282{ 1343{
1283 PangoRectangle rect; 1344 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1345 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1346 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1347 RETVAL = PANGO_DESCENT (rect);
1287} 1348}
1288 OUTPUT: 1349 OUTPUT:
1289 RETVAL 1350 RETVAL
… …
1301 1362
1302void 1363void
1303cursor_pos (DC::Layout self, int index) 1364cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1365 PPCODE:
1305{ 1366{
1306 PangoRectangle strong_pos; 1367 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1368 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1369
1309 EXTEND (SP, 3); 1370 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1371 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1372 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1373 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1374}
1314 1375
1315void 1376void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1377index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1378 PPCODE:
1318{ 1379{
1319 int line, x; 1380 int line, x;
1320 1381
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1382 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1383#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1384 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1385 --line;
1386#endif
1324 EXTEND (SP, 2); 1387 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1388 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1389 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1390}
1328 1391
1329void 1392void
1330line_x_to_index (DC::Layout self, int line, int x) 1393line_x_to_index (DC::Layout self, int line, int x)
… …
1334 int index, trailing; 1397 int index, trailing;
1335 1398
1336 if (line < 0) 1399 if (line < 0)
1337 XSRETURN_EMPTY; 1400 XSRETURN_EMPTY;
1338 1401
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1402 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1403 XSRETURN_EMPTY; /* do better */
1341 1404
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1405 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1406
1344 EXTEND (SP, 2); 1407 EXTEND (SP, 2);
… …
1661 uint8_t ext, cmd; 1724 uint8_t ext, cmd;
1662 1725
1663 do 1726 do
1664 { 1727 {
1665 ext = *data++; 1728 ext = *data++;
1666 cmd = ext & 0x3f; 1729 cmd = ext & 0x7f;
1667 1730
1668 if (cmd < 4) 1731 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 1732 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health 1733 else if (cmd == 5) // health
1671 { 1734 {
… …
1674 } 1737 }
1675 else if (cmd == 6) // monster width 1738 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 1739 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 1740 else if (cmd == 0x47)
1678 { 1741 {
1679 if (*data == 4) 1742 if (*data == 1) cell->player = data [1];
1680 ; // decode player count 1743 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1744 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1745 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681 1746
1682 data += *data + 1; 1747 data += *data + 1;
1683 } 1748 }
1684 else if (cmd == 8) // cell flags 1749 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 1750 cell->flags = *data++;
… …
1777} 1842}
1778 OUTPUT: 1843 OUTPUT:
1779 RETVAL 1844 RETVAL
1780 1845
1781void 1846void
1782draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1847draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1783 CODE: 1848 CODE:
1784{ 1849{
1785 int x, y, z; 1850 int x, y, z;
1786 1851
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1852 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1853 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1789 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1854 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790 smooth_key skey; 1855 smooth_key skey;
1791 1856 int pl_x, pl_y;
1857 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 1858 rc_t *rc = rc_alloc ();
1793 rc_key_t key; 1859 rc_key_t key;
1794 rc_array_t *arr; 1860 rc_array_t *arr;
1861
1862 pl_tex.name = 0;
1795 1863
1796 // thats current max. sorry. 1864 // thats current max. sorry.
1797 if (sw > 255) sw = 255; 1865 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 1866 if (sh > 255) sh = 255;
1799 1867
… …
1854 tileid tile = cell->tile [z]; 1922 tileid tile = cell->tile [z];
1855 1923
1856 if (tile) 1924 if (tile)
1857 { 1925 {
1858 maptex tex = self->tex [tile]; 1926 maptex tex = self->tex [tile];
1859 int px, py; 1927 int px = (x + 1) * T - tex.w;
1928 int py = (y + 1) * T - tex.h;
1860 1929
1861 if (key.texname != tex.name) 1930 if (key.texname != tex.name)
1862 { 1931 {
1863 if (!tex.name) 1932 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 1933 tex = self->tex [2]; /* missing, replace by noface */
1865 1934
1866 key.texname = tex.name; 1935 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 1936 arr = rc_array (rc, &key);
1868 } 1937 }
1869 1938
1870 px = (x + 1) * T - tex.w; 1939 if (expect_false (cell->player == player) && expect_false (z == 2))
1871 py = (y + 1) * T - tex.h; 1940 {
1941 pl_x = px;
1942 pl_y = py;
1943 pl_tex = tex;
1944 continue;
1945 }
1872 1946
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1947 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1948 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1875 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 1949 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1876 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 1950 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877 1951
1878 if (cell->flags && z == 2) 1952 if (expect_false (cell->flags) && expect_false (z == 2))
1879 { 1953 {
1880 // overlays such as the speech bubble, probably more to come 1954 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1) 1955 if (cell->flags & 1)
1882 { 1956 {
1883 maptex tex = self->tex [1]; 1957 maptex tex = self->tex [1];
… …
2020 glDisable (GL_TEXTURE_2D); 2094 glDisable (GL_TEXTURE_2D);
2021 key.texname = -1; 2095 key.texname = -1;
2022 } 2096 }
2023 2097
2024 hv_clear (smooth); 2098 hv_clear (smooth);
2099 }
2100
2101 if (pl_tex.name)
2102 {
2103 maptex tex = pl_tex;
2104 int px = pl_x + pdx;
2105 int py = pl_y + pdy;
2106
2107 key.texname = tex.name;
2108 arr = rc_array (rc, &key);
2109
2110 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2111 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2112 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2113 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2114
2115 rc_draw (rc);
2025 } 2116 }
2026 2117
2027 glDisable (GL_BLEND); 2118 glDisable (GL_BLEND);
2028 rc_free (rc); 2119 rc_free (rc);
2029 2120
… …
2266 else 2357 else
2267 *data++ = 0; 2358 *data++ = 0;
2268 } 2359 }
2269 } 2360 }
2270 2361
2362 /* if size is w*h + 5 then no data has been found */
2363 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2364 {
2271 SvPOK_only (data_sv); 2365 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2366 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2367 }
2368
2273 RETVAL = data_sv; 2369 RETVAL = data_sv;
2274} 2370}
2275 OUTPUT: 2371 OUTPUT:
2276 RETVAL 2372 RETVAL
2277 2373
2278void 2374void
2279set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2375set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2376 PPCODE:
2281{ 2377{
2282 int x, y, z; 2378 int x, y, z;
2283 int w, h; 2379 int w, h;
2284 int x1, y1; 2380 int x1, y1;
2381 STRLEN len;
2382 uint8_t *data, *end;
2383
2384 len = SvLEN (data_sv);
2385 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2386 data = SvPVbyte_nolen (data_sv);
2387 end = data + len + 8;
2388
2389 if (len < 5)
2390 XSRETURN_EMPTY;
2285 2391
2286 if (*data++ != 0) 2392 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2393 XSRETURN_EMPTY; /* version mismatch */
2288 2394
2289 w = *data++ << 8; w |= *data++; 2395 w = *data++ << 8; w |= *data++;
… …
2304 { 2410 {
2305 maprow *row = map_get_row (self, y); 2411 maprow *row = map_get_row (self, y);
2306 2412
2307 for (x = x0; x < x1; x++) 2413 for (x = x0; x < x1; x++)
2308 { 2414 {
2415 uint8_t flags;
2416
2417 if (data + 7 >= end)
2418 XSRETURN_EMPTY;
2419
2309 uint8_t flags = *data++; 2420 flags = *data++;
2310 2421
2311 if (flags) 2422 if (flags)
2312 { 2423 {
2313 mapcell *cell = row_get_cell (row, x); 2424 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2425 tileid tile[3] = { 0, 0, 0 };
… …
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2428 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2429 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2430
2320 if (cell->darkness == 0) 2431 if (cell->darkness == 0)
2321 { 2432 {
2322 cell->darkness = 0; 2433 /*cell->darkness = 0;*/
2434 EXTEND (SP, 3);
2323 2435
2324 for (z = 0; z <= 2; z++) 2436 for (z = 0; z <= 2; z++)
2325 { 2437 {
2326 tileid t = tile [z]; 2438 tileid t = tile [z];
2327 2439
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2440 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2441 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2442 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2443 need_texid (self, t);
2332 } 2444 }
2333 2445
2334 cell->tile [z] = t; 2446 cell->tile [z] = t;
2335 } 2447 }
… …
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2958void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 2959 CODE:
2848 if (gl.SeparableFilter2D) 2960 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2961 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 2962
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2963void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 2964
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2965void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 2966
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 2967void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 2968

Diff Legend

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