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

Diff Legend

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