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.274 by root, Wed Aug 20 17:50:47 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>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
44/* work around os x broken headers */ 43/* work around os x broken headers */
45#ifdef __MACOSX__ 44#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 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);
47#endif 48#endif
48 49
49#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
51 52
52#include <glib/gmacros.h> 53#include <glib.h>
53 54
54#include <pango/pango.h> 55#include <pango/pango.h>
55 56
56#ifndef PANGO_VERSION_CHECK 57#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 58# define PANGO_VERSION_CHECK(a,b,c) 0
81#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
83 84
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 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 */
86#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
87 91
88#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
90 94
91#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
92 96
93/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
94#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}
95 123
96static AV *texture_av; 124static AV *texture_av;
97 125
98static struct 126static struct
99{ 127{
156{ 184{
157 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
158 186
159 while (attrs) 187 while (attrs)
160 { 188 {
161 PangoAttribute *attr = attrs->data; 189 PangoAttribute *attr = (PangoAttribute *)attrs->data;
162 190
163 if (attr->klass->type == PANGO_ATTR_SHAPE) 191 if (attr->klass->type == PANGO_ATTR_SHAPE)
164 return 1; 192 return 1;
165 193
166 attrs = attrs->next; 194 attrs = attrs->next;
184static void 212static void
185substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
186{ 214{
187 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
188#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
189 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
190#endif 218#endif
191 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
192} 220}
193 221
194static void 222static void
231 int w, h; 259 int w, h;
232 float s, t; 260 float s, t;
233 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
234 tileid smoothtile; 262 tileid smoothtile;
235 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
236} maptex; 265} maptex;
237 266
238typedef struct { 267typedef struct {
239 uint32_t player; 268 uint32_t player;
240 tileid tile[3]; 269 tileid tile[3];
452 ev.data2 = 0; 481 ev.data2 = 0;
453 482
454 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
455} 484}
456 485
486// approximately divide by 255
487static unsigned int
488div255 (unsigned int n)
489{
490 return (n + (n >> 8)) >> 8;
491}
492
457static unsigned int 493static unsigned int
458minpot (unsigned int n) 494minpot (unsigned int n)
459{ 495{
460 if (!n) 496 if (!n)
461 return 0; 497 return 0;
527 return 0; 563 return 0;
528 564
529 return 1; 565 return 1;
530} 566}
531 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
532static void 582static void
533deliantra_main () 583deliantra_main (SV *real_main)
534{ 584{
535 char *argv[] = { 0 }; 585 dSP;
536 call_argv ("::main", G_DISCARD | G_VOID, argv); 586
587 PUSHMARK (SP);
588 call_sv (real_main, G_DISCARD | G_VOID);
537} 589}
538 590
539#ifdef __MACOSX__ 591#ifdef __MACOSX__
592 static SV *real_main;
593
540 /* to due surprising braindamage on the side of SDL design, we 594 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main() 595 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which, 596 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 597 * due to shared library magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back. 598 * and which calls our main (== SDL_main) back.
545 */ 599 */
546 extern C_LINKAGE int 600 extern C_LINKAGE int
547 main (int argc, char *argv[]) 601 main (int argc, char *argv[])
548 { 602 {
549 deliantra_main (); 603 deliantra_main (real_main);
550 } 604 }
551 605
552 #undef main 606 #undef main
553 607
554 extern C_LINKAGE int main (int argc, char *argv[]); 608 extern C_LINKAGE int main (int argc, char *argv[]);
555 609
556 static void 610 static void
557 SDL_braino (void) 611 SDL_main_hack (SV *real_main_)
558 { 612 {
613 real_main = real_main_;
614
559 char *argv[] = { "deliantra client", 0 }; 615 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv); 616 (main) (1, argv);
561 } 617 }
562#else 618#else
563 static void 619 static void
564 SDL_braino (void) 620 SDL_main_hack (SV *real_main)
565 { 621 {
566 deliantra_main (); 622 deliantra_main (real_main);
567 } 623 }
568#endif 624#endif
569 625
570MODULE = Deliantra::Client PACKAGE = DC 626MODULE = Deliantra::Client PACKAGE = DC
571 627
602 const_iv (SDL_USEREVENT), 658 const_iv (SDL_USEREVENT),
603 659
604 const_iv (SDL_APPINPUTFOCUS), 660 const_iv (SDL_APPINPUTFOCUS),
605 const_iv (SDL_APPMOUSEFOCUS), 661 const_iv (SDL_APPMOUSEFOCUS),
606 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),
607 713
608 const_iv (SDLK_FIRST), 714 const_iv (SDLK_FIRST),
609 const_iv (SDLK_LAST), 715 const_iv (SDLK_LAST),
610 const_iv (SDLK_KP0), 716 const_iv (SDLK_KP0),
611 const_iv (SDLK_KP1), 717 const_iv (SDLK_KP1),
687 const_iv (KMOD_RMETA), 793 const_iv (KMOD_RMETA),
688 const_iv (KMOD_NUM), 794 const_iv (KMOD_NUM),
689 const_iv (KMOD_CAPS), 795 const_iv (KMOD_CAPS),
690 const_iv (KMOD_MODE), 796 const_iv (KMOD_MODE),
691 797
798 const_iv (KMOD_LRAM),
799
692 const_iv (MIX_DEFAULT_FORMAT), 800 const_iv (MIX_DEFAULT_FORMAT),
693 801
694 const_iv (SDL_INIT_TIMER), 802 const_iv (SDL_INIT_TIMER),
695 const_iv (SDL_INIT_AUDIO), 803 const_iv (SDL_INIT_AUDIO),
696 const_iv (SDL_INIT_VIDEO), 804 const_iv (SDL_INIT_VIDEO),
720 828
721 const_iv (FOW_DARKNESS) 829 const_iv (FOW_DARKNESS)
722# undef const_iv 830# undef const_iv
723 }; 831 };
724 832
725 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--)
726 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 834 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
727 835
728 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 836 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
729 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 837 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
730} 838}
731 839
747NV ceil (NV x) 855NV ceil (NV x)
748 856
749IV minpot (UV n) 857IV minpot (UV n)
750 858
751IV 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
752 866
753void 867void
754pango_init () 868pango_init ()
755 CODE: 869 CODE:
756{ 870{
764#endif 878#endif
765} 879}
766 880
767char *SDL_GetError () 881char *SDL_GetError ()
768 882
769void SDL_braino () 883void SDL_main_hack (SV *real_main)
884 PROTOTYPE: &
770 885
771int SDL_Init (U32 flags) 886int SDL_Init (U32 flags)
772 887
773int SDL_InitSubSystem (U32 flags) 888int SDL_InitSubSystem (U32 flags)
774 889
775void SDL_QuitSubSystem (U32 flags) 890void SDL_QuitSubSystem (U32 flags)
776 891
777void SDL_Quit () 892void SDL_Quit ()
778 893
779int SDL_GL_SetAttribute (int attr, int value) 894int SDL_GL_SetAttribute (int attr, int value)
895 C_ARGS: (SDL_GLattr)attr, value
780 896
781int SDL_GL_GetAttribute (int attr) 897int SDL_GL_GetAttribute (int attr)
782 CODE: 898 CODE:
783 if (SDL_GL_GetAttribute (attr, &RETVAL)) 899 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
784 XSRETURN_UNDEF; 900 XSRETURN_UNDEF;
785 OUTPUT: 901 OUTPUT:
786 RETVAL 902 RETVAL
787 903
788void 904void
843 ); 959 );
844 960
845 if (RETVAL) 961 if (RETVAL)
846 { 962 {
847 av_clear (texture_av); 963 av_clear (texture_av);
848
849 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
850#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);
851#include "glfunc.h" 965#include "glfunc.h"
852#undef GL_FUNC 966#undef GL_FUNC
967 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
968 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
853 } 969 }
854} 970}
855 OUTPUT: 971 OUTPUT:
856 RETVAL 972 RETVAL
973
974void
975SDL_WM_SetCaption (const char *title, const char *icon)
857 976
858void 977void
859SDL_GL_SwapBuffers () 978SDL_GL_SwapBuffers ()
860 979
861char * 980char *
862SDL_GetKeyName (int sym) 981SDL_GetKeyName (int sym)
982 C_ARGS: (SDLKey)sym
863 983
864int 984int
865SDL_GetAppState () 985SDL_GetAppState ()
866 986
867int 987int
868SDL_GetModState () 988SDL_GetModState ()
869 989
990int
991SDL_WaitEvent ()
992 C_ARGS: 0
993
870void 994void
995SDL_PumpEvents ()
996
997void
871poll_events () 998peep_events ()
872 PPCODE: 999 PPCODE:
873{ 1000{
874 SDL_Event ev; 1001 SDL_Event ev;
875 1002
876 SDL_PumpEvents (); 1003 SDL_PumpEvents ();
883 { 1010 {
884 case SDL_KEYDOWN: 1011 case SDL_KEYDOWN:
885 case SDL_KEYUP: 1012 case SDL_KEYUP:
886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1013 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1014 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
888 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);
889 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 */
890 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1017 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
891 break; 1018 break;
892 1019
893 case SDL_ACTIVEEVENT: 1020 case SDL_ACTIVEEVENT:
894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1021 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
912 x = ev.motion.x; 1039 x = ev.motion.x;
913 y = ev.motion.y; 1040 y = ev.motion.y;
914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1041 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
915 } 1042 }
916 1043
917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1044 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
918 hv_store (hv, "state", 5, newSViv (state), 0); 1045 hv_store (hv, "state", 5, newSViv (state), 0);
919 hv_store (hv, "x", 1, newSViv (x), 0); 1046 hv_store (hv, "x", 1, newSViv (x), 0);
920 hv_store (hv, "y", 1, newSViv (y), 0); 1047 hv_store (hv, "y", 1, newSViv (y), 0);
921 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1048 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
922 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1049 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
942 1069
943 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))));
944 } 1071 }
945} 1072}
946 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
947int 1087int
948Mix_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)
949 POSTCALL: 1089 POSTCALL:
950 Mix_HookMusicFinished (music_finished); 1090 Mix_HookMusicFinished (music_finished);
951 Mix_ChannelFinished (channel_finished); 1091 Mix_ChannelFinished (channel_finished);
952 1092
953void 1093void
954Mix_QuerySpec () 1094Mix_QuerySpec ()
1013add_font (char *file) 1153add_font (char *file)
1014 CODE: 1154 CODE:
1015 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1155 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1016 OUTPUT: 1156 OUTPUT:
1017 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)
1018 1165
1019void 1166void
1020load_image_inline (SV *image_) 1167load_image_inline (SV *image_)
1021 ALIAS: 1168 ALIAS:
1022 load_image_file = 1 1169 load_image_file = 1
1068 1215
1069 SDL_LockSurface (surface2); 1216 SDL_LockSurface (surface2);
1070 EXTEND (SP, 6); 1217 EXTEND (SP, 6);
1071 PUSHs (sv_2mortal (newSViv (surface2->w))); 1218 PUSHs (sv_2mortal (newSViv (surface2->w)));
1072 PUSHs (sv_2mortal (newSViv (surface2->h))); 1219 PUSHs (sv_2mortal (newSViv (surface2->h)));
1073 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1220 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1074 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)));
1075 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1222 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1076 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1223 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1077 SDL_UnlockSurface (surface2); 1224 SDL_UnlockSurface (surface2);
1078 1225
1138#if DEBUG 1285#if DEBUG
1139 VALGRIND_DO_LEAK_CHECK; 1286 VALGRIND_DO_LEAK_CHECK;
1140#endif 1287#endif
1141} 1288}
1142 1289
1290int
1291SvREFCNT (SV *sv)
1292 CODE:
1293 RETVAL = SvREFCNT (sv);
1294 OUTPUT:
1295 RETVAL
1296
1143MODULE = Deliantra::Client PACKAGE = DC::Font 1297MODULE = Deliantra::Client PACKAGE = DC::Font
1144 1298
1145PROTOTYPES: DISABLE 1299PROTOTYPES: DISABLE
1146 1300
1147DC::Font 1301DC::Font
1148new_from_file (SV *class, char *path, int id = 0) 1302new_from_file (SV *klass, char *path, int id = 0)
1149 CODE: 1303 CODE:
1150{ 1304{
1151 int count; 1305 int count;
1152 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1306 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1153 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1307 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1182 PROTOTYPE: 1336 PROTOTYPE:
1183 CODE: 1337 CODE:
1184 tc_restore (); 1338 tc_restore ();
1185 1339
1186DC::Layout 1340DC::Layout
1187new (SV *class) 1341new (SV *klass)
1188 CODE: 1342 CODE:
1189 New (0, RETVAL, 1, struct cf_layout); 1343 New (0, RETVAL, 1, struct cf_layout);
1190 1344
1191 RETVAL->pl = pango_layout_new (opengl_context); 1345 RETVAL->pl = pango_layout_new (opengl_context);
1192 RETVAL->r = 1.; 1346 RETVAL->r = 1.;
1341 1495
1342void 1496void
1343set_height (DC::Layout self, int base_height) 1497set_height (DC::Layout self, int base_height)
1344 CODE: 1498 CODE:
1345 if (self->base_height != base_height) 1499 if (self->base_height != base_height)
1346 { 1500 {
1347 self->base_height = base_height; 1501 self->base_height = base_height;
1348 layout_update_font (self); 1502 layout_update_font (self);
1349 } 1503 }
1350 1504
1351void 1505void
1578 glDisable (GL_ALPHA_TEST); 1732 glDisable (GL_ALPHA_TEST);
1579 glDisable (GL_BLEND); 1733 glDisable (GL_BLEND);
1580 } 1734 }
1581} 1735}
1582 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
1583IV 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)
1584 CODE: 1859 CODE:
1585{ 1860{
1586 GLint width; 1861 GLint width;
1587 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);
1594MODULE = Deliantra::Client PACKAGE = DC::Map 1869MODULE = Deliantra::Client PACKAGE = DC::Map
1595 1870
1596PROTOTYPES: DISABLE 1871PROTOTYPES: DISABLE
1597 1872
1598DC::Map 1873DC::Map
1599new (SV *class) 1874new (SV *klass)
1600 CODE: 1875 CODE:
1601 New (0, RETVAL, 1, struct map); 1876 New (0, RETVAL, 1, struct map);
1602 RETVAL->x = 0; 1877 RETVAL->x = 0;
1603 RETVAL->y = 0; 1878 RETVAL->y = 0;
1604 RETVAL->w = 0; 1879 RETVAL->w = 0;
1643 1918
1644void 1919void
1645set_smooth (DC::Map self, int face, int smooth, int level) 1920set_smooth (DC::Map self, int face, int smooth, int level)
1646 CODE: 1921 CODE:
1647{ 1922{
1648 tileid texid; 1923 tileid texid;
1649 maptex *tex; 1924 maptex *tex;
1650 1925
1651 if (face < 0 || face >= self->faces) 1926 if (face < 0 || face >= self->faces)
1652 return; 1927 return;
1653 1928
1654 if (smooth < 0 || smooth >= self->faces) 1929 if (smooth < 0 || smooth >= self->faces)
1655 return; 1930 return;
1656 1931
1657 texid = self->face2tile [face]; 1932 texid = self->face2tile [face];
1658 1933
1659 if (!texid) 1934 if (!texid)
1660 return; 1935 return;
1661 1936
1662 tex = self->tex + texid; 1937 tex = self->tex + texid;
1691 //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);
1692 // use uglier nearest interpolation because linear suffers 1967 // use uglier nearest interpolation because linear suffers
1693 // from transparent color bleeding and ugly wrapping effects. 1968 // from transparent color bleeding and ugly wrapping effects.
1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1969 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1695} 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 }
1696 1991
1697int 1992int
1698ox (DC::Map self) 1993ox (DC::Map self)
1699 ALIAS: 1994 ALIAS:
1700 oy = 1 1995 oy = 1
1740 self->y += MAP_EXTEND_Y; 2035 self->y += MAP_EXTEND_Y;
1741 } 2036 }
1742} 2037}
1743 2038
1744SV * 2039SV *
1745map1a_update (DC::Map self, SV *data_, int extmap) 2040map1a_update (DC::Map self, SV *data_)
1746 CODE: 2041 CODE:
1747{ 2042{
1748 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2043 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1749 uint8_t *data_end = (uint8_t *)SvEND (data_); 2044 uint8_t *data_end = (uint8_t *)SvEND (data_);
1750 mapcell *cell; 2045 mapcell *cell;
1771 2066
1772 //TODO: don't trust server data to be in-range(!) 2067 //TODO: don't trust server data to be in-range(!)
1773 2068
1774 if (flags & 8) 2069 if (flags & 8)
1775 { 2070 {
2071 uint8_t ext, cmd;
2072
1776 if (extmap) 2073 do
1777 { 2074 {
1778 uint8_t ext, cmd; 2075 ext = *data++;
2076 cmd = ext & 0x7f;
1779 2077
1780 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
1781 { 2081 {
1782 ext = *data++;
1783 cmd = ext & 0x7f;
1784
1785 if (cmd < 4)
1786 cell->darkness = 255 - ext * 64 + 1;
1787 else if (cmd == 5) // health
1788 {
1789 cell->stat_width = 1; 2082 cell->stat_width = 1;
1790 cell->stat_hp = *data++; 2083 cell->stat_hp = *data++;
1791 }
1792 else if (cmd == 6) // monster width
1793 cell->stat_width = *data++ + 1;
1794 else if (cmd == 0x47)
1795 {
1796 if (*data == 1) cell->player = data [1];
1797 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1798 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1799 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1800
1801 data += *data + 1;
1802 }
1803 else if (cmd == 8) // cell flags
1804 cell->flags = *data++;
1805 else if (ext & 0x40) // unknown, multibyte => skip
1806 data += *data + 1;
1807 else
1808 data++;
1809 } 2084 }
1810 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++;
1811 } 2102 }
1812 else 2103 while (ext & 0x80);
1813 cell->darkness = *data++ + 1;
1814 } 2104 }
1815 2105
1816 for (z = 0; z <= 2; ++z) 2106 for (z = 0; z <= 2; ++z)
1817 if (flags & (4 >> z)) 2107 if (flags & (4 >> z))
1818 { 2108 {
1821 cell->tile [z] = self->face2tile [face]; 2111 cell->tile [z] = self->face2tile [face];
1822 2112
1823 if (cell->tile [z]) 2113 if (cell->tile [z])
1824 { 2114 {
1825 maptex *tex = self->tex + cell->tile [z]; 2115 maptex *tex = self->tex + cell->tile [z];
2116 tex->unused = 0;
1826 if (!tex->name) 2117 if (!tex->name)
1827 av_push (missing, newSViv (cell->tile [z])); 2118 av_push (missing, newSViv (cell->tile [z]));
1828 2119
1829 if (tex->smoothtile) 2120 if (tex->smoothtile)
1830 { 2121 {
1831 maptex *smooth = self->tex + tex->smoothtile; 2122 maptex *smooth = self->tex + tex->smoothtile;
2123 smooth->unused = 0;
1832 if (!smooth->name) 2124 if (!smooth->name)
1833 av_push (missing, newSViv (tex->smoothtile)); 2125 av_push (missing, newSViv (tex->smoothtile));
1834 } 2126 }
1835 } 2127 }
1836 } 2128 }
1864 ? self->row + y 2156 ? self->row + y
1865 : 0; 2157 : 0;
1866 2158
1867 for (x = x0; x < x1; x++) 2159 for (x = x0; x < x1; x++)
1868 { 2160 {
1869 int r = 32, g = 32, b = 32, a = 192; 2161 unsigned int r = 32, g = 32, b = 32, a = 192;
1870 2162
1871 if (row && row->c0 <= x && x < row->c1) 2163 if (row && row->c0 <= x && x < row->c1)
1872 { 2164 {
1873 mapcell *cell = row->col + (x - row->c0); 2165 mapcell *cell = row->col + (x - row->c0);
1874 2166
1876 { 2168 {
1877 maptex tex = self->tex [cell->tile [z]]; 2169 maptex tex = self->tex [cell->tile [z]];
1878 int a0 = 255 - tex.a; 2170 int a0 = 255 - tex.a;
1879 int a1 = tex.a; 2171 int a1 = tex.a;
1880 2172
1881 r = (r * a0 + tex.r * a1) / 255; 2173 r = div255 (r * a0 + tex.r * a1);
1882 g = (g * a0 + tex.g * a1) / 255; 2174 g = div255 (g * a0 + tex.g * a1);
1883 b = (b * a0 + tex.b * a1) / 255; 2175 b = div255 (b * a0 + tex.b * a1);
1884 a = (a * a0 + tex.a * a1) / 255; 2176 a = div255 (a * a0 + tex.a * a1);
1885 } 2177 }
1886 } 2178 }
1887 2179
1888 *map++ = (r ) 2180 *map++ = (r )
1889 | (g << 8) 2181 | (g << 8)
1890 | (b << 16) 2182 | (b << 16)
1891 | (a << 24); 2183 | (a << 24);
1892 } 2184 }
1893 } 2185 }
1894 2186
1895 RETVAL = map_sv; 2187 RETVAL = map_sv;
1896} 2188}
1897 OUTPUT: 2189 OUTPUT:
1898 RETVAL 2190 RETVAL
1899 2191
1900void 2192void
1901draw (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)
1902 CODE: 2194 CODE:
1903{ 2195{
1904 int x, y, z; 2196 int x, y, z;
1905 2197
1906 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2198 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1907 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
1908 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)
1909 smooth_key skey; 2201 smooth_key skey;
1910 int pl_x, pl_y; 2202 int pl_x, pl_y;
1911 maptex pl_tex; 2203 maptex pl_tex;
1912 rc_t *rc = rc_alloc (); 2204 rc_t *rc = rc_alloc ();
2205 rc_t *rc_ov = rc_alloc ();
1913 rc_key_t key; 2206 rc_key_t key;
1914 rc_array_t *arr; 2207 rc_array_t *arr;
1915 2208
1916 pl_tex.name = 0; 2209 pl_tex.name = 0;
1917 2210
1918 // thats current max. sorry. 2211 // that's current max. sorry.
1919 if (sw > 255) sw = 255; 2212 if (sw > 255) sw = 255;
1920 if (sh > 255) sh = 255; 2213 if (sh > 255) sh = 255;
1921 2214
1922 // clear key, in case of extra padding 2215 // clear key, in case of extra padding
1923 memset (&skey, 0, sizeof (skey)); 2216 memset (&skey, 0, sizeof (skey));
1927 key.g = 255; 2220 key.g = 255;
1928 key.b = 255; 2221 key.b = 255;
1929 key.a = 255; 2222 key.a = 255;
1930 key.mode = GL_QUADS; 2223 key.mode = GL_QUADS;
1931 key.format = GL_T2F_V3F; 2224 key.format = GL_T2F_V3F;
1932 key.texname = -1;
1933 2225
1934 mx += self->x; 2226 mx += self->x;
1935 my += self->y; 2227 my += self->y;
1936 2228
1937 // first pass: determine smooth_max 2229 // first pass: determine smooth_max
1961 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2253 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1962 2254
1963 for (z = 0; z <= 2; z++) 2255 for (z = 0; z <= 2; z++)
1964 { 2256 {
1965 memset (smooth_level, 0, sizeof (smooth_level)); 2257 memset (smooth_level, 0, sizeof (smooth_level));
2258 key.texname = -1;
1966 2259
1967 for (y = 0; y < sh; y++) 2260 for (y = 0; y < sh; y++)
1968 if (0 <= y + my && y + my < self->rows) 2261 if (0 <= y + my && y + my < self->rows)
1969 { 2262 {
1970 maprow *row = self->row + (y + my); 2263 maprow *row = self->row + (y + my);
1976 tileid tile = cell->tile [z]; 2269 tileid tile = cell->tile [z];
1977 2270
1978 if (tile) 2271 if (tile)
1979 { 2272 {
1980 maptex tex = self->tex [tile]; 2273 maptex tex = self->tex [tile];
1981 int px = (x + 1) * T - tex.w; 2274 int px, py;
1982 int py = (y + 1) * T - tex.h;
1983 2275
1984 if (key.texname != tex.name) 2276 if (key.texname != tex.name)
1985 { 2277 {
2278 self->tex [tile].unused = 0;
2279
1986 if (!tex.name) 2280 if (!tex.name)
1987 tex = self->tex [2]; /* missing, replace by noface */ 2281 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1988 2282
1989 key.texname = tex.name; 2283 key.texname = tex.name;
1990 arr = rc_array (rc, &key); 2284 arr = rc_array (rc, &key);
1991 } 2285 }
2286
2287 px = (x + 1) * Th - tex.w;
2288 py = (y + 1) * Tw - tex.h;
1992 2289
1993 if (expect_false (cell->player == player) && expect_false (z == 2)) 2290 if (expect_false (cell->player == player) && expect_false (z == 2))
1994 { 2291 {
1995 pl_x = px; 2292 pl_x = px;
1996 pl_y = py; 2293 pl_y = py;
2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2298 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2002 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);
2003 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);
2004 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);
2005 2302
2006 if (expect_false (cell->flags) && expect_false (z == 2))
2007 {
2008 // overlays such as the speech bubble, probably more to come
2009 if (cell->flags & 1)
2010 {
2011 maptex tex = self->tex [1];
2012 int px = x * T + T * 2 / 32;
2013 int py = y * T - T * 6 / 32;
2014
2015 if (tex.name)
2016 {
2017 if (key.texname != tex.name)
2018 {
2019 key.texname = tex.name;
2020 arr = rc_array (rc, &key);
2021 }
2022
2023 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2024 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2025 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2027 }
2028 }
2029 }
2030
2031 // update smooth hash 2303 // update smooth hash
2032 if (tex.smoothtile) 2304 if (tex.smoothtile)
2033 { 2305 {
2034 skey.tile = tex.smoothtile; 2306 skey.tile = tex.smoothtile;
2035 skey.level = tex.smoothlevel; 2307 skey.level = tex.smoothlevel;
2063 // corners 2335 // corners
2064 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);
2065 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);
2066 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);
2067 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);
2068 } 2361 }
2069 } 2362 }
2070 } 2363 }
2071 } 2364 }
2072 2365
2099 if (!(bits & 0x1000) 2392 if (!(bits & 0x1000)
2100 && skey->level == level 2393 && skey->level == level
2101 && level > smooth_max [skey->x][skey->y]) 2394 && level > smooth_max [skey->x][skey->y])
2102 { 2395 {
2103 maptex tex = self->tex [skey->tile]; 2396 maptex tex = self->tex [skey->tile];
2104 int px = (((int)skey->x) - 1) * T; 2397 int px = (((int)skey->x) - 1) * Tw;
2105 int py = (((int)skey->y) - 1) * T; 2398 int py = (((int)skey->y) - 1) * Th;
2106 int border = bits & 15; 2399 int border = bits & 15;
2107 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2108 float dx = tex.s * .0625f; // 16 images/row 2401 float dx = tex.s * .0625f; // 16 images/row
2109 float dy = tex.t * .5f ; // 2 images/column 2402 float dy = tex.t * .5f ; // 2 images/column
2110 2403
2112 { 2405 {
2113 // this time avoiding texture state changes 2406 // this time avoiding texture state changes
2114 // save gobs of state changes. 2407 // save gobs of state changes.
2115 if (key.texname != tex.name) 2408 if (key.texname != tex.name)
2116 { 2409 {
2410 self->tex [skey->tile].unused = 0;
2411
2117 glEnd (); 2412 glEnd ();
2118 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2119 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2120 } 2415 }
2121 2416
2122 if (border) 2417 if (border)
2123 { 2418 {
2124 float ox = border * dx; 2419 float ox = border * dx;
2125 2420
2126 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2127 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2128 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2129 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2130 } 2425 }
2131 2426
2132 if (corner) 2427 if (corner)
2133 { 2428 {
2134 float ox = corner * dx; 2429 float ox = corner * dx;
2135 2430
2136 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2137 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2138 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2139 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2140 } 2435 }
2141 } 2436 }
2142 } 2437 }
2143 } 2438 }
2144 } 2439 }
2167 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);
2168 2463
2169 rc_draw (rc); 2464 rc_draw (rc);
2170 } 2465 }
2171 2466
2467 rc_draw (rc_ov);
2468 rc_clear (rc_ov);
2469
2172 glDisable (GL_BLEND); 2470 glDisable (GL_BLEND);
2173 rc_free (rc); 2471 rc_free (rc);
2472 rc_free (rc_ov);
2174 2473
2175 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2176 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2177 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2178 { 2477 {
2181 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2182 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2183 { 2482 {
2184 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2185 2484
2186 int px = x * T; 2485 int px = x * Tw;
2187 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 }
2188 2493
2189 if (cell->stat_hp) 2494 if (cell->stat_hp)
2190 { 2495 {
2191 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2192 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2193 2498
2194 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2195 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2196 px + width - 1, py); 2501 px + width - 1, py);
2197 2502
2203 } 2508 }
2204 } 2509 }
2205} 2510}
2206 2511
2207void 2512void
2208draw_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)
2209 CODE: 2514 CODE:
2210{ 2515{
2211 static float color[16][3] = { 2516 static float color[16][3] = {
2212 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2213 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2214 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2215 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2216 2521
2217 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2218 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2219 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2220 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2221 2526
2222 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2223 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2224 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2225 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2226 2531
2227 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2228 2533
2229 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2230 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2231 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2232 }; 2537 };
2233 2538
2234 int x, y; 2539 int x, y;
2235 2540
2236 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 */
2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2238 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2239 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2240 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2241 2552
2242 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2246 2557
2247 if (m) 2558 if (m)
2248 { 2559 {
2249 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2250 2561
2251 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2252 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2253 2564
2254 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2255 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2256 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2257 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2258 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2259 } 2570 }
2267void 2578void
2268fow_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)
2269 PPCODE: 2580 PPCODE:
2270{ 2581{
2271 int x, y; 2582 int x, y;
2272 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2273 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2274 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2275 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);
2276 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2277 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2278 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2279 2591
2280 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2281 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2282 2594
2283 mx += self->x - 1; 2595 mx += self->x - 1;
2284 my += self->y - 1; 2596 my += self->y - 1;
2285
2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2287 2597
2288 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2289 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2290 { 2600 {
2291 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2294 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2295 { 2605 {
2296 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2297 2607
2298 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2299 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2300 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2301 } 2611 }
2302 } 2612 }
2303 2613
2304 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2305 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2324 2634
2325 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2326 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2327 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2328 2638
2329 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2330 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2331 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2332 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2333 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 */
2334 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2335 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2336 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2337 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2338 } 2648 }
2339 2649
2340 free (darkness1); 2650 free (darkness1);
2341 2651
2342 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2343 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2344 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2345 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2346} 2656}
2347 2657
2348SV * 2658SV *
2411 else 2721 else
2412 *data++ = 0; 2722 *data++ = 0;
2413 } 2723 }
2414 } 2724 }
2415 2725
2416 /* 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 */
2417 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2418 { 2728 {
2419 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2420 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2421 } 2731 }
2422 2732
2423 RETVAL = data_sv; 2733 RETVAL = data_sv;
2424} 2734}
2425 OUTPUT: 2735 OUTPUT:
2426 RETVAL 2736 RETVAL
2427 2737
2428void 2738void
2435 STRLEN len; 2745 STRLEN len;
2436 uint8_t *data, *end; 2746 uint8_t *data, *end;
2437 2747
2438 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2439 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2440 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2441 end = data + len + 8; 2751 end = data + len + 8;
2442 2752
2443 if (len < 5) 2753 if (len < 5)
2444 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2445 2755
2506} 2816}
2507 2817
2508MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2509 2819
2510DC::RW 2820DC::RW
2511new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2512 CODE: 2822 CODE:
2513{ 2823{
2514 STRLEN datalen; 2824 STRLEN datalen;
2515 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2516 2826
2518} 2828}
2519 OUTPUT: 2829 OUTPUT:
2520 RETVAL 2830 RETVAL
2521 2831
2522DC::RW 2832DC::RW
2523new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2524 CODE: 2834 CODE:
2525 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2526 OUTPUT: 2836 OUTPUT:
2527 RETVAL 2837 RETVAL
2528 2838
2546 if (RETVAL < 0) 2856 if (RETVAL < 0)
2547 { 2857 {
2548 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2549 2859
2550 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)
2551 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2552 2867 }
2868 else
2553 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2554 } 2870 }
2555 2871
2556 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2557 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2558} 2874}
2605void 2921void
2606set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2607 CODE: 2923 CODE:
2608{ 2924{
2609 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));
2610 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;
2611 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2612} 2928}
2613 2929
2614void 2930void
2615set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2618 2934
2619MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2620 2936
2621PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2622 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
2623DC::MixChunk 2951DC::MixChunk
2624new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2625 CODE: 2953 CODE:
2626 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2627 OUTPUT: 2955 OUTPUT:
2628 RETVAL 2956 RETVAL
2629 2957
2659 OUTPUT: 2987 OUTPUT:
2660 RETVAL 2988 RETVAL
2661 2989
2662MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2663 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
2664int 3004int
2665volume (int volume = -1) 3005volume (int volume = -1)
2666 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2667 CODE: 3007 CODE:
2668 if (items > 0) 3008 if (items > 0)
2679void 3019void
2680halt () 3020halt ()
2681 CODE: 3021 CODE:
2682 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2683 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2684DC::MixMusic 3031DC::MixMusic
2685new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2686 CODE: 3033 CODE:
2687 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2688 OUTPUT: 3035 OUTPUT:
2689 RETVAL 3036 RETVAL
2690 3037
2718 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2719# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2720 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2721 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2722 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2723 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2724 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2725 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2726 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2727 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2739 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2740 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2741 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2742 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2743 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),
2744 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2745 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2746 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2747 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2748 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2816 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2817 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2818 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2819 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2820 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),
2821# undef const_iv 3176# undef const_iv
2822 }; 3177 };
2823 3178
2824 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--)
2825 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2826 3181
2827 texture_av = newAV (); 3182 texture_av = newAV ();
2828 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2829} 3184}
2830 3185
2832disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2833 CODE: 3188 CODE:
2834 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2835 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2836 3191
2837char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2838gl_vendor () 3196gl_vendor ()
2839 CODE: 3197 CODE:
2840 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2841 OUTPUT: 3199 OUTPUT:
2842 RETVAL 3200 RETVAL
2843 3201
2844char * 3202const char *
2845gl_version () 3203gl_version ()
2846 CODE: 3204 CODE:
2847 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2848 OUTPUT: 3206 OUTPUT:
2849 RETVAL 3207 RETVAL
2850 3208
2851char * 3209const char *
2852gl_extensions () 3210gl_extensions ()
2853 CODE: 3211 CODE:
2854 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2855 OUTPUT: 3213 OUTPUT:
2856 RETVAL 3214 RETVAL
2857 3215
2858const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2859 3221
2860GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2861 CODE: 3223 CODE:
2862 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2863 OUTPUT: 3225 OUTPUT:
2871 3233
2872int glGetError () 3234int glGetError ()
2873 3235
2874void glFinish () 3236void glFinish ()
2875 3237
3238void glFlush ()
3239
2876void glClear (int mask) 3240void glClear (int mask)
2877 3241
2878void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2879 PROTOTYPE: @ 3243 PROTOTYPE: @
2880 3244
2889void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2890 3254
2891void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2892 CODE: 3256 CODE:
2893 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2894 3260
2895void glDepthMask (int flag) 3261void glDepthMask (int flag)
2896 3262
2897void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2898 3264
2933void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2934 CODE: 3300 CODE:
2935 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2936 3302
2937void 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: @
2938 ALIAS: 3305 ALIAS:
2939 glColor_premultiply = 1 3306 glColor_premultiply = 1
2940 CODE: 3307 CODE:
2941 if (ix) 3308 if (ix)
2942 { 3309 {
3048 3415
3049void glEndList () 3416void glEndList ()
3050 3417
3051void glCallList (int list) 3418void glCallList (int list)
3052 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3053MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3054 3426
3055PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3056 3428
3057void 3429void
3058find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3059 PPCODE: 3431 PPCODE:
3060{ 3432{
3061 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3062 XPUSHs (self); 3434 XPUSHs (self);
3063} 3435}
3064 3436
3065BOOT: 3437BOOT:
3066{ 3438{
3074 3446
3075void 3447void
3076draw (SV *self) 3448draw (SV *self)
3077 CODE: 3449 CODE:
3078{ 3450{
3079 HV *hv; 3451 HV *hv;
3080 SV **svp; 3452 SV **svp;
3081 NV x, y, w, h; 3453 NV x, y, w, h;
3082 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3083 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3084 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3085 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