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.273 by root, Wed Aug 20 13:30:02 2008 UTC vs.
Revision 1.321 by root, Sun Nov 18 01:15:04 2018 UTC

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