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.217 by root, Wed Aug 1 12:43:31 2007 UTC vs.
Revision 1.237 by root, Sun Oct 14 15:33:30 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 ("Deliantra MORPG Client " VERSION, "Deliantra");
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}
… …
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
805 } 831 }
806} 832}
807 833
808int 834int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 836 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 837 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 838 Mix_ChannelFinished (channel_finished);
839
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}
813 855
814void 856void
815Mix_CloseAudio () 857Mix_CloseAudio ()
816 858
817int 859int
… …
1030 RETVAL->g = 1.; 1072 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1073 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1074 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1075 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1076 RETVAL->font = 0;
1077 RETVAL->rc = rc_alloc ();
1035 1078
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1079 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1080 layout_update_font (RETVAL);
1038 OUTPUT: 1081 OUTPUT:
1039 RETVAL 1082 RETVAL
1040 1083
1041void 1084void
1042DESTROY (CFPlus::Layout self) 1085DESTROY (CFPlus::Layout self)
1043 CODE: 1086 CODE:
1044 g_object_unref (self->pl); 1087 g_object_unref (self->pl);
1088 rc_free (self->rc);
1045 Safefree (self); 1089 Safefree (self);
1046 1090
1047void 1091void
1048set_text (CFPlus::Layout self, SV *text_) 1092set_text (CFPlus::Layout self, SV *text_)
1049 CODE: 1093 CODE:
… …
1301 } 1345 }
1302} 1346}
1303 1347
1304void 1348void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1349render (CFPlus::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1350 CODE:
1351 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1352 pango_opengl_render_layout_subpixel (
1308 self->pl, 1353 self->pl,
1354 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1355 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1356 self->r, self->g, self->b, self->a,
1311 flags 1357 flags
1312 ); 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}
1313 1381
1314MODULE = CFPlus PACKAGE = CFPlus::Texture 1382MODULE = CFPlus PACKAGE = CFPlus::Texture
1315 1383
1316PROTOTYPES: ENABLE 1384PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1385
1320void 1386void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1387pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1388 CODE:
1323{ 1389{
… …
1349{ 1415{
1350 HV *hv = (HV *)SvRV (self); 1416 HV *hv = (HV *)SvRV (self);
1351 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1417 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1418 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353 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;
1354 1423
1355 if (items < 5) 1424 if (items < 5)
1356 { 1425 {
1357 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1426 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1427 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1547 self->rows += MAP_EXTEND_Y; 1616 self->rows += MAP_EXTEND_Y;
1548 self->y += MAP_EXTEND_Y; 1617 self->y += MAP_EXTEND_Y;
1549 } 1618 }
1550} 1619}
1551 1620
1552void 1621SV *
1553map1a_update (CFPlus::Map self, SV *data_, int extmap) 1622map1a_update (CFPlus::Map self, SV *data_, int extmap)
1554 CODE: 1623 CODE:
1555{ 1624{
1556 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1557 uint8_t *data_end = (uint8_t *)SvEND (data_); 1626 uint8_t *data_end = (uint8_t *)SvEND (data_);
1558 mapcell *cell; 1627 mapcell *cell;
1559 int x, y, flags; 1628 int x, y, z, flags;
1629 AV *missing = newAV ();
1630 RETVAL = newRV_noinc ((SV *)missing);
1560 1631
1561 while (data < data_end - 1) 1632 while (data < data_end - 1)
1562 { 1633 {
1563 flags = (data [0] << 8) + data [1]; data += 2; 1634 flags = (data [0] << 8) + data [1]; data += 2;
1564 1635
… …
1615 } 1686 }
1616 else 1687 else
1617 cell->darkness = *data++ + 1; 1688 cell->darkness = *data++ + 1;
1618 } 1689 }
1619 1690
1691 for (z = 0; z <= 2; ++z)
1620 if (flags & 4) 1692 if (flags & (4 >> z))
1621 { 1693 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2; 1694 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face); 1695 need_facenum (self, face);
1624 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 }
1625 } 1711 }
1626
1627 if (flags & 2)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [1] = self->face2tile [face];
1632 }
1633
1634 if (flags & 1)
1635 {
1636 faceid face = (data [0] << 8) + data [1]; data += 2;
1637 need_facenum (self, face);
1638 cell->tile [2] = self->face2tile [face];
1639 }
1640 } 1712 }
1641 else 1713 else
1642 cell->darkness = 0; 1714 cell->darkness = 0;
1643 } 1715 }
1644} 1716}
1717 OUTPUT:
1718 RETVAL
1645 1719
1646SV * 1720SV *
1647mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1648 CODE: 1722 CODE:
1649{ 1723{
… …
1700 1774
1701void 1775void
1702draw (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)
1703 CODE: 1777 CODE:
1704{ 1778{
1779 int x, y, z;
1780
1705 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1706 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
1707 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)
1708 smooth_key skey; 1784 smooth_key skey;
1709 int x, y, z; 1785
1710 int last_name; 1786 rc_t *rc = rc_alloc ();
1787 rc_key_t key;
1788 rc_array_t *arr;
1711 1789
1712 // thats current max. sorry. 1790 // thats current max. sorry.
1713 if (sw > 255) sw = 255; 1791 if (sw > 255) sw = 255;
1714 if (sh > 255) sh = 255; 1792 if (sh > 255) sh = 255;
1715 1793
1716 // clear key, in case of extra padding 1794 // clear key, in case of extra padding
1717 memset (&skey, 0, sizeof (skey)); 1795 memset (&skey, 0, sizeof (skey));
1718 1796
1719 glColor4ub (255, 255, 255, 255); 1797 memset (&key, 0, sizeof (key));
1720 1798 key.r = 255;
1721 glEnable (GL_BLEND); 1799 key.g = 255;
1722 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1800 key.b = 255;
1723 glEnable (GL_TEXTURE_2D); 1801 key.a = 255;
1724 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1802 key.mode = GL_QUADS;
1725 1803 key.format = GL_T2F_V3F;
1726 glBegin (GL_QUADS); 1804 key.texname = -1;
1727
1728 last_name = 0;
1729 1805
1730 mx += self->x; 1806 mx += self->x;
1731 my += self->y; 1807 my += self->y;
1732 1808
1733 // first pass: determine smooth_max 1809 // first pass: determine smooth_max
… …
1749 MAX (self->tex [cell->tile [0]].smoothlevel, 1825 MAX (self->tex [cell->tile [0]].smoothlevel,
1750 MAX (self->tex [cell->tile [1]].smoothlevel, 1826 MAX (self->tex [cell->tile [1]].smoothlevel,
1751 self->tex [cell->tile [2]].smoothlevel)); 1827 self->tex [cell->tile [2]].smoothlevel));
1752 } 1828 }
1753 } 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);
1754 1834
1755 for (z = 0; z <= 2; z++) 1835 for (z = 0; z <= 2; z++)
1756 { 1836 {
1757 memset (smooth_level, 0, sizeof (smooth_level)); 1837 memset (smooth_level, 0, sizeof (smooth_level));
1758 1838
… …
1768 tileid tile = cell->tile [z]; 1848 tileid tile = cell->tile [z];
1769 1849
1770 if (tile) 1850 if (tile)
1771 { 1851 {
1772 maptex tex = self->tex [tile]; 1852 maptex tex = self->tex [tile];
1773 int px = (x + 1) * T - tex.w; 1853 int px, py;
1774 int py = (y + 1) * T - tex.h;
1775 1854
1776 // suppressing texture state switches here
1777 // is only moderately effective, but worth the extra effort
1778 if (last_name != tex.name) 1855 if (key.texname != tex.name)
1779 { 1856 {
1780 if (!tex.name) 1857 if (!tex.name)
1781 tex = self->tex [2]; /* missing, replace by noface */ 1858 tex = self->tex [2]; /* missing, replace by noface */
1782 1859
1783 glEnd (); 1860 key.texname = tex.name;
1784 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1861 arr = rc_array (rc, &key);
1785 glBegin (GL_QUADS);
1786 } 1862 }
1787 1863
1788 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);
1789 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1868 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1790 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);
1791 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1870 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1792 1871
1793 if (cell->flags && z == 2) 1872 if (cell->flags && z == 2)
1794 { 1873 {
1874 // overlays such as the speech bubble, probably more to come
1795 if (cell->flags & 1) 1875 if (cell->flags & 1)
1796 { 1876 {
1797 maptex tex = self->tex [1]; 1877 maptex tex = self->tex [1];
1798 int px = x * T + T * 2 / 32; 1878 int px = x * T + T * 2 / 32;
1799 int py = y * T - T * 6 / 32; 1879 int py = y * T - T * 6 / 32;
1800 1880
1881 if (tex.name)
1801 glEnd (); 1882 {
1802 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);
1803 glBegin (GL_QUADS); 1893 }
1804
1805 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1806 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1807 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1808 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1809 } 1894 }
1810 } 1895 }
1811 1896
1812 // update smooth hash 1897 // update smooth hash
1813 if (tex.smoothtile) 1898 if (tex.smoothtile)
… …
1849 } 1934 }
1850 } 1935 }
1851 } 1936 }
1852 } 1937 }
1853 1938
1939 rc_draw (rc);
1940 rc_clear (rc);
1941
1854 // go through all smoothlevels, lowest to highest, then draw. 1942 // go through all smoothlevels, lowest to highest, then draw.
1855 // this is basically counting sort 1943 // this is basically counting sort
1856 { 1944 {
1857 int w, b; 1945 int w, b;
1858 1946
1947 glEnable (GL_TEXTURE_2D);
1948 glBegin (GL_QUADS);
1859 for (w = 0; w < 256 / 32; ++w) 1949 for (w = 0; w < 256 / 32; ++w)
1860 { 1950 {
1861 uint32_t smask = smooth_level [w]; 1951 uint32_t smask = smooth_level [w];
1862 if (smask) 1952 if (smask)
1863 for (b = 0; b < 32; ++b) 1953 for (b = 0; b < 32; ++b)
… …
1882 int border = bits & 15; 1972 int border = bits & 15;
1883 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1973 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884 float dx = tex.s * .0625f; // 16 images/row 1974 float dx = tex.s * .0625f; // 16 images/row
1885 float dy = tex.t * .5f ; // 2 images/column 1975 float dy = tex.t * .5f ; // 2 images/column
1886 1976
1887 // this time naively avoiding texture state changes
1888 // save gobs of state changes.
1889 if (last_name != tex.name) 1977 if (tex.name)
1890 { 1978 {
1979 // this time avoiding texture state changes
1980 // save gobs of state changes.
1891 if (!tex.name) 1981 if (key.texname != tex.name)
1892 continue; // smoothing not yet available 1982 {
1893
1894 glEnd (); 1983 glEnd ();
1895 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1984 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1896 glBegin (GL_QUADS); 1985 glBegin (GL_QUADS);
1897 } 1986 }
1898 1987
1899 if (border) 1988 if (border)
1900 { 1989 {
1901 float ox = border * dx; 1990 float ox = border * dx;
1902 1991
1903 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 1992 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1904 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 1993 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1905 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 1994 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1906 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 1995 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1907 } 1996 }
1908 1997
1909 if (corner) 1998 if (corner)
1910 { 1999 {
1911 float ox = corner * dx; 2000 float ox = corner * dx;
1912 2001
1913 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2002 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1914 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2003 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1915 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2004 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1916 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2005 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2006 }
1917 } 2007 }
1918 } 2008 }
1919 } 2009 }
1920 } 2010 }
1921 } 2011 }
2012
2013 glEnd ();
2014 glDisable (GL_TEXTURE_2D);
2015 key.texname = -1;
1922 } 2016 }
1923 2017
1924 hv_clear (smooth); 2018 hv_clear (smooth);
1925 } 2019 }
1926 2020
1927 glEnd ();
1928
1929 glDisable (GL_TEXTURE_2D);
1930 glDisable (GL_BLEND); 2021 glDisable (GL_BLEND);
2022 rc_free (rc);
1931 2023
1932 // top layer: overlays such as the health bar 2024 // top layer: overlays such as the health bar
1933 for (y = 0; y < sh; y++) 2025 for (y = 0; y < sh; y++)
1934 if (0 <= y + my && y + my < self->rows) 2026 if (0 <= y + my && y + my < self->rows)
1935 { 2027 {
… …
2184 int x, y, z; 2276 int x, y, z;
2185 int w, h; 2277 int w, h;
2186 int x1, y1; 2278 int x1, y1;
2187 2279
2188 if (*data++ != 0) 2280 if (*data++ != 0)
2189 return; /* version mismatch */ 2281 XSRETURN_EMPTY; /* version mismatch */
2190 2282
2191 w = *data++ << 8; w |= *data++; 2283 w = *data++ << 8; w |= *data++;
2192 h = *data++ << 8; h |= *data++; 2284 h = *data++ << 8; h |= *data++;
2193 2285
2194 // 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
… …
2260 CODE: 2352 CODE:
2261 RETVAL = SDL_RWFromFile (path, mode); 2353 RETVAL = SDL_RWFromFile (path, mode);
2262 OUTPUT: 2354 OUTPUT:
2263 RETVAL 2355 RETVAL
2264 2356
2357# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '('
2265void 2359#void
2266close (CFPlus::RW self) 2360#close (CFPlus::RW self)
2267 CODE: 2361# CODE:
2268 SDL_RWclose (self); 2362# (self->(close)) (self);
2269 2363
2270MODULE = CFPlus PACKAGE = CFPlus::Channel 2364MODULE = CFPlus PACKAGE = CFPlus::Channel
2271 2365
2272PROTOTYPES: DISABLE 2366PROTOTYPES: DISABLE
2273 2367
… …
2333 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2427 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2334 2428
2335void 2429void
2336set_position (CFPlus::Channel self, int angle, int distance) 2430set_position (CFPlus::Channel self, int angle, int distance)
2337 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);
2338 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440}
2339 2441
2340void 2442void
2341set_reverse_stereo (CFPlus::Channel self, int flip) 2443set_reverse_stereo (CFPlus::Channel self, int flip)
2342 CODE: 2444 CODE:
2343 Mix_SetReverseStereo (self, flip); 2445 Mix_SetReverseStereo (self, flip);
… …
2480 const_iv (GL_INTENSITY), 2582 const_iv (GL_INTENSITY),
2481 const_iv (GL_LUMINANCE), 2583 const_iv (GL_LUMINANCE),
2482 const_iv (GL_LUMINANCE_ALPHA), 2584 const_iv (GL_LUMINANCE_ALPHA),
2483 const_iv (GL_FLOAT), 2585 const_iv (GL_FLOAT),
2484 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),
2485 const_iv (GL_COMPILE), 2593 const_iv (GL_COMPILE),
2486 const_iv (GL_PROXY_TEXTURE_1D), 2594 const_iv (GL_PROXY_TEXTURE_1D),
2487 const_iv (GL_PROXY_TEXTURE_2D), 2595 const_iv (GL_PROXY_TEXTURE_2D),
2488 const_iv (GL_TEXTURE_1D), 2596 const_iv (GL_TEXTURE_1D),
2489 const_iv (GL_TEXTURE_2D), 2597 const_iv (GL_TEXTURE_2D),
… …
2528 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2636 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2529 const_iv (GL_POINT_SMOOTH_HINT), 2637 const_iv (GL_POINT_SMOOTH_HINT),
2530 const_iv (GL_LINE_SMOOTH_HINT), 2638 const_iv (GL_LINE_SMOOTH_HINT),
2531 const_iv (GL_POLYGON_SMOOTH_HINT), 2639 const_iv (GL_POLYGON_SMOOTH_HINT),
2532 const_iv (GL_GENERATE_MIPMAP_HINT), 2640 const_iv (GL_GENERATE_MIPMAP_HINT),
2641 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2533 const_iv (GL_FASTEST), 2642 const_iv (GL_FASTEST),
2534 const_iv (GL_DONT_CARE), 2643 const_iv (GL_DONT_CARE),
2535 const_iv (GL_NICEST), 2644 const_iv (GL_NICEST),
2536 const_iv (GL_V2F), 2645 const_iv (GL_V2F),
2537 const_iv (GL_V3F), 2646 const_iv (GL_V3F),
… …
2545 2654
2546 texture_av = newAV (); 2655 texture_av = newAV ();
2547 AvREAL_off (texture_av); 2656 AvREAL_off (texture_av);
2548} 2657}
2549 2658
2659void
2660disable_GL_EXT_blend_func_separate ()
2661 CODE:
2662 gl.BlendFuncSeparate = 0;
2663 gl.BlendFuncSeparateEXT = 0;
2664
2550char * 2665char *
2551gl_vendor () 2666gl_vendor ()
2552 CODE: 2667 CODE:
2553 RETVAL = (char *)glGetString (GL_VENDOR); 2668 RETVAL = (char *)glGetString (GL_VENDOR);
2554 OUTPUT: 2669 OUTPUT:
… …
2675 2790
2676void glRect (float x1, float y1, float x2, float y2) 2791void glRect (float x1, float y1, float x2, float y2)
2677 CODE: 2792 CODE:
2678 glRectf (x1, y1, x2, y2); 2793 glRectf (x1, y1, x2, y2);
2679 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
2680PROTOTYPES: ENABLE 2804PROTOTYPES: ENABLE
2681 2805
2682void glBegin (int mode) 2806void glBegin (int mode)
2683 2807
2684void glEnd () 2808void glEnd ()
… …
2785 NV x, y, w, h; 2909 NV x, y, w, h;
2786 SV *draw_x_sv = GvSV (draw_x_gv); 2910 SV *draw_x_sv = GvSV (draw_x_gv);
2787 SV *draw_y_sv = GvSV (draw_y_gv); 2911 SV *draw_y_sv = GvSV (draw_y_gv);
2788 SV *draw_w_sv = GvSV (draw_w_gv); 2912 SV *draw_w_sv = GvSV (draw_w_gv);
2789 SV *draw_h_sv = GvSV (draw_h_gv); 2913 SV *draw_h_sv = GvSV (draw_h_gv);
2790 SV *hover;
2791 double draw_x, draw_y, draw_w, draw_h; 2914 double draw_x, draw_y;
2792 2915
2793 if (!SvROK (self)) 2916 if (!SvROK (self))
2794 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2795 2918
2796 hv = (HV *)SvRV (self); 2919 hv = (HV *)SvRV (self);
… …
2824 { 2947 {
2825 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2948 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2826 2949
2827 if (svp && SvTRUE (*svp)) 2950 if (svp && SvTRUE (*svp))
2828 { 2951 {
2829 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);
2830 glEnable (GL_BLEND); 2953 glEnable (GL_BLEND);
2831 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2954 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2832 glBegin (GL_QUADS); 2955 glBegin (GL_QUADS);
2833 glVertex2f (0, 0); 2956 glVertex2f (0, 0);
2834 glVertex2f (w, 0); 2957 glVertex2f (w, 0);
… …
2837 glEnd (); 2960 glEnd ();
2838 glDisable (GL_BLEND); 2961 glDisable (GL_BLEND);
2839 } 2962 }
2840 } 2963 }
2841#if 0 2964#if 0
2842 if ($ENV{CFPLUS_DEBUG} & 1) { 2965 // draw borders, for debugging
2843 glPushMatrix; 2966 glPushMatrix ();
2844 glColor 1, 1, 0, 1; 2967 glColor4f (1., 1., 0., 1.);
2845 glTranslate 0.375, 0.375; 2968 glTranslatef (.5, .5, 0.);
2846 glBegin GL_LINE_LOOP; 2969 glBegin (GL_LINE_LOOP);
2847 glVertex 0 , 0; 2970 glVertex2f (0 , 0);
2848 glVertex $self->{w} - 1, 0; 2971 glVertex2f (w - 1, 0);
2849 glVertex $self->{w} - 1, $self->{h} - 1; 2972 glVertex2f (w - 1, h - 1);
2850 glVertex 0 , $self->{h} - 1; 2973 glVertex2f (0 , h - 1);
2851 glEnd; 2974 glEnd ();
2852 glPopMatrix; 2975 glPopMatrix ();
2853 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2854 }
2855#endif 2976#endif
2856 PUSHMARK (SP); 2977 PUSHMARK (SP);
2857 XPUSHs (self); 2978 XPUSHs (self);
2858 PUTBACK; 2979 PUTBACK;
2859 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