ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.264 by root, Fri Jul 18 22:32:54 2008 UTC vs.
Revision 1.311 by root, Tue Dec 27 09:17:27 2011 UTC

… …
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
… …
38#include <SDL_thread.h> 37#include <SDL_thread.h>
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
43 49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib/gmacros.h>
… …
76#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
78 84
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
82 91
83#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
85 94
86#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
87 96
88/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
99
100#define KMOD_LRAM 0x10000 // our extension
101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
90 123
91static AV *texture_av; 124static AV *texture_av;
92 125
93static struct 126static struct
94{ 127{
… …
226 int w, h; 259 int w, h;
227 float s, t; 260 float s, t;
228 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
229 tileid smoothtile; 262 tileid smoothtile;
230 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
231} maptex; 265} maptex;
232 266
233typedef struct { 267typedef struct {
234 uint32_t player; 268 uint32_t player;
235 tileid tile[3]; 269 tileid tile[3];
… …
367 self->oy = 0; 401 self->oy = 0;
368 self->row = 0; 402 self->row = 0;
369 self->rows = 0; 403 self->rows = 0;
370} 404}
371 405
406#define CELL_CLEAR(cell) \
407 do { \
408 if ((cell)->player) \
409 (cell)->tile [2] = 0; \
410 (cell)->darkness = 0; \
411 (cell)->stat_hp = 0; \
412 (cell)->flags = 0; \
413 (cell)->player = 0; \
414 } while (0)
415
372static void 416static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 417map_blank (DC__Map self, int x0, int y0, int w, int h)
374{ 418{
375 int x, y; 419 int x, y;
376 maprow *row; 420 maprow *row;
… …
390 if (x >= row->c1) 434 if (x >= row->c1)
391 break; 435 break;
392 436
393 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
394 438
395 cell->darkness = 0; 439 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 440 }
400 } 441 }
401} 442}
402 443
403typedef struct { 444typedef struct {
… …
438 ev.code = 1; 479 ev.code = 1;
439 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
440 ev.data2 = 0; 481 ev.data2 = 0;
441 482
442 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
484}
485
486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
443} 490}
444 491
445static unsigned int 492static unsigned int
446minpot (unsigned int n) 493minpot (unsigned int n)
447{ 494{
… …
514 if (!svp || !SvTRUE (*svp)) 561 if (!svp || !SvTRUE (*svp))
515 return 0; 562 return 0;
516 563
517 return 1; 564 return 1;
518} 565}
566
567/******************************************************************************/
568
569/* process keyboard modifiers */
570static int
571mod_munge (int mod)
572{
573 mod &= MOD_MASK;
574
575 if (mod & (KMOD_META | KMOD_ALT))
576 mod |= KMOD_LRAM;
577
578 return mod;
579}
580
581static void
582deliantra_main ()
583{
584 char *argv[] = { 0 };
585 call_argv ("DC::Main::main", G_DISCARD | G_VOID, argv);
586}
587
588#ifdef __MACOSX__
589 /* to due surprising braindamage on the side of SDL design, we
590 * do some mind-boggling hack here: SDL requires a custom main()
591 * on OS X, so... we provide one and call the original main(), which,
592 * due to shared library magic, calls -lSDLmain's main, not perl's main,
593 * and which calls our main (== SDL_main) back.
594 */
595 extern C_LINKAGE int
596 main (int argc, char *argv[])
597 {
598 deliantra_main ();
599 }
600
601 #undef main
602
603 extern C_LINKAGE int main (int argc, char *argv[]);
604
605 static void
606 SDL_braino (void)
607 {
608 char *argv[] = { "deliantra client", 0 };
609 (main) (1, argv);
610 }
611#else
612 static void
613 SDL_braino (void)
614 {
615 deliantra_main ();
616 }
617#endif
519 618
520MODULE = Deliantra::Client PACKAGE = DC 619MODULE = Deliantra::Client PACKAGE = DC
521 620
522PROTOTYPES: ENABLE 621PROTOTYPES: ENABLE
523 622
… …
552 const_iv (SDL_USEREVENT), 651 const_iv (SDL_USEREVENT),
553 652
554 const_iv (SDL_APPINPUTFOCUS), 653 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 654 const_iv (SDL_APPMOUSEFOCUS),
556 const_iv (SDL_APPACTIVE), 655 const_iv (SDL_APPACTIVE),
656
657
658 const_iv (SDLK_UNKNOWN),
659 const_iv (SDLK_FIRST),
660 const_iv (SDLK_BACKSPACE),
661 const_iv (SDLK_TAB),
662 const_iv (SDLK_CLEAR),
663 const_iv (SDLK_RETURN),
664 const_iv (SDLK_PAUSE),
665 const_iv (SDLK_ESCAPE),
666 const_iv (SDLK_SPACE),
667 const_iv (SDLK_EXCLAIM),
668 const_iv (SDLK_QUOTEDBL),
669 const_iv (SDLK_HASH),
670 const_iv (SDLK_DOLLAR),
671 const_iv (SDLK_AMPERSAND),
672 const_iv (SDLK_QUOTE),
673 const_iv (SDLK_LEFTPAREN),
674 const_iv (SDLK_RIGHTPAREN),
675 const_iv (SDLK_ASTERISK),
676 const_iv (SDLK_PLUS),
677 const_iv (SDLK_COMMA),
678 const_iv (SDLK_MINUS),
679 const_iv (SDLK_PERIOD),
680 const_iv (SDLK_SLASH),
681 const_iv (SDLK_0),
682 const_iv (SDLK_1),
683 const_iv (SDLK_2),
684 const_iv (SDLK_3),
685 const_iv (SDLK_4),
686 const_iv (SDLK_5),
687 const_iv (SDLK_6),
688 const_iv (SDLK_7),
689 const_iv (SDLK_8),
690 const_iv (SDLK_9),
691 const_iv (SDLK_COLON),
692 const_iv (SDLK_SEMICOLON),
693 const_iv (SDLK_LESS),
694 const_iv (SDLK_EQUALS),
695 const_iv (SDLK_GREATER),
696 const_iv (SDLK_QUESTION),
697 const_iv (SDLK_AT),
698
699 const_iv (SDLK_LEFTBRACKET),
700 const_iv (SDLK_BACKSLASH),
701 const_iv (SDLK_RIGHTBRACKET),
702 const_iv (SDLK_CARET),
703 const_iv (SDLK_UNDERSCORE),
704 const_iv (SDLK_BACKQUOTE),
705 const_iv (SDLK_DELETE),
557 706
558 const_iv (SDLK_FIRST), 707 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 708 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 709 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 710 const_iv (SDLK_KP1),
… …
637 const_iv (KMOD_RMETA), 786 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 787 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 788 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 789 const_iv (KMOD_MODE),
641 790
791 const_iv (KMOD_LRAM),
792
642 const_iv (MIX_DEFAULT_FORMAT), 793 const_iv (MIX_DEFAULT_FORMAT),
643 794
644 const_iv (SDL_INIT_TIMER), 795 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 796 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 797 const_iv (SDL_INIT_VIDEO),
… …
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 815 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO), 816 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 817 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES), 818 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL), 819 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL) 820 const_iv (SDL_GL_SWAP_CONTROL),
821
822 const_iv (FOW_DARKNESS)
670# undef const_iv 823# undef const_iv
671 }; 824 };
672 825
673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 826 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
675 828
676 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
677 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
678} 831}
679 832
… …
695NV ceil (NV x) 848NV ceil (NV x)
696 849
697IV minpot (UV n) 850IV minpot (UV n)
698 851
699IV popcount (UV n) 852IV popcount (UV n)
853
854NV distance (NV dx, NV dy)
855 CODE:
856 RETVAL = pow (dx * dx + dy * dy, 0.5);
857 OUTPUT:
858 RETVAL
700 859
701void 860void
702pango_init () 861pango_init ()
703 CODE: 862 CODE:
704{ 863{
… …
712#endif 871#endif
713} 872}
714 873
715char *SDL_GetError () 874char *SDL_GetError ()
716 875
876void SDL_braino ()
877
717int SDL_Init (U32 flags) 878int SDL_Init (U32 flags)
718 879
719int SDL_InitSubSystem (U32 flags) 880int SDL_InitSubSystem (U32 flags)
720 881
721void SDL_QuitSubSystem (U32 flags) 882void SDL_QuitSubSystem (U32 flags)
… …
756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 917 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
757 918
758 if (m && m != (SDL_Rect **)-1) 919 if (m && m != (SDL_Rect **)-1)
759 while (*m) 920 while (*m)
760 { 921 {
922 if ((*m)->w >= 400 && (*m)->h >= 300)
923 {
761 AV *av = newAV (); 924 AV *av = newAV ();
762 av_push (av, newSViv ((*m)->w)); 925 av_push (av, newSViv ((*m)->w));
763 av_push (av, newSViv ((*m)->h)); 926 av_push (av, newSViv ((*m)->h));
764 av_push (av, newSViv (rgb)); 927 av_push (av, newSViv (rgb));
765 av_push (av, newSViv (alpha)); 928 av_push (av, newSViv (alpha));
766 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 929 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
930 }
767 931
768 ++m; 932 ++m;
769 } 933 }
770} 934}
771 935
… …
791 955
792 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
793#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 957#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
794#include "glfunc.h" 958#include "glfunc.h"
795#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
796 } 963 }
797} 964}
798 OUTPUT: 965 OUTPUT:
799 RETVAL 966 RETVAL
800 967
… …
808SDL_GetAppState () 975SDL_GetAppState ()
809 976
810int 977int
811SDL_GetModState () 978SDL_GetModState ()
812 979
980int
981SDL_WaitEvent ()
982 C_ARGS: 0
983
813void 984void
985SDL_PumpEvents ()
986
987void
814poll_events () 988peep_events ()
815 PPCODE: 989 PPCODE:
816{ 990{
817 SDL_Event ev; 991 SDL_Event ev;
818 992
819 SDL_PumpEvents (); 993 SDL_PumpEvents ();
… …
826 { 1000 {
827 case SDL_KEYDOWN: 1001 case SDL_KEYDOWN:
828 case SDL_KEYUP: 1002 case SDL_KEYUP:
829 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1003 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
830 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1004 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
831 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1005 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
832 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1006 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
833 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1007 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
834 break; 1008 break;
835 1009
836 case SDL_ACTIVEEVENT: 1010 case SDL_ACTIVEEVENT:
837 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1011 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
855 x = ev.motion.x; 1029 x = ev.motion.x;
856 y = ev.motion.y; 1030 y = ev.motion.y;
857 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1031 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
858 } 1032 }
859 1033
860 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1034 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
861 hv_store (hv, "state", 5, newSViv (state), 0); 1035 hv_store (hv, "state", 5, newSViv (state), 0);
862 hv_store (hv, "x", 1, newSViv (x), 0); 1036 hv_store (hv, "x", 1, newSViv (x), 0);
863 hv_store (hv, "y", 1, newSViv (y), 0); 1037 hv_store (hv, "y", 1, newSViv (y), 0);
864 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1038 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
865 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1039 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
885 1059
886 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1060 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
887 } 1061 }
888} 1062}
889 1063
1064char *
1065SDL_AudioDriverName ()
1066 CODE:
1067{
1068 char buf [256];
1069 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1070 XSRETURN_UNDEF;
1071
1072 RETVAL = buf;
1073}
1074 OUTPUT:
1075 RETVAL
1076
890int 1077int
891Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1078Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
892 POSTCALL: 1079 POSTCALL:
893 Mix_HookMusicFinished (music_finished); 1080 Mix_HookMusicFinished (music_finished);
894 Mix_ChannelFinished (channel_finished); 1081 Mix_ChannelFinished (channel_finished);
… …
956add_font (char *file) 1143add_font (char *file)
957 CODE: 1144 CODE:
958 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1145 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
959 OUTPUT: 1146 OUTPUT:
960 RETVAL 1147 RETVAL
1148
1149void
1150IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1151
1152void
1153Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_MP3 | MIX_INIT_OGG)
961 1154
962void 1155void
963load_image_inline (SV *image_) 1156load_image_inline (SV *image_)
964 ALIAS: 1157 ALIAS:
965 load_image_file = 1 1158 load_image_file = 1
… …
1081#if DEBUG 1274#if DEBUG
1082 VALGRIND_DO_LEAK_CHECK; 1275 VALGRIND_DO_LEAK_CHECK;
1083#endif 1276#endif
1084} 1277}
1085 1278
1279int
1280SvREFCNT (SV *sv)
1281 CODE:
1282 RETVAL = SvREFCNT (sv);
1283 OUTPUT:
1284 RETVAL
1285
1086MODULE = Deliantra::Client PACKAGE = DC::Font 1286MODULE = Deliantra::Client PACKAGE = DC::Font
1087 1287
1088PROTOTYPES: DISABLE 1288PROTOTYPES: DISABLE
1089 1289
1090DC::Font 1290DC::Font
… …
1519 if (ix) 1719 if (ix)
1520 { 1720 {
1521 glDisable (GL_ALPHA_TEST); 1721 glDisable (GL_ALPHA_TEST);
1522 glDisable (GL_BLEND); 1722 glDisable (GL_BLEND);
1523 } 1723 }
1724}
1725
1726void
1727draw_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)
1728 PROTOTYPE: @
1729 CODE:
1730{
1731 glEnable (GL_BLEND);
1732 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1733 glEnable (GL_TEXTURE_2D);
1734 glBindTexture (GL_TEXTURE_2D, name1);
1735
1736 glColor3f (intensity, intensity, intensity);
1737 glPushMatrix ();
1738 glScalef (1./3, 1./3, 1.);
1739
1740 if (blend > 0.f)
1741 {
1742 float dx3 = dx * -3.f / w;
1743 float dy3 = dy * -3.f / h;
1744 GLfloat env_color[4] = { 0., 0., 0., blend };
1745
1746 /* interpolate the two shadow textures */
1747 /* stage 0 == rgb(glcolor) + alpha(t0) */
1748 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1749
1750 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1751 gl.ActiveTexture (GL_TEXTURE1);
1752 glEnable (GL_TEXTURE_2D);
1753 glBindTexture (GL_TEXTURE_2D, name2);
1754 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1755
1756 /* rgb == rgb(glcolor) */
1757 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1758 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1760
1761 /* alpha = interpolate t0, t1 by env_alpha */
1762 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1763
1764 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1765 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1766 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1767
1768 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1769 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1770
1771 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1772 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1773
1774 glBegin (GL_QUADS);
1775 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1776 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1777 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1778 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1779 glEnd ();
1780
1781 glDisable (GL_TEXTURE_2D);
1782 gl.ActiveTexture (GL_TEXTURE0);
1783 }
1784 else
1785 {
1786 /* simple blending of one texture, also opengl <1.3 path */
1787 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1788
1789 glBegin (GL_QUADS);
1790 glTexCoord2f (0, 0); glVertex2f (0, 0);
1791 glTexCoord2f (0, t); glVertex2f (0, h);
1792 glTexCoord2f (s, t); glVertex2f (w, h);
1793 glTexCoord2f (s, 0); glVertex2f (w, 0);
1794 glEnd ();
1795 }
1796
1797 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1798 {
1799 int x, y;
1800 int dx3 = dx * 3;
1801 int dy3 = dy * 3;
1802
1803 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1804 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1805 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1806 glTranslatef (-1., -1., 0);
1807 glBegin (GL_QUADS);
1808
1809 for (y = 1; y < h; y += 3)
1810 {
1811 int y1 = y - dy3;
1812 int y1valid = y1 >= 0 && y1 < h;
1813
1814 for (x = 1; x < w; x += 3)
1815 {
1816 int x1 = x - dx3;
1817 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1818 uint8_t h2;
1819
1820 if (y1valid && x1 >= 0 && x1 < w)
1821 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1822 else
1823 h2 = 1; /* out of range == invisible */
1824
1825 if (h1 || h2)
1826 {
1827 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1828 glColor4f (1., 1., 1., alpha);
1829
1830 glTexCoord2f (0, 0.); glVertex2i (x , y );
1831 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1832 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1833 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1834 }
1835 }
1836 }
1837 }
1838
1839 glEnd ();
1840
1841 glPopMatrix ();
1842
1843 glDisable (GL_TEXTURE_2D);
1844 glDisable (GL_BLEND);
1524} 1845}
1525 1846
1526IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1847IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1527 CODE: 1848 CODE:
1528{ 1849{
… …
1634 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1955 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1635 // use uglier nearest interpolation because linear suffers 1956 // use uglier nearest interpolation because linear suffers
1636 // from transparent color bleeding and ugly wrapping effects. 1957 // from transparent color bleeding and ugly wrapping effects.
1637 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1958 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1638} 1959}
1960
1961void
1962expire_textures (DC::Map self, int texid, int count)
1963 PPCODE:
1964 for (; texid < self->texs && count; ++texid, --count)
1965 {
1966 maptex *tex = self->tex + texid;
1967
1968 if (tex->name)
1969 {
1970 if (tex->unused)
1971 {
1972 tex->name = 0;
1973 tex->unused = 0;
1974 XPUSHs (sv_2mortal (newSViv (texid)));
1975 }
1976 else
1977 tex->unused = 1;
1978 }
1979 }
1639 1980
1640int 1981int
1641ox (DC::Map self) 1982ox (DC::Map self)
1642 ALIAS: 1983 ALIAS:
1643 oy = 1 1984 oy = 1
… …
1724 { 2065 {
1725 ext = *data++; 2066 ext = *data++;
1726 cmd = ext & 0x7f; 2067 cmd = ext & 0x7f;
1727 2068
1728 if (cmd < 4) 2069 if (cmd < 4)
1729 cell->darkness = 255 - ext * 64 + 1; 2070 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1730 else if (cmd == 5) // health 2071 else if (cmd == 5) // health
1731 { 2072 {
1732 cell->stat_width = 1; 2073 cell->stat_width = 1;
1733 cell->stat_hp = *data++; 2074 cell->stat_hp = *data++;
1734 } 2075 }
… …
1764 cell->tile [z] = self->face2tile [face]; 2105 cell->tile [z] = self->face2tile [face];
1765 2106
1766 if (cell->tile [z]) 2107 if (cell->tile [z])
1767 { 2108 {
1768 maptex *tex = self->tex + cell->tile [z]; 2109 maptex *tex = self->tex + cell->tile [z];
2110 tex->unused = 0;
1769 if (!tex->name) 2111 if (!tex->name)
1770 av_push (missing, newSViv (cell->tile [z])); 2112 av_push (missing, newSViv (cell->tile [z]));
1771 2113
1772 if (tex->smoothtile) 2114 if (tex->smoothtile)
1773 { 2115 {
1774 maptex *smooth = self->tex + tex->smoothtile; 2116 maptex *smooth = self->tex + tex->smoothtile;
2117 smooth->unused = 0;
1775 if (!smooth->name) 2118 if (!smooth->name)
1776 av_push (missing, newSViv (tex->smoothtile)); 2119 av_push (missing, newSViv (tex->smoothtile));
1777 } 2120 }
1778 } 2121 }
1779 } 2122 }
1780 } 2123 }
1781 else 2124 else
1782 cell->darkness = 0; 2125 CELL_CLEAR (cell);
1783 } 2126 }
1784} 2127}
1785 OUTPUT: 2128 OUTPUT:
1786 RETVAL 2129 RETVAL
1787 2130
… …
1807 ? self->row + y 2150 ? self->row + y
1808 : 0; 2151 : 0;
1809 2152
1810 for (x = x0; x < x1; x++) 2153 for (x = x0; x < x1; x++)
1811 { 2154 {
1812 int r = 32, g = 32, b = 32, a = 192; 2155 unsigned int r = 32, g = 32, b = 32, a = 192;
1813 2156
1814 if (row && row->c0 <= x && x < row->c1) 2157 if (row && row->c0 <= x && x < row->c1)
1815 { 2158 {
1816 mapcell *cell = row->col + (x - row->c0); 2159 mapcell *cell = row->col + (x - row->c0);
1817 2160
… …
1819 { 2162 {
1820 maptex tex = self->tex [cell->tile [z]]; 2163 maptex tex = self->tex [cell->tile [z]];
1821 int a0 = 255 - tex.a; 2164 int a0 = 255 - tex.a;
1822 int a1 = tex.a; 2165 int a1 = tex.a;
1823 2166
1824 r = (r * a0 + tex.r * a1) / 255; 2167 r = div255 (r * a0 + tex.r * a1);
1825 g = (g * a0 + tex.g * a1) / 255; 2168 g = div255 (g * a0 + tex.g * a1);
1826 b = (b * a0 + tex.b * a1) / 255; 2169 b = div255 (b * a0 + tex.b * a1);
1827 a = (a * a0 + tex.a * a1) / 255; 2170 a = div255 (a * a0 + tex.a * a1);
1828 } 2171 }
1829 } 2172 }
1830 2173
1831 *map++ = (r ) 2174 *map++ = (r )
1832 | (g << 8) 2175 | (g << 8)
… …
1839} 2182}
1840 OUTPUT: 2183 OUTPUT:
1841 RETVAL 2184 RETVAL
1842 2185
1843void 2186void
1844draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2187draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1845 CODE: 2188 CODE:
1846{ 2189{
1847 int x, y, z; 2190 int x, y, z;
1848 2191
1849 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2192 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1850 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2193 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1851 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2194 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1852 smooth_key skey; 2195 smooth_key skey;
1853 int pl_x, pl_y; 2196 int pl_x, pl_y;
1854 maptex pl_tex; 2197 maptex pl_tex;
1855 rc_t *rc = rc_alloc (); 2198 rc_t *rc = rc_alloc ();
2199 rc_t *rc_ov = rc_alloc ();
1856 rc_key_t key; 2200 rc_key_t key;
1857 rc_array_t *arr; 2201 rc_array_t *arr;
1858 2202
1859 pl_tex.name = 0; 2203 pl_tex.name = 0;
1860 2204
1861 // thats current max. sorry. 2205 // that's current max. sorry.
1862 if (sw > 255) sw = 255; 2206 if (sw > 255) sw = 255;
1863 if (sh > 255) sh = 255; 2207 if (sh > 255) sh = 255;
1864 2208
1865 // clear key, in case of extra padding 2209 // clear key, in case of extra padding
1866 memset (&skey, 0, sizeof (skey)); 2210 memset (&skey, 0, sizeof (skey));
… …
1870 key.g = 255; 2214 key.g = 255;
1871 key.b = 255; 2215 key.b = 255;
1872 key.a = 255; 2216 key.a = 255;
1873 key.mode = GL_QUADS; 2217 key.mode = GL_QUADS;
1874 key.format = GL_T2F_V3F; 2218 key.format = GL_T2F_V3F;
1875 key.texname = -1;
1876 2219
1877 mx += self->x; 2220 mx += self->x;
1878 my += self->y; 2221 my += self->y;
1879 2222
1880 // first pass: determine smooth_max 2223 // first pass: determine smooth_max
… …
1904 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2247 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1905 2248
1906 for (z = 0; z <= 2; z++) 2249 for (z = 0; z <= 2; z++)
1907 { 2250 {
1908 memset (smooth_level, 0, sizeof (smooth_level)); 2251 memset (smooth_level, 0, sizeof (smooth_level));
2252 key.texname = -1;
1909 2253
1910 for (y = 0; y < sh; y++) 2254 for (y = 0; y < sh; y++)
1911 if (0 <= y + my && y + my < self->rows) 2255 if (0 <= y + my && y + my < self->rows)
1912 { 2256 {
1913 maprow *row = self->row + (y + my); 2257 maprow *row = self->row + (y + my);
… …
1919 tileid tile = cell->tile [z]; 2263 tileid tile = cell->tile [z];
1920 2264
1921 if (tile) 2265 if (tile)
1922 { 2266 {
1923 maptex tex = self->tex [tile]; 2267 maptex tex = self->tex [tile];
1924 int px = (x + 1) * T - tex.w; 2268 int px, py;
1925 int py = (y + 1) * T - tex.h;
1926 2269
1927 if (key.texname != tex.name) 2270 if (key.texname != tex.name)
1928 { 2271 {
2272 self->tex [tile].unused = 0;
2273
1929 if (!tex.name) 2274 if (!tex.name)
1930 tex = self->tex [2]; /* missing, replace by noface */ 2275 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1931 2276
1932 key.texname = tex.name; 2277 key.texname = tex.name;
1933 arr = rc_array (rc, &key); 2278 arr = rc_array (rc, &key);
1934 } 2279 }
2280
2281 px = (x + 1) * Th - tex.w;
2282 py = (y + 1) * Tw - tex.h;
1935 2283
1936 if (expect_false (cell->player == player) && expect_false (z == 2)) 2284 if (expect_false (cell->player == player) && expect_false (z == 2))
1937 { 2285 {
1938 pl_x = px; 2286 pl_x = px;
1939 pl_y = py; 2287 pl_y = py;
… …
1944 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2292 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1945 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2293 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1946 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2294 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1947 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2295 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1948 2296
1949 if (expect_false (cell->flags) && expect_false (z == 2))
1950 {
1951 // overlays such as the speech bubble, probably more to come
1952 if (cell->flags & 1)
1953 {
1954 maptex tex = self->tex [1];
1955 int px = x * T + T * 2 / 32;
1956 int py = y * T - T * 6 / 32;
1957
1958 if (tex.name)
1959 {
1960 if (key.texname != tex.name)
1961 {
1962 key.texname = tex.name;
1963 arr = rc_array (rc, &key);
1964 }
1965
1966 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1967 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1968 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1969 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1970 }
1971 }
1972 }
1973
1974 // update smooth hash 2297 // update smooth hash
1975 if (tex.smoothtile) 2298 if (tex.smoothtile)
1976 { 2299 {
1977 skey.tile = tex.smoothtile; 2300 skey.tile = tex.smoothtile;
1978 skey.level = tex.smoothlevel; 2301 skey.level = tex.smoothlevel;
… …
2006 // corners 2329 // corners
2007 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2330 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2008 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2331 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2009 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2332 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2010 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2333 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2334 }
2335 }
2336
2337 if (expect_false (z == 2) && expect_false (cell->flags))
2338 {
2339 // overlays such as the speech bubble, probably more to come
2340 if (cell->flags & 1)
2341 {
2342 rc_key_t key_ov = key;
2343 maptex tex = self->tex [TEXID_SPEECH];
2344 rc_array_t *arr;
2345 int px = x * Tw + Tw * 2 / 32;
2346 int py = y * Th - Th * 6 / 32;
2347
2348 key_ov.texname = tex.name;
2349 arr = rc_array (rc_ov, &key_ov);
2350
2351 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2352 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2353 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2354 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2011 } 2355 }
2012 } 2356 }
2013 } 2357 }
2014 } 2358 }
2015 2359
… …
2042 if (!(bits & 0x1000) 2386 if (!(bits & 0x1000)
2043 && skey->level == level 2387 && skey->level == level
2044 && level > smooth_max [skey->x][skey->y]) 2388 && level > smooth_max [skey->x][skey->y])
2045 { 2389 {
2046 maptex tex = self->tex [skey->tile]; 2390 maptex tex = self->tex [skey->tile];
2047 int px = (((int)skey->x) - 1) * T; 2391 int px = (((int)skey->x) - 1) * Tw;
2048 int py = (((int)skey->y) - 1) * T; 2392 int py = (((int)skey->y) - 1) * Th;
2049 int border = bits & 15; 2393 int border = bits & 15;
2050 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2394 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2051 float dx = tex.s * .0625f; // 16 images/row 2395 float dx = tex.s * .0625f; // 16 images/row
2052 float dy = tex.t * .5f ; // 2 images/column 2396 float dy = tex.t * .5f ; // 2 images/column
2053 2397
… …
2055 { 2399 {
2056 // this time avoiding texture state changes 2400 // this time avoiding texture state changes
2057 // save gobs of state changes. 2401 // save gobs of state changes.
2058 if (key.texname != tex.name) 2402 if (key.texname != tex.name)
2059 { 2403 {
2404 self->tex [skey->tile].unused = 0;
2405
2060 glEnd (); 2406 glEnd ();
2061 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2062 glBegin (GL_QUADS); 2408 glBegin (GL_QUADS);
2063 } 2409 }
2064 2410
2065 if (border) 2411 if (border)
2066 { 2412 {
2067 float ox = border * dx; 2413 float ox = border * dx;
2068 2414
2069 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2070 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2071 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2072 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2073 } 2419 }
2074 2420
2075 if (corner) 2421 if (corner)
2076 { 2422 {
2077 float ox = corner * dx; 2423 float ox = corner * dx;
2078 2424
2079 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2425 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2080 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2081 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2082 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2083 } 2429 }
2084 } 2430 }
2085 } 2431 }
2086 } 2432 }
2087 } 2433 }
… …
2096 } 2442 }
2097 2443
2098 if (pl_tex.name) 2444 if (pl_tex.name)
2099 { 2445 {
2100 maptex tex = pl_tex; 2446 maptex tex = pl_tex;
2101 int px = pl_x + pdx; 2447 int px = pl_x + sdx;
2102 int py = pl_y + pdy; 2448 int py = pl_y + sdy;
2103 2449
2104 key.texname = tex.name; 2450 key.texname = tex.name;
2105 arr = rc_array (rc, &key); 2451 arr = rc_array (rc, &key);
2106 2452
2107 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2453 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
… …
2110 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2456 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2111 2457
2112 rc_draw (rc); 2458 rc_draw (rc);
2113 } 2459 }
2114 2460
2461 rc_draw (rc_ov);
2462 rc_clear (rc_ov);
2463
2115 glDisable (GL_BLEND); 2464 glDisable (GL_BLEND);
2116 rc_free (rc); 2465 rc_free (rc);
2466 rc_free (rc_ov);
2117 2467
2118 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2119 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2120 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2121 { 2471 {
… …
2124 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
2125 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
2126 { 2476 {
2127 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2128 2478
2129 int px = x * T; 2479 int px = x * Tw;
2130 int py = y * T; 2480 int py = y * Th;
2481
2482 if (expect_false (cell->player == player))
2483 {
2484 px += sdx;
2485 py += sdy;
2486 }
2131 2487
2132 if (cell->stat_hp) 2488 if (cell->stat_hp)
2133 { 2489 {
2134 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
2135 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2136 2492
2137 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
2138 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
2139 px + width - 1, py); 2495 px + width - 1, py);
2140 2496
… …
2146 } 2502 }
2147 } 2503 }
2148} 2504}
2149 2505
2150void 2506void
2151draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2507draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2152 CODE: 2508 CODE:
2153{ 2509{
2154 static float color[16][3] = { 2510 static float color[16][3] = {
2155 { 0.00F, 0.00F, 0.00F }, 2511 { 0.00f, 0.00f, 0.00f },
2156 { 1.00F, 1.00F, 1.00F }, 2512 { 1.00f, 1.00f, 1.00f },
2157 { 0.00F, 0.00F, 0.55F }, 2513 { 0.00f, 0.00f, 0.55f },
2158 { 1.00F, 0.00F, 0.00F }, 2514 { 1.00f, 0.00f, 0.00f },
2159 2515
2160 { 1.00F, 0.54F, 0.00F }, 2516 { 1.00f, 0.54f, 0.00f },
2161 { 0.11F, 0.56F, 1.00F }, 2517 { 0.11f, 0.56f, 1.00f },
2162 { 0.93F, 0.46F, 0.00F }, 2518 { 0.93f, 0.46f, 0.00f },
2163 { 0.18F, 0.54F, 0.34F }, 2519 { 0.18f, 0.54f, 0.34f },
2164 2520
2165 { 0.56F, 0.73F, 0.56F }, 2521 { 0.56f, 0.73f, 0.56f },
2166 { 0.80F, 0.80F, 0.80F }, 2522 { 0.80f, 0.80f, 0.80f },
2167 { 0.55F, 0.41F, 0.13F }, 2523 { 0.55f, 0.41f, 0.13f },
2168 { 0.99F, 0.77F, 0.26F }, 2524 { 0.99f, 0.77f, 0.26f },
2169 2525
2170 { 0.74F, 0.65F, 0.41F }, 2526 { 0.74f, 0.65f, 0.41f },
2171 2527
2172 { 0.00F, 1.00F, 1.00F }, 2528 { 0.00f, 1.00f, 1.00f },
2173 { 1.00F, 0.00F, 1.00F }, 2529 { 1.00f, 0.00f, 1.00f },
2174 { 1.00F, 1.00F, 0.00F }, 2530 { 1.00f, 1.00f, 0.00f },
2175 }; 2531 };
2176 2532
2177 int x, y; 2533 int x, y;
2178 2534
2179 glEnable (GL_TEXTURE_2D); 2535 glEnable (GL_TEXTURE_2D);
2536 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2537 * but the nvidia driver (185.18.14) mishandles alpha textures
2538 * and takes the colour from god knows where instead of using
2539 * Cp. MODULATE results in the same colour, but slightly different
2540 * alpha, but atcually gives us the correct colour with nvidia.
2541 */
2180 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2542 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2181 glEnable (GL_BLEND); 2543 glEnable (GL_BLEND);
2182 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2544 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2183 glBegin (GL_QUADS); 2545 glBegin (GL_QUADS);
2184 2546
2185 for (y = 0; y < h; y++) 2547 for (y = 0; y < h; y++)
… …
2189 2551
2190 if (m) 2552 if (m)
2191 { 2553 {
2192 float *c = color [m & 15]; 2554 float *c = color [m & 15];
2193 2555
2194 float tx1 = m & 0x40 ? 0.5 : 0.; 2556 float tx1 = m & 0x40 ? 0.5f : 0.f;
2195 float tx2 = tx1 + 0.5; 2557 float tx2 = tx1 + 0.5f;
2196 2558
2197 glColor4f (c[0], c[1], c[2], 0.75); 2559 glColor4f (c[0], c[1], c[2], 1);
2198 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2560 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2199 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2561 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2200 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2562 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2201 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2563 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2202 } 2564 }
… …
2210void 2572void
2211fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2573fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2212 PPCODE: 2574 PPCODE:
2213{ 2575{
2214 int x, y; 2576 int x, y;
2215 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2216 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2217 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2218 int sw34 = (sw * 3 + 3) & ~3; 2580 int sw3 = sw * 3;
2581 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2582 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2219 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2220 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2584 memset (darkness1, 0, sw1*sh1);
2221 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2222 2585
2223 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2224 SvCUR_set (darkness3_sv, sw34 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2225 2588
2226 mx += self->x - 1; 2589 mx += self->x - 1;
2227 my += self->y - 1; 2590 my += self->y - 1;
2228
2229 memset (darkness1, 255, sw1 * sh1);
2230 2591
2231 for (y = 0; y < sh1; y++) 2592 for (y = 0; y < sh1; y++)
2232 if (0 <= y + my && y + my < self->rows) 2593 if (0 <= y + my && y + my < self->rows)
2233 { 2594 {
2234 maprow *row = self->row + (y + my); 2595 maprow *row = self->row + (y + my);
… …
2237 if (row->c0 <= x + mx && x + mx < row->c1) 2598 if (row->c0 <= x + mx && x + mx < row->c1)
2238 { 2599 {
2239 mapcell *cell = row->col + (x + mx - row->c0); 2600 mapcell *cell = row->col + (x + mx - row->c0);
2240 2601
2241 darkness1 [y * sw1 + x] = cell->darkness 2602 darkness1 [y * sw1 + x] = cell->darkness
2242 ? 255 - (cell->darkness - 1) 2603 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2243 : 255 - FOW_DARKNESS; 2604 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2244 } 2605 }
2245 } 2606 }
2246 2607
2247 for (y = 0; y < sh; ++y) 2608 for (y = 0; y < sh; ++y)
2248 for (x = 0; x < sw; ++x) 2609 for (x = 0; x < sw; ++x)
… …
2267 2628
2268 uint8_t r13 = (d13 + d23 + d12) / 3; 2629 uint8_t r13 = (d13 + d23 + d12) / 3;
2269 uint8_t r23 = d23; 2630 uint8_t r23 = d23;
2270 uint8_t r33 = (d23 + d33 + d32) / 3; 2631 uint8_t r33 = (d23 + d33 + d32) / 3;
2271 2632
2272 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2633 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2273 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2274 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2275 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2636 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2276 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2637 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2277 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2278 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2639 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2279 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2280 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2281 } 2642 }
2282 2643
2283 free (darkness1); 2644 free (darkness1);
2284 2645
2285 EXTEND (SP, 3); 2646 EXTEND (SP, 3);
2286 PUSHs (sv_2mortal (newSViv (sw34))); 2647 PUSHs (sv_2mortal (newSViv (sw3)));
2287 PUSHs (sv_2mortal (newSViv (sh3))); 2648 PUSHs (sv_2mortal (newSViv (sh3)));
2288 PUSHs (darkness3_sv); 2649 PUSHs (darkness3_sv);
2289} 2650}
2290 2651
2291SV * 2652SV *
… …
2489 if (RETVAL < 0) 2850 if (RETVAL < 0)
2490 { 2851 {
2491 RETVAL = Mix_GroupOldest (-1); 2852 RETVAL = Mix_GroupOldest (-1);
2492 2853
2493 if (RETVAL < 0) 2854 if (RETVAL < 0)
2855 {
2856 // happens sometimes, maybe it just stopped playing(?)
2857 RETVAL = Mix_GroupAvailable (-1);
2858
2859 if (RETVAL < 0)
2494 XSRETURN_UNDEF; 2860 XSRETURN_UNDEF;
2495 2861 }
2862 else
2496 Mix_HaltChannel (RETVAL); 2863 Mix_HaltChannel (RETVAL);
2497 } 2864 }
2498 2865
2499 Mix_UnregisterAllEffects (RETVAL); 2866 Mix_UnregisterAllEffects (RETVAL);
2500 Mix_Volume (RETVAL, 128); 2867 Mix_Volume (RETVAL, 128);
2501} 2868}
… …
2548void 2915void
2549set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2916set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2550 CODE: 2917 CODE:
2551{ 2918{
2552 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2919 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2553 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2920 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2554 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2921 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2555} 2922}
2556 2923
2557void 2924void
2558set_reverse_stereo (DC::Channel self, int flip) 2925set_reverse_stereo (DC::Channel self, int flip)
… …
2560 Mix_SetReverseStereo (self, flip); 2927 Mix_SetReverseStereo (self, flip);
2561 2928
2562MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2563 2930
2564PROTOTYPES: DISABLE 2931PROTOTYPES: DISABLE
2932
2933void
2934decoders ()
2935 PPCODE:
2936#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2937 int i, num = Mix_GetNumChunkDecoders ();
2938 EXTEND (SP, num);
2939 for (i = 0; i < num; ++i)
2940 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2941#else
2942 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2943#endif
2565 2944
2566DC::MixChunk 2945DC::MixChunk
2567new (SV *class, DC::RW rwops) 2946new (SV *class, DC::RW rwops)
2568 CODE: 2947 CODE:
2569 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
… …
2602 OUTPUT: 2981 OUTPUT:
2603 RETVAL 2982 RETVAL
2604 2983
2605MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2984MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2606 2985
2986void
2987decoders ()
2988 PPCODE:
2989#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2990 int i, num = Mix_GetNumMusicDecoders ();
2991 EXTEND (SP, num);
2992 for (i = 0; i < num; ++i)
2993 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2994#else
2995 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2996#endif
2997
2607int 2998int
2608volume (int volume = -1) 2999volume (int volume = -1)
2609 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2610 CODE: 3001 CODE:
2611 if (items > 0) 3002 if (items > 0)
… …
2621 3012
2622void 3013void
2623halt () 3014halt ()
2624 CODE: 3015 CODE:
2625 Mix_HaltMusic (); 3016 Mix_HaltMusic ();
3017
3018int
3019playing ()
3020 CODE:
3021 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT:
3023 RETVAL
2626 3024
2627DC::MixMusic 3025DC::MixMusic
2628new (SV *class, DC::RW rwops) 3026new (SV *class, DC::RW rwops)
2629 CODE: 3027 CODE:
2630 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
… …
2661 } *civ, const_iv[] = { 3059 } *civ, const_iv[] = {
2662# define const_iv(name) { # name, (IV)name } 3060# define const_iv(name) { # name, (IV)name }
2663 const_iv (GL_VENDOR), 3061 const_iv (GL_VENDOR),
2664 const_iv (GL_VERSION), 3062 const_iv (GL_VERSION),
2665 const_iv (GL_EXTENSIONS), 3063 const_iv (GL_EXTENSIONS),
3064 const_iv (GL_MAX_TEXTURE_UNITS),
2666 const_iv (GL_COLOR_MATERIAL), 3065 const_iv (GL_COLOR_MATERIAL),
2667 const_iv (GL_SMOOTH), 3066 const_iv (GL_SMOOTH),
2668 const_iv (GL_FLAT), 3067 const_iv (GL_FLAT),
2669 const_iv (GL_DITHER), 3068 const_iv (GL_DITHER),
2670 const_iv (GL_BLEND), 3069 const_iv (GL_BLEND),
… …
2682 const_iv (GL_ZERO), 3081 const_iv (GL_ZERO),
2683 const_iv (GL_SRC_ALPHA), 3082 const_iv (GL_SRC_ALPHA),
2684 const_iv (GL_DST_ALPHA), 3083 const_iv (GL_DST_ALPHA),
2685 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3084 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2686 const_iv (GL_ONE_MINUS_DST_ALPHA), 3085 const_iv (GL_ONE_MINUS_DST_ALPHA),
3086 const_iv (GL_SRC_COLOR),
3087 const_iv (GL_DST_COLOR),
3088 const_iv (GL_ONE_MINUS_SRC_COLOR),
3089 const_iv (GL_ONE_MINUS_DST_COLOR),
2687 const_iv (GL_SRC_ALPHA_SATURATE), 3090 const_iv (GL_SRC_ALPHA_SATURATE),
2688 const_iv (GL_RGB), 3091 const_iv (GL_RGB),
2689 const_iv (GL_RGBA), 3092 const_iv (GL_RGBA),
2690 const_iv (GL_RGBA4), 3093 const_iv (GL_RGBA4),
2691 const_iv (GL_RGBA8), 3094 const_iv (GL_RGBA8),
… …
2759 const_iv (GL_NICEST), 3162 const_iv (GL_NICEST),
2760 const_iv (GL_V2F), 3163 const_iv (GL_V2F),
2761 const_iv (GL_V3F), 3164 const_iv (GL_V3F),
2762 const_iv (GL_T2F_V3F), 3165 const_iv (GL_T2F_V3F),
2763 const_iv (GL_T2F_N3F_V3F), 3166 const_iv (GL_T2F_N3F_V3F),
3167 const_iv (GL_FUNC_ADD),
3168 const_iv (GL_FUNC_SUBTRACT),
3169 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2764# undef const_iv 3170# undef const_iv
2765 }; 3171 };
2766 3172
2767 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3173 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2768 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2769 3175
2770 texture_av = newAV (); 3176 texture_av = newAV ();
2771 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
2772} 3178}
2773 3179
2774void 3180void
2775disable_GL_EXT_blend_func_separate () 3181disable_GL_EXT_blend_func_separate ()
2776 CODE: 3182 CODE:
2777 gl.BlendFuncSeparate = 0; 3183 gl.BlendFuncSeparate = 0;
2778 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
3185
3186void
3187apple_nvidia_bug (int enable)
2779 3188
2780char * 3189char *
2781gl_vendor () 3190gl_vendor ()
2782 CODE: 3191 CODE:
2783 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (char *)glGetString (GL_VENDOR);
… …
2814 3223
2815int glGetError () 3224int glGetError ()
2816 3225
2817void glFinish () 3226void glFinish ()
2818 3227
3228void glFlush ()
3229
2819void glClear (int mask) 3230void glClear (int mask)
2820 3231
2821void glClearColor (float r, float g, float b, float a = 1.0) 3232void glClearColor (float r, float g, float b, float a = 1.0)
2822 PROTOTYPE: @ 3233 PROTOTYPE: @
2823 3234
… …
2832void glBlendFunc (int sfactor, int dfactor) 3243void glBlendFunc (int sfactor, int dfactor)
2833 3244
2834void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3245void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2835 CODE: 3246 CODE:
2836 gl_BlendFuncSeparate (sa, da, saa, daa); 3247 gl_BlendFuncSeparate (sa, da, saa, daa);
3248
3249# void glBlendEquation (int se)
2837 3250
2838void glDepthMask (int flag) 3251void glDepthMask (int flag)
2839 3252
2840void glLogicOp (int opcode) 3253void glLogicOp (int opcode)
2841 3254
… …
2876void glRotate (float angle, float x, float y, float z) 3289void glRotate (float angle, float x, float y, float z)
2877 CODE: 3290 CODE:
2878 glRotatef (angle, x, y, z); 3291 glRotatef (angle, x, y, z);
2879 3292
2880void glColor (float r, float g, float b, float a = 1.0) 3293void glColor (float r, float g, float b, float a = 1.0)
3294 PROTOTYPE: @
2881 ALIAS: 3295 ALIAS:
2882 glColor_premultiply = 1 3296 glColor_premultiply = 1
2883 CODE: 3297 CODE:
2884 if (ix) 3298 if (ix)
2885 { 3299 {
… …
2990void glNewList (int list, int mode = GL_COMPILE) 3404void glNewList (int list, int mode = GL_COMPILE)
2991 3405
2992void glEndList () 3406void glEndList ()
2993 3407
2994void glCallList (int list) 3408void glCallList (int list)
3409
3410void c_init ()
3411 CODE:
3412 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3413 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2995 3414
2996MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3415MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2997 3416
2998PROTOTYPES: DISABLE 3417PROTOTYPES: DISABLE
2999 3418

Diff Legend

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