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.289 by root, Wed Dec 24 04:09:26 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 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
459 ev.data2 = 0; 481 ev.data2 = 0;
460 482
461 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
462} 484}
463 485
486// approximately divide by 255
487static unsigned int
488div255 (unsigned int n)
489{
490 return (n + (n >> 8)) >> 8;
491}
492
464static unsigned int 493static unsigned int
465minpot (unsigned int n) 494minpot (unsigned int n)
466{ 495{
467 if (!n) 496 if (!n)
468 return 0; 497 return 0;
549 578
550 return mod; 579 return mod;
551} 580}
552 581
553static void 582static void
554deliantra_main () 583deliantra_main (SV *real_main)
555{ 584{
556 char *argv[] = { 0 }; 585 dSP;
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 586
587 PUSHMARK (SP);
588 call_sv (real_main, G_DISCARD | G_VOID);
558} 589}
559 590
560#ifdef __MACOSX__ 591#ifdef __MACOSX__
592 static SV *real_main;
593
561 /* to due surprising braindamage on the side of SDL design, we 594 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 595 * 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, 596 * 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, 597 * due to shared library magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back. 598 * and which calls our main (== SDL_main) back.
566 */ 599 */
567 extern C_LINKAGE int 600 extern C_LINKAGE int
568 main (int argc, char *argv[]) 601 main (int argc, char *argv[])
569 { 602 {
570 deliantra_main (); 603 deliantra_main (real_main);
571 } 604 }
572 605
573 #undef main 606 #undef main
574 607
575 extern C_LINKAGE int main (int argc, char *argv[]); 608 extern C_LINKAGE int main (int argc, char *argv[]);
576 609
577 static void 610 static void
578 SDL_braino (void) 611 SDL_main_hack (SV *real_main_)
579 { 612 {
613 real_main = real_main_;
614
580 char *argv[] = { "deliantra client", 0 }; 615 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv); 616 (main) (1, argv);
582 } 617 }
583#else 618#else
584 static void 619 static void
585 SDL_braino (void) 620 SDL_main_hack (SV *real_main)
586 { 621 {
587 deliantra_main (); 622 deliantra_main (real_main);
588 } 623 }
589#endif 624#endif
590 625
591MODULE = Deliantra::Client PACKAGE = DC 626MODULE = Deliantra::Client PACKAGE = DC
592 627
793 828
794 const_iv (FOW_DARKNESS) 829 const_iv (FOW_DARKNESS)
795# undef const_iv 830# undef const_iv
796 }; 831 };
797 832
798 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--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 834 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 835
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 836 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 837 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 838}
804 839
820NV ceil (NV x) 855NV ceil (NV x)
821 856
822IV minpot (UV n) 857IV minpot (UV n)
823 858
824IV 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
825 866
826void 867void
827pango_init () 868pango_init ()
828 CODE: 869 CODE:
829{ 870{
837#endif 878#endif
838} 879}
839 880
840char *SDL_GetError () 881char *SDL_GetError ()
841 882
842void SDL_braino () 883void SDL_main_hack (SV *real_main)
884 PROTOTYPE: &
843 885
844int SDL_Init (U32 flags) 886int SDL_Init (U32 flags)
845 887
846int SDL_InitSubSystem (U32 flags) 888int SDL_InitSubSystem (U32 flags)
847 889
848void SDL_QuitSubSystem (U32 flags) 890void SDL_QuitSubSystem (U32 flags)
849 891
850void SDL_Quit () 892void SDL_Quit ()
851 893
852int SDL_GL_SetAttribute (int attr, int value) 894int SDL_GL_SetAttribute (int attr, int value)
895 C_ARGS: (SDL_GLattr)attr, value
853 896
854int SDL_GL_GetAttribute (int attr) 897int SDL_GL_GetAttribute (int attr)
855 CODE: 898 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL)) 899 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
857 XSRETURN_UNDEF; 900 XSRETURN_UNDEF;
858 OUTPUT: 901 OUTPUT:
859 RETVAL 902 RETVAL
860 903
861void 904void
916 ); 959 );
917 960
918 if (RETVAL) 961 if (RETVAL)
919 { 962 {
920 av_clear (texture_av); 963 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); 964#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
924#include "glfunc.h" 965#include "glfunc.h"
925#undef GL_FUNC 966#undef GL_FUNC
967 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
968 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926 } 969 }
927} 970}
928 OUTPUT: 971 OUTPUT:
929 RETVAL 972 RETVAL
973
974void
975SDL_WM_SetCaption (const char *title, const char *icon)
930 976
931void 977void
932SDL_GL_SwapBuffers () 978SDL_GL_SwapBuffers ()
933 979
934char * 980char *
935SDL_GetKeyName (int sym) 981SDL_GetKeyName (int sym)
982 C_ARGS: (SDLKey)sym
936 983
937int 984int
938SDL_GetAppState () 985SDL_GetAppState ()
939 986
940int 987int
941SDL_GetModState () 988SDL_GetModState ()
942 989
990int
991SDL_WaitEvent ()
992 C_ARGS: 0
993
943void 994void
995SDL_PumpEvents ()
996
997void
944poll_events () 998peep_events ()
945 PPCODE: 999 PPCODE:
946{ 1000{
947 SDL_Event ev; 1001 SDL_Event ev;
948 1002
949 SDL_PumpEvents (); 1003 SDL_PumpEvents ();
1015 1069
1016 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))));
1017 } 1071 }
1018} 1072}
1019 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
1020int 1087int
1021Mix_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)
1022 POSTCALL: 1089 POSTCALL:
1023 Mix_HookMusicFinished (music_finished); 1090 Mix_HookMusicFinished (music_finished);
1024 Mix_ChannelFinished (channel_finished); 1091 Mix_ChannelFinished (channel_finished);
1025 1092
1026void 1093void
1027Mix_QuerySpec () 1094Mix_QuerySpec ()
1086add_font (char *file) 1153add_font (char *file)
1087 CODE: 1154 CODE:
1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1155 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT: 1156 OUTPUT:
1090 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)
1091 1165
1092void 1166void
1093load_image_inline (SV *image_) 1167load_image_inline (SV *image_)
1094 ALIAS: 1168 ALIAS:
1095 load_image_file = 1 1169 load_image_file = 1
1141 1215
1142 SDL_LockSurface (surface2); 1216 SDL_LockSurface (surface2);
1143 EXTEND (SP, 6); 1217 EXTEND (SP, 6);
1144 PUSHs (sv_2mortal (newSViv (surface2->w))); 1218 PUSHs (sv_2mortal (newSViv (surface2->w)));
1145 PUSHs (sv_2mortal (newSViv (surface2->h))); 1219 PUSHs (sv_2mortal (newSViv (surface2->h)));
1146 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1220 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))); 1221 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1148 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1222 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1149 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1223 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1150 SDL_UnlockSurface (surface2); 1224 SDL_UnlockSurface (surface2);
1151 1225
1223MODULE = Deliantra::Client PACKAGE = DC::Font 1297MODULE = Deliantra::Client PACKAGE = DC::Font
1224 1298
1225PROTOTYPES: DISABLE 1299PROTOTYPES: DISABLE
1226 1300
1227DC::Font 1301DC::Font
1228new_from_file (SV *class, char *path, int id = 0) 1302new_from_file (SV *klass, char *path, int id = 0)
1229 CODE: 1303 CODE:
1230{ 1304{
1231 int count; 1305 int count;
1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1306 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1233 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1307 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1262 PROTOTYPE: 1336 PROTOTYPE:
1263 CODE: 1337 CODE:
1264 tc_restore (); 1338 tc_restore ();
1265 1339
1266DC::Layout 1340DC::Layout
1267new (SV *class) 1341new (SV *klass)
1268 CODE: 1342 CODE:
1269 New (0, RETVAL, 1, struct cf_layout); 1343 New (0, RETVAL, 1, struct cf_layout);
1270 1344
1271 RETVAL->pl = pango_layout_new (opengl_context); 1345 RETVAL->pl = pango_layout_new (opengl_context);
1272 RETVAL->r = 1.; 1346 RETVAL->r = 1.;
1421 1495
1422void 1496void
1423set_height (DC::Layout self, int base_height) 1497set_height (DC::Layout self, int base_height)
1424 CODE: 1498 CODE:
1425 if (self->base_height != base_height) 1499 if (self->base_height != base_height)
1426 { 1500 {
1427 self->base_height = base_height; 1501 self->base_height = base_height;
1428 layout_update_font (self); 1502 layout_update_font (self);
1429 } 1503 }
1430 1504
1431void 1505void
1658 glDisable (GL_ALPHA_TEST); 1732 glDisable (GL_ALPHA_TEST);
1659 glDisable (GL_BLEND); 1733 glDisable (GL_BLEND);
1660 } 1734 }
1661} 1735}
1662 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
1663IV 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)
1664 CODE: 1859 CODE:
1665{ 1860{
1666 GLint width; 1861 GLint width;
1667 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);
1674MODULE = Deliantra::Client PACKAGE = DC::Map 1869MODULE = Deliantra::Client PACKAGE = DC::Map
1675 1870
1676PROTOTYPES: DISABLE 1871PROTOTYPES: DISABLE
1677 1872
1678DC::Map 1873DC::Map
1679new (SV *class) 1874new (SV *klass)
1680 CODE: 1875 CODE:
1681 New (0, RETVAL, 1, struct map); 1876 New (0, RETVAL, 1, struct map);
1682 RETVAL->x = 0; 1877 RETVAL->x = 0;
1683 RETVAL->y = 0; 1878 RETVAL->y = 0;
1684 RETVAL->w = 0; 1879 RETVAL->w = 0;
1723 1918
1724void 1919void
1725set_smooth (DC::Map self, int face, int smooth, int level) 1920set_smooth (DC::Map self, int face, int smooth, int level)
1726 CODE: 1921 CODE:
1727{ 1922{
1728 tileid texid; 1923 tileid texid;
1729 maptex *tex; 1924 maptex *tex;
1730 1925
1731 if (face < 0 || face >= self->faces) 1926 if (face < 0 || face >= self->faces)
1732 return; 1927 return;
1733 1928
1734 if (smooth < 0 || smooth >= self->faces) 1929 if (smooth < 0 || smooth >= self->faces)
1735 return; 1930 return;
1736 1931
1737 texid = self->face2tile [face]; 1932 texid = self->face2tile [face];
1738 1933
1739 if (!texid) 1934 if (!texid)
1740 return; 1935 return;
1741 1936
1742 tex = self->tex + texid; 1937 tex = self->tex + texid;
1775} 1970}
1776 1971
1777void 1972void
1778expire_textures (DC::Map self, int texid, int count) 1973expire_textures (DC::Map self, int texid, int count)
1779 PPCODE: 1974 PPCODE:
1780 for (; texid < self->texs && count; ++texid, --count) 1975 for (; texid < self->texs && count; ++texid, --count)
1781 { 1976 {
1782 maptex *tex = self->tex + texid; 1977 maptex *tex = self->tex + texid;
1783 1978
1784 if (tex->name) 1979 if (tex->name)
1785 { 1980 {
1840 self->y += MAP_EXTEND_Y; 2035 self->y += MAP_EXTEND_Y;
1841 } 2036 }
1842} 2037}
1843 2038
1844SV * 2039SV *
1845map1a_update (DC::Map self, SV *data_, int extmap) 2040map1a_update (DC::Map self, SV *data_)
1846 CODE: 2041 CODE:
1847{ 2042{
1848 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2043 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1849 uint8_t *data_end = (uint8_t *)SvEND (data_); 2044 uint8_t *data_end = (uint8_t *)SvEND (data_);
1850 mapcell *cell; 2045 mapcell *cell;
1871 2066
1872 //TODO: don't trust server data to be in-range(!) 2067 //TODO: don't trust server data to be in-range(!)
1873 2068
1874 if (flags & 8) 2069 if (flags & 8)
1875 { 2070 {
2071 uint8_t ext, cmd;
2072
1876 if (extmap) 2073 do
1877 { 2074 {
1878 uint8_t ext, cmd; 2075 ext = *data++;
2076 cmd = ext & 0x7f;
1879 2077
1880 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
1881 { 2081 {
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; 2082 cell->stat_width = 1;
1890 cell->stat_hp = *data++; 2083 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 } 2084 }
1910 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++;
1911 } 2102 }
1912 else 2103 while (ext & 0x80);
1913 cell->darkness = *data++ + 1;
1914 } 2104 }
1915 2105
1916 for (z = 0; z <= 2; ++z) 2106 for (z = 0; z <= 2; ++z)
1917 if (flags & (4 >> z)) 2107 if (flags & (4 >> z))
1918 { 2108 {
1966 ? self->row + y 2156 ? self->row + y
1967 : 0; 2157 : 0;
1968 2158
1969 for (x = x0; x < x1; x++) 2159 for (x = x0; x < x1; x++)
1970 { 2160 {
1971 int r = 32, g = 32, b = 32, a = 192; 2161 unsigned int r = 32, g = 32, b = 32, a = 192;
1972 2162
1973 if (row && row->c0 <= x && x < row->c1) 2163 if (row && row->c0 <= x && x < row->c1)
1974 { 2164 {
1975 mapcell *cell = row->col + (x - row->c0); 2165 mapcell *cell = row->col + (x - row->c0);
1976 2166
1978 { 2168 {
1979 maptex tex = self->tex [cell->tile [z]]; 2169 maptex tex = self->tex [cell->tile [z]];
1980 int a0 = 255 - tex.a; 2170 int a0 = 255 - tex.a;
1981 int a1 = tex.a; 2171 int a1 = tex.a;
1982 2172
1983 r = (r * a0 + tex.r * a1) / 255; 2173 r = div255 (r * a0 + tex.r * a1);
1984 g = (g * a0 + tex.g * a1) / 255; 2174 g = div255 (g * a0 + tex.g * a1);
1985 b = (b * a0 + tex.b * a1) / 255; 2175 b = div255 (b * a0 + tex.b * a1);
1986 a = (a * a0 + tex.a * a1) / 255; 2176 a = div255 (a * a0 + tex.a * a1);
1987 } 2177 }
1988 } 2178 }
1989 2179
1990 *map++ = (r ) 2180 *map++ = (r )
1991 | (g << 8) 2181 | (g << 8)
1992 | (b << 16) 2182 | (b << 16)
1993 | (a << 24); 2183 | (a << 24);
1994 } 2184 }
1995 } 2185 }
1996 2186
1997 RETVAL = map_sv; 2187 RETVAL = map_sv;
1998} 2188}
1999 OUTPUT: 2189 OUTPUT:
2000 RETVAL 2190 RETVAL
2001 2191
2002void 2192void
2003draw (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)
2004 CODE: 2194 CODE:
2005{ 2195{
2006 int x, y, z; 2196 int x, y, z;
2007 2197
2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2198 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2009 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
2010 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)
2011 smooth_key skey; 2201 smooth_key skey;
2012 int pl_x, pl_y; 2202 int pl_x, pl_y;
2013 maptex pl_tex; 2203 maptex pl_tex;
2014 rc_t *rc = rc_alloc (); 2204 rc_t *rc = rc_alloc ();
2015 rc_t *rc_ov = rc_alloc (); 2205 rc_t *rc_ov = rc_alloc ();
2016 rc_key_t key; 2206 rc_key_t key;
2017 rc_array_t *arr, *arr_hidden; 2207 rc_array_t *arr;
2018 2208
2019 pl_tex.name = 0; 2209 pl_tex.name = 0;
2020 2210
2021 // that's current max. sorry. 2211 // that's current max. sorry.
2022 if (sw > 255) sw = 255; 2212 if (sw > 255) sw = 255;
2059 } 2249 }
2060 2250
2061 glEnable (GL_BLEND); 2251 glEnable (GL_BLEND);
2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2252 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2253 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 2254
2068 for (z = 0; z <= 2; z++) 2255 for (z = 0; z <= 2; z++)
2069 { 2256 {
2070 memset (smooth_level, 0, sizeof (smooth_level)); 2257 memset (smooth_level, 0, sizeof (smooth_level));
2071 key.texname = -1; 2258 key.texname = -1;
2095 2282
2096 key.texname = tex.name; 2283 key.texname = tex.name;
2097 arr = rc_array (rc, &key); 2284 arr = rc_array (rc, &key);
2098 } 2285 }
2099 2286
2100 px = (x + 1) * T - tex.w; 2287 px = (x + 1) * Th - tex.w;
2101 py = (y + 1) * T - tex.h; 2288 py = (y + 1) * Tw - tex.h;
2102 2289
2103 if (expect_false (cell->player == player) && expect_false (z == 2)) 2290 if (expect_false (cell->player == player) && expect_false (z == 2))
2104 { 2291 {
2105 pl_x = px; 2292 pl_x = px;
2106 pl_y = py; 2293 pl_y = py;
2151 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);
2152 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);
2153 } 2340 }
2154 } 2341 }
2155 2342
2156 if (expect_false (z == 2)) 2343 if (expect_false (z == 2) && expect_false (cell->flags))
2157 { 2344 {
2158 /* draw question marks on top of hidden spaces */ 2345 // overlays such as the speech bubble, probably more to come
2159 if (!cell->darkness) 2346 if (cell->flags & 1)
2160 { 2347 {
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; 2348 rc_key_t key_ov = key;
2177 maptex tex = self->tex [TEXID_SPEECH]; 2349 maptex tex = self->tex [TEXID_SPEECH];
2178 rc_array_t *arr; 2350 rc_array_t *arr;
2179 int px = x * T + T * 2 / 32; 2351 int px = x * Tw + Tw * 2 / 32;
2180 int py = y * T - T * 6 / 32; 2352 int py = y * Th - Th * 6 / 32;
2181 2353
2182 key_ov.texname = tex.name; 2354 key_ov.texname = tex.name;
2183 arr = rc_array (rc_ov, &key_ov); 2355 arr = rc_array (rc_ov, &key_ov);
2184 2356
2185 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2357 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2186 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2358 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2187 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2359 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2188 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2360 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2189 }
2190 } 2361 }
2191 } 2362 }
2192 } 2363 }
2193 } 2364 }
2194 2365
2221 if (!(bits & 0x1000) 2392 if (!(bits & 0x1000)
2222 && skey->level == level 2393 && skey->level == level
2223 && level > smooth_max [skey->x][skey->y]) 2394 && level > smooth_max [skey->x][skey->y])
2224 { 2395 {
2225 maptex tex = self->tex [skey->tile]; 2396 maptex tex = self->tex [skey->tile];
2226 int px = (((int)skey->x) - 1) * T; 2397 int px = (((int)skey->x) - 1) * Tw;
2227 int py = (((int)skey->y) - 1) * T; 2398 int py = (((int)skey->y) - 1) * Th;
2228 int border = bits & 15; 2399 int border = bits & 15;
2229 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2230 float dx = tex.s * .0625f; // 16 images/row 2401 float dx = tex.s * .0625f; // 16 images/row
2231 float dy = tex.t * .5f ; // 2 images/column 2402 float dy = tex.t * .5f ; // 2 images/column
2232 2403
2245 2416
2246 if (border) 2417 if (border)
2247 { 2418 {
2248 float ox = border * dx; 2419 float ox = border * dx;
2249 2420
2250 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2251 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2252 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2253 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2254 } 2425 }
2255 2426
2256 if (corner) 2427 if (corner)
2257 { 2428 {
2258 float ox = corner * dx; 2429 float ox = corner * dx;
2259 2430
2260 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2261 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2262 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2263 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2264 } 2435 }
2265 } 2436 }
2266 } 2437 }
2267 } 2438 }
2268 } 2439 }
2309 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2310 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2311 { 2482 {
2312 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2313 2484
2314 int px = x * T; 2485 int px = x * Tw;
2315 int py = y * T; 2486 int py = y * Th;
2316 2487
2317 if (expect_false (cell->player == player)) 2488 if (expect_false (cell->player == player))
2318 { 2489 {
2319 px += sdx; 2490 px += sdx;
2320 py += sdy; 2491 py += sdy;
2321 } 2492 }
2322 2493
2323 if (cell->stat_hp) 2494 if (cell->stat_hp)
2324 { 2495 {
2325 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2326 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2327 2498
2328 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2329 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2330 px + width - 1, py); 2501 px + width - 1, py);
2331 2502
2337 } 2508 }
2338 } 2509 }
2339} 2510}
2340 2511
2341void 2512void
2342draw_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)
2343 CODE: 2514 CODE:
2344{ 2515{
2345 static float color[16][3] = { 2516 static float color[16][3] = {
2346 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2347 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2348 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2349 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2350 2521
2351 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2352 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2353 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2354 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2355 2526
2356 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2357 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2358 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2359 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2360 2531
2361 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2362 2533
2363 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2364 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2365 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2366 }; 2537 };
2367 2538
2368 int x, y; 2539 int x, y;
2369 2540
2370 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 */
2371 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2372 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2373 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2374 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2375 2552
2376 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2380 2557
2381 if (m) 2558 if (m)
2382 { 2559 {
2383 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2384 2561
2385 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2386 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2387 2564
2388 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2389 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2390 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2391 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2392 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2393 } 2570 }
2401void 2578void
2402fow_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)
2403 PPCODE: 2580 PPCODE:
2404{ 2581{
2405 int x, y; 2582 int x, y;
2406 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2407 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2408 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2409 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);
2410 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2411 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2412 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2413 2591
2414 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2415 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2416 2594
2417 mx += self->x - 1; 2595 mx += self->x - 1;
2418 my += self->y - 1; 2596 my += self->y - 1;
2419
2420 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2421 2597
2422 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2423 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2424 { 2600 {
2425 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2428 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2429 { 2605 {
2430 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2431 2607
2432 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2433 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2434 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2435 } 2611 }
2436 } 2612 }
2437 2613
2438 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2439 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2458 2634
2459 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2460 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2461 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2462 2638
2463 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2464 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2465 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2466 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2467 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 */
2468 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2469 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2470 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2471 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2472 } 2648 }
2473 2649
2474 free (darkness1); 2650 free (darkness1);
2475 2651
2476 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2477 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2478 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2479 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2480} 2656}
2481 2657
2482SV * 2658SV *
2545 else 2721 else
2546 *data++ = 0; 2722 *data++ = 0;
2547 } 2723 }
2548 } 2724 }
2549 2725
2550 /* 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 */
2551 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2552 { 2728 {
2553 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2554 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2555 } 2731 }
2556 2732
2557 RETVAL = data_sv; 2733 RETVAL = data_sv;
2558} 2734}
2559 OUTPUT: 2735 OUTPUT:
2560 RETVAL 2736 RETVAL
2561 2737
2562void 2738void
2569 STRLEN len; 2745 STRLEN len;
2570 uint8_t *data, *end; 2746 uint8_t *data, *end;
2571 2747
2572 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2573 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2574 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2575 end = data + len + 8; 2751 end = data + len + 8;
2576 2752
2577 if (len < 5) 2753 if (len < 5)
2578 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2579 2755
2640} 2816}
2641 2817
2642MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2643 2819
2644DC::RW 2820DC::RW
2645new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2646 CODE: 2822 CODE:
2647{ 2823{
2648 STRLEN datalen; 2824 STRLEN datalen;
2649 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2650 2826
2652} 2828}
2653 OUTPUT: 2829 OUTPUT:
2654 RETVAL 2830 RETVAL
2655 2831
2656DC::RW 2832DC::RW
2657new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2658 CODE: 2834 CODE:
2659 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2660 OUTPUT: 2836 OUTPUT:
2661 RETVAL 2837 RETVAL
2662 2838
2680 if (RETVAL < 0) 2856 if (RETVAL < 0)
2681 { 2857 {
2682 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2683 2859
2684 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)
2685 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2686 2867 }
2868 else
2687 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2688 } 2870 }
2689 2871
2690 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2691 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2692} 2874}
2739void 2921void
2740set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2741 CODE: 2923 CODE:
2742{ 2924{
2743 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));
2744 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;
2745 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2746} 2928}
2747 2929
2748void 2930void
2749set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2752 2934
2753MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2754 2936
2755PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2756 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
2757DC::MixChunk 2951DC::MixChunk
2758new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2759 CODE: 2953 CODE:
2760 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2761 OUTPUT: 2955 OUTPUT:
2762 RETVAL 2956 RETVAL
2763 2957
2793 OUTPUT: 2987 OUTPUT:
2794 RETVAL 2988 RETVAL
2795 2989
2796MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2797 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
2798int 3004int
2799volume (int volume = -1) 3005volume (int volume = -1)
2800 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2801 CODE: 3007 CODE:
2802 if (items > 0) 3008 if (items > 0)
2813void 3019void
2814halt () 3020halt ()
2815 CODE: 3021 CODE:
2816 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2817 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2818DC::MixMusic 3031DC::MixMusic
2819new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2820 CODE: 3033 CODE:
2821 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2822 OUTPUT: 3035 OUTPUT:
2823 RETVAL 3036 RETVAL
2824 3037
2852 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2853# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2854 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2855 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2856 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2857 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2858 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2859 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2860 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2861 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2873 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2874 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2875 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2876 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2877 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),
2878 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2879 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2880 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2881 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2882 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2950 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2951 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2952 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2953 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2954 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),
2955# undef const_iv 3176# undef const_iv
2956 }; 3177 };
2957 3178
2958 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--)
2959 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2960 3181
2961 texture_av = newAV (); 3182 texture_av = newAV ();
2962 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2963} 3184}
2964 3185
2966disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2967 CODE: 3188 CODE:
2968 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2969 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2970 3191
2971char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2972gl_vendor () 3196gl_vendor ()
2973 CODE: 3197 CODE:
2974 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2975 OUTPUT: 3199 OUTPUT:
2976 RETVAL 3200 RETVAL
2977 3201
2978char * 3202const char *
2979gl_version () 3203gl_version ()
2980 CODE: 3204 CODE:
2981 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2982 OUTPUT: 3206 OUTPUT:
2983 RETVAL 3207 RETVAL
2984 3208
2985char * 3209const char *
2986gl_extensions () 3210gl_extensions ()
2987 CODE: 3211 CODE:
2988 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2989 OUTPUT: 3213 OUTPUT:
2990 RETVAL 3214 RETVAL
2991 3215
2992const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2993 3221
2994GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2995 CODE: 3223 CODE:
2996 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2997 OUTPUT: 3225 OUTPUT:
3005 3233
3006int glGetError () 3234int glGetError ()
3007 3235
3008void glFinish () 3236void glFinish ()
3009 3237
3238void glFlush ()
3239
3010void glClear (int mask) 3240void glClear (int mask)
3011 3241
3012void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
3013 PROTOTYPE: @ 3243 PROTOTYPE: @
3014 3244
3023void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
3024 3254
3025void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3026 CODE: 3256 CODE:
3027 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
3028 3260
3029void glDepthMask (int flag) 3261void glDepthMask (int flag)
3030 3262
3031void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
3032 3264
3183 3415
3184void glEndList () 3416void glEndList ()
3185 3417
3186void glCallList (int list) 3418void glCallList (int list)
3187 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3188MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3189 3426
3190PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3191 3428
3192void 3429void
3193find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3194 PPCODE: 3431 PPCODE:
3195{ 3432{
3196 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3197 XPUSHs (self); 3434 XPUSHs (self);
3198} 3435}
3199 3436
3200BOOT: 3437BOOT:
3201{ 3438{
3209 3446
3210void 3447void
3211draw (SV *self) 3448draw (SV *self)
3212 CODE: 3449 CODE:
3213{ 3450{
3214 HV *hv; 3451 HV *hv;
3215 SV **svp; 3452 SV **svp;
3216 NV x, y, w, h; 3453 NV x, y, w, h;
3217 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3218 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3219 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3220 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