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.276 by root, Sat Aug 30 08:04:01 2008 UTC vs.
Revision 1.322 by root, Sun Nov 18 01:43:12 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
34 37
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 39
37#include <SDL.h> 40#include <SDL.h>
38#include <SDL_thread.h> 41#include <SDL_thread.h>
42#include <SDL_opengl.h> 45#include <SDL_opengl.h>
43 46
44/* work around os x broken headers */ 47/* work around os x broken headers */
45#ifdef __MACOSX__ 48#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 49typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
50typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
51typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 52#endif
48 53
49#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
51 56
52#include <glib/gmacros.h> 57#include <glib.h>
53 58
54#include <pango/pango.h> 59#include <pango/pango.h>
55 60
56#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
81#define expect_false(expr) expect ((expr) != 0, 0) 86#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 87#define expect_true(expr) expect ((expr) != 0, 1)
83 88
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 90
91/* this is used as fow flag as well, so has to have a different value */
92/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
87 95
88#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
90 98
91#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
92 100
93/* mask out modifiers we are not interested in */ 101/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95 103
96#define KMOD_LRAM 0x10000 // our extension 104#define KMOD_LRAM 0x10000 // our extension
105
106#define TEXID_SPEECH 1
107#define TEXID_NOFACE 2
108
109static char *
110fast_sv_grow (SV *sv, STRLEN need)
111{
112 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need;
114
115 if (expect_false (len < want))
116 {
117 do
118 len *= 2;
119 while (len < want);
120
121 sv_grow (sv, len);
122 }
123
124 SvCUR_set (sv, want);
125 return SvEND (sv) - need;
126}
97 127
98static AV *texture_av; 128static AV *texture_av;
99 129
100static struct 130static struct
101{ 131{
158{ 188{
159 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
160 190
161 while (attrs) 191 while (attrs)
162 { 192 {
163 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
164 194
165 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
166 return 1; 196 return 1;
167 197
168 attrs = attrs->next; 198 attrs = attrs->next;
186static void 216static void
187substitute_func (FcPattern *pattern, gpointer data) 217substitute_func (FcPattern *pattern, gpointer data)
188{ 218{
189 FcPatternAddBool (pattern, FC_HINTING, 1); 219 FcPatternAddBool (pattern, FC_HINTING, 1);
190#ifdef FC_HINT_STYLE 220#ifdef FC_HINT_STYLE
191 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 221 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
192#endif 222#endif
193 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 223 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
194} 224}
195 225
196static void 226static void
233 int w, h; 263 int w, h;
234 float s, t; 264 float s, t;
235 uint8_t r, g, b, a; 265 uint8_t r, g, b, a;
236 tileid smoothtile; 266 tileid smoothtile;
237 uint8_t smoothlevel; 267 uint8_t smoothlevel;
268 uint8_t unused; /* set to zero on use */
238} maptex; 269} maptex;
239 270
240typedef struct { 271typedef struct {
241 uint32_t player; 272 uint32_t player;
242 tileid tile[3]; 273 tileid tile[3];
412 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
413 } 444 }
414 } 445 }
415} 446}
416 447
417typedef struct { 448struct smooth_key
449{
418 tileid tile; 450 tileid tile;
419 uint8_t x, y, level; 451 uint8_t x, y, level;
420} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
421 471
422static void 472static void
423smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
424{ 474{
425 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
426 476
427 if (SvIOK (*sv)) 477 if (it == h.end ())
428 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
429 else 479 else
430 sv_setiv (*sv, bits); 480 it->second |= bits;
431} 481}
432 482
433static void 483static void
434music_finished (void) 484music_finished (void)
435{ 485{
452 ev.code = 1; 502 ev.code = 1;
453 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
454 ev.data2 = 0; 504 ev.data2 = 0;
455 505
456 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
457} 514}
458 515
459static unsigned int 516static unsigned int
460minpot (unsigned int n) 517minpot (unsigned int n)
461{ 518{
529 return 0; 586 return 0;
530 587
531 return 1; 588 return 1;
532} 589}
533 590
591/******************************************************************************/
592
534/* process keyboard modifiers */ 593/* process keyboard modifiers */
535static int 594static int
536mod_munge (int mod) 595mod_munge (int mod)
537{ 596{
538 mod &= MOD_MASK; 597 mod &= MOD_MASK;
542 601
543 return mod; 602 return mod;
544} 603}
545 604
546static void 605static void
547deliantra_main () 606deliantra_main (SV *real_main)
548{ 607{
549 char *argv[] = { 0 }; 608 dSP;
550 call_argv ("::main", G_DISCARD | G_VOID, argv); 609
610 PUSHMARK (SP);
611 call_sv (real_main, G_DISCARD | G_VOID);
551} 612}
552 613
553#ifdef __MACOSX__ 614#ifdef __MACOSX__
615 static SV *real_main;
616
554 /* to due surprising braindamage on the side of SDL design, we 617 /* to due surprising braindamage on the side of SDL design, we
555 * do some mind-boggling hack here: SDL requires a custom main() 618 * do some mind-boggling hack here: SDL requires a custom main()
556 * on OS X, so... we provide one and call the original main(), which, 619 * on OS X, so... we provide one and call the original main(), which,
557 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 620 * due to shared library magic, calls -lSDLmain's main, not perl's main,
558 * and which calls our main (== SDL_main) back. 621 * and which calls our main (== SDL_main) back.
559 */ 622 */
560 extern C_LINKAGE int 623 extern C_LINKAGE int
561 main (int argc, char *argv[]) 624 main (int argc, char *argv[])
562 { 625 {
563 deliantra_main (); 626 deliantra_main (real_main);
564 } 627 }
565 628
566 #undef main 629 #undef main
567 630
568 extern C_LINKAGE int main (int argc, char *argv[]); 631 extern C_LINKAGE int main (int argc, char *argv[]);
569 632
570 static void 633 static void
571 SDL_braino (void) 634 SDL_main_hack (SV *real_main_)
572 { 635 {
636 real_main = real_main_;
637
573 char *argv[] = { "deliantra client", 0 }; 638 char *argv[] = { "deliantra client", 0 };
574 (main) (1, argv); 639 (main) (1, argv);
575 } 640 }
576#else 641#else
577 static void 642 static void
578 SDL_braino (void) 643 SDL_main_hack (SV *real_main)
579 { 644 {
580 deliantra_main (); 645 deliantra_main (real_main);
581 } 646 }
582#endif 647#endif
583 648
584MODULE = Deliantra::Client PACKAGE = DC 649MODULE = Deliantra::Client PACKAGE = DC
585 650
786 851
787 const_iv (FOW_DARKNESS) 852 const_iv (FOW_DARKNESS)
788# undef const_iv 853# undef const_iv
789 }; 854 };
790 855
791 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 856 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
792 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
793 858
794 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
795 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
796} 861}
797 862
813NV ceil (NV x) 878NV ceil (NV x)
814 879
815IV minpot (UV n) 880IV minpot (UV n)
816 881
817IV popcount (UV n) 882IV popcount (UV n)
883
884NV distance (NV dx, NV dy)
885 CODE:
886 RETVAL = pow (dx * dx + dy * dy, 0.5);
887 OUTPUT:
888 RETVAL
818 889
819void 890void
820pango_init () 891pango_init ()
821 CODE: 892 CODE:
822{ 893{
830#endif 901#endif
831} 902}
832 903
833char *SDL_GetError () 904char *SDL_GetError ()
834 905
835void SDL_braino () 906void SDL_main_hack (SV *real_main)
907 PROTOTYPE: &
836 908
837int SDL_Init (U32 flags) 909int SDL_Init (U32 flags)
838 910
839int SDL_InitSubSystem (U32 flags) 911int SDL_InitSubSystem (U32 flags)
840 912
841void SDL_QuitSubSystem (U32 flags) 913void SDL_QuitSubSystem (U32 flags)
842 914
843void SDL_Quit () 915void SDL_Quit ()
844 916
845int SDL_GL_SetAttribute (int attr, int value) 917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
846 919
847int SDL_GL_GetAttribute (int attr) 920int SDL_GL_GetAttribute (int attr)
848 CODE: 921 CODE:
849 if (SDL_GL_GetAttribute (attr, &RETVAL)) 922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
850 XSRETURN_UNDEF; 923 XSRETURN_UNDEF;
851 OUTPUT: 924 OUTPUT:
852 RETVAL 925 RETVAL
853 926
854void 927void
909 ); 982 );
910 983
911 if (RETVAL) 984 if (RETVAL)
912 { 985 {
913 av_clear (texture_av); 986 av_clear (texture_av);
914
915 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
916#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 987#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
917#include "glfunc.h" 988#include "glfunc.h"
918#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
919 } 992 }
920} 993}
921 OUTPUT: 994 OUTPUT:
922 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
923 999
924void 1000void
925SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
926 1002
927char * 1003char *
928SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
929 1006
930int 1007int
931SDL_GetAppState () 1008SDL_GetAppState ()
932 1009
933int 1010int
934SDL_GetModState () 1011SDL_GetModState ()
935 1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
936void 1017void
1018SDL_PumpEvents ()
1019
1020void
937poll_events () 1021peep_events ()
938 PPCODE: 1022 PPCODE:
939{ 1023{
940 SDL_Event ev; 1024 SDL_Event ev;
941 1025
942 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
1008 1092
1009 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1093 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1010 } 1094 }
1011} 1095}
1012 1096
1097char *
1098SDL_AudioDriverName ()
1099 CODE:
1100{
1101 char buf [256];
1102 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1103 XSRETURN_UNDEF;
1104
1105 RETVAL = buf;
1106}
1107 OUTPUT:
1108 RETVAL
1109
1013int 1110int
1014Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1111Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1015 POSTCALL: 1112 POSTCALL:
1016 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
1017 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
1018 1115
1019void 1116void
1020Mix_QuerySpec () 1117Mix_QuerySpec ()
1079add_font (char *file) 1176add_font (char *file)
1080 CODE: 1177 CODE:
1081 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082 OUTPUT: 1179 OUTPUT:
1083 RETVAL 1180 RETVAL
1181
1182void
1183IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1184
1185# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1186void
1187Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1084 1188
1085void 1189void
1086load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
1087 ALIAS: 1191 ALIAS:
1088 load_image_file = 1 1192 load_image_file = 1
1134 1238
1135 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
1136 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
1137 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
1138 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
1139 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1140 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1244 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1141 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1142 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1143 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
1144 1248
1204#if DEBUG 1308#if DEBUG
1205 VALGRIND_DO_LEAK_CHECK; 1309 VALGRIND_DO_LEAK_CHECK;
1206#endif 1310#endif
1207} 1311}
1208 1312
1313int
1314SvREFCNT (SV *sv)
1315 CODE:
1316 RETVAL = SvREFCNT (sv);
1317 OUTPUT:
1318 RETVAL
1319
1209MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1210 1321
1211PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1212 1323
1213DC::Font 1324DC::Font
1214new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1215 CODE: 1326 CODE:
1216{ 1327{
1217 int count; 1328 int count;
1218 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1219 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1248 PROTOTYPE: 1359 PROTOTYPE:
1249 CODE: 1360 CODE:
1250 tc_restore (); 1361 tc_restore ();
1251 1362
1252DC::Layout 1363DC::Layout
1253new (SV *class) 1364new (SV *klass)
1254 CODE: 1365 CODE:
1255 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1256 1367
1257 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1258 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1407 1518
1408void 1519void
1409set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1410 CODE: 1521 CODE:
1411 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1412 { 1523 {
1413 self->base_height = base_height; 1524 self->base_height = base_height;
1414 layout_update_font (self); 1525 layout_update_font (self);
1415 } 1526 }
1416 1527
1417void 1528void
1644 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1645 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1646 } 1757 }
1647} 1758}
1648 1759
1760void
1761draw_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)
1762 PROTOTYPE: @
1763 CODE:
1764{
1765 glEnable (GL_BLEND);
1766 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1767 glEnable (GL_TEXTURE_2D);
1768 glBindTexture (GL_TEXTURE_2D, name1);
1769
1770 glColor3f (intensity, intensity, intensity);
1771 glPushMatrix ();
1772 glScalef (1./3, 1./3, 1.);
1773
1774 if (blend > 0.f)
1775 {
1776 float dx3 = dx * -3.f / w;
1777 float dy3 = dy * -3.f / h;
1778 GLfloat env_color[4] = { 0., 0., 0., blend };
1779
1780 /* interpolate the two shadow textures */
1781 /* stage 0 == rgb(glcolor) + alpha(t0) */
1782 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1783
1784 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1785 gl.ActiveTexture (GL_TEXTURE1);
1786 glEnable (GL_TEXTURE_2D);
1787 glBindTexture (GL_TEXTURE_2D, name2);
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1789
1790 /* rgb == rgb(glcolor) */
1791 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1792 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1793 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1794
1795 /* alpha = interpolate t0, t1 by env_alpha */
1796 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1797
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1807
1808 glBegin (GL_QUADS);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1810 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1813 glEnd ();
1814
1815 glDisable (GL_TEXTURE_2D);
1816 gl.ActiveTexture (GL_TEXTURE0);
1817 }
1818 else
1819 {
1820 /* simple blending of one texture, also opengl <1.3 path */
1821 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1822
1823 glBegin (GL_QUADS);
1824 glTexCoord2f (0, 0); glVertex2f (0, 0);
1825 glTexCoord2f (0, t); glVertex2f (0, h);
1826 glTexCoord2f (s, t); glVertex2f (w, h);
1827 glTexCoord2f (s, 0); glVertex2f (w, 0);
1828 glEnd ();
1829 }
1830
1831 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1832 {
1833 int x, y;
1834 int dx3 = dx * 3;
1835 int dy3 = dy * 3;
1836
1837 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1838 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1839 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1840 glTranslatef (-1., -1., 0);
1841 glBegin (GL_QUADS);
1842
1843 for (y = 1; y < h; y += 3)
1844 {
1845 int y1 = y - dy3;
1846 int y1valid = y1 >= 0 && y1 < h;
1847
1848 for (x = 1; x < w; x += 3)
1849 {
1850 int x1 = x - dx3;
1851 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1852 uint8_t h2;
1853
1854 if (y1valid && x1 >= 0 && x1 < w)
1855 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1856 else
1857 h2 = 1; /* out of range == invisible */
1858
1859 if (h1 || h2)
1860 {
1861 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1862 glColor4f (1., 1., 1., alpha);
1863
1864 glTexCoord2f (0, 0.); glVertex2i (x , y );
1865 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1866 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1867 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1868 }
1869 }
1870 }
1871 }
1872
1873 glEnd ();
1874
1875 glPopMatrix ();
1876
1877 glDisable (GL_TEXTURE_2D);
1878 glDisable (GL_BLEND);
1879}
1880
1649IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1881IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1650 CODE: 1882 CODE:
1651{ 1883{
1652 GLint width; 1884 GLint width;
1653 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1885 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1660MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1661 1893
1662PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1663 1895
1664DC::Map 1896DC::Map
1665new (SV *class) 1897new (SV *klass)
1666 CODE: 1898 CODE:
1667 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1668 RETVAL->x = 0; 1900 RETVAL->x = 0;
1669 RETVAL->y = 0; 1901 RETVAL->y = 0;
1670 RETVAL->w = 0; 1902 RETVAL->w = 0;
1709 1941
1710void 1942void
1711set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1712 CODE: 1944 CODE:
1713{ 1945{
1714 tileid texid; 1946 tileid texid;
1715 maptex *tex; 1947 maptex *tex;
1716 1948
1717 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1718 return; 1950 return;
1719 1951
1720 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1721 return; 1953 return;
1722 1954
1723 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1724 1956
1725 if (!texid) 1957 if (!texid)
1726 return; 1958 return;
1727 1959
1728 tex = self->tex + texid; 1960 tex = self->tex + texid;
1757 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1989 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1758 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1759 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1760 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1761} 1993}
1994
1995void
1996expire_textures (DC::Map self, int texid, int count)
1997 PPCODE:
1998 for (; texid < self->texs && count; ++texid, --count)
1999 {
2000 maptex *tex = self->tex + texid;
2001
2002 if (tex->name)
2003 {
2004 if (tex->unused)
2005 {
2006 tex->name = 0;
2007 tex->unused = 0;
2008 XPUSHs (sv_2mortal (newSViv (texid)));
2009 }
2010 else
2011 tex->unused = 1;
2012 }
2013 }
1762 2014
1763int 2015int
1764ox (DC::Map self) 2016ox (DC::Map self)
1765 ALIAS: 2017 ALIAS:
1766 oy = 1 2018 oy = 1
1806 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1807 } 2059 }
1808} 2060}
1809 2061
1810SV * 2062SV *
1811map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1812 CODE: 2064 CODE:
1813{ 2065{
1814 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1815 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1816 mapcell *cell; 2068 mapcell *cell;
1837 2089
1838 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1839 2091
1840 if (flags & 8) 2092 if (flags & 8)
1841 { 2093 {
2094 uint8_t ext, cmd;
2095
1842 if (extmap) 2096 do
1843 { 2097 {
1844 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1845 2100
1846 do 2101 if (cmd < 4)
2102 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2103 else if (cmd == 5) // health
1847 { 2104 {
1848 ext = *data++;
1849 cmd = ext & 0x7f;
1850
1851 if (cmd < 4)
1852 cell->darkness = 255 - ext * 64 + 1;
1853 else if (cmd == 5) // health
1854 {
1855 cell->stat_width = 1; 2105 cell->stat_width = 1;
1856 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1857 }
1858 else if (cmd == 6) // monster width
1859 cell->stat_width = *data++ + 1;
1860 else if (cmd == 0x47)
1861 {
1862 if (*data == 1) cell->player = data [1];
1863 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1864 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1865 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1866
1867 data += *data + 1;
1868 }
1869 else if (cmd == 8) // cell flags
1870 cell->flags = *data++;
1871 else if (ext & 0x40) // unknown, multibyte => skip
1872 data += *data + 1;
1873 else
1874 data++;
1875 } 2107 }
1876 while (ext & 0x80); 2108 else if (cmd == 6) // monster width
2109 cell->stat_width = *data++ + 1;
2110 else if (cmd == 0x47)
2111 {
2112 if (*data == 1) cell->player = data [1];
2113 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2114 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2115 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2116
2117 data += *data + 1;
2118 }
2119 else if (cmd == 8) // cell flags
2120 cell->flags = *data++;
2121 else if (ext & 0x40) // unknown, multibyte => skip
2122 data += *data + 1;
2123 else
2124 data++;
1877 } 2125 }
1878 else 2126 while (ext & 0x80);
1879 cell->darkness = *data++ + 1;
1880 } 2127 }
1881 2128
1882 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1883 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1884 { 2131 {
1887 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1888 2135
1889 if (cell->tile [z]) 2136 if (cell->tile [z])
1890 { 2137 {
1891 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1892 if (!tex->name) 2140 if (!tex->name)
1893 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1894 2142
1895 if (tex->smoothtile) 2143 if (tex->smoothtile)
1896 { 2144 {
1897 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1898 if (!smooth->name) 2147 if (!smooth->name)
1899 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1900 } 2149 }
1901 } 2150 }
1902 } 2151 }
1930 ? self->row + y 2179 ? self->row + y
1931 : 0; 2180 : 0;
1932 2181
1933 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1934 { 2183 {
1935 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1936 2185
1937 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1938 { 2187 {
1939 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1940 2189
1942 { 2191 {
1943 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1944 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1945 int a1 = tex.a; 2194 int a1 = tex.a;
1946 2195
1947 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1948 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1949 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1950 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1951 } 2200 }
1952 } 2201 }
1953 2202
1954 *map++ = (r ) 2203 *map++ = (r )
1955 | (g << 8) 2204 | (g << 8)
1956 | (b << 16) 2205 | (b << 16)
1957 | (a << 24); 2206 | (a << 24);
1958 } 2207 }
1959 } 2208 }
1960 2209
1961 RETVAL = map_sv; 2210 RETVAL = map_sv;
1962} 2211}
1963 OUTPUT: 2212 OUTPUT:
1964 RETVAL 2213 RETVAL
1965 2214
1966void 2215void
1967draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2216draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1968 CODE: 2217 CODE:
1969{ 2218{
1970 int x, y, z; 2219 int x, y, z;
1971 2220
1972 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1973 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2221 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1974 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2222 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1975 smooth_key skey; 2223 smooth_key skey;
1976 int pl_x, pl_y; 2224 int pl_x, pl_y;
1977 maptex pl_tex; 2225 maptex pl_tex;
1978 rc_t *rc = rc_alloc (); 2226 rc_t *rc = rc_alloc ();
2227 rc_t *rc_ov = rc_alloc ();
1979 rc_key_t key; 2228 rc_key_t key;
1980 rc_array_t *arr; 2229 rc_array_t *arr;
1981 2230
1982 pl_tex.name = 0; 2231 pl_tex.name = 0;
1983 2232
1984 // thats current max. sorry. 2233 // that's current max. sorry.
1985 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1986 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1987 2236
1988 // clear key, in case of extra padding 2237 // clear key, in case of extra padding
1989 memset (&skey, 0, sizeof (skey)); 2238 memset (&skey, 0, sizeof (skey));
1993 key.g = 255; 2242 key.g = 255;
1994 key.b = 255; 2243 key.b = 255;
1995 key.a = 255; 2244 key.a = 255;
1996 key.mode = GL_QUADS; 2245 key.mode = GL_QUADS;
1997 key.format = GL_T2F_V3F; 2246 key.format = GL_T2F_V3F;
1998 key.texname = -1;
1999 2247
2000 mx += self->x; 2248 mx += self->x;
2001 my += self->y; 2249 my += self->y;
2002 2250
2003 // first pass: determine smooth_max 2251 // first pass: determine smooth_max
2026 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2027 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2028 2276
2029 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
2030 { 2278 {
2279 smooth_hash smooth;
2031 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2281 key.texname = -1;
2032 2282
2033 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
2034 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
2035 { 2285 {
2036 maprow *row = self->row + (y + my); 2286 maprow *row = self->row + (y + my);
2042 tileid tile = cell->tile [z]; 2292 tileid tile = cell->tile [z];
2043 2293
2044 if (tile) 2294 if (tile)
2045 { 2295 {
2046 maptex tex = self->tex [tile]; 2296 maptex tex = self->tex [tile];
2047 int px = (x + 1) * T - tex.w; 2297 int px, py;
2048 int py = (y + 1) * T - tex.h;
2049 2298
2050 if (key.texname != tex.name) 2299 if (key.texname != tex.name)
2051 { 2300 {
2301 self->tex [tile].unused = 0;
2302
2052 if (!tex.name) 2303 if (!tex.name)
2053 tex = self->tex [2]; /* missing, replace by noface */ 2304 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2054 2305
2055 key.texname = tex.name; 2306 key.texname = tex.name;
2056 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
2057 } 2308 }
2309
2310 px = (x + 1) * Th - tex.w;
2311 py = (y + 1) * Tw - tex.h;
2058 2312
2059 if (expect_false (cell->player == player) && expect_false (z == 2)) 2313 if (expect_false (cell->player == player) && expect_false (z == 2))
2060 { 2314 {
2061 pl_x = px; 2315 pl_x = px;
2062 pl_y = py; 2316 pl_y = py;
2067 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2321 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2068 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2322 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2069 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2323 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2070 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2324 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2071 2325
2072 if (expect_false (cell->flags) && expect_false (z == 2))
2073 {
2074 // overlays such as the speech bubble, probably more to come
2075 if (cell->flags & 1)
2076 {
2077 maptex tex = self->tex [1];
2078 int px = x * T + T * 2 / 32;
2079 int py = y * T - T * 6 / 32;
2080
2081 if (tex.name)
2082 {
2083 if (key.texname != tex.name)
2084 {
2085 key.texname = tex.name;
2086 arr = rc_array (rc, &key);
2087 }
2088
2089 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2090 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2091 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2092 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2093 }
2094 }
2095 }
2096
2097 // update smooth hash 2326 // update smooth hash
2098 if (tex.smoothtile) 2327 if (tex.smoothtile)
2099 { 2328 {
2100 skey.tile = tex.smoothtile; 2329 skey.tile = tex.smoothtile;
2101 skey.level = tex.smoothlevel; 2330 skey.level = tex.smoothlevel;
2116 2345
2117 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2118 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
2119 2348
2120 // full tile 2349 // full tile
2121 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2350 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2122 2351
2123 // borders 2352 // borders
2124 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2353 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2125 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2354 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2126 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2355 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2127 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2356 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2128 2357
2129 // corners 2358 // corners
2130 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2359 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2131 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2360 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2132 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2361 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2133 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2362 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2363 }
2364 }
2365
2366 if (expect_false (z == 2) && expect_false (cell->flags))
2367 {
2368 // overlays such as the speech bubble, probably more to come
2369 if (cell->flags & 1)
2370 {
2371 rc_key_t key_ov = key;
2372 maptex tex = self->tex [TEXID_SPEECH];
2373 rc_array_t *arr;
2374 int px = x * Tw + Tw * 2 / 32;
2375 int py = y * Th - Th * 6 / 32;
2376
2377 key_ov.texname = tex.name;
2378 arr = rc_array (rc_ov, &key_ov);
2379
2380 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2381 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2382 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2383 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2134 } 2384 }
2135 } 2385 }
2136 } 2386 }
2137 } 2387 }
2138 2388
2154 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
2155 { 2405 {
2156 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
2157 HE *he; 2407 HE *he;
2158 2408
2159 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2160 while ((he = hv_iternext (smooth)))
2161 { 2410 {
2162 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
2163 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
2164 2413
2165 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
2166 && skey->level == level 2415 && skey.level == level
2167 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
2168 { 2417 {
2169 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
2170 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
2171 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
2172 int border = bits & 15; 2421 int border = bits & 15;
2173 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2174 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
2175 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
2176 2425
2178 { 2427 {
2179 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
2180 // save gobs of state changes. 2429 // save gobs of state changes.
2181 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
2182 { 2431 {
2432 self->tex [skey.tile].unused = 0;
2433
2183 glEnd (); 2434 glEnd ();
2184 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2185 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
2186 } 2437 }
2187 2438
2188 if (border) 2439 if (border)
2189 { 2440 {
2190 float ox = border * dx; 2441 float ox = border * dx;
2191 2442
2192 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2193 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2194 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2195 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2196 } 2447 }
2197 2448
2198 if (corner) 2449 if (corner)
2199 { 2450 {
2200 float ox = corner * dx; 2451 float ox = corner * dx;
2201 2452
2202 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2203 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2204 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2205 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2206 } 2457 }
2207 } 2458 }
2208 } 2459 }
2209 } 2460 }
2210 } 2461 }
2212 2463
2213 glEnd (); 2464 glEnd ();
2214 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
2215 key.texname = -1; 2466 key.texname = -1;
2216 } 2467 }
2217
2218 hv_clear (smooth);
2219 } 2468 }
2220 2469
2221 if (pl_tex.name) 2470 if (pl_tex.name)
2222 { 2471 {
2223 maptex tex = pl_tex; 2472 maptex tex = pl_tex;
2233 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2482 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2234 2483
2235 rc_draw (rc); 2484 rc_draw (rc);
2236 } 2485 }
2237 2486
2487 rc_draw (rc_ov);
2488 rc_clear (rc_ov);
2489
2238 glDisable (GL_BLEND); 2490 glDisable (GL_BLEND);
2239 rc_free (rc); 2491 rc_free (rc);
2492 rc_free (rc_ov);
2240 2493
2241 // top layer: overlays such as the health bar 2494 // top layer: overlays such as the health bar
2242 for (y = 0; y < sh; y++) 2495 for (y = 0; y < sh; y++)
2243 if (0 <= y + my && y + my < self->rows) 2496 if (0 <= y + my && y + my < self->rows)
2244 { 2497 {
2247 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2248 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2249 { 2502 {
2250 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2251 2504
2252 int px = x * T; 2505 int px = x * Tw;
2253 int py = y * T; 2506 int py = y * Th;
2507
2508 if (expect_false (cell->player == player))
2509 {
2510 px += sdx;
2511 py += sdy;
2512 }
2254 2513
2255 if (cell->stat_hp) 2514 if (cell->stat_hp)
2256 { 2515 {
2257 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2258 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2259 2518
2260 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2261 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2262 px + width - 1, py); 2521 px + width - 1, py);
2263 2522
2269 } 2528 }
2270 } 2529 }
2271} 2530}
2272 2531
2273void 2532void
2274draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2533draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2275 CODE: 2534 CODE:
2276{ 2535{
2277 static float color[16][3] = { 2536 static float color[16][3] = {
2278 { 0.00F, 0.00F, 0.00F }, 2537 { 0.00f, 0.00f, 0.00f },
2279 { 1.00F, 1.00F, 1.00F }, 2538 { 1.00f, 1.00f, 1.00f },
2280 { 0.00F, 0.00F, 0.55F }, 2539 { 0.00f, 0.00f, 0.55f },
2281 { 1.00F, 0.00F, 0.00F }, 2540 { 1.00f, 0.00f, 0.00f },
2282 2541
2283 { 1.00F, 0.54F, 0.00F }, 2542 { 1.00f, 0.54f, 0.00f },
2284 { 0.11F, 0.56F, 1.00F }, 2543 { 0.11f, 0.56f, 1.00f },
2285 { 0.93F, 0.46F, 0.00F }, 2544 { 0.93f, 0.46f, 0.00f },
2286 { 0.18F, 0.54F, 0.34F }, 2545 { 0.18f, 0.54f, 0.34f },
2287 2546
2288 { 0.56F, 0.73F, 0.56F }, 2547 { 0.56f, 0.73f, 0.56f },
2289 { 0.80F, 0.80F, 0.80F }, 2548 { 0.80f, 0.80f, 0.80f },
2290 { 0.55F, 0.41F, 0.13F }, 2549 { 0.55f, 0.41f, 0.13f },
2291 { 0.99F, 0.77F, 0.26F }, 2550 { 0.99f, 0.77f, 0.26f },
2292 2551
2293 { 0.74F, 0.65F, 0.41F }, 2552 { 0.74f, 0.65f, 0.41f },
2294 2553
2295 { 0.00F, 1.00F, 1.00F }, 2554 { 0.00f, 1.00f, 1.00f },
2296 { 1.00F, 0.00F, 1.00F }, 2555 { 1.00f, 0.00f, 1.00f },
2297 { 1.00F, 1.00F, 0.00F }, 2556 { 1.00f, 1.00f, 0.00f },
2298 }; 2557 };
2299 2558
2300 int x, y; 2559 int x, y;
2301 2560
2302 glEnable (GL_TEXTURE_2D); 2561 glEnable (GL_TEXTURE_2D);
2562 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2563 * but the nvidia driver (185.18.14) mishandles alpha textures
2564 * and takes the colour from god knows where instead of using
2565 * Cp. MODULATE results in the same colour, but slightly different
2566 * alpha, but atcually gives us the correct colour with nvidia.
2567 */
2303 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2568 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2304 glEnable (GL_BLEND); 2569 glEnable (GL_BLEND);
2305 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2570 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2306 glBegin (GL_QUADS); 2571 glBegin (GL_QUADS);
2307 2572
2308 for (y = 0; y < h; y++) 2573 for (y = 0; y < h; y++)
2312 2577
2313 if (m) 2578 if (m)
2314 { 2579 {
2315 float *c = color [m & 15]; 2580 float *c = color [m & 15];
2316 2581
2317 float tx1 = m & 0x40 ? 0.5 : 0.; 2582 float tx1 = m & 0x40 ? 0.5f : 0.f;
2318 float tx2 = tx1 + 0.5; 2583 float tx2 = tx1 + 0.5f;
2319 2584
2320 glColor4f (c[0], c[1], c[2], 0.75); 2585 glColor4f (c[0], c[1], c[2], 1);
2321 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2586 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2322 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2587 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2323 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2588 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2324 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2589 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2325 } 2590 }
2333void 2598void
2334fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2599fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2335 PPCODE: 2600 PPCODE:
2336{ 2601{
2337 int x, y; 2602 int x, y;
2338 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2339 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2340 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2341 int sw34 = (sw * 3 + 3) & ~3; 2606 int sw3 = sw * 3;
2607 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2608 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2342 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2343 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2610 memset (darkness1, 0, sw1*sh1);
2344 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2345 2611
2346 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2347 SvCUR_set (darkness3_sv, sw34 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2348 2614
2349 mx += self->x - 1; 2615 mx += self->x - 1;
2350 my += self->y - 1; 2616 my += self->y - 1;
2351
2352 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2353 2617
2354 for (y = 0; y < sh1; y++) 2618 for (y = 0; y < sh1; y++)
2355 if (0 <= y + my && y + my < self->rows) 2619 if (0 <= y + my && y + my < self->rows)
2356 { 2620 {
2357 maprow *row = self->row + (y + my); 2621 maprow *row = self->row + (y + my);
2360 if (row->c0 <= x + mx && x + mx < row->c1) 2624 if (row->c0 <= x + mx && x + mx < row->c1)
2361 { 2625 {
2362 mapcell *cell = row->col + (x + mx - row->c0); 2626 mapcell *cell = row->col + (x + mx - row->c0);
2363 2627
2364 darkness1 [y * sw1 + x] = cell->darkness 2628 darkness1 [y * sw1 + x] = cell->darkness
2365 ? 255 - (cell->darkness - 1) 2629 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2366 : 255 - FOW_DARKNESS; 2630 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2367 } 2631 }
2368 } 2632 }
2369 2633
2370 for (y = 0; y < sh; ++y) 2634 for (y = 0; y < sh; ++y)
2371 for (x = 0; x < sw; ++x) 2635 for (x = 0; x < sw; ++x)
2390 2654
2391 uint8_t r13 = (d13 + d23 + d12) / 3; 2655 uint8_t r13 = (d13 + d23 + d12) / 3;
2392 uint8_t r23 = d23; 2656 uint8_t r23 = d23;
2393 uint8_t r33 = (d23 + d33 + d32) / 3; 2657 uint8_t r33 = (d23 + d33 + d32) / 3;
2394 2658
2395 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2659 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2396 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2660 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2397 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2661 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2398 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2662 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2399 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2663 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2400 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2664 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2401 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2665 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2402 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2666 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2403 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2667 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2404 } 2668 }
2405 2669
2406 free (darkness1); 2670 free (darkness1);
2407 2671
2408 EXTEND (SP, 3); 2672 EXTEND (SP, 3);
2409 PUSHs (sv_2mortal (newSViv (sw34))); 2673 PUSHs (sv_2mortal (newSViv (sw3)));
2410 PUSHs (sv_2mortal (newSViv (sh3))); 2674 PUSHs (sv_2mortal (newSViv (sh3)));
2411 PUSHs (darkness3_sv); 2675 PUSHs (darkness3_sv);
2412} 2676}
2413 2677
2414SV * 2678SV *
2477 else 2741 else
2478 *data++ = 0; 2742 *data++ = 0;
2479 } 2743 }
2480 } 2744 }
2481 2745
2482 /* if size is w*h + 5 then no data has been found */ 2746 /* if size is w*h + 5 then no data has been found */
2483 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2747 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2484 { 2748 {
2485 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2486 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2487 } 2751 }
2488 2752
2489 RETVAL = data_sv; 2753 RETVAL = data_sv;
2490} 2754}
2491 OUTPUT: 2755 OUTPUT:
2492 RETVAL 2756 RETVAL
2493 2757
2494void 2758void
2501 STRLEN len; 2765 STRLEN len;
2502 uint8_t *data, *end; 2766 uint8_t *data, *end;
2503 2767
2504 len = SvLEN (data_sv); 2768 len = SvLEN (data_sv);
2505 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2769 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2506 data = SvPVbyte_nolen (data_sv); 2770 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2507 end = data + len + 8; 2771 end = data + len + 8;
2508 2772
2509 if (len < 5) 2773 if (len < 5)
2510 XSRETURN_EMPTY; 2774 XSRETURN_EMPTY;
2511 2775
2572} 2836}
2573 2837
2574MODULE = Deliantra::Client PACKAGE = DC::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2575 2839
2576DC::RW 2840DC::RW
2577new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2578 CODE: 2842 CODE:
2579{ 2843{
2580 STRLEN datalen; 2844 STRLEN datalen;
2581 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2582 2846
2584} 2848}
2585 OUTPUT: 2849 OUTPUT:
2586 RETVAL 2850 RETVAL
2587 2851
2588DC::RW 2852DC::RW
2589new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2590 CODE: 2854 CODE:
2591 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2592 OUTPUT: 2856 OUTPUT:
2593 RETVAL 2857 RETVAL
2594 2858
2612 if (RETVAL < 0) 2876 if (RETVAL < 0)
2613 { 2877 {
2614 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2615 2879
2616 if (RETVAL < 0) 2880 if (RETVAL < 0)
2881 {
2882 // happens sometimes, maybe it just stopped playing(?)
2883 RETVAL = Mix_GroupAvailable (-1);
2884
2885 if (RETVAL < 0)
2617 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2618 2887 }
2888 else
2619 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2620 } 2890 }
2621 2891
2622 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2623 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2624} 2894}
2671void 2941void
2672set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2942set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2673 CODE: 2943 CODE:
2674{ 2944{
2675 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2945 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2676 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2946 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2677 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2947 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2678} 2948}
2679 2949
2680void 2950void
2681set_reverse_stereo (DC::Channel self, int flip) 2951set_reverse_stereo (DC::Channel self, int flip)
2684 2954
2685MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2686 2956
2687PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2688 2958
2959void
2960decoders ()
2961 PPCODE:
2962#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2963 int i, num = Mix_GetNumChunkDecoders ();
2964 EXTEND (SP, num);
2965 for (i = 0; i < num; ++i)
2966 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2967#else
2968 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2969#endif
2970
2689DC::MixChunk 2971DC::MixChunk
2690new (SV *class, DC::RW rwops) 2972new (SV *klass, DC::RW rwops)
2691 CODE: 2973 CODE:
2692 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2693 OUTPUT: 2975 OUTPUT:
2694 RETVAL 2976 RETVAL
2695 2977
2725 OUTPUT: 3007 OUTPUT:
2726 RETVAL 3008 RETVAL
2727 3009
2728MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3010MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2729 3011
3012void
3013decoders ()
3014 PPCODE:
3015#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3016 int i, num = Mix_GetNumMusicDecoders ();
3017 EXTEND (SP, num);
3018 for (i = 0; i < num; ++i)
3019 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3020#else
3021 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3022#endif
3023
2730int 3024int
2731volume (int volume = -1) 3025volume (int volume = -1)
2732 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2733 CODE: 3027 CODE:
2734 if (items > 0) 3028 if (items > 0)
2745void 3039void
2746halt () 3040halt ()
2747 CODE: 3041 CODE:
2748 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2749 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2750DC::MixMusic 3051DC::MixMusic
2751new (SV *class, DC::RW rwops) 3052new (SV *klass, DC::RW rwops)
2752 CODE: 3053 CODE:
2753 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2754 OUTPUT: 3055 OUTPUT:
2755 RETVAL 3056 RETVAL
2756 3057
2784 } *civ, const_iv[] = { 3085 } *civ, const_iv[] = {
2785# define const_iv(name) { # name, (IV)name } 3086# define const_iv(name) { # name, (IV)name }
2786 const_iv (GL_VENDOR), 3087 const_iv (GL_VENDOR),
2787 const_iv (GL_VERSION), 3088 const_iv (GL_VERSION),
2788 const_iv (GL_EXTENSIONS), 3089 const_iv (GL_EXTENSIONS),
3090 const_iv (GL_MAX_TEXTURE_UNITS),
2789 const_iv (GL_COLOR_MATERIAL), 3091 const_iv (GL_COLOR_MATERIAL),
2790 const_iv (GL_SMOOTH), 3092 const_iv (GL_SMOOTH),
2791 const_iv (GL_FLAT), 3093 const_iv (GL_FLAT),
2792 const_iv (GL_DITHER), 3094 const_iv (GL_DITHER),
2793 const_iv (GL_BLEND), 3095 const_iv (GL_BLEND),
2805 const_iv (GL_ZERO), 3107 const_iv (GL_ZERO),
2806 const_iv (GL_SRC_ALPHA), 3108 const_iv (GL_SRC_ALPHA),
2807 const_iv (GL_DST_ALPHA), 3109 const_iv (GL_DST_ALPHA),
2808 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3110 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2809 const_iv (GL_ONE_MINUS_DST_ALPHA), 3111 const_iv (GL_ONE_MINUS_DST_ALPHA),
3112 const_iv (GL_SRC_COLOR),
3113 const_iv (GL_DST_COLOR),
3114 const_iv (GL_ONE_MINUS_SRC_COLOR),
3115 const_iv (GL_ONE_MINUS_DST_COLOR),
2810 const_iv (GL_SRC_ALPHA_SATURATE), 3116 const_iv (GL_SRC_ALPHA_SATURATE),
2811 const_iv (GL_RGB), 3117 const_iv (GL_RGB),
2812 const_iv (GL_RGBA), 3118 const_iv (GL_RGBA),
2813 const_iv (GL_RGBA4), 3119 const_iv (GL_RGBA4),
2814 const_iv (GL_RGBA8), 3120 const_iv (GL_RGBA8),
2882 const_iv (GL_NICEST), 3188 const_iv (GL_NICEST),
2883 const_iv (GL_V2F), 3189 const_iv (GL_V2F),
2884 const_iv (GL_V3F), 3190 const_iv (GL_V3F),
2885 const_iv (GL_T2F_V3F), 3191 const_iv (GL_T2F_V3F),
2886 const_iv (GL_T2F_N3F_V3F), 3192 const_iv (GL_T2F_N3F_V3F),
3193 const_iv (GL_FUNC_ADD),
3194 const_iv (GL_FUNC_SUBTRACT),
3195 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2887# undef const_iv 3196# undef const_iv
2888 }; 3197 };
2889 3198
2890 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3199 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2891 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2892 3201
2893 texture_av = newAV (); 3202 texture_av = newAV ();
2894 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
2895} 3204}
2896 3205
2898disable_GL_EXT_blend_func_separate () 3207disable_GL_EXT_blend_func_separate ()
2899 CODE: 3208 CODE:
2900 gl.BlendFuncSeparate = 0; 3209 gl.BlendFuncSeparate = 0;
2901 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
2902 3211
2903char * 3212void
3213apple_nvidia_bug (int enable)
3214
3215const char *
2904gl_vendor () 3216gl_vendor ()
2905 CODE: 3217 CODE:
2906 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
2907 OUTPUT: 3219 OUTPUT:
2908 RETVAL 3220 RETVAL
2909 3221
2910char * 3222const char *
2911gl_version () 3223gl_version ()
2912 CODE: 3224 CODE:
2913 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
2914 OUTPUT: 3226 OUTPUT:
2915 RETVAL 3227 RETVAL
2916 3228
2917char * 3229const char *
2918gl_extensions () 3230gl_extensions ()
2919 CODE: 3231 CODE:
2920 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2921 OUTPUT: 3233 OUTPUT:
2922 RETVAL 3234 RETVAL
2923 3235
2924const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
2925 3241
2926GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
2927 CODE: 3243 CODE:
2928 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
2929 OUTPUT: 3245 OUTPUT:
2937 3253
2938int glGetError () 3254int glGetError ()
2939 3255
2940void glFinish () 3256void glFinish ()
2941 3257
3258void glFlush ()
3259
2942void glClear (int mask) 3260void glClear (int mask)
2943 3261
2944void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
2945 PROTOTYPE: @ 3263 PROTOTYPE: @
2946 3264
2955void glBlendFunc (int sfactor, int dfactor) 3273void glBlendFunc (int sfactor, int dfactor)
2956 3274
2957void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3275void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2958 CODE: 3276 CODE:
2959 gl_BlendFuncSeparate (sa, da, saa, daa); 3277 gl_BlendFuncSeparate (sa, da, saa, daa);
3278
3279# void glBlendEquation (int se)
2960 3280
2961void glDepthMask (int flag) 3281void glDepthMask (int flag)
2962 3282
2963void glLogicOp (int opcode) 3283void glLogicOp (int opcode)
2964 3284
2999void glRotate (float angle, float x, float y, float z) 3319void glRotate (float angle, float x, float y, float z)
3000 CODE: 3320 CODE:
3001 glRotatef (angle, x, y, z); 3321 glRotatef (angle, x, y, z);
3002 3322
3003void glColor (float r, float g, float b, float a = 1.0) 3323void glColor (float r, float g, float b, float a = 1.0)
3324 PROTOTYPE: @
3004 ALIAS: 3325 ALIAS:
3005 glColor_premultiply = 1 3326 glColor_premultiply = 1
3006 CODE: 3327 CODE:
3007 if (ix) 3328 if (ix)
3008 { 3329 {
3114 3435
3115void glEndList () 3436void glEndList ()
3116 3437
3117void glCallList (int list) 3438void glCallList (int list)
3118 3439
3440void c_init ()
3441 CODE:
3442 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3443 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3444
3119MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3445MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3120 3446
3121PROTOTYPES: DISABLE 3447PROTOTYPES: DISABLE
3122 3448
3123void 3449void
3124find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
3125 PPCODE: 3451 PPCODE:
3126{ 3452{
3127 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
3128 XPUSHs (self); 3454 XPUSHs (self);
3129} 3455}
3130 3456
3131BOOT: 3457BOOT:
3132{ 3458{
3140 3466
3141void 3467void
3142draw (SV *self) 3468draw (SV *self)
3143 CODE: 3469 CODE:
3144{ 3470{
3145 HV *hv; 3471 HV *hv;
3146 SV **svp; 3472 SV **svp;
3147 NV x, y, w, h; 3473 NV x, y, w, h;
3148 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
3149 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
3150 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
3151 SV *draw_h_sv = GvSV (draw_h_gv); 3477 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines