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.185 by root, Sat Apr 21 09:21:03 2007 UTC vs.
Revision 1.201 by root, Tue Jul 17 17:39:06 2007 UTC

… …
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
15#ifdef _WIN32 20#ifdef _WIN32
… …
56# define PARACHUTE SDL_INIT_NOPARACHUTE 61# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else 62#else
58# define PARACHUTE 0 63# define PARACHUTE 0
59#endif 64#endif
60 65
66static AV *texture_av;
67
61static struct 68static struct
62{ 69{
63#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
64#include "glfunc.h" 71#include "glfunc.h"
65#undef GL_FUNC 72#undef GL_FUNC
66} gl; 73} gl;
67 74
75static void
68static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69{ 77{
70 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
71 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
72 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
73 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74 else 82 else
75 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
84}
85
86static GLuint
87gen_texture ()
88{
89 GLuint name;
90
91 if (AvFILL (texture_av) >= 0)
92 name = (GLuint)(size_t)av_pop (texture_av);
93 else
94 glGenTextures (1, &name);
95
96 return name;
97}
98
99static void
100del_texture (GLuint name)
101{
102 /* make a half-assed attempt at returning the memory used by the texture */
103 /* textures are frequently being reused by cfplus anyway */
104 /*glBindTexture (GL_TEXTURE_2D, name);*/
105 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
106 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name);
76} 108}
77 109
78#include "texcache.c" 110#include "texcache.c"
79 111
80#include "pango-font.c" 112#include "pango-font.c"
… …
400 432
401/* SDL should provide this, really. */ 433/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300 434#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314 435#define SDLK_MODIFIER_MAX 314
404 436
405static AV *texture_av;
406
407MODULE = CFPlus PACKAGE = CFPlus 437MODULE = CFPlus PACKAGE = CFPlus
408 438
409PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
410 440
411BOOT: 441BOOT:
412{ 442{
413 texture_av = newAV ();
414 AvREAL_off (texture_av);
415
416 HV *stash = gv_stashpv ("CFPlus", 1); 443 HV *stash = gv_stashpv ("CFPlus", 1);
417 static const struct { 444 static const struct {
418 const char *name; 445 const char *name;
419 IV iv; 446 IV iv;
420 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
… …
560 opengl_fontmap = pango_opengl_font_map_new (); 587 opengl_fontmap = pango_opengl_font_map_new ();
561 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
562 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
563} 590}
564 591
592char *
593SDL_GetError ()
594
565int 595int
566SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 596SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
567 597
568void 598void
569SDL_Quit () 599SDL_Quit ()
570 600
571void 601void
572SDL_ListModes () 602SDL_ListModes (int rgb, int alpha)
573 PPCODE: 603 PPCODE:
574{ 604{
575 SDL_Rect **m; 605 SDL_Rect **m;
576 606
577 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 607 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
578 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
579 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
580 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 610 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
581 611
582 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 612 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
583 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 613 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
584 614
585 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 615 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
586 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
587 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
588 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
589 619
590 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 620 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
591#if SDL_VERSION_ATLEAST(1,2,10) 621#if SDL_VERSION_ATLEAST(1,2,10)
592 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 622 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
593 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 623 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
594#endif 624#endif
595 625
596 SDL_EnableUNICODE (1);
597 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
598
599 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
600 627
601 if (m && m != (SDL_Rect **)-1) 628 if (m && m != (SDL_Rect **)-1)
602 while (*m) 629 while (*m)
603 { 630 {
631 if ((*m)->w >= 640 && (*m)->h >= 480)
632 {
604 AV *av = newAV (); 633 AV *av = newAV ();
605 av_push (av, newSViv ((*m)->w)); 634 av_push (av, newSViv ((*m)->w));
606 av_push (av, newSViv ((*m)->h)); 635 av_push (av, newSViv ((*m)->h));
636 av_push (av, newSViv (rgb));
637 av_push (av, newSViv (alpha));
607 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 638 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
639 }
608 640
609 ++m; 641 ++m;
610 } 642 }
611} 643}
612 644
613char *
614SDL_GetError ()
615
616int 645int
617SDL_SetVideoMode (int w, int h, int fullscreen) 646SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
618 CODE: 647 CODE:
648{
649 SDL_EnableUNICODE (1);
650 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
651
652 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
653 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
654 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
655 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
656
619 RETVAL = !!SDL_SetVideoMode ( 657 RETVAL = !!SDL_SetVideoMode (
620 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 658 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
621 ); 659 );
660
622 if (RETVAL) 661 if (RETVAL)
623 { 662 {
663 av_clear (texture_av);
664
624 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 665 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
625# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 666#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
626# include "glfunc.h" 667#include "glfunc.h"
627# undef GL_FUNC 668#undef GL_FUNC
628 } 669 }
670}
629 OUTPUT: 671 OUTPUT:
630 RETVAL 672 RETVAL
631 673
632void 674void
633SDL_GL_SwapBuffers () 675SDL_GL_SwapBuffers ()
634 676
635char * 677char *
636SDL_GetKeyName (int sym) 678SDL_GetKeyName (int sym)
637 679
680int
681SDL_GetAppState ()
682
638void 683void
639SDL_PollEvent () 684poll_events ()
640 PPCODE: 685 PPCODE:
641{ 686{
642 SDL_Event ev; 687 SDL_Event ev;
643 688
644 while (SDL_PollEvent (&ev)) 689 SDL_PumpEvents ();
690 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
645 { 691 {
646 HV *hv = newHV (); 692 HV *hv = newHV ();
647 hv_store (hv, "type", 4, newSViv (ev.type), 0); 693 hv_store (hv, "type", 4, newSViv (ev.type), 0);
648 694
649 switch (ev.type) 695 switch (ev.type)
… …
661 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 707 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
662 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 708 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
663 break; 709 break;
664 710
665 case SDL_MOUSEMOTION: 711 case SDL_MOUSEMOTION:
712 {
713 int state = ev.motion.state;
714 int x = ev.motion.x;
715 int y = ev.motion.y;
716 int xrel = ev.motion.xrel;
717 int yrel = ev.motion.yrel;
718
719 /* do simplistic event compression */
720 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
721 && state == ev.motion.state)
722 {
723 xrel += ev.motion.xrel;
724 yrel += ev.motion.yrel;
725 x = ev.motion.x;
726 y = ev.motion.y;
727 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
728 }
729
666 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 730 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
667
668 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 731 hv_store (hv, "state", 5, newSViv (state), 0);
669 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 732 hv_store (hv, "x", 1, newSViv (x), 0);
670 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 733 hv_store (hv, "y", 1, newSViv (y), 0);
671 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 734 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
672 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 735 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
736 }
673 break; 737 break;
674 738
675 case SDL_MOUSEBUTTONDOWN: 739 case SDL_MOUSEBUTTONDOWN:
676 case SDL_MOUSEBUTTONUP: 740 case SDL_MOUSEBUTTONUP:
677 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 741 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
… …
857 ExitThread (retval); // unclean, please beam me up 921 ExitThread (retval); // unclean, please beam me up
858#else 922#else
859 _exit (retval); 923 _exit (retval);
860#endif 924#endif
861 925
926void
927debug ()
928 CODE:
929{
930#if DEBUG
931 VALGRIND_DO_LEAK_CHECK;
932#endif
933}
934
862MODULE = CFPlus PACKAGE = CFPlus::Font 935MODULE = CFPlus PACKAGE = CFPlus::Font
863 936
864CFPlus::Font 937CFPlus::Font
865new_from_file (SV *class, char *path, int id = 0) 938new_from_file (SV *class, char *path, int id = 0)
866 CODE: 939 CODE:
… …
1181 flags 1254 flags
1182 ); 1255 );
1183 1256
1184MODULE = CFPlus PACKAGE = CFPlus::Texture 1257MODULE = CFPlus PACKAGE = CFPlus::Texture
1185 1258
1259int minpot (int n)
1260
1186void 1261void
1187pad2pot (SV *data_, SV *w_, SV *h_) 1262pad2pot (SV *data_, SV *w_, SV *h_)
1188 CODE: 1263 CODE:
1189{ 1264{
1190 int ow = SvIV (w_); 1265 int ow = SvIV (w_);
… …
1266 { 1341 {
1267 glDisable (GL_ALPHA_TEST); 1342 glDisable (GL_ALPHA_TEST);
1268 glDisable (GL_BLEND); 1343 glDisable (GL_BLEND);
1269 } 1344 }
1270} 1345}
1346
1347IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1348 CODE:
1349{
1350 GLint width;
1351 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1352 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1353 RETVAL = width > 0;
1354}
1355 OUTPUT:
1356 RETVAL
1271 1357
1272MODULE = CFPlus PACKAGE = CFPlus::Map 1358MODULE = CFPlus PACKAGE = CFPlus::Map
1273 1359
1274CFPlus::Map 1360CFPlus::Map
1275new (SV *class) 1361new (SV *class)
… …
1396 CODE: 1482 CODE:
1397{ 1483{
1398 if (dx > 0) 1484 if (dx > 0)
1399 map_blank (self, self->x, self->y, dx, self->h); 1485 map_blank (self, self->x, self->y, dx, self->h);
1400 else if (dx < 0) 1486 else if (dx < 0)
1401 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1487 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1402 1488
1403 if (dy > 0) 1489 if (dy > 0)
1404 map_blank (self, self->x, self->y, self->w, dy); 1490 map_blank (self, self->x, self->y, self->w, dy);
1405 else if (dy < 0) 1491 else if (dy < 0)
1406 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1492 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1407 1493
1408 self->ox += dx; self->x += dx; 1494 self->ox += dx; self->x += dx;
1409 self->oy += dy; self->y += dy; 1495 self->oy += dy; self->y += dy;
1410 1496
1411 while (self->y < 0) 1497 while (self->y < 0)
… …
1600 1686
1601 // first pass: determine smooth_max 1687 // first pass: determine smooth_max
1602 // rather ugly, if you ask me 1688 // rather ugly, if you ask me
1603 // could also be stored inside mapcell and updated on change 1689 // could also be stored inside mapcell and updated on change
1604 memset (smooth_max, 0, sizeof (smooth_max)); 1690 memset (smooth_max, 0, sizeof (smooth_max));
1605 memset (smooth_level, 0, sizeof (smooth_level));
1606 1691
1607 for (y = 0; y < sh; y++) 1692 for (y = 0; y < sh; y++)
1608 if (0 <= y + my && y + my < self->rows) 1693 if (0 <= y + my && y + my < self->rows)
1609 { 1694 {
1610 maprow *row = self->row + (y + my); 1695 maprow *row = self->row + (y + my);
… …
1621 } 1706 }
1622 } 1707 }
1623 1708
1624 for (z = 0; z <= 2; z++) 1709 for (z = 0; z <= 2; z++)
1625 { 1710 {
1711 memset (smooth_level, 0, sizeof (smooth_level));
1712
1626 for (y = 0; y < sh; y++) 1713 for (y = 0; y < sh; y++)
1627 if (0 <= y + my && y + my < self->rows) 1714 if (0 <= y + my && y + my < self->rows)
1628 { 1715 {
1629 maprow *row = self->row + (y + my); 1716 maprow *row = self->row + (y + my);
1630 1717
… …
1715 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 1802 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1716 } 1803 }
1717 } 1804 }
1718 } 1805 }
1719 } 1806 }
1720 }
1721 1807
1722 // go through all smoothlevels, lowest to highest, then draw. 1808 // go through all smoothlevels, lowest to highest, then draw.
1723 // this is basically counting sort 1809 // this is basically counting sort
1724 {
1725 int w, b;
1726
1727 for (w = 0; w < 256 / 32; ++w)
1728 { 1810 {
1811 int w, b;
1812
1813 for (w = 0; w < 256 / 32; ++w)
1814 {
1729 uint32_t smask = smooth_level [w]; 1815 uint32_t smask = smooth_level [w];
1730 if (smask) 1816 if (smask)
1731 for (b = 0; b < 32; ++b) 1817 for (b = 0; b < 32; ++b)
1732 if (smask & (((uint32_t)1) << b)) 1818 if (smask & (((uint32_t)1) << b))
1733 {
1734 int level = (w << 5) | b;
1735 HE *he;
1736
1737 hv_iterinit (smooth);
1738 while ((he = hv_iternext (smooth)))
1739 { 1819 {
1740 smooth_key *skey = (smooth_key *)HeKEY (he); 1820 int level = (w << 5) | b;
1741 IV bits = SvIVX (HeVAL (he)); 1821 HE *he;
1742 1822
1743 if (!(bits & 0x1000) 1823 hv_iterinit (smooth);
1744 && skey->level == level 1824 while ((he = hv_iternext (smooth)))
1745 && level >= smooth_max [skey->x][skey->y])
1746 { 1825 {
1747 maptex tex = self->tex [skey->tile]; 1826 smooth_key *skey = (smooth_key *)HeKEY (he);
1748 int px = (((int)skey->x) - 1) * T; 1827 IV bits = SvIVX (HeVAL (he));
1749 int py = (((int)skey->y) - 1) * T; 1828
1750 int border = bits & 15; 1829 if (!(bits & 0x1000)
1751 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1830 && skey->level == level
1752 float dx = tex.s * .0625f; // 16 images/row 1831 && level > smooth_max [skey->x][skey->y])
1753 float dy = tex.t * .5f ; // 2 images/column
1754
1755 // this time naively avoiding texture state changes
1756 // save gobs of state changes.
1757 if (last_name != tex.name)
1758 { 1832 {
1833 maptex tex = self->tex [skey->tile];
1834 int px = (((int)skey->x) - 1) * T;
1835 int py = (((int)skey->y) - 1) * T;
1836 int border = bits & 15;
1837 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1838 float dx = tex.s * .0625f; // 16 images/row
1839 float dy = tex.t * .5f ; // 2 images/column
1840
1841 // this time naively avoiding texture state changes
1842 // save gobs of state changes.
1843 if (last_name != tex.name)
1844 {
1759 if (!tex.name) 1845 if (!tex.name)
1760 continue; // smoothing not yet available 1846 continue; // smoothing not yet available
1761 1847
1762 glEnd (); 1848 glEnd ();
1763 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1849 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1764 glBegin (GL_QUADS); 1850 glBegin (GL_QUADS);
1765 } 1851 }
1766 1852
1767 if (border) 1853 if (border)
1768 { 1854 {
1769 float ox = border * dx; 1855 float ox = border * dx;
1770 1856
1771 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 1857 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1772 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 1858 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1773 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 1859 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1774 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 1860 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1775 } 1861 }
1776 1862
1777 if (corner) 1863 if (corner)
1778 { 1864 {
1779 float ox = corner * dx; 1865 float ox = corner * dx;
1780 1866
1781 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 1867 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1782 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 1868 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1783 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 1869 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1784 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 1870 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1871 }
1785 } 1872 }
1786 } 1873 }
1787 } 1874 }
1788 } 1875 }
1789 } 1876 }
1877
1878 hv_clear (smooth);
1790 } 1879 }
1791
1792 //hv_clear (smooth);
1793 1880
1794 glEnd (); 1881 glEnd ();
1795 1882
1796 glDisable (GL_TEXTURE_2D); 1883 glDisable (GL_TEXTURE_2D);
1797 glDisable (GL_BLEND); 1884 glDisable (GL_BLEND);
… …
1887 glDisable (GL_BLEND); 1974 glDisable (GL_BLEND);
1888 glDisable (GL_TEXTURE_2D); 1975 glDisable (GL_TEXTURE_2D);
1889} 1976}
1890 1977
1891void 1978void
1892fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 1979fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1893 PPCODE: 1980 PPCODE:
1894{ 1981{
1895 int x, y; 1982 int x, y;
1896 int sw4 = (sw + 3) & ~3; 1983 int sw4 = (sw + 3) & ~3;
1897 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1984 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
… …
1917 darkness[y * sw4 + x] = cell->darkness 2004 darkness[y * sw4 + x] = cell->darkness
1918 ? 255 - (cell->darkness - 1) 2005 ? 255 - (cell->darkness - 1)
1919 : 255 - FOW_DARKNESS; 2006 : 255 - FOW_DARKNESS;
1920 } 2007 }
1921 } 2008 }
2009
2010 if (smoothing)
2011 {
2012 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
2013 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2014
2015 SvPOK_only (darkness2_sv);
2016 SvCUR_set (darkness2_sv, sw4 * sh);
2017
2018 for (y = 0; y < sh; ++y)
2019 for (x = 0; x < sw4; ++x)
2020 {
2021 float *f = (float *)matrix;
2022 int dx, dy;
2023 float sum = 0.f;
2024
2025 for (dy = -1; dy <= 1; ++dy)
2026 for (dx = -1; dx <= 1; ++dx)
2027 {
2028 unsigned int x2 = x + dx;
2029 unsigned int y2 = y + dy;
2030
2031 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
2032 }
2033
2034 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
2035 }
2036
2037 darkness_sv = darkness2_sv;
2038 }
1922 2039
1923 EXTEND (SP, 3); 2040 EXTEND (SP, 3);
1924 PUSHs (sv_2mortal (newSViv (sw4))); 2041 PUSHs (sv_2mortal (newSViv (sw4)));
1925 PUSHs (sv_2mortal (newSViv (sh))); 2042 PUSHs (sv_2mortal (newSViv (sh)));
1926 PUSHs (darkness_sv); 2043 PUSHs (darkness_sv);
… …
2100 CODE: 2217 CODE:
2101 RETVAL = Mix_VolumeMusic (volume); 2218 RETVAL = Mix_VolumeMusic (volume);
2102 OUTPUT: 2219 OUTPUT:
2103 RETVAL 2220 RETVAL
2104 2221
2222int
2223fade_out (int ms)
2224 CODE:
2225 RETVAL = Mix_FadeOutMusic (ms);
2226 OUTPUT:
2227 RETVAL
2228
2105CFPlus::MixMusic 2229CFPlus::MixMusic
2106new_from_file (SV *class, char *path) 2230new_from_file (SV *class, char *path)
2107 CODE: 2231 CODE:
2108 RETVAL = Mix_LoadMUS (path); 2232 RETVAL = Mix_LoadMUS (path);
2109 OUTPUT: 2233 OUTPUT:
… …
2116 2240
2117int 2241int
2118play (CFPlus::MixMusic self, int loops = -1) 2242play (CFPlus::MixMusic self, int loops = -1)
2119 CODE: 2243 CODE:
2120 RETVAL = Mix_PlayMusic (self, loops); 2244 RETVAL = Mix_PlayMusic (self, loops);
2245 OUTPUT:
2246 RETVAL
2247
2248int
2249fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2250 CODE:
2251 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2121 OUTPUT: 2252 OUTPUT:
2122 RETVAL 2253 RETVAL
2123 2254
2124MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2255MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2125 2256
… …
2129 static const struct { 2260 static const struct {
2130 const char *name; 2261 const char *name;
2131 IV iv; 2262 IV iv;
2132 } *civ, const_iv[] = { 2263 } *civ, const_iv[] = {
2133# define const_iv(name) { # name, (IV)name } 2264# define const_iv(name) { # name, (IV)name }
2265 const_iv (GL_VENDOR),
2266 const_iv (GL_VERSION),
2267 const_iv (GL_EXTENSIONS),
2134 const_iv (GL_COLOR_MATERIAL), 2268 const_iv (GL_COLOR_MATERIAL),
2135 const_iv (GL_SMOOTH), 2269 const_iv (GL_SMOOTH),
2136 const_iv (GL_FLAT), 2270 const_iv (GL_FLAT),
2137 const_iv (GL_DITHER), 2271 const_iv (GL_DITHER),
2138 const_iv (GL_BLEND), 2272 const_iv (GL_BLEND),
… …
2165 const_iv (GL_LUMINANCE), 2299 const_iv (GL_LUMINANCE),
2166 const_iv (GL_LUMINANCE_ALPHA), 2300 const_iv (GL_LUMINANCE_ALPHA),
2167 const_iv (GL_FLOAT), 2301 const_iv (GL_FLOAT),
2168 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2302 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2169 const_iv (GL_COMPILE), 2303 const_iv (GL_COMPILE),
2304 const_iv (GL_PROXY_TEXTURE_1D),
2305 const_iv (GL_PROXY_TEXTURE_2D),
2170 const_iv (GL_TEXTURE_1D), 2306 const_iv (GL_TEXTURE_1D),
2171 const_iv (GL_TEXTURE_2D), 2307 const_iv (GL_TEXTURE_2D),
2172 const_iv (GL_TEXTURE_ENV), 2308 const_iv (GL_TEXTURE_ENV),
2173 const_iv (GL_TEXTURE_MAG_FILTER), 2309 const_iv (GL_TEXTURE_MAG_FILTER),
2174 const_iv (GL_TEXTURE_MIN_FILTER), 2310 const_iv (GL_TEXTURE_MIN_FILTER),
… …
2214# undef const_iv 2350# undef const_iv
2215 }; 2351 };
2216 2352
2217 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2353 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2218 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2354 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2355
2356 texture_av = newAV ();
2357 AvREAL_off (texture_av);
2219} 2358}
2220 2359
2221char * 2360char *
2222gl_vendor () 2361gl_vendor ()
2223 CODE: 2362 CODE:
… …
2234 2373
2235char * 2374char *
2236gl_extensions () 2375gl_extensions ()
2237 CODE: 2376 CODE:
2238 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2377 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2378 OUTPUT:
2379 RETVAL
2380
2381const char *glGetString (GLenum pname)
2382
2383GLint glGetInteger (GLenum pname)
2384 CODE:
2385 glGetIntegerv (pname, &RETVAL);
2386 OUTPUT:
2387 RETVAL
2388
2389GLdouble glGetDouble (GLenum pname)
2390 CODE:
2391 glGetDoublev (pname, &RETVAL);
2239 OUTPUT: 2392 OUTPUT:
2240 RETVAL 2393 RETVAL
2241 2394
2242int glGetError () 2395int glGetError ()
2243 2396
… …
2368 2521
2369void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2522void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2370 2523
2371void glDrawPixels (int width, int height, int format, int type, char *pixels) 2524void glDrawPixels (int width, int height, int format, int type, char *pixels)
2372 2525
2526void glPixelZoom (float x, float y)
2527
2373void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2528void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2374 2529
2375int glGenTexture () 2530int glGenTexture ()
2376 CODE: 2531 CODE:
2377{ 2532 RETVAL = gen_texture ();
2378 GLuint name;
2379 if (AvFILL (texture_av) >= 0)
2380 name = (GLuint)av_pop (texture_av);
2381 else
2382 glGenTextures (1, &name);
2383 RETVAL = name;
2384}
2385 OUTPUT: 2533 OUTPUT:
2386 RETVAL 2534 RETVAL
2387 2535
2388void glDeleteTexture (int name) 2536void glDeleteTexture (int name)
2389 CODE: 2537 CODE:
2390{ 2538 del_texture (name);
2391 /* make a half-assed attempt at returning the memory used by the texture */ 2539
2392 /* textures are frequently being reused by cfplus anyway */
2393 glBindTexture (GL_TEXTURE_2D, name);
2394 glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);
2395 av_push (texture_av, (SV *)name);
2396 /*glDeleteTextures (1, &name_);*/
2397}
2398
2399int glGenList () 2540int glGenList ()
2400 CODE: 2541 CODE:
2401 RETVAL = glGenLists (1); 2542 RETVAL = glGenLists (1);
2402 OUTPUT: 2543 OUTPUT:
2403 RETVAL 2544 RETVAL

Diff Legend

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