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.177 by root, Tue Apr 10 10:13:10 2007 UTC vs.
Revision 1.197 by root, Sun Jul 15 21:08:40 2007 UTC

… …
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
15#ifdef _WIN32 20#ifdef _WIN32
… …
56# define PARACHUTE SDL_INIT_NOPARACHUTE 61# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else 62#else
58# define PARACHUTE 0 63# define PARACHUTE 0
59#endif 64#endif
60 65
66static AV *texture_av;
67
61static struct 68static struct
62{ 69{
63#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
64#include "glfunc.h" 71#include "glfunc.h"
65#undef GL_FUNC 72#undef GL_FUNC
66} gl; 73} gl;
67 74
75static void
68static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69{ 77{
70 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
71 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
72 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
73 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74 else 82 else
75 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
84}
85
86static GLuint
87gen_texture ()
88{
89 GLuint name;
90
91 if (AvFILL (texture_av) >= 0)
92 name = (GLuint)(size_t)av_pop (texture_av);
93 else
94 glGenTextures (1, &name);
95
96 return name;
97}
98
99static void
100del_texture (GLuint name)
101{
102 /* make a half-assed attempt at returning the memory used by the texture */
103 /* textures are frequently being reused by cfplus anyway */
104 /*glBindTexture (GL_TEXTURE_2D, name);*/
105 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
106 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name);
76} 108}
77 109
78#include "texcache.c" 110#include "texcache.c"
79 111
80#include "pango-font.c" 112#include "pango-font.c"
… …
345} smooth_key; 377} smooth_key;
346 378
347static void 379static void
348smooth_or_bits (HV *hv, smooth_key *key, IV bits) 380smooth_or_bits (HV *hv, smooth_key *key, IV bits)
349{ 381{
350 SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1); 382 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
351 383
352 if (SvIOK (*sv)) 384 if (SvIOK (*sv))
353 SvIV_set (*sv, SvIVX (*sv) | bits); 385 SvIV_set (*sv, SvIVX (*sv) | bits);
354 else 386 else
355 sv_setiv (*sv, bits); 387 sv_setiv (*sv, bits);
… …
614 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
615 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
616 ); 648 );
617 if (RETVAL) 649 if (RETVAL)
618 { 650 {
651 av_clear (texture_av);
652
619 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
620# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
621# include "glfunc.h" 655# include "glfunc.h"
622# undef GL_FUNC 656# undef GL_FUNC
657
623 } 658 }
624 OUTPUT: 659 OUTPUT:
625 RETVAL 660 RETVAL
626 661
627void 662void
… …
629 664
630char * 665char *
631SDL_GetKeyName (int sym) 666SDL_GetKeyName (int sym)
632 667
633void 668void
634SDL_PollEvent () 669poll_events ()
635 PPCODE: 670 PPCODE:
636{ 671{
637 SDL_Event ev; 672 SDL_Event ev;
638 673
639 while (SDL_PollEvent (&ev)) 674 SDL_PumpEvents ();
675 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
640 { 676 {
641 HV *hv = newHV (); 677 HV *hv = newHV ();
642 hv_store (hv, "type", 4, newSViv (ev.type), 0); 678 hv_store (hv, "type", 4, newSViv (ev.type), 0);
643 679
644 switch (ev.type) 680 switch (ev.type)
… …
656 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 692 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
657 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 693 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
658 break; 694 break;
659 695
660 case SDL_MOUSEMOTION: 696 case SDL_MOUSEMOTION:
697 {
698 int state = ev.motion.state;
699 int x = ev.motion.x;
700 int y = ev.motion.y;
701 int xrel = ev.motion.xrel;
702 int yrel = ev.motion.yrel;
703
704 /* do simplistic event compression */
705 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
706 && state == ev.motion.state)
707 {
708 xrel += ev.motion.xrel;
709 yrel += ev.motion.yrel;
710 x = ev.motion.x;
711 y = ev.motion.y;
712 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
713 }
714
661 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 715 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
662
663 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 716 hv_store (hv, "state", 5, newSViv (state), 0);
664 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 717 hv_store (hv, "x", 1, newSViv (x), 0);
665 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 718 hv_store (hv, "y", 1, newSViv (y), 0);
666 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 719 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
667 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 720 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
721 }
668 break; 722 break;
669 723
670 case SDL_MOUSEBUTTONDOWN: 724 case SDL_MOUSEBUTTONDOWN:
671 case SDL_MOUSEBUTTONUP: 725 case SDL_MOUSEBUTTONUP:
672 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 726 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
… …
701Mix_AllocateChannels (int numchans = -1) 755Mix_AllocateChannels (int numchans = -1)
702 756
703void 757void
704lowdelay (int fd, int val = 1) 758lowdelay (int fd, int val = 1)
705 CODE: 759 CODE:
706#ifndef _WIN32
707 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 760 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
708#endif
709 761
710void 762void
711win32_proxy_info () 763win32_proxy_info ()
712 PPCODE: 764 PPCODE:
713{ 765{
… …
854 ExitThread (retval); // unclean, please beam me up 906 ExitThread (retval); // unclean, please beam me up
855#else 907#else
856 _exit (retval); 908 _exit (retval);
857#endif 909#endif
858 910
911void
912debug ()
913 CODE:
914{
915#if DEBUG
916 VALGRIND_DO_LEAK_CHECK;
917#endif
918}
919
859MODULE = CFPlus PACKAGE = CFPlus::Font 920MODULE = CFPlus PACKAGE = CFPlus::Font
860 921
861CFPlus::Font 922CFPlus::Font
862new_from_file (SV *class, char *path, int id = 0) 923new_from_file (SV *class, char *path, int id = 0)
863 CODE: 924 CODE:
… …
1393 CODE: 1454 CODE:
1394{ 1455{
1395 if (dx > 0) 1456 if (dx > 0)
1396 map_blank (self, self->x, self->y, dx, self->h); 1457 map_blank (self, self->x, self->y, dx, self->h);
1397 else if (dx < 0) 1458 else if (dx < 0)
1398 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1459 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1399 1460
1400 if (dy > 0) 1461 if (dy > 0)
1401 map_blank (self, self->x, self->y, self->w, dy); 1462 map_blank (self, self->x, self->y, self->w, dy);
1402 else if (dy < 0) 1463 else if (dy < 0)
1403 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1464 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1404 1465
1405 self->ox += dx; self->x += dx; 1466 self->ox += dx; self->x += dx;
1406 self->oy += dy; self->y += dy; 1467 self->oy += dy; self->y += dy;
1407 1468
1408 while (self->y < 0) 1469 while (self->y < 0)
… …
1462 } 1523 }
1463 else if (cmd == 6) // monster width 1524 else if (cmd == 6) // monster width
1464 cell->stat_width = *data++ + 1; 1525 cell->stat_width = *data++ + 1;
1465 else if (cmd == 0x47) 1526 else if (cmd == 0x47)
1466 { 1527 {
1467 if (*data == 8) 1528 if (*data == 4)
1468 ; // decode player uuid 1529 ; // decode player count
1469 1530
1470 data += *data + 1; 1531 data += *data + 1;
1471 } 1532 }
1472 else if (cmd == 8) // cell flags 1533 else if (cmd == 8) // cell flags
1473 cell->flags = *data++; 1534 cell->flags = *data++;
… …
1567draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1628draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1568 CODE: 1629 CODE:
1569{ 1630{
1570 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1631 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1571 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1632 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1572 uint8_t smooth_max[256][256]; 1633 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1573 smooth_key skey; 1634 smooth_key skey;
1574 int x, y, z; 1635 int x, y, z;
1575 int last_name; 1636 int last_name;
1576 1637
1577 // thats current max. sorry. 1638 // thats current max. sorry.
… …
1683 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 1744 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1684 1745
1685 // add bits to current tile and all neighbours. skey.x|y is 1746 // add bits to current tile and all neighbours. skey.x|y is
1686 // shifted +1|+1 so we always stay positive. 1747 // shifted +1|+1 so we always stay positive.
1687 1748
1749 // bits is ___n cccc CCCC bbbb
1750 // n do not draw borders&corners
1751 // c draw these corners, but...
1752 // C ... not these
1753 // b draw these borders
1754
1755 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1756 // ┃· ·· ·┃ ━━
1757
1758 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1759 // ·· ·· ·┏ ┓·
1760
1688 // full tile 1761 // full tile
1689 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 1762 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1690 1763
1691 // borders 1764 // borders
1692 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031); 1765 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1693 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092); 1766 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1694 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 1767 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1695 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 1768 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1696 1769
1697 // corners 1770 // corners
1698 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 1771 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
… …
1702 } 1775 }
1703 } 1776 }
1704 } 1777 }
1705 } 1778 }
1706 1779
1707 // go through all smoothlevels, lowest to highest, then draw 1780 // go through all smoothlevels, lowest to highest, then draw.
1708 // this is basically counting sort 1781 // this is basically counting sort
1709 { 1782 {
1710 int w, b; 1783 int w, b;
1711 1784
1712 for (w = 0; w < 256 / 32; ++w) 1785 for (w = 0; w < 256 / 32; ++w)
… …
1723 while ((he = hv_iternext (smooth))) 1796 while ((he = hv_iternext (smooth)))
1724 { 1797 {
1725 smooth_key *skey = (smooth_key *)HeKEY (he); 1798 smooth_key *skey = (smooth_key *)HeKEY (he);
1726 IV bits = SvIVX (HeVAL (he)); 1799 IV bits = SvIVX (HeVAL (he));
1727 1800
1728 // bits is ___n cccc CCCC bbbb
1729 // n do not draw borders&corners
1730 // c draw these corners, but...
1731 // C ... not these
1732 // b draw these borders
1733
1734 if (!(bits & 0x1000) 1801 if (!(bits & 0x1000)
1735 && skey->level == level 1802 && skey->level == level
1736 && level >= smooth_max [skey->x][skey->y]) 1803 && level > smooth_max [skey->x][skey->y])
1737 { 1804 {
1738 maptex tex = self->tex [skey->tile]; 1805 maptex tex = self->tex [skey->tile];
1739 int px = (((int)skey->x) - 1) * T; 1806 int px = (((int)skey->x) - 1) * T;
1740 int py = (((int)skey->y) - 1) * T; 1807 int py = (((int)skey->y) - 1) * T;
1741 int border = bits & 15; 1808 int border = bits & 15;
… …
2092 CODE: 2159 CODE:
2093 RETVAL = Mix_VolumeMusic (volume); 2160 RETVAL = Mix_VolumeMusic (volume);
2094 OUTPUT: 2161 OUTPUT:
2095 RETVAL 2162 RETVAL
2096 2163
2164int
2165fade_out (int ms)
2166 CODE:
2167 RETVAL = Mix_FadeOutMusic (ms);
2168 OUTPUT:
2169 RETVAL
2170
2097CFPlus::MixMusic 2171CFPlus::MixMusic
2098new_from_file (SV *class, char *path) 2172new_from_file (SV *class, char *path)
2099 CODE: 2173 CODE:
2100 RETVAL = Mix_LoadMUS (path); 2174 RETVAL = Mix_LoadMUS (path);
2101 OUTPUT: 2175 OUTPUT:
… …
2108 2182
2109int 2183int
2110play (CFPlus::MixMusic self, int loops = -1) 2184play (CFPlus::MixMusic self, int loops = -1)
2111 CODE: 2185 CODE:
2112 RETVAL = Mix_PlayMusic (self, loops); 2186 RETVAL = Mix_PlayMusic (self, loops);
2187 OUTPUT:
2188 RETVAL
2189
2190int
2191fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2192 CODE:
2193 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2113 OUTPUT: 2194 OUTPUT:
2114 RETVAL 2195 RETVAL
2115 2196
2116MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2197MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2117 2198
… …
2206# undef const_iv 2287# undef const_iv
2207 }; 2288 };
2208 2289
2209 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2290 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2210 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2291 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2292
2293 texture_av = newAV ();
2294 AvREAL_off (texture_av);
2211} 2295}
2212 2296
2213char * 2297char *
2214gl_vendor () 2298gl_vendor ()
2215 CODE: 2299 CODE:
… …
2364 2448
2365void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2449void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2366 2450
2367int glGenTexture () 2451int glGenTexture ()
2368 CODE: 2452 CODE:
2369{ 2453 RETVAL = gen_texture ();
2370 GLuint name;
2371 glGenTextures (1, &name);
2372 RETVAL = name;
2373}
2374 OUTPUT: 2454 OUTPUT:
2375 RETVAL 2455 RETVAL
2376 2456
2377void glDeleteTexture (int name) 2457void glDeleteTexture (int name)
2378 CODE: 2458 CODE:
2379{
2380 GLuint name_ = name;
2381 glDeleteTextures (1, &name_); 2459 del_texture (name);
2382} 2460
2383
2384int glGenList () 2461int glGenList ()
2385 CODE: 2462 CODE:
2386 RETVAL = glGenLists (1); 2463 RETVAL = glGenLists (1);
2387 OUTPUT: 2464 OUTPUT:
2388 RETVAL 2465 RETVAL

Diff Legend

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