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.258 by root, Thu Apr 10 14:35:50 2008 UTC vs.
Revision 1.307 by root, Thu Oct 14 03:44:18 2010 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>
… …
65# include <netinet/in.h> 71# include <netinet/in.h>
66# include <netinet/tcp.h> 72# include <netinet/tcp.h>
67# include <inttypes.h> 73# include <inttypes.h>
68#endif 74#endif
69 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 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 */
72#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
73 91
74#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
75#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
76 94
77#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
78 96
79/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81 99
82#if 0 100#define KMOD_LRAM 0x10000 // our extension
83# define PARACHUTE SDL_INIT_NOPARACHUTE 101
84#else 102#define TEXID_SPEECH 1
85# define PARACHUTE 0 103#define TEXID_NOFACE 2
86#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}
87 123
88static AV *texture_av; 124static AV *texture_av;
89 125
90static struct 126static struct
91{ 127{
… …
223 int w, h; 259 int w, h;
224 float s, t; 260 float s, t;
225 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
226 tileid smoothtile; 262 tileid smoothtile;
227 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
228} maptex; 265} maptex;
229 266
230typedef struct { 267typedef struct {
231 uint32_t player; 268 uint32_t player;
232 tileid tile[3]; 269 tileid tile[3];
… …
364 self->oy = 0; 401 self->oy = 0;
365 self->row = 0; 402 self->row = 0;
366 self->rows = 0; 403 self->rows = 0;
367} 404}
368 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
369static void 416static void
370map_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)
371{ 418{
372 int x, y; 419 int x, y;
373 maprow *row; 420 maprow *row;
… …
387 if (x >= row->c1) 434 if (x >= row->c1)
388 break; 435 break;
389 436
390 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
391 438
392 cell->darkness = 0; 439 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 440 }
397 } 441 }
398} 442}
399 443
400typedef struct { 444typedef struct {
… …
435 ev.code = 1; 479 ev.code = 1;
436 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
437 ev.data2 = 0; 481 ev.data2 = 0;
438 482
439 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;
440} 490}
441 491
442static unsigned int 492static unsigned int
443minpot (unsigned int n) 493minpot (unsigned int n)
444{ 494{
… …
511 if (!svp || !SvTRUE (*svp)) 561 if (!svp || !SvTRUE (*svp))
512 return 0; 562 return 0;
513 563
514 return 1; 564 return 1;
515} 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 ("::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 share dlibrary 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
516 618
517MODULE = Deliantra::Client PACKAGE = DC 619MODULE = Deliantra::Client PACKAGE = DC
518 620
519PROTOTYPES: ENABLE 621PROTOTYPES: ENABLE
520 622
… …
549 const_iv (SDL_USEREVENT), 651 const_iv (SDL_USEREVENT),
550 652
551 const_iv (SDL_APPINPUTFOCUS), 653 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 654 const_iv (SDL_APPMOUSEFOCUS),
553 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),
554 706
555 const_iv (SDLK_FIRST), 707 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 708 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 709 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 710 const_iv (SDLK_KP1),
… …
634 const_iv (KMOD_RMETA), 786 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 787 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 788 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 789 const_iv (KMOD_MODE),
638 790
791 const_iv (KMOD_LRAM),
792
639 const_iv (MIX_DEFAULT_FORMAT), 793 const_iv (MIX_DEFAULT_FORMAT),
794
795 const_iv (SDL_INIT_TIMER),
796 const_iv (SDL_INIT_AUDIO),
797 const_iv (SDL_INIT_VIDEO),
798 const_iv (SDL_INIT_CDROM),
799 const_iv (SDL_INIT_JOYSTICK),
800 const_iv (SDL_INIT_EVERYTHING),
801 const_iv (SDL_INIT_NOPARACHUTE),
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)
640# undef const_iv 823# undef const_iv
641 }; 824 };
642 825
643 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; )
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
665NV ceil (NV x) 848NV ceil (NV x)
666 849
667IV minpot (UV n) 850IV minpot (UV n)
668 851
669IV 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
670 859
671void 860void
672pango_init () 861pango_init ()
673 CODE: 862 CODE:
674{ 863{
… …
680 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 869 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 870 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif 871#endif
683} 872}
684 873
685char *
686SDL_GetError () 874char *SDL_GetError ()
687 875
688int 876void SDL_braino ()
689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
690 877
691void 878int SDL_Init (U32 flags)
879
880int SDL_InitSubSystem (U32 flags)
881
882void SDL_QuitSubSystem (U32 flags)
883
692SDL_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
693 894
694void 895void
695SDL_ListModes (int rgb, int alpha) 896SDL_ListModes (int rgb, int alpha)
696 PPCODE: 897 PPCODE:
697{ 898{
… …
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 910 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 911 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 912 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712 913
713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 914 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
714#if SDL_VERSION_ATLEAST(1,2,10)
715 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
716 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 915 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717#endif
718 916
719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 917 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
720 918
721 if (m && m != (SDL_Rect **)-1) 919 if (m && m != (SDL_Rect **)-1)
722 while (*m) 920 while (*m)
723 { 921 {
724 if ((*m)->w >= 800 && (*m)->h >= 480) 922 if ((*m)->w >= 400 && (*m)->h >= 300)
725 { 923 {
726 AV *av = newAV (); 924 AV *av = newAV ();
727 av_push (av, newSViv ((*m)->w)); 925 av_push (av, newSViv ((*m)->w));
728 av_push (av, newSViv ((*m)->h)); 926 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb)); 927 av_push (av, newSViv (rgb));
… …
757 955
758 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
759#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);
760#include "glfunc.h" 958#include "glfunc.h"
761#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
762 } 963 }
763} 964}
764 OUTPUT: 965 OUTPUT:
765 RETVAL 966 RETVAL
766 967
… …
792 { 993 {
793 case SDL_KEYDOWN: 994 case SDL_KEYDOWN:
794 case SDL_KEYUP: 995 case SDL_KEYUP:
795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 996 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 997 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
797 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 998 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
798 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 999 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
799 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1000 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
800 break; 1001 break;
801 1002
802 case SDL_ACTIVEEVENT: 1003 case SDL_ACTIVEEVENT:
803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1004 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
821 x = ev.motion.x; 1022 x = ev.motion.x;
822 y = ev.motion.y; 1023 y = ev.motion.y;
823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1024 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
824 } 1025 }
825 1026
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1027 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
827 hv_store (hv, "state", 5, newSViv (state), 0); 1028 hv_store (hv, "state", 5, newSViv (state), 0);
828 hv_store (hv, "x", 1, newSViv (x), 0); 1029 hv_store (hv, "x", 1, newSViv (x), 0);
829 hv_store (hv, "y", 1, newSViv (y), 0); 1030 hv_store (hv, "y", 1, newSViv (y), 0);
830 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1031 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
831 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1032 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
851 1052
852 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1053 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
853 } 1054 }
854} 1055}
855 1056
1057char *
1058SDL_AudioDriverName ()
1059 CODE:
1060{
1061 char buf [256];
1062 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1063 XSRETURN_UNDEF;
1064
1065 RETVAL = buf;
1066}
1067 OUTPUT:
1068 RETVAL
1069
856int 1070int
857Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1071Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
858 POSTCALL: 1072 POSTCALL:
859 Mix_HookMusicFinished (music_finished); 1073 Mix_HookMusicFinished (music_finished);
860 Mix_ChannelFinished (channel_finished); 1074 Mix_ChannelFinished (channel_finished);
… …
922add_font (char *file) 1136add_font (char *file)
923 CODE: 1137 CODE:
924 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1138 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
925 OUTPUT: 1139 OUTPUT:
926 RETVAL 1140 RETVAL
1141
1142void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
927 1144
928void 1145void
929load_image_inline (SV *image_) 1146load_image_inline (SV *image_)
930 ALIAS: 1147 ALIAS:
931 load_image_file = 1 1148 load_image_file = 1
… …
1047#if DEBUG 1264#if DEBUG
1048 VALGRIND_DO_LEAK_CHECK; 1265 VALGRIND_DO_LEAK_CHECK;
1049#endif 1266#endif
1050} 1267}
1051 1268
1269int
1270SvREFCNT (SV *sv)
1271 CODE:
1272 RETVAL = SvREFCNT (sv);
1273 OUTPUT:
1274 RETVAL
1275
1052MODULE = Deliantra::Client PACKAGE = DC::Font 1276MODULE = Deliantra::Client PACKAGE = DC::Font
1053 1277
1054PROTOTYPES: DISABLE 1278PROTOTYPES: DISABLE
1055 1279
1056DC::Font 1280DC::Font
… …
1485 if (ix) 1709 if (ix)
1486 { 1710 {
1487 glDisable (GL_ALPHA_TEST); 1711 glDisable (GL_ALPHA_TEST);
1488 glDisable (GL_BLEND); 1712 glDisable (GL_BLEND);
1489 } 1713 }
1714}
1715
1716void
1717draw_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)
1718 PROTOTYPE: @
1719 CODE:
1720{
1721 glEnable (GL_BLEND);
1722 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1723 glEnable (GL_TEXTURE_2D);
1724 glBindTexture (GL_TEXTURE_2D, name1);
1725
1726 glColor3f (intensity, intensity, intensity);
1727 glPushMatrix ();
1728 glScalef (1./3, 1./3, 1.);
1729
1730 if (blend > 0.f)
1731 {
1732 float dx3 = dx * -3.f / w;
1733 float dy3 = dy * -3.f / h;
1734 GLfloat env_color[4] = { 0., 0., 0., blend };
1735
1736 /* interpolate the two shadow textures */
1737 /* stage 0 == rgb(glcolor) + alpha(t0) */
1738 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1739
1740 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1741 gl.ActiveTexture (GL_TEXTURE1);
1742 glEnable (GL_TEXTURE_2D);
1743 glBindTexture (GL_TEXTURE_2D, name2);
1744 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1745
1746 /* rgb == rgb(glcolor) */
1747 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1748 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1749 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1750
1751 /* alpha = interpolate t0, t1 by env_alpha */
1752 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1753
1754 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1755 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1756 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1757
1758 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1760
1761 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1763
1764 glBegin (GL_QUADS);
1765 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1766 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1767 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1768 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1769 glEnd ();
1770
1771 glDisable (GL_TEXTURE_2D);
1772 gl.ActiveTexture (GL_TEXTURE0);
1773 }
1774 else
1775 {
1776 /* simple blending of one texture, also opengl <1.3 path */
1777 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1778
1779 glBegin (GL_QUADS);
1780 glTexCoord2f (0, 0); glVertex2f (0, 0);
1781 glTexCoord2f (0, t); glVertex2f (0, h);
1782 glTexCoord2f (s, t); glVertex2f (w, h);
1783 glTexCoord2f (s, 0); glVertex2f (w, 0);
1784 glEnd ();
1785 }
1786
1787 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1788 {
1789 int x, y;
1790 int dx3 = dx * 3;
1791 int dy3 = dy * 3;
1792
1793 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1794 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1795 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1796 glTranslatef (-1., -1., 0);
1797 glBegin (GL_QUADS);
1798
1799 for (y = 1; y < h; y += 3)
1800 {
1801 int y1 = y - dy3;
1802 int y1valid = y1 >= 0 && y1 < h;
1803
1804 for (x = 1; x < w; x += 3)
1805 {
1806 int x1 = x - dx3;
1807 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1808 uint8_t h2;
1809
1810 if (y1valid && x1 >= 0 && x1 < w)
1811 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1812 else
1813 h2 = 1; /* out of range == invisible */
1814
1815 if (h1 || h2)
1816 {
1817 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1818 glColor4f (1., 1., 1., alpha);
1819
1820 glTexCoord2f (0, 0.); glVertex2i (x , y );
1821 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1822 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1823 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1824 }
1825 }
1826 }
1827 }
1828
1829 glEnd ();
1830
1831 glPopMatrix ();
1832
1833 glDisable (GL_TEXTURE_2D);
1834 glDisable (GL_BLEND);
1490} 1835}
1491 1836
1492IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1837IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1493 CODE: 1838 CODE:
1494{ 1839{
… …
1600 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1945 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1601 // use uglier nearest interpolation because linear suffers 1946 // use uglier nearest interpolation because linear suffers
1602 // from transparent color bleeding and ugly wrapping effects. 1947 // from transparent color bleeding and ugly wrapping effects.
1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1948 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1604} 1949}
1950
1951void
1952expire_textures (DC::Map self, int texid, int count)
1953 PPCODE:
1954 for (; texid < self->texs && count; ++texid, --count)
1955 {
1956 maptex *tex = self->tex + texid;
1957
1958 if (tex->name)
1959 {
1960 if (tex->unused)
1961 {
1962 tex->name = 0;
1963 tex->unused = 0;
1964 XPUSHs (sv_2mortal (newSViv (texid)));
1965 }
1966 else
1967 tex->unused = 1;
1968 }
1969 }
1605 1970
1606int 1971int
1607ox (DC::Map self) 1972ox (DC::Map self)
1608 ALIAS: 1973 ALIAS:
1609 oy = 1 1974 oy = 1
… …
1687 uint8_t ext, cmd; 2052 uint8_t ext, cmd;
1688 2053
1689 do 2054 do
1690 { 2055 {
1691 ext = *data++; 2056 ext = *data++;
1692 cmd = ext & 0x3f; 2057 cmd = ext & 0x7f;
1693 2058
1694 if (cmd < 4) 2059 if (cmd < 4)
1695 cell->darkness = 255 - ext * 64 + 1; 2060 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1696 else if (cmd == 5) // health 2061 else if (cmd == 5) // health
1697 { 2062 {
1698 cell->stat_width = 1; 2063 cell->stat_width = 1;
1699 cell->stat_hp = *data++; 2064 cell->stat_hp = *data++;
1700 } 2065 }
1701 else if (cmd == 6) // monster width 2066 else if (cmd == 6) // monster width
1702 cell->stat_width = *data++ + 1; 2067 cell->stat_width = *data++ + 1;
1703 else if (cmd == 0x47) 2068 else if (cmd == 0x47)
1704 { 2069 {
1705 if (*data == 4) 2070 if (*data == 1) cell->player = data [1];
1706 ; // decode player count 2071 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2072 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2073 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1707 2074
1708 data += *data + 1; 2075 data += *data + 1;
1709 } 2076 }
1710 else if (cmd == 8) // cell flags 2077 else if (cmd == 8) // cell flags
1711 cell->flags = *data++; 2078 cell->flags = *data++;
… …
1728 cell->tile [z] = self->face2tile [face]; 2095 cell->tile [z] = self->face2tile [face];
1729 2096
1730 if (cell->tile [z]) 2097 if (cell->tile [z])
1731 { 2098 {
1732 maptex *tex = self->tex + cell->tile [z]; 2099 maptex *tex = self->tex + cell->tile [z];
2100 tex->unused = 0;
1733 if (!tex->name) 2101 if (!tex->name)
1734 av_push (missing, newSViv (cell->tile [z])); 2102 av_push (missing, newSViv (cell->tile [z]));
1735 2103
1736 if (tex->smoothtile) 2104 if (tex->smoothtile)
1737 { 2105 {
1738 maptex *smooth = self->tex + tex->smoothtile; 2106 maptex *smooth = self->tex + tex->smoothtile;
2107 smooth->unused = 0;
1739 if (!smooth->name) 2108 if (!smooth->name)
1740 av_push (missing, newSViv (tex->smoothtile)); 2109 av_push (missing, newSViv (tex->smoothtile));
1741 } 2110 }
1742 } 2111 }
1743 } 2112 }
1744 } 2113 }
1745 else 2114 else
1746 cell->darkness = 0; 2115 CELL_CLEAR (cell);
1747 } 2116 }
1748} 2117}
1749 OUTPUT: 2118 OUTPUT:
1750 RETVAL 2119 RETVAL
1751 2120
… …
1771 ? self->row + y 2140 ? self->row + y
1772 : 0; 2141 : 0;
1773 2142
1774 for (x = x0; x < x1; x++) 2143 for (x = x0; x < x1; x++)
1775 { 2144 {
1776 int r = 32, g = 32, b = 32, a = 192; 2145 unsigned int r = 32, g = 32, b = 32, a = 192;
1777 2146
1778 if (row && row->c0 <= x && x < row->c1) 2147 if (row && row->c0 <= x && x < row->c1)
1779 { 2148 {
1780 mapcell *cell = row->col + (x - row->c0); 2149 mapcell *cell = row->col + (x - row->c0);
1781 2150
… …
1783 { 2152 {
1784 maptex tex = self->tex [cell->tile [z]]; 2153 maptex tex = self->tex [cell->tile [z]];
1785 int a0 = 255 - tex.a; 2154 int a0 = 255 - tex.a;
1786 int a1 = tex.a; 2155 int a1 = tex.a;
1787 2156
1788 r = (r * a0 + tex.r * a1) / 255; 2157 r = div255 (r * a0 + tex.r * a1);
1789 g = (g * a0 + tex.g * a1) / 255; 2158 g = div255 (g * a0 + tex.g * a1);
1790 b = (b * a0 + tex.b * a1) / 255; 2159 b = div255 (b * a0 + tex.b * a1);
1791 a = (a * a0 + tex.a * a1) / 255; 2160 a = div255 (a * a0 + tex.a * a1);
1792 } 2161 }
1793 } 2162 }
1794 2163
1795 *map++ = (r ) 2164 *map++ = (r )
1796 | (g << 8) 2165 | (g << 8)
… …
1803} 2172}
1804 OUTPUT: 2173 OUTPUT:
1805 RETVAL 2174 RETVAL
1806 2175
1807void 2176void
1808draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2177draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1809 CODE: 2178 CODE:
1810{ 2179{
1811 int x, y, z; 2180 int x, y, z;
1812 2181
1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2182 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2183 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1815 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2184 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1816 smooth_key skey; 2185 smooth_key skey;
1817 2186 int pl_x, pl_y;
2187 maptex pl_tex;
1818 rc_t *rc = rc_alloc (); 2188 rc_t *rc = rc_alloc ();
2189 rc_t *rc_ov = rc_alloc ();
1819 rc_key_t key; 2190 rc_key_t key;
1820 rc_array_t *arr; 2191 rc_array_t *arr;
1821 2192
2193 pl_tex.name = 0;
2194
1822 // thats current max. sorry. 2195 // that's current max. sorry.
1823 if (sw > 255) sw = 255; 2196 if (sw > 255) sw = 255;
1824 if (sh > 255) sh = 255; 2197 if (sh > 255) sh = 255;
1825 2198
1826 // clear key, in case of extra padding 2199 // clear key, in case of extra padding
1827 memset (&skey, 0, sizeof (skey)); 2200 memset (&skey, 0, sizeof (skey));
… …
1831 key.g = 255; 2204 key.g = 255;
1832 key.b = 255; 2205 key.b = 255;
1833 key.a = 255; 2206 key.a = 255;
1834 key.mode = GL_QUADS; 2207 key.mode = GL_QUADS;
1835 key.format = GL_T2F_V3F; 2208 key.format = GL_T2F_V3F;
1836 key.texname = -1;
1837 2209
1838 mx += self->x; 2210 mx += self->x;
1839 my += self->y; 2211 my += self->y;
1840 2212
1841 // first pass: determine smooth_max 2213 // first pass: determine smooth_max
… …
1865 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1866 2238
1867 for (z = 0; z <= 2; z++) 2239 for (z = 0; z <= 2; z++)
1868 { 2240 {
1869 memset (smooth_level, 0, sizeof (smooth_level)); 2241 memset (smooth_level, 0, sizeof (smooth_level));
2242 key.texname = -1;
1870 2243
1871 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
1872 if (0 <= y + my && y + my < self->rows) 2245 if (0 <= y + my && y + my < self->rows)
1873 { 2246 {
1874 maprow *row = self->row + (y + my); 2247 maprow *row = self->row + (y + my);
… …
1884 maptex tex = self->tex [tile]; 2257 maptex tex = self->tex [tile];
1885 int px, py; 2258 int px, py;
1886 2259
1887 if (key.texname != tex.name) 2260 if (key.texname != tex.name)
1888 { 2261 {
2262 self->tex [tile].unused = 0;
2263
1889 if (!tex.name) 2264 if (!tex.name)
1890 tex = self->tex [2]; /* missing, replace by noface */ 2265 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1891 2266
1892 key.texname = tex.name; 2267 key.texname = tex.name;
1893 arr = rc_array (rc, &key); 2268 arr = rc_array (rc, &key);
1894 } 2269 }
1895 2270
1896 px = (x + 1) * T - tex.w; 2271 px = (x + 1) * Th - tex.w;
1897 py = (y + 1) * T - tex.h; 2272 py = (y + 1) * Tw - tex.h;
2273
2274 if (expect_false (cell->player == player) && expect_false (z == 2))
2275 {
2276 pl_x = px;
2277 pl_y = py;
2278 pl_tex = tex;
2279 continue;
2280 }
1898 2281
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2282 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2283 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1901 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2284 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1902 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2285 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1903
1904 if (cell->flags && z == 2)
1905 {
1906 // overlays such as the speech bubble, probably more to come
1907 if (cell->flags & 1)
1908 {
1909 maptex tex = self->tex [1];
1910 int px = x * T + T * 2 / 32;
1911 int py = y * T - T * 6 / 32;
1912
1913 if (tex.name)
1914 {
1915 if (key.texname != tex.name)
1916 {
1917 key.texname = tex.name;
1918 arr = rc_array (rc, &key);
1919 }
1920
1921 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1922 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1923 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1924 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1925 }
1926 }
1927 }
1928 2286
1929 // update smooth hash 2287 // update smooth hash
1930 if (tex.smoothtile) 2288 if (tex.smoothtile)
1931 { 2289 {
1932 skey.tile = tex.smoothtile; 2290 skey.tile = tex.smoothtile;
… …
1961 // corners 2319 // corners
1962 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2320 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1963 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2321 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1964 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2322 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1965 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2323 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2324 }
2325 }
2326
2327 if (expect_false (z == 2) && expect_false (cell->flags))
2328 {
2329 // overlays such as the speech bubble, probably more to come
2330 if (cell->flags & 1)
2331 {
2332 rc_key_t key_ov = key;
2333 maptex tex = self->tex [TEXID_SPEECH];
2334 rc_array_t *arr;
2335 int px = x * Tw + Tw * 2 / 32;
2336 int py = y * Th - Th * 6 / 32;
2337
2338 key_ov.texname = tex.name;
2339 arr = rc_array (rc_ov, &key_ov);
2340
2341 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2342 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2343 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2344 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1966 } 2345 }
1967 } 2346 }
1968 } 2347 }
1969 } 2348 }
1970 2349
… …
1997 if (!(bits & 0x1000) 2376 if (!(bits & 0x1000)
1998 && skey->level == level 2377 && skey->level == level
1999 && level > smooth_max [skey->x][skey->y]) 2378 && level > smooth_max [skey->x][skey->y])
2000 { 2379 {
2001 maptex tex = self->tex [skey->tile]; 2380 maptex tex = self->tex [skey->tile];
2002 int px = (((int)skey->x) - 1) * T; 2381 int px = (((int)skey->x) - 1) * Tw;
2003 int py = (((int)skey->y) - 1) * T; 2382 int py = (((int)skey->y) - 1) * Th;
2004 int border = bits & 15; 2383 int border = bits & 15;
2005 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2384 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2006 float dx = tex.s * .0625f; // 16 images/row 2385 float dx = tex.s * .0625f; // 16 images/row
2007 float dy = tex.t * .5f ; // 2 images/column 2386 float dy = tex.t * .5f ; // 2 images/column
2008 2387
… …
2010 { 2389 {
2011 // this time avoiding texture state changes 2390 // this time avoiding texture state changes
2012 // save gobs of state changes. 2391 // save gobs of state changes.
2013 if (key.texname != tex.name) 2392 if (key.texname != tex.name)
2014 { 2393 {
2394 self->tex [skey->tile].unused = 0;
2395
2015 glEnd (); 2396 glEnd ();
2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2397 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2017 glBegin (GL_QUADS); 2398 glBegin (GL_QUADS);
2018 } 2399 }
2019 2400
2020 if (border) 2401 if (border)
2021 { 2402 {
2022 float ox = border * dx; 2403 float ox = border * dx;
2023 2404
2024 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2405 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2025 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2406 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2026 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2407 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2027 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2408 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2028 } 2409 }
2029 2410
2030 if (corner) 2411 if (corner)
2031 { 2412 {
2032 float ox = corner * dx; 2413 float ox = corner * dx;
2033 2414
2034 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2035 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2036 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2037 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2038 } 2419 }
2039 } 2420 }
2040 } 2421 }
2041 } 2422 }
2042 } 2423 }
… …
2048 } 2429 }
2049 2430
2050 hv_clear (smooth); 2431 hv_clear (smooth);
2051 } 2432 }
2052 2433
2434 if (pl_tex.name)
2435 {
2436 maptex tex = pl_tex;
2437 int px = pl_x + sdx;
2438 int py = pl_y + sdy;
2439
2440 key.texname = tex.name;
2441 arr = rc_array (rc, &key);
2442
2443 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2444 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2445 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2446 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2447
2448 rc_draw (rc);
2449 }
2450
2451 rc_draw (rc_ov);
2452 rc_clear (rc_ov);
2453
2053 glDisable (GL_BLEND); 2454 glDisable (GL_BLEND);
2054 rc_free (rc); 2455 rc_free (rc);
2456 rc_free (rc_ov);
2055 2457
2056 // top layer: overlays such as the health bar 2458 // top layer: overlays such as the health bar
2057 for (y = 0; y < sh; y++) 2459 for (y = 0; y < sh; y++)
2058 if (0 <= y + my && y + my < self->rows) 2460 if (0 <= y + my && y + my < self->rows)
2059 { 2461 {
… …
2062 for (x = 0; x < sw; x++) 2464 for (x = 0; x < sw; x++)
2063 if (row->c0 <= x + mx && x + mx < row->c1) 2465 if (row->c0 <= x + mx && x + mx < row->c1)
2064 { 2466 {
2065 mapcell *cell = row->col + (x + mx - row->c0); 2467 mapcell *cell = row->col + (x + mx - row->c0);
2066 2468
2067 int px = x * T; 2469 int px = x * Tw;
2068 int py = y * T; 2470 int py = y * Th;
2471
2472 if (expect_false (cell->player == player))
2473 {
2474 px += sdx;
2475 py += sdy;
2476 }
2069 2477
2070 if (cell->stat_hp) 2478 if (cell->stat_hp)
2071 { 2479 {
2072 int width = cell->stat_width * T; 2480 int width = cell->stat_width * Tw;
2073 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2481 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2074 2482
2075 glColor3ub (0, 0, 0); 2483 glColor3ub (0, 0, 0);
2076 glRectf (px + 1, py - thick - 2, 2484 glRectf (px + 1, py - thick - 2,
2077 px + width - 1, py); 2485 px + width - 1, py);
2078 2486
… …
2084 } 2492 }
2085 } 2493 }
2086} 2494}
2087 2495
2088void 2496void
2089draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2497draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2090 CODE: 2498 CODE:
2091{ 2499{
2092 static float color[16][3] = { 2500 static float color[16][3] = {
2093 { 0.00F, 0.00F, 0.00F }, 2501 { 0.00f, 0.00f, 0.00f },
2094 { 1.00F, 1.00F, 1.00F }, 2502 { 1.00f, 1.00f, 1.00f },
2095 { 0.00F, 0.00F, 0.55F }, 2503 { 0.00f, 0.00f, 0.55f },
2096 { 1.00F, 0.00F, 0.00F }, 2504 { 1.00f, 0.00f, 0.00f },
2097 2505
2098 { 1.00F, 0.54F, 0.00F }, 2506 { 1.00f, 0.54f, 0.00f },
2099 { 0.11F, 0.56F, 1.00F }, 2507 { 0.11f, 0.56f, 1.00f },
2100 { 0.93F, 0.46F, 0.00F }, 2508 { 0.93f, 0.46f, 0.00f },
2101 { 0.18F, 0.54F, 0.34F }, 2509 { 0.18f, 0.54f, 0.34f },
2102 2510
2103 { 0.56F, 0.73F, 0.56F }, 2511 { 0.56f, 0.73f, 0.56f },
2104 { 0.80F, 0.80F, 0.80F }, 2512 { 0.80f, 0.80f, 0.80f },
2105 { 0.55F, 0.41F, 0.13F }, 2513 { 0.55f, 0.41f, 0.13f },
2106 { 0.99F, 0.77F, 0.26F }, 2514 { 0.99f, 0.77f, 0.26f },
2107 2515
2108 { 0.74F, 0.65F, 0.41F }, 2516 { 0.74f, 0.65f, 0.41f },
2109 2517
2110 { 0.00F, 1.00F, 1.00F }, 2518 { 0.00f, 1.00f, 1.00f },
2111 { 1.00F, 0.00F, 1.00F }, 2519 { 1.00f, 0.00f, 1.00f },
2112 { 1.00F, 1.00F, 0.00F }, 2520 { 1.00f, 1.00f, 0.00f },
2113 }; 2521 };
2114 2522
2115 int x, y; 2523 int x, y;
2116 2524
2117 glEnable (GL_TEXTURE_2D); 2525 glEnable (GL_TEXTURE_2D);
2526 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2527 * but the nvidia driver (185.18.14) mishandles alpha textures
2528 * and takes the colour from god knows where instead of using
2529 * Cp. MODULATE results in the same colour, but slightly different
2530 * alpha, but atcually gives us the correct colour with nvidia.
2531 */
2118 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2532 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2119 glEnable (GL_BLEND); 2533 glEnable (GL_BLEND);
2120 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2534 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2121 glBegin (GL_QUADS); 2535 glBegin (GL_QUADS);
2122 2536
2123 for (y = 0; y < h; y++) 2537 for (y = 0; y < h; y++)
… …
2127 2541
2128 if (m) 2542 if (m)
2129 { 2543 {
2130 float *c = color [m & 15]; 2544 float *c = color [m & 15];
2131 2545
2132 float tx1 = m & 0x40 ? 0.5 : 0.; 2546 float tx1 = m & 0x40 ? 0.5f : 0.f;
2133 float tx2 = tx1 + 0.5; 2547 float tx2 = tx1 + 0.5f;
2134 2548
2135 glColor4f (c[0], c[1], c[2], 0.75); 2549 glColor4f (c[0], c[1], c[2], 1);
2136 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2550 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2137 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2551 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2138 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2552 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2139 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2553 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2140 } 2554 }
… …
2148void 2562void
2149fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2563fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2150 PPCODE: 2564 PPCODE:
2151{ 2565{
2152 int x, y; 2566 int x, y;
2153 int sw1 = sw + 2; 2567 int sw1 = sw + 2;
2154 int sh1 = sh + 2; 2568 int sh1 = sh + 2;
2155 int sh3 = sh * 3; 2569 int sh3 = sh * 3;
2156 int sw34 = (sw * 3 + 3) & ~3; 2570 int sw3 = sw * 3;
2571 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2572 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2157 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2573 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2158 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2574 memset (darkness1, 0, sw1*sh1);
2159 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2160 2575
2161 SvPOK_only (darkness3_sv); 2576 SvPOK_only (darkness3_sv);
2162 SvCUR_set (darkness3_sv, sw34 * sh3); 2577 SvCUR_set (darkness3_sv, sw3 * sh3);
2163 2578
2164 mx += self->x - 1; 2579 mx += self->x - 1;
2165 my += self->y - 1; 2580 my += self->y - 1;
2166
2167 memset (darkness1, 255, sw1 * sh1);
2168 2581
2169 for (y = 0; y < sh1; y++) 2582 for (y = 0; y < sh1; y++)
2170 if (0 <= y + my && y + my < self->rows) 2583 if (0 <= y + my && y + my < self->rows)
2171 { 2584 {
2172 maprow *row = self->row + (y + my); 2585 maprow *row = self->row + (y + my);
… …
2175 if (row->c0 <= x + mx && x + mx < row->c1) 2588 if (row->c0 <= x + mx && x + mx < row->c1)
2176 { 2589 {
2177 mapcell *cell = row->col + (x + mx - row->c0); 2590 mapcell *cell = row->col + (x + mx - row->c0);
2178 2591
2179 darkness1 [y * sw1 + x] = cell->darkness 2592 darkness1 [y * sw1 + x] = cell->darkness
2180 ? 255 - (cell->darkness - 1) 2593 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2181 : 255 - FOW_DARKNESS; 2594 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2182 } 2595 }
2183 } 2596 }
2184 2597
2185 for (y = 0; y < sh; ++y) 2598 for (y = 0; y < sh; ++y)
2186 for (x = 0; x < sw; ++x) 2599 for (x = 0; x < sw; ++x)
… …
2205 2618
2206 uint8_t r13 = (d13 + d23 + d12) / 3; 2619 uint8_t r13 = (d13 + d23 + d12) / 3;
2207 uint8_t r23 = d23; 2620 uint8_t r23 = d23;
2208 uint8_t r33 = (d23 + d33 + d32) / 3; 2621 uint8_t r33 = (d23 + d33 + d32) / 3;
2209 2622
2210 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2623 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2211 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2624 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2212 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2625 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2213 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2626 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2214 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2627 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2215 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2628 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2216 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2629 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2217 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2630 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2218 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2631 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2219 } 2632 }
2220 2633
2221 free (darkness1); 2634 free (darkness1);
2222 2635
2223 EXTEND (SP, 3); 2636 EXTEND (SP, 3);
2224 PUSHs (sv_2mortal (newSViv (sw34))); 2637 PUSHs (sv_2mortal (newSViv (sw3)));
2225 PUSHs (sv_2mortal (newSViv (sh3))); 2638 PUSHs (sv_2mortal (newSViv (sh3)));
2226 PUSHs (darkness3_sv); 2639 PUSHs (darkness3_sv);
2227} 2640}
2228 2641
2229SV * 2642SV *
… …
2292 else 2705 else
2293 *data++ = 0; 2706 *data++ = 0;
2294 } 2707 }
2295 } 2708 }
2296 2709
2710 /* if size is w*h + 5 then no data has been found */
2711 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2712 {
2297 SvPOK_only (data_sv); 2713 SvPOK_only (data_sv);
2298 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2714 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2715 }
2716
2299 RETVAL = data_sv; 2717 RETVAL = data_sv;
2300} 2718}
2301 OUTPUT: 2719 OUTPUT:
2302 RETVAL 2720 RETVAL
2303 2721
2304void 2722void
2305set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2723set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2306 PPCODE: 2724 PPCODE:
2307{ 2725{
2308 int x, y, z; 2726 int x, y, z;
2309 int w, h; 2727 int w, h;
2310 int x1, y1; 2728 int x1, y1;
2729 STRLEN len;
2730 uint8_t *data, *end;
2731
2732 len = SvLEN (data_sv);
2733 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2734 data = SvPVbyte_nolen (data_sv);
2735 end = data + len + 8;
2736
2737 if (len < 5)
2738 XSRETURN_EMPTY;
2311 2739
2312 if (*data++ != 0) 2740 if (*data++ != 0)
2313 XSRETURN_EMPTY; /* version mismatch */ 2741 XSRETURN_EMPTY; /* version mismatch */
2314 2742
2315 w = *data++ << 8; w |= *data++; 2743 w = *data++ << 8; w |= *data++;
… …
2330 { 2758 {
2331 maprow *row = map_get_row (self, y); 2759 maprow *row = map_get_row (self, y);
2332 2760
2333 for (x = x0; x < x1; x++) 2761 for (x = x0; x < x1; x++)
2334 { 2762 {
2763 uint8_t flags;
2764
2765 if (data + 7 >= end)
2766 XSRETURN_EMPTY;
2767
2335 uint8_t flags = *data++; 2768 flags = *data++;
2336 2769
2337 if (flags) 2770 if (flags)
2338 { 2771 {
2339 mapcell *cell = row_get_cell (row, x); 2772 mapcell *cell = row_get_cell (row, x);
2340 tileid tile[3] = { 0, 0, 0 }; 2773 tileid tile[3] = { 0, 0, 0 };
… …
2343 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2776 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2344 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2777 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2345 2778
2346 if (cell->darkness == 0) 2779 if (cell->darkness == 0)
2347 { 2780 {
2348 cell->darkness = 0; 2781 /*cell->darkness = 0;*/
2782 EXTEND (SP, 3);
2349 2783
2350 for (z = 0; z <= 2; z++) 2784 for (z = 0; z <= 2; z++)
2351 { 2785 {
2352 tileid t = tile [z]; 2786 tileid t = tile [z];
2353 2787
2354 if (t >= self->texs || (t && !self->tex [t].name)) 2788 if (t >= self->texs || (t && !self->tex [t].name))
2355 { 2789 {
2356 XPUSHs (sv_2mortal (newSViv (t))); 2790 PUSHs (sv_2mortal (newSViv (t)));
2357 need_texid (self, t); 2791 need_texid (self, t);
2358 } 2792 }
2359 2793
2360 cell->tile [z] = t; 2794 cell->tile [z] = t;
2361 } 2795 }
… …
2406 if (RETVAL < 0) 2840 if (RETVAL < 0)
2407 { 2841 {
2408 RETVAL = Mix_GroupOldest (-1); 2842 RETVAL = Mix_GroupOldest (-1);
2409 2843
2410 if (RETVAL < 0) 2844 if (RETVAL < 0)
2845 {
2846 // happens sometimes, maybe it just stopped playing(?)
2847 RETVAL = Mix_GroupAvailable (-1);
2848
2849 if (RETVAL < 0)
2411 XSRETURN_UNDEF; 2850 XSRETURN_UNDEF;
2412 2851 }
2852 else
2413 Mix_HaltChannel (RETVAL); 2853 Mix_HaltChannel (RETVAL);
2414 } 2854 }
2415 2855
2416 Mix_UnregisterAllEffects (RETVAL); 2856 Mix_UnregisterAllEffects (RETVAL);
2417 Mix_Volume (RETVAL, 128); 2857 Mix_Volume (RETVAL, 128);
2418} 2858}
… …
2465void 2905void
2466set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2906set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2467 CODE: 2907 CODE:
2468{ 2908{
2469 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2909 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2470 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2910 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2471 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2911 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2472} 2912}
2473 2913
2474void 2914void
2475set_reverse_stereo (DC::Channel self, int flip) 2915set_reverse_stereo (DC::Channel self, int flip)
… …
2477 Mix_SetReverseStereo (self, flip); 2917 Mix_SetReverseStereo (self, flip);
2478 2918
2479MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2919MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2480 2920
2481PROTOTYPES: DISABLE 2921PROTOTYPES: DISABLE
2922
2923void
2924decoders ()
2925 PPCODE:
2926#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2927 int i, num = Mix_GetNumChunkDecoders ();
2928 EXTEND (SP, num);
2929 for (i = 0; i < num; ++i)
2930 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2931#else
2932 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2933#endif
2482 2934
2483DC::MixChunk 2935DC::MixChunk
2484new (SV *class, DC::RW rwops) 2936new (SV *class, DC::RW rwops)
2485 CODE: 2937 CODE:
2486 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2938 RETVAL = Mix_LoadWAV_RW (rwops, 1);
… …
2519 OUTPUT: 2971 OUTPUT:
2520 RETVAL 2972 RETVAL
2521 2973
2522MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2974MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2523 2975
2976void
2977decoders ()
2978 PPCODE:
2979#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2980 int i, num = Mix_GetNumMusicDecoders ();
2981 EXTEND (SP, num);
2982 for (i = 0; i < num; ++i)
2983 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2984#else
2985 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2986#endif
2987
2524int 2988int
2525volume (int volume = -1) 2989volume (int volume = -1)
2526 PROTOTYPE: ;$ 2990 PROTOTYPE: ;$
2527 CODE: 2991 CODE:
2528 if (items > 0) 2992 if (items > 0)
… …
2538 3002
2539void 3003void
2540halt () 3004halt ()
2541 CODE: 3005 CODE:
2542 Mix_HaltMusic (); 3006 Mix_HaltMusic ();
3007
3008int
3009playing ()
3010 CODE:
3011 RETVAL = Mix_PlayingMusic ();
3012 OUTPUT:
3013 RETVAL
2543 3014
2544DC::MixMusic 3015DC::MixMusic
2545new (SV *class, DC::RW rwops) 3016new (SV *class, DC::RW rwops)
2546 CODE: 3017 CODE:
2547 RETVAL = Mix_LoadMUS_RW (rwops); 3018 RETVAL = Mix_LoadMUS_RW (rwops);
… …
2578 } *civ, const_iv[] = { 3049 } *civ, const_iv[] = {
2579# define const_iv(name) { # name, (IV)name } 3050# define const_iv(name) { # name, (IV)name }
2580 const_iv (GL_VENDOR), 3051 const_iv (GL_VENDOR),
2581 const_iv (GL_VERSION), 3052 const_iv (GL_VERSION),
2582 const_iv (GL_EXTENSIONS), 3053 const_iv (GL_EXTENSIONS),
3054 const_iv (GL_MAX_TEXTURE_UNITS),
2583 const_iv (GL_COLOR_MATERIAL), 3055 const_iv (GL_COLOR_MATERIAL),
2584 const_iv (GL_SMOOTH), 3056 const_iv (GL_SMOOTH),
2585 const_iv (GL_FLAT), 3057 const_iv (GL_FLAT),
2586 const_iv (GL_DITHER), 3058 const_iv (GL_DITHER),
2587 const_iv (GL_BLEND), 3059 const_iv (GL_BLEND),
… …
2599 const_iv (GL_ZERO), 3071 const_iv (GL_ZERO),
2600 const_iv (GL_SRC_ALPHA), 3072 const_iv (GL_SRC_ALPHA),
2601 const_iv (GL_DST_ALPHA), 3073 const_iv (GL_DST_ALPHA),
2602 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3074 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2603 const_iv (GL_ONE_MINUS_DST_ALPHA), 3075 const_iv (GL_ONE_MINUS_DST_ALPHA),
3076 const_iv (GL_SRC_COLOR),
3077 const_iv (GL_DST_COLOR),
3078 const_iv (GL_ONE_MINUS_SRC_COLOR),
3079 const_iv (GL_ONE_MINUS_DST_COLOR),
2604 const_iv (GL_SRC_ALPHA_SATURATE), 3080 const_iv (GL_SRC_ALPHA_SATURATE),
2605 const_iv (GL_RGB), 3081 const_iv (GL_RGB),
2606 const_iv (GL_RGBA), 3082 const_iv (GL_RGBA),
2607 const_iv (GL_RGBA4), 3083 const_iv (GL_RGBA4),
2608 const_iv (GL_RGBA8), 3084 const_iv (GL_RGBA8),
… …
2676 const_iv (GL_NICEST), 3152 const_iv (GL_NICEST),
2677 const_iv (GL_V2F), 3153 const_iv (GL_V2F),
2678 const_iv (GL_V3F), 3154 const_iv (GL_V3F),
2679 const_iv (GL_T2F_V3F), 3155 const_iv (GL_T2F_V3F),
2680 const_iv (GL_T2F_N3F_V3F), 3156 const_iv (GL_T2F_N3F_V3F),
3157 const_iv (GL_FUNC_ADD),
3158 const_iv (GL_FUNC_SUBTRACT),
3159 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2681# undef const_iv 3160# undef const_iv
2682 }; 3161 };
2683 3162
2684 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3163 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2685 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3164 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2692disable_GL_EXT_blend_func_separate () 3171disable_GL_EXT_blend_func_separate ()
2693 CODE: 3172 CODE:
2694 gl.BlendFuncSeparate = 0; 3173 gl.BlendFuncSeparate = 0;
2695 gl.BlendFuncSeparateEXT = 0; 3174 gl.BlendFuncSeparateEXT = 0;
2696 3175
3176void
3177apple_nvidia_bug (int enable)
3178
2697char * 3179char *
2698gl_vendor () 3180gl_vendor ()
2699 CODE: 3181 CODE:
2700 RETVAL = (char *)glGetString (GL_VENDOR); 3182 RETVAL = (char *)glGetString (GL_VENDOR);
2701 OUTPUT: 3183 OUTPUT:
… …
2731 3213
2732int glGetError () 3214int glGetError ()
2733 3215
2734void glFinish () 3216void glFinish ()
2735 3217
3218void glFlush ()
3219
2736void glClear (int mask) 3220void glClear (int mask)
2737 3221
2738void glClearColor (float r, float g, float b, float a = 1.0) 3222void glClearColor (float r, float g, float b, float a = 1.0)
2739 PROTOTYPE: @ 3223 PROTOTYPE: @
2740 3224
… …
2749void glBlendFunc (int sfactor, int dfactor) 3233void glBlendFunc (int sfactor, int dfactor)
2750 3234
2751void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3235void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2752 CODE: 3236 CODE:
2753 gl_BlendFuncSeparate (sa, da, saa, daa); 3237 gl_BlendFuncSeparate (sa, da, saa, daa);
3238
3239# void glBlendEquation (int se)
2754 3240
2755void glDepthMask (int flag) 3241void glDepthMask (int flag)
2756 3242
2757void glLogicOp (int opcode) 3243void glLogicOp (int opcode)
2758 3244
… …
2793void glRotate (float angle, float x, float y, float z) 3279void glRotate (float angle, float x, float y, float z)
2794 CODE: 3280 CODE:
2795 glRotatef (angle, x, y, z); 3281 glRotatef (angle, x, y, z);
2796 3282
2797void glColor (float r, float g, float b, float a = 1.0) 3283void glColor (float r, float g, float b, float a = 1.0)
3284 PROTOTYPE: @
2798 ALIAS: 3285 ALIAS:
2799 glColor_premultiply = 1 3286 glColor_premultiply = 1
2800 CODE: 3287 CODE:
2801 if (ix) 3288 if (ix)
2802 { 3289 {
… …
2907void glNewList (int list, int mode = GL_COMPILE) 3394void glNewList (int list, int mode = GL_COMPILE)
2908 3395
2909void glEndList () 3396void glEndList ()
2910 3397
2911void glCallList (int list) 3398void glCallList (int list)
3399
3400void c_init ()
3401 CODE:
3402 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3403 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2912 3404
2913MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3405MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2914 3406
2915PROTOTYPES: DISABLE 3407PROTOTYPES: DISABLE
2916 3408

Diff Legend

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