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.274 by root, Wed Aug 20 17:50:47 2008 UTC vs.
Revision 1.322 by root, Sun Nov 18 01:43:12 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
34 37
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 39
37#include <SDL.h> 40#include <SDL.h>
38#include <SDL_thread.h> 41#include <SDL_thread.h>
42#include <SDL_opengl.h> 45#include <SDL_opengl.h>
43 46
44/* work around os x broken headers */ 47/* work around os x broken headers */
45#ifdef __MACOSX__ 48#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 49typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
50typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
51typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 52#endif
48 53
49#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
51 56
52#include <glib/gmacros.h> 57#include <glib.h>
53 58
54#include <pango/pango.h> 59#include <pango/pango.h>
55 60
56#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
81#define expect_false(expr) expect ((expr) != 0, 0) 86#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 87#define expect_true(expr) expect ((expr) != 0, 1)
83 88
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 90
91/* this is used as fow flag as well, so has to have a different value */
92/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
87 95
88#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
90 98
91#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
92 100
93/* mask out modifiers we are not interested in */ 101/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
103
104#define KMOD_LRAM 0x10000 // our extension
105
106#define TEXID_SPEECH 1
107#define TEXID_NOFACE 2
108
109static char *
110fast_sv_grow (SV *sv, STRLEN need)
111{
112 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need;
114
115 if (expect_false (len < want))
116 {
117 do
118 len *= 2;
119 while (len < want);
120
121 sv_grow (sv, len);
122 }
123
124 SvCUR_set (sv, want);
125 return SvEND (sv) - need;
126}
95 127
96static AV *texture_av; 128static AV *texture_av;
97 129
98static struct 130static struct
99{ 131{
156{ 188{
157 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
158 190
159 while (attrs) 191 while (attrs)
160 { 192 {
161 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
162 194
163 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
164 return 1; 196 return 1;
165 197
166 attrs = attrs->next; 198 attrs = attrs->next;
184static void 216static void
185substitute_func (FcPattern *pattern, gpointer data) 217substitute_func (FcPattern *pattern, gpointer data)
186{ 218{
187 FcPatternAddBool (pattern, FC_HINTING, 1); 219 FcPatternAddBool (pattern, FC_HINTING, 1);
188#ifdef FC_HINT_STYLE 220#ifdef FC_HINT_STYLE
189 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 221 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
190#endif 222#endif
191 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 223 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
192} 224}
193 225
194static void 226static void
231 int w, h; 263 int w, h;
232 float s, t; 264 float s, t;
233 uint8_t r, g, b, a; 265 uint8_t r, g, b, a;
234 tileid smoothtile; 266 tileid smoothtile;
235 uint8_t smoothlevel; 267 uint8_t smoothlevel;
268 uint8_t unused; /* set to zero on use */
236} maptex; 269} maptex;
237 270
238typedef struct { 271typedef struct {
239 uint32_t player; 272 uint32_t player;
240 tileid tile[3]; 273 tileid tile[3];
410 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
411 } 444 }
412 } 445 }
413} 446}
414 447
415typedef struct { 448struct smooth_key
449{
416 tileid tile; 450 tileid tile;
417 uint8_t x, y, level; 451 uint8_t x, y, level;
418} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
419 471
420static void 472static void
421smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
422{ 474{
423 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
424 476
425 if (SvIOK (*sv)) 477 if (it == h.end ())
426 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
427 else 479 else
428 sv_setiv (*sv, bits); 480 it->second |= bits;
429} 481}
430 482
431static void 483static void
432music_finished (void) 484music_finished (void)
433{ 485{
450 ev.code = 1; 502 ev.code = 1;
451 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
452 ev.data2 = 0; 504 ev.data2 = 0;
453 505
454 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
455} 514}
456 515
457static unsigned int 516static unsigned int
458minpot (unsigned int n) 517minpot (unsigned int n)
459{ 518{
527 return 0; 586 return 0;
528 587
529 return 1; 588 return 1;
530} 589}
531 590
591/******************************************************************************/
592
593/* process keyboard modifiers */
594static int
595mod_munge (int mod)
596{
597 mod &= MOD_MASK;
598
599 if (mod & (KMOD_META | KMOD_ALT))
600 mod |= KMOD_LRAM;
601
602 return mod;
603}
604
532static void 605static void
533deliantra_main () 606deliantra_main (SV *real_main)
534{ 607{
535 char *argv[] = { 0 }; 608 dSP;
536 call_argv ("::main", G_DISCARD | G_VOID, argv); 609
610 PUSHMARK (SP);
611 call_sv (real_main, G_DISCARD | G_VOID);
537} 612}
538 613
539#ifdef __MACOSX__ 614#ifdef __MACOSX__
615 static SV *real_main;
616
540 /* to due surprising braindamage on the side of SDL design, we 617 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main() 618 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which, 619 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 620 * due to shared library magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back. 621 * and which calls our main (== SDL_main) back.
545 */ 622 */
546 extern C_LINKAGE int 623 extern C_LINKAGE int
547 main (int argc, char *argv[]) 624 main (int argc, char *argv[])
548 { 625 {
549 deliantra_main (); 626 deliantra_main (real_main);
550 } 627 }
551 628
552 #undef main 629 #undef main
553 630
554 extern C_LINKAGE int main (int argc, char *argv[]); 631 extern C_LINKAGE int main (int argc, char *argv[]);
555 632
556 static void 633 static void
557 SDL_braino (void) 634 SDL_main_hack (SV *real_main_)
558 { 635 {
636 real_main = real_main_;
637
559 char *argv[] = { "deliantra client", 0 }; 638 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv); 639 (main) (1, argv);
561 } 640 }
562#else 641#else
563 static void 642 static void
564 SDL_braino (void) 643 SDL_main_hack (SV *real_main)
565 { 644 {
566 deliantra_main (); 645 deliantra_main (real_main);
567 } 646 }
568#endif 647#endif
569 648
570MODULE = Deliantra::Client PACKAGE = DC 649MODULE = Deliantra::Client PACKAGE = DC
571 650
602 const_iv (SDL_USEREVENT), 681 const_iv (SDL_USEREVENT),
603 682
604 const_iv (SDL_APPINPUTFOCUS), 683 const_iv (SDL_APPINPUTFOCUS),
605 const_iv (SDL_APPMOUSEFOCUS), 684 const_iv (SDL_APPMOUSEFOCUS),
606 const_iv (SDL_APPACTIVE), 685 const_iv (SDL_APPACTIVE),
686
687
688 const_iv (SDLK_UNKNOWN),
689 const_iv (SDLK_FIRST),
690 const_iv (SDLK_BACKSPACE),
691 const_iv (SDLK_TAB),
692 const_iv (SDLK_CLEAR),
693 const_iv (SDLK_RETURN),
694 const_iv (SDLK_PAUSE),
695 const_iv (SDLK_ESCAPE),
696 const_iv (SDLK_SPACE),
697 const_iv (SDLK_EXCLAIM),
698 const_iv (SDLK_QUOTEDBL),
699 const_iv (SDLK_HASH),
700 const_iv (SDLK_DOLLAR),
701 const_iv (SDLK_AMPERSAND),
702 const_iv (SDLK_QUOTE),
703 const_iv (SDLK_LEFTPAREN),
704 const_iv (SDLK_RIGHTPAREN),
705 const_iv (SDLK_ASTERISK),
706 const_iv (SDLK_PLUS),
707 const_iv (SDLK_COMMA),
708 const_iv (SDLK_MINUS),
709 const_iv (SDLK_PERIOD),
710 const_iv (SDLK_SLASH),
711 const_iv (SDLK_0),
712 const_iv (SDLK_1),
713 const_iv (SDLK_2),
714 const_iv (SDLK_3),
715 const_iv (SDLK_4),
716 const_iv (SDLK_5),
717 const_iv (SDLK_6),
718 const_iv (SDLK_7),
719 const_iv (SDLK_8),
720 const_iv (SDLK_9),
721 const_iv (SDLK_COLON),
722 const_iv (SDLK_SEMICOLON),
723 const_iv (SDLK_LESS),
724 const_iv (SDLK_EQUALS),
725 const_iv (SDLK_GREATER),
726 const_iv (SDLK_QUESTION),
727 const_iv (SDLK_AT),
728
729 const_iv (SDLK_LEFTBRACKET),
730 const_iv (SDLK_BACKSLASH),
731 const_iv (SDLK_RIGHTBRACKET),
732 const_iv (SDLK_CARET),
733 const_iv (SDLK_UNDERSCORE),
734 const_iv (SDLK_BACKQUOTE),
735 const_iv (SDLK_DELETE),
607 736
608 const_iv (SDLK_FIRST), 737 const_iv (SDLK_FIRST),
609 const_iv (SDLK_LAST), 738 const_iv (SDLK_LAST),
610 const_iv (SDLK_KP0), 739 const_iv (SDLK_KP0),
611 const_iv (SDLK_KP1), 740 const_iv (SDLK_KP1),
687 const_iv (KMOD_RMETA), 816 const_iv (KMOD_RMETA),
688 const_iv (KMOD_NUM), 817 const_iv (KMOD_NUM),
689 const_iv (KMOD_CAPS), 818 const_iv (KMOD_CAPS),
690 const_iv (KMOD_MODE), 819 const_iv (KMOD_MODE),
691 820
821 const_iv (KMOD_LRAM),
822
692 const_iv (MIX_DEFAULT_FORMAT), 823 const_iv (MIX_DEFAULT_FORMAT),
693 824
694 const_iv (SDL_INIT_TIMER), 825 const_iv (SDL_INIT_TIMER),
695 const_iv (SDL_INIT_AUDIO), 826 const_iv (SDL_INIT_AUDIO),
696 const_iv (SDL_INIT_VIDEO), 827 const_iv (SDL_INIT_VIDEO),
720 851
721 const_iv (FOW_DARKNESS) 852 const_iv (FOW_DARKNESS)
722# undef const_iv 853# undef const_iv
723 }; 854 };
724 855
725 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 856 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
726 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
727 858
728 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
729 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
730} 861}
731 862
747NV ceil (NV x) 878NV ceil (NV x)
748 879
749IV minpot (UV n) 880IV minpot (UV n)
750 881
751IV popcount (UV n) 882IV popcount (UV n)
883
884NV distance (NV dx, NV dy)
885 CODE:
886 RETVAL = pow (dx * dx + dy * dy, 0.5);
887 OUTPUT:
888 RETVAL
752 889
753void 890void
754pango_init () 891pango_init ()
755 CODE: 892 CODE:
756{ 893{
764#endif 901#endif
765} 902}
766 903
767char *SDL_GetError () 904char *SDL_GetError ()
768 905
769void SDL_braino () 906void SDL_main_hack (SV *real_main)
907 PROTOTYPE: &
770 908
771int SDL_Init (U32 flags) 909int SDL_Init (U32 flags)
772 910
773int SDL_InitSubSystem (U32 flags) 911int SDL_InitSubSystem (U32 flags)
774 912
775void SDL_QuitSubSystem (U32 flags) 913void SDL_QuitSubSystem (U32 flags)
776 914
777void SDL_Quit () 915void SDL_Quit ()
778 916
779int SDL_GL_SetAttribute (int attr, int value) 917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
780 919
781int SDL_GL_GetAttribute (int attr) 920int SDL_GL_GetAttribute (int attr)
782 CODE: 921 CODE:
783 if (SDL_GL_GetAttribute (attr, &RETVAL)) 922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
784 XSRETURN_UNDEF; 923 XSRETURN_UNDEF;
785 OUTPUT: 924 OUTPUT:
786 RETVAL 925 RETVAL
787 926
788void 927void
843 ); 982 );
844 983
845 if (RETVAL) 984 if (RETVAL)
846 { 985 {
847 av_clear (texture_av); 986 av_clear (texture_av);
848
849 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
850#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 987#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
851#include "glfunc.h" 988#include "glfunc.h"
852#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
853 } 992 }
854} 993}
855 OUTPUT: 994 OUTPUT:
856 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
857 999
858void 1000void
859SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
860 1002
861char * 1003char *
862SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
863 1006
864int 1007int
865SDL_GetAppState () 1008SDL_GetAppState ()
866 1009
867int 1010int
868SDL_GetModState () 1011SDL_GetModState ()
869 1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
870void 1017void
1018SDL_PumpEvents ()
1019
1020void
871poll_events () 1021peep_events ()
872 PPCODE: 1022 PPCODE:
873{ 1023{
874 SDL_Event ev; 1024 SDL_Event ev;
875 1025
876 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
883 { 1033 {
884 case SDL_KEYDOWN: 1034 case SDL_KEYDOWN:
885 case SDL_KEYUP: 1035 case SDL_KEYUP:
886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1036 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1037 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
888 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1038 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
889 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1039 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
890 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1040 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
891 break; 1041 break;
892 1042
893 case SDL_ACTIVEEVENT: 1043 case SDL_ACTIVEEVENT:
894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1044 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
912 x = ev.motion.x; 1062 x = ev.motion.x;
913 y = ev.motion.y; 1063 y = ev.motion.y;
914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1064 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
915 } 1065 }
916 1066
917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1067 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
918 hv_store (hv, "state", 5, newSViv (state), 0); 1068 hv_store (hv, "state", 5, newSViv (state), 0);
919 hv_store (hv, "x", 1, newSViv (x), 0); 1069 hv_store (hv, "x", 1, newSViv (x), 0);
920 hv_store (hv, "y", 1, newSViv (y), 0); 1070 hv_store (hv, "y", 1, newSViv (y), 0);
921 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1071 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
922 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1072 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
942 1092
943 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1093 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
944 } 1094 }
945} 1095}
946 1096
1097char *
1098SDL_AudioDriverName ()
1099 CODE:
1100{
1101 char buf [256];
1102 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1103 XSRETURN_UNDEF;
1104
1105 RETVAL = buf;
1106}
1107 OUTPUT:
1108 RETVAL
1109
947int 1110int
948Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1111Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
949 POSTCALL: 1112 POSTCALL:
950 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
951 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
952 1115
953void 1116void
954Mix_QuerySpec () 1117Mix_QuerySpec ()
1013add_font (char *file) 1176add_font (char *file)
1014 CODE: 1177 CODE:
1015 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1016 OUTPUT: 1179 OUTPUT:
1017 RETVAL 1180 RETVAL
1181
1182void
1183IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1184
1185# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1186void
1187Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1018 1188
1019void 1189void
1020load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
1021 ALIAS: 1191 ALIAS:
1022 load_image_file = 1 1192 load_image_file = 1
1068 1238
1069 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
1070 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
1071 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
1072 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
1073 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1074 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1244 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1075 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1076 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1077 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
1078 1248
1138#if DEBUG 1308#if DEBUG
1139 VALGRIND_DO_LEAK_CHECK; 1309 VALGRIND_DO_LEAK_CHECK;
1140#endif 1310#endif
1141} 1311}
1142 1312
1313int
1314SvREFCNT (SV *sv)
1315 CODE:
1316 RETVAL = SvREFCNT (sv);
1317 OUTPUT:
1318 RETVAL
1319
1143MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1144 1321
1145PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1146 1323
1147DC::Font 1324DC::Font
1148new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1149 CODE: 1326 CODE:
1150{ 1327{
1151 int count; 1328 int count;
1152 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1153 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1182 PROTOTYPE: 1359 PROTOTYPE:
1183 CODE: 1360 CODE:
1184 tc_restore (); 1361 tc_restore ();
1185 1362
1186DC::Layout 1363DC::Layout
1187new (SV *class) 1364new (SV *klass)
1188 CODE: 1365 CODE:
1189 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1190 1367
1191 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1192 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1341 1518
1342void 1519void
1343set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1344 CODE: 1521 CODE:
1345 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1346 { 1523 {
1347 self->base_height = base_height; 1524 self->base_height = base_height;
1348 layout_update_font (self); 1525 layout_update_font (self);
1349 } 1526 }
1350 1527
1351void 1528void
1578 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1579 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1580 } 1757 }
1581} 1758}
1582 1759
1760void
1761draw_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)
1762 PROTOTYPE: @
1763 CODE:
1764{
1765 glEnable (GL_BLEND);
1766 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1767 glEnable (GL_TEXTURE_2D);
1768 glBindTexture (GL_TEXTURE_2D, name1);
1769
1770 glColor3f (intensity, intensity, intensity);
1771 glPushMatrix ();
1772 glScalef (1./3, 1./3, 1.);
1773
1774 if (blend > 0.f)
1775 {
1776 float dx3 = dx * -3.f / w;
1777 float dy3 = dy * -3.f / h;
1778 GLfloat env_color[4] = { 0., 0., 0., blend };
1779
1780 /* interpolate the two shadow textures */
1781 /* stage 0 == rgb(glcolor) + alpha(t0) */
1782 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1783
1784 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1785 gl.ActiveTexture (GL_TEXTURE1);
1786 glEnable (GL_TEXTURE_2D);
1787 glBindTexture (GL_TEXTURE_2D, name2);
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1789
1790 /* rgb == rgb(glcolor) */
1791 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1792 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1793 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1794
1795 /* alpha = interpolate t0, t1 by env_alpha */
1796 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1797
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1807
1808 glBegin (GL_QUADS);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1810 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1813 glEnd ();
1814
1815 glDisable (GL_TEXTURE_2D);
1816 gl.ActiveTexture (GL_TEXTURE0);
1817 }
1818 else
1819 {
1820 /* simple blending of one texture, also opengl <1.3 path */
1821 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1822
1823 glBegin (GL_QUADS);
1824 glTexCoord2f (0, 0); glVertex2f (0, 0);
1825 glTexCoord2f (0, t); glVertex2f (0, h);
1826 glTexCoord2f (s, t); glVertex2f (w, h);
1827 glTexCoord2f (s, 0); glVertex2f (w, 0);
1828 glEnd ();
1829 }
1830
1831 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1832 {
1833 int x, y;
1834 int dx3 = dx * 3;
1835 int dy3 = dy * 3;
1836
1837 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1838 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1839 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1840 glTranslatef (-1., -1., 0);
1841 glBegin (GL_QUADS);
1842
1843 for (y = 1; y < h; y += 3)
1844 {
1845 int y1 = y - dy3;
1846 int y1valid = y1 >= 0 && y1 < h;
1847
1848 for (x = 1; x < w; x += 3)
1849 {
1850 int x1 = x - dx3;
1851 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1852 uint8_t h2;
1853
1854 if (y1valid && x1 >= 0 && x1 < w)
1855 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1856 else
1857 h2 = 1; /* out of range == invisible */
1858
1859 if (h1 || h2)
1860 {
1861 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1862 glColor4f (1., 1., 1., alpha);
1863
1864 glTexCoord2f (0, 0.); glVertex2i (x , y );
1865 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1866 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1867 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1868 }
1869 }
1870 }
1871 }
1872
1873 glEnd ();
1874
1875 glPopMatrix ();
1876
1877 glDisable (GL_TEXTURE_2D);
1878 glDisable (GL_BLEND);
1879}
1880
1583IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1881IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1584 CODE: 1882 CODE:
1585{ 1883{
1586 GLint width; 1884 GLint width;
1587 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1885 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1594MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1595 1893
1596PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1597 1895
1598DC::Map 1896DC::Map
1599new (SV *class) 1897new (SV *klass)
1600 CODE: 1898 CODE:
1601 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1602 RETVAL->x = 0; 1900 RETVAL->x = 0;
1603 RETVAL->y = 0; 1901 RETVAL->y = 0;
1604 RETVAL->w = 0; 1902 RETVAL->w = 0;
1643 1941
1644void 1942void
1645set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1646 CODE: 1944 CODE:
1647{ 1945{
1648 tileid texid; 1946 tileid texid;
1649 maptex *tex; 1947 maptex *tex;
1650 1948
1651 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1652 return; 1950 return;
1653 1951
1654 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1655 return; 1953 return;
1656 1954
1657 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1658 1956
1659 if (!texid) 1957 if (!texid)
1660 return; 1958 return;
1661 1959
1662 tex = self->tex + texid; 1960 tex = self->tex + texid;
1691 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1989 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1692 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1693 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1695} 1993}
1994
1995void
1996expire_textures (DC::Map self, int texid, int count)
1997 PPCODE:
1998 for (; texid < self->texs && count; ++texid, --count)
1999 {
2000 maptex *tex = self->tex + texid;
2001
2002 if (tex->name)
2003 {
2004 if (tex->unused)
2005 {
2006 tex->name = 0;
2007 tex->unused = 0;
2008 XPUSHs (sv_2mortal (newSViv (texid)));
2009 }
2010 else
2011 tex->unused = 1;
2012 }
2013 }
1696 2014
1697int 2015int
1698ox (DC::Map self) 2016ox (DC::Map self)
1699 ALIAS: 2017 ALIAS:
1700 oy = 1 2018 oy = 1
1740 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1741 } 2059 }
1742} 2060}
1743 2061
1744SV * 2062SV *
1745map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1746 CODE: 2064 CODE:
1747{ 2065{
1748 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1749 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1750 mapcell *cell; 2068 mapcell *cell;
1771 2089
1772 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1773 2091
1774 if (flags & 8) 2092 if (flags & 8)
1775 { 2093 {
2094 uint8_t ext, cmd;
2095
1776 if (extmap) 2096 do
1777 { 2097 {
1778 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1779 2100
1780 do 2101 if (cmd < 4)
2102 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2103 else if (cmd == 5) // health
1781 { 2104 {
1782 ext = *data++;
1783 cmd = ext & 0x7f;
1784
1785 if (cmd < 4)
1786 cell->darkness = 255 - ext * 64 + 1;
1787 else if (cmd == 5) // health
1788 {
1789 cell->stat_width = 1; 2105 cell->stat_width = 1;
1790 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1791 }
1792 else if (cmd == 6) // monster width
1793 cell->stat_width = *data++ + 1;
1794 else if (cmd == 0x47)
1795 {
1796 if (*data == 1) cell->player = data [1];
1797 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1798 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1799 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1800
1801 data += *data + 1;
1802 }
1803 else if (cmd == 8) // cell flags
1804 cell->flags = *data++;
1805 else if (ext & 0x40) // unknown, multibyte => skip
1806 data += *data + 1;
1807 else
1808 data++;
1809 } 2107 }
1810 while (ext & 0x80); 2108 else if (cmd == 6) // monster width
2109 cell->stat_width = *data++ + 1;
2110 else if (cmd == 0x47)
2111 {
2112 if (*data == 1) cell->player = data [1];
2113 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2114 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2115 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2116
2117 data += *data + 1;
2118 }
2119 else if (cmd == 8) // cell flags
2120 cell->flags = *data++;
2121 else if (ext & 0x40) // unknown, multibyte => skip
2122 data += *data + 1;
2123 else
2124 data++;
1811 } 2125 }
1812 else 2126 while (ext & 0x80);
1813 cell->darkness = *data++ + 1;
1814 } 2127 }
1815 2128
1816 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1817 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1818 { 2131 {
1821 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1822 2135
1823 if (cell->tile [z]) 2136 if (cell->tile [z])
1824 { 2137 {
1825 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1826 if (!tex->name) 2140 if (!tex->name)
1827 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1828 2142
1829 if (tex->smoothtile) 2143 if (tex->smoothtile)
1830 { 2144 {
1831 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1832 if (!smooth->name) 2147 if (!smooth->name)
1833 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1834 } 2149 }
1835 } 2150 }
1836 } 2151 }
1864 ? self->row + y 2179 ? self->row + y
1865 : 0; 2180 : 0;
1866 2181
1867 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1868 { 2183 {
1869 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1870 2185
1871 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1872 { 2187 {
1873 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1874 2189
1876 { 2191 {
1877 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1878 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1879 int a1 = tex.a; 2194 int a1 = tex.a;
1880 2195
1881 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1882 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1883 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1884 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1885 } 2200 }
1886 } 2201 }
1887 2202
1888 *map++ = (r ) 2203 *map++ = (r )
1889 | (g << 8) 2204 | (g << 8)
1890 | (b << 16) 2205 | (b << 16)
1891 | (a << 24); 2206 | (a << 24);
1892 } 2207 }
1893 } 2208 }
1894 2209
1895 RETVAL = map_sv; 2210 RETVAL = map_sv;
1896} 2211}
1897 OUTPUT: 2212 OUTPUT:
1898 RETVAL 2213 RETVAL
1899 2214
1900void 2215void
1901draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2216draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1902 CODE: 2217 CODE:
1903{ 2218{
1904 int x, y, z; 2219 int x, y, z;
1905 2220
1906 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1907 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2221 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1908 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2222 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1909 smooth_key skey; 2223 smooth_key skey;
1910 int pl_x, pl_y; 2224 int pl_x, pl_y;
1911 maptex pl_tex; 2225 maptex pl_tex;
1912 rc_t *rc = rc_alloc (); 2226 rc_t *rc = rc_alloc ();
2227 rc_t *rc_ov = rc_alloc ();
1913 rc_key_t key; 2228 rc_key_t key;
1914 rc_array_t *arr; 2229 rc_array_t *arr;
1915 2230
1916 pl_tex.name = 0; 2231 pl_tex.name = 0;
1917 2232
1918 // thats current max. sorry. 2233 // that's current max. sorry.
1919 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1920 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1921 2236
1922 // clear key, in case of extra padding 2237 // clear key, in case of extra padding
1923 memset (&skey, 0, sizeof (skey)); 2238 memset (&skey, 0, sizeof (skey));
1927 key.g = 255; 2242 key.g = 255;
1928 key.b = 255; 2243 key.b = 255;
1929 key.a = 255; 2244 key.a = 255;
1930 key.mode = GL_QUADS; 2245 key.mode = GL_QUADS;
1931 key.format = GL_T2F_V3F; 2246 key.format = GL_T2F_V3F;
1932 key.texname = -1;
1933 2247
1934 mx += self->x; 2248 mx += self->x;
1935 my += self->y; 2249 my += self->y;
1936 2250
1937 // first pass: determine smooth_max 2251 // first pass: determine smooth_max
1960 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1961 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1962 2276
1963 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
1964 { 2278 {
2279 smooth_hash smooth;
1965 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2281 key.texname = -1;
1966 2282
1967 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
1968 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
1969 { 2285 {
1970 maprow *row = self->row + (y + my); 2286 maprow *row = self->row + (y + my);
1976 tileid tile = cell->tile [z]; 2292 tileid tile = cell->tile [z];
1977 2293
1978 if (tile) 2294 if (tile)
1979 { 2295 {
1980 maptex tex = self->tex [tile]; 2296 maptex tex = self->tex [tile];
1981 int px = (x + 1) * T - tex.w; 2297 int px, py;
1982 int py = (y + 1) * T - tex.h;
1983 2298
1984 if (key.texname != tex.name) 2299 if (key.texname != tex.name)
1985 { 2300 {
2301 self->tex [tile].unused = 0;
2302
1986 if (!tex.name) 2303 if (!tex.name)
1987 tex = self->tex [2]; /* missing, replace by noface */ 2304 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1988 2305
1989 key.texname = tex.name; 2306 key.texname = tex.name;
1990 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
1991 } 2308 }
2309
2310 px = (x + 1) * Th - tex.w;
2311 py = (y + 1) * Tw - tex.h;
1992 2312
1993 if (expect_false (cell->player == player) && expect_false (z == 2)) 2313 if (expect_false (cell->player == player) && expect_false (z == 2))
1994 { 2314 {
1995 pl_x = px; 2315 pl_x = px;
1996 pl_y = py; 2316 pl_y = py;
2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2321 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2002 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2322 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2003 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2323 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2004 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2324 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2005 2325
2006 if (expect_false (cell->flags) && expect_false (z == 2))
2007 {
2008 // overlays such as the speech bubble, probably more to come
2009 if (cell->flags & 1)
2010 {
2011 maptex tex = self->tex [1];
2012 int px = x * T + T * 2 / 32;
2013 int py = y * T - T * 6 / 32;
2014
2015 if (tex.name)
2016 {
2017 if (key.texname != tex.name)
2018 {
2019 key.texname = tex.name;
2020 arr = rc_array (rc, &key);
2021 }
2022
2023 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2024 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2025 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2027 }
2028 }
2029 }
2030
2031 // update smooth hash 2326 // update smooth hash
2032 if (tex.smoothtile) 2327 if (tex.smoothtile)
2033 { 2328 {
2034 skey.tile = tex.smoothtile; 2329 skey.tile = tex.smoothtile;
2035 skey.level = tex.smoothlevel; 2330 skey.level = tex.smoothlevel;
2050 2345
2051 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2052 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
2053 2348
2054 // full tile 2349 // full tile
2055 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2350 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2056 2351
2057 // borders 2352 // borders
2058 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2353 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2059 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2354 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2060 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2355 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2061 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2356 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2062 2357
2063 // corners 2358 // corners
2064 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2359 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2065 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2360 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2066 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2361 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2067 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2362 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2363 }
2364 }
2365
2366 if (expect_false (z == 2) && expect_false (cell->flags))
2367 {
2368 // overlays such as the speech bubble, probably more to come
2369 if (cell->flags & 1)
2370 {
2371 rc_key_t key_ov = key;
2372 maptex tex = self->tex [TEXID_SPEECH];
2373 rc_array_t *arr;
2374 int px = x * Tw + Tw * 2 / 32;
2375 int py = y * Th - Th * 6 / 32;
2376
2377 key_ov.texname = tex.name;
2378 arr = rc_array (rc_ov, &key_ov);
2379
2380 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2381 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2382 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2383 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2068 } 2384 }
2069 } 2385 }
2070 } 2386 }
2071 } 2387 }
2072 2388
2088 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
2089 { 2405 {
2090 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
2091 HE *he; 2407 HE *he;
2092 2408
2093 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2094 while ((he = hv_iternext (smooth)))
2095 { 2410 {
2096 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
2097 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
2098 2413
2099 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
2100 && skey->level == level 2415 && skey.level == level
2101 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
2102 { 2417 {
2103 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
2104 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
2105 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
2106 int border = bits & 15; 2421 int border = bits & 15;
2107 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2108 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
2109 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
2110 2425
2112 { 2427 {
2113 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
2114 // save gobs of state changes. 2429 // save gobs of state changes.
2115 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
2116 { 2431 {
2432 self->tex [skey.tile].unused = 0;
2433
2117 glEnd (); 2434 glEnd ();
2118 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2119 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
2120 } 2437 }
2121 2438
2122 if (border) 2439 if (border)
2123 { 2440 {
2124 float ox = border * dx; 2441 float ox = border * dx;
2125 2442
2126 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2127 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2128 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2129 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2130 } 2447 }
2131 2448
2132 if (corner) 2449 if (corner)
2133 { 2450 {
2134 float ox = corner * dx; 2451 float ox = corner * dx;
2135 2452
2136 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2137 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2138 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2139 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2140 } 2457 }
2141 } 2458 }
2142 } 2459 }
2143 } 2460 }
2144 } 2461 }
2146 2463
2147 glEnd (); 2464 glEnd ();
2148 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
2149 key.texname = -1; 2466 key.texname = -1;
2150 } 2467 }
2151
2152 hv_clear (smooth);
2153 } 2468 }
2154 2469
2155 if (pl_tex.name) 2470 if (pl_tex.name)
2156 { 2471 {
2157 maptex tex = pl_tex; 2472 maptex tex = pl_tex;
2167 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2482 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2168 2483
2169 rc_draw (rc); 2484 rc_draw (rc);
2170 } 2485 }
2171 2486
2487 rc_draw (rc_ov);
2488 rc_clear (rc_ov);
2489
2172 glDisable (GL_BLEND); 2490 glDisable (GL_BLEND);
2173 rc_free (rc); 2491 rc_free (rc);
2492 rc_free (rc_ov);
2174 2493
2175 // top layer: overlays such as the health bar 2494 // top layer: overlays such as the health bar
2176 for (y = 0; y < sh; y++) 2495 for (y = 0; y < sh; y++)
2177 if (0 <= y + my && y + my < self->rows) 2496 if (0 <= y + my && y + my < self->rows)
2178 { 2497 {
2181 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2182 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2183 { 2502 {
2184 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2185 2504
2186 int px = x * T; 2505 int px = x * Tw;
2187 int py = y * T; 2506 int py = y * Th;
2507
2508 if (expect_false (cell->player == player))
2509 {
2510 px += sdx;
2511 py += sdy;
2512 }
2188 2513
2189 if (cell->stat_hp) 2514 if (cell->stat_hp)
2190 { 2515 {
2191 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2192 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2193 2518
2194 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2195 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2196 px + width - 1, py); 2521 px + width - 1, py);
2197 2522
2203 } 2528 }
2204 } 2529 }
2205} 2530}
2206 2531
2207void 2532void
2208draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2533draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2209 CODE: 2534 CODE:
2210{ 2535{
2211 static float color[16][3] = { 2536 static float color[16][3] = {
2212 { 0.00F, 0.00F, 0.00F }, 2537 { 0.00f, 0.00f, 0.00f },
2213 { 1.00F, 1.00F, 1.00F }, 2538 { 1.00f, 1.00f, 1.00f },
2214 { 0.00F, 0.00F, 0.55F }, 2539 { 0.00f, 0.00f, 0.55f },
2215 { 1.00F, 0.00F, 0.00F }, 2540 { 1.00f, 0.00f, 0.00f },
2216 2541
2217 { 1.00F, 0.54F, 0.00F }, 2542 { 1.00f, 0.54f, 0.00f },
2218 { 0.11F, 0.56F, 1.00F }, 2543 { 0.11f, 0.56f, 1.00f },
2219 { 0.93F, 0.46F, 0.00F }, 2544 { 0.93f, 0.46f, 0.00f },
2220 { 0.18F, 0.54F, 0.34F }, 2545 { 0.18f, 0.54f, 0.34f },
2221 2546
2222 { 0.56F, 0.73F, 0.56F }, 2547 { 0.56f, 0.73f, 0.56f },
2223 { 0.80F, 0.80F, 0.80F }, 2548 { 0.80f, 0.80f, 0.80f },
2224 { 0.55F, 0.41F, 0.13F }, 2549 { 0.55f, 0.41f, 0.13f },
2225 { 0.99F, 0.77F, 0.26F }, 2550 { 0.99f, 0.77f, 0.26f },
2226 2551
2227 { 0.74F, 0.65F, 0.41F }, 2552 { 0.74f, 0.65f, 0.41f },
2228 2553
2229 { 0.00F, 1.00F, 1.00F }, 2554 { 0.00f, 1.00f, 1.00f },
2230 { 1.00F, 0.00F, 1.00F }, 2555 { 1.00f, 0.00f, 1.00f },
2231 { 1.00F, 1.00F, 0.00F }, 2556 { 1.00f, 1.00f, 0.00f },
2232 }; 2557 };
2233 2558
2234 int x, y; 2559 int x, y;
2235 2560
2236 glEnable (GL_TEXTURE_2D); 2561 glEnable (GL_TEXTURE_2D);
2562 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2563 * but the nvidia driver (185.18.14) mishandles alpha textures
2564 * and takes the colour from god knows where instead of using
2565 * Cp. MODULATE results in the same colour, but slightly different
2566 * alpha, but atcually gives us the correct colour with nvidia.
2567 */
2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2568 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2238 glEnable (GL_BLEND); 2569 glEnable (GL_BLEND);
2239 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2570 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2240 glBegin (GL_QUADS); 2571 glBegin (GL_QUADS);
2241 2572
2242 for (y = 0; y < h; y++) 2573 for (y = 0; y < h; y++)
2246 2577
2247 if (m) 2578 if (m)
2248 { 2579 {
2249 float *c = color [m & 15]; 2580 float *c = color [m & 15];
2250 2581
2251 float tx1 = m & 0x40 ? 0.5 : 0.; 2582 float tx1 = m & 0x40 ? 0.5f : 0.f;
2252 float tx2 = tx1 + 0.5; 2583 float tx2 = tx1 + 0.5f;
2253 2584
2254 glColor4f (c[0], c[1], c[2], 0.75); 2585 glColor4f (c[0], c[1], c[2], 1);
2255 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2586 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2256 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2587 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2257 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2588 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2258 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2589 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2259 } 2590 }
2267void 2598void
2268fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2599fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2269 PPCODE: 2600 PPCODE:
2270{ 2601{
2271 int x, y; 2602 int x, y;
2272 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2273 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2274 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2275 int sw34 = (sw * 3 + 3) & ~3; 2606 int sw3 = sw * 3;
2607 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2608 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2276 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2277 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2610 memset (darkness1, 0, sw1*sh1);
2278 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2279 2611
2280 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2281 SvCUR_set (darkness3_sv, sw34 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2282 2614
2283 mx += self->x - 1; 2615 mx += self->x - 1;
2284 my += self->y - 1; 2616 my += self->y - 1;
2285
2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2287 2617
2288 for (y = 0; y < sh1; y++) 2618 for (y = 0; y < sh1; y++)
2289 if (0 <= y + my && y + my < self->rows) 2619 if (0 <= y + my && y + my < self->rows)
2290 { 2620 {
2291 maprow *row = self->row + (y + my); 2621 maprow *row = self->row + (y + my);
2294 if (row->c0 <= x + mx && x + mx < row->c1) 2624 if (row->c0 <= x + mx && x + mx < row->c1)
2295 { 2625 {
2296 mapcell *cell = row->col + (x + mx - row->c0); 2626 mapcell *cell = row->col + (x + mx - row->c0);
2297 2627
2298 darkness1 [y * sw1 + x] = cell->darkness 2628 darkness1 [y * sw1 + x] = cell->darkness
2299 ? 255 - (cell->darkness - 1) 2629 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2300 : 255 - FOW_DARKNESS; 2630 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2301 } 2631 }
2302 } 2632 }
2303 2633
2304 for (y = 0; y < sh; ++y) 2634 for (y = 0; y < sh; ++y)
2305 for (x = 0; x < sw; ++x) 2635 for (x = 0; x < sw; ++x)
2324 2654
2325 uint8_t r13 = (d13 + d23 + d12) / 3; 2655 uint8_t r13 = (d13 + d23 + d12) / 3;
2326 uint8_t r23 = d23; 2656 uint8_t r23 = d23;
2327 uint8_t r33 = (d23 + d33 + d32) / 3; 2657 uint8_t r33 = (d23 + d33 + d32) / 3;
2328 2658
2329 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2659 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2330 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2660 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2331 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2661 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2332 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2662 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2333 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2663 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2334 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2664 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2335 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2665 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2336 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2666 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2337 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2667 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2338 } 2668 }
2339 2669
2340 free (darkness1); 2670 free (darkness1);
2341 2671
2342 EXTEND (SP, 3); 2672 EXTEND (SP, 3);
2343 PUSHs (sv_2mortal (newSViv (sw34))); 2673 PUSHs (sv_2mortal (newSViv (sw3)));
2344 PUSHs (sv_2mortal (newSViv (sh3))); 2674 PUSHs (sv_2mortal (newSViv (sh3)));
2345 PUSHs (darkness3_sv); 2675 PUSHs (darkness3_sv);
2346} 2676}
2347 2677
2348SV * 2678SV *
2411 else 2741 else
2412 *data++ = 0; 2742 *data++ = 0;
2413 } 2743 }
2414 } 2744 }
2415 2745
2416 /* if size is w*h + 5 then no data has been found */ 2746 /* if size is w*h + 5 then no data has been found */
2417 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2747 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2418 { 2748 {
2419 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2420 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2421 } 2751 }
2422 2752
2423 RETVAL = data_sv; 2753 RETVAL = data_sv;
2424} 2754}
2425 OUTPUT: 2755 OUTPUT:
2426 RETVAL 2756 RETVAL
2427 2757
2428void 2758void
2435 STRLEN len; 2765 STRLEN len;
2436 uint8_t *data, *end; 2766 uint8_t *data, *end;
2437 2767
2438 len = SvLEN (data_sv); 2768 len = SvLEN (data_sv);
2439 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2769 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2440 data = SvPVbyte_nolen (data_sv); 2770 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2441 end = data + len + 8; 2771 end = data + len + 8;
2442 2772
2443 if (len < 5) 2773 if (len < 5)
2444 XSRETURN_EMPTY; 2774 XSRETURN_EMPTY;
2445 2775
2506} 2836}
2507 2837
2508MODULE = Deliantra::Client PACKAGE = DC::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2509 2839
2510DC::RW 2840DC::RW
2511new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2512 CODE: 2842 CODE:
2513{ 2843{
2514 STRLEN datalen; 2844 STRLEN datalen;
2515 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2516 2846
2518} 2848}
2519 OUTPUT: 2849 OUTPUT:
2520 RETVAL 2850 RETVAL
2521 2851
2522DC::RW 2852DC::RW
2523new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2524 CODE: 2854 CODE:
2525 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2526 OUTPUT: 2856 OUTPUT:
2527 RETVAL 2857 RETVAL
2528 2858
2546 if (RETVAL < 0) 2876 if (RETVAL < 0)
2547 { 2877 {
2548 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2549 2879
2550 if (RETVAL < 0) 2880 if (RETVAL < 0)
2881 {
2882 // happens sometimes, maybe it just stopped playing(?)
2883 RETVAL = Mix_GroupAvailable (-1);
2884
2885 if (RETVAL < 0)
2551 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2552 2887 }
2888 else
2553 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2554 } 2890 }
2555 2891
2556 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2557 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2558} 2894}
2605void 2941void
2606set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2942set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2607 CODE: 2943 CODE:
2608{ 2944{
2609 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2945 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2610 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2946 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2611 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2947 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2612} 2948}
2613 2949
2614void 2950void
2615set_reverse_stereo (DC::Channel self, int flip) 2951set_reverse_stereo (DC::Channel self, int flip)
2618 2954
2619MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2620 2956
2621PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2622 2958
2959void
2960decoders ()
2961 PPCODE:
2962#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2963 int i, num = Mix_GetNumChunkDecoders ();
2964 EXTEND (SP, num);
2965 for (i = 0; i < num; ++i)
2966 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2967#else
2968 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2969#endif
2970
2623DC::MixChunk 2971DC::MixChunk
2624new (SV *class, DC::RW rwops) 2972new (SV *klass, DC::RW rwops)
2625 CODE: 2973 CODE:
2626 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2627 OUTPUT: 2975 OUTPUT:
2628 RETVAL 2976 RETVAL
2629 2977
2659 OUTPUT: 3007 OUTPUT:
2660 RETVAL 3008 RETVAL
2661 3009
2662MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3010MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2663 3011
3012void
3013decoders ()
3014 PPCODE:
3015#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3016 int i, num = Mix_GetNumMusicDecoders ();
3017 EXTEND (SP, num);
3018 for (i = 0; i < num; ++i)
3019 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3020#else
3021 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3022#endif
3023
2664int 3024int
2665volume (int volume = -1) 3025volume (int volume = -1)
2666 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2667 CODE: 3027 CODE:
2668 if (items > 0) 3028 if (items > 0)
2679void 3039void
2680halt () 3040halt ()
2681 CODE: 3041 CODE:
2682 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2683 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2684DC::MixMusic 3051DC::MixMusic
2685new (SV *class, DC::RW rwops) 3052new (SV *klass, DC::RW rwops)
2686 CODE: 3053 CODE:
2687 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2688 OUTPUT: 3055 OUTPUT:
2689 RETVAL 3056 RETVAL
2690 3057
2718 } *civ, const_iv[] = { 3085 } *civ, const_iv[] = {
2719# define const_iv(name) { # name, (IV)name } 3086# define const_iv(name) { # name, (IV)name }
2720 const_iv (GL_VENDOR), 3087 const_iv (GL_VENDOR),
2721 const_iv (GL_VERSION), 3088 const_iv (GL_VERSION),
2722 const_iv (GL_EXTENSIONS), 3089 const_iv (GL_EXTENSIONS),
3090 const_iv (GL_MAX_TEXTURE_UNITS),
2723 const_iv (GL_COLOR_MATERIAL), 3091 const_iv (GL_COLOR_MATERIAL),
2724 const_iv (GL_SMOOTH), 3092 const_iv (GL_SMOOTH),
2725 const_iv (GL_FLAT), 3093 const_iv (GL_FLAT),
2726 const_iv (GL_DITHER), 3094 const_iv (GL_DITHER),
2727 const_iv (GL_BLEND), 3095 const_iv (GL_BLEND),
2739 const_iv (GL_ZERO), 3107 const_iv (GL_ZERO),
2740 const_iv (GL_SRC_ALPHA), 3108 const_iv (GL_SRC_ALPHA),
2741 const_iv (GL_DST_ALPHA), 3109 const_iv (GL_DST_ALPHA),
2742 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3110 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2743 const_iv (GL_ONE_MINUS_DST_ALPHA), 3111 const_iv (GL_ONE_MINUS_DST_ALPHA),
3112 const_iv (GL_SRC_COLOR),
3113 const_iv (GL_DST_COLOR),
3114 const_iv (GL_ONE_MINUS_SRC_COLOR),
3115 const_iv (GL_ONE_MINUS_DST_COLOR),
2744 const_iv (GL_SRC_ALPHA_SATURATE), 3116 const_iv (GL_SRC_ALPHA_SATURATE),
2745 const_iv (GL_RGB), 3117 const_iv (GL_RGB),
2746 const_iv (GL_RGBA), 3118 const_iv (GL_RGBA),
2747 const_iv (GL_RGBA4), 3119 const_iv (GL_RGBA4),
2748 const_iv (GL_RGBA8), 3120 const_iv (GL_RGBA8),
2816 const_iv (GL_NICEST), 3188 const_iv (GL_NICEST),
2817 const_iv (GL_V2F), 3189 const_iv (GL_V2F),
2818 const_iv (GL_V3F), 3190 const_iv (GL_V3F),
2819 const_iv (GL_T2F_V3F), 3191 const_iv (GL_T2F_V3F),
2820 const_iv (GL_T2F_N3F_V3F), 3192 const_iv (GL_T2F_N3F_V3F),
3193 const_iv (GL_FUNC_ADD),
3194 const_iv (GL_FUNC_SUBTRACT),
3195 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2821# undef const_iv 3196# undef const_iv
2822 }; 3197 };
2823 3198
2824 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3199 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2825 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2826 3201
2827 texture_av = newAV (); 3202 texture_av = newAV ();
2828 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
2829} 3204}
2830 3205
2832disable_GL_EXT_blend_func_separate () 3207disable_GL_EXT_blend_func_separate ()
2833 CODE: 3208 CODE:
2834 gl.BlendFuncSeparate = 0; 3209 gl.BlendFuncSeparate = 0;
2835 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
2836 3211
2837char * 3212void
3213apple_nvidia_bug (int enable)
3214
3215const char *
2838gl_vendor () 3216gl_vendor ()
2839 CODE: 3217 CODE:
2840 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
2841 OUTPUT: 3219 OUTPUT:
2842 RETVAL 3220 RETVAL
2843 3221
2844char * 3222const char *
2845gl_version () 3223gl_version ()
2846 CODE: 3224 CODE:
2847 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
2848 OUTPUT: 3226 OUTPUT:
2849 RETVAL 3227 RETVAL
2850 3228
2851char * 3229const char *
2852gl_extensions () 3230gl_extensions ()
2853 CODE: 3231 CODE:
2854 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2855 OUTPUT: 3233 OUTPUT:
2856 RETVAL 3234 RETVAL
2857 3235
2858const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
2859 3241
2860GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
2861 CODE: 3243 CODE:
2862 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
2863 OUTPUT: 3245 OUTPUT:
2871 3253
2872int glGetError () 3254int glGetError ()
2873 3255
2874void glFinish () 3256void glFinish ()
2875 3257
3258void glFlush ()
3259
2876void glClear (int mask) 3260void glClear (int mask)
2877 3261
2878void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
2879 PROTOTYPE: @ 3263 PROTOTYPE: @
2880 3264
2889void glBlendFunc (int sfactor, int dfactor) 3273void glBlendFunc (int sfactor, int dfactor)
2890 3274
2891void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3275void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2892 CODE: 3276 CODE:
2893 gl_BlendFuncSeparate (sa, da, saa, daa); 3277 gl_BlendFuncSeparate (sa, da, saa, daa);
3278
3279# void glBlendEquation (int se)
2894 3280
2895void glDepthMask (int flag) 3281void glDepthMask (int flag)
2896 3282
2897void glLogicOp (int opcode) 3283void glLogicOp (int opcode)
2898 3284
2933void glRotate (float angle, float x, float y, float z) 3319void glRotate (float angle, float x, float y, float z)
2934 CODE: 3320 CODE:
2935 glRotatef (angle, x, y, z); 3321 glRotatef (angle, x, y, z);
2936 3322
2937void glColor (float r, float g, float b, float a = 1.0) 3323void glColor (float r, float g, float b, float a = 1.0)
3324 PROTOTYPE: @
2938 ALIAS: 3325 ALIAS:
2939 glColor_premultiply = 1 3326 glColor_premultiply = 1
2940 CODE: 3327 CODE:
2941 if (ix) 3328 if (ix)
2942 { 3329 {
3048 3435
3049void glEndList () 3436void glEndList ()
3050 3437
3051void glCallList (int list) 3438void glCallList (int list)
3052 3439
3440void c_init ()
3441 CODE:
3442 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3443 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3444
3053MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3445MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3054 3446
3055PROTOTYPES: DISABLE 3447PROTOTYPES: DISABLE
3056 3448
3057void 3449void
3058find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
3059 PPCODE: 3451 PPCODE:
3060{ 3452{
3061 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
3062 XPUSHs (self); 3454 XPUSHs (self);
3063} 3455}
3064 3456
3065BOOT: 3457BOOT:
3066{ 3458{
3074 3466
3075void 3467void
3076draw (SV *self) 3468draw (SV *self)
3077 CODE: 3469 CODE:
3078{ 3470{
3079 HV *hv; 3471 HV *hv;
3080 SV **svp; 3472 SV **svp;
3081 NV x, y, w, h; 3473 NV x, y, w, h;
3082 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
3083 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
3084 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
3085 SV *draw_h_sv = GvSV (draw_h_gv); 3477 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines