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.255 by root, Sun Jan 6 18:25:59 2008 UTC vs.
Revision 1.298 by root, Tue Dec 22 00:46:05 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>
… …
65# include <netinet/in.h> 71# include <netinet/in.h>
66# include <netinet/tcp.h> 72# include <netinet/tcp.h>
67# include <inttypes.h> 73# include <inttypes.h>
68#endif 74#endif
69 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 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 */
72#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
73 91
74#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
75#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
76 94
77#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
78 96
79/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81 99
82#if 0 100#define KMOD_LRAM 0x10000 // our extension
83# define PARACHUTE SDL_INIT_NOPARACHUTE 101
84#else 102#define TEXID_SPEECH 1
85# define PARACHUTE 0 103#define TEXID_NOFACE 2
86#endif
87 104
88static AV *texture_av; 105static AV *texture_av;
89 106
90static struct 107static struct
91{ 108{
… …
185 202
186static void 203static void
187layout_update_font (DC__Layout self) 204layout_update_font (DC__Layout self)
188{ 205{
189 /* use a random scale factor to account for unknown descenders, 0.8 works 206 /* use a random scale factor to account for unknown descenders, 0.8 works
190 * reasonably well with bitstream vera 207 * reasonably well with dejavu/bistream fonts
191 */ 208 */
192 PangoFontDescription *font = self->font ? self->font : default_font; 209 PangoFontDescription *font = self->font ? self->font : default_font;
193 210
194 pango_font_description_set_absolute_size (font, 211 pango_font_description_set_absolute_size (font,
195 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 212 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
223 int w, h; 240 int w, h;
224 float s, t; 241 float s, t;
225 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
226 tileid smoothtile; 243 tileid smoothtile;
227 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
228} maptex; 246} maptex;
229 247
230typedef struct { 248typedef struct {
231 uint32_t player; 249 uint32_t player;
232 tileid tile[3]; 250 tileid tile[3];
… …
364 self->oy = 0; 382 self->oy = 0;
365 self->row = 0; 383 self->row = 0;
366 self->rows = 0; 384 self->rows = 0;
367} 385}
368 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
369static void 397static void
370map_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)
371{ 399{
372 int x, y; 400 int x, y;
373 maprow *row; 401 maprow *row;
… …
387 if (x >= row->c1) 415 if (x >= row->c1)
388 break; 416 break;
389 417
390 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
391 419
392 cell->darkness = 0; 420 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 421 }
397 } 422 }
398} 423}
399 424
400typedef struct { 425typedef struct {
… …
511 if (!svp || !SvTRUE (*svp)) 536 if (!svp || !SvTRUE (*svp))
512 return 0; 537 return 0;
513 538
514 return 1; 539 return 1;
515} 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
516 593
517MODULE = Deliantra::Client PACKAGE = DC 594MODULE = Deliantra::Client PACKAGE = DC
518 595
519PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
520 597
… …
549 const_iv (SDL_USEREVENT), 626 const_iv (SDL_USEREVENT),
550 627
551 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
553 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),
554 681
555 const_iv (SDLK_FIRST), 682 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 683 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
… …
634 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 764 const_iv (KMOD_MODE),
638 765
766 const_iv (KMOD_LRAM),
767
639 const_iv (MIX_DEFAULT_FORMAT), 768 const_iv (MIX_DEFAULT_FORMAT),
769
770 const_iv (SDL_INIT_TIMER),
771 const_iv (SDL_INIT_AUDIO),
772 const_iv (SDL_INIT_VIDEO),
773 const_iv (SDL_INIT_CDROM),
774 const_iv (SDL_INIT_JOYSTICK),
775 const_iv (SDL_INIT_EVERYTHING),
776 const_iv (SDL_INIT_NOPARACHUTE),
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)
640# undef const_iv 798# undef const_iv
641 }; 799 };
642 800
643 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; )
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
666 824
667IV minpot (UV n) 825IV minpot (UV n)
668 826
669IV popcount (UV n) 827IV popcount (UV n)
670 828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
834
671void 835void
672pango_init () 836pango_init ()
673 CODE: 837 CODE:
674{ 838{
675 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
676 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 840 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 841 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
842 /*pango_context_set_font_description (opengl_context, default_font);*/
678#if PANGO_VERSION_CHECK (1, 15, 2) 843#if PANGO_VERSION_CHECK (1, 15, 2)
679 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 844 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 845 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
681#endif 846#endif
682} 847}
683 848
684char *
685SDL_GetError () 849char *SDL_GetError ()
686 850
687int 851void SDL_braino ()
688SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
689 852
690void 853int SDL_Init (U32 flags)
854
855int SDL_InitSubSystem (U32 flags)
856
857void SDL_QuitSubSystem (U32 flags)
858
691SDL_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
692 869
693void 870void
694SDL_ListModes (int rgb, int alpha) 871SDL_ListModes (int rgb, int alpha)
695 PPCODE: 872 PPCODE:
696{ 873{
… …
708 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
711 888
712 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
713#if SDL_VERSION_ATLEAST(1,2,10)
714 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
715 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
716#endif
717 891
718 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
719 893
720 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
721 while (*m) 895 while (*m)
722 { 896 {
723 if ((*m)->w >= 800 && (*m)->h >= 480) 897 if ((*m)->w >= 400 && (*m)->h >= 300)
724 { 898 {
725 AV *av = newAV (); 899 AV *av = newAV ();
726 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
727 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
728 av_push (av, newSViv (rgb)); 902 av_push (av, newSViv (rgb));
… …
770SDL_GetKeyName (int sym) 944SDL_GetKeyName (int sym)
771 945
772int 946int
773SDL_GetAppState () 947SDL_GetAppState ()
774 948
949int
950SDL_GetModState ()
951
775void 952void
776poll_events () 953poll_events ()
777 PPCODE: 954 PPCODE:
778{ 955{
779 SDL_Event ev; 956 SDL_Event ev;
… …
788 { 965 {
789 case SDL_KEYDOWN: 966 case SDL_KEYDOWN:
790 case SDL_KEYUP: 967 case SDL_KEYUP:
791 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 968 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
792 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 969 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
793 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 970 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
794 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 971 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
795 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 972 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
796 break; 973 break;
797 974
798 case SDL_ACTIVEEVENT: 975 case SDL_ACTIVEEVENT:
799 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 976 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
817 x = ev.motion.x; 994 x = ev.motion.x;
818 y = ev.motion.y; 995 y = ev.motion.y;
819 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 996 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
820 } 997 }
821 998
822 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 999 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
823 hv_store (hv, "state", 5, newSViv (state), 0); 1000 hv_store (hv, "state", 5, newSViv (state), 0);
824 hv_store (hv, "x", 1, newSViv (x), 0); 1001 hv_store (hv, "x", 1, newSViv (x), 0);
825 hv_store (hv, "y", 1, newSViv (y), 0); 1002 hv_store (hv, "y", 1, newSViv (y), 0);
826 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1003 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
827 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1004 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
912 } 1089 }
913 } 1090 }
914#endif 1091#endif
915} 1092}
916 1093
917void 1094int
918add_font (char *file) 1095add_font (char *file)
919 CODE: 1096 CODE:
920 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1097 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1098 OUTPUT:
1099 RETVAL
921 1100
922void 1101void
923load_image_inline (SV *image_) 1102load_image_inline (SV *image_)
924 ALIAS: 1103 ALIAS:
925 load_image_file = 1 1104 load_image_file = 1
… …
1041#if DEBUG 1220#if DEBUG
1042 VALGRIND_DO_LEAK_CHECK; 1221 VALGRIND_DO_LEAK_CHECK;
1043#endif 1222#endif
1044} 1223}
1045 1224
1225int
1226SvREFCNT (SV *sv)
1227 CODE:
1228 RETVAL = SvREFCNT (sv);
1229 OUTPUT:
1230 RETVAL
1231
1046MODULE = Deliantra::Client PACKAGE = DC::Font 1232MODULE = Deliantra::Client PACKAGE = DC::Font
1047 1233
1048PROTOTYPES: DISABLE 1234PROTOTYPES: DISABLE
1049 1235
1050DC::Font 1236DC::Font
… …
1479 if (ix) 1665 if (ix)
1480 { 1666 {
1481 glDisable (GL_ALPHA_TEST); 1667 glDisable (GL_ALPHA_TEST);
1482 glDisable (GL_BLEND); 1668 glDisable (GL_BLEND);
1483 } 1669 }
1670}
1671
1672void
1673draw_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)
1674 PROTOTYPE: @
1675 CODE:
1676{
1677 glEnable (GL_TEXTURE_2D);
1678 glEnable (GL_BLEND);
1679 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1680 glBindTexture (GL_TEXTURE_2D, name1);
1681
1682 glColor3f (intensity, intensity, intensity);
1683 glPushMatrix ();
1684 glScalef (1./3, 1./3, 1.);
1685
1686 if (blend > 0.f)
1687 {
1688 float dx3 = dx * -3.f / w;
1689 float dy3 = dy * -3.f / h;
1690 GLfloat env_color[4] = { 0., 0., 0., blend };
1691
1692 /* interpolate the two shadow textures */
1693 /* stage 0 == rgb(glcolor) + alpha(t0) */
1694 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1695
1696 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1697 gl.ActiveTexture (GL_TEXTURE1);
1698 glEnable (GL_TEXTURE_2D);
1699 glBindTexture (GL_TEXTURE_2D, name2);
1700 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1701
1702 /* rgb == rgb(glcolor) */
1703 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1705 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1706
1707 /* alpha = interpolate t0, t1 by env_alpha */
1708 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1709
1710 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1712 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1713
1714 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1715 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1716
1717 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1718 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1719
1720 glBegin (GL_QUADS);
1721 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1722 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1723 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1724 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1725 glEnd ();
1726
1727 glDisable (GL_TEXTURE_2D);
1728 gl.ActiveTexture (GL_TEXTURE0);
1729 }
1730 else
1731 {
1732 /* simple blending of one texture, also opengl <1.3 path */
1733 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1734
1735 glBegin (GL_QUADS);
1736 glTexCoord2f (0, 0); glVertex2f (0, 0);
1737 glTexCoord2f (0, t); glVertex2f (0, h);
1738 glTexCoord2f (s, t); glVertex2f (w, h);
1739 glTexCoord2f (s, 0); glVertex2f (w, 0);
1740 glEnd ();
1741 }
1742
1743 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1744 {
1745 int x, y;
1746 int dx3 = dx * 3;
1747 int dy3 = dy * 3;
1748
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1750 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1751 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1752 glTranslatef (-1., -1., 0);
1753 glBegin (GL_QUADS);
1754
1755 for (y = 1; y < h; y += 3)
1756 {
1757 int y1 = y - dy3;
1758 int y1valid = y1 >= 0 && y1 < h;
1759
1760 for (x = 1; x < w; x += 3)
1761 {
1762 int x1 = x - dx3;
1763 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1764 uint8_t h2;
1765
1766 if (y1valid && x1 >= 0 && x1 < w)
1767 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1768 else
1769 h2 = 1; /* out of range == invisible */
1770
1771 if (h1 || h2)
1772 {
1773 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1774 glColor4f (1., 1., 1., alpha);
1775
1776 glTexCoord2f (0, 0.); glVertex2i (x , y );
1777 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1778 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1779 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1780 }
1781 }
1782 }
1783 }
1784
1785 glEnd ();
1786
1787 glPopMatrix ();
1788
1789 glDisable (GL_TEXTURE_2D);
1790 glDisable (GL_BLEND);
1484} 1791}
1485 1792
1486IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1793IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1487 CODE: 1794 CODE:
1488{ 1795{
… …
1594 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1901 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1595 // use uglier nearest interpolation because linear suffers 1902 // use uglier nearest interpolation because linear suffers
1596 // from transparent color bleeding and ugly wrapping effects. 1903 // from transparent color bleeding and ugly wrapping effects.
1597 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1904 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1598} 1905}
1906
1907void
1908expire_textures (DC::Map self, int texid, int count)
1909 PPCODE:
1910 for (; texid < self->texs && count; ++texid, --count)
1911 {
1912 maptex *tex = self->tex + texid;
1913
1914 if (tex->name)
1915 {
1916 if (tex->unused)
1917 {
1918 tex->name = 0;
1919 tex->unused = 0;
1920 XPUSHs (sv_2mortal (newSViv (texid)));
1921 }
1922 else
1923 tex->unused = 1;
1924 }
1925 }
1599 1926
1600int 1927int
1601ox (DC::Map self) 1928ox (DC::Map self)
1602 ALIAS: 1929 ALIAS:
1603 oy = 1 1930 oy = 1
… …
1681 uint8_t ext, cmd; 2008 uint8_t ext, cmd;
1682 2009
1683 do 2010 do
1684 { 2011 {
1685 ext = *data++; 2012 ext = *data++;
1686 cmd = ext & 0x3f; 2013 cmd = ext & 0x7f;
1687 2014
1688 if (cmd < 4) 2015 if (cmd < 4)
1689 cell->darkness = 255 - ext * 64 + 1; 2016 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1690 else if (cmd == 5) // health 2017 else if (cmd == 5) // health
1691 { 2018 {
1692 cell->stat_width = 1; 2019 cell->stat_width = 1;
1693 cell->stat_hp = *data++; 2020 cell->stat_hp = *data++;
1694 } 2021 }
1695 else if (cmd == 6) // monster width 2022 else if (cmd == 6) // monster width
1696 cell->stat_width = *data++ + 1; 2023 cell->stat_width = *data++ + 1;
1697 else if (cmd == 0x47) 2024 else if (cmd == 0x47)
1698 { 2025 {
1699 if (*data == 4) 2026 if (*data == 1) cell->player = data [1];
1700 ; // decode player count 2027 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2028 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2029 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1701 2030
1702 data += *data + 1; 2031 data += *data + 1;
1703 } 2032 }
1704 else if (cmd == 8) // cell flags 2033 else if (cmd == 8) // cell flags
1705 cell->flags = *data++; 2034 cell->flags = *data++;
… …
1722 cell->tile [z] = self->face2tile [face]; 2051 cell->tile [z] = self->face2tile [face];
1723 2052
1724 if (cell->tile [z]) 2053 if (cell->tile [z])
1725 { 2054 {
1726 maptex *tex = self->tex + cell->tile [z]; 2055 maptex *tex = self->tex + cell->tile [z];
2056 tex->unused = 0;
1727 if (!tex->name) 2057 if (!tex->name)
1728 av_push (missing, newSViv (cell->tile [z])); 2058 av_push (missing, newSViv (cell->tile [z]));
1729 2059
1730 if (tex->smoothtile) 2060 if (tex->smoothtile)
1731 { 2061 {
1732 maptex *smooth = self->tex + tex->smoothtile; 2062 maptex *smooth = self->tex + tex->smoothtile;
2063 smooth->unused = 0;
1733 if (!smooth->name) 2064 if (!smooth->name)
1734 av_push (missing, newSViv (tex->smoothtile)); 2065 av_push (missing, newSViv (tex->smoothtile));
1735 } 2066 }
1736 } 2067 }
1737 } 2068 }
1738 } 2069 }
1739 else 2070 else
1740 cell->darkness = 0; 2071 CELL_CLEAR (cell);
1741 } 2072 }
1742} 2073}
1743 OUTPUT: 2074 OUTPUT:
1744 RETVAL 2075 RETVAL
1745 2076
… …
1797} 2128}
1798 OUTPUT: 2129 OUTPUT:
1799 RETVAL 2130 RETVAL
1800 2131
1801void 2132void
1802draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2133draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1803 CODE: 2134 CODE:
1804{ 2135{
1805 int x, y, z; 2136 int x, y, z;
1806 2137
1807 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2138 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1808 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2139 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1809 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2140 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1810 smooth_key skey; 2141 smooth_key skey;
1811 2142 int pl_x, pl_y;
2143 maptex pl_tex;
1812 rc_t *rc = rc_alloc (); 2144 rc_t *rc = rc_alloc ();
2145 rc_t *rc_ov = rc_alloc ();
1813 rc_key_t key; 2146 rc_key_t key;
1814 rc_array_t *arr; 2147 rc_array_t *arr;
1815 2148
2149 pl_tex.name = 0;
2150
1816 // thats current max. sorry. 2151 // that's current max. sorry.
1817 if (sw > 255) sw = 255; 2152 if (sw > 255) sw = 255;
1818 if (sh > 255) sh = 255; 2153 if (sh > 255) sh = 255;
1819 2154
1820 // clear key, in case of extra padding 2155 // clear key, in case of extra padding
1821 memset (&skey, 0, sizeof (skey)); 2156 memset (&skey, 0, sizeof (skey));
… …
1825 key.g = 255; 2160 key.g = 255;
1826 key.b = 255; 2161 key.b = 255;
1827 key.a = 255; 2162 key.a = 255;
1828 key.mode = GL_QUADS; 2163 key.mode = GL_QUADS;
1829 key.format = GL_T2F_V3F; 2164 key.format = GL_T2F_V3F;
1830 key.texname = -1;
1831 2165
1832 mx += self->x; 2166 mx += self->x;
1833 my += self->y; 2167 my += self->y;
1834 2168
1835 // first pass: determine smooth_max 2169 // first pass: determine smooth_max
… …
1859 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2193 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1860 2194
1861 for (z = 0; z <= 2; z++) 2195 for (z = 0; z <= 2; z++)
1862 { 2196 {
1863 memset (smooth_level, 0, sizeof (smooth_level)); 2197 memset (smooth_level, 0, sizeof (smooth_level));
2198 key.texname = -1;
1864 2199
1865 for (y = 0; y < sh; y++) 2200 for (y = 0; y < sh; y++)
1866 if (0 <= y + my && y + my < self->rows) 2201 if (0 <= y + my && y + my < self->rows)
1867 { 2202 {
1868 maprow *row = self->row + (y + my); 2203 maprow *row = self->row + (y + my);
… …
1878 maptex tex = self->tex [tile]; 2213 maptex tex = self->tex [tile];
1879 int px, py; 2214 int px, py;
1880 2215
1881 if (key.texname != tex.name) 2216 if (key.texname != tex.name)
1882 { 2217 {
2218 self->tex [tile].unused = 0;
2219
1883 if (!tex.name) 2220 if (!tex.name)
1884 tex = self->tex [2]; /* missing, replace by noface */ 2221 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1885 2222
1886 key.texname = tex.name; 2223 key.texname = tex.name;
1887 arr = rc_array (rc, &key); 2224 arr = rc_array (rc, &key);
1888 } 2225 }
1889 2226
1890 px = (x + 1) * T - tex.w; 2227 px = (x + 1) * T - tex.w;
1891 py = (y + 1) * T - tex.h; 2228 py = (y + 1) * T - tex.h;
2229
2230 if (expect_false (cell->player == player) && expect_false (z == 2))
2231 {
2232 pl_x = px;
2233 pl_y = py;
2234 pl_tex = tex;
2235 continue;
2236 }
1892 2237
1893 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2238 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1894 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2239 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1895 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2240 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1896 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2241 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1897
1898 if (cell->flags && z == 2)
1899 {
1900 // overlays such as the speech bubble, probably more to come
1901 if (cell->flags & 1)
1902 {
1903 maptex tex = self->tex [1];
1904 int px = x * T + T * 2 / 32;
1905 int py = y * T - T * 6 / 32;
1906
1907 if (tex.name)
1908 {
1909 if (key.texname != tex.name)
1910 {
1911 key.texname = tex.name;
1912 arr = rc_array (rc, &key);
1913 }
1914
1915 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1916 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1917 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1918 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1919 }
1920 }
1921 }
1922 2242
1923 // update smooth hash 2243 // update smooth hash
1924 if (tex.smoothtile) 2244 if (tex.smoothtile)
1925 { 2245 {
1926 skey.tile = tex.smoothtile; 2246 skey.tile = tex.smoothtile;
… …
1955 // corners 2275 // corners
1956 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2276 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1957 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2277 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1958 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2278 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1959 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2279 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2280 }
2281 }
2282
2283 if (expect_false (z == 2) && expect_false (cell->flags))
2284 {
2285 // overlays such as the speech bubble, probably more to come
2286 if (cell->flags & 1)
2287 {
2288 rc_key_t key_ov = key;
2289 maptex tex = self->tex [TEXID_SPEECH];
2290 rc_array_t *arr;
2291 int px = x * T + T * 2 / 32;
2292 int py = y * T - T * 6 / 32;
2293
2294 key_ov.texname = tex.name;
2295 arr = rc_array (rc_ov, &key_ov);
2296
2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2298 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2299 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2300 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1960 } 2301 }
1961 } 2302 }
1962 } 2303 }
1963 } 2304 }
1964 2305
… …
2004 { 2345 {
2005 // this time avoiding texture state changes 2346 // this time avoiding texture state changes
2006 // save gobs of state changes. 2347 // save gobs of state changes.
2007 if (key.texname != tex.name) 2348 if (key.texname != tex.name)
2008 { 2349 {
2350 self->tex [skey->tile].unused = 0;
2351
2009 glEnd (); 2352 glEnd ();
2010 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2353 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2011 glBegin (GL_QUADS); 2354 glBegin (GL_QUADS);
2012 } 2355 }
2013 2356
… …
2042 } 2385 }
2043 2386
2044 hv_clear (smooth); 2387 hv_clear (smooth);
2045 } 2388 }
2046 2389
2390 if (pl_tex.name)
2391 {
2392 maptex tex = pl_tex;
2393 int px = pl_x + sdx;
2394 int py = pl_y + sdy;
2395
2396 key.texname = tex.name;
2397 arr = rc_array (rc, &key);
2398
2399 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2400 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2401 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2402 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2403
2404 rc_draw (rc);
2405 }
2406
2407 rc_draw (rc_ov);
2408 rc_clear (rc_ov);
2409
2047 glDisable (GL_BLEND); 2410 glDisable (GL_BLEND);
2048 rc_free (rc); 2411 rc_free (rc);
2412 rc_free (rc_ov);
2049 2413
2050 // top layer: overlays such as the health bar 2414 // top layer: overlays such as the health bar
2051 for (y = 0; y < sh; y++) 2415 for (y = 0; y < sh; y++)
2052 if (0 <= y + my && y + my < self->rows) 2416 if (0 <= y + my && y + my < self->rows)
2053 { 2417 {
… …
2058 { 2422 {
2059 mapcell *cell = row->col + (x + mx - row->c0); 2423 mapcell *cell = row->col + (x + mx - row->c0);
2060 2424
2061 int px = x * T; 2425 int px = x * T;
2062 int py = y * T; 2426 int py = y * T;
2427
2428 if (expect_false (cell->player == player))
2429 {
2430 px += sdx;
2431 py += sdy;
2432 }
2063 2433
2064 if (cell->stat_hp) 2434 if (cell->stat_hp)
2065 { 2435 {
2066 int width = cell->stat_width * T; 2436 int width = cell->stat_width * T;
2067 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2437 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2078 } 2448 }
2079 } 2449 }
2080} 2450}
2081 2451
2082void 2452void
2083draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2453draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2084 CODE: 2454 CODE:
2085{ 2455{
2086 static float color[16][3] = { 2456 static float color[16][3] = {
2087 { 0.00F, 0.00F, 0.00F }, 2457 { 0.00f, 0.00f, 0.00f },
2088 { 1.00F, 1.00F, 1.00F }, 2458 { 1.00f, 1.00f, 1.00f },
2089 { 0.00F, 0.00F, 0.55F }, 2459 { 0.00f, 0.00f, 0.55f },
2090 { 1.00F, 0.00F, 0.00F }, 2460 { 1.00f, 0.00f, 0.00f },
2091 2461
2092 { 1.00F, 0.54F, 0.00F }, 2462 { 1.00f, 0.54f, 0.00f },
2093 { 0.11F, 0.56F, 1.00F }, 2463 { 0.11f, 0.56f, 1.00f },
2094 { 0.93F, 0.46F, 0.00F }, 2464 { 0.93f, 0.46f, 0.00f },
2095 { 0.18F, 0.54F, 0.34F }, 2465 { 0.18f, 0.54f, 0.34f },
2096 2466
2097 { 0.56F, 0.73F, 0.56F }, 2467 { 0.56f, 0.73f, 0.56f },
2098 { 0.80F, 0.80F, 0.80F }, 2468 { 0.80f, 0.80f, 0.80f },
2099 { 0.55F, 0.41F, 0.13F }, 2469 { 0.55f, 0.41f, 0.13f },
2100 { 0.99F, 0.77F, 0.26F }, 2470 { 0.99f, 0.77f, 0.26f },
2101 2471
2102 { 0.74F, 0.65F, 0.41F }, 2472 { 0.74f, 0.65f, 0.41f },
2103 2473
2104 { 0.00F, 1.00F, 1.00F }, 2474 { 0.00f, 1.00f, 1.00f },
2105 { 1.00F, 0.00F, 1.00F }, 2475 { 1.00f, 0.00f, 1.00f },
2106 { 1.00F, 1.00F, 0.00F }, 2476 { 1.00f, 1.00f, 0.00f },
2107 }; 2477 };
2108 2478
2109 int x, y; 2479 int x, y;
2110 2480
2111 glEnable (GL_TEXTURE_2D); 2481 glEnable (GL_TEXTURE_2D);
2482 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2483 * but the nvidia driver (185.18.14) mishandles alpha textures
2484 * and takes the colour from god knows where instead of using
2485 * Cp. MODULATE results in the same colour, but slightly different
2486 * alpha, but atcually gives us the correct colour with nvidia.
2487 */
2112 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2488 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2113 glEnable (GL_BLEND); 2489 glEnable (GL_BLEND);
2114 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2490 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2115 glBegin (GL_QUADS); 2491 glBegin (GL_QUADS);
2116 2492
2117 for (y = 0; y < h; y++) 2493 for (y = 0; y < h; y++)
… …
2121 2497
2122 if (m) 2498 if (m)
2123 { 2499 {
2124 float *c = color [m & 15]; 2500 float *c = color [m & 15];
2125 2501
2126 float tx1 = m & 0x40 ? 0.5 : 0.; 2502 float tx1 = m & 0x40 ? 0.5f : 0.f;
2127 float tx2 = tx1 + 0.5; 2503 float tx2 = tx1 + 0.5f;
2128 2504
2129 glColor4f (c[0], c[1], c[2], 0.75); 2505 glColor4f (c[0], c[1], c[2], 1);
2130 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2506 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2131 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2507 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2132 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2508 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2133 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2509 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2134 } 2510 }
… …
2142void 2518void
2143fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2519fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2144 PPCODE: 2520 PPCODE:
2145{ 2521{
2146 int x, y; 2522 int x, y;
2147 int sw1 = sw + 2; 2523 int sw1 = sw + 2;
2148 int sh1 = sh + 2; 2524 int sh1 = sh + 2;
2149 int sh3 = sh * 3; 2525 int sh3 = sh * 3;
2150 int sw34 = (sw * 3 + 3) & ~3; 2526 int sw3 = sw * 3;
2151 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2527 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2152 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2528 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2153 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2529 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2154 2530
2155 SvPOK_only (darkness3_sv); 2531 SvPOK_only (darkness3_sv);
2156 SvCUR_set (darkness3_sv, sw34 * sh3); 2532 SvCUR_set (darkness3_sv, sw3 * sh3);
2157 2533
2158 mx += self->x - 1; 2534 mx += self->x - 1;
2159 my += self->y - 1; 2535 my += self->y - 1;
2160
2161 memset (darkness1, 255, sw1 * sh1);
2162 2536
2163 for (y = 0; y < sh1; y++) 2537 for (y = 0; y < sh1; y++)
2164 if (0 <= y + my && y + my < self->rows) 2538 if (0 <= y + my && y + my < self->rows)
2165 { 2539 {
2166 maprow *row = self->row + (y + my); 2540 maprow *row = self->row + (y + my);
… …
2169 if (row->c0 <= x + mx && x + mx < row->c1) 2543 if (row->c0 <= x + mx && x + mx < row->c1)
2170 { 2544 {
2171 mapcell *cell = row->col + (x + mx - row->c0); 2545 mapcell *cell = row->col + (x + mx - row->c0);
2172 2546
2173 darkness1 [y * sw1 + x] = cell->darkness 2547 darkness1 [y * sw1 + x] = cell->darkness
2174 ? 255 - (cell->darkness - 1) 2548 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2175 : 255 - FOW_DARKNESS; 2549 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2176 } 2550 }
2177 } 2551 }
2178 2552
2179 for (y = 0; y < sh; ++y) 2553 for (y = 0; y < sh; ++y)
2180 for (x = 0; x < sw; ++x) 2554 for (x = 0; x < sw; ++x)
… …
2199 2573
2200 uint8_t r13 = (d13 + d23 + d12) / 3; 2574 uint8_t r13 = (d13 + d23 + d12) / 3;
2201 uint8_t r23 = d23; 2575 uint8_t r23 = d23;
2202 uint8_t r33 = (d23 + d33 + d32) / 3; 2576 uint8_t r33 = (d23 + d33 + d32) / 3;
2203 2577
2204 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2578 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2205 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2579 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2206 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2580 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2207 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2581 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2208 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2582 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2209 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2583 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2210 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2584 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2211 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2585 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2212 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2586 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2213 } 2587 }
2214 2588
2215 free (darkness1); 2589 free (darkness1);
2216 2590
2217 EXTEND (SP, 3); 2591 EXTEND (SP, 3);
2218 PUSHs (sv_2mortal (newSViv (sw34))); 2592 PUSHs (sv_2mortal (newSViv (sw3)));
2219 PUSHs (sv_2mortal (newSViv (sh3))); 2593 PUSHs (sv_2mortal (newSViv (sh3)));
2220 PUSHs (darkness3_sv); 2594 PUSHs (darkness3_sv);
2221} 2595}
2222 2596
2223SV * 2597SV *
… …
2286 else 2660 else
2287 *data++ = 0; 2661 *data++ = 0;
2288 } 2662 }
2289 } 2663 }
2290 2664
2665 /* if size is w*h + 5 then no data has been found */
2666 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2667 {
2291 SvPOK_only (data_sv); 2668 SvPOK_only (data_sv);
2292 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2669 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2670 }
2671
2293 RETVAL = data_sv; 2672 RETVAL = data_sv;
2294} 2673}
2295 OUTPUT: 2674 OUTPUT:
2296 RETVAL 2675 RETVAL
2297 2676
2298void 2677void
2299set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2678set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2300 PPCODE: 2679 PPCODE:
2301{ 2680{
2302 int x, y, z; 2681 int x, y, z;
2303 int w, h; 2682 int w, h;
2304 int x1, y1; 2683 int x1, y1;
2684 STRLEN len;
2685 uint8_t *data, *end;
2686
2687 len = SvLEN (data_sv);
2688 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2689 data = SvPVbyte_nolen (data_sv);
2690 end = data + len + 8;
2691
2692 if (len < 5)
2693 XSRETURN_EMPTY;
2305 2694
2306 if (*data++ != 0) 2695 if (*data++ != 0)
2307 XSRETURN_EMPTY; /* version mismatch */ 2696 XSRETURN_EMPTY; /* version mismatch */
2308 2697
2309 w = *data++ << 8; w |= *data++; 2698 w = *data++ << 8; w |= *data++;
… …
2324 { 2713 {
2325 maprow *row = map_get_row (self, y); 2714 maprow *row = map_get_row (self, y);
2326 2715
2327 for (x = x0; x < x1; x++) 2716 for (x = x0; x < x1; x++)
2328 { 2717 {
2718 uint8_t flags;
2719
2720 if (data + 7 >= end)
2721 XSRETURN_EMPTY;
2722
2329 uint8_t flags = *data++; 2723 flags = *data++;
2330 2724
2331 if (flags) 2725 if (flags)
2332 { 2726 {
2333 mapcell *cell = row_get_cell (row, x); 2727 mapcell *cell = row_get_cell (row, x);
2334 tileid tile[3] = { 0, 0, 0 }; 2728 tileid tile[3] = { 0, 0, 0 };
… …
2337 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2731 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2338 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2732 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2339 2733
2340 if (cell->darkness == 0) 2734 if (cell->darkness == 0)
2341 { 2735 {
2342 cell->darkness = 0; 2736 /*cell->darkness = 0;*/
2737 EXTEND (SP, 3);
2343 2738
2344 for (z = 0; z <= 2; z++) 2739 for (z = 0; z <= 2; z++)
2345 { 2740 {
2346 tileid t = tile [z]; 2741 tileid t = tile [z];
2347 2742
2348 if (t >= self->texs || (t && !self->tex [t].name)) 2743 if (t >= self->texs || (t && !self->tex [t].name))
2349 { 2744 {
2350 XPUSHs (sv_2mortal (newSViv (t))); 2745 PUSHs (sv_2mortal (newSViv (t)));
2351 need_texid (self, t); 2746 need_texid (self, t);
2352 } 2747 }
2353 2748
2354 cell->tile [z] = t; 2749 cell->tile [z] = t;
2355 } 2750 }
… …
2459void 2854void
2460set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2855set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2461 CODE: 2856 CODE:
2462{ 2857{
2463 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2858 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2464 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2859 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2465 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2860 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2466} 2861}
2467 2862
2468void 2863void
2469set_reverse_stereo (DC::Channel self, int flip) 2864set_reverse_stereo (DC::Channel self, int flip)
… …
2572 } *civ, const_iv[] = { 2967 } *civ, const_iv[] = {
2573# define const_iv(name) { # name, (IV)name } 2968# define const_iv(name) { # name, (IV)name }
2574 const_iv (GL_VENDOR), 2969 const_iv (GL_VENDOR),
2575 const_iv (GL_VERSION), 2970 const_iv (GL_VERSION),
2576 const_iv (GL_EXTENSIONS), 2971 const_iv (GL_EXTENSIONS),
2972 const_iv (GL_MAX_TEXTURE_UNITS),
2577 const_iv (GL_COLOR_MATERIAL), 2973 const_iv (GL_COLOR_MATERIAL),
2578 const_iv (GL_SMOOTH), 2974 const_iv (GL_SMOOTH),
2579 const_iv (GL_FLAT), 2975 const_iv (GL_FLAT),
2580 const_iv (GL_DITHER), 2976 const_iv (GL_DITHER),
2581 const_iv (GL_BLEND), 2977 const_iv (GL_BLEND),
… …
2593 const_iv (GL_ZERO), 2989 const_iv (GL_ZERO),
2594 const_iv (GL_SRC_ALPHA), 2990 const_iv (GL_SRC_ALPHA),
2595 const_iv (GL_DST_ALPHA), 2991 const_iv (GL_DST_ALPHA),
2596 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2992 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2597 const_iv (GL_ONE_MINUS_DST_ALPHA), 2993 const_iv (GL_ONE_MINUS_DST_ALPHA),
2994 const_iv (GL_SRC_COLOR),
2995 const_iv (GL_DST_COLOR),
2996 const_iv (GL_ONE_MINUS_SRC_COLOR),
2997 const_iv (GL_ONE_MINUS_DST_COLOR),
2598 const_iv (GL_SRC_ALPHA_SATURATE), 2998 const_iv (GL_SRC_ALPHA_SATURATE),
2599 const_iv (GL_RGB), 2999 const_iv (GL_RGB),
2600 const_iv (GL_RGBA), 3000 const_iv (GL_RGBA),
2601 const_iv (GL_RGBA4), 3001 const_iv (GL_RGBA4),
2602 const_iv (GL_RGBA8), 3002 const_iv (GL_RGBA8),
… …
2670 const_iv (GL_NICEST), 3070 const_iv (GL_NICEST),
2671 const_iv (GL_V2F), 3071 const_iv (GL_V2F),
2672 const_iv (GL_V3F), 3072 const_iv (GL_V3F),
2673 const_iv (GL_T2F_V3F), 3073 const_iv (GL_T2F_V3F),
2674 const_iv (GL_T2F_N3F_V3F), 3074 const_iv (GL_T2F_N3F_V3F),
3075 const_iv (GL_FUNC_ADD),
3076 const_iv (GL_FUNC_SUBTRACT),
3077 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2675# undef const_iv 3078# undef const_iv
2676 }; 3079 };
2677 3080
2678 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3081 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2679 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3082 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2686disable_GL_EXT_blend_func_separate () 3089disable_GL_EXT_blend_func_separate ()
2687 CODE: 3090 CODE:
2688 gl.BlendFuncSeparate = 0; 3091 gl.BlendFuncSeparate = 0;
2689 gl.BlendFuncSeparateEXT = 0; 3092 gl.BlendFuncSeparateEXT = 0;
2690 3093
3094void
3095apple_nvidia_bug (int enable)
3096
2691char * 3097char *
2692gl_vendor () 3098gl_vendor ()
2693 CODE: 3099 CODE:
2694 RETVAL = (char *)glGetString (GL_VENDOR); 3100 RETVAL = (char *)glGetString (GL_VENDOR);
2695 OUTPUT: 3101 OUTPUT:
… …
2744 3150
2745void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3151void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2746 CODE: 3152 CODE:
2747 gl_BlendFuncSeparate (sa, da, saa, daa); 3153 gl_BlendFuncSeparate (sa, da, saa, daa);
2748 3154
3155# void glBlendEquation (int se)
3156
2749void glDepthMask (int flag) 3157void glDepthMask (int flag)
2750 3158
2751void glLogicOp (int opcode) 3159void glLogicOp (int opcode)
2752 3160
2753void glColorMask (int red, int green, int blue, int alpha) 3161void glColorMask (int red, int green, int blue, int alpha)
… …
2787void glRotate (float angle, float x, float y, float z) 3195void glRotate (float angle, float x, float y, float z)
2788 CODE: 3196 CODE:
2789 glRotatef (angle, x, y, z); 3197 glRotatef (angle, x, y, z);
2790 3198
2791void glColor (float r, float g, float b, float a = 1.0) 3199void glColor (float r, float g, float b, float a = 1.0)
3200 PROTOTYPE: @
2792 ALIAS: 3201 ALIAS:
2793 glColor_premultiply = 1 3202 glColor_premultiply = 1
2794 CODE: 3203 CODE:
2795 if (ix) 3204 if (ix)
2796 { 3205 {
… …
2901void glNewList (int list, int mode = GL_COMPILE) 3310void glNewList (int list, int mode = GL_COMPILE)
2902 3311
2903void glEndList () 3312void glEndList ()
2904 3313
2905void glCallList (int list) 3314void glCallList (int list)
3315
3316void c_init ()
3317 CODE:
3318 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3319 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2906 3320
2907MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3321MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2908 3322
2909PROTOTYPES: DISABLE 3323PROTOTYPES: DISABLE
2910 3324

Diff Legend

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