ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.269 by root, Sun Jul 20 03:46:02 2008 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines