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.278 by root, Wed Sep 3 10:36:25 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 32 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
233 int w, h; 259 int w, h;
234 float s, t; 260 float s, t;
235 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
236 tileid smoothtile; 262 tileid smoothtile;
237 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
238} maptex; 265} maptex;
239 266
240typedef struct { 267typedef struct {
241 uint32_t player; 268 uint32_t player;
242 tileid tile[3]; 269 tileid tile[3];
454 ev.data2 = 0; 481 ev.data2 = 0;
455 482
456 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
457} 484}
458 485
486// approximately divide by 255
487static unsigned int
488div255 (unsigned int n)
489{
490 return (n + (n >> 8)) >> 8;
491}
492
459static unsigned int 493static unsigned int
460minpot (unsigned int n) 494minpot (unsigned int n)
461{ 495{
462 if (!n) 496 if (!n)
463 return 0; 497 return 0;
544 578
545 return mod; 579 return mod;
546} 580}
547 581
548static void 582static void
549deliantra_main () 583deliantra_main (SV *real_main)
550{ 584{
551 char *argv[] = { 0 }; 585 dSP;
552 call_argv ("::main", G_DISCARD | G_VOID, argv); 586
587 PUSHMARK (SP);
588 call_sv (real_main, G_DISCARD | G_VOID);
553} 589}
554 590
555#ifdef __MACOSX__ 591#ifdef __MACOSX__
592 static SV *real_main;
593
556 /* to due surprising braindamage on the side of SDL design, we 594 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main() 595 * do some mind-boggling hack here: SDL requires a custom main()
558 * 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,
559 * 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,
560 * and which calls our main (== SDL_main) back. 598 * and which calls our main (== SDL_main) back.
561 */ 599 */
562 extern C_LINKAGE int 600 extern C_LINKAGE int
563 main (int argc, char *argv[]) 601 main (int argc, char *argv[])
564 { 602 {
565 deliantra_main (); 603 deliantra_main (real_main);
566 } 604 }
567 605
568 #undef main 606 #undef main
569 607
570 extern C_LINKAGE int main (int argc, char *argv[]); 608 extern C_LINKAGE int main (int argc, char *argv[]);
571 609
572 static void 610 static void
573 SDL_braino (void) 611 SDL_main_hack (SV *real_main_)
574 { 612 {
613 real_main = real_main_;
614
575 char *argv[] = { "deliantra client", 0 }; 615 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv); 616 (main) (1, argv);
577 } 617 }
578#else 618#else
579 static void 619 static void
580 SDL_braino (void) 620 SDL_main_hack (SV *real_main)
581 { 621 {
582 deliantra_main (); 622 deliantra_main (real_main);
583 } 623 }
584#endif 624#endif
585 625
586MODULE = Deliantra::Client PACKAGE = DC 626MODULE = Deliantra::Client PACKAGE = DC
587 627
788 828
789 const_iv (FOW_DARKNESS) 829 const_iv (FOW_DARKNESS)
790# undef const_iv 830# undef const_iv
791 }; 831 };
792 832
793 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--)
794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 834 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
795 835
796 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 836 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
797 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 837 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
798} 838}
799 839
815NV ceil (NV x) 855NV ceil (NV x)
816 856
817IV minpot (UV n) 857IV minpot (UV n)
818 858
819IV 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
820 866
821void 867void
822pango_init () 868pango_init ()
823 CODE: 869 CODE:
824{ 870{
832#endif 878#endif
833} 879}
834 880
835char *SDL_GetError () 881char *SDL_GetError ()
836 882
837void SDL_braino () 883void SDL_main_hack (SV *real_main)
884 PROTOTYPE: &
838 885
839int SDL_Init (U32 flags) 886int SDL_Init (U32 flags)
840 887
841int SDL_InitSubSystem (U32 flags) 888int SDL_InitSubSystem (U32 flags)
842 889
843void SDL_QuitSubSystem (U32 flags) 890void SDL_QuitSubSystem (U32 flags)
844 891
845void SDL_Quit () 892void SDL_Quit ()
846 893
847int SDL_GL_SetAttribute (int attr, int value) 894int SDL_GL_SetAttribute (int attr, int value)
895 C_ARGS: (SDL_GLattr)attr, value
848 896
849int SDL_GL_GetAttribute (int attr) 897int SDL_GL_GetAttribute (int attr)
850 CODE: 898 CODE:
851 if (SDL_GL_GetAttribute (attr, &RETVAL)) 899 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
852 XSRETURN_UNDEF; 900 XSRETURN_UNDEF;
853 OUTPUT: 901 OUTPUT:
854 RETVAL 902 RETVAL
855 903
856void 904void
911 ); 959 );
912 960
913 if (RETVAL) 961 if (RETVAL)
914 { 962 {
915 av_clear (texture_av); 963 av_clear (texture_av);
916
917 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
918#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);
919#include "glfunc.h" 965#include "glfunc.h"
920#undef GL_FUNC 966#undef GL_FUNC
967 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
968 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
921 } 969 }
922} 970}
923 OUTPUT: 971 OUTPUT:
924 RETVAL 972 RETVAL
973
974void
975SDL_WM_SetCaption (const char *title, const char *icon)
925 976
926void 977void
927SDL_GL_SwapBuffers () 978SDL_GL_SwapBuffers ()
928 979
929char * 980char *
930SDL_GetKeyName (int sym) 981SDL_GetKeyName (int sym)
982 C_ARGS: (SDLKey)sym
931 983
932int 984int
933SDL_GetAppState () 985SDL_GetAppState ()
934 986
935int 987int
936SDL_GetModState () 988SDL_GetModState ()
937 989
990int
991SDL_WaitEvent ()
992 C_ARGS: 0
993
938void 994void
995SDL_PumpEvents ()
996
997void
939poll_events () 998peep_events ()
940 PPCODE: 999 PPCODE:
941{ 1000{
942 SDL_Event ev; 1001 SDL_Event ev;
943 1002
944 SDL_PumpEvents (); 1003 SDL_PumpEvents ();
1010 1069
1011 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))));
1012 } 1071 }
1013} 1072}
1014 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
1015int 1087int
1016Mix_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)
1017 POSTCALL: 1089 POSTCALL:
1018 Mix_HookMusicFinished (music_finished); 1090 Mix_HookMusicFinished (music_finished);
1019 Mix_ChannelFinished (channel_finished); 1091 Mix_ChannelFinished (channel_finished);
1020 1092
1021void 1093void
1022Mix_QuerySpec () 1094Mix_QuerySpec ()
1081add_font (char *file) 1153add_font (char *file)
1082 CODE: 1154 CODE:
1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1155 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT: 1156 OUTPUT:
1085 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)
1086 1165
1087void 1166void
1088load_image_inline (SV *image_) 1167load_image_inline (SV *image_)
1089 ALIAS: 1168 ALIAS:
1090 load_image_file = 1 1169 load_image_file = 1
1136 1215
1137 SDL_LockSurface (surface2); 1216 SDL_LockSurface (surface2);
1138 EXTEND (SP, 6); 1217 EXTEND (SP, 6);
1139 PUSHs (sv_2mortal (newSViv (surface2->w))); 1218 PUSHs (sv_2mortal (newSViv (surface2->w)));
1140 PUSHs (sv_2mortal (newSViv (surface2->h))); 1219 PUSHs (sv_2mortal (newSViv (surface2->h)));
1141 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1220 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1142 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)));
1143 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1222 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1144 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1223 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1145 SDL_UnlockSurface (surface2); 1224 SDL_UnlockSurface (surface2);
1146 1225
1206#if DEBUG 1285#if DEBUG
1207 VALGRIND_DO_LEAK_CHECK; 1286 VALGRIND_DO_LEAK_CHECK;
1208#endif 1287#endif
1209} 1288}
1210 1289
1290int
1291SvREFCNT (SV *sv)
1292 CODE:
1293 RETVAL = SvREFCNT (sv);
1294 OUTPUT:
1295 RETVAL
1296
1211MODULE = Deliantra::Client PACKAGE = DC::Font 1297MODULE = Deliantra::Client PACKAGE = DC::Font
1212 1298
1213PROTOTYPES: DISABLE 1299PROTOTYPES: DISABLE
1214 1300
1215DC::Font 1301DC::Font
1216new_from_file (SV *class, char *path, int id = 0) 1302new_from_file (SV *klass, char *path, int id = 0)
1217 CODE: 1303 CODE:
1218{ 1304{
1219 int count; 1305 int count;
1220 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1306 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1221 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1307 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1250 PROTOTYPE: 1336 PROTOTYPE:
1251 CODE: 1337 CODE:
1252 tc_restore (); 1338 tc_restore ();
1253 1339
1254DC::Layout 1340DC::Layout
1255new (SV *class) 1341new (SV *klass)
1256 CODE: 1342 CODE:
1257 New (0, RETVAL, 1, struct cf_layout); 1343 New (0, RETVAL, 1, struct cf_layout);
1258 1344
1259 RETVAL->pl = pango_layout_new (opengl_context); 1345 RETVAL->pl = pango_layout_new (opengl_context);
1260 RETVAL->r = 1.; 1346 RETVAL->r = 1.;
1409 1495
1410void 1496void
1411set_height (DC::Layout self, int base_height) 1497set_height (DC::Layout self, int base_height)
1412 CODE: 1498 CODE:
1413 if (self->base_height != base_height) 1499 if (self->base_height != base_height)
1414 { 1500 {
1415 self->base_height = base_height; 1501 self->base_height = base_height;
1416 layout_update_font (self); 1502 layout_update_font (self);
1417 } 1503 }
1418 1504
1419void 1505void
1646 glDisable (GL_ALPHA_TEST); 1732 glDisable (GL_ALPHA_TEST);
1647 glDisable (GL_BLEND); 1733 glDisable (GL_BLEND);
1648 } 1734 }
1649} 1735}
1650 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
1651IV 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)
1652 CODE: 1859 CODE:
1653{ 1860{
1654 GLint width; 1861 GLint width;
1655 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);
1662MODULE = Deliantra::Client PACKAGE = DC::Map 1869MODULE = Deliantra::Client PACKAGE = DC::Map
1663 1870
1664PROTOTYPES: DISABLE 1871PROTOTYPES: DISABLE
1665 1872
1666DC::Map 1873DC::Map
1667new (SV *class) 1874new (SV *klass)
1668 CODE: 1875 CODE:
1669 New (0, RETVAL, 1, struct map); 1876 New (0, RETVAL, 1, struct map);
1670 RETVAL->x = 0; 1877 RETVAL->x = 0;
1671 RETVAL->y = 0; 1878 RETVAL->y = 0;
1672 RETVAL->w = 0; 1879 RETVAL->w = 0;
1711 1918
1712void 1919void
1713set_smooth (DC::Map self, int face, int smooth, int level) 1920set_smooth (DC::Map self, int face, int smooth, int level)
1714 CODE: 1921 CODE:
1715{ 1922{
1716 tileid texid; 1923 tileid texid;
1717 maptex *tex; 1924 maptex *tex;
1718 1925
1719 if (face < 0 || face >= self->faces) 1926 if (face < 0 || face >= self->faces)
1720 return; 1927 return;
1721 1928
1722 if (smooth < 0 || smooth >= self->faces) 1929 if (smooth < 0 || smooth >= self->faces)
1723 return; 1930 return;
1724 1931
1725 texid = self->face2tile [face]; 1932 texid = self->face2tile [face];
1726 1933
1727 if (!texid) 1934 if (!texid)
1728 return; 1935 return;
1729 1936
1730 tex = self->tex + texid; 1937 tex = self->tex + texid;
1759 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1966 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1760 // use uglier nearest interpolation because linear suffers 1967 // use uglier nearest interpolation because linear suffers
1761 // from transparent color bleeding and ugly wrapping effects. 1968 // from transparent color bleeding and ugly wrapping effects.
1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1969 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1763} 1970}
1971
1972void
1973expire_textures (DC::Map self, int texid, int count)
1974 PPCODE:
1975 for (; texid < self->texs && count; ++texid, --count)
1976 {
1977 maptex *tex = self->tex + texid;
1978
1979 if (tex->name)
1980 {
1981 if (tex->unused)
1982 {
1983 tex->name = 0;
1984 tex->unused = 0;
1985 XPUSHs (sv_2mortal (newSViv (texid)));
1986 }
1987 else
1988 tex->unused = 1;
1989 }
1990 }
1764 1991
1765int 1992int
1766ox (DC::Map self) 1993ox (DC::Map self)
1767 ALIAS: 1994 ALIAS:
1768 oy = 1 1995 oy = 1
1808 self->y += MAP_EXTEND_Y; 2035 self->y += MAP_EXTEND_Y;
1809 } 2036 }
1810} 2037}
1811 2038
1812SV * 2039SV *
1813map1a_update (DC::Map self, SV *data_, int extmap) 2040map1a_update (DC::Map self, SV *data_)
1814 CODE: 2041 CODE:
1815{ 2042{
1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2043 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1817 uint8_t *data_end = (uint8_t *)SvEND (data_); 2044 uint8_t *data_end = (uint8_t *)SvEND (data_);
1818 mapcell *cell; 2045 mapcell *cell;
1839 2066
1840 //TODO: don't trust server data to be in-range(!) 2067 //TODO: don't trust server data to be in-range(!)
1841 2068
1842 if (flags & 8) 2069 if (flags & 8)
1843 { 2070 {
2071 uint8_t ext, cmd;
2072
1844 if (extmap) 2073 do
1845 { 2074 {
1846 uint8_t ext, cmd; 2075 ext = *data++;
2076 cmd = ext & 0x7f;
1847 2077
1848 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
1849 { 2081 {
1850 ext = *data++;
1851 cmd = ext & 0x7f;
1852
1853 if (cmd < 4)
1854 cell->darkness = 255 - ext * 64 + 1;
1855 else if (cmd == 5) // health
1856 {
1857 cell->stat_width = 1; 2082 cell->stat_width = 1;
1858 cell->stat_hp = *data++; 2083 cell->stat_hp = *data++;
1859 }
1860 else if (cmd == 6) // monster width
1861 cell->stat_width = *data++ + 1;
1862 else if (cmd == 0x47)
1863 {
1864 if (*data == 1) cell->player = data [1];
1865 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1866 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1867 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1868
1869 data += *data + 1;
1870 }
1871 else if (cmd == 8) // cell flags
1872 cell->flags = *data++;
1873 else if (ext & 0x40) // unknown, multibyte => skip
1874 data += *data + 1;
1875 else
1876 data++;
1877 } 2084 }
1878 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++;
1879 } 2102 }
1880 else 2103 while (ext & 0x80);
1881 cell->darkness = *data++ + 1;
1882 } 2104 }
1883 2105
1884 for (z = 0; z <= 2; ++z) 2106 for (z = 0; z <= 2; ++z)
1885 if (flags & (4 >> z)) 2107 if (flags & (4 >> z))
1886 { 2108 {
1889 cell->tile [z] = self->face2tile [face]; 2111 cell->tile [z] = self->face2tile [face];
1890 2112
1891 if (cell->tile [z]) 2113 if (cell->tile [z])
1892 { 2114 {
1893 maptex *tex = self->tex + cell->tile [z]; 2115 maptex *tex = self->tex + cell->tile [z];
2116 tex->unused = 0;
1894 if (!tex->name) 2117 if (!tex->name)
1895 av_push (missing, newSViv (cell->tile [z])); 2118 av_push (missing, newSViv (cell->tile [z]));
1896 2119
1897 if (tex->smoothtile) 2120 if (tex->smoothtile)
1898 { 2121 {
1899 maptex *smooth = self->tex + tex->smoothtile; 2122 maptex *smooth = self->tex + tex->smoothtile;
2123 smooth->unused = 0;
1900 if (!smooth->name) 2124 if (!smooth->name)
1901 av_push (missing, newSViv (tex->smoothtile)); 2125 av_push (missing, newSViv (tex->smoothtile));
1902 } 2126 }
1903 } 2127 }
1904 } 2128 }
1932 ? self->row + y 2156 ? self->row + y
1933 : 0; 2157 : 0;
1934 2158
1935 for (x = x0; x < x1; x++) 2159 for (x = x0; x < x1; x++)
1936 { 2160 {
1937 int r = 32, g = 32, b = 32, a = 192; 2161 unsigned int r = 32, g = 32, b = 32, a = 192;
1938 2162
1939 if (row && row->c0 <= x && x < row->c1) 2163 if (row && row->c0 <= x && x < row->c1)
1940 { 2164 {
1941 mapcell *cell = row->col + (x - row->c0); 2165 mapcell *cell = row->col + (x - row->c0);
1942 2166
1944 { 2168 {
1945 maptex tex = self->tex [cell->tile [z]]; 2169 maptex tex = self->tex [cell->tile [z]];
1946 int a0 = 255 - tex.a; 2170 int a0 = 255 - tex.a;
1947 int a1 = tex.a; 2171 int a1 = tex.a;
1948 2172
1949 r = (r * a0 + tex.r * a1) / 255; 2173 r = div255 (r * a0 + tex.r * a1);
1950 g = (g * a0 + tex.g * a1) / 255; 2174 g = div255 (g * a0 + tex.g * a1);
1951 b = (b * a0 + tex.b * a1) / 255; 2175 b = div255 (b * a0 + tex.b * a1);
1952 a = (a * a0 + tex.a * a1) / 255; 2176 a = div255 (a * a0 + tex.a * a1);
1953 } 2177 }
1954 } 2178 }
1955 2179
1956 *map++ = (r ) 2180 *map++ = (r )
1957 | (g << 8) 2181 | (g << 8)
1958 | (b << 16) 2182 | (b << 16)
1959 | (a << 24); 2183 | (a << 24);
1960 } 2184 }
1961 } 2185 }
1962 2186
1963 RETVAL = map_sv; 2187 RETVAL = map_sv;
1964} 2188}
1965 OUTPUT: 2189 OUTPUT:
1966 RETVAL 2190 RETVAL
1967 2191
1968void 2192void
1969draw (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)
1970 CODE: 2194 CODE:
1971{ 2195{
1972 int x, y, z; 2196 int x, y, z;
1973 2197
1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2198 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1975 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
1976 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)
1977 smooth_key skey; 2201 smooth_key skey;
1978 int pl_x, pl_y; 2202 int pl_x, pl_y;
1979 maptex pl_tex; 2203 maptex pl_tex;
1980 rc_t *rc = rc_alloc (); 2204 rc_t *rc = rc_alloc ();
2205 rc_t *rc_ov = rc_alloc ();
1981 rc_key_t key; 2206 rc_key_t key;
1982 rc_array_t *arr; 2207 rc_array_t *arr;
1983 2208
1984 pl_tex.name = 0; 2209 pl_tex.name = 0;
1985 2210
1986 // thats current max. sorry. 2211 // that's current max. sorry.
1987 if (sw > 255) sw = 255; 2212 if (sw > 255) sw = 255;
1988 if (sh > 255) sh = 255; 2213 if (sh > 255) sh = 255;
1989 2214
1990 // clear key, in case of extra padding 2215 // clear key, in case of extra padding
1991 memset (&skey, 0, sizeof (skey)); 2216 memset (&skey, 0, sizeof (skey));
1995 key.g = 255; 2220 key.g = 255;
1996 key.b = 255; 2221 key.b = 255;
1997 key.a = 255; 2222 key.a = 255;
1998 key.mode = GL_QUADS; 2223 key.mode = GL_QUADS;
1999 key.format = GL_T2F_V3F; 2224 key.format = GL_T2F_V3F;
2000 key.texname = -1;
2001 2225
2002 mx += self->x; 2226 mx += self->x;
2003 my += self->y; 2227 my += self->y;
2004 2228
2005 // first pass: determine smooth_max 2229 // first pass: determine smooth_max
2029 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2253 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2030 2254
2031 for (z = 0; z <= 2; z++) 2255 for (z = 0; z <= 2; z++)
2032 { 2256 {
2033 memset (smooth_level, 0, sizeof (smooth_level)); 2257 memset (smooth_level, 0, sizeof (smooth_level));
2258 key.texname = -1;
2034 2259
2035 for (y = 0; y < sh; y++) 2260 for (y = 0; y < sh; y++)
2036 if (0 <= y + my && y + my < self->rows) 2261 if (0 <= y + my && y + my < self->rows)
2037 { 2262 {
2038 maprow *row = self->row + (y + my); 2263 maprow *row = self->row + (y + my);
2044 tileid tile = cell->tile [z]; 2269 tileid tile = cell->tile [z];
2045 2270
2046 if (tile) 2271 if (tile)
2047 { 2272 {
2048 maptex tex = self->tex [tile]; 2273 maptex tex = self->tex [tile];
2049 int px = (x + 1) * T - tex.w; 2274 int px, py;
2050 int py = (y + 1) * T - tex.h;
2051 2275
2052 if (key.texname != tex.name) 2276 if (key.texname != tex.name)
2053 { 2277 {
2278 self->tex [tile].unused = 0;
2279
2054 if (!tex.name) 2280 if (!tex.name)
2055 tex = self->tex [2]; /* missing, replace by noface */ 2281 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2056 2282
2057 key.texname = tex.name; 2283 key.texname = tex.name;
2058 arr = rc_array (rc, &key); 2284 arr = rc_array (rc, &key);
2059 } 2285 }
2286
2287 px = (x + 1) * Th - tex.w;
2288 py = (y + 1) * Tw - tex.h;
2060 2289
2061 if (expect_false (cell->player == player) && expect_false (z == 2)) 2290 if (expect_false (cell->player == player) && expect_false (z == 2))
2062 { 2291 {
2063 pl_x = px; 2292 pl_x = px;
2064 pl_y = py; 2293 pl_y = py;
2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2298 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2070 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);
2071 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);
2072 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);
2073 2302
2074 if (expect_false (cell->flags) && expect_false (z == 2))
2075 {
2076 // overlays such as the speech bubble, probably more to come
2077 if (cell->flags & 1)
2078 {
2079 maptex tex = self->tex [1];
2080 int px = x * T + T * 2 / 32;
2081 int py = y * T - T * 6 / 32;
2082
2083 if (tex.name)
2084 {
2085 if (key.texname != tex.name)
2086 {
2087 key.texname = tex.name;
2088 arr = rc_array (rc, &key);
2089 }
2090
2091 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2092 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2093 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2094 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2095 }
2096 }
2097 }
2098
2099 // update smooth hash 2303 // update smooth hash
2100 if (tex.smoothtile) 2304 if (tex.smoothtile)
2101 { 2305 {
2102 skey.tile = tex.smoothtile; 2306 skey.tile = tex.smoothtile;
2103 skey.level = tex.smoothlevel; 2307 skey.level = tex.smoothlevel;
2131 // corners 2335 // corners
2132 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);
2133 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);
2134 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);
2135 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);
2136 } 2361 }
2137 } 2362 }
2138 } 2363 }
2139 } 2364 }
2140 2365
2167 if (!(bits & 0x1000) 2392 if (!(bits & 0x1000)
2168 && skey->level == level 2393 && skey->level == level
2169 && level > smooth_max [skey->x][skey->y]) 2394 && level > smooth_max [skey->x][skey->y])
2170 { 2395 {
2171 maptex tex = self->tex [skey->tile]; 2396 maptex tex = self->tex [skey->tile];
2172 int px = (((int)skey->x) - 1) * T; 2397 int px = (((int)skey->x) - 1) * Tw;
2173 int py = (((int)skey->y) - 1) * T; 2398 int py = (((int)skey->y) - 1) * Th;
2174 int border = bits & 15; 2399 int border = bits & 15;
2175 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2176 float dx = tex.s * .0625f; // 16 images/row 2401 float dx = tex.s * .0625f; // 16 images/row
2177 float dy = tex.t * .5f ; // 2 images/column 2402 float dy = tex.t * .5f ; // 2 images/column
2178 2403
2180 { 2405 {
2181 // this time avoiding texture state changes 2406 // this time avoiding texture state changes
2182 // save gobs of state changes. 2407 // save gobs of state changes.
2183 if (key.texname != tex.name) 2408 if (key.texname != tex.name)
2184 { 2409 {
2410 self->tex [skey->tile].unused = 0;
2411
2185 glEnd (); 2412 glEnd ();
2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2187 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2188 } 2415 }
2189 2416
2190 if (border) 2417 if (border)
2191 { 2418 {
2192 float ox = border * dx; 2419 float ox = border * dx;
2193 2420
2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2198 } 2425 }
2199 2426
2200 if (corner) 2427 if (corner)
2201 { 2428 {
2202 float ox = corner * dx; 2429 float ox = corner * dx;
2203 2430
2204 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2208 } 2435 }
2209 } 2436 }
2210 } 2437 }
2211 } 2438 }
2212 } 2439 }
2235 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);
2236 2463
2237 rc_draw (rc); 2464 rc_draw (rc);
2238 } 2465 }
2239 2466
2467 rc_draw (rc_ov);
2468 rc_clear (rc_ov);
2469
2240 glDisable (GL_BLEND); 2470 glDisable (GL_BLEND);
2241 rc_free (rc); 2471 rc_free (rc);
2472 rc_free (rc_ov);
2242 2473
2243 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2244 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2245 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2246 { 2477 {
2249 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2250 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2251 { 2482 {
2252 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2253 2484
2254 int px = x * T; 2485 int px = x * Tw;
2255 int py = y * T; 2486 int py = y * Th;
2487
2488 if (expect_false (cell->player == player))
2489 {
2490 px += sdx;
2491 py += sdy;
2492 }
2256 2493
2257 if (cell->stat_hp) 2494 if (cell->stat_hp)
2258 { 2495 {
2259 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2260 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2261 2498
2262 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2263 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2264 px + width - 1, py); 2501 px + width - 1, py);
2265 2502
2271 } 2508 }
2272 } 2509 }
2273} 2510}
2274 2511
2275void 2512void
2276draw_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)
2277 CODE: 2514 CODE:
2278{ 2515{
2279 static float color[16][3] = { 2516 static float color[16][3] = {
2280 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2281 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2282 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2283 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2284 2521
2285 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2286 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2287 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2288 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2289 2526
2290 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2291 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2292 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2293 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2294 2531
2295 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2296 2533
2297 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2298 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2299 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2300 }; 2537 };
2301 2538
2302 int x, y; 2539 int x, y;
2303 2540
2304 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 */
2305 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2306 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2307 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2308 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2309 2552
2310 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2314 2557
2315 if (m) 2558 if (m)
2316 { 2559 {
2317 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2318 2561
2319 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2320 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2321 2564
2322 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2323 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2324 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2325 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2326 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2327 } 2570 }
2335void 2578void
2336fow_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)
2337 PPCODE: 2580 PPCODE:
2338{ 2581{
2339 int x, y; 2582 int x, y;
2340 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2341 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2342 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2343 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);
2344 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2345 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2346 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2347 2591
2348 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2349 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2350 2594
2351 mx += self->x - 1; 2595 mx += self->x - 1;
2352 my += self->y - 1; 2596 my += self->y - 1;
2353
2354 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2355 2597
2356 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2357 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2358 { 2600 {
2359 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2362 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2363 { 2605 {
2364 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2365 2607
2366 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2367 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2368 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2369 } 2611 }
2370 } 2612 }
2371 2613
2372 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2373 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2392 2634
2393 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2394 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2395 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2396 2638
2397 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2398 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2399 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2400 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2401 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 */
2402 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2403 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2404 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2405 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2406 } 2648 }
2407 2649
2408 free (darkness1); 2650 free (darkness1);
2409 2651
2410 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2411 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2412 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2413 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2414} 2656}
2415 2657
2416SV * 2658SV *
2479 else 2721 else
2480 *data++ = 0; 2722 *data++ = 0;
2481 } 2723 }
2482 } 2724 }
2483 2725
2484 /* 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 */
2485 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2486 { 2728 {
2487 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2488 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2489 } 2731 }
2490 2732
2491 RETVAL = data_sv; 2733 RETVAL = data_sv;
2492} 2734}
2493 OUTPUT: 2735 OUTPUT:
2494 RETVAL 2736 RETVAL
2495 2737
2496void 2738void
2503 STRLEN len; 2745 STRLEN len;
2504 uint8_t *data, *end; 2746 uint8_t *data, *end;
2505 2747
2506 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2507 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2508 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2509 end = data + len + 8; 2751 end = data + len + 8;
2510 2752
2511 if (len < 5) 2753 if (len < 5)
2512 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2513 2755
2574} 2816}
2575 2817
2576MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2577 2819
2578DC::RW 2820DC::RW
2579new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2580 CODE: 2822 CODE:
2581{ 2823{
2582 STRLEN datalen; 2824 STRLEN datalen;
2583 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2584 2826
2586} 2828}
2587 OUTPUT: 2829 OUTPUT:
2588 RETVAL 2830 RETVAL
2589 2831
2590DC::RW 2832DC::RW
2591new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2592 CODE: 2834 CODE:
2593 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2594 OUTPUT: 2836 OUTPUT:
2595 RETVAL 2837 RETVAL
2596 2838
2614 if (RETVAL < 0) 2856 if (RETVAL < 0)
2615 { 2857 {
2616 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2617 2859
2618 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)
2619 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2620 2867 }
2868 else
2621 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2622 } 2870 }
2623 2871
2624 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2625 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2626} 2874}
2673void 2921void
2674set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2675 CODE: 2923 CODE:
2676{ 2924{
2677 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));
2678 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;
2679 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2680} 2928}
2681 2929
2682void 2930void
2683set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2686 2934
2687MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2688 2936
2689PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2690 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
2691DC::MixChunk 2951DC::MixChunk
2692new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2693 CODE: 2953 CODE:
2694 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2695 OUTPUT: 2955 OUTPUT:
2696 RETVAL 2956 RETVAL
2697 2957
2727 OUTPUT: 2987 OUTPUT:
2728 RETVAL 2988 RETVAL
2729 2989
2730MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2731 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
2732int 3004int
2733volume (int volume = -1) 3005volume (int volume = -1)
2734 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2735 CODE: 3007 CODE:
2736 if (items > 0) 3008 if (items > 0)
2747void 3019void
2748halt () 3020halt ()
2749 CODE: 3021 CODE:
2750 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2751 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2752DC::MixMusic 3031DC::MixMusic
2753new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2754 CODE: 3033 CODE:
2755 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2756 OUTPUT: 3035 OUTPUT:
2757 RETVAL 3036 RETVAL
2758 3037
2786 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2787# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2788 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2789 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2790 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2791 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2792 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2793 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2794 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2795 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2807 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2808 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2809 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2810 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2811 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),
2812 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2813 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2814 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2815 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2816 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2884 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2885 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2886 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2887 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2888 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),
2889# undef const_iv 3176# undef const_iv
2890 }; 3177 };
2891 3178
2892 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--)
2893 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2894 3181
2895 texture_av = newAV (); 3182 texture_av = newAV ();
2896 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2897} 3184}
2898 3185
2900disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2901 CODE: 3188 CODE:
2902 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2903 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2904 3191
2905char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2906gl_vendor () 3196gl_vendor ()
2907 CODE: 3197 CODE:
2908 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2909 OUTPUT: 3199 OUTPUT:
2910 RETVAL 3200 RETVAL
2911 3201
2912char * 3202const char *
2913gl_version () 3203gl_version ()
2914 CODE: 3204 CODE:
2915 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2916 OUTPUT: 3206 OUTPUT:
2917 RETVAL 3207 RETVAL
2918 3208
2919char * 3209const char *
2920gl_extensions () 3210gl_extensions ()
2921 CODE: 3211 CODE:
2922 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2923 OUTPUT: 3213 OUTPUT:
2924 RETVAL 3214 RETVAL
2925 3215
2926const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2927 3221
2928GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2929 CODE: 3223 CODE:
2930 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2931 OUTPUT: 3225 OUTPUT:
2939 3233
2940int glGetError () 3234int glGetError ()
2941 3235
2942void glFinish () 3236void glFinish ()
2943 3237
3238void glFlush ()
3239
2944void glClear (int mask) 3240void glClear (int mask)
2945 3241
2946void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2947 PROTOTYPE: @ 3243 PROTOTYPE: @
2948 3244
2957void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2958 3254
2959void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2960 CODE: 3256 CODE:
2961 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2962 3260
2963void glDepthMask (int flag) 3261void glDepthMask (int flag)
2964 3262
2965void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2966 3264
3117 3415
3118void glEndList () 3416void glEndList ()
3119 3417
3120void glCallList (int list) 3418void glCallList (int list)
3121 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3122MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3123 3426
3124PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3125 3428
3126void 3429void
3127find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3128 PPCODE: 3431 PPCODE:
3129{ 3432{
3130 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3131 XPUSHs (self); 3434 XPUSHs (self);
3132} 3435}
3133 3436
3134BOOT: 3437BOOT:
3135{ 3438{
3143 3446
3144void 3447void
3145draw (SV *self) 3448draw (SV *self)
3146 CODE: 3449 CODE:
3147{ 3450{
3148 HV *hv; 3451 HV *hv;
3149 SV **svp; 3452 SV **svp;
3150 NV x, y, w, h; 3453 NV x, y, w, h;
3151 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3152 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3153 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3154 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