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.273 by root, Wed Aug 20 13:30:02 2008 UTC vs.
Revision 1.322 by root, Sun Nov 18 01:43:12 2018 UTC

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