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.283 by root, Thu Dec 11 00:11:58 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 16 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
87 91
88#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
90 94
91#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
92 96
93/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95 99
96#define KMOD_LRAM 0x10000 // our extension 100#define KMOD_LRAM 0x10000 // our extension
101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
97 123
98static AV *texture_av; 124static AV *texture_av;
99 125
100static struct 126static struct
101{ 127{
158{ 184{
159 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
160 186
161 while (attrs) 187 while (attrs)
162 { 188 {
163 PangoAttribute *attr = attrs->data; 189 PangoAttribute *attr = (PangoAttribute *)attrs->data;
164 190
165 if (attr->klass->type == PANGO_ATTR_SHAPE) 191 if (attr->klass->type == PANGO_ATTR_SHAPE)
166 return 1; 192 return 1;
167 193
168 attrs = attrs->next; 194 attrs = attrs->next;
186static void 212static void
187substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
188{ 214{
189 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
190#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
191 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
192#endif 218#endif
193 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
194} 220}
195 221
196static void 222static void
455 ev.data2 = 0; 481 ev.data2 = 0;
456 482
457 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
458} 484}
459 485
486// approximately divide by 255
487static unsigned int
488div255 (unsigned int n)
489{
490 return (n + (n >> 8)) >> 8;
491}
492
460static unsigned int 493static unsigned int
461minpot (unsigned int n) 494minpot (unsigned int n)
462{ 495{
463 if (!n) 496 if (!n)
464 return 0; 497 return 0;
545 578
546 return mod; 579 return mod;
547} 580}
548 581
549static void 582static void
550deliantra_main () 583deliantra_main (SV *real_main)
551{ 584{
552 char *argv[] = { 0 }; 585 dSP;
553 call_argv ("::main", G_DISCARD | G_VOID, argv); 586
587 PUSHMARK (SP);
588 call_sv (real_main, G_DISCARD | G_VOID);
554} 589}
555 590
556#ifdef __MACOSX__ 591#ifdef __MACOSX__
592 static SV *real_main;
593
557 /* to due surprising braindamage on the side of SDL design, we 594 /* to due surprising braindamage on the side of SDL design, we
558 * do some mind-boggling hack here: SDL requires a custom main() 595 * do some mind-boggling hack here: SDL requires a custom main()
559 * 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,
560 * 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,
561 * and which calls our main (== SDL_main) back. 598 * and which calls our main (== SDL_main) back.
562 */ 599 */
563 extern C_LINKAGE int 600 extern C_LINKAGE int
564 main (int argc, char *argv[]) 601 main (int argc, char *argv[])
565 { 602 {
566 deliantra_main (); 603 deliantra_main (real_main);
567 } 604 }
568 605
569 #undef main 606 #undef main
570 607
571 extern C_LINKAGE int main (int argc, char *argv[]); 608 extern C_LINKAGE int main (int argc, char *argv[]);
572 609
573 static void 610 static void
574 SDL_braino (void) 611 SDL_main_hack (SV *real_main_)
575 { 612 {
613 real_main = real_main_;
614
576 char *argv[] = { "deliantra client", 0 }; 615 char *argv[] = { "deliantra client", 0 };
577 (main) (1, argv); 616 (main) (1, argv);
578 } 617 }
579#else 618#else
580 static void 619 static void
581 SDL_braino (void) 620 SDL_main_hack (SV *real_main)
582 { 621 {
583 deliantra_main (); 622 deliantra_main (real_main);
584 } 623 }
585#endif 624#endif
586 625
587MODULE = Deliantra::Client PACKAGE = DC 626MODULE = Deliantra::Client PACKAGE = DC
588 627
789 828
790 const_iv (FOW_DARKNESS) 829 const_iv (FOW_DARKNESS)
791# undef const_iv 830# undef const_iv
792 }; 831 };
793 832
794 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--)
795 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 834 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
796 835
797 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 836 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
798 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 837 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
799} 838}
800 839
816NV ceil (NV x) 855NV ceil (NV x)
817 856
818IV minpot (UV n) 857IV minpot (UV n)
819 858
820IV 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
821 866
822void 867void
823pango_init () 868pango_init ()
824 CODE: 869 CODE:
825{ 870{
833#endif 878#endif
834} 879}
835 880
836char *SDL_GetError () 881char *SDL_GetError ()
837 882
838void SDL_braino () 883void SDL_main_hack (SV *real_main)
884 PROTOTYPE: &
839 885
840int SDL_Init (U32 flags) 886int SDL_Init (U32 flags)
841 887
842int SDL_InitSubSystem (U32 flags) 888int SDL_InitSubSystem (U32 flags)
843 889
844void SDL_QuitSubSystem (U32 flags) 890void SDL_QuitSubSystem (U32 flags)
845 891
846void SDL_Quit () 892void SDL_Quit ()
847 893
848int SDL_GL_SetAttribute (int attr, int value) 894int SDL_GL_SetAttribute (int attr, int value)
895 C_ARGS: (SDL_GLattr)attr, value
849 896
850int SDL_GL_GetAttribute (int attr) 897int SDL_GL_GetAttribute (int attr)
851 CODE: 898 CODE:
852 if (SDL_GL_GetAttribute (attr, &RETVAL)) 899 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
853 XSRETURN_UNDEF; 900 XSRETURN_UNDEF;
854 OUTPUT: 901 OUTPUT:
855 RETVAL 902 RETVAL
856 903
857void 904void
912 ); 959 );
913 960
914 if (RETVAL) 961 if (RETVAL)
915 { 962 {
916 av_clear (texture_av); 963 av_clear (texture_av);
917
918 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
919#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);
920#include "glfunc.h" 965#include "glfunc.h"
921#undef GL_FUNC 966#undef GL_FUNC
967 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
968 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
922 } 969 }
923} 970}
924 OUTPUT: 971 OUTPUT:
925 RETVAL 972 RETVAL
973
974void
975SDL_WM_SetCaption (const char *title, const char *icon)
926 976
927void 977void
928SDL_GL_SwapBuffers () 978SDL_GL_SwapBuffers ()
929 979
930char * 980char *
931SDL_GetKeyName (int sym) 981SDL_GetKeyName (int sym)
982 C_ARGS: (SDLKey)sym
932 983
933int 984int
934SDL_GetAppState () 985SDL_GetAppState ()
935 986
936int 987int
937SDL_GetModState () 988SDL_GetModState ()
938 989
990int
991SDL_WaitEvent ()
992 C_ARGS: 0
993
939void 994void
995SDL_PumpEvents ()
996
997void
940poll_events () 998peep_events ()
941 PPCODE: 999 PPCODE:
942{ 1000{
943 SDL_Event ev; 1001 SDL_Event ev;
944 1002
945 SDL_PumpEvents (); 1003 SDL_PumpEvents ();
1011 1069
1012 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))));
1013 } 1071 }
1014} 1072}
1015 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
1016int 1087int
1017Mix_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)
1018 POSTCALL: 1089 POSTCALL:
1019 Mix_HookMusicFinished (music_finished); 1090 Mix_HookMusicFinished (music_finished);
1020 Mix_ChannelFinished (channel_finished); 1091 Mix_ChannelFinished (channel_finished);
1021 1092
1022void 1093void
1023Mix_QuerySpec () 1094Mix_QuerySpec ()
1082add_font (char *file) 1153add_font (char *file)
1083 CODE: 1154 CODE:
1084 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1155 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085 OUTPUT: 1156 OUTPUT:
1086 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)
1087 1165
1088void 1166void
1089load_image_inline (SV *image_) 1167load_image_inline (SV *image_)
1090 ALIAS: 1168 ALIAS:
1091 load_image_file = 1 1169 load_image_file = 1
1137 1215
1138 SDL_LockSurface (surface2); 1216 SDL_LockSurface (surface2);
1139 EXTEND (SP, 6); 1217 EXTEND (SP, 6);
1140 PUSHs (sv_2mortal (newSViv (surface2->w))); 1218 PUSHs (sv_2mortal (newSViv (surface2->w)));
1141 PUSHs (sv_2mortal (newSViv (surface2->h))); 1219 PUSHs (sv_2mortal (newSViv (surface2->h)));
1142 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1220 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1143 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)));
1144 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1222 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1145 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1223 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1146 SDL_UnlockSurface (surface2); 1224 SDL_UnlockSurface (surface2);
1147 1225
1219MODULE = Deliantra::Client PACKAGE = DC::Font 1297MODULE = Deliantra::Client PACKAGE = DC::Font
1220 1298
1221PROTOTYPES: DISABLE 1299PROTOTYPES: DISABLE
1222 1300
1223DC::Font 1301DC::Font
1224new_from_file (SV *class, char *path, int id = 0) 1302new_from_file (SV *klass, char *path, int id = 0)
1225 CODE: 1303 CODE:
1226{ 1304{
1227 int count; 1305 int count;
1228 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1306 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1229 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1307 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1258 PROTOTYPE: 1336 PROTOTYPE:
1259 CODE: 1337 CODE:
1260 tc_restore (); 1338 tc_restore ();
1261 1339
1262DC::Layout 1340DC::Layout
1263new (SV *class) 1341new (SV *klass)
1264 CODE: 1342 CODE:
1265 New (0, RETVAL, 1, struct cf_layout); 1343 New (0, RETVAL, 1, struct cf_layout);
1266 1344
1267 RETVAL->pl = pango_layout_new (opengl_context); 1345 RETVAL->pl = pango_layout_new (opengl_context);
1268 RETVAL->r = 1.; 1346 RETVAL->r = 1.;
1417 1495
1418void 1496void
1419set_height (DC::Layout self, int base_height) 1497set_height (DC::Layout self, int base_height)
1420 CODE: 1498 CODE:
1421 if (self->base_height != base_height) 1499 if (self->base_height != base_height)
1422 { 1500 {
1423 self->base_height = base_height; 1501 self->base_height = base_height;
1424 layout_update_font (self); 1502 layout_update_font (self);
1425 } 1503 }
1426 1504
1427void 1505void
1654 glDisable (GL_ALPHA_TEST); 1732 glDisable (GL_ALPHA_TEST);
1655 glDisable (GL_BLEND); 1733 glDisable (GL_BLEND);
1656 } 1734 }
1657} 1735}
1658 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
1659IV 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)
1660 CODE: 1859 CODE:
1661{ 1860{
1662 GLint width; 1861 GLint width;
1663 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);
1670MODULE = Deliantra::Client PACKAGE = DC::Map 1869MODULE = Deliantra::Client PACKAGE = DC::Map
1671 1870
1672PROTOTYPES: DISABLE 1871PROTOTYPES: DISABLE
1673 1872
1674DC::Map 1873DC::Map
1675new (SV *class) 1874new (SV *klass)
1676 CODE: 1875 CODE:
1677 New (0, RETVAL, 1, struct map); 1876 New (0, RETVAL, 1, struct map);
1678 RETVAL->x = 0; 1877 RETVAL->x = 0;
1679 RETVAL->y = 0; 1878 RETVAL->y = 0;
1680 RETVAL->w = 0; 1879 RETVAL->w = 0;
1719 1918
1720void 1919void
1721set_smooth (DC::Map self, int face, int smooth, int level) 1920set_smooth (DC::Map self, int face, int smooth, int level)
1722 CODE: 1921 CODE:
1723{ 1922{
1724 tileid texid; 1923 tileid texid;
1725 maptex *tex; 1924 maptex *tex;
1726 1925
1727 if (face < 0 || face >= self->faces) 1926 if (face < 0 || face >= self->faces)
1728 return; 1927 return;
1729 1928
1730 if (smooth < 0 || smooth >= self->faces) 1929 if (smooth < 0 || smooth >= self->faces)
1731 return; 1930 return;
1732 1931
1733 texid = self->face2tile [face]; 1932 texid = self->face2tile [face];
1734 1933
1735 if (!texid) 1934 if (!texid)
1736 return; 1935 return;
1737 1936
1738 tex = self->tex + texid; 1937 tex = self->tex + texid;
1771} 1970}
1772 1971
1773void 1972void
1774expire_textures (DC::Map self, int texid, int count) 1973expire_textures (DC::Map self, int texid, int count)
1775 PPCODE: 1974 PPCODE:
1776 for (; texid < self->texs && count; ++texid, --count) 1975 for (; texid < self->texs && count; ++texid, --count)
1777 { 1976 {
1778 maptex *tex = self->tex + texid; 1977 maptex *tex = self->tex + texid;
1779 1978
1780 if (tex->name) 1979 if (tex->name)
1781 { 1980 {
1836 self->y += MAP_EXTEND_Y; 2035 self->y += MAP_EXTEND_Y;
1837 } 2036 }
1838} 2037}
1839 2038
1840SV * 2039SV *
1841map1a_update (DC::Map self, SV *data_, int extmap) 2040map1a_update (DC::Map self, SV *data_)
1842 CODE: 2041 CODE:
1843{ 2042{
1844 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2043 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1845 uint8_t *data_end = (uint8_t *)SvEND (data_); 2044 uint8_t *data_end = (uint8_t *)SvEND (data_);
1846 mapcell *cell; 2045 mapcell *cell;
1867 2066
1868 //TODO: don't trust server data to be in-range(!) 2067 //TODO: don't trust server data to be in-range(!)
1869 2068
1870 if (flags & 8) 2069 if (flags & 8)
1871 { 2070 {
2071 uint8_t ext, cmd;
2072
1872 if (extmap) 2073 do
1873 { 2074 {
1874 uint8_t ext, cmd; 2075 ext = *data++;
2076 cmd = ext & 0x7f;
1875 2077
1876 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
1877 { 2081 {
1878 ext = *data++;
1879 cmd = ext & 0x7f;
1880
1881 if (cmd < 4)
1882 cell->darkness = 255 - ext * 64 + 1;
1883 else if (cmd == 5) // health
1884 {
1885 cell->stat_width = 1; 2082 cell->stat_width = 1;
1886 cell->stat_hp = *data++; 2083 cell->stat_hp = *data++;
1887 }
1888 else if (cmd == 6) // monster width
1889 cell->stat_width = *data++ + 1;
1890 else if (cmd == 0x47)
1891 {
1892 if (*data == 1) cell->player = data [1];
1893 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1894 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1895 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1896
1897 data += *data + 1;
1898 }
1899 else if (cmd == 8) // cell flags
1900 cell->flags = *data++;
1901 else if (ext & 0x40) // unknown, multibyte => skip
1902 data += *data + 1;
1903 else
1904 data++;
1905 } 2084 }
1906 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++;
1907 } 2102 }
1908 else 2103 while (ext & 0x80);
1909 cell->darkness = *data++ + 1;
1910 } 2104 }
1911 2105
1912 for (z = 0; z <= 2; ++z) 2106 for (z = 0; z <= 2; ++z)
1913 if (flags & (4 >> z)) 2107 if (flags & (4 >> z))
1914 { 2108 {
1962 ? self->row + y 2156 ? self->row + y
1963 : 0; 2157 : 0;
1964 2158
1965 for (x = x0; x < x1; x++) 2159 for (x = x0; x < x1; x++)
1966 { 2160 {
1967 int r = 32, g = 32, b = 32, a = 192; 2161 unsigned int r = 32, g = 32, b = 32, a = 192;
1968 2162
1969 if (row && row->c0 <= x && x < row->c1) 2163 if (row && row->c0 <= x && x < row->c1)
1970 { 2164 {
1971 mapcell *cell = row->col + (x - row->c0); 2165 mapcell *cell = row->col + (x - row->c0);
1972 2166
1974 { 2168 {
1975 maptex tex = self->tex [cell->tile [z]]; 2169 maptex tex = self->tex [cell->tile [z]];
1976 int a0 = 255 - tex.a; 2170 int a0 = 255 - tex.a;
1977 int a1 = tex.a; 2171 int a1 = tex.a;
1978 2172
1979 r = (r * a0 + tex.r * a1) / 255; 2173 r = div255 (r * a0 + tex.r * a1);
1980 g = (g * a0 + tex.g * a1) / 255; 2174 g = div255 (g * a0 + tex.g * a1);
1981 b = (b * a0 + tex.b * a1) / 255; 2175 b = div255 (b * a0 + tex.b * a1);
1982 a = (a * a0 + tex.a * a1) / 255; 2176 a = div255 (a * a0 + tex.a * a1);
1983 } 2177 }
1984 } 2178 }
1985 2179
1986 *map++ = (r ) 2180 *map++ = (r )
1987 | (g << 8) 2181 | (g << 8)
1988 | (b << 16) 2182 | (b << 16)
1989 | (a << 24); 2183 | (a << 24);
1990 } 2184 }
1991 } 2185 }
1992 2186
1993 RETVAL = map_sv; 2187 RETVAL = map_sv;
1994} 2188}
1995 OUTPUT: 2189 OUTPUT:
1996 RETVAL 2190 RETVAL
1997 2191
1998void 2192void
1999draw (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)
2000 CODE: 2194 CODE:
2001{ 2195{
2002 int x, y, z; 2196 int x, y, z;
2003 2197
2004 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2198 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2005 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
2006 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)
2007 smooth_key skey; 2201 smooth_key skey;
2008 int pl_x, pl_y; 2202 int pl_x, pl_y;
2009 maptex pl_tex; 2203 maptex pl_tex;
2010 rc_t *rc = rc_alloc (); 2204 rc_t *rc = rc_alloc ();
2205 rc_t *rc_ov = rc_alloc ();
2011 rc_key_t key; 2206 rc_key_t key;
2012 rc_array_t *arr; 2207 rc_array_t *arr;
2013 2208
2014 pl_tex.name = 0; 2209 pl_tex.name = 0;
2015 2210
2016 // thats current max. sorry. 2211 // that's current max. sorry.
2017 if (sw > 255) sw = 255; 2212 if (sw > 255) sw = 255;
2018 if (sh > 255) sh = 255; 2213 if (sh > 255) sh = 255;
2019 2214
2020 // clear key, in case of extra padding 2215 // clear key, in case of extra padding
2021 memset (&skey, 0, sizeof (skey)); 2216 memset (&skey, 0, sizeof (skey));
2074 tileid tile = cell->tile [z]; 2269 tileid tile = cell->tile [z];
2075 2270
2076 if (tile) 2271 if (tile)
2077 { 2272 {
2078 maptex tex = self->tex [tile]; 2273 maptex tex = self->tex [tile];
2079 int px = (x + 1) * T - tex.w; 2274 int px, py;
2080 int py = (y + 1) * T - tex.h;
2081 2275
2082 if (key.texname != tex.name) 2276 if (key.texname != tex.name)
2083 { 2277 {
2084 self->tex [tile].unused = 0; 2278 self->tex [tile].unused = 0;
2085 2279
2086 if (!tex.name) 2280 if (!tex.name)
2087 tex = self->tex [2]; /* missing, replace by noface */ 2281 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2088 2282
2089 key.texname = tex.name; 2283 key.texname = tex.name;
2090 arr = rc_array (rc, &key); 2284 arr = rc_array (rc, &key);
2091 } 2285 }
2286
2287 px = (x + 1) * Th - tex.w;
2288 py = (y + 1) * Tw - tex.h;
2092 2289
2093 if (expect_false (cell->player == player) && expect_false (z == 2)) 2290 if (expect_false (cell->player == player) && expect_false (z == 2))
2094 { 2291 {
2095 pl_x = px; 2292 pl_x = px;
2096 pl_y = py; 2293 pl_y = py;
2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2298 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2102 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2299 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2103 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2300 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2104 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2301 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2105 2302
2106 if (expect_false (cell->flags) && expect_false (z == 2))
2107 {
2108 // overlays such as the speech bubble, probably more to come
2109 if (cell->flags & 1)
2110 {
2111 maptex tex = self->tex [1];
2112 int px = x * T + T * 2 / 32;
2113 int py = y * T - T * 6 / 32;
2114
2115 if (tex.name)
2116 {
2117 if (key.texname != tex.name)
2118 {
2119 key.texname = tex.name;
2120 arr = rc_array (rc, &key);
2121 }
2122
2123 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2124 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2125 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2126 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2127 }
2128 }
2129 }
2130
2131 // update smooth hash 2303 // update smooth hash
2132 if (tex.smoothtile) 2304 if (tex.smoothtile)
2133 { 2305 {
2134 skey.tile = tex.smoothtile; 2306 skey.tile = tex.smoothtile;
2135 skey.level = tex.smoothlevel; 2307 skey.level = tex.smoothlevel;
2163 // corners 2335 // corners
2164 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2336 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2165 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2337 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2166 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);
2167 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2339 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2340 }
2341 }
2342
2343 if (expect_false (z == 2) && expect_false (cell->flags))
2344 {
2345 // overlays such as the speech bubble, probably more to come
2346 if (cell->flags & 1)
2347 {
2348 rc_key_t key_ov = key;
2349 maptex tex = self->tex [TEXID_SPEECH];
2350 rc_array_t *arr;
2351 int px = x * Tw + Tw * 2 / 32;
2352 int py = y * Th - Th * 6 / 32;
2353
2354 key_ov.texname = tex.name;
2355 arr = rc_array (rc_ov, &key_ov);
2356
2357 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2358 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2359 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2360 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2168 } 2361 }
2169 } 2362 }
2170 } 2363 }
2171 } 2364 }
2172 2365
2199 if (!(bits & 0x1000) 2392 if (!(bits & 0x1000)
2200 && skey->level == level 2393 && skey->level == level
2201 && level > smooth_max [skey->x][skey->y]) 2394 && level > smooth_max [skey->x][skey->y])
2202 { 2395 {
2203 maptex tex = self->tex [skey->tile]; 2396 maptex tex = self->tex [skey->tile];
2204 int px = (((int)skey->x) - 1) * T; 2397 int px = (((int)skey->x) - 1) * Tw;
2205 int py = (((int)skey->y) - 1) * T; 2398 int py = (((int)skey->y) - 1) * Th;
2206 int border = bits & 15; 2399 int border = bits & 15;
2207 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2208 float dx = tex.s * .0625f; // 16 images/row 2401 float dx = tex.s * .0625f; // 16 images/row
2209 float dy = tex.t * .5f ; // 2 images/column 2402 float dy = tex.t * .5f ; // 2 images/column
2210 2403
2223 2416
2224 if (border) 2417 if (border)
2225 { 2418 {
2226 float ox = border * dx; 2419 float ox = border * dx;
2227 2420
2228 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2229 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2230 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2231 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2232 } 2425 }
2233 2426
2234 if (corner) 2427 if (corner)
2235 { 2428 {
2236 float ox = corner * dx; 2429 float ox = corner * dx;
2237 2430
2238 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2239 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2240 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2241 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2242 } 2435 }
2243 } 2436 }
2244 } 2437 }
2245 } 2438 }
2246 } 2439 }
2269 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2462 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2270 2463
2271 rc_draw (rc); 2464 rc_draw (rc);
2272 } 2465 }
2273 2466
2467 rc_draw (rc_ov);
2468 rc_clear (rc_ov);
2469
2274 glDisable (GL_BLEND); 2470 glDisable (GL_BLEND);
2275 rc_free (rc); 2471 rc_free (rc);
2472 rc_free (rc_ov);
2276 2473
2277 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2278 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2279 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2280 { 2477 {
2283 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2284 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2285 { 2482 {
2286 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2287 2484
2288 int px = x * T; 2485 int px = x * Tw;
2289 int py = y * T; 2486 int py = y * Th;
2290 2487
2291 if (expect_false (cell->player == player)) 2488 if (expect_false (cell->player == player))
2292 { 2489 {
2293 px += sdx; 2490 px += sdx;
2294 py += sdy; 2491 py += sdy;
2295 } 2492 }
2296 2493
2297 if (cell->stat_hp) 2494 if (cell->stat_hp)
2298 { 2495 {
2299 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2300 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2301 2498
2302 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2303 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2304 px + width - 1, py); 2501 px + width - 1, py);
2305 2502
2311 } 2508 }
2312 } 2509 }
2313} 2510}
2314 2511
2315void 2512void
2316draw_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)
2317 CODE: 2514 CODE:
2318{ 2515{
2319 static float color[16][3] = { 2516 static float color[16][3] = {
2320 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2321 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2322 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2323 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2324 2521
2325 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2326 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2327 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2328 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2329 2526
2330 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2331 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2332 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2333 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2334 2531
2335 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2336 2533
2337 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2338 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2339 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2340 }; 2537 };
2341 2538
2342 int x, y; 2539 int x, y;
2343 2540
2344 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 */
2345 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2346 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2347 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2348 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2349 2552
2350 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2354 2557
2355 if (m) 2558 if (m)
2356 { 2559 {
2357 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2358 2561
2359 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2360 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2361 2564
2362 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2363 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2364 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2365 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2366 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2367 } 2570 }
2375void 2578void
2376fow_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)
2377 PPCODE: 2580 PPCODE:
2378{ 2581{
2379 int x, y; 2582 int x, y;
2380 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2381 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2382 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2383 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);
2384 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2385 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2386 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2387 2591
2388 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2389 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2390 2594
2391 mx += self->x - 1; 2595 mx += self->x - 1;
2392 my += self->y - 1; 2596 my += self->y - 1;
2393
2394 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2395 2597
2396 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2397 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2398 { 2600 {
2399 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2402 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2403 { 2605 {
2404 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2405 2607
2406 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2407 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2408 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2409 } 2611 }
2410 } 2612 }
2411 2613
2412 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2413 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2432 2634
2433 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2434 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2435 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2436 2638
2437 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2438 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2439 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2440 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2441 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 */
2442 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2443 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2444 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2445 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2446 } 2648 }
2447 2649
2448 free (darkness1); 2650 free (darkness1);
2449 2651
2450 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2451 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2452 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2453 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2454} 2656}
2455 2657
2456SV * 2658SV *
2519 else 2721 else
2520 *data++ = 0; 2722 *data++ = 0;
2521 } 2723 }
2522 } 2724 }
2523 2725
2524 /* 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 */
2525 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2526 { 2728 {
2527 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2528 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2529 } 2731 }
2530 2732
2531 RETVAL = data_sv; 2733 RETVAL = data_sv;
2532} 2734}
2533 OUTPUT: 2735 OUTPUT:
2534 RETVAL 2736 RETVAL
2535 2737
2536void 2738void
2543 STRLEN len; 2745 STRLEN len;
2544 uint8_t *data, *end; 2746 uint8_t *data, *end;
2545 2747
2546 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2547 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2548 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2549 end = data + len + 8; 2751 end = data + len + 8;
2550 2752
2551 if (len < 5) 2753 if (len < 5)
2552 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2553 2755
2614} 2816}
2615 2817
2616MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2617 2819
2618DC::RW 2820DC::RW
2619new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2620 CODE: 2822 CODE:
2621{ 2823{
2622 STRLEN datalen; 2824 STRLEN datalen;
2623 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2624 2826
2626} 2828}
2627 OUTPUT: 2829 OUTPUT:
2628 RETVAL 2830 RETVAL
2629 2831
2630DC::RW 2832DC::RW
2631new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2632 CODE: 2834 CODE:
2633 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2634 OUTPUT: 2836 OUTPUT:
2635 RETVAL 2837 RETVAL
2636 2838
2654 if (RETVAL < 0) 2856 if (RETVAL < 0)
2655 { 2857 {
2656 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2657 2859
2658 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)
2659 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2660 2867 }
2868 else
2661 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2662 } 2870 }
2663 2871
2664 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2665 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2666} 2874}
2713void 2921void
2714set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2715 CODE: 2923 CODE:
2716{ 2924{
2717 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));
2718 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;
2719 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2720} 2928}
2721 2929
2722void 2930void
2723set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2726 2934
2727MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2728 2936
2729PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2730 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
2731DC::MixChunk 2951DC::MixChunk
2732new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2733 CODE: 2953 CODE:
2734 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2735 OUTPUT: 2955 OUTPUT:
2736 RETVAL 2956 RETVAL
2737 2957
2767 OUTPUT: 2987 OUTPUT:
2768 RETVAL 2988 RETVAL
2769 2989
2770MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2771 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
2772int 3004int
2773volume (int volume = -1) 3005volume (int volume = -1)
2774 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2775 CODE: 3007 CODE:
2776 if (items > 0) 3008 if (items > 0)
2787void 3019void
2788halt () 3020halt ()
2789 CODE: 3021 CODE:
2790 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2791 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2792DC::MixMusic 3031DC::MixMusic
2793new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2794 CODE: 3033 CODE:
2795 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2796 OUTPUT: 3035 OUTPUT:
2797 RETVAL 3036 RETVAL
2798 3037
2826 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2827# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2828 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2829 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2830 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2831 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2832 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2833 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2834 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2835 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2847 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2848 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2849 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2850 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2851 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),
2852 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2853 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2854 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2855 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2856 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2924 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2925 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2926 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2927 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2928 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),
2929# undef const_iv 3176# undef const_iv
2930 }; 3177 };
2931 3178
2932 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--)
2933 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2934 3181
2935 texture_av = newAV (); 3182 texture_av = newAV ();
2936 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2937} 3184}
2938 3185
2940disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2941 CODE: 3188 CODE:
2942 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2943 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2944 3191
2945char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2946gl_vendor () 3196gl_vendor ()
2947 CODE: 3197 CODE:
2948 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2949 OUTPUT: 3199 OUTPUT:
2950 RETVAL 3200 RETVAL
2951 3201
2952char * 3202const char *
2953gl_version () 3203gl_version ()
2954 CODE: 3204 CODE:
2955 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2956 OUTPUT: 3206 OUTPUT:
2957 RETVAL 3207 RETVAL
2958 3208
2959char * 3209const char *
2960gl_extensions () 3210gl_extensions ()
2961 CODE: 3211 CODE:
2962 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2963 OUTPUT: 3213 OUTPUT:
2964 RETVAL 3214 RETVAL
2965 3215
2966const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2967 3221
2968GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2969 CODE: 3223 CODE:
2970 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2971 OUTPUT: 3225 OUTPUT:
2979 3233
2980int glGetError () 3234int glGetError ()
2981 3235
2982void glFinish () 3236void glFinish ()
2983 3237
3238void glFlush ()
3239
2984void glClear (int mask) 3240void glClear (int mask)
2985 3241
2986void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2987 PROTOTYPE: @ 3243 PROTOTYPE: @
2988 3244
2997void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2998 3254
2999void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3000 CODE: 3256 CODE:
3001 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
3002 3260
3003void glDepthMask (int flag) 3261void glDepthMask (int flag)
3004 3262
3005void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
3006 3264
3157 3415
3158void glEndList () 3416void glEndList ()
3159 3417
3160void glCallList (int list) 3418void glCallList (int list)
3161 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3162MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3163 3426
3164PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3165 3428
3166void 3429void
3167find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3168 PPCODE: 3431 PPCODE:
3169{ 3432{
3170 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3171 XPUSHs (self); 3434 XPUSHs (self);
3172} 3435}
3173 3436
3174BOOT: 3437BOOT:
3175{ 3438{
3183 3446
3184void 3447void
3185draw (SV *self) 3448draw (SV *self)
3186 CODE: 3449 CODE:
3187{ 3450{
3188 HV *hv; 3451 HV *hv;
3189 SV **svp; 3452 SV **svp;
3190 NV x, y, w, h; 3453 NV x, y, w, h;
3191 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3192 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3193 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3194 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