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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines