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.176 by root, Tue Apr 10 09:39:48 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"
… …
345} smooth_key; 378} smooth_key;
346 379
347static void 380static void
348smooth_or_bits (HV *hv, smooth_key *key, IV bits) 381smooth_or_bits (HV *hv, smooth_key *key, IV bits)
349{ 382{
350 SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1); 383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
351 384
352 if (SvIOK (*sv)) 385 if (SvIOK (*sv))
353 SvIV_set (*sv, SvIVX (*sv) | bits); 386 SvIV_set (*sv, SvIVX (*sv) | bits);
354 else 387 else
355 sv_setiv (*sv, bits); 388 sv_setiv (*sv, bits);
… …
555 opengl_fontmap = pango_opengl_font_map_new (); 588 opengl_fontmap = pango_opengl_font_map_new ();
556 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);
557 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
558} 591}
559 592
593char *
594SDL_GetError ()
595
560int 596int
561SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
562 598
563void 599void
564SDL_Quit () 600SDL_Quit ()
565 601
566void 602void
567SDL_ListModes () 603SDL_ListModes (int rgb, int alpha)
568 PPCODE: 604 PPCODE:
569{ 605{
570 SDL_Rect **m; 606 SDL_Rect **m;
571 607
572 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
573 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
574 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 610 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
575 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 611 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
576 612
577 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 613 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
578 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
579 615
580 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
581 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
582 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
583 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
584 620
585 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
586#if SDL_VERSION_ATLEAST(1,2,10) 622#if SDL_VERSION_ATLEAST(1,2,10)
587 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
588 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
589#endif 625#endif
590 626
591 SDL_EnableUNICODE (1);
592 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
593
594 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
595 628
596 if (m && m != (SDL_Rect **)-1) 629 if (m && m != (SDL_Rect **)-1)
597 while (*m) 630 while (*m)
598 { 631 {
632 if ((*m)->w >= 640 && (*m)->h >= 480)
633 {
599 AV *av = newAV (); 634 AV *av = newAV ();
600 av_push (av, newSViv ((*m)->w)); 635 av_push (av, newSViv ((*m)->w));
601 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));
602 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 639 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
640 }
603 641
604 ++m; 642 ++m;
605 } 643 }
606} 644}
607 645
608char *
609SDL_GetError ()
610
611int 646int
612SDL_SetVideoMode (int w, int h, int fullscreen) 647SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
613 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
614 RETVAL = !!SDL_SetVideoMode ( 658 RETVAL = !!SDL_SetVideoMode (
615 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 659 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
616 ); 660 );
661
617 if (RETVAL) 662 if (RETVAL)
618 { 663 {
664 av_clear (texture_av);
665
619 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
620# 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);
621# include "glfunc.h" 668#include "glfunc.h"
622# undef GL_FUNC 669#undef GL_FUNC
623 } 670 }
671}
624 OUTPUT: 672 OUTPUT:
625 RETVAL 673 RETVAL
626 674
627void 675void
628SDL_GL_SwapBuffers () 676SDL_GL_SwapBuffers ()
629 677
630char * 678char *
631SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
632 680
681int
682SDL_GetAppState ()
683
633void 684void
634SDL_PollEvent () 685poll_events ()
635 PPCODE: 686 PPCODE:
636{ 687{
637 SDL_Event ev; 688 SDL_Event ev;
638 689
639 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
640 { 692 {
641 HV *hv = newHV (); 693 HV *hv = newHV ();
642 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
643 695
644 switch (ev.type) 696 switch (ev.type)
… …
656 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
657 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
658 break; 710 break;
659 711
660 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
661 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
662
663 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
664 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
665 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
666 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
667 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
668 break; 738 break;
669 739
670 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
671 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
672 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
… …
701Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
702 772
703void 773void
704lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
705 CODE: 775 CODE:
706#ifndef _WIN32
707 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
708#endif
709 777
710void 778void
711win32_proxy_info () 779win32_proxy_info ()
712 PPCODE: 780 PPCODE:
713{ 781{
… …
854 ExitThread (retval); // unclean, please beam me up 922 ExitThread (retval); // unclean, please beam me up
855#else 923#else
856 _exit (retval); 924 _exit (retval);
857#endif 925#endif
858 926
927void
928debug ()
929 CODE:
930{
931#if DEBUG
932 VALGRIND_DO_LEAK_CHECK;
933#endif
934}
935
859MODULE = CFPlus PACKAGE = CFPlus::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
860 937
861CFPlus::Font 938CFPlus::Font
862new_from_file (SV *class, char *path, int id = 0) 939new_from_file (SV *class, char *path, int id = 0)
863 CODE: 940 CODE:
… …
1178 flags 1255 flags
1179 ); 1256 );
1180 1257
1181MODULE = CFPlus PACKAGE = CFPlus::Texture 1258MODULE = CFPlus PACKAGE = CFPlus::Texture
1182 1259
1260int minpot (int n)
1261
1183void 1262void
1184pad2pot (SV *data_, SV *w_, SV *h_) 1263pad2pot (SV *data_, SV *w_, SV *h_)
1185 CODE: 1264 CODE:
1186{ 1265{
1187 int ow = SvIV (w_); 1266 int ow = SvIV (w_);
… …
1263 { 1342 {
1264 glDisable (GL_ALPHA_TEST); 1343 glDisable (GL_ALPHA_TEST);
1265 glDisable (GL_BLEND); 1344 glDisable (GL_BLEND);
1266 } 1345 }
1267} 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
1268 1358
1269MODULE = CFPlus PACKAGE = CFPlus::Map 1359MODULE = CFPlus PACKAGE = CFPlus::Map
1270 1360
1271CFPlus::Map 1361CFPlus::Map
1272new (SV *class) 1362new (SV *class)
… …
1393 CODE: 1483 CODE:
1394{ 1484{
1395 if (dx > 0) 1485 if (dx > 0)
1396 map_blank (self, self->x, self->y, dx, self->h); 1486 map_blank (self, self->x, self->y, dx, self->h);
1397 else if (dx < 0) 1487 else if (dx < 0)
1398 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);
1399 1489
1400 if (dy > 0) 1490 if (dy > 0)
1401 map_blank (self, self->x, self->y, self->w, dy); 1491 map_blank (self, self->x, self->y, self->w, dy);
1402 else if (dy < 0) 1492 else if (dy < 0)
1403 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);
1404 1494
1405 self->ox += dx; self->x += dx; 1495 self->ox += dx; self->x += dx;
1406 self->oy += dy; self->y += dy; 1496 self->oy += dy; self->y += dy;
1407 1497
1408 while (self->y < 0) 1498 while (self->y < 0)
… …
1462 } 1552 }
1463 else if (cmd == 6) // monster width 1553 else if (cmd == 6) // monster width
1464 cell->stat_width = *data++ + 1; 1554 cell->stat_width = *data++ + 1;
1465 else if (cmd == 0x47) 1555 else if (cmd == 0x47)
1466 { 1556 {
1467 if (*data == 8) 1557 if (*data == 4)
1468 ; // decode player uuid 1558 ; // decode player count
1469 1559
1470 data += *data + 1; 1560 data += *data + 1;
1471 } 1561 }
1472 else if (cmd == 8) // cell flags 1562 else if (cmd == 8) // cell flags
1473 cell->flags = *data++; 1563 cell->flags = *data++;
… …
1567draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1657draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1568 CODE: 1658 CODE:
1569{ 1659{
1570 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1660 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1571 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1661 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1572 uint8_t smooth_max[256][256]; 1662 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1573 smooth_key skey; 1663 smooth_key skey;
1574 int x, y, z; 1664 int x, y, z;
1575 int last_name; 1665 int last_name;
1576 1666
1577 // thats current max. sorry. 1667 // thats current max. sorry.
… …
1608 for (x = 0; x < sw; x++) 1698 for (x = 0; x < sw; x++)
1609 if (row->c0 <= x + mx && x + mx < row->c1) 1699 if (row->c0 <= x + mx && x + mx < row->c1)
1610 { 1700 {
1611 mapcell *cell = row->col + (x + mx - row->c0); 1701 mapcell *cell = row->col + (x + mx - row->c0);
1612 1702
1613 for (z = 0; z <= 2; z++)
1614 {
1615 uint8_t level = self->tex [cell->tile [z]].smoothlevel;
1616 if (level > smooth_max [x + 1][y + 1])
1617 smooth_max [x + 1][y + 1] = level; 1703 smooth_max[x + 1][y + 1] =
1618 } 1704 MAX (self->tex [cell->tile [0]].smoothlevel,
1705 MAX (self->tex [cell->tile [1]].smoothlevel,
1706 self->tex [cell->tile [2]].smoothlevel));
1619 } 1707 }
1620 } 1708 }
1621 1709
1622 for (z = 0; z <= 2; z++) 1710 for (z = 0; z <= 2; z++)
1623 { 1711 {
… …
1685 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 1773 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1686 1774
1687 // add bits to current tile and all neighbours. skey.x|y is 1775 // add bits to current tile and all neighbours. skey.x|y is
1688 // shifted +1|+1 so we always stay positive. 1776 // shifted +1|+1 so we always stay positive.
1689 1777
1778 // bits is ___n cccc CCCC bbbb
1779 // n do not draw borders&corners
1780 // c draw these corners, but...
1781 // C ... not these
1782 // b draw these borders
1783
1784 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1785 // ┃· ·· ·┃ ━━
1786
1787 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1788 // ·· ·· ·┏ ┓·
1789
1690 // full tile 1790 // full tile
1691 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 1791 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1692 1792
1693 // borders 1793 // borders
1694 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031); 1794 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1695 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092); 1795 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1696 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 1796 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1697 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 1797 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1698 1798
1699 // corners 1799 // corners
1700 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 1800 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
… …
1704 } 1804 }
1705 } 1805 }
1706 } 1806 }
1707 } 1807 }
1708 1808
1709 // go through all smoothlevels, lowest to highest, then draw 1809 // go through all smoothlevels, lowest to highest, then draw.
1710 // this is basically counting sort 1810 // this is basically counting sort
1711 { 1811 {
1712 int w, b; 1812 int w, b;
1713 1813
1714 for (w = 0; w < 256 / 32; ++w) 1814 for (w = 0; w < 256 / 32; ++w)
… …
1725 while ((he = hv_iternext (smooth))) 1825 while ((he = hv_iternext (smooth)))
1726 { 1826 {
1727 smooth_key *skey = (smooth_key *)HeKEY (he); 1827 smooth_key *skey = (smooth_key *)HeKEY (he);
1728 IV bits = SvIVX (HeVAL (he)); 1828 IV bits = SvIVX (HeVAL (he));
1729 1829
1730 // bits is ___n cccc CCCC bbbb
1731 // n do not draw borders&corners
1732 // c draw these corners, but...
1733 // C ... not these
1734 // b draw these borders
1735
1736 if (!(bits & 0x1000) 1830 if (!(bits & 0x1000)
1737 && skey->level == level 1831 && skey->level == level
1738 && level >= smooth_max [skey->x][skey->y]) 1832 && level > smooth_max [skey->x][skey->y])
1739 { 1833 {
1740 maptex tex = self->tex [skey->tile]; 1834 maptex tex = self->tex [skey->tile];
1741 int px = (((int)skey->x) - 1) * T; 1835 int px = (((int)skey->x) - 1) * T;
1742 int py = (((int)skey->y) - 1) * T; 1836 int py = (((int)skey->y) - 1) * T;
1743 int border = bits & 15; 1837 int border = bits & 15;
… …
1881 glDisable (GL_BLEND); 1975 glDisable (GL_BLEND);
1882 glDisable (GL_TEXTURE_2D); 1976 glDisable (GL_TEXTURE_2D);
1883} 1977}
1884 1978
1885void 1979void
1886fow_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)
1887 PPCODE: 1981 PPCODE:
1888{ 1982{
1889 int x, y; 1983 int x, y;
1890 int sw4 = (sw + 3) & ~3; 1984 int sw4 = (sw + 3) & ~3;
1891 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1985 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
… …
1911 darkness[y * sw4 + x] = cell->darkness 2005 darkness[y * sw4 + x] = cell->darkness
1912 ? 255 - (cell->darkness - 1) 2006 ? 255 - (cell->darkness - 1)
1913 : 255 - FOW_DARKNESS; 2007 : 255 - FOW_DARKNESS;
1914 } 2008 }
1915 } 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 }
1916 2040
1917 EXTEND (SP, 3); 2041 EXTEND (SP, 3);
1918 PUSHs (sv_2mortal (newSViv (sw4))); 2042 PUSHs (sv_2mortal (newSViv (sw4)));
1919 PUSHs (sv_2mortal (newSViv (sh))); 2043 PUSHs (sv_2mortal (newSViv (sh)));
1920 PUSHs (darkness_sv); 2044 PUSHs (darkness_sv);
… …
2094 CODE: 2218 CODE:
2095 RETVAL = Mix_VolumeMusic (volume); 2219 RETVAL = Mix_VolumeMusic (volume);
2096 OUTPUT: 2220 OUTPUT:
2097 RETVAL 2221 RETVAL
2098 2222
2223int
2224fade_out (int ms)
2225 CODE:
2226 RETVAL = Mix_FadeOutMusic (ms);
2227 OUTPUT:
2228 RETVAL
2229
2099CFPlus::MixMusic 2230CFPlus::MixMusic
2100new_from_file (SV *class, char *path) 2231new_from_file (SV *class, char *path)
2101 CODE: 2232 CODE:
2102 RETVAL = Mix_LoadMUS (path); 2233 RETVAL = Mix_LoadMUS (path);
2103 OUTPUT: 2234 OUTPUT:
… …
2110 2241
2111int 2242int
2112play (CFPlus::MixMusic self, int loops = -1) 2243play (CFPlus::MixMusic self, int loops = -1)
2113 CODE: 2244 CODE:
2114 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);
2115 OUTPUT: 2253 OUTPUT:
2116 RETVAL 2254 RETVAL
2117 2255
2118MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2256MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2119 2257
… …
2123 static const struct { 2261 static const struct {
2124 const char *name; 2262 const char *name;
2125 IV iv; 2263 IV iv;
2126 } *civ, const_iv[] = { 2264 } *civ, const_iv[] = {
2127# 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),
2128 const_iv (GL_COLOR_MATERIAL), 2269 const_iv (GL_COLOR_MATERIAL),
2129 const_iv (GL_SMOOTH), 2270 const_iv (GL_SMOOTH),
2130 const_iv (GL_FLAT), 2271 const_iv (GL_FLAT),
2131 const_iv (GL_DITHER), 2272 const_iv (GL_DITHER),
2132 const_iv (GL_BLEND), 2273 const_iv (GL_BLEND),
… …
2159 const_iv (GL_LUMINANCE), 2300 const_iv (GL_LUMINANCE),
2160 const_iv (GL_LUMINANCE_ALPHA), 2301 const_iv (GL_LUMINANCE_ALPHA),
2161 const_iv (GL_FLOAT), 2302 const_iv (GL_FLOAT),
2162 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2303 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2163 const_iv (GL_COMPILE), 2304 const_iv (GL_COMPILE),
2305 const_iv (GL_PROXY_TEXTURE_1D),
2306 const_iv (GL_PROXY_TEXTURE_2D),
2164 const_iv (GL_TEXTURE_1D), 2307 const_iv (GL_TEXTURE_1D),
2165 const_iv (GL_TEXTURE_2D), 2308 const_iv (GL_TEXTURE_2D),
2166 const_iv (GL_TEXTURE_ENV), 2309 const_iv (GL_TEXTURE_ENV),
2167 const_iv (GL_TEXTURE_MAG_FILTER), 2310 const_iv (GL_TEXTURE_MAG_FILTER),
2168 const_iv (GL_TEXTURE_MIN_FILTER), 2311 const_iv (GL_TEXTURE_MIN_FILTER),
… …
2208# undef const_iv 2351# undef const_iv
2209 }; 2352 };
2210 2353
2211 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; )
2212 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);
2213} 2359}
2214 2360
2215char * 2361char *
2216gl_vendor () 2362gl_vendor ()
2217 CODE: 2363 CODE:
… …
2228 2374
2229char * 2375char *
2230gl_extensions () 2376gl_extensions ()
2231 CODE: 2377 CODE:
2232 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);
2233 OUTPUT: 2393 OUTPUT:
2234 RETVAL 2394 RETVAL
2235 2395
2236int glGetError () 2396int glGetError ()
2237 2397
… …
2362 2522
2363void 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)
2364 2524
2365void glDrawPixels (int width, int height, int format, int type, char *pixels) 2525void glDrawPixels (int width, int height, int format, int type, char *pixels)
2366 2526
2527void glPixelZoom (float x, float y)
2528
2367void 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)
2368 2530
2369int glGenTexture () 2531int glGenTexture ()
2370 CODE: 2532 CODE:
2371{ 2533 RETVAL = gen_texture ();
2372 GLuint name;
2373 glGenTextures (1, &name);
2374 RETVAL = name;
2375}
2376 OUTPUT: 2534 OUTPUT:
2377 RETVAL 2535 RETVAL
2378 2536
2379void glDeleteTexture (int name) 2537void glDeleteTexture (int name)
2380 CODE: 2538 CODE:
2381{
2382 GLuint name_ = name;
2383 glDeleteTextures (1, &name_); 2539 del_texture (name);
2384} 2540
2385
2386int glGenList () 2541int glGenList ()
2387 CODE: 2542 CODE:
2388 RETVAL = glGenLists (1); 2543 RETVAL = glGenLists (1);
2389 OUTPUT: 2544 OUTPUT:
2390 RETVAL 2545 RETVAL

Diff Legend

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