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.270 by root, Sun Jul 20 15:05:13 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),
677 851
678 const_iv (FOW_DARKNESS) 852 const_iv (FOW_DARKNESS)
679# undef const_iv 853# undef const_iv
680 }; 854 };
681 855
682 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--)
683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
684 858
685 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
686 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
687} 861}
688 862
701 875
702NV floor (NV x) 876NV floor (NV x)
703 877
704NV ceil (NV x) 878NV ceil (NV x)
705 879
706NV ceilabs (NV x) 880IV minpot (UV n)
881
882IV popcount (UV n)
883
884NV distance (NV dx, NV dy)
707 CODE: 885 CODE:
708 RETVAL = x < 0. ? - ceil (-x) : ceil (x); 886 RETVAL = pow (dx * dx + dy * dy, 0.5);
709 OUTPUT: 887 OUTPUT:
710 RETVAL 888 RETVAL
711
712IV minpot (UV n)
713
714IV popcount (UV n)
715 889
716void 890void
717pango_init () 891pango_init ()
718 CODE: 892 CODE:
719{ 893{
727#endif 901#endif
728} 902}
729 903
730char *SDL_GetError () 904char *SDL_GetError ()
731 905
906void SDL_main_hack (SV *real_main)
907 PROTOTYPE: &
908
732int SDL_Init (U32 flags) 909int SDL_Init (U32 flags)
733 910
734int SDL_InitSubSystem (U32 flags) 911int SDL_InitSubSystem (U32 flags)
735 912
736void SDL_QuitSubSystem (U32 flags) 913void SDL_QuitSubSystem (U32 flags)
737 914
738void SDL_Quit () 915void SDL_Quit ()
739 916
740int SDL_GL_SetAttribute (int attr, int value) 917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
741 919
742int SDL_GL_GetAttribute (int attr) 920int SDL_GL_GetAttribute (int attr)
743 CODE: 921 CODE:
744 if (SDL_GL_GetAttribute (attr, &RETVAL)) 922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
745 XSRETURN_UNDEF; 923 XSRETURN_UNDEF;
746 OUTPUT: 924 OUTPUT:
747 RETVAL 925 RETVAL
748 926
749void 927void
804 ); 982 );
805 983
806 if (RETVAL) 984 if (RETVAL)
807 { 985 {
808 av_clear (texture_av); 986 av_clear (texture_av);
809
810 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
811#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);
812#include "glfunc.h" 988#include "glfunc.h"
813#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
814 } 992 }
815} 993}
816 OUTPUT: 994 OUTPUT:
817 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
818 999
819void 1000void
820SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
821 1002
822char * 1003char *
823SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
824 1006
825int 1007int
826SDL_GetAppState () 1008SDL_GetAppState ()
827 1009
828int 1010int
829SDL_GetModState () 1011SDL_GetModState ()
830 1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
831void 1017void
1018SDL_PumpEvents ()
1019
1020void
832poll_events () 1021peep_events ()
833 PPCODE: 1022 PPCODE:
834{ 1023{
835 SDL_Event ev; 1024 SDL_Event ev;
836 1025
837 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
844 { 1033 {
845 case SDL_KEYDOWN: 1034 case SDL_KEYDOWN:
846 case SDL_KEYUP: 1035 case SDL_KEYUP:
847 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1036 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
848 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1037 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
849 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);
850 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 */
851 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1040 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
852 break; 1041 break;
853 1042
854 case SDL_ACTIVEEVENT: 1043 case SDL_ACTIVEEVENT:
855 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1044 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
873 x = ev.motion.x; 1062 x = ev.motion.x;
874 y = ev.motion.y; 1063 y = ev.motion.y;
875 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1064 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
876 } 1065 }
877 1066
878 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1067 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
879 hv_store (hv, "state", 5, newSViv (state), 0); 1068 hv_store (hv, "state", 5, newSViv (state), 0);
880 hv_store (hv, "x", 1, newSViv (x), 0); 1069 hv_store (hv, "x", 1, newSViv (x), 0);
881 hv_store (hv, "y", 1, newSViv (y), 0); 1070 hv_store (hv, "y", 1, newSViv (y), 0);
882 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1071 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
883 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1072 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
903 1092
904 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))));
905 } 1094 }
906} 1095}
907 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
908int 1110int
909Mix_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)
910 POSTCALL: 1112 POSTCALL:
911 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
912 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
913 1115
914void 1116void
915Mix_QuerySpec () 1117Mix_QuerySpec ()
974add_font (char *file) 1176add_font (char *file)
975 CODE: 1177 CODE:
976 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
977 OUTPUT: 1179 OUTPUT:
978 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)
979 1188
980void 1189void
981load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
982 ALIAS: 1191 ALIAS:
983 load_image_file = 1 1192 load_image_file = 1
1029 1238
1030 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
1031 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
1032 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
1033 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
1034 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1035 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)));
1036 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1037 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1038 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
1039 1248
1099#if DEBUG 1308#if DEBUG
1100 VALGRIND_DO_LEAK_CHECK; 1309 VALGRIND_DO_LEAK_CHECK;
1101#endif 1310#endif
1102} 1311}
1103 1312
1313int
1314SvREFCNT (SV *sv)
1315 CODE:
1316 RETVAL = SvREFCNT (sv);
1317 OUTPUT:
1318 RETVAL
1319
1104MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1105 1321
1106PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1107 1323
1108DC::Font 1324DC::Font
1109new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1110 CODE: 1326 CODE:
1111{ 1327{
1112 int count; 1328 int count;
1113 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1114 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1143 PROTOTYPE: 1359 PROTOTYPE:
1144 CODE: 1360 CODE:
1145 tc_restore (); 1361 tc_restore ();
1146 1362
1147DC::Layout 1363DC::Layout
1148new (SV *class) 1364new (SV *klass)
1149 CODE: 1365 CODE:
1150 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1151 1367
1152 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1153 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1302 1518
1303void 1519void
1304set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1305 CODE: 1521 CODE:
1306 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1307 { 1523 {
1308 self->base_height = base_height; 1524 self->base_height = base_height;
1309 layout_update_font (self); 1525 layout_update_font (self);
1310 } 1526 }
1311 1527
1312void 1528void
1539 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1540 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1541 } 1757 }
1542} 1758}
1543 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
1544IV 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)
1545 CODE: 1882 CODE:
1546{ 1883{
1547 GLint width; 1884 GLint width;
1548 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);
1555MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1556 1893
1557PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1558 1895
1559DC::Map 1896DC::Map
1560new (SV *class) 1897new (SV *klass)
1561 CODE: 1898 CODE:
1562 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1563 RETVAL->x = 0; 1900 RETVAL->x = 0;
1564 RETVAL->y = 0; 1901 RETVAL->y = 0;
1565 RETVAL->w = 0; 1902 RETVAL->w = 0;
1604 1941
1605void 1942void
1606set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1607 CODE: 1944 CODE:
1608{ 1945{
1609 tileid texid; 1946 tileid texid;
1610 maptex *tex; 1947 maptex *tex;
1611 1948
1612 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1613 return; 1950 return;
1614 1951
1615 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1616 return; 1953 return;
1617 1954
1618 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1619 1956
1620 if (!texid) 1957 if (!texid)
1621 return; 1958 return;
1622 1959
1623 tex = self->tex + texid; 1960 tex = self->tex + texid;
1652 //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);
1653 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1654 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1655 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1656} 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 }
1657 2014
1658int 2015int
1659ox (DC::Map self) 2016ox (DC::Map self)
1660 ALIAS: 2017 ALIAS:
1661 oy = 1 2018 oy = 1
1701 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1702 } 2059 }
1703} 2060}
1704 2061
1705SV * 2062SV *
1706map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1707 CODE: 2064 CODE:
1708{ 2065{
1709 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1710 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1711 mapcell *cell; 2068 mapcell *cell;
1732 2089
1733 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1734 2091
1735 if (flags & 8) 2092 if (flags & 8)
1736 { 2093 {
2094 uint8_t ext, cmd;
2095
1737 if (extmap) 2096 do
1738 { 2097 {
1739 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1740 2100
1741 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
1742 { 2104 {
1743 ext = *data++;
1744 cmd = ext & 0x7f;
1745
1746 if (cmd < 4)
1747 cell->darkness = 255 - ext * 64 + 1;
1748 else if (cmd == 5) // health
1749 {
1750 cell->stat_width = 1; 2105 cell->stat_width = 1;
1751 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1752 }
1753 else if (cmd == 6) // monster width
1754 cell->stat_width = *data++ + 1;
1755 else if (cmd == 0x47)
1756 {
1757 if (*data == 1) cell->player = data [1];
1758 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1759 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1760 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1761
1762 data += *data + 1;
1763 }
1764 else if (cmd == 8) // cell flags
1765 cell->flags = *data++;
1766 else if (ext & 0x40) // unknown, multibyte => skip
1767 data += *data + 1;
1768 else
1769 data++;
1770 } 2107 }
1771 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++;
1772 } 2125 }
1773 else 2126 while (ext & 0x80);
1774 cell->darkness = *data++ + 1;
1775 } 2127 }
1776 2128
1777 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1778 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1779 { 2131 {
1782 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1783 2135
1784 if (cell->tile [z]) 2136 if (cell->tile [z])
1785 { 2137 {
1786 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1787 if (!tex->name) 2140 if (!tex->name)
1788 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1789 2142
1790 if (tex->smoothtile) 2143 if (tex->smoothtile)
1791 { 2144 {
1792 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1793 if (!smooth->name) 2147 if (!smooth->name)
1794 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1795 } 2149 }
1796 } 2150 }
1797 } 2151 }
1825 ? self->row + y 2179 ? self->row + y
1826 : 0; 2180 : 0;
1827 2181
1828 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1829 { 2183 {
1830 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1831 2185
1832 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1833 { 2187 {
1834 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1835 2189
1837 { 2191 {
1838 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1839 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1840 int a1 = tex.a; 2194 int a1 = tex.a;
1841 2195
1842 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1843 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1844 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1845 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1846 } 2200 }
1847 } 2201 }
1848 2202
1849 *map++ = (r ) 2203 *map++ = (r )
1850 | (g << 8) 2204 | (g << 8)
1851 | (b << 16) 2205 | (b << 16)
1852 | (a << 24); 2206 | (a << 24);
1853 } 2207 }
1854 } 2208 }
1855 2209
1856 RETVAL = map_sv; 2210 RETVAL = map_sv;
1857} 2211}
1858 OUTPUT: 2212 OUTPUT:
1859 RETVAL 2213 RETVAL
1860 2214
1861void 2215void
1862draw (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)
1863 CODE: 2217 CODE:
1864{ 2218{
1865 int x, y, z; 2219 int x, y, z;
1866 2220
1867 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1868 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
1869 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)
1870 smooth_key skey; 2223 smooth_key skey;
1871 int pl_x, pl_y; 2224 int pl_x, pl_y;
1872 maptex pl_tex; 2225 maptex pl_tex;
1873 rc_t *rc = rc_alloc (); 2226 rc_t *rc = rc_alloc ();
2227 rc_t *rc_ov = rc_alloc ();
1874 rc_key_t key; 2228 rc_key_t key;
1875 rc_array_t *arr; 2229 rc_array_t *arr;
1876 2230
1877 pl_tex.name = 0; 2231 pl_tex.name = 0;
1878 2232
1879 // thats current max. sorry. 2233 // that's current max. sorry.
1880 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1881 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1882 2236
1883 // clear key, in case of extra padding 2237 // clear key, in case of extra padding
1884 memset (&skey, 0, sizeof (skey)); 2238 memset (&skey, 0, sizeof (skey));
1888 key.g = 255; 2242 key.g = 255;
1889 key.b = 255; 2243 key.b = 255;
1890 key.a = 255; 2244 key.a = 255;
1891 key.mode = GL_QUADS; 2245 key.mode = GL_QUADS;
1892 key.format = GL_T2F_V3F; 2246 key.format = GL_T2F_V3F;
1893 key.texname = -1;
1894 2247
1895 mx += self->x; 2248 mx += self->x;
1896 my += self->y; 2249 my += self->y;
1897 2250
1898 // first pass: determine smooth_max 2251 // first pass: determine smooth_max
1921 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1922 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1923 2276
1924 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
1925 { 2278 {
2279 smooth_hash smooth;
1926 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2281 key.texname = -1;
1927 2282
1928 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
1929 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
1930 { 2285 {
1931 maprow *row = self->row + (y + my); 2286 maprow *row = self->row + (y + my);
1937 tileid tile = cell->tile [z]; 2292 tileid tile = cell->tile [z];
1938 2293
1939 if (tile) 2294 if (tile)
1940 { 2295 {
1941 maptex tex = self->tex [tile]; 2296 maptex tex = self->tex [tile];
1942 int px = (x + 1) * T - tex.w; 2297 int px, py;
1943 int py = (y + 1) * T - tex.h;
1944 2298
1945 if (key.texname != tex.name) 2299 if (key.texname != tex.name)
1946 { 2300 {
2301 self->tex [tile].unused = 0;
2302
1947 if (!tex.name) 2303 if (!tex.name)
1948 tex = self->tex [2]; /* missing, replace by noface */ 2304 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1949 2305
1950 key.texname = tex.name; 2306 key.texname = tex.name;
1951 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
1952 } 2308 }
2309
2310 px = (x + 1) * Th - tex.w;
2311 py = (y + 1) * Tw - tex.h;
1953 2312
1954 if (expect_false (cell->player == player) && expect_false (z == 2)) 2313 if (expect_false (cell->player == player) && expect_false (z == 2))
1955 { 2314 {
1956 pl_x = px; 2315 pl_x = px;
1957 pl_y = py; 2316 pl_y = py;
1962 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2321 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1963 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);
1964 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);
1965 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);
1966 2325
1967 if (expect_false (cell->flags) && expect_false (z == 2))
1968 {
1969 // overlays such as the speech bubble, probably more to come
1970 if (cell->flags & 1)
1971 {
1972 maptex tex = self->tex [1];
1973 int px = x * T + T * 2 / 32;
1974 int py = y * T - T * 6 / 32;
1975
1976 if (tex.name)
1977 {
1978 if (key.texname != tex.name)
1979 {
1980 key.texname = tex.name;
1981 arr = rc_array (rc, &key);
1982 }
1983
1984 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1985 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1986 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1987 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1988 }
1989 }
1990 }
1991
1992 // update smooth hash 2326 // update smooth hash
1993 if (tex.smoothtile) 2327 if (tex.smoothtile)
1994 { 2328 {
1995 skey.tile = tex.smoothtile; 2329 skey.tile = tex.smoothtile;
1996 skey.level = tex.smoothlevel; 2330 skey.level = tex.smoothlevel;
2011 2345
2012 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2013 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
2014 2348
2015 // full tile 2349 // full tile
2016 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);
2017 2351
2018 // borders 2352 // borders
2019 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);
2020 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);
2021 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);
2022 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);
2023 2357
2024 // corners 2358 // corners
2025 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);
2026 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);
2027 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);
2028 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);
2029 } 2384 }
2030 } 2385 }
2031 } 2386 }
2032 } 2387 }
2033 2388
2049 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
2050 { 2405 {
2051 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
2052 HE *he; 2407 HE *he;
2053 2408
2054 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2055 while ((he = hv_iternext (smooth)))
2056 { 2410 {
2057 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
2058 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
2059 2413
2060 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
2061 && skey->level == level 2415 && skey.level == level
2062 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
2063 { 2417 {
2064 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
2065 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
2066 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
2067 int border = bits & 15; 2421 int border = bits & 15;
2068 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2069 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
2070 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
2071 2425
2073 { 2427 {
2074 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
2075 // save gobs of state changes. 2429 // save gobs of state changes.
2076 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
2077 { 2431 {
2432 self->tex [skey.tile].unused = 0;
2433
2078 glEnd (); 2434 glEnd ();
2079 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2080 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
2081 } 2437 }
2082 2438
2083 if (border) 2439 if (border)
2084 { 2440 {
2085 float ox = border * dx; 2441 float ox = border * dx;
2086 2442
2087 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2088 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2089 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2090 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2091 } 2447 }
2092 2448
2093 if (corner) 2449 if (corner)
2094 { 2450 {
2095 float ox = corner * dx; 2451 float ox = corner * dx;
2096 2452
2097 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2098 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2099 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2100 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2101 } 2457 }
2102 } 2458 }
2103 } 2459 }
2104 } 2460 }
2105 } 2461 }
2107 2463
2108 glEnd (); 2464 glEnd ();
2109 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
2110 key.texname = -1; 2466 key.texname = -1;
2111 } 2467 }
2112
2113 hv_clear (smooth);
2114 } 2468 }
2115 2469
2116 if (pl_tex.name) 2470 if (pl_tex.name)
2117 { 2471 {
2118 maptex tex = pl_tex; 2472 maptex tex = pl_tex;
2128 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);
2129 2483
2130 rc_draw (rc); 2484 rc_draw (rc);
2131 } 2485 }
2132 2486
2487 rc_draw (rc_ov);
2488 rc_clear (rc_ov);
2489
2133 glDisable (GL_BLEND); 2490 glDisable (GL_BLEND);
2134 rc_free (rc); 2491 rc_free (rc);
2492 rc_free (rc_ov);
2135 2493
2136 // top layer: overlays such as the health bar 2494 // top layer: overlays such as the health bar
2137 for (y = 0; y < sh; y++) 2495 for (y = 0; y < sh; y++)
2138 if (0 <= y + my && y + my < self->rows) 2496 if (0 <= y + my && y + my < self->rows)
2139 { 2497 {
2142 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2143 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2144 { 2502 {
2145 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2146 2504
2147 int px = x * T; 2505 int px = x * Tw;
2148 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 }
2149 2513
2150 if (cell->stat_hp) 2514 if (cell->stat_hp)
2151 { 2515 {
2152 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2153 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2154 2518
2155 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2156 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2157 px + width - 1, py); 2521 px + width - 1, py);
2158 2522
2164 } 2528 }
2165 } 2529 }
2166} 2530}
2167 2531
2168void 2532void
2169draw_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)
2170 CODE: 2534 CODE:
2171{ 2535{
2172 static float color[16][3] = { 2536 static float color[16][3] = {
2173 { 0.00F, 0.00F, 0.00F }, 2537 { 0.00f, 0.00f, 0.00f },
2174 { 1.00F, 1.00F, 1.00F }, 2538 { 1.00f, 1.00f, 1.00f },
2175 { 0.00F, 0.00F, 0.55F }, 2539 { 0.00f, 0.00f, 0.55f },
2176 { 1.00F, 0.00F, 0.00F }, 2540 { 1.00f, 0.00f, 0.00f },
2177 2541
2178 { 1.00F, 0.54F, 0.00F }, 2542 { 1.00f, 0.54f, 0.00f },
2179 { 0.11F, 0.56F, 1.00F }, 2543 { 0.11f, 0.56f, 1.00f },
2180 { 0.93F, 0.46F, 0.00F }, 2544 { 0.93f, 0.46f, 0.00f },
2181 { 0.18F, 0.54F, 0.34F }, 2545 { 0.18f, 0.54f, 0.34f },
2182 2546
2183 { 0.56F, 0.73F, 0.56F }, 2547 { 0.56f, 0.73f, 0.56f },
2184 { 0.80F, 0.80F, 0.80F }, 2548 { 0.80f, 0.80f, 0.80f },
2185 { 0.55F, 0.41F, 0.13F }, 2549 { 0.55f, 0.41f, 0.13f },
2186 { 0.99F, 0.77F, 0.26F }, 2550 { 0.99f, 0.77f, 0.26f },
2187 2551
2188 { 0.74F, 0.65F, 0.41F }, 2552 { 0.74f, 0.65f, 0.41f },
2189 2553
2190 { 0.00F, 1.00F, 1.00F }, 2554 { 0.00f, 1.00f, 1.00f },
2191 { 1.00F, 0.00F, 1.00F }, 2555 { 1.00f, 0.00f, 1.00f },
2192 { 1.00F, 1.00F, 0.00F }, 2556 { 1.00f, 1.00f, 0.00f },
2193 }; 2557 };
2194 2558
2195 int x, y; 2559 int x, y;
2196 2560
2197 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 */
2198 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2568 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2199 glEnable (GL_BLEND); 2569 glEnable (GL_BLEND);
2200 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2570 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2201 glBegin (GL_QUADS); 2571 glBegin (GL_QUADS);
2202 2572
2203 for (y = 0; y < h; y++) 2573 for (y = 0; y < h; y++)
2207 2577
2208 if (m) 2578 if (m)
2209 { 2579 {
2210 float *c = color [m & 15]; 2580 float *c = color [m & 15];
2211 2581
2212 float tx1 = m & 0x40 ? 0.5 : 0.; 2582 float tx1 = m & 0x40 ? 0.5f : 0.f;
2213 float tx2 = tx1 + 0.5; 2583 float tx2 = tx1 + 0.5f;
2214 2584
2215 glColor4f (c[0], c[1], c[2], 0.75); 2585 glColor4f (c[0], c[1], c[2], 1);
2216 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2586 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2217 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2587 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2218 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2588 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2219 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2589 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2220 } 2590 }
2228void 2598void
2229fow_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)
2230 PPCODE: 2600 PPCODE:
2231{ 2601{
2232 int x, y; 2602 int x, y;
2233 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2234 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2235 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2236 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);
2237 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2238 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2610 memset (darkness1, 0, sw1*sh1);
2239 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2240 2611
2241 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2242 SvCUR_set (darkness3_sv, sw34 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2243 2614
2244 mx += self->x - 1; 2615 mx += self->x - 1;
2245 my += self->y - 1; 2616 my += self->y - 1;
2246
2247 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2248 2617
2249 for (y = 0; y < sh1; y++) 2618 for (y = 0; y < sh1; y++)
2250 if (0 <= y + my && y + my < self->rows) 2619 if (0 <= y + my && y + my < self->rows)
2251 { 2620 {
2252 maprow *row = self->row + (y + my); 2621 maprow *row = self->row + (y + my);
2255 if (row->c0 <= x + mx && x + mx < row->c1) 2624 if (row->c0 <= x + mx && x + mx < row->c1)
2256 { 2625 {
2257 mapcell *cell = row->col + (x + mx - row->c0); 2626 mapcell *cell = row->col + (x + mx - row->c0);
2258 2627
2259 darkness1 [y * sw1 + x] = cell->darkness 2628 darkness1 [y * sw1 + x] = cell->darkness
2260 ? 255 - (cell->darkness - 1) 2629 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2261 : 255 - FOW_DARKNESS; 2630 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2262 } 2631 }
2263 } 2632 }
2264 2633
2265 for (y = 0; y < sh; ++y) 2634 for (y = 0; y < sh; ++y)
2266 for (x = 0; x < sw; ++x) 2635 for (x = 0; x < sw; ++x)
2285 2654
2286 uint8_t r13 = (d13 + d23 + d12) / 3; 2655 uint8_t r13 = (d13 + d23 + d12) / 3;
2287 uint8_t r23 = d23; 2656 uint8_t r23 = d23;
2288 uint8_t r33 = (d23 + d33 + d32) / 3; 2657 uint8_t r33 = (d23 + d33 + d32) / 3;
2289 2658
2290 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2659 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2291 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2660 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2292 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2661 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2293 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2662 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2294 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 */
2295 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2664 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2296 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2665 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2297 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2666 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2298 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2667 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2299 } 2668 }
2300 2669
2301 free (darkness1); 2670 free (darkness1);
2302 2671
2303 EXTEND (SP, 3); 2672 EXTEND (SP, 3);
2304 PUSHs (sv_2mortal (newSViv (sw34))); 2673 PUSHs (sv_2mortal (newSViv (sw3)));
2305 PUSHs (sv_2mortal (newSViv (sh3))); 2674 PUSHs (sv_2mortal (newSViv (sh3)));
2306 PUSHs (darkness3_sv); 2675 PUSHs (darkness3_sv);
2307} 2676}
2308 2677
2309SV * 2678SV *
2372 else 2741 else
2373 *data++ = 0; 2742 *data++ = 0;
2374 } 2743 }
2375 } 2744 }
2376 2745
2377 /* 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 */
2378 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2747 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2379 { 2748 {
2380 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2381 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2382 } 2751 }
2383 2752
2384 RETVAL = data_sv; 2753 RETVAL = data_sv;
2385} 2754}
2386 OUTPUT: 2755 OUTPUT:
2387 RETVAL 2756 RETVAL
2388 2757
2389void 2758void
2396 STRLEN len; 2765 STRLEN len;
2397 uint8_t *data, *end; 2766 uint8_t *data, *end;
2398 2767
2399 len = SvLEN (data_sv); 2768 len = SvLEN (data_sv);
2400 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2769 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2401 data = SvPVbyte_nolen (data_sv); 2770 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2402 end = data + len + 8; 2771 end = data + len + 8;
2403 2772
2404 if (len < 5) 2773 if (len < 5)
2405 XSRETURN_EMPTY; 2774 XSRETURN_EMPTY;
2406 2775
2467} 2836}
2468 2837
2469MODULE = Deliantra::Client PACKAGE = DC::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2470 2839
2471DC::RW 2840DC::RW
2472new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2473 CODE: 2842 CODE:
2474{ 2843{
2475 STRLEN datalen; 2844 STRLEN datalen;
2476 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2477 2846
2479} 2848}
2480 OUTPUT: 2849 OUTPUT:
2481 RETVAL 2850 RETVAL
2482 2851
2483DC::RW 2852DC::RW
2484new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2485 CODE: 2854 CODE:
2486 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2487 OUTPUT: 2856 OUTPUT:
2488 RETVAL 2857 RETVAL
2489 2858
2507 if (RETVAL < 0) 2876 if (RETVAL < 0)
2508 { 2877 {
2509 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2510 2879
2511 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)
2512 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2513 2887 }
2888 else
2514 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2515 } 2890 }
2516 2891
2517 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2518 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2519} 2894}
2566void 2941void
2567set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2942set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2568 CODE: 2943 CODE:
2569{ 2944{
2570 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));
2571 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;
2572 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2947 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2573} 2948}
2574 2949
2575void 2950void
2576set_reverse_stereo (DC::Channel self, int flip) 2951set_reverse_stereo (DC::Channel self, int flip)
2579 2954
2580MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2581 2956
2582PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2583 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
2584DC::MixChunk 2971DC::MixChunk
2585new (SV *class, DC::RW rwops) 2972new (SV *klass, DC::RW rwops)
2586 CODE: 2973 CODE:
2587 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2588 OUTPUT: 2975 OUTPUT:
2589 RETVAL 2976 RETVAL
2590 2977
2620 OUTPUT: 3007 OUTPUT:
2621 RETVAL 3008 RETVAL
2622 3009
2623MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3010MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2624 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
2625int 3024int
2626volume (int volume = -1) 3025volume (int volume = -1)
2627 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2628 CODE: 3027 CODE:
2629 if (items > 0) 3028 if (items > 0)
2640void 3039void
2641halt () 3040halt ()
2642 CODE: 3041 CODE:
2643 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2644 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2645DC::MixMusic 3051DC::MixMusic
2646new (SV *class, DC::RW rwops) 3052new (SV *klass, DC::RW rwops)
2647 CODE: 3053 CODE:
2648 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2649 OUTPUT: 3055 OUTPUT:
2650 RETVAL 3056 RETVAL
2651 3057
2679 } *civ, const_iv[] = { 3085 } *civ, const_iv[] = {
2680# define const_iv(name) { # name, (IV)name } 3086# define const_iv(name) { # name, (IV)name }
2681 const_iv (GL_VENDOR), 3087 const_iv (GL_VENDOR),
2682 const_iv (GL_VERSION), 3088 const_iv (GL_VERSION),
2683 const_iv (GL_EXTENSIONS), 3089 const_iv (GL_EXTENSIONS),
3090 const_iv (GL_MAX_TEXTURE_UNITS),
2684 const_iv (GL_COLOR_MATERIAL), 3091 const_iv (GL_COLOR_MATERIAL),
2685 const_iv (GL_SMOOTH), 3092 const_iv (GL_SMOOTH),
2686 const_iv (GL_FLAT), 3093 const_iv (GL_FLAT),
2687 const_iv (GL_DITHER), 3094 const_iv (GL_DITHER),
2688 const_iv (GL_BLEND), 3095 const_iv (GL_BLEND),
2700 const_iv (GL_ZERO), 3107 const_iv (GL_ZERO),
2701 const_iv (GL_SRC_ALPHA), 3108 const_iv (GL_SRC_ALPHA),
2702 const_iv (GL_DST_ALPHA), 3109 const_iv (GL_DST_ALPHA),
2703 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3110 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2704 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),
2705 const_iv (GL_SRC_ALPHA_SATURATE), 3116 const_iv (GL_SRC_ALPHA_SATURATE),
2706 const_iv (GL_RGB), 3117 const_iv (GL_RGB),
2707 const_iv (GL_RGBA), 3118 const_iv (GL_RGBA),
2708 const_iv (GL_RGBA4), 3119 const_iv (GL_RGBA4),
2709 const_iv (GL_RGBA8), 3120 const_iv (GL_RGBA8),
2777 const_iv (GL_NICEST), 3188 const_iv (GL_NICEST),
2778 const_iv (GL_V2F), 3189 const_iv (GL_V2F),
2779 const_iv (GL_V3F), 3190 const_iv (GL_V3F),
2780 const_iv (GL_T2F_V3F), 3191 const_iv (GL_T2F_V3F),
2781 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),
2782# undef const_iv 3196# undef const_iv
2783 }; 3197 };
2784 3198
2785 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--)
2786 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2787 3201
2788 texture_av = newAV (); 3202 texture_av = newAV ();
2789 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
2790} 3204}
2791 3205
2793disable_GL_EXT_blend_func_separate () 3207disable_GL_EXT_blend_func_separate ()
2794 CODE: 3208 CODE:
2795 gl.BlendFuncSeparate = 0; 3209 gl.BlendFuncSeparate = 0;
2796 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
2797 3211
2798char * 3212void
3213apple_nvidia_bug (int enable)
3214
3215const char *
2799gl_vendor () 3216gl_vendor ()
2800 CODE: 3217 CODE:
2801 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
2802 OUTPUT: 3219 OUTPUT:
2803 RETVAL 3220 RETVAL
2804 3221
2805char * 3222const char *
2806gl_version () 3223gl_version ()
2807 CODE: 3224 CODE:
2808 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
2809 OUTPUT: 3226 OUTPUT:
2810 RETVAL 3227 RETVAL
2811 3228
2812char * 3229const char *
2813gl_extensions () 3230gl_extensions ()
2814 CODE: 3231 CODE:
2815 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2816 OUTPUT: 3233 OUTPUT:
2817 RETVAL 3234 RETVAL
2818 3235
2819const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
2820 3241
2821GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
2822 CODE: 3243 CODE:
2823 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
2824 OUTPUT: 3245 OUTPUT:
2832 3253
2833int glGetError () 3254int glGetError ()
2834 3255
2835void glFinish () 3256void glFinish ()
2836 3257
3258void glFlush ()
3259
2837void glClear (int mask) 3260void glClear (int mask)
2838 3261
2839void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
2840 PROTOTYPE: @ 3263 PROTOTYPE: @
2841 3264
2850void glBlendFunc (int sfactor, int dfactor) 3273void glBlendFunc (int sfactor, int dfactor)
2851 3274
2852void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3275void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2853 CODE: 3276 CODE:
2854 gl_BlendFuncSeparate (sa, da, saa, daa); 3277 gl_BlendFuncSeparate (sa, da, saa, daa);
3278
3279# void glBlendEquation (int se)
2855 3280
2856void glDepthMask (int flag) 3281void glDepthMask (int flag)
2857 3282
2858void glLogicOp (int opcode) 3283void glLogicOp (int opcode)
2859 3284
2894void glRotate (float angle, float x, float y, float z) 3319void glRotate (float angle, float x, float y, float z)
2895 CODE: 3320 CODE:
2896 glRotatef (angle, x, y, z); 3321 glRotatef (angle, x, y, z);
2897 3322
2898void 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: @
2899 ALIAS: 3325 ALIAS:
2900 glColor_premultiply = 1 3326 glColor_premultiply = 1
2901 CODE: 3327 CODE:
2902 if (ix) 3328 if (ix)
2903 { 3329 {
3009 3435
3010void glEndList () 3436void glEndList ()
3011 3437
3012void glCallList (int list) 3438void glCallList (int list)
3013 3439
3440void c_init ()
3441 CODE:
3442 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3443 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3444
3014MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3445MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3015 3446
3016PROTOTYPES: DISABLE 3447PROTOTYPES: DISABLE
3017 3448
3018void 3449void
3019find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
3020 PPCODE: 3451 PPCODE:
3021{ 3452{
3022 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
3023 XPUSHs (self); 3454 XPUSHs (self);
3024} 3455}
3025 3456
3026BOOT: 3457BOOT:
3027{ 3458{
3035 3466
3036void 3467void
3037draw (SV *self) 3468draw (SV *self)
3038 CODE: 3469 CODE:
3039{ 3470{
3040 HV *hv; 3471 HV *hv;
3041 SV **svp; 3472 SV **svp;
3042 NV x, y, w, h; 3473 NV x, y, w, h;
3043 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
3044 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
3045 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
3046 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