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.275 by root, Thu Aug 28 00:53:53 2008 UTC vs.
Revision 1.321 by root, Sun Nov 18 01:15:04 2018 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
44/* work around os x broken headers */ 43/* work around os x broken headers */
45#ifdef __MACOSX__ 44#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 48#endif
48 49
49#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
51 52
52#include <glib/gmacros.h> 53#include <glib.h>
53 54
54#include <pango/pango.h> 55#include <pango/pango.h>
55 56
56#ifndef PANGO_VERSION_CHECK 57#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 58# define PANGO_VERSION_CHECK(a,b,c) 0
81#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
83 84
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
87 91
88#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
90 94
91#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
92 96
93/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
99
100#define KMOD_LRAM 0x10000 // our extension
101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
95 123
96static AV *texture_av; 124static AV *texture_av;
97 125
98static struct 126static struct
99{ 127{
156{ 184{
157 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
158 186
159 while (attrs) 187 while (attrs)
160 { 188 {
161 PangoAttribute *attr = attrs->data; 189 PangoAttribute *attr = (PangoAttribute *)attrs->data;
162 190
163 if (attr->klass->type == PANGO_ATTR_SHAPE) 191 if (attr->klass->type == PANGO_ATTR_SHAPE)
164 return 1; 192 return 1;
165 193
166 attrs = attrs->next; 194 attrs = attrs->next;
184static void 212static void
185substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
186{ 214{
187 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
188#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
189 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
190#endif 218#endif
191 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
192} 220}
193 221
194static void 222static void
231 int w, h; 259 int w, h;
232 float s, t; 260 float s, t;
233 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
234 tileid smoothtile; 262 tileid smoothtile;
235 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
236} maptex; 265} maptex;
237 266
238typedef struct { 267typedef struct {
239 uint32_t player; 268 uint32_t player;
240 tileid tile[3]; 269 tileid tile[3];
452 ev.data2 = 0; 481 ev.data2 = 0;
453 482
454 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
455} 484}
456 485
486// approximately divide by 255
487static unsigned int
488div255 (unsigned int n)
489{
490 return (n + (n >> 8)) >> 8;
491}
492
457static unsigned int 493static unsigned int
458minpot (unsigned int n) 494minpot (unsigned int n)
459{ 495{
460 if (!n) 496 if (!n)
461 return 0; 497 return 0;
527 return 0; 563 return 0;
528 564
529 return 1; 565 return 1;
530} 566}
531 567
568/******************************************************************************/
569
570/* process keyboard modifiers */
571static int
572mod_munge (int mod)
573{
574 mod &= MOD_MASK;
575
576 if (mod & (KMOD_META | KMOD_ALT))
577 mod |= KMOD_LRAM;
578
579 return mod;
580}
581
532static void 582static void
533deliantra_main () 583deliantra_main (SV *real_main)
534{ 584{
535 char *argv[] = { 0 }; 585 dSP;
536 call_argv ("::main", G_DISCARD | G_VOID, argv); 586
587 PUSHMARK (SP);
588 call_sv (real_main, G_DISCARD | G_VOID);
537} 589}
538 590
539#ifdef __MACOSX__ 591#ifdef __MACOSX__
592 static SV *real_main;
593
540 /* to due surprising braindamage on the side of SDL design, we 594 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main() 595 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which, 596 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 597 * due to shared library magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back. 598 * and which calls our main (== SDL_main) back.
545 */ 599 */
546 extern C_LINKAGE int 600 extern C_LINKAGE int
547 main (int argc, char *argv[]) 601 main (int argc, char *argv[])
548 { 602 {
549 deliantra_main (); 603 deliantra_main (real_main);
550 } 604 }
551 605
552 #undef main 606 #undef main
553 607
554 extern C_LINKAGE int main (int argc, char *argv[]); 608 extern C_LINKAGE int main (int argc, char *argv[]);
555 609
556 static void 610 static void
557 SDL_braino (void) 611 SDL_main_hack (SV *real_main_)
558 { 612 {
613 real_main = real_main_;
614
559 char *argv[] = { "deliantra client", 0 }; 615 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv); 616 (main) (1, argv);
561 } 617 }
562#else 618#else
563 static void 619 static void
564 SDL_braino (void) 620 SDL_main_hack (SV *real_main)
565 { 621 {
566 deliantra_main (); 622 deliantra_main (real_main);
567 } 623 }
568#endif 624#endif
569 625
570MODULE = Deliantra::Client PACKAGE = DC 626MODULE = Deliantra::Client PACKAGE = DC
571 627
737 const_iv (KMOD_RMETA), 793 const_iv (KMOD_RMETA),
738 const_iv (KMOD_NUM), 794 const_iv (KMOD_NUM),
739 const_iv (KMOD_CAPS), 795 const_iv (KMOD_CAPS),
740 const_iv (KMOD_MODE), 796 const_iv (KMOD_MODE),
741 797
798 const_iv (KMOD_LRAM),
799
742 const_iv (MIX_DEFAULT_FORMAT), 800 const_iv (MIX_DEFAULT_FORMAT),
743 801
744 const_iv (SDL_INIT_TIMER), 802 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO), 803 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO), 804 const_iv (SDL_INIT_VIDEO),
770 828
771 const_iv (FOW_DARKNESS) 829 const_iv (FOW_DARKNESS)
772# undef const_iv 830# undef const_iv
773 }; 831 };
774 832
775 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--)
776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 834 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
777 835
778 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 836 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
779 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 837 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
780} 838}
781 839
797NV ceil (NV x) 855NV ceil (NV x)
798 856
799IV minpot (UV n) 857IV minpot (UV n)
800 858
801IV 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
802 866
803void 867void
804pango_init () 868pango_init ()
805 CODE: 869 CODE:
806{ 870{
814#endif 878#endif
815} 879}
816 880
817char *SDL_GetError () 881char *SDL_GetError ()
818 882
819void SDL_braino () 883void SDL_main_hack (SV *real_main)
884 PROTOTYPE: &
820 885
821int SDL_Init (U32 flags) 886int SDL_Init (U32 flags)
822 887
823int SDL_InitSubSystem (U32 flags) 888int SDL_InitSubSystem (U32 flags)
824 889
825void SDL_QuitSubSystem (U32 flags) 890void SDL_QuitSubSystem (U32 flags)
826 891
827void SDL_Quit () 892void SDL_Quit ()
828 893
829int SDL_GL_SetAttribute (int attr, int value) 894int SDL_GL_SetAttribute (int attr, int value)
895 C_ARGS: (SDL_GLattr)attr, value
830 896
831int SDL_GL_GetAttribute (int attr) 897int SDL_GL_GetAttribute (int attr)
832 CODE: 898 CODE:
833 if (SDL_GL_GetAttribute (attr, &RETVAL)) 899 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
834 XSRETURN_UNDEF; 900 XSRETURN_UNDEF;
835 OUTPUT: 901 OUTPUT:
836 RETVAL 902 RETVAL
837 903
838void 904void
893 ); 959 );
894 960
895 if (RETVAL) 961 if (RETVAL)
896 { 962 {
897 av_clear (texture_av); 963 av_clear (texture_av);
898
899 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
900#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);
901#include "glfunc.h" 965#include "glfunc.h"
902#undef GL_FUNC 966#undef GL_FUNC
967 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
968 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
903 } 969 }
904} 970}
905 OUTPUT: 971 OUTPUT:
906 RETVAL 972 RETVAL
973
974void
975SDL_WM_SetCaption (const char *title, const char *icon)
907 976
908void 977void
909SDL_GL_SwapBuffers () 978SDL_GL_SwapBuffers ()
910 979
911char * 980char *
912SDL_GetKeyName (int sym) 981SDL_GetKeyName (int sym)
982 C_ARGS: (SDLKey)sym
913 983
914int 984int
915SDL_GetAppState () 985SDL_GetAppState ()
916 986
917int 987int
918SDL_GetModState () 988SDL_GetModState ()
919 989
990int
991SDL_WaitEvent ()
992 C_ARGS: 0
993
920void 994void
995SDL_PumpEvents ()
996
997void
921poll_events () 998peep_events ()
922 PPCODE: 999 PPCODE:
923{ 1000{
924 SDL_Event ev; 1001 SDL_Event ev;
925 1002
926 SDL_PumpEvents (); 1003 SDL_PumpEvents ();
933 { 1010 {
934 case SDL_KEYDOWN: 1011 case SDL_KEYDOWN:
935 case SDL_KEYUP: 1012 case SDL_KEYUP:
936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1013 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1014 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
938 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);
939 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 */
940 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1017 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
941 break; 1018 break;
942 1019
943 case SDL_ACTIVEEVENT: 1020 case SDL_ACTIVEEVENT:
944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1021 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
962 x = ev.motion.x; 1039 x = ev.motion.x;
963 y = ev.motion.y; 1040 y = ev.motion.y;
964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1041 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
965 } 1042 }
966 1043
967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1044 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
968 hv_store (hv, "state", 5, newSViv (state), 0); 1045 hv_store (hv, "state", 5, newSViv (state), 0);
969 hv_store (hv, "x", 1, newSViv (x), 0); 1046 hv_store (hv, "x", 1, newSViv (x), 0);
970 hv_store (hv, "y", 1, newSViv (y), 0); 1047 hv_store (hv, "y", 1, newSViv (y), 0);
971 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1048 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
972 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1049 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
992 1069
993 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))));
994 } 1071 }
995} 1072}
996 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
997int 1087int
998Mix_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)
999 POSTCALL: 1089 POSTCALL:
1000 Mix_HookMusicFinished (music_finished); 1090 Mix_HookMusicFinished (music_finished);
1001 Mix_ChannelFinished (channel_finished); 1091 Mix_ChannelFinished (channel_finished);
1002 1092
1003void 1093void
1004Mix_QuerySpec () 1094Mix_QuerySpec ()
1063add_font (char *file) 1153add_font (char *file)
1064 CODE: 1154 CODE:
1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1155 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT: 1156 OUTPUT:
1067 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)
1068 1165
1069void 1166void
1070load_image_inline (SV *image_) 1167load_image_inline (SV *image_)
1071 ALIAS: 1168 ALIAS:
1072 load_image_file = 1 1169 load_image_file = 1
1118 1215
1119 SDL_LockSurface (surface2); 1216 SDL_LockSurface (surface2);
1120 EXTEND (SP, 6); 1217 EXTEND (SP, 6);
1121 PUSHs (sv_2mortal (newSViv (surface2->w))); 1218 PUSHs (sv_2mortal (newSViv (surface2->w)));
1122 PUSHs (sv_2mortal (newSViv (surface2->h))); 1219 PUSHs (sv_2mortal (newSViv (surface2->h)));
1123 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1220 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1124 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)));
1125 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1222 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1126 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1223 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1127 SDL_UnlockSurface (surface2); 1224 SDL_UnlockSurface (surface2);
1128 1225
1188#if DEBUG 1285#if DEBUG
1189 VALGRIND_DO_LEAK_CHECK; 1286 VALGRIND_DO_LEAK_CHECK;
1190#endif 1287#endif
1191} 1288}
1192 1289
1290int
1291SvREFCNT (SV *sv)
1292 CODE:
1293 RETVAL = SvREFCNT (sv);
1294 OUTPUT:
1295 RETVAL
1296
1193MODULE = Deliantra::Client PACKAGE = DC::Font 1297MODULE = Deliantra::Client PACKAGE = DC::Font
1194 1298
1195PROTOTYPES: DISABLE 1299PROTOTYPES: DISABLE
1196 1300
1197DC::Font 1301DC::Font
1198new_from_file (SV *class, char *path, int id = 0) 1302new_from_file (SV *klass, char *path, int id = 0)
1199 CODE: 1303 CODE:
1200{ 1304{
1201 int count; 1305 int count;
1202 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1306 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1203 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1307 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1232 PROTOTYPE: 1336 PROTOTYPE:
1233 CODE: 1337 CODE:
1234 tc_restore (); 1338 tc_restore ();
1235 1339
1236DC::Layout 1340DC::Layout
1237new (SV *class) 1341new (SV *klass)
1238 CODE: 1342 CODE:
1239 New (0, RETVAL, 1, struct cf_layout); 1343 New (0, RETVAL, 1, struct cf_layout);
1240 1344
1241 RETVAL->pl = pango_layout_new (opengl_context); 1345 RETVAL->pl = pango_layout_new (opengl_context);
1242 RETVAL->r = 1.; 1346 RETVAL->r = 1.;
1391 1495
1392void 1496void
1393set_height (DC::Layout self, int base_height) 1497set_height (DC::Layout self, int base_height)
1394 CODE: 1498 CODE:
1395 if (self->base_height != base_height) 1499 if (self->base_height != base_height)
1396 { 1500 {
1397 self->base_height = base_height; 1501 self->base_height = base_height;
1398 layout_update_font (self); 1502 layout_update_font (self);
1399 } 1503 }
1400 1504
1401void 1505void
1628 glDisable (GL_ALPHA_TEST); 1732 glDisable (GL_ALPHA_TEST);
1629 glDisable (GL_BLEND); 1733 glDisable (GL_BLEND);
1630 } 1734 }
1631} 1735}
1632 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
1633IV 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)
1634 CODE: 1859 CODE:
1635{ 1860{
1636 GLint width; 1861 GLint width;
1637 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);
1644MODULE = Deliantra::Client PACKAGE = DC::Map 1869MODULE = Deliantra::Client PACKAGE = DC::Map
1645 1870
1646PROTOTYPES: DISABLE 1871PROTOTYPES: DISABLE
1647 1872
1648DC::Map 1873DC::Map
1649new (SV *class) 1874new (SV *klass)
1650 CODE: 1875 CODE:
1651 New (0, RETVAL, 1, struct map); 1876 New (0, RETVAL, 1, struct map);
1652 RETVAL->x = 0; 1877 RETVAL->x = 0;
1653 RETVAL->y = 0; 1878 RETVAL->y = 0;
1654 RETVAL->w = 0; 1879 RETVAL->w = 0;
1693 1918
1694void 1919void
1695set_smooth (DC::Map self, int face, int smooth, int level) 1920set_smooth (DC::Map self, int face, int smooth, int level)
1696 CODE: 1921 CODE:
1697{ 1922{
1698 tileid texid; 1923 tileid texid;
1699 maptex *tex; 1924 maptex *tex;
1700 1925
1701 if (face < 0 || face >= self->faces) 1926 if (face < 0 || face >= self->faces)
1702 return; 1927 return;
1703 1928
1704 if (smooth < 0 || smooth >= self->faces) 1929 if (smooth < 0 || smooth >= self->faces)
1705 return; 1930 return;
1706 1931
1707 texid = self->face2tile [face]; 1932 texid = self->face2tile [face];
1708 1933
1709 if (!texid) 1934 if (!texid)
1710 return; 1935 return;
1711 1936
1712 tex = self->tex + texid; 1937 tex = self->tex + texid;
1741 //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);
1742 // use uglier nearest interpolation because linear suffers 1967 // use uglier nearest interpolation because linear suffers
1743 // from transparent color bleeding and ugly wrapping effects. 1968 // from transparent color bleeding and ugly wrapping effects.
1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1969 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1745} 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 }
1746 1991
1747int 1992int
1748ox (DC::Map self) 1993ox (DC::Map self)
1749 ALIAS: 1994 ALIAS:
1750 oy = 1 1995 oy = 1
1790 self->y += MAP_EXTEND_Y; 2035 self->y += MAP_EXTEND_Y;
1791 } 2036 }
1792} 2037}
1793 2038
1794SV * 2039SV *
1795map1a_update (DC::Map self, SV *data_, int extmap) 2040map1a_update (DC::Map self, SV *data_)
1796 CODE: 2041 CODE:
1797{ 2042{
1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2043 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1799 uint8_t *data_end = (uint8_t *)SvEND (data_); 2044 uint8_t *data_end = (uint8_t *)SvEND (data_);
1800 mapcell *cell; 2045 mapcell *cell;
1821 2066
1822 //TODO: don't trust server data to be in-range(!) 2067 //TODO: don't trust server data to be in-range(!)
1823 2068
1824 if (flags & 8) 2069 if (flags & 8)
1825 { 2070 {
2071 uint8_t ext, cmd;
2072
1826 if (extmap) 2073 do
1827 { 2074 {
1828 uint8_t ext, cmd; 2075 ext = *data++;
2076 cmd = ext & 0x7f;
1829 2077
1830 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
1831 { 2081 {
1832 ext = *data++;
1833 cmd = ext & 0x7f;
1834
1835 if (cmd < 4)
1836 cell->darkness = 255 - ext * 64 + 1;
1837 else if (cmd == 5) // health
1838 {
1839 cell->stat_width = 1; 2082 cell->stat_width = 1;
1840 cell->stat_hp = *data++; 2083 cell->stat_hp = *data++;
1841 }
1842 else if (cmd == 6) // monster width
1843 cell->stat_width = *data++ + 1;
1844 else if (cmd == 0x47)
1845 {
1846 if (*data == 1) cell->player = data [1];
1847 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1848 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1849 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1850
1851 data += *data + 1;
1852 }
1853 else if (cmd == 8) // cell flags
1854 cell->flags = *data++;
1855 else if (ext & 0x40) // unknown, multibyte => skip
1856 data += *data + 1;
1857 else
1858 data++;
1859 } 2084 }
1860 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++;
1861 } 2102 }
1862 else 2103 while (ext & 0x80);
1863 cell->darkness = *data++ + 1;
1864 } 2104 }
1865 2105
1866 for (z = 0; z <= 2; ++z) 2106 for (z = 0; z <= 2; ++z)
1867 if (flags & (4 >> z)) 2107 if (flags & (4 >> z))
1868 { 2108 {
1871 cell->tile [z] = self->face2tile [face]; 2111 cell->tile [z] = self->face2tile [face];
1872 2112
1873 if (cell->tile [z]) 2113 if (cell->tile [z])
1874 { 2114 {
1875 maptex *tex = self->tex + cell->tile [z]; 2115 maptex *tex = self->tex + cell->tile [z];
2116 tex->unused = 0;
1876 if (!tex->name) 2117 if (!tex->name)
1877 av_push (missing, newSViv (cell->tile [z])); 2118 av_push (missing, newSViv (cell->tile [z]));
1878 2119
1879 if (tex->smoothtile) 2120 if (tex->smoothtile)
1880 { 2121 {
1881 maptex *smooth = self->tex + tex->smoothtile; 2122 maptex *smooth = self->tex + tex->smoothtile;
2123 smooth->unused = 0;
1882 if (!smooth->name) 2124 if (!smooth->name)
1883 av_push (missing, newSViv (tex->smoothtile)); 2125 av_push (missing, newSViv (tex->smoothtile));
1884 } 2126 }
1885 } 2127 }
1886 } 2128 }
1914 ? self->row + y 2156 ? self->row + y
1915 : 0; 2157 : 0;
1916 2158
1917 for (x = x0; x < x1; x++) 2159 for (x = x0; x < x1; x++)
1918 { 2160 {
1919 int r = 32, g = 32, b = 32, a = 192; 2161 unsigned int r = 32, g = 32, b = 32, a = 192;
1920 2162
1921 if (row && row->c0 <= x && x < row->c1) 2163 if (row && row->c0 <= x && x < row->c1)
1922 { 2164 {
1923 mapcell *cell = row->col + (x - row->c0); 2165 mapcell *cell = row->col + (x - row->c0);
1924 2166
1926 { 2168 {
1927 maptex tex = self->tex [cell->tile [z]]; 2169 maptex tex = self->tex [cell->tile [z]];
1928 int a0 = 255 - tex.a; 2170 int a0 = 255 - tex.a;
1929 int a1 = tex.a; 2171 int a1 = tex.a;
1930 2172
1931 r = (r * a0 + tex.r * a1) / 255; 2173 r = div255 (r * a0 + tex.r * a1);
1932 g = (g * a0 + tex.g * a1) / 255; 2174 g = div255 (g * a0 + tex.g * a1);
1933 b = (b * a0 + tex.b * a1) / 255; 2175 b = div255 (b * a0 + tex.b * a1);
1934 a = (a * a0 + tex.a * a1) / 255; 2176 a = div255 (a * a0 + tex.a * a1);
1935 } 2177 }
1936 } 2178 }
1937 2179
1938 *map++ = (r ) 2180 *map++ = (r )
1939 | (g << 8) 2181 | (g << 8)
1940 | (b << 16) 2182 | (b << 16)
1941 | (a << 24); 2183 | (a << 24);
1942 } 2184 }
1943 } 2185 }
1944 2186
1945 RETVAL = map_sv; 2187 RETVAL = map_sv;
1946} 2188}
1947 OUTPUT: 2189 OUTPUT:
1948 RETVAL 2190 RETVAL
1949 2191
1950void 2192void
1951draw (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)
1952 CODE: 2194 CODE:
1953{ 2195{
1954 int x, y, z; 2196 int x, y, z;
1955 2197
1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2198 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1957 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
1958 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)
1959 smooth_key skey; 2201 smooth_key skey;
1960 int pl_x, pl_y; 2202 int pl_x, pl_y;
1961 maptex pl_tex; 2203 maptex pl_tex;
1962 rc_t *rc = rc_alloc (); 2204 rc_t *rc = rc_alloc ();
2205 rc_t *rc_ov = rc_alloc ();
1963 rc_key_t key; 2206 rc_key_t key;
1964 rc_array_t *arr; 2207 rc_array_t *arr;
1965 2208
1966 pl_tex.name = 0; 2209 pl_tex.name = 0;
1967 2210
1968 // thats current max. sorry. 2211 // that's current max. sorry.
1969 if (sw > 255) sw = 255; 2212 if (sw > 255) sw = 255;
1970 if (sh > 255) sh = 255; 2213 if (sh > 255) sh = 255;
1971 2214
1972 // clear key, in case of extra padding 2215 // clear key, in case of extra padding
1973 memset (&skey, 0, sizeof (skey)); 2216 memset (&skey, 0, sizeof (skey));
1977 key.g = 255; 2220 key.g = 255;
1978 key.b = 255; 2221 key.b = 255;
1979 key.a = 255; 2222 key.a = 255;
1980 key.mode = GL_QUADS; 2223 key.mode = GL_QUADS;
1981 key.format = GL_T2F_V3F; 2224 key.format = GL_T2F_V3F;
1982 key.texname = -1;
1983 2225
1984 mx += self->x; 2226 mx += self->x;
1985 my += self->y; 2227 my += self->y;
1986 2228
1987 // first pass: determine smooth_max 2229 // first pass: determine smooth_max
2011 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2253 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2012 2254
2013 for (z = 0; z <= 2; z++) 2255 for (z = 0; z <= 2; z++)
2014 { 2256 {
2015 memset (smooth_level, 0, sizeof (smooth_level)); 2257 memset (smooth_level, 0, sizeof (smooth_level));
2258 key.texname = -1;
2016 2259
2017 for (y = 0; y < sh; y++) 2260 for (y = 0; y < sh; y++)
2018 if (0 <= y + my && y + my < self->rows) 2261 if (0 <= y + my && y + my < self->rows)
2019 { 2262 {
2020 maprow *row = self->row + (y + my); 2263 maprow *row = self->row + (y + my);
2026 tileid tile = cell->tile [z]; 2269 tileid tile = cell->tile [z];
2027 2270
2028 if (tile) 2271 if (tile)
2029 { 2272 {
2030 maptex tex = self->tex [tile]; 2273 maptex tex = self->tex [tile];
2031 int px = (x + 1) * T - tex.w; 2274 int px, py;
2032 int py = (y + 1) * T - tex.h;
2033 2275
2034 if (key.texname != tex.name) 2276 if (key.texname != tex.name)
2035 { 2277 {
2278 self->tex [tile].unused = 0;
2279
2036 if (!tex.name) 2280 if (!tex.name)
2037 tex = self->tex [2]; /* missing, replace by noface */ 2281 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2038 2282
2039 key.texname = tex.name; 2283 key.texname = tex.name;
2040 arr = rc_array (rc, &key); 2284 arr = rc_array (rc, &key);
2041 } 2285 }
2286
2287 px = (x + 1) * Th - tex.w;
2288 py = (y + 1) * Tw - tex.h;
2042 2289
2043 if (expect_false (cell->player == player) && expect_false (z == 2)) 2290 if (expect_false (cell->player == player) && expect_false (z == 2))
2044 { 2291 {
2045 pl_x = px; 2292 pl_x = px;
2046 pl_y = py; 2293 pl_y = py;
2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2298 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2052 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);
2053 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);
2054 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);
2055 2302
2056 if (expect_false (cell->flags) && expect_false (z == 2))
2057 {
2058 // overlays such as the speech bubble, probably more to come
2059 if (cell->flags & 1)
2060 {
2061 maptex tex = self->tex [1];
2062 int px = x * T + T * 2 / 32;
2063 int py = y * T - T * 6 / 32;
2064
2065 if (tex.name)
2066 {
2067 if (key.texname != tex.name)
2068 {
2069 key.texname = tex.name;
2070 arr = rc_array (rc, &key);
2071 }
2072
2073 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2074 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2075 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2076 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2077 }
2078 }
2079 }
2080
2081 // update smooth hash 2303 // update smooth hash
2082 if (tex.smoothtile) 2304 if (tex.smoothtile)
2083 { 2305 {
2084 skey.tile = tex.smoothtile; 2306 skey.tile = tex.smoothtile;
2085 skey.level = tex.smoothlevel; 2307 skey.level = tex.smoothlevel;
2113 // corners 2335 // corners
2114 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);
2115 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);
2116 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);
2117 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);
2118 } 2361 }
2119 } 2362 }
2120 } 2363 }
2121 } 2364 }
2122 2365
2149 if (!(bits & 0x1000) 2392 if (!(bits & 0x1000)
2150 && skey->level == level 2393 && skey->level == level
2151 && level > smooth_max [skey->x][skey->y]) 2394 && level > smooth_max [skey->x][skey->y])
2152 { 2395 {
2153 maptex tex = self->tex [skey->tile]; 2396 maptex tex = self->tex [skey->tile];
2154 int px = (((int)skey->x) - 1) * T; 2397 int px = (((int)skey->x) - 1) * Tw;
2155 int py = (((int)skey->y) - 1) * T; 2398 int py = (((int)skey->y) - 1) * Th;
2156 int border = bits & 15; 2399 int border = bits & 15;
2157 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2158 float dx = tex.s * .0625f; // 16 images/row 2401 float dx = tex.s * .0625f; // 16 images/row
2159 float dy = tex.t * .5f ; // 2 images/column 2402 float dy = tex.t * .5f ; // 2 images/column
2160 2403
2162 { 2405 {
2163 // this time avoiding texture state changes 2406 // this time avoiding texture state changes
2164 // save gobs of state changes. 2407 // save gobs of state changes.
2165 if (key.texname != tex.name) 2408 if (key.texname != tex.name)
2166 { 2409 {
2410 self->tex [skey->tile].unused = 0;
2411
2167 glEnd (); 2412 glEnd ();
2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2169 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2170 } 2415 }
2171 2416
2172 if (border) 2417 if (border)
2173 { 2418 {
2174 float ox = border * dx; 2419 float ox = border * dx;
2175 2420
2176 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2177 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2178 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2179 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2180 } 2425 }
2181 2426
2182 if (corner) 2427 if (corner)
2183 { 2428 {
2184 float ox = corner * dx; 2429 float ox = corner * dx;
2185 2430
2186 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2187 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2188 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2189 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2190 } 2435 }
2191 } 2436 }
2192 } 2437 }
2193 } 2438 }
2194 } 2439 }
2217 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);
2218 2463
2219 rc_draw (rc); 2464 rc_draw (rc);
2220 } 2465 }
2221 2466
2467 rc_draw (rc_ov);
2468 rc_clear (rc_ov);
2469
2222 glDisable (GL_BLEND); 2470 glDisable (GL_BLEND);
2223 rc_free (rc); 2471 rc_free (rc);
2472 rc_free (rc_ov);
2224 2473
2225 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2226 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2227 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2228 { 2477 {
2231 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2232 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2233 { 2482 {
2234 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2235 2484
2236 int px = x * T; 2485 int px = x * Tw;
2237 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 }
2238 2493
2239 if (cell->stat_hp) 2494 if (cell->stat_hp)
2240 { 2495 {
2241 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2242 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2243 2498
2244 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2245 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2246 px + width - 1, py); 2501 px + width - 1, py);
2247 2502
2253 } 2508 }
2254 } 2509 }
2255} 2510}
2256 2511
2257void 2512void
2258draw_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)
2259 CODE: 2514 CODE:
2260{ 2515{
2261 static float color[16][3] = { 2516 static float color[16][3] = {
2262 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2263 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2264 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2265 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2266 2521
2267 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2268 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2269 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2270 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2271 2526
2272 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2273 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2274 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2275 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2276 2531
2277 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2278 2533
2279 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2280 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2281 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2282 }; 2537 };
2283 2538
2284 int x, y; 2539 int x, y;
2285 2540
2286 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 */
2287 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2288 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2289 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2290 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2291 2552
2292 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2296 2557
2297 if (m) 2558 if (m)
2298 { 2559 {
2299 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2300 2561
2301 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2302 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2303 2564
2304 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2305 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2306 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2307 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2308 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2309 } 2570 }
2317void 2578void
2318fow_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)
2319 PPCODE: 2580 PPCODE:
2320{ 2581{
2321 int x, y; 2582 int x, y;
2322 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2323 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2324 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2325 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);
2326 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2327 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2328 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2329 2591
2330 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2331 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2332 2594
2333 mx += self->x - 1; 2595 mx += self->x - 1;
2334 my += self->y - 1; 2596 my += self->y - 1;
2335
2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2337 2597
2338 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2339 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2340 { 2600 {
2341 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2344 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2345 { 2605 {
2346 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2347 2607
2348 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2349 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2350 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2351 } 2611 }
2352 } 2612 }
2353 2613
2354 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2355 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2374 2634
2375 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2376 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2377 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2378 2638
2379 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2380 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2381 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2382 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2383 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 */
2384 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2385 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2386 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2387 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2388 } 2648 }
2389 2649
2390 free (darkness1); 2650 free (darkness1);
2391 2651
2392 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2393 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2394 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2395 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2396} 2656}
2397 2657
2398SV * 2658SV *
2461 else 2721 else
2462 *data++ = 0; 2722 *data++ = 0;
2463 } 2723 }
2464 } 2724 }
2465 2725
2466 /* 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 */
2467 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2468 { 2728 {
2469 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471 } 2731 }
2472 2732
2473 RETVAL = data_sv; 2733 RETVAL = data_sv;
2474} 2734}
2475 OUTPUT: 2735 OUTPUT:
2476 RETVAL 2736 RETVAL
2477 2737
2478void 2738void
2485 STRLEN len; 2745 STRLEN len;
2486 uint8_t *data, *end; 2746 uint8_t *data, *end;
2487 2747
2488 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2489 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2490 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2491 end = data + len + 8; 2751 end = data + len + 8;
2492 2752
2493 if (len < 5) 2753 if (len < 5)
2494 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2495 2755
2556} 2816}
2557 2817
2558MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2559 2819
2560DC::RW 2820DC::RW
2561new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2562 CODE: 2822 CODE:
2563{ 2823{
2564 STRLEN datalen; 2824 STRLEN datalen;
2565 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2566 2826
2568} 2828}
2569 OUTPUT: 2829 OUTPUT:
2570 RETVAL 2830 RETVAL
2571 2831
2572DC::RW 2832DC::RW
2573new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2574 CODE: 2834 CODE:
2575 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2576 OUTPUT: 2836 OUTPUT:
2577 RETVAL 2837 RETVAL
2578 2838
2596 if (RETVAL < 0) 2856 if (RETVAL < 0)
2597 { 2857 {
2598 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2599 2859
2600 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)
2601 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2602 2867 }
2868 else
2603 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2604 } 2870 }
2605 2871
2606 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2608} 2874}
2655void 2921void
2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2657 CODE: 2923 CODE:
2658{ 2924{
2659 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));
2660 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;
2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2662} 2928}
2663 2929
2664void 2930void
2665set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2668 2934
2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2670 2936
2671PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2672 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
2673DC::MixChunk 2951DC::MixChunk
2674new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2675 CODE: 2953 CODE:
2676 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2677 OUTPUT: 2955 OUTPUT:
2678 RETVAL 2956 RETVAL
2679 2957
2709 OUTPUT: 2987 OUTPUT:
2710 RETVAL 2988 RETVAL
2711 2989
2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2713 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
2714int 3004int
2715volume (int volume = -1) 3005volume (int volume = -1)
2716 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2717 CODE: 3007 CODE:
2718 if (items > 0) 3008 if (items > 0)
2729void 3019void
2730halt () 3020halt ()
2731 CODE: 3021 CODE:
2732 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2733 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2734DC::MixMusic 3031DC::MixMusic
2735new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2736 CODE: 3033 CODE:
2737 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2738 OUTPUT: 3035 OUTPUT:
2739 RETVAL 3036 RETVAL
2740 3037
2768 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2769# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2770 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2771 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2772 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2773 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2774 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2775 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2776 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2777 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2789 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2790 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2791 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2792 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2793 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),
2794 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2795 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2796 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2797 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2798 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2866 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2867 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2868 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2869 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2870 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),
2871# undef const_iv 3176# undef const_iv
2872 }; 3177 };
2873 3178
2874 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--)
2875 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2876 3181
2877 texture_av = newAV (); 3182 texture_av = newAV ();
2878 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2879} 3184}
2880 3185
2882disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2883 CODE: 3188 CODE:
2884 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2885 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2886 3191
2887char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2888gl_vendor () 3196gl_vendor ()
2889 CODE: 3197 CODE:
2890 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2891 OUTPUT: 3199 OUTPUT:
2892 RETVAL 3200 RETVAL
2893 3201
2894char * 3202const char *
2895gl_version () 3203gl_version ()
2896 CODE: 3204 CODE:
2897 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2898 OUTPUT: 3206 OUTPUT:
2899 RETVAL 3207 RETVAL
2900 3208
2901char * 3209const char *
2902gl_extensions () 3210gl_extensions ()
2903 CODE: 3211 CODE:
2904 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2905 OUTPUT: 3213 OUTPUT:
2906 RETVAL 3214 RETVAL
2907 3215
2908const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2909 3221
2910GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2911 CODE: 3223 CODE:
2912 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2913 OUTPUT: 3225 OUTPUT:
2921 3233
2922int glGetError () 3234int glGetError ()
2923 3235
2924void glFinish () 3236void glFinish ()
2925 3237
3238void glFlush ()
3239
2926void glClear (int mask) 3240void glClear (int mask)
2927 3241
2928void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2929 PROTOTYPE: @ 3243 PROTOTYPE: @
2930 3244
2939void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2940 3254
2941void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2942 CODE: 3256 CODE:
2943 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2944 3260
2945void glDepthMask (int flag) 3261void glDepthMask (int flag)
2946 3262
2947void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2948 3264
2983void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2984 CODE: 3300 CODE:
2985 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2986 3302
2987void 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: @
2988 ALIAS: 3305 ALIAS:
2989 glColor_premultiply = 1 3306 glColor_premultiply = 1
2990 CODE: 3307 CODE:
2991 if (ix) 3308 if (ix)
2992 { 3309 {
3098 3415
3099void glEndList () 3416void glEndList ()
3100 3417
3101void glCallList (int list) 3418void glCallList (int list)
3102 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3104 3426
3105PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3106 3428
3107void 3429void
3108find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3109 PPCODE: 3431 PPCODE:
3110{ 3432{
3111 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3112 XPUSHs (self); 3434 XPUSHs (self);
3113} 3435}
3114 3436
3115BOOT: 3437BOOT:
3116{ 3438{
3124 3446
3125void 3447void
3126draw (SV *self) 3448draw (SV *self)
3127 CODE: 3449 CODE:
3128{ 3450{
3129 HV *hv; 3451 HV *hv;
3130 SV **svp; 3452 SV **svp;
3131 NV x, y, w, h; 3453 NV x, y, w, h;
3132 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3133 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3134 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3135 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