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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines