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.176 by root, Tue Apr 10 09:39:48 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
… …
701Mix_AllocateChannels (int numchans = -1) 731Mix_AllocateChannels (int numchans = -1)
702 732
703void 733void
704lowdelay (int fd, int val = 1) 734lowdelay (int fd, int val = 1)
705 CODE: 735 CODE:
706#ifndef _WIN32
707 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 736 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
708#endif
709 737
710void 738void
711win32_proxy_info () 739win32_proxy_info ()
712 PPCODE: 740 PPCODE:
713{ 741{
… …
1393 CODE: 1421 CODE:
1394{ 1422{
1395 if (dx > 0) 1423 if (dx > 0)
1396 map_blank (self, self->x, self->y, dx, self->h); 1424 map_blank (self, self->x, self->y, dx, self->h);
1397 else if (dx < 0) 1425 else if (dx < 0)
1398 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);
1399 1427
1400 if (dy > 0) 1428 if (dy > 0)
1401 map_blank (self, self->x, self->y, self->w, dy); 1429 map_blank (self, self->x, self->y, self->w, dy);
1402 else if (dy < 0) 1430 else if (dy < 0)
1403 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);
1404 1432
1405 self->ox += dx; self->x += dx; 1433 self->ox += dx; self->x += dx;
1406 self->oy += dy; self->y += dy; 1434 self->oy += dy; self->y += dy;
1407 1435
1408 while (self->y < 0) 1436 while (self->y < 0)
… …
1462 } 1490 }
1463 else if (cmd == 6) // monster width 1491 else if (cmd == 6) // monster width
1464 cell->stat_width = *data++ + 1; 1492 cell->stat_width = *data++ + 1;
1465 else if (cmd == 0x47) 1493 else if (cmd == 0x47)
1466 { 1494 {
1467 if (*data == 8) 1495 if (*data == 4)
1468 ; // decode player uuid 1496 ; // decode player count
1469 1497
1470 data += *data + 1; 1498 data += *data + 1;
1471 } 1499 }
1472 else if (cmd == 8) // cell flags 1500 else if (cmd == 8) // cell flags
1473 cell->flags = *data++; 1501 cell->flags = *data++;
… …
1567draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1595draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1568 CODE: 1596 CODE:
1569{ 1597{
1570 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1598 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1571 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1599 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1572 uint8_t smooth_max[256][256]; 1600 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1573 smooth_key skey; 1601 smooth_key skey;
1574 int x, y, z; 1602 int x, y, z;
1575 int last_name; 1603 int last_name;
1576 1604
1577 // thats current max. sorry. 1605 // thats current max. sorry.
… …
1608 for (x = 0; x < sw; x++) 1636 for (x = 0; x < sw; x++)
1609 if (row->c0 <= x + mx && x + mx < row->c1) 1637 if (row->c0 <= x + mx && x + mx < row->c1)
1610 { 1638 {
1611 mapcell *cell = row->col + (x + mx - row->c0); 1639 mapcell *cell = row->col + (x + mx - row->c0);
1612 1640
1613 for (z = 0; z <= 2; z++)
1614 {
1615 uint8_t level = self->tex [cell->tile [z]].smoothlevel;
1616 if (level > smooth_max [x + 1][y + 1])
1617 smooth_max [x + 1][y + 1] = level; 1641 smooth_max[x + 1][y + 1] =
1618 } 1642 MAX (self->tex [cell->tile [0]].smoothlevel,
1643 MAX (self->tex [cell->tile [1]].smoothlevel,
1644 self->tex [cell->tile [2]].smoothlevel));
1619 } 1645 }
1620 } 1646 }
1621 1647
1622 for (z = 0; z <= 2; z++) 1648 for (z = 0; z <= 2; z++)
1623 { 1649 {
… …
1685 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 1711 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1686 1712
1687 // 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
1688 // shifted +1|+1 so we always stay positive. 1714 // shifted +1|+1 so we always stay positive.
1689 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
1690 // full tile 1728 // full tile
1691 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);
1692 1730
1693 // borders 1731 // borders
1694 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);
1695 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);
1696 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);
1697 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);
1698 1736
1699 // corners 1737 // corners
1700 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);
… …
1704 } 1742 }
1705 } 1743 }
1706 } 1744 }
1707 } 1745 }
1708 1746
1709 // go through all smoothlevels, lowest to highest, then draw 1747 // go through all smoothlevels, lowest to highest, then draw.
1710 // this is basically counting sort 1748 // this is basically counting sort
1711 { 1749 {
1712 int w, b; 1750 int w, b;
1713 1751
1714 for (w = 0; w < 256 / 32; ++w) 1752 for (w = 0; w < 256 / 32; ++w)
… …
1725 while ((he = hv_iternext (smooth))) 1763 while ((he = hv_iternext (smooth)))
1726 { 1764 {
1727 smooth_key *skey = (smooth_key *)HeKEY (he); 1765 smooth_key *skey = (smooth_key *)HeKEY (he);
1728 IV bits = SvIVX (HeVAL (he)); 1766 IV bits = SvIVX (HeVAL (he));
1729 1767
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 if (!(bits & 0x1000) 1768 if (!(bits & 0x1000)
1737 && skey->level == level 1769 && skey->level == level
1738 && level >= smooth_max [skey->x][skey->y]) 1770 && level > smooth_max [skey->x][skey->y])
1739 { 1771 {
1740 maptex tex = self->tex [skey->tile]; 1772 maptex tex = self->tex [skey->tile];
1741 int px = (((int)skey->x) - 1) * T; 1773 int px = (((int)skey->x) - 1) * T;
1742 int py = (((int)skey->y) - 1) * T; 1774 int py = (((int)skey->y) - 1) * T;
1743 int border = bits & 15; 1775 int border = bits & 15;
… …
2208# undef const_iv 2240# undef const_iv
2209 }; 2241 };
2210 2242
2211 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; )
2212 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);
2213} 2248}
2214 2249
2215char * 2250char *
2216gl_vendor () 2251gl_vendor ()
2217 CODE: 2252 CODE:
… …
2366 2401
2367void 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)
2368 2403
2369int glGenTexture () 2404int glGenTexture ()
2370 CODE: 2405 CODE:
2371{ 2406 RETVAL = gen_texture ();
2372 GLuint name;
2373 glGenTextures (1, &name);
2374 RETVAL = name;
2375}
2376 OUTPUT: 2407 OUTPUT:
2377 RETVAL 2408 RETVAL
2378 2409
2379void glDeleteTexture (int name) 2410void glDeleteTexture (int name)
2380 CODE: 2411 CODE:
2381{
2382 GLuint name_ = name;
2383 glDeleteTextures (1, &name_); 2412 del_texture (name);
2384} 2413
2385
2386int glGenList () 2414int glGenList ()
2387 CODE: 2415 CODE:
2388 RETVAL = glGenLists (1); 2416 RETVAL = glGenLists (1);
2389 OUTPUT: 2417 OUTPUT:
2390 RETVAL 2418 RETVAL

Diff Legend

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