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.293 by root, Thu Dec 17 02:49:38 2009 UTC vs.
Revision 1.326 by root, Sun Nov 18 03:06:13 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>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
44/* work around os x broken headers */ 48/* work around os x broken headers */
45#ifdef __MACOSX__ 49#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 53#endif
48 54
49#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
51 57
52#include <glib/gmacros.h> 58#include <glib.h>
53 59
54#include <pango/pango.h> 60#include <pango/pango.h>
55 61
56#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
81#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
83 89
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 91
92/* this is used as fow flag as well, so has to have a different value */
93/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 64 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
87 96
88#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
90 99
91#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
95 104
96#define KMOD_LRAM 0x10000 // our extension 105#define KMOD_LRAM 0x10000 // our extension
97 106
98#define TEXID_SPEECH 1 107#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2 108#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3 109
110static char *
111fast_sv_grow (SV *sv, STRLEN need)
112{
113 STRLEN len = SvLEN (sv);
114 STRLEN want = SvCUR (sv) + need;
115
116 if (expect_false (len < want))
117 {
118 do
119 len *= 2;
120 while (len < want);
121
122 sv_grow (sv, len);
123 }
124
125 SvCUR_set (sv, want);
126 return SvEND (sv) - need;
127}
101 128
102static AV *texture_av; 129static AV *texture_av;
103 130
104static struct 131static struct
105{ 132{
162{ 189{
163 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
164 191
165 while (attrs) 192 while (attrs)
166 { 193 {
167 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
168 195
169 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
170 return 1; 197 return 1;
171 198
172 attrs = attrs->next; 199 attrs = attrs->next;
173 } 200 }
174 201
175 return 0; 202 return 0;
176} 203}
177 204
178typedef struct cf_layout { 205struct cf_layout {
179 PangoLayout *pl; 206 PangoLayout *pl;
180 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
181 int base_height; 208 int base_height;
182 DC__Font font; 209 DC__Font font;
183 rc_t *rc; 210 rc_t rc;
184} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
185 214
186static DC__Font default_font; 215static DC__Font default_font;
187static PangoContext *opengl_context; 216static PangoContext *opengl_context;
188static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
189 218
190static void 219static void
191substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
192{ 221{
193 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
194#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
195 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
196#endif 225#endif
197 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
198} 227}
199 228
200static void 229static void
230} 259}
231 260
232typedef uint16_t tileid; 261typedef uint16_t tileid;
233typedef uint16_t faceid; 262typedef uint16_t faceid;
234 263
235typedef struct { 264struct maptex
265{
236 GLuint name; 266 GLuint name;
237 int w, h; 267 int w, h;
238 float s, t; 268 float s, t;
239 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
240 tileid smoothtile; 270 tileid smoothtile;
241 uint8_t smoothlevel; 271 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */ 272 uint8_t unused; /* set to zero on use */
243} maptex; 273};
244 274
245typedef struct { 275struct mapcell
276{
246 uint32_t player; 277 uint32_t player;
247 tileid tile[3]; 278 tileid tile[3];
248 uint16_t darkness; 279 uint16_t darkness;
249 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
250} mapcell; 281};
251 282
252typedef struct { 283struct maprow
284{
253 int32_t c0, c1; 285 int32_t c0, c1;
254 mapcell *col; 286 mapcell *col;
255} maprow; 287};
256 288
257typedef struct map { 289struct mapgrid {
258 int x, y, w, h; 290 int x, y, w, h;
259 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
260 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
261 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
262 294
263 int32_t rows; 295 int32_t rows;
264 maprow *row; 296 maprow *row;
265} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
266 300
267static char * 301static char *
268prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
269{ 303{
270 char *p; 304 char *p;
288 322
289#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
290#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 324#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
291 325
292static void 326static void
293need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
294{ 328{
295 while (self->faces <= face) 329 while (self->faces <= face)
296 { 330 {
297 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
298 self->faces *= 2; 332 self->faces *= 2;
299 } 333 }
300} 334}
301 335
302static void 336static void
303need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
304{ 338{
305 while (self->texs <= texid) 339 while (self->texs <= texid)
306 { 340 {
307 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
308 self->texs *= 2; 342 self->texs *= 2;
309 } 343 }
310} 344}
311 345
312static maprow * 346static maprow *
313map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
314{ 348{
315 if (0 > y) 349 if (0 > y)
316 { 350 {
317 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
318 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
356 390
357 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
358} 392}
359 393
360static mapcell * 394static mapcell *
361map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
362{ 396{
363 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
364} 398}
365 399
366static void 400static void
367map_clear (DC__Map self) 401map_clear (mapgrid *self)
368{ 402{
369 int r; 403 int r;
370 404
371 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
372 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
390 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
391 (cell)->player = 0; \ 425 (cell)->player = 0; \
392 } while (0) 426 } while (0)
393 427
394static void 428static void
395map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
396{ 430{
397 int x, y; 431 int x, y;
398 maprow *row; 432 maprow *row;
399 mapcell *cell; 433 mapcell *cell;
400 434
417 CELL_CLEAR (cell); 451 CELL_CLEAR (cell);
418 } 452 }
419 } 453 }
420} 454}
421 455
422typedef struct { 456struct smooth_key
457{
423 tileid tile; 458 tileid tile;
424 uint8_t x, y, level; 459 uint8_t x, y, level;
425} smooth_key; 460
461 bool operator == (const smooth_key &o) const
462 {
463 return tile == o.tile && x == o.x && y == o.y && level == o.level;
464 }
465};
466
467typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
468
469namespace std {
470 template <>
471 struct hash<smooth_key>
472 {
473 size_t operator () (const smooth_key &v) const
474 {
475 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
476 }
477 };
478}
426 479
427static void 480static void
428smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
429{ 482{
430 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
431 484
432 if (SvIOK (*sv)) 485 if (it == h.end ())
433 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
434 else 487 else
435 sv_setiv (*sv, bits); 488 it->second |= bits;
436} 489}
437 490
438static void 491static void
439music_finished (void) 492music_finished (void)
440{ 493{
457 ev.code = 1; 510 ev.code = 1;
458 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
459 ev.data2 = 0; 512 ev.data2 = 0;
460 513
461 SDL_PushEvent ((SDL_Event *)&ev); 514 SDL_PushEvent ((SDL_Event *)&ev);
515}
516
517// approximately divide by 255
518static unsigned int
519div255 (unsigned int n)
520{
521 return (n + (n >> 8)) >> 8;
462} 522}
463 523
464static unsigned int 524static unsigned int
465minpot (unsigned int n) 525minpot (unsigned int n)
466{ 526{
549 609
550 return mod; 610 return mod;
551} 611}
552 612
553static void 613static void
554deliantra_main () 614deliantra_main (SV *real_main)
555{ 615{
556 char *argv[] = { 0 }; 616 dSP;
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
558} 620}
559 621
560#ifdef __MACOSX__ 622#ifdef __MACOSX__
623 static SV *real_main;
624
561 /* to due surprising braindamage on the side of SDL design, we 625 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 626 * 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, 627 * 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, 628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back. 629 * and which calls our main (== SDL_main) back.
566 */ 630 */
567 extern C_LINKAGE int 631 extern C_LINKAGE int
568 main (int argc, char *argv[]) 632 main (int argc, char *argv[])
569 { 633 {
570 deliantra_main (); 634 deliantra_main (real_main);
571 } 635 }
572 636
573 #undef main 637 #undef main
574 638
575 extern C_LINKAGE int main (int argc, char *argv[]); 639 extern C_LINKAGE int main (int argc, char *argv[]);
576 640
577 static void 641 static void
578 SDL_braino (void) 642 SDL_main_hack (SV *real_main_)
579 { 643 {
644 real_main = real_main_;
645
580 char *argv[] = { "deliantra client", 0 }; 646 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv); 647 (main) (1, argv);
582 } 648 }
583#else 649#else
584 static void 650 static void
585 SDL_braino (void) 651 SDL_main_hack (SV *real_main)
586 { 652 {
587 deliantra_main (); 653 deliantra_main (real_main);
588 } 654 }
589#endif 655#endif
590 656
591MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
592 658
793 859
794 const_iv (FOW_DARKNESS) 860 const_iv (FOW_DARKNESS)
795# undef const_iv 861# undef const_iv
796 }; 862 };
797 863
798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 864 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 866
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 869}
804 870
820NV ceil (NV x) 886NV ceil (NV x)
821 887
822IV minpot (UV n) 888IV minpot (UV n)
823 889
824IV popcount (UV n) 890IV popcount (UV n)
891
892NV distance (NV dx, NV dy)
893 CODE:
894 RETVAL = pow (dx * dx + dy * dy, 0.5);
895 OUTPUT:
896 RETVAL
825 897
826void 898void
827pango_init () 899pango_init ()
828 CODE: 900 CODE:
829{ 901{
837#endif 909#endif
838} 910}
839 911
840char *SDL_GetError () 912char *SDL_GetError ()
841 913
842void SDL_braino () 914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
843 916
844int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
845 918
846int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
847 920
848void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
849 922
850void SDL_Quit () 923void SDL_Quit ()
851 924
852int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
853 927
854int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
855 CODE: 929 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
857 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
858 OUTPUT: 932 OUTPUT:
859 RETVAL 933 RETVAL
860 934
861void 935void
916 ); 990 );
917 991
918 if (RETVAL) 992 if (RETVAL)
919 { 993 {
920 av_clear (texture_av); 994 av_clear (texture_av);
921
922 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 995#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
924#include "glfunc.h" 996#include "glfunc.h"
925#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926 } 1000 }
927} 1001}
928 OUTPUT: 1002 OUTPUT:
929 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
930 1007
931void 1008void
932SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
933 1010
934char * 1011char *
935SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
936 1014
937int 1015int
938SDL_GetAppState () 1016SDL_GetAppState ()
939 1017
940int 1018int
941SDL_GetModState () 1019SDL_GetModState ()
942 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
943void 1025void
1026SDL_PumpEvents ()
1027
1028void
944poll_events () 1029peep_events ()
945 PPCODE: 1030 PPCODE:
946{ 1031{
947 SDL_Event ev; 1032 SDL_Event ev;
948 1033
949 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
1015 1100
1016 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1101 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1017 } 1102 }
1018} 1103}
1019 1104
1105char *
1106SDL_AudioDriverName ()
1107 CODE:
1108{
1109 char buf [256];
1110 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1111 XSRETURN_UNDEF;
1112
1113 RETVAL = buf;
1114}
1115 OUTPUT:
1116 RETVAL
1117
1020int 1118int
1021Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1119Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1022 POSTCALL: 1120 POSTCALL:
1023 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
1024 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
1025 1123
1026void 1124void
1027Mix_QuerySpec () 1125Mix_QuerySpec ()
1086add_font (char *file) 1184add_font (char *file)
1087 CODE: 1185 CODE:
1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT: 1187 OUTPUT:
1090 RETVAL 1188 RETVAL
1189
1190void
1191IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1192
1193# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1194void
1195Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1091 1196
1092void 1197void
1093load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
1094 ALIAS: 1199 ALIAS:
1095 load_image_file = 1 1200 load_image_file = 1
1141 1246
1142 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1143 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1144 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1145 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1146 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1147 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1148 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1149 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1150 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1151 1256
1223MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1224 1329
1225PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1226 1331
1227DC::Font 1332DC::Font
1228new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1229 CODE: 1334 CODE:
1230{ 1335{
1231 int count; 1336 int count;
1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1233 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1262 PROTOTYPE: 1367 PROTOTYPE:
1263 CODE: 1368 CODE:
1264 tc_restore (); 1369 tc_restore ();
1265 1370
1266DC::Layout 1371DC::Layout
1267new (SV *class) 1372new (SV *klass)
1268 CODE: 1373 CODE:
1269 New (0, RETVAL, 1, struct cf_layout); 1374 RETVAL = new cf_layout;
1270 1375
1271 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1272 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1273 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1274 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1275 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1276 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1277 RETVAL->font = 0; 1382 RETVAL->font = 0;
1278 RETVAL->rc = rc_alloc ();
1279 1383
1280 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1281 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1282 OUTPUT: 1386 OUTPUT:
1283 RETVAL 1387 RETVAL
1284 1388
1285void 1389void
1286DESTROY (DC::Layout self) 1390DESTROY (DC::Layout self)
1287 CODE: 1391 CODE:
1288 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1289 rc_free (self->rc);
1290 Safefree (self); 1393 delete self;
1291 1394
1292void 1395void
1293set_text (DC::Layout self, SV *text_) 1396set_text (DC::Layout self, SV *text_)
1294 CODE: 1397 CODE:
1295{ 1398{
1421 1524
1422void 1525void
1423set_height (DC::Layout self, int base_height) 1526set_height (DC::Layout self, int base_height)
1424 CODE: 1527 CODE:
1425 if (self->base_height != base_height) 1528 if (self->base_height != base_height)
1426 { 1529 {
1427 self->base_height = base_height; 1530 self->base_height = base_height;
1428 layout_update_font (self); 1531 layout_update_font (self);
1429 } 1532 }
1430 1533
1431void 1534void
1549} 1652}
1550 1653
1551void 1654void
1552render (DC::Layout self, float x, float y, int flags = 0) 1655render (DC::Layout self, float x, float y, int flags = 0)
1553 CODE: 1656 CODE:
1554 rc_clear (self->rc); 1657 self->rc.clear ();
1555 pango_opengl_render_layout_subpixel ( 1658 pango_opengl_render_layout_subpixel (
1556 self->pl, 1659 self->pl,
1557 self->rc, 1660 &self->rc,
1558 x * PANGO_SCALE, y * PANGO_SCALE, 1661 x * PANGO_SCALE, y * PANGO_SCALE,
1559 self->r, self->g, self->b, self->a, 1662 self->r, self->g, self->b, self->a,
1560 flags 1663 flags
1561 ); 1664 );
1562 // we assume that context_change actually clears/frees stuff 1665 // we assume that context_change actually clears/frees stuff
1573 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1676 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1574 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1677 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1575 glEnable (GL_ALPHA_TEST); 1678 glEnable (GL_ALPHA_TEST);
1576 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1679 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1577 1680
1578 rc_draw (self->rc); 1681 self->rc.draw ();
1579 1682
1580 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1581 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1582 glDisable (GL_TEXTURE_2D); 1685 glDisable (GL_TEXTURE_2D);
1583} 1686}
1659 glDisable (GL_BLEND); 1762 glDisable (GL_BLEND);
1660 } 1763 }
1661} 1764}
1662 1765
1663void 1766void
1664draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1) 1767draw_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)
1665 PROTOTYPE: @ 1768 PROTOTYPE: @
1666 CODE: 1769 CODE:
1667{ 1770{
1771 glEnable (GL_BLEND);
1772 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1668 glEnable (GL_TEXTURE_2D); 1773 glEnable (GL_TEXTURE_2D);
1669 glEnable (GL_BLEND); 1774 glBindTexture (GL_TEXTURE_2D, name1);
1670 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 1775
1673 glColor4f (intensity, intensity, intensity, 0.9); 1776 glColor3f (intensity, intensity, intensity);
1674 glPushMatrix (); 1777 glPushMatrix ();
1675 glScalef (1./3, 1./3, 1.); 1778 glScalef (1./3, 1./3, 1.);
1676 1779
1780 if (blend > 0.f)
1781 {
1782 float dx3 = dx * -3.f / w;
1783 float dy3 = dy * -3.f / h;
1784 GLfloat env_color[4] = { 0., 0., 0., blend };
1785
1786 /* interpolate the two shadow textures */
1787 /* stage 0 == rgb(glcolor) + alpha(t0) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1789
1790 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1791 gl.ActiveTexture (GL_TEXTURE1);
1792 glEnable (GL_TEXTURE_2D);
1677 glBindTexture (GL_TEXTURE_2D, name1); 1793 glBindTexture (GL_TEXTURE_2D, name2);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1678 1795
1796 /* rgb == rgb(glcolor) */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1798 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1800
1801 /* alpha = interpolate t0, t1 by env_alpha */
1802 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1807
1808 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1809 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1812 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1813
1814 glBegin (GL_QUADS);
1815 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1819 glEnd ();
1820
1821 glDisable (GL_TEXTURE_2D);
1822 gl.ActiveTexture (GL_TEXTURE0);
1823 }
1824 else
1825 {
1826 /* simple blending of one texture, also opengl <1.3 path */
1827 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1828
1829 glBegin (GL_QUADS);
1830 glTexCoord2f (0, 0); glVertex2f (0, 0);
1831 glTexCoord2f (0, t); glVertex2f (0, h);
1832 glTexCoord2f (s, t); glVertex2f (w, h);
1833 glTexCoord2f (s, 0); glVertex2f (w, 0);
1834 glEnd ();
1835 }
1836
1837 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1838 {
1839 int x, y;
1840 int dx3 = dx * 3;
1841 int dy3 = dy * 3;
1842
1843 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1844 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1845 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1846 glTranslatef (-1., -1., 0);
1679 glBegin (GL_QUADS); 1847 glBegin (GL_QUADS);
1680 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1848
1681 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1849 for (y = 1; y < h; y += 3)
1682 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1850 {
1683 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 1851 int y1 = y - dy3;
1852 int y1valid = y1 >= 0 && y1 < h;
1853
1854 for (x = 1; x < w; x += 3)
1855 {
1856 int x1 = x - dx3;
1857 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 uint8_t h2;
1859
1860 if (y1valid && x1 >= 0 && x1 < w)
1861 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1862 else
1863 h2 = 1; /* out of range == invisible */
1864
1865 if (h1 || h2)
1866 {
1867 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1868 glColor4f (1., 1., 1., alpha);
1869
1870 glTexCoord2f (0, 0.); glVertex2i (x , y );
1871 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1872 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1873 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1874 }
1875 }
1876 }
1877 }
1878
1684 glEnd (); 1879 glEnd ();
1685 1880
1686 glPopMatrix (); 1881 glPopMatrix ();
1687 1882
1688 glDisable (GL_TEXTURE_2D); 1883 glDisable (GL_TEXTURE_2D);
1703MODULE = Deliantra::Client PACKAGE = DC::Map 1898MODULE = Deliantra::Client PACKAGE = DC::Map
1704 1899
1705PROTOTYPES: DISABLE 1900PROTOTYPES: DISABLE
1706 1901
1707DC::Map 1902DC::Map
1708new (SV *class) 1903new (SV *klass)
1709 CODE: 1904 CODE:
1710 New (0, RETVAL, 1, struct map); 1905 New (0, RETVAL, 1, mapgrid);
1711 RETVAL->x = 0; 1906 RETVAL->x = 0;
1712 RETVAL->y = 0; 1907 RETVAL->y = 0;
1713 RETVAL->w = 0; 1908 RETVAL->w = 0;
1714 RETVAL->h = 0; 1909 RETVAL->h = 0;
1715 RETVAL->ox = 0; 1910 RETVAL->ox = 0;
1752 1947
1753void 1948void
1754set_smooth (DC::Map self, int face, int smooth, int level) 1949set_smooth (DC::Map self, int face, int smooth, int level)
1755 CODE: 1950 CODE:
1756{ 1951{
1757 tileid texid; 1952 tileid texid;
1758 maptex *tex; 1953 maptex *tex;
1759 1954
1760 if (face < 0 || face >= self->faces) 1955 if (face < 0 || face >= self->faces)
1761 return; 1956 return;
1762 1957
1763 if (smooth < 0 || smooth >= self->faces) 1958 if (smooth < 0 || smooth >= self->faces)
1764 return; 1959 return;
1765 1960
1766 texid = self->face2tile [face]; 1961 texid = self->face2tile [face];
1767 1962
1768 if (!texid) 1963 if (!texid)
1769 return; 1964 return;
1770 1965
1771 tex = self->tex + texid; 1966 tex = self->tex + texid;
1804} 1999}
1805 2000
1806void 2001void
1807expire_textures (DC::Map self, int texid, int count) 2002expire_textures (DC::Map self, int texid, int count)
1808 PPCODE: 2003 PPCODE:
1809 for (; texid < self->texs && count; ++texid, --count) 2004 for (; texid < self->texs && count; ++texid, --count)
1810 { 2005 {
1811 maptex *tex = self->tex + texid; 2006 maptex *tex = self->tex + texid;
1812 2007
1813 if (tex->name) 2008 if (tex->name)
1814 { 2009 {
1869 self->y += MAP_EXTEND_Y; 2064 self->y += MAP_EXTEND_Y;
1870 } 2065 }
1871} 2066}
1872 2067
1873SV * 2068SV *
1874map1a_update (DC::Map self, SV *data_, int extmap) 2069map1a_update (DC::Map self, SV *data_)
1875 CODE: 2070 CODE:
1876{ 2071{
1877 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2072 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1878 uint8_t *data_end = (uint8_t *)SvEND (data_); 2073 uint8_t *data_end = (uint8_t *)SvEND (data_);
1879 mapcell *cell; 2074 mapcell *cell;
1900 2095
1901 //TODO: don't trust server data to be in-range(!) 2096 //TODO: don't trust server data to be in-range(!)
1902 2097
1903 if (flags & 8) 2098 if (flags & 8)
1904 { 2099 {
2100 uint8_t ext, cmd;
2101
1905 if (extmap) 2102 do
1906 { 2103 {
1907 uint8_t ext, cmd; 2104 ext = *data++;
2105 cmd = ext & 0x7f;
1908 2106
1909 do 2107 if (cmd < 4)
2108 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2109 else if (cmd == 5) // health
1910 { 2110 {
1911 ext = *data++;
1912 cmd = ext & 0x7f;
1913
1914 if (cmd < 4)
1915 cell->darkness = 255 - ext * 64 + 1;
1916 else if (cmd == 5) // health
1917 {
1918 cell->stat_width = 1; 2111 cell->stat_width = 1;
1919 cell->stat_hp = *data++; 2112 cell->stat_hp = *data++;
1920 }
1921 else if (cmd == 6) // monster width
1922 cell->stat_width = *data++ + 1;
1923 else if (cmd == 0x47)
1924 {
1925 if (*data == 1) cell->player = data [1];
1926 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1927 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1928 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1929
1930 data += *data + 1;
1931 }
1932 else if (cmd == 8) // cell flags
1933 cell->flags = *data++;
1934 else if (ext & 0x40) // unknown, multibyte => skip
1935 data += *data + 1;
1936 else
1937 data++;
1938 } 2113 }
1939 while (ext & 0x80); 2114 else if (cmd == 6) // monster width
2115 cell->stat_width = *data++ + 1;
2116 else if (cmd == 0x47)
2117 {
2118 if (*data == 1) cell->player = data [1];
2119 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2120 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2121 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2122
2123 data += *data + 1;
2124 }
2125 else if (cmd == 8) // cell flags
2126 cell->flags = *data++;
2127 else if (ext & 0x40) // unknown, multibyte => skip
2128 data += *data + 1;
2129 else
2130 data++;
1940 } 2131 }
1941 else 2132 while (ext & 0x80);
1942 cell->darkness = *data++ + 1;
1943 } 2133 }
1944 2134
1945 for (z = 0; z <= 2; ++z) 2135 for (z = 0; z <= 2; ++z)
1946 if (flags & (4 >> z)) 2136 if (flags & (4 >> z))
1947 { 2137 {
1995 ? self->row + y 2185 ? self->row + y
1996 : 0; 2186 : 0;
1997 2187
1998 for (x = x0; x < x1; x++) 2188 for (x = x0; x < x1; x++)
1999 { 2189 {
2000 int r = 32, g = 32, b = 32, a = 192; 2190 unsigned int r = 32, g = 32, b = 32, a = 192;
2001 2191
2002 if (row && row->c0 <= x && x < row->c1) 2192 if (row && row->c0 <= x && x < row->c1)
2003 { 2193 {
2004 mapcell *cell = row->col + (x - row->c0); 2194 mapcell *cell = row->col + (x - row->c0);
2005 2195
2007 { 2197 {
2008 maptex tex = self->tex [cell->tile [z]]; 2198 maptex tex = self->tex [cell->tile [z]];
2009 int a0 = 255 - tex.a; 2199 int a0 = 255 - tex.a;
2010 int a1 = tex.a; 2200 int a1 = tex.a;
2011 2201
2012 r = (r * a0 + tex.r * a1) / 255; 2202 r = div255 (r * a0 + tex.r * a1);
2013 g = (g * a0 + tex.g * a1) / 255; 2203 g = div255 (g * a0 + tex.g * a1);
2014 b = (b * a0 + tex.b * a1) / 255; 2204 b = div255 (b * a0 + tex.b * a1);
2015 a = (a * a0 + tex.a * a1) / 255; 2205 a = div255 (a * a0 + tex.a * a1);
2016 } 2206 }
2017 } 2207 }
2018 2208
2019 *map++ = (r ) 2209 *map++ = (r )
2020 | (g << 8) 2210 | (g << 8)
2021 | (b << 16) 2211 | (b << 16)
2022 | (a << 24); 2212 | (a << 24);
2023 } 2213 }
2024 } 2214 }
2025 2215
2026 RETVAL = map_sv; 2216 RETVAL = map_sv;
2027} 2217}
2028 OUTPUT: 2218 OUTPUT:
2029 RETVAL 2219 RETVAL
2030 2220
2031void 2221void
2032draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2222draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2033 CODE: 2223 CODE:
2034{ 2224{
2035 int x, y, z; 2225 int x, y, z;
2036 2226
2037 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2038 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2039 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2227 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2040 smooth_key skey;
2041 int pl_x, pl_y; 2228 int pl_x, pl_y;
2042 maptex pl_tex; 2229 maptex pl_tex;
2043 rc_t *rc = rc_alloc (); 2230 rc_t rc;
2044 rc_t *rc_ov = rc_alloc (); 2231 rc_t rc_ov;
2045 rc_key_t key; 2232 rc_key_t key;
2046 rc_array_t *arr, *arr_hidden; 2233 rc_t::array_t *arr;
2047 2234
2048 pl_tex.name = 0; 2235 pl_tex.name = 0;
2049 2236
2050 // that's current max. sorry. 2237 // that's current max. sorry.
2051 if (sw > 255) sw = 255; 2238 if (sw > 255) sw = 255;
2052 if (sh > 255) sh = 255; 2239 if (sh > 255) sh = 255;
2053
2054 // clear key, in case of extra padding
2055 memset (&skey, 0, sizeof (skey));
2056 2240
2057 memset (&key, 0, sizeof (key)); 2241 memset (&key, 0, sizeof (key));
2058 key.r = 255; 2242 key.r = 255;
2059 key.g = 255; 2243 key.g = 255;
2060 key.b = 255; 2244 key.b = 255;
2066 my += self->y; 2250 my += self->y;
2067 2251
2068 // first pass: determine smooth_max 2252 // first pass: determine smooth_max
2069 // rather ugly, if you ask me 2253 // rather ugly, if you ask me
2070 // could also be stored inside mapcell and updated on change 2254 // could also be stored inside mapcell and updated on change
2071 memset (smooth_max, 0, sizeof (smooth_max)); 2255 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2072 2256
2073 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
2074 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
2075 { 2259 {
2076 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
2089 2273
2090 glEnable (GL_BLEND); 2274 glEnable (GL_BLEND);
2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2276 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2093 2277
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096
2097 for (z = 0; z <= 2; z++) 2278 for (z = 0; z <= 2; z++)
2098 { 2279 {
2099 memset (smooth_level, 0, sizeof (smooth_level)); 2280 std::bitset<256> smooth_level; // one bit for every possible smooth level
2281 smooth_key skey;
2282 smooth_hash smooth;
2100 key.texname = -1; 2283 key.texname = -1;
2101 2284
2102 for (y = 0; y < sh; y++) 2285 for (y = 0; y < sh; y++)
2103 if (0 <= y + my && y + my < self->rows) 2286 if (0 <= y + my && y + my < self->rows)
2104 { 2287 {
2121 2304
2122 if (!tex.name) 2305 if (!tex.name)
2123 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2306 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2124 2307
2125 key.texname = tex.name; 2308 key.texname = tex.name;
2126 arr = rc_array (rc, &key); 2309 arr = &rc.array (key);
2127 } 2310 }
2128 2311
2129 px = (x + 1) * T - tex.w; 2312 px = (x + 1) * Th - tex.w;
2130 py = (y + 1) * T - tex.h; 2313 py = (y + 1) * Tw - tex.h;
2131 2314
2132 if (expect_false (cell->player == player) && expect_false (z == 2)) 2315 if (expect_false (cell->player == player) && expect_false (z == 2))
2133 { 2316 {
2134 pl_x = px; 2317 pl_x = px;
2135 pl_y = py; 2318 pl_y = py;
2136 pl_tex = tex; 2319 pl_tex = tex;
2137 continue; 2320 continue;
2138 } 2321 }
2139 2322
2140 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2323 arr->t2f_v3f (0 , 0 , px , py , 0);
2141 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2324 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2142 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2325 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2143 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2326 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2144 2327
2145 // update smooth hash 2328 // update smooth hash
2146 if (tex.smoothtile) 2329 if (tex.smoothtile)
2147 { 2330 {
2148 skey.tile = tex.smoothtile; 2331 skey.tile = tex.smoothtile;
2149 skey.level = tex.smoothlevel; 2332 skey.level = tex.smoothlevel;
2150 2333
2151 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2334 smooth_level[tex.smoothlevel] = 1;
2152 2335
2153 // add bits to current tile and all neighbours. skey.x|y is 2336 // add bits to current tile and all neighbours. skey.x|y is
2154 // shifted +1|+1 so we always stay positive. 2337 // shifted +1|+1 so we always stay positive.
2155 2338
2156 // bits is ___n cccc CCCC bbbb 2339 // bits is ___n cccc CCCC bbbb
2164 2347
2165 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2348 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2166 // ·· ·· ·┏ ┓· 2349 // ·· ·· ·┏ ┓·
2167 2350
2168 // full tile 2351 // full tile
2169 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2352 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2170 2353
2171 // borders 2354 // borders
2172 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2355 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2173 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2356 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2174 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2357 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2175 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2358 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2176 2359
2177 // corners 2360 // corners
2178 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2361 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2179 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2362 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2180 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2363 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2181 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2364 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2182 } 2365 }
2183 } 2366 }
2184 2367
2185 if (expect_false (z == 2)) 2368 if (expect_false (z == 2) && expect_false (cell->flags))
2186 { 2369 {
2187 /* draw question marks on top of hidden spaces */ 2370 // overlays such as the speech bubble, probably more to come
2188 if (!cell->darkness) 2371 if (cell->flags & 1)
2189 { 2372 {
2190 maptex tex = self->tex [TEXID_HIDDEN];
2191 int px = (x + 1) * T - tex.w;
2192 int py = (y + 1) * T - tex.h;
2193
2194 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198 }
2199
2200 if (expect_false (cell->flags))
2201 {
2202 // overlays such as the speech bubble, probably more to come
2203 if (cell->flags & 1)
2204 {
2205 rc_key_t key_ov = key; 2373 rc_key_t key_ov = key;
2206 maptex tex = self->tex [TEXID_SPEECH]; 2374 maptex tex = self->tex[TEXID_SPEECH];
2207 rc_array_t *arr;
2208 int px = x * T + T * 2 / 32; 2375 int px = x * Tw + Tw * 2 / 32;
2209 int py = y * T - T * 6 / 32; 2376 int py = y * Th - Th * 6 / 32;
2210 2377
2211 key_ov.texname = tex.name; 2378 key_ov.texname = tex.name;
2212 arr = rc_array (rc_ov, &key_ov); 2379 rc_t::array_t &arr = rc_ov.array (key_ov);
2213 2380
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2381 arr.t2f_v3f (0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2382 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2383 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2384 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2218 }
2219 } 2385 }
2220 } 2386 }
2221 } 2387 }
2222 } 2388 }
2223 2389
2224 rc_draw (rc); 2390 rc.draw ();
2225 rc_clear (rc); 2391 rc.clear ();
2226 2392
2227 // go through all smoothlevels, lowest to highest, then draw. 2393 // go through all smoothlevels, lowest to highest, then draw.
2228 // this is basically counting sort 2394 // this is basically counting sort
2229 { 2395 {
2230 int w, b; 2396 int w, b;
2231 2397
2232 glEnable (GL_TEXTURE_2D); 2398 glEnable (GL_TEXTURE_2D);
2233 glBegin (GL_QUADS); 2399 glBegin (GL_QUADS);
2234 for (w = 0; w < 256 / 32; ++w) 2400 for (int level = 0; level < smooth_level.size (); ++level)
2401 if (smooth_level[level])
2402 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2235 { 2403 {
2236 uint32_t smask = smooth_level [w]; 2404 smooth_key &skey = it->first;
2237 if (smask) 2405 IV bits = it->second;
2238 for (b = 0; b < 32; ++b) 2406
2239 if (smask & (((uint32_t)1) << b)) 2407 if (!(bits & 0x1000)
2408 && skey.level == level
2409 && level > smooth_max [skey.x][skey.y])
2240 { 2410 {
2241 int level = (w << 5) | b; 2411 maptex tex = self->tex [skey.tile];
2412 int px = (((int)skey.x) - 1) * Tw;
2413 int py = (((int)skey.y) - 1) * Th;
2414 int border = bits & 15;
2415 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2416 float dx = tex.s * .0625f; // 16 images/row
2417 float dy = tex.t * .5f ; // 2 images/column
2418
2242 HE *he; 2419 if (tex.name)
2243
2244 hv_iterinit (smooth);
2245 while ((he = hv_iternext (smooth)))
2246 { 2420 {
2247 smooth_key *skey = (smooth_key *)HeKEY (he); 2421 // this time avoiding texture state changes
2248 IV bits = SvIVX (HeVAL (he)); 2422 // save gobs of state changes.
2249 2423 if (key.texname != tex.name)
2250 if (!(bits & 0x1000)
2251 && skey->level == level
2252 && level > smooth_max [skey->x][skey->y])
2253 { 2424 {
2254 maptex tex = self->tex [skey->tile];
2255 int px = (((int)skey->x) - 1) * T;
2256 int py = (((int)skey->y) - 1) * T;
2257 int border = bits & 15;
2258 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2259 float dx = tex.s * .0625f; // 16 images/row
2260 float dy = tex.t * .5f ; // 2 images/column
2261
2262 if (tex.name)
2263 {
2264 // this time avoiding texture state changes
2265 // save gobs of state changes.
2266 if (key.texname != tex.name)
2267 {
2268 self->tex [skey->tile].unused = 0; 2425 self->tex [skey.tile].unused = 0;
2269 2426
2270 glEnd (); 2427 glEnd ();
2271 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2428 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2272 glBegin (GL_QUADS); 2429 glBegin (GL_QUADS);
2273 } 2430 }
2274 2431
2275 if (border) 2432 if (border)
2276 { 2433 {
2277 float ox = border * dx; 2434 float ox = border * dx;
2278 2435
2279 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2436 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2280 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2281 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2438 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2282 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2439 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2283 } 2440 }
2284 2441
2285 if (corner) 2442 if (corner)
2286 { 2443 {
2287 float ox = corner * dx; 2444 float ox = corner * dx;
2288 2445
2289 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2446 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2290 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2447 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2291 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2448 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2292 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2449 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2293 }
2294 }
2295 } 2450 }
2296 } 2451 }
2297 } 2452 }
2298 } 2453 }
2299 2454
2300 glEnd (); 2455 glEnd ();
2301 glDisable (GL_TEXTURE_2D); 2456 glDisable (GL_TEXTURE_2D);
2302 key.texname = -1; 2457 key.texname = -1;
2303 } 2458 }
2304
2305 hv_clear (smooth);
2306 } 2459 }
2307 2460
2308 if (pl_tex.name) 2461 if (pl_tex.name)
2309 { 2462 {
2310 maptex tex = pl_tex; 2463 maptex tex = pl_tex;
2311 int px = pl_x + sdx; 2464 int px = pl_x + sdx;
2312 int py = pl_y + sdy; 2465 int py = pl_y + sdy;
2313 2466
2314 key.texname = tex.name; 2467 key.texname = tex.name;
2315 arr = rc_array (rc, &key); 2468 rc_t::array_t &arr = rc.array (key);
2316 2469
2317 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2470 arr.t2f_v3f (0 , 0 , px , py , 0);
2318 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2471 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2319 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2472 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2320 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2473 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2321 2474
2322 rc_draw (rc); 2475 rc.draw ();
2323 } 2476 }
2324 2477
2325 rc_draw (rc_ov); 2478 rc_ov.draw ();
2326 rc_clear (rc_ov); 2479 rc_ov.clear ();
2327 2480
2328 glDisable (GL_BLEND); 2481 glDisable (GL_BLEND);
2329 rc_free (rc);
2330 rc_free (rc_ov);
2331 2482
2332 // top layer: overlays such as the health bar 2483 // top layer: overlays such as the health bar
2333 for (y = 0; y < sh; y++) 2484 for (y = 0; y < sh; y++)
2334 if (0 <= y + my && y + my < self->rows) 2485 if (0 <= y + my && y + my < self->rows)
2335 { 2486 {
2338 for (x = 0; x < sw; x++) 2489 for (x = 0; x < sw; x++)
2339 if (row->c0 <= x + mx && x + mx < row->c1) 2490 if (row->c0 <= x + mx && x + mx < row->c1)
2340 { 2491 {
2341 mapcell *cell = row->col + (x + mx - row->c0); 2492 mapcell *cell = row->col + (x + mx - row->c0);
2342 2493
2343 int px = x * T; 2494 int px = x * Tw;
2344 int py = y * T; 2495 int py = y * Th;
2345 2496
2346 if (expect_false (cell->player == player)) 2497 if (expect_false (cell->player == player))
2347 { 2498 {
2348 px += sdx; 2499 px += sdx;
2349 py += sdy; 2500 py += sdy;
2350 } 2501 }
2351 2502
2352 if (cell->stat_hp) 2503 if (cell->stat_hp)
2353 { 2504 {
2354 int width = cell->stat_width * T; 2505 int width = cell->stat_width * Tw;
2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2506 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2356 2507
2357 glColor3ub (0, 0, 0); 2508 glColor3ub (0, 0, 0);
2358 glRectf (px + 1, py - thick - 2, 2509 glRectf (px + 1, py - thick - 2,
2359 px + width - 1, py); 2510 px + width - 1, py);
2360 2511
2366 } 2517 }
2367 } 2518 }
2368} 2519}
2369 2520
2370void 2521void
2371draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2522draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2372 CODE: 2523 CODE:
2373{ 2524{
2374 static float color[16][3] = { 2525 static float color[16][3] = {
2375 { 0.00F, 0.00F, 0.00F }, 2526 { 0.00f, 0.00f, 0.00f },
2376 { 1.00F, 1.00F, 1.00F }, 2527 { 1.00f, 1.00f, 1.00f },
2377 { 0.00F, 0.00F, 0.55F }, 2528 { 0.00f, 0.00f, 0.55f },
2378 { 1.00F, 0.00F, 0.00F }, 2529 { 1.00f, 0.00f, 0.00f },
2379 2530
2380 { 1.00F, 0.54F, 0.00F }, 2531 { 1.00f, 0.54f, 0.00f },
2381 { 0.11F, 0.56F, 1.00F }, 2532 { 0.11f, 0.56f, 1.00f },
2382 { 0.93F, 0.46F, 0.00F }, 2533 { 0.93f, 0.46f, 0.00f },
2383 { 0.18F, 0.54F, 0.34F }, 2534 { 0.18f, 0.54f, 0.34f },
2384 2535
2385 { 0.56F, 0.73F, 0.56F }, 2536 { 0.56f, 0.73f, 0.56f },
2386 { 0.80F, 0.80F, 0.80F }, 2537 { 0.80f, 0.80f, 0.80f },
2387 { 0.55F, 0.41F, 0.13F }, 2538 { 0.55f, 0.41f, 0.13f },
2388 { 0.99F, 0.77F, 0.26F }, 2539 { 0.99f, 0.77f, 0.26f },
2389 2540
2390 { 0.74F, 0.65F, 0.41F }, 2541 { 0.74f, 0.65f, 0.41f },
2391 2542
2392 { 0.00F, 1.00F, 1.00F }, 2543 { 0.00f, 1.00f, 1.00f },
2393 { 1.00F, 0.00F, 1.00F }, 2544 { 1.00f, 0.00f, 1.00f },
2394 { 1.00F, 1.00F, 0.00F }, 2545 { 1.00f, 1.00f, 0.00f },
2395 }; 2546 };
2396 2547
2397 int x, y; 2548 int x, y;
2398 2549
2399 glEnable (GL_TEXTURE_2D); 2550 glEnable (GL_TEXTURE_2D);
2400 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2551 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2401 * but the nvidia driver (185.18.14) mishandles alpha textures 2552 * but the nvidia driver (185.18.14) mishandles alpha textures
2402 * ansd takes the colour from god knows where instead of using 2553 * and takes the colour from god knows where instead of using
2403 * Cp. MODULATE results in the same colour, but slightly different 2554 * Cp. MODULATE results in the same colour, but slightly different
2404 * alpha, but atcually gives us the correct colour with nvidia. 2555 * alpha, but atcually gives us the correct colour with nvidia.
2405 */ 2556 */
2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2407 glEnable (GL_BLEND); 2558 glEnable (GL_BLEND);
2415 2566
2416 if (m) 2567 if (m)
2417 { 2568 {
2418 float *c = color [m & 15]; 2569 float *c = color [m & 15];
2419 2570
2420 float tx1 = m & 0x40 ? 0.5 : 0.; 2571 float tx1 = m & 0x40 ? 0.5f : 0.f;
2421 float tx2 = tx1 + 0.5; 2572 float tx2 = tx1 + 0.5f;
2422 2573
2423 glColor4f (c[0], c[1], c[2], 1); 2574 glColor4f (c[0], c[1], c[2], 1);
2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2575 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2576 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2577 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2436void 2587void
2437fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2588fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2438 PPCODE: 2589 PPCODE:
2439{ 2590{
2440 int x, y; 2591 int x, y;
2441 int sw1 = sw + 2; 2592 int sw1 = sw + 2;
2442 int sh1 = sh + 2; 2593 int sh1 = sh + 2;
2443 int sh3 = sh * 3; 2594 int sh3 = sh * 3;
2444 int sw34 = (sw * 3 + 3) & ~3; 2595 int sw3 = sw * 3;
2596 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2597 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2445 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2598 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2446 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2599 memset (darkness1, 0, sw1*sh1);
2447 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2448 2600
2449 SvPOK_only (darkness3_sv); 2601 SvPOK_only (darkness3_sv);
2450 SvCUR_set (darkness3_sv, sw34 * sh3); 2602 SvCUR_set (darkness3_sv, sw3 * sh3);
2451 2603
2452 mx += self->x - 1; 2604 mx += self->x - 1;
2453 my += self->y - 1; 2605 my += self->y - 1;
2454
2455 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2456 2606
2457 for (y = 0; y < sh1; y++) 2607 for (y = 0; y < sh1; y++)
2458 if (0 <= y + my && y + my < self->rows) 2608 if (0 <= y + my && y + my < self->rows)
2459 { 2609 {
2460 maprow *row = self->row + (y + my); 2610 maprow *row = self->row + (y + my);
2463 if (row->c0 <= x + mx && x + mx < row->c1) 2613 if (row->c0 <= x + mx && x + mx < row->c1)
2464 { 2614 {
2465 mapcell *cell = row->col + (x + mx - row->c0); 2615 mapcell *cell = row->col + (x + mx - row->c0);
2466 2616
2467 darkness1 [y * sw1 + x] = cell->darkness 2617 darkness1 [y * sw1 + x] = cell->darkness
2468 ? 255 - (cell->darkness - 1) 2618 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2469 : 255 - FOW_DARKNESS; 2619 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2470 } 2620 }
2471 } 2621 }
2472 2622
2473 for (y = 0; y < sh; ++y) 2623 for (y = 0; y < sh; ++y)
2474 for (x = 0; x < sw; ++x) 2624 for (x = 0; x < sw; ++x)
2493 2643
2494 uint8_t r13 = (d13 + d23 + d12) / 3; 2644 uint8_t r13 = (d13 + d23 + d12) / 3;
2495 uint8_t r23 = d23; 2645 uint8_t r23 = d23;
2496 uint8_t r33 = (d23 + d33 + d32) / 3; 2646 uint8_t r33 = (d23 + d33 + d32) / 3;
2497 2647
2498 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2648 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2499 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2649 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2500 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2650 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2501 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2651 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2502 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2652 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2503 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2653 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2504 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2654 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2505 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2655 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2506 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2656 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2507 } 2657 }
2508 2658
2509 free (darkness1); 2659 free (darkness1);
2510 2660
2511 EXTEND (SP, 3); 2661 EXTEND (SP, 3);
2512 PUSHs (sv_2mortal (newSViv (sw34))); 2662 PUSHs (sv_2mortal (newSViv (sw3)));
2513 PUSHs (sv_2mortal (newSViv (sh3))); 2663 PUSHs (sv_2mortal (newSViv (sh3)));
2514 PUSHs (darkness3_sv); 2664 PUSHs (darkness3_sv);
2515} 2665}
2516 2666
2517SV * 2667SV *
2580 else 2730 else
2581 *data++ = 0; 2731 *data++ = 0;
2582 } 2732 }
2583 } 2733 }
2584 2734
2585 /* if size is w*h + 5 then no data has been found */ 2735 /* if size is w*h + 5 then no data has been found */
2586 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2736 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2587 { 2737 {
2588 SvPOK_only (data_sv); 2738 SvPOK_only (data_sv);
2589 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2739 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2590 } 2740 }
2591 2741
2592 RETVAL = data_sv; 2742 RETVAL = data_sv;
2593} 2743}
2594 OUTPUT: 2744 OUTPUT:
2595 RETVAL 2745 RETVAL
2596 2746
2597void 2747void
2604 STRLEN len; 2754 STRLEN len;
2605 uint8_t *data, *end; 2755 uint8_t *data, *end;
2606 2756
2607 len = SvLEN (data_sv); 2757 len = SvLEN (data_sv);
2608 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2758 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2609 data = SvPVbyte_nolen (data_sv); 2759 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2610 end = data + len + 8; 2760 end = data + len + 8;
2611 2761
2612 if (len < 5) 2762 if (len < 5)
2613 XSRETURN_EMPTY; 2763 XSRETURN_EMPTY;
2614 2764
2675} 2825}
2676 2826
2677MODULE = Deliantra::Client PACKAGE = DC::RW 2827MODULE = Deliantra::Client PACKAGE = DC::RW
2678 2828
2679DC::RW 2829DC::RW
2680new (SV *class, SV *data_sv) 2830new (SV *klass, SV *data_sv)
2681 CODE: 2831 CODE:
2682{ 2832{
2683 STRLEN datalen; 2833 STRLEN datalen;
2684 char *data = SvPVbyte (data_sv, datalen); 2834 char *data = SvPVbyte (data_sv, datalen);
2685 2835
2687} 2837}
2688 OUTPUT: 2838 OUTPUT:
2689 RETVAL 2839 RETVAL
2690 2840
2691DC::RW 2841DC::RW
2692new_from_file (SV *class, const char *path, const char *mode = "rb") 2842new_from_file (SV *klass, const char *path, const char *mode = "rb")
2693 CODE: 2843 CODE:
2694 RETVAL = SDL_RWFromFile (path, mode); 2844 RETVAL = SDL_RWFromFile (path, mode);
2695 OUTPUT: 2845 OUTPUT:
2696 RETVAL 2846 RETVAL
2697 2847
2715 if (RETVAL < 0) 2865 if (RETVAL < 0)
2716 { 2866 {
2717 RETVAL = Mix_GroupOldest (-1); 2867 RETVAL = Mix_GroupOldest (-1);
2718 2868
2719 if (RETVAL < 0) 2869 if (RETVAL < 0)
2870 {
2871 // happens sometimes, maybe it just stopped playing(?)
2872 RETVAL = Mix_GroupAvailable (-1);
2873
2874 if (RETVAL < 0)
2720 XSRETURN_UNDEF; 2875 XSRETURN_UNDEF;
2721 2876 }
2877 else
2722 Mix_HaltChannel (RETVAL); 2878 Mix_HaltChannel (RETVAL);
2723 } 2879 }
2724 2880
2725 Mix_UnregisterAllEffects (RETVAL); 2881 Mix_UnregisterAllEffects (RETVAL);
2726 Mix_Volume (RETVAL, 128); 2882 Mix_Volume (RETVAL, 128);
2727} 2883}
2774void 2930void
2775set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2931set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2776 CODE: 2932 CODE:
2777{ 2933{
2778 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2934 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2779 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2935 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2780 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2936 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2781} 2937}
2782 2938
2783void 2939void
2784set_reverse_stereo (DC::Channel self, int flip) 2940set_reverse_stereo (DC::Channel self, int flip)
2787 2943
2788MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2944MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2789 2945
2790PROTOTYPES: DISABLE 2946PROTOTYPES: DISABLE
2791 2947
2948void
2949decoders ()
2950 PPCODE:
2951#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2952 int i, num = Mix_GetNumChunkDecoders ();
2953 EXTEND (SP, num);
2954 for (i = 0; i < num; ++i)
2955 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2956#else
2957 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2958#endif
2959
2792DC::MixChunk 2960DC::MixChunk
2793new (SV *class, DC::RW rwops) 2961new (SV *klass, DC::RW rwops)
2794 CODE: 2962 CODE:
2795 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2963 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2796 OUTPUT: 2964 OUTPUT:
2797 RETVAL 2965 RETVAL
2798 2966
2828 OUTPUT: 2996 OUTPUT:
2829 RETVAL 2997 RETVAL
2830 2998
2831MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2999MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2832 3000
3001void
3002decoders ()
3003 PPCODE:
3004#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3005 int i, num = Mix_GetNumMusicDecoders ();
3006 EXTEND (SP, num);
3007 for (i = 0; i < num; ++i)
3008 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3009#else
3010 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3011#endif
3012
2833int 3013int
2834volume (int volume = -1) 3014volume (int volume = -1)
2835 PROTOTYPE: ;$ 3015 PROTOTYPE: ;$
2836 CODE: 3016 CODE:
2837 if (items > 0) 3017 if (items > 0)
2848void 3028void
2849halt () 3029halt ()
2850 CODE: 3030 CODE:
2851 Mix_HaltMusic (); 3031 Mix_HaltMusic ();
2852 3032
3033int
3034playing ()
3035 CODE:
3036 RETVAL = Mix_PlayingMusic ();
3037 OUTPUT:
3038 RETVAL
3039
2853DC::MixMusic 3040DC::MixMusic
2854new (SV *class, DC::RW rwops) 3041new (SV *klass, DC::RW rwops)
2855 CODE: 3042 CODE:
2856 RETVAL = Mix_LoadMUS_RW (rwops); 3043 RETVAL = Mix_LoadMUS_RW (rwops);
2857 OUTPUT: 3044 OUTPUT:
2858 RETVAL 3045 RETVAL
2859 3046
2996 const_iv (GL_FUNC_SUBTRACT), 3183 const_iv (GL_FUNC_SUBTRACT),
2997 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3184 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2998# undef const_iv 3185# undef const_iv
2999 }; 3186 };
3000 3187
3001 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3188 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3189 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3003 3190
3004 texture_av = newAV (); 3191 texture_av = newAV ();
3005 AvREAL_off (texture_av); 3192 AvREAL_off (texture_av);
3006} 3193}
3007 3194
3012 gl.BlendFuncSeparateEXT = 0; 3199 gl.BlendFuncSeparateEXT = 0;
3013 3200
3014void 3201void
3015apple_nvidia_bug (int enable) 3202apple_nvidia_bug (int enable)
3016 3203
3017char * 3204const char *
3018gl_vendor () 3205gl_vendor ()
3019 CODE: 3206 CODE:
3020 RETVAL = (char *)glGetString (GL_VENDOR); 3207 RETVAL = (const char *)glGetString (GL_VENDOR);
3021 OUTPUT: 3208 OUTPUT:
3022 RETVAL 3209 RETVAL
3023 3210
3024char * 3211const char *
3025gl_version () 3212gl_version ()
3026 CODE: 3213 CODE:
3027 RETVAL = (char *)glGetString (GL_VERSION); 3214 RETVAL = (const char *)glGetString (GL_VERSION);
3028 OUTPUT: 3215 OUTPUT:
3029 RETVAL 3216 RETVAL
3030 3217
3031char * 3218const char *
3032gl_extensions () 3219gl_extensions ()
3033 CODE: 3220 CODE:
3034 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3221 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3035 OUTPUT: 3222 OUTPUT:
3036 RETVAL 3223 RETVAL
3037 3224
3038const char *glGetString (GLenum pname) 3225const char *glGetString (GLenum pname)
3226 CODE:
3227 RETVAL = (const char *)glGetString (pname);
3228 OUTPUT:
3229 RETVAL
3039 3230
3040GLint glGetInteger (GLenum pname) 3231GLint glGetInteger (GLenum pname)
3041 CODE: 3232 CODE:
3042 glGetIntegerv (pname, &RETVAL); 3233 glGetIntegerv (pname, &RETVAL);
3043 OUTPUT: 3234 OUTPUT:
3050 RETVAL 3241 RETVAL
3051 3242
3052int glGetError () 3243int glGetError ()
3053 3244
3054void glFinish () 3245void glFinish ()
3246
3247void glFlush ()
3055 3248
3056void glClear (int mask) 3249void glClear (int mask)
3057 3250
3058void glClearColor (float r, float g, float b, float a = 1.0) 3251void glClearColor (float r, float g, float b, float a = 1.0)
3059 PROTOTYPE: @ 3252 PROTOTYPE: @
3231 3424
3232void glEndList () 3425void glEndList ()
3233 3426
3234void glCallList (int list) 3427void glCallList (int list)
3235 3428
3429void c_init ()
3430 CODE:
3431 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3432 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3433
3236MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3434MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3237 3435
3238PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
3239 3437
3240void 3438void
3241find_widget (SV *self, NV x, NV y) 3439find_widget (SV *self, NV x, NV y)
3242 PPCODE: 3440 PPCODE:
3243{ 3441{
3244 if (within_widget (self, x, y)) 3442 if (within_widget (self, x, y))
3245 XPUSHs (self); 3443 XPUSHs (self);
3246} 3444}
3247 3445
3248BOOT: 3446BOOT:
3249{ 3447{
3257 3455
3258void 3456void
3259draw (SV *self) 3457draw (SV *self)
3260 CODE: 3458 CODE:
3261{ 3459{
3262 HV *hv; 3460 HV *hv;
3263 SV **svp; 3461 SV **svp;
3264 NV x, y, w, h; 3462 NV x, y, w, h;
3265 SV *draw_x_sv = GvSV (draw_x_gv); 3463 SV *draw_x_sv = GvSV (draw_x_gv);
3266 SV *draw_y_sv = GvSV (draw_y_gv); 3464 SV *draw_y_sv = GvSV (draw_y_gv);
3267 SV *draw_w_sv = GvSV (draw_w_gv); 3465 SV *draw_w_sv = GvSV (draw_w_gv);
3268 SV *draw_h_sv = GvSV (draw_h_gv); 3466 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines