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.185 by root, Sat Apr 21 09:21:03 2007 UTC vs.
Revision 1.196 by root, Sun Jul 15 21:02:20 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"
… …
400 432
401/* SDL should provide this, really. */ 433/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300 434#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314 435#define SDLK_MODIFIER_MAX 314
404 436
405static AV *texture_av;
406
407MODULE = CFPlus PACKAGE = CFPlus 437MODULE = CFPlus PACKAGE = CFPlus
408 438
409PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
410 440
411BOOT: 441BOOT:
412{ 442{
413 texture_av = newAV ();
414 AvREAL_off (texture_av);
415
416 HV *stash = gv_stashpv ("CFPlus", 1); 443 HV *stash = gv_stashpv ("CFPlus", 1);
417 static const struct { 444 static const struct {
418 const char *name; 445 const char *name;
419 IV iv; 446 IV iv;
420 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
… …
619 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
620 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
621 ); 648 );
622 if (RETVAL) 649 if (RETVAL)
623 { 650 {
651 av_clear (texture_av);
652
624 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
625# 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);
626# include "glfunc.h" 655# include "glfunc.h"
627# undef GL_FUNC 656# undef GL_FUNC
657
628 } 658 }
629 OUTPUT: 659 OUTPUT:
630 RETVAL 660 RETVAL
631 661
632void 662void
… …
661 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 691 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
662 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 692 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
663 break; 693 break;
664 694
665 case SDL_MOUSEMOTION: 695 case SDL_MOUSEMOTION:
696 {
697 int state = ev.motion.state;
698 int x = ev.motion.x;
699 int y = ev.motion.y;
700 int xrel = ev.motion.xrel;
701 int yrel = ev.motion.yrel;
702
703 /* do simplistic event compression */
704 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
705 && state == ev.motion.state)
706 {
707 xrel += ev.motion.xrel;
708 yrel += ev.motion.yrel;
709 x = ev.motion.x;
710 y = ev.motion.y;
711 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
712 }
713
666 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 714 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
667
668 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 715 hv_store (hv, "state", 5, newSViv (state), 0);
669 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 716 hv_store (hv, "x", 1, newSViv (x), 0);
670 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 717 hv_store (hv, "y", 1, newSViv (y), 0);
671 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 718 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
672 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 719 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
720 }
673 break; 721 break;
674 722
675 case SDL_MOUSEBUTTONDOWN: 723 case SDL_MOUSEBUTTONDOWN:
676 case SDL_MOUSEBUTTONUP: 724 case SDL_MOUSEBUTTONUP:
677 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 725 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
… …
857 ExitThread (retval); // unclean, please beam me up 905 ExitThread (retval); // unclean, please beam me up
858#else 906#else
859 _exit (retval); 907 _exit (retval);
860#endif 908#endif
861 909
910void
911debug ()
912 CODE:
913{
914#if DEBUG
915 VALGRIND_DO_LEAK_CHECK;
916#endif
917}
918
862MODULE = CFPlus PACKAGE = CFPlus::Font 919MODULE = CFPlus PACKAGE = CFPlus::Font
863 920
864CFPlus::Font 921CFPlus::Font
865new_from_file (SV *class, char *path, int id = 0) 922new_from_file (SV *class, char *path, int id = 0)
866 CODE: 923 CODE:
… …
1396 CODE: 1453 CODE:
1397{ 1454{
1398 if (dx > 0) 1455 if (dx > 0)
1399 map_blank (self, self->x, self->y, dx, self->h); 1456 map_blank (self, self->x, self->y, dx, self->h);
1400 else if (dx < 0) 1457 else if (dx < 0)
1401 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1458 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1402 1459
1403 if (dy > 0) 1460 if (dy > 0)
1404 map_blank (self, self->x, self->y, self->w, dy); 1461 map_blank (self, self->x, self->y, self->w, dy);
1405 else if (dy < 0) 1462 else if (dy < 0)
1406 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1463 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1407 1464
1408 self->ox += dx; self->x += dx; 1465 self->ox += dx; self->x += dx;
1409 self->oy += dy; self->y += dy; 1466 self->oy += dy; self->y += dy;
1410 1467
1411 while (self->y < 0) 1468 while (self->y < 0)
… …
1600 1657
1601 // first pass: determine smooth_max 1658 // first pass: determine smooth_max
1602 // rather ugly, if you ask me 1659 // rather ugly, if you ask me
1603 // could also be stored inside mapcell and updated on change 1660 // could also be stored inside mapcell and updated on change
1604 memset (smooth_max, 0, sizeof (smooth_max)); 1661 memset (smooth_max, 0, sizeof (smooth_max));
1605 memset (smooth_level, 0, sizeof (smooth_level));
1606 1662
1607 for (y = 0; y < sh; y++) 1663 for (y = 0; y < sh; y++)
1608 if (0 <= y + my && y + my < self->rows) 1664 if (0 <= y + my && y + my < self->rows)
1609 { 1665 {
1610 maprow *row = self->row + (y + my); 1666 maprow *row = self->row + (y + my);
… …
1621 } 1677 }
1622 } 1678 }
1623 1679
1624 for (z = 0; z <= 2; z++) 1680 for (z = 0; z <= 2; z++)
1625 { 1681 {
1682 memset (smooth_level, 0, sizeof (smooth_level));
1683
1626 for (y = 0; y < sh; y++) 1684 for (y = 0; y < sh; y++)
1627 if (0 <= y + my && y + my < self->rows) 1685 if (0 <= y + my && y + my < self->rows)
1628 { 1686 {
1629 maprow *row = self->row + (y + my); 1687 maprow *row = self->row + (y + my);
1630 1688
… …
1715 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 1773 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1716 } 1774 }
1717 } 1775 }
1718 } 1776 }
1719 } 1777 }
1720 }
1721 1778
1722 // go through all smoothlevels, lowest to highest, then draw. 1779 // go through all smoothlevels, lowest to highest, then draw.
1723 // this is basically counting sort 1780 // this is basically counting sort
1724 {
1725 int w, b;
1726
1727 for (w = 0; w < 256 / 32; ++w)
1728 { 1781 {
1782 int w, b;
1783
1784 for (w = 0; w < 256 / 32; ++w)
1785 {
1729 uint32_t smask = smooth_level [w]; 1786 uint32_t smask = smooth_level [w];
1730 if (smask) 1787 if (smask)
1731 for (b = 0; b < 32; ++b) 1788 for (b = 0; b < 32; ++b)
1732 if (smask & (((uint32_t)1) << b)) 1789 if (smask & (((uint32_t)1) << b))
1733 {
1734 int level = (w << 5) | b;
1735 HE *he;
1736
1737 hv_iterinit (smooth);
1738 while ((he = hv_iternext (smooth)))
1739 { 1790 {
1740 smooth_key *skey = (smooth_key *)HeKEY (he); 1791 int level = (w << 5) | b;
1741 IV bits = SvIVX (HeVAL (he)); 1792 HE *he;
1742 1793
1743 if (!(bits & 0x1000) 1794 hv_iterinit (smooth);
1744 && skey->level == level 1795 while ((he = hv_iternext (smooth)))
1745 && level >= smooth_max [skey->x][skey->y])
1746 { 1796 {
1747 maptex tex = self->tex [skey->tile]; 1797 smooth_key *skey = (smooth_key *)HeKEY (he);
1748 int px = (((int)skey->x) - 1) * T; 1798 IV bits = SvIVX (HeVAL (he));
1749 int py = (((int)skey->y) - 1) * T; 1799
1750 int border = bits & 15; 1800 if (!(bits & 0x1000)
1751 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1801 && skey->level == level
1752 float dx = tex.s * .0625f; // 16 images/row 1802 && level > smooth_max [skey->x][skey->y])
1753 float dy = tex.t * .5f ; // 2 images/column
1754
1755 // this time naively avoiding texture state changes
1756 // save gobs of state changes.
1757 if (last_name != tex.name)
1758 { 1803 {
1804 maptex tex = self->tex [skey->tile];
1805 int px = (((int)skey->x) - 1) * T;
1806 int py = (((int)skey->y) - 1) * T;
1807 int border = bits & 15;
1808 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1809 float dx = tex.s * .0625f; // 16 images/row
1810 float dy = tex.t * .5f ; // 2 images/column
1811
1812 // this time naively avoiding texture state changes
1813 // save gobs of state changes.
1814 if (last_name != tex.name)
1815 {
1759 if (!tex.name) 1816 if (!tex.name)
1760 continue; // smoothing not yet available 1817 continue; // smoothing not yet available
1761 1818
1762 glEnd (); 1819 glEnd ();
1763 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1820 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1764 glBegin (GL_QUADS); 1821 glBegin (GL_QUADS);
1765 } 1822 }
1766 1823
1767 if (border) 1824 if (border)
1768 { 1825 {
1769 float ox = border * dx; 1826 float ox = border * dx;
1770 1827
1771 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 1828 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1772 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 1829 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1773 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 1830 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1774 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 1831 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1775 } 1832 }
1776 1833
1777 if (corner) 1834 if (corner)
1778 { 1835 {
1779 float ox = corner * dx; 1836 float ox = corner * dx;
1780 1837
1781 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 1838 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1782 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 1839 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1783 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 1840 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1784 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 1841 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1842 }
1785 } 1843 }
1786 } 1844 }
1787 } 1845 }
1788 } 1846 }
1789 } 1847 }
1848
1849 hv_clear (smooth);
1790 } 1850 }
1791
1792 //hv_clear (smooth);
1793 1851
1794 glEnd (); 1852 glEnd ();
1795 1853
1796 glDisable (GL_TEXTURE_2D); 1854 glDisable (GL_TEXTURE_2D);
1797 glDisable (GL_BLEND); 1855 glDisable (GL_BLEND);
… …
2100 CODE: 2158 CODE:
2101 RETVAL = Mix_VolumeMusic (volume); 2159 RETVAL = Mix_VolumeMusic (volume);
2102 OUTPUT: 2160 OUTPUT:
2103 RETVAL 2161 RETVAL
2104 2162
2163int
2164fade_out (int ms)
2165 CODE:
2166 RETVAL = Mix_FadeOutMusic (ms);
2167 OUTPUT:
2168 RETVAL
2169
2105CFPlus::MixMusic 2170CFPlus::MixMusic
2106new_from_file (SV *class, char *path) 2171new_from_file (SV *class, char *path)
2107 CODE: 2172 CODE:
2108 RETVAL = Mix_LoadMUS (path); 2173 RETVAL = Mix_LoadMUS (path);
2109 OUTPUT: 2174 OUTPUT:
… …
2116 2181
2117int 2182int
2118play (CFPlus::MixMusic self, int loops = -1) 2183play (CFPlus::MixMusic self, int loops = -1)
2119 CODE: 2184 CODE:
2120 RETVAL = Mix_PlayMusic (self, loops); 2185 RETVAL = Mix_PlayMusic (self, loops);
2186 OUTPUT:
2187 RETVAL
2188
2189int
2190fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2191 CODE:
2192 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2121 OUTPUT: 2193 OUTPUT:
2122 RETVAL 2194 RETVAL
2123 2195
2124MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2196MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2125 2197
… …
2214# undef const_iv 2286# undef const_iv
2215 }; 2287 };
2216 2288
2217 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2289 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2218 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2290 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2291
2292 texture_av = newAV ();
2293 AvREAL_off (texture_av);
2219} 2294}
2220 2295
2221char * 2296char *
2222gl_vendor () 2297gl_vendor ()
2223 CODE: 2298 CODE:
… …
2372 2447
2373void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2448void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2374 2449
2375int glGenTexture () 2450int glGenTexture ()
2376 CODE: 2451 CODE:
2377{ 2452 RETVAL = gen_texture ();
2378 GLuint name;
2379 if (AvFILL (texture_av) >= 0)
2380 name = (GLuint)av_pop (texture_av);
2381 else
2382 glGenTextures (1, &name);
2383 RETVAL = name;
2384}
2385 OUTPUT: 2453 OUTPUT:
2386 RETVAL 2454 RETVAL
2387 2455
2388void glDeleteTexture (int name) 2456void glDeleteTexture (int name)
2389 CODE: 2457 CODE:
2390{ 2458 del_texture (name);
2391 /* make a half-assed attempt at returning the memory used by the texture */ 2459
2392 /* textures are frequently being reused by cfplus anyway */
2393 glBindTexture (GL_TEXTURE_2D, name);
2394 glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);
2395 av_push (texture_av, (SV *)name);
2396 /*glDeleteTextures (1, &name_);*/
2397}
2398
2399int glGenList () 2460int glGenList ()
2400 CODE: 2461 CODE:
2401 RETVAL = glGenLists (1); 2462 RETVAL = glGenLists (1);
2402 OUTPUT: 2463 OUTPUT:
2403 RETVAL 2464 RETVAL

Diff Legend

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