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.263 by root, Fri Jul 18 21:18:42 2008 UTC vs.
Revision 1.311 by root, Tue Dec 27 09:17:27 2011 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)
99
100#define KMOD_LRAM 0x10000 // our extension
101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
90 123
91static AV *texture_av; 124static AV *texture_av;
92 125
93static struct 126static struct
94{ 127{
… …
226 int w, h; 259 int w, h;
227 float s, t; 260 float s, t;
228 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
229 tileid smoothtile; 262 tileid smoothtile;
230 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
231} maptex; 265} maptex;
232 266
233typedef struct { 267typedef struct {
234 uint32_t player; 268 uint32_t player;
235 tileid tile[3]; 269 tileid tile[3];
… …
367 self->oy = 0; 401 self->oy = 0;
368 self->row = 0; 402 self->row = 0;
369 self->rows = 0; 403 self->rows = 0;
370} 404}
371 405
406#define CELL_CLEAR(cell) \
407 do { \
408 if ((cell)->player) \
409 (cell)->tile [2] = 0; \
410 (cell)->darkness = 0; \
411 (cell)->stat_hp = 0; \
412 (cell)->flags = 0; \
413 (cell)->player = 0; \
414 } while (0)
415
372static void 416static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 417map_blank (DC__Map self, int x0, int y0, int w, int h)
374{ 418{
375 int x, y; 419 int x, y;
376 maprow *row; 420 maprow *row;
… …
390 if (x >= row->c1) 434 if (x >= row->c1)
391 break; 435 break;
392 436
393 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
394 438
395 cell->darkness = 0; 439 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 440 }
400 } 441 }
401} 442}
402 443
403typedef struct { 444typedef struct {
… …
438 ev.code = 1; 479 ev.code = 1;
439 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
440 ev.data2 = 0; 481 ev.data2 = 0;
441 482
442 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
484}
485
486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
443} 490}
444 491
445static unsigned int 492static unsigned int
446minpot (unsigned int n) 493minpot (unsigned int n)
447{ 494{
… …
514 if (!svp || !SvTRUE (*svp)) 561 if (!svp || !SvTRUE (*svp))
515 return 0; 562 return 0;
516 563
517 return 1; 564 return 1;
518} 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 ()
583{
584 char *argv[] = { 0 };
585 call_argv ("DC::Main::main", G_DISCARD | G_VOID, argv);
586}
587
588#ifdef __MACOSX__
589 /* to due surprising braindamage on the side of SDL design, we
590 * do some mind-boggling hack here: SDL requires a custom main()
591 * on OS X, so... we provide one and call the original main(), which,
592 * due to shared library magic, calls -lSDLmain's main, not perl's main,
593 * and which calls our main (== SDL_main) back.
594 */
595 extern C_LINKAGE int
596 main (int argc, char *argv[])
597 {
598 deliantra_main ();
599 }
600
601 #undef main
602
603 extern C_LINKAGE int main (int argc, char *argv[]);
604
605 static void
606 SDL_braino (void)
607 {
608 char *argv[] = { "deliantra client", 0 };
609 (main) (1, argv);
610 }
611#else
612 static void
613 SDL_braino (void)
614 {
615 deliantra_main ();
616 }
617#endif
519 618
520MODULE = Deliantra::Client PACKAGE = DC 619MODULE = Deliantra::Client PACKAGE = DC
521 620
522PROTOTYPES: ENABLE 621PROTOTYPES: ENABLE
523 622
… …
552 const_iv (SDL_USEREVENT), 651 const_iv (SDL_USEREVENT),
553 652
554 const_iv (SDL_APPINPUTFOCUS), 653 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 654 const_iv (SDL_APPMOUSEFOCUS),
556 const_iv (SDL_APPACTIVE), 655 const_iv (SDL_APPACTIVE),
656
657
658 const_iv (SDLK_UNKNOWN),
659 const_iv (SDLK_FIRST),
660 const_iv (SDLK_BACKSPACE),
661 const_iv (SDLK_TAB),
662 const_iv (SDLK_CLEAR),
663 const_iv (SDLK_RETURN),
664 const_iv (SDLK_PAUSE),
665 const_iv (SDLK_ESCAPE),
666 const_iv (SDLK_SPACE),
667 const_iv (SDLK_EXCLAIM),
668 const_iv (SDLK_QUOTEDBL),
669 const_iv (SDLK_HASH),
670 const_iv (SDLK_DOLLAR),
671 const_iv (SDLK_AMPERSAND),
672 const_iv (SDLK_QUOTE),
673 const_iv (SDLK_LEFTPAREN),
674 const_iv (SDLK_RIGHTPAREN),
675 const_iv (SDLK_ASTERISK),
676 const_iv (SDLK_PLUS),
677 const_iv (SDLK_COMMA),
678 const_iv (SDLK_MINUS),
679 const_iv (SDLK_PERIOD),
680 const_iv (SDLK_SLASH),
681 const_iv (SDLK_0),
682 const_iv (SDLK_1),
683 const_iv (SDLK_2),
684 const_iv (SDLK_3),
685 const_iv (SDLK_4),
686 const_iv (SDLK_5),
687 const_iv (SDLK_6),
688 const_iv (SDLK_7),
689 const_iv (SDLK_8),
690 const_iv (SDLK_9),
691 const_iv (SDLK_COLON),
692 const_iv (SDLK_SEMICOLON),
693 const_iv (SDLK_LESS),
694 const_iv (SDLK_EQUALS),
695 const_iv (SDLK_GREATER),
696 const_iv (SDLK_QUESTION),
697 const_iv (SDLK_AT),
698
699 const_iv (SDLK_LEFTBRACKET),
700 const_iv (SDLK_BACKSLASH),
701 const_iv (SDLK_RIGHTBRACKET),
702 const_iv (SDLK_CARET),
703 const_iv (SDLK_UNDERSCORE),
704 const_iv (SDLK_BACKQUOTE),
705 const_iv (SDLK_DELETE),
557 706
558 const_iv (SDLK_FIRST), 707 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 708 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 709 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 710 const_iv (SDLK_KP1),
… …
637 const_iv (KMOD_RMETA), 786 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 787 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 788 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 789 const_iv (KMOD_MODE),
641 790
791 const_iv (KMOD_LRAM),
792
642 const_iv (MIX_DEFAULT_FORMAT), 793 const_iv (MIX_DEFAULT_FORMAT),
643 794
644 const_iv (SDL_INIT_TIMER), 795 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 796 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 797 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM), 798 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK), 799 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING), 800 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE), 801 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD), 802 const_iv (SDL_INIT_EVENTTHREAD),
803
804 const_iv (SDL_GL_RED_SIZE),
805 const_iv (SDL_GL_GREEN_SIZE),
806 const_iv (SDL_GL_BLUE_SIZE),
807 const_iv (SDL_GL_ALPHA_SIZE),
808 const_iv (SDL_GL_DOUBLEBUFFER),
809 const_iv (SDL_GL_BUFFER_SIZE),
810 const_iv (SDL_GL_DEPTH_SIZE),
811 const_iv (SDL_GL_STENCIL_SIZE),
812 const_iv (SDL_GL_ACCUM_RED_SIZE),
813 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
814 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
815 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
816 const_iv (SDL_GL_STEREO),
817 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
818 const_iv (SDL_GL_MULTISAMPLESAMPLES),
819 const_iv (SDL_GL_ACCELERATED_VISUAL),
820 const_iv (SDL_GL_SWAP_CONTROL),
821
822 const_iv (FOW_DARKNESS)
652# undef const_iv 823# undef const_iv
653 }; 824 };
654 825
655 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 826 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
656 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
657 828
658 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
659 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
660} 831}
661 832
… …
677NV ceil (NV x) 848NV ceil (NV x)
678 849
679IV minpot (UV n) 850IV minpot (UV n)
680 851
681IV popcount (UV n) 852IV popcount (UV n)
853
854NV distance (NV dx, NV dy)
855 CODE:
856 RETVAL = pow (dx * dx + dy * dy, 0.5);
857 OUTPUT:
858 RETVAL
682 859
683void 860void
684pango_init () 861pango_init ()
685 CODE: 862 CODE:
686{ 863{
… …
694#endif 871#endif
695} 872}
696 873
697char *SDL_GetError () 874char *SDL_GetError ()
698 875
876void SDL_braino ()
877
699int SDL_Init (U32 flags) 878int SDL_Init (U32 flags)
700 879
701int SDL_InitSubSystem (U32 flags) 880int SDL_InitSubSystem (U32 flags)
702 881
703void SDL_QuitSubSystem (U32 flags) 882void SDL_QuitSubSystem (U32 flags)
704 883
705void SDL_Quit () 884void SDL_Quit ()
885
886int SDL_GL_SetAttribute (int attr, int value)
887
888int SDL_GL_GetAttribute (int attr)
889 CODE:
890 if (SDL_GL_GetAttribute (attr, &RETVAL))
891 XSRETURN_UNDEF;
892 OUTPUT:
893 RETVAL
706 894
707void 895void
708SDL_ListModes (int rgb, int alpha) 896SDL_ListModes (int rgb, int alpha)
709 PPCODE: 897 PPCODE:
710{ 898{
… …
722 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 910 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
723 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 911 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
724 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 912 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
725 913
726 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 914 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
727#if SDL_VERSION_ATLEAST(1,2,10)
728 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
729 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 915 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
730#endif
731 916
732 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 917 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
733 918
734 if (m && m != (SDL_Rect **)-1) 919 if (m && m != (SDL_Rect **)-1)
735 while (*m) 920 while (*m)
736 { 921 {
922 if ((*m)->w >= 400 && (*m)->h >= 300)
923 {
737 AV *av = newAV (); 924 AV *av = newAV ();
738 av_push (av, newSViv ((*m)->w)); 925 av_push (av, newSViv ((*m)->w));
739 av_push (av, newSViv ((*m)->h)); 926 av_push (av, newSViv ((*m)->h));
740 av_push (av, newSViv (rgb)); 927 av_push (av, newSViv (rgb));
741 av_push (av, newSViv (alpha)); 928 av_push (av, newSViv (alpha));
742 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 929 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
930 }
743 931
744 ++m; 932 ++m;
745 } 933 }
746} 934}
747 935
… …
767 955
768 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
769#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 957#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
770#include "glfunc.h" 958#include "glfunc.h"
771#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
772 } 963 }
773} 964}
774 OUTPUT: 965 OUTPUT:
775 RETVAL 966 RETVAL
776 967
… …
784SDL_GetAppState () 975SDL_GetAppState ()
785 976
786int 977int
787SDL_GetModState () 978SDL_GetModState ()
788 979
980int
981SDL_WaitEvent ()
982 C_ARGS: 0
983
789void 984void
985SDL_PumpEvents ()
986
987void
790poll_events () 988peep_events ()
791 PPCODE: 989 PPCODE:
792{ 990{
793 SDL_Event ev; 991 SDL_Event ev;
794 992
795 SDL_PumpEvents (); 993 SDL_PumpEvents ();
… …
802 { 1000 {
803 case SDL_KEYDOWN: 1001 case SDL_KEYDOWN:
804 case SDL_KEYUP: 1002 case SDL_KEYUP:
805 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1003 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
806 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1004 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
807 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1005 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
808 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1006 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
809 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1007 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
810 break; 1008 break;
811 1009
812 case SDL_ACTIVEEVENT: 1010 case SDL_ACTIVEEVENT:
813 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1011 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
831 x = ev.motion.x; 1029 x = ev.motion.x;
832 y = ev.motion.y; 1030 y = ev.motion.y;
833 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1031 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
834 } 1032 }
835 1033
836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1034 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
837 hv_store (hv, "state", 5, newSViv (state), 0); 1035 hv_store (hv, "state", 5, newSViv (state), 0);
838 hv_store (hv, "x", 1, newSViv (x), 0); 1036 hv_store (hv, "x", 1, newSViv (x), 0);
839 hv_store (hv, "y", 1, newSViv (y), 0); 1037 hv_store (hv, "y", 1, newSViv (y), 0);
840 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1038 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
841 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1039 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
861 1059
862 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1060 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
863 } 1061 }
864} 1062}
865 1063
1064char *
1065SDL_AudioDriverName ()
1066 CODE:
1067{
1068 char buf [256];
1069 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1070 XSRETURN_UNDEF;
1071
1072 RETVAL = buf;
1073}
1074 OUTPUT:
1075 RETVAL
1076
866int 1077int
867Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1078Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
868 POSTCALL: 1079 POSTCALL:
869 Mix_HookMusicFinished (music_finished); 1080 Mix_HookMusicFinished (music_finished);
870 Mix_ChannelFinished (channel_finished); 1081 Mix_ChannelFinished (channel_finished);
… …
932add_font (char *file) 1143add_font (char *file)
933 CODE: 1144 CODE:
934 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1145 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
935 OUTPUT: 1146 OUTPUT:
936 RETVAL 1147 RETVAL
1148
1149void
1150IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1151
1152void
1153Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_MP3 | MIX_INIT_OGG)
937 1154
938void 1155void
939load_image_inline (SV *image_) 1156load_image_inline (SV *image_)
940 ALIAS: 1157 ALIAS:
941 load_image_file = 1 1158 load_image_file = 1
… …
1057#if DEBUG 1274#if DEBUG
1058 VALGRIND_DO_LEAK_CHECK; 1275 VALGRIND_DO_LEAK_CHECK;
1059#endif 1276#endif
1060} 1277}
1061 1278
1279int
1280SvREFCNT (SV *sv)
1281 CODE:
1282 RETVAL = SvREFCNT (sv);
1283 OUTPUT:
1284 RETVAL
1285
1062MODULE = Deliantra::Client PACKAGE = DC::Font 1286MODULE = Deliantra::Client PACKAGE = DC::Font
1063 1287
1064PROTOTYPES: DISABLE 1288PROTOTYPES: DISABLE
1065 1289
1066DC::Font 1290DC::Font
… …
1495 if (ix) 1719 if (ix)
1496 { 1720 {
1497 glDisable (GL_ALPHA_TEST); 1721 glDisable (GL_ALPHA_TEST);
1498 glDisable (GL_BLEND); 1722 glDisable (GL_BLEND);
1499 } 1723 }
1724}
1725
1726void
1727draw_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)
1728 PROTOTYPE: @
1729 CODE:
1730{
1731 glEnable (GL_BLEND);
1732 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1733 glEnable (GL_TEXTURE_2D);
1734 glBindTexture (GL_TEXTURE_2D, name1);
1735
1736 glColor3f (intensity, intensity, intensity);
1737 glPushMatrix ();
1738 glScalef (1./3, 1./3, 1.);
1739
1740 if (blend > 0.f)
1741 {
1742 float dx3 = dx * -3.f / w;
1743 float dy3 = dy * -3.f / h;
1744 GLfloat env_color[4] = { 0., 0., 0., blend };
1745
1746 /* interpolate the two shadow textures */
1747 /* stage 0 == rgb(glcolor) + alpha(t0) */
1748 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1749
1750 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1751 gl.ActiveTexture (GL_TEXTURE1);
1752 glEnable (GL_TEXTURE_2D);
1753 glBindTexture (GL_TEXTURE_2D, name2);
1754 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1755
1756 /* rgb == rgb(glcolor) */
1757 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1758 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1760
1761 /* alpha = interpolate t0, t1 by env_alpha */
1762 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1763
1764 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1765 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1766 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1767
1768 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1769 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1770
1771 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1772 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1773
1774 glBegin (GL_QUADS);
1775 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1776 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1777 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1778 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1779 glEnd ();
1780
1781 glDisable (GL_TEXTURE_2D);
1782 gl.ActiveTexture (GL_TEXTURE0);
1783 }
1784 else
1785 {
1786 /* simple blending of one texture, also opengl <1.3 path */
1787 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1788
1789 glBegin (GL_QUADS);
1790 glTexCoord2f (0, 0); glVertex2f (0, 0);
1791 glTexCoord2f (0, t); glVertex2f (0, h);
1792 glTexCoord2f (s, t); glVertex2f (w, h);
1793 glTexCoord2f (s, 0); glVertex2f (w, 0);
1794 glEnd ();
1795 }
1796
1797 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1798 {
1799 int x, y;
1800 int dx3 = dx * 3;
1801 int dy3 = dy * 3;
1802
1803 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1804 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1805 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1806 glTranslatef (-1., -1., 0);
1807 glBegin (GL_QUADS);
1808
1809 for (y = 1; y < h; y += 3)
1810 {
1811 int y1 = y - dy3;
1812 int y1valid = y1 >= 0 && y1 < h;
1813
1814 for (x = 1; x < w; x += 3)
1815 {
1816 int x1 = x - dx3;
1817 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1818 uint8_t h2;
1819
1820 if (y1valid && x1 >= 0 && x1 < w)
1821 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1822 else
1823 h2 = 1; /* out of range == invisible */
1824
1825 if (h1 || h2)
1826 {
1827 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1828 glColor4f (1., 1., 1., alpha);
1829
1830 glTexCoord2f (0, 0.); glVertex2i (x , y );
1831 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1832 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1833 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1834 }
1835 }
1836 }
1837 }
1838
1839 glEnd ();
1840
1841 glPopMatrix ();
1842
1843 glDisable (GL_TEXTURE_2D);
1844 glDisable (GL_BLEND);
1500} 1845}
1501 1846
1502IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1847IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1503 CODE: 1848 CODE:
1504{ 1849{
… …
1610 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1955 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1611 // use uglier nearest interpolation because linear suffers 1956 // use uglier nearest interpolation because linear suffers
1612 // from transparent color bleeding and ugly wrapping effects. 1957 // from transparent color bleeding and ugly wrapping effects.
1613 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1958 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1614} 1959}
1960
1961void
1962expire_textures (DC::Map self, int texid, int count)
1963 PPCODE:
1964 for (; texid < self->texs && count; ++texid, --count)
1965 {
1966 maptex *tex = self->tex + texid;
1967
1968 if (tex->name)
1969 {
1970 if (tex->unused)
1971 {
1972 tex->name = 0;
1973 tex->unused = 0;
1974 XPUSHs (sv_2mortal (newSViv (texid)));
1975 }
1976 else
1977 tex->unused = 1;
1978 }
1979 }
1615 1980
1616int 1981int
1617ox (DC::Map self) 1982ox (DC::Map self)
1618 ALIAS: 1983 ALIAS:
1619 oy = 1 1984 oy = 1
… …
1700 { 2065 {
1701 ext = *data++; 2066 ext = *data++;
1702 cmd = ext & 0x7f; 2067 cmd = ext & 0x7f;
1703 2068
1704 if (cmd < 4) 2069 if (cmd < 4)
1705 cell->darkness = 255 - ext * 64 + 1; 2070 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1706 else if (cmd == 5) // health 2071 else if (cmd == 5) // health
1707 { 2072 {
1708 cell->stat_width = 1; 2073 cell->stat_width = 1;
1709 cell->stat_hp = *data++; 2074 cell->stat_hp = *data++;
1710 } 2075 }
… …
1740 cell->tile [z] = self->face2tile [face]; 2105 cell->tile [z] = self->face2tile [face];
1741 2106
1742 if (cell->tile [z]) 2107 if (cell->tile [z])
1743 { 2108 {
1744 maptex *tex = self->tex + cell->tile [z]; 2109 maptex *tex = self->tex + cell->tile [z];
2110 tex->unused = 0;
1745 if (!tex->name) 2111 if (!tex->name)
1746 av_push (missing, newSViv (cell->tile [z])); 2112 av_push (missing, newSViv (cell->tile [z]));
1747 2113
1748 if (tex->smoothtile) 2114 if (tex->smoothtile)
1749 { 2115 {
1750 maptex *smooth = self->tex + tex->smoothtile; 2116 maptex *smooth = self->tex + tex->smoothtile;
2117 smooth->unused = 0;
1751 if (!smooth->name) 2118 if (!smooth->name)
1752 av_push (missing, newSViv (tex->smoothtile)); 2119 av_push (missing, newSViv (tex->smoothtile));
1753 } 2120 }
1754 } 2121 }
1755 } 2122 }
1756 } 2123 }
1757 else 2124 else
1758 cell->darkness = 0; 2125 CELL_CLEAR (cell);
1759 } 2126 }
1760} 2127}
1761 OUTPUT: 2128 OUTPUT:
1762 RETVAL 2129 RETVAL
1763 2130
… …
1783 ? self->row + y 2150 ? self->row + y
1784 : 0; 2151 : 0;
1785 2152
1786 for (x = x0; x < x1; x++) 2153 for (x = x0; x < x1; x++)
1787 { 2154 {
1788 int r = 32, g = 32, b = 32, a = 192; 2155 unsigned int r = 32, g = 32, b = 32, a = 192;
1789 2156
1790 if (row && row->c0 <= x && x < row->c1) 2157 if (row && row->c0 <= x && x < row->c1)
1791 { 2158 {
1792 mapcell *cell = row->col + (x - row->c0); 2159 mapcell *cell = row->col + (x - row->c0);
1793 2160
… …
1795 { 2162 {
1796 maptex tex = self->tex [cell->tile [z]]; 2163 maptex tex = self->tex [cell->tile [z]];
1797 int a0 = 255 - tex.a; 2164 int a0 = 255 - tex.a;
1798 int a1 = tex.a; 2165 int a1 = tex.a;
1799 2166
1800 r = (r * a0 + tex.r * a1) / 255; 2167 r = div255 (r * a0 + tex.r * a1);
1801 g = (g * a0 + tex.g * a1) / 255; 2168 g = div255 (g * a0 + tex.g * a1);
1802 b = (b * a0 + tex.b * a1) / 255; 2169 b = div255 (b * a0 + tex.b * a1);
1803 a = (a * a0 + tex.a * a1) / 255; 2170 a = div255 (a * a0 + tex.a * a1);
1804 } 2171 }
1805 } 2172 }
1806 2173
1807 *map++ = (r ) 2174 *map++ = (r )
1808 | (g << 8) 2175 | (g << 8)
… …
1815} 2182}
1816 OUTPUT: 2183 OUTPUT:
1817 RETVAL 2184 RETVAL
1818 2185
1819void 2186void
1820draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2187draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1821 CODE: 2188 CODE:
1822{ 2189{
1823 int x, y, z; 2190 int x, y, z;
1824 2191
1825 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2192 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1826 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2193 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1827 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2194 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1828 smooth_key skey; 2195 smooth_key skey;
1829 int pl_x, pl_y; 2196 int pl_x, pl_y;
1830 maptex pl_tex; 2197 maptex pl_tex;
1831 rc_t *rc = rc_alloc (); 2198 rc_t *rc = rc_alloc ();
2199 rc_t *rc_ov = rc_alloc ();
1832 rc_key_t key; 2200 rc_key_t key;
1833 rc_array_t *arr; 2201 rc_array_t *arr;
1834 2202
1835 pl_tex.name = 0; 2203 pl_tex.name = 0;
1836 2204
1837 // thats current max. sorry. 2205 // that's current max. sorry.
1838 if (sw > 255) sw = 255; 2206 if (sw > 255) sw = 255;
1839 if (sh > 255) sh = 255; 2207 if (sh > 255) sh = 255;
1840 2208
1841 // clear key, in case of extra padding 2209 // clear key, in case of extra padding
1842 memset (&skey, 0, sizeof (skey)); 2210 memset (&skey, 0, sizeof (skey));
… …
1846 key.g = 255; 2214 key.g = 255;
1847 key.b = 255; 2215 key.b = 255;
1848 key.a = 255; 2216 key.a = 255;
1849 key.mode = GL_QUADS; 2217 key.mode = GL_QUADS;
1850 key.format = GL_T2F_V3F; 2218 key.format = GL_T2F_V3F;
1851 key.texname = -1;
1852 2219
1853 mx += self->x; 2220 mx += self->x;
1854 my += self->y; 2221 my += self->y;
1855 2222
1856 // first pass: determine smooth_max 2223 // first pass: determine smooth_max
… …
1880 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2247 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1881 2248
1882 for (z = 0; z <= 2; z++) 2249 for (z = 0; z <= 2; z++)
1883 { 2250 {
1884 memset (smooth_level, 0, sizeof (smooth_level)); 2251 memset (smooth_level, 0, sizeof (smooth_level));
2252 key.texname = -1;
1885 2253
1886 for (y = 0; y < sh; y++) 2254 for (y = 0; y < sh; y++)
1887 if (0 <= y + my && y + my < self->rows) 2255 if (0 <= y + my && y + my < self->rows)
1888 { 2256 {
1889 maprow *row = self->row + (y + my); 2257 maprow *row = self->row + (y + my);
… …
1895 tileid tile = cell->tile [z]; 2263 tileid tile = cell->tile [z];
1896 2264
1897 if (tile) 2265 if (tile)
1898 { 2266 {
1899 maptex tex = self->tex [tile]; 2267 maptex tex = self->tex [tile];
1900 int px = (x + 1) * T - tex.w; 2268 int px, py;
1901 int py = (y + 1) * T - tex.h;
1902 2269
1903 if (key.texname != tex.name) 2270 if (key.texname != tex.name)
1904 { 2271 {
2272 self->tex [tile].unused = 0;
2273
1905 if (!tex.name) 2274 if (!tex.name)
1906 tex = self->tex [2]; /* missing, replace by noface */ 2275 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1907 2276
1908 key.texname = tex.name; 2277 key.texname = tex.name;
1909 arr = rc_array (rc, &key); 2278 arr = rc_array (rc, &key);
1910 } 2279 }
2280
2281 px = (x + 1) * Th - tex.w;
2282 py = (y + 1) * Tw - tex.h;
1911 2283
1912 if (expect_false (cell->player == player) && expect_false (z == 2)) 2284 if (expect_false (cell->player == player) && expect_false (z == 2))
1913 { 2285 {
1914 pl_x = px; 2286 pl_x = px;
1915 pl_y = py; 2287 pl_y = py;
… …
1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2292 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1921 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2293 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1922 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2294 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1923 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2295 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1924 2296
1925 if (expect_false (cell->flags) && expect_false (z == 2))
1926 {
1927 // overlays such as the speech bubble, probably more to come
1928 if (cell->flags & 1)
1929 {
1930 maptex tex = self->tex [1];
1931 int px = x * T + T * 2 / 32;
1932 int py = y * T - T * 6 / 32;
1933
1934 if (tex.name)
1935 {
1936 if (key.texname != tex.name)
1937 {
1938 key.texname = tex.name;
1939 arr = rc_array (rc, &key);
1940 }
1941
1942 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1943 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1945 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1946 }
1947 }
1948 }
1949
1950 // update smooth hash 2297 // update smooth hash
1951 if (tex.smoothtile) 2298 if (tex.smoothtile)
1952 { 2299 {
1953 skey.tile = tex.smoothtile; 2300 skey.tile = tex.smoothtile;
1954 skey.level = tex.smoothlevel; 2301 skey.level = tex.smoothlevel;
… …
1982 // corners 2329 // corners
1983 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2330 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1984 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2331 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1985 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2332 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1986 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2333 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2334 }
2335 }
2336
2337 if (expect_false (z == 2) && expect_false (cell->flags))
2338 {
2339 // overlays such as the speech bubble, probably more to come
2340 if (cell->flags & 1)
2341 {
2342 rc_key_t key_ov = key;
2343 maptex tex = self->tex [TEXID_SPEECH];
2344 rc_array_t *arr;
2345 int px = x * Tw + Tw * 2 / 32;
2346 int py = y * Th - Th * 6 / 32;
2347
2348 key_ov.texname = tex.name;
2349 arr = rc_array (rc_ov, &key_ov);
2350
2351 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2352 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2353 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2354 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1987 } 2355 }
1988 } 2356 }
1989 } 2357 }
1990 } 2358 }
1991 2359
… …
2018 if (!(bits & 0x1000) 2386 if (!(bits & 0x1000)
2019 && skey->level == level 2387 && skey->level == level
2020 && level > smooth_max [skey->x][skey->y]) 2388 && level > smooth_max [skey->x][skey->y])
2021 { 2389 {
2022 maptex tex = self->tex [skey->tile]; 2390 maptex tex = self->tex [skey->tile];
2023 int px = (((int)skey->x) - 1) * T; 2391 int px = (((int)skey->x) - 1) * Tw;
2024 int py = (((int)skey->y) - 1) * T; 2392 int py = (((int)skey->y) - 1) * Th;
2025 int border = bits & 15; 2393 int border = bits & 15;
2026 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2394 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2027 float dx = tex.s * .0625f; // 16 images/row 2395 float dx = tex.s * .0625f; // 16 images/row
2028 float dy = tex.t * .5f ; // 2 images/column 2396 float dy = tex.t * .5f ; // 2 images/column
2029 2397
… …
2031 { 2399 {
2032 // this time avoiding texture state changes 2400 // this time avoiding texture state changes
2033 // save gobs of state changes. 2401 // save gobs of state changes.
2034 if (key.texname != tex.name) 2402 if (key.texname != tex.name)
2035 { 2403 {
2404 self->tex [skey->tile].unused = 0;
2405
2036 glEnd (); 2406 glEnd ();
2037 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2038 glBegin (GL_QUADS); 2408 glBegin (GL_QUADS);
2039 } 2409 }
2040 2410
2041 if (border) 2411 if (border)
2042 { 2412 {
2043 float ox = border * dx; 2413 float ox = border * dx;
2044 2414
2045 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2046 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2047 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2048 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2049 } 2419 }
2050 2420
2051 if (corner) 2421 if (corner)
2052 { 2422 {
2053 float ox = corner * dx; 2423 float ox = corner * dx;
2054 2424
2055 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2425 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2056 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2057 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2058 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2059 } 2429 }
2060 } 2430 }
2061 } 2431 }
2062 } 2432 }
2063 } 2433 }
… …
2072 } 2442 }
2073 2443
2074 if (pl_tex.name) 2444 if (pl_tex.name)
2075 { 2445 {
2076 maptex tex = pl_tex; 2446 maptex tex = pl_tex;
2077 int px = pl_x + pdx; 2447 int px = pl_x + sdx;
2078 int py = pl_y + pdy; 2448 int py = pl_y + sdy;
2079 2449
2080 key.texname = tex.name; 2450 key.texname = tex.name;
2081 arr = rc_array (rc, &key); 2451 arr = rc_array (rc, &key);
2082 2452
2083 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2453 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
… …
2086 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2456 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2087 2457
2088 rc_draw (rc); 2458 rc_draw (rc);
2089 } 2459 }
2090 2460
2461 rc_draw (rc_ov);
2462 rc_clear (rc_ov);
2463
2091 glDisable (GL_BLEND); 2464 glDisable (GL_BLEND);
2092 rc_free (rc); 2465 rc_free (rc);
2466 rc_free (rc_ov);
2093 2467
2094 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2095 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2096 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2097 { 2471 {
… …
2100 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
2101 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
2102 { 2476 {
2103 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2104 2478
2105 int px = x * T; 2479 int px = x * Tw;
2106 int py = y * T; 2480 int py = y * Th;
2481
2482 if (expect_false (cell->player == player))
2483 {
2484 px += sdx;
2485 py += sdy;
2486 }
2107 2487
2108 if (cell->stat_hp) 2488 if (cell->stat_hp)
2109 { 2489 {
2110 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
2111 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2112 2492
2113 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
2114 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
2115 px + width - 1, py); 2495 px + width - 1, py);
2116 2496
… …
2122 } 2502 }
2123 } 2503 }
2124} 2504}
2125 2505
2126void 2506void
2127draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2507draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2128 CODE: 2508 CODE:
2129{ 2509{
2130 static float color[16][3] = { 2510 static float color[16][3] = {
2131 { 0.00F, 0.00F, 0.00F }, 2511 { 0.00f, 0.00f, 0.00f },
2132 { 1.00F, 1.00F, 1.00F }, 2512 { 1.00f, 1.00f, 1.00f },
2133 { 0.00F, 0.00F, 0.55F }, 2513 { 0.00f, 0.00f, 0.55f },
2134 { 1.00F, 0.00F, 0.00F }, 2514 { 1.00f, 0.00f, 0.00f },
2135 2515
2136 { 1.00F, 0.54F, 0.00F }, 2516 { 1.00f, 0.54f, 0.00f },
2137 { 0.11F, 0.56F, 1.00F }, 2517 { 0.11f, 0.56f, 1.00f },
2138 { 0.93F, 0.46F, 0.00F }, 2518 { 0.93f, 0.46f, 0.00f },
2139 { 0.18F, 0.54F, 0.34F }, 2519 { 0.18f, 0.54f, 0.34f },
2140 2520
2141 { 0.56F, 0.73F, 0.56F }, 2521 { 0.56f, 0.73f, 0.56f },
2142 { 0.80F, 0.80F, 0.80F }, 2522 { 0.80f, 0.80f, 0.80f },
2143 { 0.55F, 0.41F, 0.13F }, 2523 { 0.55f, 0.41f, 0.13f },
2144 { 0.99F, 0.77F, 0.26F }, 2524 { 0.99f, 0.77f, 0.26f },
2145 2525
2146 { 0.74F, 0.65F, 0.41F }, 2526 { 0.74f, 0.65f, 0.41f },
2147 2527
2148 { 0.00F, 1.00F, 1.00F }, 2528 { 0.00f, 1.00f, 1.00f },
2149 { 1.00F, 0.00F, 1.00F }, 2529 { 1.00f, 0.00f, 1.00f },
2150 { 1.00F, 1.00F, 0.00F }, 2530 { 1.00f, 1.00f, 0.00f },
2151 }; 2531 };
2152 2532
2153 int x, y; 2533 int x, y;
2154 2534
2155 glEnable (GL_TEXTURE_2D); 2535 glEnable (GL_TEXTURE_2D);
2536 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2537 * but the nvidia driver (185.18.14) mishandles alpha textures
2538 * and takes the colour from god knows where instead of using
2539 * Cp. MODULATE results in the same colour, but slightly different
2540 * alpha, but atcually gives us the correct colour with nvidia.
2541 */
2156 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2542 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2157 glEnable (GL_BLEND); 2543 glEnable (GL_BLEND);
2158 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2544 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2159 glBegin (GL_QUADS); 2545 glBegin (GL_QUADS);
2160 2546
2161 for (y = 0; y < h; y++) 2547 for (y = 0; y < h; y++)
… …
2165 2551
2166 if (m) 2552 if (m)
2167 { 2553 {
2168 float *c = color [m & 15]; 2554 float *c = color [m & 15];
2169 2555
2170 float tx1 = m & 0x40 ? 0.5 : 0.; 2556 float tx1 = m & 0x40 ? 0.5f : 0.f;
2171 float tx2 = tx1 + 0.5; 2557 float tx2 = tx1 + 0.5f;
2172 2558
2173 glColor4f (c[0], c[1], c[2], 0.75); 2559 glColor4f (c[0], c[1], c[2], 1);
2174 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2560 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2175 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2561 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2176 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2562 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2177 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2563 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2178 } 2564 }
… …
2186void 2572void
2187fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2573fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2188 PPCODE: 2574 PPCODE:
2189{ 2575{
2190 int x, y; 2576 int x, y;
2191 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2192 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2193 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2194 int sw34 = (sw * 3 + 3) & ~3; 2580 int sw3 = sw * 3;
2581 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2582 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2195 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2196 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2584 memset (darkness1, 0, sw1*sh1);
2197 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2198 2585
2199 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2200 SvCUR_set (darkness3_sv, sw34 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2201 2588
2202 mx += self->x - 1; 2589 mx += self->x - 1;
2203 my += self->y - 1; 2590 my += self->y - 1;
2204
2205 memset (darkness1, 255, sw1 * sh1);
2206 2591
2207 for (y = 0; y < sh1; y++) 2592 for (y = 0; y < sh1; y++)
2208 if (0 <= y + my && y + my < self->rows) 2593 if (0 <= y + my && y + my < self->rows)
2209 { 2594 {
2210 maprow *row = self->row + (y + my); 2595 maprow *row = self->row + (y + my);
… …
2213 if (row->c0 <= x + mx && x + mx < row->c1) 2598 if (row->c0 <= x + mx && x + mx < row->c1)
2214 { 2599 {
2215 mapcell *cell = row->col + (x + mx - row->c0); 2600 mapcell *cell = row->col + (x + mx - row->c0);
2216 2601
2217 darkness1 [y * sw1 + x] = cell->darkness 2602 darkness1 [y * sw1 + x] = cell->darkness
2218 ? 255 - (cell->darkness - 1) 2603 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2219 : 255 - FOW_DARKNESS; 2604 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2220 } 2605 }
2221 } 2606 }
2222 2607
2223 for (y = 0; y < sh; ++y) 2608 for (y = 0; y < sh; ++y)
2224 for (x = 0; x < sw; ++x) 2609 for (x = 0; x < sw; ++x)
… …
2243 2628
2244 uint8_t r13 = (d13 + d23 + d12) / 3; 2629 uint8_t r13 = (d13 + d23 + d12) / 3;
2245 uint8_t r23 = d23; 2630 uint8_t r23 = d23;
2246 uint8_t r33 = (d23 + d33 + d32) / 3; 2631 uint8_t r33 = (d23 + d33 + d32) / 3;
2247 2632
2248 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2633 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2249 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2250 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2251 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2636 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2252 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2637 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2253 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2254 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2639 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2255 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2256 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2257 } 2642 }
2258 2643
2259 free (darkness1); 2644 free (darkness1);
2260 2645
2261 EXTEND (SP, 3); 2646 EXTEND (SP, 3);
2262 PUSHs (sv_2mortal (newSViv (sw34))); 2647 PUSHs (sv_2mortal (newSViv (sw3)));
2263 PUSHs (sv_2mortal (newSViv (sh3))); 2648 PUSHs (sv_2mortal (newSViv (sh3)));
2264 PUSHs (darkness3_sv); 2649 PUSHs (darkness3_sv);
2265} 2650}
2266 2651
2267SV * 2652SV *
… …
2465 if (RETVAL < 0) 2850 if (RETVAL < 0)
2466 { 2851 {
2467 RETVAL = Mix_GroupOldest (-1); 2852 RETVAL = Mix_GroupOldest (-1);
2468 2853
2469 if (RETVAL < 0) 2854 if (RETVAL < 0)
2855 {
2856 // happens sometimes, maybe it just stopped playing(?)
2857 RETVAL = Mix_GroupAvailable (-1);
2858
2859 if (RETVAL < 0)
2470 XSRETURN_UNDEF; 2860 XSRETURN_UNDEF;
2471 2861 }
2862 else
2472 Mix_HaltChannel (RETVAL); 2863 Mix_HaltChannel (RETVAL);
2473 } 2864 }
2474 2865
2475 Mix_UnregisterAllEffects (RETVAL); 2866 Mix_UnregisterAllEffects (RETVAL);
2476 Mix_Volume (RETVAL, 128); 2867 Mix_Volume (RETVAL, 128);
2477} 2868}
… …
2524void 2915void
2525set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2916set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2526 CODE: 2917 CODE:
2527{ 2918{
2528 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2919 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2529 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2920 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2530 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2921 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2531} 2922}
2532 2923
2533void 2924void
2534set_reverse_stereo (DC::Channel self, int flip) 2925set_reverse_stereo (DC::Channel self, int flip)
… …
2536 Mix_SetReverseStereo (self, flip); 2927 Mix_SetReverseStereo (self, flip);
2537 2928
2538MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2539 2930
2540PROTOTYPES: DISABLE 2931PROTOTYPES: DISABLE
2932
2933void
2934decoders ()
2935 PPCODE:
2936#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2937 int i, num = Mix_GetNumChunkDecoders ();
2938 EXTEND (SP, num);
2939 for (i = 0; i < num; ++i)
2940 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2941#else
2942 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2943#endif
2541 2944
2542DC::MixChunk 2945DC::MixChunk
2543new (SV *class, DC::RW rwops) 2946new (SV *class, DC::RW rwops)
2544 CODE: 2947 CODE:
2545 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
… …
2578 OUTPUT: 2981 OUTPUT:
2579 RETVAL 2982 RETVAL
2580 2983
2581MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2984MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2582 2985
2986void
2987decoders ()
2988 PPCODE:
2989#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2990 int i, num = Mix_GetNumMusicDecoders ();
2991 EXTEND (SP, num);
2992 for (i = 0; i < num; ++i)
2993 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2994#else
2995 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2996#endif
2997
2583int 2998int
2584volume (int volume = -1) 2999volume (int volume = -1)
2585 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2586 CODE: 3001 CODE:
2587 if (items > 0) 3002 if (items > 0)
… …
2597 3012
2598void 3013void
2599halt () 3014halt ()
2600 CODE: 3015 CODE:
2601 Mix_HaltMusic (); 3016 Mix_HaltMusic ();
3017
3018int
3019playing ()
3020 CODE:
3021 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT:
3023 RETVAL
2602 3024
2603DC::MixMusic 3025DC::MixMusic
2604new (SV *class, DC::RW rwops) 3026new (SV *class, DC::RW rwops)
2605 CODE: 3027 CODE:
2606 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
… …
2637 } *civ, const_iv[] = { 3059 } *civ, const_iv[] = {
2638# define const_iv(name) { # name, (IV)name } 3060# define const_iv(name) { # name, (IV)name }
2639 const_iv (GL_VENDOR), 3061 const_iv (GL_VENDOR),
2640 const_iv (GL_VERSION), 3062 const_iv (GL_VERSION),
2641 const_iv (GL_EXTENSIONS), 3063 const_iv (GL_EXTENSIONS),
3064 const_iv (GL_MAX_TEXTURE_UNITS),
2642 const_iv (GL_COLOR_MATERIAL), 3065 const_iv (GL_COLOR_MATERIAL),
2643 const_iv (GL_SMOOTH), 3066 const_iv (GL_SMOOTH),
2644 const_iv (GL_FLAT), 3067 const_iv (GL_FLAT),
2645 const_iv (GL_DITHER), 3068 const_iv (GL_DITHER),
2646 const_iv (GL_BLEND), 3069 const_iv (GL_BLEND),
… …
2658 const_iv (GL_ZERO), 3081 const_iv (GL_ZERO),
2659 const_iv (GL_SRC_ALPHA), 3082 const_iv (GL_SRC_ALPHA),
2660 const_iv (GL_DST_ALPHA), 3083 const_iv (GL_DST_ALPHA),
2661 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3084 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2662 const_iv (GL_ONE_MINUS_DST_ALPHA), 3085 const_iv (GL_ONE_MINUS_DST_ALPHA),
3086 const_iv (GL_SRC_COLOR),
3087 const_iv (GL_DST_COLOR),
3088 const_iv (GL_ONE_MINUS_SRC_COLOR),
3089 const_iv (GL_ONE_MINUS_DST_COLOR),
2663 const_iv (GL_SRC_ALPHA_SATURATE), 3090 const_iv (GL_SRC_ALPHA_SATURATE),
2664 const_iv (GL_RGB), 3091 const_iv (GL_RGB),
2665 const_iv (GL_RGBA), 3092 const_iv (GL_RGBA),
2666 const_iv (GL_RGBA4), 3093 const_iv (GL_RGBA4),
2667 const_iv (GL_RGBA8), 3094 const_iv (GL_RGBA8),
… …
2735 const_iv (GL_NICEST), 3162 const_iv (GL_NICEST),
2736 const_iv (GL_V2F), 3163 const_iv (GL_V2F),
2737 const_iv (GL_V3F), 3164 const_iv (GL_V3F),
2738 const_iv (GL_T2F_V3F), 3165 const_iv (GL_T2F_V3F),
2739 const_iv (GL_T2F_N3F_V3F), 3166 const_iv (GL_T2F_N3F_V3F),
3167 const_iv (GL_FUNC_ADD),
3168 const_iv (GL_FUNC_SUBTRACT),
3169 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2740# undef const_iv 3170# undef const_iv
2741 }; 3171 };
2742 3172
2743 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3173 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2744 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2745 3175
2746 texture_av = newAV (); 3176 texture_av = newAV ();
2747 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
2748} 3178}
2749 3179
2750void 3180void
2751disable_GL_EXT_blend_func_separate () 3181disable_GL_EXT_blend_func_separate ()
2752 CODE: 3182 CODE:
2753 gl.BlendFuncSeparate = 0; 3183 gl.BlendFuncSeparate = 0;
2754 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
3185
3186void
3187apple_nvidia_bug (int enable)
2755 3188
2756char * 3189char *
2757gl_vendor () 3190gl_vendor ()
2758 CODE: 3191 CODE:
2759 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (char *)glGetString (GL_VENDOR);
… …
2790 3223
2791int glGetError () 3224int glGetError ()
2792 3225
2793void glFinish () 3226void glFinish ()
2794 3227
3228void glFlush ()
3229
2795void glClear (int mask) 3230void glClear (int mask)
2796 3231
2797void glClearColor (float r, float g, float b, float a = 1.0) 3232void glClearColor (float r, float g, float b, float a = 1.0)
2798 PROTOTYPE: @ 3233 PROTOTYPE: @
2799 3234
… …
2808void glBlendFunc (int sfactor, int dfactor) 3243void glBlendFunc (int sfactor, int dfactor)
2809 3244
2810void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3245void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2811 CODE: 3246 CODE:
2812 gl_BlendFuncSeparate (sa, da, saa, daa); 3247 gl_BlendFuncSeparate (sa, da, saa, daa);
3248
3249# void glBlendEquation (int se)
2813 3250
2814void glDepthMask (int flag) 3251void glDepthMask (int flag)
2815 3252
2816void glLogicOp (int opcode) 3253void glLogicOp (int opcode)
2817 3254
… …
2852void glRotate (float angle, float x, float y, float z) 3289void glRotate (float angle, float x, float y, float z)
2853 CODE: 3290 CODE:
2854 glRotatef (angle, x, y, z); 3291 glRotatef (angle, x, y, z);
2855 3292
2856void glColor (float r, float g, float b, float a = 1.0) 3293void glColor (float r, float g, float b, float a = 1.0)
3294 PROTOTYPE: @
2857 ALIAS: 3295 ALIAS:
2858 glColor_premultiply = 1 3296 glColor_premultiply = 1
2859 CODE: 3297 CODE:
2860 if (ix) 3298 if (ix)
2861 { 3299 {
… …
2966void glNewList (int list, int mode = GL_COMPILE) 3404void glNewList (int list, int mode = GL_COMPILE)
2967 3405
2968void glEndList () 3406void glEndList ()
2969 3407
2970void glCallList (int list) 3408void glCallList (int list)
3409
3410void c_init ()
3411 CODE:
3412 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3413 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2971 3414
2972MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3415MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2973 3416
2974PROTOTYPES: DISABLE 3417PROTOTYPES: DISABLE
2975 3418

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines