ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.262 by root, Wed Jul 16 20:12:27 2008 UTC vs.
Revision 1.306 by root, Thu Oct 14 00:02:39 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>
… …
76#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
78 84
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
82 91
83#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
85 94
86#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
87 96
88/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
90 99
91#if 1 100#define KMOD_LRAM 0x10000 // our extension
92# define PARACHUTE SDL_INIT_NOPARACHUTE 101
93#else 102#define TEXID_SPEECH 1
94# define PARACHUTE 0 103#define TEXID_NOFACE 2
95#endif 104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
96 123
97static AV *texture_av; 124static AV *texture_av;
98 125
99static struct 126static struct
100{ 127{
… …
232 int w, h; 259 int w, h;
233 float s, t; 260 float s, t;
234 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
235 tileid smoothtile; 262 tileid smoothtile;
236 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
237} maptex; 265} maptex;
238 266
239typedef struct { 267typedef struct {
240 uint32_t player; 268 uint32_t player;
241 tileid tile[3]; 269 tileid tile[3];
… …
373 self->oy = 0; 401 self->oy = 0;
374 self->row = 0; 402 self->row = 0;
375 self->rows = 0; 403 self->rows = 0;
376} 404}
377 405
406#define CELL_CLEAR(cell) \
407 do { \
408 if ((cell)->player) \
409 (cell)->tile [2] = 0; \
410 (cell)->darkness = 0; \
411 (cell)->stat_hp = 0; \
412 (cell)->flags = 0; \
413 (cell)->player = 0; \
414 } while (0)
415
378static void 416static void
379map_blank (DC__Map self, int x0, int y0, int w, int h) 417map_blank (DC__Map self, int x0, int y0, int w, int h)
380{ 418{
381 int x, y; 419 int x, y;
382 maprow *row; 420 maprow *row;
… …
396 if (x >= row->c1) 434 if (x >= row->c1)
397 break; 435 break;
398 436
399 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
400 438
401 cell->darkness = 0; 439 CELL_CLEAR (cell);
402 cell->stat_hp = 0;
403 cell->flags = 0;
404 cell->player = 0;
405 } 440 }
406 } 441 }
407} 442}
408 443
409typedef struct { 444typedef struct {
… …
444 ev.code = 1; 479 ev.code = 1;
445 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
446 ev.data2 = 0; 481 ev.data2 = 0;
447 482
448 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
484}
485
486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
449} 490}
450 491
451static unsigned int 492static unsigned int
452minpot (unsigned int n) 493minpot (unsigned int n)
453{ 494{
… …
520 if (!svp || !SvTRUE (*svp)) 561 if (!svp || !SvTRUE (*svp))
521 return 0; 562 return 0;
522 563
523 return 1; 564 return 1;
524} 565}
566
567/******************************************************************************/
568
569/* process keyboard modifiers */
570static int
571mod_munge (int mod)
572{
573 mod &= MOD_MASK;
574
575 if (mod & (KMOD_META | KMOD_ALT))
576 mod |= KMOD_LRAM;
577
578 return mod;
579}
580
581static void
582deliantra_main ()
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
525 618
526MODULE = Deliantra::Client PACKAGE = DC 619MODULE = Deliantra::Client PACKAGE = DC
527 620
528PROTOTYPES: ENABLE 621PROTOTYPES: ENABLE
529 622
… …
558 const_iv (SDL_USEREVENT), 651 const_iv (SDL_USEREVENT),
559 652
560 const_iv (SDL_APPINPUTFOCUS), 653 const_iv (SDL_APPINPUTFOCUS),
561 const_iv (SDL_APPMOUSEFOCUS), 654 const_iv (SDL_APPMOUSEFOCUS),
562 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),
563 706
564 const_iv (SDLK_FIRST), 707 const_iv (SDLK_FIRST),
565 const_iv (SDLK_LAST), 708 const_iv (SDLK_LAST),
566 const_iv (SDLK_KP0), 709 const_iv (SDLK_KP0),
567 const_iv (SDLK_KP1), 710 const_iv (SDLK_KP1),
… …
643 const_iv (KMOD_RMETA), 786 const_iv (KMOD_RMETA),
644 const_iv (KMOD_NUM), 787 const_iv (KMOD_NUM),
645 const_iv (KMOD_CAPS), 788 const_iv (KMOD_CAPS),
646 const_iv (KMOD_MODE), 789 const_iv (KMOD_MODE),
647 790
791 const_iv (KMOD_LRAM),
792
648 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)
649# undef const_iv 823# undef const_iv
650 }; 824 };
651 825
652 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; )
653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
674NV ceil (NV x) 848NV ceil (NV x)
675 849
676IV minpot (UV n) 850IV minpot (UV n)
677 851
678IV 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
679 859
680void 860void
681pango_init () 861pango_init ()
682 CODE: 862 CODE:
683{ 863{
… …
689 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 869 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
690 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 870 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
691#endif 871#endif
692} 872}
693 873
694char *
695SDL_GetError () 874char *SDL_GetError ()
696 875
697int 876void SDL_braino ()
698SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
699 877
700void 878int SDL_Init (U32 flags)
879
880int SDL_InitSubSystem (U32 flags)
881
882void SDL_QuitSubSystem (U32 flags)
883
701SDL_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
702 894
703void 895void
704SDL_ListModes (int rgb, int alpha) 896SDL_ListModes (int rgb, int alpha)
705 PPCODE: 897 PPCODE:
706{ 898{
… …
718 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 910 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
719 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 911 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
720 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 912 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
721 913
722 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 914 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
723#if SDL_VERSION_ATLEAST(1,2,10)
724 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
725 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 915 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
726#endif
727 916
728 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 917 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
729 918
730 if (m && m != (SDL_Rect **)-1) 919 if (m && m != (SDL_Rect **)-1)
731 while (*m) 920 while (*m)
732 { 921 {
733 if ((*m)->w >= 800 && (*m)->h >= 480) 922 if ((*m)->w >= 400 && (*m)->h >= 300)
734 { 923 {
735 AV *av = newAV (); 924 AV *av = newAV ();
736 av_push (av, newSViv ((*m)->w)); 925 av_push (av, newSViv ((*m)->w));
737 av_push (av, newSViv ((*m)->h)); 926 av_push (av, newSViv ((*m)->h));
738 av_push (av, newSViv (rgb)); 927 av_push (av, newSViv (rgb));
… …
766 955
767 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
768#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);
769#include "glfunc.h" 958#include "glfunc.h"
770#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
771 } 963 }
772} 964}
773 OUTPUT: 965 OUTPUT:
774 RETVAL 966 RETVAL
775 967
… …
801 { 993 {
802 case SDL_KEYDOWN: 994 case SDL_KEYDOWN:
803 case SDL_KEYUP: 995 case SDL_KEYUP:
804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 996 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 997 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
806 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 998 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
807 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 999 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
808 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1000 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
809 break; 1001 break;
810 1002
811 case SDL_ACTIVEEVENT: 1003 case SDL_ACTIVEEVENT:
812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1004 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
830 x = ev.motion.x; 1022 x = ev.motion.x;
831 y = ev.motion.y; 1023 y = ev.motion.y;
832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1024 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
833 } 1025 }
834 1026
835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1027 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
836 hv_store (hv, "state", 5, newSViv (state), 0); 1028 hv_store (hv, "state", 5, newSViv (state), 0);
837 hv_store (hv, "x", 1, newSViv (x), 0); 1029 hv_store (hv, "x", 1, newSViv (x), 0);
838 hv_store (hv, "y", 1, newSViv (y), 0); 1030 hv_store (hv, "y", 1, newSViv (y), 0);
839 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1031 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
840 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1032 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
860 1052
861 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))));
862 } 1054 }
863} 1055}
864 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
865int 1070int
866Mix_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)
867 POSTCALL: 1072 POSTCALL:
868 Mix_HookMusicFinished (music_finished); 1073 Mix_HookMusicFinished (music_finished);
869 Mix_ChannelFinished (channel_finished); 1074 Mix_ChannelFinished (channel_finished);
… …
931add_font (char *file) 1136add_font (char *file)
932 CODE: 1137 CODE:
933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1138 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT: 1139 OUTPUT:
935 RETVAL 1140 RETVAL
1141
1142void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
936 1144
937void 1145void
938load_image_inline (SV *image_) 1146load_image_inline (SV *image_)
939 ALIAS: 1147 ALIAS:
940 load_image_file = 1 1148 load_image_file = 1
… …
1056#if DEBUG 1264#if DEBUG
1057 VALGRIND_DO_LEAK_CHECK; 1265 VALGRIND_DO_LEAK_CHECK;
1058#endif 1266#endif
1059} 1267}
1060 1268
1269int
1270SvREFCNT (SV *sv)
1271 CODE:
1272 RETVAL = SvREFCNT (sv);
1273 OUTPUT:
1274 RETVAL
1275
1061MODULE = Deliantra::Client PACKAGE = DC::Font 1276MODULE = Deliantra::Client PACKAGE = DC::Font
1062 1277
1063PROTOTYPES: DISABLE 1278PROTOTYPES: DISABLE
1064 1279
1065DC::Font 1280DC::Font
… …
1494 if (ix) 1709 if (ix)
1495 { 1710 {
1496 glDisable (GL_ALPHA_TEST); 1711 glDisable (GL_ALPHA_TEST);
1497 glDisable (GL_BLEND); 1712 glDisable (GL_BLEND);
1498 } 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);
1499} 1835}
1500 1836
1501IV 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)
1502 CODE: 1838 CODE:
1503{ 1839{
… …
1609 //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);
1610 // use uglier nearest interpolation because linear suffers 1946 // use uglier nearest interpolation because linear suffers
1611 // from transparent color bleeding and ugly wrapping effects. 1947 // from transparent color bleeding and ugly wrapping effects.
1612 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1948 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1613} 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 }
1614 1970
1615int 1971int
1616ox (DC::Map self) 1972ox (DC::Map self)
1617 ALIAS: 1973 ALIAS:
1618 oy = 1 1974 oy = 1
… …
1699 { 2055 {
1700 ext = *data++; 2056 ext = *data++;
1701 cmd = ext & 0x7f; 2057 cmd = ext & 0x7f;
1702 2058
1703 if (cmd < 4) 2059 if (cmd < 4)
1704 cell->darkness = 255 - ext * 64 + 1; 2060 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1705 else if (cmd == 5) // health 2061 else if (cmd == 5) // health
1706 { 2062 {
1707 cell->stat_width = 1; 2063 cell->stat_width = 1;
1708 cell->stat_hp = *data++; 2064 cell->stat_hp = *data++;
1709 } 2065 }
… …
1739 cell->tile [z] = self->face2tile [face]; 2095 cell->tile [z] = self->face2tile [face];
1740 2096
1741 if (cell->tile [z]) 2097 if (cell->tile [z])
1742 { 2098 {
1743 maptex *tex = self->tex + cell->tile [z]; 2099 maptex *tex = self->tex + cell->tile [z];
2100 tex->unused = 0;
1744 if (!tex->name) 2101 if (!tex->name)
1745 av_push (missing, newSViv (cell->tile [z])); 2102 av_push (missing, newSViv (cell->tile [z]));
1746 2103
1747 if (tex->smoothtile) 2104 if (tex->smoothtile)
1748 { 2105 {
1749 maptex *smooth = self->tex + tex->smoothtile; 2106 maptex *smooth = self->tex + tex->smoothtile;
2107 smooth->unused = 0;
1750 if (!smooth->name) 2108 if (!smooth->name)
1751 av_push (missing, newSViv (tex->smoothtile)); 2109 av_push (missing, newSViv (tex->smoothtile));
1752 } 2110 }
1753 } 2111 }
1754 } 2112 }
1755 } 2113 }
1756 else 2114 else
1757 cell->darkness = 0; 2115 CELL_CLEAR (cell);
1758 } 2116 }
1759} 2117}
1760 OUTPUT: 2118 OUTPUT:
1761 RETVAL 2119 RETVAL
1762 2120
… …
1782 ? self->row + y 2140 ? self->row + y
1783 : 0; 2141 : 0;
1784 2142
1785 for (x = x0; x < x1; x++) 2143 for (x = x0; x < x1; x++)
1786 { 2144 {
1787 int r = 32, g = 32, b = 32, a = 192; 2145 unsigned int r = 32, g = 32, b = 32, a = 192;
1788 2146
1789 if (row && row->c0 <= x && x < row->c1) 2147 if (row && row->c0 <= x && x < row->c1)
1790 { 2148 {
1791 mapcell *cell = row->col + (x - row->c0); 2149 mapcell *cell = row->col + (x - row->c0);
1792 2150
… …
1794 { 2152 {
1795 maptex tex = self->tex [cell->tile [z]]; 2153 maptex tex = self->tex [cell->tile [z]];
1796 int a0 = 255 - tex.a; 2154 int a0 = 255 - tex.a;
1797 int a1 = tex.a; 2155 int a1 = tex.a;
1798 2156
1799 r = (r * a0 + tex.r * a1) / 255; 2157 r = div255 (r * a0 + tex.r * a1);
1800 g = (g * a0 + tex.g * a1) / 255; 2158 g = div255 (g * a0 + tex.g * a1);
1801 b = (b * a0 + tex.b * a1) / 255; 2159 b = div255 (b * a0 + tex.b * a1);
1802 a = (a * a0 + tex.a * a1) / 255; 2160 a = div255 (a * a0 + tex.a * a1);
1803 } 2161 }
1804 } 2162 }
1805 2163
1806 *map++ = (r ) 2164 *map++ = (r )
1807 | (g << 8) 2165 | (g << 8)
… …
1814} 2172}
1815 OUTPUT: 2173 OUTPUT:
1816 RETVAL 2174 RETVAL
1817 2175
1818void 2176void
1819draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 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)
1820 CODE: 2178 CODE:
1821{ 2179{
1822 int x, y, z; 2180 int x, y, z;
1823 2181
1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2182 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1825 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
1826 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)
1827 smooth_key skey; 2185 smooth_key skey;
1828 int pl_x, pl_y; 2186 int pl_x, pl_y;
1829 maptex pl_tex; 2187 maptex pl_tex;
1830 rc_t *rc = rc_alloc (); 2188 rc_t *rc = rc_alloc ();
2189 rc_t *rc_ov = rc_alloc ();
1831 rc_key_t key; 2190 rc_key_t key;
1832 rc_array_t *arr; 2191 rc_array_t *arr;
1833 2192
1834 pl_tex.name = 0; 2193 pl_tex.name = 0;
1835 2194
1836 // thats current max. sorry. 2195 // that's current max. sorry.
1837 if (sw > 255) sw = 255; 2196 if (sw > 255) sw = 255;
1838 if (sh > 255) sh = 255; 2197 if (sh > 255) sh = 255;
1839 2198
1840 // clear key, in case of extra padding 2199 // clear key, in case of extra padding
1841 memset (&skey, 0, sizeof (skey)); 2200 memset (&skey, 0, sizeof (skey));
… …
1845 key.g = 255; 2204 key.g = 255;
1846 key.b = 255; 2205 key.b = 255;
1847 key.a = 255; 2206 key.a = 255;
1848 key.mode = GL_QUADS; 2207 key.mode = GL_QUADS;
1849 key.format = GL_T2F_V3F; 2208 key.format = GL_T2F_V3F;
1850 key.texname = -1;
1851 2209
1852 mx += self->x; 2210 mx += self->x;
1853 my += self->y; 2211 my += self->y;
1854 2212
1855 // first pass: determine smooth_max 2213 // first pass: determine smooth_max
… …
1879 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1880 2238
1881 for (z = 0; z <= 2; z++) 2239 for (z = 0; z <= 2; z++)
1882 { 2240 {
1883 memset (smooth_level, 0, sizeof (smooth_level)); 2241 memset (smooth_level, 0, sizeof (smooth_level));
2242 key.texname = -1;
1884 2243
1885 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
1886 if (0 <= y + my && y + my < self->rows) 2245 if (0 <= y + my && y + my < self->rows)
1887 { 2246 {
1888 maprow *row = self->row + (y + my); 2247 maprow *row = self->row + (y + my);
… …
1894 tileid tile = cell->tile [z]; 2253 tileid tile = cell->tile [z];
1895 2254
1896 if (tile) 2255 if (tile)
1897 { 2256 {
1898 maptex tex = self->tex [tile]; 2257 maptex tex = self->tex [tile];
1899 int px = (x + 1) * T - tex.w; 2258 int px, py;
1900 int py = (y + 1) * T - tex.h;
1901 2259
1902 if (key.texname != tex.name) 2260 if (key.texname != tex.name)
1903 { 2261 {
2262 self->tex [tile].unused = 0;
2263
1904 if (!tex.name) 2264 if (!tex.name)
1905 tex = self->tex [2]; /* missing, replace by noface */ 2265 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1906 2266
1907 key.texname = tex.name; 2267 key.texname = tex.name;
1908 arr = rc_array (rc, &key); 2268 arr = rc_array (rc, &key);
1909 } 2269 }
2270
2271 px = (x + 1) * Th - tex.w;
2272 py = (y + 1) * Tw - tex.h;
1910 2273
1911 if (expect_false (cell->player == player) && expect_false (z == 2)) 2274 if (expect_false (cell->player == player) && expect_false (z == 2))
1912 { 2275 {
1913 pl_x = px; 2276 pl_x = px;
1914 pl_y = py; 2277 pl_y = py;
… …
1919 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2282 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1920 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);
1921 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);
1922 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);
1923 2286
1924 if (expect_false (cell->flags) && expect_false (z == 2))
1925 {
1926 // overlays such as the speech bubble, probably more to come
1927 if (cell->flags & 1)
1928 {
1929 maptex tex = self->tex [1];
1930 int px = x * T + T * 2 / 32;
1931 int py = y * T - T * 6 / 32;
1932
1933 if (tex.name)
1934 {
1935 if (key.texname != tex.name)
1936 {
1937 key.texname = tex.name;
1938 arr = rc_array (rc, &key);
1939 }
1940
1941 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1942 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1943 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1945 }
1946 }
1947 }
1948
1949 // update smooth hash 2287 // update smooth hash
1950 if (tex.smoothtile) 2288 if (tex.smoothtile)
1951 { 2289 {
1952 skey.tile = tex.smoothtile; 2290 skey.tile = tex.smoothtile;
1953 skey.level = tex.smoothlevel; 2291 skey.level = tex.smoothlevel;
… …
1981 // corners 2319 // corners
1982 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);
1983 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);
1984 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);
1985 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);
1986 } 2345 }
1987 } 2346 }
1988 } 2347 }
1989 } 2348 }
1990 2349
… …
2017 if (!(bits & 0x1000) 2376 if (!(bits & 0x1000)
2018 && skey->level == level 2377 && skey->level == level
2019 && level > smooth_max [skey->x][skey->y]) 2378 && level > smooth_max [skey->x][skey->y])
2020 { 2379 {
2021 maptex tex = self->tex [skey->tile]; 2380 maptex tex = self->tex [skey->tile];
2022 int px = (((int)skey->x) - 1) * T; 2381 int px = (((int)skey->x) - 1) * Tw;
2023 int py = (((int)skey->y) - 1) * T; 2382 int py = (((int)skey->y) - 1) * Th;
2024 int border = bits & 15; 2383 int border = bits & 15;
2025 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2384 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2026 float dx = tex.s * .0625f; // 16 images/row 2385 float dx = tex.s * .0625f; // 16 images/row
2027 float dy = tex.t * .5f ; // 2 images/column 2386 float dy = tex.t * .5f ; // 2 images/column
2028 2387
… …
2030 { 2389 {
2031 // this time avoiding texture state changes 2390 // this time avoiding texture state changes
2032 // save gobs of state changes. 2391 // save gobs of state changes.
2033 if (key.texname != tex.name) 2392 if (key.texname != tex.name)
2034 { 2393 {
2394 self->tex [skey->tile].unused = 0;
2395
2035 glEnd (); 2396 glEnd ();
2036 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2397 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2037 glBegin (GL_QUADS); 2398 glBegin (GL_QUADS);
2038 } 2399 }
2039 2400
2040 if (border) 2401 if (border)
2041 { 2402 {
2042 float ox = border * dx; 2403 float ox = border * dx;
2043 2404
2044 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2405 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2045 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2406 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2046 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2407 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2047 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2408 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2048 } 2409 }
2049 2410
2050 if (corner) 2411 if (corner)
2051 { 2412 {
2052 float ox = corner * dx; 2413 float ox = corner * dx;
2053 2414
2054 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2055 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2056 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2057 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2058 } 2419 }
2059 } 2420 }
2060 } 2421 }
2061 } 2422 }
2062 } 2423 }
… …
2071 } 2432 }
2072 2433
2073 if (pl_tex.name) 2434 if (pl_tex.name)
2074 { 2435 {
2075 maptex tex = pl_tex; 2436 maptex tex = pl_tex;
2076 int px = pl_x + pdx; 2437 int px = pl_x + sdx;
2077 int py = pl_y + pdy; 2438 int py = pl_y + sdy;
2078 2439
2079 key.texname = tex.name; 2440 key.texname = tex.name;
2080 arr = rc_array (rc, &key); 2441 arr = rc_array (rc, &key);
2081 2442
2082 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2443 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
… …
2085 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2446 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2086 2447
2087 rc_draw (rc); 2448 rc_draw (rc);
2088 } 2449 }
2089 2450
2451 rc_draw (rc_ov);
2452 rc_clear (rc_ov);
2453
2090 glDisable (GL_BLEND); 2454 glDisable (GL_BLEND);
2091 rc_free (rc); 2455 rc_free (rc);
2456 rc_free (rc_ov);
2092 2457
2093 // top layer: overlays such as the health bar 2458 // top layer: overlays such as the health bar
2094 for (y = 0; y < sh; y++) 2459 for (y = 0; y < sh; y++)
2095 if (0 <= y + my && y + my < self->rows) 2460 if (0 <= y + my && y + my < self->rows)
2096 { 2461 {
… …
2099 for (x = 0; x < sw; x++) 2464 for (x = 0; x < sw; x++)
2100 if (row->c0 <= x + mx && x + mx < row->c1) 2465 if (row->c0 <= x + mx && x + mx < row->c1)
2101 { 2466 {
2102 mapcell *cell = row->col + (x + mx - row->c0); 2467 mapcell *cell = row->col + (x + mx - row->c0);
2103 2468
2104 int px = x * T; 2469 int px = x * Tw;
2105 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 }
2106 2477
2107 if (cell->stat_hp) 2478 if (cell->stat_hp)
2108 { 2479 {
2109 int width = cell->stat_width * T; 2480 int width = cell->stat_width * Tw;
2110 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2481 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2111 2482
2112 glColor3ub (0, 0, 0); 2483 glColor3ub (0, 0, 0);
2113 glRectf (px + 1, py - thick - 2, 2484 glRectf (px + 1, py - thick - 2,
2114 px + width - 1, py); 2485 px + width - 1, py);
2115 2486
… …
2121 } 2492 }
2122 } 2493 }
2123} 2494}
2124 2495
2125void 2496void
2126draw_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)
2127 CODE: 2498 CODE:
2128{ 2499{
2129 static float color[16][3] = { 2500 static float color[16][3] = {
2130 { 0.00F, 0.00F, 0.00F }, 2501 { 0.00f, 0.00f, 0.00f },
2131 { 1.00F, 1.00F, 1.00F }, 2502 { 1.00f, 1.00f, 1.00f },
2132 { 0.00F, 0.00F, 0.55F }, 2503 { 0.00f, 0.00f, 0.55f },
2133 { 1.00F, 0.00F, 0.00F }, 2504 { 1.00f, 0.00f, 0.00f },
2134 2505
2135 { 1.00F, 0.54F, 0.00F }, 2506 { 1.00f, 0.54f, 0.00f },
2136 { 0.11F, 0.56F, 1.00F }, 2507 { 0.11f, 0.56f, 1.00f },
2137 { 0.93F, 0.46F, 0.00F }, 2508 { 0.93f, 0.46f, 0.00f },
2138 { 0.18F, 0.54F, 0.34F }, 2509 { 0.18f, 0.54f, 0.34f },
2139 2510
2140 { 0.56F, 0.73F, 0.56F }, 2511 { 0.56f, 0.73f, 0.56f },
2141 { 0.80F, 0.80F, 0.80F }, 2512 { 0.80f, 0.80f, 0.80f },
2142 { 0.55F, 0.41F, 0.13F }, 2513 { 0.55f, 0.41f, 0.13f },
2143 { 0.99F, 0.77F, 0.26F }, 2514 { 0.99f, 0.77f, 0.26f },
2144 2515
2145 { 0.74F, 0.65F, 0.41F }, 2516 { 0.74f, 0.65f, 0.41f },
2146 2517
2147 { 0.00F, 1.00F, 1.00F }, 2518 { 0.00f, 1.00f, 1.00f },
2148 { 1.00F, 0.00F, 1.00F }, 2519 { 1.00f, 0.00f, 1.00f },
2149 { 1.00F, 1.00F, 0.00F }, 2520 { 1.00f, 1.00f, 0.00f },
2150 }; 2521 };
2151 2522
2152 int x, y; 2523 int x, y;
2153 2524
2154 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 */
2155 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2532 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2156 glEnable (GL_BLEND); 2533 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2534 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glBegin (GL_QUADS); 2535 glBegin (GL_QUADS);
2159 2536
2160 for (y = 0; y < h; y++) 2537 for (y = 0; y < h; y++)
… …
2164 2541
2165 if (m) 2542 if (m)
2166 { 2543 {
2167 float *c = color [m & 15]; 2544 float *c = color [m & 15];
2168 2545
2169 float tx1 = m & 0x40 ? 0.5 : 0.; 2546 float tx1 = m & 0x40 ? 0.5f : 0.f;
2170 float tx2 = tx1 + 0.5; 2547 float tx2 = tx1 + 0.5f;
2171 2548
2172 glColor4f (c[0], c[1], c[2], 0.75); 2549 glColor4f (c[0], c[1], c[2], 1);
2173 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2550 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2174 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2551 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2175 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2552 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2176 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2553 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2177 } 2554 }
… …
2185void 2562void
2186fow_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)
2187 PPCODE: 2564 PPCODE:
2188{ 2565{
2189 int x, y; 2566 int x, y;
2190 int sw1 = sw + 2; 2567 int sw1 = sw + 2;
2191 int sh1 = sh + 2; 2568 int sh1 = sh + 2;
2192 int sh3 = sh * 3; 2569 int sh3 = sh * 3;
2193 int sw34 = (sw * 3 + 3) & ~3; 2570 int sw3 = sw * 3;
2194 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2571 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2195 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2572 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2196 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2573 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2197 2574
2198 SvPOK_only (darkness3_sv); 2575 SvPOK_only (darkness3_sv);
2199 SvCUR_set (darkness3_sv, sw34 * sh3); 2576 SvCUR_set (darkness3_sv, sw3 * sh3);
2200 2577
2201 mx += self->x - 1; 2578 mx += self->x - 1;
2202 my += self->y - 1; 2579 my += self->y - 1;
2203
2204 memset (darkness1, 255, sw1 * sh1);
2205 2580
2206 for (y = 0; y < sh1; y++) 2581 for (y = 0; y < sh1; y++)
2207 if (0 <= y + my && y + my < self->rows) 2582 if (0 <= y + my && y + my < self->rows)
2208 { 2583 {
2209 maprow *row = self->row + (y + my); 2584 maprow *row = self->row + (y + my);
… …
2212 if (row->c0 <= x + mx && x + mx < row->c1) 2587 if (row->c0 <= x + mx && x + mx < row->c1)
2213 { 2588 {
2214 mapcell *cell = row->col + (x + mx - row->c0); 2589 mapcell *cell = row->col + (x + mx - row->c0);
2215 2590
2216 darkness1 [y * sw1 + x] = cell->darkness 2591 darkness1 [y * sw1 + x] = cell->darkness
2217 ? 255 - (cell->darkness - 1) 2592 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2218 : 255 - FOW_DARKNESS; 2593 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2219 } 2594 }
2220 } 2595 }
2221 2596
2222 for (y = 0; y < sh; ++y) 2597 for (y = 0; y < sh; ++y)
2223 for (x = 0; x < sw; ++x) 2598 for (x = 0; x < sw; ++x)
… …
2242 2617
2243 uint8_t r13 = (d13 + d23 + d12) / 3; 2618 uint8_t r13 = (d13 + d23 + d12) / 3;
2244 uint8_t r23 = d23; 2619 uint8_t r23 = d23;
2245 uint8_t r33 = (d23 + d33 + d32) / 3; 2620 uint8_t r33 = (d23 + d33 + d32) / 3;
2246 2621
2247 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2622 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2248 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2623 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2249 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2624 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2250 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2625 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2251 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2626 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2252 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2627 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2253 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2628 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2254 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2629 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2255 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2630 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2256 } 2631 }
2257 2632
2258 free (darkness1); 2633 free (darkness1);
2259 2634
2260 EXTEND (SP, 3); 2635 EXTEND (SP, 3);
2261 PUSHs (sv_2mortal (newSViv (sw34))); 2636 PUSHs (sv_2mortal (newSViv (sw3)));
2262 PUSHs (sv_2mortal (newSViv (sh3))); 2637 PUSHs (sv_2mortal (newSViv (sh3)));
2263 PUSHs (darkness3_sv); 2638 PUSHs (darkness3_sv);
2264} 2639}
2265 2640
2266SV * 2641SV *
… …
2464 if (RETVAL < 0) 2839 if (RETVAL < 0)
2465 { 2840 {
2466 RETVAL = Mix_GroupOldest (-1); 2841 RETVAL = Mix_GroupOldest (-1);
2467 2842
2468 if (RETVAL < 0) 2843 if (RETVAL < 0)
2844 {
2845 // happens sometimes, maybe it just stopped playing(?)
2846 RETVAL = Mix_GroupAvailable (-1);
2847
2848 if (RETVAL < 0)
2469 XSRETURN_UNDEF; 2849 XSRETURN_UNDEF;
2470 2850 }
2851 else
2471 Mix_HaltChannel (RETVAL); 2852 Mix_HaltChannel (RETVAL);
2472 } 2853 }
2473 2854
2474 Mix_UnregisterAllEffects (RETVAL); 2855 Mix_UnregisterAllEffects (RETVAL);
2475 Mix_Volume (RETVAL, 128); 2856 Mix_Volume (RETVAL, 128);
2476} 2857}
… …
2523void 2904void
2524set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2905set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2525 CODE: 2906 CODE:
2526{ 2907{
2527 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2908 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2528 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2909 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2529 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2910 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2530} 2911}
2531 2912
2532void 2913void
2533set_reverse_stereo (DC::Channel self, int flip) 2914set_reverse_stereo (DC::Channel self, int flip)
… …
2535 Mix_SetReverseStereo (self, flip); 2916 Mix_SetReverseStereo (self, flip);
2536 2917
2537MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2918MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2538 2919
2539PROTOTYPES: DISABLE 2920PROTOTYPES: DISABLE
2921
2922void
2923decoders ()
2924 PPCODE:
2925#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2926 int i, num = Mix_GetNumChunkDecoders ();
2927 EXTEND (SP, num);
2928 for (i = 0; i < num; ++i)
2929 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2930#else
2931 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2932#endif
2540 2933
2541DC::MixChunk 2934DC::MixChunk
2542new (SV *class, DC::RW rwops) 2935new (SV *class, DC::RW rwops)
2543 CODE: 2936 CODE:
2544 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2937 RETVAL = Mix_LoadWAV_RW (rwops, 1);
… …
2577 OUTPUT: 2970 OUTPUT:
2578 RETVAL 2971 RETVAL
2579 2972
2580MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2973MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2581 2974
2975void
2976decoders ()
2977 PPCODE:
2978#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2979 int i, num = Mix_GetNumMusicDecoders ();
2980 EXTEND (SP, num);
2981 for (i = 0; i < num; ++i)
2982 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2983#else
2984 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2985#endif
2986
2582int 2987int
2583volume (int volume = -1) 2988volume (int volume = -1)
2584 PROTOTYPE: ;$ 2989 PROTOTYPE: ;$
2585 CODE: 2990 CODE:
2586 if (items > 0) 2991 if (items > 0)
… …
2596 3001
2597void 3002void
2598halt () 3003halt ()
2599 CODE: 3004 CODE:
2600 Mix_HaltMusic (); 3005 Mix_HaltMusic ();
3006
3007int
3008playing ()
3009 CODE:
3010 RETVAL = Mix_PlayingMusic ();
3011 OUTPUT:
3012 RETVAL
2601 3013
2602DC::MixMusic 3014DC::MixMusic
2603new (SV *class, DC::RW rwops) 3015new (SV *class, DC::RW rwops)
2604 CODE: 3016 CODE:
2605 RETVAL = Mix_LoadMUS_RW (rwops); 3017 RETVAL = Mix_LoadMUS_RW (rwops);
… …
2636 } *civ, const_iv[] = { 3048 } *civ, const_iv[] = {
2637# define const_iv(name) { # name, (IV)name } 3049# define const_iv(name) { # name, (IV)name }
2638 const_iv (GL_VENDOR), 3050 const_iv (GL_VENDOR),
2639 const_iv (GL_VERSION), 3051 const_iv (GL_VERSION),
2640 const_iv (GL_EXTENSIONS), 3052 const_iv (GL_EXTENSIONS),
3053 const_iv (GL_MAX_TEXTURE_UNITS),
2641 const_iv (GL_COLOR_MATERIAL), 3054 const_iv (GL_COLOR_MATERIAL),
2642 const_iv (GL_SMOOTH), 3055 const_iv (GL_SMOOTH),
2643 const_iv (GL_FLAT), 3056 const_iv (GL_FLAT),
2644 const_iv (GL_DITHER), 3057 const_iv (GL_DITHER),
2645 const_iv (GL_BLEND), 3058 const_iv (GL_BLEND),
… …
2657 const_iv (GL_ZERO), 3070 const_iv (GL_ZERO),
2658 const_iv (GL_SRC_ALPHA), 3071 const_iv (GL_SRC_ALPHA),
2659 const_iv (GL_DST_ALPHA), 3072 const_iv (GL_DST_ALPHA),
2660 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3073 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2661 const_iv (GL_ONE_MINUS_DST_ALPHA), 3074 const_iv (GL_ONE_MINUS_DST_ALPHA),
3075 const_iv (GL_SRC_COLOR),
3076 const_iv (GL_DST_COLOR),
3077 const_iv (GL_ONE_MINUS_SRC_COLOR),
3078 const_iv (GL_ONE_MINUS_DST_COLOR),
2662 const_iv (GL_SRC_ALPHA_SATURATE), 3079 const_iv (GL_SRC_ALPHA_SATURATE),
2663 const_iv (GL_RGB), 3080 const_iv (GL_RGB),
2664 const_iv (GL_RGBA), 3081 const_iv (GL_RGBA),
2665 const_iv (GL_RGBA4), 3082 const_iv (GL_RGBA4),
2666 const_iv (GL_RGBA8), 3083 const_iv (GL_RGBA8),
… …
2734 const_iv (GL_NICEST), 3151 const_iv (GL_NICEST),
2735 const_iv (GL_V2F), 3152 const_iv (GL_V2F),
2736 const_iv (GL_V3F), 3153 const_iv (GL_V3F),
2737 const_iv (GL_T2F_V3F), 3154 const_iv (GL_T2F_V3F),
2738 const_iv (GL_T2F_N3F_V3F), 3155 const_iv (GL_T2F_N3F_V3F),
3156 const_iv (GL_FUNC_ADD),
3157 const_iv (GL_FUNC_SUBTRACT),
3158 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2739# undef const_iv 3159# undef const_iv
2740 }; 3160 };
2741 3161
2742 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3162 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2743 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3163 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2750disable_GL_EXT_blend_func_separate () 3170disable_GL_EXT_blend_func_separate ()
2751 CODE: 3171 CODE:
2752 gl.BlendFuncSeparate = 0; 3172 gl.BlendFuncSeparate = 0;
2753 gl.BlendFuncSeparateEXT = 0; 3173 gl.BlendFuncSeparateEXT = 0;
2754 3174
3175void
3176apple_nvidia_bug (int enable)
3177
2755char * 3178char *
2756gl_vendor () 3179gl_vendor ()
2757 CODE: 3180 CODE:
2758 RETVAL = (char *)glGetString (GL_VENDOR); 3181 RETVAL = (char *)glGetString (GL_VENDOR);
2759 OUTPUT: 3182 OUTPUT:
… …
2789 3212
2790int glGetError () 3213int glGetError ()
2791 3214
2792void glFinish () 3215void glFinish ()
2793 3216
3217void glFlush ()
3218
2794void glClear (int mask) 3219void glClear (int mask)
2795 3220
2796void glClearColor (float r, float g, float b, float a = 1.0) 3221void glClearColor (float r, float g, float b, float a = 1.0)
2797 PROTOTYPE: @ 3222 PROTOTYPE: @
2798 3223
… …
2807void glBlendFunc (int sfactor, int dfactor) 3232void glBlendFunc (int sfactor, int dfactor)
2808 3233
2809void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3234void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2810 CODE: 3235 CODE:
2811 gl_BlendFuncSeparate (sa, da, saa, daa); 3236 gl_BlendFuncSeparate (sa, da, saa, daa);
3237
3238# void glBlendEquation (int se)
2812 3239
2813void glDepthMask (int flag) 3240void glDepthMask (int flag)
2814 3241
2815void glLogicOp (int opcode) 3242void glLogicOp (int opcode)
2816 3243
… …
2851void glRotate (float angle, float x, float y, float z) 3278void glRotate (float angle, float x, float y, float z)
2852 CODE: 3279 CODE:
2853 glRotatef (angle, x, y, z); 3280 glRotatef (angle, x, y, z);
2854 3281
2855void glColor (float r, float g, float b, float a = 1.0) 3282void glColor (float r, float g, float b, float a = 1.0)
3283 PROTOTYPE: @
2856 ALIAS: 3284 ALIAS:
2857 glColor_premultiply = 1 3285 glColor_premultiply = 1
2858 CODE: 3286 CODE:
2859 if (ix) 3287 if (ix)
2860 { 3288 {
… …
2965void glNewList (int list, int mode = GL_COMPILE) 3393void glNewList (int list, int mode = GL_COMPILE)
2966 3394
2967void glEndList () 3395void glEndList ()
2968 3396
2969void glCallList (int list) 3397void glCallList (int list)
3398
3399void c_init ()
3400 CODE:
3401 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3402 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2970 3403
2971MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3404MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2972 3405
2973PROTOTYPES: DISABLE 3406PROTOTYPES: DISABLE
2974 3407

Diff Legend

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