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.179 by root, Wed Apr 11 04:32:51 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);
… …
852 ExitThread (retval); // unclean, please beam me up 906 ExitThread (retval); // unclean, please beam me up
853#else 907#else
854 _exit (retval); 908 _exit (retval);
855#endif 909#endif
856 910
911void
912debug ()
913 CODE:
914{
915#if DEBUG
916 VALGRIND_DO_LEAK_CHECK;
917#endif
918}
919
857MODULE = CFPlus PACKAGE = CFPlus::Font 920MODULE = CFPlus PACKAGE = CFPlus::Font
858 921
859CFPlus::Font 922CFPlus::Font
860new_from_file (SV *class, char *path, int id = 0) 923new_from_file (SV *class, char *path, int id = 0)
861 CODE: 924 CODE:
… …
1391 CODE: 1454 CODE:
1392{ 1455{
1393 if (dx > 0) 1456 if (dx > 0)
1394 map_blank (self, self->x, self->y, dx, self->h); 1457 map_blank (self, self->x, self->y, dx, self->h);
1395 else if (dx < 0) 1458 else if (dx < 0)
1396 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);
1397 1460
1398 if (dy > 0) 1461 if (dy > 0)
1399 map_blank (self, self->x, self->y, self->w, dy); 1462 map_blank (self, self->x, self->y, self->w, dy);
1400 else if (dy < 0) 1463 else if (dy < 0)
1401 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);
1402 1465
1403 self->ox += dx; self->x += dx; 1466 self->ox += dx; self->x += dx;
1404 self->oy += dy; self->y += dy; 1467 self->oy += dy; self->y += dy;
1405 1468
1406 while (self->y < 0) 1469 while (self->y < 0)
… …
1460 } 1523 }
1461 else if (cmd == 6) // monster width 1524 else if (cmd == 6) // monster width
1462 cell->stat_width = *data++ + 1; 1525 cell->stat_width = *data++ + 1;
1463 else if (cmd == 0x47) 1526 else if (cmd == 0x47)
1464 { 1527 {
1465 if (*data == 8) 1528 if (*data == 4)
1466 ; // decode player uuid 1529 ; // decode player count
1467 1530
1468 data += *data + 1; 1531 data += *data + 1;
1469 } 1532 }
1470 else if (cmd == 8) // cell flags 1533 else if (cmd == 8) // cell flags
1471 cell->flags = *data++; 1534 cell->flags = *data++;
… …
1681 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 1744 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1682 1745
1683 // 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
1684 // shifted +1|+1 so we always stay positive. 1747 // shifted +1|+1 so we always stay positive.
1685 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
1686 // full tile 1761 // full tile
1687 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);
1688 1763
1689 // borders 1764 // borders
1690 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);
1691 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);
1692 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);
1693 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);
1694 1769
1695 // corners 1770 // corners
1696 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);
… …
1700 } 1775 }
1701 } 1776 }
1702 } 1777 }
1703 } 1778 }
1704 1779
1705 // go through all smoothlevels, lowest to highest, then draw 1780 // go through all smoothlevels, lowest to highest, then draw.
1706 // this is basically counting sort 1781 // this is basically counting sort
1707 { 1782 {
1708 int w, b; 1783 int w, b;
1709 1784
1710 for (w = 0; w < 256 / 32; ++w) 1785 for (w = 0; w < 256 / 32; ++w)
… …
1721 while ((he = hv_iternext (smooth))) 1796 while ((he = hv_iternext (smooth)))
1722 { 1797 {
1723 smooth_key *skey = (smooth_key *)HeKEY (he); 1798 smooth_key *skey = (smooth_key *)HeKEY (he);
1724 IV bits = SvIVX (HeVAL (he)); 1799 IV bits = SvIVX (HeVAL (he));
1725 1800
1726 // bits is ___n cccc CCCC bbbb
1727 // n do not draw borders&corners
1728 // c draw these corners, but...
1729 // C ... not these
1730 // b draw these borders
1731
1732 if (!(bits & 0x1000) 1801 if (!(bits & 0x1000)
1733 && skey->level == level 1802 && skey->level == level
1734 && level >= smooth_max [skey->x][skey->y]) 1803 && level > smooth_max [skey->x][skey->y])
1735 { 1804 {
1736 maptex tex = self->tex [skey->tile]; 1805 maptex tex = self->tex [skey->tile];
1737 int px = (((int)skey->x) - 1) * T; 1806 int px = (((int)skey->x) - 1) * T;
1738 int py = (((int)skey->y) - 1) * T; 1807 int py = (((int)skey->y) - 1) * T;
1739 int border = bits & 15; 1808 int border = bits & 15;
… …
2090 CODE: 2159 CODE:
2091 RETVAL = Mix_VolumeMusic (volume); 2160 RETVAL = Mix_VolumeMusic (volume);
2092 OUTPUT: 2161 OUTPUT:
2093 RETVAL 2162 RETVAL
2094 2163
2164int
2165fade_out (int ms)
2166 CODE:
2167 RETVAL = Mix_FadeOutMusic (ms);
2168 OUTPUT:
2169 RETVAL
2170
2095CFPlus::MixMusic 2171CFPlus::MixMusic
2096new_from_file (SV *class, char *path) 2172new_from_file (SV *class, char *path)
2097 CODE: 2173 CODE:
2098 RETVAL = Mix_LoadMUS (path); 2174 RETVAL = Mix_LoadMUS (path);
2099 OUTPUT: 2175 OUTPUT:
… …
2106 2182
2107int 2183int
2108play (CFPlus::MixMusic self, int loops = -1) 2184play (CFPlus::MixMusic self, int loops = -1)
2109 CODE: 2185 CODE:
2110 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);
2111 OUTPUT: 2194 OUTPUT:
2112 RETVAL 2195 RETVAL
2113 2196
2114MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2197MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2115 2198
… …
2204# undef const_iv 2287# undef const_iv
2205 }; 2288 };
2206 2289
2207 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; )
2208 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);
2209} 2295}
2210 2296
2211char * 2297char *
2212gl_vendor () 2298gl_vendor ()
2213 CODE: 2299 CODE:
… …
2362 2448
2363void 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)
2364 2450
2365int glGenTexture () 2451int glGenTexture ()
2366 CODE: 2452 CODE:
2367{ 2453 RETVAL = gen_texture ();
2368 GLuint name;
2369 glGenTextures (1, &name);
2370 RETVAL = name;
2371}
2372 OUTPUT: 2454 OUTPUT:
2373 RETVAL 2455 RETVAL
2374 2456
2375void glDeleteTexture (int name) 2457void glDeleteTexture (int name)
2376 CODE: 2458 CODE:
2377{
2378 GLuint name_ = name;
2379 glDeleteTextures (1, &name_); 2459 del_texture (name);
2380} 2460
2381
2382int glGenList () 2461int glGenList ()
2383 CODE: 2462 CODE:
2384 RETVAL = glGenLists (1); 2463 RETVAL = glGenLists (1);
2385 OUTPUT: 2464 OUTPUT:
2386 RETVAL 2465 RETVAL

Diff Legend

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