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.269 by root, Sun Jul 20 03:46:02 2008 UTC vs.
Revision 1.321 by root, Sun Nov 18 01:15:04 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];
447 ev.data2 = 0; 481 ev.data2 = 0;
448 482
449 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
450} 484}
451 485
486// approximately divide by 255
487static unsigned int
488div255 (unsigned int n)
489{
490 return (n + (n >> 8)) >> 8;
491}
492
452static unsigned int 493static unsigned int
453minpot (unsigned int n) 494minpot (unsigned int n)
454{ 495{
455 if (!n) 496 if (!n)
456 return 0; 497 return 0;
521 if (!svp || !SvTRUE (*svp)) 562 if (!svp || !SvTRUE (*svp))
522 return 0; 563 return 0;
523 564
524 return 1; 565 return 1;
525} 566}
567
568/******************************************************************************/
569
570/* process keyboard modifiers */
571static int
572mod_munge (int mod)
573{
574 mod &= MOD_MASK;
575
576 if (mod & (KMOD_META | KMOD_ALT))
577 mod |= KMOD_LRAM;
578
579 return mod;
580}
581
582static void
583deliantra_main (SV *real_main)
584{
585 dSP;
586
587 PUSHMARK (SP);
588 call_sv (real_main, G_DISCARD | G_VOID);
589}
590
591#ifdef __MACOSX__
592 static SV *real_main;
593
594 /* to due surprising braindamage on the side of SDL design, we
595 * do some mind-boggling hack here: SDL requires a custom main()
596 * on OS X, so... we provide one and call the original main(), which,
597 * due to shared library magic, calls -lSDLmain's main, not perl's main,
598 * and which calls our main (== SDL_main) back.
599 */
600 extern C_LINKAGE int
601 main (int argc, char *argv[])
602 {
603 deliantra_main (real_main);
604 }
605
606 #undef main
607
608 extern C_LINKAGE int main (int argc, char *argv[]);
609
610 static void
611 SDL_main_hack (SV *real_main_)
612 {
613 real_main = real_main_;
614
615 char *argv[] = { "deliantra client", 0 };
616 (main) (1, argv);
617 }
618#else
619 static void
620 SDL_main_hack (SV *real_main)
621 {
622 deliantra_main (real_main);
623 }
624#endif
526 625
527MODULE = Deliantra::Client PACKAGE = DC 626MODULE = Deliantra::Client PACKAGE = DC
528 627
529PROTOTYPES: ENABLE 628PROTOTYPES: ENABLE
530 629
559 const_iv (SDL_USEREVENT), 658 const_iv (SDL_USEREVENT),
560 659
561 const_iv (SDL_APPINPUTFOCUS), 660 const_iv (SDL_APPINPUTFOCUS),
562 const_iv (SDL_APPMOUSEFOCUS), 661 const_iv (SDL_APPMOUSEFOCUS),
563 const_iv (SDL_APPACTIVE), 662 const_iv (SDL_APPACTIVE),
663
664
665 const_iv (SDLK_UNKNOWN),
666 const_iv (SDLK_FIRST),
667 const_iv (SDLK_BACKSPACE),
668 const_iv (SDLK_TAB),
669 const_iv (SDLK_CLEAR),
670 const_iv (SDLK_RETURN),
671 const_iv (SDLK_PAUSE),
672 const_iv (SDLK_ESCAPE),
673 const_iv (SDLK_SPACE),
674 const_iv (SDLK_EXCLAIM),
675 const_iv (SDLK_QUOTEDBL),
676 const_iv (SDLK_HASH),
677 const_iv (SDLK_DOLLAR),
678 const_iv (SDLK_AMPERSAND),
679 const_iv (SDLK_QUOTE),
680 const_iv (SDLK_LEFTPAREN),
681 const_iv (SDLK_RIGHTPAREN),
682 const_iv (SDLK_ASTERISK),
683 const_iv (SDLK_PLUS),
684 const_iv (SDLK_COMMA),
685 const_iv (SDLK_MINUS),
686 const_iv (SDLK_PERIOD),
687 const_iv (SDLK_SLASH),
688 const_iv (SDLK_0),
689 const_iv (SDLK_1),
690 const_iv (SDLK_2),
691 const_iv (SDLK_3),
692 const_iv (SDLK_4),
693 const_iv (SDLK_5),
694 const_iv (SDLK_6),
695 const_iv (SDLK_7),
696 const_iv (SDLK_8),
697 const_iv (SDLK_9),
698 const_iv (SDLK_COLON),
699 const_iv (SDLK_SEMICOLON),
700 const_iv (SDLK_LESS),
701 const_iv (SDLK_EQUALS),
702 const_iv (SDLK_GREATER),
703 const_iv (SDLK_QUESTION),
704 const_iv (SDLK_AT),
705
706 const_iv (SDLK_LEFTBRACKET),
707 const_iv (SDLK_BACKSLASH),
708 const_iv (SDLK_RIGHTBRACKET),
709 const_iv (SDLK_CARET),
710 const_iv (SDLK_UNDERSCORE),
711 const_iv (SDLK_BACKQUOTE),
712 const_iv (SDLK_DELETE),
564 713
565 const_iv (SDLK_FIRST), 714 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST), 715 const_iv (SDLK_LAST),
567 const_iv (SDLK_KP0), 716 const_iv (SDLK_KP0),
568 const_iv (SDLK_KP1), 717 const_iv (SDLK_KP1),
644 const_iv (KMOD_RMETA), 793 const_iv (KMOD_RMETA),
645 const_iv (KMOD_NUM), 794 const_iv (KMOD_NUM),
646 const_iv (KMOD_CAPS), 795 const_iv (KMOD_CAPS),
647 const_iv (KMOD_MODE), 796 const_iv (KMOD_MODE),
648 797
798 const_iv (KMOD_LRAM),
799
649 const_iv (MIX_DEFAULT_FORMAT), 800 const_iv (MIX_DEFAULT_FORMAT),
650 801
651 const_iv (SDL_INIT_TIMER), 802 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO), 803 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO), 804 const_iv (SDL_INIT_VIDEO),
677 828
678 const_iv (FOW_DARKNESS) 829 const_iv (FOW_DARKNESS)
679# undef const_iv 830# undef const_iv
680 }; 831 };
681 832
682 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 833 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 834 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
684 835
685 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 836 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
686 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 837 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
687} 838}
688 839
704NV ceil (NV x) 855NV ceil (NV x)
705 856
706IV minpot (UV n) 857IV minpot (UV n)
707 858
708IV popcount (UV n) 859IV popcount (UV n)
860
861NV distance (NV dx, NV dy)
862 CODE:
863 RETVAL = pow (dx * dx + dy * dy, 0.5);
864 OUTPUT:
865 RETVAL
709 866
710void 867void
711pango_init () 868pango_init ()
712 CODE: 869 CODE:
713{ 870{
721#endif 878#endif
722} 879}
723 880
724char *SDL_GetError () 881char *SDL_GetError ()
725 882
883void SDL_main_hack (SV *real_main)
884 PROTOTYPE: &
885
726int SDL_Init (U32 flags) 886int SDL_Init (U32 flags)
727 887
728int SDL_InitSubSystem (U32 flags) 888int SDL_InitSubSystem (U32 flags)
729 889
730void SDL_QuitSubSystem (U32 flags) 890void SDL_QuitSubSystem (U32 flags)
731 891
732void SDL_Quit () 892void SDL_Quit ()
733 893
734int SDL_GL_SetAttribute (int attr, int value) 894int SDL_GL_SetAttribute (int attr, int value)
895 C_ARGS: (SDL_GLattr)attr, value
735 896
736int SDL_GL_GetAttribute (int attr) 897int SDL_GL_GetAttribute (int attr)
737 CODE: 898 CODE:
738 if (SDL_GL_GetAttribute (attr, &RETVAL)) 899 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
739 XSRETURN_UNDEF; 900 XSRETURN_UNDEF;
740 OUTPUT: 901 OUTPUT:
741 RETVAL 902 RETVAL
742 903
743void 904void
798 ); 959 );
799 960
800 if (RETVAL) 961 if (RETVAL)
801 { 962 {
802 av_clear (texture_av); 963 av_clear (texture_av);
803
804 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
805#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 964#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
806#include "glfunc.h" 965#include "glfunc.h"
807#undef GL_FUNC 966#undef GL_FUNC
967 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
968 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
808 } 969 }
809} 970}
810 OUTPUT: 971 OUTPUT:
811 RETVAL 972 RETVAL
973
974void
975SDL_WM_SetCaption (const char *title, const char *icon)
812 976
813void 977void
814SDL_GL_SwapBuffers () 978SDL_GL_SwapBuffers ()
815 979
816char * 980char *
817SDL_GetKeyName (int sym) 981SDL_GetKeyName (int sym)
982 C_ARGS: (SDLKey)sym
818 983
819int 984int
820SDL_GetAppState () 985SDL_GetAppState ()
821 986
822int 987int
823SDL_GetModState () 988SDL_GetModState ()
824 989
990int
991SDL_WaitEvent ()
992 C_ARGS: 0
993
825void 994void
995SDL_PumpEvents ()
996
997void
826poll_events () 998peep_events ()
827 PPCODE: 999 PPCODE:
828{ 1000{
829 SDL_Event ev; 1001 SDL_Event ev;
830 1002
831 SDL_PumpEvents (); 1003 SDL_PumpEvents ();
838 { 1010 {
839 case SDL_KEYDOWN: 1011 case SDL_KEYDOWN:
840 case SDL_KEYUP: 1012 case SDL_KEYUP:
841 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1013 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
842 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1014 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
843 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1015 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
844 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1016 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
845 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1017 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
846 break; 1018 break;
847 1019
848 case SDL_ACTIVEEVENT: 1020 case SDL_ACTIVEEVENT:
849 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1021 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
867 x = ev.motion.x; 1039 x = ev.motion.x;
868 y = ev.motion.y; 1040 y = ev.motion.y;
869 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1041 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
870 } 1042 }
871 1043
872 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1044 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
873 hv_store (hv, "state", 5, newSViv (state), 0); 1045 hv_store (hv, "state", 5, newSViv (state), 0);
874 hv_store (hv, "x", 1, newSViv (x), 0); 1046 hv_store (hv, "x", 1, newSViv (x), 0);
875 hv_store (hv, "y", 1, newSViv (y), 0); 1047 hv_store (hv, "y", 1, newSViv (y), 0);
876 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1048 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
877 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1049 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
897 1069
898 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1070 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
899 } 1071 }
900} 1072}
901 1073
1074char *
1075SDL_AudioDriverName ()
1076 CODE:
1077{
1078 char buf [256];
1079 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1080 XSRETURN_UNDEF;
1081
1082 RETVAL = buf;
1083}
1084 OUTPUT:
1085 RETVAL
1086
902int 1087int
903Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1088Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
904 POSTCALL: 1089 POSTCALL:
905 Mix_HookMusicFinished (music_finished); 1090 Mix_HookMusicFinished (music_finished);
906 Mix_ChannelFinished (channel_finished); 1091 Mix_ChannelFinished (channel_finished);
907 1092
908void 1093void
909Mix_QuerySpec () 1094Mix_QuerySpec ()
968add_font (char *file) 1153add_font (char *file)
969 CODE: 1154 CODE:
970 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1155 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
971 OUTPUT: 1156 OUTPUT:
972 RETVAL 1157 RETVAL
1158
1159void
1160IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1161
1162# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1163void
1164Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
973 1165
974void 1166void
975load_image_inline (SV *image_) 1167load_image_inline (SV *image_)
976 ALIAS: 1168 ALIAS:
977 load_image_file = 1 1169 load_image_file = 1
1023 1215
1024 SDL_LockSurface (surface2); 1216 SDL_LockSurface (surface2);
1025 EXTEND (SP, 6); 1217 EXTEND (SP, 6);
1026 PUSHs (sv_2mortal (newSViv (surface2->w))); 1218 PUSHs (sv_2mortal (newSViv (surface2->w)));
1027 PUSHs (sv_2mortal (newSViv (surface2->h))); 1219 PUSHs (sv_2mortal (newSViv (surface2->h)));
1028 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1220 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1029 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1221 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1030 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1222 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1031 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1223 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1032 SDL_UnlockSurface (surface2); 1224 SDL_UnlockSurface (surface2);
1033 1225
1093#if DEBUG 1285#if DEBUG
1094 VALGRIND_DO_LEAK_CHECK; 1286 VALGRIND_DO_LEAK_CHECK;
1095#endif 1287#endif
1096} 1288}
1097 1289
1290int
1291SvREFCNT (SV *sv)
1292 CODE:
1293 RETVAL = SvREFCNT (sv);
1294 OUTPUT:
1295 RETVAL
1296
1098MODULE = Deliantra::Client PACKAGE = DC::Font 1297MODULE = Deliantra::Client PACKAGE = DC::Font
1099 1298
1100PROTOTYPES: DISABLE 1299PROTOTYPES: DISABLE
1101 1300
1102DC::Font 1301DC::Font
1103new_from_file (SV *class, char *path, int id = 0) 1302new_from_file (SV *klass, char *path, int id = 0)
1104 CODE: 1303 CODE:
1105{ 1304{
1106 int count; 1305 int count;
1107 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1306 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1108 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1307 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1137 PROTOTYPE: 1336 PROTOTYPE:
1138 CODE: 1337 CODE:
1139 tc_restore (); 1338 tc_restore ();
1140 1339
1141DC::Layout 1340DC::Layout
1142new (SV *class) 1341new (SV *klass)
1143 CODE: 1342 CODE:
1144 New (0, RETVAL, 1, struct cf_layout); 1343 New (0, RETVAL, 1, struct cf_layout);
1145 1344
1146 RETVAL->pl = pango_layout_new (opengl_context); 1345 RETVAL->pl = pango_layout_new (opengl_context);
1147 RETVAL->r = 1.; 1346 RETVAL->r = 1.;
1296 1495
1297void 1496void
1298set_height (DC::Layout self, int base_height) 1497set_height (DC::Layout self, int base_height)
1299 CODE: 1498 CODE:
1300 if (self->base_height != base_height) 1499 if (self->base_height != base_height)
1301 { 1500 {
1302 self->base_height = base_height; 1501 self->base_height = base_height;
1303 layout_update_font (self); 1502 layout_update_font (self);
1304 } 1503 }
1305 1504
1306void 1505void
1533 glDisable (GL_ALPHA_TEST); 1732 glDisable (GL_ALPHA_TEST);
1534 glDisable (GL_BLEND); 1733 glDisable (GL_BLEND);
1535 } 1734 }
1536} 1735}
1537 1736
1737void
1738draw_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)
1739 PROTOTYPE: @
1740 CODE:
1741{
1742 glEnable (GL_BLEND);
1743 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1744 glEnable (GL_TEXTURE_2D);
1745 glBindTexture (GL_TEXTURE_2D, name1);
1746
1747 glColor3f (intensity, intensity, intensity);
1748 glPushMatrix ();
1749 glScalef (1./3, 1./3, 1.);
1750
1751 if (blend > 0.f)
1752 {
1753 float dx3 = dx * -3.f / w;
1754 float dy3 = dy * -3.f / h;
1755 GLfloat env_color[4] = { 0., 0., 0., blend };
1756
1757 /* interpolate the two shadow textures */
1758 /* stage 0 == rgb(glcolor) + alpha(t0) */
1759 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1760
1761 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1762 gl.ActiveTexture (GL_TEXTURE1);
1763 glEnable (GL_TEXTURE_2D);
1764 glBindTexture (GL_TEXTURE_2D, name2);
1765 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1766
1767 /* rgb == rgb(glcolor) */
1768 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1769 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1770 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1771
1772 /* alpha = interpolate t0, t1 by env_alpha */
1773 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1774
1775 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1776 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1777 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1778
1779 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1780 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1781
1782 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1783 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1784
1785 glBegin (GL_QUADS);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1787 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1788 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1789 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1790 glEnd ();
1791
1792 glDisable (GL_TEXTURE_2D);
1793 gl.ActiveTexture (GL_TEXTURE0);
1794 }
1795 else
1796 {
1797 /* simple blending of one texture, also opengl <1.3 path */
1798 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1799
1800 glBegin (GL_QUADS);
1801 glTexCoord2f (0, 0); glVertex2f (0, 0);
1802 glTexCoord2f (0, t); glVertex2f (0, h);
1803 glTexCoord2f (s, t); glVertex2f (w, h);
1804 glTexCoord2f (s, 0); glVertex2f (w, 0);
1805 glEnd ();
1806 }
1807
1808 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1809 {
1810 int x, y;
1811 int dx3 = dx * 3;
1812 int dy3 = dy * 3;
1813
1814 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1815 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1816 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1817 glTranslatef (-1., -1., 0);
1818 glBegin (GL_QUADS);
1819
1820 for (y = 1; y < h; y += 3)
1821 {
1822 int y1 = y - dy3;
1823 int y1valid = y1 >= 0 && y1 < h;
1824
1825 for (x = 1; x < w; x += 3)
1826 {
1827 int x1 = x - dx3;
1828 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1829 uint8_t h2;
1830
1831 if (y1valid && x1 >= 0 && x1 < w)
1832 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1833 else
1834 h2 = 1; /* out of range == invisible */
1835
1836 if (h1 || h2)
1837 {
1838 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1839 glColor4f (1., 1., 1., alpha);
1840
1841 glTexCoord2f (0, 0.); glVertex2i (x , y );
1842 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1843 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1844 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1845 }
1846 }
1847 }
1848 }
1849
1850 glEnd ();
1851
1852 glPopMatrix ();
1853
1854 glDisable (GL_TEXTURE_2D);
1855 glDisable (GL_BLEND);
1856}
1857
1538IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1858IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1539 CODE: 1859 CODE:
1540{ 1860{
1541 GLint width; 1861 GLint width;
1542 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1862 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1549MODULE = Deliantra::Client PACKAGE = DC::Map 1869MODULE = Deliantra::Client PACKAGE = DC::Map
1550 1870
1551PROTOTYPES: DISABLE 1871PROTOTYPES: DISABLE
1552 1872
1553DC::Map 1873DC::Map
1554new (SV *class) 1874new (SV *klass)
1555 CODE: 1875 CODE:
1556 New (0, RETVAL, 1, struct map); 1876 New (0, RETVAL, 1, struct map);
1557 RETVAL->x = 0; 1877 RETVAL->x = 0;
1558 RETVAL->y = 0; 1878 RETVAL->y = 0;
1559 RETVAL->w = 0; 1879 RETVAL->w = 0;
1598 1918
1599void 1919void
1600set_smooth (DC::Map self, int face, int smooth, int level) 1920set_smooth (DC::Map self, int face, int smooth, int level)
1601 CODE: 1921 CODE:
1602{ 1922{
1603 tileid texid; 1923 tileid texid;
1604 maptex *tex; 1924 maptex *tex;
1605 1925
1606 if (face < 0 || face >= self->faces) 1926 if (face < 0 || face >= self->faces)
1607 return; 1927 return;
1608 1928
1609 if (smooth < 0 || smooth >= self->faces) 1929 if (smooth < 0 || smooth >= self->faces)
1610 return; 1930 return;
1611 1931
1612 texid = self->face2tile [face]; 1932 texid = self->face2tile [face];
1613 1933
1614 if (!texid) 1934 if (!texid)
1615 return; 1935 return;
1616 1936
1617 tex = self->tex + texid; 1937 tex = self->tex + texid;
1646 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1966 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1647 // use uglier nearest interpolation because linear suffers 1967 // use uglier nearest interpolation because linear suffers
1648 // from transparent color bleeding and ugly wrapping effects. 1968 // from transparent color bleeding and ugly wrapping effects.
1649 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1969 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1650} 1970}
1971
1972void
1973expire_textures (DC::Map self, int texid, int count)
1974 PPCODE:
1975 for (; texid < self->texs && count; ++texid, --count)
1976 {
1977 maptex *tex = self->tex + texid;
1978
1979 if (tex->name)
1980 {
1981 if (tex->unused)
1982 {
1983 tex->name = 0;
1984 tex->unused = 0;
1985 XPUSHs (sv_2mortal (newSViv (texid)));
1986 }
1987 else
1988 tex->unused = 1;
1989 }
1990 }
1651 1991
1652int 1992int
1653ox (DC::Map self) 1993ox (DC::Map self)
1654 ALIAS: 1994 ALIAS:
1655 oy = 1 1995 oy = 1
1695 self->y += MAP_EXTEND_Y; 2035 self->y += MAP_EXTEND_Y;
1696 } 2036 }
1697} 2037}
1698 2038
1699SV * 2039SV *
1700map1a_update (DC::Map self, SV *data_, int extmap) 2040map1a_update (DC::Map self, SV *data_)
1701 CODE: 2041 CODE:
1702{ 2042{
1703 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2043 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1704 uint8_t *data_end = (uint8_t *)SvEND (data_); 2044 uint8_t *data_end = (uint8_t *)SvEND (data_);
1705 mapcell *cell; 2045 mapcell *cell;
1726 2066
1727 //TODO: don't trust server data to be in-range(!) 2067 //TODO: don't trust server data to be in-range(!)
1728 2068
1729 if (flags & 8) 2069 if (flags & 8)
1730 { 2070 {
2071 uint8_t ext, cmd;
2072
1731 if (extmap) 2073 do
1732 { 2074 {
1733 uint8_t ext, cmd; 2075 ext = *data++;
2076 cmd = ext & 0x7f;
1734 2077
1735 do 2078 if (cmd < 4)
2079 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2080 else if (cmd == 5) // health
1736 { 2081 {
1737 ext = *data++;
1738 cmd = ext & 0x7f;
1739
1740 if (cmd < 4)
1741 cell->darkness = 255 - ext * 64 + 1;
1742 else if (cmd == 5) // health
1743 {
1744 cell->stat_width = 1; 2082 cell->stat_width = 1;
1745 cell->stat_hp = *data++; 2083 cell->stat_hp = *data++;
1746 }
1747 else if (cmd == 6) // monster width
1748 cell->stat_width = *data++ + 1;
1749 else if (cmd == 0x47)
1750 {
1751 if (*data == 1) cell->player = data [1];
1752 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1753 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1754 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1755
1756 data += *data + 1;
1757 }
1758 else if (cmd == 8) // cell flags
1759 cell->flags = *data++;
1760 else if (ext & 0x40) // unknown, multibyte => skip
1761 data += *data + 1;
1762 else
1763 data++;
1764 } 2084 }
1765 while (ext & 0x80); 2085 else if (cmd == 6) // monster width
2086 cell->stat_width = *data++ + 1;
2087 else if (cmd == 0x47)
2088 {
2089 if (*data == 1) cell->player = data [1];
2090 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2091 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2092 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2093
2094 data += *data + 1;
2095 }
2096 else if (cmd == 8) // cell flags
2097 cell->flags = *data++;
2098 else if (ext & 0x40) // unknown, multibyte => skip
2099 data += *data + 1;
2100 else
2101 data++;
1766 } 2102 }
1767 else 2103 while (ext & 0x80);
1768 cell->darkness = *data++ + 1;
1769 } 2104 }
1770 2105
1771 for (z = 0; z <= 2; ++z) 2106 for (z = 0; z <= 2; ++z)
1772 if (flags & (4 >> z)) 2107 if (flags & (4 >> z))
1773 { 2108 {
1776 cell->tile [z] = self->face2tile [face]; 2111 cell->tile [z] = self->face2tile [face];
1777 2112
1778 if (cell->tile [z]) 2113 if (cell->tile [z])
1779 { 2114 {
1780 maptex *tex = self->tex + cell->tile [z]; 2115 maptex *tex = self->tex + cell->tile [z];
2116 tex->unused = 0;
1781 if (!tex->name) 2117 if (!tex->name)
1782 av_push (missing, newSViv (cell->tile [z])); 2118 av_push (missing, newSViv (cell->tile [z]));
1783 2119
1784 if (tex->smoothtile) 2120 if (tex->smoothtile)
1785 { 2121 {
1786 maptex *smooth = self->tex + tex->smoothtile; 2122 maptex *smooth = self->tex + tex->smoothtile;
2123 smooth->unused = 0;
1787 if (!smooth->name) 2124 if (!smooth->name)
1788 av_push (missing, newSViv (tex->smoothtile)); 2125 av_push (missing, newSViv (tex->smoothtile));
1789 } 2126 }
1790 } 2127 }
1791 } 2128 }
1819 ? self->row + y 2156 ? self->row + y
1820 : 0; 2157 : 0;
1821 2158
1822 for (x = x0; x < x1; x++) 2159 for (x = x0; x < x1; x++)
1823 { 2160 {
1824 int r = 32, g = 32, b = 32, a = 192; 2161 unsigned int r = 32, g = 32, b = 32, a = 192;
1825 2162
1826 if (row && row->c0 <= x && x < row->c1) 2163 if (row && row->c0 <= x && x < row->c1)
1827 { 2164 {
1828 mapcell *cell = row->col + (x - row->c0); 2165 mapcell *cell = row->col + (x - row->c0);
1829 2166
1831 { 2168 {
1832 maptex tex = self->tex [cell->tile [z]]; 2169 maptex tex = self->tex [cell->tile [z]];
1833 int a0 = 255 - tex.a; 2170 int a0 = 255 - tex.a;
1834 int a1 = tex.a; 2171 int a1 = tex.a;
1835 2172
1836 r = (r * a0 + tex.r * a1) / 255; 2173 r = div255 (r * a0 + tex.r * a1);
1837 g = (g * a0 + tex.g * a1) / 255; 2174 g = div255 (g * a0 + tex.g * a1);
1838 b = (b * a0 + tex.b * a1) / 255; 2175 b = div255 (b * a0 + tex.b * a1);
1839 a = (a * a0 + tex.a * a1) / 255; 2176 a = div255 (a * a0 + tex.a * a1);
1840 } 2177 }
1841 } 2178 }
1842 2179
1843 *map++ = (r ) 2180 *map++ = (r )
1844 | (g << 8) 2181 | (g << 8)
1845 | (b << 16) 2182 | (b << 16)
1846 | (a << 24); 2183 | (a << 24);
1847 } 2184 }
1848 } 2185 }
1849 2186
1850 RETVAL = map_sv; 2187 RETVAL = map_sv;
1851} 2188}
1852 OUTPUT: 2189 OUTPUT:
1853 RETVAL 2190 RETVAL
1854 2191
1855void 2192void
1856draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2193draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1857 CODE: 2194 CODE:
1858{ 2195{
1859 int x, y, z; 2196 int x, y, z;
1860 2197
1861 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2198 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1862 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2199 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1863 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2200 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1864 smooth_key skey; 2201 smooth_key skey;
1865 int pl_x, pl_y; 2202 int pl_x, pl_y;
1866 maptex pl_tex; 2203 maptex pl_tex;
1867 rc_t *rc = rc_alloc (); 2204 rc_t *rc = rc_alloc ();
2205 rc_t *rc_ov = rc_alloc ();
1868 rc_key_t key; 2206 rc_key_t key;
1869 rc_array_t *arr; 2207 rc_array_t *arr;
1870 2208
1871 pl_tex.name = 0; 2209 pl_tex.name = 0;
1872 2210
1873 // thats current max. sorry. 2211 // that's current max. sorry.
1874 if (sw > 255) sw = 255; 2212 if (sw > 255) sw = 255;
1875 if (sh > 255) sh = 255; 2213 if (sh > 255) sh = 255;
1876 2214
1877 // clear key, in case of extra padding 2215 // clear key, in case of extra padding
1878 memset (&skey, 0, sizeof (skey)); 2216 memset (&skey, 0, sizeof (skey));
1882 key.g = 255; 2220 key.g = 255;
1883 key.b = 255; 2221 key.b = 255;
1884 key.a = 255; 2222 key.a = 255;
1885 key.mode = GL_QUADS; 2223 key.mode = GL_QUADS;
1886 key.format = GL_T2F_V3F; 2224 key.format = GL_T2F_V3F;
1887 key.texname = -1;
1888 2225
1889 mx += self->x; 2226 mx += self->x;
1890 my += self->y; 2227 my += self->y;
1891 2228
1892 // first pass: determine smooth_max 2229 // first pass: determine smooth_max
1916 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2253 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1917 2254
1918 for (z = 0; z <= 2; z++) 2255 for (z = 0; z <= 2; z++)
1919 { 2256 {
1920 memset (smooth_level, 0, sizeof (smooth_level)); 2257 memset (smooth_level, 0, sizeof (smooth_level));
2258 key.texname = -1;
1921 2259
1922 for (y = 0; y < sh; y++) 2260 for (y = 0; y < sh; y++)
1923 if (0 <= y + my && y + my < self->rows) 2261 if (0 <= y + my && y + my < self->rows)
1924 { 2262 {
1925 maprow *row = self->row + (y + my); 2263 maprow *row = self->row + (y + my);
1931 tileid tile = cell->tile [z]; 2269 tileid tile = cell->tile [z];
1932 2270
1933 if (tile) 2271 if (tile)
1934 { 2272 {
1935 maptex tex = self->tex [tile]; 2273 maptex tex = self->tex [tile];
1936 int px = (x + 1) * T - tex.w; 2274 int px, py;
1937 int py = (y + 1) * T - tex.h;
1938 2275
1939 if (key.texname != tex.name) 2276 if (key.texname != tex.name)
1940 { 2277 {
2278 self->tex [tile].unused = 0;
2279
1941 if (!tex.name) 2280 if (!tex.name)
1942 tex = self->tex [2]; /* missing, replace by noface */ 2281 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1943 2282
1944 key.texname = tex.name; 2283 key.texname = tex.name;
1945 arr = rc_array (rc, &key); 2284 arr = rc_array (rc, &key);
1946 } 2285 }
2286
2287 px = (x + 1) * Th - tex.w;
2288 py = (y + 1) * Tw - tex.h;
1947 2289
1948 if (expect_false (cell->player == player) && expect_false (z == 2)) 2290 if (expect_false (cell->player == player) && expect_false (z == 2))
1949 { 2291 {
1950 pl_x = px; 2292 pl_x = px;
1951 pl_y = py; 2293 pl_y = py;
1956 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2298 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1957 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2299 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1958 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2300 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1959 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2301 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1960 2302
1961 if (expect_false (cell->flags) && expect_false (z == 2))
1962 {
1963 // overlays such as the speech bubble, probably more to come
1964 if (cell->flags & 1)
1965 {
1966 maptex tex = self->tex [1];
1967 int px = x * T + T * 2 / 32;
1968 int py = y * T - T * 6 / 32;
1969
1970 if (tex.name)
1971 {
1972 if (key.texname != tex.name)
1973 {
1974 key.texname = tex.name;
1975 arr = rc_array (rc, &key);
1976 }
1977
1978 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1979 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1980 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1981 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1982 }
1983 }
1984 }
1985
1986 // update smooth hash 2303 // update smooth hash
1987 if (tex.smoothtile) 2304 if (tex.smoothtile)
1988 { 2305 {
1989 skey.tile = tex.smoothtile; 2306 skey.tile = tex.smoothtile;
1990 skey.level = tex.smoothlevel; 2307 skey.level = tex.smoothlevel;
2018 // corners 2335 // corners
2019 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2336 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2020 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2337 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2021 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2338 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2022 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2339 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2340 }
2341 }
2342
2343 if (expect_false (z == 2) && expect_false (cell->flags))
2344 {
2345 // overlays such as the speech bubble, probably more to come
2346 if (cell->flags & 1)
2347 {
2348 rc_key_t key_ov = key;
2349 maptex tex = self->tex [TEXID_SPEECH];
2350 rc_array_t *arr;
2351 int px = x * Tw + Tw * 2 / 32;
2352 int py = y * Th - Th * 6 / 32;
2353
2354 key_ov.texname = tex.name;
2355 arr = rc_array (rc_ov, &key_ov);
2356
2357 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2358 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2359 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2360 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2023 } 2361 }
2024 } 2362 }
2025 } 2363 }
2026 } 2364 }
2027 2365
2054 if (!(bits & 0x1000) 2392 if (!(bits & 0x1000)
2055 && skey->level == level 2393 && skey->level == level
2056 && level > smooth_max [skey->x][skey->y]) 2394 && level > smooth_max [skey->x][skey->y])
2057 { 2395 {
2058 maptex tex = self->tex [skey->tile]; 2396 maptex tex = self->tex [skey->tile];
2059 int px = (((int)skey->x) - 1) * T; 2397 int px = (((int)skey->x) - 1) * Tw;
2060 int py = (((int)skey->y) - 1) * T; 2398 int py = (((int)skey->y) - 1) * Th;
2061 int border = bits & 15; 2399 int border = bits & 15;
2062 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2063 float dx = tex.s * .0625f; // 16 images/row 2401 float dx = tex.s * .0625f; // 16 images/row
2064 float dy = tex.t * .5f ; // 2 images/column 2402 float dy = tex.t * .5f ; // 2 images/column
2065 2403
2067 { 2405 {
2068 // this time avoiding texture state changes 2406 // this time avoiding texture state changes
2069 // save gobs of state changes. 2407 // save gobs of state changes.
2070 if (key.texname != tex.name) 2408 if (key.texname != tex.name)
2071 { 2409 {
2410 self->tex [skey->tile].unused = 0;
2411
2072 glEnd (); 2412 glEnd ();
2073 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2074 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2075 } 2415 }
2076 2416
2077 if (border) 2417 if (border)
2078 { 2418 {
2079 float ox = border * dx; 2419 float ox = border * dx;
2080 2420
2081 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2082 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2083 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2084 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2085 } 2425 }
2086 2426
2087 if (corner) 2427 if (corner)
2088 { 2428 {
2089 float ox = corner * dx; 2429 float ox = corner * dx;
2090 2430
2091 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2092 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2093 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2094 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2095 } 2435 }
2096 } 2436 }
2097 } 2437 }
2098 } 2438 }
2099 } 2439 }
2122 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2462 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2123 2463
2124 rc_draw (rc); 2464 rc_draw (rc);
2125 } 2465 }
2126 2466
2467 rc_draw (rc_ov);
2468 rc_clear (rc_ov);
2469
2127 glDisable (GL_BLEND); 2470 glDisable (GL_BLEND);
2128 rc_free (rc); 2471 rc_free (rc);
2472 rc_free (rc_ov);
2129 2473
2130 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2131 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2132 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2133 { 2477 {
2136 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2137 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2138 { 2482 {
2139 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2140 2484
2141 int px = x * T; 2485 int px = x * Tw;
2142 int py = y * T; 2486 int py = y * Th;
2487
2488 if (expect_false (cell->player == player))
2489 {
2490 px += sdx;
2491 py += sdy;
2492 }
2143 2493
2144 if (cell->stat_hp) 2494 if (cell->stat_hp)
2145 { 2495 {
2146 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2147 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2148 2498
2149 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2150 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2151 px + width - 1, py); 2501 px + width - 1, py);
2152 2502
2158 } 2508 }
2159 } 2509 }
2160} 2510}
2161 2511
2162void 2512void
2163draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2513draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2164 CODE: 2514 CODE:
2165{ 2515{
2166 static float color[16][3] = { 2516 static float color[16][3] = {
2167 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2168 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2169 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2170 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2171 2521
2172 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2173 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2174 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2175 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2176 2526
2177 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2178 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2179 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2180 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2181 2531
2182 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2183 2533
2184 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2185 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2186 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2187 }; 2537 };
2188 2538
2189 int x, y; 2539 int x, y;
2190 2540
2191 glEnable (GL_TEXTURE_2D); 2541 glEnable (GL_TEXTURE_2D);
2542 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2543 * but the nvidia driver (185.18.14) mishandles alpha textures
2544 * and takes the colour from god knows where instead of using
2545 * Cp. MODULATE results in the same colour, but slightly different
2546 * alpha, but atcually gives us the correct colour with nvidia.
2547 */
2192 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2193 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2194 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2195 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2196 2552
2197 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2201 2557
2202 if (m) 2558 if (m)
2203 { 2559 {
2204 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2205 2561
2206 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2207 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2208 2564
2209 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2210 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2211 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2212 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2213 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2214 } 2570 }
2222void 2578void
2223fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2579fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2224 PPCODE: 2580 PPCODE:
2225{ 2581{
2226 int x, y; 2582 int x, y;
2227 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2228 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2229 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2230 int sw34 = (sw * 3 + 3) & ~3; 2586 int sw3 = sw * 3;
2587 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2588 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2231 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2232 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2233 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2234 2591
2235 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2236 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2237 2594
2238 mx += self->x - 1; 2595 mx += self->x - 1;
2239 my += self->y - 1; 2596 my += self->y - 1;
2240
2241 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2242 2597
2243 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2244 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2245 { 2600 {
2246 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2249 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2250 { 2605 {
2251 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2252 2607
2253 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2254 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2255 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2256 } 2611 }
2257 } 2612 }
2258 2613
2259 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2260 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2279 2634
2280 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2281 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2282 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2283 2638
2284 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2285 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2286 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2287 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2288 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2289 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2290 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2291 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2292 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2293 } 2648 }
2294 2649
2295 free (darkness1); 2650 free (darkness1);
2296 2651
2297 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2298 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2299 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2300 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2301} 2656}
2302 2657
2303SV * 2658SV *
2366 else 2721 else
2367 *data++ = 0; 2722 *data++ = 0;
2368 } 2723 }
2369 } 2724 }
2370 2725
2371 /* if size is w*h + 5 then no data has been found */ 2726 /* if size is w*h + 5 then no data has been found */
2372 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2373 { 2728 {
2374 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2375 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2376 } 2731 }
2377 2732
2378 RETVAL = data_sv; 2733 RETVAL = data_sv;
2379} 2734}
2380 OUTPUT: 2735 OUTPUT:
2381 RETVAL 2736 RETVAL
2382 2737
2383void 2738void
2390 STRLEN len; 2745 STRLEN len;
2391 uint8_t *data, *end; 2746 uint8_t *data, *end;
2392 2747
2393 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2394 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2395 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2396 end = data + len + 8; 2751 end = data + len + 8;
2397 2752
2398 if (len < 5) 2753 if (len < 5)
2399 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2400 2755
2461} 2816}
2462 2817
2463MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2464 2819
2465DC::RW 2820DC::RW
2466new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2467 CODE: 2822 CODE:
2468{ 2823{
2469 STRLEN datalen; 2824 STRLEN datalen;
2470 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2471 2826
2473} 2828}
2474 OUTPUT: 2829 OUTPUT:
2475 RETVAL 2830 RETVAL
2476 2831
2477DC::RW 2832DC::RW
2478new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2479 CODE: 2834 CODE:
2480 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2481 OUTPUT: 2836 OUTPUT:
2482 RETVAL 2837 RETVAL
2483 2838
2501 if (RETVAL < 0) 2856 if (RETVAL < 0)
2502 { 2857 {
2503 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2504 2859
2505 if (RETVAL < 0) 2860 if (RETVAL < 0)
2861 {
2862 // happens sometimes, maybe it just stopped playing(?)
2863 RETVAL = Mix_GroupAvailable (-1);
2864
2865 if (RETVAL < 0)
2506 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2507 2867 }
2868 else
2508 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2509 } 2870 }
2510 2871
2511 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2512 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2513} 2874}
2560void 2921void
2561set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2562 CODE: 2923 CODE:
2563{ 2924{
2564 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2925 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2565 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2926 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2566 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2567} 2928}
2568 2929
2569void 2930void
2570set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2573 2934
2574MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2575 2936
2576PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2577 2938
2939void
2940decoders ()
2941 PPCODE:
2942#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2943 int i, num = Mix_GetNumChunkDecoders ();
2944 EXTEND (SP, num);
2945 for (i = 0; i < num; ++i)
2946 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2947#else
2948 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2949#endif
2950
2578DC::MixChunk 2951DC::MixChunk
2579new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2580 CODE: 2953 CODE:
2581 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2582 OUTPUT: 2955 OUTPUT:
2583 RETVAL 2956 RETVAL
2584 2957
2614 OUTPUT: 2987 OUTPUT:
2615 RETVAL 2988 RETVAL
2616 2989
2617MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2618 2991
2992void
2993decoders ()
2994 PPCODE:
2995#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2996 int i, num = Mix_GetNumMusicDecoders ();
2997 EXTEND (SP, num);
2998 for (i = 0; i < num; ++i)
2999 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3000#else
3001 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3002#endif
3003
2619int 3004int
2620volume (int volume = -1) 3005volume (int volume = -1)
2621 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2622 CODE: 3007 CODE:
2623 if (items > 0) 3008 if (items > 0)
2634void 3019void
2635halt () 3020halt ()
2636 CODE: 3021 CODE:
2637 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2638 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2639DC::MixMusic 3031DC::MixMusic
2640new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2641 CODE: 3033 CODE:
2642 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2643 OUTPUT: 3035 OUTPUT:
2644 RETVAL 3036 RETVAL
2645 3037
2673 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2674# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2675 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2676 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2677 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2678 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2679 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2680 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2681 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2682 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2694 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2695 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2696 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2697 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2698 const_iv (GL_ONE_MINUS_DST_ALPHA), 3091 const_iv (GL_ONE_MINUS_DST_ALPHA),
3092 const_iv (GL_SRC_COLOR),
3093 const_iv (GL_DST_COLOR),
3094 const_iv (GL_ONE_MINUS_SRC_COLOR),
3095 const_iv (GL_ONE_MINUS_DST_COLOR),
2699 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2700 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2701 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2702 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2703 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2771 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2772 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2773 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2774 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2775 const_iv (GL_T2F_N3F_V3F), 3172 const_iv (GL_T2F_N3F_V3F),
3173 const_iv (GL_FUNC_ADD),
3174 const_iv (GL_FUNC_SUBTRACT),
3175 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2776# undef const_iv 3176# undef const_iv
2777 }; 3177 };
2778 3178
2779 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3179 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2780 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2781 3181
2782 texture_av = newAV (); 3182 texture_av = newAV ();
2783 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2784} 3184}
2785 3185
2787disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2788 CODE: 3188 CODE:
2789 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2790 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2791 3191
2792char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2793gl_vendor () 3196gl_vendor ()
2794 CODE: 3197 CODE:
2795 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2796 OUTPUT: 3199 OUTPUT:
2797 RETVAL 3200 RETVAL
2798 3201
2799char * 3202const char *
2800gl_version () 3203gl_version ()
2801 CODE: 3204 CODE:
2802 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2803 OUTPUT: 3206 OUTPUT:
2804 RETVAL 3207 RETVAL
2805 3208
2806char * 3209const char *
2807gl_extensions () 3210gl_extensions ()
2808 CODE: 3211 CODE:
2809 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2810 OUTPUT: 3213 OUTPUT:
2811 RETVAL 3214 RETVAL
2812 3215
2813const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2814 3221
2815GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2816 CODE: 3223 CODE:
2817 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2818 OUTPUT: 3225 OUTPUT:
2826 3233
2827int glGetError () 3234int glGetError ()
2828 3235
2829void glFinish () 3236void glFinish ()
2830 3237
3238void glFlush ()
3239
2831void glClear (int mask) 3240void glClear (int mask)
2832 3241
2833void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2834 PROTOTYPE: @ 3243 PROTOTYPE: @
2835 3244
2844void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2845 3254
2846void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2847 CODE: 3256 CODE:
2848 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2849 3260
2850void glDepthMask (int flag) 3261void glDepthMask (int flag)
2851 3262
2852void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2853 3264
2888void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2889 CODE: 3300 CODE:
2890 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2891 3302
2892void glColor (float r, float g, float b, float a = 1.0) 3303void glColor (float r, float g, float b, float a = 1.0)
3304 PROTOTYPE: @
2893 ALIAS: 3305 ALIAS:
2894 glColor_premultiply = 1 3306 glColor_premultiply = 1
2895 CODE: 3307 CODE:
2896 if (ix) 3308 if (ix)
2897 { 3309 {
3003 3415
3004void glEndList () 3416void glEndList ()
3005 3417
3006void glCallList (int list) 3418void glCallList (int list)
3007 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3008MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3009 3426
3010PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3011 3428
3012void 3429void
3013find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3014 PPCODE: 3431 PPCODE:
3015{ 3432{
3016 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3017 XPUSHs (self); 3434 XPUSHs (self);
3018} 3435}
3019 3436
3020BOOT: 3437BOOT:
3021{ 3438{
3029 3446
3030void 3447void
3031draw (SV *self) 3448draw (SV *self)
3032 CODE: 3449 CODE:
3033{ 3450{
3034 HV *hv; 3451 HV *hv;
3035 SV **svp; 3452 SV **svp;
3036 NV x, y, w, h; 3453 NV x, y, w, h;
3037 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3038 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3039 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3040 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines