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.192 by root, Fri Apr 27 21:27:51 2007 UTC

… …
56# define PARACHUTE SDL_INIT_NOPARACHUTE 56# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else 57#else
58# define PARACHUTE 0 58# define PARACHUTE 0
59#endif 59#endif
60 60
61static AV *texture_av;
62
61static struct 63static struct
62{ 64{
63#define GL_FUNC(ptr,name) ptr name; 65#define GL_FUNC(ptr,name) ptr name;
64#include "glfunc.h" 66#include "glfunc.h"
65#undef GL_FUNC 67#undef GL_FUNC
66} gl; 68} gl;
67 69
70static void
68static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 71gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69{ 72{
70 if (gl.BlendFuncSeparate) 73 if (gl.BlendFuncSeparate)
71 gl.BlendFuncSeparate (sa, da, saa, daa); 74 gl.BlendFuncSeparate (sa, da, saa, daa);
72 else if (gl.BlendFuncSeparateEXT) 75 else if (gl.BlendFuncSeparateEXT)
73 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 76 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74 else 77 else
75 glBlendFunc (sa, da); 78 glBlendFunc (sa, da);
79}
80
81static GLuint
82gen_texture ()
83{
84 GLuint name;
85
86 if (AvFILL (texture_av) >= 0)
87 name = (GLuint)(size_t)av_pop (texture_av);
88 else
89 glGenTextures (1, &name);
90
91 return name;
92}
93
94static void
95del_texture (GLuint name)
96{
97 /* make a half-assed attempt at returning the memory used by the texture */
98 /* textures are frequently being reused by cfplus anyway */
99 /*glBindTexture (GL_TEXTURE_2D, name);*/
100 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
101 av_push (texture_av, (SV *)(size_t)name);
102 glDeleteTextures (1, &name);
76} 103}
77 104
78#include "texcache.c" 105#include "texcache.c"
79 106
80#include "pango-font.c" 107#include "pango-font.c"
… …
345} smooth_key; 372} smooth_key;
346 373
347static void 374static void
348smooth_or_bits (HV *hv, smooth_key *key, IV bits) 375smooth_or_bits (HV *hv, smooth_key *key, IV bits)
349{ 376{
350 SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1); 377 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
351 378
352 if (SvIOK (*sv)) 379 if (SvIOK (*sv))
353 SvIV_set (*sv, SvIVX (*sv) | bits); 380 SvIV_set (*sv, SvIVX (*sv) | bits);
354 else 381 else
355 sv_setiv (*sv, bits); 382 sv_setiv (*sv, bits);
… …
614 RETVAL = !!SDL_SetVideoMode ( 641 RETVAL = !!SDL_SetVideoMode (
615 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 642 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
616 ); 643 );
617 if (RETVAL) 644 if (RETVAL)
618 { 645 {
646 av_clear (texture_av);
647
619 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 648 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
620# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 649# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
621# include "glfunc.h" 650# include "glfunc.h"
622# undef GL_FUNC 651# undef GL_FUNC
652
623 } 653 }
624 OUTPUT: 654 OUTPUT:
625 RETVAL 655 RETVAL
626 656
627void 657void
… …
1391 CODE: 1421 CODE:
1392{ 1422{
1393 if (dx > 0) 1423 if (dx > 0)
1394 map_blank (self, self->x, self->y, dx, self->h); 1424 map_blank (self, self->x, self->y, dx, self->h);
1395 else if (dx < 0) 1425 else if (dx < 0)
1396 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1426 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1397 1427
1398 if (dy > 0) 1428 if (dy > 0)
1399 map_blank (self, self->x, self->y, self->w, dy); 1429 map_blank (self, self->x, self->y, self->w, dy);
1400 else if (dy < 0) 1430 else if (dy < 0)
1401 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1431 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1402 1432
1403 self->ox += dx; self->x += dx; 1433 self->ox += dx; self->x += dx;
1404 self->oy += dy; self->y += dy; 1434 self->oy += dy; self->y += dy;
1405 1435
1406 while (self->y < 0) 1436 while (self->y < 0)
… …
1460 } 1490 }
1461 else if (cmd == 6) // monster width 1491 else if (cmd == 6) // monster width
1462 cell->stat_width = *data++ + 1; 1492 cell->stat_width = *data++ + 1;
1463 else if (cmd == 0x47) 1493 else if (cmd == 0x47)
1464 { 1494 {
1465 if (*data == 8) 1495 if (*data == 4)
1466 ; // decode player uuid 1496 ; // decode player count
1467 1497
1468 data += *data + 1; 1498 data += *data + 1;
1469 } 1499 }
1470 else if (cmd == 8) // cell flags 1500 else if (cmd == 8) // cell flags
1471 cell->flags = *data++; 1501 cell->flags = *data++;
… …
1681 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 1711 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1682 1712
1683 // add bits to current tile and all neighbours. skey.x|y is 1713 // add bits to current tile and all neighbours. skey.x|y is
1684 // shifted +1|+1 so we always stay positive. 1714 // shifted +1|+1 so we always stay positive.
1685 1715
1716 // bits is ___n cccc CCCC bbbb
1717 // n do not draw borders&corners
1718 // c draw these corners, but...
1719 // C ... not these
1720 // b draw these borders
1721
1722 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1723 // ┃· ·· ·┃ ━━
1724
1725 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1726 // ·· ·· ·┏ ┓·
1727
1686 // full tile 1728 // full tile
1687 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 1729 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1688 1730
1689 // borders 1731 // borders
1690 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031); 1732 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); 1733 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); 1734 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); 1735 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1694 1736
1695 // corners 1737 // corners
1696 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 1738 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
… …
1700 } 1742 }
1701 } 1743 }
1702 } 1744 }
1703 } 1745 }
1704 1746
1705 // go through all smoothlevels, lowest to highest, then draw 1747 // go through all smoothlevels, lowest to highest, then draw.
1706 // this is basically counting sort 1748 // this is basically counting sort
1707 { 1749 {
1708 int w, b; 1750 int w, b;
1709 1751
1710 for (w = 0; w < 256 / 32; ++w) 1752 for (w = 0; w < 256 / 32; ++w)
… …
1721 while ((he = hv_iternext (smooth))) 1763 while ((he = hv_iternext (smooth)))
1722 { 1764 {
1723 smooth_key *skey = (smooth_key *)HeKEY (he); 1765 smooth_key *skey = (smooth_key *)HeKEY (he);
1724 IV bits = SvIVX (HeVAL (he)); 1766 IV bits = SvIVX (HeVAL (he));
1725 1767
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) 1768 if (!(bits & 0x1000)
1733 && skey->level == level 1769 && skey->level == level
1734 && level >= smooth_max [skey->x][skey->y]) 1770 && level > smooth_max [skey->x][skey->y])
1735 { 1771 {
1736 maptex tex = self->tex [skey->tile]; 1772 maptex tex = self->tex [skey->tile];
1737 int px = (((int)skey->x) - 1) * T; 1773 int px = (((int)skey->x) - 1) * T;
1738 int py = (((int)skey->y) - 1) * T; 1774 int py = (((int)skey->y) - 1) * T;
1739 int border = bits & 15; 1775 int border = bits & 15;
… …
2204# undef const_iv 2240# undef const_iv
2205 }; 2241 };
2206 2242
2207 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2243 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2208 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2244 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2245
2246 texture_av = newAV ();
2247 AvREAL_off (texture_av);
2209} 2248}
2210 2249
2211char * 2250char *
2212gl_vendor () 2251gl_vendor ()
2213 CODE: 2252 CODE:
… …
2362 2401
2363void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2402void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2364 2403
2365int glGenTexture () 2404int glGenTexture ()
2366 CODE: 2405 CODE:
2367{ 2406 RETVAL = gen_texture ();
2368 GLuint name;
2369 glGenTextures (1, &name);
2370 RETVAL = name;
2371}
2372 OUTPUT: 2407 OUTPUT:
2373 RETVAL 2408 RETVAL
2374 2409
2375void glDeleteTexture (int name) 2410void glDeleteTexture (int name)
2376 CODE: 2411 CODE:
2377{
2378 GLuint name_ = name;
2379 glDeleteTextures (1, &name_); 2412 del_texture (name);
2380} 2413
2381
2382int glGenList () 2414int glGenList ()
2383 CODE: 2415 CODE:
2384 RETVAL = glGenLists (1); 2416 RETVAL = glGenLists (1);
2385 OUTPUT: 2417 OUTPUT:
2386 RETVAL 2418 RETVAL

Diff Legend

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