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.204 by root, Thu Jul 19 14:54:50 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
1186void 1260int minpot (int n)
1187pad2pot (SV *data_, SV *w_, SV *h_)
1188 CODE:
1189{
1190 int ow = SvIV (w_);
1191 int oh = SvIV (h_);
1192 1261
1193 if (ow && oh) 1262void
1263pad (SV *data_, int ow, int oh, int nw, int nh)
1264 CODE:
1265{
1266 if ((nw != ow || nh != oh) && SvOK (data_))
1194 { 1267 {
1195 int nw = minpot (ow);
1196 int nh = minpot (oh);
1197
1198 if (nw != ow || nh != oh)
1199 {
1200 if (SvOK (data_))
1201 {
1202 STRLEN datalen; 1268 STRLEN datalen;
1203 char *data = SvPVbyte (data_, datalen); 1269 char *data = SvPVbyte (data_, datalen);
1204 int bpp = datalen / (ow * oh); 1270 int bpp = datalen / (ow * oh);
1205 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1271 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1206 1272
1207 SvPOK_only (result_); 1273 SvPOK_only (result_);
1208 SvCUR_set (result_, nw * nh * bpp); 1274 SvCUR_set (result_, nw * nh * bpp);
1209 1275
1210 memset (SvPVX (result_), 0, nw * nh * bpp); 1276 memset (SvPVX (result_), 0, nw * nh * bpp);
1211 while (oh--) 1277 while (oh--)
1212 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1278 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1213 1279
1214 sv_setsv (data_, result_); 1280 sv_setsv (data_, result_);
1215 }
1216
1217 sv_setiv (w_, nw);
1218 sv_setiv (h_, nh);
1219 }
1220 } 1281 }
1221} 1282}
1222 1283
1223void 1284void
1224draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1285draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1266 { 1327 {
1267 glDisable (GL_ALPHA_TEST); 1328 glDisable (GL_ALPHA_TEST);
1268 glDisable (GL_BLEND); 1329 glDisable (GL_BLEND);
1269 } 1330 }
1270} 1331}
1332
1333IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1334 CODE:
1335{
1336 GLint width;
1337 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1338 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1339 RETVAL = width > 0;
1340}
1341 OUTPUT:
1342 RETVAL
1271 1343
1272MODULE = CFPlus PACKAGE = CFPlus::Map 1344MODULE = CFPlus PACKAGE = CFPlus::Map
1273 1345
1274CFPlus::Map 1346CFPlus::Map
1275new (SV *class) 1347new (SV *class)
… …
1396 CODE: 1468 CODE:
1397{ 1469{
1398 if (dx > 0) 1470 if (dx > 0)
1399 map_blank (self, self->x, self->y, dx, self->h); 1471 map_blank (self, self->x, self->y, dx, self->h);
1400 else if (dx < 0) 1472 else if (dx < 0)
1401 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1473 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1402 1474
1403 if (dy > 0) 1475 if (dy > 0)
1404 map_blank (self, self->x, self->y, self->w, dy); 1476 map_blank (self, self->x, self->y, self->w, dy);
1405 else if (dy < 0) 1477 else if (dy < 0)
1406 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1478 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1407 1479
1408 self->ox += dx; self->x += dx; 1480 self->ox += dx; self->x += dx;
1409 self->oy += dy; self->y += dy; 1481 self->oy += dy; self->y += dy;
1410 1482
1411 while (self->y < 0) 1483 while (self->y < 0)
… …
1600 1672
1601 // first pass: determine smooth_max 1673 // first pass: determine smooth_max
1602 // rather ugly, if you ask me 1674 // rather ugly, if you ask me
1603 // could also be stored inside mapcell and updated on change 1675 // could also be stored inside mapcell and updated on change
1604 memset (smooth_max, 0, sizeof (smooth_max)); 1676 memset (smooth_max, 0, sizeof (smooth_max));
1605 memset (smooth_level, 0, sizeof (smooth_level));
1606 1677
1607 for (y = 0; y < sh; y++) 1678 for (y = 0; y < sh; y++)
1608 if (0 <= y + my && y + my < self->rows) 1679 if (0 <= y + my && y + my < self->rows)
1609 { 1680 {
1610 maprow *row = self->row + (y + my); 1681 maprow *row = self->row + (y + my);
… …
1621 } 1692 }
1622 } 1693 }
1623 1694
1624 for (z = 0; z <= 2; z++) 1695 for (z = 0; z <= 2; z++)
1625 { 1696 {
1697 memset (smooth_level, 0, sizeof (smooth_level));
1698
1626 for (y = 0; y < sh; y++) 1699 for (y = 0; y < sh; y++)
1627 if (0 <= y + my && y + my < self->rows) 1700 if (0 <= y + my && y + my < self->rows)
1628 { 1701 {
1629 maprow *row = self->row + (y + my); 1702 maprow *row = self->row + (y + my);
1630 1703
… …
1715 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 1788 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1716 } 1789 }
1717 } 1790 }
1718 } 1791 }
1719 } 1792 }
1720 }
1721 1793
1722 // go through all smoothlevels, lowest to highest, then draw. 1794 // go through all smoothlevels, lowest to highest, then draw.
1723 // this is basically counting sort 1795 // this is basically counting sort
1724 {
1725 int w, b;
1726
1727 for (w = 0; w < 256 / 32; ++w)
1728 { 1796 {
1797 int w, b;
1798
1799 for (w = 0; w < 256 / 32; ++w)
1800 {
1729 uint32_t smask = smooth_level [w]; 1801 uint32_t smask = smooth_level [w];
1730 if (smask) 1802 if (smask)
1731 for (b = 0; b < 32; ++b) 1803 for (b = 0; b < 32; ++b)
1732 if (smask & (((uint32_t)1) << b)) 1804 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 { 1805 {
1740 smooth_key *skey = (smooth_key *)HeKEY (he); 1806 int level = (w << 5) | b;
1741 IV bits = SvIVX (HeVAL (he)); 1807 HE *he;
1742 1808
1743 if (!(bits & 0x1000) 1809 hv_iterinit (smooth);
1744 && skey->level == level 1810 while ((he = hv_iternext (smooth)))
1745 && level >= smooth_max [skey->x][skey->y])
1746 { 1811 {
1747 maptex tex = self->tex [skey->tile]; 1812 smooth_key *skey = (smooth_key *)HeKEY (he);
1748 int px = (((int)skey->x) - 1) * T; 1813 IV bits = SvIVX (HeVAL (he));
1749 int py = (((int)skey->y) - 1) * T; 1814
1750 int border = bits & 15; 1815 if (!(bits & 0x1000)
1751 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1816 && skey->level == level
1752 float dx = tex.s * .0625f; // 16 images/row 1817 && 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 { 1818 {
1819 maptex tex = self->tex [skey->tile];
1820 int px = (((int)skey->x) - 1) * T;
1821 int py = (((int)skey->y) - 1) * T;
1822 int border = bits & 15;
1823 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1824 float dx = tex.s * .0625f; // 16 images/row
1825 float dy = tex.t * .5f ; // 2 images/column
1826
1827 // this time naively avoiding texture state changes
1828 // save gobs of state changes.
1829 if (last_name != tex.name)
1830 {
1759 if (!tex.name) 1831 if (!tex.name)
1760 continue; // smoothing not yet available 1832 continue; // smoothing not yet available
1761 1833
1762 glEnd (); 1834 glEnd ();
1763 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1835 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1764 glBegin (GL_QUADS); 1836 glBegin (GL_QUADS);
1765 } 1837 }
1766 1838
1767 if (border) 1839 if (border)
1768 { 1840 {
1769 float ox = border * dx; 1841 float ox = border * dx;
1770 1842
1771 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 1843 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1772 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 1844 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1773 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 1845 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1774 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 1846 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1775 } 1847 }
1776 1848
1777 if (corner) 1849 if (corner)
1778 { 1850 {
1779 float ox = corner * dx; 1851 float ox = corner * dx;
1780 1852
1781 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 1853 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1782 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 1854 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1783 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 1855 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1784 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 1856 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1857 }
1785 } 1858 }
1786 } 1859 }
1787 } 1860 }
1788 } 1861 }
1789 } 1862 }
1863
1864 hv_clear (smooth);
1790 } 1865 }
1791
1792 //hv_clear (smooth);
1793 1866
1794 glEnd (); 1867 glEnd ();
1795 1868
1796 glDisable (GL_TEXTURE_2D); 1869 glDisable (GL_TEXTURE_2D);
1797 glDisable (GL_BLEND); 1870 glDisable (GL_BLEND);
… …
1891void 1964void
1892fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 1965fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1893 PPCODE: 1966 PPCODE:
1894{ 1967{
1895 int x, y; 1968 int x, y;
1969 int sw1 = sw + 2;
1970 int sh1 = sh + 2;
1971 int sh3 = sh * 3;
1896 int sw4 = (sw + 3) & ~3; 1972 int sw34 = (sw * 3 + 3) & ~3;
1973 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1897 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1974 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1898 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1975 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1899 1976
1900 memset (darkness, 255, sw4 * sh);
1901 SvPOK_only (darkness_sv); 1977 SvPOK_only (darkness3_sv);
1902 SvCUR_set (darkness_sv, sw4 * sh); 1978 SvCUR_set (darkness3_sv, sw34 * sh3);
1903 1979
1904 mx += self->x; 1980 mx += self->x - 1;
1905 my += self->y; 1981 my += self->y - 1;
1906 1982
1983 memset (darkness1, 255, sw1 * sh1);
1984
1907 for (y = 0; y < sh; y++) 1985 for (y = 0; y < sh1; y++)
1908 if (0 <= y + my && y + my < self->rows) 1986 if (0 <= y + my && y + my < self->rows)
1909 { 1987 {
1910 maprow *row = self->row + (y + my); 1988 maprow *row = self->row + (y + my);
1911 1989
1912 for (x = 0; x < sw; x++) 1990 for (x = 0; x < sw1; x++)
1913 if (row->c0 <= x + mx && x + mx < row->c1) 1991 if (row->c0 <= x + mx && x + mx < row->c1)
1914 { 1992 {
1915 mapcell *cell = row->col + (x + mx - row->c0); 1993 mapcell *cell = row->col + (x + mx - row->c0);
1916 1994
1917 darkness[y * sw4 + x] = cell->darkness 1995 darkness1 [y * sw1 + x] = cell->darkness
1918 ? 255 - (cell->darkness - 1) 1996 ? 255 - (cell->darkness - 1)
1919 : 255 - FOW_DARKNESS; 1997 : 255 - FOW_DARKNESS;
1920 } 1998 }
1921 } 1999 }
1922 2000
2001 for (y = 0; y < sh; ++y)
2002 for (x = 0; x < sw; ++x)
2003 {
2004 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2005 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2006 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2007 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2008 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2009 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2010 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2011 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2012 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2013
2014 uint8_t r11 = (d11 + d21 + d12) / 3;
2015 uint8_t r21 = d21;
2016 uint8_t r31 = (d21 + d31 + d32) / 3;
2017
2018 uint8_t r12 = d12;
2019 uint8_t r22 = d22;
2020 uint8_t r32 = d32;
2021
2022 uint8_t r13 = (d13 + d23 + d12) / 3;
2023 uint8_t r23 = d23;
2024 uint8_t r33 = (d23 + d33 + d32) / 3;
2025
2026 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2027 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2028 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2029 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2030 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2031 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2032 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2033 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2034 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2035 }
2036
2037 free (darkness1);
2038
1923 EXTEND (SP, 3); 2039 EXTEND (SP, 3);
1924 PUSHs (sv_2mortal (newSViv (sw4))); 2040 PUSHs (sv_2mortal (newSViv (sw34)));
1925 PUSHs (sv_2mortal (newSViv (sh))); 2041 PUSHs (sv_2mortal (newSViv (sh3)));
1926 PUSHs (darkness_sv); 2042 PUSHs (darkness3_sv);
1927} 2043}
1928 2044
1929SV * 2045SV *
1930get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2046get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1931 CODE: 2047 CODE:
… …
2100 CODE: 2216 CODE:
2101 RETVAL = Mix_VolumeMusic (volume); 2217 RETVAL = Mix_VolumeMusic (volume);
2102 OUTPUT: 2218 OUTPUT:
2103 RETVAL 2219 RETVAL
2104 2220
2221int
2222fade_out (int ms)
2223 CODE:
2224 RETVAL = Mix_FadeOutMusic (ms);
2225 OUTPUT:
2226 RETVAL
2227
2105CFPlus::MixMusic 2228CFPlus::MixMusic
2106new_from_file (SV *class, char *path) 2229new_from_file (SV *class, char *path)
2107 CODE: 2230 CODE:
2108 RETVAL = Mix_LoadMUS (path); 2231 RETVAL = Mix_LoadMUS (path);
2109 OUTPUT: 2232 OUTPUT:
… …
2116 2239
2117int 2240int
2118play (CFPlus::MixMusic self, int loops = -1) 2241play (CFPlus::MixMusic self, int loops = -1)
2119 CODE: 2242 CODE:
2120 RETVAL = Mix_PlayMusic (self, loops); 2243 RETVAL = Mix_PlayMusic (self, loops);
2244 OUTPUT:
2245 RETVAL
2246
2247int
2248fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2249 CODE:
2250 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2121 OUTPUT: 2251 OUTPUT:
2122 RETVAL 2252 RETVAL
2123 2253
2124MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2254MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2125 2255
… …
2129 static const struct { 2259 static const struct {
2130 const char *name; 2260 const char *name;
2131 IV iv; 2261 IV iv;
2132 } *civ, const_iv[] = { 2262 } *civ, const_iv[] = {
2133# define const_iv(name) { # name, (IV)name } 2263# define const_iv(name) { # name, (IV)name }
2264 const_iv (GL_VENDOR),
2265 const_iv (GL_VERSION),
2266 const_iv (GL_EXTENSIONS),
2134 const_iv (GL_COLOR_MATERIAL), 2267 const_iv (GL_COLOR_MATERIAL),
2135 const_iv (GL_SMOOTH), 2268 const_iv (GL_SMOOTH),
2136 const_iv (GL_FLAT), 2269 const_iv (GL_FLAT),
2137 const_iv (GL_DITHER), 2270 const_iv (GL_DITHER),
2138 const_iv (GL_BLEND), 2271 const_iv (GL_BLEND),
… …
2165 const_iv (GL_LUMINANCE), 2298 const_iv (GL_LUMINANCE),
2166 const_iv (GL_LUMINANCE_ALPHA), 2299 const_iv (GL_LUMINANCE_ALPHA),
2167 const_iv (GL_FLOAT), 2300 const_iv (GL_FLOAT),
2168 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2301 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2169 const_iv (GL_COMPILE), 2302 const_iv (GL_COMPILE),
2303 const_iv (GL_PROXY_TEXTURE_1D),
2304 const_iv (GL_PROXY_TEXTURE_2D),
2170 const_iv (GL_TEXTURE_1D), 2305 const_iv (GL_TEXTURE_1D),
2171 const_iv (GL_TEXTURE_2D), 2306 const_iv (GL_TEXTURE_2D),
2172 const_iv (GL_TEXTURE_ENV), 2307 const_iv (GL_TEXTURE_ENV),
2173 const_iv (GL_TEXTURE_MAG_FILTER), 2308 const_iv (GL_TEXTURE_MAG_FILTER),
2174 const_iv (GL_TEXTURE_MIN_FILTER), 2309 const_iv (GL_TEXTURE_MIN_FILTER),
… …
2214# undef const_iv 2349# undef const_iv
2215 }; 2350 };
2216 2351
2217 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2352 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2218 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2353 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2354
2355 texture_av = newAV ();
2356 AvREAL_off (texture_av);
2219} 2357}
2220 2358
2221char * 2359char *
2222gl_vendor () 2360gl_vendor ()
2223 CODE: 2361 CODE:
… …
2234 2372
2235char * 2373char *
2236gl_extensions () 2374gl_extensions ()
2237 CODE: 2375 CODE:
2238 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2376 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2377 OUTPUT:
2378 RETVAL
2379
2380const char *glGetString (GLenum pname)
2381
2382GLint glGetInteger (GLenum pname)
2383 CODE:
2384 glGetIntegerv (pname, &RETVAL);
2385 OUTPUT:
2386 RETVAL
2387
2388GLdouble glGetDouble (GLenum pname)
2389 CODE:
2390 glGetDoublev (pname, &RETVAL);
2239 OUTPUT: 2391 OUTPUT:
2240 RETVAL 2392 RETVAL
2241 2393
2242int glGetError () 2394int glGetError ()
2243 2395
… …
2368 2520
2369void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2521void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2370 2522
2371void glDrawPixels (int width, int height, int format, int type, char *pixels) 2523void glDrawPixels (int width, int height, int format, int type, char *pixels)
2372 2524
2525void glPixelZoom (float x, float y)
2526
2373void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2527void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2374 2528
2375int glGenTexture () 2529int glGenTexture ()
2376 CODE: 2530 CODE:
2377{ 2531 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: 2532 OUTPUT:
2386 RETVAL 2533 RETVAL
2387 2534
2388void glDeleteTexture (int name) 2535void glDeleteTexture (int name)
2389 CODE: 2536 CODE:
2390{ 2537 del_texture (name);
2391 /* make a half-assed attempt at returning the memory used by the texture */ 2538
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 () 2539int glGenList ()
2400 CODE: 2540 CODE:
2401 RETVAL = glGenLists (1); 2541 RETVAL = glGenLists (1);
2402 OUTPUT: 2542 OUTPUT:
2403 RETVAL 2543 RETVAL

Diff Legend

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