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.268 by root, Sun Jul 20 02:57:43 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>
39#include <SDL_endian.h> 42#include <SDL_endian.h>
40#include <SDL_image.h> 43#include <SDL_image.h>
41#include <SDL_mixer.h> 44#include <SDL_mixer.h>
42#include <SDL_opengl.h> 45#include <SDL_opengl.h>
43 46
47/* work around os x broken headers */
48#ifdef __MACOSX__
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);
52#endif
53
44#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
46 56
47#include <glib/gmacros.h> 57#include <glib.h>
48 58
49#include <pango/pango.h> 59#include <pango/pango.h>
50 60
51#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
76#define expect_false(expr) expect ((expr) != 0, 0) 86#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 87#define expect_true(expr) expect ((expr) != 0, 1)
78 88
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 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 */
81#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
82 95
83#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
85 98
86#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
87 100
88/* mask out modifiers we are not interested in */ 101/* mask out modifiers we are not interested in */
89#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}
90 127
91static AV *texture_av; 128static AV *texture_av;
92 129
93static struct 130static struct
94{ 131{
151{ 188{
152 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
153 190
154 while (attrs) 191 while (attrs)
155 { 192 {
156 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
157 194
158 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
159 return 1; 196 return 1;
160 197
161 attrs = attrs->next; 198 attrs = attrs->next;
179static void 216static void
180substitute_func (FcPattern *pattern, gpointer data) 217substitute_func (FcPattern *pattern, gpointer data)
181{ 218{
182 FcPatternAddBool (pattern, FC_HINTING, 1); 219 FcPatternAddBool (pattern, FC_HINTING, 1);
183#ifdef FC_HINT_STYLE 220#ifdef FC_HINT_STYLE
184 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 221 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
185#endif 222#endif
186 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 223 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
187} 224}
188 225
189static void 226static void
226 int w, h; 263 int w, h;
227 float s, t; 264 float s, t;
228 uint8_t r, g, b, a; 265 uint8_t r, g, b, a;
229 tileid smoothtile; 266 tileid smoothtile;
230 uint8_t smoothlevel; 267 uint8_t smoothlevel;
268 uint8_t unused; /* set to zero on use */
231} maptex; 269} maptex;
232 270
233typedef struct { 271typedef struct {
234 uint32_t player; 272 uint32_t player;
235 tileid tile[3]; 273 tileid tile[3];
405 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
406 } 444 }
407 } 445 }
408} 446}
409 447
410typedef struct { 448struct smooth_key
449{
411 tileid tile; 450 tileid tile;
412 uint8_t x, y, level; 451 uint8_t x, y, level;
413} 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}
414 471
415static void 472static void
416smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
417{ 474{
418 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
419 476
420 if (SvIOK (*sv)) 477 if (it == h.end ())
421 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
422 else 479 else
423 sv_setiv (*sv, bits); 480 it->second |= bits;
424} 481}
425 482
426static void 483static void
427music_finished (void) 484music_finished (void)
428{ 485{
445 ev.code = 1; 502 ev.code = 1;
446 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
447 ev.data2 = 0; 504 ev.data2 = 0;
448 505
449 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;
450} 514}
451 515
452static unsigned int 516static unsigned int
453minpot (unsigned int n) 517minpot (unsigned int n)
454{ 518{
521 if (!svp || !SvTRUE (*svp)) 585 if (!svp || !SvTRUE (*svp))
522 return 0; 586 return 0;
523 587
524 return 1; 588 return 1;
525} 589}
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
605static void
606deliantra_main (SV *real_main)
607{
608 dSP;
609
610 PUSHMARK (SP);
611 call_sv (real_main, G_DISCARD | G_VOID);
612}
613
614#ifdef __MACOSX__
615 static SV *real_main;
616
617 /* to due surprising braindamage on the side of SDL design, we
618 * do some mind-boggling hack here: SDL requires a custom main()
619 * on OS X, so... we provide one and call the original main(), which,
620 * due to shared library magic, calls -lSDLmain's main, not perl's main,
621 * and which calls our main (== SDL_main) back.
622 */
623 extern C_LINKAGE int
624 main (int argc, char *argv[])
625 {
626 deliantra_main (real_main);
627 }
628
629 #undef main
630
631 extern C_LINKAGE int main (int argc, char *argv[]);
632
633 static void
634 SDL_main_hack (SV *real_main_)
635 {
636 real_main = real_main_;
637
638 char *argv[] = { "deliantra client", 0 };
639 (main) (1, argv);
640 }
641#else
642 static void
643 SDL_main_hack (SV *real_main)
644 {
645 deliantra_main (real_main);
646 }
647#endif
526 648
527MODULE = Deliantra::Client PACKAGE = DC 649MODULE = Deliantra::Client PACKAGE = DC
528 650
529PROTOTYPES: ENABLE 651PROTOTYPES: ENABLE
530 652
559 const_iv (SDL_USEREVENT), 681 const_iv (SDL_USEREVENT),
560 682
561 const_iv (SDL_APPINPUTFOCUS), 683 const_iv (SDL_APPINPUTFOCUS),
562 const_iv (SDL_APPMOUSEFOCUS), 684 const_iv (SDL_APPMOUSEFOCUS),
563 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),
564 736
565 const_iv (SDLK_FIRST), 737 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST), 738 const_iv (SDLK_LAST),
567 const_iv (SDLK_KP0), 739 const_iv (SDLK_KP0),
568 const_iv (SDLK_KP1), 740 const_iv (SDLK_KP1),
644 const_iv (KMOD_RMETA), 816 const_iv (KMOD_RMETA),
645 const_iv (KMOD_NUM), 817 const_iv (KMOD_NUM),
646 const_iv (KMOD_CAPS), 818 const_iv (KMOD_CAPS),
647 const_iv (KMOD_MODE), 819 const_iv (KMOD_MODE),
648 820
821 const_iv (KMOD_LRAM),
822
649 const_iv (MIX_DEFAULT_FORMAT), 823 const_iv (MIX_DEFAULT_FORMAT),
650 824
651 const_iv (SDL_INIT_TIMER), 825 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO), 826 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO), 827 const_iv (SDL_INIT_VIDEO),
671 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 845 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
672 const_iv (SDL_GL_STEREO), 846 const_iv (SDL_GL_STEREO),
673 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 847 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
674 const_iv (SDL_GL_MULTISAMPLESAMPLES), 848 const_iv (SDL_GL_MULTISAMPLESAMPLES),
675 const_iv (SDL_GL_ACCELERATED_VISUAL), 849 const_iv (SDL_GL_ACCELERATED_VISUAL),
676 const_iv (SDL_GL_SWAP_CONTROL) 850 const_iv (SDL_GL_SWAP_CONTROL),
851
852 const_iv (FOW_DARKNESS)
677# undef const_iv 853# undef const_iv
678 }; 854 };
679 855
680 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--)
681 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
682 858
683 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
684 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
685} 861}
686 862
702NV ceil (NV x) 878NV ceil (NV x)
703 879
704IV minpot (UV n) 880IV minpot (UV n)
705 881
706IV 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
707 889
708void 890void
709pango_init () 891pango_init ()
710 CODE: 892 CODE:
711{ 893{
719#endif 901#endif
720} 902}
721 903
722char *SDL_GetError () 904char *SDL_GetError ()
723 905
906void SDL_main_hack (SV *real_main)
907 PROTOTYPE: &
908
724int SDL_Init (U32 flags) 909int SDL_Init (U32 flags)
725 910
726int SDL_InitSubSystem (U32 flags) 911int SDL_InitSubSystem (U32 flags)
727 912
728void SDL_QuitSubSystem (U32 flags) 913void SDL_QuitSubSystem (U32 flags)
729 914
730void SDL_Quit () 915void SDL_Quit ()
731 916
732int SDL_GL_SetAttribute (int attr, int value) 917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
733 919
734int SDL_GL_GetAttribute (int attr) 920int SDL_GL_GetAttribute (int attr)
735 CODE: 921 CODE:
736 if (SDL_GL_GetAttribute (attr, &RETVAL)) 922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
737 XSRETURN_UNDEF; 923 XSRETURN_UNDEF;
738 OUTPUT: 924 OUTPUT:
739 RETVAL 925 RETVAL
740 926
741void 927void
796 ); 982 );
797 983
798 if (RETVAL) 984 if (RETVAL)
799 { 985 {
800 av_clear (texture_av); 986 av_clear (texture_av);
801
802 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
803#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);
804#include "glfunc.h" 988#include "glfunc.h"
805#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
806 } 992 }
807} 993}
808 OUTPUT: 994 OUTPUT:
809 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
810 999
811void 1000void
812SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
813 1002
814char * 1003char *
815SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
816 1006
817int 1007int
818SDL_GetAppState () 1008SDL_GetAppState ()
819 1009
820int 1010int
821SDL_GetModState () 1011SDL_GetModState ()
822 1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
823void 1017void
1018SDL_PumpEvents ()
1019
1020void
824poll_events () 1021peep_events ()
825 PPCODE: 1022 PPCODE:
826{ 1023{
827 SDL_Event ev; 1024 SDL_Event ev;
828 1025
829 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
836 { 1033 {
837 case SDL_KEYDOWN: 1034 case SDL_KEYDOWN:
838 case SDL_KEYUP: 1035 case SDL_KEYUP:
839 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1036 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
840 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1037 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
841 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);
842 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 */
843 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1040 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
844 break; 1041 break;
845 1042
846 case SDL_ACTIVEEVENT: 1043 case SDL_ACTIVEEVENT:
847 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1044 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
865 x = ev.motion.x; 1062 x = ev.motion.x;
866 y = ev.motion.y; 1063 y = ev.motion.y;
867 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1064 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
868 } 1065 }
869 1066
870 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1067 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
871 hv_store (hv, "state", 5, newSViv (state), 0); 1068 hv_store (hv, "state", 5, newSViv (state), 0);
872 hv_store (hv, "x", 1, newSViv (x), 0); 1069 hv_store (hv, "x", 1, newSViv (x), 0);
873 hv_store (hv, "y", 1, newSViv (y), 0); 1070 hv_store (hv, "y", 1, newSViv (y), 0);
874 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1071 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
875 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1072 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
895 1092
896 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))));
897 } 1094 }
898} 1095}
899 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
900int 1110int
901Mix_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)
902 POSTCALL: 1112 POSTCALL:
903 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
904 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
905 1115
906void 1116void
907Mix_QuerySpec () 1117Mix_QuerySpec ()
966add_font (char *file) 1176add_font (char *file)
967 CODE: 1177 CODE:
968 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
969 OUTPUT: 1179 OUTPUT:
970 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)
971 1188
972void 1189void
973load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
974 ALIAS: 1191 ALIAS:
975 load_image_file = 1 1192 load_image_file = 1
1021 1238
1022 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
1023 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
1024 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
1025 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
1026 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1027 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)));
1028 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1029 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1030 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
1031 1248
1091#if DEBUG 1308#if DEBUG
1092 VALGRIND_DO_LEAK_CHECK; 1309 VALGRIND_DO_LEAK_CHECK;
1093#endif 1310#endif
1094} 1311}
1095 1312
1313int
1314SvREFCNT (SV *sv)
1315 CODE:
1316 RETVAL = SvREFCNT (sv);
1317 OUTPUT:
1318 RETVAL
1319
1096MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1097 1321
1098PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1099 1323
1100DC::Font 1324DC::Font
1101new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1102 CODE: 1326 CODE:
1103{ 1327{
1104 int count; 1328 int count;
1105 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1106 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1135 PROTOTYPE: 1359 PROTOTYPE:
1136 CODE: 1360 CODE:
1137 tc_restore (); 1361 tc_restore ();
1138 1362
1139DC::Layout 1363DC::Layout
1140new (SV *class) 1364new (SV *klass)
1141 CODE: 1365 CODE:
1142 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1143 1367
1144 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1145 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1294 1518
1295void 1519void
1296set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1297 CODE: 1521 CODE:
1298 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1299 { 1523 {
1300 self->base_height = base_height; 1524 self->base_height = base_height;
1301 layout_update_font (self); 1525 layout_update_font (self);
1302 } 1526 }
1303 1527
1304void 1528void
1531 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1532 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1533 } 1757 }
1534} 1758}
1535 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
1536IV 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)
1537 CODE: 1882 CODE:
1538{ 1883{
1539 GLint width; 1884 GLint width;
1540 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);
1547MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1548 1893
1549PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1550 1895
1551DC::Map 1896DC::Map
1552new (SV *class) 1897new (SV *klass)
1553 CODE: 1898 CODE:
1554 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1555 RETVAL->x = 0; 1900 RETVAL->x = 0;
1556 RETVAL->y = 0; 1901 RETVAL->y = 0;
1557 RETVAL->w = 0; 1902 RETVAL->w = 0;
1596 1941
1597void 1942void
1598set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1599 CODE: 1944 CODE:
1600{ 1945{
1601 tileid texid; 1946 tileid texid;
1602 maptex *tex; 1947 maptex *tex;
1603 1948
1604 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1605 return; 1950 return;
1606 1951
1607 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1608 return; 1953 return;
1609 1954
1610 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1611 1956
1612 if (!texid) 1957 if (!texid)
1613 return; 1958 return;
1614 1959
1615 tex = self->tex + texid; 1960 tex = self->tex + texid;
1644 //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);
1645 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1646 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1647 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1648} 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 }
1649 2014
1650int 2015int
1651ox (DC::Map self) 2016ox (DC::Map self)
1652 ALIAS: 2017 ALIAS:
1653 oy = 1 2018 oy = 1
1693 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1694 } 2059 }
1695} 2060}
1696 2061
1697SV * 2062SV *
1698map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1699 CODE: 2064 CODE:
1700{ 2065{
1701 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1702 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1703 mapcell *cell; 2068 mapcell *cell;
1724 2089
1725 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1726 2091
1727 if (flags & 8) 2092 if (flags & 8)
1728 { 2093 {
2094 uint8_t ext, cmd;
2095
1729 if (extmap) 2096 do
1730 { 2097 {
1731 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1732 2100
1733 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
1734 { 2104 {
1735 ext = *data++;
1736 cmd = ext & 0x7f;
1737
1738 if (cmd < 4)
1739 cell->darkness = 255 - ext * 64 + 1;
1740 else if (cmd == 5) // health
1741 {
1742 cell->stat_width = 1; 2105 cell->stat_width = 1;
1743 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1744 }
1745 else if (cmd == 6) // monster width
1746 cell->stat_width = *data++ + 1;
1747 else if (cmd == 0x47)
1748 {
1749 if (*data == 1) cell->player = data [1];
1750 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1751 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1752 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1753
1754 data += *data + 1;
1755 }
1756 else if (cmd == 8) // cell flags
1757 cell->flags = *data++;
1758 else if (ext & 0x40) // unknown, multibyte => skip
1759 data += *data + 1;
1760 else
1761 data++;
1762 } 2107 }
1763 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++;
1764 } 2125 }
1765 else 2126 while (ext & 0x80);
1766 cell->darkness = *data++ + 1;
1767 } 2127 }
1768 2128
1769 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1770 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1771 { 2131 {
1774 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1775 2135
1776 if (cell->tile [z]) 2136 if (cell->tile [z])
1777 { 2137 {
1778 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1779 if (!tex->name) 2140 if (!tex->name)
1780 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1781 2142
1782 if (tex->smoothtile) 2143 if (tex->smoothtile)
1783 { 2144 {
1784 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1785 if (!smooth->name) 2147 if (!smooth->name)
1786 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1787 } 2149 }
1788 } 2150 }
1789 } 2151 }
1817 ? self->row + y 2179 ? self->row + y
1818 : 0; 2180 : 0;
1819 2181
1820 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1821 { 2183 {
1822 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1823 2185
1824 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1825 { 2187 {
1826 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1827 2189
1829 { 2191 {
1830 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1831 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1832 int a1 = tex.a; 2194 int a1 = tex.a;
1833 2195
1834 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1835 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1836 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1837 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1838 } 2200 }
1839 } 2201 }
1840 2202
1841 *map++ = (r ) 2203 *map++ = (r )
1842 | (g << 8) 2204 | (g << 8)
1843 | (b << 16) 2205 | (b << 16)
1844 | (a << 24); 2206 | (a << 24);
1845 } 2207 }
1846 } 2208 }
1847 2209
1848 RETVAL = map_sv; 2210 RETVAL = map_sv;
1849} 2211}
1850 OUTPUT: 2212 OUTPUT:
1851 RETVAL 2213 RETVAL
1852 2214
1853void 2215void
1854draw (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)
1855 CODE: 2217 CODE:
1856{ 2218{
1857 int x, y, z; 2219 int x, y, z;
1858 2220
1859 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1860 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
1861 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)
1862 smooth_key skey; 2223 smooth_key skey;
1863 int pl_x, pl_y; 2224 int pl_x, pl_y;
1864 maptex pl_tex; 2225 maptex pl_tex;
1865 rc_t *rc = rc_alloc (); 2226 rc_t *rc = rc_alloc ();
2227 rc_t *rc_ov = rc_alloc ();
1866 rc_key_t key; 2228 rc_key_t key;
1867 rc_array_t *arr; 2229 rc_array_t *arr;
1868 2230
1869 pl_tex.name = 0; 2231 pl_tex.name = 0;
1870 2232
1871 // thats current max. sorry. 2233 // that's current max. sorry.
1872 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1873 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1874 2236
1875 // clear key, in case of extra padding 2237 // clear key, in case of extra padding
1876 memset (&skey, 0, sizeof (skey)); 2238 memset (&skey, 0, sizeof (skey));
1880 key.g = 255; 2242 key.g = 255;
1881 key.b = 255; 2243 key.b = 255;
1882 key.a = 255; 2244 key.a = 255;
1883 key.mode = GL_QUADS; 2245 key.mode = GL_QUADS;
1884 key.format = GL_T2F_V3F; 2246 key.format = GL_T2F_V3F;
1885 key.texname = -1;
1886 2247
1887 mx += self->x; 2248 mx += self->x;
1888 my += self->y; 2249 my += self->y;
1889 2250
1890 // first pass: determine smooth_max 2251 // first pass: determine smooth_max
1913 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1914 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1915 2276
1916 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
1917 { 2278 {
2279 smooth_hash smooth;
1918 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2281 key.texname = -1;
1919 2282
1920 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
1921 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
1922 { 2285 {
1923 maprow *row = self->row + (y + my); 2286 maprow *row = self->row + (y + my);
1929 tileid tile = cell->tile [z]; 2292 tileid tile = cell->tile [z];
1930 2293
1931 if (tile) 2294 if (tile)
1932 { 2295 {
1933 maptex tex = self->tex [tile]; 2296 maptex tex = self->tex [tile];
1934 int px = (x + 1) * T - tex.w; 2297 int px, py;
1935 int py = (y + 1) * T - tex.h;
1936 2298
1937 if (key.texname != tex.name) 2299 if (key.texname != tex.name)
1938 { 2300 {
2301 self->tex [tile].unused = 0;
2302
1939 if (!tex.name) 2303 if (!tex.name)
1940 tex = self->tex [2]; /* missing, replace by noface */ 2304 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1941 2305
1942 key.texname = tex.name; 2306 key.texname = tex.name;
1943 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
1944 } 2308 }
2309
2310 px = (x + 1) * Th - tex.w;
2311 py = (y + 1) * Tw - tex.h;
1945 2312
1946 if (expect_false (cell->player == player) && expect_false (z == 2)) 2313 if (expect_false (cell->player == player) && expect_false (z == 2))
1947 { 2314 {
1948 pl_x = px; 2315 pl_x = px;
1949 pl_y = py; 2316 pl_y = py;
1954 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2321 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1955 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);
1956 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);
1957 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);
1958 2325
1959 if (expect_false (cell->flags) && expect_false (z == 2))
1960 {
1961 // overlays such as the speech bubble, probably more to come
1962 if (cell->flags & 1)
1963 {
1964 maptex tex = self->tex [1];
1965 int px = x * T + T * 2 / 32;
1966 int py = y * T - T * 6 / 32;
1967
1968 if (tex.name)
1969 {
1970 if (key.texname != tex.name)
1971 {
1972 key.texname = tex.name;
1973 arr = rc_array (rc, &key);
1974 }
1975
1976 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1977 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1978 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1979 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1980 }
1981 }
1982 }
1983
1984 // update smooth hash 2326 // update smooth hash
1985 if (tex.smoothtile) 2327 if (tex.smoothtile)
1986 { 2328 {
1987 skey.tile = tex.smoothtile; 2329 skey.tile = tex.smoothtile;
1988 skey.level = tex.smoothlevel; 2330 skey.level = tex.smoothlevel;
2003 2345
2004 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2005 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
2006 2348
2007 // full tile 2349 // full tile
2008 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);
2009 2351
2010 // borders 2352 // borders
2011 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);
2012 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);
2013 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);
2014 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);
2015 2357
2016 // corners 2358 // corners
2017 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);
2018 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);
2019 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);
2020 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);
2021 } 2384 }
2022 } 2385 }
2023 } 2386 }
2024 } 2387 }
2025 2388
2041 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
2042 { 2405 {
2043 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
2044 HE *he; 2407 HE *he;
2045 2408
2046 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2047 while ((he = hv_iternext (smooth)))
2048 { 2410 {
2049 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
2050 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
2051 2413
2052 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
2053 && skey->level == level 2415 && skey.level == level
2054 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
2055 { 2417 {
2056 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
2057 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
2058 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
2059 int border = bits & 15; 2421 int border = bits & 15;
2060 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2061 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
2062 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
2063 2425
2065 { 2427 {
2066 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
2067 // save gobs of state changes. 2429 // save gobs of state changes.
2068 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
2069 { 2431 {
2432 self->tex [skey.tile].unused = 0;
2433
2070 glEnd (); 2434 glEnd ();
2071 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2072 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
2073 } 2437 }
2074 2438
2075 if (border) 2439 if (border)
2076 { 2440 {
2077 float ox = border * dx; 2441 float ox = border * dx;
2078 2442
2079 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2080 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2081 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2082 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2083 } 2447 }
2084 2448
2085 if (corner) 2449 if (corner)
2086 { 2450 {
2087 float ox = corner * dx; 2451 float ox = corner * dx;
2088 2452
2089 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2090 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2091 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2092 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2093 } 2457 }
2094 } 2458 }
2095 } 2459 }
2096 } 2460 }
2097 } 2461 }
2099 2463
2100 glEnd (); 2464 glEnd ();
2101 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
2102 key.texname = -1; 2466 key.texname = -1;
2103 } 2467 }
2104
2105 hv_clear (smooth);
2106 } 2468 }
2107 2469
2108 if (pl_tex.name) 2470 if (pl_tex.name)
2109 { 2471 {
2110 maptex tex = pl_tex; 2472 maptex tex = pl_tex;
2120 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);
2121 2483
2122 rc_draw (rc); 2484 rc_draw (rc);
2123 } 2485 }
2124 2486
2487 rc_draw (rc_ov);
2488 rc_clear (rc_ov);
2489
2125 glDisable (GL_BLEND); 2490 glDisable (GL_BLEND);
2126 rc_free (rc); 2491 rc_free (rc);
2492 rc_free (rc_ov);
2127 2493
2128 // top layer: overlays such as the health bar 2494 // top layer: overlays such as the health bar
2129 for (y = 0; y < sh; y++) 2495 for (y = 0; y < sh; y++)
2130 if (0 <= y + my && y + my < self->rows) 2496 if (0 <= y + my && y + my < self->rows)
2131 { 2497 {
2134 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2135 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2136 { 2502 {
2137 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2138 2504
2139 int px = x * T; 2505 int px = x * Tw;
2140 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 }
2141 2513
2142 if (cell->stat_hp) 2514 if (cell->stat_hp)
2143 { 2515 {
2144 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2145 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2146 2518
2147 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2148 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2149 px + width - 1, py); 2521 px + width - 1, py);
2150 2522
2156 } 2528 }
2157 } 2529 }
2158} 2530}
2159 2531
2160void 2532void
2161draw_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)
2162 CODE: 2534 CODE:
2163{ 2535{
2164 static float color[16][3] = { 2536 static float color[16][3] = {
2165 { 0.00F, 0.00F, 0.00F }, 2537 { 0.00f, 0.00f, 0.00f },
2166 { 1.00F, 1.00F, 1.00F }, 2538 { 1.00f, 1.00f, 1.00f },
2167 { 0.00F, 0.00F, 0.55F }, 2539 { 0.00f, 0.00f, 0.55f },
2168 { 1.00F, 0.00F, 0.00F }, 2540 { 1.00f, 0.00f, 0.00f },
2169 2541
2170 { 1.00F, 0.54F, 0.00F }, 2542 { 1.00f, 0.54f, 0.00f },
2171 { 0.11F, 0.56F, 1.00F }, 2543 { 0.11f, 0.56f, 1.00f },
2172 { 0.93F, 0.46F, 0.00F }, 2544 { 0.93f, 0.46f, 0.00f },
2173 { 0.18F, 0.54F, 0.34F }, 2545 { 0.18f, 0.54f, 0.34f },
2174 2546
2175 { 0.56F, 0.73F, 0.56F }, 2547 { 0.56f, 0.73f, 0.56f },
2176 { 0.80F, 0.80F, 0.80F }, 2548 { 0.80f, 0.80f, 0.80f },
2177 { 0.55F, 0.41F, 0.13F }, 2549 { 0.55f, 0.41f, 0.13f },
2178 { 0.99F, 0.77F, 0.26F }, 2550 { 0.99f, 0.77f, 0.26f },
2179 2551
2180 { 0.74F, 0.65F, 0.41F }, 2552 { 0.74f, 0.65f, 0.41f },
2181 2553
2182 { 0.00F, 1.00F, 1.00F }, 2554 { 0.00f, 1.00f, 1.00f },
2183 { 1.00F, 0.00F, 1.00F }, 2555 { 1.00f, 0.00f, 1.00f },
2184 { 1.00F, 1.00F, 0.00F }, 2556 { 1.00f, 1.00f, 0.00f },
2185 }; 2557 };
2186 2558
2187 int x, y; 2559 int x, y;
2188 2560
2189 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 */
2190 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2568 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2191 glEnable (GL_BLEND); 2569 glEnable (GL_BLEND);
2192 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2570 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2193 glBegin (GL_QUADS); 2571 glBegin (GL_QUADS);
2194 2572
2195 for (y = 0; y < h; y++) 2573 for (y = 0; y < h; y++)
2199 2577
2200 if (m) 2578 if (m)
2201 { 2579 {
2202 float *c = color [m & 15]; 2580 float *c = color [m & 15];
2203 2581
2204 float tx1 = m & 0x40 ? 0.5 : 0.; 2582 float tx1 = m & 0x40 ? 0.5f : 0.f;
2205 float tx2 = tx1 + 0.5; 2583 float tx2 = tx1 + 0.5f;
2206 2584
2207 glColor4f (c[0], c[1], c[2], 0.75); 2585 glColor4f (c[0], c[1], c[2], 1);
2208 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2586 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2209 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2587 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2210 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2588 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2211 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2589 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2212 } 2590 }
2220void 2598void
2221fow_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)
2222 PPCODE: 2600 PPCODE:
2223{ 2601{
2224 int x, y; 2602 int x, y;
2225 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2226 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2227 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2228 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);
2229 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2230 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2610 memset (darkness1, 0, sw1*sh1);
2231 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2232 2611
2233 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2234 SvCUR_set (darkness3_sv, sw34 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2235 2614
2236 mx += self->x - 1; 2615 mx += self->x - 1;
2237 my += self->y - 1; 2616 my += self->y - 1;
2238
2239 memset (darkness1, 255, sw1 * sh1);
2240 2617
2241 for (y = 0; y < sh1; y++) 2618 for (y = 0; y < sh1; y++)
2242 if (0 <= y + my && y + my < self->rows) 2619 if (0 <= y + my && y + my < self->rows)
2243 { 2620 {
2244 maprow *row = self->row + (y + my); 2621 maprow *row = self->row + (y + my);
2247 if (row->c0 <= x + mx && x + mx < row->c1) 2624 if (row->c0 <= x + mx && x + mx < row->c1)
2248 { 2625 {
2249 mapcell *cell = row->col + (x + mx - row->c0); 2626 mapcell *cell = row->col + (x + mx - row->c0);
2250 2627
2251 darkness1 [y * sw1 + x] = cell->darkness 2628 darkness1 [y * sw1 + x] = cell->darkness
2252 ? 255 - (cell->darkness - 1) 2629 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2253 : 255 - FOW_DARKNESS; 2630 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2254 } 2631 }
2255 } 2632 }
2256 2633
2257 for (y = 0; y < sh; ++y) 2634 for (y = 0; y < sh; ++y)
2258 for (x = 0; x < sw; ++x) 2635 for (x = 0; x < sw; ++x)
2277 2654
2278 uint8_t r13 = (d13 + d23 + d12) / 3; 2655 uint8_t r13 = (d13 + d23 + d12) / 3;
2279 uint8_t r23 = d23; 2656 uint8_t r23 = d23;
2280 uint8_t r33 = (d23 + d33 + d32) / 3; 2657 uint8_t r33 = (d23 + d33 + d32) / 3;
2281 2658
2282 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2659 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2283 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2660 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2284 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2661 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2662 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2286 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 */
2287 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2664 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2665 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2289 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2666 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2290 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2667 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2291 } 2668 }
2292 2669
2293 free (darkness1); 2670 free (darkness1);
2294 2671
2295 EXTEND (SP, 3); 2672 EXTEND (SP, 3);
2296 PUSHs (sv_2mortal (newSViv (sw34))); 2673 PUSHs (sv_2mortal (newSViv (sw3)));
2297 PUSHs (sv_2mortal (newSViv (sh3))); 2674 PUSHs (sv_2mortal (newSViv (sh3)));
2298 PUSHs (darkness3_sv); 2675 PUSHs (darkness3_sv);
2299} 2676}
2300 2677
2301SV * 2678SV *
2364 else 2741 else
2365 *data++ = 0; 2742 *data++ = 0;
2366 } 2743 }
2367 } 2744 }
2368 2745
2369 /* 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 */
2370 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2747 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2371 { 2748 {
2372 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2373 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2374 } 2751 }
2375 2752
2376 RETVAL = data_sv; 2753 RETVAL = data_sv;
2377} 2754}
2378 OUTPUT: 2755 OUTPUT:
2379 RETVAL 2756 RETVAL
2380 2757
2381void 2758void
2388 STRLEN len; 2765 STRLEN len;
2389 uint8_t *data, *end; 2766 uint8_t *data, *end;
2390 2767
2391 len = SvLEN (data_sv); 2768 len = SvLEN (data_sv);
2392 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2769 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2393 data = SvPVbyte_nolen (data_sv); 2770 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2394 end = data + len + 8; 2771 end = data + len + 8;
2395 2772
2396 if (len < 5) 2773 if (len < 5)
2397 XSRETURN_EMPTY; 2774 XSRETURN_EMPTY;
2398 2775
2459} 2836}
2460 2837
2461MODULE = Deliantra::Client PACKAGE = DC::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2462 2839
2463DC::RW 2840DC::RW
2464new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2465 CODE: 2842 CODE:
2466{ 2843{
2467 STRLEN datalen; 2844 STRLEN datalen;
2468 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2469 2846
2471} 2848}
2472 OUTPUT: 2849 OUTPUT:
2473 RETVAL 2850 RETVAL
2474 2851
2475DC::RW 2852DC::RW
2476new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2477 CODE: 2854 CODE:
2478 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2479 OUTPUT: 2856 OUTPUT:
2480 RETVAL 2857 RETVAL
2481 2858
2499 if (RETVAL < 0) 2876 if (RETVAL < 0)
2500 { 2877 {
2501 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2502 2879
2503 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)
2504 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2505 2887 }
2888 else
2506 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2507 } 2890 }
2508 2891
2509 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2510 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2511} 2894}
2558void 2941void
2559set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2942set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2560 CODE: 2943 CODE:
2561{ 2944{
2562 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));
2563 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;
2564 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2947 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2565} 2948}
2566 2949
2567void 2950void
2568set_reverse_stereo (DC::Channel self, int flip) 2951set_reverse_stereo (DC::Channel self, int flip)
2571 2954
2572MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2573 2956
2574PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2575 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
2576DC::MixChunk 2971DC::MixChunk
2577new (SV *class, DC::RW rwops) 2972new (SV *klass, DC::RW rwops)
2578 CODE: 2973 CODE:
2579 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2580 OUTPUT: 2975 OUTPUT:
2581 RETVAL 2976 RETVAL
2582 2977
2612 OUTPUT: 3007 OUTPUT:
2613 RETVAL 3008 RETVAL
2614 3009
2615MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3010MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2616 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
2617int 3024int
2618volume (int volume = -1) 3025volume (int volume = -1)
2619 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2620 CODE: 3027 CODE:
2621 if (items > 0) 3028 if (items > 0)
2632void 3039void
2633halt () 3040halt ()
2634 CODE: 3041 CODE:
2635 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2636 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2637DC::MixMusic 3051DC::MixMusic
2638new (SV *class, DC::RW rwops) 3052new (SV *klass, DC::RW rwops)
2639 CODE: 3053 CODE:
2640 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2641 OUTPUT: 3055 OUTPUT:
2642 RETVAL 3056 RETVAL
2643 3057
2671 } *civ, const_iv[] = { 3085 } *civ, const_iv[] = {
2672# define const_iv(name) { # name, (IV)name } 3086# define const_iv(name) { # name, (IV)name }
2673 const_iv (GL_VENDOR), 3087 const_iv (GL_VENDOR),
2674 const_iv (GL_VERSION), 3088 const_iv (GL_VERSION),
2675 const_iv (GL_EXTENSIONS), 3089 const_iv (GL_EXTENSIONS),
3090 const_iv (GL_MAX_TEXTURE_UNITS),
2676 const_iv (GL_COLOR_MATERIAL), 3091 const_iv (GL_COLOR_MATERIAL),
2677 const_iv (GL_SMOOTH), 3092 const_iv (GL_SMOOTH),
2678 const_iv (GL_FLAT), 3093 const_iv (GL_FLAT),
2679 const_iv (GL_DITHER), 3094 const_iv (GL_DITHER),
2680 const_iv (GL_BLEND), 3095 const_iv (GL_BLEND),
2692 const_iv (GL_ZERO), 3107 const_iv (GL_ZERO),
2693 const_iv (GL_SRC_ALPHA), 3108 const_iv (GL_SRC_ALPHA),
2694 const_iv (GL_DST_ALPHA), 3109 const_iv (GL_DST_ALPHA),
2695 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3110 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2696 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),
2697 const_iv (GL_SRC_ALPHA_SATURATE), 3116 const_iv (GL_SRC_ALPHA_SATURATE),
2698 const_iv (GL_RGB), 3117 const_iv (GL_RGB),
2699 const_iv (GL_RGBA), 3118 const_iv (GL_RGBA),
2700 const_iv (GL_RGBA4), 3119 const_iv (GL_RGBA4),
2701 const_iv (GL_RGBA8), 3120 const_iv (GL_RGBA8),
2769 const_iv (GL_NICEST), 3188 const_iv (GL_NICEST),
2770 const_iv (GL_V2F), 3189 const_iv (GL_V2F),
2771 const_iv (GL_V3F), 3190 const_iv (GL_V3F),
2772 const_iv (GL_T2F_V3F), 3191 const_iv (GL_T2F_V3F),
2773 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),
2774# undef const_iv 3196# undef const_iv
2775 }; 3197 };
2776 3198
2777 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--)
2778 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2779 3201
2780 texture_av = newAV (); 3202 texture_av = newAV ();
2781 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
2782} 3204}
2783 3205
2785disable_GL_EXT_blend_func_separate () 3207disable_GL_EXT_blend_func_separate ()
2786 CODE: 3208 CODE:
2787 gl.BlendFuncSeparate = 0; 3209 gl.BlendFuncSeparate = 0;
2788 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
2789 3211
2790char * 3212void
3213apple_nvidia_bug (int enable)
3214
3215const char *
2791gl_vendor () 3216gl_vendor ()
2792 CODE: 3217 CODE:
2793 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
2794 OUTPUT: 3219 OUTPUT:
2795 RETVAL 3220 RETVAL
2796 3221
2797char * 3222const char *
2798gl_version () 3223gl_version ()
2799 CODE: 3224 CODE:
2800 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
2801 OUTPUT: 3226 OUTPUT:
2802 RETVAL 3227 RETVAL
2803 3228
2804char * 3229const char *
2805gl_extensions () 3230gl_extensions ()
2806 CODE: 3231 CODE:
2807 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2808 OUTPUT: 3233 OUTPUT:
2809 RETVAL 3234 RETVAL
2810 3235
2811const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
2812 3241
2813GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
2814 CODE: 3243 CODE:
2815 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
2816 OUTPUT: 3245 OUTPUT:
2824 3253
2825int glGetError () 3254int glGetError ()
2826 3255
2827void glFinish () 3256void glFinish ()
2828 3257
3258void glFlush ()
3259
2829void glClear (int mask) 3260void glClear (int mask)
2830 3261
2831void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
2832 PROTOTYPE: @ 3263 PROTOTYPE: @
2833 3264
2842void glBlendFunc (int sfactor, int dfactor) 3273void glBlendFunc (int sfactor, int dfactor)
2843 3274
2844void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3275void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2845 CODE: 3276 CODE:
2846 gl_BlendFuncSeparate (sa, da, saa, daa); 3277 gl_BlendFuncSeparate (sa, da, saa, daa);
3278
3279# void glBlendEquation (int se)
2847 3280
2848void glDepthMask (int flag) 3281void glDepthMask (int flag)
2849 3282
2850void glLogicOp (int opcode) 3283void glLogicOp (int opcode)
2851 3284
2886void glRotate (float angle, float x, float y, float z) 3319void glRotate (float angle, float x, float y, float z)
2887 CODE: 3320 CODE:
2888 glRotatef (angle, x, y, z); 3321 glRotatef (angle, x, y, z);
2889 3322
2890void 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: @
2891 ALIAS: 3325 ALIAS:
2892 glColor_premultiply = 1 3326 glColor_premultiply = 1
2893 CODE: 3327 CODE:
2894 if (ix) 3328 if (ix)
2895 { 3329 {
3001 3435
3002void glEndList () 3436void glEndList ()
3003 3437
3004void glCallList (int list) 3438void glCallList (int list)
3005 3439
3440void c_init ()
3441 CODE:
3442 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3443 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3444
3006MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3445MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3007 3446
3008PROTOTYPES: DISABLE 3447PROTOTYPES: DISABLE
3009 3448
3010void 3449void
3011find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
3012 PPCODE: 3451 PPCODE:
3013{ 3452{
3014 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
3015 XPUSHs (self); 3454 XPUSHs (self);
3016} 3455}
3017 3456
3018BOOT: 3457BOOT:
3019{ 3458{
3027 3466
3028void 3467void
3029draw (SV *self) 3468draw (SV *self)
3030 CODE: 3469 CODE:
3031{ 3470{
3032 HV *hv; 3471 HV *hv;
3033 SV **svp; 3472 SV **svp;
3034 NV x, y, w, h; 3473 NV x, y, w, h;
3035 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
3036 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
3037 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
3038 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