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.263 by root, Fri Jul 18 21:18:42 2008 UTC vs.
Revision 1.299 by root, Tue Dec 22 01:37:41 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);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
43 49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib/gmacros.h>
… …
76#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
78 84
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
82 91
83#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
85 94
86#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
87 96
88/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
99
100#define KMOD_LRAM 0x10000 // our extension
101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
90 104
91static AV *texture_av; 105static AV *texture_av;
92 106
93static struct 107static struct
94{ 108{
… …
226 int w, h; 240 int w, h;
227 float s, t; 241 float s, t;
228 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
229 tileid smoothtile; 243 tileid smoothtile;
230 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
231} maptex; 246} maptex;
232 247
233typedef struct { 248typedef struct {
234 uint32_t player; 249 uint32_t player;
235 tileid tile[3]; 250 tileid tile[3];
… …
367 self->oy = 0; 382 self->oy = 0;
368 self->row = 0; 383 self->row = 0;
369 self->rows = 0; 384 self->rows = 0;
370} 385}
371 386
387#define CELL_CLEAR(cell) \
388 do { \
389 if ((cell)->player) \
390 (cell)->tile [2] = 0; \
391 (cell)->darkness = 0; \
392 (cell)->stat_hp = 0; \
393 (cell)->flags = 0; \
394 (cell)->player = 0; \
395 } while (0)
396
372static void 397static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 398map_blank (DC__Map self, int x0, int y0, int w, int h)
374{ 399{
375 int x, y; 400 int x, y;
376 maprow *row; 401 maprow *row;
… …
390 if (x >= row->c1) 415 if (x >= row->c1)
391 break; 416 break;
392 417
393 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
394 419
395 cell->darkness = 0; 420 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 421 }
400 } 422 }
401} 423}
402 424
403typedef struct { 425typedef struct {
… …
514 if (!svp || !SvTRUE (*svp)) 536 if (!svp || !SvTRUE (*svp))
515 return 0; 537 return 0;
516 538
517 return 1; 539 return 1;
518} 540}
541
542/******************************************************************************/
543
544/* process keyboard modifiers */
545static int
546mod_munge (int mod)
547{
548 mod &= MOD_MASK;
549
550 if (mod & (KMOD_META | KMOD_ALT))
551 mod |= KMOD_LRAM;
552
553 return mod;
554}
555
556static void
557deliantra_main ()
558{
559 char *argv[] = { 0 };
560 call_argv ("::main", G_DISCARD | G_VOID, argv);
561}
562
563#ifdef __MACOSX__
564 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back.
569 */
570 extern C_LINKAGE int
571 main (int argc, char *argv[])
572 {
573 deliantra_main ();
574 }
575
576 #undef main
577
578 extern C_LINKAGE int main (int argc, char *argv[]);
579
580 static void
581 SDL_braino (void)
582 {
583 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv);
585 }
586#else
587 static void
588 SDL_braino (void)
589 {
590 deliantra_main ();
591 }
592#endif
519 593
520MODULE = Deliantra::Client PACKAGE = DC 594MODULE = Deliantra::Client PACKAGE = DC
521 595
522PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
523 597
… …
552 const_iv (SDL_USEREVENT), 626 const_iv (SDL_USEREVENT),
553 627
554 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
556 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
631
632
633 const_iv (SDLK_UNKNOWN),
634 const_iv (SDLK_FIRST),
635 const_iv (SDLK_BACKSPACE),
636 const_iv (SDLK_TAB),
637 const_iv (SDLK_CLEAR),
638 const_iv (SDLK_RETURN),
639 const_iv (SDLK_PAUSE),
640 const_iv (SDLK_ESCAPE),
641 const_iv (SDLK_SPACE),
642 const_iv (SDLK_EXCLAIM),
643 const_iv (SDLK_QUOTEDBL),
644 const_iv (SDLK_HASH),
645 const_iv (SDLK_DOLLAR),
646 const_iv (SDLK_AMPERSAND),
647 const_iv (SDLK_QUOTE),
648 const_iv (SDLK_LEFTPAREN),
649 const_iv (SDLK_RIGHTPAREN),
650 const_iv (SDLK_ASTERISK),
651 const_iv (SDLK_PLUS),
652 const_iv (SDLK_COMMA),
653 const_iv (SDLK_MINUS),
654 const_iv (SDLK_PERIOD),
655 const_iv (SDLK_SLASH),
656 const_iv (SDLK_0),
657 const_iv (SDLK_1),
658 const_iv (SDLK_2),
659 const_iv (SDLK_3),
660 const_iv (SDLK_4),
661 const_iv (SDLK_5),
662 const_iv (SDLK_6),
663 const_iv (SDLK_7),
664 const_iv (SDLK_8),
665 const_iv (SDLK_9),
666 const_iv (SDLK_COLON),
667 const_iv (SDLK_SEMICOLON),
668 const_iv (SDLK_LESS),
669 const_iv (SDLK_EQUALS),
670 const_iv (SDLK_GREATER),
671 const_iv (SDLK_QUESTION),
672 const_iv (SDLK_AT),
673
674 const_iv (SDLK_LEFTBRACKET),
675 const_iv (SDLK_BACKSLASH),
676 const_iv (SDLK_RIGHTBRACKET),
677 const_iv (SDLK_CARET),
678 const_iv (SDLK_UNDERSCORE),
679 const_iv (SDLK_BACKQUOTE),
680 const_iv (SDLK_DELETE),
557 681
558 const_iv (SDLK_FIRST), 682 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 683 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
… …
637 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 764 const_iv (KMOD_MODE),
641 765
766 const_iv (KMOD_LRAM),
767
642 const_iv (MIX_DEFAULT_FORMAT), 768 const_iv (MIX_DEFAULT_FORMAT),
643 769
644 const_iv (SDL_INIT_TIMER), 770 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 771 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 772 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM), 773 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK), 774 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING), 775 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE), 776 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD), 777 const_iv (SDL_INIT_EVENTTHREAD),
778
779 const_iv (SDL_GL_RED_SIZE),
780 const_iv (SDL_GL_GREEN_SIZE),
781 const_iv (SDL_GL_BLUE_SIZE),
782 const_iv (SDL_GL_ALPHA_SIZE),
783 const_iv (SDL_GL_DOUBLEBUFFER),
784 const_iv (SDL_GL_BUFFER_SIZE),
785 const_iv (SDL_GL_DEPTH_SIZE),
786 const_iv (SDL_GL_STENCIL_SIZE),
787 const_iv (SDL_GL_ACCUM_RED_SIZE),
788 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
789 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
790 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
791 const_iv (SDL_GL_STEREO),
792 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
793 const_iv (SDL_GL_MULTISAMPLESAMPLES),
794 const_iv (SDL_GL_ACCELERATED_VISUAL),
795 const_iv (SDL_GL_SWAP_CONTROL),
796
797 const_iv (FOW_DARKNESS)
652# undef const_iv 798# undef const_iv
653 }; 799 };
654 800
655 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
656 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
677NV ceil (NV x) 823NV ceil (NV x)
678 824
679IV minpot (UV n) 825IV minpot (UV n)
680 826
681IV popcount (UV n) 827IV popcount (UV n)
828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
682 834
683void 835void
684pango_init () 836pango_init ()
685 CODE: 837 CODE:
686{ 838{
… …
694#endif 846#endif
695} 847}
696 848
697char *SDL_GetError () 849char *SDL_GetError ()
698 850
851void SDL_braino ()
852
699int SDL_Init (U32 flags) 853int SDL_Init (U32 flags)
700 854
701int SDL_InitSubSystem (U32 flags) 855int SDL_InitSubSystem (U32 flags)
702 856
703void SDL_QuitSubSystem (U32 flags) 857void SDL_QuitSubSystem (U32 flags)
704 858
705void SDL_Quit () 859void SDL_Quit ()
860
861int SDL_GL_SetAttribute (int attr, int value)
862
863int SDL_GL_GetAttribute (int attr)
864 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL))
866 XSRETURN_UNDEF;
867 OUTPUT:
868 RETVAL
706 869
707void 870void
708SDL_ListModes (int rgb, int alpha) 871SDL_ListModes (int rgb, int alpha)
709 PPCODE: 872 PPCODE:
710{ 873{
… …
722 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
723 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
724 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
725 888
726 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
727#if SDL_VERSION_ATLEAST(1,2,10)
728 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
729 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
730#endif
731 891
732 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
733 893
734 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
735 while (*m) 895 while (*m)
736 { 896 {
897 if ((*m)->w >= 400 && (*m)->h >= 300)
898 {
737 AV *av = newAV (); 899 AV *av = newAV ();
738 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
739 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
740 av_push (av, newSViv (rgb)); 902 av_push (av, newSViv (rgb));
741 av_push (av, newSViv (alpha)); 903 av_push (av, newSViv (alpha));
742 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 904 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
905 }
743 906
744 ++m; 907 ++m;
745 } 908 }
746} 909}
747 910
… …
767 930
768 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
769#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
770#include "glfunc.h" 933#include "glfunc.h"
771#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
772 } 938 }
773} 939}
774 OUTPUT: 940 OUTPUT:
775 RETVAL 941 RETVAL
776 942
… …
802 { 968 {
803 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
804 case SDL_KEYUP: 970 case SDL_KEYUP:
805 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
806 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
807 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 973 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
808 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 974 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
809 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
810 break; 976 break;
811 977
812 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
813 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
831 x = ev.motion.x; 997 x = ev.motion.x;
832 y = ev.motion.y; 998 y = ev.motion.y;
833 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
834 } 1000 }
835 1001
836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
837 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
838 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
839 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
840 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
841 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1057#if DEBUG 1223#if DEBUG
1058 VALGRIND_DO_LEAK_CHECK; 1224 VALGRIND_DO_LEAK_CHECK;
1059#endif 1225#endif
1060} 1226}
1061 1227
1228int
1229SvREFCNT (SV *sv)
1230 CODE:
1231 RETVAL = SvREFCNT (sv);
1232 OUTPUT:
1233 RETVAL
1234
1062MODULE = Deliantra::Client PACKAGE = DC::Font 1235MODULE = Deliantra::Client PACKAGE = DC::Font
1063 1236
1064PROTOTYPES: DISABLE 1237PROTOTYPES: DISABLE
1065 1238
1066DC::Font 1239DC::Font
… …
1495 if (ix) 1668 if (ix)
1496 { 1669 {
1497 glDisable (GL_ALPHA_TEST); 1670 glDisable (GL_ALPHA_TEST);
1498 glDisable (GL_BLEND); 1671 glDisable (GL_BLEND);
1499 } 1672 }
1673}
1674
1675void
1676draw_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)
1677 PROTOTYPE: @
1678 CODE:
1679{
1680 glEnable (GL_BLEND);
1681 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1682 glEnable (GL_TEXTURE_2D);
1683 glBindTexture (GL_TEXTURE_2D, name1);
1684
1685 glColor3f (intensity, intensity, intensity);
1686 glPushMatrix ();
1687 glScalef (1./3, 1./3, 1.);
1688
1689 if (blend > 0.f)
1690 {
1691 float dx3 = dx * -3.f / w;
1692 float dy3 = dy * -3.f / h;
1693 GLfloat env_color[4] = { 0., 0., 0., blend };
1694
1695 /* interpolate the two shadow textures */
1696 /* stage 0 == rgb(glcolor) + alpha(t0) */
1697 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1698
1699 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1700 gl.ActiveTexture (GL_TEXTURE1);
1701 glEnable (GL_TEXTURE_2D);
1702 glBindTexture (GL_TEXTURE_2D, name2);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1704
1705 /* rgb == rgb(glcolor) */
1706 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1707 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1708 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1709
1710 /* alpha = interpolate t0, t1 by env_alpha */
1711 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1712
1713 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1714 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1715 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1716
1717 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1718 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1719
1720 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1721 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1722
1723 glBegin (GL_QUADS);
1724 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1725 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1726 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1727 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1728 glEnd ();
1729
1730 glDisable (GL_TEXTURE_2D);
1731 gl.ActiveTexture (GL_TEXTURE0);
1732 }
1733 else
1734 {
1735 /* simple blending of one texture, also opengl <1.3 path */
1736 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1737
1738 glBegin (GL_QUADS);
1739 glTexCoord2f (0, 0); glVertex2f (0, 0);
1740 glTexCoord2f (0, t); glVertex2f (0, h);
1741 glTexCoord2f (s, t); glVertex2f (w, h);
1742 glTexCoord2f (s, 0); glVertex2f (w, 0);
1743 glEnd ();
1744 }
1745
1746 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1747 {
1748 int x, y;
1749 int dx3 = dx * 3;
1750 int dy3 = dy * 3;
1751
1752 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1753 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1754 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1755 glTranslatef (-1., -1., 0);
1756 glBegin (GL_QUADS);
1757
1758 for (y = 1; y < h; y += 3)
1759 {
1760 int y1 = y - dy3;
1761 int y1valid = y1 >= 0 && y1 < h;
1762
1763 for (x = 1; x < w; x += 3)
1764 {
1765 int x1 = x - dx3;
1766 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1767 uint8_t h2;
1768
1769 if (y1valid && x1 >= 0 && x1 < w)
1770 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1771 else
1772 h2 = 1; /* out of range == invisible */
1773
1774 if (h1 || h2)
1775 {
1776 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1777 glColor4f (1., 1., 1., alpha);
1778
1779 glTexCoord2f (0, 0.); glVertex2i (x , y );
1780 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1781 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1782 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1783 }
1784 }
1785 }
1786 }
1787
1788 glEnd ();
1789
1790 glPopMatrix ();
1791
1792 glDisable (GL_TEXTURE_2D);
1793 glDisable (GL_BLEND);
1500} 1794}
1501 1795
1502IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1796IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1503 CODE: 1797 CODE:
1504{ 1798{
… …
1610 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1904 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1611 // use uglier nearest interpolation because linear suffers 1905 // use uglier nearest interpolation because linear suffers
1612 // from transparent color bleeding and ugly wrapping effects. 1906 // from transparent color bleeding and ugly wrapping effects.
1613 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1907 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1614} 1908}
1909
1910void
1911expire_textures (DC::Map self, int texid, int count)
1912 PPCODE:
1913 for (; texid < self->texs && count; ++texid, --count)
1914 {
1915 maptex *tex = self->tex + texid;
1916
1917 if (tex->name)
1918 {
1919 if (tex->unused)
1920 {
1921 tex->name = 0;
1922 tex->unused = 0;
1923 XPUSHs (sv_2mortal (newSViv (texid)));
1924 }
1925 else
1926 tex->unused = 1;
1927 }
1928 }
1615 1929
1616int 1930int
1617ox (DC::Map self) 1931ox (DC::Map self)
1618 ALIAS: 1932 ALIAS:
1619 oy = 1 1933 oy = 1
… …
1700 { 2014 {
1701 ext = *data++; 2015 ext = *data++;
1702 cmd = ext & 0x7f; 2016 cmd = ext & 0x7f;
1703 2017
1704 if (cmd < 4) 2018 if (cmd < 4)
1705 cell->darkness = 255 - ext * 64 + 1; 2019 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1706 else if (cmd == 5) // health 2020 else if (cmd == 5) // health
1707 { 2021 {
1708 cell->stat_width = 1; 2022 cell->stat_width = 1;
1709 cell->stat_hp = *data++; 2023 cell->stat_hp = *data++;
1710 } 2024 }
… …
1740 cell->tile [z] = self->face2tile [face]; 2054 cell->tile [z] = self->face2tile [face];
1741 2055
1742 if (cell->tile [z]) 2056 if (cell->tile [z])
1743 { 2057 {
1744 maptex *tex = self->tex + cell->tile [z]; 2058 maptex *tex = self->tex + cell->tile [z];
2059 tex->unused = 0;
1745 if (!tex->name) 2060 if (!tex->name)
1746 av_push (missing, newSViv (cell->tile [z])); 2061 av_push (missing, newSViv (cell->tile [z]));
1747 2062
1748 if (tex->smoothtile) 2063 if (tex->smoothtile)
1749 { 2064 {
1750 maptex *smooth = self->tex + tex->smoothtile; 2065 maptex *smooth = self->tex + tex->smoothtile;
2066 smooth->unused = 0;
1751 if (!smooth->name) 2067 if (!smooth->name)
1752 av_push (missing, newSViv (tex->smoothtile)); 2068 av_push (missing, newSViv (tex->smoothtile));
1753 } 2069 }
1754 } 2070 }
1755 } 2071 }
1756 } 2072 }
1757 else 2073 else
1758 cell->darkness = 0; 2074 CELL_CLEAR (cell);
1759 } 2075 }
1760} 2076}
1761 OUTPUT: 2077 OUTPUT:
1762 RETVAL 2078 RETVAL
1763 2079
… …
1815} 2131}
1816 OUTPUT: 2132 OUTPUT:
1817 RETVAL 2133 RETVAL
1818 2134
1819void 2135void
1820draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2136draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1821 CODE: 2137 CODE:
1822{ 2138{
1823 int x, y, z; 2139 int x, y, z;
1824 2140
1825 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2141 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1826 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2142 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1827 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2143 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1828 smooth_key skey; 2144 smooth_key skey;
1829 int pl_x, pl_y; 2145 int pl_x, pl_y;
1830 maptex pl_tex; 2146 maptex pl_tex;
1831 rc_t *rc = rc_alloc (); 2147 rc_t *rc = rc_alloc ();
2148 rc_t *rc_ov = rc_alloc ();
1832 rc_key_t key; 2149 rc_key_t key;
1833 rc_array_t *arr; 2150 rc_array_t *arr;
1834 2151
1835 pl_tex.name = 0; 2152 pl_tex.name = 0;
1836 2153
1837 // thats current max. sorry. 2154 // that's current max. sorry.
1838 if (sw > 255) sw = 255; 2155 if (sw > 255) sw = 255;
1839 if (sh > 255) sh = 255; 2156 if (sh > 255) sh = 255;
1840 2157
1841 // clear key, in case of extra padding 2158 // clear key, in case of extra padding
1842 memset (&skey, 0, sizeof (skey)); 2159 memset (&skey, 0, sizeof (skey));
… …
1846 key.g = 255; 2163 key.g = 255;
1847 key.b = 255; 2164 key.b = 255;
1848 key.a = 255; 2165 key.a = 255;
1849 key.mode = GL_QUADS; 2166 key.mode = GL_QUADS;
1850 key.format = GL_T2F_V3F; 2167 key.format = GL_T2F_V3F;
1851 key.texname = -1;
1852 2168
1853 mx += self->x; 2169 mx += self->x;
1854 my += self->y; 2170 my += self->y;
1855 2171
1856 // first pass: determine smooth_max 2172 // first pass: determine smooth_max
… …
1880 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2196 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1881 2197
1882 for (z = 0; z <= 2; z++) 2198 for (z = 0; z <= 2; z++)
1883 { 2199 {
1884 memset (smooth_level, 0, sizeof (smooth_level)); 2200 memset (smooth_level, 0, sizeof (smooth_level));
2201 key.texname = -1;
1885 2202
1886 for (y = 0; y < sh; y++) 2203 for (y = 0; y < sh; y++)
1887 if (0 <= y + my && y + my < self->rows) 2204 if (0 <= y + my && y + my < self->rows)
1888 { 2205 {
1889 maprow *row = self->row + (y + my); 2206 maprow *row = self->row + (y + my);
… …
1895 tileid tile = cell->tile [z]; 2212 tileid tile = cell->tile [z];
1896 2213
1897 if (tile) 2214 if (tile)
1898 { 2215 {
1899 maptex tex = self->tex [tile]; 2216 maptex tex = self->tex [tile];
1900 int px = (x + 1) * T - tex.w; 2217 int px, py;
1901 int py = (y + 1) * T - tex.h;
1902 2218
1903 if (key.texname != tex.name) 2219 if (key.texname != tex.name)
1904 { 2220 {
2221 self->tex [tile].unused = 0;
2222
1905 if (!tex.name) 2223 if (!tex.name)
1906 tex = self->tex [2]; /* missing, replace by noface */ 2224 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1907 2225
1908 key.texname = tex.name; 2226 key.texname = tex.name;
1909 arr = rc_array (rc, &key); 2227 arr = rc_array (rc, &key);
1910 } 2228 }
2229
2230 px = (x + 1) * T - tex.w;
2231 py = (y + 1) * T - tex.h;
1911 2232
1912 if (expect_false (cell->player == player) && expect_false (z == 2)) 2233 if (expect_false (cell->player == player) && expect_false (z == 2))
1913 { 2234 {
1914 pl_x = px; 2235 pl_x = px;
1915 pl_y = py; 2236 pl_y = py;
… …
1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2241 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1921 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2242 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1922 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2243 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1923 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2244 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1924 2245
1925 if (expect_false (cell->flags) && expect_false (z == 2))
1926 {
1927 // overlays such as the speech bubble, probably more to come
1928 if (cell->flags & 1)
1929 {
1930 maptex tex = self->tex [1];
1931 int px = x * T + T * 2 / 32;
1932 int py = y * T - T * 6 / 32;
1933
1934 if (tex.name)
1935 {
1936 if (key.texname != tex.name)
1937 {
1938 key.texname = tex.name;
1939 arr = rc_array (rc, &key);
1940 }
1941
1942 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1943 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1945 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1946 }
1947 }
1948 }
1949
1950 // update smooth hash 2246 // update smooth hash
1951 if (tex.smoothtile) 2247 if (tex.smoothtile)
1952 { 2248 {
1953 skey.tile = tex.smoothtile; 2249 skey.tile = tex.smoothtile;
1954 skey.level = tex.smoothlevel; 2250 skey.level = tex.smoothlevel;
… …
1982 // corners 2278 // corners
1983 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2279 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1984 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2280 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1985 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2281 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1986 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2282 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2283 }
2284 }
2285
2286 if (expect_false (z == 2) && expect_false (cell->flags))
2287 {
2288 // overlays such as the speech bubble, probably more to come
2289 if (cell->flags & 1)
2290 {
2291 rc_key_t key_ov = key;
2292 maptex tex = self->tex [TEXID_SPEECH];
2293 rc_array_t *arr;
2294 int px = x * T + T * 2 / 32;
2295 int py = y * T - T * 6 / 32;
2296
2297 key_ov.texname = tex.name;
2298 arr = rc_array (rc_ov, &key_ov);
2299
2300 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2301 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2302 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2303 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1987 } 2304 }
1988 } 2305 }
1989 } 2306 }
1990 } 2307 }
1991 2308
… …
2031 { 2348 {
2032 // this time avoiding texture state changes 2349 // this time avoiding texture state changes
2033 // save gobs of state changes. 2350 // save gobs of state changes.
2034 if (key.texname != tex.name) 2351 if (key.texname != tex.name)
2035 { 2352 {
2353 self->tex [skey->tile].unused = 0;
2354
2036 glEnd (); 2355 glEnd ();
2037 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2356 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2038 glBegin (GL_QUADS); 2357 glBegin (GL_QUADS);
2039 } 2358 }
2040 2359
… …
2072 } 2391 }
2073 2392
2074 if (pl_tex.name) 2393 if (pl_tex.name)
2075 { 2394 {
2076 maptex tex = pl_tex; 2395 maptex tex = pl_tex;
2077 int px = pl_x + pdx; 2396 int px = pl_x + sdx;
2078 int py = pl_y + pdy; 2397 int py = pl_y + sdy;
2079 2398
2080 key.texname = tex.name; 2399 key.texname = tex.name;
2081 arr = rc_array (rc, &key); 2400 arr = rc_array (rc, &key);
2082 2401
2083 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2402 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
… …
2086 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2405 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2087 2406
2088 rc_draw (rc); 2407 rc_draw (rc);
2089 } 2408 }
2090 2409
2410 rc_draw (rc_ov);
2411 rc_clear (rc_ov);
2412
2091 glDisable (GL_BLEND); 2413 glDisable (GL_BLEND);
2092 rc_free (rc); 2414 rc_free (rc);
2415 rc_free (rc_ov);
2093 2416
2094 // top layer: overlays such as the health bar 2417 // top layer: overlays such as the health bar
2095 for (y = 0; y < sh; y++) 2418 for (y = 0; y < sh; y++)
2096 if (0 <= y + my && y + my < self->rows) 2419 if (0 <= y + my && y + my < self->rows)
2097 { 2420 {
… …
2102 { 2425 {
2103 mapcell *cell = row->col + (x + mx - row->c0); 2426 mapcell *cell = row->col + (x + mx - row->c0);
2104 2427
2105 int px = x * T; 2428 int px = x * T;
2106 int py = y * T; 2429 int py = y * T;
2430
2431 if (expect_false (cell->player == player))
2432 {
2433 px += sdx;
2434 py += sdy;
2435 }
2107 2436
2108 if (cell->stat_hp) 2437 if (cell->stat_hp)
2109 { 2438 {
2110 int width = cell->stat_width * T; 2439 int width = cell->stat_width * T;
2111 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2440 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2122 } 2451 }
2123 } 2452 }
2124} 2453}
2125 2454
2126void 2455void
2127draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2456draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2128 CODE: 2457 CODE:
2129{ 2458{
2130 static float color[16][3] = { 2459 static float color[16][3] = {
2131 { 0.00F, 0.00F, 0.00F }, 2460 { 0.00f, 0.00f, 0.00f },
2132 { 1.00F, 1.00F, 1.00F }, 2461 { 1.00f, 1.00f, 1.00f },
2133 { 0.00F, 0.00F, 0.55F }, 2462 { 0.00f, 0.00f, 0.55f },
2134 { 1.00F, 0.00F, 0.00F }, 2463 { 1.00f, 0.00f, 0.00f },
2135 2464
2136 { 1.00F, 0.54F, 0.00F }, 2465 { 1.00f, 0.54f, 0.00f },
2137 { 0.11F, 0.56F, 1.00F }, 2466 { 0.11f, 0.56f, 1.00f },
2138 { 0.93F, 0.46F, 0.00F }, 2467 { 0.93f, 0.46f, 0.00f },
2139 { 0.18F, 0.54F, 0.34F }, 2468 { 0.18f, 0.54f, 0.34f },
2140 2469
2141 { 0.56F, 0.73F, 0.56F }, 2470 { 0.56f, 0.73f, 0.56f },
2142 { 0.80F, 0.80F, 0.80F }, 2471 { 0.80f, 0.80f, 0.80f },
2143 { 0.55F, 0.41F, 0.13F }, 2472 { 0.55f, 0.41f, 0.13f },
2144 { 0.99F, 0.77F, 0.26F }, 2473 { 0.99f, 0.77f, 0.26f },
2145 2474
2146 { 0.74F, 0.65F, 0.41F }, 2475 { 0.74f, 0.65f, 0.41f },
2147 2476
2148 { 0.00F, 1.00F, 1.00F }, 2477 { 0.00f, 1.00f, 1.00f },
2149 { 1.00F, 0.00F, 1.00F }, 2478 { 1.00f, 0.00f, 1.00f },
2150 { 1.00F, 1.00F, 0.00F }, 2479 { 1.00f, 1.00f, 0.00f },
2151 }; 2480 };
2152 2481
2153 int x, y; 2482 int x, y;
2154 2483
2155 glEnable (GL_TEXTURE_2D); 2484 glEnable (GL_TEXTURE_2D);
2485 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2486 * but the nvidia driver (185.18.14) mishandles alpha textures
2487 * and takes the colour from god knows where instead of using
2488 * Cp. MODULATE results in the same colour, but slightly different
2489 * alpha, but atcually gives us the correct colour with nvidia.
2490 */
2156 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2157 glEnable (GL_BLEND); 2492 glEnable (GL_BLEND);
2158 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2493 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2159 glBegin (GL_QUADS); 2494 glBegin (GL_QUADS);
2160 2495
2161 for (y = 0; y < h; y++) 2496 for (y = 0; y < h; y++)
… …
2165 2500
2166 if (m) 2501 if (m)
2167 { 2502 {
2168 float *c = color [m & 15]; 2503 float *c = color [m & 15];
2169 2504
2170 float tx1 = m & 0x40 ? 0.5 : 0.; 2505 float tx1 = m & 0x40 ? 0.5f : 0.f;
2171 float tx2 = tx1 + 0.5; 2506 float tx2 = tx1 + 0.5f;
2172 2507
2173 glColor4f (c[0], c[1], c[2], 0.75); 2508 glColor4f (c[0], c[1], c[2], 1);
2174 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2509 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2175 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2510 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2176 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2511 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2177 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2512 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2178 } 2513 }
… …
2186void 2521void
2187fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2522fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2188 PPCODE: 2523 PPCODE:
2189{ 2524{
2190 int x, y; 2525 int x, y;
2191 int sw1 = sw + 2; 2526 int sw1 = sw + 2;
2192 int sh1 = sh + 2; 2527 int sh1 = sh + 2;
2193 int sh3 = sh * 3; 2528 int sh3 = sh * 3;
2194 int sw34 = (sw * 3 + 3) & ~3; 2529 int sw3 = sw * 3;
2195 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2530 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2196 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2531 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2197 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2532 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2198 2533
2199 SvPOK_only (darkness3_sv); 2534 SvPOK_only (darkness3_sv);
2200 SvCUR_set (darkness3_sv, sw34 * sh3); 2535 SvCUR_set (darkness3_sv, sw3 * sh3);
2201 2536
2202 mx += self->x - 1; 2537 mx += self->x - 1;
2203 my += self->y - 1; 2538 my += self->y - 1;
2204
2205 memset (darkness1, 255, sw1 * sh1);
2206 2539
2207 for (y = 0; y < sh1; y++) 2540 for (y = 0; y < sh1; y++)
2208 if (0 <= y + my && y + my < self->rows) 2541 if (0 <= y + my && y + my < self->rows)
2209 { 2542 {
2210 maprow *row = self->row + (y + my); 2543 maprow *row = self->row + (y + my);
… …
2213 if (row->c0 <= x + mx && x + mx < row->c1) 2546 if (row->c0 <= x + mx && x + mx < row->c1)
2214 { 2547 {
2215 mapcell *cell = row->col + (x + mx - row->c0); 2548 mapcell *cell = row->col + (x + mx - row->c0);
2216 2549
2217 darkness1 [y * sw1 + x] = cell->darkness 2550 darkness1 [y * sw1 + x] = cell->darkness
2218 ? 255 - (cell->darkness - 1) 2551 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2219 : 255 - FOW_DARKNESS; 2552 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2220 } 2553 }
2221 } 2554 }
2222 2555
2223 for (y = 0; y < sh; ++y) 2556 for (y = 0; y < sh; ++y)
2224 for (x = 0; x < sw; ++x) 2557 for (x = 0; x < sw; ++x)
… …
2243 2576
2244 uint8_t r13 = (d13 + d23 + d12) / 3; 2577 uint8_t r13 = (d13 + d23 + d12) / 3;
2245 uint8_t r23 = d23; 2578 uint8_t r23 = d23;
2246 uint8_t r33 = (d23 + d33 + d32) / 3; 2579 uint8_t r33 = (d23 + d33 + d32) / 3;
2247 2580
2248 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2581 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2249 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2582 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2250 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2583 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2251 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2584 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2252 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2585 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2253 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2586 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2254 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2587 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2255 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2588 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2256 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2589 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2257 } 2590 }
2258 2591
2259 free (darkness1); 2592 free (darkness1);
2260 2593
2261 EXTEND (SP, 3); 2594 EXTEND (SP, 3);
2262 PUSHs (sv_2mortal (newSViv (sw34))); 2595 PUSHs (sv_2mortal (newSViv (sw3)));
2263 PUSHs (sv_2mortal (newSViv (sh3))); 2596 PUSHs (sv_2mortal (newSViv (sh3)));
2264 PUSHs (darkness3_sv); 2597 PUSHs (darkness3_sv);
2265} 2598}
2266 2599
2267SV * 2600SV *
… …
2524void 2857void
2525set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2858set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2526 CODE: 2859 CODE:
2527{ 2860{
2528 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2861 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2529 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2862 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2530 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2863 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2531} 2864}
2532 2865
2533void 2866void
2534set_reverse_stereo (DC::Channel self, int flip) 2867set_reverse_stereo (DC::Channel self, int flip)
… …
2637 } *civ, const_iv[] = { 2970 } *civ, const_iv[] = {
2638# define const_iv(name) { # name, (IV)name } 2971# define const_iv(name) { # name, (IV)name }
2639 const_iv (GL_VENDOR), 2972 const_iv (GL_VENDOR),
2640 const_iv (GL_VERSION), 2973 const_iv (GL_VERSION),
2641 const_iv (GL_EXTENSIONS), 2974 const_iv (GL_EXTENSIONS),
2975 const_iv (GL_MAX_TEXTURE_UNITS),
2642 const_iv (GL_COLOR_MATERIAL), 2976 const_iv (GL_COLOR_MATERIAL),
2643 const_iv (GL_SMOOTH), 2977 const_iv (GL_SMOOTH),
2644 const_iv (GL_FLAT), 2978 const_iv (GL_FLAT),
2645 const_iv (GL_DITHER), 2979 const_iv (GL_DITHER),
2646 const_iv (GL_BLEND), 2980 const_iv (GL_BLEND),
… …
2658 const_iv (GL_ZERO), 2992 const_iv (GL_ZERO),
2659 const_iv (GL_SRC_ALPHA), 2993 const_iv (GL_SRC_ALPHA),
2660 const_iv (GL_DST_ALPHA), 2994 const_iv (GL_DST_ALPHA),
2661 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2995 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2662 const_iv (GL_ONE_MINUS_DST_ALPHA), 2996 const_iv (GL_ONE_MINUS_DST_ALPHA),
2997 const_iv (GL_SRC_COLOR),
2998 const_iv (GL_DST_COLOR),
2999 const_iv (GL_ONE_MINUS_SRC_COLOR),
3000 const_iv (GL_ONE_MINUS_DST_COLOR),
2663 const_iv (GL_SRC_ALPHA_SATURATE), 3001 const_iv (GL_SRC_ALPHA_SATURATE),
2664 const_iv (GL_RGB), 3002 const_iv (GL_RGB),
2665 const_iv (GL_RGBA), 3003 const_iv (GL_RGBA),
2666 const_iv (GL_RGBA4), 3004 const_iv (GL_RGBA4),
2667 const_iv (GL_RGBA8), 3005 const_iv (GL_RGBA8),
… …
2735 const_iv (GL_NICEST), 3073 const_iv (GL_NICEST),
2736 const_iv (GL_V2F), 3074 const_iv (GL_V2F),
2737 const_iv (GL_V3F), 3075 const_iv (GL_V3F),
2738 const_iv (GL_T2F_V3F), 3076 const_iv (GL_T2F_V3F),
2739 const_iv (GL_T2F_N3F_V3F), 3077 const_iv (GL_T2F_N3F_V3F),
3078 const_iv (GL_FUNC_ADD),
3079 const_iv (GL_FUNC_SUBTRACT),
3080 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2740# undef const_iv 3081# undef const_iv
2741 }; 3082 };
2742 3083
2743 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3084 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2744 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3085 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2751disable_GL_EXT_blend_func_separate () 3092disable_GL_EXT_blend_func_separate ()
2752 CODE: 3093 CODE:
2753 gl.BlendFuncSeparate = 0; 3094 gl.BlendFuncSeparate = 0;
2754 gl.BlendFuncSeparateEXT = 0; 3095 gl.BlendFuncSeparateEXT = 0;
2755 3096
3097void
3098apple_nvidia_bug (int enable)
3099
2756char * 3100char *
2757gl_vendor () 3101gl_vendor ()
2758 CODE: 3102 CODE:
2759 RETVAL = (char *)glGetString (GL_VENDOR); 3103 RETVAL = (char *)glGetString (GL_VENDOR);
2760 OUTPUT: 3104 OUTPUT:
… …
2809 3153
2810void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3154void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2811 CODE: 3155 CODE:
2812 gl_BlendFuncSeparate (sa, da, saa, daa); 3156 gl_BlendFuncSeparate (sa, da, saa, daa);
2813 3157
3158# void glBlendEquation (int se)
3159
2814void glDepthMask (int flag) 3160void glDepthMask (int flag)
2815 3161
2816void glLogicOp (int opcode) 3162void glLogicOp (int opcode)
2817 3163
2818void glColorMask (int red, int green, int blue, int alpha) 3164void glColorMask (int red, int green, int blue, int alpha)
… …
2852void glRotate (float angle, float x, float y, float z) 3198void glRotate (float angle, float x, float y, float z)
2853 CODE: 3199 CODE:
2854 glRotatef (angle, x, y, z); 3200 glRotatef (angle, x, y, z);
2855 3201
2856void glColor (float r, float g, float b, float a = 1.0) 3202void glColor (float r, float g, float b, float a = 1.0)
3203 PROTOTYPE: @
2857 ALIAS: 3204 ALIAS:
2858 glColor_premultiply = 1 3205 glColor_premultiply = 1
2859 CODE: 3206 CODE:
2860 if (ix) 3207 if (ix)
2861 { 3208 {
… …
2966void glNewList (int list, int mode = GL_COMPILE) 3313void glNewList (int list, int mode = GL_COMPILE)
2967 3314
2968void glEndList () 3315void glEndList ()
2969 3316
2970void glCallList (int list) 3317void glCallList (int list)
3318
3319void c_init ()
3320 CODE:
3321 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3322 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2971 3323
2972MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3324MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2973 3325
2974PROTOTYPES: DISABLE 3326PROTOTYPES: DISABLE
2975 3327

Diff Legend

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