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.288 by pippijn, Tue Dec 23 18:52:54 2008 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
44/* work around os x broken headers */ 43/* work around os x broken headers */
45#ifdef __MACOSX__ 44#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 48#endif
48 49
49#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
51 52
52#include <glib/gmacros.h> 53#include <glib.h>
53 54
54#include <pango/pango.h> 55#include <pango/pango.h>
55 56
56#ifndef PANGO_VERSION_CHECK 57#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 58# define PANGO_VERSION_CHECK(a,b,c) 0
81#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
83 84
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 64 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
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;
190static void 212static void
191substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
192{ 214{
193 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
194#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
195 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
196#endif 218#endif
197 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
198} 220}
199 221
200static void 222static void
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
820NV ceil (NV x) 854NV ceil (NV x)
821 855
822IV minpot (UV n) 856IV minpot (UV n)
823 857
824IV popcount (UV n) 858IV popcount (UV n)
859
860NV distance (NV dx, NV dy)
861 CODE:
862 RETVAL = pow (dx * dx + dy * dy, 0.5);
863 OUTPUT:
864 RETVAL
825 865
826void 866void
827pango_init () 867pango_init ()
828 CODE: 868 CODE:
829{ 869{
837#endif 877#endif
838} 878}
839 879
840char *SDL_GetError () 880char *SDL_GetError ()
841 881
842void SDL_braino () 882void SDL_main_hack (SV *real_main)
883 PROTOTYPE: &
843 884
844int SDL_Init (U32 flags) 885int SDL_Init (U32 flags)
845 886
846int SDL_InitSubSystem (U32 flags) 887int SDL_InitSubSystem (U32 flags)
847 888
848void SDL_QuitSubSystem (U32 flags) 889void SDL_QuitSubSystem (U32 flags)
849 890
850void SDL_Quit () 891void SDL_Quit ()
851 892
852int SDL_GL_SetAttribute (int attr, int value) 893int SDL_GL_SetAttribute (int attr, int value)
894 C_ARGS: (SDL_GLattr)attr, value
853 895
854int SDL_GL_GetAttribute (int attr) 896int SDL_GL_GetAttribute (int attr)
855 CODE: 897 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL)) 898 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
857 XSRETURN_UNDEF; 899 XSRETURN_UNDEF;
858 OUTPUT: 900 OUTPUT:
859 RETVAL 901 RETVAL
860 902
861void 903void
916 ); 958 );
917 959
918 if (RETVAL) 960 if (RETVAL)
919 { 961 {
920 av_clear (texture_av); 962 av_clear (texture_av);
921
922 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923#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);
924#include "glfunc.h" 964#include "glfunc.h"
925#undef GL_FUNC 965#undef GL_FUNC
966 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
967 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926 } 968 }
927} 969}
928 OUTPUT: 970 OUTPUT:
929 RETVAL 971 RETVAL
972
973void
974SDL_WM_SetCaption (const char *title, const char *icon)
930 975
931void 976void
932SDL_GL_SwapBuffers () 977SDL_GL_SwapBuffers ()
933 978
934char * 979char *
935SDL_GetKeyName (int sym) 980SDL_GetKeyName (int sym)
981 C_ARGS: (SDLKey)sym
936 982
937int 983int
938SDL_GetAppState () 984SDL_GetAppState ()
939 985
940int 986int
941SDL_GetModState () 987SDL_GetModState ()
942 988
989int
990SDL_WaitEvent ()
991 C_ARGS: 0
992
943void 993void
994SDL_PumpEvents ()
995
996void
944poll_events () 997peep_events ()
945 PPCODE: 998 PPCODE:
946{ 999{
947 SDL_Event ev; 1000 SDL_Event ev;
948 1001
949 SDL_PumpEvents (); 1002 SDL_PumpEvents ();
1015 1068
1016 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))));
1017 } 1070 }
1018} 1071}
1019 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
1020int 1086int
1021Mix_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)
1022 POSTCALL: 1088 POSTCALL:
1023 Mix_HookMusicFinished (music_finished); 1089 Mix_HookMusicFinished (music_finished);
1024 Mix_ChannelFinished (channel_finished); 1090 Mix_ChannelFinished (channel_finished);
1086add_font (char *file) 1152add_font (char *file)
1087 CODE: 1153 CODE:
1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1154 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT: 1155 OUTPUT:
1090 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)
1091 1164
1092void 1165void
1093load_image_inline (SV *image_) 1166load_image_inline (SV *image_)
1094 ALIAS: 1167 ALIAS:
1095 load_image_file = 1 1168 load_image_file = 1
1141 1214
1142 SDL_LockSurface (surface2); 1215 SDL_LockSurface (surface2);
1143 EXTEND (SP, 6); 1216 EXTEND (SP, 6);
1144 PUSHs (sv_2mortal (newSViv (surface2->w))); 1217 PUSHs (sv_2mortal (newSViv (surface2->w)));
1145 PUSHs (sv_2mortal (newSViv (surface2->h))); 1218 PUSHs (sv_2mortal (newSViv (surface2->h)));
1146 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1219 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1147 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)));
1148 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1221 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1149 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1222 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1150 SDL_UnlockSurface (surface2); 1223 SDL_UnlockSurface (surface2);
1151 1224
1223MODULE = Deliantra::Client PACKAGE = DC::Font 1296MODULE = Deliantra::Client PACKAGE = DC::Font
1224 1297
1225PROTOTYPES: DISABLE 1298PROTOTYPES: DISABLE
1226 1299
1227DC::Font 1300DC::Font
1228new_from_file (SV *class, char *path, int id = 0) 1301new_from_file (SV *klass, char *path, int id = 0)
1229 CODE: 1302 CODE:
1230{ 1303{
1231 int count; 1304 int count;
1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1305 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1233 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1306 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1262 PROTOTYPE: 1335 PROTOTYPE:
1263 CODE: 1336 CODE:
1264 tc_restore (); 1337 tc_restore ();
1265 1338
1266DC::Layout 1339DC::Layout
1267new (SV *class) 1340new (SV *klass)
1268 CODE: 1341 CODE:
1269 New (0, RETVAL, 1, struct cf_layout); 1342 New (0, RETVAL, 1, struct cf_layout);
1270 1343
1271 RETVAL->pl = pango_layout_new (opengl_context); 1344 RETVAL->pl = pango_layout_new (opengl_context);
1272 RETVAL->r = 1.; 1345 RETVAL->r = 1.;
1421 1494
1422void 1495void
1423set_height (DC::Layout self, int base_height) 1496set_height (DC::Layout self, int base_height)
1424 CODE: 1497 CODE:
1425 if (self->base_height != base_height) 1498 if (self->base_height != base_height)
1426 { 1499 {
1427 self->base_height = base_height; 1500 self->base_height = base_height;
1428 layout_update_font (self); 1501 layout_update_font (self);
1429 } 1502 }
1430 1503
1431void 1504void
1658 glDisable (GL_ALPHA_TEST); 1731 glDisable (GL_ALPHA_TEST);
1659 glDisable (GL_BLEND); 1732 glDisable (GL_BLEND);
1660 } 1733 }
1661} 1734}
1662 1735
1736void
1737draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1738 PROTOTYPE: @
1739 CODE:
1740{
1741 glEnable (GL_BLEND);
1742 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1743 glEnable (GL_TEXTURE_2D);
1744 glBindTexture (GL_TEXTURE_2D, name1);
1745
1746 glColor3f (intensity, intensity, intensity);
1747 glPushMatrix ();
1748 glScalef (1./3, 1./3, 1.);
1749
1750 if (blend > 0.f)
1751 {
1752 float dx3 = dx * -3.f / w;
1753 float dy3 = dy * -3.f / h;
1754 GLfloat env_color[4] = { 0., 0., 0., blend };
1755
1756 /* interpolate the two shadow textures */
1757 /* stage 0 == rgb(glcolor) + alpha(t0) */
1758 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1759
1760 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1761 gl.ActiveTexture (GL_TEXTURE1);
1762 glEnable (GL_TEXTURE_2D);
1763 glBindTexture (GL_TEXTURE_2D, name2);
1764 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1765
1766 /* rgb == rgb(glcolor) */
1767 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1768 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1769 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1770
1771 /* alpha = interpolate t0, t1 by env_alpha */
1772 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1773
1774 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1775 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1776 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1777
1778 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1779 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1780
1781 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1782 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1783
1784 glBegin (GL_QUADS);
1785 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1787 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1788 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1789 glEnd ();
1790
1791 glDisable (GL_TEXTURE_2D);
1792 gl.ActiveTexture (GL_TEXTURE0);
1793 }
1794 else
1795 {
1796 /* simple blending of one texture, also opengl <1.3 path */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1798
1799 glBegin (GL_QUADS);
1800 glTexCoord2f (0, 0); glVertex2f (0, 0);
1801 glTexCoord2f (0, t); glVertex2f (0, h);
1802 glTexCoord2f (s, t); glVertex2f (w, h);
1803 glTexCoord2f (s, 0); glVertex2f (w, 0);
1804 glEnd ();
1805 }
1806
1807 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1808 {
1809 int x, y;
1810 int dx3 = dx * 3;
1811 int dy3 = dy * 3;
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1814 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1815 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1816 glTranslatef (-1., -1., 0);
1817 glBegin (GL_QUADS);
1818
1819 for (y = 1; y < h; y += 3)
1820 {
1821 int y1 = y - dy3;
1822 int y1valid = y1 >= 0 && y1 < h;
1823
1824 for (x = 1; x < w; x += 3)
1825 {
1826 int x1 = x - dx3;
1827 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1828 uint8_t h2;
1829
1830 if (y1valid && x1 >= 0 && x1 < w)
1831 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1832 else
1833 h2 = 1; /* out of range == invisible */
1834
1835 if (h1 || h2)
1836 {
1837 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1838 glColor4f (1., 1., 1., alpha);
1839
1840 glTexCoord2f (0, 0.); glVertex2i (x , y );
1841 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1842 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1843 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1844 }
1845 }
1846 }
1847 }
1848
1849 glEnd ();
1850
1851 glPopMatrix ();
1852
1853 glDisable (GL_TEXTURE_2D);
1854 glDisable (GL_BLEND);
1855}
1856
1663IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1857IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1664 CODE: 1858 CODE:
1665{ 1859{
1666 GLint width; 1860 GLint width;
1667 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1861 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1674MODULE = Deliantra::Client PACKAGE = DC::Map 1868MODULE = Deliantra::Client PACKAGE = DC::Map
1675 1869
1676PROTOTYPES: DISABLE 1870PROTOTYPES: DISABLE
1677 1871
1678DC::Map 1872DC::Map
1679new (SV *class) 1873new (SV *klass)
1680 CODE: 1874 CODE:
1681 New (0, RETVAL, 1, struct map); 1875 New (0, RETVAL, 1, struct map);
1682 RETVAL->x = 0; 1876 RETVAL->x = 0;
1683 RETVAL->y = 0; 1877 RETVAL->y = 0;
1684 RETVAL->w = 0; 1878 RETVAL->w = 0;
1840 self->y += MAP_EXTEND_Y; 2034 self->y += MAP_EXTEND_Y;
1841 } 2035 }
1842} 2036}
1843 2037
1844SV * 2038SV *
1845map1a_update (DC::Map self, SV *data_, int extmap) 2039map1a_update (DC::Map self, SV *data_)
1846 CODE: 2040 CODE:
1847{ 2041{
1848 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2042 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1849 uint8_t *data_end = (uint8_t *)SvEND (data_); 2043 uint8_t *data_end = (uint8_t *)SvEND (data_);
1850 mapcell *cell; 2044 mapcell *cell;
1871 2065
1872 //TODO: don't trust server data to be in-range(!) 2066 //TODO: don't trust server data to be in-range(!)
1873 2067
1874 if (flags & 8) 2068 if (flags & 8)
1875 { 2069 {
2070 uint8_t ext, cmd;
2071
1876 if (extmap) 2072 do
1877 { 2073 {
1878 uint8_t ext, cmd; 2074 ext = *data++;
2075 cmd = ext & 0x7f;
1879 2076
1880 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
1881 { 2080 {
1882 ext = *data++;
1883 cmd = ext & 0x7f;
1884
1885 if (cmd < 4)
1886 cell->darkness = 255 - ext * 64 + 1;
1887 else if (cmd == 5) // health
1888 {
1889 cell->stat_width = 1; 2081 cell->stat_width = 1;
1890 cell->stat_hp = *data++; 2082 cell->stat_hp = *data++;
1891 }
1892 else if (cmd == 6) // monster width
1893 cell->stat_width = *data++ + 1;
1894 else if (cmd == 0x47)
1895 {
1896 if (*data == 1) cell->player = data [1];
1897 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1898 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1899 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1900
1901 data += *data + 1;
1902 }
1903 else if (cmd == 8) // cell flags
1904 cell->flags = *data++;
1905 else if (ext & 0x40) // unknown, multibyte => skip
1906 data += *data + 1;
1907 else
1908 data++;
1909 } 2083 }
1910 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++;
1911 } 2101 }
1912 else 2102 while (ext & 0x80);
1913 cell->darkness = *data++ + 1;
1914 } 2103 }
1915 2104
1916 for (z = 0; z <= 2; ++z) 2105 for (z = 0; z <= 2; ++z)
1917 if (flags & (4 >> z)) 2106 if (flags & (4 >> z))
1918 { 2107 {
1966 ? self->row + y 2155 ? self->row + y
1967 : 0; 2156 : 0;
1968 2157
1969 for (x = x0; x < x1; x++) 2158 for (x = x0; x < x1; x++)
1970 { 2159 {
1971 int r = 32, g = 32, b = 32, a = 192; 2160 unsigned int r = 32, g = 32, b = 32, a = 192;
1972 2161
1973 if (row && row->c0 <= x && x < row->c1) 2162 if (row && row->c0 <= x && x < row->c1)
1974 { 2163 {
1975 mapcell *cell = row->col + (x - row->c0); 2164 mapcell *cell = row->col + (x - row->c0);
1976 2165
1978 { 2167 {
1979 maptex tex = self->tex [cell->tile [z]]; 2168 maptex tex = self->tex [cell->tile [z]];
1980 int a0 = 255 - tex.a; 2169 int a0 = 255 - tex.a;
1981 int a1 = tex.a; 2170 int a1 = tex.a;
1982 2171
1983 r = (r * a0 + tex.r * a1) / 255; 2172 r = div255 (r * a0 + tex.r * a1);
1984 g = (g * a0 + tex.g * a1) / 255; 2173 g = div255 (g * a0 + tex.g * a1);
1985 b = (b * a0 + tex.b * a1) / 255; 2174 b = div255 (b * a0 + tex.b * a1);
1986 a = (a * a0 + tex.a * a1) / 255; 2175 a = div255 (a * a0 + tex.a * a1);
1987 } 2176 }
1988 } 2177 }
1989 2178
1990 *map++ = (r ) 2179 *map++ = (r )
1991 | (g << 8) 2180 | (g << 8)
1998} 2187}
1999 OUTPUT: 2188 OUTPUT:
2000 RETVAL 2189 RETVAL
2001 2190
2002void 2191void
2003draw (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)
2004 CODE: 2193 CODE:
2005{ 2194{
2006 int x, y, z; 2195 int x, y, z;
2007 2196
2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2197 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2012 int pl_x, pl_y; 2201 int pl_x, pl_y;
2013 maptex pl_tex; 2202 maptex pl_tex;
2014 rc_t *rc = rc_alloc (); 2203 rc_t *rc = rc_alloc ();
2015 rc_t *rc_ov = rc_alloc (); 2204 rc_t *rc_ov = rc_alloc ();
2016 rc_key_t key; 2205 rc_key_t key;
2017 rc_array_t *arr, *arr_hidden; 2206 rc_array_t *arr;
2018 2207
2019 pl_tex.name = 0; 2208 pl_tex.name = 0;
2020 2209
2021 // that's current max. sorry. 2210 // that's current max. sorry.
2022 if (sw > 255) sw = 255; 2211 if (sw > 255) sw = 255;
2059 } 2248 }
2060 2249
2061 glEnable (GL_BLEND); 2250 glEnable (GL_BLEND);
2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2251 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2252 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2064
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067 2253
2068 for (z = 0; z <= 2; z++) 2254 for (z = 0; z <= 2; z++)
2069 { 2255 {
2070 memset (smooth_level, 0, sizeof (smooth_level)); 2256 memset (smooth_level, 0, sizeof (smooth_level));
2071 key.texname = -1; 2257 key.texname = -1;
2095 2281
2096 key.texname = tex.name; 2282 key.texname = tex.name;
2097 arr = rc_array (rc, &key); 2283 arr = rc_array (rc, &key);
2098 } 2284 }
2099 2285
2100 px = (x + 1) * T - tex.w; 2286 px = (x + 1) * Th - tex.w;
2101 py = (y + 1) * T - tex.h; 2287 py = (y + 1) * Tw - tex.h;
2102 2288
2103 if (expect_false (cell->player == player) && expect_false (z == 2)) 2289 if (expect_false (cell->player == player) && expect_false (z == 2))
2104 { 2290 {
2105 pl_x = px; 2291 pl_x = px;
2106 pl_y = py; 2292 pl_y = py;
2151 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);
2152 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);
2153 } 2339 }
2154 } 2340 }
2155 2341
2156 if (expect_false (z == 2)) 2342 if (expect_false (z == 2) && expect_false (cell->flags))
2157 { 2343 {
2158 /* draw question marks on top of hidden spaces */ 2344 // overlays such as the speech bubble, probably more to come
2159 if (!cell->darkness) 2345 if (cell->flags & 1)
2160 { 2346 {
2161 maptex tex = self->tex [TEXID_HIDDEN];
2162 int px = (x + 1) * T - tex.w;
2163 int py = (y + 1) * T - tex.h;
2164
2165 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169 }
2170
2171 if (expect_false (cell->flags))
2172 {
2173 // overlays such as the speech bubble, probably more to come
2174 if (cell->flags & 1)
2175 {
2176 rc_key_t key_ov = key; 2347 rc_key_t key_ov = key;
2177 maptex tex = self->tex [TEXID_SPEECH]; 2348 maptex tex = self->tex [TEXID_SPEECH];
2178 rc_array_t *arr; 2349 rc_array_t *arr;
2350 int px = x * Tw + Tw * 2 / 32;
2351 int py = y * Th - Th * 6 / 32;
2179 2352
2180 key_ov.texname = tex.name; 2353 key_ov.texname = tex.name;
2181 arr = rc_array (rc_ov, &key_ov); 2354 arr = rc_array (rc_ov, &key_ov);
2182 2355
2183 int px = x * T + T * 2 / 32;
2184 int py = y * T - T * 6 / 32;
2185
2186 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2356 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2187 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2357 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2188 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);
2189 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2359 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2190 }
2191 } 2360 }
2192 } 2361 }
2193 } 2362 }
2194 } 2363 }
2195 2364
2222 if (!(bits & 0x1000) 2391 if (!(bits & 0x1000)
2223 && skey->level == level 2392 && skey->level == level
2224 && level > smooth_max [skey->x][skey->y]) 2393 && level > smooth_max [skey->x][skey->y])
2225 { 2394 {
2226 maptex tex = self->tex [skey->tile]; 2395 maptex tex = self->tex [skey->tile];
2227 int px = (((int)skey->x) - 1) * T; 2396 int px = (((int)skey->x) - 1) * Tw;
2228 int py = (((int)skey->y) - 1) * T; 2397 int py = (((int)skey->y) - 1) * Th;
2229 int border = bits & 15; 2398 int border = bits & 15;
2230 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2399 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2231 float dx = tex.s * .0625f; // 16 images/row 2400 float dx = tex.s * .0625f; // 16 images/row
2232 float dy = tex.t * .5f ; // 2 images/column 2401 float dy = tex.t * .5f ; // 2 images/column
2233 2402
2246 2415
2247 if (border) 2416 if (border)
2248 { 2417 {
2249 float ox = border * dx; 2418 float ox = border * dx;
2250 2419
2251 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2420 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2252 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2421 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2253 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2422 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2254 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2423 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2255 } 2424 }
2256 2425
2257 if (corner) 2426 if (corner)
2258 { 2427 {
2259 float ox = corner * dx; 2428 float ox = corner * dx;
2260 2429
2261 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2262 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2263 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2264 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2265 } 2434 }
2266 } 2435 }
2267 } 2436 }
2268 } 2437 }
2269 } 2438 }
2310 for (x = 0; x < sw; x++) 2479 for (x = 0; x < sw; x++)
2311 if (row->c0 <= x + mx && x + mx < row->c1) 2480 if (row->c0 <= x + mx && x + mx < row->c1)
2312 { 2481 {
2313 mapcell *cell = row->col + (x + mx - row->c0); 2482 mapcell *cell = row->col + (x + mx - row->c0);
2314 2483
2315 int px = x * T; 2484 int px = x * Tw;
2316 int py = y * T; 2485 int py = y * Th;
2317 2486
2318 if (expect_false (cell->player == player)) 2487 if (expect_false (cell->player == player))
2319 { 2488 {
2320 px += sdx; 2489 px += sdx;
2321 py += sdy; 2490 py += sdy;
2322 } 2491 }
2323 2492
2324 if (cell->stat_hp) 2493 if (cell->stat_hp)
2325 { 2494 {
2326 int width = cell->stat_width * T; 2495 int width = cell->stat_width * Tw;
2327 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2496 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2328 2497
2329 glColor3ub (0, 0, 0); 2498 glColor3ub (0, 0, 0);
2330 glRectf (px + 1, py - thick - 2, 2499 glRectf (px + 1, py - thick - 2,
2331 px + width - 1, py); 2500 px + width - 1, py);
2332 2501
2338 } 2507 }
2339 } 2508 }
2340} 2509}
2341 2510
2342void 2511void
2343draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2512draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2344 CODE: 2513 CODE:
2345{ 2514{
2346 static float color[16][3] = { 2515 static float color[16][3] = {
2347 { 0.00F, 0.00F, 0.00F }, 2516 { 0.00f, 0.00f, 0.00f },
2348 { 1.00F, 1.00F, 1.00F }, 2517 { 1.00f, 1.00f, 1.00f },
2349 { 0.00F, 0.00F, 0.55F }, 2518 { 0.00f, 0.00f, 0.55f },
2350 { 1.00F, 0.00F, 0.00F }, 2519 { 1.00f, 0.00f, 0.00f },
2351 2520
2352 { 1.00F, 0.54F, 0.00F }, 2521 { 1.00f, 0.54f, 0.00f },
2353 { 0.11F, 0.56F, 1.00F }, 2522 { 0.11f, 0.56f, 1.00f },
2354 { 0.93F, 0.46F, 0.00F }, 2523 { 0.93f, 0.46f, 0.00f },
2355 { 0.18F, 0.54F, 0.34F }, 2524 { 0.18f, 0.54f, 0.34f },
2356 2525
2357 { 0.56F, 0.73F, 0.56F }, 2526 { 0.56f, 0.73f, 0.56f },
2358 { 0.80F, 0.80F, 0.80F }, 2527 { 0.80f, 0.80f, 0.80f },
2359 { 0.55F, 0.41F, 0.13F }, 2528 { 0.55f, 0.41f, 0.13f },
2360 { 0.99F, 0.77F, 0.26F }, 2529 { 0.99f, 0.77f, 0.26f },
2361 2530
2362 { 0.74F, 0.65F, 0.41F }, 2531 { 0.74f, 0.65f, 0.41f },
2363 2532
2364 { 0.00F, 1.00F, 1.00F }, 2533 { 0.00f, 1.00f, 1.00f },
2365 { 1.00F, 0.00F, 1.00F }, 2534 { 1.00f, 0.00f, 1.00f },
2366 { 1.00F, 1.00F, 0.00F }, 2535 { 1.00f, 1.00f, 0.00f },
2367 }; 2536 };
2368 2537
2369 int x, y; 2538 int x, y;
2370 2539
2371 glEnable (GL_TEXTURE_2D); 2540 glEnable (GL_TEXTURE_2D);
2541 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2542 * but the nvidia driver (185.18.14) mishandles alpha textures
2543 * and takes the colour from god knows where instead of using
2544 * Cp. MODULATE results in the same colour, but slightly different
2545 * alpha, but atcually gives us the correct colour with nvidia.
2546 */
2372 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2547 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2373 glEnable (GL_BLEND); 2548 glEnable (GL_BLEND);
2374 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2549 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2375 glBegin (GL_QUADS); 2550 glBegin (GL_QUADS);
2376 2551
2377 for (y = 0; y < h; y++) 2552 for (y = 0; y < h; y++)
2381 2556
2382 if (m) 2557 if (m)
2383 { 2558 {
2384 float *c = color [m & 15]; 2559 float *c = color [m & 15];
2385 2560
2386 float tx1 = m & 0x40 ? 0.5 : 0.; 2561 float tx1 = m & 0x40 ? 0.5f : 0.f;
2387 float tx2 = tx1 + 0.5; 2562 float tx2 = tx1 + 0.5f;
2388 2563
2389 glColor4f (c[0], c[1], c[2], 0.75); 2564 glColor4f (c[0], c[1], c[2], 1);
2390 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2565 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2391 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2566 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2392 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2567 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2393 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2568 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2394 } 2569 }
2402void 2577void
2403fow_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)
2404 PPCODE: 2579 PPCODE:
2405{ 2580{
2406 int x, y; 2581 int x, y;
2407 int sw1 = sw + 2; 2582 int sw1 = sw + 2;
2408 int sh1 = sh + 2; 2583 int sh1 = sh + 2;
2409 int sh3 = sh * 3; 2584 int sh3 = sh * 3;
2410 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);
2411 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2588 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2412 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2589 memset (darkness1, 0, sw1*sh1);
2413 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2414 2590
2415 SvPOK_only (darkness3_sv); 2591 SvPOK_only (darkness3_sv);
2416 SvCUR_set (darkness3_sv, sw34 * sh3); 2592 SvCUR_set (darkness3_sv, sw3 * sh3);
2417 2593
2418 mx += self->x - 1; 2594 mx += self->x - 1;
2419 my += self->y - 1; 2595 my += self->y - 1;
2420
2421 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2422 2596
2423 for (y = 0; y < sh1; y++) 2597 for (y = 0; y < sh1; y++)
2424 if (0 <= y + my && y + my < self->rows) 2598 if (0 <= y + my && y + my < self->rows)
2425 { 2599 {
2426 maprow *row = self->row + (y + my); 2600 maprow *row = self->row + (y + my);
2429 if (row->c0 <= x + mx && x + mx < row->c1) 2603 if (row->c0 <= x + mx && x + mx < row->c1)
2430 { 2604 {
2431 mapcell *cell = row->col + (x + mx - row->c0); 2605 mapcell *cell = row->col + (x + mx - row->c0);
2432 2606
2433 darkness1 [y * sw1 + x] = cell->darkness 2607 darkness1 [y * sw1 + x] = cell->darkness
2434 ? 255 - (cell->darkness - 1) 2608 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2435 : 255 - FOW_DARKNESS; 2609 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2436 } 2610 }
2437 } 2611 }
2438 2612
2439 for (y = 0; y < sh; ++y) 2613 for (y = 0; y < sh; ++y)
2440 for (x = 0; x < sw; ++x) 2614 for (x = 0; x < sw; ++x)
2459 2633
2460 uint8_t r13 = (d13 + d23 + d12) / 3; 2634 uint8_t r13 = (d13 + d23 + d12) / 3;
2461 uint8_t r23 = d23; 2635 uint8_t r23 = d23;
2462 uint8_t r33 = (d23 + d33 + d32) / 3; 2636 uint8_t r33 = (d23 + d33 + d32) / 3;
2463 2637
2464 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2465 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2466 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2467 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2468 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 */
2469 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2470 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2471 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2472 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2473 } 2647 }
2474 2648
2475 free (darkness1); 2649 free (darkness1);
2476 2650
2477 EXTEND (SP, 3); 2651 EXTEND (SP, 3);
2478 PUSHs (sv_2mortal (newSViv (sw34))); 2652 PUSHs (sv_2mortal (newSViv (sw3)));
2479 PUSHs (sv_2mortal (newSViv (sh3))); 2653 PUSHs (sv_2mortal (newSViv (sh3)));
2480 PUSHs (darkness3_sv); 2654 PUSHs (darkness3_sv);
2481} 2655}
2482 2656
2483SV * 2657SV *
2570 STRLEN len; 2744 STRLEN len;
2571 uint8_t *data, *end; 2745 uint8_t *data, *end;
2572 2746
2573 len = SvLEN (data_sv); 2747 len = SvLEN (data_sv);
2574 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2748 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2575 data = SvPVbyte_nolen (data_sv); 2749 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2576 end = data + len + 8; 2750 end = data + len + 8;
2577 2751
2578 if (len < 5) 2752 if (len < 5)
2579 XSRETURN_EMPTY; 2753 XSRETURN_EMPTY;
2580 2754
2641} 2815}
2642 2816
2643MODULE = Deliantra::Client PACKAGE = DC::RW 2817MODULE = Deliantra::Client PACKAGE = DC::RW
2644 2818
2645DC::RW 2819DC::RW
2646new (SV *class, SV *data_sv) 2820new (SV *klass, SV *data_sv)
2647 CODE: 2821 CODE:
2648{ 2822{
2649 STRLEN datalen; 2823 STRLEN datalen;
2650 char *data = SvPVbyte (data_sv, datalen); 2824 char *data = SvPVbyte (data_sv, datalen);
2651 2825
2653} 2827}
2654 OUTPUT: 2828 OUTPUT:
2655 RETVAL 2829 RETVAL
2656 2830
2657DC::RW 2831DC::RW
2658new_from_file (SV *class, const char *path, const char *mode = "rb") 2832new_from_file (SV *klass, const char *path, const char *mode = "rb")
2659 CODE: 2833 CODE:
2660 RETVAL = SDL_RWFromFile (path, mode); 2834 RETVAL = SDL_RWFromFile (path, mode);
2661 OUTPUT: 2835 OUTPUT:
2662 RETVAL 2836 RETVAL
2663 2837
2681 if (RETVAL < 0) 2855 if (RETVAL < 0)
2682 { 2856 {
2683 RETVAL = Mix_GroupOldest (-1); 2857 RETVAL = Mix_GroupOldest (-1);
2684 2858
2685 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)
2686 XSRETURN_UNDEF; 2865 XSRETURN_UNDEF;
2687 2866 }
2867 else
2688 Mix_HaltChannel (RETVAL); 2868 Mix_HaltChannel (RETVAL);
2689 } 2869 }
2690 2870
2691 Mix_UnregisterAllEffects (RETVAL); 2871 Mix_UnregisterAllEffects (RETVAL);
2692 Mix_Volume (RETVAL, 128); 2872 Mix_Volume (RETVAL, 128);
2693} 2873}
2740void 2920void
2741set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2921set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2742 CODE: 2922 CODE:
2743{ 2923{
2744 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2924 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2745 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2925 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2746 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2926 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2747} 2927}
2748 2928
2749void 2929void
2750set_reverse_stereo (DC::Channel self, int flip) 2930set_reverse_stereo (DC::Channel self, int flip)
2753 2933
2754MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2934MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2755 2935
2756PROTOTYPES: DISABLE 2936PROTOTYPES: DISABLE
2757 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
2758DC::MixChunk 2950DC::MixChunk
2759new (SV *class, DC::RW rwops) 2951new (SV *klass, DC::RW rwops)
2760 CODE: 2952 CODE:
2761 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2953 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2762 OUTPUT: 2954 OUTPUT:
2763 RETVAL 2955 RETVAL
2764 2956
2794 OUTPUT: 2986 OUTPUT:
2795 RETVAL 2987 RETVAL
2796 2988
2797MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2989MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2798 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
2799int 3003int
2800volume (int volume = -1) 3004volume (int volume = -1)
2801 PROTOTYPE: ;$ 3005 PROTOTYPE: ;$
2802 CODE: 3006 CODE:
2803 if (items > 0) 3007 if (items > 0)
2814void 3018void
2815halt () 3019halt ()
2816 CODE: 3020 CODE:
2817 Mix_HaltMusic (); 3021 Mix_HaltMusic ();
2818 3022
3023int
3024playing ()
3025 CODE:
3026 RETVAL = Mix_PlayingMusic ();
3027 OUTPUT:
3028 RETVAL
3029
2819DC::MixMusic 3030DC::MixMusic
2820new (SV *class, DC::RW rwops) 3031new (SV *klass, DC::RW rwops)
2821 CODE: 3032 CODE:
2822 RETVAL = Mix_LoadMUS_RW (rwops); 3033 RETVAL = Mix_LoadMUS_RW (rwops);
2823 OUTPUT: 3034 OUTPUT:
2824 RETVAL 3035 RETVAL
2825 3036
2853 } *civ, const_iv[] = { 3064 } *civ, const_iv[] = {
2854# define const_iv(name) { # name, (IV)name } 3065# define const_iv(name) { # name, (IV)name }
2855 const_iv (GL_VENDOR), 3066 const_iv (GL_VENDOR),
2856 const_iv (GL_VERSION), 3067 const_iv (GL_VERSION),
2857 const_iv (GL_EXTENSIONS), 3068 const_iv (GL_EXTENSIONS),
3069 const_iv (GL_MAX_TEXTURE_UNITS),
2858 const_iv (GL_COLOR_MATERIAL), 3070 const_iv (GL_COLOR_MATERIAL),
2859 const_iv (GL_SMOOTH), 3071 const_iv (GL_SMOOTH),
2860 const_iv (GL_FLAT), 3072 const_iv (GL_FLAT),
2861 const_iv (GL_DITHER), 3073 const_iv (GL_DITHER),
2862 const_iv (GL_BLEND), 3074 const_iv (GL_BLEND),
2874 const_iv (GL_ZERO), 3086 const_iv (GL_ZERO),
2875 const_iv (GL_SRC_ALPHA), 3087 const_iv (GL_SRC_ALPHA),
2876 const_iv (GL_DST_ALPHA), 3088 const_iv (GL_DST_ALPHA),
2877 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3089 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2878 const_iv (GL_ONE_MINUS_DST_ALPHA), 3090 const_iv (GL_ONE_MINUS_DST_ALPHA),
3091 const_iv (GL_SRC_COLOR),
3092 const_iv (GL_DST_COLOR),
3093 const_iv (GL_ONE_MINUS_SRC_COLOR),
3094 const_iv (GL_ONE_MINUS_DST_COLOR),
2879 const_iv (GL_SRC_ALPHA_SATURATE), 3095 const_iv (GL_SRC_ALPHA_SATURATE),
2880 const_iv (GL_RGB), 3096 const_iv (GL_RGB),
2881 const_iv (GL_RGBA), 3097 const_iv (GL_RGBA),
2882 const_iv (GL_RGBA4), 3098 const_iv (GL_RGBA4),
2883 const_iv (GL_RGBA8), 3099 const_iv (GL_RGBA8),
2951 const_iv (GL_NICEST), 3167 const_iv (GL_NICEST),
2952 const_iv (GL_V2F), 3168 const_iv (GL_V2F),
2953 const_iv (GL_V3F), 3169 const_iv (GL_V3F),
2954 const_iv (GL_T2F_V3F), 3170 const_iv (GL_T2F_V3F),
2955 const_iv (GL_T2F_N3F_V3F), 3171 const_iv (GL_T2F_N3F_V3F),
3172 const_iv (GL_FUNC_ADD),
3173 const_iv (GL_FUNC_SUBTRACT),
3174 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2956# undef const_iv 3175# undef const_iv
2957 }; 3176 };
2958 3177
2959 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--)
2960 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3179 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2961 3180
2962 texture_av = newAV (); 3181 texture_av = newAV ();
2963 AvREAL_off (texture_av); 3182 AvREAL_off (texture_av);
2964} 3183}
2965 3184
2967disable_GL_EXT_blend_func_separate () 3186disable_GL_EXT_blend_func_separate ()
2968 CODE: 3187 CODE:
2969 gl.BlendFuncSeparate = 0; 3188 gl.BlendFuncSeparate = 0;
2970 gl.BlendFuncSeparateEXT = 0; 3189 gl.BlendFuncSeparateEXT = 0;
2971 3190
2972char * 3191void
3192apple_nvidia_bug (int enable)
3193
3194const char *
2973gl_vendor () 3195gl_vendor ()
2974 CODE: 3196 CODE:
2975 RETVAL = (char *)glGetString (GL_VENDOR); 3197 RETVAL = (const char *)glGetString (GL_VENDOR);
2976 OUTPUT: 3198 OUTPUT:
2977 RETVAL 3199 RETVAL
2978 3200
2979char * 3201const char *
2980gl_version () 3202gl_version ()
2981 CODE: 3203 CODE:
2982 RETVAL = (char *)glGetString (GL_VERSION); 3204 RETVAL = (const char *)glGetString (GL_VERSION);
2983 OUTPUT: 3205 OUTPUT:
2984 RETVAL 3206 RETVAL
2985 3207
2986char * 3208const char *
2987gl_extensions () 3209gl_extensions ()
2988 CODE: 3210 CODE:
2989 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3211 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2990 OUTPUT: 3212 OUTPUT:
2991 RETVAL 3213 RETVAL
2992 3214
2993const char *glGetString (GLenum pname) 3215const char *glGetString (GLenum pname)
3216 CODE:
3217 RETVAL = (const char *)glGetString (pname);
3218 OUTPUT:
3219 RETVAL
2994 3220
2995GLint glGetInteger (GLenum pname) 3221GLint glGetInteger (GLenum pname)
2996 CODE: 3222 CODE:
2997 glGetIntegerv (pname, &RETVAL); 3223 glGetIntegerv (pname, &RETVAL);
2998 OUTPUT: 3224 OUTPUT:
3006 3232
3007int glGetError () 3233int glGetError ()
3008 3234
3009void glFinish () 3235void glFinish ()
3010 3236
3237void glFlush ()
3238
3011void glClear (int mask) 3239void glClear (int mask)
3012 3240
3013void glClearColor (float r, float g, float b, float a = 1.0) 3241void glClearColor (float r, float g, float b, float a = 1.0)
3014 PROTOTYPE: @ 3242 PROTOTYPE: @
3015 3243
3024void glBlendFunc (int sfactor, int dfactor) 3252void glBlendFunc (int sfactor, int dfactor)
3025 3253
3026void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3254void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3027 CODE: 3255 CODE:
3028 gl_BlendFuncSeparate (sa, da, saa, daa); 3256 gl_BlendFuncSeparate (sa, da, saa, daa);
3257
3258# void glBlendEquation (int se)
3029 3259
3030void glDepthMask (int flag) 3260void glDepthMask (int flag)
3031 3261
3032void glLogicOp (int opcode) 3262void glLogicOp (int opcode)
3033 3263
3183void glNewList (int list, int mode = GL_COMPILE) 3413void glNewList (int list, int mode = GL_COMPILE)
3184 3414
3185void glEndList () 3415void glEndList ()
3186 3416
3187void 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);
3188 3423
3189MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3424MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3190 3425
3191PROTOTYPES: DISABLE 3426PROTOTYPES: DISABLE
3192 3427

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines