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.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.238 by root, Sat Nov 3 12:08:43 2007 UTC

… …
114 av_push (texture_av, (SV *)(size_t)name); 114 av_push (texture_av, (SV *)(size_t)name);
115 glDeleteTextures (1, &name); 115 glDeleteTextures (1, &name);
116} 116}
117 117
118#include "texcache.c" 118#include "texcache.c"
119#include "rendercache.c"
119 120
120#include "pango-font.c" 121#include "pango-font.c"
121#include "pango-fontmap.c" 122#include "pango-fontmap.c"
122#include "pango-render.c" 123#include "pango-render.c"
123 124
… …
149typedef struct cf_layout { 150typedef struct cf_layout {
150 PangoLayout *pl; 151 PangoLayout *pl;
151 float r, g, b, a; // default color for rgba mode 152 float r, g, b, a; // default color for rgba mode
152 int base_height; 153 int base_height;
153 CFPlus__Font font; 154 CFPlus__Font font;
155 rc_t *rc;
154} *CFPlus__Layout; 156} *CFPlus__Layout;
155 157
156static CFPlus__Font default_font; 158static CFPlus__Font default_font;
157static PangoContext *opengl_context; 159static PangoContext *opengl_context;
158static PangoFontMap *opengl_fontmap; 160static PangoFontMap *opengl_fontmap;
… …
201 203
202typedef uint16_t tileid; 204typedef uint16_t tileid;
203typedef uint16_t faceid; 205typedef uint16_t faceid;
204 206
205typedef struct { 207typedef struct {
206 int name; 208 GLuint name;
207 int w, h; 209 int w, h;
208 float s, t; 210 float s, t;
209 uint8_t r, g, b, a; 211 uint8_t r, g, b, a;
210 tileid smoothtile; 212 tileid smoothtile;
211 uint8_t smoothlevel; 213 uint8_t smoothlevel;
… …
436 n |= n >> 4; 438 n |= n >> 4;
437 n |= n >> 8; 439 n |= n >> 8;
438 n |= n >> 16; 440 n |= n >> 16;
439 441
440 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;
441} 454}
442 455
443/* SDL should provide this, really. */ 456/* SDL should provide this, really. */
444#define SDLK_MODIFIER_MIN 300 457#define SDLK_MODIFIER_MIN 300
445#define SDLK_MODIFIER_MAX 314 458#define SDLK_MODIFIER_MAX 314
… …
523 536
524 const_iv (SDL_APPINPUTFOCUS), 537 const_iv (SDL_APPINPUTFOCUS),
525 const_iv (SDL_APPMOUSEFOCUS), 538 const_iv (SDL_APPMOUSEFOCUS),
526 const_iv (SDL_APPACTIVE), 539 const_iv (SDL_APPACTIVE),
527 540
541 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST),
528 const_iv (SDLK_KP0), 543 const_iv (SDLK_KP0),
529 const_iv (SDLK_KP1), 544 const_iv (SDLK_KP1),
530 const_iv (SDLK_KP2), 545 const_iv (SDLK_KP2),
531 const_iv (SDLK_KP3), 546 const_iv (SDLK_KP3),
532 const_iv (SDLK_KP4), 547 const_iv (SDLK_KP4),
… …
604 const_iv (KMOD_LMETA), 619 const_iv (KMOD_LMETA),
605 const_iv (KMOD_RMETA), 620 const_iv (KMOD_RMETA),
606 const_iv (KMOD_NUM), 621 const_iv (KMOD_NUM),
607 const_iv (KMOD_CAPS), 622 const_iv (KMOD_CAPS),
608 const_iv (KMOD_MODE), 623 const_iv (KMOD_MODE),
624
625 const_iv (MIX_DEFAULT_FORMAT),
609# undef const_iv 626# undef const_iv
610 }; 627 };
611 628
612 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; )
613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
630 RETVAL 647 RETVAL
631 648
632NV floor (NV x) 649NV floor (NV x)
633 650
634NV ceil (NV x) 651NV ceil (NV x)
652
653IV minpot (UV n)
654
655IV popcount (UV n)
635 656
636void 657void
637pango_init () 658pango_init ()
638 CODE: 659 CODE:
639{ 660{
… …
679 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
680 701
681 if (m && m != (SDL_Rect **)-1) 702 if (m && m != (SDL_Rect **)-1)
682 while (*m) 703 while (*m)
683 { 704 {
684 if ((*m)->w >= 640 && (*m)->h >= 480) 705 if ((*m)->w >= 800 && (*m)->h >= 600)
685 { 706 {
686 AV *av = newAV (); 707 AV *av = newAV ();
687 av_push (av, newSViv ((*m)->w)); 708 av_push (av, newSViv ((*m)->w));
688 av_push (av, newSViv ((*m)->h)); 709 av_push (av, newSViv ((*m)->h));
689 av_push (av, newSViv (rgb)); 710 av_push (av, newSViv (rgb));
… …
713 734
714 if (RETVAL) 735 if (RETVAL)
715 { 736 {
716 av_clear (texture_av); 737 av_clear (texture_av);
717 738
718 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
719#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);
720#include "glfunc.h" 741#include "glfunc.h"
721#undef GL_FUNC 742#undef GL_FUNC
722 } 743 }
723} 744}
… …
809 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))));
810 } 831 }
811} 832}
812 833
813int 834int
814Mix_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)
815 POSTCALL: 836 POSTCALL:
816 Mix_HookMusicFinished (music_finished); 837 Mix_HookMusicFinished (music_finished);
817 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}
818 855
819void 856void
820Mix_CloseAudio () 857Mix_CloseAudio ()
821 858
822int 859int
… …
1035 RETVAL->g = 1.; 1072 RETVAL->g = 1.;
1036 RETVAL->b = 1.; 1073 RETVAL->b = 1.;
1037 RETVAL->a = 1.; 1074 RETVAL->a = 1.;
1038 RETVAL->base_height = MIN_FONT_HEIGHT; 1075 RETVAL->base_height = MIN_FONT_HEIGHT;
1039 RETVAL->font = 0; 1076 RETVAL->font = 0;
1077 RETVAL->rc = rc_alloc ();
1040 1078
1041 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1079 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042 layout_update_font (RETVAL); 1080 layout_update_font (RETVAL);
1043 OUTPUT: 1081 OUTPUT:
1044 RETVAL 1082 RETVAL
1045 1083
1046void 1084void
1047DESTROY (CFPlus::Layout self) 1085DESTROY (CFPlus::Layout self)
1048 CODE: 1086 CODE:
1049 g_object_unref (self->pl); 1087 g_object_unref (self->pl);
1088 rc_free (self->rc);
1050 Safefree (self); 1089 Safefree (self);
1051 1090
1052void 1091void
1053set_text (CFPlus::Layout self, SV *text_) 1092set_text (CFPlus::Layout self, SV *text_)
1054 CODE: 1093 CODE:
… …
1306 } 1345 }
1307} 1346}
1308 1347
1309void 1348void
1310render (CFPlus::Layout self, float x, float y, int flags = 0) 1349render (CFPlus::Layout self, float x, float y, int flags = 0)
1311 PPCODE: 1350 CODE:
1351 rc_clear (self->rc);
1312 pango_opengl_render_layout_subpixel ( 1352 pango_opengl_render_layout_subpixel (
1313 self->pl, 1353 self->pl,
1354 self->rc,
1314 x * PANGO_SCALE, y * PANGO_SCALE, 1355 x * PANGO_SCALE, y * PANGO_SCALE,
1315 self->r, self->g, self->b, self->a, 1356 self->r, self->g, self->b, self->a,
1316 flags 1357 flags
1317 ); 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}
1318 1381
1319MODULE = CFPlus PACKAGE = CFPlus::Texture 1382MODULE = CFPlus PACKAGE = CFPlus::Texture
1320 1383
1321PROTOTYPES: ENABLE 1384PROTOTYPES: ENABLE
1322
1323int minpot (int n)
1324 1385
1325void 1386void
1326pad (SV *data_, int ow, int oh, int nw, int nh) 1387pad (SV *data_, int ow, int oh, int nw, int nh)
1327 CODE: 1388 CODE:
1328{ 1389{
… …
1713 1774
1714void 1775void
1715draw (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)
1716 CODE: 1777 CODE:
1717{ 1778{
1779 int x, y, z;
1780
1718 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1719 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
1720 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)
1721 smooth_key skey; 1784 smooth_key skey;
1722 int x, y, z; 1785
1723 int last_name; 1786 rc_t *rc = rc_alloc ();
1787 rc_key_t key;
1788 rc_array_t *arr;
1724 1789
1725 // thats current max. sorry. 1790 // thats current max. sorry.
1726 if (sw > 255) sw = 255; 1791 if (sw > 255) sw = 255;
1727 if (sh > 255) sh = 255; 1792 if (sh > 255) sh = 255;
1728 1793
1729 // clear key, in case of extra padding 1794 // clear key, in case of extra padding
1730 memset (&skey, 0, sizeof (skey)); 1795 memset (&skey, 0, sizeof (skey));
1731 1796
1732 glColor4ub (255, 255, 255, 255); 1797 memset (&key, 0, sizeof (key));
1733 1798 key.r = 255;
1734 glEnable (GL_BLEND); 1799 key.g = 255;
1735 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1800 key.b = 255;
1736 glEnable (GL_TEXTURE_2D); 1801 key.a = 255;
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1802 key.mode = GL_QUADS;
1738 1803 key.format = GL_T2F_V3F;
1739 glBegin (GL_QUADS);
1740
1741 last_name = -1; 1804 key.texname = -1;
1742 1805
1743 mx += self->x; 1806 mx += self->x;
1744 my += self->y; 1807 my += self->y;
1745 1808
1746 // first pass: determine smooth_max 1809 // first pass: determine smooth_max
… …
1762 MAX (self->tex [cell->tile [0]].smoothlevel, 1825 MAX (self->tex [cell->tile [0]].smoothlevel,
1763 MAX (self->tex [cell->tile [1]].smoothlevel, 1826 MAX (self->tex [cell->tile [1]].smoothlevel,
1764 self->tex [cell->tile [2]].smoothlevel)); 1827 self->tex [cell->tile [2]].smoothlevel));
1765 } 1828 }
1766 } 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);
1767 1834
1768 for (z = 0; z <= 2; z++) 1835 for (z = 0; z <= 2; z++)
1769 { 1836 {
1770 memset (smooth_level, 0, sizeof (smooth_level)); 1837 memset (smooth_level, 0, sizeof (smooth_level));
1771 1838
… …
1783 if (tile) 1850 if (tile)
1784 { 1851 {
1785 maptex tex = self->tex [tile]; 1852 maptex tex = self->tex [tile];
1786 int px, py; 1853 int px, py;
1787 1854
1788 // suppressing texture state switches here
1789 // is only moderately effective, but worth the extra effort
1790 if (last_name != tex.name) 1855 if (key.texname != tex.name)
1791 { 1856 {
1792 if (!tex.name) 1857 if (!tex.name)
1793 tex = self->tex [2]; /* missing, replace by noface */ 1858 tex = self->tex [2]; /* missing, replace by noface */
1794 1859
1795 glEnd (); 1860 key.texname = tex.name;
1796 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1861 arr = rc_array (rc, &key);
1797 glBegin (GL_QUADS);
1798 } 1862 }
1799 1863
1800 px = (x + 1) * T - tex.w; 1864 px = (x + 1) * T - tex.w;
1801 py = (y + 1) * T - tex.h; 1865 py = (y + 1) * T - tex.h;
1802 1866
1803 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1804 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1868 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1805 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);
1806 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1870 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1807 1871
1808 if (cell->flags && z == 2) 1872 if (cell->flags && z == 2)
1809 { 1873 {
1874 // overlays such as the speech bubble, probably more to come
1810 if (cell->flags & 1) 1875 if (cell->flags & 1)
1811 { 1876 {
1812 maptex tex = self->tex [1]; 1877 maptex tex = self->tex [1];
1813 int px = x * T + T * 2 / 32; 1878 int px = x * T + T * 2 / 32;
1814 int py = y * T - T * 6 / 32; 1879 int py = y * T - T * 6 / 32;
1815 1880
1881 if (tex.name)
1816 glEnd (); 1882 {
1817 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);
1818 glBegin (GL_QUADS); 1893 }
1819
1820 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1821 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1822 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1823 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1824 } 1894 }
1825 } 1895 }
1826 1896
1827 // update smooth hash 1897 // update smooth hash
1828 if (tex.smoothtile) 1898 if (tex.smoothtile)
… …
1864 } 1934 }
1865 } 1935 }
1866 } 1936 }
1867 } 1937 }
1868 1938
1939 rc_draw (rc);
1940 rc_clear (rc);
1941
1869 // go through all smoothlevels, lowest to highest, then draw. 1942 // go through all smoothlevels, lowest to highest, then draw.
1870 // this is basically counting sort 1943 // this is basically counting sort
1871 { 1944 {
1872 int w, b; 1945 int w, b;
1873 1946
1947 glEnable (GL_TEXTURE_2D);
1948 glBegin (GL_QUADS);
1874 for (w = 0; w < 256 / 32; ++w) 1949 for (w = 0; w < 256 / 32; ++w)
1875 { 1950 {
1876 uint32_t smask = smooth_level [w]; 1951 uint32_t smask = smooth_level [w];
1877 if (smask) 1952 if (smask)
1878 for (b = 0; b < 32; ++b) 1953 for (b = 0; b < 32; ++b)
… …
1897 int border = bits & 15; 1972 int border = bits & 15;
1898 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1973 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899 float dx = tex.s * .0625f; // 16 images/row 1974 float dx = tex.s * .0625f; // 16 images/row
1900 float dy = tex.t * .5f ; // 2 images/column 1975 float dy = tex.t * .5f ; // 2 images/column
1901 1976
1902 // this time naively avoiding texture state changes
1903 // save gobs of state changes.
1904 if (last_name != tex.name) 1977 if (tex.name)
1905 { 1978 {
1979 // this time avoiding texture state changes
1980 // save gobs of state changes.
1906 if (!tex.name) 1981 if (key.texname != tex.name)
1907 continue; // smoothing not yet available 1982 {
1908
1909 glEnd (); 1983 glEnd ();
1910 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1984 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911 glBegin (GL_QUADS); 1985 glBegin (GL_QUADS);
1912 } 1986 }
1913 1987
1914 if (border) 1988 if (border)
1915 { 1989 {
1916 float ox = border * dx; 1990 float ox = border * dx;
1917 1991
1918 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 1992 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 1993 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1920 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 1994 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1921 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 1995 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1922 } 1996 }
1923 1997
1924 if (corner) 1998 if (corner)
1925 { 1999 {
1926 float ox = corner * dx; 2000 float ox = corner * dx;
1927 2001
1928 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2002 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2003 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1930 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2004 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1931 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2005 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2006 }
1932 } 2007 }
1933 } 2008 }
1934 } 2009 }
1935 } 2010 }
1936 } 2011 }
2012
2013 glEnd ();
2014 glDisable (GL_TEXTURE_2D);
2015 key.texname = -1;
1937 } 2016 }
1938 2017
1939 hv_clear (smooth); 2018 hv_clear (smooth);
1940 } 2019 }
1941 2020
1942 glEnd ();
1943
1944 glDisable (GL_TEXTURE_2D);
1945 glDisable (GL_BLEND); 2021 glDisable (GL_BLEND);
2022 rc_free (rc);
1946 2023
1947 // top layer: overlays such as the health bar 2024 // top layer: overlays such as the health bar
1948 for (y = 0; y < sh; y++) 2025 for (y = 0; y < sh; y++)
1949 if (0 <= y + my && y + my < self->rows) 2026 if (0 <= y + my && y + my < self->rows)
1950 { 2027 {
… …
2199 int x, y, z; 2276 int x, y, z;
2200 int w, h; 2277 int w, h;
2201 int x1, y1; 2278 int x1, y1;
2202 2279
2203 if (*data++ != 0) 2280 if (*data++ != 0)
2204 return; /* version mismatch */ 2281 XSRETURN_EMPTY; /* version mismatch */
2205 2282
2206 w = *data++ << 8; w |= *data++; 2283 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2284 h = *data++ << 8; h |= *data++;
2208 2285
2209 // 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
… …
2505 const_iv (GL_INTENSITY), 2582 const_iv (GL_INTENSITY),
2506 const_iv (GL_LUMINANCE), 2583 const_iv (GL_LUMINANCE),
2507 const_iv (GL_LUMINANCE_ALPHA), 2584 const_iv (GL_LUMINANCE_ALPHA),
2508 const_iv (GL_FLOAT), 2585 const_iv (GL_FLOAT),
2509 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),
2510 const_iv (GL_COMPILE), 2593 const_iv (GL_COMPILE),
2511 const_iv (GL_PROXY_TEXTURE_1D), 2594 const_iv (GL_PROXY_TEXTURE_1D),
2512 const_iv (GL_PROXY_TEXTURE_2D), 2595 const_iv (GL_PROXY_TEXTURE_2D),
2513 const_iv (GL_TEXTURE_1D), 2596 const_iv (GL_TEXTURE_1D),
2514 const_iv (GL_TEXTURE_2D), 2597 const_iv (GL_TEXTURE_2D),
… …
2553 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2636 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554 const_iv (GL_POINT_SMOOTH_HINT), 2637 const_iv (GL_POINT_SMOOTH_HINT),
2555 const_iv (GL_LINE_SMOOTH_HINT), 2638 const_iv (GL_LINE_SMOOTH_HINT),
2556 const_iv (GL_POLYGON_SMOOTH_HINT), 2639 const_iv (GL_POLYGON_SMOOTH_HINT),
2557 const_iv (GL_GENERATE_MIPMAP_HINT), 2640 const_iv (GL_GENERATE_MIPMAP_HINT),
2641 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558 const_iv (GL_FASTEST), 2642 const_iv (GL_FASTEST),
2559 const_iv (GL_DONT_CARE), 2643 const_iv (GL_DONT_CARE),
2560 const_iv (GL_NICEST), 2644 const_iv (GL_NICEST),
2561 const_iv (GL_V2F), 2645 const_iv (GL_V2F),
2562 const_iv (GL_V3F), 2646 const_iv (GL_V3F),
… …
2570 2654
2571 texture_av = newAV (); 2655 texture_av = newAV ();
2572 AvREAL_off (texture_av); 2656 AvREAL_off (texture_av);
2573} 2657}
2574 2658
2659void
2660disable_GL_EXT_blend_func_separate ()
2661 CODE:
2662 gl.BlendFuncSeparate = 0;
2663 gl.BlendFuncSeparateEXT = 0;
2664
2575char * 2665char *
2576gl_vendor () 2666gl_vendor ()
2577 CODE: 2667 CODE:
2578 RETVAL = (char *)glGetString (GL_VENDOR); 2668 RETVAL = (char *)glGetString (GL_VENDOR);
2579 OUTPUT: 2669 OUTPUT:
… …
2700 2790
2701void glRect (float x1, float y1, float x2, float y2) 2791void glRect (float x1, float y1, float x2, float y2)
2702 CODE: 2792 CODE:
2703 glRectf (x1, y1, x2, y2); 2793 glRectf (x1, y1, x2, y2);
2704 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
2705PROTOTYPES: ENABLE 2804PROTOTYPES: ENABLE
2706 2805
2707void glBegin (int mode) 2806void glBegin (int mode)
2708 2807
2709void glEnd () 2808void glEnd ()
… …
2810 NV x, y, w, h; 2909 NV x, y, w, h;
2811 SV *draw_x_sv = GvSV (draw_x_gv); 2910 SV *draw_x_sv = GvSV (draw_x_gv);
2812 SV *draw_y_sv = GvSV (draw_y_gv); 2911 SV *draw_y_sv = GvSV (draw_y_gv);
2813 SV *draw_w_sv = GvSV (draw_w_gv); 2912 SV *draw_w_sv = GvSV (draw_w_gv);
2814 SV *draw_h_sv = GvSV (draw_h_gv); 2913 SV *draw_h_sv = GvSV (draw_h_gv);
2815 SV *hover;
2816 double draw_x, draw_y, draw_w, draw_h; 2914 double draw_x, draw_y;
2817 2915
2818 if (!SvROK (self)) 2916 if (!SvROK (self))
2819 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2820 2918
2821 hv = (HV *)SvRV (self); 2919 hv = (HV *)SvRV (self);
… …
2849 { 2947 {
2850 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2948 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851 2949
2852 if (svp && SvTRUE (*svp)) 2950 if (svp && SvTRUE (*svp))
2853 { 2951 {
2854 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);
2855 glEnable (GL_BLEND); 2953 glEnable (GL_BLEND);
2856 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2954 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857 glBegin (GL_QUADS); 2955 glBegin (GL_QUADS);
2858 glVertex2f (0, 0); 2956 glVertex2f (0, 0);
2859 glVertex2f (w, 0); 2957 glVertex2f (w, 0);
… …
2862 glEnd (); 2960 glEnd ();
2863 glDisable (GL_BLEND); 2961 glDisable (GL_BLEND);
2864 } 2962 }
2865 } 2963 }
2866#if 0 2964#if 0
2867 if ($ENV{CFPLUS_DEBUG} & 1) { 2965 // draw borders, for debugging
2868 glPushMatrix; 2966 glPushMatrix ();
2869 glColor 1, 1, 0, 1; 2967 glColor4f (1., 1., 0., 1.);
2870 glTranslate 0.375, 0.375; 2968 glTranslatef (.5, .5, 0.);
2871 glBegin GL_LINE_LOOP; 2969 glBegin (GL_LINE_LOOP);
2872 glVertex 0 , 0; 2970 glVertex2f (0 , 0);
2873 glVertex $self->{w} - 1, 0; 2971 glVertex2f (w - 1, 0);
2874 glVertex $self->{w} - 1, $self->{h} - 1; 2972 glVertex2f (w - 1, h - 1);
2875 glVertex 0 , $self->{h} - 1; 2973 glVertex2f (0 , h - 1);
2876 glEnd; 2974 glEnd ();
2877 glPopMatrix; 2975 glPopMatrix ();
2878 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879 }
2880#endif 2976#endif
2881 PUSHMARK (SP); 2977 PUSHMARK (SP);
2882 XPUSHs (self); 2978 XPUSHs (self);
2883 PUTBACK; 2979 PUTBACK;
2884 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