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.194 by root, Thu Jul 12 17:56:50 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
… …
701Mix_AllocateChannels (int numchans = -1) 736Mix_AllocateChannels (int numchans = -1)
702 737
703void 738void
704lowdelay (int fd, int val = 1) 739lowdelay (int fd, int val = 1)
705 CODE: 740 CODE:
706#ifndef _WIN32
707 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 741 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
708#endif
709 742
710void 743void
711win32_proxy_info () 744win32_proxy_info ()
712 PPCODE: 745 PPCODE:
713{ 746{
… …
854 ExitThread (retval); // unclean, please beam me up 887 ExitThread (retval); // unclean, please beam me up
855#else 888#else
856 _exit (retval); 889 _exit (retval);
857#endif 890#endif
858 891
892void
893debug ()
894 CODE:
895{
896#if DEBUG
897 VALGRIND_DO_LEAK_CHECK;
898#endif
899}
900
859MODULE = CFPlus PACKAGE = CFPlus::Font 901MODULE = CFPlus PACKAGE = CFPlus::Font
860 902
861CFPlus::Font 903CFPlus::Font
862new_from_file (SV *class, char *path, int id = 0) 904new_from_file (SV *class, char *path, int id = 0)
863 CODE: 905 CODE:
… …
1393 CODE: 1435 CODE:
1394{ 1436{
1395 if (dx > 0) 1437 if (dx > 0)
1396 map_blank (self, self->x, self->y, dx, self->h); 1438 map_blank (self, self->x, self->y, dx, self->h);
1397 else if (dx < 0) 1439 else if (dx < 0)
1398 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1440 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1399 1441
1400 if (dy > 0) 1442 if (dy > 0)
1401 map_blank (self, self->x, self->y, self->w, dy); 1443 map_blank (self, self->x, self->y, self->w, dy);
1402 else if (dy < 0) 1444 else if (dy < 0)
1403 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1445 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1404 1446
1405 self->ox += dx; self->x += dx; 1447 self->ox += dx; self->x += dx;
1406 self->oy += dy; self->y += dy; 1448 self->oy += dy; self->y += dy;
1407 1449
1408 while (self->y < 0) 1450 while (self->y < 0)
… …
1462 } 1504 }
1463 else if (cmd == 6) // monster width 1505 else if (cmd == 6) // monster width
1464 cell->stat_width = *data++ + 1; 1506 cell->stat_width = *data++ + 1;
1465 else if (cmd == 0x47) 1507 else if (cmd == 0x47)
1466 { 1508 {
1467 if (*data == 8) 1509 if (*data == 4)
1468 ; // decode player uuid 1510 ; // decode player count
1469 1511
1470 data += *data + 1; 1512 data += *data + 1;
1471 } 1513 }
1472 else if (cmd == 8) // cell flags 1514 else if (cmd == 8) // cell flags
1473 cell->flags = *data++; 1515 cell->flags = *data++;
… …
1567draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1609draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1568 CODE: 1610 CODE:
1569{ 1611{
1570 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1612 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1571 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1613 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1572 uint8_t smooth_max[256][256]; 1614 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1573 smooth_key skey; 1615 smooth_key skey;
1574 int x, y, z; 1616 int x, y, z;
1575 int last_name; 1617 int last_name;
1576 1618
1577 // thats current max. sorry. 1619 // thats current max. sorry.
… …
1683 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 1725 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1684 1726
1685 // add bits to current tile and all neighbours. skey.x|y is 1727 // add bits to current tile and all neighbours. skey.x|y is
1686 // shifted +1|+1 so we always stay positive. 1728 // shifted +1|+1 so we always stay positive.
1687 1729
1730 // bits is ___n cccc CCCC bbbb
1731 // n do not draw borders&corners
1732 // c draw these corners, but...
1733 // C ... not these
1734 // b draw these borders
1735
1736 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1737 // ┃· ·· ·┃ ━━
1738
1739 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1740 // ·· ·· ·┏ ┓·
1741
1688 // full tile 1742 // full tile
1689 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 1743 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1690 1744
1691 // borders 1745 // borders
1692 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031); 1746 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); 1747 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); 1748 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); 1749 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1696 1750
1697 // corners 1751 // corners
1698 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 1752 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
… …
1702 } 1756 }
1703 } 1757 }
1704 } 1758 }
1705 } 1759 }
1706 1760
1707 // go through all smoothlevels, lowest to highest, then draw 1761 // go through all smoothlevels, lowest to highest, then draw.
1708 // this is basically counting sort 1762 // this is basically counting sort
1709 { 1763 {
1710 int w, b; 1764 int w, b;
1711 1765
1712 for (w = 0; w < 256 / 32; ++w) 1766 for (w = 0; w < 256 / 32; ++w)
… …
1723 while ((he = hv_iternext (smooth))) 1777 while ((he = hv_iternext (smooth)))
1724 { 1778 {
1725 smooth_key *skey = (smooth_key *)HeKEY (he); 1779 smooth_key *skey = (smooth_key *)HeKEY (he);
1726 IV bits = SvIVX (HeVAL (he)); 1780 IV bits = SvIVX (HeVAL (he));
1727 1781
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) 1782 if (!(bits & 0x1000)
1735 && skey->level == level 1783 && skey->level == level
1736 && level >= smooth_max [skey->x][skey->y]) 1784 && level > smooth_max [skey->x][skey->y])
1737 { 1785 {
1738 maptex tex = self->tex [skey->tile]; 1786 maptex tex = self->tex [skey->tile];
1739 int px = (((int)skey->x) - 1) * T; 1787 int px = (((int)skey->x) - 1) * T;
1740 int py = (((int)skey->y) - 1) * T; 1788 int py = (((int)skey->y) - 1) * T;
1741 int border = bits & 15; 1789 int border = bits & 15;
… …
2089 2137
2090int 2138int
2091volume (int volume = -1) 2139volume (int volume = -1)
2092 CODE: 2140 CODE:
2093 RETVAL = Mix_VolumeMusic (volume); 2141 RETVAL = Mix_VolumeMusic (volume);
2142 OUTPUT:
2143 RETVAL
2144
2145int
2146fade_out (int ms)
2147 CODE:
2148 RETVAL = Mix_FadeOutMusic (ms);
2094 OUTPUT: 2149 OUTPUT:
2095 RETVAL 2150 RETVAL
2096 2151
2097CFPlus::MixMusic 2152CFPlus::MixMusic
2098new_from_file (SV *class, char *path) 2153new_from_file (SV *class, char *path)
… …
2206# undef const_iv 2261# undef const_iv
2207 }; 2262 };
2208 2263
2209 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2264 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2210 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2265 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2266
2267 texture_av = newAV ();
2268 AvREAL_off (texture_av);
2211} 2269}
2212 2270
2213char * 2271char *
2214gl_vendor () 2272gl_vendor ()
2215 CODE: 2273 CODE:
… …
2364 2422
2365void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2423void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2366 2424
2367int glGenTexture () 2425int glGenTexture ()
2368 CODE: 2426 CODE:
2369{ 2427 RETVAL = gen_texture ();
2370 GLuint name;
2371 glGenTextures (1, &name);
2372 RETVAL = name;
2373}
2374 OUTPUT: 2428 OUTPUT:
2375 RETVAL 2429 RETVAL
2376 2430
2377void glDeleteTexture (int name) 2431void glDeleteTexture (int name)
2378 CODE: 2432 CODE:
2379{
2380 GLuint name_ = name;
2381 glDeleteTextures (1, &name_); 2433 del_texture (name);
2382} 2434
2383
2384int glGenList () 2435int glGenList ()
2385 CODE: 2436 CODE:
2386 RETVAL = glGenLists (1); 2437 RETVAL = glGenLists (1);
2387 OUTPUT: 2438 OUTPUT:
2388 RETVAL 2439 RETVAL

Diff Legend

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