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.256 by root, Mon Mar 24 00:24:46 2008 UTC vs.
Revision 1.301 by root, Thu Feb 4 20:01:08 2010 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));
… …
756 930
757 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
758#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);
759#include "glfunc.h" 933#include "glfunc.h"
760#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
761 } 938 }
762} 939}
763 OUTPUT: 940 OUTPUT:
764 RETVAL 941 RETVAL
765 942
… …
791 { 968 {
792 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
793 case SDL_KEYUP: 970 case SDL_KEYUP:
794 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
795 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
796 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);
797 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 */
798 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
799 break; 976 break;
800 977
801 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
802 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
820 x = ev.motion.x; 997 x = ev.motion.x;
821 y = ev.motion.y; 998 y = ev.motion.y;
822 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
823 } 1000 }
824 1001
825 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
826 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
827 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
828 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
829 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
830 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
915 } 1092 }
916 } 1093 }
917#endif 1094#endif
918} 1095}
919 1096
920void 1097int
921add_font (char *file) 1098add_font (char *file)
922 CODE: 1099 CODE:
923 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1100 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1101 OUTPUT:
1102 RETVAL
924 1103
925void 1104void
926load_image_inline (SV *image_) 1105load_image_inline (SV *image_)
927 ALIAS: 1106 ALIAS:
928 load_image_file = 1 1107 load_image_file = 1
… …
1044#if DEBUG 1223#if DEBUG
1045 VALGRIND_DO_LEAK_CHECK; 1224 VALGRIND_DO_LEAK_CHECK;
1046#endif 1225#endif
1047} 1226}
1048 1227
1228int
1229SvREFCNT (SV *sv)
1230 CODE:
1231 RETVAL = SvREFCNT (sv);
1232 OUTPUT:
1233 RETVAL
1234
1049MODULE = Deliantra::Client PACKAGE = DC::Font 1235MODULE = Deliantra::Client PACKAGE = DC::Font
1050 1236
1051PROTOTYPES: DISABLE 1237PROTOTYPES: DISABLE
1052 1238
1053DC::Font 1239DC::Font
… …
1482 if (ix) 1668 if (ix)
1483 { 1669 {
1484 glDisable (GL_ALPHA_TEST); 1670 glDisable (GL_ALPHA_TEST);
1485 glDisable (GL_BLEND); 1671 glDisable (GL_BLEND);
1486 } 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 (intensity ? GL_SRC_ALPHA : 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_PRIMARY_COLOR);
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);
1487} 1794}
1488 1795
1489IV 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)
1490 CODE: 1797 CODE:
1491{ 1798{
… …
1597 //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);
1598 // use uglier nearest interpolation because linear suffers 1905 // use uglier nearest interpolation because linear suffers
1599 // from transparent color bleeding and ugly wrapping effects. 1906 // from transparent color bleeding and ugly wrapping effects.
1600 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1907 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1601} 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 }
1602 1929
1603int 1930int
1604ox (DC::Map self) 1931ox (DC::Map self)
1605 ALIAS: 1932 ALIAS:
1606 oy = 1 1933 oy = 1
… …
1684 uint8_t ext, cmd; 2011 uint8_t ext, cmd;
1685 2012
1686 do 2013 do
1687 { 2014 {
1688 ext = *data++; 2015 ext = *data++;
1689 cmd = ext & 0x3f; 2016 cmd = ext & 0x7f;
1690 2017
1691 if (cmd < 4) 2018 if (cmd < 4)
1692 cell->darkness = 255 - ext * 64 + 1; 2019 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1693 else if (cmd == 5) // health 2020 else if (cmd == 5) // health
1694 { 2021 {
1695 cell->stat_width = 1; 2022 cell->stat_width = 1;
1696 cell->stat_hp = *data++; 2023 cell->stat_hp = *data++;
1697 } 2024 }
1698 else if (cmd == 6) // monster width 2025 else if (cmd == 6) // monster width
1699 cell->stat_width = *data++ + 1; 2026 cell->stat_width = *data++ + 1;
1700 else if (cmd == 0x47) 2027 else if (cmd == 0x47)
1701 { 2028 {
1702 if (*data == 4) 2029 if (*data == 1) cell->player = data [1];
1703 ; // decode player count 2030 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2031 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2032 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1704 2033
1705 data += *data + 1; 2034 data += *data + 1;
1706 } 2035 }
1707 else if (cmd == 8) // cell flags 2036 else if (cmd == 8) // cell flags
1708 cell->flags = *data++; 2037 cell->flags = *data++;
… …
1725 cell->tile [z] = self->face2tile [face]; 2054 cell->tile [z] = self->face2tile [face];
1726 2055
1727 if (cell->tile [z]) 2056 if (cell->tile [z])
1728 { 2057 {
1729 maptex *tex = self->tex + cell->tile [z]; 2058 maptex *tex = self->tex + cell->tile [z];
2059 tex->unused = 0;
1730 if (!tex->name) 2060 if (!tex->name)
1731 av_push (missing, newSViv (cell->tile [z])); 2061 av_push (missing, newSViv (cell->tile [z]));
1732 2062
1733 if (tex->smoothtile) 2063 if (tex->smoothtile)
1734 { 2064 {
1735 maptex *smooth = self->tex + tex->smoothtile; 2065 maptex *smooth = self->tex + tex->smoothtile;
2066 smooth->unused = 0;
1736 if (!smooth->name) 2067 if (!smooth->name)
1737 av_push (missing, newSViv (tex->smoothtile)); 2068 av_push (missing, newSViv (tex->smoothtile));
1738 } 2069 }
1739 } 2070 }
1740 } 2071 }
1741 } 2072 }
1742 else 2073 else
1743 cell->darkness = 0; 2074 CELL_CLEAR (cell);
1744 } 2075 }
1745} 2076}
1746 OUTPUT: 2077 OUTPUT:
1747 RETVAL 2078 RETVAL
1748 2079
… …
1800} 2131}
1801 OUTPUT: 2132 OUTPUT:
1802 RETVAL 2133 RETVAL
1803 2134
1804void 2135void
1805draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2136draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1806 CODE: 2137 CODE:
1807{ 2138{
1808 int x, y, z; 2139 int x, y, z;
1809 2140
1810 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2141 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1811 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
1812 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)
1813 smooth_key skey; 2144 smooth_key skey;
1814 2145 int pl_x, pl_y;
2146 maptex pl_tex;
1815 rc_t *rc = rc_alloc (); 2147 rc_t *rc = rc_alloc ();
2148 rc_t *rc_ov = rc_alloc ();
1816 rc_key_t key; 2149 rc_key_t key;
1817 rc_array_t *arr; 2150 rc_array_t *arr;
1818 2151
2152 pl_tex.name = 0;
2153
1819 // thats current max. sorry. 2154 // that's current max. sorry.
1820 if (sw > 255) sw = 255; 2155 if (sw > 255) sw = 255;
1821 if (sh > 255) sh = 255; 2156 if (sh > 255) sh = 255;
1822 2157
1823 // clear key, in case of extra padding 2158 // clear key, in case of extra padding
1824 memset (&skey, 0, sizeof (skey)); 2159 memset (&skey, 0, sizeof (skey));
… …
1828 key.g = 255; 2163 key.g = 255;
1829 key.b = 255; 2164 key.b = 255;
1830 key.a = 255; 2165 key.a = 255;
1831 key.mode = GL_QUADS; 2166 key.mode = GL_QUADS;
1832 key.format = GL_T2F_V3F; 2167 key.format = GL_T2F_V3F;
1833 key.texname = -1;
1834 2168
1835 mx += self->x; 2169 mx += self->x;
1836 my += self->y; 2170 my += self->y;
1837 2171
1838 // first pass: determine smooth_max 2172 // first pass: determine smooth_max
… …
1862 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2196 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1863 2197
1864 for (z = 0; z <= 2; z++) 2198 for (z = 0; z <= 2; z++)
1865 { 2199 {
1866 memset (smooth_level, 0, sizeof (smooth_level)); 2200 memset (smooth_level, 0, sizeof (smooth_level));
2201 key.texname = -1;
1867 2202
1868 for (y = 0; y < sh; y++) 2203 for (y = 0; y < sh; y++)
1869 if (0 <= y + my && y + my < self->rows) 2204 if (0 <= y + my && y + my < self->rows)
1870 { 2205 {
1871 maprow *row = self->row + (y + my); 2206 maprow *row = self->row + (y + my);
… …
1881 maptex tex = self->tex [tile]; 2216 maptex tex = self->tex [tile];
1882 int px, py; 2217 int px, py;
1883 2218
1884 if (key.texname != tex.name) 2219 if (key.texname != tex.name)
1885 { 2220 {
2221 self->tex [tile].unused = 0;
2222
1886 if (!tex.name) 2223 if (!tex.name)
1887 tex = self->tex [2]; /* missing, replace by noface */ 2224 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1888 2225
1889 key.texname = tex.name; 2226 key.texname = tex.name;
1890 arr = rc_array (rc, &key); 2227 arr = rc_array (rc, &key);
1891 } 2228 }
1892 2229
1893 px = (x + 1) * T - tex.w; 2230 px = (x + 1) * T - tex.w;
1894 py = (y + 1) * T - tex.h; 2231 py = (y + 1) * T - tex.h;
2232
2233 if (expect_false (cell->player == player) && expect_false (z == 2))
2234 {
2235 pl_x = px;
2236 pl_y = py;
2237 pl_tex = tex;
2238 continue;
2239 }
1895 2240
1896 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2241 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1897 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);
1898 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);
1899 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);
1900
1901 if (cell->flags && z == 2)
1902 {
1903 // overlays such as the speech bubble, probably more to come
1904 if (cell->flags & 1)
1905 {
1906 maptex tex = self->tex [1];
1907 int px = x * T + T * 2 / 32;
1908 int py = y * T - T * 6 / 32;
1909
1910 if (tex.name)
1911 {
1912 if (key.texname != tex.name)
1913 {
1914 key.texname = tex.name;
1915 arr = rc_array (rc, &key);
1916 }
1917
1918 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1919 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1920 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1921 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1922 }
1923 }
1924 }
1925 2245
1926 // update smooth hash 2246 // update smooth hash
1927 if (tex.smoothtile) 2247 if (tex.smoothtile)
1928 { 2248 {
1929 skey.tile = tex.smoothtile; 2249 skey.tile = tex.smoothtile;
… …
1958 // corners 2278 // corners
1959 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);
1960 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);
1961 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);
1962 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);
1963 } 2304 }
1964 } 2305 }
1965 } 2306 }
1966 } 2307 }
1967 2308
… …
2007 { 2348 {
2008 // this time avoiding texture state changes 2349 // this time avoiding texture state changes
2009 // save gobs of state changes. 2350 // save gobs of state changes.
2010 if (key.texname != tex.name) 2351 if (key.texname != tex.name)
2011 { 2352 {
2353 self->tex [skey->tile].unused = 0;
2354
2012 glEnd (); 2355 glEnd ();
2013 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2356 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2014 glBegin (GL_QUADS); 2357 glBegin (GL_QUADS);
2015 } 2358 }
2016 2359
… …
2045 } 2388 }
2046 2389
2047 hv_clear (smooth); 2390 hv_clear (smooth);
2048 } 2391 }
2049 2392
2393 if (pl_tex.name)
2394 {
2395 maptex tex = pl_tex;
2396 int px = pl_x + sdx;
2397 int py = pl_y + sdy;
2398
2399 key.texname = tex.name;
2400 arr = rc_array (rc, &key);
2401
2402 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2403 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2404 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2405 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2406
2407 rc_draw (rc);
2408 }
2409
2410 rc_draw (rc_ov);
2411 rc_clear (rc_ov);
2412
2050 glDisable (GL_BLEND); 2413 glDisable (GL_BLEND);
2051 rc_free (rc); 2414 rc_free (rc);
2415 rc_free (rc_ov);
2052 2416
2053 // top layer: overlays such as the health bar 2417 // top layer: overlays such as the health bar
2054 for (y = 0; y < sh; y++) 2418 for (y = 0; y < sh; y++)
2055 if (0 <= y + my && y + my < self->rows) 2419 if (0 <= y + my && y + my < self->rows)
2056 { 2420 {
… …
2061 { 2425 {
2062 mapcell *cell = row->col + (x + mx - row->c0); 2426 mapcell *cell = row->col + (x + mx - row->c0);
2063 2427
2064 int px = x * T; 2428 int px = x * T;
2065 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 }
2066 2436
2067 if (cell->stat_hp) 2437 if (cell->stat_hp)
2068 { 2438 {
2069 int width = cell->stat_width * T; 2439 int width = cell->stat_width * T;
2070 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2440 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2081 } 2451 }
2082 } 2452 }
2083} 2453}
2084 2454
2085void 2455void
2086draw_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)
2087 CODE: 2457 CODE:
2088{ 2458{
2089 static float color[16][3] = { 2459 static float color[16][3] = {
2090 { 0.00F, 0.00F, 0.00F }, 2460 { 0.00f, 0.00f, 0.00f },
2091 { 1.00F, 1.00F, 1.00F }, 2461 { 1.00f, 1.00f, 1.00f },
2092 { 0.00F, 0.00F, 0.55F }, 2462 { 0.00f, 0.00f, 0.55f },
2093 { 1.00F, 0.00F, 0.00F }, 2463 { 1.00f, 0.00f, 0.00f },
2094 2464
2095 { 1.00F, 0.54F, 0.00F }, 2465 { 1.00f, 0.54f, 0.00f },
2096 { 0.11F, 0.56F, 1.00F }, 2466 { 0.11f, 0.56f, 1.00f },
2097 { 0.93F, 0.46F, 0.00F }, 2467 { 0.93f, 0.46f, 0.00f },
2098 { 0.18F, 0.54F, 0.34F }, 2468 { 0.18f, 0.54f, 0.34f },
2099 2469
2100 { 0.56F, 0.73F, 0.56F }, 2470 { 0.56f, 0.73f, 0.56f },
2101 { 0.80F, 0.80F, 0.80F }, 2471 { 0.80f, 0.80f, 0.80f },
2102 { 0.55F, 0.41F, 0.13F }, 2472 { 0.55f, 0.41f, 0.13f },
2103 { 0.99F, 0.77F, 0.26F }, 2473 { 0.99f, 0.77f, 0.26f },
2104 2474
2105 { 0.74F, 0.65F, 0.41F }, 2475 { 0.74f, 0.65f, 0.41f },
2106 2476
2107 { 0.00F, 1.00F, 1.00F }, 2477 { 0.00f, 1.00f, 1.00f },
2108 { 1.00F, 0.00F, 1.00F }, 2478 { 1.00f, 0.00f, 1.00f },
2109 { 1.00F, 1.00F, 0.00F }, 2479 { 1.00f, 1.00f, 0.00f },
2110 }; 2480 };
2111 2481
2112 int x, y; 2482 int x, y;
2113 2483
2114 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 */
2115 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2116 glEnable (GL_BLEND); 2492 glEnable (GL_BLEND);
2117 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2493 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2118 glBegin (GL_QUADS); 2494 glBegin (GL_QUADS);
2119 2495
2120 for (y = 0; y < h; y++) 2496 for (y = 0; y < h; y++)
… …
2124 2500
2125 if (m) 2501 if (m)
2126 { 2502 {
2127 float *c = color [m & 15]; 2503 float *c = color [m & 15];
2128 2504
2129 float tx1 = m & 0x40 ? 0.5 : 0.; 2505 float tx1 = m & 0x40 ? 0.5f : 0.f;
2130 float tx2 = tx1 + 0.5; 2506 float tx2 = tx1 + 0.5f;
2131 2507
2132 glColor4f (c[0], c[1], c[2], 0.75); 2508 glColor4f (c[0], c[1], c[2], 1);
2133 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2509 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2134 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2510 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2135 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2511 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2136 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2512 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2137 } 2513 }
… …
2145void 2521void
2146fow_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)
2147 PPCODE: 2523 PPCODE:
2148{ 2524{
2149 int x, y; 2525 int x, y;
2150 int sw1 = sw + 2; 2526 int sw1 = sw + 2;
2151 int sh1 = sh + 2; 2527 int sh1 = sh + 2;
2152 int sh3 = sh * 3; 2528 int sh3 = sh * 3;
2153 int sw34 = (sw * 3 + 3) & ~3; 2529 int sw3 = sw * 3;
2154 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2530 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2155 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2531 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2156 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2532 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2157 2533
2158 SvPOK_only (darkness3_sv); 2534 SvPOK_only (darkness3_sv);
2159 SvCUR_set (darkness3_sv, sw34 * sh3); 2535 SvCUR_set (darkness3_sv, sw3 * sh3);
2160 2536
2161 mx += self->x - 1; 2537 mx += self->x - 1;
2162 my += self->y - 1; 2538 my += self->y - 1;
2163
2164 memset (darkness1, 255, sw1 * sh1);
2165 2539
2166 for (y = 0; y < sh1; y++) 2540 for (y = 0; y < sh1; y++)
2167 if (0 <= y + my && y + my < self->rows) 2541 if (0 <= y + my && y + my < self->rows)
2168 { 2542 {
2169 maprow *row = self->row + (y + my); 2543 maprow *row = self->row + (y + my);
… …
2172 if (row->c0 <= x + mx && x + mx < row->c1) 2546 if (row->c0 <= x + mx && x + mx < row->c1)
2173 { 2547 {
2174 mapcell *cell = row->col + (x + mx - row->c0); 2548 mapcell *cell = row->col + (x + mx - row->c0);
2175 2549
2176 darkness1 [y * sw1 + x] = cell->darkness 2550 darkness1 [y * sw1 + x] = cell->darkness
2177 ? 255 - (cell->darkness - 1) 2551 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2178 : 255 - FOW_DARKNESS; 2552 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2179 } 2553 }
2180 } 2554 }
2181 2555
2182 for (y = 0; y < sh; ++y) 2556 for (y = 0; y < sh; ++y)
2183 for (x = 0; x < sw; ++x) 2557 for (x = 0; x < sw; ++x)
… …
2202 2576
2203 uint8_t r13 = (d13 + d23 + d12) / 3; 2577 uint8_t r13 = (d13 + d23 + d12) / 3;
2204 uint8_t r23 = d23; 2578 uint8_t r23 = d23;
2205 uint8_t r33 = (d23 + d33 + d32) / 3; 2579 uint8_t r33 = (d23 + d33 + d32) / 3;
2206 2580
2207 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2581 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2208 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2582 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2209 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2583 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2210 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2584 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2211 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 */
2212 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2586 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2213 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2587 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2214 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2588 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2215 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2589 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2216 } 2590 }
2217 2591
2218 free (darkness1); 2592 free (darkness1);
2219 2593
2220 EXTEND (SP, 3); 2594 EXTEND (SP, 3);
2221 PUSHs (sv_2mortal (newSViv (sw34))); 2595 PUSHs (sv_2mortal (newSViv (sw3)));
2222 PUSHs (sv_2mortal (newSViv (sh3))); 2596 PUSHs (sv_2mortal (newSViv (sh3)));
2223 PUSHs (darkness3_sv); 2597 PUSHs (darkness3_sv);
2224} 2598}
2225 2599
2226SV * 2600SV *
… …
2289 else 2663 else
2290 *data++ = 0; 2664 *data++ = 0;
2291 } 2665 }
2292 } 2666 }
2293 2667
2668 /* if size is w*h + 5 then no data has been found */
2669 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2670 {
2294 SvPOK_only (data_sv); 2671 SvPOK_only (data_sv);
2295 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2672 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2673 }
2674
2296 RETVAL = data_sv; 2675 RETVAL = data_sv;
2297} 2676}
2298 OUTPUT: 2677 OUTPUT:
2299 RETVAL 2678 RETVAL
2300 2679
2301void 2680void
2302set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2681set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2303 PPCODE: 2682 PPCODE:
2304{ 2683{
2305 int x, y, z; 2684 int x, y, z;
2306 int w, h; 2685 int w, h;
2307 int x1, y1; 2686 int x1, y1;
2687 STRLEN len;
2688 uint8_t *data, *end;
2689
2690 len = SvLEN (data_sv);
2691 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2692 data = SvPVbyte_nolen (data_sv);
2693 end = data + len + 8;
2694
2695 if (len < 5)
2696 XSRETURN_EMPTY;
2308 2697
2309 if (*data++ != 0) 2698 if (*data++ != 0)
2310 XSRETURN_EMPTY; /* version mismatch */ 2699 XSRETURN_EMPTY; /* version mismatch */
2311 2700
2312 w = *data++ << 8; w |= *data++; 2701 w = *data++ << 8; w |= *data++;
… …
2327 { 2716 {
2328 maprow *row = map_get_row (self, y); 2717 maprow *row = map_get_row (self, y);
2329 2718
2330 for (x = x0; x < x1; x++) 2719 for (x = x0; x < x1; x++)
2331 { 2720 {
2721 uint8_t flags;
2722
2723 if (data + 7 >= end)
2724 XSRETURN_EMPTY;
2725
2332 uint8_t flags = *data++; 2726 flags = *data++;
2333 2727
2334 if (flags) 2728 if (flags)
2335 { 2729 {
2336 mapcell *cell = row_get_cell (row, x); 2730 mapcell *cell = row_get_cell (row, x);
2337 tileid tile[3] = { 0, 0, 0 }; 2731 tileid tile[3] = { 0, 0, 0 };
… …
2340 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2734 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2341 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2735 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2342 2736
2343 if (cell->darkness == 0) 2737 if (cell->darkness == 0)
2344 { 2738 {
2345 cell->darkness = 0; 2739 /*cell->darkness = 0;*/
2740 EXTEND (SP, 3);
2346 2741
2347 for (z = 0; z <= 2; z++) 2742 for (z = 0; z <= 2; z++)
2348 { 2743 {
2349 tileid t = tile [z]; 2744 tileid t = tile [z];
2350 2745
2351 if (t >= self->texs || (t && !self->tex [t].name)) 2746 if (t >= self->texs || (t && !self->tex [t].name))
2352 { 2747 {
2353 XPUSHs (sv_2mortal (newSViv (t))); 2748 PUSHs (sv_2mortal (newSViv (t)));
2354 need_texid (self, t); 2749 need_texid (self, t);
2355 } 2750 }
2356 2751
2357 cell->tile [z] = t; 2752 cell->tile [z] = t;
2358 } 2753 }
… …
2462void 2857void
2463set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2858set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2464 CODE: 2859 CODE:
2465{ 2860{
2466 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));
2467 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;
2468 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2863 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2469} 2864}
2470 2865
2471void 2866void
2472set_reverse_stereo (DC::Channel self, int flip) 2867set_reverse_stereo (DC::Channel self, int flip)
… …
2474 Mix_SetReverseStereo (self, flip); 2869 Mix_SetReverseStereo (self, flip);
2475 2870
2476MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2871MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2477 2872
2478PROTOTYPES: DISABLE 2873PROTOTYPES: DISABLE
2874
2875void
2876decoders ()
2877 PPCODE:
2878#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2879 int i, num = Mix_GetNumChunkDecoders ();
2880 EXTEND (SP, num);
2881 for (i = 0; i < num; ++i)
2882 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2883#else
2884 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2885#endif
2479 2886
2480DC::MixChunk 2887DC::MixChunk
2481new (SV *class, DC::RW rwops) 2888new (SV *class, DC::RW rwops)
2482 CODE: 2889 CODE:
2483 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2890 RETVAL = Mix_LoadWAV_RW (rwops, 1);
… …
2516 OUTPUT: 2923 OUTPUT:
2517 RETVAL 2924 RETVAL
2518 2925
2519MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2926MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2520 2927
2928void
2929decoders ()
2930 PPCODE:
2931#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2932 int i, num = Mix_GetNumMusicDecoders ();
2933 EXTEND (SP, num);
2934 for (i = 0; i < num; ++i)
2935 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2936#else
2937 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2938#endif
2939
2521int 2940int
2522volume (int volume = -1) 2941volume (int volume = -1)
2523 PROTOTYPE: ;$ 2942 PROTOTYPE: ;$
2524 CODE: 2943 CODE:
2525 if (items > 0) 2944 if (items > 0)
… …
2535 2954
2536void 2955void
2537halt () 2956halt ()
2538 CODE: 2957 CODE:
2539 Mix_HaltMusic (); 2958 Mix_HaltMusic ();
2959
2960int
2961playing ()
2962 CODE:
2963 RETVAL = Mix_PlayingMusic ();
2964 OUTPUT:
2965 RETVAL
2540 2966
2541DC::MixMusic 2967DC::MixMusic
2542new (SV *class, DC::RW rwops) 2968new (SV *class, DC::RW rwops)
2543 CODE: 2969 CODE:
2544 RETVAL = Mix_LoadMUS_RW (rwops); 2970 RETVAL = Mix_LoadMUS_RW (rwops);
… …
2575 } *civ, const_iv[] = { 3001 } *civ, const_iv[] = {
2576# define const_iv(name) { # name, (IV)name } 3002# define const_iv(name) { # name, (IV)name }
2577 const_iv (GL_VENDOR), 3003 const_iv (GL_VENDOR),
2578 const_iv (GL_VERSION), 3004 const_iv (GL_VERSION),
2579 const_iv (GL_EXTENSIONS), 3005 const_iv (GL_EXTENSIONS),
3006 const_iv (GL_MAX_TEXTURE_UNITS),
2580 const_iv (GL_COLOR_MATERIAL), 3007 const_iv (GL_COLOR_MATERIAL),
2581 const_iv (GL_SMOOTH), 3008 const_iv (GL_SMOOTH),
2582 const_iv (GL_FLAT), 3009 const_iv (GL_FLAT),
2583 const_iv (GL_DITHER), 3010 const_iv (GL_DITHER),
2584 const_iv (GL_BLEND), 3011 const_iv (GL_BLEND),
… …
2596 const_iv (GL_ZERO), 3023 const_iv (GL_ZERO),
2597 const_iv (GL_SRC_ALPHA), 3024 const_iv (GL_SRC_ALPHA),
2598 const_iv (GL_DST_ALPHA), 3025 const_iv (GL_DST_ALPHA),
2599 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3026 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2600 const_iv (GL_ONE_MINUS_DST_ALPHA), 3027 const_iv (GL_ONE_MINUS_DST_ALPHA),
3028 const_iv (GL_SRC_COLOR),
3029 const_iv (GL_DST_COLOR),
3030 const_iv (GL_ONE_MINUS_SRC_COLOR),
3031 const_iv (GL_ONE_MINUS_DST_COLOR),
2601 const_iv (GL_SRC_ALPHA_SATURATE), 3032 const_iv (GL_SRC_ALPHA_SATURATE),
2602 const_iv (GL_RGB), 3033 const_iv (GL_RGB),
2603 const_iv (GL_RGBA), 3034 const_iv (GL_RGBA),
2604 const_iv (GL_RGBA4), 3035 const_iv (GL_RGBA4),
2605 const_iv (GL_RGBA8), 3036 const_iv (GL_RGBA8),
… …
2673 const_iv (GL_NICEST), 3104 const_iv (GL_NICEST),
2674 const_iv (GL_V2F), 3105 const_iv (GL_V2F),
2675 const_iv (GL_V3F), 3106 const_iv (GL_V3F),
2676 const_iv (GL_T2F_V3F), 3107 const_iv (GL_T2F_V3F),
2677 const_iv (GL_T2F_N3F_V3F), 3108 const_iv (GL_T2F_N3F_V3F),
3109 const_iv (GL_FUNC_ADD),
3110 const_iv (GL_FUNC_SUBTRACT),
3111 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2678# undef const_iv 3112# undef const_iv
2679 }; 3113 };
2680 3114
2681 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3115 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2682 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3116 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2689disable_GL_EXT_blend_func_separate () 3123disable_GL_EXT_blend_func_separate ()
2690 CODE: 3124 CODE:
2691 gl.BlendFuncSeparate = 0; 3125 gl.BlendFuncSeparate = 0;
2692 gl.BlendFuncSeparateEXT = 0; 3126 gl.BlendFuncSeparateEXT = 0;
2693 3127
3128void
3129apple_nvidia_bug (int enable)
3130
2694char * 3131char *
2695gl_vendor () 3132gl_vendor ()
2696 CODE: 3133 CODE:
2697 RETVAL = (char *)glGetString (GL_VENDOR); 3134 RETVAL = (char *)glGetString (GL_VENDOR);
2698 OUTPUT: 3135 OUTPUT:
… …
2747 3184
2748void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3185void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2749 CODE: 3186 CODE:
2750 gl_BlendFuncSeparate (sa, da, saa, daa); 3187 gl_BlendFuncSeparate (sa, da, saa, daa);
2751 3188
3189# void glBlendEquation (int se)
3190
2752void glDepthMask (int flag) 3191void glDepthMask (int flag)
2753 3192
2754void glLogicOp (int opcode) 3193void glLogicOp (int opcode)
2755 3194
2756void glColorMask (int red, int green, int blue, int alpha) 3195void glColorMask (int red, int green, int blue, int alpha)
… …
2790void glRotate (float angle, float x, float y, float z) 3229void glRotate (float angle, float x, float y, float z)
2791 CODE: 3230 CODE:
2792 glRotatef (angle, x, y, z); 3231 glRotatef (angle, x, y, z);
2793 3232
2794void glColor (float r, float g, float b, float a = 1.0) 3233void glColor (float r, float g, float b, float a = 1.0)
3234 PROTOTYPE: @
2795 ALIAS: 3235 ALIAS:
2796 glColor_premultiply = 1 3236 glColor_premultiply = 1
2797 CODE: 3237 CODE:
2798 if (ix) 3238 if (ix)
2799 { 3239 {
… …
2904void glNewList (int list, int mode = GL_COMPILE) 3344void glNewList (int list, int mode = GL_COMPILE)
2905 3345
2906void glEndList () 3346void glEndList ()
2907 3347
2908void glCallList (int list) 3348void glCallList (int list)
3349
3350void c_init ()
3351 CODE:
3352 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3353 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2909 3354
2910MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3355MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2911 3356
2912PROTOTYPES: DISABLE 3357PROTOTYPES: DISABLE
2913 3358

Diff Legend

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