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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.295 by root, Mon Dec 21 03:30:22 2009 UTC vs.
Revision 1.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 atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f 27# define M_PI 3.14159265f
26#endif 28#endif
27 29
28#include <assert.h> 30#include <cassert>
29#include <math.h> 31#include <cmath>
30#include <string.h> 32#include <cstring>
31#include <stdio.h> 33#include <cstdio>
32#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
33 37
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35 39
36#include <SDL.h> 40#include <SDL.h>
37#include <SDL_thread.h> 41#include <SDL_thread.h>
41#include <SDL_opengl.h> 45#include <SDL_opengl.h>
42 46
43/* work around os x broken headers */ 47/* work around os x broken headers */
44#ifdef __MACOSX__ 48#ifdef __MACOSX__
45typedef 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);
46#endif 52#endif
47 53
48#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
49#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
50 56
51#include <glib/gmacros.h> 57#include <glib.h>
52 58
53#include <pango/pango.h> 59#include <pango/pango.h>
54 60
55#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
80#define expect_false(expr) expect ((expr) != 0, 0) 86#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1) 87#define expect_true(expr) expect ((expr) != 0, 1)
82 88
83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
84 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 */
85#define FOW_DARKNESS 64 93#define FOW_DARKNESS 50
86#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */ 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
95 103
96#define KMOD_LRAM 0x10000 // our extension 104#define KMOD_LRAM 0x10000 // our extension
97 105
98#define TEXID_SPEECH 1 106#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2 107#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3 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}
101 127
102static AV *texture_av; 128static AV *texture_av;
103 129
104static struct 130static struct
105{ 131{
162{ 188{
163 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
164 190
165 while (attrs) 191 while (attrs)
166 { 192 {
167 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
168 194
169 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
170 return 1; 196 return 1;
171 197
172 attrs = attrs->next; 198 attrs = attrs->next;
190static void 216static void
191substitute_func (FcPattern *pattern, gpointer data) 217substitute_func (FcPattern *pattern, gpointer data)
192{ 218{
193 FcPatternAddBool (pattern, FC_HINTING, 1); 219 FcPatternAddBool (pattern, FC_HINTING, 1);
194#ifdef FC_HINT_STYLE 220#ifdef FC_HINT_STYLE
195 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 221 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
196#endif 222#endif
197 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 223 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
198} 224}
199 225
200static void 226static void
417 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
418 } 444 }
419 } 445 }
420} 446}
421 447
422typedef struct { 448struct smooth_key
449{
423 tileid tile; 450 tileid tile;
424 uint8_t x, y, level; 451 uint8_t x, y, level;
425} 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}
426 471
427static void 472static void
428smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
429{ 474{
430 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
431 476
432 if (SvIOK (*sv)) 477 if (it == h.end ())
433 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
434 else 479 else
435 sv_setiv (*sv, bits); 480 it->second |= bits;
436} 481}
437 482
438static void 483static void
439music_finished (void) 484music_finished (void)
440{ 485{
457 ev.code = 1; 502 ev.code = 1;
458 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
459 ev.data2 = 0; 504 ev.data2 = 0;
460 505
461 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;
462} 514}
463 515
464static unsigned int 516static unsigned int
465minpot (unsigned int n) 517minpot (unsigned int n)
466{ 518{
549 601
550 return mod; 602 return mod;
551} 603}
552 604
553static void 605static void
554deliantra_main () 606deliantra_main (SV *real_main)
555{ 607{
556 char *argv[] = { 0 }; 608 dSP;
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 609
610 PUSHMARK (SP);
611 call_sv (real_main, G_DISCARD | G_VOID);
558} 612}
559 613
560#ifdef __MACOSX__ 614#ifdef __MACOSX__
615 static SV *real_main;
616
561 /* to due surprising braindamage on the side of SDL design, we 617 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 618 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which, 619 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 620 * due to shared library magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back. 621 * and which calls our main (== SDL_main) back.
566 */ 622 */
567 extern C_LINKAGE int 623 extern C_LINKAGE int
568 main (int argc, char *argv[]) 624 main (int argc, char *argv[])
569 { 625 {
570 deliantra_main (); 626 deliantra_main (real_main);
571 } 627 }
572 628
573 #undef main 629 #undef main
574 630
575 extern C_LINKAGE int main (int argc, char *argv[]); 631 extern C_LINKAGE int main (int argc, char *argv[]);
576 632
577 static void 633 static void
578 SDL_braino (void) 634 SDL_main_hack (SV *real_main_)
579 { 635 {
636 real_main = real_main_;
637
580 char *argv[] = { "deliantra client", 0 }; 638 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv); 639 (main) (1, argv);
582 } 640 }
583#else 641#else
584 static void 642 static void
585 SDL_braino (void) 643 SDL_main_hack (SV *real_main)
586 { 644 {
587 deliantra_main (); 645 deliantra_main (real_main);
588 } 646 }
589#endif 647#endif
590 648
591MODULE = Deliantra::Client PACKAGE = DC 649MODULE = Deliantra::Client PACKAGE = DC
592 650
793 851
794 const_iv (FOW_DARKNESS) 852 const_iv (FOW_DARKNESS)
795# undef const_iv 853# undef const_iv
796 }; 854 };
797 855
798 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--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 858
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 861}
804 862
843#endif 901#endif
844} 902}
845 903
846char *SDL_GetError () 904char *SDL_GetError ()
847 905
848void SDL_braino () 906void SDL_main_hack (SV *real_main)
907 PROTOTYPE: &
849 908
850int SDL_Init (U32 flags) 909int SDL_Init (U32 flags)
851 910
852int SDL_InitSubSystem (U32 flags) 911int SDL_InitSubSystem (U32 flags)
853 912
854void SDL_QuitSubSystem (U32 flags) 913void SDL_QuitSubSystem (U32 flags)
855 914
856void SDL_Quit () 915void SDL_Quit ()
857 916
858int SDL_GL_SetAttribute (int attr, int value) 917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
859 919
860int SDL_GL_GetAttribute (int attr) 920int SDL_GL_GetAttribute (int attr)
861 CODE: 921 CODE:
862 if (SDL_GL_GetAttribute (attr, &RETVAL)) 922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
863 XSRETURN_UNDEF; 923 XSRETURN_UNDEF;
864 OUTPUT: 924 OUTPUT:
865 RETVAL 925 RETVAL
866 926
867void 927void
922 ); 982 );
923 983
924 if (RETVAL) 984 if (RETVAL)
925 { 985 {
926 av_clear (texture_av); 986 av_clear (texture_av);
927
928 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
929#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 987#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
930#include "glfunc.h" 988#include "glfunc.h"
931#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
932 } 992 }
933} 993}
934 OUTPUT: 994 OUTPUT:
935 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
936 999
937void 1000void
938SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
939 1002
940char * 1003char *
941SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
942 1006
943int 1007int
944SDL_GetAppState () 1008SDL_GetAppState ()
945 1009
946int 1010int
947SDL_GetModState () 1011SDL_GetModState ()
948 1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
949void 1017void
1018SDL_PumpEvents ()
1019
1020void
950poll_events () 1021peep_events ()
951 PPCODE: 1022 PPCODE:
952{ 1023{
953 SDL_Event ev; 1024 SDL_Event ev;
954 1025
955 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
1021 1092
1022 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))));
1023 } 1094 }
1024} 1095}
1025 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
1026int 1110int
1027Mix_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)
1028 POSTCALL: 1112 POSTCALL:
1029 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
1030 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
1031 1115
1032void 1116void
1033Mix_QuerySpec () 1117Mix_QuerySpec ()
1092add_font (char *file) 1176add_font (char *file)
1093 CODE: 1177 CODE:
1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT: 1179 OUTPUT:
1096 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)
1097 1188
1098void 1189void
1099load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
1100 ALIAS: 1191 ALIAS:
1101 load_image_file = 1 1192 load_image_file = 1
1147 1238
1148 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
1149 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
1150 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
1151 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
1152 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1153 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)));
1154 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1155 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1156 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
1157 1248
1229MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1230 1321
1231PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1232 1323
1233DC::Font 1324DC::Font
1234new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1235 CODE: 1326 CODE:
1236{ 1327{
1237 int count; 1328 int count;
1238 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1239 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1268 PROTOTYPE: 1359 PROTOTYPE:
1269 CODE: 1360 CODE:
1270 tc_restore (); 1361 tc_restore ();
1271 1362
1272DC::Layout 1363DC::Layout
1273new (SV *class) 1364new (SV *klass)
1274 CODE: 1365 CODE:
1275 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1276 1367
1277 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1278 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1427 1518
1428void 1519void
1429set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1430 CODE: 1521 CODE:
1431 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1432 { 1523 {
1433 self->base_height = base_height; 1524 self->base_height = base_height;
1434 layout_update_font (self); 1525 layout_update_font (self);
1435 } 1526 }
1436 1527
1437void 1528void
1665 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1666 } 1757 }
1667} 1758}
1668 1759
1669void 1760void
1670draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f) 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)
1671 PROTOTYPE: @ 1762 PROTOTYPE: @
1672 CODE: 1763 CODE:
1673{ 1764{
1765 glEnable (GL_BLEND);
1766 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1674 glEnable (GL_TEXTURE_2D); 1767 glEnable (GL_TEXTURE_2D);
1675 glEnable (GL_BLEND);
1676 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glBindTexture (GL_TEXTURE_2D, name1); 1768 glBindTexture (GL_TEXTURE_2D, name1);
1678 1769
1679 glColor3f (intensity, intensity, intensity); 1770 glColor3f (intensity, intensity, intensity);
1680 glPushMatrix (); 1771 glPushMatrix ();
1681 glScalef (1./3, 1./3, 1.); 1772 glScalef (1./3, 1./3, 1.);
1682 1773
1683 if (blend > 0.f) 1774 if (blend > 0.f)
1684 { 1775 {
1685 float S2, T2; /* 0. 0. for texture 2 */ 1776 float dx3 = dx * -3.f / w;
1686 float w = w1 > w2 ? w1 : w2; 1777 float dy3 = dy * -3.f / h;
1687 float h = h1 > h2 ? h1 : h2;
1688 GLfloat env_color[4] = { 0., 0., 0., blend }; 1778 GLfloat env_color[4] = { 0., 0., 0., blend };
1689 1779
1690 /* interpolate the two shadow textures */ 1780 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */ 1781 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1782 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1697 glBindTexture (GL_TEXTURE_2D, name2); 1787 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699 1789
1700 /* rgb == rgb(glcolor) */ 1790 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1791 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1792 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1793 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704 1794
1705 /* alpha = interpolate t0, t1 by env_alpha */ 1795 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1796 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707 1797
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA); 1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714 1804
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT); 1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA); 1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717 1807
1718 s1 *= w / w1;
1719 t1 *= h / h1;
1720
1721 dx *= -3.f / w2;
1722 dy *= -3.f / h2;
1723 dx *= w / w2;
1724 dy *= h / h2;
1725
1726 s2 *= w / w2;
1727 t2 *= h / h2;
1728
1729 glBegin (GL_QUADS); 1808 glBegin (GL_QUADS);
1730 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0); 1809 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1731 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1); 1810 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1732 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1); 1811 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1733 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0); 1812 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1734 glEnd (); 1813 glEnd ();
1735 1814
1736 glDisable (GL_TEXTURE_2D); 1815 glDisable (GL_TEXTURE_2D);
1737 gl.ActiveTexture (GL_TEXTURE0); 1816 gl.ActiveTexture (GL_TEXTURE0);
1738 } 1817 }
1740 { 1819 {
1741 /* simple blending of one texture, also opengl <1.3 path */ 1820 /* simple blending of one texture, also opengl <1.3 path */
1742 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1821 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743 1822
1744 glBegin (GL_QUADS); 1823 glBegin (GL_QUADS);
1745 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1824 glTexCoord2f (0, 0); glVertex2f (0, 0);
1746 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1825 glTexCoord2f (0, t); glVertex2f (0, h);
1747 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1826 glTexCoord2f (s, t); glVertex2f (w, h);
1748 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 1827 glTexCoord2f (s, 0); glVertex2f (w, 0);
1749 glEnd (); 1828 glEnd ();
1750 } 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 ();
1751 1874
1752 glPopMatrix (); 1875 glPopMatrix ();
1753 1876
1754 glDisable (GL_TEXTURE_2D); 1877 glDisable (GL_TEXTURE_2D);
1755 glDisable (GL_BLEND); 1878 glDisable (GL_BLEND);
1769MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1770 1893
1771PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1772 1895
1773DC::Map 1896DC::Map
1774new (SV *class) 1897new (SV *klass)
1775 CODE: 1898 CODE:
1776 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1777 RETVAL->x = 0; 1900 RETVAL->x = 0;
1778 RETVAL->y = 0; 1901 RETVAL->y = 0;
1779 RETVAL->w = 0; 1902 RETVAL->w = 0;
1818 1941
1819void 1942void
1820set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1821 CODE: 1944 CODE:
1822{ 1945{
1823 tileid texid; 1946 tileid texid;
1824 maptex *tex; 1947 maptex *tex;
1825 1948
1826 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1827 return; 1950 return;
1828 1951
1829 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1830 return; 1953 return;
1831 1954
1832 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1833 1956
1834 if (!texid) 1957 if (!texid)
1835 return; 1958 return;
1836 1959
1837 tex = self->tex + texid; 1960 tex = self->tex + texid;
1870} 1993}
1871 1994
1872void 1995void
1873expire_textures (DC::Map self, int texid, int count) 1996expire_textures (DC::Map self, int texid, int count)
1874 PPCODE: 1997 PPCODE:
1875 for (; texid < self->texs && count; ++texid, --count) 1998 for (; texid < self->texs && count; ++texid, --count)
1876 { 1999 {
1877 maptex *tex = self->tex + texid; 2000 maptex *tex = self->tex + texid;
1878 2001
1879 if (tex->name) 2002 if (tex->name)
1880 { 2003 {
1935 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1936 } 2059 }
1937} 2060}
1938 2061
1939SV * 2062SV *
1940map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1941 CODE: 2064 CODE:
1942{ 2065{
1943 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1944 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1945 mapcell *cell; 2068 mapcell *cell;
1966 2089
1967 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1968 2091
1969 if (flags & 8) 2092 if (flags & 8)
1970 { 2093 {
2094 uint8_t ext, cmd;
2095
1971 if (extmap) 2096 do
1972 { 2097 {
1973 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1974 2100
1975 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
1976 { 2104 {
1977 ext = *data++;
1978 cmd = ext & 0x7f;
1979
1980 if (cmd < 4)
1981 cell->darkness = 255 - ext * 64 + 1;
1982 else if (cmd == 5) // health
1983 {
1984 cell->stat_width = 1; 2105 cell->stat_width = 1;
1985 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1986 }
1987 else if (cmd == 6) // monster width
1988 cell->stat_width = *data++ + 1;
1989 else if (cmd == 0x47)
1990 {
1991 if (*data == 1) cell->player = data [1];
1992 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1993 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1994 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1995
1996 data += *data + 1;
1997 }
1998 else if (cmd == 8) // cell flags
1999 cell->flags = *data++;
2000 else if (ext & 0x40) // unknown, multibyte => skip
2001 data += *data + 1;
2002 else
2003 data++;
2004 } 2107 }
2005 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++;
2006 } 2125 }
2007 else 2126 while (ext & 0x80);
2008 cell->darkness = *data++ + 1;
2009 } 2127 }
2010 2128
2011 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
2012 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
2013 { 2131 {
2061 ? self->row + y 2179 ? self->row + y
2062 : 0; 2180 : 0;
2063 2181
2064 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
2065 { 2183 {
2066 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
2067 2185
2068 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
2069 { 2187 {
2070 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
2071 2189
2073 { 2191 {
2074 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
2075 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
2076 int a1 = tex.a; 2194 int a1 = tex.a;
2077 2195
2078 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
2079 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
2080 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
2081 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
2082 } 2200 }
2083 } 2201 }
2084 2202
2085 *map++ = (r ) 2203 *map++ = (r )
2086 | (g << 8) 2204 | (g << 8)
2087 | (b << 16) 2205 | (b << 16)
2088 | (a << 24); 2206 | (a << 24);
2089 } 2207 }
2090 } 2208 }
2091 2209
2092 RETVAL = map_sv; 2210 RETVAL = map_sv;
2093} 2211}
2094 OUTPUT: 2212 OUTPUT:
2095 RETVAL 2213 RETVAL
2096 2214
2097void 2215void
2098draw (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)
2099 CODE: 2217 CODE:
2100{ 2218{
2101 int x, y, z; 2219 int x, y, z;
2102 2220
2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2104 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
2105 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)
2106 smooth_key skey; 2223 smooth_key skey;
2107 int pl_x, pl_y; 2224 int pl_x, pl_y;
2108 maptex pl_tex; 2225 maptex pl_tex;
2109 rc_t *rc = rc_alloc (); 2226 rc_t *rc = rc_alloc ();
2110 rc_t *rc_ov = rc_alloc (); 2227 rc_t *rc_ov = rc_alloc ();
2111 rc_key_t key; 2228 rc_key_t key;
2112 rc_array_t *arr, *arr_hidden; 2229 rc_array_t *arr;
2113 2230
2114 pl_tex.name = 0; 2231 pl_tex.name = 0;
2115 2232
2116 // that's current max. sorry. 2233 // that's current max. sorry.
2117 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
2155 2272
2156 glEnable (GL_BLEND); 2273 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2159 2276
2160 key.texname = self->tex [TEXID_HIDDEN].name;
2161 arr_hidden = rc_array (rc_ov, &key);
2162
2163 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
2164 { 2278 {
2279 smooth_hash smooth;
2165 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2166 key.texname = -1; 2281 key.texname = -1;
2167 2282
2168 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
2169 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
2190 2305
2191 key.texname = tex.name; 2306 key.texname = tex.name;
2192 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
2193 } 2308 }
2194 2309
2195 px = (x + 1) * T - tex.w; 2310 px = (x + 1) * Th - tex.w;
2196 py = (y + 1) * T - tex.h; 2311 py = (y + 1) * Tw - tex.h;
2197 2312
2198 if (expect_false (cell->player == player) && expect_false (z == 2)) 2313 if (expect_false (cell->player == player) && expect_false (z == 2))
2199 { 2314 {
2200 pl_x = px; 2315 pl_x = px;
2201 pl_y = py; 2316 pl_y = py;
2230 2345
2231 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2232 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
2233 2348
2234 // full tile 2349 // full tile
2235 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);
2236 2351
2237 // borders 2352 // borders
2238 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);
2239 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);
2240 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);
2241 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);
2242 2357
2243 // corners 2358 // corners
2244 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);
2245 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);
2246 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);
2247 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);
2248 } 2363 }
2249 } 2364 }
2250 2365
2251 if (expect_false (z == 2)) 2366 if (expect_false (z == 2) && expect_false (cell->flags))
2252 { 2367 {
2253 /* draw question marks on top of hidden spaces */ 2368 // overlays such as the speech bubble, probably more to come
2254 if (!cell->darkness) 2369 if (cell->flags & 1)
2255 { 2370 {
2256 maptex tex = self->tex [TEXID_HIDDEN];
2257 int px = (x + 1) * T - tex.w;
2258 int py = (y + 1) * T - tex.h;
2259
2260 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264 }
2265
2266 if (expect_false (cell->flags))
2267 {
2268 // overlays such as the speech bubble, probably more to come
2269 if (cell->flags & 1)
2270 {
2271 rc_key_t key_ov = key; 2371 rc_key_t key_ov = key;
2272 maptex tex = self->tex [TEXID_SPEECH]; 2372 maptex tex = self->tex [TEXID_SPEECH];
2273 rc_array_t *arr; 2373 rc_array_t *arr;
2274 int px = x * T + T * 2 / 32; 2374 int px = x * Tw + Tw * 2 / 32;
2275 int py = y * T - T * 6 / 32; 2375 int py = y * Th - Th * 6 / 32;
2276 2376
2277 key_ov.texname = tex.name; 2377 key_ov.texname = tex.name;
2278 arr = rc_array (rc_ov, &key_ov); 2378 arr = rc_array (rc_ov, &key_ov);
2279 2379
2280 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2380 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2281 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2381 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2282 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2382 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2283 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2383 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2284 }
2285 } 2384 }
2286 } 2385 }
2287 } 2386 }
2288 } 2387 }
2289 2388
2305 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
2306 { 2405 {
2307 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
2308 HE *he; 2407 HE *he;
2309 2408
2310 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2311 while ((he = hv_iternext (smooth)))
2312 { 2410 {
2313 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
2314 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
2315 2413
2316 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
2317 && skey->level == level 2415 && skey.level == level
2318 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
2319 { 2417 {
2320 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
2321 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
2322 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
2323 int border = bits & 15; 2421 int border = bits & 15;
2324 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2325 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
2326 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
2327 2425
2329 { 2427 {
2330 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
2331 // save gobs of state changes. 2429 // save gobs of state changes.
2332 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
2333 { 2431 {
2334 self->tex [skey->tile].unused = 0; 2432 self->tex [skey.tile].unused = 0;
2335 2433
2336 glEnd (); 2434 glEnd ();
2337 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2338 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
2339 } 2437 }
2340 2438
2341 if (border) 2439 if (border)
2342 { 2440 {
2343 float ox = border * dx; 2441 float ox = border * dx;
2344 2442
2345 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2346 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2347 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2348 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2349 } 2447 }
2350 2448
2351 if (corner) 2449 if (corner)
2352 { 2450 {
2353 float ox = corner * dx; 2451 float ox = corner * dx;
2354 2452
2355 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2356 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2357 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2358 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2359 } 2457 }
2360 } 2458 }
2361 } 2459 }
2362 } 2460 }
2363 } 2461 }
2365 2463
2366 glEnd (); 2464 glEnd ();
2367 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
2368 key.texname = -1; 2466 key.texname = -1;
2369 } 2467 }
2370
2371 hv_clear (smooth);
2372 } 2468 }
2373 2469
2374 if (pl_tex.name) 2470 if (pl_tex.name)
2375 { 2471 {
2376 maptex tex = pl_tex; 2472 maptex tex = pl_tex;
2404 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2405 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2406 { 2502 {
2407 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2408 2504
2409 int px = x * T; 2505 int px = x * Tw;
2410 int py = y * T; 2506 int py = y * Th;
2411 2507
2412 if (expect_false (cell->player == player)) 2508 if (expect_false (cell->player == player))
2413 { 2509 {
2414 px += sdx; 2510 px += sdx;
2415 py += sdy; 2511 py += sdy;
2416 } 2512 }
2417 2513
2418 if (cell->stat_hp) 2514 if (cell->stat_hp)
2419 { 2515 {
2420 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2422 2518
2423 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2424 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2425 px + width - 1, py); 2521 px + width - 1, py);
2426 2522
2463 int x, y; 2559 int x, y;
2464 2560
2465 glEnable (GL_TEXTURE_2D); 2561 glEnable (GL_TEXTURE_2D);
2466 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2562 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467 * but the nvidia driver (185.18.14) mishandles alpha textures 2563 * but the nvidia driver (185.18.14) mishandles alpha textures
2468 * ansd takes the colour from god knows where instead of using 2564 * and takes the colour from god knows where instead of using
2469 * Cp. MODULATE results in the same colour, but slightly different 2565 * Cp. MODULATE results in the same colour, but slightly different
2470 * alpha, but atcually gives us the correct colour with nvidia. 2566 * alpha, but atcually gives us the correct colour with nvidia.
2471 */ 2567 */
2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2568 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2473 glEnable (GL_BLEND); 2569 glEnable (GL_BLEND);
2502void 2598void
2503fow_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)
2504 PPCODE: 2600 PPCODE:
2505{ 2601{
2506 int x, y; 2602 int x, y;
2507 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2508 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2509 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2510 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);
2511 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2512 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2610 memset (darkness1, 0, sw1*sh1);
2513 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2514 2611
2515 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2516 SvCUR_set (darkness3_sv, sw34 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2517 2614
2518 mx += self->x - 1; 2615 mx += self->x - 1;
2519 my += self->y - 1; 2616 my += self->y - 1;
2520
2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2522 2617
2523 for (y = 0; y < sh1; y++) 2618 for (y = 0; y < sh1; y++)
2524 if (0 <= y + my && y + my < self->rows) 2619 if (0 <= y + my && y + my < self->rows)
2525 { 2620 {
2526 maprow *row = self->row + (y + my); 2621 maprow *row = self->row + (y + my);
2559 2654
2560 uint8_t r13 = (d13 + d23 + d12) / 3; 2655 uint8_t r13 = (d13 + d23 + d12) / 3;
2561 uint8_t r23 = d23; 2656 uint8_t r23 = d23;
2562 uint8_t r33 = (d23 + d33 + d32) / 3; 2657 uint8_t r33 = (d23 + d33 + d32) / 3;
2563 2658
2564 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2659 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2565 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2660 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2566 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2661 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2567 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2662 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2568 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 */
2569 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2664 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2570 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2665 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2571 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2666 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2572 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2667 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2573 } 2668 }
2574 2669
2575 free (darkness1); 2670 free (darkness1);
2576 2671
2577 EXTEND (SP, 3); 2672 EXTEND (SP, 3);
2578 PUSHs (sv_2mortal (newSViv (sw34))); 2673 PUSHs (sv_2mortal (newSViv (sw3)));
2579 PUSHs (sv_2mortal (newSViv (sh3))); 2674 PUSHs (sv_2mortal (newSViv (sh3)));
2580 PUSHs (darkness3_sv); 2675 PUSHs (darkness3_sv);
2581} 2676}
2582 2677
2583SV * 2678SV *
2646 else 2741 else
2647 *data++ = 0; 2742 *data++ = 0;
2648 } 2743 }
2649 } 2744 }
2650 2745
2651 /* 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 */
2652 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2747 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2653 { 2748 {
2654 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2655 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656 } 2751 }
2657 2752
2658 RETVAL = data_sv; 2753 RETVAL = data_sv;
2659} 2754}
2660 OUTPUT: 2755 OUTPUT:
2661 RETVAL 2756 RETVAL
2662 2757
2663void 2758void
2670 STRLEN len; 2765 STRLEN len;
2671 uint8_t *data, *end; 2766 uint8_t *data, *end;
2672 2767
2673 len = SvLEN (data_sv); 2768 len = SvLEN (data_sv);
2674 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2769 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2675 data = SvPVbyte_nolen (data_sv); 2770 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2676 end = data + len + 8; 2771 end = data + len + 8;
2677 2772
2678 if (len < 5) 2773 if (len < 5)
2679 XSRETURN_EMPTY; 2774 XSRETURN_EMPTY;
2680 2775
2741} 2836}
2742 2837
2743MODULE = Deliantra::Client PACKAGE = DC::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2744 2839
2745DC::RW 2840DC::RW
2746new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2747 CODE: 2842 CODE:
2748{ 2843{
2749 STRLEN datalen; 2844 STRLEN datalen;
2750 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2751 2846
2753} 2848}
2754 OUTPUT: 2849 OUTPUT:
2755 RETVAL 2850 RETVAL
2756 2851
2757DC::RW 2852DC::RW
2758new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2759 CODE: 2854 CODE:
2760 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2761 OUTPUT: 2856 OUTPUT:
2762 RETVAL 2857 RETVAL
2763 2858
2781 if (RETVAL < 0) 2876 if (RETVAL < 0)
2782 { 2877 {
2783 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2784 2879
2785 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)
2786 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2787 2887 }
2888 else
2788 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2789 } 2890 }
2790 2891
2791 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2792 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2793} 2894}
2853 2954
2854MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2855 2956
2856PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2857 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
2858DC::MixChunk 2971DC::MixChunk
2859new (SV *class, DC::RW rwops) 2972new (SV *klass, DC::RW rwops)
2860 CODE: 2973 CODE:
2861 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2862 OUTPUT: 2975 OUTPUT:
2863 RETVAL 2976 RETVAL
2864 2977
2894 OUTPUT: 3007 OUTPUT:
2895 RETVAL 3008 RETVAL
2896 3009
2897MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3010MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2898 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
2899int 3024int
2900volume (int volume = -1) 3025volume (int volume = -1)
2901 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2902 CODE: 3027 CODE:
2903 if (items > 0) 3028 if (items > 0)
2914void 3039void
2915halt () 3040halt ()
2916 CODE: 3041 CODE:
2917 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2918 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2919DC::MixMusic 3051DC::MixMusic
2920new (SV *class, DC::RW rwops) 3052new (SV *klass, DC::RW rwops)
2921 CODE: 3053 CODE:
2922 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2923 OUTPUT: 3055 OUTPUT:
2924 RETVAL 3056 RETVAL
2925 3057
3062 const_iv (GL_FUNC_SUBTRACT), 3194 const_iv (GL_FUNC_SUBTRACT),
3063 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3195 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3064# undef const_iv 3196# undef const_iv
3065 }; 3197 };
3066 3198
3067 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--)
3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3069 3201
3070 texture_av = newAV (); 3202 texture_av = newAV ();
3071 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
3072} 3204}
3073 3205
3078 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
3079 3211
3080void 3212void
3081apple_nvidia_bug (int enable) 3213apple_nvidia_bug (int enable)
3082 3214
3083char * 3215const char *
3084gl_vendor () 3216gl_vendor ()
3085 CODE: 3217 CODE:
3086 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
3087 OUTPUT: 3219 OUTPUT:
3088 RETVAL 3220 RETVAL
3089 3221
3090char * 3222const char *
3091gl_version () 3223gl_version ()
3092 CODE: 3224 CODE:
3093 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
3094 OUTPUT: 3226 OUTPUT:
3095 RETVAL 3227 RETVAL
3096 3228
3097char * 3229const char *
3098gl_extensions () 3230gl_extensions ()
3099 CODE: 3231 CODE:
3100 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3101 OUTPUT: 3233 OUTPUT:
3102 RETVAL 3234 RETVAL
3103 3235
3104const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
3105 3241
3106GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
3107 CODE: 3243 CODE:
3108 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
3109 OUTPUT: 3245 OUTPUT:
3116 RETVAL 3252 RETVAL
3117 3253
3118int glGetError () 3254int glGetError ()
3119 3255
3120void glFinish () 3256void glFinish ()
3257
3258void glFlush ()
3121 3259
3122void glClear (int mask) 3260void glClear (int mask)
3123 3261
3124void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
3125 PROTOTYPE: @ 3263 PROTOTYPE: @
3297 3435
3298void glEndList () 3436void glEndList ()
3299 3437
3300void glCallList (int list) 3438void glCallList (int list)
3301 3439
3440void c_init ()
3441 CODE:
3442 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3443 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3444
3302MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3445MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3303 3446
3304PROTOTYPES: DISABLE 3447PROTOTYPES: DISABLE
3305 3448
3306void 3449void
3307find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
3308 PPCODE: 3451 PPCODE:
3309{ 3452{
3310 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
3311 XPUSHs (self); 3454 XPUSHs (self);
3312} 3455}
3313 3456
3314BOOT: 3457BOOT:
3315{ 3458{
3323 3466
3324void 3467void
3325draw (SV *self) 3468draw (SV *self)
3326 CODE: 3469 CODE:
3327{ 3470{
3328 HV *hv; 3471 HV *hv;
3329 SV **svp; 3472 SV **svp;
3330 NV x, y, w, h; 3473 NV x, y, w, h;
3331 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
3332 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
3333 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
3334 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