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.265 by root, Fri Jul 18 22:56:11 2008 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib.h>
48 54
49#include <pango/pango.h> 55#include <pango/pango.h>
50 56
51#ifndef PANGO_VERSION_CHECK 57#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 58# define PANGO_VERSION_CHECK(a,b,c) 0
76#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
78 84
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
82 91
83#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
85 94
86#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
87 96
88/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
99
100#define KMOD_LRAM 0x10000 // our extension
101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
90 123
91static AV *texture_av; 124static AV *texture_av;
92 125
93static struct 126static struct
94{ 127{
151{ 184{
152 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
153 186
154 while (attrs) 187 while (attrs)
155 { 188 {
156 PangoAttribute *attr = attrs->data; 189 PangoAttribute *attr = (PangoAttribute *)attrs->data;
157 190
158 if (attr->klass->type == PANGO_ATTR_SHAPE) 191 if (attr->klass->type == PANGO_ATTR_SHAPE)
159 return 1; 192 return 1;
160 193
161 attrs = attrs->next; 194 attrs = attrs->next;
179static void 212static void
180substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
181{ 214{
182 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
183#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
184 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
185#endif 218#endif
186 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
187} 220}
188 221
189static void 222static void
226 int w, h; 259 int w, h;
227 float s, t; 260 float s, t;
228 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
229 tileid smoothtile; 262 tileid smoothtile;
230 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
231} maptex; 265} maptex;
232 266
233typedef struct { 267typedef struct {
234 uint32_t player; 268 uint32_t player;
235 tileid tile[3]; 269 tileid tile[3];
367 self->oy = 0; 401 self->oy = 0;
368 self->row = 0; 402 self->row = 0;
369 self->rows = 0; 403 self->rows = 0;
370} 404}
371 405
406#define CELL_CLEAR(cell) \
407 do { \
408 if ((cell)->player) \
409 (cell)->tile [2] = 0; \
410 (cell)->darkness = 0; \
411 (cell)->stat_hp = 0; \
412 (cell)->flags = 0; \
413 (cell)->player = 0; \
414 } while (0)
415
372static void 416static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 417map_blank (DC__Map self, int x0, int y0, int w, int h)
374{ 418{
375 int x, y; 419 int x, y;
376 maprow *row; 420 maprow *row;
390 if (x >= row->c1) 434 if (x >= row->c1)
391 break; 435 break;
392 436
393 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
394 438
395 cell->darkness = 0; 439 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 440 }
400 } 441 }
401} 442}
402 443
403typedef struct { 444typedef struct {
438 ev.code = 1; 479 ev.code = 1;
439 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
440 ev.data2 = 0; 481 ev.data2 = 0;
441 482
442 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
484}
485
486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
443} 490}
444 491
445static unsigned int 492static unsigned int
446minpot (unsigned int n) 493minpot (unsigned int n)
447{ 494{
514 if (!svp || !SvTRUE (*svp)) 561 if (!svp || !SvTRUE (*svp))
515 return 0; 562 return 0;
516 563
517 return 1; 564 return 1;
518} 565}
566
567/******************************************************************************/
568
569/* process keyboard modifiers */
570static int
571mod_munge (int mod)
572{
573 mod &= MOD_MASK;
574
575 if (mod & (KMOD_META | KMOD_ALT))
576 mod |= KMOD_LRAM;
577
578 return mod;
579}
580
581static void
582deliantra_main (SV *real_main)
583{
584 dSP;
585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
588}
589
590#ifdef __MACOSX__
591 static SV *real_main;
592
593 /* to due surprising braindamage on the side of SDL design, we
594 * do some mind-boggling hack here: SDL requires a custom main()
595 * on OS X, so... we provide one and call the original main(), which,
596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
597 * and which calls our main (== SDL_main) back.
598 */
599 extern C_LINKAGE int
600 main (int argc, char *argv[])
601 {
602 deliantra_main (real_main);
603 }
604
605 #undef main
606
607 extern C_LINKAGE int main (int argc, char *argv[]);
608
609 static void
610 SDL_main_hack (SV *real_main_)
611 {
612 real_main = real_main_;
613
614 char *argv[] = { "deliantra client", 0 };
615 (main) (1, argv);
616 }
617#else
618 static void
619 SDL_main_hack (SV *real_main)
620 {
621 deliantra_main (real_main);
622 }
623#endif
519 624
520MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
521 626
522PROTOTYPES: ENABLE 627PROTOTYPES: ENABLE
523 628
552 const_iv (SDL_USEREVENT), 657 const_iv (SDL_USEREVENT),
553 658
554 const_iv (SDL_APPINPUTFOCUS), 659 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 660 const_iv (SDL_APPMOUSEFOCUS),
556 const_iv (SDL_APPACTIVE), 661 const_iv (SDL_APPACTIVE),
662
663
664 const_iv (SDLK_UNKNOWN),
665 const_iv (SDLK_FIRST),
666 const_iv (SDLK_BACKSPACE),
667 const_iv (SDLK_TAB),
668 const_iv (SDLK_CLEAR),
669 const_iv (SDLK_RETURN),
670 const_iv (SDLK_PAUSE),
671 const_iv (SDLK_ESCAPE),
672 const_iv (SDLK_SPACE),
673 const_iv (SDLK_EXCLAIM),
674 const_iv (SDLK_QUOTEDBL),
675 const_iv (SDLK_HASH),
676 const_iv (SDLK_DOLLAR),
677 const_iv (SDLK_AMPERSAND),
678 const_iv (SDLK_QUOTE),
679 const_iv (SDLK_LEFTPAREN),
680 const_iv (SDLK_RIGHTPAREN),
681 const_iv (SDLK_ASTERISK),
682 const_iv (SDLK_PLUS),
683 const_iv (SDLK_COMMA),
684 const_iv (SDLK_MINUS),
685 const_iv (SDLK_PERIOD),
686 const_iv (SDLK_SLASH),
687 const_iv (SDLK_0),
688 const_iv (SDLK_1),
689 const_iv (SDLK_2),
690 const_iv (SDLK_3),
691 const_iv (SDLK_4),
692 const_iv (SDLK_5),
693 const_iv (SDLK_6),
694 const_iv (SDLK_7),
695 const_iv (SDLK_8),
696 const_iv (SDLK_9),
697 const_iv (SDLK_COLON),
698 const_iv (SDLK_SEMICOLON),
699 const_iv (SDLK_LESS),
700 const_iv (SDLK_EQUALS),
701 const_iv (SDLK_GREATER),
702 const_iv (SDLK_QUESTION),
703 const_iv (SDLK_AT),
704
705 const_iv (SDLK_LEFTBRACKET),
706 const_iv (SDLK_BACKSLASH),
707 const_iv (SDLK_RIGHTBRACKET),
708 const_iv (SDLK_CARET),
709 const_iv (SDLK_UNDERSCORE),
710 const_iv (SDLK_BACKQUOTE),
711 const_iv (SDLK_DELETE),
557 712
558 const_iv (SDLK_FIRST), 713 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 714 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 715 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 716 const_iv (SDLK_KP1),
637 const_iv (KMOD_RMETA), 792 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 793 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 794 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 795 const_iv (KMOD_MODE),
641 796
797 const_iv (KMOD_LRAM),
798
642 const_iv (MIX_DEFAULT_FORMAT), 799 const_iv (MIX_DEFAULT_FORMAT),
643 800
644 const_iv (SDL_INIT_TIMER), 801 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 802 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 803 const_iv (SDL_INIT_VIDEO),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 821 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO), 822 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 823 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES), 824 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL), 825 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL) 826 const_iv (SDL_GL_SWAP_CONTROL),
827
828 const_iv (FOW_DARKNESS)
670# undef const_iv 829# undef const_iv
671 }; 830 };
672 831
673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 832 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
675 834
676 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
677 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
678} 837}
679 838
695NV ceil (NV x) 854NV ceil (NV x)
696 855
697IV minpot (UV n) 856IV minpot (UV n)
698 857
699IV popcount (UV n) 858IV popcount (UV n)
859
860NV distance (NV dx, NV dy)
861 CODE:
862 RETVAL = pow (dx * dx + dy * dy, 0.5);
863 OUTPUT:
864 RETVAL
700 865
701void 866void
702pango_init () 867pango_init ()
703 CODE: 868 CODE:
704{ 869{
712#endif 877#endif
713} 878}
714 879
715char *SDL_GetError () 880char *SDL_GetError ()
716 881
882void SDL_main_hack (SV *real_main)
883 PROTOTYPE: &
884
717int SDL_Init (U32 flags) 885int SDL_Init (U32 flags)
718 886
719int SDL_InitSubSystem (U32 flags) 887int SDL_InitSubSystem (U32 flags)
720 888
721void SDL_QuitSubSystem (U32 flags) 889void SDL_QuitSubSystem (U32 flags)
722 890
723void SDL_Quit () 891void SDL_Quit ()
724 892
725int SDL_GL_SetAttribute (int attr, int value) 893int SDL_GL_SetAttribute (int attr, int value)
894 C_ARGS: (SDL_GLattr)attr, value
726 895
727int SDL_GL_GetAttribute (int attr) 896int SDL_GL_GetAttribute (int attr)
728 CODE: 897 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL)) 898 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
730 XSRETURN_UNDEF; 899 XSRETURN_UNDEF;
731 OUTPUT: 900 OUTPUT:
732 RETVAL 901 RETVAL
733 902
734void 903void
789 ); 958 );
790 959
791 if (RETVAL) 960 if (RETVAL)
792 { 961 {
793 av_clear (texture_av); 962 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); 963#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
797#include "glfunc.h" 964#include "glfunc.h"
798#undef GL_FUNC 965#undef GL_FUNC
966 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
967 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
799 } 968 }
800} 969}
801 OUTPUT: 970 OUTPUT:
802 RETVAL 971 RETVAL
972
973void
974SDL_WM_SetCaption (const char *title, const char *icon)
803 975
804void 976void
805SDL_GL_SwapBuffers () 977SDL_GL_SwapBuffers ()
806 978
807char * 979char *
808SDL_GetKeyName (int sym) 980SDL_GetKeyName (int sym)
981 C_ARGS: (SDLKey)sym
809 982
810int 983int
811SDL_GetAppState () 984SDL_GetAppState ()
812 985
813int 986int
814SDL_GetModState () 987SDL_GetModState ()
815 988
989int
990SDL_WaitEvent ()
991 C_ARGS: 0
992
816void 993void
994SDL_PumpEvents ()
995
996void
817poll_events () 997peep_events ()
818 PPCODE: 998 PPCODE:
819{ 999{
820 SDL_Event ev; 1000 SDL_Event ev;
821 1001
822 SDL_PumpEvents (); 1002 SDL_PumpEvents ();
829 { 1009 {
830 case SDL_KEYDOWN: 1010 case SDL_KEYDOWN:
831 case SDL_KEYUP: 1011 case SDL_KEYUP:
832 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1012 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
833 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1013 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); 1014 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 */ 1015 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); 1016 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
837 break; 1017 break;
838 1018
839 case SDL_ACTIVEEVENT: 1019 case SDL_ACTIVEEVENT:
840 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1020 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
858 x = ev.motion.x; 1038 x = ev.motion.x;
859 y = ev.motion.y; 1039 y = ev.motion.y;
860 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1040 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
861 } 1041 }
862 1042
863 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1043 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
864 hv_store (hv, "state", 5, newSViv (state), 0); 1044 hv_store (hv, "state", 5, newSViv (state), 0);
865 hv_store (hv, "x", 1, newSViv (x), 0); 1045 hv_store (hv, "x", 1, newSViv (x), 0);
866 hv_store (hv, "y", 1, newSViv (y), 0); 1046 hv_store (hv, "y", 1, newSViv (y), 0);
867 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1047 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
868 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1048 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
888 1068
889 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1069 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
890 } 1070 }
891} 1071}
892 1072
1073char *
1074SDL_AudioDriverName ()
1075 CODE:
1076{
1077 char buf [256];
1078 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1079 XSRETURN_UNDEF;
1080
1081 RETVAL = buf;
1082}
1083 OUTPUT:
1084 RETVAL
1085
893int 1086int
894Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1087Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
895 POSTCALL: 1088 POSTCALL:
896 Mix_HookMusicFinished (music_finished); 1089 Mix_HookMusicFinished (music_finished);
897 Mix_ChannelFinished (channel_finished); 1090 Mix_ChannelFinished (channel_finished);
959add_font (char *file) 1152add_font (char *file)
960 CODE: 1153 CODE:
961 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1154 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
962 OUTPUT: 1155 OUTPUT:
963 RETVAL 1156 RETVAL
1157
1158void
1159IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1160
1161# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1162void
1163Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
964 1164
965void 1165void
966load_image_inline (SV *image_) 1166load_image_inline (SV *image_)
967 ALIAS: 1167 ALIAS:
968 load_image_file = 1 1168 load_image_file = 1
1014 1214
1015 SDL_LockSurface (surface2); 1215 SDL_LockSurface (surface2);
1016 EXTEND (SP, 6); 1216 EXTEND (SP, 6);
1017 PUSHs (sv_2mortal (newSViv (surface2->w))); 1217 PUSHs (sv_2mortal (newSViv (surface2->w)));
1018 PUSHs (sv_2mortal (newSViv (surface2->h))); 1218 PUSHs (sv_2mortal (newSViv (surface2->h)));
1019 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1219 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))); 1220 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1021 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1221 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1022 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1222 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1023 SDL_UnlockSurface (surface2); 1223 SDL_UnlockSurface (surface2);
1024 1224
1084#if DEBUG 1284#if DEBUG
1085 VALGRIND_DO_LEAK_CHECK; 1285 VALGRIND_DO_LEAK_CHECK;
1086#endif 1286#endif
1087} 1287}
1088 1288
1289int
1290SvREFCNT (SV *sv)
1291 CODE:
1292 RETVAL = SvREFCNT (sv);
1293 OUTPUT:
1294 RETVAL
1295
1089MODULE = Deliantra::Client PACKAGE = DC::Font 1296MODULE = Deliantra::Client PACKAGE = DC::Font
1090 1297
1091PROTOTYPES: DISABLE 1298PROTOTYPES: DISABLE
1092 1299
1093DC::Font 1300DC::Font
1094new_from_file (SV *class, char *path, int id = 0) 1301new_from_file (SV *klass, char *path, int id = 0)
1095 CODE: 1302 CODE:
1096{ 1303{
1097 int count; 1304 int count;
1098 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1305 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1099 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1306 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1128 PROTOTYPE: 1335 PROTOTYPE:
1129 CODE: 1336 CODE:
1130 tc_restore (); 1337 tc_restore ();
1131 1338
1132DC::Layout 1339DC::Layout
1133new (SV *class) 1340new (SV *klass)
1134 CODE: 1341 CODE:
1135 New (0, RETVAL, 1, struct cf_layout); 1342 New (0, RETVAL, 1, struct cf_layout);
1136 1343
1137 RETVAL->pl = pango_layout_new (opengl_context); 1344 RETVAL->pl = pango_layout_new (opengl_context);
1138 RETVAL->r = 1.; 1345 RETVAL->r = 1.;
1287 1494
1288void 1495void
1289set_height (DC::Layout self, int base_height) 1496set_height (DC::Layout self, int base_height)
1290 CODE: 1497 CODE:
1291 if (self->base_height != base_height) 1498 if (self->base_height != base_height)
1292 { 1499 {
1293 self->base_height = base_height; 1500 self->base_height = base_height;
1294 layout_update_font (self); 1501 layout_update_font (self);
1295 } 1502 }
1296 1503
1297void 1504void
1524 glDisable (GL_ALPHA_TEST); 1731 glDisable (GL_ALPHA_TEST);
1525 glDisable (GL_BLEND); 1732 glDisable (GL_BLEND);
1526 } 1733 }
1527} 1734}
1528 1735
1736void
1737draw_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)
1738 PROTOTYPE: @
1739 CODE:
1740{
1741 glEnable (GL_BLEND);
1742 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1743 glEnable (GL_TEXTURE_2D);
1744 glBindTexture (GL_TEXTURE_2D, name1);
1745
1746 glColor3f (intensity, intensity, intensity);
1747 glPushMatrix ();
1748 glScalef (1./3, 1./3, 1.);
1749
1750 if (blend > 0.f)
1751 {
1752 float dx3 = dx * -3.f / w;
1753 float dy3 = dy * -3.f / h;
1754 GLfloat env_color[4] = { 0., 0., 0., blend };
1755
1756 /* interpolate the two shadow textures */
1757 /* stage 0 == rgb(glcolor) + alpha(t0) */
1758 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1759
1760 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1761 gl.ActiveTexture (GL_TEXTURE1);
1762 glEnable (GL_TEXTURE_2D);
1763 glBindTexture (GL_TEXTURE_2D, name2);
1764 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1765
1766 /* rgb == rgb(glcolor) */
1767 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1768 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1769 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1770
1771 /* alpha = interpolate t0, t1 by env_alpha */
1772 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1773
1774 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1775 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1776 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1777
1778 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1779 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1780
1781 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1782 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1783
1784 glBegin (GL_QUADS);
1785 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1787 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1788 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1789 glEnd ();
1790
1791 glDisable (GL_TEXTURE_2D);
1792 gl.ActiveTexture (GL_TEXTURE0);
1793 }
1794 else
1795 {
1796 /* simple blending of one texture, also opengl <1.3 path */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1798
1799 glBegin (GL_QUADS);
1800 glTexCoord2f (0, 0); glVertex2f (0, 0);
1801 glTexCoord2f (0, t); glVertex2f (0, h);
1802 glTexCoord2f (s, t); glVertex2f (w, h);
1803 glTexCoord2f (s, 0); glVertex2f (w, 0);
1804 glEnd ();
1805 }
1806
1807 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1808 {
1809 int x, y;
1810 int dx3 = dx * 3;
1811 int dy3 = dy * 3;
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1814 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1815 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1816 glTranslatef (-1., -1., 0);
1817 glBegin (GL_QUADS);
1818
1819 for (y = 1; y < h; y += 3)
1820 {
1821 int y1 = y - dy3;
1822 int y1valid = y1 >= 0 && y1 < h;
1823
1824 for (x = 1; x < w; x += 3)
1825 {
1826 int x1 = x - dx3;
1827 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1828 uint8_t h2;
1829
1830 if (y1valid && x1 >= 0 && x1 < w)
1831 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1832 else
1833 h2 = 1; /* out of range == invisible */
1834
1835 if (h1 || h2)
1836 {
1837 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1838 glColor4f (1., 1., 1., alpha);
1839
1840 glTexCoord2f (0, 0.); glVertex2i (x , y );
1841 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1842 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1843 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1844 }
1845 }
1846 }
1847 }
1848
1849 glEnd ();
1850
1851 glPopMatrix ();
1852
1853 glDisable (GL_TEXTURE_2D);
1854 glDisable (GL_BLEND);
1855}
1856
1529IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1857IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1530 CODE: 1858 CODE:
1531{ 1859{
1532 GLint width; 1860 GLint width;
1533 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1861 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1540MODULE = Deliantra::Client PACKAGE = DC::Map 1868MODULE = Deliantra::Client PACKAGE = DC::Map
1541 1869
1542PROTOTYPES: DISABLE 1870PROTOTYPES: DISABLE
1543 1871
1544DC::Map 1872DC::Map
1545new (SV *class) 1873new (SV *klass)
1546 CODE: 1874 CODE:
1547 New (0, RETVAL, 1, struct map); 1875 New (0, RETVAL, 1, struct map);
1548 RETVAL->x = 0; 1876 RETVAL->x = 0;
1549 RETVAL->y = 0; 1877 RETVAL->y = 0;
1550 RETVAL->w = 0; 1878 RETVAL->w = 0;
1637 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1965 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1638 // use uglier nearest interpolation because linear suffers 1966 // use uglier nearest interpolation because linear suffers
1639 // from transparent color bleeding and ugly wrapping effects. 1967 // from transparent color bleeding and ugly wrapping effects.
1640 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1968 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1641} 1969}
1970
1971void
1972expire_textures (DC::Map self, int texid, int count)
1973 PPCODE:
1974 for (; texid < self->texs && count; ++texid, --count)
1975 {
1976 maptex *tex = self->tex + texid;
1977
1978 if (tex->name)
1979 {
1980 if (tex->unused)
1981 {
1982 tex->name = 0;
1983 tex->unused = 0;
1984 XPUSHs (sv_2mortal (newSViv (texid)));
1985 }
1986 else
1987 tex->unused = 1;
1988 }
1989 }
1642 1990
1643int 1991int
1644ox (DC::Map self) 1992ox (DC::Map self)
1645 ALIAS: 1993 ALIAS:
1646 oy = 1 1994 oy = 1
1686 self->y += MAP_EXTEND_Y; 2034 self->y += MAP_EXTEND_Y;
1687 } 2035 }
1688} 2036}
1689 2037
1690SV * 2038SV *
1691map1a_update (DC::Map self, SV *data_, int extmap) 2039map1a_update (DC::Map self, SV *data_)
1692 CODE: 2040 CODE:
1693{ 2041{
1694 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2042 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1695 uint8_t *data_end = (uint8_t *)SvEND (data_); 2043 uint8_t *data_end = (uint8_t *)SvEND (data_);
1696 mapcell *cell; 2044 mapcell *cell;
1717 2065
1718 //TODO: don't trust server data to be in-range(!) 2066 //TODO: don't trust server data to be in-range(!)
1719 2067
1720 if (flags & 8) 2068 if (flags & 8)
1721 { 2069 {
2070 uint8_t ext, cmd;
2071
1722 if (extmap) 2072 do
1723 { 2073 {
1724 uint8_t ext, cmd; 2074 ext = *data++;
2075 cmd = ext & 0x7f;
1725 2076
1726 do 2077 if (cmd < 4)
2078 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2079 else if (cmd == 5) // health
1727 { 2080 {
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; 2081 cell->stat_width = 1;
1736 cell->stat_hp = *data++; 2082 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 } 2083 }
1756 while (ext & 0x80); 2084 else if (cmd == 6) // monster width
2085 cell->stat_width = *data++ + 1;
2086 else if (cmd == 0x47)
2087 {
2088 if (*data == 1) cell->player = data [1];
2089 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2090 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2091 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2092
2093 data += *data + 1;
2094 }
2095 else if (cmd == 8) // cell flags
2096 cell->flags = *data++;
2097 else if (ext & 0x40) // unknown, multibyte => skip
2098 data += *data + 1;
2099 else
2100 data++;
1757 } 2101 }
1758 else 2102 while (ext & 0x80);
1759 cell->darkness = *data++ + 1;
1760 } 2103 }
1761 2104
1762 for (z = 0; z <= 2; ++z) 2105 for (z = 0; z <= 2; ++z)
1763 if (flags & (4 >> z)) 2106 if (flags & (4 >> z))
1764 { 2107 {
1767 cell->tile [z] = self->face2tile [face]; 2110 cell->tile [z] = self->face2tile [face];
1768 2111
1769 if (cell->tile [z]) 2112 if (cell->tile [z])
1770 { 2113 {
1771 maptex *tex = self->tex + cell->tile [z]; 2114 maptex *tex = self->tex + cell->tile [z];
2115 tex->unused = 0;
1772 if (!tex->name) 2116 if (!tex->name)
1773 av_push (missing, newSViv (cell->tile [z])); 2117 av_push (missing, newSViv (cell->tile [z]));
1774 2118
1775 if (tex->smoothtile) 2119 if (tex->smoothtile)
1776 { 2120 {
1777 maptex *smooth = self->tex + tex->smoothtile; 2121 maptex *smooth = self->tex + tex->smoothtile;
2122 smooth->unused = 0;
1778 if (!smooth->name) 2123 if (!smooth->name)
1779 av_push (missing, newSViv (tex->smoothtile)); 2124 av_push (missing, newSViv (tex->smoothtile));
1780 } 2125 }
1781 } 2126 }
1782 } 2127 }
1783 } 2128 }
1784 else 2129 else
1785 cell->darkness = 0; 2130 CELL_CLEAR (cell);
1786 } 2131 }
1787} 2132}
1788 OUTPUT: 2133 OUTPUT:
1789 RETVAL 2134 RETVAL
1790 2135
1810 ? self->row + y 2155 ? self->row + y
1811 : 0; 2156 : 0;
1812 2157
1813 for (x = x0; x < x1; x++) 2158 for (x = x0; x < x1; x++)
1814 { 2159 {
1815 int r = 32, g = 32, b = 32, a = 192; 2160 unsigned int r = 32, g = 32, b = 32, a = 192;
1816 2161
1817 if (row && row->c0 <= x && x < row->c1) 2162 if (row && row->c0 <= x && x < row->c1)
1818 { 2163 {
1819 mapcell *cell = row->col + (x - row->c0); 2164 mapcell *cell = row->col + (x - row->c0);
1820 2165
1822 { 2167 {
1823 maptex tex = self->tex [cell->tile [z]]; 2168 maptex tex = self->tex [cell->tile [z]];
1824 int a0 = 255 - tex.a; 2169 int a0 = 255 - tex.a;
1825 int a1 = tex.a; 2170 int a1 = tex.a;
1826 2171
1827 r = (r * a0 + tex.r * a1) / 255; 2172 r = div255 (r * a0 + tex.r * a1);
1828 g = (g * a0 + tex.g * a1) / 255; 2173 g = div255 (g * a0 + tex.g * a1);
1829 b = (b * a0 + tex.b * a1) / 255; 2174 b = div255 (b * a0 + tex.b * a1);
1830 a = (a * a0 + tex.a * a1) / 255; 2175 a = div255 (a * a0 + tex.a * a1);
1831 } 2176 }
1832 } 2177 }
1833 2178
1834 *map++ = (r ) 2179 *map++ = (r )
1835 | (g << 8) 2180 | (g << 8)
1842} 2187}
1843 OUTPUT: 2188 OUTPUT:
1844 RETVAL 2189 RETVAL
1845 2190
1846void 2191void
1847draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2192draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1848 CODE: 2193 CODE:
1849{ 2194{
1850 int x, y, z; 2195 int x, y, z;
1851 2196
1852 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2197 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1853 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2198 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1854 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2199 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1855 smooth_key skey; 2200 smooth_key skey;
1856 int pl_x, pl_y; 2201 int pl_x, pl_y;
1857 maptex pl_tex; 2202 maptex pl_tex;
1858 rc_t *rc = rc_alloc (); 2203 rc_t *rc = rc_alloc ();
2204 rc_t *rc_ov = rc_alloc ();
1859 rc_key_t key; 2205 rc_key_t key;
1860 rc_array_t *arr; 2206 rc_array_t *arr;
1861 2207
1862 pl_tex.name = 0; 2208 pl_tex.name = 0;
1863 2209
1864 // thats current max. sorry. 2210 // that's current max. sorry.
1865 if (sw > 255) sw = 255; 2211 if (sw > 255) sw = 255;
1866 if (sh > 255) sh = 255; 2212 if (sh > 255) sh = 255;
1867 2213
1868 // clear key, in case of extra padding 2214 // clear key, in case of extra padding
1869 memset (&skey, 0, sizeof (skey)); 2215 memset (&skey, 0, sizeof (skey));
1873 key.g = 255; 2219 key.g = 255;
1874 key.b = 255; 2220 key.b = 255;
1875 key.a = 255; 2221 key.a = 255;
1876 key.mode = GL_QUADS; 2222 key.mode = GL_QUADS;
1877 key.format = GL_T2F_V3F; 2223 key.format = GL_T2F_V3F;
1878 key.texname = -1;
1879 2224
1880 mx += self->x; 2225 mx += self->x;
1881 my += self->y; 2226 my += self->y;
1882 2227
1883 // first pass: determine smooth_max 2228 // first pass: determine smooth_max
1907 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2252 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1908 2253
1909 for (z = 0; z <= 2; z++) 2254 for (z = 0; z <= 2; z++)
1910 { 2255 {
1911 memset (smooth_level, 0, sizeof (smooth_level)); 2256 memset (smooth_level, 0, sizeof (smooth_level));
2257 key.texname = -1;
1912 2258
1913 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1914 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1915 { 2261 {
1916 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
1922 tileid tile = cell->tile [z]; 2268 tileid tile = cell->tile [z];
1923 2269
1924 if (tile) 2270 if (tile)
1925 { 2271 {
1926 maptex tex = self->tex [tile]; 2272 maptex tex = self->tex [tile];
1927 int px = (x + 1) * T - tex.w; 2273 int px, py;
1928 int py = (y + 1) * T - tex.h;
1929 2274
1930 if (key.texname != tex.name) 2275 if (key.texname != tex.name)
1931 { 2276 {
2277 self->tex [tile].unused = 0;
2278
1932 if (!tex.name) 2279 if (!tex.name)
1933 tex = self->tex [2]; /* missing, replace by noface */ 2280 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1934 2281
1935 key.texname = tex.name; 2282 key.texname = tex.name;
1936 arr = rc_array (rc, &key); 2283 arr = rc_array (rc, &key);
1937 } 2284 }
2285
2286 px = (x + 1) * Th - tex.w;
2287 py = (y + 1) * Tw - tex.h;
1938 2288
1939 if (expect_false (cell->player == player) && expect_false (z == 2)) 2289 if (expect_false (cell->player == player) && expect_false (z == 2))
1940 { 2290 {
1941 pl_x = px; 2291 pl_x = px;
1942 pl_y = py; 2292 pl_y = py;
1947 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1948 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2298 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1949 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2299 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1950 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2300 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1951 2301
1952 if (expect_false (cell->flags) && expect_false (z == 2))
1953 {
1954 // overlays such as the speech bubble, probably more to come
1955 if (cell->flags & 1)
1956 {
1957 maptex tex = self->tex [1];
1958 int px = x * T + T * 2 / 32;
1959 int py = y * T - T * 6 / 32;
1960
1961 if (tex.name)
1962 {
1963 if (key.texname != tex.name)
1964 {
1965 key.texname = tex.name;
1966 arr = rc_array (rc, &key);
1967 }
1968
1969 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1970 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1971 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1972 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1973 }
1974 }
1975 }
1976
1977 // update smooth hash 2302 // update smooth hash
1978 if (tex.smoothtile) 2303 if (tex.smoothtile)
1979 { 2304 {
1980 skey.tile = tex.smoothtile; 2305 skey.tile = tex.smoothtile;
1981 skey.level = tex.smoothlevel; 2306 skey.level = tex.smoothlevel;
2009 // corners 2334 // corners
2010 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2335 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2011 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2336 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2012 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2337 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2013 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2338 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2339 }
2340 }
2341
2342 if (expect_false (z == 2) && expect_false (cell->flags))
2343 {
2344 // overlays such as the speech bubble, probably more to come
2345 if (cell->flags & 1)
2346 {
2347 rc_key_t key_ov = key;
2348 maptex tex = self->tex [TEXID_SPEECH];
2349 rc_array_t *arr;
2350 int px = x * Tw + Tw * 2 / 32;
2351 int py = y * Th - Th * 6 / 32;
2352
2353 key_ov.texname = tex.name;
2354 arr = rc_array (rc_ov, &key_ov);
2355
2356 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2357 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2358 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2359 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2014 } 2360 }
2015 } 2361 }
2016 } 2362 }
2017 } 2363 }
2018 2364
2045 if (!(bits & 0x1000) 2391 if (!(bits & 0x1000)
2046 && skey->level == level 2392 && skey->level == level
2047 && level > smooth_max [skey->x][skey->y]) 2393 && level > smooth_max [skey->x][skey->y])
2048 { 2394 {
2049 maptex tex = self->tex [skey->tile]; 2395 maptex tex = self->tex [skey->tile];
2050 int px = (((int)skey->x) - 1) * T; 2396 int px = (((int)skey->x) - 1) * Tw;
2051 int py = (((int)skey->y) - 1) * T; 2397 int py = (((int)skey->y) - 1) * Th;
2052 int border = bits & 15; 2398 int border = bits & 15;
2053 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2399 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2054 float dx = tex.s * .0625f; // 16 images/row 2400 float dx = tex.s * .0625f; // 16 images/row
2055 float dy = tex.t * .5f ; // 2 images/column 2401 float dy = tex.t * .5f ; // 2 images/column
2056 2402
2058 { 2404 {
2059 // this time avoiding texture state changes 2405 // this time avoiding texture state changes
2060 // save gobs of state changes. 2406 // save gobs of state changes.
2061 if (key.texname != tex.name) 2407 if (key.texname != tex.name)
2062 { 2408 {
2409 self->tex [skey->tile].unused = 0;
2410
2063 glEnd (); 2411 glEnd ();
2064 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2412 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2065 glBegin (GL_QUADS); 2413 glBegin (GL_QUADS);
2066 } 2414 }
2067 2415
2068 if (border) 2416 if (border)
2069 { 2417 {
2070 float ox = border * dx; 2418 float ox = border * dx;
2071 2419
2072 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2420 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2073 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2421 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2074 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2422 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2075 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2423 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2076 } 2424 }
2077 2425
2078 if (corner) 2426 if (corner)
2079 { 2427 {
2080 float ox = corner * dx; 2428 float ox = corner * dx;
2081 2429
2082 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2083 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2084 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2085 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2086 } 2434 }
2087 } 2435 }
2088 } 2436 }
2089 } 2437 }
2090 } 2438 }
2099 } 2447 }
2100 2448
2101 if (pl_tex.name) 2449 if (pl_tex.name)
2102 { 2450 {
2103 maptex tex = pl_tex; 2451 maptex tex = pl_tex;
2104 int px = pl_x + pdx; 2452 int px = pl_x + sdx;
2105 int py = pl_y + pdy; 2453 int py = pl_y + sdy;
2106 2454
2107 key.texname = tex.name; 2455 key.texname = tex.name;
2108 arr = rc_array (rc, &key); 2456 arr = rc_array (rc, &key);
2109 2457
2110 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2458 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2113 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2461 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2114 2462
2115 rc_draw (rc); 2463 rc_draw (rc);
2116 } 2464 }
2117 2465
2466 rc_draw (rc_ov);
2467 rc_clear (rc_ov);
2468
2118 glDisable (GL_BLEND); 2469 glDisable (GL_BLEND);
2119 rc_free (rc); 2470 rc_free (rc);
2471 rc_free (rc_ov);
2120 2472
2121 // top layer: overlays such as the health bar 2473 // top layer: overlays such as the health bar
2122 for (y = 0; y < sh; y++) 2474 for (y = 0; y < sh; y++)
2123 if (0 <= y + my && y + my < self->rows) 2475 if (0 <= y + my && y + my < self->rows)
2124 { 2476 {
2127 for (x = 0; x < sw; x++) 2479 for (x = 0; x < sw; x++)
2128 if (row->c0 <= x + mx && x + mx < row->c1) 2480 if (row->c0 <= x + mx && x + mx < row->c1)
2129 { 2481 {
2130 mapcell *cell = row->col + (x + mx - row->c0); 2482 mapcell *cell = row->col + (x + mx - row->c0);
2131 2483
2132 int px = x * T; 2484 int px = x * Tw;
2133 int py = y * T; 2485 int py = y * Th;
2486
2487 if (expect_false (cell->player == player))
2488 {
2489 px += sdx;
2490 py += sdy;
2491 }
2134 2492
2135 if (cell->stat_hp) 2493 if (cell->stat_hp)
2136 { 2494 {
2137 int width = cell->stat_width * T; 2495 int width = cell->stat_width * Tw;
2138 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2496 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2139 2497
2140 glColor3ub (0, 0, 0); 2498 glColor3ub (0, 0, 0);
2141 glRectf (px + 1, py - thick - 2, 2499 glRectf (px + 1, py - thick - 2,
2142 px + width - 1, py); 2500 px + width - 1, py);
2143 2501
2149 } 2507 }
2150 } 2508 }
2151} 2509}
2152 2510
2153void 2511void
2154draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2512draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2155 CODE: 2513 CODE:
2156{ 2514{
2157 static float color[16][3] = { 2515 static float color[16][3] = {
2158 { 0.00F, 0.00F, 0.00F }, 2516 { 0.00f, 0.00f, 0.00f },
2159 { 1.00F, 1.00F, 1.00F }, 2517 { 1.00f, 1.00f, 1.00f },
2160 { 0.00F, 0.00F, 0.55F }, 2518 { 0.00f, 0.00f, 0.55f },
2161 { 1.00F, 0.00F, 0.00F }, 2519 { 1.00f, 0.00f, 0.00f },
2162 2520
2163 { 1.00F, 0.54F, 0.00F }, 2521 { 1.00f, 0.54f, 0.00f },
2164 { 0.11F, 0.56F, 1.00F }, 2522 { 0.11f, 0.56f, 1.00f },
2165 { 0.93F, 0.46F, 0.00F }, 2523 { 0.93f, 0.46f, 0.00f },
2166 { 0.18F, 0.54F, 0.34F }, 2524 { 0.18f, 0.54f, 0.34f },
2167 2525
2168 { 0.56F, 0.73F, 0.56F }, 2526 { 0.56f, 0.73f, 0.56f },
2169 { 0.80F, 0.80F, 0.80F }, 2527 { 0.80f, 0.80f, 0.80f },
2170 { 0.55F, 0.41F, 0.13F }, 2528 { 0.55f, 0.41f, 0.13f },
2171 { 0.99F, 0.77F, 0.26F }, 2529 { 0.99f, 0.77f, 0.26f },
2172 2530
2173 { 0.74F, 0.65F, 0.41F }, 2531 { 0.74f, 0.65f, 0.41f },
2174 2532
2175 { 0.00F, 1.00F, 1.00F }, 2533 { 0.00f, 1.00f, 1.00f },
2176 { 1.00F, 0.00F, 1.00F }, 2534 { 1.00f, 0.00f, 1.00f },
2177 { 1.00F, 1.00F, 0.00F }, 2535 { 1.00f, 1.00f, 0.00f },
2178 }; 2536 };
2179 2537
2180 int x, y; 2538 int x, y;
2181 2539
2182 glEnable (GL_TEXTURE_2D); 2540 glEnable (GL_TEXTURE_2D);
2541 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2542 * but the nvidia driver (185.18.14) mishandles alpha textures
2543 * and takes the colour from god knows where instead of using
2544 * Cp. MODULATE results in the same colour, but slightly different
2545 * alpha, but atcually gives us the correct colour with nvidia.
2546 */
2183 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2547 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2184 glEnable (GL_BLEND); 2548 glEnable (GL_BLEND);
2185 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2549 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2186 glBegin (GL_QUADS); 2550 glBegin (GL_QUADS);
2187 2551
2188 for (y = 0; y < h; y++) 2552 for (y = 0; y < h; y++)
2192 2556
2193 if (m) 2557 if (m)
2194 { 2558 {
2195 float *c = color [m & 15]; 2559 float *c = color [m & 15];
2196 2560
2197 float tx1 = m & 0x40 ? 0.5 : 0.; 2561 float tx1 = m & 0x40 ? 0.5f : 0.f;
2198 float tx2 = tx1 + 0.5; 2562 float tx2 = tx1 + 0.5f;
2199 2563
2200 glColor4f (c[0], c[1], c[2], 0.75); 2564 glColor4f (c[0], c[1], c[2], 1);
2201 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2565 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2202 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2566 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2203 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2567 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2204 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2568 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2205 } 2569 }
2213void 2577void
2214fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2578fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2215 PPCODE: 2579 PPCODE:
2216{ 2580{
2217 int x, y; 2581 int x, y;
2218 int sw1 = sw + 2; 2582 int sw1 = sw + 2;
2219 int sh1 = sh + 2; 2583 int sh1 = sh + 2;
2220 int sh3 = sh * 3; 2584 int sh3 = sh * 3;
2221 int sw34 = (sw * 3 + 3) & ~3; 2585 int sw3 = sw * 3;
2586 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2587 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2222 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2588 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2223 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2589 memset (darkness1, 0, sw1*sh1);
2224 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2225 2590
2226 SvPOK_only (darkness3_sv); 2591 SvPOK_only (darkness3_sv);
2227 SvCUR_set (darkness3_sv, sw34 * sh3); 2592 SvCUR_set (darkness3_sv, sw3 * sh3);
2228 2593
2229 mx += self->x - 1; 2594 mx += self->x - 1;
2230 my += self->y - 1; 2595 my += self->y - 1;
2231
2232 memset (darkness1, 255, sw1 * sh1);
2233 2596
2234 for (y = 0; y < sh1; y++) 2597 for (y = 0; y < sh1; y++)
2235 if (0 <= y + my && y + my < self->rows) 2598 if (0 <= y + my && y + my < self->rows)
2236 { 2599 {
2237 maprow *row = self->row + (y + my); 2600 maprow *row = self->row + (y + my);
2240 if (row->c0 <= x + mx && x + mx < row->c1) 2603 if (row->c0 <= x + mx && x + mx < row->c1)
2241 { 2604 {
2242 mapcell *cell = row->col + (x + mx - row->c0); 2605 mapcell *cell = row->col + (x + mx - row->c0);
2243 2606
2244 darkness1 [y * sw1 + x] = cell->darkness 2607 darkness1 [y * sw1 + x] = cell->darkness
2245 ? 255 - (cell->darkness - 1) 2608 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2246 : 255 - FOW_DARKNESS; 2609 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2247 } 2610 }
2248 } 2611 }
2249 2612
2250 for (y = 0; y < sh; ++y) 2613 for (y = 0; y < sh; ++y)
2251 for (x = 0; x < sw; ++x) 2614 for (x = 0; x < sw; ++x)
2270 2633
2271 uint8_t r13 = (d13 + d23 + d12) / 3; 2634 uint8_t r13 = (d13 + d23 + d12) / 3;
2272 uint8_t r23 = d23; 2635 uint8_t r23 = d23;
2273 uint8_t r33 = (d23 + d33 + d32) / 3; 2636 uint8_t r33 = (d23 + d33 + d32) / 3;
2274 2637
2275 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2276 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2277 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2278 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2279 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2280 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2281 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2282 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2283 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2284 } 2647 }
2285 2648
2286 free (darkness1); 2649 free (darkness1);
2287 2650
2288 EXTEND (SP, 3); 2651 EXTEND (SP, 3);
2289 PUSHs (sv_2mortal (newSViv (sw34))); 2652 PUSHs (sv_2mortal (newSViv (sw3)));
2290 PUSHs (sv_2mortal (newSViv (sh3))); 2653 PUSHs (sv_2mortal (newSViv (sh3)));
2291 PUSHs (darkness3_sv); 2654 PUSHs (darkness3_sv);
2292} 2655}
2293 2656
2294SV * 2657SV *
2381 STRLEN len; 2744 STRLEN len;
2382 uint8_t *data, *end; 2745 uint8_t *data, *end;
2383 2746
2384 len = SvLEN (data_sv); 2747 len = SvLEN (data_sv);
2385 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2748 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2386 data = SvPVbyte_nolen (data_sv); 2749 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2387 end = data + len + 8; 2750 end = data + len + 8;
2388 2751
2389 if (len < 5) 2752 if (len < 5)
2390 XSRETURN_EMPTY; 2753 XSRETURN_EMPTY;
2391 2754
2452} 2815}
2453 2816
2454MODULE = Deliantra::Client PACKAGE = DC::RW 2817MODULE = Deliantra::Client PACKAGE = DC::RW
2455 2818
2456DC::RW 2819DC::RW
2457new (SV *class, SV *data_sv) 2820new (SV *klass, SV *data_sv)
2458 CODE: 2821 CODE:
2459{ 2822{
2460 STRLEN datalen; 2823 STRLEN datalen;
2461 char *data = SvPVbyte (data_sv, datalen); 2824 char *data = SvPVbyte (data_sv, datalen);
2462 2825
2464} 2827}
2465 OUTPUT: 2828 OUTPUT:
2466 RETVAL 2829 RETVAL
2467 2830
2468DC::RW 2831DC::RW
2469new_from_file (SV *class, const char *path, const char *mode = "rb") 2832new_from_file (SV *klass, const char *path, const char *mode = "rb")
2470 CODE: 2833 CODE:
2471 RETVAL = SDL_RWFromFile (path, mode); 2834 RETVAL = SDL_RWFromFile (path, mode);
2472 OUTPUT: 2835 OUTPUT:
2473 RETVAL 2836 RETVAL
2474 2837
2492 if (RETVAL < 0) 2855 if (RETVAL < 0)
2493 { 2856 {
2494 RETVAL = Mix_GroupOldest (-1); 2857 RETVAL = Mix_GroupOldest (-1);
2495 2858
2496 if (RETVAL < 0) 2859 if (RETVAL < 0)
2860 {
2861 // happens sometimes, maybe it just stopped playing(?)
2862 RETVAL = Mix_GroupAvailable (-1);
2863
2864 if (RETVAL < 0)
2497 XSRETURN_UNDEF; 2865 XSRETURN_UNDEF;
2498 2866 }
2867 else
2499 Mix_HaltChannel (RETVAL); 2868 Mix_HaltChannel (RETVAL);
2500 } 2869 }
2501 2870
2502 Mix_UnregisterAllEffects (RETVAL); 2871 Mix_UnregisterAllEffects (RETVAL);
2503 Mix_Volume (RETVAL, 128); 2872 Mix_Volume (RETVAL, 128);
2504} 2873}
2551void 2920void
2552set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2921set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2553 CODE: 2922 CODE:
2554{ 2923{
2555 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2924 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2556 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2925 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2557 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2926 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2558} 2927}
2559 2928
2560void 2929void
2561set_reverse_stereo (DC::Channel self, int flip) 2930set_reverse_stereo (DC::Channel self, int flip)
2564 2933
2565MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2934MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2566 2935
2567PROTOTYPES: DISABLE 2936PROTOTYPES: DISABLE
2568 2937
2938void
2939decoders ()
2940 PPCODE:
2941#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2942 int i, num = Mix_GetNumChunkDecoders ();
2943 EXTEND (SP, num);
2944 for (i = 0; i < num; ++i)
2945 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2946#else
2947 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2948#endif
2949
2569DC::MixChunk 2950DC::MixChunk
2570new (SV *class, DC::RW rwops) 2951new (SV *klass, DC::RW rwops)
2571 CODE: 2952 CODE:
2572 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2953 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2573 OUTPUT: 2954 OUTPUT:
2574 RETVAL 2955 RETVAL
2575 2956
2605 OUTPUT: 2986 OUTPUT:
2606 RETVAL 2987 RETVAL
2607 2988
2608MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2989MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2609 2990
2991void
2992decoders ()
2993 PPCODE:
2994#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2995 int i, num = Mix_GetNumMusicDecoders ();
2996 EXTEND (SP, num);
2997 for (i = 0; i < num; ++i)
2998 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2999#else
3000 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3001#endif
3002
2610int 3003int
2611volume (int volume = -1) 3004volume (int volume = -1)
2612 PROTOTYPE: ;$ 3005 PROTOTYPE: ;$
2613 CODE: 3006 CODE:
2614 if (items > 0) 3007 if (items > 0)
2625void 3018void
2626halt () 3019halt ()
2627 CODE: 3020 CODE:
2628 Mix_HaltMusic (); 3021 Mix_HaltMusic ();
2629 3022
3023int
3024playing ()
3025 CODE:
3026 RETVAL = Mix_PlayingMusic ();
3027 OUTPUT:
3028 RETVAL
3029
2630DC::MixMusic 3030DC::MixMusic
2631new (SV *class, DC::RW rwops) 3031new (SV *klass, DC::RW rwops)
2632 CODE: 3032 CODE:
2633 RETVAL = Mix_LoadMUS_RW (rwops); 3033 RETVAL = Mix_LoadMUS_RW (rwops);
2634 OUTPUT: 3034 OUTPUT:
2635 RETVAL 3035 RETVAL
2636 3036
2664 } *civ, const_iv[] = { 3064 } *civ, const_iv[] = {
2665# define const_iv(name) { # name, (IV)name } 3065# define const_iv(name) { # name, (IV)name }
2666 const_iv (GL_VENDOR), 3066 const_iv (GL_VENDOR),
2667 const_iv (GL_VERSION), 3067 const_iv (GL_VERSION),
2668 const_iv (GL_EXTENSIONS), 3068 const_iv (GL_EXTENSIONS),
3069 const_iv (GL_MAX_TEXTURE_UNITS),
2669 const_iv (GL_COLOR_MATERIAL), 3070 const_iv (GL_COLOR_MATERIAL),
2670 const_iv (GL_SMOOTH), 3071 const_iv (GL_SMOOTH),
2671 const_iv (GL_FLAT), 3072 const_iv (GL_FLAT),
2672 const_iv (GL_DITHER), 3073 const_iv (GL_DITHER),
2673 const_iv (GL_BLEND), 3074 const_iv (GL_BLEND),
2685 const_iv (GL_ZERO), 3086 const_iv (GL_ZERO),
2686 const_iv (GL_SRC_ALPHA), 3087 const_iv (GL_SRC_ALPHA),
2687 const_iv (GL_DST_ALPHA), 3088 const_iv (GL_DST_ALPHA),
2688 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3089 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2689 const_iv (GL_ONE_MINUS_DST_ALPHA), 3090 const_iv (GL_ONE_MINUS_DST_ALPHA),
3091 const_iv (GL_SRC_COLOR),
3092 const_iv (GL_DST_COLOR),
3093 const_iv (GL_ONE_MINUS_SRC_COLOR),
3094 const_iv (GL_ONE_MINUS_DST_COLOR),
2690 const_iv (GL_SRC_ALPHA_SATURATE), 3095 const_iv (GL_SRC_ALPHA_SATURATE),
2691 const_iv (GL_RGB), 3096 const_iv (GL_RGB),
2692 const_iv (GL_RGBA), 3097 const_iv (GL_RGBA),
2693 const_iv (GL_RGBA4), 3098 const_iv (GL_RGBA4),
2694 const_iv (GL_RGBA8), 3099 const_iv (GL_RGBA8),
2762 const_iv (GL_NICEST), 3167 const_iv (GL_NICEST),
2763 const_iv (GL_V2F), 3168 const_iv (GL_V2F),
2764 const_iv (GL_V3F), 3169 const_iv (GL_V3F),
2765 const_iv (GL_T2F_V3F), 3170 const_iv (GL_T2F_V3F),
2766 const_iv (GL_T2F_N3F_V3F), 3171 const_iv (GL_T2F_N3F_V3F),
3172 const_iv (GL_FUNC_ADD),
3173 const_iv (GL_FUNC_SUBTRACT),
3174 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2767# undef const_iv 3175# undef const_iv
2768 }; 3176 };
2769 3177
2770 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3178 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2771 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3179 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2772 3180
2773 texture_av = newAV (); 3181 texture_av = newAV ();
2774 AvREAL_off (texture_av); 3182 AvREAL_off (texture_av);
2775} 3183}
2776 3184
2778disable_GL_EXT_blend_func_separate () 3186disable_GL_EXT_blend_func_separate ()
2779 CODE: 3187 CODE:
2780 gl.BlendFuncSeparate = 0; 3188 gl.BlendFuncSeparate = 0;
2781 gl.BlendFuncSeparateEXT = 0; 3189 gl.BlendFuncSeparateEXT = 0;
2782 3190
2783char * 3191void
3192apple_nvidia_bug (int enable)
3193
3194const char *
2784gl_vendor () 3195gl_vendor ()
2785 CODE: 3196 CODE:
2786 RETVAL = (char *)glGetString (GL_VENDOR); 3197 RETVAL = (const char *)glGetString (GL_VENDOR);
2787 OUTPUT: 3198 OUTPUT:
2788 RETVAL 3199 RETVAL
2789 3200
2790char * 3201const char *
2791gl_version () 3202gl_version ()
2792 CODE: 3203 CODE:
2793 RETVAL = (char *)glGetString (GL_VERSION); 3204 RETVAL = (const char *)glGetString (GL_VERSION);
2794 OUTPUT: 3205 OUTPUT:
2795 RETVAL 3206 RETVAL
2796 3207
2797char * 3208const char *
2798gl_extensions () 3209gl_extensions ()
2799 CODE: 3210 CODE:
2800 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3211 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2801 OUTPUT: 3212 OUTPUT:
2802 RETVAL 3213 RETVAL
2803 3214
2804const char *glGetString (GLenum pname) 3215const char *glGetString (GLenum pname)
3216 CODE:
3217 RETVAL = (const char *)glGetString (pname);
3218 OUTPUT:
3219 RETVAL
2805 3220
2806GLint glGetInteger (GLenum pname) 3221GLint glGetInteger (GLenum pname)
2807 CODE: 3222 CODE:
2808 glGetIntegerv (pname, &RETVAL); 3223 glGetIntegerv (pname, &RETVAL);
2809 OUTPUT: 3224 OUTPUT:
2817 3232
2818int glGetError () 3233int glGetError ()
2819 3234
2820void glFinish () 3235void glFinish ()
2821 3236
3237void glFlush ()
3238
2822void glClear (int mask) 3239void glClear (int mask)
2823 3240
2824void glClearColor (float r, float g, float b, float a = 1.0) 3241void glClearColor (float r, float g, float b, float a = 1.0)
2825 PROTOTYPE: @ 3242 PROTOTYPE: @
2826 3243
2835void glBlendFunc (int sfactor, int dfactor) 3252void glBlendFunc (int sfactor, int dfactor)
2836 3253
2837void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3254void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2838 CODE: 3255 CODE:
2839 gl_BlendFuncSeparate (sa, da, saa, daa); 3256 gl_BlendFuncSeparate (sa, da, saa, daa);
3257
3258# void glBlendEquation (int se)
2840 3259
2841void glDepthMask (int flag) 3260void glDepthMask (int flag)
2842 3261
2843void glLogicOp (int opcode) 3262void glLogicOp (int opcode)
2844 3263
2879void glRotate (float angle, float x, float y, float z) 3298void glRotate (float angle, float x, float y, float z)
2880 CODE: 3299 CODE:
2881 glRotatef (angle, x, y, z); 3300 glRotatef (angle, x, y, z);
2882 3301
2883void glColor (float r, float g, float b, float a = 1.0) 3302void glColor (float r, float g, float b, float a = 1.0)
3303 PROTOTYPE: @
2884 ALIAS: 3304 ALIAS:
2885 glColor_premultiply = 1 3305 glColor_premultiply = 1
2886 CODE: 3306 CODE:
2887 if (ix) 3307 if (ix)
2888 { 3308 {
2993void glNewList (int list, int mode = GL_COMPILE) 3413void glNewList (int list, int mode = GL_COMPILE)
2994 3414
2995void glEndList () 3415void glEndList ()
2996 3416
2997void glCallList (int list) 3417void glCallList (int list)
3418
3419void c_init ()
3420 CODE:
3421 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3422 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2998 3423
2999MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3424MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3000 3425
3001PROTOTYPES: DISABLE 3426PROTOTYPES: DISABLE
3002 3427

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines