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.264 by root, Fri Jul 18 22:32:54 2008 UTC vs.
Revision 1.296 by root, Mon Dec 21 23:52:34 2009 UTC

… …
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
… …
38#include <SDL_thread.h> 37#include <SDL_thread.h>
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46#endif
43 47
44#define PANGO_ENABLE_BACKEND 48#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 49#define G_DISABLE_CAST_CHECKS
46 50
47#include <glib/gmacros.h> 51#include <glib/gmacros.h>
… …
76#define expect_false(expr) expect ((expr) != 0, 0) 80#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 81#define expect_true(expr) expect ((expr) != 0, 1)
78 82
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 84
85/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
82 89
83#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
85 92
86#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
87 94
88/* mask out modifiers we are not interested in */ 95/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
97
98#define KMOD_LRAM 0x10000 // our extension
99
100#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2
102#define TEXID_HIDDEN 3
90 103
91static AV *texture_av; 104static AV *texture_av;
92 105
93static struct 106static struct
94{ 107{
… …
226 int w, h; 239 int w, h;
227 float s, t; 240 float s, t;
228 uint8_t r, g, b, a; 241 uint8_t r, g, b, a;
229 tileid smoothtile; 242 tileid smoothtile;
230 uint8_t smoothlevel; 243 uint8_t smoothlevel;
244 uint8_t unused; /* set to zero on use */
231} maptex; 245} maptex;
232 246
233typedef struct { 247typedef struct {
234 uint32_t player; 248 uint32_t player;
235 tileid tile[3]; 249 tileid tile[3];
… …
367 self->oy = 0; 381 self->oy = 0;
368 self->row = 0; 382 self->row = 0;
369 self->rows = 0; 383 self->rows = 0;
370} 384}
371 385
386#define CELL_CLEAR(cell) \
387 do { \
388 if ((cell)->player) \
389 (cell)->tile [2] = 0; \
390 (cell)->darkness = 0; \
391 (cell)->stat_hp = 0; \
392 (cell)->flags = 0; \
393 (cell)->player = 0; \
394 } while (0)
395
372static void 396static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 397map_blank (DC__Map self, int x0, int y0, int w, int h)
374{ 398{
375 int x, y; 399 int x, y;
376 maprow *row; 400 maprow *row;
… …
390 if (x >= row->c1) 414 if (x >= row->c1)
391 break; 415 break;
392 416
393 cell = row->col + x - row->c0; 417 cell = row->col + x - row->c0;
394 418
395 cell->darkness = 0; 419 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 420 }
400 } 421 }
401} 422}
402 423
403typedef struct { 424typedef struct {
… …
514 if (!svp || !SvTRUE (*svp)) 535 if (!svp || !SvTRUE (*svp))
515 return 0; 536 return 0;
516 537
517 return 1; 538 return 1;
518} 539}
540
541/******************************************************************************/
542
543/* process keyboard modifiers */
544static int
545mod_munge (int mod)
546{
547 mod &= MOD_MASK;
548
549 if (mod & (KMOD_META | KMOD_ALT))
550 mod |= KMOD_LRAM;
551
552 return mod;
553}
554
555static void
556deliantra_main ()
557{
558 char *argv[] = { 0 };
559 call_argv ("::main", G_DISCARD | G_VOID, argv);
560}
561
562#ifdef __MACOSX__
563 /* to due surprising braindamage on the side of SDL design, we
564 * do some mind-boggling hack here: SDL requires a custom main()
565 * on OS X, so... we provide one and call the original main(), which,
566 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
567 * and which calls our main (== SDL_main) back.
568 */
569 extern C_LINKAGE int
570 main (int argc, char *argv[])
571 {
572 deliantra_main ();
573 }
574
575 #undef main
576
577 extern C_LINKAGE int main (int argc, char *argv[]);
578
579 static void
580 SDL_braino (void)
581 {
582 char *argv[] = { "deliantra client", 0 };
583 (main) (1, argv);
584 }
585#else
586 static void
587 SDL_braino (void)
588 {
589 deliantra_main ();
590 }
591#endif
519 592
520MODULE = Deliantra::Client PACKAGE = DC 593MODULE = Deliantra::Client PACKAGE = DC
521 594
522PROTOTYPES: ENABLE 595PROTOTYPES: ENABLE
523 596
… …
552 const_iv (SDL_USEREVENT), 625 const_iv (SDL_USEREVENT),
553 626
554 const_iv (SDL_APPINPUTFOCUS), 627 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 628 const_iv (SDL_APPMOUSEFOCUS),
556 const_iv (SDL_APPACTIVE), 629 const_iv (SDL_APPACTIVE),
630
631
632 const_iv (SDLK_UNKNOWN),
633 const_iv (SDLK_FIRST),
634 const_iv (SDLK_BACKSPACE),
635 const_iv (SDLK_TAB),
636 const_iv (SDLK_CLEAR),
637 const_iv (SDLK_RETURN),
638 const_iv (SDLK_PAUSE),
639 const_iv (SDLK_ESCAPE),
640 const_iv (SDLK_SPACE),
641 const_iv (SDLK_EXCLAIM),
642 const_iv (SDLK_QUOTEDBL),
643 const_iv (SDLK_HASH),
644 const_iv (SDLK_DOLLAR),
645 const_iv (SDLK_AMPERSAND),
646 const_iv (SDLK_QUOTE),
647 const_iv (SDLK_LEFTPAREN),
648 const_iv (SDLK_RIGHTPAREN),
649 const_iv (SDLK_ASTERISK),
650 const_iv (SDLK_PLUS),
651 const_iv (SDLK_COMMA),
652 const_iv (SDLK_MINUS),
653 const_iv (SDLK_PERIOD),
654 const_iv (SDLK_SLASH),
655 const_iv (SDLK_0),
656 const_iv (SDLK_1),
657 const_iv (SDLK_2),
658 const_iv (SDLK_3),
659 const_iv (SDLK_4),
660 const_iv (SDLK_5),
661 const_iv (SDLK_6),
662 const_iv (SDLK_7),
663 const_iv (SDLK_8),
664 const_iv (SDLK_9),
665 const_iv (SDLK_COLON),
666 const_iv (SDLK_SEMICOLON),
667 const_iv (SDLK_LESS),
668 const_iv (SDLK_EQUALS),
669 const_iv (SDLK_GREATER),
670 const_iv (SDLK_QUESTION),
671 const_iv (SDLK_AT),
672
673 const_iv (SDLK_LEFTBRACKET),
674 const_iv (SDLK_BACKSLASH),
675 const_iv (SDLK_RIGHTBRACKET),
676 const_iv (SDLK_CARET),
677 const_iv (SDLK_UNDERSCORE),
678 const_iv (SDLK_BACKQUOTE),
679 const_iv (SDLK_DELETE),
557 680
558 const_iv (SDLK_FIRST), 681 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 682 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 683 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 684 const_iv (SDLK_KP1),
… …
637 const_iv (KMOD_RMETA), 760 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 761 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 762 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 763 const_iv (KMOD_MODE),
641 764
765 const_iv (KMOD_LRAM),
766
642 const_iv (MIX_DEFAULT_FORMAT), 767 const_iv (MIX_DEFAULT_FORMAT),
643 768
644 const_iv (SDL_INIT_TIMER), 769 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 770 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 771 const_iv (SDL_INIT_VIDEO),
… …
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 789 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO), 790 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 791 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES), 792 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL), 793 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL) 794 const_iv (SDL_GL_SWAP_CONTROL),
795
796 const_iv (FOW_DARKNESS)
670# undef const_iv 797# undef const_iv
671 }; 798 };
672 799
673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 800 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 801 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
695NV ceil (NV x) 822NV ceil (NV x)
696 823
697IV minpot (UV n) 824IV minpot (UV n)
698 825
699IV popcount (UV n) 826IV popcount (UV n)
827
828NV distance (NV dx, NV dy)
829 CODE:
830 RETVAL = pow (dx * dx + dy * dy, 0.5);
831 OUTPUT:
832 RETVAL
700 833
701void 834void
702pango_init () 835pango_init ()
703 CODE: 836 CODE:
704{ 837{
… …
712#endif 845#endif
713} 846}
714 847
715char *SDL_GetError () 848char *SDL_GetError ()
716 849
850void SDL_braino ()
851
717int SDL_Init (U32 flags) 852int SDL_Init (U32 flags)
718 853
719int SDL_InitSubSystem (U32 flags) 854int SDL_InitSubSystem (U32 flags)
720 855
721void SDL_QuitSubSystem (U32 flags) 856void SDL_QuitSubSystem (U32 flags)
… …
756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 891 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
757 892
758 if (m && m != (SDL_Rect **)-1) 893 if (m && m != (SDL_Rect **)-1)
759 while (*m) 894 while (*m)
760 { 895 {
896 if ((*m)->w >= 400 && (*m)->h >= 300)
897 {
761 AV *av = newAV (); 898 AV *av = newAV ();
762 av_push (av, newSViv ((*m)->w)); 899 av_push (av, newSViv ((*m)->w));
763 av_push (av, newSViv ((*m)->h)); 900 av_push (av, newSViv ((*m)->h));
764 av_push (av, newSViv (rgb)); 901 av_push (av, newSViv (rgb));
765 av_push (av, newSViv (alpha)); 902 av_push (av, newSViv (alpha));
766 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 903 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
904 }
767 905
768 ++m; 906 ++m;
769 } 907 }
770} 908}
771 909
… …
826 { 964 {
827 case SDL_KEYDOWN: 965 case SDL_KEYDOWN:
828 case SDL_KEYUP: 966 case SDL_KEYUP:
829 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 967 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
830 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 968 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
831 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 969 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
832 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 970 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
833 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 971 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
834 break; 972 break;
835 973
836 case SDL_ACTIVEEVENT: 974 case SDL_ACTIVEEVENT:
837 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 975 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
855 x = ev.motion.x; 993 x = ev.motion.x;
856 y = ev.motion.y; 994 y = ev.motion.y;
857 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 995 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
858 } 996 }
859 997
860 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 998 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
861 hv_store (hv, "state", 5, newSViv (state), 0); 999 hv_store (hv, "state", 5, newSViv (state), 0);
862 hv_store (hv, "x", 1, newSViv (x), 0); 1000 hv_store (hv, "x", 1, newSViv (x), 0);
863 hv_store (hv, "y", 1, newSViv (y), 0); 1001 hv_store (hv, "y", 1, newSViv (y), 0);
864 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1002 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
865 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1003 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1081#if DEBUG 1219#if DEBUG
1082 VALGRIND_DO_LEAK_CHECK; 1220 VALGRIND_DO_LEAK_CHECK;
1083#endif 1221#endif
1084} 1222}
1085 1223
1224int
1225SvREFCNT (SV *sv)
1226 CODE:
1227 RETVAL = SvREFCNT (sv);
1228 OUTPUT:
1229 RETVAL
1230
1086MODULE = Deliantra::Client PACKAGE = DC::Font 1231MODULE = Deliantra::Client PACKAGE = DC::Font
1087 1232
1088PROTOTYPES: DISABLE 1233PROTOTYPES: DISABLE
1089 1234
1090DC::Font 1235DC::Font
… …
1519 if (ix) 1664 if (ix)
1520 { 1665 {
1521 glDisable (GL_ALPHA_TEST); 1666 glDisable (GL_ALPHA_TEST);
1522 glDisable (GL_BLEND); 1667 glDisable (GL_BLEND);
1523 } 1668 }
1669}
1670
1671void
1672draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1673 PROTOTYPE: @
1674 CODE:
1675{
1676 glEnable (GL_TEXTURE_2D);
1677 glEnable (GL_BLEND);
1678 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1679 glBindTexture (GL_TEXTURE_2D, name1);
1680
1681 glColor3f (intensity, intensity, intensity);
1682 glPushMatrix ();
1683 glScalef (1./3, 1./3, 1.);
1684
1685 if (blend > 0.f)
1686 {
1687 float dx3 = dx * -3.f / w;
1688 float dy3 = dy * -3.f / h;
1689 GLfloat env_color[4] = { 0., 0., 0., blend };
1690
1691 /* interpolate the two shadow textures */
1692 /* stage 0 == rgb(glcolor) + alpha(t0) */
1693 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1694
1695 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1696 gl.ActiveTexture (GL_TEXTURE1);
1697 glEnable (GL_TEXTURE_2D);
1698 glBindTexture (GL_TEXTURE_2D, name2);
1699 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1700
1701 /* rgb == rgb(glcolor) */
1702 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1705
1706 /* alpha = interpolate t0, t1 by env_alpha */
1707 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1708
1709 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1710 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1712
1713 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1714 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1715
1716 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1717 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1718
1719 glBegin (GL_QUADS);
1720 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1721 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1722 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1723 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1724 glEnd ();
1725
1726 glDisable (GL_TEXTURE_2D);
1727 gl.ActiveTexture (GL_TEXTURE0);
1728 }
1729 else
1730 {
1731 /* simple blending of one texture, also opengl <1.3 path */
1732 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1733
1734 glBegin (GL_QUADS);
1735 glTexCoord2f (0, 0); glVertex2f (0, 0);
1736 glTexCoord2f (0, t); glVertex2f (0, h);
1737 glTexCoord2f (s, t); glVertex2f (w, h);
1738 glTexCoord2f (s, 0); glVertex2f (w, 0);
1739 glEnd ();
1740 }
1741
1742 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1743 {
1744 int x, y;
1745 int dx3 = dx * 3;
1746 int dy3 = dy * 3;
1747
1748 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1749 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1750 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1751 glTranslatef (-1., -1., 0);
1752 glBegin (GL_QUADS);
1753
1754 for (y = 1; y < h; y += 3)
1755 {
1756 int y1 = y - dy3;
1757 int y1valid = y1 >= 0 && y1 < h;
1758
1759 for (x = 1; x < w; x += 3)
1760 {
1761 int x1 = x - dx3;
1762 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1763 uint8_t h2;
1764
1765 if (y1valid && x1 >= 0 && x1 < w)
1766 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1767 else
1768 h2 = 1; /* out of range == invisible */
1769
1770 if (h1 || h2)
1771 {
1772 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1773 glColor4f (1., 1., 1., alpha);
1774
1775 glTexCoord2f (0, 0.); glVertex2i (x , y );
1776 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1777 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1778 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1779 }
1780 }
1781 }
1782 }
1783
1784 glEnd ();
1785
1786 glPopMatrix ();
1787
1788 glDisable (GL_TEXTURE_2D);
1789 glDisable (GL_BLEND);
1524} 1790}
1525 1791
1526IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1792IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1527 CODE: 1793 CODE:
1528{ 1794{
… …
1634 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1900 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1635 // use uglier nearest interpolation because linear suffers 1901 // use uglier nearest interpolation because linear suffers
1636 // from transparent color bleeding and ugly wrapping effects. 1902 // from transparent color bleeding and ugly wrapping effects.
1637 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1903 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1638} 1904}
1905
1906void
1907expire_textures (DC::Map self, int texid, int count)
1908 PPCODE:
1909 for (; texid < self->texs && count; ++texid, --count)
1910 {
1911 maptex *tex = self->tex + texid;
1912
1913 if (tex->name)
1914 {
1915 if (tex->unused)
1916 {
1917 tex->name = 0;
1918 tex->unused = 0;
1919 XPUSHs (sv_2mortal (newSViv (texid)));
1920 }
1921 else
1922 tex->unused = 1;
1923 }
1924 }
1639 1925
1640int 1926int
1641ox (DC::Map self) 1927ox (DC::Map self)
1642 ALIAS: 1928 ALIAS:
1643 oy = 1 1929 oy = 1
… …
1724 { 2010 {
1725 ext = *data++; 2011 ext = *data++;
1726 cmd = ext & 0x7f; 2012 cmd = ext & 0x7f;
1727 2013
1728 if (cmd < 4) 2014 if (cmd < 4)
1729 cell->darkness = 255 - ext * 64 + 1; 2015 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1730 else if (cmd == 5) // health 2016 else if (cmd == 5) // health
1731 { 2017 {
1732 cell->stat_width = 1; 2018 cell->stat_width = 1;
1733 cell->stat_hp = *data++; 2019 cell->stat_hp = *data++;
1734 } 2020 }
… …
1764 cell->tile [z] = self->face2tile [face]; 2050 cell->tile [z] = self->face2tile [face];
1765 2051
1766 if (cell->tile [z]) 2052 if (cell->tile [z])
1767 { 2053 {
1768 maptex *tex = self->tex + cell->tile [z]; 2054 maptex *tex = self->tex + cell->tile [z];
2055 tex->unused = 0;
1769 if (!tex->name) 2056 if (!tex->name)
1770 av_push (missing, newSViv (cell->tile [z])); 2057 av_push (missing, newSViv (cell->tile [z]));
1771 2058
1772 if (tex->smoothtile) 2059 if (tex->smoothtile)
1773 { 2060 {
1774 maptex *smooth = self->tex + tex->smoothtile; 2061 maptex *smooth = self->tex + tex->smoothtile;
2062 smooth->unused = 0;
1775 if (!smooth->name) 2063 if (!smooth->name)
1776 av_push (missing, newSViv (tex->smoothtile)); 2064 av_push (missing, newSViv (tex->smoothtile));
1777 } 2065 }
1778 } 2066 }
1779 } 2067 }
1780 } 2068 }
1781 else 2069 else
1782 cell->darkness = 0; 2070 CELL_CLEAR (cell);
1783 } 2071 }
1784} 2072}
1785 OUTPUT: 2073 OUTPUT:
1786 RETVAL 2074 RETVAL
1787 2075
… …
1839} 2127}
1840 OUTPUT: 2128 OUTPUT:
1841 RETVAL 2129 RETVAL
1842 2130
1843void 2131void
1844draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2132draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1845 CODE: 2133 CODE:
1846{ 2134{
1847 int x, y, z; 2135 int x, y, z;
1848 2136
1849 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2137 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1850 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2138 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1851 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2139 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1852 smooth_key skey; 2140 smooth_key skey;
1853 int pl_x, pl_y; 2141 int pl_x, pl_y;
1854 maptex pl_tex; 2142 maptex pl_tex;
1855 rc_t *rc = rc_alloc (); 2143 rc_t *rc = rc_alloc ();
2144 rc_t *rc_ov = rc_alloc ();
1856 rc_key_t key; 2145 rc_key_t key;
1857 rc_array_t *arr; 2146 rc_array_t *arr, *arr_hidden;
1858 2147
1859 pl_tex.name = 0; 2148 pl_tex.name = 0;
1860 2149
1861 // thats current max. sorry. 2150 // that's current max. sorry.
1862 if (sw > 255) sw = 255; 2151 if (sw > 255) sw = 255;
1863 if (sh > 255) sh = 255; 2152 if (sh > 255) sh = 255;
1864 2153
1865 // clear key, in case of extra padding 2154 // clear key, in case of extra padding
1866 memset (&skey, 0, sizeof (skey)); 2155 memset (&skey, 0, sizeof (skey));
… …
1870 key.g = 255; 2159 key.g = 255;
1871 key.b = 255; 2160 key.b = 255;
1872 key.a = 255; 2161 key.a = 255;
1873 key.mode = GL_QUADS; 2162 key.mode = GL_QUADS;
1874 key.format = GL_T2F_V3F; 2163 key.format = GL_T2F_V3F;
1875 key.texname = -1;
1876 2164
1877 mx += self->x; 2165 mx += self->x;
1878 my += self->y; 2166 my += self->y;
1879 2167
1880 // first pass: determine smooth_max 2168 // first pass: determine smooth_max
… …
1901 2189
1902 glEnable (GL_BLEND); 2190 glEnable (GL_BLEND);
1903 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2191 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1904 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2192 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1905 2193
2194 key.texname = self->tex [TEXID_HIDDEN].name;
2195 arr_hidden = rc_array (rc_ov, &key);
2196
1906 for (z = 0; z <= 2; z++) 2197 for (z = 0; z <= 2; z++)
1907 { 2198 {
1908 memset (smooth_level, 0, sizeof (smooth_level)); 2199 memset (smooth_level, 0, sizeof (smooth_level));
2200 key.texname = -1;
1909 2201
1910 for (y = 0; y < sh; y++) 2202 for (y = 0; y < sh; y++)
1911 if (0 <= y + my && y + my < self->rows) 2203 if (0 <= y + my && y + my < self->rows)
1912 { 2204 {
1913 maprow *row = self->row + (y + my); 2205 maprow *row = self->row + (y + my);
… …
1919 tileid tile = cell->tile [z]; 2211 tileid tile = cell->tile [z];
1920 2212
1921 if (tile) 2213 if (tile)
1922 { 2214 {
1923 maptex tex = self->tex [tile]; 2215 maptex tex = self->tex [tile];
1924 int px = (x + 1) * T - tex.w; 2216 int px, py;
1925 int py = (y + 1) * T - tex.h;
1926 2217
1927 if (key.texname != tex.name) 2218 if (key.texname != tex.name)
1928 { 2219 {
2220 self->tex [tile].unused = 0;
2221
1929 if (!tex.name) 2222 if (!tex.name)
1930 tex = self->tex [2]; /* missing, replace by noface */ 2223 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1931 2224
1932 key.texname = tex.name; 2225 key.texname = tex.name;
1933 arr = rc_array (rc, &key); 2226 arr = rc_array (rc, &key);
1934 } 2227 }
2228
2229 px = (x + 1) * T - tex.w;
2230 py = (y + 1) * T - tex.h;
1935 2231
1936 if (expect_false (cell->player == player) && expect_false (z == 2)) 2232 if (expect_false (cell->player == player) && expect_false (z == 2))
1937 { 2233 {
1938 pl_x = px; 2234 pl_x = px;
1939 pl_y = py; 2235 pl_y = py;
… …
1944 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2240 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1945 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2241 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1946 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2242 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1947 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2243 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1948 2244
1949 if (expect_false (cell->flags) && expect_false (z == 2))
1950 {
1951 // overlays such as the speech bubble, probably more to come
1952 if (cell->flags & 1)
1953 {
1954 maptex tex = self->tex [1];
1955 int px = x * T + T * 2 / 32;
1956 int py = y * T - T * 6 / 32;
1957
1958 if (tex.name)
1959 {
1960 if (key.texname != tex.name)
1961 {
1962 key.texname = tex.name;
1963 arr = rc_array (rc, &key);
1964 }
1965
1966 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1967 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1968 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1969 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1970 }
1971 }
1972 }
1973
1974 // update smooth hash 2245 // update smooth hash
1975 if (tex.smoothtile) 2246 if (tex.smoothtile)
1976 { 2247 {
1977 skey.tile = tex.smoothtile; 2248 skey.tile = tex.smoothtile;
1978 skey.level = tex.smoothlevel; 2249 skey.level = tex.smoothlevel;
… …
2006 // corners 2277 // corners
2007 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2278 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2008 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2279 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2009 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2280 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2010 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2281 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2282 }
2283 }
2284
2285 if (expect_false (z == 2) && expect_false (cell->flags))
2286 {
2287 // overlays such as the speech bubble, probably more to come
2288 if (cell->flags & 1)
2289 {
2290 rc_key_t key_ov = key;
2291 maptex tex = self->tex [TEXID_SPEECH];
2292 rc_array_t *arr;
2293 int px = x * T + T * 2 / 32;
2294 int py = y * T - T * 6 / 32;
2295
2296 key_ov.texname = tex.name;
2297 arr = rc_array (rc_ov, &key_ov);
2298
2299 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2300 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2301 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2302 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2011 } 2303 }
2012 } 2304 }
2013 } 2305 }
2014 } 2306 }
2015 2307
… …
2055 { 2347 {
2056 // this time avoiding texture state changes 2348 // this time avoiding texture state changes
2057 // save gobs of state changes. 2349 // save gobs of state changes.
2058 if (key.texname != tex.name) 2350 if (key.texname != tex.name)
2059 { 2351 {
2352 self->tex [skey->tile].unused = 0;
2353
2060 glEnd (); 2354 glEnd ();
2061 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2355 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2062 glBegin (GL_QUADS); 2356 glBegin (GL_QUADS);
2063 } 2357 }
2064 2358
… …
2096 } 2390 }
2097 2391
2098 if (pl_tex.name) 2392 if (pl_tex.name)
2099 { 2393 {
2100 maptex tex = pl_tex; 2394 maptex tex = pl_tex;
2101 int px = pl_x + pdx; 2395 int px = pl_x + sdx;
2102 int py = pl_y + pdy; 2396 int py = pl_y + sdy;
2103 2397
2104 key.texname = tex.name; 2398 key.texname = tex.name;
2105 arr = rc_array (rc, &key); 2399 arr = rc_array (rc, &key);
2106 2400
2107 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2401 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
… …
2110 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2404 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2111 2405
2112 rc_draw (rc); 2406 rc_draw (rc);
2113 } 2407 }
2114 2408
2409 rc_draw (rc_ov);
2410 rc_clear (rc_ov);
2411
2115 glDisable (GL_BLEND); 2412 glDisable (GL_BLEND);
2116 rc_free (rc); 2413 rc_free (rc);
2414 rc_free (rc_ov);
2117 2415
2118 // top layer: overlays such as the health bar 2416 // top layer: overlays such as the health bar
2119 for (y = 0; y < sh; y++) 2417 for (y = 0; y < sh; y++)
2120 if (0 <= y + my && y + my < self->rows) 2418 if (0 <= y + my && y + my < self->rows)
2121 { 2419 {
… …
2126 { 2424 {
2127 mapcell *cell = row->col + (x + mx - row->c0); 2425 mapcell *cell = row->col + (x + mx - row->c0);
2128 2426
2129 int px = x * T; 2427 int px = x * T;
2130 int py = y * T; 2428 int py = y * T;
2429
2430 if (expect_false (cell->player == player))
2431 {
2432 px += sdx;
2433 py += sdy;
2434 }
2131 2435
2132 if (cell->stat_hp) 2436 if (cell->stat_hp)
2133 { 2437 {
2134 int width = cell->stat_width * T; 2438 int width = cell->stat_width * T;
2135 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2439 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2146 } 2450 }
2147 } 2451 }
2148} 2452}
2149 2453
2150void 2454void
2151draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2455draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2152 CODE: 2456 CODE:
2153{ 2457{
2154 static float color[16][3] = { 2458 static float color[16][3] = {
2155 { 0.00F, 0.00F, 0.00F }, 2459 { 0.00f, 0.00f, 0.00f },
2156 { 1.00F, 1.00F, 1.00F }, 2460 { 1.00f, 1.00f, 1.00f },
2157 { 0.00F, 0.00F, 0.55F }, 2461 { 0.00f, 0.00f, 0.55f },
2158 { 1.00F, 0.00F, 0.00F }, 2462 { 1.00f, 0.00f, 0.00f },
2159 2463
2160 { 1.00F, 0.54F, 0.00F }, 2464 { 1.00f, 0.54f, 0.00f },
2161 { 0.11F, 0.56F, 1.00F }, 2465 { 0.11f, 0.56f, 1.00f },
2162 { 0.93F, 0.46F, 0.00F }, 2466 { 0.93f, 0.46f, 0.00f },
2163 { 0.18F, 0.54F, 0.34F }, 2467 { 0.18f, 0.54f, 0.34f },
2164 2468
2165 { 0.56F, 0.73F, 0.56F }, 2469 { 0.56f, 0.73f, 0.56f },
2166 { 0.80F, 0.80F, 0.80F }, 2470 { 0.80f, 0.80f, 0.80f },
2167 { 0.55F, 0.41F, 0.13F }, 2471 { 0.55f, 0.41f, 0.13f },
2168 { 0.99F, 0.77F, 0.26F }, 2472 { 0.99f, 0.77f, 0.26f },
2169 2473
2170 { 0.74F, 0.65F, 0.41F }, 2474 { 0.74f, 0.65f, 0.41f },
2171 2475
2172 { 0.00F, 1.00F, 1.00F }, 2476 { 0.00f, 1.00f, 1.00f },
2173 { 1.00F, 0.00F, 1.00F }, 2477 { 1.00f, 0.00f, 1.00f },
2174 { 1.00F, 1.00F, 0.00F }, 2478 { 1.00f, 1.00f, 0.00f },
2175 }; 2479 };
2176 2480
2177 int x, y; 2481 int x, y;
2178 2482
2179 glEnable (GL_TEXTURE_2D); 2483 glEnable (GL_TEXTURE_2D);
2484 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2485 * but the nvidia driver (185.18.14) mishandles alpha textures
2486 * and takes the colour from god knows where instead of using
2487 * Cp. MODULATE results in the same colour, but slightly different
2488 * alpha, but atcually gives us the correct colour with nvidia.
2489 */
2180 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2490 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2181 glEnable (GL_BLEND); 2491 glEnable (GL_BLEND);
2182 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2492 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2183 glBegin (GL_QUADS); 2493 glBegin (GL_QUADS);
2184 2494
2185 for (y = 0; y < h; y++) 2495 for (y = 0; y < h; y++)
… …
2189 2499
2190 if (m) 2500 if (m)
2191 { 2501 {
2192 float *c = color [m & 15]; 2502 float *c = color [m & 15];
2193 2503
2194 float tx1 = m & 0x40 ? 0.5 : 0.; 2504 float tx1 = m & 0x40 ? 0.5f : 0.f;
2195 float tx2 = tx1 + 0.5; 2505 float tx2 = tx1 + 0.5f;
2196 2506
2197 glColor4f (c[0], c[1], c[2], 0.75); 2507 glColor4f (c[0], c[1], c[2], 1);
2198 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2508 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2199 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2509 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2200 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2510 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2201 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2511 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2202 } 2512 }
… …
2210void 2520void
2211fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2521fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2212 PPCODE: 2522 PPCODE:
2213{ 2523{
2214 int x, y; 2524 int x, y;
2215 int sw1 = sw + 2; 2525 int sw1 = sw + 2;
2216 int sh1 = sh + 2; 2526 int sh1 = sh + 2;
2217 int sh3 = sh * 3; 2527 int sh3 = sh * 3;
2218 int sw34 = (sw * 3 + 3) & ~3; 2528 int sw3 = sw * 3;
2219 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2529 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2220 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2530 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2221 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2531 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2222 2532
2223 SvPOK_only (darkness3_sv); 2533 SvPOK_only (darkness3_sv);
2224 SvCUR_set (darkness3_sv, sw34 * sh3); 2534 SvCUR_set (darkness3_sv, sw3 * sh3);
2225 2535
2226 mx += self->x - 1; 2536 mx += self->x - 1;
2227 my += self->y - 1; 2537 my += self->y - 1;
2228
2229 memset (darkness1, 255, sw1 * sh1);
2230 2538
2231 for (y = 0; y < sh1; y++) 2539 for (y = 0; y < sh1; y++)
2232 if (0 <= y + my && y + my < self->rows) 2540 if (0 <= y + my && y + my < self->rows)
2233 { 2541 {
2234 maprow *row = self->row + (y + my); 2542 maprow *row = self->row + (y + my);
… …
2237 if (row->c0 <= x + mx && x + mx < row->c1) 2545 if (row->c0 <= x + mx && x + mx < row->c1)
2238 { 2546 {
2239 mapcell *cell = row->col + (x + mx - row->c0); 2547 mapcell *cell = row->col + (x + mx - row->c0);
2240 2548
2241 darkness1 [y * sw1 + x] = cell->darkness 2549 darkness1 [y * sw1 + x] = cell->darkness
2242 ? 255 - (cell->darkness - 1) 2550 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2243 : 255 - FOW_DARKNESS; 2551 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2244 } 2552 }
2245 } 2553 }
2246 2554
2247 for (y = 0; y < sh; ++y) 2555 for (y = 0; y < sh; ++y)
2248 for (x = 0; x < sw; ++x) 2556 for (x = 0; x < sw; ++x)
… …
2267 2575
2268 uint8_t r13 = (d13 + d23 + d12) / 3; 2576 uint8_t r13 = (d13 + d23 + d12) / 3;
2269 uint8_t r23 = d23; 2577 uint8_t r23 = d23;
2270 uint8_t r33 = (d23 + d33 + d32) / 3; 2578 uint8_t r33 = (d23 + d33 + d32) / 3;
2271 2579
2272 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2580 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2273 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2581 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2274 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2582 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2275 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2583 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2276 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2584 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2277 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2585 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2278 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2586 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2279 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2587 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2280 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2588 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2281 } 2589 }
2282 2590
2283 free (darkness1); 2591 free (darkness1);
2284 2592
2285 EXTEND (SP, 3); 2593 EXTEND (SP, 3);
2286 PUSHs (sv_2mortal (newSViv (sw34))); 2594 PUSHs (sv_2mortal (newSViv (sw3)));
2287 PUSHs (sv_2mortal (newSViv (sh3))); 2595 PUSHs (sv_2mortal (newSViv (sh3)));
2288 PUSHs (darkness3_sv); 2596 PUSHs (darkness3_sv);
2289} 2597}
2290 2598
2291SV * 2599SV *
… …
2548void 2856void
2549set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2857set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2550 CODE: 2858 CODE:
2551{ 2859{
2552 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2860 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2553 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2861 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2554 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2862 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2555} 2863}
2556 2864
2557void 2865void
2558set_reverse_stereo (DC::Channel self, int flip) 2866set_reverse_stereo (DC::Channel self, int flip)
… …
2661 } *civ, const_iv[] = { 2969 } *civ, const_iv[] = {
2662# define const_iv(name) { # name, (IV)name } 2970# define const_iv(name) { # name, (IV)name }
2663 const_iv (GL_VENDOR), 2971 const_iv (GL_VENDOR),
2664 const_iv (GL_VERSION), 2972 const_iv (GL_VERSION),
2665 const_iv (GL_EXTENSIONS), 2973 const_iv (GL_EXTENSIONS),
2974 const_iv (GL_MAX_TEXTURE_UNITS),
2666 const_iv (GL_COLOR_MATERIAL), 2975 const_iv (GL_COLOR_MATERIAL),
2667 const_iv (GL_SMOOTH), 2976 const_iv (GL_SMOOTH),
2668 const_iv (GL_FLAT), 2977 const_iv (GL_FLAT),
2669 const_iv (GL_DITHER), 2978 const_iv (GL_DITHER),
2670 const_iv (GL_BLEND), 2979 const_iv (GL_BLEND),
… …
2682 const_iv (GL_ZERO), 2991 const_iv (GL_ZERO),
2683 const_iv (GL_SRC_ALPHA), 2992 const_iv (GL_SRC_ALPHA),
2684 const_iv (GL_DST_ALPHA), 2993 const_iv (GL_DST_ALPHA),
2685 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2994 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2686 const_iv (GL_ONE_MINUS_DST_ALPHA), 2995 const_iv (GL_ONE_MINUS_DST_ALPHA),
2996 const_iv (GL_SRC_COLOR),
2997 const_iv (GL_DST_COLOR),
2998 const_iv (GL_ONE_MINUS_SRC_COLOR),
2999 const_iv (GL_ONE_MINUS_DST_COLOR),
2687 const_iv (GL_SRC_ALPHA_SATURATE), 3000 const_iv (GL_SRC_ALPHA_SATURATE),
2688 const_iv (GL_RGB), 3001 const_iv (GL_RGB),
2689 const_iv (GL_RGBA), 3002 const_iv (GL_RGBA),
2690 const_iv (GL_RGBA4), 3003 const_iv (GL_RGBA4),
2691 const_iv (GL_RGBA8), 3004 const_iv (GL_RGBA8),
… …
2759 const_iv (GL_NICEST), 3072 const_iv (GL_NICEST),
2760 const_iv (GL_V2F), 3073 const_iv (GL_V2F),
2761 const_iv (GL_V3F), 3074 const_iv (GL_V3F),
2762 const_iv (GL_T2F_V3F), 3075 const_iv (GL_T2F_V3F),
2763 const_iv (GL_T2F_N3F_V3F), 3076 const_iv (GL_T2F_N3F_V3F),
3077 const_iv (GL_FUNC_ADD),
3078 const_iv (GL_FUNC_SUBTRACT),
3079 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2764# undef const_iv 3080# undef const_iv
2765 }; 3081 };
2766 3082
2767 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3083 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2768 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3084 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2775disable_GL_EXT_blend_func_separate () 3091disable_GL_EXT_blend_func_separate ()
2776 CODE: 3092 CODE:
2777 gl.BlendFuncSeparate = 0; 3093 gl.BlendFuncSeparate = 0;
2778 gl.BlendFuncSeparateEXT = 0; 3094 gl.BlendFuncSeparateEXT = 0;
2779 3095
3096void
3097apple_nvidia_bug (int enable)
3098
2780char * 3099char *
2781gl_vendor () 3100gl_vendor ()
2782 CODE: 3101 CODE:
2783 RETVAL = (char *)glGetString (GL_VENDOR); 3102 RETVAL = (char *)glGetString (GL_VENDOR);
2784 OUTPUT: 3103 OUTPUT:
… …
2833 3152
2834void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3153void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2835 CODE: 3154 CODE:
2836 gl_BlendFuncSeparate (sa, da, saa, daa); 3155 gl_BlendFuncSeparate (sa, da, saa, daa);
2837 3156
3157# void glBlendEquation (int se)
3158
2838void glDepthMask (int flag) 3159void glDepthMask (int flag)
2839 3160
2840void glLogicOp (int opcode) 3161void glLogicOp (int opcode)
2841 3162
2842void glColorMask (int red, int green, int blue, int alpha) 3163void glColorMask (int red, int green, int blue, int alpha)
… …
2876void glRotate (float angle, float x, float y, float z) 3197void glRotate (float angle, float x, float y, float z)
2877 CODE: 3198 CODE:
2878 glRotatef (angle, x, y, z); 3199 glRotatef (angle, x, y, z);
2879 3200
2880void glColor (float r, float g, float b, float a = 1.0) 3201void glColor (float r, float g, float b, float a = 1.0)
3202 PROTOTYPE: @
2881 ALIAS: 3203 ALIAS:
2882 glColor_premultiply = 1 3204 glColor_premultiply = 1
2883 CODE: 3205 CODE:
2884 if (ix) 3206 if (ix)
2885 { 3207 {
… …
2990void glNewList (int list, int mode = GL_COMPILE) 3312void glNewList (int list, int mode = GL_COMPILE)
2991 3313
2992void glEndList () 3314void glEndList ()
2993 3315
2994void glCallList (int list) 3316void glCallList (int list)
3317
3318void c_init ()
3319 CODE:
3320 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3321 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2995 3322
2996MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3323MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2997 3324
2998PROTOTYPES: DISABLE 3325PROTOTYPES: DISABLE
2999 3326

Diff Legend

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