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.252 by root, Fri Dec 28 17:30:33 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#if 0 96/* mask out modifiers we are not interested in */
76# define PARACHUTE SDL_INIT_NOPARACHUTE 97#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77#else 98
78# define PARACHUTE 0 99#define KMOD_LRAM 0x10000 // our extension
79#endif 100
101#define TEXID_SPEECH 1
102#define TEXID_NOFACE 2
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}
80 146
81static AV *texture_av; 147static AV *texture_av;
82 148
83static struct 149static struct
84{ 150{
141{ 207{
142 GSList *attrs = run->item->analysis.extra_attrs; 208 GSList *attrs = run->item->analysis.extra_attrs;
143 209
144 while (attrs) 210 while (attrs)
145 { 211 {
146 PangoAttribute *attr = attrs->data; 212 PangoAttribute *attr = (PangoAttribute *)attrs->data;
147 213
148 if (attr->klass->type == PANGO_ATTR_SHAPE) 214 if (attr->klass->type == PANGO_ATTR_SHAPE)
149 return 1; 215 return 1;
150 216
151 attrs = attrs->next; 217 attrs = attrs->next;
152 } 218 }
153 219
154 return 0; 220 return 0;
155} 221}
156 222
157typedef struct cf_layout { 223struct cf_layout {
158 PangoLayout *pl; 224 PangoLayout *pl;
159 float r, g, b, a; // default color for rgba mode 225 float r, g, b, a; // default color for rgba mode
160 int base_height; 226 int base_height;
161 DC__Font font; 227 DC__Font font;
162 rc_t *rc; 228 rc_t rc;
163} *DC__Layout; 229};
230
231typedef cf_layout *DC__Layout;
164 232
165static DC__Font default_font; 233static DC__Font default_font;
166static PangoContext *opengl_context; 234static PangoContext *opengl_context;
167static PangoFontMap *opengl_fontmap; 235static PangoFontMap *opengl_fontmap;
168 236
169static void 237static void
170substitute_func (FcPattern *pattern, gpointer data) 238substitute_func (FcPattern *pattern, gpointer data)
171{ 239{
172 FcPatternAddBool (pattern, FC_HINTING, 1); 240 FcPatternAddBool (pattern, FC_HINTING, 1);
173#ifdef FC_HINT_STYLE 241#ifdef FC_HINT_STYLE
174 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 242 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
175#endif 243#endif
176 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 244 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
177} 245}
178 246
179static void 247static void
180layout_update_font (DC__Layout self) 248layout_update_font (DC__Layout self)
181{ 249{
182 /* 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
183 * reasonably well with bitstream vera 251 * reasonably well with dejavu/bistream fonts
184 */ 252 */
185 PangoFontDescription *font = self->font ? self->font : default_font; 253 PangoFontDescription *font = self->font ? self->font : default_font;
186 254
187 pango_font_description_set_absolute_size (font, 255 pango_font_description_set_absolute_size (font,
188 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 256 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
206 274
207 *w = rect.width; 275 *w = rect.width;
208 *h = rect.height; 276 *h = rect.height;
209} 277}
210 278
279/////////////////////////////////////////////////////////////////////////////
280
211typedef uint16_t tileid; 281typedef uint16_t tileid;
212typedef uint16_t faceid; 282typedef uint16_t faceid;
213 283
214typedef struct { 284struct maptex
285{
215 GLuint name; 286 GLuint name;
216 int w, h; 287 int w, h;
217 float s, t; 288 float s, t;
218 uint8_t r, g, b, a; 289 uint8_t r, g, b, a;
219 tileid smoothtile; 290 tileid smoothtile;
220 uint8_t smoothlevel; 291 uint8_t smoothlevel;
221} maptex; 292 uint8_t unused; /* set to zero on use */
293};
222 294
223typedef struct { 295struct mapcell
296{
224 uint32_t player; 297 uint32_t player;
225 tileid tile[3]; 298 tileid tile[3];
226 uint16_t darkness; 299 uint16_t darkness;
227 uint8_t stat_width, stat_hp, flags, smoothmax; 300 uint8_t stat_width, stat_hp, flags, smoothmax;
228} mapcell; 301};
229 302
230typedef struct { 303struct maprow
304{
231 int32_t c0, c1; 305 int32_t c0, c1;
232 mapcell *col; 306 mapcell *col;
233} maprow; 307};
234 308
235typedef struct map { 309struct mapgrid {
236 int x, y, w, h; 310 int x, y, w, h;
237 int ox, oy; /* offset to virtual global coordinate system */ 311 int ox, oy; /* offset to virtual global coordinate system */
238 int faces; tileid *face2tile; // [faceid] 312 int faces; tileid *face2tile; // [faceid]
239 int texs; maptex *tex; // [tileid] 313 int texs; maptex *tex; // [tileid]
240 314
241 int32_t rows; 315 int32_t rows;
242 maprow *row; 316 maprow *row;
243} *DC__Map; 317};
244 318
245static char * 319typedef mapgrid *DC__Map;
320
321template<typename T>
322ecb_cold static void
246prepend (char *ptr, int sze, int inc) 323prepend (T *&ptr, int sze, int inc)
247{ 324{
248 char *p; 325 T *p;
249 326
250 New (0, p, sze + inc, char); 327 Newx (p, inc + sze, T);
251 Zero (p, inc, char); 328 Zero (p, inc, T);
252 Move (ptr, p + inc, sze, char); 329 Move (ptr, p + inc, sze, T);
253 Safefree (ptr); 330 Safefree (ptr);
254 331
255 return p; 332 ptr = p;
256} 333}
257 334
258static char * 335template<typename T>
336ecb_cold static void
259append (char *ptr, int sze, int inc) 337append (T *&ptr, int sze, int inc)
260{ 338{
261 Renew (ptr, sze + inc, char); 339 Renew (ptr, sze + inc, T);
262 Zero (ptr + sze, inc, char); 340 Zero (ptr + sze, inc, T);
263
264 return ptr;
265} 341}
266
267#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
268#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
269 342
270static void 343static void
271need_facenum (struct map *self, faceid face) 344need_facenum (struct mapgrid *self, faceid face)
272{ 345{
273 while (self->faces <= face) 346 if (ecb_expect_true (self->faces > face))
274 { 347 return;
348
349 size_t newsize = minpot (face + 1);
275 Append (tileid, self->face2tile, self->faces, self->faces); 350 append (self->face2tile, self->faces, newsize - self->faces);
276 self->faces *= 2; 351 self->faces = newsize;
277 }
278} 352}
279 353
280static void 354static void
281need_texid (struct map *self, int texid) 355need_texid (struct mapgrid *self, int texid)
282{ 356{
283 while (self->texs <= texid) 357 if (ecb_expect_true (self->texs > texid))
284 { 358 return;
359
360 size_t newsize = minpot (texid + 1);
285 Append (maptex, self->tex, self->texs, self->texs); 361 append (self->tex, self->texs, newsize - self->texs);
286 self->texs *= 2; 362 self->texs = newsize;
287 }
288} 363}
289 364
290static maprow * 365static maprow *
291map_get_row (DC__Map self, int y) 366map_get_row (mapgrid *self, int y)
292{ 367{
293 if (0 > y) 368 if (0 > y)
294 { 369 {
295 int extend = - y + MAP_EXTEND_Y; 370 int extend = - y + MAP_EXTEND_Y;
296 Prepend (maprow, self->row, self->rows, extend); 371 prepend (self->row, self->rows, extend);
297 372
298 self->rows += extend; 373 self->rows += extend;
299 self->y += extend; 374 self->y += extend;
300 y += extend; 375 y += extend;
301 } 376 }
302 else if (y >= self->rows) 377 else if (y >= self->rows)
303 { 378 {
304 int extend = y - self->rows + MAP_EXTEND_Y; 379 int extend = y - self->rows + MAP_EXTEND_Y;
305 Append (maprow, self->row, self->rows, extend); 380 append (self->row, self->rows, extend);
306 self->rows += extend; 381 self->rows += extend;
307 } 382 }
308 383
309 return self->row + y; 384 return self->row + y;
310} 385}
320 } 395 }
321 396
322 if (row->c0 > x) 397 if (row->c0 > x)
323 { 398 {
324 int extend = row->c0 - x + MAP_EXTEND_X; 399 int extend = row->c0 - x + MAP_EXTEND_X;
325 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 400 prepend (row->col, row->c1 - row->c0, extend);
326 row->c0 -= extend; 401 row->c0 -= extend;
327 } 402 }
328 else if (x >= row->c1) 403 else if (x >= row->c1)
329 { 404 {
330 int extend = x - row->c1 + MAP_EXTEND_X; 405 int extend = x - row->c1 + MAP_EXTEND_X;
331 Append (mapcell, row->col, row->c1 - row->c0, extend); 406 append (row->col, row->c1 - row->c0, extend);
332 row->c1 += extend; 407 row->c1 += extend;
333 } 408 }
334 409
335 return row->col + (x - row->c0); 410 return row->col + (x - row->c0);
336} 411}
337 412
338static mapcell * 413static mapcell *
339map_get_cell (DC__Map self, int x, int y) 414map_get_cell (mapgrid *self, int x, int y)
340{ 415{
341 return row_get_cell (map_get_row (self, y), x); 416 return row_get_cell (map_get_row (self, y), x);
342} 417}
343 418
344static void 419static void
345map_clear (DC__Map self) 420map_clear (mapgrid *self)
346{ 421{
347 int r; 422 int r;
348 423
349 for (r = 0; r < self->rows; r++) 424 for (r = 0; r < self->rows; r++)
350 Safefree (self->row[r].col); 425 Safefree (self->row[r].col);
357 self->oy = 0; 432 self->oy = 0;
358 self->row = 0; 433 self->row = 0;
359 self->rows = 0; 434 self->rows = 0;
360} 435}
361 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
362static void 447static void
363map_blank (DC__Map self, int x0, int y0, int w, int h) 448map_blank (mapgrid *self, int x0, int y0, int w, int h)
364{ 449{
365 int x, y; 450 int x, y;
366 maprow *row; 451 maprow *row;
367 mapcell *cell; 452 mapcell *cell;
368 453
380 if (x >= row->c1) 465 if (x >= row->c1)
381 break; 466 break;
382 467
383 cell = row->col + x - row->c0; 468 cell = row->col + x - row->c0;
384 469
385 cell->darkness = 0; 470 CELL_CLEAR (cell);
386 cell->stat_hp = 0;
387 cell->flags = 0;
388 cell->player = 0;
389 } 471 }
390 } 472 }
391} 473}
392 474
393typedef struct { 475struct smooth_key
476{
394 tileid tile; 477 tileid tile;
395 uint8_t x, y, level; 478 uint8_t x, y, level;
396} 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}
397 498
398static void 499static void
399smooth_or_bits (HV *hv, smooth_key *key, IV bits) 500smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
400{ 501{
401 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 502 auto &&it = h.find (key);
402 503
403 if (SvIOK (*sv)) 504 if (it == h.end ())
404 SvIV_set (*sv, SvIVX (*sv) | bits); 505 h.insert (std::make_pair (key, bits));
405 else 506 else
406 sv_setiv (*sv, bits); 507 it->second |= bits;
407} 508}
408 509
409static void 510static void
410music_finished (void) 511music_finished (void)
411{ 512{
430 ev.data2 = 0; 531 ev.data2 = 0;
431 532
432 SDL_PushEvent ((SDL_Event *)&ev); 533 SDL_PushEvent ((SDL_Event *)&ev);
433} 534}
434 535
435static unsigned int
436minpot (unsigned int n)
437{
438 if (!n)
439 return 0;
440
441 --n;
442
443 n |= n >> 1;
444 n |= n >> 2;
445 n |= n >> 4;
446 n |= n >> 8;
447 n |= n >> 16;
448
449 return n + 1;
450}
451
452static unsigned int
453popcount (unsigned int n)
454{
455 n -= (n >> 1) & 0x55555555U;
456 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
457 n = ((n >> 4) + n) & 0x0f0f0f0fU;
458 n *= 0x01010101U;
459
460 return n >> 24;
461}
462
463/* SDL should provide this, really. */ 536/* SDL should provide this, really. */
464#define SDLK_MODIFIER_MIN 300 537#define SDLK_MODIFIER_MIN 300
465#define SDLK_MODIFIER_MAX 314 538#define SDLK_MODIFIER_MAX 314
466 539
467/******************************************************************************/ 540/******************************************************************************/
504 if (!svp || !SvTRUE (*svp)) 577 if (!svp || !SvTRUE (*svp))
505 return 0; 578 return 0;
506 579
507 return 1; 580 return 1;
508} 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
509 640
510MODULE = Deliantra::Client PACKAGE = DC 641MODULE = Deliantra::Client PACKAGE = DC
511 642
512PROTOTYPES: ENABLE 643PROTOTYPES: ENABLE
513 644
542 const_iv (SDL_USEREVENT), 673 const_iv (SDL_USEREVENT),
543 674
544 const_iv (SDL_APPINPUTFOCUS), 675 const_iv (SDL_APPINPUTFOCUS),
545 const_iv (SDL_APPMOUSEFOCUS), 676 const_iv (SDL_APPMOUSEFOCUS),
546 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),
547 728
548 const_iv (SDLK_FIRST), 729 const_iv (SDLK_FIRST),
549 const_iv (SDLK_LAST), 730 const_iv (SDLK_LAST),
550 const_iv (SDLK_KP0), 731 const_iv (SDLK_KP0),
551 const_iv (SDLK_KP1), 732 const_iv (SDLK_KP1),
627 const_iv (KMOD_RMETA), 808 const_iv (KMOD_RMETA),
628 const_iv (KMOD_NUM), 809 const_iv (KMOD_NUM),
629 const_iv (KMOD_CAPS), 810 const_iv (KMOD_CAPS),
630 const_iv (KMOD_MODE), 811 const_iv (KMOD_MODE),
631 812
813 const_iv (KMOD_LRAM),
814
632 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)
633# undef const_iv 845# undef const_iv
634 }; 846 };
635 847
636 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--)
637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 849 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
638 850
639 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 851 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
640 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 852 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
641} 853}
642 854
657 869
658NV ceil (NV x) 870NV ceil (NV x)
659 871
660IV minpot (UV n) 872IV minpot (UV n)
661 873
874UV ld32 (UV n)
875 CODE:
876 RETVAL = ecb_ld32 (n);
877 OUTPUT:
878 RETVAL
879
662IV 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
663 891
664void 892void
665pango_init () 893pango_init ()
666 CODE: 894 CODE:
667{ 895{
668 opengl_fontmap = pango_opengl_font_map_new (); 896 opengl_fontmap = pango_opengl_font_map_new ();
669 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);
670 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 898 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671#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)
672 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 901 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 902 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674#endif 903#endif
675} 904}
676 905
677char *
678SDL_GetError () 906char *SDL_GetError ()
679 907
680int 908void SDL_main_hack (SV *real_main)
681SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 909 PROTOTYPE: &
682 910
683void 911int SDL_Init (U32 flags)
912
913int SDL_InitSubSystem (U32 flags)
914
915void SDL_QuitSubSystem (U32 flags)
916
684SDL_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
685 928
686void 929void
687SDL_ListModes (int rgb, int alpha) 930SDL_ListModes (int rgb, int alpha)
688 PPCODE: 931 PPCODE:
689{ 932{
701 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 944 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
702 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 945 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
703 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 946 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
704 947
705 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 948 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
706#if SDL_VERSION_ATLEAST(1,2,10)
707 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
708 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 949 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
709#endif
710 950
711 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 951 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
712 952
713 if (m && m != (SDL_Rect **)-1) 953 if (m && m != (SDL_Rect **)-1)
714 while (*m) 954 while (*m)
715 { 955 {
716 if ((*m)->w >= 800 && (*m)->h >= 480) 956 if ((*m)->w >= 400 && (*m)->h >= 300)
717 { 957 {
718 AV *av = newAV (); 958 AV *av = newAV ();
719 av_push (av, newSViv ((*m)->w)); 959 av_push (av, newSViv ((*m)->w));
720 av_push (av, newSViv ((*m)->h)); 960 av_push (av, newSViv ((*m)->h));
721 av_push (av, newSViv (rgb)); 961 av_push (av, newSViv (rgb));
744 ); 984 );
745 985
746 if (RETVAL) 986 if (RETVAL)
747 { 987 {
748 av_clear (texture_av); 988 av_clear (texture_av);
749
750 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
751#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);
752#include "glfunc.h" 990#include "glfunc.h"
753#undef GL_FUNC 991#undef GL_FUNC
992 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
993 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
754 } 994 }
755} 995}
756 OUTPUT: 996 OUTPUT:
757 RETVAL 997 RETVAL
998
999void
1000SDL_WM_SetCaption (const char *title, const char *icon)
758 1001
759void 1002void
760SDL_GL_SwapBuffers () 1003SDL_GL_SwapBuffers ()
761 1004
762char * 1005char *
763SDL_GetKeyName (int sym) 1006SDL_GetKeyName (int sym)
1007 C_ARGS: (SDLKey)sym
764 1008
765int 1009int
766SDL_GetAppState () 1010SDL_GetAppState ()
767 1011
1012int
1013SDL_GetModState ()
1014
1015int
1016SDL_WaitEvent ()
1017 C_ARGS: 0
1018
768void 1019void
1020SDL_PumpEvents ()
1021
1022void
769poll_events () 1023peep_events ()
770 PPCODE: 1024 PPCODE:
771{ 1025{
772 SDL_Event ev; 1026 SDL_Event ev;
773 1027
774 SDL_PumpEvents (); 1028 SDL_PumpEvents ();
781 { 1035 {
782 case SDL_KEYDOWN: 1036 case SDL_KEYDOWN:
783 case SDL_KEYUP: 1037 case SDL_KEYUP:
784 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1038 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
785 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1039 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
786 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1040 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
787 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1041 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
788 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1042 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
789 break; 1043 break;
790 1044
791 case SDL_ACTIVEEVENT: 1045 case SDL_ACTIVEEVENT:
792 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1046 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
810 x = ev.motion.x; 1064 x = ev.motion.x;
811 y = ev.motion.y; 1065 y = ev.motion.y;
812 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1066 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
813 } 1067 }
814 1068
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1069 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
816 hv_store (hv, "state", 5, newSViv (state), 0); 1070 hv_store (hv, "state", 5, newSViv (state), 0);
817 hv_store (hv, "x", 1, newSViv (x), 0); 1071 hv_store (hv, "x", 1, newSViv (x), 0);
818 hv_store (hv, "y", 1, newSViv (y), 0); 1072 hv_store (hv, "y", 1, newSViv (y), 0);
819 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1073 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
820 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1074 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
821 } 1075 }
822 break; 1076 break;
823 1077
824 case SDL_MOUSEBUTTONDOWN: 1078 case SDL_MOUSEBUTTONDOWN:
825 case SDL_MOUSEBUTTONUP: 1079 case SDL_MOUSEBUTTONUP:
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1080 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
827 1081
828 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1082 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
829 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1083 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
830 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1084 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
831 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1085 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
840 1094
841 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))));
842 } 1096 }
843} 1097}
844 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
845int 1112int
846Mix_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)
847 POSTCALL: 1114 POSTCALL:
848 Mix_HookMusicFinished (music_finished); 1115 Mix_HookMusicFinished (music_finished);
849 Mix_ChannelFinished (channel_finished); 1116 Mix_ChannelFinished (channel_finished);
850 1117
851void 1118void
852Mix_QuerySpec () 1119Mix_QuerySpec ()
905 } 1172 }
906 } 1173 }
907#endif 1174#endif
908} 1175}
909 1176
910void 1177int
911add_font (char *file) 1178add_font (char *file)
912 CODE: 1179 CODE:
913 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)
914 1190
915void 1191void
916load_image_inline (SV *image_) 1192load_image_inline (SV *image_)
917 ALIAS: 1193 ALIAS:
918 load_image_file = 1 1194 load_image_file = 1
964 1240
965 SDL_LockSurface (surface2); 1241 SDL_LockSurface (surface2);
966 EXTEND (SP, 6); 1242 EXTEND (SP, 6);
967 PUSHs (sv_2mortal (newSViv (surface2->w))); 1243 PUSHs (sv_2mortal (newSViv (surface2->w)));
968 PUSHs (sv_2mortal (newSViv (surface2->h))); 1244 PUSHs (sv_2mortal (newSViv (surface2->h)));
969 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1245 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
970 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)));
971 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1247 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
972 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1248 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
973 SDL_UnlockSurface (surface2); 1249 SDL_UnlockSurface (surface2);
974 1250
1034#if DEBUG 1310#if DEBUG
1035 VALGRIND_DO_LEAK_CHECK; 1311 VALGRIND_DO_LEAK_CHECK;
1036#endif 1312#endif
1037} 1313}
1038 1314
1315int
1316SvREFCNT (SV *sv)
1317 CODE:
1318 RETVAL = SvREFCNT (sv);
1319 OUTPUT:
1320 RETVAL
1321
1039MODULE = Deliantra::Client PACKAGE = DC::Font 1322MODULE = Deliantra::Client PACKAGE = DC::Font
1040 1323
1041PROTOTYPES: DISABLE 1324PROTOTYPES: DISABLE
1042 1325
1043DC::Font 1326DC::Font
1044new_from_file (SV *class, char *path, int id = 0) 1327new_from_file (SV *klass, char *path, int id = 0)
1045 CODE: 1328 CODE:
1046{ 1329{
1047 int count; 1330 int count;
1048 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1331 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1049 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1332 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1078 PROTOTYPE: 1361 PROTOTYPE:
1079 CODE: 1362 CODE:
1080 tc_restore (); 1363 tc_restore ();
1081 1364
1082DC::Layout 1365DC::Layout
1083new (SV *class) 1366new (SV *klass)
1084 CODE: 1367 CODE:
1085 New (0, RETVAL, 1, struct cf_layout); 1368 RETVAL = new cf_layout;
1086 1369
1087 RETVAL->pl = pango_layout_new (opengl_context); 1370 RETVAL->pl = pango_layout_new (opengl_context);
1088 RETVAL->r = 1.; 1371 RETVAL->r = 1.;
1089 RETVAL->g = 1.; 1372 RETVAL->g = 1.;
1090 RETVAL->b = 1.; 1373 RETVAL->b = 1.;
1091 RETVAL->a = 1.; 1374 RETVAL->a = 1.;
1092 RETVAL->base_height = MIN_FONT_HEIGHT; 1375 RETVAL->base_height = MIN_FONT_HEIGHT;
1093 RETVAL->font = 0; 1376 RETVAL->font = 0;
1094 RETVAL->rc = rc_alloc ();
1095 1377
1096 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1378 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1097 layout_update_font (RETVAL); 1379 layout_update_font (RETVAL);
1098 OUTPUT: 1380 OUTPUT:
1099 RETVAL 1381 RETVAL
1100 1382
1101void 1383void
1102DESTROY (DC::Layout self) 1384DESTROY (DC::Layout self)
1103 CODE: 1385 CODE:
1104 g_object_unref (self->pl); 1386 g_object_unref (self->pl);
1105 rc_free (self->rc);
1106 Safefree (self); 1387 delete self;
1107 1388
1108void 1389void
1109set_text (DC::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1110 CODE: 1391 CODE:
1111{ 1392{
1237 1518
1238void 1519void
1239set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1240 CODE: 1521 CODE:
1241 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1242 { 1523 {
1243 self->base_height = base_height; 1524 self->base_height = base_height;
1244 layout_update_font (self); 1525 layout_update_font (self);
1245 } 1526 }
1246 1527
1247void 1528void
1328 PPCODE: 1609 PPCODE:
1329{ 1610{
1330 int line, x; 1611 int line, x;
1331 1612
1332 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);
1333#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1614#if !PANGO_VERSION_CHECK (1, 17, 3)
1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1615 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1335 --line; 1616 --line;
1336#endif 1617#endif
1337 EXTEND (SP, 2); 1618 EXTEND (SP, 2);
1338 PUSHs (sv_2mortal (newSViv (line))); 1619 PUSHs (sv_2mortal (newSViv (line)));
1365} 1646}
1366 1647
1367void 1648void
1368render (DC::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1369 CODE: 1650 CODE:
1370 rc_clear (self->rc); 1651 self->rc.clear ();
1371 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1372 self->pl, 1653 self->pl,
1373 self->rc, 1654 &self->rc,
1374 x * PANGO_SCALE, y * PANGO_SCALE, 1655 x * PANGO_SCALE, y * PANGO_SCALE,
1375 self->r, self->g, self->b, self->a, 1656 self->r, self->g, self->b, self->a,
1376 flags 1657 flags
1377 ); 1658 );
1378 // we assume that context_change actually clears/frees stuff 1659 // we assume that context_change actually clears/frees stuff
1389 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1670 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1390 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1671 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1391 glEnable (GL_ALPHA_TEST); 1672 glEnable (GL_ALPHA_TEST);
1392 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1673 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1393 1674
1394 rc_draw (self->rc); 1675 self->rc.draw ();
1395 1676
1396 glDisable (GL_ALPHA_TEST); 1677 glDisable (GL_ALPHA_TEST);
1397 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1398 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1399} 1680}
1474 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1475 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1476 } 1757 }
1477} 1758}
1478 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
1479IV 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)
1480 CODE: 1882 CODE:
1481{ 1883{
1482 GLint width; 1884 GLint width;
1483 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);
1490MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1491 1893
1492PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1493 1895
1494DC::Map 1896DC::Map
1495new (SV *class) 1897new (SV *klass)
1496 CODE: 1898 CODE:
1497 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, mapgrid);
1498 RETVAL->x = 0; 1900 RETVAL->x = 0;
1499 RETVAL->y = 0; 1901 RETVAL->y = 0;
1500 RETVAL->w = 0; 1902 RETVAL->w = 0;
1501 RETVAL->h = 0; 1903 RETVAL->h = 0;
1502 RETVAL->ox = 0; 1904 RETVAL->ox = 0;
1539 1941
1540void 1942void
1541set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1542 CODE: 1944 CODE:
1543{ 1945{
1544 tileid texid; 1946 tileid texid;
1545 maptex *tex; 1947 maptex *tex;
1546 1948
1547 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1548 return; 1950 return;
1549 1951
1550 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1551 return; 1953 return;
1552 1954
1553 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1554 1956
1555 if (!texid) 1957 if (!texid)
1556 return; 1958 return;
1557 1959
1558 tex = self->tex + texid; 1960 tex = self->tex + texid;
1587 //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);
1588 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1589 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1590 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1591} 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 }
1592 2014
1593int 2015int
1594ox (DC::Map self) 2016ox (DC::Map self)
1595 ALIAS: 2017 ALIAS:
1596 oy = 1 2018 oy = 1
1628 self->ox += dx; self->x += dx; 2050 self->ox += dx; self->x += dx;
1629 self->oy += dy; self->y += dy; 2051 self->oy += dy; self->y += dy;
1630 2052
1631 while (self->y < 0) 2053 while (self->y < 0)
1632 { 2054 {
1633 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2055 prepend (self->row, self->rows, MAP_EXTEND_Y);
1634 2056
1635 self->rows += MAP_EXTEND_Y; 2057 self->rows += MAP_EXTEND_Y;
1636 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1637 } 2059 }
1638} 2060}
1639 2061
1640SV * 2062SV *
1641map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1642 CODE: 2064 CODE:
1643{ 2065{
1644 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1645 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1646 mapcell *cell; 2068 mapcell *cell;
1667 2089
1668 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1669 2091
1670 if (flags & 8) 2092 if (flags & 8)
1671 { 2093 {
2094 uint8_t ext, cmd;
2095
1672 if (extmap) 2096 do
1673 { 2097 {
1674 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1675 2100
1676 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
1677 { 2104 {
1678 ext = *data++;
1679 cmd = ext & 0x3f;
1680
1681 if (cmd < 4)
1682 cell->darkness = 255 - ext * 64 + 1;
1683 else if (cmd == 5) // health
1684 {
1685 cell->stat_width = 1; 2105 cell->stat_width = 1;
1686 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1687 }
1688 else if (cmd == 6) // monster width
1689 cell->stat_width = *data++ + 1;
1690 else if (cmd == 0x47)
1691 {
1692 if (*data == 4)
1693 ; // decode player count
1694
1695 data += *data + 1;
1696 }
1697 else if (cmd == 8) // cell flags
1698 cell->flags = *data++;
1699 else if (ext & 0x40) // unknown, multibyte => skip
1700 data += *data + 1;
1701 else
1702 data++;
1703 } 2107 }
1704 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++;
1705 } 2125 }
1706 else 2126 while (ext & 0x80);
1707 cell->darkness = *data++ + 1;
1708 } 2127 }
1709 2128
1710 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1711 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1712 { 2131 {
1715 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1716 2135
1717 if (cell->tile [z]) 2136 if (cell->tile [z])
1718 { 2137 {
1719 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1720 if (!tex->name) 2140 if (!tex->name)
1721 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1722 2142
1723 if (tex->smoothtile) 2143 if (tex->smoothtile)
1724 { 2144 {
1725 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1726 if (!smooth->name) 2147 if (!smooth->name)
1727 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1728 } 2149 }
1729 } 2150 }
1730 } 2151 }
1731 } 2152 }
1732 else 2153 else
1733 cell->darkness = 0; 2154 CELL_CLEAR (cell);
1734 } 2155 }
1735} 2156}
1736 OUTPUT: 2157 OUTPUT:
1737 RETVAL 2158 RETVAL
1738 2159
1758 ? self->row + y 2179 ? self->row + y
1759 : 0; 2180 : 0;
1760 2181
1761 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1762 { 2183 {
1763 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1764 2185
1765 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1766 { 2187 {
1767 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1768 2189
1770 { 2191 {
1771 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1772 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1773 int a1 = tex.a; 2194 int a1 = tex.a;
1774 2195
1775 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1776 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1777 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1778 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1779 } 2200 }
1780 } 2201 }
1781 2202
1782 *map++ = (r ) 2203 *map++ = (r )
1783 | (g << 8) 2204 | (g << 8)
1784 | (b << 16) 2205 | (b << 16)
1785 | (a << 24); 2206 | (a << 24);
1786 } 2207 }
1787 } 2208 }
1788 2209
1789 RETVAL = map_sv; 2210 RETVAL = map_sv;
1790} 2211}
1791 OUTPUT: 2212 OUTPUT:
1792 RETVAL 2213 RETVAL
1793 2214
1794void 2215void
1795draw (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)
1796 CODE: 2217 CODE:
1797{ 2218{
1798 int x, y, z; 2219 int x, y, z;
1799 2220
1800 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1801 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1802 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!
1803 smooth_key skey; 2222 int pl_x, pl_y;
1804 2223 maptex pl_tex;
1805 rc_t *rc = rc_alloc (); 2224 rc_t rc;
2225 rc_t rc_ov;
1806 rc_key_t key; 2226 rc_key_t key;
1807 rc_array_t *arr; 2227 rc_t::array_t *arr;
1808 2228
2229 pl_tex.name = 0;
2230
1809 // thats current max. sorry. 2231 // that's current max. sorry.
1810 if (sw > 255) sw = 255; 2232 if (sw > 255) sw = 255;
1811 if (sh > 255) sh = 255; 2233 if (sh > 255) sh = 255;
1812
1813 // clear key, in case of extra padding
1814 memset (&skey, 0, sizeof (skey));
1815 2234
1816 memset (&key, 0, sizeof (key)); 2235 memset (&key, 0, sizeof (key));
1817 key.r = 255; 2236 key.r = 255;
1818 key.g = 255; 2237 key.g = 255;
1819 key.b = 255; 2238 key.b = 255;
1820 key.a = 255; 2239 key.a = 255;
1821 key.mode = GL_QUADS; 2240 key.mode = GL_QUADS;
1822 key.format = GL_T2F_V3F; 2241 key.format = GL_T2F_V3F;
1823 key.texname = -1;
1824 2242
1825 mx += self->x; 2243 mx += self->x;
1826 my += self->y; 2244 my += self->y;
1827 2245
1828 // first pass: determine smooth_max 2246 // first pass: determine smooth_max
1829 // rather ugly, if you ask me 2247 // rather ugly, if you ask me
1830 // could also be stored inside mapcell and updated on change 2248 // could also be stored inside mapcell and updated on change
1831 memset (smooth_max, 0, sizeof (smooth_max)); 2249 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1832 2250
1833 for (y = 0; y < sh; y++) 2251 for (y = 0; y < sh; y++)
1834 if (0 <= y + my && y + my < self->rows) 2252 if (0 <= y + my && y + my < self->rows)
1835 { 2253 {
1836 maprow *row = self->row + (y + my); 2254 maprow *row = self->row + (y + my);
1851 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2269 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1852 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2270 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1853 2271
1854 for (z = 0; z <= 2; z++) 2272 for (z = 0; z <= 2; z++)
1855 { 2273 {
1856 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;
1857 2278
1858 for (y = 0; y < sh; y++) 2279 for (y = 0; y < sh; y++)
1859 if (0 <= y + my && y + my < self->rows) 2280 if (0 <= y + my && y + my < self->rows)
1860 { 2281 {
1861 maprow *row = self->row + (y + my); 2282 maprow *row = self->row + (y + my);
1871 maptex tex = self->tex [tile]; 2292 maptex tex = self->tex [tile];
1872 int px, py; 2293 int px, py;
1873 2294
1874 if (key.texname != tex.name) 2295 if (key.texname != tex.name)
1875 { 2296 {
2297 self->tex [tile].unused = 0;
2298
1876 if (!tex.name) 2299 if (!tex.name)
1877 tex = self->tex [2]; /* missing, replace by noface */ 2300 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1878 2301
1879 key.texname = tex.name; 2302 key.texname = tex.name;
1880 arr = rc_array (rc, &key); 2303 arr = &rc.array (key);
1881 } 2304 }
1882 2305
1883 px = (x + 1) * T - tex.w; 2306 px = (x + 1) * Th - tex.w;
1884 py = (y + 1) * T - tex.h; 2307 py = (y + 1) * Tw - tex.h;
1885 2308
1886 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2309 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1887 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1888 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1889 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1890
1891 if (cell->flags && z == 2)
1892 { 2310 {
1893 // overlays such as the speech bubble, probably more to come 2311 pl_x = px;
1894 if (cell->flags & 1) 2312 pl_y = py;
2313 pl_tex = tex;
1895 { 2314 continue;
1896 maptex tex = self->tex [1];
1897 int px = x * T + T * 2 / 32;
1898 int py = y * T - T * 6 / 32;
1899
1900 if (tex.name)
1901 {
1902 if (key.texname != tex.name)
1903 {
1904 key.texname = tex.name;
1905 arr = rc_array (rc, &key);
1906 }
1907
1908 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1909 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1910 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1911 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1912 }
1913 }
1914 } 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);
1915 2321
1916 // update smooth hash 2322 // update smooth hash
1917 if (tex.smoothtile) 2323 if (tex.smoothtile)
1918 { 2324 {
1919 skey.tile = tex.smoothtile; 2325 skey.tile = tex.smoothtile;
1920 skey.level = tex.smoothlevel; 2326 skey.level = tex.smoothlevel;
1921 2327
1922 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2328 smooth_level[tex.smoothlevel] = 1;
1923 2329
1924 // 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
1925 // shifted +1|+1 so we always stay positive. 2331 // shifted +1|+1 so we always stay positive.
1926 2332
1927 // bits is ___n cccc CCCC bbbb 2333 // bits is ___n cccc CCCC bbbb
1935 2341
1936 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2342 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1937 // ·· ·· ·┏ ┓· 2343 // ·· ·· ·┏ ┓·
1938 2344
1939 // full tile 2345 // full tile
1940 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);
1941 2347
1942 // borders 2348 // borders
1943 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);
1944 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);
1945 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);
1946 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);
1947 2353
1948 // corners 2354 // corners
1949 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);
1950 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);
1951 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);
1952 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);
1953 } 2379 }
1954 } 2380 }
1955 } 2381 }
1956 } 2382 }
1957 2383
1958 rc_draw (rc); 2384 rc.draw ();
1959 rc_clear (rc); 2385 rc.clear ();
1960 2386
1961 // go through all smoothlevels, lowest to highest, then draw. 2387 // go through all smoothlevels, lowest to highest, then draw.
1962 // this is basically counting sort 2388 // this is basically counting sort
1963 { 2389 {
1964 int w, b; 2390 int w, b;
1965 2391
1966 glEnable (GL_TEXTURE_2D); 2392 glEnable (GL_TEXTURE_2D);
1967 glBegin (GL_QUADS); 2393 glBegin (GL_QUADS);
1968 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)
1969 { 2397 {
1970 uint32_t smask = smooth_level [w]; 2398 smooth_key &skey = it->first;
1971 if (smask) 2399 IV bits = it->second;
1972 for (b = 0; b < 32; ++b) 2400
1973 if (smask & (((uint32_t)1) << b)) 2401 if (!(bits & 0x1000)
2402 && skey.level == level
2403 && level > smooth_max [skey.x][skey.y])
1974 { 2404 {
1975 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
1976 HE *he; 2413 if (tex.name)
1977
1978 hv_iterinit (smooth);
1979 while ((he = hv_iternext (smooth)))
1980 { 2414 {
1981 smooth_key *skey = (smooth_key *)HeKEY (he); 2415 // this time avoiding texture state changes
1982 IV bits = SvIVX (HeVAL (he)); 2416 // save gobs of state changes.
1983 2417 if (key.texname != tex.name)
1984 if (!(bits & 0x1000)
1985 && skey->level == level
1986 && level > smooth_max [skey->x][skey->y])
1987 { 2418 {
1988 maptex tex = self->tex [skey->tile]; 2419 self->tex [skey.tile].unused = 0;
1989 int px = (((int)skey->x) - 1) * T;
1990 int py = (((int)skey->y) - 1) * T;
1991 int border = bits & 15;
1992 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1993 float dx = tex.s * .0625f; // 16 images/row
1994 float dy = tex.t * .5f ; // 2 images/column
1995 2420
1996 if (tex.name)
1997 {
1998 // this time avoiding texture state changes
1999 // save gobs of state changes.
2000 if (key.texname != tex.name)
2001 {
2002 glEnd (); 2421 glEnd ();
2003 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2422 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2004 glBegin (GL_QUADS); 2423 glBegin (GL_QUADS);
2005 } 2424 }
2006 2425
2007 if (border) 2426 if (border)
2008 { 2427 {
2009 float ox = border * dx; 2428 float ox = border * dx;
2010 2429
2011 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2012 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2013 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2014 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2015 } 2434 }
2016 2435
2017 if (corner) 2436 if (corner)
2018 { 2437 {
2019 float ox = corner * dx; 2438 float ox = corner * dx;
2020 2439
2021 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2022 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2441 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2023 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2442 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2024 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2443 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2025 }
2026 }
2027 } 2444 }
2028 } 2445 }
2029 } 2446 }
2030 } 2447 }
2031 2448
2032 glEnd (); 2449 glEnd ();
2033 glDisable (GL_TEXTURE_2D); 2450 glDisable (GL_TEXTURE_2D);
2034 key.texname = -1; 2451 key.texname = -1;
2035 } 2452 }
2036
2037 hv_clear (smooth);
2038 } 2453 }
2039 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
2040 glDisable (GL_BLEND); 2475 glDisable (GL_BLEND);
2041 rc_free (rc);
2042 2476
2043 // top layer: overlays such as the health bar 2477 // top layer: overlays such as the health bar
2044 for (y = 0; y < sh; y++) 2478 for (y = 0; y < sh; y++)
2045 if (0 <= y + my && y + my < self->rows) 2479 if (0 <= y + my && y + my < self->rows)
2046 { 2480 {
2049 for (x = 0; x < sw; x++) 2483 for (x = 0; x < sw; x++)
2050 if (row->c0 <= x + mx && x + mx < row->c1) 2484 if (row->c0 <= x + mx && x + mx < row->c1)
2051 { 2485 {
2052 mapcell *cell = row->col + (x + mx - row->c0); 2486 mapcell *cell = row->col + (x + mx - row->c0);
2053 2487
2054 int px = x * T; 2488 int px = x * Tw;
2055 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 }
2056 2496
2057 if (cell->stat_hp) 2497 if (cell->stat_hp)
2058 { 2498 {
2059 int width = cell->stat_width * T; 2499 int width = cell->stat_width * Tw;
2060 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2500 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2061 2501
2062 glColor3ub (0, 0, 0); 2502 glColor3ub (0, 0, 0);
2063 glRectf (px + 1, py - thick - 2, 2503 glRectf (px + 1, py - thick - 2,
2064 px + width - 1, py); 2504 px + width - 1, py);
2065 2505
2071 } 2511 }
2072 } 2512 }
2073} 2513}
2074 2514
2075void 2515void
2076draw_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)
2077 CODE: 2517 CODE:
2078{ 2518{
2079 static float color[16][3] = { 2519 static float color[16][3] = {
2080 { 0.00F, 0.00F, 0.00F }, 2520 { 0.00f, 0.00f, 0.00f },
2081 { 1.00F, 1.00F, 1.00F }, 2521 { 1.00f, 1.00f, 1.00f },
2082 { 0.00F, 0.00F, 0.55F }, 2522 { 0.00f, 0.00f, 0.55f },
2083 { 1.00F, 0.00F, 0.00F }, 2523 { 1.00f, 0.00f, 0.00f },
2084 2524
2085 { 1.00F, 0.54F, 0.00F }, 2525 { 1.00f, 0.54f, 0.00f },
2086 { 0.11F, 0.56F, 1.00F }, 2526 { 0.11f, 0.56f, 1.00f },
2087 { 0.93F, 0.46F, 0.00F }, 2527 { 0.93f, 0.46f, 0.00f },
2088 { 0.18F, 0.54F, 0.34F }, 2528 { 0.18f, 0.54f, 0.34f },
2089 2529
2090 { 0.56F, 0.73F, 0.56F }, 2530 { 0.56f, 0.73f, 0.56f },
2091 { 0.80F, 0.80F, 0.80F }, 2531 { 0.80f, 0.80f, 0.80f },
2092 { 0.55F, 0.41F, 0.13F }, 2532 { 0.55f, 0.41f, 0.13f },
2093 { 0.99F, 0.77F, 0.26F }, 2533 { 0.99f, 0.77f, 0.26f },
2094 2534
2095 { 0.74F, 0.65F, 0.41F }, 2535 { 0.74f, 0.65f, 0.41f },
2096 2536
2097 { 0.00F, 1.00F, 1.00F }, 2537 { 0.00f, 1.00f, 1.00f },
2098 { 1.00F, 0.00F, 1.00F }, 2538 { 1.00f, 0.00f, 1.00f },
2099 { 1.00F, 1.00F, 0.00F }, 2539 { 1.00f, 1.00f, 0.00f },
2100 }; 2540 };
2101 2541
2102 int x, y; 2542 int x, y;
2103 2543
2104 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 */
2105 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2551 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2106 glEnable (GL_BLEND); 2552 glEnable (GL_BLEND);
2107 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2553 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2108 glBegin (GL_QUADS); 2554 glBegin (GL_QUADS);
2109 2555
2110 for (y = 0; y < h; y++) 2556 for (y = 0; y < h; y++)
2114 2560
2115 if (m) 2561 if (m)
2116 { 2562 {
2117 float *c = color [m & 15]; 2563 float *c = color [m & 15];
2118 2564
2119 float tx1 = m & 0x40 ? 0.5 : 0.; 2565 float tx1 = m & 0x40 ? 0.5f : 0.f;
2120 float tx2 = tx1 + 0.5; 2566 float tx2 = tx1 + 0.5f;
2121 2567
2122 glColor4f (c[0], c[1], c[2], 0.75); 2568 glColor4f (c[0], c[1], c[2], 1);
2123 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2569 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2124 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2570 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2125 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2571 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2126 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2572 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2127 } 2573 }
2135void 2581void
2136fow_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)
2137 PPCODE: 2583 PPCODE:
2138{ 2584{
2139 int x, y; 2585 int x, y;
2140 int sw1 = sw + 2; 2586 int sw1 = sw + 2;
2141 int sh1 = sh + 2; 2587 int sh1 = sh + 2;
2142 int sh3 = sh * 3; 2588 int sh3 = sh * 3;
2143 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);
2144 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2592 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2145 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2593 memset (darkness1, 0, sw1*sh1);
2146 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2147 2594
2148 SvPOK_only (darkness3_sv); 2595 SvPOK_only (darkness3_sv);
2149 SvCUR_set (darkness3_sv, sw34 * sh3); 2596 SvCUR_set (darkness3_sv, sw3 * sh3);
2150 2597
2151 mx += self->x - 1; 2598 mx += self->x - 1;
2152 my += self->y - 1; 2599 my += self->y - 1;
2153
2154 memset (darkness1, 255, sw1 * sh1);
2155 2600
2156 for (y = 0; y < sh1; y++) 2601 for (y = 0; y < sh1; y++)
2157 if (0 <= y + my && y + my < self->rows) 2602 if (0 <= y + my && y + my < self->rows)
2158 { 2603 {
2159 maprow *row = self->row + (y + my); 2604 maprow *row = self->row + (y + my);
2162 if (row->c0 <= x + mx && x + mx < row->c1) 2607 if (row->c0 <= x + mx && x + mx < row->c1)
2163 { 2608 {
2164 mapcell *cell = row->col + (x + mx - row->c0); 2609 mapcell *cell = row->col + (x + mx - row->c0);
2165 2610
2166 darkness1 [y * sw1 + x] = cell->darkness 2611 darkness1 [y * sw1 + x] = cell->darkness
2167 ? 255 - (cell->darkness - 1) 2612 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2168 : 255 - FOW_DARKNESS; 2613 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2169 } 2614 }
2170 } 2615 }
2171 2616
2172 for (y = 0; y < sh; ++y) 2617 for (y = 0; y < sh; ++y)
2173 for (x = 0; x < sw; ++x) 2618 for (x = 0; x < sw; ++x)
2192 2637
2193 uint8_t r13 = (d13 + d23 + d12) / 3; 2638 uint8_t r13 = (d13 + d23 + d12) / 3;
2194 uint8_t r23 = d23; 2639 uint8_t r23 = d23;
2195 uint8_t r33 = (d23 + d33 + d32) / 3; 2640 uint8_t r33 = (d23 + d33 + d32) / 3;
2196 2641
2197 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2198 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2199 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2200 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2645 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2201 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 */
2202 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2203 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2204 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2205 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2206 } 2651 }
2207 2652
2208 free (darkness1); 2653 free (darkness1);
2209 2654
2210 EXTEND (SP, 3); 2655 EXTEND (SP, 3);
2211 PUSHs (sv_2mortal (newSViv (sw34))); 2656 PUSHs (sv_2mortal (newSViv (sw3)));
2212 PUSHs (sv_2mortal (newSViv (sh3))); 2657 PUSHs (sv_2mortal (newSViv (sh3)));
2213 PUSHs (darkness3_sv); 2658 PUSHs (darkness3_sv);
2214} 2659}
2215 2660
2216SV * 2661SV *
2279 else 2724 else
2280 *data++ = 0; 2725 *data++ = 0;
2281 } 2726 }
2282 } 2727 }
2283 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 {
2284 SvPOK_only (data_sv); 2732 SvPOK_only (data_sv);
2285 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2733 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2734 }
2735
2286 RETVAL = data_sv; 2736 RETVAL = data_sv;
2287} 2737}
2288 OUTPUT: 2738 OUTPUT:
2289 RETVAL 2739 RETVAL
2290 2740
2291void 2741void
2292set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2742set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2293 PPCODE: 2743 PPCODE:
2294{ 2744{
2295 int x, y, z; 2745 int x, y, z;
2296 int w, h; 2746 int w, h;
2297 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;
2298 2758
2299 if (*data++ != 0) 2759 if (*data++ != 0)
2300 XSRETURN_EMPTY; /* version mismatch */ 2760 XSRETURN_EMPTY; /* version mismatch */
2301 2761
2302 w = *data++ << 8; w |= *data++; 2762 w = *data++ << 8; w |= *data++;
2317 { 2777 {
2318 maprow *row = map_get_row (self, y); 2778 maprow *row = map_get_row (self, y);
2319 2779
2320 for (x = x0; x < x1; x++) 2780 for (x = x0; x < x1; x++)
2321 { 2781 {
2782 uint8_t flags;
2783
2784 if (data + 7 >= end)
2785 XSRETURN_EMPTY;
2786
2322 uint8_t flags = *data++; 2787 flags = *data++;
2323 2788
2324 if (flags) 2789 if (flags)
2325 { 2790 {
2326 mapcell *cell = row_get_cell (row, x); 2791 mapcell *cell = row_get_cell (row, x);
2327 tileid tile[3] = { 0, 0, 0 }; 2792 tileid tile[3] = { 0, 0, 0 };
2330 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2795 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2331 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2796 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2332 2797
2333 if (cell->darkness == 0) 2798 if (cell->darkness == 0)
2334 { 2799 {
2335 cell->darkness = 0; 2800 /*cell->darkness = 0;*/
2801 EXTEND (SP, 3);
2336 2802
2337 for (z = 0; z <= 2; z++) 2803 for (z = 0; z <= 2; z++)
2338 { 2804 {
2339 tileid t = tile [z]; 2805 tileid t = tile [z];
2340 2806
2341 if (t >= self->texs || (t && !self->tex [t].name)) 2807 if (t >= self->texs || (t && !self->tex [t].name))
2342 { 2808 {
2343 XPUSHs (sv_2mortal (newSViv (t))); 2809 PUSHs (sv_2mortal (newSViv (t)));
2344 need_texid (self, t); 2810 need_texid (self, t);
2345 } 2811 }
2346 2812
2347 cell->tile [z] = t; 2813 cell->tile [z] = t;
2348 } 2814 }
2353} 2819}
2354 2820
2355MODULE = Deliantra::Client PACKAGE = DC::RW 2821MODULE = Deliantra::Client PACKAGE = DC::RW
2356 2822
2357DC::RW 2823DC::RW
2358new (SV *class, SV *data_sv) 2824new (SV *klass, SV *data_sv)
2359 CODE: 2825 CODE:
2360{ 2826{
2361 STRLEN datalen; 2827 STRLEN datalen;
2362 char *data = SvPVbyte (data_sv, datalen); 2828 char *data = SvPVbyte (data_sv, datalen);
2363 2829
2365} 2831}
2366 OUTPUT: 2832 OUTPUT:
2367 RETVAL 2833 RETVAL
2368 2834
2369DC::RW 2835DC::RW
2370new_from_file (SV *class, const char *path, const char *mode = "rb") 2836new_from_file (SV *klass, const char *path, const char *mode = "rb")
2371 CODE: 2837 CODE:
2372 RETVAL = SDL_RWFromFile (path, mode); 2838 RETVAL = SDL_RWFromFile (path, mode);
2373 OUTPUT: 2839 OUTPUT:
2374 RETVAL 2840 RETVAL
2375 2841
2393 if (RETVAL < 0) 2859 if (RETVAL < 0)
2394 { 2860 {
2395 RETVAL = Mix_GroupOldest (-1); 2861 RETVAL = Mix_GroupOldest (-1);
2396 2862
2397 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)
2398 XSRETURN_UNDEF; 2869 XSRETURN_UNDEF;
2399 2870 }
2871 else
2400 Mix_HaltChannel (RETVAL); 2872 Mix_HaltChannel (RETVAL);
2401 } 2873 }
2402 2874
2403 Mix_UnregisterAllEffects (RETVAL); 2875 Mix_UnregisterAllEffects (RETVAL);
2404 Mix_Volume (RETVAL, 128); 2876 Mix_Volume (RETVAL, 128);
2405} 2877}
2452void 2924void
2453set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2925set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2454 CODE: 2926 CODE:
2455{ 2927{
2456 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));
2457 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;
2458 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2930 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2459} 2931}
2460 2932
2461void 2933void
2462set_reverse_stereo (DC::Channel self, int flip) 2934set_reverse_stereo (DC::Channel self, int flip)
2465 2937
2466MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2938MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2467 2939
2468PROTOTYPES: DISABLE 2940PROTOTYPES: DISABLE
2469 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
2470DC::MixChunk 2954DC::MixChunk
2471new (SV *class, DC::RW rwops) 2955new (SV *klass, DC::RW rwops)
2472 CODE: 2956 CODE:
2473 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2957 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2474 OUTPUT: 2958 OUTPUT:
2475 RETVAL 2959 RETVAL
2476 2960
2506 OUTPUT: 2990 OUTPUT:
2507 RETVAL 2991 RETVAL
2508 2992
2509MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2993MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2510 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
2511int 3007int
2512volume (int volume = -1) 3008volume (int volume = -1)
2513 PROTOTYPE: ;$ 3009 PROTOTYPE: ;$
2514 CODE: 3010 CODE:
2515 if (items > 0) 3011 if (items > 0)
2526void 3022void
2527halt () 3023halt ()
2528 CODE: 3024 CODE:
2529 Mix_HaltMusic (); 3025 Mix_HaltMusic ();
2530 3026
3027int
3028playing ()
3029 CODE:
3030 RETVAL = Mix_PlayingMusic ();
3031 OUTPUT:
3032 RETVAL
3033
2531DC::MixMusic 3034DC::MixMusic
2532new (SV *class, DC::RW rwops) 3035new (SV *klass, DC::RW rwops)
2533 CODE: 3036 CODE:
2534 RETVAL = Mix_LoadMUS_RW (rwops); 3037 RETVAL = Mix_LoadMUS_RW (rwops);
2535 OUTPUT: 3038 OUTPUT:
2536 RETVAL 3039 RETVAL
2537 3040
2565 } *civ, const_iv[] = { 3068 } *civ, const_iv[] = {
2566# define const_iv(name) { # name, (IV)name } 3069# define const_iv(name) { # name, (IV)name }
2567 const_iv (GL_VENDOR), 3070 const_iv (GL_VENDOR),
2568 const_iv (GL_VERSION), 3071 const_iv (GL_VERSION),
2569 const_iv (GL_EXTENSIONS), 3072 const_iv (GL_EXTENSIONS),
3073 const_iv (GL_MAX_TEXTURE_UNITS),
2570 const_iv (GL_COLOR_MATERIAL), 3074 const_iv (GL_COLOR_MATERIAL),
2571 const_iv (GL_SMOOTH), 3075 const_iv (GL_SMOOTH),
2572 const_iv (GL_FLAT), 3076 const_iv (GL_FLAT),
2573 const_iv (GL_DITHER), 3077 const_iv (GL_DITHER),
2574 const_iv (GL_BLEND), 3078 const_iv (GL_BLEND),
2586 const_iv (GL_ZERO), 3090 const_iv (GL_ZERO),
2587 const_iv (GL_SRC_ALPHA), 3091 const_iv (GL_SRC_ALPHA),
2588 const_iv (GL_DST_ALPHA), 3092 const_iv (GL_DST_ALPHA),
2589 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3093 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2590 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),
2591 const_iv (GL_SRC_ALPHA_SATURATE), 3099 const_iv (GL_SRC_ALPHA_SATURATE),
2592 const_iv (GL_RGB), 3100 const_iv (GL_RGB),
2593 const_iv (GL_RGBA), 3101 const_iv (GL_RGBA),
2594 const_iv (GL_RGBA4), 3102 const_iv (GL_RGBA4),
2595 const_iv (GL_RGBA8), 3103 const_iv (GL_RGBA8),
2663 const_iv (GL_NICEST), 3171 const_iv (GL_NICEST),
2664 const_iv (GL_V2F), 3172 const_iv (GL_V2F),
2665 const_iv (GL_V3F), 3173 const_iv (GL_V3F),
2666 const_iv (GL_T2F_V3F), 3174 const_iv (GL_T2F_V3F),
2667 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),
2668# undef const_iv 3179# undef const_iv
2669 }; 3180 };
2670 3181
2671 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--)
2672 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3183 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2673 3184
2674 texture_av = newAV (); 3185 texture_av = newAV ();
2675 AvREAL_off (texture_av); 3186 AvREAL_off (texture_av);
2676} 3187}
2677 3188
2679disable_GL_EXT_blend_func_separate () 3190disable_GL_EXT_blend_func_separate ()
2680 CODE: 3191 CODE:
2681 gl.BlendFuncSeparate = 0; 3192 gl.BlendFuncSeparate = 0;
2682 gl.BlendFuncSeparateEXT = 0; 3193 gl.BlendFuncSeparateEXT = 0;
2683 3194
2684char * 3195void
3196apple_nvidia_bug (int enable)
3197
3198const char *
2685gl_vendor () 3199gl_vendor ()
2686 CODE: 3200 CODE:
2687 RETVAL = (char *)glGetString (GL_VENDOR); 3201 RETVAL = (const char *)glGetString (GL_VENDOR);
2688 OUTPUT: 3202 OUTPUT:
2689 RETVAL 3203 RETVAL
2690 3204
2691char * 3205const char *
2692gl_version () 3206gl_version ()
2693 CODE: 3207 CODE:
2694 RETVAL = (char *)glGetString (GL_VERSION); 3208 RETVAL = (const char *)glGetString (GL_VERSION);
2695 OUTPUT: 3209 OUTPUT:
2696 RETVAL 3210 RETVAL
2697 3211
2698char * 3212const char *
2699gl_extensions () 3213gl_extensions ()
2700 CODE: 3214 CODE:
2701 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3215 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2702 OUTPUT: 3216 OUTPUT:
2703 RETVAL 3217 RETVAL
2704 3218
2705const char *glGetString (GLenum pname) 3219const char *glGetString (GLenum pname)
3220 CODE:
3221 RETVAL = (const char *)glGetString (pname);
3222 OUTPUT:
3223 RETVAL
2706 3224
2707GLint glGetInteger (GLenum pname) 3225GLint glGetInteger (GLenum pname)
2708 CODE: 3226 CODE:
2709 glGetIntegerv (pname, &RETVAL); 3227 glGetIntegerv (pname, &RETVAL);
2710 OUTPUT: 3228 OUTPUT:
2718 3236
2719int glGetError () 3237int glGetError ()
2720 3238
2721void glFinish () 3239void glFinish ()
2722 3240
3241void glFlush ()
3242
2723void glClear (int mask) 3243void glClear (int mask)
2724 3244
2725void glClearColor (float r, float g, float b, float a = 1.0) 3245void glClearColor (float r, float g, float b, float a = 1.0)
2726 PROTOTYPE: @ 3246 PROTOTYPE: @
2727 3247
2736void glBlendFunc (int sfactor, int dfactor) 3256void glBlendFunc (int sfactor, int dfactor)
2737 3257
2738void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3258void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2739 CODE: 3259 CODE:
2740 gl_BlendFuncSeparate (sa, da, saa, daa); 3260 gl_BlendFuncSeparate (sa, da, saa, daa);
3261
3262# void glBlendEquation (int se)
2741 3263
2742void glDepthMask (int flag) 3264void glDepthMask (int flag)
2743 3265
2744void glLogicOp (int opcode) 3266void glLogicOp (int opcode)
2745 3267
2780void glRotate (float angle, float x, float y, float z) 3302void glRotate (float angle, float x, float y, float z)
2781 CODE: 3303 CODE:
2782 glRotatef (angle, x, y, z); 3304 glRotatef (angle, x, y, z);
2783 3305
2784void 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: @
2785 ALIAS: 3308 ALIAS:
2786 glColor_premultiply = 1 3309 glColor_premultiply = 1
2787 CODE: 3310 CODE:
2788 if (ix) 3311 if (ix)
2789 { 3312 {
2895 3418
2896void glEndList () 3419void glEndList ()
2897 3420
2898void glCallList (int list) 3421void glCallList (int list)
2899 3422
3423void c_init ()
3424 CODE:
3425 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3426 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3427
2900MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3428MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2901 3429
2902PROTOTYPES: DISABLE 3430PROTOTYPES: DISABLE
2903 3431
2904void 3432void
2905find_widget (SV *self, NV x, NV y) 3433find_widget (SV *self, NV x, NV y)
2906 PPCODE: 3434 PPCODE:
2907{ 3435{
2908 if (within_widget (self, x, y)) 3436 if (within_widget (self, x, y))
2909 XPUSHs (self); 3437 XPUSHs (self);
2910} 3438}
2911 3439
2912BOOT: 3440BOOT:
2913{ 3441{
2921 3449
2922void 3450void
2923draw (SV *self) 3451draw (SV *self)
2924 CODE: 3452 CODE:
2925{ 3453{
2926 HV *hv; 3454 HV *hv;
2927 SV **svp; 3455 SV **svp;
2928 NV x, y, w, h; 3456 NV x, y, w, h;
2929 SV *draw_x_sv = GvSV (draw_x_gv); 3457 SV *draw_x_sv = GvSV (draw_x_gv);
2930 SV *draw_y_sv = GvSV (draw_y_gv); 3458 SV *draw_y_sv = GvSV (draw_y_gv);
2931 SV *draw_w_sv = GvSV (draw_w_gv); 3459 SV *draw_w_sv = GvSV (draw_w_gv);
2932 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