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.242 by root, Wed Dec 26 21:03:21 2007 UTC vs.
Revision 1.330 by root, Sun Nov 18 15:24:24 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>
39#include <SDL_endian.h> 43#include <SDL_endian.h>
40#include <SDL_image.h> 44#include <SDL_image.h>
41#include <SDL_mixer.h> 45#include <SDL_mixer.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
48/* work around os x broken headers */
49#ifdef __MACOSX__
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);
53#endif
54
44#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
46 57
47#include <glib/gmacros.h> 58#include <glib.h>
48 59
49#include <pango/pango.h> 60#include <pango/pango.h>
61
62#ifndef PANGO_VERSION_CHECK
63# define PANGO_VERSION_CHECK(a,b,c) 0
64#endif
65
66#if !PANGO_VERSION_CHECK (1, 15, 2)
67# define pango_layout_get_line_readonly pango_layout_get_line
68# define pango_layout_get_lines_readonly pango_layout_get_lines
69# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
70# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
71#endif
50 72
51#ifndef _WIN32 73#ifndef _WIN32
52# include <sys/types.h> 74# include <sys/types.h>
53# include <sys/socket.h> 75# include <sys/socket.h>
54# include <netinet/in.h> 76# include <netinet/in.h>
55# include <netinet/tcp.h> 77# include <netinet/tcp.h>
56# include <inttypes.h> 78# include <inttypes.h>
57#endif 79#endif
58 80
81#if __GNUC__ >= 4
82# define expect(expr,value) __builtin_expect ((expr),(value))
83#else
84# define expect(expr,value) (expr)
85#endif
86
87#define expect_false(expr) expect ((expr) != 0, 0)
88#define expect_true(expr) expect ((expr) != 0, 1)
89
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 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 */
61#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
62 96
63#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
65 99
66#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
67 101
68#if 0 102/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 104
71# define PARACHUTE 0 105#define KMOD_LRAM 0x10000 // our extension
72#endif 106
107#define TEXID_SPEECH 1
108#define TEXID_NOFACE 2
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}
73 128
74static AV *texture_av; 129static AV *texture_av;
75 130
76static struct 131static struct
77{ 132{
134{ 189{
135 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
136 191
137 while (attrs) 192 while (attrs)
138 { 193 {
139 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
140 195
141 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
142 return 1; 197 return 1;
143 198
144 attrs = attrs->next; 199 attrs = attrs->next;
145 } 200 }
146 201
147 return 0; 202 return 0;
148} 203}
149 204
150typedef struct cf_layout { 205struct cf_layout {
151 PangoLayout *pl; 206 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
153 int base_height; 208 int base_height;
154 DC__Font font; 209 DC__Font font;
155 rc_t *rc; 210 rc_t rc;
156} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
157 214
158static DC__Font default_font; 215static DC__Font default_font;
159static PangoContext *opengl_context; 216static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
161 218
162static void 219static void
163substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
164{ 221{
165 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
166#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
167 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
168#endif 225#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 227}
171 228
172static void 229static void
173layout_update_font (DC__Layout self) 230layout_update_font (DC__Layout self)
174{ 231{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 232 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 233 * reasonably well with dejavu/bistream fonts
177 */ 234 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 235 PangoFontDescription *font = self->font ? self->font : default_font;
179 236
180 pango_font_description_set_absolute_size (font, 237 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 238 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
202} 259}
203 260
204typedef uint16_t tileid; 261typedef uint16_t tileid;
205typedef uint16_t faceid; 262typedef uint16_t faceid;
206 263
207typedef struct { 264struct maptex
265{
208 GLuint name; 266 GLuint name;
209 int w, h; 267 int w, h;
210 float s, t; 268 float s, t;
211 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
212 tileid smoothtile; 270 tileid smoothtile;
213 uint8_t smoothlevel; 271 uint8_t smoothlevel;
214} maptex; 272 uint8_t unused; /* set to zero on use */
273};
215 274
216typedef struct { 275struct mapcell
276{
217 uint32_t player; 277 uint32_t player;
218 tileid tile[3]; 278 tileid tile[3];
219 uint16_t darkness; 279 uint16_t darkness;
220 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
221} mapcell; 281};
222 282
223typedef struct { 283struct maprow
284{
224 int32_t c0, c1; 285 int32_t c0, c1;
225 mapcell *col; 286 mapcell *col;
226} maprow; 287};
227 288
228typedef struct map { 289struct mapgrid {
229 int x, y, w, h; 290 int x, y, w, h;
230 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
231 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
233 294
234 int32_t rows; 295 int32_t rows;
235 maprow *row; 296 maprow *row;
236} *DC__Map; 297};
237 298
238static char * 299typedef mapgrid *DC__Map;
300
301template<typename T>
302static void
239prepend (char *ptr, int sze, int inc) 303prepend (T *&ptr, int sze, int inc)
240{ 304{
241 char *p; 305 T *p;
242 306
243 New (0, p, sze + inc, char); 307 Newxz (p, sze + inc, T);
244 Zero (p, inc, char);
245 Move (ptr, p + inc, sze, char); 308 Move (ptr, p + inc, sze, T);
246 Safefree (ptr); 309 Safefree (ptr);
247 310
248 return p; 311 ptr = p;
249} 312}
250 313
251static char * 314template<typename T>
252append (char *ptr, int sze, int inc)
253{
254 Renew (ptr, sze + inc, char);
255 Zero (ptr + sze, inc, char);
256
257 return ptr;
258}
259
260#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
261#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
262
263static void 315static void
316append (T *&ptr, int sze, int inc)
317{
318 Renew (ptr, sze + inc, T);
319 Zero (ptr + sze, inc, T);
320}
321
322static void
264need_facenum (struct map *self, faceid face) 323need_facenum (struct mapgrid *self, faceid face)
265{ 324{
266 while (self->faces <= face) 325 while (self->faces <= face)
267 { 326 {
268 Append (tileid, self->face2tile, self->faces, self->faces); 327 append (self->face2tile, self->faces, self->faces);
269 self->faces *= 2; 328 self->faces *= 2;
270 } 329 }
271} 330}
272 331
273static void 332static void
274need_texid (struct map *self, int texid) 333need_texid (struct mapgrid *self, int texid)
275{ 334{
276 while (self->texs <= texid) 335 while (self->texs <= texid)
277 { 336 {
278 Append (maptex, self->tex, self->texs, self->texs); 337 append (self->tex, self->texs, self->texs);
279 self->texs *= 2; 338 self->texs *= 2;
280 } 339 }
281} 340}
282 341
283static maprow * 342static maprow *
284map_get_row (DC__Map self, int y) 343map_get_row (mapgrid *self, int y)
285{ 344{
286 if (0 > y) 345 if (0 > y)
287 { 346 {
288 int extend = - y + MAP_EXTEND_Y; 347 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 348 prepend (self->row, self->rows, extend);
290 349
291 self->rows += extend; 350 self->rows += extend;
292 self->y += extend; 351 self->y += extend;
293 y += extend; 352 y += extend;
294 } 353 }
295 else if (y >= self->rows) 354 else if (y >= self->rows)
296 { 355 {
297 int extend = y - self->rows + MAP_EXTEND_Y; 356 int extend = y - self->rows + MAP_EXTEND_Y;
298 Append (maprow, self->row, self->rows, extend); 357 append (self->row, self->rows, extend);
299 self->rows += extend; 358 self->rows += extend;
300 } 359 }
301 360
302 return self->row + y; 361 return self->row + y;
303} 362}
313 } 372 }
314 373
315 if (row->c0 > x) 374 if (row->c0 > x)
316 { 375 {
317 int extend = row->c0 - x + MAP_EXTEND_X; 376 int extend = row->c0 - x + MAP_EXTEND_X;
318 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 377 prepend (row->col, row->c1 - row->c0, extend);
319 row->c0 -= extend; 378 row->c0 -= extend;
320 } 379 }
321 else if (x >= row->c1) 380 else if (x >= row->c1)
322 { 381 {
323 int extend = x - row->c1 + MAP_EXTEND_X; 382 int extend = x - row->c1 + MAP_EXTEND_X;
324 Append (mapcell, row->col, row->c1 - row->c0, extend); 383 append (row->col, row->c1 - row->c0, extend);
325 row->c1 += extend; 384 row->c1 += extend;
326 } 385 }
327 386
328 return row->col + (x - row->c0); 387 return row->col + (x - row->c0);
329} 388}
330 389
331static mapcell * 390static mapcell *
332map_get_cell (DC__Map self, int x, int y) 391map_get_cell (mapgrid *self, int x, int y)
333{ 392{
334 return row_get_cell (map_get_row (self, y), x); 393 return row_get_cell (map_get_row (self, y), x);
335} 394}
336 395
337static void 396static void
338map_clear (DC__Map self) 397map_clear (mapgrid *self)
339{ 398{
340 int r; 399 int r;
341 400
342 for (r = 0; r < self->rows; r++) 401 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 402 Safefree (self->row[r].col);
350 self->oy = 0; 409 self->oy = 0;
351 self->row = 0; 410 self->row = 0;
352 self->rows = 0; 411 self->rows = 0;
353} 412}
354 413
414#define CELL_CLEAR(cell) \
415 do { \
416 if ((cell)->player) \
417 (cell)->tile [2] = 0; \
418 (cell)->darkness = 0; \
419 (cell)->stat_hp = 0; \
420 (cell)->flags = 0; \
421 (cell)->player = 0; \
422 } while (0)
423
355static void 424static void
356map_blank (DC__Map self, int x0, int y0, int w, int h) 425map_blank (mapgrid *self, int x0, int y0, int w, int h)
357{ 426{
358 int x, y; 427 int x, y;
359 maprow *row; 428 maprow *row;
360 mapcell *cell; 429 mapcell *cell;
361 430
373 if (x >= row->c1) 442 if (x >= row->c1)
374 break; 443 break;
375 444
376 cell = row->col + x - row->c0; 445 cell = row->col + x - row->c0;
377 446
378 cell->darkness = 0; 447 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 448 }
383 } 449 }
384} 450}
385 451
386typedef struct { 452struct smooth_key
453{
387 tileid tile; 454 tileid tile;
388 uint8_t x, y, level; 455 uint8_t x, y, level;
389} smooth_key; 456
457 bool operator == (const smooth_key &o) const
458 {
459 return tile == o.tile && x == o.x && y == o.y && level == o.level;
460 }
461};
462
463typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
464
465namespace std {
466 template <>
467 struct hash<smooth_key>
468 {
469 size_t operator () (const smooth_key &v) const
470 {
471 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
472 }
473 };
474}
390 475
391static void 476static void
392smooth_or_bits (HV *hv, smooth_key *key, IV bits) 477smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
393{ 478{
394 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 479 auto &&it = h.find (key);
395 480
396 if (SvIOK (*sv)) 481 if (it == h.end ())
397 SvIV_set (*sv, SvIVX (*sv) | bits); 482 h.insert (std::make_pair (key, bits));
398 else 483 else
399 sv_setiv (*sv, bits); 484 it->second |= bits;
400} 485}
401 486
402static void 487static void
403music_finished (void) 488music_finished (void)
404{ 489{
421 ev.code = 1; 506 ev.code = 1;
422 ev.data1 = (void *)(long)channel; 507 ev.data1 = (void *)(long)channel;
423 ev.data2 = 0; 508 ev.data2 = 0;
424 509
425 SDL_PushEvent ((SDL_Event *)&ev); 510 SDL_PushEvent ((SDL_Event *)&ev);
511}
512
513// approximately divide by 255
514static unsigned int
515div255 (unsigned int n)
516{
517 return (n + (n >> 8)) >> 8;
426} 518}
427 519
428static unsigned int 520static unsigned int
429minpot (unsigned int n) 521minpot (unsigned int n)
430{ 522{
497 if (!svp || !SvTRUE (*svp)) 589 if (!svp || !SvTRUE (*svp))
498 return 0; 590 return 0;
499 591
500 return 1; 592 return 1;
501} 593}
594
595/******************************************************************************/
596
597/* process keyboard modifiers */
598static int
599mod_munge (int mod)
600{
601 mod &= MOD_MASK;
602
603 if (mod & (KMOD_META | KMOD_ALT))
604 mod |= KMOD_LRAM;
605
606 return mod;
607}
608
609static void
610deliantra_main (SV *real_main)
611{
612 dSP;
613
614 PUSHMARK (SP);
615 call_sv (real_main, G_DISCARD | G_VOID);
616}
617
618#ifdef __MACOSX__
619 static SV *real_main;
620
621 /* to due surprising braindamage on the side of SDL design, we
622 * do some mind-boggling hack here: SDL requires a custom main()
623 * on OS X, so... we provide one and call the original main(), which,
624 * due to shared library magic, calls -lSDLmain's main, not perl's main,
625 * and which calls our main (== SDL_main) back.
626 */
627 extern C_LINKAGE int
628 main (int argc, char *argv[])
629 {
630 deliantra_main (real_main);
631 }
632
633 #undef main
634
635 extern C_LINKAGE int main (int argc, char *argv[]);
636
637 static void
638 SDL_main_hack (SV *real_main_)
639 {
640 real_main = real_main_;
641
642 char *argv[] = { "deliantra client", 0 };
643 (main) (1, argv);
644 }
645#else
646 static void
647 SDL_main_hack (SV *real_main)
648 {
649 deliantra_main (real_main);
650 }
651#endif
502 652
503MODULE = Deliantra::Client PACKAGE = DC 653MODULE = Deliantra::Client PACKAGE = DC
504 654
505PROTOTYPES: ENABLE 655PROTOTYPES: ENABLE
506 656
535 const_iv (SDL_USEREVENT), 685 const_iv (SDL_USEREVENT),
536 686
537 const_iv (SDL_APPINPUTFOCUS), 687 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 688 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 689 const_iv (SDL_APPACTIVE),
690
691
692 const_iv (SDLK_UNKNOWN),
693 const_iv (SDLK_FIRST),
694 const_iv (SDLK_BACKSPACE),
695 const_iv (SDLK_TAB),
696 const_iv (SDLK_CLEAR),
697 const_iv (SDLK_RETURN),
698 const_iv (SDLK_PAUSE),
699 const_iv (SDLK_ESCAPE),
700 const_iv (SDLK_SPACE),
701 const_iv (SDLK_EXCLAIM),
702 const_iv (SDLK_QUOTEDBL),
703 const_iv (SDLK_HASH),
704 const_iv (SDLK_DOLLAR),
705 const_iv (SDLK_AMPERSAND),
706 const_iv (SDLK_QUOTE),
707 const_iv (SDLK_LEFTPAREN),
708 const_iv (SDLK_RIGHTPAREN),
709 const_iv (SDLK_ASTERISK),
710 const_iv (SDLK_PLUS),
711 const_iv (SDLK_COMMA),
712 const_iv (SDLK_MINUS),
713 const_iv (SDLK_PERIOD),
714 const_iv (SDLK_SLASH),
715 const_iv (SDLK_0),
716 const_iv (SDLK_1),
717 const_iv (SDLK_2),
718 const_iv (SDLK_3),
719 const_iv (SDLK_4),
720 const_iv (SDLK_5),
721 const_iv (SDLK_6),
722 const_iv (SDLK_7),
723 const_iv (SDLK_8),
724 const_iv (SDLK_9),
725 const_iv (SDLK_COLON),
726 const_iv (SDLK_SEMICOLON),
727 const_iv (SDLK_LESS),
728 const_iv (SDLK_EQUALS),
729 const_iv (SDLK_GREATER),
730 const_iv (SDLK_QUESTION),
731 const_iv (SDLK_AT),
732
733 const_iv (SDLK_LEFTBRACKET),
734 const_iv (SDLK_BACKSLASH),
735 const_iv (SDLK_RIGHTBRACKET),
736 const_iv (SDLK_CARET),
737 const_iv (SDLK_UNDERSCORE),
738 const_iv (SDLK_BACKQUOTE),
739 const_iv (SDLK_DELETE),
540 740
541 const_iv (SDLK_FIRST), 741 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 742 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 743 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 744 const_iv (SDLK_KP1),
620 const_iv (KMOD_RMETA), 820 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 821 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 822 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 823 const_iv (KMOD_MODE),
624 824
825 const_iv (KMOD_LRAM),
826
625 const_iv (MIX_DEFAULT_FORMAT), 827 const_iv (MIX_DEFAULT_FORMAT),
828
829 const_iv (SDL_INIT_TIMER),
830 const_iv (SDL_INIT_AUDIO),
831 const_iv (SDL_INIT_VIDEO),
832 const_iv (SDL_INIT_CDROM),
833 const_iv (SDL_INIT_JOYSTICK),
834 const_iv (SDL_INIT_EVERYTHING),
835 const_iv (SDL_INIT_NOPARACHUTE),
836 const_iv (SDL_INIT_EVENTTHREAD),
837
838 const_iv (SDL_GL_RED_SIZE),
839 const_iv (SDL_GL_GREEN_SIZE),
840 const_iv (SDL_GL_BLUE_SIZE),
841 const_iv (SDL_GL_ALPHA_SIZE),
842 const_iv (SDL_GL_DOUBLEBUFFER),
843 const_iv (SDL_GL_BUFFER_SIZE),
844 const_iv (SDL_GL_DEPTH_SIZE),
845 const_iv (SDL_GL_STENCIL_SIZE),
846 const_iv (SDL_GL_ACCUM_RED_SIZE),
847 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
848 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
849 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
850 const_iv (SDL_GL_STEREO),
851 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
852 const_iv (SDL_GL_MULTISAMPLESAMPLES),
853 const_iv (SDL_GL_ACCELERATED_VISUAL),
854 const_iv (SDL_GL_SWAP_CONTROL),
855
856 const_iv (FOW_DARKNESS)
626# undef const_iv 857# undef const_iv
627 }; 858 };
628 859
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 860 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 861 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
631 862
632 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 863 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
633 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 864 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
634} 865}
635 866
651NV ceil (NV x) 882NV ceil (NV x)
652 883
653IV minpot (UV n) 884IV minpot (UV n)
654 885
655IV popcount (UV n) 886IV popcount (UV n)
887
888NV distance (NV dx, NV dy)
889 CODE:
890 RETVAL = pow (dx * dx + dy * dy, 0.5);
891 OUTPUT:
892 RETVAL
656 893
657void 894void
658pango_init () 895pango_init ()
659 CODE: 896 CODE:
660{ 897{
661 opengl_fontmap = pango_opengl_font_map_new (); 898 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 899 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 900 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
901 /*pango_context_set_font_description (opengl_context, default_font);*/
902#if PANGO_VERSION_CHECK (1, 15, 2)
903 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
904 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
905#endif
664} 906}
665 907
666char *
667SDL_GetError () 908char *SDL_GetError ()
668 909
669int 910void SDL_main_hack (SV *real_main)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 911 PROTOTYPE: &
671 912
672void 913int SDL_Init (U32 flags)
914
915int SDL_InitSubSystem (U32 flags)
916
917void SDL_QuitSubSystem (U32 flags)
918
673SDL_Quit () 919void SDL_Quit ()
920
921int SDL_GL_SetAttribute (int attr, int value)
922 C_ARGS: (SDL_GLattr)attr, value
923
924int SDL_GL_GetAttribute (int attr)
925 CODE:
926 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
927 XSRETURN_UNDEF;
928 OUTPUT:
929 RETVAL
674 930
675void 931void
676SDL_ListModes (int rgb, int alpha) 932SDL_ListModes (int rgb, int alpha)
677 PPCODE: 933 PPCODE:
678{ 934{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 946 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 947 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 948 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 949
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 950 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 951 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 952
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 953 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 954
702 if (m && m != (SDL_Rect **)-1) 955 if (m && m != (SDL_Rect **)-1)
703 while (*m) 956 while (*m)
704 { 957 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 958 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 959 {
707 AV *av = newAV (); 960 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 961 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 962 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 963 av_push (av, newSViv (rgb));
733 ); 986 );
734 987
735 if (RETVAL) 988 if (RETVAL)
736 { 989 {
737 av_clear (texture_av); 990 av_clear (texture_av);
738
739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 991#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
741#include "glfunc.h" 992#include "glfunc.h"
742#undef GL_FUNC 993#undef GL_FUNC
994 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
995 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 996 }
744} 997}
745 OUTPUT: 998 OUTPUT:
746 RETVAL 999 RETVAL
1000
1001void
1002SDL_WM_SetCaption (const char *title, const char *icon)
747 1003
748void 1004void
749SDL_GL_SwapBuffers () 1005SDL_GL_SwapBuffers ()
750 1006
751char * 1007char *
752SDL_GetKeyName (int sym) 1008SDL_GetKeyName (int sym)
1009 C_ARGS: (SDLKey)sym
753 1010
754int 1011int
755SDL_GetAppState () 1012SDL_GetAppState ()
756 1013
1014int
1015SDL_GetModState ()
1016
1017int
1018SDL_WaitEvent ()
1019 C_ARGS: 0
1020
757void 1021void
1022SDL_PumpEvents ()
1023
1024void
758poll_events () 1025peep_events ()
759 PPCODE: 1026 PPCODE:
760{ 1027{
761 SDL_Event ev; 1028 SDL_Event ev;
762 1029
763 SDL_PumpEvents (); 1030 SDL_PumpEvents ();
770 { 1037 {
771 case SDL_KEYDOWN: 1038 case SDL_KEYDOWN:
772 case SDL_KEYUP: 1039 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1040 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1041 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1042 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1043 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1044 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 1045 break;
779 1046
780 case SDL_ACTIVEEVENT: 1047 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1048 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 1066 x = ev.motion.x;
800 y = ev.motion.y; 1067 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1068 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1069 }
803 1070
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1071 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1072 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1073 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1074 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1075 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1076 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1077 }
811 break; 1078 break;
812 1079
813 case SDL_MOUSEBUTTONDOWN: 1080 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1081 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1082 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1083
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1084 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1085 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1086 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1087 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
829 1096
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1097 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 1098 }
832} 1099}
833 1100
1101char *
1102SDL_AudioDriverName ()
1103 CODE:
1104{
1105 char buf [256];
1106 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1107 XSRETURN_UNDEF;
1108
1109 RETVAL = buf;
1110}
1111 OUTPUT:
1112 RETVAL
1113
834int 1114int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1115Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
836 POSTCALL: 1116 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1117 Mix_HookMusicFinished (music_finished);
838 Mix_ChannelFinished (channel_finished); 1118 Mix_ChannelFinished (channel_finished);
839 1119
840void 1120void
841Mix_QuerySpec () 1121Mix_QuerySpec ()
894 } 1174 }
895 } 1175 }
896#endif 1176#endif
897} 1177}
898 1178
899void 1179int
900add_font (char *file) 1180add_font (char *file)
901 CODE: 1181 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1182 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1183 OUTPUT:
1184 RETVAL
1185
1186void
1187IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1188
1189# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1190void
1191Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
903 1192
904void 1193void
905load_image_inline (SV *image_) 1194load_image_inline (SV *image_)
906 ALIAS: 1195 ALIAS:
907 load_image_file = 1 1196 load_image_file = 1
953 1242
954 SDL_LockSurface (surface2); 1243 SDL_LockSurface (surface2);
955 EXTEND (SP, 6); 1244 EXTEND (SP, 6);
956 PUSHs (sv_2mortal (newSViv (surface2->w))); 1245 PUSHs (sv_2mortal (newSViv (surface2->w)));
957 PUSHs (sv_2mortal (newSViv (surface2->h))); 1246 PUSHs (sv_2mortal (newSViv (surface2->h)));
958 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1247 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
959 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1248 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
960 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1249 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
961 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1250 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
962 SDL_UnlockSurface (surface2); 1251 SDL_UnlockSurface (surface2);
963 1252
1023#if DEBUG 1312#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1313 VALGRIND_DO_LEAK_CHECK;
1025#endif 1314#endif
1026} 1315}
1027 1316
1317int
1318SvREFCNT (SV *sv)
1319 CODE:
1320 RETVAL = SvREFCNT (sv);
1321 OUTPUT:
1322 RETVAL
1323
1028MODULE = Deliantra::Client PACKAGE = DC::Font 1324MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1325
1030PROTOTYPES: DISABLE 1326PROTOTYPES: DISABLE
1031 1327
1032DC::Font 1328DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1329new_from_file (SV *klass, char *path, int id = 0)
1034 CODE: 1330 CODE:
1035{ 1331{
1036 int count; 1332 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1333 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1038 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1334 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1067 PROTOTYPE: 1363 PROTOTYPE:
1068 CODE: 1364 CODE:
1069 tc_restore (); 1365 tc_restore ();
1070 1366
1071DC::Layout 1367DC::Layout
1072new (SV *class) 1368new (SV *klass)
1073 CODE: 1369 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1370 RETVAL = new cf_layout;
1075 1371
1076 RETVAL->pl = pango_layout_new (opengl_context); 1372 RETVAL->pl = pango_layout_new (opengl_context);
1077 RETVAL->r = 1.; 1373 RETVAL->r = 1.;
1078 RETVAL->g = 1.; 1374 RETVAL->g = 1.;
1079 RETVAL->b = 1.; 1375 RETVAL->b = 1.;
1080 RETVAL->a = 1.; 1376 RETVAL->a = 1.;
1081 RETVAL->base_height = MIN_FONT_HEIGHT; 1377 RETVAL->base_height = MIN_FONT_HEIGHT;
1082 RETVAL->font = 0; 1378 RETVAL->font = 0;
1083 RETVAL->rc = rc_alloc ();
1084 1379
1085 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1380 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1086 layout_update_font (RETVAL); 1381 layout_update_font (RETVAL);
1087 OUTPUT: 1382 OUTPUT:
1088 RETVAL 1383 RETVAL
1089 1384
1090void 1385void
1091DESTROY (DC::Layout self) 1386DESTROY (DC::Layout self)
1092 CODE: 1387 CODE:
1093 g_object_unref (self->pl); 1388 g_object_unref (self->pl);
1094 rc_free (self->rc);
1095 Safefree (self); 1389 delete self;
1096 1390
1097void 1391void
1098set_text (DC::Layout self, SV *text_) 1392set_text (DC::Layout self, SV *text_)
1099 CODE: 1393 CODE:
1100{ 1394{
1165{ 1459{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1460 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1461
1168 do 1462 do
1169 { 1463 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1464 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1465
1172 if (run && shape_attr_p (run)) 1466 if (run && shape_attr_p (run))
1173 { 1467 {
1174 PangoRectangle extents; 1468 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1469 pango_layout_iter_get_run_extents (iter, 0, &extents);
1226 1520
1227void 1521void
1228set_height (DC::Layout self, int base_height) 1522set_height (DC::Layout self, int base_height)
1229 CODE: 1523 CODE:
1230 if (self->base_height != base_height) 1524 if (self->base_height != base_height)
1231 { 1525 {
1232 self->base_height = base_height; 1526 self->base_height = base_height;
1233 layout_update_font (self); 1527 layout_update_font (self);
1234 } 1528 }
1235 1529
1236void 1530void
1279int 1573int
1280descent (DC::Layout self) 1574descent (DC::Layout self)
1281 CODE: 1575 CODE:
1282{ 1576{
1283 PangoRectangle rect; 1577 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1578 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1579 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1580 RETVAL = PANGO_DESCENT (rect);
1287} 1581}
1288 OUTPUT: 1582 OUTPUT:
1289 RETVAL 1583 RETVAL
1301 1595
1302void 1596void
1303cursor_pos (DC::Layout self, int index) 1597cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1598 PPCODE:
1305{ 1599{
1306 PangoRectangle strong_pos; 1600 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1601 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1602
1309 EXTEND (SP, 3); 1603 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1604 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1605 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1606 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1607}
1314 1608
1315void 1609void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1610index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1611 PPCODE:
1318{ 1612{
1319 int line, x; 1613 int line, x;
1320 1614
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1615 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1616#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1617 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1618 --line;
1619#endif
1324 EXTEND (SP, 2); 1620 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1621 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1622 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1623}
1328 1624
1329void 1625void
1330line_x_to_index (DC::Layout self, int line, int x) 1626line_x_to_index (DC::Layout self, int line, int x)
1334 int index, trailing; 1630 int index, trailing;
1335 1631
1336 if (line < 0) 1632 if (line < 0)
1337 XSRETURN_EMPTY; 1633 XSRETURN_EMPTY;
1338 1634
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1635 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1636 XSRETURN_EMPTY; /* do better */
1341 1637
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1638 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1639
1344 EXTEND (SP, 2); 1640 EXTEND (SP, 2);
1352} 1648}
1353 1649
1354void 1650void
1355render (DC::Layout self, float x, float y, int flags = 0) 1651render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1652 CODE:
1357 rc_clear (self->rc); 1653 self->rc.clear ();
1358 pango_opengl_render_layout_subpixel ( 1654 pango_opengl_render_layout_subpixel (
1359 self->pl, 1655 self->pl,
1360 self->rc, 1656 &self->rc,
1361 x * PANGO_SCALE, y * PANGO_SCALE, 1657 x * PANGO_SCALE, y * PANGO_SCALE,
1362 self->r, self->g, self->b, self->a, 1658 self->r, self->g, self->b, self->a,
1363 flags 1659 flags
1364 ); 1660 );
1365 // we assume that context_change actually clears/frees stuff 1661 // we assume that context_change actually clears/frees stuff
1376 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1672 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1377 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1673 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1378 glEnable (GL_ALPHA_TEST); 1674 glEnable (GL_ALPHA_TEST);
1379 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1675 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1380 1676
1381 rc_draw (self->rc); 1677 self->rc.draw ();
1382 1678
1383 glDisable (GL_ALPHA_TEST); 1679 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1680 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1681 glDisable (GL_TEXTURE_2D);
1386} 1682}
1461 glDisable (GL_ALPHA_TEST); 1757 glDisable (GL_ALPHA_TEST);
1462 glDisable (GL_BLEND); 1758 glDisable (GL_BLEND);
1463 } 1759 }
1464} 1760}
1465 1761
1762void
1763draw_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)
1764 PROTOTYPE: @
1765 CODE:
1766{
1767 glEnable (GL_BLEND);
1768 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1769 glEnable (GL_TEXTURE_2D);
1770 glBindTexture (GL_TEXTURE_2D, name1);
1771
1772 glColor3f (intensity, intensity, intensity);
1773 glPushMatrix ();
1774 glScalef (1./3, 1./3, 1.);
1775
1776 if (blend > 0.f)
1777 {
1778 float dx3 = dx * -3.f / w;
1779 float dy3 = dy * -3.f / h;
1780 GLfloat env_color[4] = { 0., 0., 0., blend };
1781
1782 /* interpolate the two shadow textures */
1783 /* stage 0 == rgb(glcolor) + alpha(t0) */
1784 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1785
1786 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1787 gl.ActiveTexture (GL_TEXTURE1);
1788 glEnable (GL_TEXTURE_2D);
1789 glBindTexture (GL_TEXTURE_2D, name2);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1791
1792 /* rgb == rgb(glcolor) */
1793 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1796
1797 /* alpha = interpolate t0, t1 by env_alpha */
1798 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1799
1800 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1802 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1806
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1809
1810 glBegin (GL_QUADS);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1813 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1814 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1815 glEnd ();
1816
1817 glDisable (GL_TEXTURE_2D);
1818 gl.ActiveTexture (GL_TEXTURE0);
1819 }
1820 else
1821 {
1822 /* simple blending of one texture, also opengl <1.3 path */
1823 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1824
1825 glBegin (GL_QUADS);
1826 glTexCoord2f (0, 0); glVertex2f (0, 0);
1827 glTexCoord2f (0, t); glVertex2f (0, h);
1828 glTexCoord2f (s, t); glVertex2f (w, h);
1829 glTexCoord2f (s, 0); glVertex2f (w, 0);
1830 glEnd ();
1831 }
1832
1833 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1834 {
1835 int x, y;
1836 int dx3 = dx * 3;
1837 int dy3 = dy * 3;
1838
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1840 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1841 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1842 glTranslatef (-1., -1., 0);
1843 glBegin (GL_QUADS);
1844
1845 for (y = 1; y < h; y += 3)
1846 {
1847 int y1 = y - dy3;
1848 int y1valid = y1 >= 0 && y1 < h;
1849
1850 for (x = 1; x < w; x += 3)
1851 {
1852 int x1 = x - dx3;
1853 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1854 uint8_t h2;
1855
1856 if (y1valid && x1 >= 0 && x1 < w)
1857 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 else
1859 h2 = 1; /* out of range == invisible */
1860
1861 if (h1 || h2)
1862 {
1863 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1864 glColor4f (1., 1., 1., alpha);
1865
1866 glTexCoord2f (0, 0.); glVertex2i (x , y );
1867 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1868 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1869 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1870 }
1871 }
1872 }
1873 }
1874
1875 glEnd ();
1876
1877 glPopMatrix ();
1878
1879 glDisable (GL_TEXTURE_2D);
1880 glDisable (GL_BLEND);
1881}
1882
1466IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1883IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1467 CODE: 1884 CODE:
1468{ 1885{
1469 GLint width; 1886 GLint width;
1470 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1887 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1477MODULE = Deliantra::Client PACKAGE = DC::Map 1894MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1895
1479PROTOTYPES: DISABLE 1896PROTOTYPES: DISABLE
1480 1897
1481DC::Map 1898DC::Map
1482new (SV *class) 1899new (SV *klass)
1483 CODE: 1900 CODE:
1484 New (0, RETVAL, 1, struct map); 1901 New (0, RETVAL, 1, mapgrid);
1485 RETVAL->x = 0; 1902 RETVAL->x = 0;
1486 RETVAL->y = 0; 1903 RETVAL->y = 0;
1487 RETVAL->w = 0; 1904 RETVAL->w = 0;
1488 RETVAL->h = 0; 1905 RETVAL->h = 0;
1489 RETVAL->ox = 0; 1906 RETVAL->ox = 0;
1526 1943
1527void 1944void
1528set_smooth (DC::Map self, int face, int smooth, int level) 1945set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1946 CODE:
1530{ 1947{
1531 tileid texid; 1948 tileid texid;
1532 maptex *tex; 1949 maptex *tex;
1533 1950
1534 if (face < 0 || face >= self->faces) 1951 if (face < 0 || face >= self->faces)
1535 return; 1952 return;
1536 1953
1537 if (smooth < 0 || smooth >= self->faces) 1954 if (smooth < 0 || smooth >= self->faces)
1538 return; 1955 return;
1539 1956
1540 texid = self->face2tile [face]; 1957 texid = self->face2tile [face];
1541 1958
1542 if (!texid) 1959 if (!texid)
1543 return; 1960 return;
1544 1961
1545 tex = self->tex + texid; 1962 tex = self->tex + texid;
1574 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1991 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1575 // use uglier nearest interpolation because linear suffers 1992 // use uglier nearest interpolation because linear suffers
1576 // from transparent color bleeding and ugly wrapping effects. 1993 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1994 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1995}
1996
1997void
1998expire_textures (DC::Map self, int texid, int count)
1999 PPCODE:
2000 for (; texid < self->texs && count; ++texid, --count)
2001 {
2002 maptex *tex = self->tex + texid;
2003
2004 if (tex->name)
2005 {
2006 if (tex->unused)
2007 {
2008 tex->name = 0;
2009 tex->unused = 0;
2010 XPUSHs (sv_2mortal (newSViv (texid)));
2011 }
2012 else
2013 tex->unused = 1;
2014 }
2015 }
1579 2016
1580int 2017int
1581ox (DC::Map self) 2018ox (DC::Map self)
1582 ALIAS: 2019 ALIAS:
1583 oy = 1 2020 oy = 1
1615 self->ox += dx; self->x += dx; 2052 self->ox += dx; self->x += dx;
1616 self->oy += dy; self->y += dy; 2053 self->oy += dy; self->y += dy;
1617 2054
1618 while (self->y < 0) 2055 while (self->y < 0)
1619 { 2056 {
1620 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2057 prepend (self->row, self->rows, MAP_EXTEND_Y);
1621 2058
1622 self->rows += MAP_EXTEND_Y; 2059 self->rows += MAP_EXTEND_Y;
1623 self->y += MAP_EXTEND_Y; 2060 self->y += MAP_EXTEND_Y;
1624 } 2061 }
1625} 2062}
1626 2063
1627SV * 2064SV *
1628map1a_update (DC::Map self, SV *data_, int extmap) 2065map1a_update (DC::Map self, SV *data_)
1629 CODE: 2066 CODE:
1630{ 2067{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2068 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 2069 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 2070 mapcell *cell;
1654 2091
1655 //TODO: don't trust server data to be in-range(!) 2092 //TODO: don't trust server data to be in-range(!)
1656 2093
1657 if (flags & 8) 2094 if (flags & 8)
1658 { 2095 {
2096 uint8_t ext, cmd;
2097
1659 if (extmap) 2098 do
1660 { 2099 {
1661 uint8_t ext, cmd; 2100 ext = *data++;
2101 cmd = ext & 0x7f;
1662 2102
1663 do 2103 if (cmd < 4)
2104 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2105 else if (cmd == 5) // health
1664 { 2106 {
1665 ext = *data++;
1666 cmd = ext & 0x3f;
1667
1668 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health
1671 {
1672 cell->stat_width = 1; 2107 cell->stat_width = 1;
1673 cell->stat_hp = *data++; 2108 cell->stat_hp = *data++;
1674 }
1675 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47)
1678 {
1679 if (*data == 4)
1680 ; // decode player count
1681
1682 data += *data + 1;
1683 }
1684 else if (cmd == 8) // cell flags
1685 cell->flags = *data++;
1686 else if (ext & 0x40) // unknown, multibyte => skip
1687 data += *data + 1;
1688 else
1689 data++;
1690 } 2109 }
1691 while (ext & 0x80); 2110 else if (cmd == 6) // monster width
2111 cell->stat_width = *data++ + 1;
2112 else if (cmd == 0x47)
2113 {
2114 if (*data == 1) cell->player = data [1];
2115 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2116 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2117 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2118
2119 data += *data + 1;
2120 }
2121 else if (cmd == 8) // cell flags
2122 cell->flags = *data++;
2123 else if (ext & 0x40) // unknown, multibyte => skip
2124 data += *data + 1;
2125 else
2126 data++;
1692 } 2127 }
1693 else 2128 while (ext & 0x80);
1694 cell->darkness = *data++ + 1;
1695 } 2129 }
1696 2130
1697 for (z = 0; z <= 2; ++z) 2131 for (z = 0; z <= 2; ++z)
1698 if (flags & (4 >> z)) 2132 if (flags & (4 >> z))
1699 { 2133 {
1702 cell->tile [z] = self->face2tile [face]; 2136 cell->tile [z] = self->face2tile [face];
1703 2137
1704 if (cell->tile [z]) 2138 if (cell->tile [z])
1705 { 2139 {
1706 maptex *tex = self->tex + cell->tile [z]; 2140 maptex *tex = self->tex + cell->tile [z];
2141 tex->unused = 0;
1707 if (!tex->name) 2142 if (!tex->name)
1708 av_push (missing, newSViv (cell->tile [z])); 2143 av_push (missing, newSViv (cell->tile [z]));
1709 2144
1710 if (tex->smoothtile) 2145 if (tex->smoothtile)
1711 { 2146 {
1712 maptex *smooth = self->tex + tex->smoothtile; 2147 maptex *smooth = self->tex + tex->smoothtile;
2148 smooth->unused = 0;
1713 if (!smooth->name) 2149 if (!smooth->name)
1714 av_push (missing, newSViv (tex->smoothtile)); 2150 av_push (missing, newSViv (tex->smoothtile));
1715 } 2151 }
1716 } 2152 }
1717 } 2153 }
1718 } 2154 }
1719 else 2155 else
1720 cell->darkness = 0; 2156 CELL_CLEAR (cell);
1721 } 2157 }
1722} 2158}
1723 OUTPUT: 2159 OUTPUT:
1724 RETVAL 2160 RETVAL
1725 2161
1745 ? self->row + y 2181 ? self->row + y
1746 : 0; 2182 : 0;
1747 2183
1748 for (x = x0; x < x1; x++) 2184 for (x = x0; x < x1; x++)
1749 { 2185 {
1750 int r = 32, g = 32, b = 32, a = 192; 2186 unsigned int r = 32, g = 32, b = 32, a = 192;
1751 2187
1752 if (row && row->c0 <= x && x < row->c1) 2188 if (row && row->c0 <= x && x < row->c1)
1753 { 2189 {
1754 mapcell *cell = row->col + (x - row->c0); 2190 mapcell *cell = row->col + (x - row->c0);
1755 2191
1757 { 2193 {
1758 maptex tex = self->tex [cell->tile [z]]; 2194 maptex tex = self->tex [cell->tile [z]];
1759 int a0 = 255 - tex.a; 2195 int a0 = 255 - tex.a;
1760 int a1 = tex.a; 2196 int a1 = tex.a;
1761 2197
1762 r = (r * a0 + tex.r * a1) / 255; 2198 r = div255 (r * a0 + tex.r * a1);
1763 g = (g * a0 + tex.g * a1) / 255; 2199 g = div255 (g * a0 + tex.g * a1);
1764 b = (b * a0 + tex.b * a1) / 255; 2200 b = div255 (b * a0 + tex.b * a1);
1765 a = (a * a0 + tex.a * a1) / 255; 2201 a = div255 (a * a0 + tex.a * a1);
1766 } 2202 }
1767 } 2203 }
1768 2204
1769 *map++ = (r ) 2205 *map++ = (r )
1770 | (g << 8) 2206 | (g << 8)
1771 | (b << 16) 2207 | (b << 16)
1772 | (a << 24); 2208 | (a << 24);
1773 } 2209 }
1774 } 2210 }
1775 2211
1776 RETVAL = map_sv; 2212 RETVAL = map_sv;
1777} 2213}
1778 OUTPUT: 2214 OUTPUT:
1779 RETVAL 2215 RETVAL
1780 2216
1781void 2217void
1782draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2218draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1783 CODE: 2219 CODE:
1784{ 2220{
1785 int x, y, z; 2221 int x, y, z;
1786 2222
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1789 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2223 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1790 smooth_key skey; 2224 int pl_x, pl_y;
1791 2225 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 2226 rc_t rc;
2227 rc_t rc_ov;
1793 rc_key_t key; 2228 rc_key_t key;
1794 rc_array_t *arr; 2229 rc_t::array_t *arr;
1795 2230
2231 pl_tex.name = 0;
2232
1796 // thats current max. sorry. 2233 // that's current max. sorry.
1797 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1799
1800 // clear key, in case of extra padding
1801 memset (&skey, 0, sizeof (skey));
1802 2236
1803 memset (&key, 0, sizeof (key)); 2237 memset (&key, 0, sizeof (key));
1804 key.r = 255; 2238 key.r = 255;
1805 key.g = 255; 2239 key.g = 255;
1806 key.b = 255; 2240 key.b = 255;
1807 key.a = 255; 2241 key.a = 255;
1808 key.mode = GL_QUADS; 2242 key.mode = GL_QUADS;
1809 key.format = GL_T2F_V3F; 2243 key.format = GL_T2F_V3F;
1810 key.texname = -1;
1811 2244
1812 mx += self->x; 2245 mx += self->x;
1813 my += self->y; 2246 my += self->y;
1814 2247
1815 // first pass: determine smooth_max 2248 // first pass: determine smooth_max
1816 // rather ugly, if you ask me 2249 // rather ugly, if you ask me
1817 // could also be stored inside mapcell and updated on change 2250 // could also be stored inside mapcell and updated on change
1818 memset (smooth_max, 0, sizeof (smooth_max)); 2251 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1819 2252
1820 for (y = 0; y < sh; y++) 2253 for (y = 0; y < sh; y++)
1821 if (0 <= y + my && y + my < self->rows) 2254 if (0 <= y + my && y + my < self->rows)
1822 { 2255 {
1823 maprow *row = self->row + (y + my); 2256 maprow *row = self->row + (y + my);
1838 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2271 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2272 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1840 2273
1841 for (z = 0; z <= 2; z++) 2274 for (z = 0; z <= 2; z++)
1842 { 2275 {
1843 memset (smooth_level, 0, sizeof (smooth_level)); 2276 std::bitset<256> smooth_level; // one bit for every possible smooth level
2277 smooth_key skey;
2278 smooth_hash smooth;
2279 key.texname = -1;
1844 2280
1845 for (y = 0; y < sh; y++) 2281 for (y = 0; y < sh; y++)
1846 if (0 <= y + my && y + my < self->rows) 2282 if (0 <= y + my && y + my < self->rows)
1847 { 2283 {
1848 maprow *row = self->row + (y + my); 2284 maprow *row = self->row + (y + my);
1858 maptex tex = self->tex [tile]; 2294 maptex tex = self->tex [tile];
1859 int px, py; 2295 int px, py;
1860 2296
1861 if (key.texname != tex.name) 2297 if (key.texname != tex.name)
1862 { 2298 {
2299 self->tex [tile].unused = 0;
2300
1863 if (!tex.name) 2301 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2302 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1865 2303
1866 key.texname = tex.name; 2304 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2305 arr = &rc.array (key);
1868 } 2306 }
1869 2307
1870 px = (x + 1) * T - tex.w; 2308 px = (x + 1) * Th - tex.w;
1871 py = (y + 1) * T - tex.h; 2309 py = (y + 1) * Tw - tex.h;
1872 2310
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2311 if (expect_false (cell->player == player) && expect_false (z == 2))
1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1875 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1876 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877
1878 if (cell->flags && z == 2)
1879 { 2312 {
1880 // overlays such as the speech bubble, probably more to come 2313 pl_x = px;
1881 if (cell->flags & 1) 2314 pl_y = py;
2315 pl_tex = tex;
1882 { 2316 continue;
1883 maptex tex = self->tex [1];
1884 int px = x * T + T * 2 / 32;
1885 int py = y * T - T * 6 / 32;
1886
1887 if (tex.name)
1888 {
1889 if (key.texname != tex.name)
1890 {
1891 key.texname = tex.name;
1892 arr = rc_array (rc, &key);
1893 }
1894
1895 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1896 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1897 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1898 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1899 }
1900 }
1901 } 2317 }
2318
2319 arr->t2f_v3f (0 , 0 , px , py , 0);
2320 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2321 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2322 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1902 2323
1903 // update smooth hash 2324 // update smooth hash
1904 if (tex.smoothtile) 2325 if (tex.smoothtile)
1905 { 2326 {
1906 skey.tile = tex.smoothtile; 2327 skey.tile = tex.smoothtile;
1907 skey.level = tex.smoothlevel; 2328 skey.level = tex.smoothlevel;
1908 2329
1909 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2330 smooth_level[tex.smoothlevel] = 1;
1910 2331
1911 // add bits to current tile and all neighbours. skey.x|y is 2332 // add bits to current tile and all neighbours. skey.x|y is
1912 // shifted +1|+1 so we always stay positive. 2333 // shifted +1|+1 so we always stay positive.
1913 2334
1914 // bits is ___n cccc CCCC bbbb 2335 // bits is ___n cccc CCCC bbbb
1922 2343
1923 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2344 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1924 // ·· ·· ·┏ ┓· 2345 // ·· ·· ·┏ ┓·
1925 2346
1926 // full tile 2347 // full tile
1927 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2348 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1928 2349
1929 // borders 2350 // borders
1930 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2351 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1931 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2352 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1932 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2353 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1933 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2354 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1934 2355
1935 // corners 2356 // corners
1936 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2357 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1937 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2358 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1938 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2359 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1939 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2360 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2361 }
2362 }
2363
2364 if (expect_false (z == 2) && expect_false (cell->flags))
2365 {
2366 // overlays such as the speech bubble, probably more to come
2367 if (cell->flags & 1)
2368 {
2369 rc_key_t key_ov = key;
2370 maptex tex = self->tex[TEXID_SPEECH];
2371 int px = x * Tw + Tw * 2 / 32;
2372 int py = y * Th - Th * 6 / 32;
2373
2374 key_ov.texname = tex.name;
2375 rc_t::array_t &arr = rc_ov.array (key_ov);
2376
2377 arr.t2f_v3f (0 , 0 , px , py , 0);
2378 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2379 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2380 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
1940 } 2381 }
1941 } 2382 }
1942 } 2383 }
1943 } 2384 }
1944 2385
1945 rc_draw (rc); 2386 rc.draw ();
1946 rc_clear (rc); 2387 rc.clear ();
1947 2388
1948 // go through all smoothlevels, lowest to highest, then draw. 2389 // go through all smoothlevels, lowest to highest, then draw.
1949 // this is basically counting sort 2390 // this is basically counting sort
1950 { 2391 {
1951 int w, b; 2392 int w, b;
1952 2393
1953 glEnable (GL_TEXTURE_2D); 2394 glEnable (GL_TEXTURE_2D);
1954 glBegin (GL_QUADS); 2395 glBegin (GL_QUADS);
1955 for (w = 0; w < 256 / 32; ++w) 2396 for (int level = 0; level < smooth_level.size (); ++level)
2397 if (smooth_level[level])
2398 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1956 { 2399 {
1957 uint32_t smask = smooth_level [w]; 2400 smooth_key &skey = it->first;
1958 if (smask) 2401 IV bits = it->second;
1959 for (b = 0; b < 32; ++b) 2402
1960 if (smask & (((uint32_t)1) << b)) 2403 if (!(bits & 0x1000)
2404 && skey.level == level
2405 && level > smooth_max [skey.x][skey.y])
1961 { 2406 {
1962 int level = (w << 5) | b; 2407 maptex tex = self->tex [skey.tile];
2408 int px = (((int)skey.x) - 1) * Tw;
2409 int py = (((int)skey.y) - 1) * Th;
2410 int border = bits & 15;
2411 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2412 float dx = tex.s * .0625f; // 16 images/row
2413 float dy = tex.t * .5f ; // 2 images/column
2414
1963 HE *he; 2415 if (tex.name)
1964
1965 hv_iterinit (smooth);
1966 while ((he = hv_iternext (smooth)))
1967 { 2416 {
1968 smooth_key *skey = (smooth_key *)HeKEY (he); 2417 // this time avoiding texture state changes
1969 IV bits = SvIVX (HeVAL (he)); 2418 // save gobs of state changes.
1970 2419 if (key.texname != tex.name)
1971 if (!(bits & 0x1000)
1972 && skey->level == level
1973 && level > smooth_max [skey->x][skey->y])
1974 { 2420 {
1975 maptex tex = self->tex [skey->tile]; 2421 self->tex [skey.tile].unused = 0;
1976 int px = (((int)skey->x) - 1) * T;
1977 int py = (((int)skey->y) - 1) * T;
1978 int border = bits & 15;
1979 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1980 float dx = tex.s * .0625f; // 16 images/row
1981 float dy = tex.t * .5f ; // 2 images/column
1982 2422
1983 if (tex.name)
1984 {
1985 // this time avoiding texture state changes
1986 // save gobs of state changes.
1987 if (key.texname != tex.name)
1988 {
1989 glEnd (); 2423 glEnd ();
1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2424 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1991 glBegin (GL_QUADS); 2425 glBegin (GL_QUADS);
1992 } 2426 }
1993 2427
1994 if (border) 2428 if (border)
1995 { 2429 {
1996 float ox = border * dx; 2430 float ox = border * dx;
1997 2431
1998 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2432 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1999 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2000 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2001 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2435 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2002 } 2436 }
2003 2437
2004 if (corner) 2438 if (corner)
2005 { 2439 {
2006 float ox = corner * dx; 2440 float ox = corner * dx;
2007 2441
2008 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2442 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2009 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2443 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2010 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2444 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2011 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2012 }
2013 }
2014 } 2446 }
2015 } 2447 }
2016 } 2448 }
2017 } 2449 }
2018 2450
2019 glEnd (); 2451 glEnd ();
2020 glDisable (GL_TEXTURE_2D); 2452 glDisable (GL_TEXTURE_2D);
2021 key.texname = -1; 2453 key.texname = -1;
2022 } 2454 }
2023
2024 hv_clear (smooth);
2025 } 2455 }
2026 2456
2457 if (pl_tex.name)
2458 {
2459 maptex tex = pl_tex;
2460 int px = pl_x + sdx;
2461 int py = pl_y + sdy;
2462
2463 key.texname = tex.name;
2464 rc_t::array_t &arr = rc.array (key);
2465
2466 arr.t2f_v3f (0 , 0 , px , py , 0);
2467 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2468 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2469 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2470
2471 rc.draw ();
2472 }
2473
2474 rc_ov.draw ();
2475 rc_ov.clear ();
2476
2027 glDisable (GL_BLEND); 2477 glDisable (GL_BLEND);
2028 rc_free (rc);
2029 2478
2030 // top layer: overlays such as the health bar 2479 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2480 for (y = 0; y < sh; y++)
2032 if (0 <= y + my && y + my < self->rows) 2481 if (0 <= y + my && y + my < self->rows)
2033 { 2482 {
2036 for (x = 0; x < sw; x++) 2485 for (x = 0; x < sw; x++)
2037 if (row->c0 <= x + mx && x + mx < row->c1) 2486 if (row->c0 <= x + mx && x + mx < row->c1)
2038 { 2487 {
2039 mapcell *cell = row->col + (x + mx - row->c0); 2488 mapcell *cell = row->col + (x + mx - row->c0);
2040 2489
2041 int px = x * T; 2490 int px = x * Tw;
2042 int py = y * T; 2491 int py = y * Th;
2492
2493 if (expect_false (cell->player == player))
2494 {
2495 px += sdx;
2496 py += sdy;
2497 }
2043 2498
2044 if (cell->stat_hp) 2499 if (cell->stat_hp)
2045 { 2500 {
2046 int width = cell->stat_width * T; 2501 int width = cell->stat_width * Tw;
2047 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2502 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2048 2503
2049 glColor3ub (0, 0, 0); 2504 glColor3ub (0, 0, 0);
2050 glRectf (px + 1, py - thick - 2, 2505 glRectf (px + 1, py - thick - 2,
2051 px + width - 1, py); 2506 px + width - 1, py);
2052 2507
2058 } 2513 }
2059 } 2514 }
2060} 2515}
2061 2516
2062void 2517void
2063draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2518draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2064 CODE: 2519 CODE:
2065{ 2520{
2066 static float color[16][3] = { 2521 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2522 { 0.00f, 0.00f, 0.00f },
2068 { 1.00F, 1.00F, 1.00F }, 2523 { 1.00f, 1.00f, 1.00f },
2069 { 0.00F, 0.00F, 0.55F }, 2524 { 0.00f, 0.00f, 0.55f },
2070 { 1.00F, 0.00F, 0.00F }, 2525 { 1.00f, 0.00f, 0.00f },
2071 2526
2072 { 1.00F, 0.54F, 0.00F }, 2527 { 1.00f, 0.54f, 0.00f },
2073 { 0.11F, 0.56F, 1.00F }, 2528 { 0.11f, 0.56f, 1.00f },
2074 { 0.93F, 0.46F, 0.00F }, 2529 { 0.93f, 0.46f, 0.00f },
2075 { 0.18F, 0.54F, 0.34F }, 2530 { 0.18f, 0.54f, 0.34f },
2076 2531
2077 { 0.56F, 0.73F, 0.56F }, 2532 { 0.56f, 0.73f, 0.56f },
2078 { 0.80F, 0.80F, 0.80F }, 2533 { 0.80f, 0.80f, 0.80f },
2079 { 0.55F, 0.41F, 0.13F }, 2534 { 0.55f, 0.41f, 0.13f },
2080 { 0.99F, 0.77F, 0.26F }, 2535 { 0.99f, 0.77f, 0.26f },
2081 2536
2082 { 0.74F, 0.65F, 0.41F }, 2537 { 0.74f, 0.65f, 0.41f },
2083 2538
2084 { 0.00F, 1.00F, 1.00F }, 2539 { 0.00f, 1.00f, 1.00f },
2085 { 1.00F, 0.00F, 1.00F }, 2540 { 1.00f, 0.00f, 1.00f },
2086 { 1.00F, 1.00F, 0.00F }, 2541 { 1.00f, 1.00f, 0.00f },
2087 }; 2542 };
2088 2543
2089 int x, y; 2544 int x, y;
2090 2545
2091 glEnable (GL_TEXTURE_2D); 2546 glEnable (GL_TEXTURE_2D);
2547 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2548 * but the nvidia driver (185.18.14) mishandles alpha textures
2549 * and takes the colour from god knows where instead of using
2550 * Cp. MODULATE results in the same colour, but slightly different
2551 * alpha, but atcually gives us the correct colour with nvidia.
2552 */
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2553 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2093 glEnable (GL_BLEND); 2554 glEnable (GL_BLEND);
2094 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2555 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2095 glBegin (GL_QUADS); 2556 glBegin (GL_QUADS);
2096 2557
2097 for (y = 0; y < h; y++) 2558 for (y = 0; y < h; y++)
2101 2562
2102 if (m) 2563 if (m)
2103 { 2564 {
2104 float *c = color [m & 15]; 2565 float *c = color [m & 15];
2105 2566
2106 float tx1 = m & 0x40 ? 0.5 : 0.; 2567 float tx1 = m & 0x40 ? 0.5f : 0.f;
2107 float tx2 = tx1 + 0.5; 2568 float tx2 = tx1 + 0.5f;
2108 2569
2109 glColor4f (c[0], c[1], c[2], 0.75); 2570 glColor4f (c[0], c[1], c[2], 1);
2110 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2571 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2111 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2572 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2112 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2573 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2113 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2574 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2114 } 2575 }
2122void 2583void
2123fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2584fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124 PPCODE: 2585 PPCODE:
2125{ 2586{
2126 int x, y; 2587 int x, y;
2127 int sw1 = sw + 2; 2588 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2589 int sh1 = sh + 2;
2129 int sh3 = sh * 3; 2590 int sh3 = sh * 3;
2130 int sw34 = (sw * 3 + 3) & ~3; 2591 int sw3 = sw * 3;
2592 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2593 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2131 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2594 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2132 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2595 memset (darkness1, 0, sw1*sh1);
2133 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2134 2596
2135 SvPOK_only (darkness3_sv); 2597 SvPOK_only (darkness3_sv);
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2598 SvCUR_set (darkness3_sv, sw3 * sh3);
2137 2599
2138 mx += self->x - 1; 2600 mx += self->x - 1;
2139 my += self->y - 1; 2601 my += self->y - 1;
2140
2141 memset (darkness1, 255, sw1 * sh1);
2142 2602
2143 for (y = 0; y < sh1; y++) 2603 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2604 if (0 <= y + my && y + my < self->rows)
2145 { 2605 {
2146 maprow *row = self->row + (y + my); 2606 maprow *row = self->row + (y + my);
2149 if (row->c0 <= x + mx && x + mx < row->c1) 2609 if (row->c0 <= x + mx && x + mx < row->c1)
2150 { 2610 {
2151 mapcell *cell = row->col + (x + mx - row->c0); 2611 mapcell *cell = row->col + (x + mx - row->c0);
2152 2612
2153 darkness1 [y * sw1 + x] = cell->darkness 2613 darkness1 [y * sw1 + x] = cell->darkness
2154 ? 255 - (cell->darkness - 1) 2614 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2155 : 255 - FOW_DARKNESS; 2615 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2156 } 2616 }
2157 } 2617 }
2158 2618
2159 for (y = 0; y < sh; ++y) 2619 for (y = 0; y < sh; ++y)
2160 for (x = 0; x < sw; ++x) 2620 for (x = 0; x < sw; ++x)
2179 2639
2180 uint8_t r13 = (d13 + d23 + d12) / 3; 2640 uint8_t r13 = (d13 + d23 + d12) / 3;
2181 uint8_t r23 = d23; 2641 uint8_t r23 = d23;
2182 uint8_t r33 = (d23 + d33 + d32) / 3; 2642 uint8_t r33 = (d23 + d33 + d32) / 3;
2183 2643
2184 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2185 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2645 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2186 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2646 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2187 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2188 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2648 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2189 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2649 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2190 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2191 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2651 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2192 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2652 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2193 } 2653 }
2194 2654
2195 free (darkness1); 2655 free (darkness1);
2196 2656
2197 EXTEND (SP, 3); 2657 EXTEND (SP, 3);
2198 PUSHs (sv_2mortal (newSViv (sw34))); 2658 PUSHs (sv_2mortal (newSViv (sw3)));
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2659 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2660 PUSHs (darkness3_sv);
2201} 2661}
2202 2662
2203SV * 2663SV *
2266 else 2726 else
2267 *data++ = 0; 2727 *data++ = 0;
2268 } 2728 }
2269 } 2729 }
2270 2730
2731 /* if size is w*h + 5 then no data has been found */
2732 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2733 {
2271 SvPOK_only (data_sv); 2734 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2735 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2736 }
2737
2273 RETVAL = data_sv; 2738 RETVAL = data_sv;
2274} 2739}
2275 OUTPUT: 2740 OUTPUT:
2276 RETVAL 2741 RETVAL
2277 2742
2278void 2743void
2279set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2744set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2745 PPCODE:
2281{ 2746{
2282 int x, y, z; 2747 int x, y, z;
2283 int w, h; 2748 int w, h;
2284 int x1, y1; 2749 int x1, y1;
2750 STRLEN len;
2751 uint8_t *data, *end;
2752
2753 len = SvLEN (data_sv);
2754 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2755 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2756 end = data + len + 8;
2757
2758 if (len < 5)
2759 XSRETURN_EMPTY;
2285 2760
2286 if (*data++ != 0) 2761 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2762 XSRETURN_EMPTY; /* version mismatch */
2288 2763
2289 w = *data++ << 8; w |= *data++; 2764 w = *data++ << 8; w |= *data++;
2304 { 2779 {
2305 maprow *row = map_get_row (self, y); 2780 maprow *row = map_get_row (self, y);
2306 2781
2307 for (x = x0; x < x1; x++) 2782 for (x = x0; x < x1; x++)
2308 { 2783 {
2784 uint8_t flags;
2785
2786 if (data + 7 >= end)
2787 XSRETURN_EMPTY;
2788
2309 uint8_t flags = *data++; 2789 flags = *data++;
2310 2790
2311 if (flags) 2791 if (flags)
2312 { 2792 {
2313 mapcell *cell = row_get_cell (row, x); 2793 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2794 tileid tile[3] = { 0, 0, 0 };
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2797 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2798 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2799
2320 if (cell->darkness == 0) 2800 if (cell->darkness == 0)
2321 { 2801 {
2322 cell->darkness = 0; 2802 /*cell->darkness = 0;*/
2803 EXTEND (SP, 3);
2323 2804
2324 for (z = 0; z <= 2; z++) 2805 for (z = 0; z <= 2; z++)
2325 { 2806 {
2326 tileid t = tile [z]; 2807 tileid t = tile [z];
2327 2808
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2809 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2810 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2811 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2812 need_texid (self, t);
2332 } 2813 }
2333 2814
2334 cell->tile [z] = t; 2815 cell->tile [z] = t;
2335 } 2816 }
2340} 2821}
2341 2822
2342MODULE = Deliantra::Client PACKAGE = DC::RW 2823MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2824
2344DC::RW 2825DC::RW
2345new (SV *class, SV *data_sv) 2826new (SV *klass, SV *data_sv)
2346 CODE: 2827 CODE:
2347{ 2828{
2348 STRLEN datalen; 2829 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2830 char *data = SvPVbyte (data_sv, datalen);
2350 2831
2352} 2833}
2353 OUTPUT: 2834 OUTPUT:
2354 RETVAL 2835 RETVAL
2355 2836
2356DC::RW 2837DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2838new_from_file (SV *klass, const char *path, const char *mode = "rb")
2358 CODE: 2839 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2840 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2841 OUTPUT:
2361 RETVAL 2842 RETVAL
2362 2843
2380 if (RETVAL < 0) 2861 if (RETVAL < 0)
2381 { 2862 {
2382 RETVAL = Mix_GroupOldest (-1); 2863 RETVAL = Mix_GroupOldest (-1);
2383 2864
2384 if (RETVAL < 0) 2865 if (RETVAL < 0)
2866 {
2867 // happens sometimes, maybe it just stopped playing(?)
2868 RETVAL = Mix_GroupAvailable (-1);
2869
2870 if (RETVAL < 0)
2385 XSRETURN_UNDEF; 2871 XSRETURN_UNDEF;
2386 2872 }
2873 else
2387 Mix_HaltChannel (RETVAL); 2874 Mix_HaltChannel (RETVAL);
2388 } 2875 }
2389 2876
2390 Mix_UnregisterAllEffects (RETVAL); 2877 Mix_UnregisterAllEffects (RETVAL);
2391 Mix_Volume (RETVAL, 128); 2878 Mix_Volume (RETVAL, 128);
2392} 2879}
2439void 2926void
2440set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2927set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2928 CODE:
2442{ 2929{
2443 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2930 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2444 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2931 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2932 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2933}
2447 2934
2448void 2935void
2449set_reverse_stereo (DC::Channel self, int flip) 2936set_reverse_stereo (DC::Channel self, int flip)
2452 2939
2453MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2940MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2941
2455PROTOTYPES: DISABLE 2942PROTOTYPES: DISABLE
2456 2943
2944void
2945decoders ()
2946 PPCODE:
2947#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2948 int i, num = Mix_GetNumChunkDecoders ();
2949 EXTEND (SP, num);
2950 for (i = 0; i < num; ++i)
2951 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2952#else
2953 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2954#endif
2955
2457DC::MixChunk 2956DC::MixChunk
2458new (SV *class, DC::RW rwops) 2957new (SV *klass, DC::RW rwops)
2459 CODE: 2958 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2959 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2960 OUTPUT:
2462 RETVAL 2961 RETVAL
2463 2962
2493 OUTPUT: 2992 OUTPUT:
2494 RETVAL 2993 RETVAL
2495 2994
2496MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2995MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497 2996
2997void
2998decoders ()
2999 PPCODE:
3000#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3001 int i, num = Mix_GetNumMusicDecoders ();
3002 EXTEND (SP, num);
3003 for (i = 0; i < num; ++i)
3004 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3005#else
3006 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3007#endif
3008
2498int 3009int
2499volume (int volume = -1) 3010volume (int volume = -1)
2500 PROTOTYPE: ;$ 3011 PROTOTYPE: ;$
2501 CODE: 3012 CODE:
2502 if (items > 0) 3013 if (items > 0)
2513void 3024void
2514halt () 3025halt ()
2515 CODE: 3026 CODE:
2516 Mix_HaltMusic (); 3027 Mix_HaltMusic ();
2517 3028
3029int
3030playing ()
3031 CODE:
3032 RETVAL = Mix_PlayingMusic ();
3033 OUTPUT:
3034 RETVAL
3035
2518DC::MixMusic 3036DC::MixMusic
2519new (SV *class, DC::RW rwops) 3037new (SV *klass, DC::RW rwops)
2520 CODE: 3038 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 3039 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 3040 OUTPUT:
2523 RETVAL 3041 RETVAL
2524 3042
2552 } *civ, const_iv[] = { 3070 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 3071# define const_iv(name) { # name, (IV)name }
2554 const_iv (GL_VENDOR), 3072 const_iv (GL_VENDOR),
2555 const_iv (GL_VERSION), 3073 const_iv (GL_VERSION),
2556 const_iv (GL_EXTENSIONS), 3074 const_iv (GL_EXTENSIONS),
3075 const_iv (GL_MAX_TEXTURE_UNITS),
2557 const_iv (GL_COLOR_MATERIAL), 3076 const_iv (GL_COLOR_MATERIAL),
2558 const_iv (GL_SMOOTH), 3077 const_iv (GL_SMOOTH),
2559 const_iv (GL_FLAT), 3078 const_iv (GL_FLAT),
2560 const_iv (GL_DITHER), 3079 const_iv (GL_DITHER),
2561 const_iv (GL_BLEND), 3080 const_iv (GL_BLEND),
2573 const_iv (GL_ZERO), 3092 const_iv (GL_ZERO),
2574 const_iv (GL_SRC_ALPHA), 3093 const_iv (GL_SRC_ALPHA),
2575 const_iv (GL_DST_ALPHA), 3094 const_iv (GL_DST_ALPHA),
2576 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3095 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2577 const_iv (GL_ONE_MINUS_DST_ALPHA), 3096 const_iv (GL_ONE_MINUS_DST_ALPHA),
3097 const_iv (GL_SRC_COLOR),
3098 const_iv (GL_DST_COLOR),
3099 const_iv (GL_ONE_MINUS_SRC_COLOR),
3100 const_iv (GL_ONE_MINUS_DST_COLOR),
2578 const_iv (GL_SRC_ALPHA_SATURATE), 3101 const_iv (GL_SRC_ALPHA_SATURATE),
2579 const_iv (GL_RGB), 3102 const_iv (GL_RGB),
2580 const_iv (GL_RGBA), 3103 const_iv (GL_RGBA),
2581 const_iv (GL_RGBA4), 3104 const_iv (GL_RGBA4),
2582 const_iv (GL_RGBA8), 3105 const_iv (GL_RGBA8),
2650 const_iv (GL_NICEST), 3173 const_iv (GL_NICEST),
2651 const_iv (GL_V2F), 3174 const_iv (GL_V2F),
2652 const_iv (GL_V3F), 3175 const_iv (GL_V3F),
2653 const_iv (GL_T2F_V3F), 3176 const_iv (GL_T2F_V3F),
2654 const_iv (GL_T2F_N3F_V3F), 3177 const_iv (GL_T2F_N3F_V3F),
3178 const_iv (GL_FUNC_ADD),
3179 const_iv (GL_FUNC_SUBTRACT),
3180 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2655# undef const_iv 3181# undef const_iv
2656 }; 3182 };
2657 3183
2658 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3184 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2659 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3185 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2660 3186
2661 texture_av = newAV (); 3187 texture_av = newAV ();
2662 AvREAL_off (texture_av); 3188 AvREAL_off (texture_av);
2663} 3189}
2664 3190
2666disable_GL_EXT_blend_func_separate () 3192disable_GL_EXT_blend_func_separate ()
2667 CODE: 3193 CODE:
2668 gl.BlendFuncSeparate = 0; 3194 gl.BlendFuncSeparate = 0;
2669 gl.BlendFuncSeparateEXT = 0; 3195 gl.BlendFuncSeparateEXT = 0;
2670 3196
2671char * 3197void
3198apple_nvidia_bug (int enable)
3199
3200const char *
2672gl_vendor () 3201gl_vendor ()
2673 CODE: 3202 CODE:
2674 RETVAL = (char *)glGetString (GL_VENDOR); 3203 RETVAL = (const char *)glGetString (GL_VENDOR);
2675 OUTPUT: 3204 OUTPUT:
2676 RETVAL 3205 RETVAL
2677 3206
2678char * 3207const char *
2679gl_version () 3208gl_version ()
2680 CODE: 3209 CODE:
2681 RETVAL = (char *)glGetString (GL_VERSION); 3210 RETVAL = (const char *)glGetString (GL_VERSION);
2682 OUTPUT: 3211 OUTPUT:
2683 RETVAL 3212 RETVAL
2684 3213
2685char * 3214const char *
2686gl_extensions () 3215gl_extensions ()
2687 CODE: 3216 CODE:
2688 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3217 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2689 OUTPUT: 3218 OUTPUT:
2690 RETVAL 3219 RETVAL
2691 3220
2692const char *glGetString (GLenum pname) 3221const char *glGetString (GLenum pname)
3222 CODE:
3223 RETVAL = (const char *)glGetString (pname);
3224 OUTPUT:
3225 RETVAL
2693 3226
2694GLint glGetInteger (GLenum pname) 3227GLint glGetInteger (GLenum pname)
2695 CODE: 3228 CODE:
2696 glGetIntegerv (pname, &RETVAL); 3229 glGetIntegerv (pname, &RETVAL);
2697 OUTPUT: 3230 OUTPUT:
2705 3238
2706int glGetError () 3239int glGetError ()
2707 3240
2708void glFinish () 3241void glFinish ()
2709 3242
3243void glFlush ()
3244
2710void glClear (int mask) 3245void glClear (int mask)
2711 3246
2712void glClearColor (float r, float g, float b, float a = 1.0) 3247void glClearColor (float r, float g, float b, float a = 1.0)
2713 PROTOTYPE: @ 3248 PROTOTYPE: @
2714 3249
2723void glBlendFunc (int sfactor, int dfactor) 3258void glBlendFunc (int sfactor, int dfactor)
2724 3259
2725void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3260void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2726 CODE: 3261 CODE:
2727 gl_BlendFuncSeparate (sa, da, saa, daa); 3262 gl_BlendFuncSeparate (sa, da, saa, daa);
3263
3264# void glBlendEquation (int se)
2728 3265
2729void glDepthMask (int flag) 3266void glDepthMask (int flag)
2730 3267
2731void glLogicOp (int opcode) 3268void glLogicOp (int opcode)
2732 3269
2767void glRotate (float angle, float x, float y, float z) 3304void glRotate (float angle, float x, float y, float z)
2768 CODE: 3305 CODE:
2769 glRotatef (angle, x, y, z); 3306 glRotatef (angle, x, y, z);
2770 3307
2771void glColor (float r, float g, float b, float a = 1.0) 3308void glColor (float r, float g, float b, float a = 1.0)
3309 PROTOTYPE: @
2772 ALIAS: 3310 ALIAS:
2773 glColor_premultiply = 1 3311 glColor_premultiply = 1
2774 CODE: 3312 CODE:
2775 if (ix) 3313 if (ix)
2776 { 3314 {
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3384void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3385 CODE:
2848 if (gl.SeparableFilter2D) 3386 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3387 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3388
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3389void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 3390
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3391void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 3392
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3393void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3394
2882 3420
2883void glEndList () 3421void glEndList ()
2884 3422
2885void glCallList (int list) 3423void glCallList (int list)
2886 3424
3425void c_init ()
3426 CODE:
3427 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3428 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3429
2887MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3430MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 3431
2889PROTOTYPES: DISABLE 3432PROTOTYPES: DISABLE
2890 3433
2891void 3434void
2892find_widget (SV *self, NV x, NV y) 3435find_widget (SV *self, NV x, NV y)
2893 PPCODE: 3436 PPCODE:
2894{ 3437{
2895 if (within_widget (self, x, y)) 3438 if (within_widget (self, x, y))
2896 XPUSHs (self); 3439 XPUSHs (self);
2897} 3440}
2898 3441
2899BOOT: 3442BOOT:
2900{ 3443{
2908 3451
2909void 3452void
2910draw (SV *self) 3453draw (SV *self)
2911 CODE: 3454 CODE:
2912{ 3455{
2913 HV *hv; 3456 HV *hv;
2914 SV **svp; 3457 SV **svp;
2915 NV x, y, w, h; 3458 NV x, y, w, h;
2916 SV *draw_x_sv = GvSV (draw_x_gv); 3459 SV *draw_x_sv = GvSV (draw_x_gv);
2917 SV *draw_y_sv = GvSV (draw_y_gv); 3460 SV *draw_y_sv = GvSV (draw_y_gv);
2918 SV *draw_w_sv = GvSV (draw_w_gv); 3461 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 3462 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines