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.262 by root, Wed Jul 16 20:12:27 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)
90 99
91#if 1 100#define KMOD_LRAM 0x10000 // our extension
92# define PARACHUTE SDL_INIT_NOPARACHUTE 101
93#else 102#define TEXID_SPEECH 1
94# define PARACHUTE 0 103#define TEXID_NOFACE 2
95#endif 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}
96 123
97static AV *texture_av; 124static AV *texture_av;
98 125
99static struct 126static struct
100{ 127{
157{ 184{
158 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
159 186
160 while (attrs) 187 while (attrs)
161 { 188 {
162 PangoAttribute *attr = attrs->data; 189 PangoAttribute *attr = (PangoAttribute *)attrs->data;
163 190
164 if (attr->klass->type == PANGO_ATTR_SHAPE) 191 if (attr->klass->type == PANGO_ATTR_SHAPE)
165 return 1; 192 return 1;
166 193
167 attrs = attrs->next; 194 attrs = attrs->next;
185static void 212static void
186substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
187{ 214{
188 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
189#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
190 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
191#endif 218#endif
192 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
193} 220}
194 221
195static void 222static void
232 int w, h; 259 int w, h;
233 float s, t; 260 float s, t;
234 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
235 tileid smoothtile; 262 tileid smoothtile;
236 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
237} maptex; 265} maptex;
238 266
239typedef struct { 267typedef struct {
240 uint32_t player; 268 uint32_t player;
241 tileid tile[3]; 269 tileid tile[3];
373 self->oy = 0; 401 self->oy = 0;
374 self->row = 0; 402 self->row = 0;
375 self->rows = 0; 403 self->rows = 0;
376} 404}
377 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
378static void 416static void
379map_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)
380{ 418{
381 int x, y; 419 int x, y;
382 maprow *row; 420 maprow *row;
396 if (x >= row->c1) 434 if (x >= row->c1)
397 break; 435 break;
398 436
399 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
400 438
401 cell->darkness = 0; 439 CELL_CLEAR (cell);
402 cell->stat_hp = 0;
403 cell->flags = 0;
404 cell->player = 0;
405 } 440 }
406 } 441 }
407} 442}
408 443
409typedef struct { 444typedef struct {
444 ev.code = 1; 479 ev.code = 1;
445 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
446 ev.data2 = 0; 481 ev.data2 = 0;
447 482
448 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;
449} 491}
450 492
451static unsigned int 493static unsigned int
452minpot (unsigned int n) 494minpot (unsigned int n)
453{ 495{
520 if (!svp || !SvTRUE (*svp)) 562 if (!svp || !SvTRUE (*svp))
521 return 0; 563 return 0;
522 564
523 return 1; 565 return 1;
524} 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
525 625
526MODULE = Deliantra::Client PACKAGE = DC 626MODULE = Deliantra::Client PACKAGE = DC
527 627
528PROTOTYPES: ENABLE 628PROTOTYPES: ENABLE
529 629
558 const_iv (SDL_USEREVENT), 658 const_iv (SDL_USEREVENT),
559 659
560 const_iv (SDL_APPINPUTFOCUS), 660 const_iv (SDL_APPINPUTFOCUS),
561 const_iv (SDL_APPMOUSEFOCUS), 661 const_iv (SDL_APPMOUSEFOCUS),
562 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),
563 713
564 const_iv (SDLK_FIRST), 714 const_iv (SDLK_FIRST),
565 const_iv (SDLK_LAST), 715 const_iv (SDLK_LAST),
566 const_iv (SDLK_KP0), 716 const_iv (SDLK_KP0),
567 const_iv (SDLK_KP1), 717 const_iv (SDLK_KP1),
643 const_iv (KMOD_RMETA), 793 const_iv (KMOD_RMETA),
644 const_iv (KMOD_NUM), 794 const_iv (KMOD_NUM),
645 const_iv (KMOD_CAPS), 795 const_iv (KMOD_CAPS),
646 const_iv (KMOD_MODE), 796 const_iv (KMOD_MODE),
647 797
798 const_iv (KMOD_LRAM),
799
648 const_iv (MIX_DEFAULT_FORMAT), 800 const_iv (MIX_DEFAULT_FORMAT),
801
802 const_iv (SDL_INIT_TIMER),
803 const_iv (SDL_INIT_AUDIO),
804 const_iv (SDL_INIT_VIDEO),
805 const_iv (SDL_INIT_CDROM),
806 const_iv (SDL_INIT_JOYSTICK),
807 const_iv (SDL_INIT_EVERYTHING),
808 const_iv (SDL_INIT_NOPARACHUTE),
809 const_iv (SDL_INIT_EVENTTHREAD),
810
811 const_iv (SDL_GL_RED_SIZE),
812 const_iv (SDL_GL_GREEN_SIZE),
813 const_iv (SDL_GL_BLUE_SIZE),
814 const_iv (SDL_GL_ALPHA_SIZE),
815 const_iv (SDL_GL_DOUBLEBUFFER),
816 const_iv (SDL_GL_BUFFER_SIZE),
817 const_iv (SDL_GL_DEPTH_SIZE),
818 const_iv (SDL_GL_STENCIL_SIZE),
819 const_iv (SDL_GL_ACCUM_RED_SIZE),
820 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
821 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
822 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
823 const_iv (SDL_GL_STEREO),
824 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
825 const_iv (SDL_GL_MULTISAMPLESAMPLES),
826 const_iv (SDL_GL_ACCELERATED_VISUAL),
827 const_iv (SDL_GL_SWAP_CONTROL),
828
829 const_iv (FOW_DARKNESS)
649# undef const_iv 830# undef const_iv
650 }; 831 };
651 832
652 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--)
653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 834 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
654 835
655 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 836 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
656 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 837 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
657} 838}
658 839
674NV ceil (NV x) 855NV ceil (NV x)
675 856
676IV minpot (UV n) 857IV minpot (UV n)
677 858
678IV 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
679 866
680void 867void
681pango_init () 868pango_init ()
682 CODE: 869 CODE:
683{ 870{
689 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 876 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
690 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 877 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
691#endif 878#endif
692} 879}
693 880
694char *
695SDL_GetError () 881char *SDL_GetError ()
696 882
697int 883void SDL_main_hack (SV *real_main)
698SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 884 PROTOTYPE: &
699 885
700void 886int SDL_Init (U32 flags)
887
888int SDL_InitSubSystem (U32 flags)
889
890void SDL_QuitSubSystem (U32 flags)
891
701SDL_Quit () 892void SDL_Quit ()
893
894int SDL_GL_SetAttribute (int attr, int value)
895 C_ARGS: (SDL_GLattr)attr, value
896
897int SDL_GL_GetAttribute (int attr)
898 CODE:
899 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
900 XSRETURN_UNDEF;
901 OUTPUT:
902 RETVAL
702 903
703void 904void
704SDL_ListModes (int rgb, int alpha) 905SDL_ListModes (int rgb, int alpha)
705 PPCODE: 906 PPCODE:
706{ 907{
718 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 919 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
719 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 920 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
720 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 921 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
721 922
722 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 923 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
723#if SDL_VERSION_ATLEAST(1,2,10)
724 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
725 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 924 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
726#endif
727 925
728 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 926 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
729 927
730 if (m && m != (SDL_Rect **)-1) 928 if (m && m != (SDL_Rect **)-1)
731 while (*m) 929 while (*m)
732 { 930 {
733 if ((*m)->w >= 800 && (*m)->h >= 480) 931 if ((*m)->w >= 400 && (*m)->h >= 300)
734 { 932 {
735 AV *av = newAV (); 933 AV *av = newAV ();
736 av_push (av, newSViv ((*m)->w)); 934 av_push (av, newSViv ((*m)->w));
737 av_push (av, newSViv ((*m)->h)); 935 av_push (av, newSViv ((*m)->h));
738 av_push (av, newSViv (rgb)); 936 av_push (av, newSViv (rgb));
761 ); 959 );
762 960
763 if (RETVAL) 961 if (RETVAL)
764 { 962 {
765 av_clear (texture_av); 963 av_clear (texture_av);
766
767 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
768#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);
769#include "glfunc.h" 965#include "glfunc.h"
770#undef GL_FUNC 966#undef GL_FUNC
967 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
968 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
771 } 969 }
772} 970}
773 OUTPUT: 971 OUTPUT:
774 RETVAL 972 RETVAL
973
974void
975SDL_WM_SetCaption (const char *title, const char *icon)
775 976
776void 977void
777SDL_GL_SwapBuffers () 978SDL_GL_SwapBuffers ()
778 979
779char * 980char *
780SDL_GetKeyName (int sym) 981SDL_GetKeyName (int sym)
982 C_ARGS: (SDLKey)sym
781 983
782int 984int
783SDL_GetAppState () 985SDL_GetAppState ()
784 986
785int 987int
786SDL_GetModState () 988SDL_GetModState ()
787 989
990int
991SDL_WaitEvent ()
992 C_ARGS: 0
993
788void 994void
995SDL_PumpEvents ()
996
997void
789poll_events () 998peep_events ()
790 PPCODE: 999 PPCODE:
791{ 1000{
792 SDL_Event ev; 1001 SDL_Event ev;
793 1002
794 SDL_PumpEvents (); 1003 SDL_PumpEvents ();
801 { 1010 {
802 case SDL_KEYDOWN: 1011 case SDL_KEYDOWN:
803 case SDL_KEYUP: 1012 case SDL_KEYUP:
804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1013 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1014 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
806 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);
807 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 */
808 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1017 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
809 break; 1018 break;
810 1019
811 case SDL_ACTIVEEVENT: 1020 case SDL_ACTIVEEVENT:
812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1021 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
830 x = ev.motion.x; 1039 x = ev.motion.x;
831 y = ev.motion.y; 1040 y = ev.motion.y;
832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1041 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
833 } 1042 }
834 1043
835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1044 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
836 hv_store (hv, "state", 5, newSViv (state), 0); 1045 hv_store (hv, "state", 5, newSViv (state), 0);
837 hv_store (hv, "x", 1, newSViv (x), 0); 1046 hv_store (hv, "x", 1, newSViv (x), 0);
838 hv_store (hv, "y", 1, newSViv (y), 0); 1047 hv_store (hv, "y", 1, newSViv (y), 0);
839 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1048 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
840 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1049 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
860 1069
861 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))));
862 } 1071 }
863} 1072}
864 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
865int 1087int
866Mix_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)
867 POSTCALL: 1089 POSTCALL:
868 Mix_HookMusicFinished (music_finished); 1090 Mix_HookMusicFinished (music_finished);
869 Mix_ChannelFinished (channel_finished); 1091 Mix_ChannelFinished (channel_finished);
870 1092
871void 1093void
872Mix_QuerySpec () 1094Mix_QuerySpec ()
931add_font (char *file) 1153add_font (char *file)
932 CODE: 1154 CODE:
933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1155 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT: 1156 OUTPUT:
935 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)
936 1165
937void 1166void
938load_image_inline (SV *image_) 1167load_image_inline (SV *image_)
939 ALIAS: 1168 ALIAS:
940 load_image_file = 1 1169 load_image_file = 1
986 1215
987 SDL_LockSurface (surface2); 1216 SDL_LockSurface (surface2);
988 EXTEND (SP, 6); 1217 EXTEND (SP, 6);
989 PUSHs (sv_2mortal (newSViv (surface2->w))); 1218 PUSHs (sv_2mortal (newSViv (surface2->w)));
990 PUSHs (sv_2mortal (newSViv (surface2->h))); 1219 PUSHs (sv_2mortal (newSViv (surface2->h)));
991 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1220 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
992 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)));
993 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1222 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
994 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1223 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
995 SDL_UnlockSurface (surface2); 1224 SDL_UnlockSurface (surface2);
996 1225
1056#if DEBUG 1285#if DEBUG
1057 VALGRIND_DO_LEAK_CHECK; 1286 VALGRIND_DO_LEAK_CHECK;
1058#endif 1287#endif
1059} 1288}
1060 1289
1290int
1291SvREFCNT (SV *sv)
1292 CODE:
1293 RETVAL = SvREFCNT (sv);
1294 OUTPUT:
1295 RETVAL
1296
1061MODULE = Deliantra::Client PACKAGE = DC::Font 1297MODULE = Deliantra::Client PACKAGE = DC::Font
1062 1298
1063PROTOTYPES: DISABLE 1299PROTOTYPES: DISABLE
1064 1300
1065DC::Font 1301DC::Font
1066new_from_file (SV *class, char *path, int id = 0) 1302new_from_file (SV *klass, char *path, int id = 0)
1067 CODE: 1303 CODE:
1068{ 1304{
1069 int count; 1305 int count;
1070 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1306 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1071 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1307 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1100 PROTOTYPE: 1336 PROTOTYPE:
1101 CODE: 1337 CODE:
1102 tc_restore (); 1338 tc_restore ();
1103 1339
1104DC::Layout 1340DC::Layout
1105new (SV *class) 1341new (SV *klass)
1106 CODE: 1342 CODE:
1107 New (0, RETVAL, 1, struct cf_layout); 1343 New (0, RETVAL, 1, struct cf_layout);
1108 1344
1109 RETVAL->pl = pango_layout_new (opengl_context); 1345 RETVAL->pl = pango_layout_new (opengl_context);
1110 RETVAL->r = 1.; 1346 RETVAL->r = 1.;
1259 1495
1260void 1496void
1261set_height (DC::Layout self, int base_height) 1497set_height (DC::Layout self, int base_height)
1262 CODE: 1498 CODE:
1263 if (self->base_height != base_height) 1499 if (self->base_height != base_height)
1264 { 1500 {
1265 self->base_height = base_height; 1501 self->base_height = base_height;
1266 layout_update_font (self); 1502 layout_update_font (self);
1267 } 1503 }
1268 1504
1269void 1505void
1496 glDisable (GL_ALPHA_TEST); 1732 glDisable (GL_ALPHA_TEST);
1497 glDisable (GL_BLEND); 1733 glDisable (GL_BLEND);
1498 } 1734 }
1499} 1735}
1500 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
1501IV 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)
1502 CODE: 1859 CODE:
1503{ 1860{
1504 GLint width; 1861 GLint width;
1505 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);
1512MODULE = Deliantra::Client PACKAGE = DC::Map 1869MODULE = Deliantra::Client PACKAGE = DC::Map
1513 1870
1514PROTOTYPES: DISABLE 1871PROTOTYPES: DISABLE
1515 1872
1516DC::Map 1873DC::Map
1517new (SV *class) 1874new (SV *klass)
1518 CODE: 1875 CODE:
1519 New (0, RETVAL, 1, struct map); 1876 New (0, RETVAL, 1, struct map);
1520 RETVAL->x = 0; 1877 RETVAL->x = 0;
1521 RETVAL->y = 0; 1878 RETVAL->y = 0;
1522 RETVAL->w = 0; 1879 RETVAL->w = 0;
1561 1918
1562void 1919void
1563set_smooth (DC::Map self, int face, int smooth, int level) 1920set_smooth (DC::Map self, int face, int smooth, int level)
1564 CODE: 1921 CODE:
1565{ 1922{
1566 tileid texid; 1923 tileid texid;
1567 maptex *tex; 1924 maptex *tex;
1568 1925
1569 if (face < 0 || face >= self->faces) 1926 if (face < 0 || face >= self->faces)
1570 return; 1927 return;
1571 1928
1572 if (smooth < 0 || smooth >= self->faces) 1929 if (smooth < 0 || smooth >= self->faces)
1573 return; 1930 return;
1574 1931
1575 texid = self->face2tile [face]; 1932 texid = self->face2tile [face];
1576 1933
1577 if (!texid) 1934 if (!texid)
1578 return; 1935 return;
1579 1936
1580 tex = self->tex + texid; 1937 tex = self->tex + texid;
1609 //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);
1610 // use uglier nearest interpolation because linear suffers 1967 // use uglier nearest interpolation because linear suffers
1611 // from transparent color bleeding and ugly wrapping effects. 1968 // from transparent color bleeding and ugly wrapping effects.
1612 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1969 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1613} 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 }
1614 1991
1615int 1992int
1616ox (DC::Map self) 1993ox (DC::Map self)
1617 ALIAS: 1994 ALIAS:
1618 oy = 1 1995 oy = 1
1658 self->y += MAP_EXTEND_Y; 2035 self->y += MAP_EXTEND_Y;
1659 } 2036 }
1660} 2037}
1661 2038
1662SV * 2039SV *
1663map1a_update (DC::Map self, SV *data_, int extmap) 2040map1a_update (DC::Map self, SV *data_)
1664 CODE: 2041 CODE:
1665{ 2042{
1666 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2043 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1667 uint8_t *data_end = (uint8_t *)SvEND (data_); 2044 uint8_t *data_end = (uint8_t *)SvEND (data_);
1668 mapcell *cell; 2045 mapcell *cell;
1689 2066
1690 //TODO: don't trust server data to be in-range(!) 2067 //TODO: don't trust server data to be in-range(!)
1691 2068
1692 if (flags & 8) 2069 if (flags & 8)
1693 { 2070 {
2071 uint8_t ext, cmd;
2072
1694 if (extmap) 2073 do
1695 { 2074 {
1696 uint8_t ext, cmd; 2075 ext = *data++;
2076 cmd = ext & 0x7f;
1697 2077
1698 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
1699 { 2081 {
1700 ext = *data++;
1701 cmd = ext & 0x7f;
1702
1703 if (cmd < 4)
1704 cell->darkness = 255 - ext * 64 + 1;
1705 else if (cmd == 5) // health
1706 {
1707 cell->stat_width = 1; 2082 cell->stat_width = 1;
1708 cell->stat_hp = *data++; 2083 cell->stat_hp = *data++;
1709 }
1710 else if (cmd == 6) // monster width
1711 cell->stat_width = *data++ + 1;
1712 else if (cmd == 0x47)
1713 {
1714 if (*data == 1) cell->player = data [1];
1715 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1716 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1717 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1718
1719 data += *data + 1;
1720 }
1721 else if (cmd == 8) // cell flags
1722 cell->flags = *data++;
1723 else if (ext & 0x40) // unknown, multibyte => skip
1724 data += *data + 1;
1725 else
1726 data++;
1727 } 2084 }
1728 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++;
1729 } 2102 }
1730 else 2103 while (ext & 0x80);
1731 cell->darkness = *data++ + 1;
1732 } 2104 }
1733 2105
1734 for (z = 0; z <= 2; ++z) 2106 for (z = 0; z <= 2; ++z)
1735 if (flags & (4 >> z)) 2107 if (flags & (4 >> z))
1736 { 2108 {
1739 cell->tile [z] = self->face2tile [face]; 2111 cell->tile [z] = self->face2tile [face];
1740 2112
1741 if (cell->tile [z]) 2113 if (cell->tile [z])
1742 { 2114 {
1743 maptex *tex = self->tex + cell->tile [z]; 2115 maptex *tex = self->tex + cell->tile [z];
2116 tex->unused = 0;
1744 if (!tex->name) 2117 if (!tex->name)
1745 av_push (missing, newSViv (cell->tile [z])); 2118 av_push (missing, newSViv (cell->tile [z]));
1746 2119
1747 if (tex->smoothtile) 2120 if (tex->smoothtile)
1748 { 2121 {
1749 maptex *smooth = self->tex + tex->smoothtile; 2122 maptex *smooth = self->tex + tex->smoothtile;
2123 smooth->unused = 0;
1750 if (!smooth->name) 2124 if (!smooth->name)
1751 av_push (missing, newSViv (tex->smoothtile)); 2125 av_push (missing, newSViv (tex->smoothtile));
1752 } 2126 }
1753 } 2127 }
1754 } 2128 }
1755 } 2129 }
1756 else 2130 else
1757 cell->darkness = 0; 2131 CELL_CLEAR (cell);
1758 } 2132 }
1759} 2133}
1760 OUTPUT: 2134 OUTPUT:
1761 RETVAL 2135 RETVAL
1762 2136
1782 ? self->row + y 2156 ? self->row + y
1783 : 0; 2157 : 0;
1784 2158
1785 for (x = x0; x < x1; x++) 2159 for (x = x0; x < x1; x++)
1786 { 2160 {
1787 int r = 32, g = 32, b = 32, a = 192; 2161 unsigned int r = 32, g = 32, b = 32, a = 192;
1788 2162
1789 if (row && row->c0 <= x && x < row->c1) 2163 if (row && row->c0 <= x && x < row->c1)
1790 { 2164 {
1791 mapcell *cell = row->col + (x - row->c0); 2165 mapcell *cell = row->col + (x - row->c0);
1792 2166
1794 { 2168 {
1795 maptex tex = self->tex [cell->tile [z]]; 2169 maptex tex = self->tex [cell->tile [z]];
1796 int a0 = 255 - tex.a; 2170 int a0 = 255 - tex.a;
1797 int a1 = tex.a; 2171 int a1 = tex.a;
1798 2172
1799 r = (r * a0 + tex.r * a1) / 255; 2173 r = div255 (r * a0 + tex.r * a1);
1800 g = (g * a0 + tex.g * a1) / 255; 2174 g = div255 (g * a0 + tex.g * a1);
1801 b = (b * a0 + tex.b * a1) / 255; 2175 b = div255 (b * a0 + tex.b * a1);
1802 a = (a * a0 + tex.a * a1) / 255; 2176 a = div255 (a * a0 + tex.a * a1);
1803 } 2177 }
1804 } 2178 }
1805 2179
1806 *map++ = (r ) 2180 *map++ = (r )
1807 | (g << 8) 2181 | (g << 8)
1808 | (b << 16) 2182 | (b << 16)
1809 | (a << 24); 2183 | (a << 24);
1810 } 2184 }
1811 } 2185 }
1812 2186
1813 RETVAL = map_sv; 2187 RETVAL = map_sv;
1814} 2188}
1815 OUTPUT: 2189 OUTPUT:
1816 RETVAL 2190 RETVAL
1817 2191
1818void 2192void
1819draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 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)
1820 CODE: 2194 CODE:
1821{ 2195{
1822 int x, y, z; 2196 int x, y, z;
1823 2197
1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2198 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1825 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
1826 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)
1827 smooth_key skey; 2201 smooth_key skey;
1828 int pl_x, pl_y; 2202 int pl_x, pl_y;
1829 maptex pl_tex; 2203 maptex pl_tex;
1830 rc_t *rc = rc_alloc (); 2204 rc_t *rc = rc_alloc ();
2205 rc_t *rc_ov = rc_alloc ();
1831 rc_key_t key; 2206 rc_key_t key;
1832 rc_array_t *arr; 2207 rc_array_t *arr;
1833 2208
1834 pl_tex.name = 0; 2209 pl_tex.name = 0;
1835 2210
1836 // thats current max. sorry. 2211 // that's current max. sorry.
1837 if (sw > 255) sw = 255; 2212 if (sw > 255) sw = 255;
1838 if (sh > 255) sh = 255; 2213 if (sh > 255) sh = 255;
1839 2214
1840 // clear key, in case of extra padding 2215 // clear key, in case of extra padding
1841 memset (&skey, 0, sizeof (skey)); 2216 memset (&skey, 0, sizeof (skey));
1845 key.g = 255; 2220 key.g = 255;
1846 key.b = 255; 2221 key.b = 255;
1847 key.a = 255; 2222 key.a = 255;
1848 key.mode = GL_QUADS; 2223 key.mode = GL_QUADS;
1849 key.format = GL_T2F_V3F; 2224 key.format = GL_T2F_V3F;
1850 key.texname = -1;
1851 2225
1852 mx += self->x; 2226 mx += self->x;
1853 my += self->y; 2227 my += self->y;
1854 2228
1855 // first pass: determine smooth_max 2229 // first pass: determine smooth_max
1879 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2253 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1880 2254
1881 for (z = 0; z <= 2; z++) 2255 for (z = 0; z <= 2; z++)
1882 { 2256 {
1883 memset (smooth_level, 0, sizeof (smooth_level)); 2257 memset (smooth_level, 0, sizeof (smooth_level));
2258 key.texname = -1;
1884 2259
1885 for (y = 0; y < sh; y++) 2260 for (y = 0; y < sh; y++)
1886 if (0 <= y + my && y + my < self->rows) 2261 if (0 <= y + my && y + my < self->rows)
1887 { 2262 {
1888 maprow *row = self->row + (y + my); 2263 maprow *row = self->row + (y + my);
1894 tileid tile = cell->tile [z]; 2269 tileid tile = cell->tile [z];
1895 2270
1896 if (tile) 2271 if (tile)
1897 { 2272 {
1898 maptex tex = self->tex [tile]; 2273 maptex tex = self->tex [tile];
1899 int px = (x + 1) * T - tex.w; 2274 int px, py;
1900 int py = (y + 1) * T - tex.h;
1901 2275
1902 if (key.texname != tex.name) 2276 if (key.texname != tex.name)
1903 { 2277 {
2278 self->tex [tile].unused = 0;
2279
1904 if (!tex.name) 2280 if (!tex.name)
1905 tex = self->tex [2]; /* missing, replace by noface */ 2281 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1906 2282
1907 key.texname = tex.name; 2283 key.texname = tex.name;
1908 arr = rc_array (rc, &key); 2284 arr = rc_array (rc, &key);
1909 } 2285 }
2286
2287 px = (x + 1) * Th - tex.w;
2288 py = (y + 1) * Tw - tex.h;
1910 2289
1911 if (expect_false (cell->player == player) && expect_false (z == 2)) 2290 if (expect_false (cell->player == player) && expect_false (z == 2))
1912 { 2291 {
1913 pl_x = px; 2292 pl_x = px;
1914 pl_y = py; 2293 pl_y = py;
1919 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2298 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1920 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);
1921 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);
1922 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);
1923 2302
1924 if (expect_false (cell->flags) && expect_false (z == 2))
1925 {
1926 // overlays such as the speech bubble, probably more to come
1927 if (cell->flags & 1)
1928 {
1929 maptex tex = self->tex [1];
1930 int px = x * T + T * 2 / 32;
1931 int py = y * T - T * 6 / 32;
1932
1933 if (tex.name)
1934 {
1935 if (key.texname != tex.name)
1936 {
1937 key.texname = tex.name;
1938 arr = rc_array (rc, &key);
1939 }
1940
1941 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1942 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1943 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1945 }
1946 }
1947 }
1948
1949 // update smooth hash 2303 // update smooth hash
1950 if (tex.smoothtile) 2304 if (tex.smoothtile)
1951 { 2305 {
1952 skey.tile = tex.smoothtile; 2306 skey.tile = tex.smoothtile;
1953 skey.level = tex.smoothlevel; 2307 skey.level = tex.smoothlevel;
1981 // corners 2335 // corners
1982 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);
1983 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);
1984 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);
1985 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);
1986 } 2361 }
1987 } 2362 }
1988 } 2363 }
1989 } 2364 }
1990 2365
2017 if (!(bits & 0x1000) 2392 if (!(bits & 0x1000)
2018 && skey->level == level 2393 && skey->level == level
2019 && level > smooth_max [skey->x][skey->y]) 2394 && level > smooth_max [skey->x][skey->y])
2020 { 2395 {
2021 maptex tex = self->tex [skey->tile]; 2396 maptex tex = self->tex [skey->tile];
2022 int px = (((int)skey->x) - 1) * T; 2397 int px = (((int)skey->x) - 1) * Tw;
2023 int py = (((int)skey->y) - 1) * T; 2398 int py = (((int)skey->y) - 1) * Th;
2024 int border = bits & 15; 2399 int border = bits & 15;
2025 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2026 float dx = tex.s * .0625f; // 16 images/row 2401 float dx = tex.s * .0625f; // 16 images/row
2027 float dy = tex.t * .5f ; // 2 images/column 2402 float dy = tex.t * .5f ; // 2 images/column
2028 2403
2030 { 2405 {
2031 // this time avoiding texture state changes 2406 // this time avoiding texture state changes
2032 // save gobs of state changes. 2407 // save gobs of state changes.
2033 if (key.texname != tex.name) 2408 if (key.texname != tex.name)
2034 { 2409 {
2410 self->tex [skey->tile].unused = 0;
2411
2035 glEnd (); 2412 glEnd ();
2036 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2037 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2038 } 2415 }
2039 2416
2040 if (border) 2417 if (border)
2041 { 2418 {
2042 float ox = border * dx; 2419 float ox = border * dx;
2043 2420
2044 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2045 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2046 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2047 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2048 } 2425 }
2049 2426
2050 if (corner) 2427 if (corner)
2051 { 2428 {
2052 float ox = corner * dx; 2429 float ox = corner * dx;
2053 2430
2054 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2055 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2056 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2057 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2058 } 2435 }
2059 } 2436 }
2060 } 2437 }
2061 } 2438 }
2062 } 2439 }
2071 } 2448 }
2072 2449
2073 if (pl_tex.name) 2450 if (pl_tex.name)
2074 { 2451 {
2075 maptex tex = pl_tex; 2452 maptex tex = pl_tex;
2076 int px = pl_x + pdx; 2453 int px = pl_x + sdx;
2077 int py = pl_y + pdy; 2454 int py = pl_y + sdy;
2078 2455
2079 key.texname = tex.name; 2456 key.texname = tex.name;
2080 arr = rc_array (rc, &key); 2457 arr = rc_array (rc, &key);
2081 2458
2082 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2459 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2085 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);
2086 2463
2087 rc_draw (rc); 2464 rc_draw (rc);
2088 } 2465 }
2089 2466
2467 rc_draw (rc_ov);
2468 rc_clear (rc_ov);
2469
2090 glDisable (GL_BLEND); 2470 glDisable (GL_BLEND);
2091 rc_free (rc); 2471 rc_free (rc);
2472 rc_free (rc_ov);
2092 2473
2093 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2094 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2095 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2096 { 2477 {
2099 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2100 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2101 { 2482 {
2102 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2103 2484
2104 int px = x * T; 2485 int px = x * Tw;
2105 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 }
2106 2493
2107 if (cell->stat_hp) 2494 if (cell->stat_hp)
2108 { 2495 {
2109 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2110 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2111 2498
2112 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2113 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2114 px + width - 1, py); 2501 px + width - 1, py);
2115 2502
2121 } 2508 }
2122 } 2509 }
2123} 2510}
2124 2511
2125void 2512void
2126draw_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)
2127 CODE: 2514 CODE:
2128{ 2515{
2129 static float color[16][3] = { 2516 static float color[16][3] = {
2130 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2131 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2132 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2133 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2134 2521
2135 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2136 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2137 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2138 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2139 2526
2140 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2141 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2142 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2143 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2144 2531
2145 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2146 2533
2147 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2148 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2149 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2150 }; 2537 };
2151 2538
2152 int x, y; 2539 int x, y;
2153 2540
2154 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 */
2155 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2156 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2159 2552
2160 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2164 2557
2165 if (m) 2558 if (m)
2166 { 2559 {
2167 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2168 2561
2169 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2170 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2171 2564
2172 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2173 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2174 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2175 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2176 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2177 } 2570 }
2185void 2578void
2186fow_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)
2187 PPCODE: 2580 PPCODE:
2188{ 2581{
2189 int x, y; 2582 int x, y;
2190 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2191 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2192 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2193 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);
2194 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2195 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2196 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2197 2591
2198 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2199 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2200 2594
2201 mx += self->x - 1; 2595 mx += self->x - 1;
2202 my += self->y - 1; 2596 my += self->y - 1;
2203
2204 memset (darkness1, 255, sw1 * sh1);
2205 2597
2206 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2207 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2208 { 2600 {
2209 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2212 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2213 { 2605 {
2214 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2215 2607
2216 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2217 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2218 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2219 } 2611 }
2220 } 2612 }
2221 2613
2222 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2223 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2242 2634
2243 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2244 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2245 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2246 2638
2247 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2248 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2249 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2250 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2251 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 */
2252 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2253 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2254 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2255 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2256 } 2648 }
2257 2649
2258 free (darkness1); 2650 free (darkness1);
2259 2651
2260 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2261 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2262 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2263 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2264} 2656}
2265 2657
2266SV * 2658SV *
2329 else 2721 else
2330 *data++ = 0; 2722 *data++ = 0;
2331 } 2723 }
2332 } 2724 }
2333 2725
2334 /* 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 */
2335 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2336 { 2728 {
2337 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2338 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2339 } 2731 }
2340 2732
2341 RETVAL = data_sv; 2733 RETVAL = data_sv;
2342} 2734}
2343 OUTPUT: 2735 OUTPUT:
2344 RETVAL 2736 RETVAL
2345 2737
2346void 2738void
2353 STRLEN len; 2745 STRLEN len;
2354 uint8_t *data, *end; 2746 uint8_t *data, *end;
2355 2747
2356 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2357 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2358 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2359 end = data + len + 8; 2751 end = data + len + 8;
2360 2752
2361 if (len < 5) 2753 if (len < 5)
2362 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2363 2755
2424} 2816}
2425 2817
2426MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2427 2819
2428DC::RW 2820DC::RW
2429new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2430 CODE: 2822 CODE:
2431{ 2823{
2432 STRLEN datalen; 2824 STRLEN datalen;
2433 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2434 2826
2436} 2828}
2437 OUTPUT: 2829 OUTPUT:
2438 RETVAL 2830 RETVAL
2439 2831
2440DC::RW 2832DC::RW
2441new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2442 CODE: 2834 CODE:
2443 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2444 OUTPUT: 2836 OUTPUT:
2445 RETVAL 2837 RETVAL
2446 2838
2464 if (RETVAL < 0) 2856 if (RETVAL < 0)
2465 { 2857 {
2466 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2467 2859
2468 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)
2469 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2470 2867 }
2868 else
2471 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2472 } 2870 }
2473 2871
2474 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2475 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2476} 2874}
2523void 2921void
2524set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2525 CODE: 2923 CODE:
2526{ 2924{
2527 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));
2528 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;
2529 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2530} 2928}
2531 2929
2532void 2930void
2533set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2536 2934
2537MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2538 2936
2539PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2540 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
2541DC::MixChunk 2951DC::MixChunk
2542new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2543 CODE: 2953 CODE:
2544 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2545 OUTPUT: 2955 OUTPUT:
2546 RETVAL 2956 RETVAL
2547 2957
2577 OUTPUT: 2987 OUTPUT:
2578 RETVAL 2988 RETVAL
2579 2989
2580MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2581 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
2582int 3004int
2583volume (int volume = -1) 3005volume (int volume = -1)
2584 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2585 CODE: 3007 CODE:
2586 if (items > 0) 3008 if (items > 0)
2597void 3019void
2598halt () 3020halt ()
2599 CODE: 3021 CODE:
2600 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2601 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2602DC::MixMusic 3031DC::MixMusic
2603new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2604 CODE: 3033 CODE:
2605 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2606 OUTPUT: 3035 OUTPUT:
2607 RETVAL 3036 RETVAL
2608 3037
2636 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2637# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2638 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2639 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2640 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2641 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2642 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2643 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2644 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2645 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2657 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2658 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2659 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2660 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2661 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),
2662 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2663 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2664 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2665 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2666 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2734 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2735 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2736 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2737 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2738 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),
2739# undef const_iv 3176# undef const_iv
2740 }; 3177 };
2741 3178
2742 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--)
2743 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2744 3181
2745 texture_av = newAV (); 3182 texture_av = newAV ();
2746 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2747} 3184}
2748 3185
2750disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2751 CODE: 3188 CODE:
2752 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2753 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2754 3191
2755char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2756gl_vendor () 3196gl_vendor ()
2757 CODE: 3197 CODE:
2758 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2759 OUTPUT: 3199 OUTPUT:
2760 RETVAL 3200 RETVAL
2761 3201
2762char * 3202const char *
2763gl_version () 3203gl_version ()
2764 CODE: 3204 CODE:
2765 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2766 OUTPUT: 3206 OUTPUT:
2767 RETVAL 3207 RETVAL
2768 3208
2769char * 3209const char *
2770gl_extensions () 3210gl_extensions ()
2771 CODE: 3211 CODE:
2772 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2773 OUTPUT: 3213 OUTPUT:
2774 RETVAL 3214 RETVAL
2775 3215
2776const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2777 3221
2778GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2779 CODE: 3223 CODE:
2780 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2781 OUTPUT: 3225 OUTPUT:
2789 3233
2790int glGetError () 3234int glGetError ()
2791 3235
2792void glFinish () 3236void glFinish ()
2793 3237
3238void glFlush ()
3239
2794void glClear (int mask) 3240void glClear (int mask)
2795 3241
2796void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2797 PROTOTYPE: @ 3243 PROTOTYPE: @
2798 3244
2807void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2808 3254
2809void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2810 CODE: 3256 CODE:
2811 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2812 3260
2813void glDepthMask (int flag) 3261void glDepthMask (int flag)
2814 3262
2815void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2816 3264
2851void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2852 CODE: 3300 CODE:
2853 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2854 3302
2855void 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: @
2856 ALIAS: 3305 ALIAS:
2857 glColor_premultiply = 1 3306 glColor_premultiply = 1
2858 CODE: 3307 CODE:
2859 if (ix) 3308 if (ix)
2860 { 3309 {
2966 3415
2967void glEndList () 3416void glEndList ()
2968 3417
2969void glCallList (int list) 3418void glCallList (int list)
2970 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
2971MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2972 3426
2973PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
2974 3428
2975void 3429void
2976find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
2977 PPCODE: 3431 PPCODE:
2978{ 3432{
2979 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
2980 XPUSHs (self); 3434 XPUSHs (self);
2981} 3435}
2982 3436
2983BOOT: 3437BOOT:
2984{ 3438{
2992 3446
2993void 3447void
2994draw (SV *self) 3448draw (SV *self)
2995 CODE: 3449 CODE:
2996{ 3450{
2997 HV *hv; 3451 HV *hv;
2998 SV **svp; 3452 SV **svp;
2999 NV x, y, w, h; 3453 NV x, y, w, h;
3000 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3001 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3002 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3003 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