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.295 by root, Mon Dec 21 03:30:22 2009 UTC vs.
Revision 1.319 by root, Sun Nov 18 00:52:22 2018 UTC

41#include <SDL_opengl.h> 41#include <SDL_opengl.h>
42 42
43/* work around os x broken headers */ 43/* work around os x broken headers */
44#ifdef __MACOSX__ 44#ifdef __MACOSX__
45typedef 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);
46#endif 48#endif
47 49
48#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
49#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
50 52
51#include <glib/gmacros.h> 53#include <glib.h>
52 54
53#include <pango/pango.h> 55#include <pango/pango.h>
54 56
55#ifndef PANGO_VERSION_CHECK 57#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0 58# define PANGO_VERSION_CHECK(a,b,c) 0
80#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
82 84
83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
84 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 */
85#define FOW_DARKNESS 64 89#define FOW_DARKNESS 50
86#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */ 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
95 99
96#define KMOD_LRAM 0x10000 // our extension 100#define KMOD_LRAM 0x10000 // our extension
97 101
98#define TEXID_SPEECH 1 102#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2 103#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3 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}
101 123
102static AV *texture_av; 124static AV *texture_av;
103 125
104static struct 126static struct
105{ 127{
162{ 184{
163 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
164 186
165 while (attrs) 187 while (attrs)
166 { 188 {
167 PangoAttribute *attr = attrs->data; 189 PangoAttribute *attr = (PangoAttribute *)attrs->data;
168 190
169 if (attr->klass->type == PANGO_ATTR_SHAPE) 191 if (attr->klass->type == PANGO_ATTR_SHAPE)
170 return 1; 192 return 1;
171 193
172 attrs = attrs->next; 194 attrs = attrs->next;
460 482
461 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
462} 484}
463 485
464static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
465minpot (unsigned int n) 493minpot (unsigned int n)
466{ 494{
467 if (!n) 495 if (!n)
468 return 0; 496 return 0;
469 497
549 577
550 return mod; 578 return mod;
551} 579}
552 580
553static void 581static void
554deliantra_main () 582deliantra_main (SV *real_main)
555{ 583{
556 char *argv[] = { 0 }; 584 dSP;
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
558} 588}
559 589
560#ifdef __MACOSX__ 590#ifdef __MACOSX__
591 static SV *real_main;
592
561 /* to due surprising braindamage on the side of SDL design, we 593 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 594 * do some mind-boggling hack here: SDL requires a custom main()
563 * 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,
564 * 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,
565 * and which calls our main (== SDL_main) back. 597 * and which calls our main (== SDL_main) back.
566 */ 598 */
567 extern C_LINKAGE int 599 extern C_LINKAGE int
568 main (int argc, char *argv[]) 600 main (int argc, char *argv[])
569 { 601 {
570 deliantra_main (); 602 deliantra_main (real_main);
571 } 603 }
572 604
573 #undef main 605 #undef main
574 606
575 extern C_LINKAGE int main (int argc, char *argv[]); 607 extern C_LINKAGE int main (int argc, char *argv[]);
576 608
577 static void 609 static void
578 SDL_braino (void) 610 SDL_main_hack (SV *real_main_)
579 { 611 {
612 real_main = real_main_;
613
580 char *argv[] = { "deliantra client", 0 }; 614 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv); 615 (main) (1, argv);
582 } 616 }
583#else 617#else
584 static void 618 static void
585 SDL_braino (void) 619 SDL_main_hack (SV *real_main)
586 { 620 {
587 deliantra_main (); 621 deliantra_main (real_main);
588 } 622 }
589#endif 623#endif
590 624
591MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
592 626
793 827
794 const_iv (FOW_DARKNESS) 828 const_iv (FOW_DARKNESS)
795# undef const_iv 829# undef const_iv
796 }; 830 };
797 831
798 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--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 834
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 837}
804 838
843#endif 877#endif
844} 878}
845 879
846char *SDL_GetError () 880char *SDL_GetError ()
847 881
848void SDL_braino () 882void SDL_main_hack (SV *real_main)
883 PROTOTYPE: &
849 884
850int SDL_Init (U32 flags) 885int SDL_Init (U32 flags)
851 886
852int SDL_InitSubSystem (U32 flags) 887int SDL_InitSubSystem (U32 flags)
853 888
854void SDL_QuitSubSystem (U32 flags) 889void SDL_QuitSubSystem (U32 flags)
855 890
856void SDL_Quit () 891void SDL_Quit ()
857 892
858int SDL_GL_SetAttribute (int attr, int value) 893int SDL_GL_SetAttribute (int attr, int value)
894 C_ARGS: (SDL_GLattr)attr, value
859 895
860int SDL_GL_GetAttribute (int attr) 896int SDL_GL_GetAttribute (int attr)
861 CODE: 897 CODE:
862 if (SDL_GL_GetAttribute (attr, &RETVAL)) 898 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
863 XSRETURN_UNDEF; 899 XSRETURN_UNDEF;
864 OUTPUT: 900 OUTPUT:
865 RETVAL 901 RETVAL
866 902
867void 903void
922 ); 958 );
923 959
924 if (RETVAL) 960 if (RETVAL)
925 { 961 {
926 av_clear (texture_av); 962 av_clear (texture_av);
927
928 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
929#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);
930#include "glfunc.h" 964#include "glfunc.h"
931#undef GL_FUNC 965#undef GL_FUNC
966 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
967 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
932 } 968 }
933} 969}
934 OUTPUT: 970 OUTPUT:
935 RETVAL 971 RETVAL
972
973void
974SDL_WM_SetCaption (const char *title, const char *icon)
936 975
937void 976void
938SDL_GL_SwapBuffers () 977SDL_GL_SwapBuffers ()
939 978
940char * 979char *
941SDL_GetKeyName (int sym) 980SDL_GetKeyName (int sym)
981 C_ARGS: (SDLKey)sym
942 982
943int 983int
944SDL_GetAppState () 984SDL_GetAppState ()
945 985
946int 986int
947SDL_GetModState () 987SDL_GetModState ()
948 988
989int
990SDL_WaitEvent ()
991 C_ARGS: 0
992
949void 993void
994SDL_PumpEvents ()
995
996void
950poll_events () 997peep_events ()
951 PPCODE: 998 PPCODE:
952{ 999{
953 SDL_Event ev; 1000 SDL_Event ev;
954 1001
955 SDL_PumpEvents (); 1002 SDL_PumpEvents ();
1021 1068
1022 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))));
1023 } 1070 }
1024} 1071}
1025 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
1026int 1086int
1027Mix_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)
1028 POSTCALL: 1088 POSTCALL:
1029 Mix_HookMusicFinished (music_finished); 1089 Mix_HookMusicFinished (music_finished);
1030 Mix_ChannelFinished (channel_finished); 1090 Mix_ChannelFinished (channel_finished);
1092add_font (char *file) 1152add_font (char *file)
1093 CODE: 1153 CODE:
1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1154 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT: 1155 OUTPUT:
1096 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)
1097 1164
1098void 1165void
1099load_image_inline (SV *image_) 1166load_image_inline (SV *image_)
1100 ALIAS: 1167 ALIAS:
1101 load_image_file = 1 1168 load_image_file = 1
1147 1214
1148 SDL_LockSurface (surface2); 1215 SDL_LockSurface (surface2);
1149 EXTEND (SP, 6); 1216 EXTEND (SP, 6);
1150 PUSHs (sv_2mortal (newSViv (surface2->w))); 1217 PUSHs (sv_2mortal (newSViv (surface2->w)));
1151 PUSHs (sv_2mortal (newSViv (surface2->h))); 1218 PUSHs (sv_2mortal (newSViv (surface2->h)));
1152 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1219 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1153 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)));
1154 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1221 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1155 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1222 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1156 SDL_UnlockSurface (surface2); 1223 SDL_UnlockSurface (surface2);
1157 1224
1229MODULE = Deliantra::Client PACKAGE = DC::Font 1296MODULE = Deliantra::Client PACKAGE = DC::Font
1230 1297
1231PROTOTYPES: DISABLE 1298PROTOTYPES: DISABLE
1232 1299
1233DC::Font 1300DC::Font
1234new_from_file (SV *class, char *path, int id = 0) 1301new_from_file (SV *klass, char *path, int id = 0)
1235 CODE: 1302 CODE:
1236{ 1303{
1237 int count; 1304 int count;
1238 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1305 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1239 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1306 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1268 PROTOTYPE: 1335 PROTOTYPE:
1269 CODE: 1336 CODE:
1270 tc_restore (); 1337 tc_restore ();
1271 1338
1272DC::Layout 1339DC::Layout
1273new (SV *class) 1340new (SV *klass)
1274 CODE: 1341 CODE:
1275 New (0, RETVAL, 1, struct cf_layout); 1342 New (0, RETVAL, 1, struct cf_layout);
1276 1343
1277 RETVAL->pl = pango_layout_new (opengl_context); 1344 RETVAL->pl = pango_layout_new (opengl_context);
1278 RETVAL->r = 1.; 1345 RETVAL->r = 1.;
1427 1494
1428void 1495void
1429set_height (DC::Layout self, int base_height) 1496set_height (DC::Layout self, int base_height)
1430 CODE: 1497 CODE:
1431 if (self->base_height != base_height) 1498 if (self->base_height != base_height)
1432 { 1499 {
1433 self->base_height = base_height; 1500 self->base_height = base_height;
1434 layout_update_font (self); 1501 layout_update_font (self);
1435 } 1502 }
1436 1503
1437void 1504void
1665 glDisable (GL_BLEND); 1732 glDisable (GL_BLEND);
1666 } 1733 }
1667} 1734}
1668 1735
1669void 1736void
1670draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f) 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)
1671 PROTOTYPE: @ 1738 PROTOTYPE: @
1672 CODE: 1739 CODE:
1673{ 1740{
1741 glEnable (GL_BLEND);
1742 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1674 glEnable (GL_TEXTURE_2D); 1743 glEnable (GL_TEXTURE_2D);
1675 glEnable (GL_BLEND);
1676 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glBindTexture (GL_TEXTURE_2D, name1); 1744 glBindTexture (GL_TEXTURE_2D, name1);
1678 1745
1679 glColor3f (intensity, intensity, intensity); 1746 glColor3f (intensity, intensity, intensity);
1680 glPushMatrix (); 1747 glPushMatrix ();
1681 glScalef (1./3, 1./3, 1.); 1748 glScalef (1./3, 1./3, 1.);
1682 1749
1683 if (blend > 0.f) 1750 if (blend > 0.f)
1684 { 1751 {
1685 float S2, T2; /* 0. 0. for texture 2 */ 1752 float dx3 = dx * -3.f / w;
1686 float w = w1 > w2 ? w1 : w2; 1753 float dy3 = dy * -3.f / h;
1687 float h = h1 > h2 ? h1 : h2;
1688 GLfloat env_color[4] = { 0., 0., 0., blend }; 1754 GLfloat env_color[4] = { 0., 0., 0., blend };
1689 1755
1690 /* interpolate the two shadow textures */ 1756 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */ 1757 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1758 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1697 glBindTexture (GL_TEXTURE_2D, name2); 1763 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1764 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699 1765
1700 /* rgb == rgb(glcolor) */ 1766 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1767 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1768 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1769 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704 1770
1705 /* alpha = interpolate t0, t1 by env_alpha */ 1771 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1772 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707 1773
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA); 1779 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714 1780
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT); 1781 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA); 1782 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717 1783
1718 s1 *= w / w1;
1719 t1 *= h / h1;
1720
1721 dx *= -3.f / w2;
1722 dy *= -3.f / h2;
1723 dx *= w / w2;
1724 dy *= h / h2;
1725
1726 s2 *= w / w2;
1727 t2 *= h / h2;
1728
1729 glBegin (GL_QUADS); 1784 glBegin (GL_QUADS);
1730 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0); 1785 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1731 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1); 1786 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1732 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1); 1787 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1733 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0); 1788 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1734 glEnd (); 1789 glEnd ();
1735 1790
1736 glDisable (GL_TEXTURE_2D); 1791 glDisable (GL_TEXTURE_2D);
1737 gl.ActiveTexture (GL_TEXTURE0); 1792 gl.ActiveTexture (GL_TEXTURE0);
1738 } 1793 }
1740 { 1795 {
1741 /* simple blending of one texture, also opengl <1.3 path */ 1796 /* simple blending of one texture, also opengl <1.3 path */
1742 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1797 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743 1798
1744 glBegin (GL_QUADS); 1799 glBegin (GL_QUADS);
1745 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1800 glTexCoord2f (0, 0); glVertex2f (0, 0);
1746 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1801 glTexCoord2f (0, t); glVertex2f (0, h);
1747 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1802 glTexCoord2f (s, t); glVertex2f (w, h);
1748 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 1803 glTexCoord2f (s, 0); glVertex2f (w, 0);
1749 glEnd (); 1804 glEnd ();
1750 } 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 ();
1751 1850
1752 glPopMatrix (); 1851 glPopMatrix ();
1753 1852
1754 glDisable (GL_TEXTURE_2D); 1853 glDisable (GL_TEXTURE_2D);
1755 glDisable (GL_BLEND); 1854 glDisable (GL_BLEND);
1769MODULE = Deliantra::Client PACKAGE = DC::Map 1868MODULE = Deliantra::Client PACKAGE = DC::Map
1770 1869
1771PROTOTYPES: DISABLE 1870PROTOTYPES: DISABLE
1772 1871
1773DC::Map 1872DC::Map
1774new (SV *class) 1873new (SV *klass)
1775 CODE: 1874 CODE:
1776 New (0, RETVAL, 1, struct map); 1875 New (0, RETVAL, 1, struct map);
1777 RETVAL->x = 0; 1876 RETVAL->x = 0;
1778 RETVAL->y = 0; 1877 RETVAL->y = 0;
1779 RETVAL->w = 0; 1878 RETVAL->w = 0;
1935 self->y += MAP_EXTEND_Y; 2034 self->y += MAP_EXTEND_Y;
1936 } 2035 }
1937} 2036}
1938 2037
1939SV * 2038SV *
1940map1a_update (DC::Map self, SV *data_, int extmap) 2039map1a_update (DC::Map self, SV *data_)
1941 CODE: 2040 CODE:
1942{ 2041{
1943 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2042 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1944 uint8_t *data_end = (uint8_t *)SvEND (data_); 2043 uint8_t *data_end = (uint8_t *)SvEND (data_);
1945 mapcell *cell; 2044 mapcell *cell;
1966 2065
1967 //TODO: don't trust server data to be in-range(!) 2066 //TODO: don't trust server data to be in-range(!)
1968 2067
1969 if (flags & 8) 2068 if (flags & 8)
1970 { 2069 {
2070 uint8_t ext, cmd;
2071
1971 if (extmap) 2072 do
1972 { 2073 {
1973 uint8_t ext, cmd; 2074 ext = *data++;
2075 cmd = ext & 0x7f;
1974 2076
1975 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
1976 { 2080 {
1977 ext = *data++;
1978 cmd = ext & 0x7f;
1979
1980 if (cmd < 4)
1981 cell->darkness = 255 - ext * 64 + 1;
1982 else if (cmd == 5) // health
1983 {
1984 cell->stat_width = 1; 2081 cell->stat_width = 1;
1985 cell->stat_hp = *data++; 2082 cell->stat_hp = *data++;
1986 }
1987 else if (cmd == 6) // monster width
1988 cell->stat_width = *data++ + 1;
1989 else if (cmd == 0x47)
1990 {
1991 if (*data == 1) cell->player = data [1];
1992 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1993 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1994 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1995
1996 data += *data + 1;
1997 }
1998 else if (cmd == 8) // cell flags
1999 cell->flags = *data++;
2000 else if (ext & 0x40) // unknown, multibyte => skip
2001 data += *data + 1;
2002 else
2003 data++;
2004 } 2083 }
2005 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++;
2006 } 2101 }
2007 else 2102 while (ext & 0x80);
2008 cell->darkness = *data++ + 1;
2009 } 2103 }
2010 2104
2011 for (z = 0; z <= 2; ++z) 2105 for (z = 0; z <= 2; ++z)
2012 if (flags & (4 >> z)) 2106 if (flags & (4 >> z))
2013 { 2107 {
2061 ? self->row + y 2155 ? self->row + y
2062 : 0; 2156 : 0;
2063 2157
2064 for (x = x0; x < x1; x++) 2158 for (x = x0; x < x1; x++)
2065 { 2159 {
2066 int r = 32, g = 32, b = 32, a = 192; 2160 unsigned int r = 32, g = 32, b = 32, a = 192;
2067 2161
2068 if (row && row->c0 <= x && x < row->c1) 2162 if (row && row->c0 <= x && x < row->c1)
2069 { 2163 {
2070 mapcell *cell = row->col + (x - row->c0); 2164 mapcell *cell = row->col + (x - row->c0);
2071 2165
2073 { 2167 {
2074 maptex tex = self->tex [cell->tile [z]]; 2168 maptex tex = self->tex [cell->tile [z]];
2075 int a0 = 255 - tex.a; 2169 int a0 = 255 - tex.a;
2076 int a1 = tex.a; 2170 int a1 = tex.a;
2077 2171
2078 r = (r * a0 + tex.r * a1) / 255; 2172 r = div255 (r * a0 + tex.r * a1);
2079 g = (g * a0 + tex.g * a1) / 255; 2173 g = div255 (g * a0 + tex.g * a1);
2080 b = (b * a0 + tex.b * a1) / 255; 2174 b = div255 (b * a0 + tex.b * a1);
2081 a = (a * a0 + tex.a * a1) / 255; 2175 a = div255 (a * a0 + tex.a * a1);
2082 } 2176 }
2083 } 2177 }
2084 2178
2085 *map++ = (r ) 2179 *map++ = (r )
2086 | (g << 8) 2180 | (g << 8)
2093} 2187}
2094 OUTPUT: 2188 OUTPUT:
2095 RETVAL 2189 RETVAL
2096 2190
2097void 2191void
2098draw (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)
2099 CODE: 2193 CODE:
2100{ 2194{
2101 int x, y, z; 2195 int x, y, z;
2102 2196
2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2197 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2107 int pl_x, pl_y; 2201 int pl_x, pl_y;
2108 maptex pl_tex; 2202 maptex pl_tex;
2109 rc_t *rc = rc_alloc (); 2203 rc_t *rc = rc_alloc ();
2110 rc_t *rc_ov = rc_alloc (); 2204 rc_t *rc_ov = rc_alloc ();
2111 rc_key_t key; 2205 rc_key_t key;
2112 rc_array_t *arr, *arr_hidden; 2206 rc_array_t *arr;
2113 2207
2114 pl_tex.name = 0; 2208 pl_tex.name = 0;
2115 2209
2116 // that's current max. sorry. 2210 // that's current max. sorry.
2117 if (sw > 255) sw = 255; 2211 if (sw > 255) sw = 255;
2154 } 2248 }
2155 2249
2156 glEnable (GL_BLEND); 2250 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2251 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2252 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2159
2160 key.texname = self->tex [TEXID_HIDDEN].name;
2161 arr_hidden = rc_array (rc_ov, &key);
2162 2253
2163 for (z = 0; z <= 2; z++) 2254 for (z = 0; z <= 2; z++)
2164 { 2255 {
2165 memset (smooth_level, 0, sizeof (smooth_level)); 2256 memset (smooth_level, 0, sizeof (smooth_level));
2166 key.texname = -1; 2257 key.texname = -1;
2190 2281
2191 key.texname = tex.name; 2282 key.texname = tex.name;
2192 arr = rc_array (rc, &key); 2283 arr = rc_array (rc, &key);
2193 } 2284 }
2194 2285
2195 px = (x + 1) * T - tex.w; 2286 px = (x + 1) * Th - tex.w;
2196 py = (y + 1) * T - tex.h; 2287 py = (y + 1) * Tw - tex.h;
2197 2288
2198 if (expect_false (cell->player == player) && expect_false (z == 2)) 2289 if (expect_false (cell->player == player) && expect_false (z == 2))
2199 { 2290 {
2200 pl_x = px; 2291 pl_x = px;
2201 pl_y = py; 2292 pl_y = py;
2246 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);
2247 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);
2248 } 2339 }
2249 } 2340 }
2250 2341
2251 if (expect_false (z == 2)) 2342 if (expect_false (z == 2) && expect_false (cell->flags))
2252 { 2343 {
2253 /* draw question marks on top of hidden spaces */ 2344 // overlays such as the speech bubble, probably more to come
2254 if (!cell->darkness) 2345 if (cell->flags & 1)
2255 { 2346 {
2256 maptex tex = self->tex [TEXID_HIDDEN];
2257 int px = (x + 1) * T - tex.w;
2258 int py = (y + 1) * T - tex.h;
2259
2260 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264 }
2265
2266 if (expect_false (cell->flags))
2267 {
2268 // overlays such as the speech bubble, probably more to come
2269 if (cell->flags & 1)
2270 {
2271 rc_key_t key_ov = key; 2347 rc_key_t key_ov = key;
2272 maptex tex = self->tex [TEXID_SPEECH]; 2348 maptex tex = self->tex [TEXID_SPEECH];
2273 rc_array_t *arr; 2349 rc_array_t *arr;
2274 int px = x * T + T * 2 / 32; 2350 int px = x * Tw + Tw * 2 / 32;
2275 int py = y * T - T * 6 / 32; 2351 int py = y * Th - Th * 6 / 32;
2276 2352
2277 key_ov.texname = tex.name; 2353 key_ov.texname = tex.name;
2278 arr = rc_array (rc_ov, &key_ov); 2354 arr = rc_array (rc_ov, &key_ov);
2279 2355
2280 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2356 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2281 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2357 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2282 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2358 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2283 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2359 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2284 }
2285 } 2360 }
2286 } 2361 }
2287 } 2362 }
2288 } 2363 }
2289 2364
2316 if (!(bits & 0x1000) 2391 if (!(bits & 0x1000)
2317 && skey->level == level 2392 && skey->level == level
2318 && level > smooth_max [skey->x][skey->y]) 2393 && level > smooth_max [skey->x][skey->y])
2319 { 2394 {
2320 maptex tex = self->tex [skey->tile]; 2395 maptex tex = self->tex [skey->tile];
2321 int px = (((int)skey->x) - 1) * T; 2396 int px = (((int)skey->x) - 1) * Tw;
2322 int py = (((int)skey->y) - 1) * T; 2397 int py = (((int)skey->y) - 1) * Th;
2323 int border = bits & 15; 2398 int border = bits & 15;
2324 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2399 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2325 float dx = tex.s * .0625f; // 16 images/row 2400 float dx = tex.s * .0625f; // 16 images/row
2326 float dy = tex.t * .5f ; // 2 images/column 2401 float dy = tex.t * .5f ; // 2 images/column
2327 2402
2340 2415
2341 if (border) 2416 if (border)
2342 { 2417 {
2343 float ox = border * dx; 2418 float ox = border * dx;
2344 2419
2345 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2420 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2346 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2421 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2347 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2422 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2348 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2423 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2349 } 2424 }
2350 2425
2351 if (corner) 2426 if (corner)
2352 { 2427 {
2353 float ox = corner * dx; 2428 float ox = corner * dx;
2354 2429
2355 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2356 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2357 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2358 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2359 } 2434 }
2360 } 2435 }
2361 } 2436 }
2362 } 2437 }
2363 } 2438 }
2404 for (x = 0; x < sw; x++) 2479 for (x = 0; x < sw; x++)
2405 if (row->c0 <= x + mx && x + mx < row->c1) 2480 if (row->c0 <= x + mx && x + mx < row->c1)
2406 { 2481 {
2407 mapcell *cell = row->col + (x + mx - row->c0); 2482 mapcell *cell = row->col + (x + mx - row->c0);
2408 2483
2409 int px = x * T; 2484 int px = x * Tw;
2410 int py = y * T; 2485 int py = y * Th;
2411 2486
2412 if (expect_false (cell->player == player)) 2487 if (expect_false (cell->player == player))
2413 { 2488 {
2414 px += sdx; 2489 px += sdx;
2415 py += sdy; 2490 py += sdy;
2416 } 2491 }
2417 2492
2418 if (cell->stat_hp) 2493 if (cell->stat_hp)
2419 { 2494 {
2420 int width = cell->stat_width * T; 2495 int width = cell->stat_width * Tw;
2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2496 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2422 2497
2423 glColor3ub (0, 0, 0); 2498 glColor3ub (0, 0, 0);
2424 glRectf (px + 1, py - thick - 2, 2499 glRectf (px + 1, py - thick - 2,
2425 px + width - 1, py); 2500 px + width - 1, py);
2426 2501
2463 int x, y; 2538 int x, y;
2464 2539
2465 glEnable (GL_TEXTURE_2D); 2540 glEnable (GL_TEXTURE_2D);
2466 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2541 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467 * but the nvidia driver (185.18.14) mishandles alpha textures 2542 * but the nvidia driver (185.18.14) mishandles alpha textures
2468 * ansd takes the colour from god knows where instead of using 2543 * and takes the colour from god knows where instead of using
2469 * Cp. MODULATE results in the same colour, but slightly different 2544 * Cp. MODULATE results in the same colour, but slightly different
2470 * alpha, but atcually gives us the correct colour with nvidia. 2545 * alpha, but atcually gives us the correct colour with nvidia.
2471 */ 2546 */
2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2547 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2473 glEnable (GL_BLEND); 2548 glEnable (GL_BLEND);
2502void 2577void
2503fow_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)
2504 PPCODE: 2579 PPCODE:
2505{ 2580{
2506 int x, y; 2581 int x, y;
2507 int sw1 = sw + 2; 2582 int sw1 = sw + 2;
2508 int sh1 = sh + 2; 2583 int sh1 = sh + 2;
2509 int sh3 = sh * 3; 2584 int sh3 = sh * 3;
2510 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);
2511 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2588 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2512 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2589 memset (darkness1, 0, sw1*sh1);
2513 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2514 2590
2515 SvPOK_only (darkness3_sv); 2591 SvPOK_only (darkness3_sv);
2516 SvCUR_set (darkness3_sv, sw34 * sh3); 2592 SvCUR_set (darkness3_sv, sw3 * sh3);
2517 2593
2518 mx += self->x - 1; 2594 mx += self->x - 1;
2519 my += self->y - 1; 2595 my += self->y - 1;
2520
2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2522 2596
2523 for (y = 0; y < sh1; y++) 2597 for (y = 0; y < sh1; y++)
2524 if (0 <= y + my && y + my < self->rows) 2598 if (0 <= y + my && y + my < self->rows)
2525 { 2599 {
2526 maprow *row = self->row + (y + my); 2600 maprow *row = self->row + (y + my);
2559 2633
2560 uint8_t r13 = (d13 + d23 + d12) / 3; 2634 uint8_t r13 = (d13 + d23 + d12) / 3;
2561 uint8_t r23 = d23; 2635 uint8_t r23 = d23;
2562 uint8_t r33 = (d23 + d33 + d32) / 3; 2636 uint8_t r33 = (d23 + d33 + d32) / 3;
2563 2637
2564 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2565 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2566 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2567 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2568 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 */
2569 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2570 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2571 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2572 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2573 } 2647 }
2574 2648
2575 free (darkness1); 2649 free (darkness1);
2576 2650
2577 EXTEND (SP, 3); 2651 EXTEND (SP, 3);
2578 PUSHs (sv_2mortal (newSViv (sw34))); 2652 PUSHs (sv_2mortal (newSViv (sw3)));
2579 PUSHs (sv_2mortal (newSViv (sh3))); 2653 PUSHs (sv_2mortal (newSViv (sh3)));
2580 PUSHs (darkness3_sv); 2654 PUSHs (darkness3_sv);
2581} 2655}
2582 2656
2583SV * 2657SV *
2670 STRLEN len; 2744 STRLEN len;
2671 uint8_t *data, *end; 2745 uint8_t *data, *end;
2672 2746
2673 len = SvLEN (data_sv); 2747 len = SvLEN (data_sv);
2674 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2748 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2675 data = SvPVbyte_nolen (data_sv); 2749 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2676 end = data + len + 8; 2750 end = data + len + 8;
2677 2751
2678 if (len < 5) 2752 if (len < 5)
2679 XSRETURN_EMPTY; 2753 XSRETURN_EMPTY;
2680 2754
2741} 2815}
2742 2816
2743MODULE = Deliantra::Client PACKAGE = DC::RW 2817MODULE = Deliantra::Client PACKAGE = DC::RW
2744 2818
2745DC::RW 2819DC::RW
2746new (SV *class, SV *data_sv) 2820new (SV *klass, SV *data_sv)
2747 CODE: 2821 CODE:
2748{ 2822{
2749 STRLEN datalen; 2823 STRLEN datalen;
2750 char *data = SvPVbyte (data_sv, datalen); 2824 char *data = SvPVbyte (data_sv, datalen);
2751 2825
2753} 2827}
2754 OUTPUT: 2828 OUTPUT:
2755 RETVAL 2829 RETVAL
2756 2830
2757DC::RW 2831DC::RW
2758new_from_file (SV *class, const char *path, const char *mode = "rb") 2832new_from_file (SV *klass, const char *path, const char *mode = "rb")
2759 CODE: 2833 CODE:
2760 RETVAL = SDL_RWFromFile (path, mode); 2834 RETVAL = SDL_RWFromFile (path, mode);
2761 OUTPUT: 2835 OUTPUT:
2762 RETVAL 2836 RETVAL
2763 2837
2781 if (RETVAL < 0) 2855 if (RETVAL < 0)
2782 { 2856 {
2783 RETVAL = Mix_GroupOldest (-1); 2857 RETVAL = Mix_GroupOldest (-1);
2784 2858
2785 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)
2786 XSRETURN_UNDEF; 2865 XSRETURN_UNDEF;
2787 2866 }
2867 else
2788 Mix_HaltChannel (RETVAL); 2868 Mix_HaltChannel (RETVAL);
2789 } 2869 }
2790 2870
2791 Mix_UnregisterAllEffects (RETVAL); 2871 Mix_UnregisterAllEffects (RETVAL);
2792 Mix_Volume (RETVAL, 128); 2872 Mix_Volume (RETVAL, 128);
2793} 2873}
2853 2933
2854MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2934MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2855 2935
2856PROTOTYPES: DISABLE 2936PROTOTYPES: DISABLE
2857 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
2858DC::MixChunk 2950DC::MixChunk
2859new (SV *class, DC::RW rwops) 2951new (SV *klass, DC::RW rwops)
2860 CODE: 2952 CODE:
2861 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2953 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2862 OUTPUT: 2954 OUTPUT:
2863 RETVAL 2955 RETVAL
2864 2956
2894 OUTPUT: 2986 OUTPUT:
2895 RETVAL 2987 RETVAL
2896 2988
2897MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2989MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2898 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
2899int 3003int
2900volume (int volume = -1) 3004volume (int volume = -1)
2901 PROTOTYPE: ;$ 3005 PROTOTYPE: ;$
2902 CODE: 3006 CODE:
2903 if (items > 0) 3007 if (items > 0)
2914void 3018void
2915halt () 3019halt ()
2916 CODE: 3020 CODE:
2917 Mix_HaltMusic (); 3021 Mix_HaltMusic ();
2918 3022
3023int
3024playing ()
3025 CODE:
3026 RETVAL = Mix_PlayingMusic ();
3027 OUTPUT:
3028 RETVAL
3029
2919DC::MixMusic 3030DC::MixMusic
2920new (SV *class, DC::RW rwops) 3031new (SV *klass, DC::RW rwops)
2921 CODE: 3032 CODE:
2922 RETVAL = Mix_LoadMUS_RW (rwops); 3033 RETVAL = Mix_LoadMUS_RW (rwops);
2923 OUTPUT: 3034 OUTPUT:
2924 RETVAL 3035 RETVAL
2925 3036
3062 const_iv (GL_FUNC_SUBTRACT), 3173 const_iv (GL_FUNC_SUBTRACT),
3063 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3174 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3064# undef const_iv 3175# undef const_iv
3065 }; 3176 };
3066 3177
3067 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--)
3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3179 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3069 3180
3070 texture_av = newAV (); 3181 texture_av = newAV ();
3071 AvREAL_off (texture_av); 3182 AvREAL_off (texture_av);
3072} 3183}
3073 3184
3078 gl.BlendFuncSeparateEXT = 0; 3189 gl.BlendFuncSeparateEXT = 0;
3079 3190
3080void 3191void
3081apple_nvidia_bug (int enable) 3192apple_nvidia_bug (int enable)
3082 3193
3083char * 3194const char *
3084gl_vendor () 3195gl_vendor ()
3085 CODE: 3196 CODE:
3086 RETVAL = (char *)glGetString (GL_VENDOR); 3197 RETVAL = (const char *)glGetString (GL_VENDOR);
3087 OUTPUT: 3198 OUTPUT:
3088 RETVAL 3199 RETVAL
3089 3200
3090char * 3201const char *
3091gl_version () 3202gl_version ()
3092 CODE: 3203 CODE:
3093 RETVAL = (char *)glGetString (GL_VERSION); 3204 RETVAL = (const char *)glGetString (GL_VERSION);
3094 OUTPUT: 3205 OUTPUT:
3095 RETVAL 3206 RETVAL
3096 3207
3097char * 3208const char *
3098gl_extensions () 3209gl_extensions ()
3099 CODE: 3210 CODE:
3100 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3211 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3101 OUTPUT: 3212 OUTPUT:
3102 RETVAL 3213 RETVAL
3103 3214
3104const char *glGetString (GLenum pname) 3215const char *glGetString (GLenum pname)
3216 CODE:
3217 RETVAL = (const char *)glGetString (pname);
3218 OUTPUT:
3219 RETVAL
3105 3220
3106GLint glGetInteger (GLenum pname) 3221GLint glGetInteger (GLenum pname)
3107 CODE: 3222 CODE:
3108 glGetIntegerv (pname, &RETVAL); 3223 glGetIntegerv (pname, &RETVAL);
3109 OUTPUT: 3224 OUTPUT:
3116 RETVAL 3231 RETVAL
3117 3232
3118int glGetError () 3233int glGetError ()
3119 3234
3120void glFinish () 3235void glFinish ()
3236
3237void glFlush ()
3121 3238
3122void glClear (int mask) 3239void glClear (int mask)
3123 3240
3124void glClearColor (float r, float g, float b, float a = 1.0) 3241void glClearColor (float r, float g, float b, float a = 1.0)
3125 PROTOTYPE: @ 3242 PROTOTYPE: @
3296void glNewList (int list, int mode = GL_COMPILE) 3413void glNewList (int list, int mode = GL_COMPILE)
3297 3414
3298void glEndList () 3415void glEndList ()
3299 3416
3300void 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);
3301 3423
3302MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3424MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3303 3425
3304PROTOTYPES: DISABLE 3426PROTOTYPES: DISABLE
3305 3427

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines