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.275 by root, Thu Aug 28 00:53:53 2008 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
44/* work around os x broken headers */ 43/* work around os x broken headers */
45#ifdef __MACOSX__ 44#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 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);
47#endif 48#endif
48 49
49#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
51 52
52#include <glib/gmacros.h> 53#include <glib.h>
53 54
54#include <pango/pango.h> 55#include <pango/pango.h>
55 56
56#ifndef PANGO_VERSION_CHECK 57#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 58# define PANGO_VERSION_CHECK(a,b,c) 0
81#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
83 84
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 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 */
86#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
87 91
88#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
90 94
91#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
92 96
93/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
99
100#define KMOD_LRAM 0x10000 // our extension
101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
95 123
96static AV *texture_av; 124static AV *texture_av;
97 125
98static struct 126static struct
99{ 127{
156{ 184{
157 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
158 186
159 while (attrs) 187 while (attrs)
160 { 188 {
161 PangoAttribute *attr = attrs->data; 189 PangoAttribute *attr = (PangoAttribute *)attrs->data;
162 190
163 if (attr->klass->type == PANGO_ATTR_SHAPE) 191 if (attr->klass->type == PANGO_ATTR_SHAPE)
164 return 1; 192 return 1;
165 193
166 attrs = attrs->next; 194 attrs = attrs->next;
184static void 212static void
185substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
186{ 214{
187 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
188#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
189 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
190#endif 218#endif
191 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
192} 220}
193 221
194static void 222static void
231 int w, h; 259 int w, h;
232 float s, t; 260 float s, t;
233 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
234 tileid smoothtile; 262 tileid smoothtile;
235 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
236} maptex; 265} maptex;
237 266
238typedef struct { 267typedef struct {
239 uint32_t player; 268 uint32_t player;
240 tileid tile[3]; 269 tileid tile[3];
453 482
454 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
455} 484}
456 485
457static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
458minpot (unsigned int n) 493minpot (unsigned int n)
459{ 494{
460 if (!n) 495 if (!n)
461 return 0; 496 return 0;
462 497
527 return 0; 562 return 0;
528 563
529 return 1; 564 return 1;
530} 565}
531 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
532static void 581static void
533deliantra_main () 582deliantra_main (SV *real_main)
534{ 583{
535 char *argv[] = { 0 }; 584 dSP;
536 call_argv ("::main", G_DISCARD | G_VOID, argv); 585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
537} 588}
538 589
539#ifdef __MACOSX__ 590#ifdef __MACOSX__
591 static SV *real_main;
592
540 /* to due surprising braindamage on the side of SDL design, we 593 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main() 594 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which, 595 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back. 597 * and which calls our main (== SDL_main) back.
545 */ 598 */
546 extern C_LINKAGE int 599 extern C_LINKAGE int
547 main (int argc, char *argv[]) 600 main (int argc, char *argv[])
548 { 601 {
549 deliantra_main (); 602 deliantra_main (real_main);
550 } 603 }
551 604
552 #undef main 605 #undef main
553 606
554 extern C_LINKAGE int main (int argc, char *argv[]); 607 extern C_LINKAGE int main (int argc, char *argv[]);
555 608
556 static void 609 static void
557 SDL_braino (void) 610 SDL_main_hack (SV *real_main_)
558 { 611 {
612 real_main = real_main_;
613
559 char *argv[] = { "deliantra client", 0 }; 614 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv); 615 (main) (1, argv);
561 } 616 }
562#else 617#else
563 static void 618 static void
564 SDL_braino (void) 619 SDL_main_hack (SV *real_main)
565 { 620 {
566 deliantra_main (); 621 deliantra_main (real_main);
567 } 622 }
568#endif 623#endif
569 624
570MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
571 626
737 const_iv (KMOD_RMETA), 792 const_iv (KMOD_RMETA),
738 const_iv (KMOD_NUM), 793 const_iv (KMOD_NUM),
739 const_iv (KMOD_CAPS), 794 const_iv (KMOD_CAPS),
740 const_iv (KMOD_MODE), 795 const_iv (KMOD_MODE),
741 796
797 const_iv (KMOD_LRAM),
798
742 const_iv (MIX_DEFAULT_FORMAT), 799 const_iv (MIX_DEFAULT_FORMAT),
743 800
744 const_iv (SDL_INIT_TIMER), 801 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO), 802 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO), 803 const_iv (SDL_INIT_VIDEO),
770 827
771 const_iv (FOW_DARKNESS) 828 const_iv (FOW_DARKNESS)
772# undef const_iv 829# undef const_iv
773 }; 830 };
774 831
775 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 832 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
777 834
778 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
779 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
780} 837}
781 838
797NV ceil (NV x) 854NV ceil (NV x)
798 855
799IV minpot (UV n) 856IV minpot (UV n)
800 857
801IV popcount (UV n) 858IV popcount (UV n)
859
860NV distance (NV dx, NV dy)
861 CODE:
862 RETVAL = pow (dx * dx + dy * dy, 0.5);
863 OUTPUT:
864 RETVAL
802 865
803void 866void
804pango_init () 867pango_init ()
805 CODE: 868 CODE:
806{ 869{
814#endif 877#endif
815} 878}
816 879
817char *SDL_GetError () 880char *SDL_GetError ()
818 881
819void SDL_braino () 882void SDL_main_hack (SV *real_main)
883 PROTOTYPE: &
820 884
821int SDL_Init (U32 flags) 885int SDL_Init (U32 flags)
822 886
823int SDL_InitSubSystem (U32 flags) 887int SDL_InitSubSystem (U32 flags)
824 888
825void SDL_QuitSubSystem (U32 flags) 889void SDL_QuitSubSystem (U32 flags)
826 890
827void SDL_Quit () 891void SDL_Quit ()
828 892
829int SDL_GL_SetAttribute (int attr, int value) 893int SDL_GL_SetAttribute (int attr, int value)
894 C_ARGS: (SDL_GLattr)attr, value
830 895
831int SDL_GL_GetAttribute (int attr) 896int SDL_GL_GetAttribute (int attr)
832 CODE: 897 CODE:
833 if (SDL_GL_GetAttribute (attr, &RETVAL)) 898 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
834 XSRETURN_UNDEF; 899 XSRETURN_UNDEF;
835 OUTPUT: 900 OUTPUT:
836 RETVAL 901 RETVAL
837 902
838void 903void
893 ); 958 );
894 959
895 if (RETVAL) 960 if (RETVAL)
896 { 961 {
897 av_clear (texture_av); 962 av_clear (texture_av);
898
899 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
900#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 963#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
901#include "glfunc.h" 964#include "glfunc.h"
902#undef GL_FUNC 965#undef GL_FUNC
966 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
967 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
903 } 968 }
904} 969}
905 OUTPUT: 970 OUTPUT:
906 RETVAL 971 RETVAL
972
973void
974SDL_WM_SetCaption (const char *title, const char *icon)
907 975
908void 976void
909SDL_GL_SwapBuffers () 977SDL_GL_SwapBuffers ()
910 978
911char * 979char *
912SDL_GetKeyName (int sym) 980SDL_GetKeyName (int sym)
981 C_ARGS: (SDLKey)sym
913 982
914int 983int
915SDL_GetAppState () 984SDL_GetAppState ()
916 985
917int 986int
918SDL_GetModState () 987SDL_GetModState ()
919 988
989int
990SDL_WaitEvent ()
991 C_ARGS: 0
992
920void 993void
994SDL_PumpEvents ()
995
996void
921poll_events () 997peep_events ()
922 PPCODE: 998 PPCODE:
923{ 999{
924 SDL_Event ev; 1000 SDL_Event ev;
925 1001
926 SDL_PumpEvents (); 1002 SDL_PumpEvents ();
933 { 1009 {
934 case SDL_KEYDOWN: 1010 case SDL_KEYDOWN:
935 case SDL_KEYUP: 1011 case SDL_KEYUP:
936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1012 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1013 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
938 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1014 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
939 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1015 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
940 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1016 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
941 break; 1017 break;
942 1018
943 case SDL_ACTIVEEVENT: 1019 case SDL_ACTIVEEVENT:
944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1020 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
962 x = ev.motion.x; 1038 x = ev.motion.x;
963 y = ev.motion.y; 1039 y = ev.motion.y;
964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1040 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
965 } 1041 }
966 1042
967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1043 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
968 hv_store (hv, "state", 5, newSViv (state), 0); 1044 hv_store (hv, "state", 5, newSViv (state), 0);
969 hv_store (hv, "x", 1, newSViv (x), 0); 1045 hv_store (hv, "x", 1, newSViv (x), 0);
970 hv_store (hv, "y", 1, newSViv (y), 0); 1046 hv_store (hv, "y", 1, newSViv (y), 0);
971 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1047 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
972 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1048 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
992 1068
993 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1069 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
994 } 1070 }
995} 1071}
996 1072
1073char *
1074SDL_AudioDriverName ()
1075 CODE:
1076{
1077 char buf [256];
1078 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1079 XSRETURN_UNDEF;
1080
1081 RETVAL = buf;
1082}
1083 OUTPUT:
1084 RETVAL
1085
997int 1086int
998Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1087Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
999 POSTCALL: 1088 POSTCALL:
1000 Mix_HookMusicFinished (music_finished); 1089 Mix_HookMusicFinished (music_finished);
1001 Mix_ChannelFinished (channel_finished); 1090 Mix_ChannelFinished (channel_finished);
1063add_font (char *file) 1152add_font (char *file)
1064 CODE: 1153 CODE:
1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1154 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT: 1155 OUTPUT:
1067 RETVAL 1156 RETVAL
1157
1158void
1159IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1160
1161# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1162void
1163Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1068 1164
1069void 1165void
1070load_image_inline (SV *image_) 1166load_image_inline (SV *image_)
1071 ALIAS: 1167 ALIAS:
1072 load_image_file = 1 1168 load_image_file = 1
1118 1214
1119 SDL_LockSurface (surface2); 1215 SDL_LockSurface (surface2);
1120 EXTEND (SP, 6); 1216 EXTEND (SP, 6);
1121 PUSHs (sv_2mortal (newSViv (surface2->w))); 1217 PUSHs (sv_2mortal (newSViv (surface2->w)));
1122 PUSHs (sv_2mortal (newSViv (surface2->h))); 1218 PUSHs (sv_2mortal (newSViv (surface2->h)));
1123 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1219 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1124 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1220 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1125 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1221 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1126 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1222 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1127 SDL_UnlockSurface (surface2); 1223 SDL_UnlockSurface (surface2);
1128 1224
1188#if DEBUG 1284#if DEBUG
1189 VALGRIND_DO_LEAK_CHECK; 1285 VALGRIND_DO_LEAK_CHECK;
1190#endif 1286#endif
1191} 1287}
1192 1288
1289int
1290SvREFCNT (SV *sv)
1291 CODE:
1292 RETVAL = SvREFCNT (sv);
1293 OUTPUT:
1294 RETVAL
1295
1193MODULE = Deliantra::Client PACKAGE = DC::Font 1296MODULE = Deliantra::Client PACKAGE = DC::Font
1194 1297
1195PROTOTYPES: DISABLE 1298PROTOTYPES: DISABLE
1196 1299
1197DC::Font 1300DC::Font
1198new_from_file (SV *class, char *path, int id = 0) 1301new_from_file (SV *klass, char *path, int id = 0)
1199 CODE: 1302 CODE:
1200{ 1303{
1201 int count; 1304 int count;
1202 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1305 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1203 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1306 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1232 PROTOTYPE: 1335 PROTOTYPE:
1233 CODE: 1336 CODE:
1234 tc_restore (); 1337 tc_restore ();
1235 1338
1236DC::Layout 1339DC::Layout
1237new (SV *class) 1340new (SV *klass)
1238 CODE: 1341 CODE:
1239 New (0, RETVAL, 1, struct cf_layout); 1342 New (0, RETVAL, 1, struct cf_layout);
1240 1343
1241 RETVAL->pl = pango_layout_new (opengl_context); 1344 RETVAL->pl = pango_layout_new (opengl_context);
1242 RETVAL->r = 1.; 1345 RETVAL->r = 1.;
1391 1494
1392void 1495void
1393set_height (DC::Layout self, int base_height) 1496set_height (DC::Layout self, int base_height)
1394 CODE: 1497 CODE:
1395 if (self->base_height != base_height) 1498 if (self->base_height != base_height)
1396 { 1499 {
1397 self->base_height = base_height; 1500 self->base_height = base_height;
1398 layout_update_font (self); 1501 layout_update_font (self);
1399 } 1502 }
1400 1503
1401void 1504void
1628 glDisable (GL_ALPHA_TEST); 1731 glDisable (GL_ALPHA_TEST);
1629 glDisable (GL_BLEND); 1732 glDisable (GL_BLEND);
1630 } 1733 }
1631} 1734}
1632 1735
1736void
1737draw_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)
1738 PROTOTYPE: @
1739 CODE:
1740{
1741 glEnable (GL_BLEND);
1742 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1743 glEnable (GL_TEXTURE_2D);
1744 glBindTexture (GL_TEXTURE_2D, name1);
1745
1746 glColor3f (intensity, intensity, intensity);
1747 glPushMatrix ();
1748 glScalef (1./3, 1./3, 1.);
1749
1750 if (blend > 0.f)
1751 {
1752 float dx3 = dx * -3.f / w;
1753 float dy3 = dy * -3.f / h;
1754 GLfloat env_color[4] = { 0., 0., 0., blend };
1755
1756 /* interpolate the two shadow textures */
1757 /* stage 0 == rgb(glcolor) + alpha(t0) */
1758 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1759
1760 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1761 gl.ActiveTexture (GL_TEXTURE1);
1762 glEnable (GL_TEXTURE_2D);
1763 glBindTexture (GL_TEXTURE_2D, name2);
1764 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1765
1766 /* rgb == rgb(glcolor) */
1767 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1768 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1769 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1770
1771 /* alpha = interpolate t0, t1 by env_alpha */
1772 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1773
1774 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1775 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1776 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1777
1778 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1779 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1780
1781 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1782 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1783
1784 glBegin (GL_QUADS);
1785 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1787 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1788 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1789 glEnd ();
1790
1791 glDisable (GL_TEXTURE_2D);
1792 gl.ActiveTexture (GL_TEXTURE0);
1793 }
1794 else
1795 {
1796 /* simple blending of one texture, also opengl <1.3 path */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1798
1799 glBegin (GL_QUADS);
1800 glTexCoord2f (0, 0); glVertex2f (0, 0);
1801 glTexCoord2f (0, t); glVertex2f (0, h);
1802 glTexCoord2f (s, t); glVertex2f (w, h);
1803 glTexCoord2f (s, 0); glVertex2f (w, 0);
1804 glEnd ();
1805 }
1806
1807 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1808 {
1809 int x, y;
1810 int dx3 = dx * 3;
1811 int dy3 = dy * 3;
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1814 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1815 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1816 glTranslatef (-1., -1., 0);
1817 glBegin (GL_QUADS);
1818
1819 for (y = 1; y < h; y += 3)
1820 {
1821 int y1 = y - dy3;
1822 int y1valid = y1 >= 0 && y1 < h;
1823
1824 for (x = 1; x < w; x += 3)
1825 {
1826 int x1 = x - dx3;
1827 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1828 uint8_t h2;
1829
1830 if (y1valid && x1 >= 0 && x1 < w)
1831 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1832 else
1833 h2 = 1; /* out of range == invisible */
1834
1835 if (h1 || h2)
1836 {
1837 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1838 glColor4f (1., 1., 1., alpha);
1839
1840 glTexCoord2f (0, 0.); glVertex2i (x , y );
1841 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1842 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1843 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1844 }
1845 }
1846 }
1847 }
1848
1849 glEnd ();
1850
1851 glPopMatrix ();
1852
1853 glDisable (GL_TEXTURE_2D);
1854 glDisable (GL_BLEND);
1855}
1856
1633IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1857IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1634 CODE: 1858 CODE:
1635{ 1859{
1636 GLint width; 1860 GLint width;
1637 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1861 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1644MODULE = Deliantra::Client PACKAGE = DC::Map 1868MODULE = Deliantra::Client PACKAGE = DC::Map
1645 1869
1646PROTOTYPES: DISABLE 1870PROTOTYPES: DISABLE
1647 1871
1648DC::Map 1872DC::Map
1649new (SV *class) 1873new (SV *klass)
1650 CODE: 1874 CODE:
1651 New (0, RETVAL, 1, struct map); 1875 New (0, RETVAL, 1, struct map);
1652 RETVAL->x = 0; 1876 RETVAL->x = 0;
1653 RETVAL->y = 0; 1877 RETVAL->y = 0;
1654 RETVAL->w = 0; 1878 RETVAL->w = 0;
1741 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1965 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1742 // use uglier nearest interpolation because linear suffers 1966 // use uglier nearest interpolation because linear suffers
1743 // from transparent color bleeding and ugly wrapping effects. 1967 // from transparent color bleeding and ugly wrapping effects.
1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1968 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1745} 1969}
1970
1971void
1972expire_textures (DC::Map self, int texid, int count)
1973 PPCODE:
1974 for (; texid < self->texs && count; ++texid, --count)
1975 {
1976 maptex *tex = self->tex + texid;
1977
1978 if (tex->name)
1979 {
1980 if (tex->unused)
1981 {
1982 tex->name = 0;
1983 tex->unused = 0;
1984 XPUSHs (sv_2mortal (newSViv (texid)));
1985 }
1986 else
1987 tex->unused = 1;
1988 }
1989 }
1746 1990
1747int 1991int
1748ox (DC::Map self) 1992ox (DC::Map self)
1749 ALIAS: 1993 ALIAS:
1750 oy = 1 1994 oy = 1
1790 self->y += MAP_EXTEND_Y; 2034 self->y += MAP_EXTEND_Y;
1791 } 2035 }
1792} 2036}
1793 2037
1794SV * 2038SV *
1795map1a_update (DC::Map self, SV *data_, int extmap) 2039map1a_update (DC::Map self, SV *data_)
1796 CODE: 2040 CODE:
1797{ 2041{
1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2042 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1799 uint8_t *data_end = (uint8_t *)SvEND (data_); 2043 uint8_t *data_end = (uint8_t *)SvEND (data_);
1800 mapcell *cell; 2044 mapcell *cell;
1821 2065
1822 //TODO: don't trust server data to be in-range(!) 2066 //TODO: don't trust server data to be in-range(!)
1823 2067
1824 if (flags & 8) 2068 if (flags & 8)
1825 { 2069 {
2070 uint8_t ext, cmd;
2071
1826 if (extmap) 2072 do
1827 { 2073 {
1828 uint8_t ext, cmd; 2074 ext = *data++;
2075 cmd = ext & 0x7f;
1829 2076
1830 do 2077 if (cmd < 4)
2078 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2079 else if (cmd == 5) // health
1831 { 2080 {
1832 ext = *data++;
1833 cmd = ext & 0x7f;
1834
1835 if (cmd < 4)
1836 cell->darkness = 255 - ext * 64 + 1;
1837 else if (cmd == 5) // health
1838 {
1839 cell->stat_width = 1; 2081 cell->stat_width = 1;
1840 cell->stat_hp = *data++; 2082 cell->stat_hp = *data++;
1841 }
1842 else if (cmd == 6) // monster width
1843 cell->stat_width = *data++ + 1;
1844 else if (cmd == 0x47)
1845 {
1846 if (*data == 1) cell->player = data [1];
1847 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1848 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1849 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1850
1851 data += *data + 1;
1852 }
1853 else if (cmd == 8) // cell flags
1854 cell->flags = *data++;
1855 else if (ext & 0x40) // unknown, multibyte => skip
1856 data += *data + 1;
1857 else
1858 data++;
1859 } 2083 }
1860 while (ext & 0x80); 2084 else if (cmd == 6) // monster width
2085 cell->stat_width = *data++ + 1;
2086 else if (cmd == 0x47)
2087 {
2088 if (*data == 1) cell->player = data [1];
2089 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2090 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2091 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2092
2093 data += *data + 1;
2094 }
2095 else if (cmd == 8) // cell flags
2096 cell->flags = *data++;
2097 else if (ext & 0x40) // unknown, multibyte => skip
2098 data += *data + 1;
2099 else
2100 data++;
1861 } 2101 }
1862 else 2102 while (ext & 0x80);
1863 cell->darkness = *data++ + 1;
1864 } 2103 }
1865 2104
1866 for (z = 0; z <= 2; ++z) 2105 for (z = 0; z <= 2; ++z)
1867 if (flags & (4 >> z)) 2106 if (flags & (4 >> z))
1868 { 2107 {
1871 cell->tile [z] = self->face2tile [face]; 2110 cell->tile [z] = self->face2tile [face];
1872 2111
1873 if (cell->tile [z]) 2112 if (cell->tile [z])
1874 { 2113 {
1875 maptex *tex = self->tex + cell->tile [z]; 2114 maptex *tex = self->tex + cell->tile [z];
2115 tex->unused = 0;
1876 if (!tex->name) 2116 if (!tex->name)
1877 av_push (missing, newSViv (cell->tile [z])); 2117 av_push (missing, newSViv (cell->tile [z]));
1878 2118
1879 if (tex->smoothtile) 2119 if (tex->smoothtile)
1880 { 2120 {
1881 maptex *smooth = self->tex + tex->smoothtile; 2121 maptex *smooth = self->tex + tex->smoothtile;
2122 smooth->unused = 0;
1882 if (!smooth->name) 2123 if (!smooth->name)
1883 av_push (missing, newSViv (tex->smoothtile)); 2124 av_push (missing, newSViv (tex->smoothtile));
1884 } 2125 }
1885 } 2126 }
1886 } 2127 }
1914 ? self->row + y 2155 ? self->row + y
1915 : 0; 2156 : 0;
1916 2157
1917 for (x = x0; x < x1; x++) 2158 for (x = x0; x < x1; x++)
1918 { 2159 {
1919 int r = 32, g = 32, b = 32, a = 192; 2160 unsigned int r = 32, g = 32, b = 32, a = 192;
1920 2161
1921 if (row && row->c0 <= x && x < row->c1) 2162 if (row && row->c0 <= x && x < row->c1)
1922 { 2163 {
1923 mapcell *cell = row->col + (x - row->c0); 2164 mapcell *cell = row->col + (x - row->c0);
1924 2165
1926 { 2167 {
1927 maptex tex = self->tex [cell->tile [z]]; 2168 maptex tex = self->tex [cell->tile [z]];
1928 int a0 = 255 - tex.a; 2169 int a0 = 255 - tex.a;
1929 int a1 = tex.a; 2170 int a1 = tex.a;
1930 2171
1931 r = (r * a0 + tex.r * a1) / 255; 2172 r = div255 (r * a0 + tex.r * a1);
1932 g = (g * a0 + tex.g * a1) / 255; 2173 g = div255 (g * a0 + tex.g * a1);
1933 b = (b * a0 + tex.b * a1) / 255; 2174 b = div255 (b * a0 + tex.b * a1);
1934 a = (a * a0 + tex.a * a1) / 255; 2175 a = div255 (a * a0 + tex.a * a1);
1935 } 2176 }
1936 } 2177 }
1937 2178
1938 *map++ = (r ) 2179 *map++ = (r )
1939 | (g << 8) 2180 | (g << 8)
1946} 2187}
1947 OUTPUT: 2188 OUTPUT:
1948 RETVAL 2189 RETVAL
1949 2190
1950void 2191void
1951draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2192draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1952 CODE: 2193 CODE:
1953{ 2194{
1954 int x, y, z; 2195 int x, y, z;
1955 2196
1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2197 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1957 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2198 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1958 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2199 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1959 smooth_key skey; 2200 smooth_key skey;
1960 int pl_x, pl_y; 2201 int pl_x, pl_y;
1961 maptex pl_tex; 2202 maptex pl_tex;
1962 rc_t *rc = rc_alloc (); 2203 rc_t *rc = rc_alloc ();
2204 rc_t *rc_ov = rc_alloc ();
1963 rc_key_t key; 2205 rc_key_t key;
1964 rc_array_t *arr; 2206 rc_array_t *arr;
1965 2207
1966 pl_tex.name = 0; 2208 pl_tex.name = 0;
1967 2209
1968 // thats current max. sorry. 2210 // that's current max. sorry.
1969 if (sw > 255) sw = 255; 2211 if (sw > 255) sw = 255;
1970 if (sh > 255) sh = 255; 2212 if (sh > 255) sh = 255;
1971 2213
1972 // clear key, in case of extra padding 2214 // clear key, in case of extra padding
1973 memset (&skey, 0, sizeof (skey)); 2215 memset (&skey, 0, sizeof (skey));
1977 key.g = 255; 2219 key.g = 255;
1978 key.b = 255; 2220 key.b = 255;
1979 key.a = 255; 2221 key.a = 255;
1980 key.mode = GL_QUADS; 2222 key.mode = GL_QUADS;
1981 key.format = GL_T2F_V3F; 2223 key.format = GL_T2F_V3F;
1982 key.texname = -1;
1983 2224
1984 mx += self->x; 2225 mx += self->x;
1985 my += self->y; 2226 my += self->y;
1986 2227
1987 // first pass: determine smooth_max 2228 // first pass: determine smooth_max
2011 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2252 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2012 2253
2013 for (z = 0; z <= 2; z++) 2254 for (z = 0; z <= 2; z++)
2014 { 2255 {
2015 memset (smooth_level, 0, sizeof (smooth_level)); 2256 memset (smooth_level, 0, sizeof (smooth_level));
2257 key.texname = -1;
2016 2258
2017 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
2018 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
2019 { 2261 {
2020 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
2026 tileid tile = cell->tile [z]; 2268 tileid tile = cell->tile [z];
2027 2269
2028 if (tile) 2270 if (tile)
2029 { 2271 {
2030 maptex tex = self->tex [tile]; 2272 maptex tex = self->tex [tile];
2031 int px = (x + 1) * T - tex.w; 2273 int px, py;
2032 int py = (y + 1) * T - tex.h;
2033 2274
2034 if (key.texname != tex.name) 2275 if (key.texname != tex.name)
2035 { 2276 {
2277 self->tex [tile].unused = 0;
2278
2036 if (!tex.name) 2279 if (!tex.name)
2037 tex = self->tex [2]; /* missing, replace by noface */ 2280 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2038 2281
2039 key.texname = tex.name; 2282 key.texname = tex.name;
2040 arr = rc_array (rc, &key); 2283 arr = rc_array (rc, &key);
2041 } 2284 }
2285
2286 px = (x + 1) * Th - tex.w;
2287 py = (y + 1) * Tw - tex.h;
2042 2288
2043 if (expect_false (cell->player == player) && expect_false (z == 2)) 2289 if (expect_false (cell->player == player) && expect_false (z == 2))
2044 { 2290 {
2045 pl_x = px; 2291 pl_x = px;
2046 pl_y = py; 2292 pl_y = py;
2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2052 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2298 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2053 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2299 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2054 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2300 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2055 2301
2056 if (expect_false (cell->flags) && expect_false (z == 2))
2057 {
2058 // overlays such as the speech bubble, probably more to come
2059 if (cell->flags & 1)
2060 {
2061 maptex tex = self->tex [1];
2062 int px = x * T + T * 2 / 32;
2063 int py = y * T - T * 6 / 32;
2064
2065 if (tex.name)
2066 {
2067 if (key.texname != tex.name)
2068 {
2069 key.texname = tex.name;
2070 arr = rc_array (rc, &key);
2071 }
2072
2073 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2074 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2075 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2076 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2077 }
2078 }
2079 }
2080
2081 // update smooth hash 2302 // update smooth hash
2082 if (tex.smoothtile) 2303 if (tex.smoothtile)
2083 { 2304 {
2084 skey.tile = tex.smoothtile; 2305 skey.tile = tex.smoothtile;
2085 skey.level = tex.smoothlevel; 2306 skey.level = tex.smoothlevel;
2113 // corners 2334 // corners
2114 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2335 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2115 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2336 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2116 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2337 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2117 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2338 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2339 }
2340 }
2341
2342 if (expect_false (z == 2) && expect_false (cell->flags))
2343 {
2344 // overlays such as the speech bubble, probably more to come
2345 if (cell->flags & 1)
2346 {
2347 rc_key_t key_ov = key;
2348 maptex tex = self->tex [TEXID_SPEECH];
2349 rc_array_t *arr;
2350 int px = x * Tw + Tw * 2 / 32;
2351 int py = y * Th - Th * 6 / 32;
2352
2353 key_ov.texname = tex.name;
2354 arr = rc_array (rc_ov, &key_ov);
2355
2356 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2357 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2358 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2359 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2118 } 2360 }
2119 } 2361 }
2120 } 2362 }
2121 } 2363 }
2122 2364
2149 if (!(bits & 0x1000) 2391 if (!(bits & 0x1000)
2150 && skey->level == level 2392 && skey->level == level
2151 && level > smooth_max [skey->x][skey->y]) 2393 && level > smooth_max [skey->x][skey->y])
2152 { 2394 {
2153 maptex tex = self->tex [skey->tile]; 2395 maptex tex = self->tex [skey->tile];
2154 int px = (((int)skey->x) - 1) * T; 2396 int px = (((int)skey->x) - 1) * Tw;
2155 int py = (((int)skey->y) - 1) * T; 2397 int py = (((int)skey->y) - 1) * Th;
2156 int border = bits & 15; 2398 int border = bits & 15;
2157 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2399 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2158 float dx = tex.s * .0625f; // 16 images/row 2400 float dx = tex.s * .0625f; // 16 images/row
2159 float dy = tex.t * .5f ; // 2 images/column 2401 float dy = tex.t * .5f ; // 2 images/column
2160 2402
2162 { 2404 {
2163 // this time avoiding texture state changes 2405 // this time avoiding texture state changes
2164 // save gobs of state changes. 2406 // save gobs of state changes.
2165 if (key.texname != tex.name) 2407 if (key.texname != tex.name)
2166 { 2408 {
2409 self->tex [skey->tile].unused = 0;
2410
2167 glEnd (); 2411 glEnd ();
2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2412 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2169 glBegin (GL_QUADS); 2413 glBegin (GL_QUADS);
2170 } 2414 }
2171 2415
2172 if (border) 2416 if (border)
2173 { 2417 {
2174 float ox = border * dx; 2418 float ox = border * dx;
2175 2419
2176 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2420 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2177 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2421 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2178 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2422 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2179 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2423 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2180 } 2424 }
2181 2425
2182 if (corner) 2426 if (corner)
2183 { 2427 {
2184 float ox = corner * dx; 2428 float ox = corner * dx;
2185 2429
2186 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2187 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2188 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2189 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2190 } 2434 }
2191 } 2435 }
2192 } 2436 }
2193 } 2437 }
2194 } 2438 }
2217 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2461 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2218 2462
2219 rc_draw (rc); 2463 rc_draw (rc);
2220 } 2464 }
2221 2465
2466 rc_draw (rc_ov);
2467 rc_clear (rc_ov);
2468
2222 glDisable (GL_BLEND); 2469 glDisable (GL_BLEND);
2223 rc_free (rc); 2470 rc_free (rc);
2471 rc_free (rc_ov);
2224 2472
2225 // top layer: overlays such as the health bar 2473 // top layer: overlays such as the health bar
2226 for (y = 0; y < sh; y++) 2474 for (y = 0; y < sh; y++)
2227 if (0 <= y + my && y + my < self->rows) 2475 if (0 <= y + my && y + my < self->rows)
2228 { 2476 {
2231 for (x = 0; x < sw; x++) 2479 for (x = 0; x < sw; x++)
2232 if (row->c0 <= x + mx && x + mx < row->c1) 2480 if (row->c0 <= x + mx && x + mx < row->c1)
2233 { 2481 {
2234 mapcell *cell = row->col + (x + mx - row->c0); 2482 mapcell *cell = row->col + (x + mx - row->c0);
2235 2483
2236 int px = x * T; 2484 int px = x * Tw;
2237 int py = y * T; 2485 int py = y * Th;
2486
2487 if (expect_false (cell->player == player))
2488 {
2489 px += sdx;
2490 py += sdy;
2491 }
2238 2492
2239 if (cell->stat_hp) 2493 if (cell->stat_hp)
2240 { 2494 {
2241 int width = cell->stat_width * T; 2495 int width = cell->stat_width * Tw;
2242 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2496 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2243 2497
2244 glColor3ub (0, 0, 0); 2498 glColor3ub (0, 0, 0);
2245 glRectf (px + 1, py - thick - 2, 2499 glRectf (px + 1, py - thick - 2,
2246 px + width - 1, py); 2500 px + width - 1, py);
2247 2501
2253 } 2507 }
2254 } 2508 }
2255} 2509}
2256 2510
2257void 2511void
2258draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2512draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2259 CODE: 2513 CODE:
2260{ 2514{
2261 static float color[16][3] = { 2515 static float color[16][3] = {
2262 { 0.00F, 0.00F, 0.00F }, 2516 { 0.00f, 0.00f, 0.00f },
2263 { 1.00F, 1.00F, 1.00F }, 2517 { 1.00f, 1.00f, 1.00f },
2264 { 0.00F, 0.00F, 0.55F }, 2518 { 0.00f, 0.00f, 0.55f },
2265 { 1.00F, 0.00F, 0.00F }, 2519 { 1.00f, 0.00f, 0.00f },
2266 2520
2267 { 1.00F, 0.54F, 0.00F }, 2521 { 1.00f, 0.54f, 0.00f },
2268 { 0.11F, 0.56F, 1.00F }, 2522 { 0.11f, 0.56f, 1.00f },
2269 { 0.93F, 0.46F, 0.00F }, 2523 { 0.93f, 0.46f, 0.00f },
2270 { 0.18F, 0.54F, 0.34F }, 2524 { 0.18f, 0.54f, 0.34f },
2271 2525
2272 { 0.56F, 0.73F, 0.56F }, 2526 { 0.56f, 0.73f, 0.56f },
2273 { 0.80F, 0.80F, 0.80F }, 2527 { 0.80f, 0.80f, 0.80f },
2274 { 0.55F, 0.41F, 0.13F }, 2528 { 0.55f, 0.41f, 0.13f },
2275 { 0.99F, 0.77F, 0.26F }, 2529 { 0.99f, 0.77f, 0.26f },
2276 2530
2277 { 0.74F, 0.65F, 0.41F }, 2531 { 0.74f, 0.65f, 0.41f },
2278 2532
2279 { 0.00F, 1.00F, 1.00F }, 2533 { 0.00f, 1.00f, 1.00f },
2280 { 1.00F, 0.00F, 1.00F }, 2534 { 1.00f, 0.00f, 1.00f },
2281 { 1.00F, 1.00F, 0.00F }, 2535 { 1.00f, 1.00f, 0.00f },
2282 }; 2536 };
2283 2537
2284 int x, y; 2538 int x, y;
2285 2539
2286 glEnable (GL_TEXTURE_2D); 2540 glEnable (GL_TEXTURE_2D);
2541 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2542 * but the nvidia driver (185.18.14) mishandles alpha textures
2543 * and takes the colour from god knows where instead of using
2544 * Cp. MODULATE results in the same colour, but slightly different
2545 * alpha, but atcually gives us the correct colour with nvidia.
2546 */
2287 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2547 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2288 glEnable (GL_BLEND); 2548 glEnable (GL_BLEND);
2289 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2549 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2290 glBegin (GL_QUADS); 2550 glBegin (GL_QUADS);
2291 2551
2292 for (y = 0; y < h; y++) 2552 for (y = 0; y < h; y++)
2296 2556
2297 if (m) 2557 if (m)
2298 { 2558 {
2299 float *c = color [m & 15]; 2559 float *c = color [m & 15];
2300 2560
2301 float tx1 = m & 0x40 ? 0.5 : 0.; 2561 float tx1 = m & 0x40 ? 0.5f : 0.f;
2302 float tx2 = tx1 + 0.5; 2562 float tx2 = tx1 + 0.5f;
2303 2563
2304 glColor4f (c[0], c[1], c[2], 0.75); 2564 glColor4f (c[0], c[1], c[2], 1);
2305 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2565 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2306 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2566 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2307 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2567 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2308 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2568 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2309 } 2569 }
2317void 2577void
2318fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2578fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2319 PPCODE: 2579 PPCODE:
2320{ 2580{
2321 int x, y; 2581 int x, y;
2322 int sw1 = sw + 2; 2582 int sw1 = sw + 2;
2323 int sh1 = sh + 2; 2583 int sh1 = sh + 2;
2324 int sh3 = sh * 3; 2584 int sh3 = sh * 3;
2325 int sw34 = (sw * 3 + 3) & ~3; 2585 int sw3 = sw * 3;
2586 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2587 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2326 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2588 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2327 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2589 memset (darkness1, 0, sw1*sh1);
2328 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2329 2590
2330 SvPOK_only (darkness3_sv); 2591 SvPOK_only (darkness3_sv);
2331 SvCUR_set (darkness3_sv, sw34 * sh3); 2592 SvCUR_set (darkness3_sv, sw3 * sh3);
2332 2593
2333 mx += self->x - 1; 2594 mx += self->x - 1;
2334 my += self->y - 1; 2595 my += self->y - 1;
2335
2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2337 2596
2338 for (y = 0; y < sh1; y++) 2597 for (y = 0; y < sh1; y++)
2339 if (0 <= y + my && y + my < self->rows) 2598 if (0 <= y + my && y + my < self->rows)
2340 { 2599 {
2341 maprow *row = self->row + (y + my); 2600 maprow *row = self->row + (y + my);
2344 if (row->c0 <= x + mx && x + mx < row->c1) 2603 if (row->c0 <= x + mx && x + mx < row->c1)
2345 { 2604 {
2346 mapcell *cell = row->col + (x + mx - row->c0); 2605 mapcell *cell = row->col + (x + mx - row->c0);
2347 2606
2348 darkness1 [y * sw1 + x] = cell->darkness 2607 darkness1 [y * sw1 + x] = cell->darkness
2349 ? 255 - (cell->darkness - 1) 2608 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2350 : 255 - FOW_DARKNESS; 2609 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2351 } 2610 }
2352 } 2611 }
2353 2612
2354 for (y = 0; y < sh; ++y) 2613 for (y = 0; y < sh; ++y)
2355 for (x = 0; x < sw; ++x) 2614 for (x = 0; x < sw; ++x)
2374 2633
2375 uint8_t r13 = (d13 + d23 + d12) / 3; 2634 uint8_t r13 = (d13 + d23 + d12) / 3;
2376 uint8_t r23 = d23; 2635 uint8_t r23 = d23;
2377 uint8_t r33 = (d23 + d33 + d32) / 3; 2636 uint8_t r33 = (d23 + d33 + d32) / 3;
2378 2637
2379 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2380 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2381 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2382 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2383 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2384 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2385 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2386 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2387 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2388 } 2647 }
2389 2648
2390 free (darkness1); 2649 free (darkness1);
2391 2650
2392 EXTEND (SP, 3); 2651 EXTEND (SP, 3);
2393 PUSHs (sv_2mortal (newSViv (sw34))); 2652 PUSHs (sv_2mortal (newSViv (sw3)));
2394 PUSHs (sv_2mortal (newSViv (sh3))); 2653 PUSHs (sv_2mortal (newSViv (sh3)));
2395 PUSHs (darkness3_sv); 2654 PUSHs (darkness3_sv);
2396} 2655}
2397 2656
2398SV * 2657SV *
2485 STRLEN len; 2744 STRLEN len;
2486 uint8_t *data, *end; 2745 uint8_t *data, *end;
2487 2746
2488 len = SvLEN (data_sv); 2747 len = SvLEN (data_sv);
2489 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2748 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2490 data = SvPVbyte_nolen (data_sv); 2749 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2491 end = data + len + 8; 2750 end = data + len + 8;
2492 2751
2493 if (len < 5) 2752 if (len < 5)
2494 XSRETURN_EMPTY; 2753 XSRETURN_EMPTY;
2495 2754
2556} 2815}
2557 2816
2558MODULE = Deliantra::Client PACKAGE = DC::RW 2817MODULE = Deliantra::Client PACKAGE = DC::RW
2559 2818
2560DC::RW 2819DC::RW
2561new (SV *class, SV *data_sv) 2820new (SV *klass, SV *data_sv)
2562 CODE: 2821 CODE:
2563{ 2822{
2564 STRLEN datalen; 2823 STRLEN datalen;
2565 char *data = SvPVbyte (data_sv, datalen); 2824 char *data = SvPVbyte (data_sv, datalen);
2566 2825
2568} 2827}
2569 OUTPUT: 2828 OUTPUT:
2570 RETVAL 2829 RETVAL
2571 2830
2572DC::RW 2831DC::RW
2573new_from_file (SV *class, const char *path, const char *mode = "rb") 2832new_from_file (SV *klass, const char *path, const char *mode = "rb")
2574 CODE: 2833 CODE:
2575 RETVAL = SDL_RWFromFile (path, mode); 2834 RETVAL = SDL_RWFromFile (path, mode);
2576 OUTPUT: 2835 OUTPUT:
2577 RETVAL 2836 RETVAL
2578 2837
2596 if (RETVAL < 0) 2855 if (RETVAL < 0)
2597 { 2856 {
2598 RETVAL = Mix_GroupOldest (-1); 2857 RETVAL = Mix_GroupOldest (-1);
2599 2858
2600 if (RETVAL < 0) 2859 if (RETVAL < 0)
2860 {
2861 // happens sometimes, maybe it just stopped playing(?)
2862 RETVAL = Mix_GroupAvailable (-1);
2863
2864 if (RETVAL < 0)
2601 XSRETURN_UNDEF; 2865 XSRETURN_UNDEF;
2602 2866 }
2867 else
2603 Mix_HaltChannel (RETVAL); 2868 Mix_HaltChannel (RETVAL);
2604 } 2869 }
2605 2870
2606 Mix_UnregisterAllEffects (RETVAL); 2871 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128); 2872 Mix_Volume (RETVAL, 128);
2608} 2873}
2655void 2920void
2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2921set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2657 CODE: 2922 CODE:
2658{ 2923{
2659 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2924 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2660 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2925 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2926 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2662} 2927}
2663 2928
2664void 2929void
2665set_reverse_stereo (DC::Channel self, int flip) 2930set_reverse_stereo (DC::Channel self, int flip)
2668 2933
2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2934MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2670 2935
2671PROTOTYPES: DISABLE 2936PROTOTYPES: DISABLE
2672 2937
2938void
2939decoders ()
2940 PPCODE:
2941#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2942 int i, num = Mix_GetNumChunkDecoders ();
2943 EXTEND (SP, num);
2944 for (i = 0; i < num; ++i)
2945 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2946#else
2947 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2948#endif
2949
2673DC::MixChunk 2950DC::MixChunk
2674new (SV *class, DC::RW rwops) 2951new (SV *klass, DC::RW rwops)
2675 CODE: 2952 CODE:
2676 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2953 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2677 OUTPUT: 2954 OUTPUT:
2678 RETVAL 2955 RETVAL
2679 2956
2709 OUTPUT: 2986 OUTPUT:
2710 RETVAL 2987 RETVAL
2711 2988
2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2989MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2713 2990
2991void
2992decoders ()
2993 PPCODE:
2994#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2995 int i, num = Mix_GetNumMusicDecoders ();
2996 EXTEND (SP, num);
2997 for (i = 0; i < num; ++i)
2998 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2999#else
3000 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3001#endif
3002
2714int 3003int
2715volume (int volume = -1) 3004volume (int volume = -1)
2716 PROTOTYPE: ;$ 3005 PROTOTYPE: ;$
2717 CODE: 3006 CODE:
2718 if (items > 0) 3007 if (items > 0)
2729void 3018void
2730halt () 3019halt ()
2731 CODE: 3020 CODE:
2732 Mix_HaltMusic (); 3021 Mix_HaltMusic ();
2733 3022
3023int
3024playing ()
3025 CODE:
3026 RETVAL = Mix_PlayingMusic ();
3027 OUTPUT:
3028 RETVAL
3029
2734DC::MixMusic 3030DC::MixMusic
2735new (SV *class, DC::RW rwops) 3031new (SV *klass, DC::RW rwops)
2736 CODE: 3032 CODE:
2737 RETVAL = Mix_LoadMUS_RW (rwops); 3033 RETVAL = Mix_LoadMUS_RW (rwops);
2738 OUTPUT: 3034 OUTPUT:
2739 RETVAL 3035 RETVAL
2740 3036
2768 } *civ, const_iv[] = { 3064 } *civ, const_iv[] = {
2769# define const_iv(name) { # name, (IV)name } 3065# define const_iv(name) { # name, (IV)name }
2770 const_iv (GL_VENDOR), 3066 const_iv (GL_VENDOR),
2771 const_iv (GL_VERSION), 3067 const_iv (GL_VERSION),
2772 const_iv (GL_EXTENSIONS), 3068 const_iv (GL_EXTENSIONS),
3069 const_iv (GL_MAX_TEXTURE_UNITS),
2773 const_iv (GL_COLOR_MATERIAL), 3070 const_iv (GL_COLOR_MATERIAL),
2774 const_iv (GL_SMOOTH), 3071 const_iv (GL_SMOOTH),
2775 const_iv (GL_FLAT), 3072 const_iv (GL_FLAT),
2776 const_iv (GL_DITHER), 3073 const_iv (GL_DITHER),
2777 const_iv (GL_BLEND), 3074 const_iv (GL_BLEND),
2789 const_iv (GL_ZERO), 3086 const_iv (GL_ZERO),
2790 const_iv (GL_SRC_ALPHA), 3087 const_iv (GL_SRC_ALPHA),
2791 const_iv (GL_DST_ALPHA), 3088 const_iv (GL_DST_ALPHA),
2792 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3089 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2793 const_iv (GL_ONE_MINUS_DST_ALPHA), 3090 const_iv (GL_ONE_MINUS_DST_ALPHA),
3091 const_iv (GL_SRC_COLOR),
3092 const_iv (GL_DST_COLOR),
3093 const_iv (GL_ONE_MINUS_SRC_COLOR),
3094 const_iv (GL_ONE_MINUS_DST_COLOR),
2794 const_iv (GL_SRC_ALPHA_SATURATE), 3095 const_iv (GL_SRC_ALPHA_SATURATE),
2795 const_iv (GL_RGB), 3096 const_iv (GL_RGB),
2796 const_iv (GL_RGBA), 3097 const_iv (GL_RGBA),
2797 const_iv (GL_RGBA4), 3098 const_iv (GL_RGBA4),
2798 const_iv (GL_RGBA8), 3099 const_iv (GL_RGBA8),
2866 const_iv (GL_NICEST), 3167 const_iv (GL_NICEST),
2867 const_iv (GL_V2F), 3168 const_iv (GL_V2F),
2868 const_iv (GL_V3F), 3169 const_iv (GL_V3F),
2869 const_iv (GL_T2F_V3F), 3170 const_iv (GL_T2F_V3F),
2870 const_iv (GL_T2F_N3F_V3F), 3171 const_iv (GL_T2F_N3F_V3F),
3172 const_iv (GL_FUNC_ADD),
3173 const_iv (GL_FUNC_SUBTRACT),
3174 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2871# undef const_iv 3175# undef const_iv
2872 }; 3176 };
2873 3177
2874 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3178 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2875 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3179 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2876 3180
2877 texture_av = newAV (); 3181 texture_av = newAV ();
2878 AvREAL_off (texture_av); 3182 AvREAL_off (texture_av);
2879} 3183}
2880 3184
2882disable_GL_EXT_blend_func_separate () 3186disable_GL_EXT_blend_func_separate ()
2883 CODE: 3187 CODE:
2884 gl.BlendFuncSeparate = 0; 3188 gl.BlendFuncSeparate = 0;
2885 gl.BlendFuncSeparateEXT = 0; 3189 gl.BlendFuncSeparateEXT = 0;
2886 3190
2887char * 3191void
3192apple_nvidia_bug (int enable)
3193
3194const char *
2888gl_vendor () 3195gl_vendor ()
2889 CODE: 3196 CODE:
2890 RETVAL = (char *)glGetString (GL_VENDOR); 3197 RETVAL = (const char *)glGetString (GL_VENDOR);
2891 OUTPUT: 3198 OUTPUT:
2892 RETVAL 3199 RETVAL
2893 3200
2894char * 3201const char *
2895gl_version () 3202gl_version ()
2896 CODE: 3203 CODE:
2897 RETVAL = (char *)glGetString (GL_VERSION); 3204 RETVAL = (const char *)glGetString (GL_VERSION);
2898 OUTPUT: 3205 OUTPUT:
2899 RETVAL 3206 RETVAL
2900 3207
2901char * 3208const char *
2902gl_extensions () 3209gl_extensions ()
2903 CODE: 3210 CODE:
2904 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3211 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2905 OUTPUT: 3212 OUTPUT:
2906 RETVAL 3213 RETVAL
2907 3214
2908const char *glGetString (GLenum pname) 3215const char *glGetString (GLenum pname)
3216 CODE:
3217 RETVAL = (const char *)glGetString (pname);
3218 OUTPUT:
3219 RETVAL
2909 3220
2910GLint glGetInteger (GLenum pname) 3221GLint glGetInteger (GLenum pname)
2911 CODE: 3222 CODE:
2912 glGetIntegerv (pname, &RETVAL); 3223 glGetIntegerv (pname, &RETVAL);
2913 OUTPUT: 3224 OUTPUT:
2921 3232
2922int glGetError () 3233int glGetError ()
2923 3234
2924void glFinish () 3235void glFinish ()
2925 3236
3237void glFlush ()
3238
2926void glClear (int mask) 3239void glClear (int mask)
2927 3240
2928void glClearColor (float r, float g, float b, float a = 1.0) 3241void glClearColor (float r, float g, float b, float a = 1.0)
2929 PROTOTYPE: @ 3242 PROTOTYPE: @
2930 3243
2939void glBlendFunc (int sfactor, int dfactor) 3252void glBlendFunc (int sfactor, int dfactor)
2940 3253
2941void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3254void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2942 CODE: 3255 CODE:
2943 gl_BlendFuncSeparate (sa, da, saa, daa); 3256 gl_BlendFuncSeparate (sa, da, saa, daa);
3257
3258# void glBlendEquation (int se)
2944 3259
2945void glDepthMask (int flag) 3260void glDepthMask (int flag)
2946 3261
2947void glLogicOp (int opcode) 3262void glLogicOp (int opcode)
2948 3263
2983void glRotate (float angle, float x, float y, float z) 3298void glRotate (float angle, float x, float y, float z)
2984 CODE: 3299 CODE:
2985 glRotatef (angle, x, y, z); 3300 glRotatef (angle, x, y, z);
2986 3301
2987void glColor (float r, float g, float b, float a = 1.0) 3302void glColor (float r, float g, float b, float a = 1.0)
3303 PROTOTYPE: @
2988 ALIAS: 3304 ALIAS:
2989 glColor_premultiply = 1 3305 glColor_premultiply = 1
2990 CODE: 3306 CODE:
2991 if (ix) 3307 if (ix)
2992 { 3308 {
3097void glNewList (int list, int mode = GL_COMPILE) 3413void glNewList (int list, int mode = GL_COMPILE)
3098 3414
3099void glEndList () 3415void glEndList ()
3100 3416
3101void glCallList (int list) 3417void glCallList (int list)
3418
3419void c_init ()
3420 CODE:
3421 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3422 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3102 3423
3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3424MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3104 3425
3105PROTOTYPES: DISABLE 3426PROTOTYPES: DISABLE
3106 3427

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines