ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.295 by root, Mon Dec 21 03:30:22 2009 UTC vs.
Revision 1.314 by root, Wed Jan 18 15:31:51 2012 UTC

… …
41#include <SDL_opengl.h> 41#include <SDL_opengl.h>
42 42
43/* work around os x broken headers */ 43/* work around os x broken headers */
44#ifdef __MACOSX__ 44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
46#endif 48#endif
47 49
48#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
49#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
50 52
… …
80#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
82 84
83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
84 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
85#define FOW_DARKNESS 64 89#define FOW_DARKNESS 50
86#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */ 90#define DARKNESS_ADJUST(n) (n)
87 91
88#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
90 94
91#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
… …
95 99
96#define KMOD_LRAM 0x10000 // our extension 100#define KMOD_LRAM 0x10000 // our extension
97 101
98#define TEXID_SPEECH 1 102#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2 103#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3 104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
101 123
102static AV *texture_av; 124static AV *texture_av;
103 125
104static struct 126static struct
105{ 127{
… …
460 482
461 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
462} 484}
463 485
464static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
465minpot (unsigned int n) 493minpot (unsigned int n)
466{ 494{
467 if (!n) 495 if (!n)
468 return 0; 496 return 0;
469 497
… …
549 577
550 return mod; 578 return mod;
551} 579}
552 580
553static void 581static void
554deliantra_main () 582deliantra_main (SV *real_main)
555{ 583{
556 char *argv[] = { 0 }; 584 dSP;
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
558} 588}
559 589
560#ifdef __MACOSX__ 590#ifdef __MACOSX__
591 static SV *real_main;
592
561 /* to due surprising braindamage on the side of SDL design, we 593 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 594 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which, 595 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back. 597 * and which calls our main (== SDL_main) back.
566 */ 598 */
567 extern C_LINKAGE int 599 extern C_LINKAGE int
568 main (int argc, char *argv[]) 600 main (int argc, char *argv[])
569 { 601 {
570 deliantra_main (); 602 deliantra_main (real_main);
571 } 603 }
572 604
573 #undef main 605 #undef main
574 606
575 extern C_LINKAGE int main (int argc, char *argv[]); 607 extern C_LINKAGE int main (int argc, char *argv[]);
576 608
577 static void 609 static void
578 SDL_braino (void) 610 SDL_main_hack (SV *real_main_)
579 { 611 {
612 real_main = real_main;
613
580 char *argv[] = { "deliantra client", 0 }; 614 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv); 615 (main) (1, argv);
582 } 616 }
583#else 617#else
584 static void 618 static void
585 SDL_braino (void) 619 SDL_main_hack (SV *real_main)
586 { 620 {
587 deliantra_main (); 621 deliantra_main (real_main);
588 } 622 }
589#endif 623#endif
590 624
591MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
592 626
… …
793 827
794 const_iv (FOW_DARKNESS) 828 const_iv (FOW_DARKNESS)
795# undef const_iv 829# undef const_iv
796 }; 830 };
797 831
798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 832 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 834
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 837}
804 838
… …
843#endif 877#endif
844} 878}
845 879
846char *SDL_GetError () 880char *SDL_GetError ()
847 881
848void SDL_braino () 882void SDL_main_hack (SV *real_main)
883 PROTOTYPE: &
849 884
850int SDL_Init (U32 flags) 885int SDL_Init (U32 flags)
851 886
852int SDL_InitSubSystem (U32 flags) 887int SDL_InitSubSystem (U32 flags)
853 888
… …
922 ); 957 );
923 958
924 if (RETVAL) 959 if (RETVAL)
925 { 960 {
926 av_clear (texture_av); 961 av_clear (texture_av);
927
928 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
929#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 962#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
930#include "glfunc.h" 963#include "glfunc.h"
931#undef GL_FUNC 964#undef GL_FUNC
965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
932 } 967 }
933} 968}
934 OUTPUT: 969 OUTPUT:
935 RETVAL 970 RETVAL
936 971
937void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
938SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
939 977
940char * 978char *
941SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
942 980
… …
944SDL_GetAppState () 982SDL_GetAppState ()
945 983
946int 984int
947SDL_GetModState () 985SDL_GetModState ()
948 986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
949void 991void
992SDL_PumpEvents ()
993
994void
950poll_events () 995peep_events ()
951 PPCODE: 996 PPCODE:
952{ 997{
953 SDL_Event ev; 998 SDL_Event ev;
954 999
955 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
… …
1021 1066
1022 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1067 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1023 } 1068 }
1024} 1069}
1025 1070
1071char *
1072SDL_AudioDriverName ()
1073 CODE:
1074{
1075 char buf [256];
1076 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1077 XSRETURN_UNDEF;
1078
1079 RETVAL = buf;
1080}
1081 OUTPUT:
1082 RETVAL
1083
1026int 1084int
1027Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1085Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1028 POSTCALL: 1086 POSTCALL:
1029 Mix_HookMusicFinished (music_finished); 1087 Mix_HookMusicFinished (music_finished);
1030 Mix_ChannelFinished (channel_finished); 1088 Mix_ChannelFinished (channel_finished);
… …
1092add_font (char *file) 1150add_font (char *file)
1093 CODE: 1151 CODE:
1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1152 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT: 1153 OUTPUT:
1096 RETVAL 1154 RETVAL
1155
1156void
1157IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1158
1159# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1160void
1161Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1097 1162
1098void 1163void
1099load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
1100 ALIAS: 1165 ALIAS:
1101 load_image_file = 1 1166 load_image_file = 1
… …
1665 glDisable (GL_BLEND); 1730 glDisable (GL_BLEND);
1666 } 1731 }
1667} 1732}
1668 1733
1669void 1734void
1670draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f) 1735draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1671 PROTOTYPE: @ 1736 PROTOTYPE: @
1672 CODE: 1737 CODE:
1673{ 1738{
1739 glEnable (GL_BLEND);
1740 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1674 glEnable (GL_TEXTURE_2D); 1741 glEnable (GL_TEXTURE_2D);
1675 glEnable (GL_BLEND);
1676 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glBindTexture (GL_TEXTURE_2D, name1); 1742 glBindTexture (GL_TEXTURE_2D, name1);
1678 1743
1679 glColor3f (intensity, intensity, intensity); 1744 glColor3f (intensity, intensity, intensity);
1680 glPushMatrix (); 1745 glPushMatrix ();
1681 glScalef (1./3, 1./3, 1.); 1746 glScalef (1./3, 1./3, 1.);
1682 1747
1683 if (blend > 0.f) 1748 if (blend > 0.f)
1684 { 1749 {
1685 float S2, T2; /* 0. 0. for texture 2 */ 1750 float dx3 = dx * -3.f / w;
1686 float w = w1 > w2 ? w1 : w2; 1751 float dy3 = dy * -3.f / h;
1687 float h = h1 > h2 ? h1 : h2;
1688 GLfloat env_color[4] = { 0., 0., 0., blend }; 1752 GLfloat env_color[4] = { 0., 0., 0., blend };
1689 1753
1690 /* interpolate the two shadow textures */ 1754 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */ 1755 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1756 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
… …
1697 glBindTexture (GL_TEXTURE_2D, name2); 1761 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1762 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699 1763
1700 /* rgb == rgb(glcolor) */ 1764 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1765 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1766 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1767 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704 1768
1705 /* alpha = interpolate t0, t1 by env_alpha */ 1769 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1770 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707 1771
… …
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA); 1777 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714 1778
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT); 1779 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA); 1780 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717 1781
1718 s1 *= w / w1;
1719 t1 *= h / h1;
1720
1721 dx *= -3.f / w2;
1722 dy *= -3.f / h2;
1723 dx *= w / w2;
1724 dy *= h / h2;
1725
1726 s2 *= w / w2;
1727 t2 *= h / h2;
1728
1729 glBegin (GL_QUADS); 1782 glBegin (GL_QUADS);
1730 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0); 1783 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1731 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1); 1784 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1732 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1); 1785 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1733 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0); 1786 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1734 glEnd (); 1787 glEnd ();
1735 1788
1736 glDisable (GL_TEXTURE_2D); 1789 glDisable (GL_TEXTURE_2D);
1737 gl.ActiveTexture (GL_TEXTURE0); 1790 gl.ActiveTexture (GL_TEXTURE0);
1738 } 1791 }
… …
1740 { 1793 {
1741 /* simple blending of one texture, also opengl <1.3 path */ 1794 /* simple blending of one texture, also opengl <1.3 path */
1742 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743 1796
1744 glBegin (GL_QUADS); 1797 glBegin (GL_QUADS);
1745 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1798 glTexCoord2f (0, 0); glVertex2f (0, 0);
1746 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1799 glTexCoord2f (0, t); glVertex2f (0, h);
1747 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1800 glTexCoord2f (s, t); glVertex2f (w, h);
1748 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 1801 glTexCoord2f (s, 0); glVertex2f (w, 0);
1749 glEnd (); 1802 glEnd ();
1750 } 1803 }
1804
1805 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1806 {
1807 int x, y;
1808 int dx3 = dx * 3;
1809 int dy3 = dy * 3;
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1812 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1813 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1814 glTranslatef (-1., -1., 0);
1815 glBegin (GL_QUADS);
1816
1817 for (y = 1; y < h; y += 3)
1818 {
1819 int y1 = y - dy3;
1820 int y1valid = y1 >= 0 && y1 < h;
1821
1822 for (x = 1; x < w; x += 3)
1823 {
1824 int x1 = x - dx3;
1825 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1826 uint8_t h2;
1827
1828 if (y1valid && x1 >= 0 && x1 < w)
1829 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1830 else
1831 h2 = 1; /* out of range == invisible */
1832
1833 if (h1 || h2)
1834 {
1835 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1836 glColor4f (1., 1., 1., alpha);
1837
1838 glTexCoord2f (0, 0.); glVertex2i (x , y );
1839 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1840 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1841 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1842 }
1843 }
1844 }
1845 }
1846
1847 glEnd ();
1751 1848
1752 glPopMatrix (); 1849 glPopMatrix ();
1753 1850
1754 glDisable (GL_TEXTURE_2D); 1851 glDisable (GL_TEXTURE_2D);
1755 glDisable (GL_BLEND); 1852 glDisable (GL_BLEND);
… …
1976 { 2073 {
1977 ext = *data++; 2074 ext = *data++;
1978 cmd = ext & 0x7f; 2075 cmd = ext & 0x7f;
1979 2076
1980 if (cmd < 4) 2077 if (cmd < 4)
1981 cell->darkness = 255 - ext * 64 + 1; 2078 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1982 else if (cmd == 5) // health 2079 else if (cmd == 5) // health
1983 { 2080 {
1984 cell->stat_width = 1; 2081 cell->stat_width = 1;
1985 cell->stat_hp = *data++; 2082 cell->stat_hp = *data++;
1986 } 2083 }
… …
2061 ? self->row + y 2158 ? self->row + y
2062 : 0; 2159 : 0;
2063 2160
2064 for (x = x0; x < x1; x++) 2161 for (x = x0; x < x1; x++)
2065 { 2162 {
2066 int r = 32, g = 32, b = 32, a = 192; 2163 unsigned int r = 32, g = 32, b = 32, a = 192;
2067 2164
2068 if (row && row->c0 <= x && x < row->c1) 2165 if (row && row->c0 <= x && x < row->c1)
2069 { 2166 {
2070 mapcell *cell = row->col + (x - row->c0); 2167 mapcell *cell = row->col + (x - row->c0);
2071 2168
… …
2073 { 2170 {
2074 maptex tex = self->tex [cell->tile [z]]; 2171 maptex tex = self->tex [cell->tile [z]];
2075 int a0 = 255 - tex.a; 2172 int a0 = 255 - tex.a;
2076 int a1 = tex.a; 2173 int a1 = tex.a;
2077 2174
2078 r = (r * a0 + tex.r * a1) / 255; 2175 r = div255 (r * a0 + tex.r * a1);
2079 g = (g * a0 + tex.g * a1) / 255; 2176 g = div255 (g * a0 + tex.g * a1);
2080 b = (b * a0 + tex.b * a1) / 255; 2177 b = div255 (b * a0 + tex.b * a1);
2081 a = (a * a0 + tex.a * a1) / 255; 2178 a = div255 (a * a0 + tex.a * a1);
2082 } 2179 }
2083 } 2180 }
2084 2181
2085 *map++ = (r ) 2182 *map++ = (r )
2086 | (g << 8) 2183 | (g << 8)
… …
2093} 2190}
2094 OUTPUT: 2191 OUTPUT:
2095 RETVAL 2192 RETVAL
2096 2193
2097void 2194void
2098draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2195draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2099 CODE: 2196 CODE:
2100{ 2197{
2101 int x, y, z; 2198 int x, y, z;
2102 2199
2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2200 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
… …
2107 int pl_x, pl_y; 2204 int pl_x, pl_y;
2108 maptex pl_tex; 2205 maptex pl_tex;
2109 rc_t *rc = rc_alloc (); 2206 rc_t *rc = rc_alloc ();
2110 rc_t *rc_ov = rc_alloc (); 2207 rc_t *rc_ov = rc_alloc ();
2111 rc_key_t key; 2208 rc_key_t key;
2112 rc_array_t *arr, *arr_hidden; 2209 rc_array_t *arr;
2113 2210
2114 pl_tex.name = 0; 2211 pl_tex.name = 0;
2115 2212
2116 // that's current max. sorry. 2213 // that's current max. sorry.
2117 if (sw > 255) sw = 255; 2214 if (sw > 255) sw = 255;
… …
2154 } 2251 }
2155 2252
2156 glEnable (GL_BLEND); 2253 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2159
2160 key.texname = self->tex [TEXID_HIDDEN].name;
2161 arr_hidden = rc_array (rc_ov, &key);
2162 2256
2163 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
2164 { 2258 {
2165 memset (smooth_level, 0, sizeof (smooth_level)); 2259 memset (smooth_level, 0, sizeof (smooth_level));
2166 key.texname = -1; 2260 key.texname = -1;
… …
2190 2284
2191 key.texname = tex.name; 2285 key.texname = tex.name;
2192 arr = rc_array (rc, &key); 2286 arr = rc_array (rc, &key);
2193 } 2287 }
2194 2288
2195 px = (x + 1) * T - tex.w; 2289 px = (x + 1) * Th - tex.w;
2196 py = (y + 1) * T - tex.h; 2290 py = (y + 1) * Tw - tex.h;
2197 2291
2198 if (expect_false (cell->player == player) && expect_false (z == 2)) 2292 if (expect_false (cell->player == player) && expect_false (z == 2))
2199 { 2293 {
2200 pl_x = px; 2294 pl_x = px;
2201 pl_y = py; 2295 pl_y = py;
… …
2246 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2340 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2247 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2341 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2248 } 2342 }
2249 } 2343 }
2250 2344
2251 if (expect_false (z == 2)) 2345 if (expect_false (z == 2) && expect_false (cell->flags))
2252 { 2346 {
2253 /* draw question marks on top of hidden spaces */ 2347 // overlays such as the speech bubble, probably more to come
2254 if (!cell->darkness) 2348 if (cell->flags & 1)
2255 { 2349 {
2256 maptex tex = self->tex [TEXID_HIDDEN];
2257 int px = (x + 1) * T - tex.w;
2258 int py = (y + 1) * T - tex.h;
2259
2260 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264 }
2265
2266 if (expect_false (cell->flags))
2267 {
2268 // overlays such as the speech bubble, probably more to come
2269 if (cell->flags & 1)
2270 {
2271 rc_key_t key_ov = key; 2350 rc_key_t key_ov = key;
2272 maptex tex = self->tex [TEXID_SPEECH]; 2351 maptex tex = self->tex [TEXID_SPEECH];
2273 rc_array_t *arr; 2352 rc_array_t *arr;
2274 int px = x * T + T * 2 / 32; 2353 int px = x * Tw + Tw * 2 / 32;
2275 int py = y * T - T * 6 / 32; 2354 int py = y * Th - Th * 6 / 32;
2276 2355
2277 key_ov.texname = tex.name; 2356 key_ov.texname = tex.name;
2278 arr = rc_array (rc_ov, &key_ov); 2357 arr = rc_array (rc_ov, &key_ov);
2279 2358
2280 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2359 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2281 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2360 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2282 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2361 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2283 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2362 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2284 }
2285 } 2363 }
2286 } 2364 }
2287 } 2365 }
2288 } 2366 }
2289 2367
… …
2316 if (!(bits & 0x1000) 2394 if (!(bits & 0x1000)
2317 && skey->level == level 2395 && skey->level == level
2318 && level > smooth_max [skey->x][skey->y]) 2396 && level > smooth_max [skey->x][skey->y])
2319 { 2397 {
2320 maptex tex = self->tex [skey->tile]; 2398 maptex tex = self->tex [skey->tile];
2321 int px = (((int)skey->x) - 1) * T; 2399 int px = (((int)skey->x) - 1) * Tw;
2322 int py = (((int)skey->y) - 1) * T; 2400 int py = (((int)skey->y) - 1) * Th;
2323 int border = bits & 15; 2401 int border = bits & 15;
2324 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2402 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2325 float dx = tex.s * .0625f; // 16 images/row 2403 float dx = tex.s * .0625f; // 16 images/row
2326 float dy = tex.t * .5f ; // 2 images/column 2404 float dy = tex.t * .5f ; // 2 images/column
2327 2405
… …
2340 2418
2341 if (border) 2419 if (border)
2342 { 2420 {
2343 float ox = border * dx; 2421 float ox = border * dx;
2344 2422
2345 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2423 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2346 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2424 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2347 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2425 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2348 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2426 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2349 } 2427 }
2350 2428
2351 if (corner) 2429 if (corner)
2352 { 2430 {
2353 float ox = corner * dx; 2431 float ox = corner * dx;
2354 2432
2355 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2356 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2434 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2357 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2435 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2358 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2436 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2359 } 2437 }
2360 } 2438 }
2361 } 2439 }
2362 } 2440 }
2363 } 2441 }
… …
2404 for (x = 0; x < sw; x++) 2482 for (x = 0; x < sw; x++)
2405 if (row->c0 <= x + mx && x + mx < row->c1) 2483 if (row->c0 <= x + mx && x + mx < row->c1)
2406 { 2484 {
2407 mapcell *cell = row->col + (x + mx - row->c0); 2485 mapcell *cell = row->col + (x + mx - row->c0);
2408 2486
2409 int px = x * T; 2487 int px = x * Tw;
2410 int py = y * T; 2488 int py = y * Th;
2411 2489
2412 if (expect_false (cell->player == player)) 2490 if (expect_false (cell->player == player))
2413 { 2491 {
2414 px += sdx; 2492 px += sdx;
2415 py += sdy; 2493 py += sdy;
2416 } 2494 }
2417 2495
2418 if (cell->stat_hp) 2496 if (cell->stat_hp)
2419 { 2497 {
2420 int width = cell->stat_width * T; 2498 int width = cell->stat_width * Tw;
2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2499 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2422 2500
2423 glColor3ub (0, 0, 0); 2501 glColor3ub (0, 0, 0);
2424 glRectf (px + 1, py - thick - 2, 2502 glRectf (px + 1, py - thick - 2,
2425 px + width - 1, py); 2503 px + width - 1, py);
2426 2504
… …
2463 int x, y; 2541 int x, y;
2464 2542
2465 glEnable (GL_TEXTURE_2D); 2543 glEnable (GL_TEXTURE_2D);
2466 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2544 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467 * but the nvidia driver (185.18.14) mishandles alpha textures 2545 * but the nvidia driver (185.18.14) mishandles alpha textures
2468 * ansd takes the colour from god knows where instead of using 2546 * and takes the colour from god knows where instead of using
2469 * Cp. MODULATE results in the same colour, but slightly different 2547 * Cp. MODULATE results in the same colour, but slightly different
2470 * alpha, but atcually gives us the correct colour with nvidia. 2548 * alpha, but atcually gives us the correct colour with nvidia.
2471 */ 2549 */
2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2550 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2473 glEnable (GL_BLEND); 2551 glEnable (GL_BLEND);
… …
2502void 2580void
2503fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2581fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2504 PPCODE: 2582 PPCODE:
2505{ 2583{
2506 int x, y; 2584 int x, y;
2507 int sw1 = sw + 2; 2585 int sw1 = sw + 2;
2508 int sh1 = sh + 2; 2586 int sh1 = sh + 2;
2509 int sh3 = sh * 3; 2587 int sh3 = sh * 3;
2510 int sw34 = (sw * 3 + 3) & ~3; 2588 int sw3 = sw * 3;
2589 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2590 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2511 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2591 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2512 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2592 memset (darkness1, 0, sw1*sh1);
2513 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2514 2593
2515 SvPOK_only (darkness3_sv); 2594 SvPOK_only (darkness3_sv);
2516 SvCUR_set (darkness3_sv, sw34 * sh3); 2595 SvCUR_set (darkness3_sv, sw3 * sh3);
2517 2596
2518 mx += self->x - 1; 2597 mx += self->x - 1;
2519 my += self->y - 1; 2598 my += self->y - 1;
2520
2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2522 2599
2523 for (y = 0; y < sh1; y++) 2600 for (y = 0; y < sh1; y++)
2524 if (0 <= y + my && y + my < self->rows) 2601 if (0 <= y + my && y + my < self->rows)
2525 { 2602 {
2526 maprow *row = self->row + (y + my); 2603 maprow *row = self->row + (y + my);
… …
2559 2636
2560 uint8_t r13 = (d13 + d23 + d12) / 3; 2637 uint8_t r13 = (d13 + d23 + d12) / 3;
2561 uint8_t r23 = d23; 2638 uint8_t r23 = d23;
2562 uint8_t r33 = (d23 + d33 + d32) / 3; 2639 uint8_t r33 = (d23 + d33 + d32) / 3;
2563 2640
2564 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2565 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2566 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2567 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2568 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2645 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2569 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2646 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2570 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2571 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2572 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2573 } 2650 }
2574 2651
2575 free (darkness1); 2652 free (darkness1);
2576 2653
2577 EXTEND (SP, 3); 2654 EXTEND (SP, 3);
2578 PUSHs (sv_2mortal (newSViv (sw34))); 2655 PUSHs (sv_2mortal (newSViv (sw3)));
2579 PUSHs (sv_2mortal (newSViv (sh3))); 2656 PUSHs (sv_2mortal (newSViv (sh3)));
2580 PUSHs (darkness3_sv); 2657 PUSHs (darkness3_sv);
2581} 2658}
2582 2659
2583SV * 2660SV *
… …
2781 if (RETVAL < 0) 2858 if (RETVAL < 0)
2782 { 2859 {
2783 RETVAL = Mix_GroupOldest (-1); 2860 RETVAL = Mix_GroupOldest (-1);
2784 2861
2785 if (RETVAL < 0) 2862 if (RETVAL < 0)
2863 {
2864 // happens sometimes, maybe it just stopped playing(?)
2865 RETVAL = Mix_GroupAvailable (-1);
2866
2867 if (RETVAL < 0)
2786 XSRETURN_UNDEF; 2868 XSRETURN_UNDEF;
2787 2869 }
2870 else
2788 Mix_HaltChannel (RETVAL); 2871 Mix_HaltChannel (RETVAL);
2789 } 2872 }
2790 2873
2791 Mix_UnregisterAllEffects (RETVAL); 2874 Mix_UnregisterAllEffects (RETVAL);
2792 Mix_Volume (RETVAL, 128); 2875 Mix_Volume (RETVAL, 128);
2793} 2876}
… …
2852 Mix_SetReverseStereo (self, flip); 2935 Mix_SetReverseStereo (self, flip);
2853 2936
2854MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2937MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2855 2938
2856PROTOTYPES: DISABLE 2939PROTOTYPES: DISABLE
2940
2941void
2942decoders ()
2943 PPCODE:
2944#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2945 int i, num = Mix_GetNumChunkDecoders ();
2946 EXTEND (SP, num);
2947 for (i = 0; i < num; ++i)
2948 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2949#else
2950 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2951#endif
2857 2952
2858DC::MixChunk 2953DC::MixChunk
2859new (SV *class, DC::RW rwops) 2954new (SV *class, DC::RW rwops)
2860 CODE: 2955 CODE:
2861 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2956 RETVAL = Mix_LoadWAV_RW (rwops, 1);
… …
2894 OUTPUT: 2989 OUTPUT:
2895 RETVAL 2990 RETVAL
2896 2991
2897MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2992MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2898 2993
2994void
2995decoders ()
2996 PPCODE:
2997#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2998 int i, num = Mix_GetNumMusicDecoders ();
2999 EXTEND (SP, num);
3000 for (i = 0; i < num; ++i)
3001 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3002#else
3003 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3004#endif
3005
2899int 3006int
2900volume (int volume = -1) 3007volume (int volume = -1)
2901 PROTOTYPE: ;$ 3008 PROTOTYPE: ;$
2902 CODE: 3009 CODE:
2903 if (items > 0) 3010 if (items > 0)
… …
2913 3020
2914void 3021void
2915halt () 3022halt ()
2916 CODE: 3023 CODE:
2917 Mix_HaltMusic (); 3024 Mix_HaltMusic ();
3025
3026int
3027playing ()
3028 CODE:
3029 RETVAL = Mix_PlayingMusic ();
3030 OUTPUT:
3031 RETVAL
2918 3032
2919DC::MixMusic 3033DC::MixMusic
2920new (SV *class, DC::RW rwops) 3034new (SV *class, DC::RW rwops)
2921 CODE: 3035 CODE:
2922 RETVAL = Mix_LoadMUS_RW (rwops); 3036 RETVAL = Mix_LoadMUS_RW (rwops);
… …
3062 const_iv (GL_FUNC_SUBTRACT), 3176 const_iv (GL_FUNC_SUBTRACT),
3063 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3177 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3064# undef const_iv 3178# undef const_iv
3065 }; 3179 };
3066 3180
3067 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3181 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3182 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3069 3183
3070 texture_av = newAV (); 3184 texture_av = newAV ();
3071 AvREAL_off (texture_av); 3185 AvREAL_off (texture_av);
3072} 3186}
3073 3187
… …
3116 RETVAL 3230 RETVAL
3117 3231
3118int glGetError () 3232int glGetError ()
3119 3233
3120void glFinish () 3234void glFinish ()
3235
3236void glFlush ()
3121 3237
3122void glClear (int mask) 3238void glClear (int mask)
3123 3239
3124void glClearColor (float r, float g, float b, float a = 1.0) 3240void glClearColor (float r, float g, float b, float a = 1.0)
3125 PROTOTYPE: @ 3241 PROTOTYPE: @
… …
3296void glNewList (int list, int mode = GL_COMPILE) 3412void glNewList (int list, int mode = GL_COMPILE)
3297 3413
3298void glEndList () 3414void glEndList ()
3299 3415
3300void glCallList (int list) 3416void glCallList (int list)
3417
3418void c_init ()
3419 CODE:
3420 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3421 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3301 3422
3302MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3423MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3303 3424
3304PROTOTYPES: DISABLE 3425PROTOTYPES: DISABLE
3305 3426

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines