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.268 by root, Sun Jul 20 02:57:43 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),
671 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 822 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
672 const_iv (SDL_GL_STEREO), 823 const_iv (SDL_GL_STEREO),
673 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 824 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
674 const_iv (SDL_GL_MULTISAMPLESAMPLES), 825 const_iv (SDL_GL_MULTISAMPLESAMPLES),
675 const_iv (SDL_GL_ACCELERATED_VISUAL), 826 const_iv (SDL_GL_ACCELERATED_VISUAL),
676 const_iv (SDL_GL_SWAP_CONTROL) 827 const_iv (SDL_GL_SWAP_CONTROL),
828
829 const_iv (FOW_DARKNESS)
677# undef const_iv 830# undef const_iv
678 }; 831 };
679 832
680 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--)
681 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 834 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
682 835
683 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 836 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
684 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 837 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
685} 838}
686 839
702NV ceil (NV x) 855NV ceil (NV x)
703 856
704IV minpot (UV n) 857IV minpot (UV n)
705 858
706IV 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
707 866
708void 867void
709pango_init () 868pango_init ()
710 CODE: 869 CODE:
711{ 870{
719#endif 878#endif
720} 879}
721 880
722char *SDL_GetError () 881char *SDL_GetError ()
723 882
883void SDL_main_hack (SV *real_main)
884 PROTOTYPE: &
885
724int SDL_Init (U32 flags) 886int SDL_Init (U32 flags)
725 887
726int SDL_InitSubSystem (U32 flags) 888int SDL_InitSubSystem (U32 flags)
727 889
728void SDL_QuitSubSystem (U32 flags) 890void SDL_QuitSubSystem (U32 flags)
729 891
730void SDL_Quit () 892void SDL_Quit ()
731 893
732int SDL_GL_SetAttribute (int attr, int value) 894int SDL_GL_SetAttribute (int attr, int value)
895 C_ARGS: (SDL_GLattr)attr, value
733 896
734int SDL_GL_GetAttribute (int attr) 897int SDL_GL_GetAttribute (int attr)
735 CODE: 898 CODE:
736 if (SDL_GL_GetAttribute (attr, &RETVAL)) 899 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
737 XSRETURN_UNDEF; 900 XSRETURN_UNDEF;
738 OUTPUT: 901 OUTPUT:
739 RETVAL 902 RETVAL
740 903
741void 904void
796 ); 959 );
797 960
798 if (RETVAL) 961 if (RETVAL)
799 { 962 {
800 av_clear (texture_av); 963 av_clear (texture_av);
801
802 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
803#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);
804#include "glfunc.h" 965#include "glfunc.h"
805#undef GL_FUNC 966#undef GL_FUNC
967 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
968 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
806 } 969 }
807} 970}
808 OUTPUT: 971 OUTPUT:
809 RETVAL 972 RETVAL
973
974void
975SDL_WM_SetCaption (const char *title, const char *icon)
810 976
811void 977void
812SDL_GL_SwapBuffers () 978SDL_GL_SwapBuffers ()
813 979
814char * 980char *
815SDL_GetKeyName (int sym) 981SDL_GetKeyName (int sym)
982 C_ARGS: (SDLKey)sym
816 983
817int 984int
818SDL_GetAppState () 985SDL_GetAppState ()
819 986
820int 987int
821SDL_GetModState () 988SDL_GetModState ()
822 989
990int
991SDL_WaitEvent ()
992 C_ARGS: 0
993
823void 994void
995SDL_PumpEvents ()
996
997void
824poll_events () 998peep_events ()
825 PPCODE: 999 PPCODE:
826{ 1000{
827 SDL_Event ev; 1001 SDL_Event ev;
828 1002
829 SDL_PumpEvents (); 1003 SDL_PumpEvents ();
836 { 1010 {
837 case SDL_KEYDOWN: 1011 case SDL_KEYDOWN:
838 case SDL_KEYUP: 1012 case SDL_KEYUP:
839 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1013 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
840 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1014 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
841 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);
842 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 */
843 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1017 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
844 break; 1018 break;
845 1019
846 case SDL_ACTIVEEVENT: 1020 case SDL_ACTIVEEVENT:
847 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1021 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
865 x = ev.motion.x; 1039 x = ev.motion.x;
866 y = ev.motion.y; 1040 y = ev.motion.y;
867 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1041 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
868 } 1042 }
869 1043
870 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1044 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
871 hv_store (hv, "state", 5, newSViv (state), 0); 1045 hv_store (hv, "state", 5, newSViv (state), 0);
872 hv_store (hv, "x", 1, newSViv (x), 0); 1046 hv_store (hv, "x", 1, newSViv (x), 0);
873 hv_store (hv, "y", 1, newSViv (y), 0); 1047 hv_store (hv, "y", 1, newSViv (y), 0);
874 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1048 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
875 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1049 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
895 1069
896 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))));
897 } 1071 }
898} 1072}
899 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
900int 1087int
901Mix_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)
902 POSTCALL: 1089 POSTCALL:
903 Mix_HookMusicFinished (music_finished); 1090 Mix_HookMusicFinished (music_finished);
904 Mix_ChannelFinished (channel_finished); 1091 Mix_ChannelFinished (channel_finished);
905 1092
906void 1093void
907Mix_QuerySpec () 1094Mix_QuerySpec ()
966add_font (char *file) 1153add_font (char *file)
967 CODE: 1154 CODE:
968 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1155 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
969 OUTPUT: 1156 OUTPUT:
970 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)
971 1165
972void 1166void
973load_image_inline (SV *image_) 1167load_image_inline (SV *image_)
974 ALIAS: 1168 ALIAS:
975 load_image_file = 1 1169 load_image_file = 1
1021 1215
1022 SDL_LockSurface (surface2); 1216 SDL_LockSurface (surface2);
1023 EXTEND (SP, 6); 1217 EXTEND (SP, 6);
1024 PUSHs (sv_2mortal (newSViv (surface2->w))); 1218 PUSHs (sv_2mortal (newSViv (surface2->w)));
1025 PUSHs (sv_2mortal (newSViv (surface2->h))); 1219 PUSHs (sv_2mortal (newSViv (surface2->h)));
1026 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1220 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1027 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)));
1028 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1222 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1029 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1223 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1030 SDL_UnlockSurface (surface2); 1224 SDL_UnlockSurface (surface2);
1031 1225
1091#if DEBUG 1285#if DEBUG
1092 VALGRIND_DO_LEAK_CHECK; 1286 VALGRIND_DO_LEAK_CHECK;
1093#endif 1287#endif
1094} 1288}
1095 1289
1290int
1291SvREFCNT (SV *sv)
1292 CODE:
1293 RETVAL = SvREFCNT (sv);
1294 OUTPUT:
1295 RETVAL
1296
1096MODULE = Deliantra::Client PACKAGE = DC::Font 1297MODULE = Deliantra::Client PACKAGE = DC::Font
1097 1298
1098PROTOTYPES: DISABLE 1299PROTOTYPES: DISABLE
1099 1300
1100DC::Font 1301DC::Font
1101new_from_file (SV *class, char *path, int id = 0) 1302new_from_file (SV *klass, char *path, int id = 0)
1102 CODE: 1303 CODE:
1103{ 1304{
1104 int count; 1305 int count;
1105 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1306 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1106 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1307 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1135 PROTOTYPE: 1336 PROTOTYPE:
1136 CODE: 1337 CODE:
1137 tc_restore (); 1338 tc_restore ();
1138 1339
1139DC::Layout 1340DC::Layout
1140new (SV *class) 1341new (SV *klass)
1141 CODE: 1342 CODE:
1142 New (0, RETVAL, 1, struct cf_layout); 1343 New (0, RETVAL, 1, struct cf_layout);
1143 1344
1144 RETVAL->pl = pango_layout_new (opengl_context); 1345 RETVAL->pl = pango_layout_new (opengl_context);
1145 RETVAL->r = 1.; 1346 RETVAL->r = 1.;
1294 1495
1295void 1496void
1296set_height (DC::Layout self, int base_height) 1497set_height (DC::Layout self, int base_height)
1297 CODE: 1498 CODE:
1298 if (self->base_height != base_height) 1499 if (self->base_height != base_height)
1299 { 1500 {
1300 self->base_height = base_height; 1501 self->base_height = base_height;
1301 layout_update_font (self); 1502 layout_update_font (self);
1302 } 1503 }
1303 1504
1304void 1505void
1531 glDisable (GL_ALPHA_TEST); 1732 glDisable (GL_ALPHA_TEST);
1532 glDisable (GL_BLEND); 1733 glDisable (GL_BLEND);
1533 } 1734 }
1534} 1735}
1535 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
1536IV 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)
1537 CODE: 1859 CODE:
1538{ 1860{
1539 GLint width; 1861 GLint width;
1540 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);
1547MODULE = Deliantra::Client PACKAGE = DC::Map 1869MODULE = Deliantra::Client PACKAGE = DC::Map
1548 1870
1549PROTOTYPES: DISABLE 1871PROTOTYPES: DISABLE
1550 1872
1551DC::Map 1873DC::Map
1552new (SV *class) 1874new (SV *klass)
1553 CODE: 1875 CODE:
1554 New (0, RETVAL, 1, struct map); 1876 New (0, RETVAL, 1, struct map);
1555 RETVAL->x = 0; 1877 RETVAL->x = 0;
1556 RETVAL->y = 0; 1878 RETVAL->y = 0;
1557 RETVAL->w = 0; 1879 RETVAL->w = 0;
1596 1918
1597void 1919void
1598set_smooth (DC::Map self, int face, int smooth, int level) 1920set_smooth (DC::Map self, int face, int smooth, int level)
1599 CODE: 1921 CODE:
1600{ 1922{
1601 tileid texid; 1923 tileid texid;
1602 maptex *tex; 1924 maptex *tex;
1603 1925
1604 if (face < 0 || face >= self->faces) 1926 if (face < 0 || face >= self->faces)
1605 return; 1927 return;
1606 1928
1607 if (smooth < 0 || smooth >= self->faces) 1929 if (smooth < 0 || smooth >= self->faces)
1608 return; 1930 return;
1609 1931
1610 texid = self->face2tile [face]; 1932 texid = self->face2tile [face];
1611 1933
1612 if (!texid) 1934 if (!texid)
1613 return; 1935 return;
1614 1936
1615 tex = self->tex + texid; 1937 tex = self->tex + texid;
1644 //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);
1645 // use uglier nearest interpolation because linear suffers 1967 // use uglier nearest interpolation because linear suffers
1646 // from transparent color bleeding and ugly wrapping effects. 1968 // from transparent color bleeding and ugly wrapping effects.
1647 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1969 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1648} 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 }
1649 1991
1650int 1992int
1651ox (DC::Map self) 1993ox (DC::Map self)
1652 ALIAS: 1994 ALIAS:
1653 oy = 1 1995 oy = 1
1693 self->y += MAP_EXTEND_Y; 2035 self->y += MAP_EXTEND_Y;
1694 } 2036 }
1695} 2037}
1696 2038
1697SV * 2039SV *
1698map1a_update (DC::Map self, SV *data_, int extmap) 2040map1a_update (DC::Map self, SV *data_)
1699 CODE: 2041 CODE:
1700{ 2042{
1701 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2043 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1702 uint8_t *data_end = (uint8_t *)SvEND (data_); 2044 uint8_t *data_end = (uint8_t *)SvEND (data_);
1703 mapcell *cell; 2045 mapcell *cell;
1724 2066
1725 //TODO: don't trust server data to be in-range(!) 2067 //TODO: don't trust server data to be in-range(!)
1726 2068
1727 if (flags & 8) 2069 if (flags & 8)
1728 { 2070 {
2071 uint8_t ext, cmd;
2072
1729 if (extmap) 2073 do
1730 { 2074 {
1731 uint8_t ext, cmd; 2075 ext = *data++;
2076 cmd = ext & 0x7f;
1732 2077
1733 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
1734 { 2081 {
1735 ext = *data++;
1736 cmd = ext & 0x7f;
1737
1738 if (cmd < 4)
1739 cell->darkness = 255 - ext * 64 + 1;
1740 else if (cmd == 5) // health
1741 {
1742 cell->stat_width = 1; 2082 cell->stat_width = 1;
1743 cell->stat_hp = *data++; 2083 cell->stat_hp = *data++;
1744 }
1745 else if (cmd == 6) // monster width
1746 cell->stat_width = *data++ + 1;
1747 else if (cmd == 0x47)
1748 {
1749 if (*data == 1) cell->player = data [1];
1750 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1751 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1752 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1753
1754 data += *data + 1;
1755 }
1756 else if (cmd == 8) // cell flags
1757 cell->flags = *data++;
1758 else if (ext & 0x40) // unknown, multibyte => skip
1759 data += *data + 1;
1760 else
1761 data++;
1762 } 2084 }
1763 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++;
1764 } 2102 }
1765 else 2103 while (ext & 0x80);
1766 cell->darkness = *data++ + 1;
1767 } 2104 }
1768 2105
1769 for (z = 0; z <= 2; ++z) 2106 for (z = 0; z <= 2; ++z)
1770 if (flags & (4 >> z)) 2107 if (flags & (4 >> z))
1771 { 2108 {
1774 cell->tile [z] = self->face2tile [face]; 2111 cell->tile [z] = self->face2tile [face];
1775 2112
1776 if (cell->tile [z]) 2113 if (cell->tile [z])
1777 { 2114 {
1778 maptex *tex = self->tex + cell->tile [z]; 2115 maptex *tex = self->tex + cell->tile [z];
2116 tex->unused = 0;
1779 if (!tex->name) 2117 if (!tex->name)
1780 av_push (missing, newSViv (cell->tile [z])); 2118 av_push (missing, newSViv (cell->tile [z]));
1781 2119
1782 if (tex->smoothtile) 2120 if (tex->smoothtile)
1783 { 2121 {
1784 maptex *smooth = self->tex + tex->smoothtile; 2122 maptex *smooth = self->tex + tex->smoothtile;
2123 smooth->unused = 0;
1785 if (!smooth->name) 2124 if (!smooth->name)
1786 av_push (missing, newSViv (tex->smoothtile)); 2125 av_push (missing, newSViv (tex->smoothtile));
1787 } 2126 }
1788 } 2127 }
1789 } 2128 }
1817 ? self->row + y 2156 ? self->row + y
1818 : 0; 2157 : 0;
1819 2158
1820 for (x = x0; x < x1; x++) 2159 for (x = x0; x < x1; x++)
1821 { 2160 {
1822 int r = 32, g = 32, b = 32, a = 192; 2161 unsigned int r = 32, g = 32, b = 32, a = 192;
1823 2162
1824 if (row && row->c0 <= x && x < row->c1) 2163 if (row && row->c0 <= x && x < row->c1)
1825 { 2164 {
1826 mapcell *cell = row->col + (x - row->c0); 2165 mapcell *cell = row->col + (x - row->c0);
1827 2166
1829 { 2168 {
1830 maptex tex = self->tex [cell->tile [z]]; 2169 maptex tex = self->tex [cell->tile [z]];
1831 int a0 = 255 - tex.a; 2170 int a0 = 255 - tex.a;
1832 int a1 = tex.a; 2171 int a1 = tex.a;
1833 2172
1834 r = (r * a0 + tex.r * a1) / 255; 2173 r = div255 (r * a0 + tex.r * a1);
1835 g = (g * a0 + tex.g * a1) / 255; 2174 g = div255 (g * a0 + tex.g * a1);
1836 b = (b * a0 + tex.b * a1) / 255; 2175 b = div255 (b * a0 + tex.b * a1);
1837 a = (a * a0 + tex.a * a1) / 255; 2176 a = div255 (a * a0 + tex.a * a1);
1838 } 2177 }
1839 } 2178 }
1840 2179
1841 *map++ = (r ) 2180 *map++ = (r )
1842 | (g << 8) 2181 | (g << 8)
1843 | (b << 16) 2182 | (b << 16)
1844 | (a << 24); 2183 | (a << 24);
1845 } 2184 }
1846 } 2185 }
1847 2186
1848 RETVAL = map_sv; 2187 RETVAL = map_sv;
1849} 2188}
1850 OUTPUT: 2189 OUTPUT:
1851 RETVAL 2190 RETVAL
1852 2191
1853void 2192void
1854draw (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)
1855 CODE: 2194 CODE:
1856{ 2195{
1857 int x, y, z; 2196 int x, y, z;
1858 2197
1859 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2198 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1860 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
1861 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)
1862 smooth_key skey; 2201 smooth_key skey;
1863 int pl_x, pl_y; 2202 int pl_x, pl_y;
1864 maptex pl_tex; 2203 maptex pl_tex;
1865 rc_t *rc = rc_alloc (); 2204 rc_t *rc = rc_alloc ();
2205 rc_t *rc_ov = rc_alloc ();
1866 rc_key_t key; 2206 rc_key_t key;
1867 rc_array_t *arr; 2207 rc_array_t *arr;
1868 2208
1869 pl_tex.name = 0; 2209 pl_tex.name = 0;
1870 2210
1871 // thats current max. sorry. 2211 // that's current max. sorry.
1872 if (sw > 255) sw = 255; 2212 if (sw > 255) sw = 255;
1873 if (sh > 255) sh = 255; 2213 if (sh > 255) sh = 255;
1874 2214
1875 // clear key, in case of extra padding 2215 // clear key, in case of extra padding
1876 memset (&skey, 0, sizeof (skey)); 2216 memset (&skey, 0, sizeof (skey));
1880 key.g = 255; 2220 key.g = 255;
1881 key.b = 255; 2221 key.b = 255;
1882 key.a = 255; 2222 key.a = 255;
1883 key.mode = GL_QUADS; 2223 key.mode = GL_QUADS;
1884 key.format = GL_T2F_V3F; 2224 key.format = GL_T2F_V3F;
1885 key.texname = -1;
1886 2225
1887 mx += self->x; 2226 mx += self->x;
1888 my += self->y; 2227 my += self->y;
1889 2228
1890 // first pass: determine smooth_max 2229 // first pass: determine smooth_max
1914 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2253 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1915 2254
1916 for (z = 0; z <= 2; z++) 2255 for (z = 0; z <= 2; z++)
1917 { 2256 {
1918 memset (smooth_level, 0, sizeof (smooth_level)); 2257 memset (smooth_level, 0, sizeof (smooth_level));
2258 key.texname = -1;
1919 2259
1920 for (y = 0; y < sh; y++) 2260 for (y = 0; y < sh; y++)
1921 if (0 <= y + my && y + my < self->rows) 2261 if (0 <= y + my && y + my < self->rows)
1922 { 2262 {
1923 maprow *row = self->row + (y + my); 2263 maprow *row = self->row + (y + my);
1929 tileid tile = cell->tile [z]; 2269 tileid tile = cell->tile [z];
1930 2270
1931 if (tile) 2271 if (tile)
1932 { 2272 {
1933 maptex tex = self->tex [tile]; 2273 maptex tex = self->tex [tile];
1934 int px = (x + 1) * T - tex.w; 2274 int px, py;
1935 int py = (y + 1) * T - tex.h;
1936 2275
1937 if (key.texname != tex.name) 2276 if (key.texname != tex.name)
1938 { 2277 {
2278 self->tex [tile].unused = 0;
2279
1939 if (!tex.name) 2280 if (!tex.name)
1940 tex = self->tex [2]; /* missing, replace by noface */ 2281 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1941 2282
1942 key.texname = tex.name; 2283 key.texname = tex.name;
1943 arr = rc_array (rc, &key); 2284 arr = rc_array (rc, &key);
1944 } 2285 }
2286
2287 px = (x + 1) * Th - tex.w;
2288 py = (y + 1) * Tw - tex.h;
1945 2289
1946 if (expect_false (cell->player == player) && expect_false (z == 2)) 2290 if (expect_false (cell->player == player) && expect_false (z == 2))
1947 { 2291 {
1948 pl_x = px; 2292 pl_x = px;
1949 pl_y = py; 2293 pl_y = py;
1954 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2298 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1955 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);
1956 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);
1957 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);
1958 2302
1959 if (expect_false (cell->flags) && expect_false (z == 2))
1960 {
1961 // overlays such as the speech bubble, probably more to come
1962 if (cell->flags & 1)
1963 {
1964 maptex tex = self->tex [1];
1965 int px = x * T + T * 2 / 32;
1966 int py = y * T - T * 6 / 32;
1967
1968 if (tex.name)
1969 {
1970 if (key.texname != tex.name)
1971 {
1972 key.texname = tex.name;
1973 arr = rc_array (rc, &key);
1974 }
1975
1976 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1977 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1978 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1979 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1980 }
1981 }
1982 }
1983
1984 // update smooth hash 2303 // update smooth hash
1985 if (tex.smoothtile) 2304 if (tex.smoothtile)
1986 { 2305 {
1987 skey.tile = tex.smoothtile; 2306 skey.tile = tex.smoothtile;
1988 skey.level = tex.smoothlevel; 2307 skey.level = tex.smoothlevel;
2016 // corners 2335 // corners
2017 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);
2018 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);
2019 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);
2020 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);
2021 } 2361 }
2022 } 2362 }
2023 } 2363 }
2024 } 2364 }
2025 2365
2052 if (!(bits & 0x1000) 2392 if (!(bits & 0x1000)
2053 && skey->level == level 2393 && skey->level == level
2054 && level > smooth_max [skey->x][skey->y]) 2394 && level > smooth_max [skey->x][skey->y])
2055 { 2395 {
2056 maptex tex = self->tex [skey->tile]; 2396 maptex tex = self->tex [skey->tile];
2057 int px = (((int)skey->x) - 1) * T; 2397 int px = (((int)skey->x) - 1) * Tw;
2058 int py = (((int)skey->y) - 1) * T; 2398 int py = (((int)skey->y) - 1) * Th;
2059 int border = bits & 15; 2399 int border = bits & 15;
2060 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2061 float dx = tex.s * .0625f; // 16 images/row 2401 float dx = tex.s * .0625f; // 16 images/row
2062 float dy = tex.t * .5f ; // 2 images/column 2402 float dy = tex.t * .5f ; // 2 images/column
2063 2403
2065 { 2405 {
2066 // this time avoiding texture state changes 2406 // this time avoiding texture state changes
2067 // save gobs of state changes. 2407 // save gobs of state changes.
2068 if (key.texname != tex.name) 2408 if (key.texname != tex.name)
2069 { 2409 {
2410 self->tex [skey->tile].unused = 0;
2411
2070 glEnd (); 2412 glEnd ();
2071 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2072 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2073 } 2415 }
2074 2416
2075 if (border) 2417 if (border)
2076 { 2418 {
2077 float ox = border * dx; 2419 float ox = border * dx;
2078 2420
2079 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2080 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2081 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2082 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2083 } 2425 }
2084 2426
2085 if (corner) 2427 if (corner)
2086 { 2428 {
2087 float ox = corner * dx; 2429 float ox = corner * dx;
2088 2430
2089 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2090 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2091 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2092 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2093 } 2435 }
2094 } 2436 }
2095 } 2437 }
2096 } 2438 }
2097 } 2439 }
2120 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);
2121 2463
2122 rc_draw (rc); 2464 rc_draw (rc);
2123 } 2465 }
2124 2466
2467 rc_draw (rc_ov);
2468 rc_clear (rc_ov);
2469
2125 glDisable (GL_BLEND); 2470 glDisable (GL_BLEND);
2126 rc_free (rc); 2471 rc_free (rc);
2472 rc_free (rc_ov);
2127 2473
2128 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2129 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2130 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2131 { 2477 {
2134 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2135 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2136 { 2482 {
2137 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2138 2484
2139 int px = x * T; 2485 int px = x * Tw;
2140 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 }
2141 2493
2142 if (cell->stat_hp) 2494 if (cell->stat_hp)
2143 { 2495 {
2144 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2145 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2146 2498
2147 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2148 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2149 px + width - 1, py); 2501 px + width - 1, py);
2150 2502
2156 } 2508 }
2157 } 2509 }
2158} 2510}
2159 2511
2160void 2512void
2161draw_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)
2162 CODE: 2514 CODE:
2163{ 2515{
2164 static float color[16][3] = { 2516 static float color[16][3] = {
2165 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2166 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2167 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2168 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2169 2521
2170 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2171 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2172 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2173 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2174 2526
2175 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2176 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2177 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2178 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2179 2531
2180 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2181 2533
2182 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2183 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2184 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2185 }; 2537 };
2186 2538
2187 int x, y; 2539 int x, y;
2188 2540
2189 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 */
2190 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2191 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2192 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2193 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2194 2552
2195 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2199 2557
2200 if (m) 2558 if (m)
2201 { 2559 {
2202 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2203 2561
2204 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2205 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2206 2564
2207 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2208 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2209 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2210 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2211 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2212 } 2570 }
2220void 2578void
2221fow_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)
2222 PPCODE: 2580 PPCODE:
2223{ 2581{
2224 int x, y; 2582 int x, y;
2225 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2226 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2227 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2228 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);
2229 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2230 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2231 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2232 2591
2233 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2234 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2235 2594
2236 mx += self->x - 1; 2595 mx += self->x - 1;
2237 my += self->y - 1; 2596 my += self->y - 1;
2238
2239 memset (darkness1, 255, sw1 * sh1);
2240 2597
2241 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2242 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2243 { 2600 {
2244 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2247 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2248 { 2605 {
2249 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2250 2607
2251 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2252 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2253 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2254 } 2611 }
2255 } 2612 }
2256 2613
2257 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2258 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2277 2634
2278 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2279 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2280 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2281 2638
2282 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2283 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2284 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2286 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 */
2287 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2289 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2290 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2291 } 2648 }
2292 2649
2293 free (darkness1); 2650 free (darkness1);
2294 2651
2295 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2296 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2297 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2298 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2299} 2656}
2300 2657
2301SV * 2658SV *
2364 else 2721 else
2365 *data++ = 0; 2722 *data++ = 0;
2366 } 2723 }
2367 } 2724 }
2368 2725
2369 /* 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 */
2370 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2371 { 2728 {
2372 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2373 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2374 } 2731 }
2375 2732
2376 RETVAL = data_sv; 2733 RETVAL = data_sv;
2377} 2734}
2378 OUTPUT: 2735 OUTPUT:
2379 RETVAL 2736 RETVAL
2380 2737
2381void 2738void
2388 STRLEN len; 2745 STRLEN len;
2389 uint8_t *data, *end; 2746 uint8_t *data, *end;
2390 2747
2391 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2392 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2393 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2394 end = data + len + 8; 2751 end = data + len + 8;
2395 2752
2396 if (len < 5) 2753 if (len < 5)
2397 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2398 2755
2459} 2816}
2460 2817
2461MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2462 2819
2463DC::RW 2820DC::RW
2464new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2465 CODE: 2822 CODE:
2466{ 2823{
2467 STRLEN datalen; 2824 STRLEN datalen;
2468 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2469 2826
2471} 2828}
2472 OUTPUT: 2829 OUTPUT:
2473 RETVAL 2830 RETVAL
2474 2831
2475DC::RW 2832DC::RW
2476new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2477 CODE: 2834 CODE:
2478 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2479 OUTPUT: 2836 OUTPUT:
2480 RETVAL 2837 RETVAL
2481 2838
2499 if (RETVAL < 0) 2856 if (RETVAL < 0)
2500 { 2857 {
2501 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2502 2859
2503 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)
2504 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2505 2867 }
2868 else
2506 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2507 } 2870 }
2508 2871
2509 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2510 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2511} 2874}
2558void 2921void
2559set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2560 CODE: 2923 CODE:
2561{ 2924{
2562 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));
2563 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;
2564 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2565} 2928}
2566 2929
2567void 2930void
2568set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2571 2934
2572MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2573 2936
2574PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2575 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
2576DC::MixChunk 2951DC::MixChunk
2577new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2578 CODE: 2953 CODE:
2579 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2580 OUTPUT: 2955 OUTPUT:
2581 RETVAL 2956 RETVAL
2582 2957
2612 OUTPUT: 2987 OUTPUT:
2613 RETVAL 2988 RETVAL
2614 2989
2615MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2616 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
2617int 3004int
2618volume (int volume = -1) 3005volume (int volume = -1)
2619 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2620 CODE: 3007 CODE:
2621 if (items > 0) 3008 if (items > 0)
2632void 3019void
2633halt () 3020halt ()
2634 CODE: 3021 CODE:
2635 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2636 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2637DC::MixMusic 3031DC::MixMusic
2638new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2639 CODE: 3033 CODE:
2640 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2641 OUTPUT: 3035 OUTPUT:
2642 RETVAL 3036 RETVAL
2643 3037
2671 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2672# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2673 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2674 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2675 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2676 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2677 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2678 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2679 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2680 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2692 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2693 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2694 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2695 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2696 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),
2697 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2698 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2699 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2700 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2701 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2769 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2770 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2771 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2772 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2773 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),
2774# undef const_iv 3176# undef const_iv
2775 }; 3177 };
2776 3178
2777 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--)
2778 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2779 3181
2780 texture_av = newAV (); 3182 texture_av = newAV ();
2781 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2782} 3184}
2783 3185
2785disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2786 CODE: 3188 CODE:
2787 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2788 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2789 3191
2790char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2791gl_vendor () 3196gl_vendor ()
2792 CODE: 3197 CODE:
2793 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2794 OUTPUT: 3199 OUTPUT:
2795 RETVAL 3200 RETVAL
2796 3201
2797char * 3202const char *
2798gl_version () 3203gl_version ()
2799 CODE: 3204 CODE:
2800 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2801 OUTPUT: 3206 OUTPUT:
2802 RETVAL 3207 RETVAL
2803 3208
2804char * 3209const char *
2805gl_extensions () 3210gl_extensions ()
2806 CODE: 3211 CODE:
2807 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2808 OUTPUT: 3213 OUTPUT:
2809 RETVAL 3214 RETVAL
2810 3215
2811const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2812 3221
2813GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2814 CODE: 3223 CODE:
2815 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2816 OUTPUT: 3225 OUTPUT:
2824 3233
2825int glGetError () 3234int glGetError ()
2826 3235
2827void glFinish () 3236void glFinish ()
2828 3237
3238void glFlush ()
3239
2829void glClear (int mask) 3240void glClear (int mask)
2830 3241
2831void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2832 PROTOTYPE: @ 3243 PROTOTYPE: @
2833 3244
2842void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2843 3254
2844void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2845 CODE: 3256 CODE:
2846 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2847 3260
2848void glDepthMask (int flag) 3261void glDepthMask (int flag)
2849 3262
2850void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2851 3264
2886void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2887 CODE: 3300 CODE:
2888 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2889 3302
2890void 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: @
2891 ALIAS: 3305 ALIAS:
2892 glColor_premultiply = 1 3306 glColor_premultiply = 1
2893 CODE: 3307 CODE:
2894 if (ix) 3308 if (ix)
2895 { 3309 {
3001 3415
3002void glEndList () 3416void glEndList ()
3003 3417
3004void glCallList (int list) 3418void glCallList (int list)
3005 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3006MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3007 3426
3008PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3009 3428
3010void 3429void
3011find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3012 PPCODE: 3431 PPCODE:
3013{ 3432{
3014 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3015 XPUSHs (self); 3434 XPUSHs (self);
3016} 3435}
3017 3436
3018BOOT: 3437BOOT:
3019{ 3438{
3027 3446
3028void 3447void
3029draw (SV *self) 3448draw (SV *self)
3030 CODE: 3449 CODE:
3031{ 3450{
3032 HV *hv; 3451 HV *hv;
3033 SV **svp; 3452 SV **svp;
3034 NV x, y, w, h; 3453 NV x, y, w, h;
3035 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3036 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3037 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3038 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