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.195 by root, Sat Jul 14 12:05:52 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
… …
852 ExitThread (retval); // unclean, please beam me up 887 ExitThread (retval); // unclean, please beam me up
853#else 888#else
854 _exit (retval); 889 _exit (retval);
855#endif 890#endif
856 891
892void
893debug ()
894 CODE:
895{
896#if DEBUG
897 VALGRIND_DO_LEAK_CHECK;
898#endif
899}
900
857MODULE = CFPlus PACKAGE = CFPlus::Font 901MODULE = CFPlus PACKAGE = CFPlus::Font
858 902
859CFPlus::Font 903CFPlus::Font
860new_from_file (SV *class, char *path, int id = 0) 904new_from_file (SV *class, char *path, int id = 0)
861 CODE: 905 CODE:
… …
1391 CODE: 1435 CODE:
1392{ 1436{
1393 if (dx > 0) 1437 if (dx > 0)
1394 map_blank (self, self->x, self->y, dx, self->h); 1438 map_blank (self, self->x, self->y, dx, self->h);
1395 else if (dx < 0) 1439 else if (dx < 0)
1396 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);
1397 1441
1398 if (dy > 0) 1442 if (dy > 0)
1399 map_blank (self, self->x, self->y, self->w, dy); 1443 map_blank (self, self->x, self->y, self->w, dy);
1400 else if (dy < 0) 1444 else if (dy < 0)
1401 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);
1402 1446
1403 self->ox += dx; self->x += dx; 1447 self->ox += dx; self->x += dx;
1404 self->oy += dy; self->y += dy; 1448 self->oy += dy; self->y += dy;
1405 1449
1406 while (self->y < 0) 1450 while (self->y < 0)
… …
1460 } 1504 }
1461 else if (cmd == 6) // monster width 1505 else if (cmd == 6) // monster width
1462 cell->stat_width = *data++ + 1; 1506 cell->stat_width = *data++ + 1;
1463 else if (cmd == 0x47) 1507 else if (cmd == 0x47)
1464 { 1508 {
1465 if (*data == 8) 1509 if (*data == 4)
1466 ; // decode player uuid 1510 ; // decode player count
1467 1511
1468 data += *data + 1; 1512 data += *data + 1;
1469 } 1513 }
1470 else if (cmd == 8) // cell flags 1514 else if (cmd == 8) // cell flags
1471 cell->flags = *data++; 1515 cell->flags = *data++;
… …
1681 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 1725 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1682 1726
1683 // 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
1684 // shifted +1|+1 so we always stay positive. 1728 // shifted +1|+1 so we always stay positive.
1685 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
1686 // full tile 1742 // full tile
1687 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);
1688 1744
1689 // borders 1745 // borders
1690 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);
1691 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);
1692 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);
1693 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);
1694 1750
1695 // corners 1751 // corners
1696 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);
… …
1700 } 1756 }
1701 } 1757 }
1702 } 1758 }
1703 } 1759 }
1704 1760
1705 // go through all smoothlevels, lowest to highest, then draw 1761 // go through all smoothlevels, lowest to highest, then draw.
1706 // this is basically counting sort 1762 // this is basically counting sort
1707 { 1763 {
1708 int w, b; 1764 int w, b;
1709 1765
1710 for (w = 0; w < 256 / 32; ++w) 1766 for (w = 0; w < 256 / 32; ++w)
… …
1721 while ((he = hv_iternext (smooth))) 1777 while ((he = hv_iternext (smooth)))
1722 { 1778 {
1723 smooth_key *skey = (smooth_key *)HeKEY (he); 1779 smooth_key *skey = (smooth_key *)HeKEY (he);
1724 IV bits = SvIVX (HeVAL (he)); 1780 IV bits = SvIVX (HeVAL (he));
1725 1781
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) 1782 if (!(bits & 0x1000)
1733 && skey->level == level 1783 && skey->level == level
1734 && level >= smooth_max [skey->x][skey->y]) 1784 && level > smooth_max [skey->x][skey->y])
1735 { 1785 {
1736 maptex tex = self->tex [skey->tile]; 1786 maptex tex = self->tex [skey->tile];
1737 int px = (((int)skey->x) - 1) * T; 1787 int px = (((int)skey->x) - 1) * T;
1738 int py = (((int)skey->y) - 1) * T; 1788 int py = (((int)skey->y) - 1) * T;
1739 int border = bits & 15; 1789 int border = bits & 15;
… …
2090 CODE: 2140 CODE:
2091 RETVAL = Mix_VolumeMusic (volume); 2141 RETVAL = Mix_VolumeMusic (volume);
2092 OUTPUT: 2142 OUTPUT:
2093 RETVAL 2143 RETVAL
2094 2144
2145int
2146fade_out (int ms)
2147 CODE:
2148 RETVAL = Mix_FadeOutMusic (ms);
2149 OUTPUT:
2150 RETVAL
2151
2095CFPlus::MixMusic 2152CFPlus::MixMusic
2096new_from_file (SV *class, char *path) 2153new_from_file (SV *class, char *path)
2097 CODE: 2154 CODE:
2098 RETVAL = Mix_LoadMUS (path); 2155 RETVAL = Mix_LoadMUS (path);
2099 OUTPUT: 2156 OUTPUT:
… …
2106 2163
2107int 2164int
2108play (CFPlus::MixMusic self, int loops = -1) 2165play (CFPlus::MixMusic self, int loops = -1)
2109 CODE: 2166 CODE:
2110 RETVAL = Mix_PlayMusic (self, loops); 2167 RETVAL = Mix_PlayMusic (self, loops);
2168 OUTPUT:
2169 RETVAL
2170
2171int
2172fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2173 CODE:
2174 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2111 OUTPUT: 2175 OUTPUT:
2112 RETVAL 2176 RETVAL
2113 2177
2114MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2178MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2115 2179
… …
2204# undef const_iv 2268# undef const_iv
2205 }; 2269 };
2206 2270
2207 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2271 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2208 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2272 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2273
2274 texture_av = newAV ();
2275 AvREAL_off (texture_av);
2209} 2276}
2210 2277
2211char * 2278char *
2212gl_vendor () 2279gl_vendor ()
2213 CODE: 2280 CODE:
… …
2362 2429
2363void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2430void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2364 2431
2365int glGenTexture () 2432int glGenTexture ()
2366 CODE: 2433 CODE:
2367{ 2434 RETVAL = gen_texture ();
2368 GLuint name;
2369 glGenTextures (1, &name);
2370 RETVAL = name;
2371}
2372 OUTPUT: 2435 OUTPUT:
2373 RETVAL 2436 RETVAL
2374 2437
2375void glDeleteTexture (int name) 2438void glDeleteTexture (int name)
2376 CODE: 2439 CODE:
2377{
2378 GLuint name_ = name;
2379 glDeleteTextures (1, &name_); 2440 del_texture (name);
2380} 2441
2381
2382int glGenList () 2442int glGenList ()
2383 CODE: 2443 CODE:
2384 RETVAL = glGenLists (1); 2444 RETVAL = glGenLists (1);
2385 OUTPUT: 2445 OUTPUT:
2386 RETVAL 2446 RETVAL

Diff Legend

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