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.273 by root, Wed Aug 20 13:30:02 2008 UTC vs.
Revision 1.323 by root, Sun Nov 18 01:48:39 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
34 37
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 39
37#include <SDL.h> 40#include <SDL.h>
38#include <SDL_thread.h> 41#include <SDL_thread.h>
42#include <SDL_opengl.h> 45#include <SDL_opengl.h>
43 46
44/* work around os x broken headers */ 47/* work around os x broken headers */
45#ifdef __MACOSX__ 48#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 49typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
50typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
51typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 52#endif
48 53
49#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
51 56
52#include <glib/gmacros.h> 57#include <glib.h>
53 58
54#include <pango/pango.h> 59#include <pango/pango.h>
55 60
56#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
81#define expect_false(expr) expect ((expr) != 0, 0) 86#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 87#define expect_true(expr) expect ((expr) != 0, 1)
83 88
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 90
91/* this is used as fow flag as well, so has to have a different value */
92/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
87 95
88#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
90 98
91#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
92 100
93/* mask out modifiers we are not interested in */ 101/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
103
104#define KMOD_LRAM 0x10000 // our extension
105
106#define TEXID_SPEECH 1
107#define TEXID_NOFACE 2
108
109static char *
110fast_sv_grow (SV *sv, STRLEN need)
111{
112 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need;
114
115 if (expect_false (len < want))
116 {
117 do
118 len *= 2;
119 while (len < want);
120
121 sv_grow (sv, len);
122 }
123
124 SvCUR_set (sv, want);
125 return SvEND (sv) - need;
126}
95 127
96static AV *texture_av; 128static AV *texture_av;
97 129
98static struct 130static struct
99{ 131{
156{ 188{
157 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
158 190
159 while (attrs) 191 while (attrs)
160 { 192 {
161 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
162 194
163 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
164 return 1; 196 return 1;
165 197
166 attrs = attrs->next; 198 attrs = attrs->next;
167 } 199 }
168 200
169 return 0; 201 return 0;
170} 202}
171 203
172typedef struct cf_layout { 204struct cf_layout {
173 PangoLayout *pl; 205 PangoLayout *pl;
174 float r, g, b, a; // default color for rgba mode 206 float r, g, b, a; // default color for rgba mode
175 int base_height; 207 int base_height;
176 DC__Font font; 208 DC__Font font;
177 rc_t *rc; 209 rc_t *rc;
178} *DC__Layout; 210};
211
212typedef cf_layout *DC__Layout;
179 213
180static DC__Font default_font; 214static DC__Font default_font;
181static PangoContext *opengl_context; 215static PangoContext *opengl_context;
182static PangoFontMap *opengl_fontmap; 216static PangoFontMap *opengl_fontmap;
183 217
184static void 218static void
185substitute_func (FcPattern *pattern, gpointer data) 219substitute_func (FcPattern *pattern, gpointer data)
186{ 220{
187 FcPatternAddBool (pattern, FC_HINTING, 1); 221 FcPatternAddBool (pattern, FC_HINTING, 1);
188#ifdef FC_HINT_STYLE 222#ifdef FC_HINT_STYLE
189 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 223 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
190#endif 224#endif
191 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 225 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
192} 226}
193 227
194static void 228static void
224} 258}
225 259
226typedef uint16_t tileid; 260typedef uint16_t tileid;
227typedef uint16_t faceid; 261typedef uint16_t faceid;
228 262
229typedef struct { 263struct maptex
264{
230 GLuint name; 265 GLuint name;
231 int w, h; 266 int w, h;
232 float s, t; 267 float s, t;
233 uint8_t r, g, b, a; 268 uint8_t r, g, b, a;
234 tileid smoothtile; 269 tileid smoothtile;
235 uint8_t smoothlevel; 270 uint8_t smoothlevel;
236} maptex; 271 uint8_t unused; /* set to zero on use */
272};
237 273
238typedef struct { 274struct mapcell
275{
239 uint32_t player; 276 uint32_t player;
240 tileid tile[3]; 277 tileid tile[3];
241 uint16_t darkness; 278 uint16_t darkness;
242 uint8_t stat_width, stat_hp, flags, smoothmax; 279 uint8_t stat_width, stat_hp, flags, smoothmax;
243} mapcell; 280};
244 281
245typedef struct { 282struct maprow
283{
246 int32_t c0, c1; 284 int32_t c0, c1;
247 mapcell *col; 285 mapcell *col;
248} maprow; 286};
249 287
250typedef struct map { 288struct mapgrid {
251 int x, y, w, h; 289 int x, y, w, h;
252 int ox, oy; /* offset to virtual global coordinate system */ 290 int ox, oy; /* offset to virtual global coordinate system */
253 int faces; tileid *face2tile; // [faceid] 291 int faces; tileid *face2tile; // [faceid]
254 int texs; maptex *tex; // [tileid] 292 int texs; maptex *tex; // [tileid]
255 293
256 int32_t rows; 294 int32_t rows;
257 maprow *row; 295 maprow *row;
258} *DC__Map; 296};
297
298typedef mapgrid *DC__Map;
259 299
260static char * 300static char *
261prepend (char *ptr, int sze, int inc) 301prepend (char *ptr, int sze, int inc)
262{ 302{
263 char *p; 303 char *p;
281 321
282#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 322#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
283#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
284 324
285static void 325static void
286need_facenum (struct map *self, faceid face) 326need_facenum (struct mapgrid *self, faceid face)
287{ 327{
288 while (self->faces <= face) 328 while (self->faces <= face)
289 { 329 {
290 Append (tileid, self->face2tile, self->faces, self->faces); 330 Append (tileid, self->face2tile, self->faces, self->faces);
291 self->faces *= 2; 331 self->faces *= 2;
292 } 332 }
293} 333}
294 334
295static void 335static void
296need_texid (struct map *self, int texid) 336need_texid (struct mapgrid *self, int texid)
297{ 337{
298 while (self->texs <= texid) 338 while (self->texs <= texid)
299 { 339 {
300 Append (maptex, self->tex, self->texs, self->texs); 340 Append (maptex, self->tex, self->texs, self->texs);
301 self->texs *= 2; 341 self->texs *= 2;
302 } 342 }
303} 343}
304 344
305static maprow * 345static maprow *
306map_get_row (DC__Map self, int y) 346map_get_row (mapgrid *self, int y)
307{ 347{
308 if (0 > y) 348 if (0 > y)
309 { 349 {
310 int extend = - y + MAP_EXTEND_Y; 350 int extend = - y + MAP_EXTEND_Y;
311 Prepend (maprow, self->row, self->rows, extend); 351 Prepend (maprow, self->row, self->rows, extend);
349 389
350 return row->col + (x - row->c0); 390 return row->col + (x - row->c0);
351} 391}
352 392
353static mapcell * 393static mapcell *
354map_get_cell (DC__Map self, int x, int y) 394map_get_cell (mapgrid *self, int x, int y)
355{ 395{
356 return row_get_cell (map_get_row (self, y), x); 396 return row_get_cell (map_get_row (self, y), x);
357} 397}
358 398
359static void 399static void
360map_clear (DC__Map self) 400map_clear (mapgrid *self)
361{ 401{
362 int r; 402 int r;
363 403
364 for (r = 0; r < self->rows; r++) 404 for (r = 0; r < self->rows; r++)
365 Safefree (self->row[r].col); 405 Safefree (self->row[r].col);
383 (cell)->flags = 0; \ 423 (cell)->flags = 0; \
384 (cell)->player = 0; \ 424 (cell)->player = 0; \
385 } while (0) 425 } while (0)
386 426
387static void 427static void
388map_blank (DC__Map self, int x0, int y0, int w, int h) 428map_blank (mapgrid *self, int x0, int y0, int w, int h)
389{ 429{
390 int x, y; 430 int x, y;
391 maprow *row; 431 maprow *row;
392 mapcell *cell; 432 mapcell *cell;
393 433
410 CELL_CLEAR (cell); 450 CELL_CLEAR (cell);
411 } 451 }
412 } 452 }
413} 453}
414 454
415typedef struct { 455struct smooth_key
456{
416 tileid tile; 457 tileid tile;
417 uint8_t x, y, level; 458 uint8_t x, y, level;
418} smooth_key; 459
460 bool operator == (const smooth_key &o) const
461 {
462 return tile == o.tile && x == o.x && y == o.y && level == o.level;
463 }
464};
465
466typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
467
468namespace std {
469 template <>
470 struct hash<smooth_key>
471 {
472 size_t operator () (const smooth_key &v) const
473 {
474 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
475 }
476 };
477}
419 478
420static void 479static void
421smooth_or_bits (HV *hv, smooth_key *key, IV bits) 480smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
422{ 481{
423 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 482 auto &&it = h.find (key);
424 483
425 if (SvIOK (*sv)) 484 if (it == h.end ())
426 SvIV_set (*sv, SvIVX (*sv) | bits); 485 h.insert (std::make_pair (key, bits));
427 else 486 else
428 sv_setiv (*sv, bits); 487 it->second |= bits;
429} 488}
430 489
431static void 490static void
432music_finished (void) 491music_finished (void)
433{ 492{
450 ev.code = 1; 509 ev.code = 1;
451 ev.data1 = (void *)(long)channel; 510 ev.data1 = (void *)(long)channel;
452 ev.data2 = 0; 511 ev.data2 = 0;
453 512
454 SDL_PushEvent ((SDL_Event *)&ev); 513 SDL_PushEvent ((SDL_Event *)&ev);
514}
515
516// approximately divide by 255
517static unsigned int
518div255 (unsigned int n)
519{
520 return (n + (n >> 8)) >> 8;
455} 521}
456 522
457static unsigned int 523static unsigned int
458minpot (unsigned int n) 524minpot (unsigned int n)
459{ 525{
527 return 0; 593 return 0;
528 594
529 return 1; 595 return 1;
530} 596}
531 597
598/******************************************************************************/
599
600/* process keyboard modifiers */
601static int
602mod_munge (int mod)
603{
604 mod &= MOD_MASK;
605
606 if (mod & (KMOD_META | KMOD_ALT))
607 mod |= KMOD_LRAM;
608
609 return mod;
610}
611
532static void 612static void
533deliantra_main () 613deliantra_main (SV *real_main)
534{ 614{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537 dSP; 615 dSP;
616
617 PUSHMARK (SP);
618 call_sv (real_main, G_DISCARD | G_VOID);
538} 619}
539 620
540#ifdef __MACOSX__ 621#ifdef __MACOSX__
622 static SV *real_main;
623
541 /* to due surprising braindamage on the side of SDL design, we 624 /* to due surprising braindamage on the side of SDL design, we
542 * do some mind-boggling hack here: SDL requires a custom main() 625 * do some mind-boggling hack here: SDL requires a custom main()
543 * on OS X, so... we provide one and call the original main(), which, 626 * on OS X, so... we provide one and call the original main(), which,
544 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 627 * due to shared library magic, calls -lSDLmain's main, not perl's main,
545 * and which calls our main (== SDL_main) back. 628 * and which calls our main (== SDL_main) back.
546 */ 629 */
547 extern C_LINKAGE int 630 extern C_LINKAGE int
548 main (int argc, char *argv[]) 631 main (int argc, char *argv[])
549 { 632 {
550 deliantra_main (); 633 deliantra_main (real_main);
551 } 634 }
552 635
553 #undef main 636 #undef main
554 637
555 extern C_LINKAGE int main (int argc, char *argv[]); 638 extern C_LINKAGE int main (int argc, char *argv[]);
556 639
557 static void 640 static void
558 SDL_braino (void) 641 SDL_main_hack (SV *real_main_)
559 { 642 {
643 real_main = real_main_;
644
560 char *argv[] = { "deliantra client", 0 }; 645 char *argv[] = { "deliantra client", 0 };
561 (main) (1, argv); 646 (main) (1, argv);
562 } 647 }
563#else 648#else
564 static void 649 static void
565 SDL_braino (void) 650 SDL_main_hack (SV *real_main)
566 { 651 {
567 deliantra_main (); 652 deliantra_main (real_main);
568 } 653 }
569#endif 654#endif
570 655
571MODULE = Deliantra::Client PACKAGE = DC 656MODULE = Deliantra::Client PACKAGE = DC
572 657
603 const_iv (SDL_USEREVENT), 688 const_iv (SDL_USEREVENT),
604 689
605 const_iv (SDL_APPINPUTFOCUS), 690 const_iv (SDL_APPINPUTFOCUS),
606 const_iv (SDL_APPMOUSEFOCUS), 691 const_iv (SDL_APPMOUSEFOCUS),
607 const_iv (SDL_APPACTIVE), 692 const_iv (SDL_APPACTIVE),
693
694
695 const_iv (SDLK_UNKNOWN),
696 const_iv (SDLK_FIRST),
697 const_iv (SDLK_BACKSPACE),
698 const_iv (SDLK_TAB),
699 const_iv (SDLK_CLEAR),
700 const_iv (SDLK_RETURN),
701 const_iv (SDLK_PAUSE),
702 const_iv (SDLK_ESCAPE),
703 const_iv (SDLK_SPACE),
704 const_iv (SDLK_EXCLAIM),
705 const_iv (SDLK_QUOTEDBL),
706 const_iv (SDLK_HASH),
707 const_iv (SDLK_DOLLAR),
708 const_iv (SDLK_AMPERSAND),
709 const_iv (SDLK_QUOTE),
710 const_iv (SDLK_LEFTPAREN),
711 const_iv (SDLK_RIGHTPAREN),
712 const_iv (SDLK_ASTERISK),
713 const_iv (SDLK_PLUS),
714 const_iv (SDLK_COMMA),
715 const_iv (SDLK_MINUS),
716 const_iv (SDLK_PERIOD),
717 const_iv (SDLK_SLASH),
718 const_iv (SDLK_0),
719 const_iv (SDLK_1),
720 const_iv (SDLK_2),
721 const_iv (SDLK_3),
722 const_iv (SDLK_4),
723 const_iv (SDLK_5),
724 const_iv (SDLK_6),
725 const_iv (SDLK_7),
726 const_iv (SDLK_8),
727 const_iv (SDLK_9),
728 const_iv (SDLK_COLON),
729 const_iv (SDLK_SEMICOLON),
730 const_iv (SDLK_LESS),
731 const_iv (SDLK_EQUALS),
732 const_iv (SDLK_GREATER),
733 const_iv (SDLK_QUESTION),
734 const_iv (SDLK_AT),
735
736 const_iv (SDLK_LEFTBRACKET),
737 const_iv (SDLK_BACKSLASH),
738 const_iv (SDLK_RIGHTBRACKET),
739 const_iv (SDLK_CARET),
740 const_iv (SDLK_UNDERSCORE),
741 const_iv (SDLK_BACKQUOTE),
742 const_iv (SDLK_DELETE),
608 743
609 const_iv (SDLK_FIRST), 744 const_iv (SDLK_FIRST),
610 const_iv (SDLK_LAST), 745 const_iv (SDLK_LAST),
611 const_iv (SDLK_KP0), 746 const_iv (SDLK_KP0),
612 const_iv (SDLK_KP1), 747 const_iv (SDLK_KP1),
688 const_iv (KMOD_RMETA), 823 const_iv (KMOD_RMETA),
689 const_iv (KMOD_NUM), 824 const_iv (KMOD_NUM),
690 const_iv (KMOD_CAPS), 825 const_iv (KMOD_CAPS),
691 const_iv (KMOD_MODE), 826 const_iv (KMOD_MODE),
692 827
828 const_iv (KMOD_LRAM),
829
693 const_iv (MIX_DEFAULT_FORMAT), 830 const_iv (MIX_DEFAULT_FORMAT),
694 831
695 const_iv (SDL_INIT_TIMER), 832 const_iv (SDL_INIT_TIMER),
696 const_iv (SDL_INIT_AUDIO), 833 const_iv (SDL_INIT_AUDIO),
697 const_iv (SDL_INIT_VIDEO), 834 const_iv (SDL_INIT_VIDEO),
721 858
722 const_iv (FOW_DARKNESS) 859 const_iv (FOW_DARKNESS)
723# undef const_iv 860# undef const_iv
724 }; 861 };
725 862
726 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 863 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
727 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 864 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
728 865
729 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 866 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
730 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 867 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
731} 868}
732 869
748NV ceil (NV x) 885NV ceil (NV x)
749 886
750IV minpot (UV n) 887IV minpot (UV n)
751 888
752IV popcount (UV n) 889IV popcount (UV n)
890
891NV distance (NV dx, NV dy)
892 CODE:
893 RETVAL = pow (dx * dx + dy * dy, 0.5);
894 OUTPUT:
895 RETVAL
753 896
754void 897void
755pango_init () 898pango_init ()
756 CODE: 899 CODE:
757{ 900{
765#endif 908#endif
766} 909}
767 910
768char *SDL_GetError () 911char *SDL_GetError ()
769 912
770void SDL_braino () 913void SDL_main_hack (SV *real_main)
914 PROTOTYPE: &
771 915
772int SDL_Init (U32 flags) 916int SDL_Init (U32 flags)
773 917
774int SDL_InitSubSystem (U32 flags) 918int SDL_InitSubSystem (U32 flags)
775 919
776void SDL_QuitSubSystem (U32 flags) 920void SDL_QuitSubSystem (U32 flags)
777 921
778void SDL_Quit () 922void SDL_Quit ()
779 923
780int SDL_GL_SetAttribute (int attr, int value) 924int SDL_GL_SetAttribute (int attr, int value)
925 C_ARGS: (SDL_GLattr)attr, value
781 926
782int SDL_GL_GetAttribute (int attr) 927int SDL_GL_GetAttribute (int attr)
783 CODE: 928 CODE:
784 if (SDL_GL_GetAttribute (attr, &RETVAL)) 929 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
785 XSRETURN_UNDEF; 930 XSRETURN_UNDEF;
786 OUTPUT: 931 OUTPUT:
787 RETVAL 932 RETVAL
788 933
789void 934void
844 ); 989 );
845 990
846 if (RETVAL) 991 if (RETVAL)
847 { 992 {
848 av_clear (texture_av); 993 av_clear (texture_av);
849
850 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
851#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 994#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
852#include "glfunc.h" 995#include "glfunc.h"
853#undef GL_FUNC 996#undef GL_FUNC
997 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
998 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
854 } 999 }
855} 1000}
856 OUTPUT: 1001 OUTPUT:
857 RETVAL 1002 RETVAL
1003
1004void
1005SDL_WM_SetCaption (const char *title, const char *icon)
858 1006
859void 1007void
860SDL_GL_SwapBuffers () 1008SDL_GL_SwapBuffers ()
861 1009
862char * 1010char *
863SDL_GetKeyName (int sym) 1011SDL_GetKeyName (int sym)
1012 C_ARGS: (SDLKey)sym
864 1013
865int 1014int
866SDL_GetAppState () 1015SDL_GetAppState ()
867 1016
868int 1017int
869SDL_GetModState () 1018SDL_GetModState ()
870 1019
1020int
1021SDL_WaitEvent ()
1022 C_ARGS: 0
1023
871void 1024void
1025SDL_PumpEvents ()
1026
1027void
872poll_events () 1028peep_events ()
873 PPCODE: 1029 PPCODE:
874{ 1030{
875 SDL_Event ev; 1031 SDL_Event ev;
876 1032
877 SDL_PumpEvents (); 1033 SDL_PumpEvents ();
884 { 1040 {
885 case SDL_KEYDOWN: 1041 case SDL_KEYDOWN:
886 case SDL_KEYUP: 1042 case SDL_KEYUP:
887 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1043 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
888 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1044 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
889 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1045 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
890 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1046 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
891 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1047 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
892 break; 1048 break;
893 1049
894 case SDL_ACTIVEEVENT: 1050 case SDL_ACTIVEEVENT:
895 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1051 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
913 x = ev.motion.x; 1069 x = ev.motion.x;
914 y = ev.motion.y; 1070 y = ev.motion.y;
915 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1071 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
916 } 1072 }
917 1073
918 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1074 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
919 hv_store (hv, "state", 5, newSViv (state), 0); 1075 hv_store (hv, "state", 5, newSViv (state), 0);
920 hv_store (hv, "x", 1, newSViv (x), 0); 1076 hv_store (hv, "x", 1, newSViv (x), 0);
921 hv_store (hv, "y", 1, newSViv (y), 0); 1077 hv_store (hv, "y", 1, newSViv (y), 0);
922 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1078 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
923 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1079 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
943 1099
944 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1100 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
945 } 1101 }
946} 1102}
947 1103
1104char *
1105SDL_AudioDriverName ()
1106 CODE:
1107{
1108 char buf [256];
1109 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1110 XSRETURN_UNDEF;
1111
1112 RETVAL = buf;
1113}
1114 OUTPUT:
1115 RETVAL
1116
948int 1117int
949Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1118Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
950 POSTCALL: 1119 POSTCALL:
951 Mix_HookMusicFinished (music_finished); 1120 Mix_HookMusicFinished (music_finished);
952 Mix_ChannelFinished (channel_finished); 1121 Mix_ChannelFinished (channel_finished);
953 1122
954void 1123void
955Mix_QuerySpec () 1124Mix_QuerySpec ()
1014add_font (char *file) 1183add_font (char *file)
1015 CODE: 1184 CODE:
1016 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1185 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1017 OUTPUT: 1186 OUTPUT:
1018 RETVAL 1187 RETVAL
1188
1189void
1190IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1191
1192# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1193void
1194Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1019 1195
1020void 1196void
1021load_image_inline (SV *image_) 1197load_image_inline (SV *image_)
1022 ALIAS: 1198 ALIAS:
1023 load_image_file = 1 1199 load_image_file = 1
1069 1245
1070 SDL_LockSurface (surface2); 1246 SDL_LockSurface (surface2);
1071 EXTEND (SP, 6); 1247 EXTEND (SP, 6);
1072 PUSHs (sv_2mortal (newSViv (surface2->w))); 1248 PUSHs (sv_2mortal (newSViv (surface2->w)));
1073 PUSHs (sv_2mortal (newSViv (surface2->h))); 1249 PUSHs (sv_2mortal (newSViv (surface2->h)));
1074 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1250 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1075 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1251 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1076 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1252 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1077 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1253 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1078 SDL_UnlockSurface (surface2); 1254 SDL_UnlockSurface (surface2);
1079 1255
1139#if DEBUG 1315#if DEBUG
1140 VALGRIND_DO_LEAK_CHECK; 1316 VALGRIND_DO_LEAK_CHECK;
1141#endif 1317#endif
1142} 1318}
1143 1319
1320int
1321SvREFCNT (SV *sv)
1322 CODE:
1323 RETVAL = SvREFCNT (sv);
1324 OUTPUT:
1325 RETVAL
1326
1144MODULE = Deliantra::Client PACKAGE = DC::Font 1327MODULE = Deliantra::Client PACKAGE = DC::Font
1145 1328
1146PROTOTYPES: DISABLE 1329PROTOTYPES: DISABLE
1147 1330
1148DC::Font 1331DC::Font
1149new_from_file (SV *class, char *path, int id = 0) 1332new_from_file (SV *klass, char *path, int id = 0)
1150 CODE: 1333 CODE:
1151{ 1334{
1152 int count; 1335 int count;
1153 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1336 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1154 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1337 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1183 PROTOTYPE: 1366 PROTOTYPE:
1184 CODE: 1367 CODE:
1185 tc_restore (); 1368 tc_restore ();
1186 1369
1187DC::Layout 1370DC::Layout
1188new (SV *class) 1371new (SV *klass)
1189 CODE: 1372 CODE:
1190 New (0, RETVAL, 1, struct cf_layout); 1373 New (0, RETVAL, 1, struct cf_layout);
1191 1374
1192 RETVAL->pl = pango_layout_new (opengl_context); 1375 RETVAL->pl = pango_layout_new (opengl_context);
1193 RETVAL->r = 1.; 1376 RETVAL->r = 1.;
1342 1525
1343void 1526void
1344set_height (DC::Layout self, int base_height) 1527set_height (DC::Layout self, int base_height)
1345 CODE: 1528 CODE:
1346 if (self->base_height != base_height) 1529 if (self->base_height != base_height)
1347 { 1530 {
1348 self->base_height = base_height; 1531 self->base_height = base_height;
1349 layout_update_font (self); 1532 layout_update_font (self);
1350 } 1533 }
1351 1534
1352void 1535void
1579 glDisable (GL_ALPHA_TEST); 1762 glDisable (GL_ALPHA_TEST);
1580 glDisable (GL_BLEND); 1763 glDisable (GL_BLEND);
1581 } 1764 }
1582} 1765}
1583 1766
1767void
1768draw_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)
1769 PROTOTYPE: @
1770 CODE:
1771{
1772 glEnable (GL_BLEND);
1773 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1774 glEnable (GL_TEXTURE_2D);
1775 glBindTexture (GL_TEXTURE_2D, name1);
1776
1777 glColor3f (intensity, intensity, intensity);
1778 glPushMatrix ();
1779 glScalef (1./3, 1./3, 1.);
1780
1781 if (blend > 0.f)
1782 {
1783 float dx3 = dx * -3.f / w;
1784 float dy3 = dy * -3.f / h;
1785 GLfloat env_color[4] = { 0., 0., 0., blend };
1786
1787 /* interpolate the two shadow textures */
1788 /* stage 0 == rgb(glcolor) + alpha(t0) */
1789 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1790
1791 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1792 gl.ActiveTexture (GL_TEXTURE1);
1793 glEnable (GL_TEXTURE_2D);
1794 glBindTexture (GL_TEXTURE_2D, name2);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1796
1797 /* rgb == rgb(glcolor) */
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1801
1802 /* alpha = interpolate t0, t1 by env_alpha */
1803 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1808
1809 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1810 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1811
1812 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1813 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1814
1815 glBegin (GL_QUADS);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1820 glEnd ();
1821
1822 glDisable (GL_TEXTURE_2D);
1823 gl.ActiveTexture (GL_TEXTURE0);
1824 }
1825 else
1826 {
1827 /* simple blending of one texture, also opengl <1.3 path */
1828 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1829
1830 glBegin (GL_QUADS);
1831 glTexCoord2f (0, 0); glVertex2f (0, 0);
1832 glTexCoord2f (0, t); glVertex2f (0, h);
1833 glTexCoord2f (s, t); glVertex2f (w, h);
1834 glTexCoord2f (s, 0); glVertex2f (w, 0);
1835 glEnd ();
1836 }
1837
1838 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1839 {
1840 int x, y;
1841 int dx3 = dx * 3;
1842 int dy3 = dy * 3;
1843
1844 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1845 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1846 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1847 glTranslatef (-1., -1., 0);
1848 glBegin (GL_QUADS);
1849
1850 for (y = 1; y < h; y += 3)
1851 {
1852 int y1 = y - dy3;
1853 int y1valid = y1 >= 0 && y1 < h;
1854
1855 for (x = 1; x < w; x += 3)
1856 {
1857 int x1 = x - dx3;
1858 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1859 uint8_t h2;
1860
1861 if (y1valid && x1 >= 0 && x1 < w)
1862 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1863 else
1864 h2 = 1; /* out of range == invisible */
1865
1866 if (h1 || h2)
1867 {
1868 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1869 glColor4f (1., 1., 1., alpha);
1870
1871 glTexCoord2f (0, 0.); glVertex2i (x , y );
1872 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1873 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1874 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1875 }
1876 }
1877 }
1878 }
1879
1880 glEnd ();
1881
1882 glPopMatrix ();
1883
1884 glDisable (GL_TEXTURE_2D);
1885 glDisable (GL_BLEND);
1886}
1887
1584IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1888IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1585 CODE: 1889 CODE:
1586{ 1890{
1587 GLint width; 1891 GLint width;
1588 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1892 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1595MODULE = Deliantra::Client PACKAGE = DC::Map 1899MODULE = Deliantra::Client PACKAGE = DC::Map
1596 1900
1597PROTOTYPES: DISABLE 1901PROTOTYPES: DISABLE
1598 1902
1599DC::Map 1903DC::Map
1600new (SV *class) 1904new (SV *klass)
1601 CODE: 1905 CODE:
1602 New (0, RETVAL, 1, struct map); 1906 New (0, RETVAL, 1, mapgrid);
1603 RETVAL->x = 0; 1907 RETVAL->x = 0;
1604 RETVAL->y = 0; 1908 RETVAL->y = 0;
1605 RETVAL->w = 0; 1909 RETVAL->w = 0;
1606 RETVAL->h = 0; 1910 RETVAL->h = 0;
1607 RETVAL->ox = 0; 1911 RETVAL->ox = 0;
1644 1948
1645void 1949void
1646set_smooth (DC::Map self, int face, int smooth, int level) 1950set_smooth (DC::Map self, int face, int smooth, int level)
1647 CODE: 1951 CODE:
1648{ 1952{
1649 tileid texid; 1953 tileid texid;
1650 maptex *tex; 1954 maptex *tex;
1651 1955
1652 if (face < 0 || face >= self->faces) 1956 if (face < 0 || face >= self->faces)
1653 return; 1957 return;
1654 1958
1655 if (smooth < 0 || smooth >= self->faces) 1959 if (smooth < 0 || smooth >= self->faces)
1656 return; 1960 return;
1657 1961
1658 texid = self->face2tile [face]; 1962 texid = self->face2tile [face];
1659 1963
1660 if (!texid) 1964 if (!texid)
1661 return; 1965 return;
1662 1966
1663 tex = self->tex + texid; 1967 tex = self->tex + texid;
1692 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1996 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1693 // use uglier nearest interpolation because linear suffers 1997 // use uglier nearest interpolation because linear suffers
1694 // from transparent color bleeding and ugly wrapping effects. 1998 // from transparent color bleeding and ugly wrapping effects.
1695 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1999 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1696} 2000}
2001
2002void
2003expire_textures (DC::Map self, int texid, int count)
2004 PPCODE:
2005 for (; texid < self->texs && count; ++texid, --count)
2006 {
2007 maptex *tex = self->tex + texid;
2008
2009 if (tex->name)
2010 {
2011 if (tex->unused)
2012 {
2013 tex->name = 0;
2014 tex->unused = 0;
2015 XPUSHs (sv_2mortal (newSViv (texid)));
2016 }
2017 else
2018 tex->unused = 1;
2019 }
2020 }
1697 2021
1698int 2022int
1699ox (DC::Map self) 2023ox (DC::Map self)
1700 ALIAS: 2024 ALIAS:
1701 oy = 1 2025 oy = 1
1741 self->y += MAP_EXTEND_Y; 2065 self->y += MAP_EXTEND_Y;
1742 } 2066 }
1743} 2067}
1744 2068
1745SV * 2069SV *
1746map1a_update (DC::Map self, SV *data_, int extmap) 2070map1a_update (DC::Map self, SV *data_)
1747 CODE: 2071 CODE:
1748{ 2072{
1749 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2073 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1750 uint8_t *data_end = (uint8_t *)SvEND (data_); 2074 uint8_t *data_end = (uint8_t *)SvEND (data_);
1751 mapcell *cell; 2075 mapcell *cell;
1772 2096
1773 //TODO: don't trust server data to be in-range(!) 2097 //TODO: don't trust server data to be in-range(!)
1774 2098
1775 if (flags & 8) 2099 if (flags & 8)
1776 { 2100 {
2101 uint8_t ext, cmd;
2102
1777 if (extmap) 2103 do
1778 { 2104 {
1779 uint8_t ext, cmd; 2105 ext = *data++;
2106 cmd = ext & 0x7f;
1780 2107
1781 do 2108 if (cmd < 4)
2109 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2110 else if (cmd == 5) // health
1782 { 2111 {
1783 ext = *data++;
1784 cmd = ext & 0x7f;
1785
1786 if (cmd < 4)
1787 cell->darkness = 255 - ext * 64 + 1;
1788 else if (cmd == 5) // health
1789 {
1790 cell->stat_width = 1; 2112 cell->stat_width = 1;
1791 cell->stat_hp = *data++; 2113 cell->stat_hp = *data++;
1792 }
1793 else if (cmd == 6) // monster width
1794 cell->stat_width = *data++ + 1;
1795 else if (cmd == 0x47)
1796 {
1797 if (*data == 1) cell->player = data [1];
1798 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1799 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1800 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1801
1802 data += *data + 1;
1803 }
1804 else if (cmd == 8) // cell flags
1805 cell->flags = *data++;
1806 else if (ext & 0x40) // unknown, multibyte => skip
1807 data += *data + 1;
1808 else
1809 data++;
1810 } 2114 }
1811 while (ext & 0x80); 2115 else if (cmd == 6) // monster width
2116 cell->stat_width = *data++ + 1;
2117 else if (cmd == 0x47)
2118 {
2119 if (*data == 1) cell->player = data [1];
2120 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2121 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2122 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2123
2124 data += *data + 1;
2125 }
2126 else if (cmd == 8) // cell flags
2127 cell->flags = *data++;
2128 else if (ext & 0x40) // unknown, multibyte => skip
2129 data += *data + 1;
2130 else
2131 data++;
1812 } 2132 }
1813 else 2133 while (ext & 0x80);
1814 cell->darkness = *data++ + 1;
1815 } 2134 }
1816 2135
1817 for (z = 0; z <= 2; ++z) 2136 for (z = 0; z <= 2; ++z)
1818 if (flags & (4 >> z)) 2137 if (flags & (4 >> z))
1819 { 2138 {
1822 cell->tile [z] = self->face2tile [face]; 2141 cell->tile [z] = self->face2tile [face];
1823 2142
1824 if (cell->tile [z]) 2143 if (cell->tile [z])
1825 { 2144 {
1826 maptex *tex = self->tex + cell->tile [z]; 2145 maptex *tex = self->tex + cell->tile [z];
2146 tex->unused = 0;
1827 if (!tex->name) 2147 if (!tex->name)
1828 av_push (missing, newSViv (cell->tile [z])); 2148 av_push (missing, newSViv (cell->tile [z]));
1829 2149
1830 if (tex->smoothtile) 2150 if (tex->smoothtile)
1831 { 2151 {
1832 maptex *smooth = self->tex + tex->smoothtile; 2152 maptex *smooth = self->tex + tex->smoothtile;
2153 smooth->unused = 0;
1833 if (!smooth->name) 2154 if (!smooth->name)
1834 av_push (missing, newSViv (tex->smoothtile)); 2155 av_push (missing, newSViv (tex->smoothtile));
1835 } 2156 }
1836 } 2157 }
1837 } 2158 }
1865 ? self->row + y 2186 ? self->row + y
1866 : 0; 2187 : 0;
1867 2188
1868 for (x = x0; x < x1; x++) 2189 for (x = x0; x < x1; x++)
1869 { 2190 {
1870 int r = 32, g = 32, b = 32, a = 192; 2191 unsigned int r = 32, g = 32, b = 32, a = 192;
1871 2192
1872 if (row && row->c0 <= x && x < row->c1) 2193 if (row && row->c0 <= x && x < row->c1)
1873 { 2194 {
1874 mapcell *cell = row->col + (x - row->c0); 2195 mapcell *cell = row->col + (x - row->c0);
1875 2196
1877 { 2198 {
1878 maptex tex = self->tex [cell->tile [z]]; 2199 maptex tex = self->tex [cell->tile [z]];
1879 int a0 = 255 - tex.a; 2200 int a0 = 255 - tex.a;
1880 int a1 = tex.a; 2201 int a1 = tex.a;
1881 2202
1882 r = (r * a0 + tex.r * a1) / 255; 2203 r = div255 (r * a0 + tex.r * a1);
1883 g = (g * a0 + tex.g * a1) / 255; 2204 g = div255 (g * a0 + tex.g * a1);
1884 b = (b * a0 + tex.b * a1) / 255; 2205 b = div255 (b * a0 + tex.b * a1);
1885 a = (a * a0 + tex.a * a1) / 255; 2206 a = div255 (a * a0 + tex.a * a1);
1886 } 2207 }
1887 } 2208 }
1888 2209
1889 *map++ = (r ) 2210 *map++ = (r )
1890 | (g << 8) 2211 | (g << 8)
1891 | (b << 16) 2212 | (b << 16)
1892 | (a << 24); 2213 | (a << 24);
1893 } 2214 }
1894 } 2215 }
1895 2216
1896 RETVAL = map_sv; 2217 RETVAL = map_sv;
1897} 2218}
1898 OUTPUT: 2219 OUTPUT:
1899 RETVAL 2220 RETVAL
1900 2221
1901void 2222void
1902draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2223draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1903 CODE: 2224 CODE:
1904{ 2225{
1905 int x, y, z; 2226 int x, y, z;
1906 2227
1907 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1908 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2228 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1909 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1910 smooth_key skey; 2230 smooth_key skey;
1911 int pl_x, pl_y; 2231 int pl_x, pl_y;
1912 maptex pl_tex; 2232 maptex pl_tex;
1913 rc_t *rc = rc_alloc (); 2233 rc_t *rc = rc_alloc ();
2234 rc_t *rc_ov = rc_alloc ();
1914 rc_key_t key; 2235 rc_key_t key;
1915 rc_array_t *arr; 2236 rc_array_t *arr;
1916 2237
1917 pl_tex.name = 0; 2238 pl_tex.name = 0;
1918 2239
1919 // thats current max. sorry. 2240 // that's current max. sorry.
1920 if (sw > 255) sw = 255; 2241 if (sw > 255) sw = 255;
1921 if (sh > 255) sh = 255; 2242 if (sh > 255) sh = 255;
1922 2243
1923 // clear key, in case of extra padding 2244 // clear key, in case of extra padding
1924 memset (&skey, 0, sizeof (skey)); 2245 memset (&skey, 0, sizeof (skey));
1928 key.g = 255; 2249 key.g = 255;
1929 key.b = 255; 2250 key.b = 255;
1930 key.a = 255; 2251 key.a = 255;
1931 key.mode = GL_QUADS; 2252 key.mode = GL_QUADS;
1932 key.format = GL_T2F_V3F; 2253 key.format = GL_T2F_V3F;
1933 key.texname = -1;
1934 2254
1935 mx += self->x; 2255 mx += self->x;
1936 my += self->y; 2256 my += self->y;
1937 2257
1938 // first pass: determine smooth_max 2258 // first pass: determine smooth_max
1961 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2281 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1962 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1963 2283
1964 for (z = 0; z <= 2; z++) 2284 for (z = 0; z <= 2; z++)
1965 { 2285 {
2286 smooth_hash smooth;
1966 memset (smooth_level, 0, sizeof (smooth_level)); 2287 memset (smooth_level, 0, sizeof (smooth_level));
2288 key.texname = -1;
1967 2289
1968 for (y = 0; y < sh; y++) 2290 for (y = 0; y < sh; y++)
1969 if (0 <= y + my && y + my < self->rows) 2291 if (0 <= y + my && y + my < self->rows)
1970 { 2292 {
1971 maprow *row = self->row + (y + my); 2293 maprow *row = self->row + (y + my);
1977 tileid tile = cell->tile [z]; 2299 tileid tile = cell->tile [z];
1978 2300
1979 if (tile) 2301 if (tile)
1980 { 2302 {
1981 maptex tex = self->tex [tile]; 2303 maptex tex = self->tex [tile];
1982 int px = (x + 1) * T - tex.w; 2304 int px, py;
1983 int py = (y + 1) * T - tex.h;
1984 2305
1985 if (key.texname != tex.name) 2306 if (key.texname != tex.name)
1986 { 2307 {
2308 self->tex [tile].unused = 0;
2309
1987 if (!tex.name) 2310 if (!tex.name)
1988 tex = self->tex [2]; /* missing, replace by noface */ 2311 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1989 2312
1990 key.texname = tex.name; 2313 key.texname = tex.name;
1991 arr = rc_array (rc, &key); 2314 arr = rc_array (rc, &key);
1992 } 2315 }
2316
2317 px = (x + 1) * Th - tex.w;
2318 py = (y + 1) * Tw - tex.h;
1993 2319
1994 if (expect_false (cell->player == player) && expect_false (z == 2)) 2320 if (expect_false (cell->player == player) && expect_false (z == 2))
1995 { 2321 {
1996 pl_x = px; 2322 pl_x = px;
1997 pl_y = py; 2323 pl_y = py;
2002 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2328 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2003 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2329 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2004 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2330 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2005 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2331 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2006 2332
2007 if (expect_false (cell->flags) && expect_false (z == 2))
2008 {
2009 // overlays such as the speech bubble, probably more to come
2010 if (cell->flags & 1)
2011 {
2012 maptex tex = self->tex [1];
2013 int px = x * T + T * 2 / 32;
2014 int py = y * T - T * 6 / 32;
2015
2016 if (tex.name)
2017 {
2018 if (key.texname != tex.name)
2019 {
2020 key.texname = tex.name;
2021 arr = rc_array (rc, &key);
2022 }
2023
2024 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2025 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2027 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2028 }
2029 }
2030 }
2031
2032 // update smooth hash 2333 // update smooth hash
2033 if (tex.smoothtile) 2334 if (tex.smoothtile)
2034 { 2335 {
2035 skey.tile = tex.smoothtile; 2336 skey.tile = tex.smoothtile;
2036 skey.level = tex.smoothlevel; 2337 skey.level = tex.smoothlevel;
2051 2352
2052 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2353 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2053 // ·· ·· ·┏ ┓· 2354 // ·· ·· ·┏ ┓·
2054 2355
2055 // full tile 2356 // full tile
2056 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2357 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2057 2358
2058 // borders 2359 // borders
2059 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2360 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2060 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2361 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2061 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2362 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2062 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2363 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2063 2364
2064 // corners 2365 // corners
2065 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2366 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2066 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2367 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2067 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2368 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2068 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2369 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2370 }
2371 }
2372
2373 if (expect_false (z == 2) && expect_false (cell->flags))
2374 {
2375 // overlays such as the speech bubble, probably more to come
2376 if (cell->flags & 1)
2377 {
2378 rc_key_t key_ov = key;
2379 maptex tex = self->tex [TEXID_SPEECH];
2380 rc_array_t *arr;
2381 int px = x * Tw + Tw * 2 / 32;
2382 int py = y * Th - Th * 6 / 32;
2383
2384 key_ov.texname = tex.name;
2385 arr = rc_array (rc_ov, &key_ov);
2386
2387 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2388 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2389 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2390 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2069 } 2391 }
2070 } 2392 }
2071 } 2393 }
2072 } 2394 }
2073 2395
2089 if (smask & (((uint32_t)1) << b)) 2411 if (smask & (((uint32_t)1) << b))
2090 { 2412 {
2091 int level = (w << 5) | b; 2413 int level = (w << 5) | b;
2092 HE *he; 2414 HE *he;
2093 2415
2094 hv_iterinit (smooth); 2416 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2095 while ((he = hv_iternext (smooth)))
2096 { 2417 {
2097 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 smooth_key &skey = it->first;
2098 IV bits = SvIVX (HeVAL (he)); 2419 IV bits = it->second;
2099 2420
2100 if (!(bits & 0x1000) 2421 if (!(bits & 0x1000)
2101 && skey->level == level 2422 && skey.level == level
2102 && level > smooth_max [skey->x][skey->y]) 2423 && level > smooth_max [skey.x][skey.y])
2103 { 2424 {
2104 maptex tex = self->tex [skey->tile]; 2425 maptex tex = self->tex [skey.tile];
2105 int px = (((int)skey->x) - 1) * T; 2426 int px = (((int)skey.x) - 1) * Tw;
2106 int py = (((int)skey->y) - 1) * T; 2427 int py = (((int)skey.y) - 1) * Th;
2107 int border = bits & 15; 2428 int border = bits & 15;
2108 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2429 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2109 float dx = tex.s * .0625f; // 16 images/row 2430 float dx = tex.s * .0625f; // 16 images/row
2110 float dy = tex.t * .5f ; // 2 images/column 2431 float dy = tex.t * .5f ; // 2 images/column
2111 2432
2113 { 2434 {
2114 // this time avoiding texture state changes 2435 // this time avoiding texture state changes
2115 // save gobs of state changes. 2436 // save gobs of state changes.
2116 if (key.texname != tex.name) 2437 if (key.texname != tex.name)
2117 { 2438 {
2439 self->tex [skey.tile].unused = 0;
2440
2118 glEnd (); 2441 glEnd ();
2119 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2442 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2120 glBegin (GL_QUADS); 2443 glBegin (GL_QUADS);
2121 } 2444 }
2122 2445
2123 if (border) 2446 if (border)
2124 { 2447 {
2125 float ox = border * dx; 2448 float ox = border * dx;
2126 2449
2127 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2450 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2128 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2451 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2129 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2130 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2453 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2131 } 2454 }
2132 2455
2133 if (corner) 2456 if (corner)
2134 { 2457 {
2135 float ox = corner * dx; 2458 float ox = corner * dx;
2136 2459
2137 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2460 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2138 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2461 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2139 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2462 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2140 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2463 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2141 } 2464 }
2142 } 2465 }
2143 } 2466 }
2144 } 2467 }
2145 } 2468 }
2147 2470
2148 glEnd (); 2471 glEnd ();
2149 glDisable (GL_TEXTURE_2D); 2472 glDisable (GL_TEXTURE_2D);
2150 key.texname = -1; 2473 key.texname = -1;
2151 } 2474 }
2152
2153 hv_clear (smooth);
2154 } 2475 }
2155 2476
2156 if (pl_tex.name) 2477 if (pl_tex.name)
2157 { 2478 {
2158 maptex tex = pl_tex; 2479 maptex tex = pl_tex;
2168 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2489 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2169 2490
2170 rc_draw (rc); 2491 rc_draw (rc);
2171 } 2492 }
2172 2493
2494 rc_draw (rc_ov);
2495 rc_clear (rc_ov);
2496
2173 glDisable (GL_BLEND); 2497 glDisable (GL_BLEND);
2174 rc_free (rc); 2498 rc_free (rc);
2499 rc_free (rc_ov);
2175 2500
2176 // top layer: overlays such as the health bar 2501 // top layer: overlays such as the health bar
2177 for (y = 0; y < sh; y++) 2502 for (y = 0; y < sh; y++)
2178 if (0 <= y + my && y + my < self->rows) 2503 if (0 <= y + my && y + my < self->rows)
2179 { 2504 {
2182 for (x = 0; x < sw; x++) 2507 for (x = 0; x < sw; x++)
2183 if (row->c0 <= x + mx && x + mx < row->c1) 2508 if (row->c0 <= x + mx && x + mx < row->c1)
2184 { 2509 {
2185 mapcell *cell = row->col + (x + mx - row->c0); 2510 mapcell *cell = row->col + (x + mx - row->c0);
2186 2511
2187 int px = x * T; 2512 int px = x * Tw;
2188 int py = y * T; 2513 int py = y * Th;
2514
2515 if (expect_false (cell->player == player))
2516 {
2517 px += sdx;
2518 py += sdy;
2519 }
2189 2520
2190 if (cell->stat_hp) 2521 if (cell->stat_hp)
2191 { 2522 {
2192 int width = cell->stat_width * T; 2523 int width = cell->stat_width * Tw;
2193 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2524 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2194 2525
2195 glColor3ub (0, 0, 0); 2526 glColor3ub (0, 0, 0);
2196 glRectf (px + 1, py - thick - 2, 2527 glRectf (px + 1, py - thick - 2,
2197 px + width - 1, py); 2528 px + width - 1, py);
2198 2529
2204 } 2535 }
2205 } 2536 }
2206} 2537}
2207 2538
2208void 2539void
2209draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2540draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2210 CODE: 2541 CODE:
2211{ 2542{
2212 static float color[16][3] = { 2543 static float color[16][3] = {
2213 { 0.00F, 0.00F, 0.00F }, 2544 { 0.00f, 0.00f, 0.00f },
2214 { 1.00F, 1.00F, 1.00F }, 2545 { 1.00f, 1.00f, 1.00f },
2215 { 0.00F, 0.00F, 0.55F }, 2546 { 0.00f, 0.00f, 0.55f },
2216 { 1.00F, 0.00F, 0.00F }, 2547 { 1.00f, 0.00f, 0.00f },
2217 2548
2218 { 1.00F, 0.54F, 0.00F }, 2549 { 1.00f, 0.54f, 0.00f },
2219 { 0.11F, 0.56F, 1.00F }, 2550 { 0.11f, 0.56f, 1.00f },
2220 { 0.93F, 0.46F, 0.00F }, 2551 { 0.93f, 0.46f, 0.00f },
2221 { 0.18F, 0.54F, 0.34F }, 2552 { 0.18f, 0.54f, 0.34f },
2222 2553
2223 { 0.56F, 0.73F, 0.56F }, 2554 { 0.56f, 0.73f, 0.56f },
2224 { 0.80F, 0.80F, 0.80F }, 2555 { 0.80f, 0.80f, 0.80f },
2225 { 0.55F, 0.41F, 0.13F }, 2556 { 0.55f, 0.41f, 0.13f },
2226 { 0.99F, 0.77F, 0.26F }, 2557 { 0.99f, 0.77f, 0.26f },
2227 2558
2228 { 0.74F, 0.65F, 0.41F }, 2559 { 0.74f, 0.65f, 0.41f },
2229 2560
2230 { 0.00F, 1.00F, 1.00F }, 2561 { 0.00f, 1.00f, 1.00f },
2231 { 1.00F, 0.00F, 1.00F }, 2562 { 1.00f, 0.00f, 1.00f },
2232 { 1.00F, 1.00F, 0.00F }, 2563 { 1.00f, 1.00f, 0.00f },
2233 }; 2564 };
2234 2565
2235 int x, y; 2566 int x, y;
2236 2567
2237 glEnable (GL_TEXTURE_2D); 2568 glEnable (GL_TEXTURE_2D);
2569 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2570 * but the nvidia driver (185.18.14) mishandles alpha textures
2571 * and takes the colour from god knows where instead of using
2572 * Cp. MODULATE results in the same colour, but slightly different
2573 * alpha, but atcually gives us the correct colour with nvidia.
2574 */
2238 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2575 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2239 glEnable (GL_BLEND); 2576 glEnable (GL_BLEND);
2240 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2577 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2241 glBegin (GL_QUADS); 2578 glBegin (GL_QUADS);
2242 2579
2243 for (y = 0; y < h; y++) 2580 for (y = 0; y < h; y++)
2247 2584
2248 if (m) 2585 if (m)
2249 { 2586 {
2250 float *c = color [m & 15]; 2587 float *c = color [m & 15];
2251 2588
2252 float tx1 = m & 0x40 ? 0.5 : 0.; 2589 float tx1 = m & 0x40 ? 0.5f : 0.f;
2253 float tx2 = tx1 + 0.5; 2590 float tx2 = tx1 + 0.5f;
2254 2591
2255 glColor4f (c[0], c[1], c[2], 0.75); 2592 glColor4f (c[0], c[1], c[2], 1);
2256 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2593 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2257 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2594 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2258 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2595 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2259 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2596 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2260 } 2597 }
2268void 2605void
2269fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2606fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2270 PPCODE: 2607 PPCODE:
2271{ 2608{
2272 int x, y; 2609 int x, y;
2273 int sw1 = sw + 2; 2610 int sw1 = sw + 2;
2274 int sh1 = sh + 2; 2611 int sh1 = sh + 2;
2275 int sh3 = sh * 3; 2612 int sh3 = sh * 3;
2276 int sw34 = (sw * 3 + 3) & ~3; 2613 int sw3 = sw * 3;
2614 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2615 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2277 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2616 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2278 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2617 memset (darkness1, 0, sw1*sh1);
2279 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2280 2618
2281 SvPOK_only (darkness3_sv); 2619 SvPOK_only (darkness3_sv);
2282 SvCUR_set (darkness3_sv, sw34 * sh3); 2620 SvCUR_set (darkness3_sv, sw3 * sh3);
2283 2621
2284 mx += self->x - 1; 2622 mx += self->x - 1;
2285 my += self->y - 1; 2623 my += self->y - 1;
2286
2287 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2288 2624
2289 for (y = 0; y < sh1; y++) 2625 for (y = 0; y < sh1; y++)
2290 if (0 <= y + my && y + my < self->rows) 2626 if (0 <= y + my && y + my < self->rows)
2291 { 2627 {
2292 maprow *row = self->row + (y + my); 2628 maprow *row = self->row + (y + my);
2295 if (row->c0 <= x + mx && x + mx < row->c1) 2631 if (row->c0 <= x + mx && x + mx < row->c1)
2296 { 2632 {
2297 mapcell *cell = row->col + (x + mx - row->c0); 2633 mapcell *cell = row->col + (x + mx - row->c0);
2298 2634
2299 darkness1 [y * sw1 + x] = cell->darkness 2635 darkness1 [y * sw1 + x] = cell->darkness
2300 ? 255 - (cell->darkness - 1) 2636 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2301 : 255 - FOW_DARKNESS; 2637 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2302 } 2638 }
2303 } 2639 }
2304 2640
2305 for (y = 0; y < sh; ++y) 2641 for (y = 0; y < sh; ++y)
2306 for (x = 0; x < sw; ++x) 2642 for (x = 0; x < sw; ++x)
2325 2661
2326 uint8_t r13 = (d13 + d23 + d12) / 3; 2662 uint8_t r13 = (d13 + d23 + d12) / 3;
2327 uint8_t r23 = d23; 2663 uint8_t r23 = d23;
2328 uint8_t r33 = (d23 + d33 + d32) / 3; 2664 uint8_t r33 = (d23 + d33 + d32) / 3;
2329 2665
2330 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2666 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2331 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2667 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2332 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2668 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2333 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2334 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2670 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2335 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2671 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2336 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2337 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2673 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2338 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2674 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2339 } 2675 }
2340 2676
2341 free (darkness1); 2677 free (darkness1);
2342 2678
2343 EXTEND (SP, 3); 2679 EXTEND (SP, 3);
2344 PUSHs (sv_2mortal (newSViv (sw34))); 2680 PUSHs (sv_2mortal (newSViv (sw3)));
2345 PUSHs (sv_2mortal (newSViv (sh3))); 2681 PUSHs (sv_2mortal (newSViv (sh3)));
2346 PUSHs (darkness3_sv); 2682 PUSHs (darkness3_sv);
2347} 2683}
2348 2684
2349SV * 2685SV *
2412 else 2748 else
2413 *data++ = 0; 2749 *data++ = 0;
2414 } 2750 }
2415 } 2751 }
2416 2752
2417 /* if size is w*h + 5 then no data has been found */ 2753 /* if size is w*h + 5 then no data has been found */
2418 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2754 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2419 { 2755 {
2420 SvPOK_only (data_sv); 2756 SvPOK_only (data_sv);
2421 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2757 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2422 } 2758 }
2423 2759
2424 RETVAL = data_sv; 2760 RETVAL = data_sv;
2425} 2761}
2426 OUTPUT: 2762 OUTPUT:
2427 RETVAL 2763 RETVAL
2428 2764
2429void 2765void
2436 STRLEN len; 2772 STRLEN len;
2437 uint8_t *data, *end; 2773 uint8_t *data, *end;
2438 2774
2439 len = SvLEN (data_sv); 2775 len = SvLEN (data_sv);
2440 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2776 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2441 data = SvPVbyte_nolen (data_sv); 2777 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2442 end = data + len + 8; 2778 end = data + len + 8;
2443 2779
2444 if (len < 5) 2780 if (len < 5)
2445 XSRETURN_EMPTY; 2781 XSRETURN_EMPTY;
2446 2782
2507} 2843}
2508 2844
2509MODULE = Deliantra::Client PACKAGE = DC::RW 2845MODULE = Deliantra::Client PACKAGE = DC::RW
2510 2846
2511DC::RW 2847DC::RW
2512new (SV *class, SV *data_sv) 2848new (SV *klass, SV *data_sv)
2513 CODE: 2849 CODE:
2514{ 2850{
2515 STRLEN datalen; 2851 STRLEN datalen;
2516 char *data = SvPVbyte (data_sv, datalen); 2852 char *data = SvPVbyte (data_sv, datalen);
2517 2853
2519} 2855}
2520 OUTPUT: 2856 OUTPUT:
2521 RETVAL 2857 RETVAL
2522 2858
2523DC::RW 2859DC::RW
2524new_from_file (SV *class, const char *path, const char *mode = "rb") 2860new_from_file (SV *klass, const char *path, const char *mode = "rb")
2525 CODE: 2861 CODE:
2526 RETVAL = SDL_RWFromFile (path, mode); 2862 RETVAL = SDL_RWFromFile (path, mode);
2527 OUTPUT: 2863 OUTPUT:
2528 RETVAL 2864 RETVAL
2529 2865
2547 if (RETVAL < 0) 2883 if (RETVAL < 0)
2548 { 2884 {
2549 RETVAL = Mix_GroupOldest (-1); 2885 RETVAL = Mix_GroupOldest (-1);
2550 2886
2551 if (RETVAL < 0) 2887 if (RETVAL < 0)
2888 {
2889 // happens sometimes, maybe it just stopped playing(?)
2890 RETVAL = Mix_GroupAvailable (-1);
2891
2892 if (RETVAL < 0)
2552 XSRETURN_UNDEF; 2893 XSRETURN_UNDEF;
2553 2894 }
2895 else
2554 Mix_HaltChannel (RETVAL); 2896 Mix_HaltChannel (RETVAL);
2555 } 2897 }
2556 2898
2557 Mix_UnregisterAllEffects (RETVAL); 2899 Mix_UnregisterAllEffects (RETVAL);
2558 Mix_Volume (RETVAL, 128); 2900 Mix_Volume (RETVAL, 128);
2559} 2901}
2606void 2948void
2607set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2949set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2608 CODE: 2950 CODE:
2609{ 2951{
2610 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2952 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2611 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2953 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2612 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2954 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2613} 2955}
2614 2956
2615void 2957void
2616set_reverse_stereo (DC::Channel self, int flip) 2958set_reverse_stereo (DC::Channel self, int flip)
2619 2961
2620MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2962MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2621 2963
2622PROTOTYPES: DISABLE 2964PROTOTYPES: DISABLE
2623 2965
2966void
2967decoders ()
2968 PPCODE:
2969#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2970 int i, num = Mix_GetNumChunkDecoders ();
2971 EXTEND (SP, num);
2972 for (i = 0; i < num; ++i)
2973 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2974#else
2975 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2976#endif
2977
2624DC::MixChunk 2978DC::MixChunk
2625new (SV *class, DC::RW rwops) 2979new (SV *klass, DC::RW rwops)
2626 CODE: 2980 CODE:
2627 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2981 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2628 OUTPUT: 2982 OUTPUT:
2629 RETVAL 2983 RETVAL
2630 2984
2660 OUTPUT: 3014 OUTPUT:
2661 RETVAL 3015 RETVAL
2662 3016
2663MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3017MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2664 3018
3019void
3020decoders ()
3021 PPCODE:
3022#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3023 int i, num = Mix_GetNumMusicDecoders ();
3024 EXTEND (SP, num);
3025 for (i = 0; i < num; ++i)
3026 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3027#else
3028 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3029#endif
3030
2665int 3031int
2666volume (int volume = -1) 3032volume (int volume = -1)
2667 PROTOTYPE: ;$ 3033 PROTOTYPE: ;$
2668 CODE: 3034 CODE:
2669 if (items > 0) 3035 if (items > 0)
2680void 3046void
2681halt () 3047halt ()
2682 CODE: 3048 CODE:
2683 Mix_HaltMusic (); 3049 Mix_HaltMusic ();
2684 3050
3051int
3052playing ()
3053 CODE:
3054 RETVAL = Mix_PlayingMusic ();
3055 OUTPUT:
3056 RETVAL
3057
2685DC::MixMusic 3058DC::MixMusic
2686new (SV *class, DC::RW rwops) 3059new (SV *klass, DC::RW rwops)
2687 CODE: 3060 CODE:
2688 RETVAL = Mix_LoadMUS_RW (rwops); 3061 RETVAL = Mix_LoadMUS_RW (rwops);
2689 OUTPUT: 3062 OUTPUT:
2690 RETVAL 3063 RETVAL
2691 3064
2719 } *civ, const_iv[] = { 3092 } *civ, const_iv[] = {
2720# define const_iv(name) { # name, (IV)name } 3093# define const_iv(name) { # name, (IV)name }
2721 const_iv (GL_VENDOR), 3094 const_iv (GL_VENDOR),
2722 const_iv (GL_VERSION), 3095 const_iv (GL_VERSION),
2723 const_iv (GL_EXTENSIONS), 3096 const_iv (GL_EXTENSIONS),
3097 const_iv (GL_MAX_TEXTURE_UNITS),
2724 const_iv (GL_COLOR_MATERIAL), 3098 const_iv (GL_COLOR_MATERIAL),
2725 const_iv (GL_SMOOTH), 3099 const_iv (GL_SMOOTH),
2726 const_iv (GL_FLAT), 3100 const_iv (GL_FLAT),
2727 const_iv (GL_DITHER), 3101 const_iv (GL_DITHER),
2728 const_iv (GL_BLEND), 3102 const_iv (GL_BLEND),
2740 const_iv (GL_ZERO), 3114 const_iv (GL_ZERO),
2741 const_iv (GL_SRC_ALPHA), 3115 const_iv (GL_SRC_ALPHA),
2742 const_iv (GL_DST_ALPHA), 3116 const_iv (GL_DST_ALPHA),
2743 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3117 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2744 const_iv (GL_ONE_MINUS_DST_ALPHA), 3118 const_iv (GL_ONE_MINUS_DST_ALPHA),
3119 const_iv (GL_SRC_COLOR),
3120 const_iv (GL_DST_COLOR),
3121 const_iv (GL_ONE_MINUS_SRC_COLOR),
3122 const_iv (GL_ONE_MINUS_DST_COLOR),
2745 const_iv (GL_SRC_ALPHA_SATURATE), 3123 const_iv (GL_SRC_ALPHA_SATURATE),
2746 const_iv (GL_RGB), 3124 const_iv (GL_RGB),
2747 const_iv (GL_RGBA), 3125 const_iv (GL_RGBA),
2748 const_iv (GL_RGBA4), 3126 const_iv (GL_RGBA4),
2749 const_iv (GL_RGBA8), 3127 const_iv (GL_RGBA8),
2817 const_iv (GL_NICEST), 3195 const_iv (GL_NICEST),
2818 const_iv (GL_V2F), 3196 const_iv (GL_V2F),
2819 const_iv (GL_V3F), 3197 const_iv (GL_V3F),
2820 const_iv (GL_T2F_V3F), 3198 const_iv (GL_T2F_V3F),
2821 const_iv (GL_T2F_N3F_V3F), 3199 const_iv (GL_T2F_N3F_V3F),
3200 const_iv (GL_FUNC_ADD),
3201 const_iv (GL_FUNC_SUBTRACT),
3202 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2822# undef const_iv 3203# undef const_iv
2823 }; 3204 };
2824 3205
2825 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3206 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2826 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3207 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2827 3208
2828 texture_av = newAV (); 3209 texture_av = newAV ();
2829 AvREAL_off (texture_av); 3210 AvREAL_off (texture_av);
2830} 3211}
2831 3212
2833disable_GL_EXT_blend_func_separate () 3214disable_GL_EXT_blend_func_separate ()
2834 CODE: 3215 CODE:
2835 gl.BlendFuncSeparate = 0; 3216 gl.BlendFuncSeparate = 0;
2836 gl.BlendFuncSeparateEXT = 0; 3217 gl.BlendFuncSeparateEXT = 0;
2837 3218
2838char * 3219void
3220apple_nvidia_bug (int enable)
3221
3222const char *
2839gl_vendor () 3223gl_vendor ()
2840 CODE: 3224 CODE:
2841 RETVAL = (char *)glGetString (GL_VENDOR); 3225 RETVAL = (const char *)glGetString (GL_VENDOR);
2842 OUTPUT: 3226 OUTPUT:
2843 RETVAL 3227 RETVAL
2844 3228
2845char * 3229const char *
2846gl_version () 3230gl_version ()
2847 CODE: 3231 CODE:
2848 RETVAL = (char *)glGetString (GL_VERSION); 3232 RETVAL = (const char *)glGetString (GL_VERSION);
2849 OUTPUT: 3233 OUTPUT:
2850 RETVAL 3234 RETVAL
2851 3235
2852char * 3236const char *
2853gl_extensions () 3237gl_extensions ()
2854 CODE: 3238 CODE:
2855 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3239 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2856 OUTPUT: 3240 OUTPUT:
2857 RETVAL 3241 RETVAL
2858 3242
2859const char *glGetString (GLenum pname) 3243const char *glGetString (GLenum pname)
3244 CODE:
3245 RETVAL = (const char *)glGetString (pname);
3246 OUTPUT:
3247 RETVAL
2860 3248
2861GLint glGetInteger (GLenum pname) 3249GLint glGetInteger (GLenum pname)
2862 CODE: 3250 CODE:
2863 glGetIntegerv (pname, &RETVAL); 3251 glGetIntegerv (pname, &RETVAL);
2864 OUTPUT: 3252 OUTPUT:
2872 3260
2873int glGetError () 3261int glGetError ()
2874 3262
2875void glFinish () 3263void glFinish ()
2876 3264
3265void glFlush ()
3266
2877void glClear (int mask) 3267void glClear (int mask)
2878 3268
2879void glClearColor (float r, float g, float b, float a = 1.0) 3269void glClearColor (float r, float g, float b, float a = 1.0)
2880 PROTOTYPE: @ 3270 PROTOTYPE: @
2881 3271
2890void glBlendFunc (int sfactor, int dfactor) 3280void glBlendFunc (int sfactor, int dfactor)
2891 3281
2892void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3282void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2893 CODE: 3283 CODE:
2894 gl_BlendFuncSeparate (sa, da, saa, daa); 3284 gl_BlendFuncSeparate (sa, da, saa, daa);
3285
3286# void glBlendEquation (int se)
2895 3287
2896void glDepthMask (int flag) 3288void glDepthMask (int flag)
2897 3289
2898void glLogicOp (int opcode) 3290void glLogicOp (int opcode)
2899 3291
2934void glRotate (float angle, float x, float y, float z) 3326void glRotate (float angle, float x, float y, float z)
2935 CODE: 3327 CODE:
2936 glRotatef (angle, x, y, z); 3328 glRotatef (angle, x, y, z);
2937 3329
2938void glColor (float r, float g, float b, float a = 1.0) 3330void glColor (float r, float g, float b, float a = 1.0)
3331 PROTOTYPE: @
2939 ALIAS: 3332 ALIAS:
2940 glColor_premultiply = 1 3333 glColor_premultiply = 1
2941 CODE: 3334 CODE:
2942 if (ix) 3335 if (ix)
2943 { 3336 {
3049 3442
3050void glEndList () 3443void glEndList ()
3051 3444
3052void glCallList (int list) 3445void glCallList (int list)
3053 3446
3447void c_init ()
3448 CODE:
3449 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3450 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3451
3054MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3452MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3055 3453
3056PROTOTYPES: DISABLE 3454PROTOTYPES: DISABLE
3057 3455
3058void 3456void
3059find_widget (SV *self, NV x, NV y) 3457find_widget (SV *self, NV x, NV y)
3060 PPCODE: 3458 PPCODE:
3061{ 3459{
3062 if (within_widget (self, x, y)) 3460 if (within_widget (self, x, y))
3063 XPUSHs (self); 3461 XPUSHs (self);
3064} 3462}
3065 3463
3066BOOT: 3464BOOT:
3067{ 3465{
3075 3473
3076void 3474void
3077draw (SV *self) 3475draw (SV *self)
3078 CODE: 3476 CODE:
3079{ 3477{
3080 HV *hv; 3478 HV *hv;
3081 SV **svp; 3479 SV **svp;
3082 NV x, y, w, h; 3480 NV x, y, w, h;
3083 SV *draw_x_sv = GvSV (draw_x_gv); 3481 SV *draw_x_sv = GvSV (draw_x_gv);
3084 SV *draw_y_sv = GvSV (draw_y_gv); 3482 SV *draw_y_sv = GvSV (draw_y_gv);
3085 SV *draw_w_sv = GvSV (draw_w_gv); 3483 SV *draw_w_sv = GvSV (draw_w_gv);
3086 SV *draw_h_sv = GvSV (draw_h_gv); 3484 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines