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.276 by root, Sat Aug 30 08:04:01 2008 UTC vs.
Revision 1.321 by root, Sun Nov 18 01:15:04 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)
95 99
96#define KMOD_LRAM 0x10000 // our extension 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}
97 123
98static AV *texture_av; 124static AV *texture_av;
99 125
100static struct 126static struct
101{ 127{
158{ 184{
159 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
160 186
161 while (attrs) 187 while (attrs)
162 { 188 {
163 PangoAttribute *attr = attrs->data; 189 PangoAttribute *attr = (PangoAttribute *)attrs->data;
164 190
165 if (attr->klass->type == PANGO_ATTR_SHAPE) 191 if (attr->klass->type == PANGO_ATTR_SHAPE)
166 return 1; 192 return 1;
167 193
168 attrs = attrs->next; 194 attrs = attrs->next;
186static void 212static void
187substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
188{ 214{
189 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
190#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
191 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
192#endif 218#endif
193 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
194} 220}
195 221
196static void 222static void
233 int w, h; 259 int w, h;
234 float s, t; 260 float s, t;
235 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
236 tileid smoothtile; 262 tileid smoothtile;
237 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
238} maptex; 265} maptex;
239 266
240typedef struct { 267typedef struct {
241 uint32_t player; 268 uint32_t player;
242 tileid tile[3]; 269 tileid tile[3];
454 ev.data2 = 0; 481 ev.data2 = 0;
455 482
456 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
457} 484}
458 485
486// approximately divide by 255
487static unsigned int
488div255 (unsigned int n)
489{
490 return (n + (n >> 8)) >> 8;
491}
492
459static unsigned int 493static unsigned int
460minpot (unsigned int n) 494minpot (unsigned int n)
461{ 495{
462 if (!n) 496 if (!n)
463 return 0; 497 return 0;
529 return 0; 563 return 0;
530 564
531 return 1; 565 return 1;
532} 566}
533 567
568/******************************************************************************/
569
534/* process keyboard modifiers */ 570/* process keyboard modifiers */
535static int 571static int
536mod_munge (int mod) 572mod_munge (int mod)
537{ 573{
538 mod &= MOD_MASK; 574 mod &= MOD_MASK;
542 578
543 return mod; 579 return mod;
544} 580}
545 581
546static void 582static void
547deliantra_main () 583deliantra_main (SV *real_main)
548{ 584{
549 char *argv[] = { 0 }; 585 dSP;
550 call_argv ("::main", G_DISCARD | G_VOID, argv); 586
587 PUSHMARK (SP);
588 call_sv (real_main, G_DISCARD | G_VOID);
551} 589}
552 590
553#ifdef __MACOSX__ 591#ifdef __MACOSX__
592 static SV *real_main;
593
554 /* to due surprising braindamage on the side of SDL design, we 594 /* to due surprising braindamage on the side of SDL design, we
555 * do some mind-boggling hack here: SDL requires a custom main() 595 * do some mind-boggling hack here: SDL requires a custom main()
556 * on OS X, so... we provide one and call the original main(), which, 596 * on OS X, so... we provide one and call the original main(), which,
557 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 597 * due to shared library magic, calls -lSDLmain's main, not perl's main,
558 * and which calls our main (== SDL_main) back. 598 * and which calls our main (== SDL_main) back.
559 */ 599 */
560 extern C_LINKAGE int 600 extern C_LINKAGE int
561 main (int argc, char *argv[]) 601 main (int argc, char *argv[])
562 { 602 {
563 deliantra_main (); 603 deliantra_main (real_main);
564 } 604 }
565 605
566 #undef main 606 #undef main
567 607
568 extern C_LINKAGE int main (int argc, char *argv[]); 608 extern C_LINKAGE int main (int argc, char *argv[]);
569 609
570 static void 610 static void
571 SDL_braino (void) 611 SDL_main_hack (SV *real_main_)
572 { 612 {
613 real_main = real_main_;
614
573 char *argv[] = { "deliantra client", 0 }; 615 char *argv[] = { "deliantra client", 0 };
574 (main) (1, argv); 616 (main) (1, argv);
575 } 617 }
576#else 618#else
577 static void 619 static void
578 SDL_braino (void) 620 SDL_main_hack (SV *real_main)
579 { 621 {
580 deliantra_main (); 622 deliantra_main (real_main);
581 } 623 }
582#endif 624#endif
583 625
584MODULE = Deliantra::Client PACKAGE = DC 626MODULE = Deliantra::Client PACKAGE = DC
585 627
786 828
787 const_iv (FOW_DARKNESS) 829 const_iv (FOW_DARKNESS)
788# undef const_iv 830# undef const_iv
789 }; 831 };
790 832
791 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 833 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
792 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 834 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
793 835
794 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 836 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
795 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 837 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
796} 838}
797 839
813NV ceil (NV x) 855NV ceil (NV x)
814 856
815IV minpot (UV n) 857IV minpot (UV n)
816 858
817IV popcount (UV n) 859IV popcount (UV n)
860
861NV distance (NV dx, NV dy)
862 CODE:
863 RETVAL = pow (dx * dx + dy * dy, 0.5);
864 OUTPUT:
865 RETVAL
818 866
819void 867void
820pango_init () 868pango_init ()
821 CODE: 869 CODE:
822{ 870{
830#endif 878#endif
831} 879}
832 880
833char *SDL_GetError () 881char *SDL_GetError ()
834 882
835void SDL_braino () 883void SDL_main_hack (SV *real_main)
884 PROTOTYPE: &
836 885
837int SDL_Init (U32 flags) 886int SDL_Init (U32 flags)
838 887
839int SDL_InitSubSystem (U32 flags) 888int SDL_InitSubSystem (U32 flags)
840 889
841void SDL_QuitSubSystem (U32 flags) 890void SDL_QuitSubSystem (U32 flags)
842 891
843void SDL_Quit () 892void SDL_Quit ()
844 893
845int SDL_GL_SetAttribute (int attr, int value) 894int SDL_GL_SetAttribute (int attr, int value)
895 C_ARGS: (SDL_GLattr)attr, value
846 896
847int SDL_GL_GetAttribute (int attr) 897int SDL_GL_GetAttribute (int attr)
848 CODE: 898 CODE:
849 if (SDL_GL_GetAttribute (attr, &RETVAL)) 899 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
850 XSRETURN_UNDEF; 900 XSRETURN_UNDEF;
851 OUTPUT: 901 OUTPUT:
852 RETVAL 902 RETVAL
853 903
854void 904void
909 ); 959 );
910 960
911 if (RETVAL) 961 if (RETVAL)
912 { 962 {
913 av_clear (texture_av); 963 av_clear (texture_av);
914
915 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
916#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 964#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
917#include "glfunc.h" 965#include "glfunc.h"
918#undef GL_FUNC 966#undef GL_FUNC
967 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
968 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
919 } 969 }
920} 970}
921 OUTPUT: 971 OUTPUT:
922 RETVAL 972 RETVAL
973
974void
975SDL_WM_SetCaption (const char *title, const char *icon)
923 976
924void 977void
925SDL_GL_SwapBuffers () 978SDL_GL_SwapBuffers ()
926 979
927char * 980char *
928SDL_GetKeyName (int sym) 981SDL_GetKeyName (int sym)
982 C_ARGS: (SDLKey)sym
929 983
930int 984int
931SDL_GetAppState () 985SDL_GetAppState ()
932 986
933int 987int
934SDL_GetModState () 988SDL_GetModState ()
935 989
990int
991SDL_WaitEvent ()
992 C_ARGS: 0
993
936void 994void
995SDL_PumpEvents ()
996
997void
937poll_events () 998peep_events ()
938 PPCODE: 999 PPCODE:
939{ 1000{
940 SDL_Event ev; 1001 SDL_Event ev;
941 1002
942 SDL_PumpEvents (); 1003 SDL_PumpEvents ();
1008 1069
1009 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1070 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1010 } 1071 }
1011} 1072}
1012 1073
1074char *
1075SDL_AudioDriverName ()
1076 CODE:
1077{
1078 char buf [256];
1079 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1080 XSRETURN_UNDEF;
1081
1082 RETVAL = buf;
1083}
1084 OUTPUT:
1085 RETVAL
1086
1013int 1087int
1014Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1088Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1015 POSTCALL: 1089 POSTCALL:
1016 Mix_HookMusicFinished (music_finished); 1090 Mix_HookMusicFinished (music_finished);
1017 Mix_ChannelFinished (channel_finished); 1091 Mix_ChannelFinished (channel_finished);
1018 1092
1019void 1093void
1020Mix_QuerySpec () 1094Mix_QuerySpec ()
1079add_font (char *file) 1153add_font (char *file)
1080 CODE: 1154 CODE:
1081 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1155 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082 OUTPUT: 1156 OUTPUT:
1083 RETVAL 1157 RETVAL
1158
1159void
1160IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1161
1162# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1163void
1164Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1084 1165
1085void 1166void
1086load_image_inline (SV *image_) 1167load_image_inline (SV *image_)
1087 ALIAS: 1168 ALIAS:
1088 load_image_file = 1 1169 load_image_file = 1
1134 1215
1135 SDL_LockSurface (surface2); 1216 SDL_LockSurface (surface2);
1136 EXTEND (SP, 6); 1217 EXTEND (SP, 6);
1137 PUSHs (sv_2mortal (newSViv (surface2->w))); 1218 PUSHs (sv_2mortal (newSViv (surface2->w)));
1138 PUSHs (sv_2mortal (newSViv (surface2->h))); 1219 PUSHs (sv_2mortal (newSViv (surface2->h)));
1139 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1220 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1140 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1221 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1141 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1222 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1142 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1223 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1143 SDL_UnlockSurface (surface2); 1224 SDL_UnlockSurface (surface2);
1144 1225
1204#if DEBUG 1285#if DEBUG
1205 VALGRIND_DO_LEAK_CHECK; 1286 VALGRIND_DO_LEAK_CHECK;
1206#endif 1287#endif
1207} 1288}
1208 1289
1290int
1291SvREFCNT (SV *sv)
1292 CODE:
1293 RETVAL = SvREFCNT (sv);
1294 OUTPUT:
1295 RETVAL
1296
1209MODULE = Deliantra::Client PACKAGE = DC::Font 1297MODULE = Deliantra::Client PACKAGE = DC::Font
1210 1298
1211PROTOTYPES: DISABLE 1299PROTOTYPES: DISABLE
1212 1300
1213DC::Font 1301DC::Font
1214new_from_file (SV *class, char *path, int id = 0) 1302new_from_file (SV *klass, char *path, int id = 0)
1215 CODE: 1303 CODE:
1216{ 1304{
1217 int count; 1305 int count;
1218 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1306 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1219 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1307 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1248 PROTOTYPE: 1336 PROTOTYPE:
1249 CODE: 1337 CODE:
1250 tc_restore (); 1338 tc_restore ();
1251 1339
1252DC::Layout 1340DC::Layout
1253new (SV *class) 1341new (SV *klass)
1254 CODE: 1342 CODE:
1255 New (0, RETVAL, 1, struct cf_layout); 1343 New (0, RETVAL, 1, struct cf_layout);
1256 1344
1257 RETVAL->pl = pango_layout_new (opengl_context); 1345 RETVAL->pl = pango_layout_new (opengl_context);
1258 RETVAL->r = 1.; 1346 RETVAL->r = 1.;
1407 1495
1408void 1496void
1409set_height (DC::Layout self, int base_height) 1497set_height (DC::Layout self, int base_height)
1410 CODE: 1498 CODE:
1411 if (self->base_height != base_height) 1499 if (self->base_height != base_height)
1412 { 1500 {
1413 self->base_height = base_height; 1501 self->base_height = base_height;
1414 layout_update_font (self); 1502 layout_update_font (self);
1415 } 1503 }
1416 1504
1417void 1505void
1644 glDisable (GL_ALPHA_TEST); 1732 glDisable (GL_ALPHA_TEST);
1645 glDisable (GL_BLEND); 1733 glDisable (GL_BLEND);
1646 } 1734 }
1647} 1735}
1648 1736
1737void
1738draw_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)
1739 PROTOTYPE: @
1740 CODE:
1741{
1742 glEnable (GL_BLEND);
1743 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1744 glEnable (GL_TEXTURE_2D);
1745 glBindTexture (GL_TEXTURE_2D, name1);
1746
1747 glColor3f (intensity, intensity, intensity);
1748 glPushMatrix ();
1749 glScalef (1./3, 1./3, 1.);
1750
1751 if (blend > 0.f)
1752 {
1753 float dx3 = dx * -3.f / w;
1754 float dy3 = dy * -3.f / h;
1755 GLfloat env_color[4] = { 0., 0., 0., blend };
1756
1757 /* interpolate the two shadow textures */
1758 /* stage 0 == rgb(glcolor) + alpha(t0) */
1759 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1760
1761 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1762 gl.ActiveTexture (GL_TEXTURE1);
1763 glEnable (GL_TEXTURE_2D);
1764 glBindTexture (GL_TEXTURE_2D, name2);
1765 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1766
1767 /* rgb == rgb(glcolor) */
1768 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1769 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1770 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1771
1772 /* alpha = interpolate t0, t1 by env_alpha */
1773 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1774
1775 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1776 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1777 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1778
1779 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1780 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1781
1782 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1783 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1784
1785 glBegin (GL_QUADS);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1787 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1788 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1789 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1790 glEnd ();
1791
1792 glDisable (GL_TEXTURE_2D);
1793 gl.ActiveTexture (GL_TEXTURE0);
1794 }
1795 else
1796 {
1797 /* simple blending of one texture, also opengl <1.3 path */
1798 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1799
1800 glBegin (GL_QUADS);
1801 glTexCoord2f (0, 0); glVertex2f (0, 0);
1802 glTexCoord2f (0, t); glVertex2f (0, h);
1803 glTexCoord2f (s, t); glVertex2f (w, h);
1804 glTexCoord2f (s, 0); glVertex2f (w, 0);
1805 glEnd ();
1806 }
1807
1808 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1809 {
1810 int x, y;
1811 int dx3 = dx * 3;
1812 int dy3 = dy * 3;
1813
1814 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1815 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1816 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1817 glTranslatef (-1., -1., 0);
1818 glBegin (GL_QUADS);
1819
1820 for (y = 1; y < h; y += 3)
1821 {
1822 int y1 = y - dy3;
1823 int y1valid = y1 >= 0 && y1 < h;
1824
1825 for (x = 1; x < w; x += 3)
1826 {
1827 int x1 = x - dx3;
1828 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1829 uint8_t h2;
1830
1831 if (y1valid && x1 >= 0 && x1 < w)
1832 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1833 else
1834 h2 = 1; /* out of range == invisible */
1835
1836 if (h1 || h2)
1837 {
1838 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1839 glColor4f (1., 1., 1., alpha);
1840
1841 glTexCoord2f (0, 0.); glVertex2i (x , y );
1842 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1843 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1844 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1845 }
1846 }
1847 }
1848 }
1849
1850 glEnd ();
1851
1852 glPopMatrix ();
1853
1854 glDisable (GL_TEXTURE_2D);
1855 glDisable (GL_BLEND);
1856}
1857
1649IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1858IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1650 CODE: 1859 CODE:
1651{ 1860{
1652 GLint width; 1861 GLint width;
1653 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1862 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1660MODULE = Deliantra::Client PACKAGE = DC::Map 1869MODULE = Deliantra::Client PACKAGE = DC::Map
1661 1870
1662PROTOTYPES: DISABLE 1871PROTOTYPES: DISABLE
1663 1872
1664DC::Map 1873DC::Map
1665new (SV *class) 1874new (SV *klass)
1666 CODE: 1875 CODE:
1667 New (0, RETVAL, 1, struct map); 1876 New (0, RETVAL, 1, struct map);
1668 RETVAL->x = 0; 1877 RETVAL->x = 0;
1669 RETVAL->y = 0; 1878 RETVAL->y = 0;
1670 RETVAL->w = 0; 1879 RETVAL->w = 0;
1709 1918
1710void 1919void
1711set_smooth (DC::Map self, int face, int smooth, int level) 1920set_smooth (DC::Map self, int face, int smooth, int level)
1712 CODE: 1921 CODE:
1713{ 1922{
1714 tileid texid; 1923 tileid texid;
1715 maptex *tex; 1924 maptex *tex;
1716 1925
1717 if (face < 0 || face >= self->faces) 1926 if (face < 0 || face >= self->faces)
1718 return; 1927 return;
1719 1928
1720 if (smooth < 0 || smooth >= self->faces) 1929 if (smooth < 0 || smooth >= self->faces)
1721 return; 1930 return;
1722 1931
1723 texid = self->face2tile [face]; 1932 texid = self->face2tile [face];
1724 1933
1725 if (!texid) 1934 if (!texid)
1726 return; 1935 return;
1727 1936
1728 tex = self->tex + texid; 1937 tex = self->tex + texid;
1757 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1966 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1758 // use uglier nearest interpolation because linear suffers 1967 // use uglier nearest interpolation because linear suffers
1759 // from transparent color bleeding and ugly wrapping effects. 1968 // from transparent color bleeding and ugly wrapping effects.
1760 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1969 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1761} 1970}
1971
1972void
1973expire_textures (DC::Map self, int texid, int count)
1974 PPCODE:
1975 for (; texid < self->texs && count; ++texid, --count)
1976 {
1977 maptex *tex = self->tex + texid;
1978
1979 if (tex->name)
1980 {
1981 if (tex->unused)
1982 {
1983 tex->name = 0;
1984 tex->unused = 0;
1985 XPUSHs (sv_2mortal (newSViv (texid)));
1986 }
1987 else
1988 tex->unused = 1;
1989 }
1990 }
1762 1991
1763int 1992int
1764ox (DC::Map self) 1993ox (DC::Map self)
1765 ALIAS: 1994 ALIAS:
1766 oy = 1 1995 oy = 1
1806 self->y += MAP_EXTEND_Y; 2035 self->y += MAP_EXTEND_Y;
1807 } 2036 }
1808} 2037}
1809 2038
1810SV * 2039SV *
1811map1a_update (DC::Map self, SV *data_, int extmap) 2040map1a_update (DC::Map self, SV *data_)
1812 CODE: 2041 CODE:
1813{ 2042{
1814 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2043 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1815 uint8_t *data_end = (uint8_t *)SvEND (data_); 2044 uint8_t *data_end = (uint8_t *)SvEND (data_);
1816 mapcell *cell; 2045 mapcell *cell;
1837 2066
1838 //TODO: don't trust server data to be in-range(!) 2067 //TODO: don't trust server data to be in-range(!)
1839 2068
1840 if (flags & 8) 2069 if (flags & 8)
1841 { 2070 {
2071 uint8_t ext, cmd;
2072
1842 if (extmap) 2073 do
1843 { 2074 {
1844 uint8_t ext, cmd; 2075 ext = *data++;
2076 cmd = ext & 0x7f;
1845 2077
1846 do 2078 if (cmd < 4)
2079 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2080 else if (cmd == 5) // health
1847 { 2081 {
1848 ext = *data++;
1849 cmd = ext & 0x7f;
1850
1851 if (cmd < 4)
1852 cell->darkness = 255 - ext * 64 + 1;
1853 else if (cmd == 5) // health
1854 {
1855 cell->stat_width = 1; 2082 cell->stat_width = 1;
1856 cell->stat_hp = *data++; 2083 cell->stat_hp = *data++;
1857 }
1858 else if (cmd == 6) // monster width
1859 cell->stat_width = *data++ + 1;
1860 else if (cmd == 0x47)
1861 {
1862 if (*data == 1) cell->player = data [1];
1863 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1864 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1865 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1866
1867 data += *data + 1;
1868 }
1869 else if (cmd == 8) // cell flags
1870 cell->flags = *data++;
1871 else if (ext & 0x40) // unknown, multibyte => skip
1872 data += *data + 1;
1873 else
1874 data++;
1875 } 2084 }
1876 while (ext & 0x80); 2085 else if (cmd == 6) // monster width
2086 cell->stat_width = *data++ + 1;
2087 else if (cmd == 0x47)
2088 {
2089 if (*data == 1) cell->player = data [1];
2090 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2091 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2092 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2093
2094 data += *data + 1;
2095 }
2096 else if (cmd == 8) // cell flags
2097 cell->flags = *data++;
2098 else if (ext & 0x40) // unknown, multibyte => skip
2099 data += *data + 1;
2100 else
2101 data++;
1877 } 2102 }
1878 else 2103 while (ext & 0x80);
1879 cell->darkness = *data++ + 1;
1880 } 2104 }
1881 2105
1882 for (z = 0; z <= 2; ++z) 2106 for (z = 0; z <= 2; ++z)
1883 if (flags & (4 >> z)) 2107 if (flags & (4 >> z))
1884 { 2108 {
1887 cell->tile [z] = self->face2tile [face]; 2111 cell->tile [z] = self->face2tile [face];
1888 2112
1889 if (cell->tile [z]) 2113 if (cell->tile [z])
1890 { 2114 {
1891 maptex *tex = self->tex + cell->tile [z]; 2115 maptex *tex = self->tex + cell->tile [z];
2116 tex->unused = 0;
1892 if (!tex->name) 2117 if (!tex->name)
1893 av_push (missing, newSViv (cell->tile [z])); 2118 av_push (missing, newSViv (cell->tile [z]));
1894 2119
1895 if (tex->smoothtile) 2120 if (tex->smoothtile)
1896 { 2121 {
1897 maptex *smooth = self->tex + tex->smoothtile; 2122 maptex *smooth = self->tex + tex->smoothtile;
2123 smooth->unused = 0;
1898 if (!smooth->name) 2124 if (!smooth->name)
1899 av_push (missing, newSViv (tex->smoothtile)); 2125 av_push (missing, newSViv (tex->smoothtile));
1900 } 2126 }
1901 } 2127 }
1902 } 2128 }
1930 ? self->row + y 2156 ? self->row + y
1931 : 0; 2157 : 0;
1932 2158
1933 for (x = x0; x < x1; x++) 2159 for (x = x0; x < x1; x++)
1934 { 2160 {
1935 int r = 32, g = 32, b = 32, a = 192; 2161 unsigned int r = 32, g = 32, b = 32, a = 192;
1936 2162
1937 if (row && row->c0 <= x && x < row->c1) 2163 if (row && row->c0 <= x && x < row->c1)
1938 { 2164 {
1939 mapcell *cell = row->col + (x - row->c0); 2165 mapcell *cell = row->col + (x - row->c0);
1940 2166
1942 { 2168 {
1943 maptex tex = self->tex [cell->tile [z]]; 2169 maptex tex = self->tex [cell->tile [z]];
1944 int a0 = 255 - tex.a; 2170 int a0 = 255 - tex.a;
1945 int a1 = tex.a; 2171 int a1 = tex.a;
1946 2172
1947 r = (r * a0 + tex.r * a1) / 255; 2173 r = div255 (r * a0 + tex.r * a1);
1948 g = (g * a0 + tex.g * a1) / 255; 2174 g = div255 (g * a0 + tex.g * a1);
1949 b = (b * a0 + tex.b * a1) / 255; 2175 b = div255 (b * a0 + tex.b * a1);
1950 a = (a * a0 + tex.a * a1) / 255; 2176 a = div255 (a * a0 + tex.a * a1);
1951 } 2177 }
1952 } 2178 }
1953 2179
1954 *map++ = (r ) 2180 *map++ = (r )
1955 | (g << 8) 2181 | (g << 8)
1956 | (b << 16) 2182 | (b << 16)
1957 | (a << 24); 2183 | (a << 24);
1958 } 2184 }
1959 } 2185 }
1960 2186
1961 RETVAL = map_sv; 2187 RETVAL = map_sv;
1962} 2188}
1963 OUTPUT: 2189 OUTPUT:
1964 RETVAL 2190 RETVAL
1965 2191
1966void 2192void
1967draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2193draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1968 CODE: 2194 CODE:
1969{ 2195{
1970 int x, y, z; 2196 int x, y, z;
1971 2197
1972 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2198 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1973 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2199 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1974 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2200 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1975 smooth_key skey; 2201 smooth_key skey;
1976 int pl_x, pl_y; 2202 int pl_x, pl_y;
1977 maptex pl_tex; 2203 maptex pl_tex;
1978 rc_t *rc = rc_alloc (); 2204 rc_t *rc = rc_alloc ();
2205 rc_t *rc_ov = rc_alloc ();
1979 rc_key_t key; 2206 rc_key_t key;
1980 rc_array_t *arr; 2207 rc_array_t *arr;
1981 2208
1982 pl_tex.name = 0; 2209 pl_tex.name = 0;
1983 2210
1984 // thats current max. sorry. 2211 // that's current max. sorry.
1985 if (sw > 255) sw = 255; 2212 if (sw > 255) sw = 255;
1986 if (sh > 255) sh = 255; 2213 if (sh > 255) sh = 255;
1987 2214
1988 // clear key, in case of extra padding 2215 // clear key, in case of extra padding
1989 memset (&skey, 0, sizeof (skey)); 2216 memset (&skey, 0, sizeof (skey));
1993 key.g = 255; 2220 key.g = 255;
1994 key.b = 255; 2221 key.b = 255;
1995 key.a = 255; 2222 key.a = 255;
1996 key.mode = GL_QUADS; 2223 key.mode = GL_QUADS;
1997 key.format = GL_T2F_V3F; 2224 key.format = GL_T2F_V3F;
1998 key.texname = -1;
1999 2225
2000 mx += self->x; 2226 mx += self->x;
2001 my += self->y; 2227 my += self->y;
2002 2228
2003 // first pass: determine smooth_max 2229 // first pass: determine smooth_max
2027 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2253 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2028 2254
2029 for (z = 0; z <= 2; z++) 2255 for (z = 0; z <= 2; z++)
2030 { 2256 {
2031 memset (smooth_level, 0, sizeof (smooth_level)); 2257 memset (smooth_level, 0, sizeof (smooth_level));
2258 key.texname = -1;
2032 2259
2033 for (y = 0; y < sh; y++) 2260 for (y = 0; y < sh; y++)
2034 if (0 <= y + my && y + my < self->rows) 2261 if (0 <= y + my && y + my < self->rows)
2035 { 2262 {
2036 maprow *row = self->row + (y + my); 2263 maprow *row = self->row + (y + my);
2042 tileid tile = cell->tile [z]; 2269 tileid tile = cell->tile [z];
2043 2270
2044 if (tile) 2271 if (tile)
2045 { 2272 {
2046 maptex tex = self->tex [tile]; 2273 maptex tex = self->tex [tile];
2047 int px = (x + 1) * T - tex.w; 2274 int px, py;
2048 int py = (y + 1) * T - tex.h;
2049 2275
2050 if (key.texname != tex.name) 2276 if (key.texname != tex.name)
2051 { 2277 {
2278 self->tex [tile].unused = 0;
2279
2052 if (!tex.name) 2280 if (!tex.name)
2053 tex = self->tex [2]; /* missing, replace by noface */ 2281 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2054 2282
2055 key.texname = tex.name; 2283 key.texname = tex.name;
2056 arr = rc_array (rc, &key); 2284 arr = rc_array (rc, &key);
2057 } 2285 }
2286
2287 px = (x + 1) * Th - tex.w;
2288 py = (y + 1) * Tw - tex.h;
2058 2289
2059 if (expect_false (cell->player == player) && expect_false (z == 2)) 2290 if (expect_false (cell->player == player) && expect_false (z == 2))
2060 { 2291 {
2061 pl_x = px; 2292 pl_x = px;
2062 pl_y = py; 2293 pl_y = py;
2067 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2298 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2068 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2299 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2069 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2300 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2070 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2301 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2071 2302
2072 if (expect_false (cell->flags) && expect_false (z == 2))
2073 {
2074 // overlays such as the speech bubble, probably more to come
2075 if (cell->flags & 1)
2076 {
2077 maptex tex = self->tex [1];
2078 int px = x * T + T * 2 / 32;
2079 int py = y * T - T * 6 / 32;
2080
2081 if (tex.name)
2082 {
2083 if (key.texname != tex.name)
2084 {
2085 key.texname = tex.name;
2086 arr = rc_array (rc, &key);
2087 }
2088
2089 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2090 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2091 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2092 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2093 }
2094 }
2095 }
2096
2097 // update smooth hash 2303 // update smooth hash
2098 if (tex.smoothtile) 2304 if (tex.smoothtile)
2099 { 2305 {
2100 skey.tile = tex.smoothtile; 2306 skey.tile = tex.smoothtile;
2101 skey.level = tex.smoothlevel; 2307 skey.level = tex.smoothlevel;
2129 // corners 2335 // corners
2130 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2336 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2131 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2337 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2132 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2338 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2133 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2339 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2340 }
2341 }
2342
2343 if (expect_false (z == 2) && expect_false (cell->flags))
2344 {
2345 // overlays such as the speech bubble, probably more to come
2346 if (cell->flags & 1)
2347 {
2348 rc_key_t key_ov = key;
2349 maptex tex = self->tex [TEXID_SPEECH];
2350 rc_array_t *arr;
2351 int px = x * Tw + Tw * 2 / 32;
2352 int py = y * Th - Th * 6 / 32;
2353
2354 key_ov.texname = tex.name;
2355 arr = rc_array (rc_ov, &key_ov);
2356
2357 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2358 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2359 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2360 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2134 } 2361 }
2135 } 2362 }
2136 } 2363 }
2137 } 2364 }
2138 2365
2165 if (!(bits & 0x1000) 2392 if (!(bits & 0x1000)
2166 && skey->level == level 2393 && skey->level == level
2167 && level > smooth_max [skey->x][skey->y]) 2394 && level > smooth_max [skey->x][skey->y])
2168 { 2395 {
2169 maptex tex = self->tex [skey->tile]; 2396 maptex tex = self->tex [skey->tile];
2170 int px = (((int)skey->x) - 1) * T; 2397 int px = (((int)skey->x) - 1) * Tw;
2171 int py = (((int)skey->y) - 1) * T; 2398 int py = (((int)skey->y) - 1) * Th;
2172 int border = bits & 15; 2399 int border = bits & 15;
2173 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2174 float dx = tex.s * .0625f; // 16 images/row 2401 float dx = tex.s * .0625f; // 16 images/row
2175 float dy = tex.t * .5f ; // 2 images/column 2402 float dy = tex.t * .5f ; // 2 images/column
2176 2403
2178 { 2405 {
2179 // this time avoiding texture state changes 2406 // this time avoiding texture state changes
2180 // save gobs of state changes. 2407 // save gobs of state changes.
2181 if (key.texname != tex.name) 2408 if (key.texname != tex.name)
2182 { 2409 {
2410 self->tex [skey->tile].unused = 0;
2411
2183 glEnd (); 2412 glEnd ();
2184 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2185 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2186 } 2415 }
2187 2416
2188 if (border) 2417 if (border)
2189 { 2418 {
2190 float ox = border * dx; 2419 float ox = border * dx;
2191 2420
2192 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2193 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2194 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2195 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2196 } 2425 }
2197 2426
2198 if (corner) 2427 if (corner)
2199 { 2428 {
2200 float ox = corner * dx; 2429 float ox = corner * dx;
2201 2430
2202 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2203 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2204 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2205 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2206 } 2435 }
2207 } 2436 }
2208 } 2437 }
2209 } 2438 }
2210 } 2439 }
2233 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2462 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2234 2463
2235 rc_draw (rc); 2464 rc_draw (rc);
2236 } 2465 }
2237 2466
2467 rc_draw (rc_ov);
2468 rc_clear (rc_ov);
2469
2238 glDisable (GL_BLEND); 2470 glDisable (GL_BLEND);
2239 rc_free (rc); 2471 rc_free (rc);
2472 rc_free (rc_ov);
2240 2473
2241 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2242 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2243 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2244 { 2477 {
2247 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2248 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2249 { 2482 {
2250 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2251 2484
2252 int px = x * T; 2485 int px = x * Tw;
2253 int py = y * T; 2486 int py = y * Th;
2487
2488 if (expect_false (cell->player == player))
2489 {
2490 px += sdx;
2491 py += sdy;
2492 }
2254 2493
2255 if (cell->stat_hp) 2494 if (cell->stat_hp)
2256 { 2495 {
2257 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2258 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2259 2498
2260 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2261 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2262 px + width - 1, py); 2501 px + width - 1, py);
2263 2502
2269 } 2508 }
2270 } 2509 }
2271} 2510}
2272 2511
2273void 2512void
2274draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2513draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2275 CODE: 2514 CODE:
2276{ 2515{
2277 static float color[16][3] = { 2516 static float color[16][3] = {
2278 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2279 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2280 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2281 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2282 2521
2283 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2284 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2285 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2286 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2287 2526
2288 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2289 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2290 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2291 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2292 2531
2293 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2294 2533
2295 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2296 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2297 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2298 }; 2537 };
2299 2538
2300 int x, y; 2539 int x, y;
2301 2540
2302 glEnable (GL_TEXTURE_2D); 2541 glEnable (GL_TEXTURE_2D);
2542 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2543 * but the nvidia driver (185.18.14) mishandles alpha textures
2544 * and takes the colour from god knows where instead of using
2545 * Cp. MODULATE results in the same colour, but slightly different
2546 * alpha, but atcually gives us the correct colour with nvidia.
2547 */
2303 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2304 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2305 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2306 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2307 2552
2308 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2312 2557
2313 if (m) 2558 if (m)
2314 { 2559 {
2315 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2316 2561
2317 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2318 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2319 2564
2320 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2321 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2322 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2323 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2324 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2325 } 2570 }
2333void 2578void
2334fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2579fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2335 PPCODE: 2580 PPCODE:
2336{ 2581{
2337 int x, y; 2582 int x, y;
2338 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2339 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2340 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2341 int sw34 = (sw * 3 + 3) & ~3; 2586 int sw3 = sw * 3;
2587 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2588 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2342 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2343 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2344 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2345 2591
2346 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2347 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2348 2594
2349 mx += self->x - 1; 2595 mx += self->x - 1;
2350 my += self->y - 1; 2596 my += self->y - 1;
2351
2352 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2353 2597
2354 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2355 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2356 { 2600 {
2357 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2360 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2361 { 2605 {
2362 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2363 2607
2364 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2365 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2366 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2367 } 2611 }
2368 } 2612 }
2369 2613
2370 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2371 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2390 2634
2391 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2392 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2393 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2394 2638
2395 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2396 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2397 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2398 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2399 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2400 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2401 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2402 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2403 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2404 } 2648 }
2405 2649
2406 free (darkness1); 2650 free (darkness1);
2407 2651
2408 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2409 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2410 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2411 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2412} 2656}
2413 2657
2414SV * 2658SV *
2477 else 2721 else
2478 *data++ = 0; 2722 *data++ = 0;
2479 } 2723 }
2480 } 2724 }
2481 2725
2482 /* if size is w*h + 5 then no data has been found */ 2726 /* if size is w*h + 5 then no data has been found */
2483 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2484 { 2728 {
2485 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2486 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2487 } 2731 }
2488 2732
2489 RETVAL = data_sv; 2733 RETVAL = data_sv;
2490} 2734}
2491 OUTPUT: 2735 OUTPUT:
2492 RETVAL 2736 RETVAL
2493 2737
2494void 2738void
2501 STRLEN len; 2745 STRLEN len;
2502 uint8_t *data, *end; 2746 uint8_t *data, *end;
2503 2747
2504 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2505 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2506 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2507 end = data + len + 8; 2751 end = data + len + 8;
2508 2752
2509 if (len < 5) 2753 if (len < 5)
2510 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2511 2755
2572} 2816}
2573 2817
2574MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2575 2819
2576DC::RW 2820DC::RW
2577new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2578 CODE: 2822 CODE:
2579{ 2823{
2580 STRLEN datalen; 2824 STRLEN datalen;
2581 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2582 2826
2584} 2828}
2585 OUTPUT: 2829 OUTPUT:
2586 RETVAL 2830 RETVAL
2587 2831
2588DC::RW 2832DC::RW
2589new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2590 CODE: 2834 CODE:
2591 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2592 OUTPUT: 2836 OUTPUT:
2593 RETVAL 2837 RETVAL
2594 2838
2612 if (RETVAL < 0) 2856 if (RETVAL < 0)
2613 { 2857 {
2614 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2615 2859
2616 if (RETVAL < 0) 2860 if (RETVAL < 0)
2861 {
2862 // happens sometimes, maybe it just stopped playing(?)
2863 RETVAL = Mix_GroupAvailable (-1);
2864
2865 if (RETVAL < 0)
2617 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2618 2867 }
2868 else
2619 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2620 } 2870 }
2621 2871
2622 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2623 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2624} 2874}
2671void 2921void
2672set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2673 CODE: 2923 CODE:
2674{ 2924{
2675 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2925 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2676 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2926 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2677 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2678} 2928}
2679 2929
2680void 2930void
2681set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2684 2934
2685MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2686 2936
2687PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2688 2938
2939void
2940decoders ()
2941 PPCODE:
2942#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2943 int i, num = Mix_GetNumChunkDecoders ();
2944 EXTEND (SP, num);
2945 for (i = 0; i < num; ++i)
2946 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2947#else
2948 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2949#endif
2950
2689DC::MixChunk 2951DC::MixChunk
2690new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2691 CODE: 2953 CODE:
2692 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2693 OUTPUT: 2955 OUTPUT:
2694 RETVAL 2956 RETVAL
2695 2957
2725 OUTPUT: 2987 OUTPUT:
2726 RETVAL 2988 RETVAL
2727 2989
2728MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2729 2991
2992void
2993decoders ()
2994 PPCODE:
2995#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2996 int i, num = Mix_GetNumMusicDecoders ();
2997 EXTEND (SP, num);
2998 for (i = 0; i < num; ++i)
2999 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3000#else
3001 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3002#endif
3003
2730int 3004int
2731volume (int volume = -1) 3005volume (int volume = -1)
2732 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2733 CODE: 3007 CODE:
2734 if (items > 0) 3008 if (items > 0)
2745void 3019void
2746halt () 3020halt ()
2747 CODE: 3021 CODE:
2748 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2749 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2750DC::MixMusic 3031DC::MixMusic
2751new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2752 CODE: 3033 CODE:
2753 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2754 OUTPUT: 3035 OUTPUT:
2755 RETVAL 3036 RETVAL
2756 3037
2784 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2785# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2786 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2787 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2788 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2789 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2790 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2791 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2792 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2793 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2805 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2806 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2807 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2808 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2809 const_iv (GL_ONE_MINUS_DST_ALPHA), 3091 const_iv (GL_ONE_MINUS_DST_ALPHA),
3092 const_iv (GL_SRC_COLOR),
3093 const_iv (GL_DST_COLOR),
3094 const_iv (GL_ONE_MINUS_SRC_COLOR),
3095 const_iv (GL_ONE_MINUS_DST_COLOR),
2810 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2811 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2812 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2813 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2814 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2882 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2883 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2884 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2885 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2886 const_iv (GL_T2F_N3F_V3F), 3172 const_iv (GL_T2F_N3F_V3F),
3173 const_iv (GL_FUNC_ADD),
3174 const_iv (GL_FUNC_SUBTRACT),
3175 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2887# undef const_iv 3176# undef const_iv
2888 }; 3177 };
2889 3178
2890 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3179 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2891 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2892 3181
2893 texture_av = newAV (); 3182 texture_av = newAV ();
2894 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2895} 3184}
2896 3185
2898disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2899 CODE: 3188 CODE:
2900 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2901 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2902 3191
2903char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2904gl_vendor () 3196gl_vendor ()
2905 CODE: 3197 CODE:
2906 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2907 OUTPUT: 3199 OUTPUT:
2908 RETVAL 3200 RETVAL
2909 3201
2910char * 3202const char *
2911gl_version () 3203gl_version ()
2912 CODE: 3204 CODE:
2913 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2914 OUTPUT: 3206 OUTPUT:
2915 RETVAL 3207 RETVAL
2916 3208
2917char * 3209const char *
2918gl_extensions () 3210gl_extensions ()
2919 CODE: 3211 CODE:
2920 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2921 OUTPUT: 3213 OUTPUT:
2922 RETVAL 3214 RETVAL
2923 3215
2924const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2925 3221
2926GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2927 CODE: 3223 CODE:
2928 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2929 OUTPUT: 3225 OUTPUT:
2937 3233
2938int glGetError () 3234int glGetError ()
2939 3235
2940void glFinish () 3236void glFinish ()
2941 3237
3238void glFlush ()
3239
2942void glClear (int mask) 3240void glClear (int mask)
2943 3241
2944void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2945 PROTOTYPE: @ 3243 PROTOTYPE: @
2946 3244
2955void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2956 3254
2957void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2958 CODE: 3256 CODE:
2959 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2960 3260
2961void glDepthMask (int flag) 3261void glDepthMask (int flag)
2962 3262
2963void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2964 3264
2999void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
3000 CODE: 3300 CODE:
3001 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
3002 3302
3003void glColor (float r, float g, float b, float a = 1.0) 3303void glColor (float r, float g, float b, float a = 1.0)
3304 PROTOTYPE: @
3004 ALIAS: 3305 ALIAS:
3005 glColor_premultiply = 1 3306 glColor_premultiply = 1
3006 CODE: 3307 CODE:
3007 if (ix) 3308 if (ix)
3008 { 3309 {
3114 3415
3115void glEndList () 3416void glEndList ()
3116 3417
3117void glCallList (int list) 3418void glCallList (int list)
3118 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3119MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3120 3426
3121PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3122 3428
3123void 3429void
3124find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3125 PPCODE: 3431 PPCODE:
3126{ 3432{
3127 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3128 XPUSHs (self); 3434 XPUSHs (self);
3129} 3435}
3130 3436
3131BOOT: 3437BOOT:
3132{ 3438{
3140 3446
3141void 3447void
3142draw (SV *self) 3448draw (SV *self)
3143 CODE: 3449 CODE:
3144{ 3450{
3145 HV *hv; 3451 HV *hv;
3146 SV **svp; 3452 SV **svp;
3147 NV x, y, w, h; 3453 NV x, y, w, h;
3148 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3149 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3150 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3151 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines