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.266 by root, Sun Jul 20 02:51:40 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];
367 self->oy = 0; 405 self->oy = 0;
368 self->row = 0; 406 self->row = 0;
369 self->rows = 0; 407 self->rows = 0;
370} 408}
371 409
410#define CELL_CLEAR(cell) \
411 do { \
412 if ((cell)->player) \
413 (cell)->tile [2] = 0; \
414 (cell)->darkness = 0; \
415 (cell)->stat_hp = 0; \
416 (cell)->flags = 0; \
417 (cell)->player = 0; \
418 } while (0)
419
372static void 420static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (DC__Map self, int x0, int y0, int w, int h)
374{ 422{
375 int x, y; 423 int x, y;
376 maprow *row; 424 maprow *row;
390 if (x >= row->c1) 438 if (x >= row->c1)
391 break; 439 break;
392 440
393 cell = row->col + x - row->c0; 441 cell = row->col + x - row->c0;
394 442
395 cell->darkness = 0; 443 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 444 }
400 } 445 }
401} 446}
402 447
403typedef struct { 448struct smooth_key
449{
404 tileid tile; 450 tileid tile;
405 uint8_t x, y, level; 451 uint8_t x, y, level;
406} 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}
407 471
408static void 472static void
409smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
410{ 474{
411 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
412 476
413 if (SvIOK (*sv)) 477 if (it == h.end ())
414 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
415 else 479 else
416 sv_setiv (*sv, bits); 480 it->second |= bits;
417} 481}
418 482
419static void 483static void
420music_finished (void) 484music_finished (void)
421{ 485{
438 ev.code = 1; 502 ev.code = 1;
439 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
440 ev.data2 = 0; 504 ev.data2 = 0;
441 505
442 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;
443} 514}
444 515
445static unsigned int 516static unsigned int
446minpot (unsigned int n) 517minpot (unsigned int n)
447{ 518{
514 if (!svp || !SvTRUE (*svp)) 585 if (!svp || !SvTRUE (*svp))
515 return 0; 586 return 0;
516 587
517 return 1; 588 return 1;
518} 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
519 648
520MODULE = Deliantra::Client PACKAGE = DC 649MODULE = Deliantra::Client PACKAGE = DC
521 650
522PROTOTYPES: ENABLE 651PROTOTYPES: ENABLE
523 652
552 const_iv (SDL_USEREVENT), 681 const_iv (SDL_USEREVENT),
553 682
554 const_iv (SDL_APPINPUTFOCUS), 683 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 684 const_iv (SDL_APPMOUSEFOCUS),
556 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),
557 736
558 const_iv (SDLK_FIRST), 737 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 738 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 739 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 740 const_iv (SDLK_KP1),
637 const_iv (KMOD_RMETA), 816 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 817 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 818 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 819 const_iv (KMOD_MODE),
641 820
821 const_iv (KMOD_LRAM),
822
642 const_iv (MIX_DEFAULT_FORMAT), 823 const_iv (MIX_DEFAULT_FORMAT),
643 824
644 const_iv (SDL_INIT_TIMER), 825 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 826 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 827 const_iv (SDL_INIT_VIDEO),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 845 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO), 846 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 847 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES), 848 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL), 849 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL) 850 const_iv (SDL_GL_SWAP_CONTROL),
851
852 const_iv (FOW_DARKNESS)
670# undef const_iv 853# undef const_iv
671 }; 854 };
672 855
673 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--)
674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
675 858
676 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
677 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
678} 861}
679 862
695NV ceil (NV x) 878NV ceil (NV x)
696 879
697IV minpot (UV n) 880IV minpot (UV n)
698 881
699IV 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
700 889
701void 890void
702pango_init () 891pango_init ()
703 CODE: 892 CODE:
704{ 893{
712#endif 901#endif
713} 902}
714 903
715char *SDL_GetError () 904char *SDL_GetError ()
716 905
906void SDL_main_hack (SV *real_main)
907 PROTOTYPE: &
908
717int SDL_Init (U32 flags) 909int SDL_Init (U32 flags)
718 910
719int SDL_InitSubSystem (U32 flags) 911int SDL_InitSubSystem (U32 flags)
720 912
721void SDL_QuitSubSystem (U32 flags) 913void SDL_QuitSubSystem (U32 flags)
722 914
723void SDL_Quit () 915void SDL_Quit ()
724 916
725int SDL_GL_SetAttribute (int attr, int value) 917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
726 919
727int SDL_GL_GetAttribute (int attr) 920int SDL_GL_GetAttribute (int attr)
728 CODE: 921 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL)) 922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
730 XSRETURN_UNDEF; 923 XSRETURN_UNDEF;
731 OUTPUT: 924 OUTPUT:
732 RETVAL 925 RETVAL
733 926
734void 927void
789 ); 982 );
790 983
791 if (RETVAL) 984 if (RETVAL)
792 { 985 {
793 av_clear (texture_av); 986 av_clear (texture_av);
794
795 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
796#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);
797#include "glfunc.h" 988#include "glfunc.h"
798#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
799 } 992 }
800} 993}
801 OUTPUT: 994 OUTPUT:
802 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
803 999
804void 1000void
805SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
806 1002
807char * 1003char *
808SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
809 1006
810int 1007int
811SDL_GetAppState () 1008SDL_GetAppState ()
812 1009
813int 1010int
814SDL_GetModState () 1011SDL_GetModState ()
815 1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
816void 1017void
1018SDL_PumpEvents ()
1019
1020void
817poll_events () 1021peep_events ()
818 PPCODE: 1022 PPCODE:
819{ 1023{
820 SDL_Event ev; 1024 SDL_Event ev;
821 1025
822 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
829 { 1033 {
830 case SDL_KEYDOWN: 1034 case SDL_KEYDOWN:
831 case SDL_KEYUP: 1035 case SDL_KEYUP:
832 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1036 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
833 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1037 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
834 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);
835 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 */
836 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1040 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
837 break; 1041 break;
838 1042
839 case SDL_ACTIVEEVENT: 1043 case SDL_ACTIVEEVENT:
840 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1044 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
858 x = ev.motion.x; 1062 x = ev.motion.x;
859 y = ev.motion.y; 1063 y = ev.motion.y;
860 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1064 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
861 } 1065 }
862 1066
863 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1067 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
864 hv_store (hv, "state", 5, newSViv (state), 0); 1068 hv_store (hv, "state", 5, newSViv (state), 0);
865 hv_store (hv, "x", 1, newSViv (x), 0); 1069 hv_store (hv, "x", 1, newSViv (x), 0);
866 hv_store (hv, "y", 1, newSViv (y), 0); 1070 hv_store (hv, "y", 1, newSViv (y), 0);
867 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1071 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
868 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1072 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
888 1092
889 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))));
890 } 1094 }
891} 1095}
892 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
893int 1110int
894Mix_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)
895 POSTCALL: 1112 POSTCALL:
896 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
897 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
898 1115
899void 1116void
900Mix_QuerySpec () 1117Mix_QuerySpec ()
959add_font (char *file) 1176add_font (char *file)
960 CODE: 1177 CODE:
961 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
962 OUTPUT: 1179 OUTPUT:
963 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)
964 1188
965void 1189void
966load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
967 ALIAS: 1191 ALIAS:
968 load_image_file = 1 1192 load_image_file = 1
1014 1238
1015 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
1016 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
1017 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
1018 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
1019 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1020 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)));
1021 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1022 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1023 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
1024 1248
1084#if DEBUG 1308#if DEBUG
1085 VALGRIND_DO_LEAK_CHECK; 1309 VALGRIND_DO_LEAK_CHECK;
1086#endif 1310#endif
1087} 1311}
1088 1312
1313int
1314SvREFCNT (SV *sv)
1315 CODE:
1316 RETVAL = SvREFCNT (sv);
1317 OUTPUT:
1318 RETVAL
1319
1089MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1090 1321
1091PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1092 1323
1093DC::Font 1324DC::Font
1094new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1095 CODE: 1326 CODE:
1096{ 1327{
1097 int count; 1328 int count;
1098 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1099 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1128 PROTOTYPE: 1359 PROTOTYPE:
1129 CODE: 1360 CODE:
1130 tc_restore (); 1361 tc_restore ();
1131 1362
1132DC::Layout 1363DC::Layout
1133new (SV *class) 1364new (SV *klass)
1134 CODE: 1365 CODE:
1135 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1136 1367
1137 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1138 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1287 1518
1288void 1519void
1289set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1290 CODE: 1521 CODE:
1291 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1292 { 1523 {
1293 self->base_height = base_height; 1524 self->base_height = base_height;
1294 layout_update_font (self); 1525 layout_update_font (self);
1295 } 1526 }
1296 1527
1297void 1528void
1524 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1525 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1526 } 1757 }
1527} 1758}
1528 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
1529IV 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)
1530 CODE: 1882 CODE:
1531{ 1883{
1532 GLint width; 1884 GLint width;
1533 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);
1540MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1541 1893
1542PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1543 1895
1544DC::Map 1896DC::Map
1545new (SV *class) 1897new (SV *klass)
1546 CODE: 1898 CODE:
1547 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1548 RETVAL->x = 0; 1900 RETVAL->x = 0;
1549 RETVAL->y = 0; 1901 RETVAL->y = 0;
1550 RETVAL->w = 0; 1902 RETVAL->w = 0;
1589 1941
1590void 1942void
1591set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1592 CODE: 1944 CODE:
1593{ 1945{
1594 tileid texid; 1946 tileid texid;
1595 maptex *tex; 1947 maptex *tex;
1596 1948
1597 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1598 return; 1950 return;
1599 1951
1600 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1601 return; 1953 return;
1602 1954
1603 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1604 1956
1605 if (!texid) 1957 if (!texid)
1606 return; 1958 return;
1607 1959
1608 tex = self->tex + texid; 1960 tex = self->tex + texid;
1637 //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);
1638 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1639 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1640 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1641} 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 }
1642 2014
1643int 2015int
1644ox (DC::Map self) 2016ox (DC::Map self)
1645 ALIAS: 2017 ALIAS:
1646 oy = 1 2018 oy = 1
1686 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1687 } 2059 }
1688} 2060}
1689 2061
1690SV * 2062SV *
1691map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1692 CODE: 2064 CODE:
1693{ 2065{
1694 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1695 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1696 mapcell *cell; 2068 mapcell *cell;
1717 2089
1718 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1719 2091
1720 if (flags & 8) 2092 if (flags & 8)
1721 { 2093 {
2094 uint8_t ext, cmd;
2095
1722 if (extmap) 2096 do
1723 { 2097 {
1724 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1725 2100
1726 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
1727 { 2104 {
1728 ext = *data++;
1729 cmd = ext & 0x7f;
1730
1731 if (cmd < 4)
1732 cell->darkness = 255 - ext * 64 + 1;
1733 else if (cmd == 5) // health
1734 {
1735 cell->stat_width = 1; 2105 cell->stat_width = 1;
1736 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1737 }
1738 else if (cmd == 6) // monster width
1739 cell->stat_width = *data++ + 1;
1740 else if (cmd == 0x47)
1741 {
1742 if (*data == 1) cell->player = data [1];
1743 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1744 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1745 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1746
1747 data += *data + 1;
1748 }
1749 else if (cmd == 8) // cell flags
1750 cell->flags = *data++;
1751 else if (ext & 0x40) // unknown, multibyte => skip
1752 data += *data + 1;
1753 else
1754 data++;
1755 } 2107 }
1756 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++;
1757 } 2125 }
1758 else 2126 while (ext & 0x80);
1759 cell->darkness = *data++ + 1;
1760 } 2127 }
1761 2128
1762 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1763 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1764 { 2131 {
1767 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1768 2135
1769 if (cell->tile [z]) 2136 if (cell->tile [z])
1770 { 2137 {
1771 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1772 if (!tex->name) 2140 if (!tex->name)
1773 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1774 2142
1775 if (tex->smoothtile) 2143 if (tex->smoothtile)
1776 { 2144 {
1777 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1778 if (!smooth->name) 2147 if (!smooth->name)
1779 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1780 } 2149 }
1781 } 2150 }
1782 } 2151 }
1783 } 2152 }
1784 else 2153 else
1785 { 2154 CELL_CLEAR (cell);
1786 cell->darkness = 0;
1787 cell->stat_hp = 0;
1788 cell->flags = 0;
1789 cell->player = 0;
1790 }
1791 } 2155 }
1792} 2156}
1793 OUTPUT: 2157 OUTPUT:
1794 RETVAL 2158 RETVAL
1795 2159
1815 ? self->row + y 2179 ? self->row + y
1816 : 0; 2180 : 0;
1817 2181
1818 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1819 { 2183 {
1820 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1821 2185
1822 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1823 { 2187 {
1824 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1825 2189
1827 { 2191 {
1828 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1829 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1830 int a1 = tex.a; 2194 int a1 = tex.a;
1831 2195
1832 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1833 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1834 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1835 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1836 } 2200 }
1837 } 2201 }
1838 2202
1839 *map++ = (r ) 2203 *map++ = (r )
1840 | (g << 8) 2204 | (g << 8)
1841 | (b << 16) 2205 | (b << 16)
1842 | (a << 24); 2206 | (a << 24);
1843 } 2207 }
1844 } 2208 }
1845 2209
1846 RETVAL = map_sv; 2210 RETVAL = map_sv;
1847} 2211}
1848 OUTPUT: 2212 OUTPUT:
1849 RETVAL 2213 RETVAL
1850 2214
1851void 2215void
1852draw (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)
1853 CODE: 2217 CODE:
1854{ 2218{
1855 int x, y, z; 2219 int x, y, z;
1856 2220
1857 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1858 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
1859 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)
1860 smooth_key skey; 2223 smooth_key skey;
1861 int pl_x, pl_y; 2224 int pl_x, pl_y;
1862 maptex pl_tex; 2225 maptex pl_tex;
1863 rc_t *rc = rc_alloc (); 2226 rc_t *rc = rc_alloc ();
2227 rc_t *rc_ov = rc_alloc ();
1864 rc_key_t key; 2228 rc_key_t key;
1865 rc_array_t *arr; 2229 rc_array_t *arr;
1866 2230
1867 pl_tex.name = 0; 2231 pl_tex.name = 0;
1868 2232
1869 // thats current max. sorry. 2233 // that's current max. sorry.
1870 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1871 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1872 2236
1873 // clear key, in case of extra padding 2237 // clear key, in case of extra padding
1874 memset (&skey, 0, sizeof (skey)); 2238 memset (&skey, 0, sizeof (skey));
1878 key.g = 255; 2242 key.g = 255;
1879 key.b = 255; 2243 key.b = 255;
1880 key.a = 255; 2244 key.a = 255;
1881 key.mode = GL_QUADS; 2245 key.mode = GL_QUADS;
1882 key.format = GL_T2F_V3F; 2246 key.format = GL_T2F_V3F;
1883 key.texname = -1;
1884 2247
1885 mx += self->x; 2248 mx += self->x;
1886 my += self->y; 2249 my += self->y;
1887 2250
1888 // first pass: determine smooth_max 2251 // first pass: determine smooth_max
1911 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1912 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1913 2276
1914 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
1915 { 2278 {
2279 smooth_hash smooth;
1916 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2281 key.texname = -1;
1917 2282
1918 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
1919 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
1920 { 2285 {
1921 maprow *row = self->row + (y + my); 2286 maprow *row = self->row + (y + my);
1927 tileid tile = cell->tile [z]; 2292 tileid tile = cell->tile [z];
1928 2293
1929 if (tile) 2294 if (tile)
1930 { 2295 {
1931 maptex tex = self->tex [tile]; 2296 maptex tex = self->tex [tile];
1932 int px = (x + 1) * T - tex.w; 2297 int px, py;
1933 int py = (y + 1) * T - tex.h;
1934 2298
1935 if (key.texname != tex.name) 2299 if (key.texname != tex.name)
1936 { 2300 {
2301 self->tex [tile].unused = 0;
2302
1937 if (!tex.name) 2303 if (!tex.name)
1938 tex = self->tex [2]; /* missing, replace by noface */ 2304 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1939 2305
1940 key.texname = tex.name; 2306 key.texname = tex.name;
1941 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
1942 } 2308 }
2309
2310 px = (x + 1) * Th - tex.w;
2311 py = (y + 1) * Tw - tex.h;
1943 2312
1944 if (expect_false (cell->player == player) && expect_false (z == 2)) 2313 if (expect_false (cell->player == player) && expect_false (z == 2))
1945 { 2314 {
1946 pl_x = px; 2315 pl_x = px;
1947 pl_y = py; 2316 pl_y = py;
1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2321 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1953 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);
1954 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);
1955 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);
1956 2325
1957 if (expect_false (cell->flags) && expect_false (z == 2))
1958 {
1959 // overlays such as the speech bubble, probably more to come
1960 if (cell->flags & 1)
1961 {
1962 maptex tex = self->tex [1];
1963 int px = x * T + T * 2 / 32;
1964 int py = y * T - T * 6 / 32;
1965
1966 if (tex.name)
1967 {
1968 if (key.texname != tex.name)
1969 {
1970 key.texname = tex.name;
1971 arr = rc_array (rc, &key);
1972 }
1973
1974 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1975 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1976 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1977 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1978 }
1979 }
1980 }
1981
1982 // update smooth hash 2326 // update smooth hash
1983 if (tex.smoothtile) 2327 if (tex.smoothtile)
1984 { 2328 {
1985 skey.tile = tex.smoothtile; 2329 skey.tile = tex.smoothtile;
1986 skey.level = tex.smoothlevel; 2330 skey.level = tex.smoothlevel;
2001 2345
2002 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2003 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
2004 2348
2005 // full tile 2349 // full tile
2006 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);
2007 2351
2008 // borders 2352 // borders
2009 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);
2010 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);
2011 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);
2012 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);
2013 2357
2014 // corners 2358 // corners
2015 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);
2016 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);
2017 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);
2018 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);
2019 } 2384 }
2020 } 2385 }
2021 } 2386 }
2022 } 2387 }
2023 2388
2039 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
2040 { 2405 {
2041 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
2042 HE *he; 2407 HE *he;
2043 2408
2044 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2045 while ((he = hv_iternext (smooth)))
2046 { 2410 {
2047 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
2048 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
2049 2413
2050 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
2051 && skey->level == level 2415 && skey.level == level
2052 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
2053 { 2417 {
2054 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
2055 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
2056 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
2057 int border = bits & 15; 2421 int border = bits & 15;
2058 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2059 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
2060 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
2061 2425
2063 { 2427 {
2064 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
2065 // save gobs of state changes. 2429 // save gobs of state changes.
2066 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
2067 { 2431 {
2432 self->tex [skey.tile].unused = 0;
2433
2068 glEnd (); 2434 glEnd ();
2069 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2070 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
2071 } 2437 }
2072 2438
2073 if (border) 2439 if (border)
2074 { 2440 {
2075 float ox = border * dx; 2441 float ox = border * dx;
2076 2442
2077 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2078 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2079 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2080 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2081 } 2447 }
2082 2448
2083 if (corner) 2449 if (corner)
2084 { 2450 {
2085 float ox = corner * dx; 2451 float ox = corner * dx;
2086 2452
2087 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2088 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2089 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2090 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2091 } 2457 }
2092 } 2458 }
2093 } 2459 }
2094 } 2460 }
2095 } 2461 }
2097 2463
2098 glEnd (); 2464 glEnd ();
2099 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
2100 key.texname = -1; 2466 key.texname = -1;
2101 } 2467 }
2102
2103 hv_clear (smooth);
2104 } 2468 }
2105 2469
2106 if (pl_tex.name) 2470 if (pl_tex.name)
2107 { 2471 {
2108 maptex tex = pl_tex; 2472 maptex tex = pl_tex;
2118 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);
2119 2483
2120 rc_draw (rc); 2484 rc_draw (rc);
2121 } 2485 }
2122 2486
2487 rc_draw (rc_ov);
2488 rc_clear (rc_ov);
2489
2123 glDisable (GL_BLEND); 2490 glDisable (GL_BLEND);
2124 rc_free (rc); 2491 rc_free (rc);
2492 rc_free (rc_ov);
2125 2493
2126 // top layer: overlays such as the health bar 2494 // top layer: overlays such as the health bar
2127 for (y = 0; y < sh; y++) 2495 for (y = 0; y < sh; y++)
2128 if (0 <= y + my && y + my < self->rows) 2496 if (0 <= y + my && y + my < self->rows)
2129 { 2497 {
2132 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2133 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2134 { 2502 {
2135 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2136 2504
2137 int px = x * T; 2505 int px = x * Tw;
2138 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 }
2139 2513
2140 if (cell->stat_hp) 2514 if (cell->stat_hp)
2141 { 2515 {
2142 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2143 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2144 2518
2145 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2146 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2147 px + width - 1, py); 2521 px + width - 1, py);
2148 2522
2154 } 2528 }
2155 } 2529 }
2156} 2530}
2157 2531
2158void 2532void
2159draw_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)
2160 CODE: 2534 CODE:
2161{ 2535{
2162 static float color[16][3] = { 2536 static float color[16][3] = {
2163 { 0.00F, 0.00F, 0.00F }, 2537 { 0.00f, 0.00f, 0.00f },
2164 { 1.00F, 1.00F, 1.00F }, 2538 { 1.00f, 1.00f, 1.00f },
2165 { 0.00F, 0.00F, 0.55F }, 2539 { 0.00f, 0.00f, 0.55f },
2166 { 1.00F, 0.00F, 0.00F }, 2540 { 1.00f, 0.00f, 0.00f },
2167 2541
2168 { 1.00F, 0.54F, 0.00F }, 2542 { 1.00f, 0.54f, 0.00f },
2169 { 0.11F, 0.56F, 1.00F }, 2543 { 0.11f, 0.56f, 1.00f },
2170 { 0.93F, 0.46F, 0.00F }, 2544 { 0.93f, 0.46f, 0.00f },
2171 { 0.18F, 0.54F, 0.34F }, 2545 { 0.18f, 0.54f, 0.34f },
2172 2546
2173 { 0.56F, 0.73F, 0.56F }, 2547 { 0.56f, 0.73f, 0.56f },
2174 { 0.80F, 0.80F, 0.80F }, 2548 { 0.80f, 0.80f, 0.80f },
2175 { 0.55F, 0.41F, 0.13F }, 2549 { 0.55f, 0.41f, 0.13f },
2176 { 0.99F, 0.77F, 0.26F }, 2550 { 0.99f, 0.77f, 0.26f },
2177 2551
2178 { 0.74F, 0.65F, 0.41F }, 2552 { 0.74f, 0.65f, 0.41f },
2179 2553
2180 { 0.00F, 1.00F, 1.00F }, 2554 { 0.00f, 1.00f, 1.00f },
2181 { 1.00F, 0.00F, 1.00F }, 2555 { 1.00f, 0.00f, 1.00f },
2182 { 1.00F, 1.00F, 0.00F }, 2556 { 1.00f, 1.00f, 0.00f },
2183 }; 2557 };
2184 2558
2185 int x, y; 2559 int x, y;
2186 2560
2187 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 */
2188 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2568 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2189 glEnable (GL_BLEND); 2569 glEnable (GL_BLEND);
2190 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2570 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2191 glBegin (GL_QUADS); 2571 glBegin (GL_QUADS);
2192 2572
2193 for (y = 0; y < h; y++) 2573 for (y = 0; y < h; y++)
2197 2577
2198 if (m) 2578 if (m)
2199 { 2579 {
2200 float *c = color [m & 15]; 2580 float *c = color [m & 15];
2201 2581
2202 float tx1 = m & 0x40 ? 0.5 : 0.; 2582 float tx1 = m & 0x40 ? 0.5f : 0.f;
2203 float tx2 = tx1 + 0.5; 2583 float tx2 = tx1 + 0.5f;
2204 2584
2205 glColor4f (c[0], c[1], c[2], 0.75); 2585 glColor4f (c[0], c[1], c[2], 1);
2206 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2586 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2207 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2587 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2208 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2588 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2209 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2589 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2210 } 2590 }
2218void 2598void
2219fow_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)
2220 PPCODE: 2600 PPCODE:
2221{ 2601{
2222 int x, y; 2602 int x, y;
2223 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2224 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2225 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2226 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);
2227 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2228 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2610 memset (darkness1, 0, sw1*sh1);
2229 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2230 2611
2231 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2232 SvCUR_set (darkness3_sv, sw34 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2233 2614
2234 mx += self->x - 1; 2615 mx += self->x - 1;
2235 my += self->y - 1; 2616 my += self->y - 1;
2236
2237 memset (darkness1, 255, sw1 * sh1);
2238 2617
2239 for (y = 0; y < sh1; y++) 2618 for (y = 0; y < sh1; y++)
2240 if (0 <= y + my && y + my < self->rows) 2619 if (0 <= y + my && y + my < self->rows)
2241 { 2620 {
2242 maprow *row = self->row + (y + my); 2621 maprow *row = self->row + (y + my);
2245 if (row->c0 <= x + mx && x + mx < row->c1) 2624 if (row->c0 <= x + mx && x + mx < row->c1)
2246 { 2625 {
2247 mapcell *cell = row->col + (x + mx - row->c0); 2626 mapcell *cell = row->col + (x + mx - row->c0);
2248 2627
2249 darkness1 [y * sw1 + x] = cell->darkness 2628 darkness1 [y * sw1 + x] = cell->darkness
2250 ? 255 - (cell->darkness - 1) 2629 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2251 : 255 - FOW_DARKNESS; 2630 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2252 } 2631 }
2253 } 2632 }
2254 2633
2255 for (y = 0; y < sh; ++y) 2634 for (y = 0; y < sh; ++y)
2256 for (x = 0; x < sw; ++x) 2635 for (x = 0; x < sw; ++x)
2275 2654
2276 uint8_t r13 = (d13 + d23 + d12) / 3; 2655 uint8_t r13 = (d13 + d23 + d12) / 3;
2277 uint8_t r23 = d23; 2656 uint8_t r23 = d23;
2278 uint8_t r33 = (d23 + d33 + d32) / 3; 2657 uint8_t r33 = (d23 + d33 + d32) / 3;
2279 2658
2280 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2659 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2281 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2660 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2282 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2661 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2283 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2662 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2284 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 */
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2664 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2286 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2665 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2287 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2666 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2667 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2289 } 2668 }
2290 2669
2291 free (darkness1); 2670 free (darkness1);
2292 2671
2293 EXTEND (SP, 3); 2672 EXTEND (SP, 3);
2294 PUSHs (sv_2mortal (newSViv (sw34))); 2673 PUSHs (sv_2mortal (newSViv (sw3)));
2295 PUSHs (sv_2mortal (newSViv (sh3))); 2674 PUSHs (sv_2mortal (newSViv (sh3)));
2296 PUSHs (darkness3_sv); 2675 PUSHs (darkness3_sv);
2297} 2676}
2298 2677
2299SV * 2678SV *
2362 else 2741 else
2363 *data++ = 0; 2742 *data++ = 0;
2364 } 2743 }
2365 } 2744 }
2366 2745
2367 /* 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 */
2368 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2747 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2369 { 2748 {
2370 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2371 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2372 } 2751 }
2373 2752
2374 RETVAL = data_sv; 2753 RETVAL = data_sv;
2375} 2754}
2376 OUTPUT: 2755 OUTPUT:
2377 RETVAL 2756 RETVAL
2378 2757
2379void 2758void
2386 STRLEN len; 2765 STRLEN len;
2387 uint8_t *data, *end; 2766 uint8_t *data, *end;
2388 2767
2389 len = SvLEN (data_sv); 2768 len = SvLEN (data_sv);
2390 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2769 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2391 data = SvPVbyte_nolen (data_sv); 2770 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2392 end = data + len + 8; 2771 end = data + len + 8;
2393 2772
2394 if (len < 5) 2773 if (len < 5)
2395 XSRETURN_EMPTY; 2774 XSRETURN_EMPTY;
2396 2775
2457} 2836}
2458 2837
2459MODULE = Deliantra::Client PACKAGE = DC::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2460 2839
2461DC::RW 2840DC::RW
2462new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2463 CODE: 2842 CODE:
2464{ 2843{
2465 STRLEN datalen; 2844 STRLEN datalen;
2466 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2467 2846
2469} 2848}
2470 OUTPUT: 2849 OUTPUT:
2471 RETVAL 2850 RETVAL
2472 2851
2473DC::RW 2852DC::RW
2474new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2475 CODE: 2854 CODE:
2476 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2477 OUTPUT: 2856 OUTPUT:
2478 RETVAL 2857 RETVAL
2479 2858
2497 if (RETVAL < 0) 2876 if (RETVAL < 0)
2498 { 2877 {
2499 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2500 2879
2501 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)
2502 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2503 2887 }
2888 else
2504 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2505 } 2890 }
2506 2891
2507 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2508 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2509} 2894}
2556void 2941void
2557set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2942set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2558 CODE: 2943 CODE:
2559{ 2944{
2560 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));
2561 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;
2562 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2947 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2563} 2948}
2564 2949
2565void 2950void
2566set_reverse_stereo (DC::Channel self, int flip) 2951set_reverse_stereo (DC::Channel self, int flip)
2569 2954
2570MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2571 2956
2572PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2573 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
2574DC::MixChunk 2971DC::MixChunk
2575new (SV *class, DC::RW rwops) 2972new (SV *klass, DC::RW rwops)
2576 CODE: 2973 CODE:
2577 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2578 OUTPUT: 2975 OUTPUT:
2579 RETVAL 2976 RETVAL
2580 2977
2610 OUTPUT: 3007 OUTPUT:
2611 RETVAL 3008 RETVAL
2612 3009
2613MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3010MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2614 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
2615int 3024int
2616volume (int volume = -1) 3025volume (int volume = -1)
2617 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2618 CODE: 3027 CODE:
2619 if (items > 0) 3028 if (items > 0)
2630void 3039void
2631halt () 3040halt ()
2632 CODE: 3041 CODE:
2633 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2634 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2635DC::MixMusic 3051DC::MixMusic
2636new (SV *class, DC::RW rwops) 3052new (SV *klass, DC::RW rwops)
2637 CODE: 3053 CODE:
2638 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2639 OUTPUT: 3055 OUTPUT:
2640 RETVAL 3056 RETVAL
2641 3057
2669 } *civ, const_iv[] = { 3085 } *civ, const_iv[] = {
2670# define const_iv(name) { # name, (IV)name } 3086# define const_iv(name) { # name, (IV)name }
2671 const_iv (GL_VENDOR), 3087 const_iv (GL_VENDOR),
2672 const_iv (GL_VERSION), 3088 const_iv (GL_VERSION),
2673 const_iv (GL_EXTENSIONS), 3089 const_iv (GL_EXTENSIONS),
3090 const_iv (GL_MAX_TEXTURE_UNITS),
2674 const_iv (GL_COLOR_MATERIAL), 3091 const_iv (GL_COLOR_MATERIAL),
2675 const_iv (GL_SMOOTH), 3092 const_iv (GL_SMOOTH),
2676 const_iv (GL_FLAT), 3093 const_iv (GL_FLAT),
2677 const_iv (GL_DITHER), 3094 const_iv (GL_DITHER),
2678 const_iv (GL_BLEND), 3095 const_iv (GL_BLEND),
2690 const_iv (GL_ZERO), 3107 const_iv (GL_ZERO),
2691 const_iv (GL_SRC_ALPHA), 3108 const_iv (GL_SRC_ALPHA),
2692 const_iv (GL_DST_ALPHA), 3109 const_iv (GL_DST_ALPHA),
2693 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3110 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2694 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),
2695 const_iv (GL_SRC_ALPHA_SATURATE), 3116 const_iv (GL_SRC_ALPHA_SATURATE),
2696 const_iv (GL_RGB), 3117 const_iv (GL_RGB),
2697 const_iv (GL_RGBA), 3118 const_iv (GL_RGBA),
2698 const_iv (GL_RGBA4), 3119 const_iv (GL_RGBA4),
2699 const_iv (GL_RGBA8), 3120 const_iv (GL_RGBA8),
2767 const_iv (GL_NICEST), 3188 const_iv (GL_NICEST),
2768 const_iv (GL_V2F), 3189 const_iv (GL_V2F),
2769 const_iv (GL_V3F), 3190 const_iv (GL_V3F),
2770 const_iv (GL_T2F_V3F), 3191 const_iv (GL_T2F_V3F),
2771 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),
2772# undef const_iv 3196# undef const_iv
2773 }; 3197 };
2774 3198
2775 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--)
2776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2777 3201
2778 texture_av = newAV (); 3202 texture_av = newAV ();
2779 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
2780} 3204}
2781 3205
2783disable_GL_EXT_blend_func_separate () 3207disable_GL_EXT_blend_func_separate ()
2784 CODE: 3208 CODE:
2785 gl.BlendFuncSeparate = 0; 3209 gl.BlendFuncSeparate = 0;
2786 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
2787 3211
2788char * 3212void
3213apple_nvidia_bug (int enable)
3214
3215const char *
2789gl_vendor () 3216gl_vendor ()
2790 CODE: 3217 CODE:
2791 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
2792 OUTPUT: 3219 OUTPUT:
2793 RETVAL 3220 RETVAL
2794 3221
2795char * 3222const char *
2796gl_version () 3223gl_version ()
2797 CODE: 3224 CODE:
2798 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
2799 OUTPUT: 3226 OUTPUT:
2800 RETVAL 3227 RETVAL
2801 3228
2802char * 3229const char *
2803gl_extensions () 3230gl_extensions ()
2804 CODE: 3231 CODE:
2805 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2806 OUTPUT: 3233 OUTPUT:
2807 RETVAL 3234 RETVAL
2808 3235
2809const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
2810 3241
2811GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
2812 CODE: 3243 CODE:
2813 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
2814 OUTPUT: 3245 OUTPUT:
2822 3253
2823int glGetError () 3254int glGetError ()
2824 3255
2825void glFinish () 3256void glFinish ()
2826 3257
3258void glFlush ()
3259
2827void glClear (int mask) 3260void glClear (int mask)
2828 3261
2829void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
2830 PROTOTYPE: @ 3263 PROTOTYPE: @
2831 3264
2840void glBlendFunc (int sfactor, int dfactor) 3273void glBlendFunc (int sfactor, int dfactor)
2841 3274
2842void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3275void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2843 CODE: 3276 CODE:
2844 gl_BlendFuncSeparate (sa, da, saa, daa); 3277 gl_BlendFuncSeparate (sa, da, saa, daa);
3278
3279# void glBlendEquation (int se)
2845 3280
2846void glDepthMask (int flag) 3281void glDepthMask (int flag)
2847 3282
2848void glLogicOp (int opcode) 3283void glLogicOp (int opcode)
2849 3284
2884void glRotate (float angle, float x, float y, float z) 3319void glRotate (float angle, float x, float y, float z)
2885 CODE: 3320 CODE:
2886 glRotatef (angle, x, y, z); 3321 glRotatef (angle, x, y, z);
2887 3322
2888void 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: @
2889 ALIAS: 3325 ALIAS:
2890 glColor_premultiply = 1 3326 glColor_premultiply = 1
2891 CODE: 3327 CODE:
2892 if (ix) 3328 if (ix)
2893 { 3329 {
2999 3435
3000void glEndList () 3436void glEndList ()
3001 3437
3002void glCallList (int list) 3438void glCallList (int list)
3003 3439
3440void c_init ()
3441 CODE:
3442 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3443 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3444
3004MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3445MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3005 3446
3006PROTOTYPES: DISABLE 3447PROTOTYPES: DISABLE
3007 3448
3008void 3449void
3009find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
3010 PPCODE: 3451 PPCODE:
3011{ 3452{
3012 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
3013 XPUSHs (self); 3454 XPUSHs (self);
3014} 3455}
3015 3456
3016BOOT: 3457BOOT:
3017{ 3458{
3025 3466
3026void 3467void
3027draw (SV *self) 3468draw (SV *self)
3028 CODE: 3469 CODE:
3029{ 3470{
3030 HV *hv; 3471 HV *hv;
3031 SV **svp; 3472 SV **svp;
3032 NV x, y, w, h; 3473 NV x, y, w, h;
3033 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
3034 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
3035 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
3036 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