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.213 by root, Sun Jul 29 04:14:45 2007 UTC vs.
Revision 1.236 by root, Mon Oct 8 16:10:14 2007 UTC

… …
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
… …
109 av_push (texture_av, (SV *)(size_t)name); 114 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 115 glDeleteTextures (1, &name);
111} 116}
112 117
113#include "texcache.c" 118#include "texcache.c"
119#include "rendercache.c"
114 120
115#include "pango-font.c" 121#include "pango-font.c"
116#include "pango-fontmap.c" 122#include "pango-fontmap.c"
117#include "pango-render.c" 123#include "pango-render.c"
118 124
… …
144typedef struct cf_layout { 150typedef struct cf_layout {
145 PangoLayout *pl; 151 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 152 float r, g, b, a; // default color for rgba mode
147 int base_height; 153 int base_height;
148 CFPlus__Font font; 154 CFPlus__Font font;
155 rc_t *rc;
149} *CFPlus__Layout; 156} *CFPlus__Layout;
150 157
151static CFPlus__Font default_font; 158static CFPlus__Font default_font;
152static PangoContext *opengl_context; 159static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 160static PangoFontMap *opengl_fontmap;
… …
196 203
197typedef uint16_t tileid; 204typedef uint16_t tileid;
198typedef uint16_t faceid; 205typedef uint16_t faceid;
199 206
200typedef struct { 207typedef struct {
201 int name; 208 GLuint name;
202 int w, h; 209 int w, h;
203 float s, t; 210 float s, t;
204 uint8_t r, g, b, a; 211 uint8_t r, g, b, a;
205 tileid smoothtile; 212 tileid smoothtile;
206 uint8_t smoothlevel; 213 uint8_t smoothlevel;
… …
431 n |= n >> 4; 438 n |= n >> 4;
432 n |= n >> 8; 439 n |= n >> 8;
433 n |= n >> 16; 440 n |= n >> 16;
434 441
435 return n + 1; 442 return n + 1;
443}
444
445static unsigned int
446popcount (unsigned int n)
447{
448 n -= (n >> 1) & 0x55555555U;
449 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
450 n = ((n >> 4) + n) & 0x0f0f0f0fU;
451 n *= 0x01010101U;
452
453 return n >> 24;
436} 454}
437 455
438/* SDL should provide this, really. */ 456/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 457#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 458#define SDLK_MODIFIER_MAX 314
… …
518 536
519 const_iv (SDL_APPINPUTFOCUS), 537 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 538 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 539 const_iv (SDL_APPACTIVE),
522 540
541 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 543 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 544 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 545 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 546 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 547 const_iv (SDLK_KP4),
… …
599 const_iv (KMOD_LMETA), 619 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 620 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 621 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 622 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 623 const_iv (KMOD_MODE),
624
625 const_iv (MIX_DEFAULT_FORMAT),
604# undef const_iv 626# undef const_iv
605 }; 627 };
606 628
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
625 RETVAL 647 RETVAL
626 648
627NV floor (NV x) 649NV floor (NV x)
628 650
629NV ceil (NV x) 651NV ceil (NV x)
652
653IV minpot (UV n)
654
655IV popcount (UV n)
630 656
631void 657void
632pango_init () 658pango_init ()
633 CODE: 659 CODE:
634{ 660{
… …
708 734
709 if (RETVAL) 735 if (RETVAL)
710 { 736 {
711 av_clear (texture_av); 737 av_clear (texture_av);
712 738
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 739 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 741#include "glfunc.h"
716#undef GL_FUNC 742#undef GL_FUNC
717 } 743 }
718} 744}
… …
810 POSTCALL: 836 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 837 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 838 Mix_ChannelFinished (channel_finished);
813 839
814void 840void
841Mix_QuerySpec ()
842 PPCODE:
843{
844 int freq, channels;
845 Uint16 format;
846
847 if (Mix_QuerySpec (&freq, &format, &channels))
848 {
849 EXTEND (SP, 3);
850 PUSHs (sv_2mortal (newSViv (freq)));
851 PUSHs (sv_2mortal (newSViv (format)));
852 PUSHs (sv_2mortal (newSViv (channels)));
853 }
854}
855
856void
815Mix_CloseAudio () 857Mix_CloseAudio ()
816 858
817int 859int
818Mix_AllocateChannels (int numchans = -1) 860Mix_AllocateChannels (int numchans = -1)
861
862const char *
863Mix_GetError ()
819 864
820void 865void
821lowdelay (int fd, int val = 1) 866lowdelay (int fd, int val = 1)
822 CODE: 867 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 868 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
1027 RETVAL->g = 1.; 1072 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1073 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1074 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1075 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1076 RETVAL->font = 0;
1077 RETVAL->rc = rc_alloc ();
1032 1078
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1079 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1080 layout_update_font (RETVAL);
1035 OUTPUT: 1081 OUTPUT:
1036 RETVAL 1082 RETVAL
1037 1083
1038void 1084void
1039DESTROY (CFPlus::Layout self) 1085DESTROY (CFPlus::Layout self)
1040 CODE: 1086 CODE:
1041 g_object_unref (self->pl); 1087 g_object_unref (self->pl);
1088 rc_free (self->rc);
1042 Safefree (self); 1089 Safefree (self);
1043 1090
1044void 1091void
1045set_text (CFPlus::Layout self, SV *text_) 1092set_text (CFPlus::Layout self, SV *text_)
1046 CODE: 1093 CODE:
… …
1298 } 1345 }
1299} 1346}
1300 1347
1301void 1348void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1349render (CFPlus::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1350 CODE:
1351 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1352 pango_opengl_render_layout_subpixel (
1305 self->pl, 1353 self->pl,
1354 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1355 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1356 self->r, self->g, self->b, self->a,
1308 flags 1357 flags
1309 ); 1358 );
1359 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl);
1362
1363void
1364draw (CFPlus::Layout self)
1365 CODE:
1366{
1367 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND);
1370 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1371 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1372 glEnable (GL_ALPHA_TEST);
1373 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1374
1375 rc_draw (self->rc);
1376
1377 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D);
1380}
1310 1381
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1382MODULE = CFPlus PACKAGE = CFPlus::Texture
1312 1383
1313PROTOTYPES: ENABLE 1384PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1385
1317void 1386void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1387pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1388 CODE:
1320{ 1389{
… …
1346{ 1415{
1347 HV *hv = (HV *)SvRV (self); 1416 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1417 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1418 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1419 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1420
1421 if (name <= 0)
1422 XSRETURN_EMPTY;
1351 1423
1352 if (items < 5) 1424 if (items < 5)
1353 { 1425 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1426 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1427 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1544 self->rows += MAP_EXTEND_Y; 1616 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1617 self->y += MAP_EXTEND_Y;
1546 } 1618 }
1547} 1619}
1548 1620
1549void 1621SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1622map1a_update (CFPlus::Map self, SV *data_, int extmap)
1551 CODE: 1623 CODE:
1552{ 1624{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1626 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1627 mapcell *cell;
1556 int x, y, flags; 1628 int x, y, z, flags;
1629 AV *missing = newAV ();
1630 RETVAL = newRV_noinc ((SV *)missing);
1557 1631
1558 while (data < data_end - 1) 1632 while (data < data_end - 1)
1559 { 1633 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1634 flags = (data [0] << 8) + data [1]; data += 2;
1561 1635
… …
1612 } 1686 }
1613 else 1687 else
1614 cell->darkness = *data++ + 1; 1688 cell->darkness = *data++ + 1;
1615 } 1689 }
1616 1690
1691 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1692 if (flags & (4 >> z))
1618 { 1693 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1694 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1695 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 1696 cell->tile [z] = self->face2tile [face];
1697
1698 if (cell->tile [z])
1699 {
1700 maptex *tex = self->tex + cell->tile [z];
1701 if (!tex->name)
1702 av_push (missing, newSViv (cell->tile [z]));
1703
1704 if (tex->smoothtile)
1705 {
1706 maptex *smooth = self->tex + tex->smoothtile;
1707 if (!smooth->name)
1708 av_push (missing, newSViv (tex->smoothtile));
1709 }
1710 }
1622 } 1711 }
1623
1624 if (flags & 2)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [1] = self->face2tile [face];
1629 }
1630
1631 if (flags & 1)
1632 {
1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1634 need_facenum (self, face);
1635 cell->tile [2] = self->face2tile [face];
1636 }
1637 } 1712 }
1638 else 1713 else
1639 cell->darkness = 0; 1714 cell->darkness = 0;
1640 } 1715 }
1641} 1716}
1717 OUTPUT:
1718 RETVAL
1642 1719
1643SV * 1720SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1645 CODE: 1722 CODE:
1646{ 1723{
… …
1697 1774
1698void 1775void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1776draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1700 CODE: 1777 CODE:
1701{ 1778{
1779 int x, y, z;
1780
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1782 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1783 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 1784 smooth_key skey;
1706 int x, y, z; 1785
1707 int last_name; 1786 rc_t *rc = rc_alloc ();
1787 rc_key_t key;
1788 rc_array_t *arr;
1708 1789
1709 // thats current max. sorry. 1790 // thats current max. sorry.
1710 if (sw > 255) sw = 255; 1791 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 1792 if (sh > 255) sh = 255;
1712 1793
1713 // clear key, in case of extra padding 1794 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 1795 memset (&skey, 0, sizeof (skey));
1715 1796
1716 glColor4ub (255, 255, 255, 255); 1797 memset (&key, 0, sizeof (key));
1717 1798 key.r = 255;
1718 glEnable (GL_BLEND); 1799 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1800 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 1801 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1802 key.mode = GL_QUADS;
1722 1803 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS); 1804 key.texname = -1;
1724
1725 last_name = 0;
1726 1805
1727 mx += self->x; 1806 mx += self->x;
1728 my += self->y; 1807 my += self->y;
1729 1808
1730 // first pass: determine smooth_max 1809 // first pass: determine smooth_max
… …
1746 MAX (self->tex [cell->tile [0]].smoothlevel, 1825 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 1826 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 1827 self->tex [cell->tile [2]].smoothlevel));
1749 } 1828 }
1750 } 1829 }
1830
1831 glEnable (GL_BLEND);
1832 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1833 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1751 1834
1752 for (z = 0; z <= 2; z++) 1835 for (z = 0; z <= 2; z++)
1753 { 1836 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 1837 memset (smooth_level, 0, sizeof (smooth_level));
1755 1838
… …
1765 tileid tile = cell->tile [z]; 1848 tileid tile = cell->tile [z];
1766 1849
1767 if (tile) 1850 if (tile)
1768 { 1851 {
1769 maptex tex = self->tex [tile]; 1852 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 1853 int px, py;
1771 int py = (y + 1) * T - tex.h;
1772 1854
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 1855 if (key.texname != tex.name)
1776 { 1856 {
1777 if (!tex.name) 1857 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 1858 tex = self->tex [2]; /* missing, replace by noface */
1779 1859
1780 glEnd (); 1860 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1861 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 1862 }
1784 1863
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1864 px = (x + 1) * T - tex.w;
1865 py = (y + 1) * T - tex.h;
1866
1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1868 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1787 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1869 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1870 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1789 1871
1790 if (cell->flags && z == 2) 1872 if (cell->flags && z == 2)
1791 { 1873 {
1874 // overlays such as the speech bubble, probably more to come
1792 if (cell->flags & 1) 1875 if (cell->flags & 1)
1793 { 1876 {
1794 maptex tex = self->tex [1]; 1877 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32; 1878 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32; 1879 int py = y * T - T * 6 / 32;
1797 1880
1881 if (tex.name)
1798 glEnd (); 1882 {
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1883 if (key.texname != tex.name)
1884 {
1885 key.texname = tex.name;
1886 arr = rc_array (rc, &key);
1887 }
1888
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1891 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1892 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1800 glBegin (GL_QUADS); 1893 }
1801
1802 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806 } 1894 }
1807 } 1895 }
1808 1896
1809 // update smooth hash 1897 // update smooth hash
1810 if (tex.smoothtile) 1898 if (tex.smoothtile)
… …
1846 } 1934 }
1847 } 1935 }
1848 } 1936 }
1849 } 1937 }
1850 1938
1939 rc_draw (rc);
1940 rc_clear (rc);
1941
1851 // go through all smoothlevels, lowest to highest, then draw. 1942 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 1943 // this is basically counting sort
1853 { 1944 {
1854 int w, b; 1945 int w, b;
1855 1946
1947 glEnable (GL_TEXTURE_2D);
1948 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 1949 for (w = 0; w < 256 / 32; ++w)
1857 { 1950 {
1858 uint32_t smask = smooth_level [w]; 1951 uint32_t smask = smooth_level [w];
1859 if (smask) 1952 if (smask)
1860 for (b = 0; b < 32; ++b) 1953 for (b = 0; b < 32; ++b)
… …
1879 int border = bits & 15; 1972 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1973 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 1974 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 1975 float dy = tex.t * .5f ; // 2 images/column
1883 1976
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 1977 if (tex.name)
1887 { 1978 {
1979 // this time avoiding texture state changes
1980 // save gobs of state changes.
1888 if (!tex.name) 1981 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 1982 {
1890
1891 glEnd (); 1983 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1984 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 1985 glBegin (GL_QUADS);
1894 } 1986 }
1895 1987
1896 if (border) 1988 if (border)
1897 { 1989 {
1898 float ox = border * dx; 1990 float ox = border * dx;
1899 1991
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 1992 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 1993 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 1994 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 1995 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 1996 }
1905 1997
1906 if (corner) 1998 if (corner)
1907 { 1999 {
1908 float ox = corner * dx; 2000 float ox = corner * dx;
1909 2001
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2002 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2003 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2004 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2005 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2006 }
1914 } 2007 }
1915 } 2008 }
1916 } 2009 }
1917 } 2010 }
1918 } 2011 }
2012
2013 glEnd ();
2014 glDisable (GL_TEXTURE_2D);
2015 key.texname = -1;
1919 } 2016 }
1920 2017
1921 hv_clear (smooth); 2018 hv_clear (smooth);
1922 } 2019 }
1923 2020
1924 glEnd ();
1925
1926 glDisable (GL_TEXTURE_2D);
1927 glDisable (GL_BLEND); 2021 glDisable (GL_BLEND);
2022 rc_free (rc);
1928 2023
1929 // top layer: overlays such as the health bar 2024 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2025 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2026 if (0 <= y + my && y + my < self->rows)
1932 { 2027 {
… …
2181 int x, y, z; 2276 int x, y, z;
2182 int w, h; 2277 int w, h;
2183 int x1, y1; 2278 int x1, y1;
2184 2279
2185 if (*data++ != 0) 2280 if (*data++ != 0)
2186 return; /* version mismatch */ 2281 XSRETURN_EMPTY; /* version mismatch */
2187 2282
2188 w = *data++ << 8; w |= *data++; 2283 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2284 h = *data++ << 8; h |= *data++;
2190 2285
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2286 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2257 CODE: 2352 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2353 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2354 OUTPUT:
2260 RETVAL 2355 RETVAL
2261 2356
2357# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '('
2262void 2359#void
2263close (CFPlus::RW self) 2360#close (CFPlus::RW self)
2264 CODE: 2361# CODE:
2265 SDL_RWclose (self); 2362# (self->(close)) (self);
2266 2363
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2364MODULE = CFPlus PACKAGE = CFPlus::Channel
2268 2365
2269PROTOTYPES: DISABLE 2366PROTOTYPES: DISABLE
2367
2368CFPlus::Channel
2369find ()
2370 CODE:
2371{
2372 RETVAL = Mix_GroupAvailable (-1);
2373
2374 if (RETVAL < 0)
2375 {
2376 RETVAL = Mix_GroupOldest (-1);
2377
2378 if (RETVAL < 0)
2379 XSRETURN_UNDEF;
2380
2381 Mix_HaltChannel (RETVAL);
2382 }
2383
2384 Mix_UnregisterAllEffects (RETVAL);
2385 Mix_Volume (RETVAL, 128);
2386}
2387 OUTPUT:
2388 RETVAL
2270 2389
2271void 2390void
2272halt (CFPlus::Channel self) 2391halt (CFPlus::Channel self)
2273 CODE: 2392 CODE:
2274 Mix_HaltChannel (self); 2393 Mix_HaltChannel (self);
… …
2284 Mix_FadeOutChannel (self, ticks); 2403 Mix_FadeOutChannel (self, ticks);
2285 2404
2286int 2405int
2287volume (CFPlus::Channel self, int volume) 2406volume (CFPlus::Channel self, int volume)
2288 CODE: 2407 CODE:
2289 RETVAL = Mix_Volume (self, volume); 2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2290 OUTPUT: 2409 OUTPUT:
2291 RETVAL 2410 RETVAL
2292 2411
2293void 2412void
2294unregister_all_effects (CFPlus::Channel self) 2413unregister_all_effects (CFPlus::Channel self)
… …
2296 Mix_UnregisterAllEffects (self); 2415 Mix_UnregisterAllEffects (self);
2297 2416
2298void 2417void
2299set_panning (CFPlus::Channel self, int left, int right) 2418set_panning (CFPlus::Channel self, int left, int right)
2300 CODE: 2419 CODE:
2420 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255);
2301 Mix_SetPanning (self, left, right); 2422 Mix_SetPanning (self, left, right);
2302 2423
2303void 2424void
2304set_distance (CFPlus::Channel self, int distance) 2425set_distance (CFPlus::Channel self, int distance)
2305 CODE: 2426 CODE:
2306 Mix_SetDistance (self, distance); 2427 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2307 2428
2308void 2429void
2309set_position (CFPlus::Channel self, int angle, int distance) 2430set_position (CFPlus::Channel self, int angle, int distance)
2310 CODE: 2431 CODE:
2432
2433void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)
2435 CODE:
2436{
2437 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2438 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2311 Mix_SetPosition (self, angle, distance); 2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440}
2312 2441
2313void 2442void
2314set_reverse_stereo (CFPlus::Channel self, int flip) 2443set_reverse_stereo (CFPlus::Channel self, int flip)
2315 CODE: 2444 CODE:
2316 Mix_SetReverseStereo (self, flip); 2445 Mix_SetReverseStereo (self, flip);
… …
2332 Mix_FreeChunk (self); 2461 Mix_FreeChunk (self);
2333 2462
2334int 2463int
2335volume (CFPlus::MixChunk self, int volume = -1) 2464volume (CFPlus::MixChunk self, int volume = -1)
2336 CODE: 2465 CODE:
2466 if (items > 1)
2467 volume = CLAMP (volume, 0, 128);
2337 RETVAL = Mix_VolumeChunk (self, volume); 2468 RETVAL = Mix_VolumeChunk (self, volume);
2338 OUTPUT: 2469 OUTPUT:
2339 RETVAL 2470 RETVAL
2340 2471
2341CFPlus::Channel 2472CFPlus::Channel
2342play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2473play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)
2343 CODE: 2474 CODE:
2475{
2344 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477
2478 if (RETVAL < 0)
2479 XSRETURN_UNDEF;
2480
2481 if (channel < 0)
2482 {
2345 Mix_UnregisterAllEffects (RETVAL); 2483 Mix_UnregisterAllEffects (RETVAL);
2484 Mix_Volume (RETVAL, 128);
2485 }
2486}
2346 OUTPUT: 2487 OUTPUT:
2347 RETVAL 2488 RETVAL
2348 2489
2349MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2490MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2350 2491
2351int 2492int
2352volume (int volume = -1) 2493volume (int volume = -1)
2353 PROTOTYPE: ;$ 2494 PROTOTYPE: ;$
2354 CODE: 2495 CODE:
2496 if (items > 0)
2497 volume = CLAMP (volume, 0, 128);
2355 RETVAL = Mix_VolumeMusic (volume); 2498 RETVAL = Mix_VolumeMusic (volume);
2356 OUTPUT: 2499 OUTPUT:
2357 RETVAL 2500 RETVAL
2358 2501
2359void 2502void
… …
2439 const_iv (GL_INTENSITY), 2582 const_iv (GL_INTENSITY),
2440 const_iv (GL_LUMINANCE), 2583 const_iv (GL_LUMINANCE),
2441 const_iv (GL_LUMINANCE_ALPHA), 2584 const_iv (GL_LUMINANCE_ALPHA),
2442 const_iv (GL_FLOAT), 2585 const_iv (GL_FLOAT),
2443 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2586 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2587 const_iv (GL_COMPRESSED_ALPHA_ARB),
2588 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2589 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2590 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2591 const_iv (GL_COMPRESSED_RGB_ARB),
2592 const_iv (GL_COMPRESSED_RGBA_ARB),
2444 const_iv (GL_COMPILE), 2593 const_iv (GL_COMPILE),
2445 const_iv (GL_PROXY_TEXTURE_1D), 2594 const_iv (GL_PROXY_TEXTURE_1D),
2446 const_iv (GL_PROXY_TEXTURE_2D), 2595 const_iv (GL_PROXY_TEXTURE_2D),
2447 const_iv (GL_TEXTURE_1D), 2596 const_iv (GL_TEXTURE_1D),
2448 const_iv (GL_TEXTURE_2D), 2597 const_iv (GL_TEXTURE_2D),
… …
2487 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2636 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2488 const_iv (GL_POINT_SMOOTH_HINT), 2637 const_iv (GL_POINT_SMOOTH_HINT),
2489 const_iv (GL_LINE_SMOOTH_HINT), 2638 const_iv (GL_LINE_SMOOTH_HINT),
2490 const_iv (GL_POLYGON_SMOOTH_HINT), 2639 const_iv (GL_POLYGON_SMOOTH_HINT),
2491 const_iv (GL_GENERATE_MIPMAP_HINT), 2640 const_iv (GL_GENERATE_MIPMAP_HINT),
2641 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2492 const_iv (GL_FASTEST), 2642 const_iv (GL_FASTEST),
2493 const_iv (GL_DONT_CARE), 2643 const_iv (GL_DONT_CARE),
2494 const_iv (GL_NICEST), 2644 const_iv (GL_NICEST),
2495 const_iv (GL_V2F), 2645 const_iv (GL_V2F),
2496 const_iv (GL_V3F), 2646 const_iv (GL_V3F),
… …
2504 2654
2505 texture_av = newAV (); 2655 texture_av = newAV ();
2506 AvREAL_off (texture_av); 2656 AvREAL_off (texture_av);
2507} 2657}
2508 2658
2659void
2660disable_GL_EXT_blend_func_separate ()
2661 CODE:
2662 gl.BlendFuncSeparate = 0;
2663 gl.BlendFuncSeparateEXT = 0;
2664
2509char * 2665char *
2510gl_vendor () 2666gl_vendor ()
2511 CODE: 2667 CODE:
2512 RETVAL = (char *)glGetString (GL_VENDOR); 2668 RETVAL = (char *)glGetString (GL_VENDOR);
2513 OUTPUT: 2669 OUTPUT:
… …
2634 2790
2635void glRect (float x1, float y1, float x2, float y2) 2791void glRect (float x1, float y1, float x2, float y2)
2636 CODE: 2792 CODE:
2637 glRectf (x1, y1, x2, y2); 2793 glRectf (x1, y1, x2, y2);
2638 2794
2795void glRect_lineloop (float x1, float y1, float x2, float y2)
2796 CODE:
2797 glBegin (GL_LINE_LOOP);
2798 glVertex2f (x1, y1);
2799 glVertex2f (x2, y1);
2800 glVertex2f (x2, y2);
2801 glVertex2f (x1, y2);
2802 glEnd ();
2803
2639PROTOTYPES: ENABLE 2804PROTOTYPES: ENABLE
2640 2805
2641void glBegin (int mode) 2806void glBegin (int mode)
2642 2807
2643void glEnd () 2808void glEnd ()
… …
2744 NV x, y, w, h; 2909 NV x, y, w, h;
2745 SV *draw_x_sv = GvSV (draw_x_gv); 2910 SV *draw_x_sv = GvSV (draw_x_gv);
2746 SV *draw_y_sv = GvSV (draw_y_gv); 2911 SV *draw_y_sv = GvSV (draw_y_gv);
2747 SV *draw_w_sv = GvSV (draw_w_gv); 2912 SV *draw_w_sv = GvSV (draw_w_gv);
2748 SV *draw_h_sv = GvSV (draw_h_gv); 2913 SV *draw_h_sv = GvSV (draw_h_gv);
2749 SV *hover;
2750 double draw_x, draw_y, draw_w, draw_h; 2914 double draw_x, draw_y;
2751 2915
2752 if (!SvROK (self)) 2916 if (!SvROK (self))
2753 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2754 2918
2755 hv = (HV *)SvRV (self); 2919 hv = (HV *)SvRV (self);
… …
2783 { 2947 {
2784 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2948 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2785 2949
2786 if (svp && SvTRUE (*svp)) 2950 if (svp && SvTRUE (*svp))
2787 { 2951 {
2788 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2952 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2789 glEnable (GL_BLEND); 2953 glEnable (GL_BLEND);
2790 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2954 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2791 glBegin (GL_QUADS); 2955 glBegin (GL_QUADS);
2792 glVertex2f (0, 0); 2956 glVertex2f (0, 0);
2793 glVertex2f (w, 0); 2957 glVertex2f (w, 0);
… …
2796 glEnd (); 2960 glEnd ();
2797 glDisable (GL_BLEND); 2961 glDisable (GL_BLEND);
2798 } 2962 }
2799 } 2963 }
2800#if 0 2964#if 0
2801 if ($ENV{CFPLUS_DEBUG} & 1) { 2965 // draw borders, for debugging
2802 glPushMatrix; 2966 glPushMatrix ();
2803 glColor 1, 1, 0, 1; 2967 glColor4f (1., 1., 0., 1.);
2804 glTranslate 0.375, 0.375; 2968 glTranslatef (.5, .5, 0.);
2805 glBegin GL_LINE_LOOP; 2969 glBegin (GL_LINE_LOOP);
2806 glVertex 0 , 0; 2970 glVertex2f (0 , 0);
2807 glVertex $self->{w} - 1, 0; 2971 glVertex2f (w - 1, 0);
2808 glVertex $self->{w} - 1, $self->{h} - 1; 2972 glVertex2f (w - 1, h - 1);
2809 glVertex 0 , $self->{h} - 1; 2973 glVertex2f (0 , h - 1);
2810 glEnd; 2974 glEnd ();
2811 glPopMatrix; 2975 glPopMatrix ();
2812 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2813 }
2814#endif 2976#endif
2815 PUSHMARK (SP); 2977 PUSHMARK (SP);
2816 XPUSHs (self); 2978 XPUSHs (self);
2817 PUTBACK; 2979 PUTBACK;
2818 call_method ("_draw", G_VOID | G_DISCARD); 2980 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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