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.317 by root, Fri Nov 23 12:39:05 2012 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>
38#include <SDL_thread.h> 37#include <SDL_thread.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>
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
43 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/gmacros.h>
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{
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
486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
449} 490}
450 491
451static unsigned int 492static unsigned int
452minpot (unsigned int n) 493minpot (unsigned int n)
453{ 494{
520 if (!svp || !SvTRUE (*svp)) 561 if (!svp || !SvTRUE (*svp))
521 return 0; 562 return 0;
522 563
523 return 1; 564 return 1;
524} 565}
566
567/******************************************************************************/
568
569/* process keyboard modifiers */
570static int
571mod_munge (int mod)
572{
573 mod &= MOD_MASK;
574
575 if (mod & (KMOD_META | KMOD_ALT))
576 mod |= KMOD_LRAM;
577
578 return mod;
579}
580
581static void
582deliantra_main (SV *real_main)
583{
584 dSP;
585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
588}
589
590#ifdef __MACOSX__
591 static SV *real_main;
592
593 /* to due surprising braindamage on the side of SDL design, we
594 * do some mind-boggling hack here: SDL requires a custom main()
595 * on OS X, so... we provide one and call the original main(), which,
596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
597 * and which calls our main (== SDL_main) back.
598 */
599 extern C_LINKAGE int
600 main (int argc, char *argv[])
601 {
602 deliantra_main (real_main);
603 }
604
605 #undef main
606
607 extern C_LINKAGE int main (int argc, char *argv[]);
608
609 static void
610 SDL_main_hack (SV *real_main_)
611 {
612 real_main = real_main_;
613
614 char *argv[] = { "deliantra client", 0 };
615 (main) (1, argv);
616 }
617#else
618 static void
619 SDL_main_hack (SV *real_main)
620 {
621 deliantra_main (real_main);
622 }
623#endif
525 624
526MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
527 626
528PROTOTYPES: ENABLE 627PROTOTYPES: ENABLE
529 628
558 const_iv (SDL_USEREVENT), 657 const_iv (SDL_USEREVENT),
559 658
560 const_iv (SDL_APPINPUTFOCUS), 659 const_iv (SDL_APPINPUTFOCUS),
561 const_iv (SDL_APPMOUSEFOCUS), 660 const_iv (SDL_APPMOUSEFOCUS),
562 const_iv (SDL_APPACTIVE), 661 const_iv (SDL_APPACTIVE),
662
663
664 const_iv (SDLK_UNKNOWN),
665 const_iv (SDLK_FIRST),
666 const_iv (SDLK_BACKSPACE),
667 const_iv (SDLK_TAB),
668 const_iv (SDLK_CLEAR),
669 const_iv (SDLK_RETURN),
670 const_iv (SDLK_PAUSE),
671 const_iv (SDLK_ESCAPE),
672 const_iv (SDLK_SPACE),
673 const_iv (SDLK_EXCLAIM),
674 const_iv (SDLK_QUOTEDBL),
675 const_iv (SDLK_HASH),
676 const_iv (SDLK_DOLLAR),
677 const_iv (SDLK_AMPERSAND),
678 const_iv (SDLK_QUOTE),
679 const_iv (SDLK_LEFTPAREN),
680 const_iv (SDLK_RIGHTPAREN),
681 const_iv (SDLK_ASTERISK),
682 const_iv (SDLK_PLUS),
683 const_iv (SDLK_COMMA),
684 const_iv (SDLK_MINUS),
685 const_iv (SDLK_PERIOD),
686 const_iv (SDLK_SLASH),
687 const_iv (SDLK_0),
688 const_iv (SDLK_1),
689 const_iv (SDLK_2),
690 const_iv (SDLK_3),
691 const_iv (SDLK_4),
692 const_iv (SDLK_5),
693 const_iv (SDLK_6),
694 const_iv (SDLK_7),
695 const_iv (SDLK_8),
696 const_iv (SDLK_9),
697 const_iv (SDLK_COLON),
698 const_iv (SDLK_SEMICOLON),
699 const_iv (SDLK_LESS),
700 const_iv (SDLK_EQUALS),
701 const_iv (SDLK_GREATER),
702 const_iv (SDLK_QUESTION),
703 const_iv (SDLK_AT),
704
705 const_iv (SDLK_LEFTBRACKET),
706 const_iv (SDLK_BACKSLASH),
707 const_iv (SDLK_RIGHTBRACKET),
708 const_iv (SDLK_CARET),
709 const_iv (SDLK_UNDERSCORE),
710 const_iv (SDLK_BACKQUOTE),
711 const_iv (SDLK_DELETE),
563 712
564 const_iv (SDLK_FIRST), 713 const_iv (SDLK_FIRST),
565 const_iv (SDLK_LAST), 714 const_iv (SDLK_LAST),
566 const_iv (SDLK_KP0), 715 const_iv (SDLK_KP0),
567 const_iv (SDLK_KP1), 716 const_iv (SDLK_KP1),
643 const_iv (KMOD_RMETA), 792 const_iv (KMOD_RMETA),
644 const_iv (KMOD_NUM), 793 const_iv (KMOD_NUM),
645 const_iv (KMOD_CAPS), 794 const_iv (KMOD_CAPS),
646 const_iv (KMOD_MODE), 795 const_iv (KMOD_MODE),
647 796
797 const_iv (KMOD_LRAM),
798
648 const_iv (MIX_DEFAULT_FORMAT), 799 const_iv (MIX_DEFAULT_FORMAT),
800
801 const_iv (SDL_INIT_TIMER),
802 const_iv (SDL_INIT_AUDIO),
803 const_iv (SDL_INIT_VIDEO),
804 const_iv (SDL_INIT_CDROM),
805 const_iv (SDL_INIT_JOYSTICK),
806 const_iv (SDL_INIT_EVERYTHING),
807 const_iv (SDL_INIT_NOPARACHUTE),
808 const_iv (SDL_INIT_EVENTTHREAD),
809
810 const_iv (SDL_GL_RED_SIZE),
811 const_iv (SDL_GL_GREEN_SIZE),
812 const_iv (SDL_GL_BLUE_SIZE),
813 const_iv (SDL_GL_ALPHA_SIZE),
814 const_iv (SDL_GL_DOUBLEBUFFER),
815 const_iv (SDL_GL_BUFFER_SIZE),
816 const_iv (SDL_GL_DEPTH_SIZE),
817 const_iv (SDL_GL_STENCIL_SIZE),
818 const_iv (SDL_GL_ACCUM_RED_SIZE),
819 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
820 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
821 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
822 const_iv (SDL_GL_STEREO),
823 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
824 const_iv (SDL_GL_MULTISAMPLESAMPLES),
825 const_iv (SDL_GL_ACCELERATED_VISUAL),
826 const_iv (SDL_GL_SWAP_CONTROL),
827
828 const_iv (FOW_DARKNESS)
649# undef const_iv 829# undef const_iv
650 }; 830 };
651 831
652 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 832 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
654 834
655 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
656 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
657} 837}
658 838
674NV ceil (NV x) 854NV ceil (NV x)
675 855
676IV minpot (UV n) 856IV minpot (UV n)
677 857
678IV popcount (UV n) 858IV popcount (UV n)
859
860NV distance (NV dx, NV dy)
861 CODE:
862 RETVAL = pow (dx * dx + dy * dy, 0.5);
863 OUTPUT:
864 RETVAL
679 865
680void 866void
681pango_init () 867pango_init ()
682 CODE: 868 CODE:
683{ 869{
689 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 875 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
690 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 876 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
691#endif 877#endif
692} 878}
693 879
694char *
695SDL_GetError () 880char *SDL_GetError ()
696 881
697int 882void SDL_main_hack (SV *real_main)
698SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 883 PROTOTYPE: &
699 884
700void 885int SDL_Init (U32 flags)
886
887int SDL_InitSubSystem (U32 flags)
888
889void SDL_QuitSubSystem (U32 flags)
890
701SDL_Quit () 891void SDL_Quit ()
892
893int SDL_GL_SetAttribute (int attr, int value)
894
895int SDL_GL_GetAttribute (int attr)
896 CODE:
897 if (SDL_GL_GetAttribute (attr, &RETVAL))
898 XSRETURN_UNDEF;
899 OUTPUT:
900 RETVAL
702 901
703void 902void
704SDL_ListModes (int rgb, int alpha) 903SDL_ListModes (int rgb, int alpha)
705 PPCODE: 904 PPCODE:
706{ 905{
718 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 917 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
719 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 918 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
720 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 919 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
721 920
722 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 921 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); 922 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
726#endif
727 923
728 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 924 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
729 925
730 if (m && m != (SDL_Rect **)-1) 926 if (m && m != (SDL_Rect **)-1)
731 while (*m) 927 while (*m)
732 { 928 {
733 if ((*m)->w >= 800 && (*m)->h >= 480) 929 if ((*m)->w >= 400 && (*m)->h >= 300)
734 { 930 {
735 AV *av = newAV (); 931 AV *av = newAV ();
736 av_push (av, newSViv ((*m)->w)); 932 av_push (av, newSViv ((*m)->w));
737 av_push (av, newSViv ((*m)->h)); 933 av_push (av, newSViv ((*m)->h));
738 av_push (av, newSViv (rgb)); 934 av_push (av, newSViv (rgb));
761 ); 957 );
762 958
763 if (RETVAL) 959 if (RETVAL)
764 { 960 {
765 av_clear (texture_av); 961 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); 962#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
769#include "glfunc.h" 963#include "glfunc.h"
770#undef GL_FUNC 964#undef GL_FUNC
965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
771 } 967 }
772} 968}
773 OUTPUT: 969 OUTPUT:
774 RETVAL 970 RETVAL
775 971
776void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
777SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
778 977
779char * 978char *
780SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
781 980
783SDL_GetAppState () 982SDL_GetAppState ()
784 983
785int 984int
786SDL_GetModState () 985SDL_GetModState ()
787 986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
788void 991void
992SDL_PumpEvents ()
993
994void
789poll_events () 995peep_events ()
790 PPCODE: 996 PPCODE:
791{ 997{
792 SDL_Event ev; 998 SDL_Event ev;
793 999
794 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
801 { 1007 {
802 case SDL_KEYDOWN: 1008 case SDL_KEYDOWN:
803 case SDL_KEYUP: 1009 case SDL_KEYUP:
804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1011 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); 1012 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 */ 1013 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); 1014 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
809 break; 1015 break;
810 1016
811 case SDL_ACTIVEEVENT: 1017 case SDL_ACTIVEEVENT:
812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1018 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
830 x = ev.motion.x; 1036 x = ev.motion.x;
831 y = ev.motion.y; 1037 y = ev.motion.y;
832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1038 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
833 } 1039 }
834 1040
835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1041 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
836 hv_store (hv, "state", 5, newSViv (state), 0); 1042 hv_store (hv, "state", 5, newSViv (state), 0);
837 hv_store (hv, "x", 1, newSViv (x), 0); 1043 hv_store (hv, "x", 1, newSViv (x), 0);
838 hv_store (hv, "y", 1, newSViv (y), 0); 1044 hv_store (hv, "y", 1, newSViv (y), 0);
839 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1045 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
840 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1046 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
860 1066
861 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1067 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
862 } 1068 }
863} 1069}
864 1070
1071char *
1072SDL_AudioDriverName ()
1073 CODE:
1074{
1075 char buf [256];
1076 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1077 XSRETURN_UNDEF;
1078
1079 RETVAL = buf;
1080}
1081 OUTPUT:
1082 RETVAL
1083
865int 1084int
866Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1085Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
867 POSTCALL: 1086 POSTCALL:
868 Mix_HookMusicFinished (music_finished); 1087 Mix_HookMusicFinished (music_finished);
869 Mix_ChannelFinished (channel_finished); 1088 Mix_ChannelFinished (channel_finished);
931add_font (char *file) 1150add_font (char *file)
932 CODE: 1151 CODE:
933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1152 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT: 1153 OUTPUT:
935 RETVAL 1154 RETVAL
1155
1156void
1157IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1158
1159# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1160void
1161Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
936 1162
937void 1163void
938load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
939 ALIAS: 1165 ALIAS:
940 load_image_file = 1 1166 load_image_file = 1
1056#if DEBUG 1282#if DEBUG
1057 VALGRIND_DO_LEAK_CHECK; 1283 VALGRIND_DO_LEAK_CHECK;
1058#endif 1284#endif
1059} 1285}
1060 1286
1287int
1288SvREFCNT (SV *sv)
1289 CODE:
1290 RETVAL = SvREFCNT (sv);
1291 OUTPUT:
1292 RETVAL
1293
1061MODULE = Deliantra::Client PACKAGE = DC::Font 1294MODULE = Deliantra::Client PACKAGE = DC::Font
1062 1295
1063PROTOTYPES: DISABLE 1296PROTOTYPES: DISABLE
1064 1297
1065DC::Font 1298DC::Font
1259 1492
1260void 1493void
1261set_height (DC::Layout self, int base_height) 1494set_height (DC::Layout self, int base_height)
1262 CODE: 1495 CODE:
1263 if (self->base_height != base_height) 1496 if (self->base_height != base_height)
1264 { 1497 {
1265 self->base_height = base_height; 1498 self->base_height = base_height;
1266 layout_update_font (self); 1499 layout_update_font (self);
1267 } 1500 }
1268 1501
1269void 1502void
1494 if (ix) 1727 if (ix)
1495 { 1728 {
1496 glDisable (GL_ALPHA_TEST); 1729 glDisable (GL_ALPHA_TEST);
1497 glDisable (GL_BLEND); 1730 glDisable (GL_BLEND);
1498 } 1731 }
1732}
1733
1734void
1735draw_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)
1736 PROTOTYPE: @
1737 CODE:
1738{
1739 glEnable (GL_BLEND);
1740 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1741 glEnable (GL_TEXTURE_2D);
1742 glBindTexture (GL_TEXTURE_2D, name1);
1743
1744 glColor3f (intensity, intensity, intensity);
1745 glPushMatrix ();
1746 glScalef (1./3, 1./3, 1.);
1747
1748 if (blend > 0.f)
1749 {
1750 float dx3 = dx * -3.f / w;
1751 float dy3 = dy * -3.f / h;
1752 GLfloat env_color[4] = { 0., 0., 0., blend };
1753
1754 /* interpolate the two shadow textures */
1755 /* stage 0 == rgb(glcolor) + alpha(t0) */
1756 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1757
1758 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1759 gl.ActiveTexture (GL_TEXTURE1);
1760 glEnable (GL_TEXTURE_2D);
1761 glBindTexture (GL_TEXTURE_2D, name2);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1763
1764 /* rgb == rgb(glcolor) */
1765 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1766 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1767 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1768
1769 /* alpha = interpolate t0, t1 by env_alpha */
1770 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1771
1772 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1773 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1774 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1775
1776 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1777 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1778
1779 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1780 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1781
1782 glBegin (GL_QUADS);
1783 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1784 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1785 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1787 glEnd ();
1788
1789 glDisable (GL_TEXTURE_2D);
1790 gl.ActiveTexture (GL_TEXTURE0);
1791 }
1792 else
1793 {
1794 /* simple blending of one texture, also opengl <1.3 path */
1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1796
1797 glBegin (GL_QUADS);
1798 glTexCoord2f (0, 0); glVertex2f (0, 0);
1799 glTexCoord2f (0, t); glVertex2f (0, h);
1800 glTexCoord2f (s, t); glVertex2f (w, h);
1801 glTexCoord2f (s, 0); glVertex2f (w, 0);
1802 glEnd ();
1803 }
1804
1805 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1806 {
1807 int x, y;
1808 int dx3 = dx * 3;
1809 int dy3 = dy * 3;
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1812 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1813 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1814 glTranslatef (-1., -1., 0);
1815 glBegin (GL_QUADS);
1816
1817 for (y = 1; y < h; y += 3)
1818 {
1819 int y1 = y - dy3;
1820 int y1valid = y1 >= 0 && y1 < h;
1821
1822 for (x = 1; x < w; x += 3)
1823 {
1824 int x1 = x - dx3;
1825 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1826 uint8_t h2;
1827
1828 if (y1valid && x1 >= 0 && x1 < w)
1829 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1830 else
1831 h2 = 1; /* out of range == invisible */
1832
1833 if (h1 || h2)
1834 {
1835 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1836 glColor4f (1., 1., 1., alpha);
1837
1838 glTexCoord2f (0, 0.); glVertex2i (x , y );
1839 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1840 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1841 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1842 }
1843 }
1844 }
1845 }
1846
1847 glEnd ();
1848
1849 glPopMatrix ();
1850
1851 glDisable (GL_TEXTURE_2D);
1852 glDisable (GL_BLEND);
1499} 1853}
1500 1854
1501IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1855IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1502 CODE: 1856 CODE:
1503{ 1857{
1609 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1963 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1610 // use uglier nearest interpolation because linear suffers 1964 // use uglier nearest interpolation because linear suffers
1611 // from transparent color bleeding and ugly wrapping effects. 1965 // from transparent color bleeding and ugly wrapping effects.
1612 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1966 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1613} 1967}
1968
1969void
1970expire_textures (DC::Map self, int texid, int count)
1971 PPCODE:
1972 for (; texid < self->texs && count; ++texid, --count)
1973 {
1974 maptex *tex = self->tex + texid;
1975
1976 if (tex->name)
1977 {
1978 if (tex->unused)
1979 {
1980 tex->name = 0;
1981 tex->unused = 0;
1982 XPUSHs (sv_2mortal (newSViv (texid)));
1983 }
1984 else
1985 tex->unused = 1;
1986 }
1987 }
1614 1988
1615int 1989int
1616ox (DC::Map self) 1990ox (DC::Map self)
1617 ALIAS: 1991 ALIAS:
1618 oy = 1 1992 oy = 1
1658 self->y += MAP_EXTEND_Y; 2032 self->y += MAP_EXTEND_Y;
1659 } 2033 }
1660} 2034}
1661 2035
1662SV * 2036SV *
1663map1a_update (DC::Map self, SV *data_, int extmap) 2037map1a_update (DC::Map self, SV *data_)
1664 CODE: 2038 CODE:
1665{ 2039{
1666 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2040 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1667 uint8_t *data_end = (uint8_t *)SvEND (data_); 2041 uint8_t *data_end = (uint8_t *)SvEND (data_);
1668 mapcell *cell; 2042 mapcell *cell;
1689 2063
1690 //TODO: don't trust server data to be in-range(!) 2064 //TODO: don't trust server data to be in-range(!)
1691 2065
1692 if (flags & 8) 2066 if (flags & 8)
1693 { 2067 {
2068 uint8_t ext, cmd;
2069
1694 if (extmap) 2070 do
1695 { 2071 {
1696 uint8_t ext, cmd; 2072 ext = *data++;
2073 cmd = ext & 0x7f;
1697 2074
1698 do 2075 if (cmd < 4)
2076 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2077 else if (cmd == 5) // health
1699 { 2078 {
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; 2079 cell->stat_width = 1;
1708 cell->stat_hp = *data++; 2080 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 } 2081 }
1728 while (ext & 0x80); 2082 else if (cmd == 6) // monster width
2083 cell->stat_width = *data++ + 1;
2084 else if (cmd == 0x47)
2085 {
2086 if (*data == 1) cell->player = data [1];
2087 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2088 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2089 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2090
2091 data += *data + 1;
2092 }
2093 else if (cmd == 8) // cell flags
2094 cell->flags = *data++;
2095 else if (ext & 0x40) // unknown, multibyte => skip
2096 data += *data + 1;
2097 else
2098 data++;
1729 } 2099 }
1730 else 2100 while (ext & 0x80);
1731 cell->darkness = *data++ + 1;
1732 } 2101 }
1733 2102
1734 for (z = 0; z <= 2; ++z) 2103 for (z = 0; z <= 2; ++z)
1735 if (flags & (4 >> z)) 2104 if (flags & (4 >> z))
1736 { 2105 {
1739 cell->tile [z] = self->face2tile [face]; 2108 cell->tile [z] = self->face2tile [face];
1740 2109
1741 if (cell->tile [z]) 2110 if (cell->tile [z])
1742 { 2111 {
1743 maptex *tex = self->tex + cell->tile [z]; 2112 maptex *tex = self->tex + cell->tile [z];
2113 tex->unused = 0;
1744 if (!tex->name) 2114 if (!tex->name)
1745 av_push (missing, newSViv (cell->tile [z])); 2115 av_push (missing, newSViv (cell->tile [z]));
1746 2116
1747 if (tex->smoothtile) 2117 if (tex->smoothtile)
1748 { 2118 {
1749 maptex *smooth = self->tex + tex->smoothtile; 2119 maptex *smooth = self->tex + tex->smoothtile;
2120 smooth->unused = 0;
1750 if (!smooth->name) 2121 if (!smooth->name)
1751 av_push (missing, newSViv (tex->smoothtile)); 2122 av_push (missing, newSViv (tex->smoothtile));
1752 } 2123 }
1753 } 2124 }
1754 } 2125 }
1755 } 2126 }
1756 else 2127 else
1757 cell->darkness = 0; 2128 CELL_CLEAR (cell);
1758 } 2129 }
1759} 2130}
1760 OUTPUT: 2131 OUTPUT:
1761 RETVAL 2132 RETVAL
1762 2133
1782 ? self->row + y 2153 ? self->row + y
1783 : 0; 2154 : 0;
1784 2155
1785 for (x = x0; x < x1; x++) 2156 for (x = x0; x < x1; x++)
1786 { 2157 {
1787 int r = 32, g = 32, b = 32, a = 192; 2158 unsigned int r = 32, g = 32, b = 32, a = 192;
1788 2159
1789 if (row && row->c0 <= x && x < row->c1) 2160 if (row && row->c0 <= x && x < row->c1)
1790 { 2161 {
1791 mapcell *cell = row->col + (x - row->c0); 2162 mapcell *cell = row->col + (x - row->c0);
1792 2163
1794 { 2165 {
1795 maptex tex = self->tex [cell->tile [z]]; 2166 maptex tex = self->tex [cell->tile [z]];
1796 int a0 = 255 - tex.a; 2167 int a0 = 255 - tex.a;
1797 int a1 = tex.a; 2168 int a1 = tex.a;
1798 2169
1799 r = (r * a0 + tex.r * a1) / 255; 2170 r = div255 (r * a0 + tex.r * a1);
1800 g = (g * a0 + tex.g * a1) / 255; 2171 g = div255 (g * a0 + tex.g * a1);
1801 b = (b * a0 + tex.b * a1) / 255; 2172 b = div255 (b * a0 + tex.b * a1);
1802 a = (a * a0 + tex.a * a1) / 255; 2173 a = div255 (a * a0 + tex.a * a1);
1803 } 2174 }
1804 } 2175 }
1805 2176
1806 *map++ = (r ) 2177 *map++ = (r )
1807 | (g << 8) 2178 | (g << 8)
1814} 2185}
1815 OUTPUT: 2186 OUTPUT:
1816 RETVAL 2187 RETVAL
1817 2188
1818void 2189void
1819draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2190draw (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: 2191 CODE:
1821{ 2192{
1822 int x, y, z; 2193 int x, y, z;
1823 2194
1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2195 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1825 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2196 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) 2197 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1827 smooth_key skey; 2198 smooth_key skey;
1828 int pl_x, pl_y; 2199 int pl_x, pl_y;
1829 maptex pl_tex; 2200 maptex pl_tex;
1830 rc_t *rc = rc_alloc (); 2201 rc_t *rc = rc_alloc ();
2202 rc_t *rc_ov = rc_alloc ();
1831 rc_key_t key; 2203 rc_key_t key;
1832 rc_array_t *arr; 2204 rc_array_t *arr;
1833 2205
1834 pl_tex.name = 0; 2206 pl_tex.name = 0;
1835 2207
1836 // thats current max. sorry. 2208 // that's current max. sorry.
1837 if (sw > 255) sw = 255; 2209 if (sw > 255) sw = 255;
1838 if (sh > 255) sh = 255; 2210 if (sh > 255) sh = 255;
1839 2211
1840 // clear key, in case of extra padding 2212 // clear key, in case of extra padding
1841 memset (&skey, 0, sizeof (skey)); 2213 memset (&skey, 0, sizeof (skey));
1845 key.g = 255; 2217 key.g = 255;
1846 key.b = 255; 2218 key.b = 255;
1847 key.a = 255; 2219 key.a = 255;
1848 key.mode = GL_QUADS; 2220 key.mode = GL_QUADS;
1849 key.format = GL_T2F_V3F; 2221 key.format = GL_T2F_V3F;
1850 key.texname = -1;
1851 2222
1852 mx += self->x; 2223 mx += self->x;
1853 my += self->y; 2224 my += self->y;
1854 2225
1855 // first pass: determine smooth_max 2226 // first pass: determine smooth_max
1879 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2250 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1880 2251
1881 for (z = 0; z <= 2; z++) 2252 for (z = 0; z <= 2; z++)
1882 { 2253 {
1883 memset (smooth_level, 0, sizeof (smooth_level)); 2254 memset (smooth_level, 0, sizeof (smooth_level));
2255 key.texname = -1;
1884 2256
1885 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
1886 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
1887 { 2259 {
1888 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
1894 tileid tile = cell->tile [z]; 2266 tileid tile = cell->tile [z];
1895 2267
1896 if (tile) 2268 if (tile)
1897 { 2269 {
1898 maptex tex = self->tex [tile]; 2270 maptex tex = self->tex [tile];
1899 int px = (x + 1) * T - tex.w; 2271 int px, py;
1900 int py = (y + 1) * T - tex.h;
1901 2272
1902 if (key.texname != tex.name) 2273 if (key.texname != tex.name)
1903 { 2274 {
2275 self->tex [tile].unused = 0;
2276
1904 if (!tex.name) 2277 if (!tex.name)
1905 tex = self->tex [2]; /* missing, replace by noface */ 2278 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1906 2279
1907 key.texname = tex.name; 2280 key.texname = tex.name;
1908 arr = rc_array (rc, &key); 2281 arr = rc_array (rc, &key);
1909 } 2282 }
2283
2284 px = (x + 1) * Th - tex.w;
2285 py = (y + 1) * Tw - tex.h;
1910 2286
1911 if (expect_false (cell->player == player) && expect_false (z == 2)) 2287 if (expect_false (cell->player == player) && expect_false (z == 2))
1912 { 2288 {
1913 pl_x = px; 2289 pl_x = px;
1914 pl_y = py; 2290 pl_y = py;
1919 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2295 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1920 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2296 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); 2297 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); 2298 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1923 2299
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 2300 // update smooth hash
1950 if (tex.smoothtile) 2301 if (tex.smoothtile)
1951 { 2302 {
1952 skey.tile = tex.smoothtile; 2303 skey.tile = tex.smoothtile;
1953 skey.level = tex.smoothlevel; 2304 skey.level = tex.smoothlevel;
1981 // corners 2332 // corners
1982 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2333 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); 2334 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); 2335 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); 2336 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2337 }
2338 }
2339
2340 if (expect_false (z == 2) && expect_false (cell->flags))
2341 {
2342 // overlays such as the speech bubble, probably more to come
2343 if (cell->flags & 1)
2344 {
2345 rc_key_t key_ov = key;
2346 maptex tex = self->tex [TEXID_SPEECH];
2347 rc_array_t *arr;
2348 int px = x * Tw + Tw * 2 / 32;
2349 int py = y * Th - Th * 6 / 32;
2350
2351 key_ov.texname = tex.name;
2352 arr = rc_array (rc_ov, &key_ov);
2353
2354 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2355 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2356 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2357 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1986 } 2358 }
1987 } 2359 }
1988 } 2360 }
1989 } 2361 }
1990 2362
2017 if (!(bits & 0x1000) 2389 if (!(bits & 0x1000)
2018 && skey->level == level 2390 && skey->level == level
2019 && level > smooth_max [skey->x][skey->y]) 2391 && level > smooth_max [skey->x][skey->y])
2020 { 2392 {
2021 maptex tex = self->tex [skey->tile]; 2393 maptex tex = self->tex [skey->tile];
2022 int px = (((int)skey->x) - 1) * T; 2394 int px = (((int)skey->x) - 1) * Tw;
2023 int py = (((int)skey->y) - 1) * T; 2395 int py = (((int)skey->y) - 1) * Th;
2024 int border = bits & 15; 2396 int border = bits & 15;
2025 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2397 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2026 float dx = tex.s * .0625f; // 16 images/row 2398 float dx = tex.s * .0625f; // 16 images/row
2027 float dy = tex.t * .5f ; // 2 images/column 2399 float dy = tex.t * .5f ; // 2 images/column
2028 2400
2030 { 2402 {
2031 // this time avoiding texture state changes 2403 // this time avoiding texture state changes
2032 // save gobs of state changes. 2404 // save gobs of state changes.
2033 if (key.texname != tex.name) 2405 if (key.texname != tex.name)
2034 { 2406 {
2407 self->tex [skey->tile].unused = 0;
2408
2035 glEnd (); 2409 glEnd ();
2036 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2410 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2037 glBegin (GL_QUADS); 2411 glBegin (GL_QUADS);
2038 } 2412 }
2039 2413
2040 if (border) 2414 if (border)
2041 { 2415 {
2042 float ox = border * dx; 2416 float ox = border * dx;
2043 2417
2044 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2418 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2045 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2419 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2046 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2420 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2047 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2421 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2048 } 2422 }
2049 2423
2050 if (corner) 2424 if (corner)
2051 { 2425 {
2052 float ox = corner * dx; 2426 float ox = corner * dx;
2053 2427
2054 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2055 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2429 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2056 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2430 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2057 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2431 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2058 } 2432 }
2059 } 2433 }
2060 } 2434 }
2061 } 2435 }
2062 } 2436 }
2071 } 2445 }
2072 2446
2073 if (pl_tex.name) 2447 if (pl_tex.name)
2074 { 2448 {
2075 maptex tex = pl_tex; 2449 maptex tex = pl_tex;
2076 int px = pl_x + pdx; 2450 int px = pl_x + sdx;
2077 int py = pl_y + pdy; 2451 int py = pl_y + sdy;
2078 2452
2079 key.texname = tex.name; 2453 key.texname = tex.name;
2080 arr = rc_array (rc, &key); 2454 arr = rc_array (rc, &key);
2081 2455
2082 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2456 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2085 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2459 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2086 2460
2087 rc_draw (rc); 2461 rc_draw (rc);
2088 } 2462 }
2089 2463
2464 rc_draw (rc_ov);
2465 rc_clear (rc_ov);
2466
2090 glDisable (GL_BLEND); 2467 glDisable (GL_BLEND);
2091 rc_free (rc); 2468 rc_free (rc);
2469 rc_free (rc_ov);
2092 2470
2093 // top layer: overlays such as the health bar 2471 // top layer: overlays such as the health bar
2094 for (y = 0; y < sh; y++) 2472 for (y = 0; y < sh; y++)
2095 if (0 <= y + my && y + my < self->rows) 2473 if (0 <= y + my && y + my < self->rows)
2096 { 2474 {
2099 for (x = 0; x < sw; x++) 2477 for (x = 0; x < sw; x++)
2100 if (row->c0 <= x + mx && x + mx < row->c1) 2478 if (row->c0 <= x + mx && x + mx < row->c1)
2101 { 2479 {
2102 mapcell *cell = row->col + (x + mx - row->c0); 2480 mapcell *cell = row->col + (x + mx - row->c0);
2103 2481
2104 int px = x * T; 2482 int px = x * Tw;
2105 int py = y * T; 2483 int py = y * Th;
2484
2485 if (expect_false (cell->player == player))
2486 {
2487 px += sdx;
2488 py += sdy;
2489 }
2106 2490
2107 if (cell->stat_hp) 2491 if (cell->stat_hp)
2108 { 2492 {
2109 int width = cell->stat_width * T; 2493 int width = cell->stat_width * Tw;
2110 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2494 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2111 2495
2112 glColor3ub (0, 0, 0); 2496 glColor3ub (0, 0, 0);
2113 glRectf (px + 1, py - thick - 2, 2497 glRectf (px + 1, py - thick - 2,
2114 px + width - 1, py); 2498 px + width - 1, py);
2115 2499
2121 } 2505 }
2122 } 2506 }
2123} 2507}
2124 2508
2125void 2509void
2126draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2510draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2127 CODE: 2511 CODE:
2128{ 2512{
2129 static float color[16][3] = { 2513 static float color[16][3] = {
2130 { 0.00F, 0.00F, 0.00F }, 2514 { 0.00f, 0.00f, 0.00f },
2131 { 1.00F, 1.00F, 1.00F }, 2515 { 1.00f, 1.00f, 1.00f },
2132 { 0.00F, 0.00F, 0.55F }, 2516 { 0.00f, 0.00f, 0.55f },
2133 { 1.00F, 0.00F, 0.00F }, 2517 { 1.00f, 0.00f, 0.00f },
2134 2518
2135 { 1.00F, 0.54F, 0.00F }, 2519 { 1.00f, 0.54f, 0.00f },
2136 { 0.11F, 0.56F, 1.00F }, 2520 { 0.11f, 0.56f, 1.00f },
2137 { 0.93F, 0.46F, 0.00F }, 2521 { 0.93f, 0.46f, 0.00f },
2138 { 0.18F, 0.54F, 0.34F }, 2522 { 0.18f, 0.54f, 0.34f },
2139 2523
2140 { 0.56F, 0.73F, 0.56F }, 2524 { 0.56f, 0.73f, 0.56f },
2141 { 0.80F, 0.80F, 0.80F }, 2525 { 0.80f, 0.80f, 0.80f },
2142 { 0.55F, 0.41F, 0.13F }, 2526 { 0.55f, 0.41f, 0.13f },
2143 { 0.99F, 0.77F, 0.26F }, 2527 { 0.99f, 0.77f, 0.26f },
2144 2528
2145 { 0.74F, 0.65F, 0.41F }, 2529 { 0.74f, 0.65f, 0.41f },
2146 2530
2147 { 0.00F, 1.00F, 1.00F }, 2531 { 0.00f, 1.00f, 1.00f },
2148 { 1.00F, 0.00F, 1.00F }, 2532 { 1.00f, 0.00f, 1.00f },
2149 { 1.00F, 1.00F, 0.00F }, 2533 { 1.00f, 1.00f, 0.00f },
2150 }; 2534 };
2151 2535
2152 int x, y; 2536 int x, y;
2153 2537
2154 glEnable (GL_TEXTURE_2D); 2538 glEnable (GL_TEXTURE_2D);
2539 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2540 * but the nvidia driver (185.18.14) mishandles alpha textures
2541 * and takes the colour from god knows where instead of using
2542 * Cp. MODULATE results in the same colour, but slightly different
2543 * alpha, but atcually gives us the correct colour with nvidia.
2544 */
2155 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2545 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2156 glEnable (GL_BLEND); 2546 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2547 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glBegin (GL_QUADS); 2548 glBegin (GL_QUADS);
2159 2549
2160 for (y = 0; y < h; y++) 2550 for (y = 0; y < h; y++)
2164 2554
2165 if (m) 2555 if (m)
2166 { 2556 {
2167 float *c = color [m & 15]; 2557 float *c = color [m & 15];
2168 2558
2169 float tx1 = m & 0x40 ? 0.5 : 0.; 2559 float tx1 = m & 0x40 ? 0.5f : 0.f;
2170 float tx2 = tx1 + 0.5; 2560 float tx2 = tx1 + 0.5f;
2171 2561
2172 glColor4f (c[0], c[1], c[2], 0.75); 2562 glColor4f (c[0], c[1], c[2], 1);
2173 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2563 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2174 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2564 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2175 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2565 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2176 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2566 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2177 } 2567 }
2185void 2575void
2186fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2576fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2187 PPCODE: 2577 PPCODE:
2188{ 2578{
2189 int x, y; 2579 int x, y;
2190 int sw1 = sw + 2; 2580 int sw1 = sw + 2;
2191 int sh1 = sh + 2; 2581 int sh1 = sh + 2;
2192 int sh3 = sh * 3; 2582 int sh3 = sh * 3;
2193 int sw34 = (sw * 3 + 3) & ~3; 2583 int sw3 = sw * 3;
2584 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2585 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2194 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2586 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2195 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2587 memset (darkness1, 0, sw1*sh1);
2196 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2197 2588
2198 SvPOK_only (darkness3_sv); 2589 SvPOK_only (darkness3_sv);
2199 SvCUR_set (darkness3_sv, sw34 * sh3); 2590 SvCUR_set (darkness3_sv, sw3 * sh3);
2200 2591
2201 mx += self->x - 1; 2592 mx += self->x - 1;
2202 my += self->y - 1; 2593 my += self->y - 1;
2203
2204 memset (darkness1, 255, sw1 * sh1);
2205 2594
2206 for (y = 0; y < sh1; y++) 2595 for (y = 0; y < sh1; y++)
2207 if (0 <= y + my && y + my < self->rows) 2596 if (0 <= y + my && y + my < self->rows)
2208 { 2597 {
2209 maprow *row = self->row + (y + my); 2598 maprow *row = self->row + (y + my);
2212 if (row->c0 <= x + mx && x + mx < row->c1) 2601 if (row->c0 <= x + mx && x + mx < row->c1)
2213 { 2602 {
2214 mapcell *cell = row->col + (x + mx - row->c0); 2603 mapcell *cell = row->col + (x + mx - row->c0);
2215 2604
2216 darkness1 [y * sw1 + x] = cell->darkness 2605 darkness1 [y * sw1 + x] = cell->darkness
2217 ? 255 - (cell->darkness - 1) 2606 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2218 : 255 - FOW_DARKNESS; 2607 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2219 } 2608 }
2220 } 2609 }
2221 2610
2222 for (y = 0; y < sh; ++y) 2611 for (y = 0; y < sh; ++y)
2223 for (x = 0; x < sw; ++x) 2612 for (x = 0; x < sw; ++x)
2242 2631
2243 uint8_t r13 = (d13 + d23 + d12) / 3; 2632 uint8_t r13 = (d13 + d23 + d12) / 3;
2244 uint8_t r23 = d23; 2633 uint8_t r23 = d23;
2245 uint8_t r33 = (d23 + d33 + d32) / 3; 2634 uint8_t r33 = (d23 + d33 + d32) / 3;
2246 2635
2247 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2636 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2248 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2637 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2249 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2250 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2639 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2251 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2640 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); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2253 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2642 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2254 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2643 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2255 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2256 } 2645 }
2257 2646
2258 free (darkness1); 2647 free (darkness1);
2259 2648
2260 EXTEND (SP, 3); 2649 EXTEND (SP, 3);
2261 PUSHs (sv_2mortal (newSViv (sw34))); 2650 PUSHs (sv_2mortal (newSViv (sw3)));
2262 PUSHs (sv_2mortal (newSViv (sh3))); 2651 PUSHs (sv_2mortal (newSViv (sh3)));
2263 PUSHs (darkness3_sv); 2652 PUSHs (darkness3_sv);
2264} 2653}
2265 2654
2266SV * 2655SV *
2464 if (RETVAL < 0) 2853 if (RETVAL < 0)
2465 { 2854 {
2466 RETVAL = Mix_GroupOldest (-1); 2855 RETVAL = Mix_GroupOldest (-1);
2467 2856
2468 if (RETVAL < 0) 2857 if (RETVAL < 0)
2858 {
2859 // happens sometimes, maybe it just stopped playing(?)
2860 RETVAL = Mix_GroupAvailable (-1);
2861
2862 if (RETVAL < 0)
2469 XSRETURN_UNDEF; 2863 XSRETURN_UNDEF;
2470 2864 }
2865 else
2471 Mix_HaltChannel (RETVAL); 2866 Mix_HaltChannel (RETVAL);
2472 } 2867 }
2473 2868
2474 Mix_UnregisterAllEffects (RETVAL); 2869 Mix_UnregisterAllEffects (RETVAL);
2475 Mix_Volume (RETVAL, 128); 2870 Mix_Volume (RETVAL, 128);
2476} 2871}
2523void 2918void
2524set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2919set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2525 CODE: 2920 CODE:
2526{ 2921{
2527 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2922 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); 2923 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2529 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2924 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2530} 2925}
2531 2926
2532void 2927void
2533set_reverse_stereo (DC::Channel self, int flip) 2928set_reverse_stereo (DC::Channel self, int flip)
2535 Mix_SetReverseStereo (self, flip); 2930 Mix_SetReverseStereo (self, flip);
2536 2931
2537MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2932MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2538 2933
2539PROTOTYPES: DISABLE 2934PROTOTYPES: DISABLE
2935
2936void
2937decoders ()
2938 PPCODE:
2939#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2940 int i, num = Mix_GetNumChunkDecoders ();
2941 EXTEND (SP, num);
2942 for (i = 0; i < num; ++i)
2943 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2944#else
2945 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2946#endif
2540 2947
2541DC::MixChunk 2948DC::MixChunk
2542new (SV *class, DC::RW rwops) 2949new (SV *class, DC::RW rwops)
2543 CODE: 2950 CODE:
2544 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2951 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2577 OUTPUT: 2984 OUTPUT:
2578 RETVAL 2985 RETVAL
2579 2986
2580MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2987MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2581 2988
2989void
2990decoders ()
2991 PPCODE:
2992#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2993 int i, num = Mix_GetNumMusicDecoders ();
2994 EXTEND (SP, num);
2995 for (i = 0; i < num; ++i)
2996 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2997#else
2998 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2999#endif
3000
2582int 3001int
2583volume (int volume = -1) 3002volume (int volume = -1)
2584 PROTOTYPE: ;$ 3003 PROTOTYPE: ;$
2585 CODE: 3004 CODE:
2586 if (items > 0) 3005 if (items > 0)
2596 3015
2597void 3016void
2598halt () 3017halt ()
2599 CODE: 3018 CODE:
2600 Mix_HaltMusic (); 3019 Mix_HaltMusic ();
3020
3021int
3022playing ()
3023 CODE:
3024 RETVAL = Mix_PlayingMusic ();
3025 OUTPUT:
3026 RETVAL
2601 3027
2602DC::MixMusic 3028DC::MixMusic
2603new (SV *class, DC::RW rwops) 3029new (SV *class, DC::RW rwops)
2604 CODE: 3030 CODE:
2605 RETVAL = Mix_LoadMUS_RW (rwops); 3031 RETVAL = Mix_LoadMUS_RW (rwops);
2636 } *civ, const_iv[] = { 3062 } *civ, const_iv[] = {
2637# define const_iv(name) { # name, (IV)name } 3063# define const_iv(name) { # name, (IV)name }
2638 const_iv (GL_VENDOR), 3064 const_iv (GL_VENDOR),
2639 const_iv (GL_VERSION), 3065 const_iv (GL_VERSION),
2640 const_iv (GL_EXTENSIONS), 3066 const_iv (GL_EXTENSIONS),
3067 const_iv (GL_MAX_TEXTURE_UNITS),
2641 const_iv (GL_COLOR_MATERIAL), 3068 const_iv (GL_COLOR_MATERIAL),
2642 const_iv (GL_SMOOTH), 3069 const_iv (GL_SMOOTH),
2643 const_iv (GL_FLAT), 3070 const_iv (GL_FLAT),
2644 const_iv (GL_DITHER), 3071 const_iv (GL_DITHER),
2645 const_iv (GL_BLEND), 3072 const_iv (GL_BLEND),
2657 const_iv (GL_ZERO), 3084 const_iv (GL_ZERO),
2658 const_iv (GL_SRC_ALPHA), 3085 const_iv (GL_SRC_ALPHA),
2659 const_iv (GL_DST_ALPHA), 3086 const_iv (GL_DST_ALPHA),
2660 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3087 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2661 const_iv (GL_ONE_MINUS_DST_ALPHA), 3088 const_iv (GL_ONE_MINUS_DST_ALPHA),
3089 const_iv (GL_SRC_COLOR),
3090 const_iv (GL_DST_COLOR),
3091 const_iv (GL_ONE_MINUS_SRC_COLOR),
3092 const_iv (GL_ONE_MINUS_DST_COLOR),
2662 const_iv (GL_SRC_ALPHA_SATURATE), 3093 const_iv (GL_SRC_ALPHA_SATURATE),
2663 const_iv (GL_RGB), 3094 const_iv (GL_RGB),
2664 const_iv (GL_RGBA), 3095 const_iv (GL_RGBA),
2665 const_iv (GL_RGBA4), 3096 const_iv (GL_RGBA4),
2666 const_iv (GL_RGBA8), 3097 const_iv (GL_RGBA8),
2734 const_iv (GL_NICEST), 3165 const_iv (GL_NICEST),
2735 const_iv (GL_V2F), 3166 const_iv (GL_V2F),
2736 const_iv (GL_V3F), 3167 const_iv (GL_V3F),
2737 const_iv (GL_T2F_V3F), 3168 const_iv (GL_T2F_V3F),
2738 const_iv (GL_T2F_N3F_V3F), 3169 const_iv (GL_T2F_N3F_V3F),
3170 const_iv (GL_FUNC_ADD),
3171 const_iv (GL_FUNC_SUBTRACT),
3172 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2739# undef const_iv 3173# undef const_iv
2740 }; 3174 };
2741 3175
2742 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3176 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2743 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3177 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2744 3178
2745 texture_av = newAV (); 3179 texture_av = newAV ();
2746 AvREAL_off (texture_av); 3180 AvREAL_off (texture_av);
2747} 3181}
2748 3182
2749void 3183void
2750disable_GL_EXT_blend_func_separate () 3184disable_GL_EXT_blend_func_separate ()
2751 CODE: 3185 CODE:
2752 gl.BlendFuncSeparate = 0; 3186 gl.BlendFuncSeparate = 0;
2753 gl.BlendFuncSeparateEXT = 0; 3187 gl.BlendFuncSeparateEXT = 0;
3188
3189void
3190apple_nvidia_bug (int enable)
2754 3191
2755char * 3192char *
2756gl_vendor () 3193gl_vendor ()
2757 CODE: 3194 CODE:
2758 RETVAL = (char *)glGetString (GL_VENDOR); 3195 RETVAL = (char *)glGetString (GL_VENDOR);
2789 3226
2790int glGetError () 3227int glGetError ()
2791 3228
2792void glFinish () 3229void glFinish ()
2793 3230
3231void glFlush ()
3232
2794void glClear (int mask) 3233void glClear (int mask)
2795 3234
2796void glClearColor (float r, float g, float b, float a = 1.0) 3235void glClearColor (float r, float g, float b, float a = 1.0)
2797 PROTOTYPE: @ 3236 PROTOTYPE: @
2798 3237
2807void glBlendFunc (int sfactor, int dfactor) 3246void glBlendFunc (int sfactor, int dfactor)
2808 3247
2809void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3248void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2810 CODE: 3249 CODE:
2811 gl_BlendFuncSeparate (sa, da, saa, daa); 3250 gl_BlendFuncSeparate (sa, da, saa, daa);
3251
3252# void glBlendEquation (int se)
2812 3253
2813void glDepthMask (int flag) 3254void glDepthMask (int flag)
2814 3255
2815void glLogicOp (int opcode) 3256void glLogicOp (int opcode)
2816 3257
2851void glRotate (float angle, float x, float y, float z) 3292void glRotate (float angle, float x, float y, float z)
2852 CODE: 3293 CODE:
2853 glRotatef (angle, x, y, z); 3294 glRotatef (angle, x, y, z);
2854 3295
2855void glColor (float r, float g, float b, float a = 1.0) 3296void glColor (float r, float g, float b, float a = 1.0)
3297 PROTOTYPE: @
2856 ALIAS: 3298 ALIAS:
2857 glColor_premultiply = 1 3299 glColor_premultiply = 1
2858 CODE: 3300 CODE:
2859 if (ix) 3301 if (ix)
2860 { 3302 {
2965void glNewList (int list, int mode = GL_COMPILE) 3407void glNewList (int list, int mode = GL_COMPILE)
2966 3408
2967void glEndList () 3409void glEndList ()
2968 3410
2969void glCallList (int list) 3411void glCallList (int list)
3412
3413void c_init ()
3414 CODE:
3415 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3416 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2970 3417
2971MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3418MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2972 3419
2973PROTOTYPES: DISABLE 3420PROTOTYPES: DISABLE
2974 3421

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines