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.266 by root, Sun Jul 20 02:51:40 2008 UTC vs.
Revision 1.321 by root, Sun Nov 18 01:15:04 2018 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib.h>
48 54
49#include <pango/pango.h> 55#include <pango/pango.h>
50 56
51#ifndef PANGO_VERSION_CHECK 57#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 58# define PANGO_VERSION_CHECK(a,b,c) 0
76#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
78 84
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
82 91
83#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
85 94
86#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
87 96
88/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
99
100#define KMOD_LRAM 0x10000 // our extension
101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
90 123
91static AV *texture_av; 124static AV *texture_av;
92 125
93static struct 126static struct
94{ 127{
151{ 184{
152 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
153 186
154 while (attrs) 187 while (attrs)
155 { 188 {
156 PangoAttribute *attr = attrs->data; 189 PangoAttribute *attr = (PangoAttribute *)attrs->data;
157 190
158 if (attr->klass->type == PANGO_ATTR_SHAPE) 191 if (attr->klass->type == PANGO_ATTR_SHAPE)
159 return 1; 192 return 1;
160 193
161 attrs = attrs->next; 194 attrs = attrs->next;
179static void 212static void
180substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
181{ 214{
182 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
183#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
184 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
185#endif 218#endif
186 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
187} 220}
188 221
189static void 222static void
226 int w, h; 259 int w, h;
227 float s, t; 260 float s, t;
228 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
229 tileid smoothtile; 262 tileid smoothtile;
230 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
231} maptex; 265} maptex;
232 266
233typedef struct { 267typedef struct {
234 uint32_t player; 268 uint32_t player;
235 tileid tile[3]; 269 tileid tile[3];
367 self->oy = 0; 401 self->oy = 0;
368 self->row = 0; 402 self->row = 0;
369 self->rows = 0; 403 self->rows = 0;
370} 404}
371 405
406#define CELL_CLEAR(cell) \
407 do { \
408 if ((cell)->player) \
409 (cell)->tile [2] = 0; \
410 (cell)->darkness = 0; \
411 (cell)->stat_hp = 0; \
412 (cell)->flags = 0; \
413 (cell)->player = 0; \
414 } while (0)
415
372static void 416static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 417map_blank (DC__Map self, int x0, int y0, int w, int h)
374{ 418{
375 int x, y; 419 int x, y;
376 maprow *row; 420 maprow *row;
390 if (x >= row->c1) 434 if (x >= row->c1)
391 break; 435 break;
392 436
393 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
394 438
395 cell->darkness = 0; 439 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 440 }
400 } 441 }
401} 442}
402 443
403typedef struct { 444typedef struct {
438 ev.code = 1; 479 ev.code = 1;
439 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
440 ev.data2 = 0; 481 ev.data2 = 0;
441 482
442 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
484}
485
486// approximately divide by 255
487static unsigned int
488div255 (unsigned int n)
489{
490 return (n + (n >> 8)) >> 8;
443} 491}
444 492
445static unsigned int 493static unsigned int
446minpot (unsigned int n) 494minpot (unsigned int n)
447{ 495{
514 if (!svp || !SvTRUE (*svp)) 562 if (!svp || !SvTRUE (*svp))
515 return 0; 563 return 0;
516 564
517 return 1; 565 return 1;
518} 566}
567
568/******************************************************************************/
569
570/* process keyboard modifiers */
571static int
572mod_munge (int mod)
573{
574 mod &= MOD_MASK;
575
576 if (mod & (KMOD_META | KMOD_ALT))
577 mod |= KMOD_LRAM;
578
579 return mod;
580}
581
582static void
583deliantra_main (SV *real_main)
584{
585 dSP;
586
587 PUSHMARK (SP);
588 call_sv (real_main, G_DISCARD | G_VOID);
589}
590
591#ifdef __MACOSX__
592 static SV *real_main;
593
594 /* to due surprising braindamage on the side of SDL design, we
595 * do some mind-boggling hack here: SDL requires a custom main()
596 * on OS X, so... we provide one and call the original main(), which,
597 * due to shared library magic, calls -lSDLmain's main, not perl's main,
598 * and which calls our main (== SDL_main) back.
599 */
600 extern C_LINKAGE int
601 main (int argc, char *argv[])
602 {
603 deliantra_main (real_main);
604 }
605
606 #undef main
607
608 extern C_LINKAGE int main (int argc, char *argv[]);
609
610 static void
611 SDL_main_hack (SV *real_main_)
612 {
613 real_main = real_main_;
614
615 char *argv[] = { "deliantra client", 0 };
616 (main) (1, argv);
617 }
618#else
619 static void
620 SDL_main_hack (SV *real_main)
621 {
622 deliantra_main (real_main);
623 }
624#endif
519 625
520MODULE = Deliantra::Client PACKAGE = DC 626MODULE = Deliantra::Client PACKAGE = DC
521 627
522PROTOTYPES: ENABLE 628PROTOTYPES: ENABLE
523 629
552 const_iv (SDL_USEREVENT), 658 const_iv (SDL_USEREVENT),
553 659
554 const_iv (SDL_APPINPUTFOCUS), 660 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 661 const_iv (SDL_APPMOUSEFOCUS),
556 const_iv (SDL_APPACTIVE), 662 const_iv (SDL_APPACTIVE),
663
664
665 const_iv (SDLK_UNKNOWN),
666 const_iv (SDLK_FIRST),
667 const_iv (SDLK_BACKSPACE),
668 const_iv (SDLK_TAB),
669 const_iv (SDLK_CLEAR),
670 const_iv (SDLK_RETURN),
671 const_iv (SDLK_PAUSE),
672 const_iv (SDLK_ESCAPE),
673 const_iv (SDLK_SPACE),
674 const_iv (SDLK_EXCLAIM),
675 const_iv (SDLK_QUOTEDBL),
676 const_iv (SDLK_HASH),
677 const_iv (SDLK_DOLLAR),
678 const_iv (SDLK_AMPERSAND),
679 const_iv (SDLK_QUOTE),
680 const_iv (SDLK_LEFTPAREN),
681 const_iv (SDLK_RIGHTPAREN),
682 const_iv (SDLK_ASTERISK),
683 const_iv (SDLK_PLUS),
684 const_iv (SDLK_COMMA),
685 const_iv (SDLK_MINUS),
686 const_iv (SDLK_PERIOD),
687 const_iv (SDLK_SLASH),
688 const_iv (SDLK_0),
689 const_iv (SDLK_1),
690 const_iv (SDLK_2),
691 const_iv (SDLK_3),
692 const_iv (SDLK_4),
693 const_iv (SDLK_5),
694 const_iv (SDLK_6),
695 const_iv (SDLK_7),
696 const_iv (SDLK_8),
697 const_iv (SDLK_9),
698 const_iv (SDLK_COLON),
699 const_iv (SDLK_SEMICOLON),
700 const_iv (SDLK_LESS),
701 const_iv (SDLK_EQUALS),
702 const_iv (SDLK_GREATER),
703 const_iv (SDLK_QUESTION),
704 const_iv (SDLK_AT),
705
706 const_iv (SDLK_LEFTBRACKET),
707 const_iv (SDLK_BACKSLASH),
708 const_iv (SDLK_RIGHTBRACKET),
709 const_iv (SDLK_CARET),
710 const_iv (SDLK_UNDERSCORE),
711 const_iv (SDLK_BACKQUOTE),
712 const_iv (SDLK_DELETE),
557 713
558 const_iv (SDLK_FIRST), 714 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 715 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 716 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 717 const_iv (SDLK_KP1),
637 const_iv (KMOD_RMETA), 793 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 794 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 795 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 796 const_iv (KMOD_MODE),
641 797
798 const_iv (KMOD_LRAM),
799
642 const_iv (MIX_DEFAULT_FORMAT), 800 const_iv (MIX_DEFAULT_FORMAT),
643 801
644 const_iv (SDL_INIT_TIMER), 802 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 803 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 804 const_iv (SDL_INIT_VIDEO),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 822 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO), 823 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 824 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES), 825 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL), 826 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL) 827 const_iv (SDL_GL_SWAP_CONTROL),
828
829 const_iv (FOW_DARKNESS)
670# undef const_iv 830# undef const_iv
671 }; 831 };
672 832
673 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--)
674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 834 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
675 835
676 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 836 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
677 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 837 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
678} 838}
679 839
695NV ceil (NV x) 855NV ceil (NV x)
696 856
697IV minpot (UV n) 857IV minpot (UV n)
698 858
699IV 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
700 866
701void 867void
702pango_init () 868pango_init ()
703 CODE: 869 CODE:
704{ 870{
712#endif 878#endif
713} 879}
714 880
715char *SDL_GetError () 881char *SDL_GetError ()
716 882
883void SDL_main_hack (SV *real_main)
884 PROTOTYPE: &
885
717int SDL_Init (U32 flags) 886int SDL_Init (U32 flags)
718 887
719int SDL_InitSubSystem (U32 flags) 888int SDL_InitSubSystem (U32 flags)
720 889
721void SDL_QuitSubSystem (U32 flags) 890void SDL_QuitSubSystem (U32 flags)
722 891
723void SDL_Quit () 892void SDL_Quit ()
724 893
725int SDL_GL_SetAttribute (int attr, int value) 894int SDL_GL_SetAttribute (int attr, int value)
895 C_ARGS: (SDL_GLattr)attr, value
726 896
727int SDL_GL_GetAttribute (int attr) 897int SDL_GL_GetAttribute (int attr)
728 CODE: 898 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL)) 899 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
730 XSRETURN_UNDEF; 900 XSRETURN_UNDEF;
731 OUTPUT: 901 OUTPUT:
732 RETVAL 902 RETVAL
733 903
734void 904void
789 ); 959 );
790 960
791 if (RETVAL) 961 if (RETVAL)
792 { 962 {
793 av_clear (texture_av); 963 av_clear (texture_av);
794
795 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
796#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);
797#include "glfunc.h" 965#include "glfunc.h"
798#undef GL_FUNC 966#undef GL_FUNC
967 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
968 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
799 } 969 }
800} 970}
801 OUTPUT: 971 OUTPUT:
802 RETVAL 972 RETVAL
973
974void
975SDL_WM_SetCaption (const char *title, const char *icon)
803 976
804void 977void
805SDL_GL_SwapBuffers () 978SDL_GL_SwapBuffers ()
806 979
807char * 980char *
808SDL_GetKeyName (int sym) 981SDL_GetKeyName (int sym)
982 C_ARGS: (SDLKey)sym
809 983
810int 984int
811SDL_GetAppState () 985SDL_GetAppState ()
812 986
813int 987int
814SDL_GetModState () 988SDL_GetModState ()
815 989
990int
991SDL_WaitEvent ()
992 C_ARGS: 0
993
816void 994void
995SDL_PumpEvents ()
996
997void
817poll_events () 998peep_events ()
818 PPCODE: 999 PPCODE:
819{ 1000{
820 SDL_Event ev; 1001 SDL_Event ev;
821 1002
822 SDL_PumpEvents (); 1003 SDL_PumpEvents ();
829 { 1010 {
830 case SDL_KEYDOWN: 1011 case SDL_KEYDOWN:
831 case SDL_KEYUP: 1012 case SDL_KEYUP:
832 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1013 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
833 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1014 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
834 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);
835 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 */
836 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1017 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
837 break; 1018 break;
838 1019
839 case SDL_ACTIVEEVENT: 1020 case SDL_ACTIVEEVENT:
840 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1021 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
858 x = ev.motion.x; 1039 x = ev.motion.x;
859 y = ev.motion.y; 1040 y = ev.motion.y;
860 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1041 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
861 } 1042 }
862 1043
863 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1044 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
864 hv_store (hv, "state", 5, newSViv (state), 0); 1045 hv_store (hv, "state", 5, newSViv (state), 0);
865 hv_store (hv, "x", 1, newSViv (x), 0); 1046 hv_store (hv, "x", 1, newSViv (x), 0);
866 hv_store (hv, "y", 1, newSViv (y), 0); 1047 hv_store (hv, "y", 1, newSViv (y), 0);
867 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1048 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
868 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1049 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
888 1069
889 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))));
890 } 1071 }
891} 1072}
892 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
893int 1087int
894Mix_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)
895 POSTCALL: 1089 POSTCALL:
896 Mix_HookMusicFinished (music_finished); 1090 Mix_HookMusicFinished (music_finished);
897 Mix_ChannelFinished (channel_finished); 1091 Mix_ChannelFinished (channel_finished);
898 1092
899void 1093void
900Mix_QuerySpec () 1094Mix_QuerySpec ()
959add_font (char *file) 1153add_font (char *file)
960 CODE: 1154 CODE:
961 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1155 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
962 OUTPUT: 1156 OUTPUT:
963 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)
964 1165
965void 1166void
966load_image_inline (SV *image_) 1167load_image_inline (SV *image_)
967 ALIAS: 1168 ALIAS:
968 load_image_file = 1 1169 load_image_file = 1
1014 1215
1015 SDL_LockSurface (surface2); 1216 SDL_LockSurface (surface2);
1016 EXTEND (SP, 6); 1217 EXTEND (SP, 6);
1017 PUSHs (sv_2mortal (newSViv (surface2->w))); 1218 PUSHs (sv_2mortal (newSViv (surface2->w)));
1018 PUSHs (sv_2mortal (newSViv (surface2->h))); 1219 PUSHs (sv_2mortal (newSViv (surface2->h)));
1019 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1220 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1020 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)));
1021 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1222 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1022 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1223 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1023 SDL_UnlockSurface (surface2); 1224 SDL_UnlockSurface (surface2);
1024 1225
1084#if DEBUG 1285#if DEBUG
1085 VALGRIND_DO_LEAK_CHECK; 1286 VALGRIND_DO_LEAK_CHECK;
1086#endif 1287#endif
1087} 1288}
1088 1289
1290int
1291SvREFCNT (SV *sv)
1292 CODE:
1293 RETVAL = SvREFCNT (sv);
1294 OUTPUT:
1295 RETVAL
1296
1089MODULE = Deliantra::Client PACKAGE = DC::Font 1297MODULE = Deliantra::Client PACKAGE = DC::Font
1090 1298
1091PROTOTYPES: DISABLE 1299PROTOTYPES: DISABLE
1092 1300
1093DC::Font 1301DC::Font
1094new_from_file (SV *class, char *path, int id = 0) 1302new_from_file (SV *klass, char *path, int id = 0)
1095 CODE: 1303 CODE:
1096{ 1304{
1097 int count; 1305 int count;
1098 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1306 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1099 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1307 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1128 PROTOTYPE: 1336 PROTOTYPE:
1129 CODE: 1337 CODE:
1130 tc_restore (); 1338 tc_restore ();
1131 1339
1132DC::Layout 1340DC::Layout
1133new (SV *class) 1341new (SV *klass)
1134 CODE: 1342 CODE:
1135 New (0, RETVAL, 1, struct cf_layout); 1343 New (0, RETVAL, 1, struct cf_layout);
1136 1344
1137 RETVAL->pl = pango_layout_new (opengl_context); 1345 RETVAL->pl = pango_layout_new (opengl_context);
1138 RETVAL->r = 1.; 1346 RETVAL->r = 1.;
1287 1495
1288void 1496void
1289set_height (DC::Layout self, int base_height) 1497set_height (DC::Layout self, int base_height)
1290 CODE: 1498 CODE:
1291 if (self->base_height != base_height) 1499 if (self->base_height != base_height)
1292 { 1500 {
1293 self->base_height = base_height; 1501 self->base_height = base_height;
1294 layout_update_font (self); 1502 layout_update_font (self);
1295 } 1503 }
1296 1504
1297void 1505void
1524 glDisable (GL_ALPHA_TEST); 1732 glDisable (GL_ALPHA_TEST);
1525 glDisable (GL_BLEND); 1733 glDisable (GL_BLEND);
1526 } 1734 }
1527} 1735}
1528 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
1529IV 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)
1530 CODE: 1859 CODE:
1531{ 1860{
1532 GLint width; 1861 GLint width;
1533 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);
1540MODULE = Deliantra::Client PACKAGE = DC::Map 1869MODULE = Deliantra::Client PACKAGE = DC::Map
1541 1870
1542PROTOTYPES: DISABLE 1871PROTOTYPES: DISABLE
1543 1872
1544DC::Map 1873DC::Map
1545new (SV *class) 1874new (SV *klass)
1546 CODE: 1875 CODE:
1547 New (0, RETVAL, 1, struct map); 1876 New (0, RETVAL, 1, struct map);
1548 RETVAL->x = 0; 1877 RETVAL->x = 0;
1549 RETVAL->y = 0; 1878 RETVAL->y = 0;
1550 RETVAL->w = 0; 1879 RETVAL->w = 0;
1589 1918
1590void 1919void
1591set_smooth (DC::Map self, int face, int smooth, int level) 1920set_smooth (DC::Map self, int face, int smooth, int level)
1592 CODE: 1921 CODE:
1593{ 1922{
1594 tileid texid; 1923 tileid texid;
1595 maptex *tex; 1924 maptex *tex;
1596 1925
1597 if (face < 0 || face >= self->faces) 1926 if (face < 0 || face >= self->faces)
1598 return; 1927 return;
1599 1928
1600 if (smooth < 0 || smooth >= self->faces) 1929 if (smooth < 0 || smooth >= self->faces)
1601 return; 1930 return;
1602 1931
1603 texid = self->face2tile [face]; 1932 texid = self->face2tile [face];
1604 1933
1605 if (!texid) 1934 if (!texid)
1606 return; 1935 return;
1607 1936
1608 tex = self->tex + texid; 1937 tex = self->tex + texid;
1637 //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);
1638 // use uglier nearest interpolation because linear suffers 1967 // use uglier nearest interpolation because linear suffers
1639 // from transparent color bleeding and ugly wrapping effects. 1968 // from transparent color bleeding and ugly wrapping effects.
1640 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1969 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1641} 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 }
1642 1991
1643int 1992int
1644ox (DC::Map self) 1993ox (DC::Map self)
1645 ALIAS: 1994 ALIAS:
1646 oy = 1 1995 oy = 1
1686 self->y += MAP_EXTEND_Y; 2035 self->y += MAP_EXTEND_Y;
1687 } 2036 }
1688} 2037}
1689 2038
1690SV * 2039SV *
1691map1a_update (DC::Map self, SV *data_, int extmap) 2040map1a_update (DC::Map self, SV *data_)
1692 CODE: 2041 CODE:
1693{ 2042{
1694 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2043 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1695 uint8_t *data_end = (uint8_t *)SvEND (data_); 2044 uint8_t *data_end = (uint8_t *)SvEND (data_);
1696 mapcell *cell; 2045 mapcell *cell;
1717 2066
1718 //TODO: don't trust server data to be in-range(!) 2067 //TODO: don't trust server data to be in-range(!)
1719 2068
1720 if (flags & 8) 2069 if (flags & 8)
1721 { 2070 {
2071 uint8_t ext, cmd;
2072
1722 if (extmap) 2073 do
1723 { 2074 {
1724 uint8_t ext, cmd; 2075 ext = *data++;
2076 cmd = ext & 0x7f;
1725 2077
1726 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
1727 { 2081 {
1728 ext = *data++;
1729 cmd = ext & 0x7f;
1730
1731 if (cmd < 4)
1732 cell->darkness = 255 - ext * 64 + 1;
1733 else if (cmd == 5) // health
1734 {
1735 cell->stat_width = 1; 2082 cell->stat_width = 1;
1736 cell->stat_hp = *data++; 2083 cell->stat_hp = *data++;
1737 }
1738 else if (cmd == 6) // monster width
1739 cell->stat_width = *data++ + 1;
1740 else if (cmd == 0x47)
1741 {
1742 if (*data == 1) cell->player = data [1];
1743 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1744 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1745 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1746
1747 data += *data + 1;
1748 }
1749 else if (cmd == 8) // cell flags
1750 cell->flags = *data++;
1751 else if (ext & 0x40) // unknown, multibyte => skip
1752 data += *data + 1;
1753 else
1754 data++;
1755 } 2084 }
1756 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++;
1757 } 2102 }
1758 else 2103 while (ext & 0x80);
1759 cell->darkness = *data++ + 1;
1760 } 2104 }
1761 2105
1762 for (z = 0; z <= 2; ++z) 2106 for (z = 0; z <= 2; ++z)
1763 if (flags & (4 >> z)) 2107 if (flags & (4 >> z))
1764 { 2108 {
1767 cell->tile [z] = self->face2tile [face]; 2111 cell->tile [z] = self->face2tile [face];
1768 2112
1769 if (cell->tile [z]) 2113 if (cell->tile [z])
1770 { 2114 {
1771 maptex *tex = self->tex + cell->tile [z]; 2115 maptex *tex = self->tex + cell->tile [z];
2116 tex->unused = 0;
1772 if (!tex->name) 2117 if (!tex->name)
1773 av_push (missing, newSViv (cell->tile [z])); 2118 av_push (missing, newSViv (cell->tile [z]));
1774 2119
1775 if (tex->smoothtile) 2120 if (tex->smoothtile)
1776 { 2121 {
1777 maptex *smooth = self->tex + tex->smoothtile; 2122 maptex *smooth = self->tex + tex->smoothtile;
2123 smooth->unused = 0;
1778 if (!smooth->name) 2124 if (!smooth->name)
1779 av_push (missing, newSViv (tex->smoothtile)); 2125 av_push (missing, newSViv (tex->smoothtile));
1780 } 2126 }
1781 } 2127 }
1782 } 2128 }
1783 } 2129 }
1784 else 2130 else
1785 { 2131 CELL_CLEAR (cell);
1786 cell->darkness = 0;
1787 cell->stat_hp = 0;
1788 cell->flags = 0;
1789 cell->player = 0;
1790 }
1791 } 2132 }
1792} 2133}
1793 OUTPUT: 2134 OUTPUT:
1794 RETVAL 2135 RETVAL
1795 2136
1815 ? self->row + y 2156 ? self->row + y
1816 : 0; 2157 : 0;
1817 2158
1818 for (x = x0; x < x1; x++) 2159 for (x = x0; x < x1; x++)
1819 { 2160 {
1820 int r = 32, g = 32, b = 32, a = 192; 2161 unsigned int r = 32, g = 32, b = 32, a = 192;
1821 2162
1822 if (row && row->c0 <= x && x < row->c1) 2163 if (row && row->c0 <= x && x < row->c1)
1823 { 2164 {
1824 mapcell *cell = row->col + (x - row->c0); 2165 mapcell *cell = row->col + (x - row->c0);
1825 2166
1827 { 2168 {
1828 maptex tex = self->tex [cell->tile [z]]; 2169 maptex tex = self->tex [cell->tile [z]];
1829 int a0 = 255 - tex.a; 2170 int a0 = 255 - tex.a;
1830 int a1 = tex.a; 2171 int a1 = tex.a;
1831 2172
1832 r = (r * a0 + tex.r * a1) / 255; 2173 r = div255 (r * a0 + tex.r * a1);
1833 g = (g * a0 + tex.g * a1) / 255; 2174 g = div255 (g * a0 + tex.g * a1);
1834 b = (b * a0 + tex.b * a1) / 255; 2175 b = div255 (b * a0 + tex.b * a1);
1835 a = (a * a0 + tex.a * a1) / 255; 2176 a = div255 (a * a0 + tex.a * a1);
1836 } 2177 }
1837 } 2178 }
1838 2179
1839 *map++ = (r ) 2180 *map++ = (r )
1840 | (g << 8) 2181 | (g << 8)
1841 | (b << 16) 2182 | (b << 16)
1842 | (a << 24); 2183 | (a << 24);
1843 } 2184 }
1844 } 2185 }
1845 2186
1846 RETVAL = map_sv; 2187 RETVAL = map_sv;
1847} 2188}
1848 OUTPUT: 2189 OUTPUT:
1849 RETVAL 2190 RETVAL
1850 2191
1851void 2192void
1852draw (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)
1853 CODE: 2194 CODE:
1854{ 2195{
1855 int x, y, z; 2196 int x, y, z;
1856 2197
1857 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2198 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1858 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
1859 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)
1860 smooth_key skey; 2201 smooth_key skey;
1861 int pl_x, pl_y; 2202 int pl_x, pl_y;
1862 maptex pl_tex; 2203 maptex pl_tex;
1863 rc_t *rc = rc_alloc (); 2204 rc_t *rc = rc_alloc ();
2205 rc_t *rc_ov = rc_alloc ();
1864 rc_key_t key; 2206 rc_key_t key;
1865 rc_array_t *arr; 2207 rc_array_t *arr;
1866 2208
1867 pl_tex.name = 0; 2209 pl_tex.name = 0;
1868 2210
1869 // thats current max. sorry. 2211 // that's current max. sorry.
1870 if (sw > 255) sw = 255; 2212 if (sw > 255) sw = 255;
1871 if (sh > 255) sh = 255; 2213 if (sh > 255) sh = 255;
1872 2214
1873 // clear key, in case of extra padding 2215 // clear key, in case of extra padding
1874 memset (&skey, 0, sizeof (skey)); 2216 memset (&skey, 0, sizeof (skey));
1878 key.g = 255; 2220 key.g = 255;
1879 key.b = 255; 2221 key.b = 255;
1880 key.a = 255; 2222 key.a = 255;
1881 key.mode = GL_QUADS; 2223 key.mode = GL_QUADS;
1882 key.format = GL_T2F_V3F; 2224 key.format = GL_T2F_V3F;
1883 key.texname = -1;
1884 2225
1885 mx += self->x; 2226 mx += self->x;
1886 my += self->y; 2227 my += self->y;
1887 2228
1888 // first pass: determine smooth_max 2229 // first pass: determine smooth_max
1912 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2253 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1913 2254
1914 for (z = 0; z <= 2; z++) 2255 for (z = 0; z <= 2; z++)
1915 { 2256 {
1916 memset (smooth_level, 0, sizeof (smooth_level)); 2257 memset (smooth_level, 0, sizeof (smooth_level));
2258 key.texname = -1;
1917 2259
1918 for (y = 0; y < sh; y++) 2260 for (y = 0; y < sh; y++)
1919 if (0 <= y + my && y + my < self->rows) 2261 if (0 <= y + my && y + my < self->rows)
1920 { 2262 {
1921 maprow *row = self->row + (y + my); 2263 maprow *row = self->row + (y + my);
1927 tileid tile = cell->tile [z]; 2269 tileid tile = cell->tile [z];
1928 2270
1929 if (tile) 2271 if (tile)
1930 { 2272 {
1931 maptex tex = self->tex [tile]; 2273 maptex tex = self->tex [tile];
1932 int px = (x + 1) * T - tex.w; 2274 int px, py;
1933 int py = (y + 1) * T - tex.h;
1934 2275
1935 if (key.texname != tex.name) 2276 if (key.texname != tex.name)
1936 { 2277 {
2278 self->tex [tile].unused = 0;
2279
1937 if (!tex.name) 2280 if (!tex.name)
1938 tex = self->tex [2]; /* missing, replace by noface */ 2281 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1939 2282
1940 key.texname = tex.name; 2283 key.texname = tex.name;
1941 arr = rc_array (rc, &key); 2284 arr = rc_array (rc, &key);
1942 } 2285 }
2286
2287 px = (x + 1) * Th - tex.w;
2288 py = (y + 1) * Tw - tex.h;
1943 2289
1944 if (expect_false (cell->player == player) && expect_false (z == 2)) 2290 if (expect_false (cell->player == player) && expect_false (z == 2))
1945 { 2291 {
1946 pl_x = px; 2292 pl_x = px;
1947 pl_y = py; 2293 pl_y = py;
1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2298 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1953 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);
1954 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);
1955 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);
1956 2302
1957 if (expect_false (cell->flags) && expect_false (z == 2))
1958 {
1959 // overlays such as the speech bubble, probably more to come
1960 if (cell->flags & 1)
1961 {
1962 maptex tex = self->tex [1];
1963 int px = x * T + T * 2 / 32;
1964 int py = y * T - T * 6 / 32;
1965
1966 if (tex.name)
1967 {
1968 if (key.texname != tex.name)
1969 {
1970 key.texname = tex.name;
1971 arr = rc_array (rc, &key);
1972 }
1973
1974 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1975 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1976 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1977 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1978 }
1979 }
1980 }
1981
1982 // update smooth hash 2303 // update smooth hash
1983 if (tex.smoothtile) 2304 if (tex.smoothtile)
1984 { 2305 {
1985 skey.tile = tex.smoothtile; 2306 skey.tile = tex.smoothtile;
1986 skey.level = tex.smoothlevel; 2307 skey.level = tex.smoothlevel;
2014 // corners 2335 // corners
2015 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);
2016 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);
2017 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);
2018 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);
2019 } 2361 }
2020 } 2362 }
2021 } 2363 }
2022 } 2364 }
2023 2365
2050 if (!(bits & 0x1000) 2392 if (!(bits & 0x1000)
2051 && skey->level == level 2393 && skey->level == level
2052 && level > smooth_max [skey->x][skey->y]) 2394 && level > smooth_max [skey->x][skey->y])
2053 { 2395 {
2054 maptex tex = self->tex [skey->tile]; 2396 maptex tex = self->tex [skey->tile];
2055 int px = (((int)skey->x) - 1) * T; 2397 int px = (((int)skey->x) - 1) * Tw;
2056 int py = (((int)skey->y) - 1) * T; 2398 int py = (((int)skey->y) - 1) * Th;
2057 int border = bits & 15; 2399 int border = bits & 15;
2058 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2059 float dx = tex.s * .0625f; // 16 images/row 2401 float dx = tex.s * .0625f; // 16 images/row
2060 float dy = tex.t * .5f ; // 2 images/column 2402 float dy = tex.t * .5f ; // 2 images/column
2061 2403
2063 { 2405 {
2064 // this time avoiding texture state changes 2406 // this time avoiding texture state changes
2065 // save gobs of state changes. 2407 // save gobs of state changes.
2066 if (key.texname != tex.name) 2408 if (key.texname != tex.name)
2067 { 2409 {
2410 self->tex [skey->tile].unused = 0;
2411
2068 glEnd (); 2412 glEnd ();
2069 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2070 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2071 } 2415 }
2072 2416
2073 if (border) 2417 if (border)
2074 { 2418 {
2075 float ox = border * dx; 2419 float ox = border * dx;
2076 2420
2077 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2078 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2079 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2080 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2081 } 2425 }
2082 2426
2083 if (corner) 2427 if (corner)
2084 { 2428 {
2085 float ox = corner * dx; 2429 float ox = corner * dx;
2086 2430
2087 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2088 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2089 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2090 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2091 } 2435 }
2092 } 2436 }
2093 } 2437 }
2094 } 2438 }
2095 } 2439 }
2118 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);
2119 2463
2120 rc_draw (rc); 2464 rc_draw (rc);
2121 } 2465 }
2122 2466
2467 rc_draw (rc_ov);
2468 rc_clear (rc_ov);
2469
2123 glDisable (GL_BLEND); 2470 glDisable (GL_BLEND);
2124 rc_free (rc); 2471 rc_free (rc);
2472 rc_free (rc_ov);
2125 2473
2126 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2127 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2128 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2129 { 2477 {
2132 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2133 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2134 { 2482 {
2135 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2136 2484
2137 int px = x * T; 2485 int px = x * Tw;
2138 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 }
2139 2493
2140 if (cell->stat_hp) 2494 if (cell->stat_hp)
2141 { 2495 {
2142 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2143 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2144 2498
2145 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2146 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2147 px + width - 1, py); 2501 px + width - 1, py);
2148 2502
2154 } 2508 }
2155 } 2509 }
2156} 2510}
2157 2511
2158void 2512void
2159draw_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)
2160 CODE: 2514 CODE:
2161{ 2515{
2162 static float color[16][3] = { 2516 static float color[16][3] = {
2163 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2164 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2165 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2166 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2167 2521
2168 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2169 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2170 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2171 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2172 2526
2173 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2174 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2175 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2176 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2177 2531
2178 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2179 2533
2180 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2181 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2182 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2183 }; 2537 };
2184 2538
2185 int x, y; 2539 int x, y;
2186 2540
2187 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 */
2188 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2189 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2190 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2191 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2192 2552
2193 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2197 2557
2198 if (m) 2558 if (m)
2199 { 2559 {
2200 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2201 2561
2202 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2203 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2204 2564
2205 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2206 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2207 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2208 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2209 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2210 } 2570 }
2218void 2578void
2219fow_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)
2220 PPCODE: 2580 PPCODE:
2221{ 2581{
2222 int x, y; 2582 int x, y;
2223 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2224 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2225 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2226 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);
2227 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2228 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2229 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2230 2591
2231 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2232 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2233 2594
2234 mx += self->x - 1; 2595 mx += self->x - 1;
2235 my += self->y - 1; 2596 my += self->y - 1;
2236
2237 memset (darkness1, 255, sw1 * sh1);
2238 2597
2239 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2240 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2241 { 2600 {
2242 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2245 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2246 { 2605 {
2247 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2248 2607
2249 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2250 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2251 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2252 } 2611 }
2253 } 2612 }
2254 2613
2255 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2256 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2275 2634
2276 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2277 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2278 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2279 2638
2280 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2281 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2282 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2283 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2284 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 */
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2286 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2287 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2289 } 2648 }
2290 2649
2291 free (darkness1); 2650 free (darkness1);
2292 2651
2293 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2294 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2295 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2296 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2297} 2656}
2298 2657
2299SV * 2658SV *
2362 else 2721 else
2363 *data++ = 0; 2722 *data++ = 0;
2364 } 2723 }
2365 } 2724 }
2366 2725
2367 /* 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 */
2368 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2369 { 2728 {
2370 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2371 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2372 } 2731 }
2373 2732
2374 RETVAL = data_sv; 2733 RETVAL = data_sv;
2375} 2734}
2376 OUTPUT: 2735 OUTPUT:
2377 RETVAL 2736 RETVAL
2378 2737
2379void 2738void
2386 STRLEN len; 2745 STRLEN len;
2387 uint8_t *data, *end; 2746 uint8_t *data, *end;
2388 2747
2389 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2390 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2391 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2392 end = data + len + 8; 2751 end = data + len + 8;
2393 2752
2394 if (len < 5) 2753 if (len < 5)
2395 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2396 2755
2457} 2816}
2458 2817
2459MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2460 2819
2461DC::RW 2820DC::RW
2462new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2463 CODE: 2822 CODE:
2464{ 2823{
2465 STRLEN datalen; 2824 STRLEN datalen;
2466 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2467 2826
2469} 2828}
2470 OUTPUT: 2829 OUTPUT:
2471 RETVAL 2830 RETVAL
2472 2831
2473DC::RW 2832DC::RW
2474new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2475 CODE: 2834 CODE:
2476 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2477 OUTPUT: 2836 OUTPUT:
2478 RETVAL 2837 RETVAL
2479 2838
2497 if (RETVAL < 0) 2856 if (RETVAL < 0)
2498 { 2857 {
2499 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2500 2859
2501 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)
2502 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2503 2867 }
2868 else
2504 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2505 } 2870 }
2506 2871
2507 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2508 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2509} 2874}
2556void 2921void
2557set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2558 CODE: 2923 CODE:
2559{ 2924{
2560 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));
2561 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;
2562 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2563} 2928}
2564 2929
2565void 2930void
2566set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2569 2934
2570MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2571 2936
2572PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2573 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
2574DC::MixChunk 2951DC::MixChunk
2575new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2576 CODE: 2953 CODE:
2577 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2578 OUTPUT: 2955 OUTPUT:
2579 RETVAL 2956 RETVAL
2580 2957
2610 OUTPUT: 2987 OUTPUT:
2611 RETVAL 2988 RETVAL
2612 2989
2613MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2614 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
2615int 3004int
2616volume (int volume = -1) 3005volume (int volume = -1)
2617 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2618 CODE: 3007 CODE:
2619 if (items > 0) 3008 if (items > 0)
2630void 3019void
2631halt () 3020halt ()
2632 CODE: 3021 CODE:
2633 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2634 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2635DC::MixMusic 3031DC::MixMusic
2636new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2637 CODE: 3033 CODE:
2638 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2639 OUTPUT: 3035 OUTPUT:
2640 RETVAL 3036 RETVAL
2641 3037
2669 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2670# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2671 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2672 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2673 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2674 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2675 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2676 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2677 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2678 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2690 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2691 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2692 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2693 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2694 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),
2695 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2696 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2697 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2698 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2699 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2767 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2768 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2769 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2770 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2771 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),
2772# undef const_iv 3176# undef const_iv
2773 }; 3177 };
2774 3178
2775 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--)
2776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2777 3181
2778 texture_av = newAV (); 3182 texture_av = newAV ();
2779 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2780} 3184}
2781 3185
2783disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2784 CODE: 3188 CODE:
2785 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2786 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2787 3191
2788char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2789gl_vendor () 3196gl_vendor ()
2790 CODE: 3197 CODE:
2791 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2792 OUTPUT: 3199 OUTPUT:
2793 RETVAL 3200 RETVAL
2794 3201
2795char * 3202const char *
2796gl_version () 3203gl_version ()
2797 CODE: 3204 CODE:
2798 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2799 OUTPUT: 3206 OUTPUT:
2800 RETVAL 3207 RETVAL
2801 3208
2802char * 3209const char *
2803gl_extensions () 3210gl_extensions ()
2804 CODE: 3211 CODE:
2805 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2806 OUTPUT: 3213 OUTPUT:
2807 RETVAL 3214 RETVAL
2808 3215
2809const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2810 3221
2811GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2812 CODE: 3223 CODE:
2813 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2814 OUTPUT: 3225 OUTPUT:
2822 3233
2823int glGetError () 3234int glGetError ()
2824 3235
2825void glFinish () 3236void glFinish ()
2826 3237
3238void glFlush ()
3239
2827void glClear (int mask) 3240void glClear (int mask)
2828 3241
2829void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2830 PROTOTYPE: @ 3243 PROTOTYPE: @
2831 3244
2840void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2841 3254
2842void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2843 CODE: 3256 CODE:
2844 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2845 3260
2846void glDepthMask (int flag) 3261void glDepthMask (int flag)
2847 3262
2848void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2849 3264
2884void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2885 CODE: 3300 CODE:
2886 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2887 3302
2888void 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: @
2889 ALIAS: 3305 ALIAS:
2890 glColor_premultiply = 1 3306 glColor_premultiply = 1
2891 CODE: 3307 CODE:
2892 if (ix) 3308 if (ix)
2893 { 3309 {
2999 3415
3000void glEndList () 3416void glEndList ()
3001 3417
3002void glCallList (int list) 3418void glCallList (int list)
3003 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3004MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3005 3426
3006PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3007 3428
3008void 3429void
3009find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3010 PPCODE: 3431 PPCODE:
3011{ 3432{
3012 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3013 XPUSHs (self); 3434 XPUSHs (self);
3014} 3435}
3015 3436
3016BOOT: 3437BOOT:
3017{ 3438{
3025 3446
3026void 3447void
3027draw (SV *self) 3448draw (SV *self)
3028 CODE: 3449 CODE:
3029{ 3450{
3030 HV *hv; 3451 HV *hv;
3031 SV **svp; 3452 SV **svp;
3032 NV x, y, w, h; 3453 NV x, y, w, h;
3033 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3034 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3035 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3036 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