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

Diff Legend

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