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.246 by root, Fri Dec 28 15:06:02 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>
61
62#ifndef PANGO_VERSION_CHECK
63# define PANGO_VERSION_CHECK(a,b,c) 0
64#endif
65
66#if !PANGO_VERSION_CHECK (1, 15, 2)
67# define pango_layout_get_line_readonly pango_layout_get_line
68# define pango_layout_get_lines_readonly pango_layout_get_lines
69# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
70# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
71#endif
50 72
51#ifndef _WIN32 73#ifndef _WIN32
52# include <sys/types.h> 74# include <sys/types.h>
53# include <sys/socket.h> 75# include <sys/socket.h>
54# include <netinet/in.h> 76# include <netinet/in.h>
55# include <netinet/tcp.h> 77# include <netinet/tcp.h>
56# include <inttypes.h> 78# include <inttypes.h>
57#endif 79#endif
58 80
81#include "ecb.h"
82#include "salloc.h"
83
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 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 */
61#define FOW_DARKNESS 32 88#define FOW_DARKNESS 50
89#define DARKNESS_ADJUST(n) (n)
62 90
63#define MAP_EXTEND_X 32 91#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 92#define MAP_EXTEND_Y 512
65 93
66#define MIN_FONT_HEIGHT 10 94#define MIN_FONT_HEIGHT 10
67 95
68#if 0 96/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 97#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 98
71# define PARACHUTE 0 99#define KMOD_LRAM 0x10000 // our extension
72#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}
73 146
74static AV *texture_av; 147static AV *texture_av;
75 148
76static struct 149static struct
77{ 150{
… …
134{ 207{
135 GSList *attrs = run->item->analysis.extra_attrs; 208 GSList *attrs = run->item->analysis.extra_attrs;
136 209
137 while (attrs) 210 while (attrs)
138 { 211 {
139 PangoAttribute *attr = attrs->data; 212 PangoAttribute *attr = (PangoAttribute *)attrs->data;
140 213
141 if (attr->klass->type == PANGO_ATTR_SHAPE) 214 if (attr->klass->type == PANGO_ATTR_SHAPE)
142 return 1; 215 return 1;
143 216
144 attrs = attrs->next; 217 attrs = attrs->next;
145 } 218 }
146 219
147 return 0; 220 return 0;
148} 221}
149 222
150typedef struct cf_layout { 223struct cf_layout {
151 PangoLayout *pl; 224 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 225 float r, g, b, a; // default color for rgba mode
153 int base_height; 226 int base_height;
154 DC__Font font; 227 DC__Font font;
155 rc_t *rc; 228 rc_t rc;
156} *DC__Layout; 229};
230
231typedef cf_layout *DC__Layout;
157 232
158static DC__Font default_font; 233static DC__Font default_font;
159static PangoContext *opengl_context; 234static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 235static PangoFontMap *opengl_fontmap;
161 236
162static void 237static void
163substitute_func (FcPattern *pattern, gpointer data) 238substitute_func (FcPattern *pattern, gpointer data)
164{ 239{
165 FcPatternAddBool (pattern, FC_HINTING, 1); 240 FcPatternAddBool (pattern, FC_HINTING, 1);
166#ifdef FC_HINT_STYLE 241#ifdef FC_HINT_STYLE
167 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 242 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
168#endif 243#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 244 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 245}
171 246
172static void 247static void
173layout_update_font (DC__Layout self) 248layout_update_font (DC__Layout self)
174{ 249{
175 /* 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
176 * reasonably well with bitstream vera 251 * reasonably well with dejavu/bistream fonts
177 */ 252 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 253 PangoFontDescription *font = self->font ? self->font : default_font;
179 254
180 pango_font_description_set_absolute_size (font, 255 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 256 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
199 274
200 *w = rect.width; 275 *w = rect.width;
201 *h = rect.height; 276 *h = rect.height;
202} 277}
203 278
279/////////////////////////////////////////////////////////////////////////////
280
204typedef uint16_t tileid; 281typedef uint16_t tileid;
205typedef uint16_t faceid; 282typedef uint16_t faceid;
206 283
207typedef struct { 284struct maptex
285{
208 GLuint name; 286 GLuint name;
209 int w, h; 287 int w, h;
210 float s, t; 288 float s, t;
211 uint8_t r, g, b, a; 289 uint8_t r, g, b, a;
212 tileid smoothtile; 290 tileid smoothtile;
213 uint8_t smoothlevel; 291 uint8_t smoothlevel;
214} maptex; 292 uint8_t unused; /* set to zero on use */
293};
215 294
216typedef struct { 295struct mapcell
296{
217 uint32_t player; 297 uint32_t player;
218 tileid tile[3]; 298 tileid tile[3];
219 uint16_t darkness; 299 uint16_t darkness;
220 uint8_t stat_width, stat_hp, flags, smoothmax; 300 uint8_t stat_width, stat_hp, flags, smoothmax;
221} mapcell; 301};
222 302
223typedef struct { 303struct maprow
304{
224 int32_t c0, c1; 305 int32_t c0, c1;
225 mapcell *col; 306 mapcell *col;
226} maprow; 307};
227 308
228typedef struct map { 309struct mapgrid {
229 int x, y, w, h; 310 int x, y, w, h;
230 int ox, oy; /* offset to virtual global coordinate system */ 311 int ox, oy; /* offset to virtual global coordinate system */
231 int faces; tileid *face2tile; // [faceid] 312 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 313 int texs; maptex *tex; // [tileid]
233 314
234 int32_t rows; 315 int32_t rows;
235 maprow *row; 316 maprow *row;
236} *DC__Map; 317};
237 318
238static char * 319typedef mapgrid *DC__Map;
320
321template<typename T>
322ecb_cold static void
239prepend (char *ptr, int sze, int inc) 323prepend (T *&ptr, int sze, int inc)
240{ 324{
241 char *p; 325 T *p;
242 326
243 New (0, p, sze + inc, char); 327 Newx (p, inc + sze, T);
244 Zero (p, inc, char); 328 Zero (p, inc, T);
245 Move (ptr, p + inc, sze, char); 329 Move (ptr, p + inc, sze, T);
246 Safefree (ptr); 330 Safefree (ptr);
247 331
248 return p; 332 ptr = p;
249} 333}
250 334
251static char * 335template<typename T>
336ecb_cold static void
252append (char *ptr, int sze, int inc) 337append (T *&ptr, int sze, int inc)
253{ 338{
254 Renew (ptr, sze + inc, char); 339 Renew (ptr, sze + inc, T);
255 Zero (ptr + sze, inc, char); 340 Zero (ptr + sze, inc, T);
256
257 return ptr;
258} 341}
259
260#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
261#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
262 342
263static void 343static void
264need_facenum (struct map *self, faceid face) 344need_facenum (struct mapgrid *self, faceid face)
265{ 345{
266 while (self->faces <= face) 346 if (ecb_expect_true (self->faces > face))
267 { 347 return;
348
349 size_t newsize = minpot (face + 1);
268 Append (tileid, self->face2tile, self->faces, self->faces); 350 append (self->face2tile, self->faces, newsize - self->faces);
269 self->faces *= 2; 351 self->faces = newsize;
270 }
271} 352}
272 353
273static void 354static void
274need_texid (struct map *self, int texid) 355need_texid (struct mapgrid *self, int texid)
275{ 356{
276 while (self->texs <= texid) 357 if (ecb_expect_true (self->texs > texid))
277 { 358 return;
359
360 size_t newsize = minpot (texid + 1);
278 Append (maptex, self->tex, self->texs, self->texs); 361 append (self->tex, self->texs, newsize - self->texs);
279 self->texs *= 2; 362 self->texs = newsize;
280 }
281} 363}
282 364
283static maprow * 365static maprow *
284map_get_row (DC__Map self, int y) 366map_get_row (mapgrid *self, int y)
285{ 367{
286 if (0 > y) 368 if (0 > y)
287 { 369 {
288 int extend = - y + MAP_EXTEND_Y; 370 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 371 prepend (self->row, self->rows, extend);
290 372
291 self->rows += extend; 373 self->rows += extend;
292 self->y += extend; 374 self->y += extend;
293 y += extend; 375 y += extend;
294 } 376 }
295 else if (y >= self->rows) 377 else if (y >= self->rows)
296 { 378 {
297 int extend = y - self->rows + MAP_EXTEND_Y; 379 int extend = y - self->rows + MAP_EXTEND_Y;
298 Append (maprow, self->row, self->rows, extend); 380 append (self->row, self->rows, extend);
299 self->rows += extend; 381 self->rows += extend;
300 } 382 }
301 383
302 return self->row + y; 384 return self->row + y;
303} 385}
… …
313 } 395 }
314 396
315 if (row->c0 > x) 397 if (row->c0 > x)
316 { 398 {
317 int extend = row->c0 - x + MAP_EXTEND_X; 399 int extend = row->c0 - x + MAP_EXTEND_X;
318 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 400 prepend (row->col, row->c1 - row->c0, extend);
319 row->c0 -= extend; 401 row->c0 -= extend;
320 } 402 }
321 else if (x >= row->c1) 403 else if (x >= row->c1)
322 { 404 {
323 int extend = x - row->c1 + MAP_EXTEND_X; 405 int extend = x - row->c1 + MAP_EXTEND_X;
324 Append (mapcell, row->col, row->c1 - row->c0, extend); 406 append (row->col, row->c1 - row->c0, extend);
325 row->c1 += extend; 407 row->c1 += extend;
326 } 408 }
327 409
328 return row->col + (x - row->c0); 410 return row->col + (x - row->c0);
329} 411}
330 412
331static mapcell * 413static mapcell *
332map_get_cell (DC__Map self, int x, int y) 414map_get_cell (mapgrid *self, int x, int y)
333{ 415{
334 return row_get_cell (map_get_row (self, y), x); 416 return row_get_cell (map_get_row (self, y), x);
335} 417}
336 418
337static void 419static void
338map_clear (DC__Map self) 420map_clear (mapgrid *self)
339{ 421{
340 int r; 422 int r;
341 423
342 for (r = 0; r < self->rows; r++) 424 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 425 Safefree (self->row[r].col);
… …
350 self->oy = 0; 432 self->oy = 0;
351 self->row = 0; 433 self->row = 0;
352 self->rows = 0; 434 self->rows = 0;
353} 435}
354 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
355static void 447static void
356map_blank (DC__Map self, int x0, int y0, int w, int h) 448map_blank (mapgrid *self, int x0, int y0, int w, int h)
357{ 449{
358 int x, y; 450 int x, y;
359 maprow *row; 451 maprow *row;
360 mapcell *cell; 452 mapcell *cell;
361 453
… …
373 if (x >= row->c1) 465 if (x >= row->c1)
374 break; 466 break;
375 467
376 cell = row->col + x - row->c0; 468 cell = row->col + x - row->c0;
377 469
378 cell->darkness = 0; 470 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 471 }
383 } 472 }
384} 473}
385 474
386typedef struct { 475struct smooth_key
476{
387 tileid tile; 477 tileid tile;
388 uint8_t x, y, level; 478 uint8_t x, y, level;
389} 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}
390 498
391static void 499static void
392smooth_or_bits (HV *hv, smooth_key *key, IV bits) 500smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
393{ 501{
394 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 502 auto &&it = h.find (key);
395 503
396 if (SvIOK (*sv)) 504 if (it == h.end ())
397 SvIV_set (*sv, SvIVX (*sv) | bits); 505 h.insert (std::make_pair (key, bits));
398 else 506 else
399 sv_setiv (*sv, bits); 507 it->second |= bits;
400} 508}
401 509
402static void 510static void
403music_finished (void) 511music_finished (void)
404{ 512{
… …
423 ev.data2 = 0; 531 ev.data2 = 0;
424 532
425 SDL_PushEvent ((SDL_Event *)&ev); 533 SDL_PushEvent ((SDL_Event *)&ev);
426} 534}
427 535
428static unsigned int
429minpot (unsigned int n)
430{
431 if (!n)
432 return 0;
433
434 --n;
435
436 n |= n >> 1;
437 n |= n >> 2;
438 n |= n >> 4;
439 n |= n >> 8;
440 n |= n >> 16;
441
442 return n + 1;
443}
444
445static unsigned int
446popcount (unsigned int n)
447{
448 n -= (n >> 1) & 0x55555555U;
449 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
450 n = ((n >> 4) + n) & 0x0f0f0f0fU;
451 n *= 0x01010101U;
452
453 return n >> 24;
454}
455
456/* SDL should provide this, really. */ 536/* SDL should provide this, really. */
457#define SDLK_MODIFIER_MIN 300 537#define SDLK_MODIFIER_MIN 300
458#define SDLK_MODIFIER_MAX 314 538#define SDLK_MODIFIER_MAX 314
459 539
460/******************************************************************************/ 540/******************************************************************************/
… …
497 if (!svp || !SvTRUE (*svp)) 577 if (!svp || !SvTRUE (*svp))
498 return 0; 578 return 0;
499 579
500 return 1; 580 return 1;
501} 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
502 640
503MODULE = Deliantra::Client PACKAGE = DC 641MODULE = Deliantra::Client PACKAGE = DC
504 642
505PROTOTYPES: ENABLE 643PROTOTYPES: ENABLE
506 644
… …
535 const_iv (SDL_USEREVENT), 673 const_iv (SDL_USEREVENT),
536 674
537 const_iv (SDL_APPINPUTFOCUS), 675 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 676 const_iv (SDL_APPMOUSEFOCUS),
539 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),
540 728
541 const_iv (SDLK_FIRST), 729 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 730 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 731 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 732 const_iv (SDLK_KP1),
… …
620 const_iv (KMOD_RMETA), 808 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 809 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 810 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 811 const_iv (KMOD_MODE),
624 812
813 const_iv (KMOD_LRAM),
814
625 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)
626# undef const_iv 845# undef const_iv
627 }; 846 };
628 847
629 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--)
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 849 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
631 850
632 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 851 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
633 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 852 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
634} 853}
635 854
… …
650 869
651NV ceil (NV x) 870NV ceil (NV x)
652 871
653IV minpot (UV n) 872IV minpot (UV n)
654 873
874UV ld32 (UV n)
875 CODE:
876 RETVAL = ecb_ld32 (n);
877 OUTPUT:
878 RETVAL
879
655IV 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
656 891
657void 892void
658pango_init () 893pango_init ()
659 CODE: 894 CODE:
660{ 895{
661 opengl_fontmap = pango_opengl_font_map_new (); 896 opengl_fontmap = pango_opengl_font_map_new ();
662 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);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 898 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
899 /*pango_context_set_font_description (opengl_context, default_font);*/
900#if PANGO_VERSION_CHECK (1, 15, 2)
901 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
902 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
903#endif
664} 904}
665 905
666char *
667SDL_GetError () 906char *SDL_GetError ()
668 907
669int 908void SDL_main_hack (SV *real_main)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 909 PROTOTYPE: &
671 910
672void 911int SDL_Init (U32 flags)
912
913int SDL_InitSubSystem (U32 flags)
914
915void SDL_QuitSubSystem (U32 flags)
916
673SDL_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
674 928
675void 929void
676SDL_ListModes (int rgb, int alpha) 930SDL_ListModes (int rgb, int alpha)
677 PPCODE: 931 PPCODE:
678{ 932{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 944 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 945 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 946 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 947
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 948 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 949 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 950
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 951 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 952
702 if (m && m != (SDL_Rect **)-1) 953 if (m && m != (SDL_Rect **)-1)
703 while (*m) 954 while (*m)
704 { 955 {
705 if ((*m)->w >= 800 && (*m)->h >= 480) 956 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 957 {
707 AV *av = newAV (); 958 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 959 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 960 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 961 av_push (av, newSViv (rgb));
… …
733 ); 984 );
734 985
735 if (RETVAL) 986 if (RETVAL)
736 { 987 {
737 av_clear (texture_av); 988 av_clear (texture_av);
738
739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 989#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
741#include "glfunc.h" 990#include "glfunc.h"
742#undef GL_FUNC 991#undef GL_FUNC
992 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
993 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 994 }
744} 995}
745 OUTPUT: 996 OUTPUT:
746 RETVAL 997 RETVAL
998
999void
1000SDL_WM_SetCaption (const char *title, const char *icon)
747 1001
748void 1002void
749SDL_GL_SwapBuffers () 1003SDL_GL_SwapBuffers ()
750 1004
751char * 1005char *
752SDL_GetKeyName (int sym) 1006SDL_GetKeyName (int sym)
1007 C_ARGS: (SDLKey)sym
753 1008
754int 1009int
755SDL_GetAppState () 1010SDL_GetAppState ()
756 1011
1012int
1013SDL_GetModState ()
1014
1015int
1016SDL_WaitEvent ()
1017 C_ARGS: 0
1018
757void 1019void
1020SDL_PumpEvents ()
1021
1022void
758poll_events () 1023peep_events ()
759 PPCODE: 1024 PPCODE:
760{ 1025{
761 SDL_Event ev; 1026 SDL_Event ev;
762 1027
763 SDL_PumpEvents (); 1028 SDL_PumpEvents ();
… …
770 { 1035 {
771 case SDL_KEYDOWN: 1036 case SDL_KEYDOWN:
772 case SDL_KEYUP: 1037 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1038 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1039 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 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);
776 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 */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1042 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 1043 break;
779 1044
780 case SDL_ACTIVEEVENT: 1045 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1046 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 1064 x = ev.motion.x;
800 y = ev.motion.y; 1065 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1066 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1067 }
803 1068
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1069 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1070 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1071 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1072 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1073 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1074 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1075 }
811 break; 1076 break;
812 1077
813 case SDL_MOUSEBUTTONDOWN: 1078 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1079 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1080 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1081
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1082 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1083 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1084 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1085 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
829 1094
830 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))));
831 } 1096 }
832} 1097}
833 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
834int 1112int
835Mix_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)
836 POSTCALL: 1114 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1115 Mix_HookMusicFinished (music_finished);
838 Mix_ChannelFinished (channel_finished); 1116 Mix_ChannelFinished (channel_finished);
839 1117
840void 1118void
841Mix_QuerySpec () 1119Mix_QuerySpec ()
… …
894 } 1172 }
895 } 1173 }
896#endif 1174#endif
897} 1175}
898 1176
899void 1177int
900add_font (char *file) 1178add_font (char *file)
901 CODE: 1179 CODE:
902 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)
903 1190
904void 1191void
905load_image_inline (SV *image_) 1192load_image_inline (SV *image_)
906 ALIAS: 1193 ALIAS:
907 load_image_file = 1 1194 load_image_file = 1
… …
953 1240
954 SDL_LockSurface (surface2); 1241 SDL_LockSurface (surface2);
955 EXTEND (SP, 6); 1242 EXTEND (SP, 6);
956 PUSHs (sv_2mortal (newSViv (surface2->w))); 1243 PUSHs (sv_2mortal (newSViv (surface2->w)));
957 PUSHs (sv_2mortal (newSViv (surface2->h))); 1244 PUSHs (sv_2mortal (newSViv (surface2->h)));
958 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1245 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
959 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1246 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
960 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1247 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
961 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1248 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
962 SDL_UnlockSurface (surface2); 1249 SDL_UnlockSurface (surface2);
963 1250
… …
1023#if DEBUG 1310#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1311 VALGRIND_DO_LEAK_CHECK;
1025#endif 1312#endif
1026} 1313}
1027 1314
1315int
1316SvREFCNT (SV *sv)
1317 CODE:
1318 RETVAL = SvREFCNT (sv);
1319 OUTPUT:
1320 RETVAL
1321
1028MODULE = Deliantra::Client PACKAGE = DC::Font 1322MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1323
1030PROTOTYPES: DISABLE 1324PROTOTYPES: DISABLE
1031 1325
1032DC::Font 1326DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1327new_from_file (SV *klass, char *path, int id = 0)
1034 CODE: 1328 CODE:
1035{ 1329{
1036 int count; 1330 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1331 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1038 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1332 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
1067 PROTOTYPE: 1361 PROTOTYPE:
1068 CODE: 1362 CODE:
1069 tc_restore (); 1363 tc_restore ();
1070 1364
1071DC::Layout 1365DC::Layout
1072new (SV *class) 1366new (SV *klass)
1073 CODE: 1367 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1368 RETVAL = new cf_layout;
1075 1369
1076 RETVAL->pl = pango_layout_new (opengl_context); 1370 RETVAL->pl = pango_layout_new (opengl_context);
1077 RETVAL->r = 1.; 1371 RETVAL->r = 1.;
1078 RETVAL->g = 1.; 1372 RETVAL->g = 1.;
1079 RETVAL->b = 1.; 1373 RETVAL->b = 1.;
1080 RETVAL->a = 1.; 1374 RETVAL->a = 1.;
1081 RETVAL->base_height = MIN_FONT_HEIGHT; 1375 RETVAL->base_height = MIN_FONT_HEIGHT;
1082 RETVAL->font = 0; 1376 RETVAL->font = 0;
1083 RETVAL->rc = rc_alloc ();
1084 1377
1085 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1378 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1086 layout_update_font (RETVAL); 1379 layout_update_font (RETVAL);
1087 OUTPUT: 1380 OUTPUT:
1088 RETVAL 1381 RETVAL
1089 1382
1090void 1383void
1091DESTROY (DC::Layout self) 1384DESTROY (DC::Layout self)
1092 CODE: 1385 CODE:
1093 g_object_unref (self->pl); 1386 g_object_unref (self->pl);
1094 rc_free (self->rc);
1095 Safefree (self); 1387 delete self;
1096 1388
1097void 1389void
1098set_text (DC::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1099 CODE: 1391 CODE:
1100{ 1392{
… …
1165{ 1457{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1458 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1459
1168 do 1460 do
1169 { 1461 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1462 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1463
1172 if (run && shape_attr_p (run)) 1464 if (run && shape_attr_p (run))
1173 { 1465 {
1174 PangoRectangle extents; 1466 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1467 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1226 1518
1227void 1519void
1228set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1229 CODE: 1521 CODE:
1230 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1231 { 1523 {
1232 self->base_height = base_height; 1524 self->base_height = base_height;
1233 layout_update_font (self); 1525 layout_update_font (self);
1234 } 1526 }
1235 1527
1236void 1528void
… …
1279int 1571int
1280descent (DC::Layout self) 1572descent (DC::Layout self)
1281 CODE: 1573 CODE:
1282{ 1574{
1283 PangoRectangle rect; 1575 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1576 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1577 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1578 RETVAL = PANGO_DESCENT (rect);
1287} 1579}
1288 OUTPUT: 1580 OUTPUT:
1289 RETVAL 1581 RETVAL
… …
1301 1593
1302void 1594void
1303cursor_pos (DC::Layout self, int index) 1595cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1596 PPCODE:
1305{ 1597{
1306 PangoRectangle strong_pos; 1598 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1599 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1600
1309 EXTEND (SP, 3); 1601 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1602 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1603 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1604 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1605}
1314 1606
1315void 1607void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1608index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1609 PPCODE:
1318{ 1610{
1319 int line, x; 1611 int line, x;
1320 1612
1321 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);
1322#if !PANGO_VERSION_CHECK (1, 17. 3) 1614#if !PANGO_VERSION_CHECK (1, 17, 3)
1323 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1615 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1324 --line; 1616 --line;
1325#endif 1617#endif
1326 EXTEND (SP, 2); 1618 EXTEND (SP, 2);
1327 PUSHs (sv_2mortal (newSViv (line))); 1619 PUSHs (sv_2mortal (newSViv (line)));
… …
1336 int index, trailing; 1628 int index, trailing;
1337 1629
1338 if (line < 0) 1630 if (line < 0)
1339 XSRETURN_EMPTY; 1631 XSRETURN_EMPTY;
1340 1632
1341 if (!(lp = pango_layout_get_line (self->pl, line))) 1633 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1342 XSRETURN_EMPTY; /* do better */ 1634 XSRETURN_EMPTY; /* do better */
1343 1635
1344 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1636 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1345 1637
1346 EXTEND (SP, 2); 1638 EXTEND (SP, 2);
… …
1354} 1646}
1355 1647
1356void 1648void
1357render (DC::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1358 CODE: 1650 CODE:
1359 rc_clear (self->rc); 1651 self->rc.clear ();
1360 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1361 self->pl, 1653 self->pl,
1362 self->rc, 1654 &self->rc,
1363 x * PANGO_SCALE, y * PANGO_SCALE, 1655 x * PANGO_SCALE, y * PANGO_SCALE,
1364 self->r, self->g, self->b, self->a, 1656 self->r, self->g, self->b, self->a,
1365 flags 1657 flags
1366 ); 1658 );
1367 // we assume that context_change actually clears/frees stuff 1659 // we assume that context_change actually clears/frees stuff
… …
1378 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1670 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1379 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1671 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1380 glEnable (GL_ALPHA_TEST); 1672 glEnable (GL_ALPHA_TEST);
1381 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1673 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1382 1674
1383 rc_draw (self->rc); 1675 self->rc.draw ();
1384 1676
1385 glDisable (GL_ALPHA_TEST); 1677 glDisable (GL_ALPHA_TEST);
1386 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1387 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1388} 1680}
… …
1463 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1464 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1465 } 1757 }
1466} 1758}
1467 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
1468IV 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)
1469 CODE: 1882 CODE:
1470{ 1883{
1471 GLint width; 1884 GLint width;
1472 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);
… …
1479MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1480 1893
1481PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1482 1895
1483DC::Map 1896DC::Map
1484new (SV *class) 1897new (SV *klass)
1485 CODE: 1898 CODE:
1486 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, mapgrid);
1487 RETVAL->x = 0; 1900 RETVAL->x = 0;
1488 RETVAL->y = 0; 1901 RETVAL->y = 0;
1489 RETVAL->w = 0; 1902 RETVAL->w = 0;
1490 RETVAL->h = 0; 1903 RETVAL->h = 0;
1491 RETVAL->ox = 0; 1904 RETVAL->ox = 0;
… …
1528 1941
1529void 1942void
1530set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1531 CODE: 1944 CODE:
1532{ 1945{
1533 tileid texid; 1946 tileid texid;
1534 maptex *tex; 1947 maptex *tex;
1535 1948
1536 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1537 return; 1950 return;
1538 1951
1539 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1540 return; 1953 return;
1541 1954
1542 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1543 1956
1544 if (!texid) 1957 if (!texid)
1545 return; 1958 return;
1546 1959
1547 tex = self->tex + texid; 1960 tex = self->tex + texid;
… …
1576 //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);
1577 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1578 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1579 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1580} 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 }
1581 2014
1582int 2015int
1583ox (DC::Map self) 2016ox (DC::Map self)
1584 ALIAS: 2017 ALIAS:
1585 oy = 1 2018 oy = 1
… …
1617 self->ox += dx; self->x += dx; 2050 self->ox += dx; self->x += dx;
1618 self->oy += dy; self->y += dy; 2051 self->oy += dy; self->y += dy;
1619 2052
1620 while (self->y < 0) 2053 while (self->y < 0)
1621 { 2054 {
1622 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2055 prepend (self->row, self->rows, MAP_EXTEND_Y);
1623 2056
1624 self->rows += MAP_EXTEND_Y; 2057 self->rows += MAP_EXTEND_Y;
1625 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1626 } 2059 }
1627} 2060}
1628 2061
1629SV * 2062SV *
1630map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1631 CODE: 2064 CODE:
1632{ 2065{
1633 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1634 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1635 mapcell *cell; 2068 mapcell *cell;
… …
1656 2089
1657 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1658 2091
1659 if (flags & 8) 2092 if (flags & 8)
1660 { 2093 {
2094 uint8_t ext, cmd;
2095
1661 if (extmap) 2096 do
1662 { 2097 {
1663 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1664 2100
1665 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
1666 { 2104 {
1667 ext = *data++;
1668 cmd = ext & 0x3f;
1669
1670 if (cmd < 4)
1671 cell->darkness = 255 - ext * 64 + 1;
1672 else if (cmd == 5) // health
1673 {
1674 cell->stat_width = 1; 2105 cell->stat_width = 1;
1675 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1676 }
1677 else if (cmd == 6) // monster width
1678 cell->stat_width = *data++ + 1;
1679 else if (cmd == 0x47)
1680 {
1681 if (*data == 4)
1682 ; // decode player count
1683
1684 data += *data + 1;
1685 }
1686 else if (cmd == 8) // cell flags
1687 cell->flags = *data++;
1688 else if (ext & 0x40) // unknown, multibyte => skip
1689 data += *data + 1;
1690 else
1691 data++;
1692 } 2107 }
1693 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++;
1694 } 2125 }
1695 else 2126 while (ext & 0x80);
1696 cell->darkness = *data++ + 1;
1697 } 2127 }
1698 2128
1699 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1700 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1701 { 2131 {
… …
1704 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1705 2135
1706 if (cell->tile [z]) 2136 if (cell->tile [z])
1707 { 2137 {
1708 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1709 if (!tex->name) 2140 if (!tex->name)
1710 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1711 2142
1712 if (tex->smoothtile) 2143 if (tex->smoothtile)
1713 { 2144 {
1714 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1715 if (!smooth->name) 2147 if (!smooth->name)
1716 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1717 } 2149 }
1718 } 2150 }
1719 } 2151 }
1720 } 2152 }
1721 else 2153 else
1722 cell->darkness = 0; 2154 CELL_CLEAR (cell);
1723 } 2155 }
1724} 2156}
1725 OUTPUT: 2157 OUTPUT:
1726 RETVAL 2158 RETVAL
1727 2159
… …
1747 ? self->row + y 2179 ? self->row + y
1748 : 0; 2180 : 0;
1749 2181
1750 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1751 { 2183 {
1752 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1753 2185
1754 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1755 { 2187 {
1756 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1757 2189
… …
1759 { 2191 {
1760 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1761 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1762 int a1 = tex.a; 2194 int a1 = tex.a;
1763 2195
1764 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1765 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1766 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1767 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1768 } 2200 }
1769 } 2201 }
1770 2202
1771 *map++ = (r ) 2203 *map++ = (r )
1772 | (g << 8) 2204 | (g << 8)
1773 | (b << 16) 2205 | (b << 16)
1774 | (a << 24); 2206 | (a << 24);
1775 } 2207 }
1776 } 2208 }
1777 2209
1778 RETVAL = map_sv; 2210 RETVAL = map_sv;
1779} 2211}
1780 OUTPUT: 2212 OUTPUT:
1781 RETVAL 2213 RETVAL
1782 2214
1783void 2215void
1784draw (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)
1785 CODE: 2217 CODE:
1786{ 2218{
1787 int x, y, z; 2219 int x, y, z;
1788 2220
1789 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1790 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1791 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!
1792 smooth_key skey; 2222 int pl_x, pl_y;
1793 2223 maptex pl_tex;
1794 rc_t *rc = rc_alloc (); 2224 rc_t rc;
2225 rc_t rc_ov;
1795 rc_key_t key; 2226 rc_key_t key;
1796 rc_array_t *arr; 2227 rc_t::array_t *arr;
1797 2228
2229 pl_tex.name = 0;
2230
1798 // thats current max. sorry. 2231 // that's current max. sorry.
1799 if (sw > 255) sw = 255; 2232 if (sw > 255) sw = 255;
1800 if (sh > 255) sh = 255; 2233 if (sh > 255) sh = 255;
1801
1802 // clear key, in case of extra padding
1803 memset (&skey, 0, sizeof (skey));
1804 2234
1805 memset (&key, 0, sizeof (key)); 2235 memset (&key, 0, sizeof (key));
1806 key.r = 255; 2236 key.r = 255;
1807 key.g = 255; 2237 key.g = 255;
1808 key.b = 255; 2238 key.b = 255;
1809 key.a = 255; 2239 key.a = 255;
1810 key.mode = GL_QUADS; 2240 key.mode = GL_QUADS;
1811 key.format = GL_T2F_V3F; 2241 key.format = GL_T2F_V3F;
1812 key.texname = -1;
1813 2242
1814 mx += self->x; 2243 mx += self->x;
1815 my += self->y; 2244 my += self->y;
1816 2245
1817 // first pass: determine smooth_max 2246 // first pass: determine smooth_max
1818 // rather ugly, if you ask me 2247 // rather ugly, if you ask me
1819 // could also be stored inside mapcell and updated on change 2248 // could also be stored inside mapcell and updated on change
1820 memset (smooth_max, 0, sizeof (smooth_max)); 2249 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1821 2250
1822 for (y = 0; y < sh; y++) 2251 for (y = 0; y < sh; y++)
1823 if (0 <= y + my && y + my < self->rows) 2252 if (0 <= y + my && y + my < self->rows)
1824 { 2253 {
1825 maprow *row = self->row + (y + my); 2254 maprow *row = self->row + (y + my);
… …
1840 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2269 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1841 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2270 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1842 2271
1843 for (z = 0; z <= 2; z++) 2272 for (z = 0; z <= 2; z++)
1844 { 2273 {
1845 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;
1846 2278
1847 for (y = 0; y < sh; y++) 2279 for (y = 0; y < sh; y++)
1848 if (0 <= y + my && y + my < self->rows) 2280 if (0 <= y + my && y + my < self->rows)
1849 { 2281 {
1850 maprow *row = self->row + (y + my); 2282 maprow *row = self->row + (y + my);
… …
1860 maptex tex = self->tex [tile]; 2292 maptex tex = self->tex [tile];
1861 int px, py; 2293 int px, py;
1862 2294
1863 if (key.texname != tex.name) 2295 if (key.texname != tex.name)
1864 { 2296 {
2297 self->tex [tile].unused = 0;
2298
1865 if (!tex.name) 2299 if (!tex.name)
1866 tex = self->tex [2]; /* missing, replace by noface */ 2300 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1867 2301
1868 key.texname = tex.name; 2302 key.texname = tex.name;
1869 arr = rc_array (rc, &key); 2303 arr = &rc.array (key);
1870 } 2304 }
1871 2305
1872 px = (x + 1) * T - tex.w; 2306 px = (x + 1) * Th - tex.w;
1873 py = (y + 1) * T - tex.h; 2307 py = (y + 1) * Tw - tex.h;
1874 2308
1875 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2309 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1876 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1877 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1878 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1879
1880 if (cell->flags && z == 2)
1881 { 2310 {
1882 // overlays such as the speech bubble, probably more to come 2311 pl_x = px;
1883 if (cell->flags & 1) 2312 pl_y = py;
2313 pl_tex = tex;
1884 { 2314 continue;
1885 maptex tex = self->tex [1];
1886 int px = x * T + T * 2 / 32;
1887 int py = y * T - T * 6 / 32;
1888
1889 if (tex.name)
1890 {
1891 if (key.texname != tex.name)
1892 {
1893 key.texname = tex.name;
1894 arr = rc_array (rc, &key);
1895 }
1896
1897 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1898 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1899 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1900 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1901 }
1902 }
1903 } 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);
1904 2321
1905 // update smooth hash 2322 // update smooth hash
1906 if (tex.smoothtile) 2323 if (tex.smoothtile)
1907 { 2324 {
1908 skey.tile = tex.smoothtile; 2325 skey.tile = tex.smoothtile;
1909 skey.level = tex.smoothlevel; 2326 skey.level = tex.smoothlevel;
1910 2327
1911 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2328 smooth_level[tex.smoothlevel] = 1;
1912 2329
1913 // 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
1914 // shifted +1|+1 so we always stay positive. 2331 // shifted +1|+1 so we always stay positive.
1915 2332
1916 // bits is ___n cccc CCCC bbbb 2333 // bits is ___n cccc CCCC bbbb
… …
1924 2341
1925 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2342 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1926 // ·· ·· ·┏ ┓· 2343 // ·· ·· ·┏ ┓·
1927 2344
1928 // full tile 2345 // full tile
1929 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);
1930 2347
1931 // borders 2348 // borders
1932 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);
1933 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);
1934 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);
1935 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);
1936 2353
1937 // corners 2354 // corners
1938 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);
1939 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);
1940 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);
1941 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);
1942 } 2379 }
1943 } 2380 }
1944 } 2381 }
1945 } 2382 }
1946 2383
1947 rc_draw (rc); 2384 rc.draw ();
1948 rc_clear (rc); 2385 rc.clear ();
1949 2386
1950 // go through all smoothlevels, lowest to highest, then draw. 2387 // go through all smoothlevels, lowest to highest, then draw.
1951 // this is basically counting sort 2388 // this is basically counting sort
1952 { 2389 {
1953 int w, b; 2390 int w, b;
1954 2391
1955 glEnable (GL_TEXTURE_2D); 2392 glEnable (GL_TEXTURE_2D);
1956 glBegin (GL_QUADS); 2393 glBegin (GL_QUADS);
1957 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)
1958 { 2397 {
1959 uint32_t smask = smooth_level [w]; 2398 smooth_key &skey = it->first;
1960 if (smask) 2399 IV bits = it->second;
1961 for (b = 0; b < 32; ++b) 2400
1962 if (smask & (((uint32_t)1) << b)) 2401 if (!(bits & 0x1000)
2402 && skey.level == level
2403 && level > smooth_max [skey.x][skey.y])
1963 { 2404 {
1964 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
1965 HE *he; 2413 if (tex.name)
1966
1967 hv_iterinit (smooth);
1968 while ((he = hv_iternext (smooth)))
1969 { 2414 {
1970 smooth_key *skey = (smooth_key *)HeKEY (he); 2415 // this time avoiding texture state changes
1971 IV bits = SvIVX (HeVAL (he)); 2416 // save gobs of state changes.
1972 2417 if (key.texname != tex.name)
1973 if (!(bits & 0x1000)
1974 && skey->level == level
1975 && level > smooth_max [skey->x][skey->y])
1976 { 2418 {
1977 maptex tex = self->tex [skey->tile]; 2419 self->tex [skey.tile].unused = 0;
1978 int px = (((int)skey->x) - 1) * T;
1979 int py = (((int)skey->y) - 1) * T;
1980 int border = bits & 15;
1981 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1982 float dx = tex.s * .0625f; // 16 images/row
1983 float dy = tex.t * .5f ; // 2 images/column
1984 2420
1985 if (tex.name)
1986 {
1987 // this time avoiding texture state changes
1988 // save gobs of state changes.
1989 if (key.texname != tex.name)
1990 {
1991 glEnd (); 2421 glEnd ();
1992 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2422 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1993 glBegin (GL_QUADS); 2423 glBegin (GL_QUADS);
1994 } 2424 }
1995 2425
1996 if (border) 2426 if (border)
1997 { 2427 {
1998 float ox = border * dx; 2428 float ox = border * dx;
1999 2429
2000 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2001 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2002 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2003 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2004 } 2434 }
2005 2435
2006 if (corner) 2436 if (corner)
2007 { 2437 {
2008 float ox = corner * dx; 2438 float ox = corner * dx;
2009 2439
2010 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2011 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2441 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2012 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2442 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2013 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2443 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2014 }
2015 }
2016 } 2444 }
2017 } 2445 }
2018 } 2446 }
2019 } 2447 }
2020 2448
2021 glEnd (); 2449 glEnd ();
2022 glDisable (GL_TEXTURE_2D); 2450 glDisable (GL_TEXTURE_2D);
2023 key.texname = -1; 2451 key.texname = -1;
2024 } 2452 }
2025
2026 hv_clear (smooth);
2027 } 2453 }
2028 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
2029 glDisable (GL_BLEND); 2475 glDisable (GL_BLEND);
2030 rc_free (rc);
2031 2476
2032 // top layer: overlays such as the health bar 2477 // top layer: overlays such as the health bar
2033 for (y = 0; y < sh; y++) 2478 for (y = 0; y < sh; y++)
2034 if (0 <= y + my && y + my < self->rows) 2479 if (0 <= y + my && y + my < self->rows)
2035 { 2480 {
… …
2038 for (x = 0; x < sw; x++) 2483 for (x = 0; x < sw; x++)
2039 if (row->c0 <= x + mx && x + mx < row->c1) 2484 if (row->c0 <= x + mx && x + mx < row->c1)
2040 { 2485 {
2041 mapcell *cell = row->col + (x + mx - row->c0); 2486 mapcell *cell = row->col + (x + mx - row->c0);
2042 2487
2043 int px = x * T; 2488 int px = x * Tw;
2044 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 }
2045 2496
2046 if (cell->stat_hp) 2497 if (cell->stat_hp)
2047 { 2498 {
2048 int width = cell->stat_width * T; 2499 int width = cell->stat_width * Tw;
2049 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2500 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2050 2501
2051 glColor3ub (0, 0, 0); 2502 glColor3ub (0, 0, 0);
2052 glRectf (px + 1, py - thick - 2, 2503 glRectf (px + 1, py - thick - 2,
2053 px + width - 1, py); 2504 px + width - 1, py);
2054 2505
… …
2060 } 2511 }
2061 } 2512 }
2062} 2513}
2063 2514
2064void 2515void
2065draw_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)
2066 CODE: 2517 CODE:
2067{ 2518{
2068 static float color[16][3] = { 2519 static float color[16][3] = {
2069 { 0.00F, 0.00F, 0.00F }, 2520 { 0.00f, 0.00f, 0.00f },
2070 { 1.00F, 1.00F, 1.00F }, 2521 { 1.00f, 1.00f, 1.00f },
2071 { 0.00F, 0.00F, 0.55F }, 2522 { 0.00f, 0.00f, 0.55f },
2072 { 1.00F, 0.00F, 0.00F }, 2523 { 1.00f, 0.00f, 0.00f },
2073 2524
2074 { 1.00F, 0.54F, 0.00F }, 2525 { 1.00f, 0.54f, 0.00f },
2075 { 0.11F, 0.56F, 1.00F }, 2526 { 0.11f, 0.56f, 1.00f },
2076 { 0.93F, 0.46F, 0.00F }, 2527 { 0.93f, 0.46f, 0.00f },
2077 { 0.18F, 0.54F, 0.34F }, 2528 { 0.18f, 0.54f, 0.34f },
2078 2529
2079 { 0.56F, 0.73F, 0.56F }, 2530 { 0.56f, 0.73f, 0.56f },
2080 { 0.80F, 0.80F, 0.80F }, 2531 { 0.80f, 0.80f, 0.80f },
2081 { 0.55F, 0.41F, 0.13F }, 2532 { 0.55f, 0.41f, 0.13f },
2082 { 0.99F, 0.77F, 0.26F }, 2533 { 0.99f, 0.77f, 0.26f },
2083 2534
2084 { 0.74F, 0.65F, 0.41F }, 2535 { 0.74f, 0.65f, 0.41f },
2085 2536
2086 { 0.00F, 1.00F, 1.00F }, 2537 { 0.00f, 1.00f, 1.00f },
2087 { 1.00F, 0.00F, 1.00F }, 2538 { 1.00f, 0.00f, 1.00f },
2088 { 1.00F, 1.00F, 0.00F }, 2539 { 1.00f, 1.00f, 0.00f },
2089 }; 2540 };
2090 2541
2091 int x, y; 2542 int x, y;
2092 2543
2093 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 */
2094 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2551 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2095 glEnable (GL_BLEND); 2552 glEnable (GL_BLEND);
2096 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2553 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2097 glBegin (GL_QUADS); 2554 glBegin (GL_QUADS);
2098 2555
2099 for (y = 0; y < h; y++) 2556 for (y = 0; y < h; y++)
… …
2103 2560
2104 if (m) 2561 if (m)
2105 { 2562 {
2106 float *c = color [m & 15]; 2563 float *c = color [m & 15];
2107 2564
2108 float tx1 = m & 0x40 ? 0.5 : 0.; 2565 float tx1 = m & 0x40 ? 0.5f : 0.f;
2109 float tx2 = tx1 + 0.5; 2566 float tx2 = tx1 + 0.5f;
2110 2567
2111 glColor4f (c[0], c[1], c[2], 0.75); 2568 glColor4f (c[0], c[1], c[2], 1);
2112 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2569 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2113 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2570 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2114 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2571 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2115 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2572 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2116 } 2573 }
… …
2124void 2581void
2125fow_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)
2126 PPCODE: 2583 PPCODE:
2127{ 2584{
2128 int x, y; 2585 int x, y;
2129 int sw1 = sw + 2; 2586 int sw1 = sw + 2;
2130 int sh1 = sh + 2; 2587 int sh1 = sh + 2;
2131 int sh3 = sh * 3; 2588 int sh3 = sh * 3;
2132 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);
2133 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2592 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2134 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2593 memset (darkness1, 0, sw1*sh1);
2135 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2136 2594
2137 SvPOK_only (darkness3_sv); 2595 SvPOK_only (darkness3_sv);
2138 SvCUR_set (darkness3_sv, sw34 * sh3); 2596 SvCUR_set (darkness3_sv, sw3 * sh3);
2139 2597
2140 mx += self->x - 1; 2598 mx += self->x - 1;
2141 my += self->y - 1; 2599 my += self->y - 1;
2142
2143 memset (darkness1, 255, sw1 * sh1);
2144 2600
2145 for (y = 0; y < sh1; y++) 2601 for (y = 0; y < sh1; y++)
2146 if (0 <= y + my && y + my < self->rows) 2602 if (0 <= y + my && y + my < self->rows)
2147 { 2603 {
2148 maprow *row = self->row + (y + my); 2604 maprow *row = self->row + (y + my);
… …
2151 if (row->c0 <= x + mx && x + mx < row->c1) 2607 if (row->c0 <= x + mx && x + mx < row->c1)
2152 { 2608 {
2153 mapcell *cell = row->col + (x + mx - row->c0); 2609 mapcell *cell = row->col + (x + mx - row->c0);
2154 2610
2155 darkness1 [y * sw1 + x] = cell->darkness 2611 darkness1 [y * sw1 + x] = cell->darkness
2156 ? 255 - (cell->darkness - 1) 2612 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2157 : 255 - FOW_DARKNESS; 2613 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2158 } 2614 }
2159 } 2615 }
2160 2616
2161 for (y = 0; y < sh; ++y) 2617 for (y = 0; y < sh; ++y)
2162 for (x = 0; x < sw; ++x) 2618 for (x = 0; x < sw; ++x)
… …
2181 2637
2182 uint8_t r13 = (d13 + d23 + d12) / 3; 2638 uint8_t r13 = (d13 + d23 + d12) / 3;
2183 uint8_t r23 = d23; 2639 uint8_t r23 = d23;
2184 uint8_t r33 = (d23 + d33 + d32) / 3; 2640 uint8_t r33 = (d23 + d33 + d32) / 3;
2185 2641
2186 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2187 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2188 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2189 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2645 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2190 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 */
2191 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2192 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2193 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2194 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2195 } 2651 }
2196 2652
2197 free (darkness1); 2653 free (darkness1);
2198 2654
2199 EXTEND (SP, 3); 2655 EXTEND (SP, 3);
2200 PUSHs (sv_2mortal (newSViv (sw34))); 2656 PUSHs (sv_2mortal (newSViv (sw3)));
2201 PUSHs (sv_2mortal (newSViv (sh3))); 2657 PUSHs (sv_2mortal (newSViv (sh3)));
2202 PUSHs (darkness3_sv); 2658 PUSHs (darkness3_sv);
2203} 2659}
2204 2660
2205SV * 2661SV *
… …
2268 else 2724 else
2269 *data++ = 0; 2725 *data++ = 0;
2270 } 2726 }
2271 } 2727 }
2272 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 {
2273 SvPOK_only (data_sv); 2732 SvPOK_only (data_sv);
2274 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2733 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2734 }
2735
2275 RETVAL = data_sv; 2736 RETVAL = data_sv;
2276} 2737}
2277 OUTPUT: 2738 OUTPUT:
2278 RETVAL 2739 RETVAL
2279 2740
2280void 2741void
2281set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2742set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2282 PPCODE: 2743 PPCODE:
2283{ 2744{
2284 int x, y, z; 2745 int x, y, z;
2285 int w, h; 2746 int w, h;
2286 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;
2287 2758
2288 if (*data++ != 0) 2759 if (*data++ != 0)
2289 XSRETURN_EMPTY; /* version mismatch */ 2760 XSRETURN_EMPTY; /* version mismatch */
2290 2761
2291 w = *data++ << 8; w |= *data++; 2762 w = *data++ << 8; w |= *data++;
… …
2306 { 2777 {
2307 maprow *row = map_get_row (self, y); 2778 maprow *row = map_get_row (self, y);
2308 2779
2309 for (x = x0; x < x1; x++) 2780 for (x = x0; x < x1; x++)
2310 { 2781 {
2782 uint8_t flags;
2783
2784 if (data + 7 >= end)
2785 XSRETURN_EMPTY;
2786
2311 uint8_t flags = *data++; 2787 flags = *data++;
2312 2788
2313 if (flags) 2789 if (flags)
2314 { 2790 {
2315 mapcell *cell = row_get_cell (row, x); 2791 mapcell *cell = row_get_cell (row, x);
2316 tileid tile[3] = { 0, 0, 0 }; 2792 tileid tile[3] = { 0, 0, 0 };
… …
2319 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2795 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2320 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2796 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2321 2797
2322 if (cell->darkness == 0) 2798 if (cell->darkness == 0)
2323 { 2799 {
2324 cell->darkness = 0; 2800 /*cell->darkness = 0;*/
2801 EXTEND (SP, 3);
2325 2802
2326 for (z = 0; z <= 2; z++) 2803 for (z = 0; z <= 2; z++)
2327 { 2804 {
2328 tileid t = tile [z]; 2805 tileid t = tile [z];
2329 2806
2330 if (t >= self->texs || (t && !self->tex [t].name)) 2807 if (t >= self->texs || (t && !self->tex [t].name))
2331 { 2808 {
2332 XPUSHs (sv_2mortal (newSViv (t))); 2809 PUSHs (sv_2mortal (newSViv (t)));
2333 need_texid (self, t); 2810 need_texid (self, t);
2334 } 2811 }
2335 2812
2336 cell->tile [z] = t; 2813 cell->tile [z] = t;
2337 } 2814 }
… …
2342} 2819}
2343 2820
2344MODULE = Deliantra::Client PACKAGE = DC::RW 2821MODULE = Deliantra::Client PACKAGE = DC::RW
2345 2822
2346DC::RW 2823DC::RW
2347new (SV *class, SV *data_sv) 2824new (SV *klass, SV *data_sv)
2348 CODE: 2825 CODE:
2349{ 2826{
2350 STRLEN datalen; 2827 STRLEN datalen;
2351 char *data = SvPVbyte (data_sv, datalen); 2828 char *data = SvPVbyte (data_sv, datalen);
2352 2829
… …
2354} 2831}
2355 OUTPUT: 2832 OUTPUT:
2356 RETVAL 2833 RETVAL
2357 2834
2358DC::RW 2835DC::RW
2359new_from_file (SV *class, const char *path, const char *mode = "rb") 2836new_from_file (SV *klass, const char *path, const char *mode = "rb")
2360 CODE: 2837 CODE:
2361 RETVAL = SDL_RWFromFile (path, mode); 2838 RETVAL = SDL_RWFromFile (path, mode);
2362 OUTPUT: 2839 OUTPUT:
2363 RETVAL 2840 RETVAL
2364 2841
… …
2382 if (RETVAL < 0) 2859 if (RETVAL < 0)
2383 { 2860 {
2384 RETVAL = Mix_GroupOldest (-1); 2861 RETVAL = Mix_GroupOldest (-1);
2385 2862
2386 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)
2387 XSRETURN_UNDEF; 2869 XSRETURN_UNDEF;
2388 2870 }
2871 else
2389 Mix_HaltChannel (RETVAL); 2872 Mix_HaltChannel (RETVAL);
2390 } 2873 }
2391 2874
2392 Mix_UnregisterAllEffects (RETVAL); 2875 Mix_UnregisterAllEffects (RETVAL);
2393 Mix_Volume (RETVAL, 128); 2876 Mix_Volume (RETVAL, 128);
2394} 2877}
… …
2441void 2924void
2442set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2925set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2443 CODE: 2926 CODE:
2444{ 2927{
2445 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));
2446 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;
2447 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2930 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2448} 2931}
2449 2932
2450void 2933void
2451set_reverse_stereo (DC::Channel self, int flip) 2934set_reverse_stereo (DC::Channel self, int flip)
… …
2454 2937
2455MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2938MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2456 2939
2457PROTOTYPES: DISABLE 2940PROTOTYPES: DISABLE
2458 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
2459DC::MixChunk 2954DC::MixChunk
2460new (SV *class, DC::RW rwops) 2955new (SV *klass, DC::RW rwops)
2461 CODE: 2956 CODE:
2462 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2957 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2463 OUTPUT: 2958 OUTPUT:
2464 RETVAL 2959 RETVAL
2465 2960
… …
2495 OUTPUT: 2990 OUTPUT:
2496 RETVAL 2991 RETVAL
2497 2992
2498MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2993MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2499 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
2500int 3007int
2501volume (int volume = -1) 3008volume (int volume = -1)
2502 PROTOTYPE: ;$ 3009 PROTOTYPE: ;$
2503 CODE: 3010 CODE:
2504 if (items > 0) 3011 if (items > 0)
… …
2515void 3022void
2516halt () 3023halt ()
2517 CODE: 3024 CODE:
2518 Mix_HaltMusic (); 3025 Mix_HaltMusic ();
2519 3026
3027int
3028playing ()
3029 CODE:
3030 RETVAL = Mix_PlayingMusic ();
3031 OUTPUT:
3032 RETVAL
3033
2520DC::MixMusic 3034DC::MixMusic
2521new (SV *class, DC::RW rwops) 3035new (SV *klass, DC::RW rwops)
2522 CODE: 3036 CODE:
2523 RETVAL = Mix_LoadMUS_RW (rwops); 3037 RETVAL = Mix_LoadMUS_RW (rwops);
2524 OUTPUT: 3038 OUTPUT:
2525 RETVAL 3039 RETVAL
2526 3040
… …
2554 } *civ, const_iv[] = { 3068 } *civ, const_iv[] = {
2555# define const_iv(name) { # name, (IV)name } 3069# define const_iv(name) { # name, (IV)name }
2556 const_iv (GL_VENDOR), 3070 const_iv (GL_VENDOR),
2557 const_iv (GL_VERSION), 3071 const_iv (GL_VERSION),
2558 const_iv (GL_EXTENSIONS), 3072 const_iv (GL_EXTENSIONS),
3073 const_iv (GL_MAX_TEXTURE_UNITS),
2559 const_iv (GL_COLOR_MATERIAL), 3074 const_iv (GL_COLOR_MATERIAL),
2560 const_iv (GL_SMOOTH), 3075 const_iv (GL_SMOOTH),
2561 const_iv (GL_FLAT), 3076 const_iv (GL_FLAT),
2562 const_iv (GL_DITHER), 3077 const_iv (GL_DITHER),
2563 const_iv (GL_BLEND), 3078 const_iv (GL_BLEND),
… …
2575 const_iv (GL_ZERO), 3090 const_iv (GL_ZERO),
2576 const_iv (GL_SRC_ALPHA), 3091 const_iv (GL_SRC_ALPHA),
2577 const_iv (GL_DST_ALPHA), 3092 const_iv (GL_DST_ALPHA),
2578 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3093 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2579 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),
2580 const_iv (GL_SRC_ALPHA_SATURATE), 3099 const_iv (GL_SRC_ALPHA_SATURATE),
2581 const_iv (GL_RGB), 3100 const_iv (GL_RGB),
2582 const_iv (GL_RGBA), 3101 const_iv (GL_RGBA),
2583 const_iv (GL_RGBA4), 3102 const_iv (GL_RGBA4),
2584 const_iv (GL_RGBA8), 3103 const_iv (GL_RGBA8),
… …
2652 const_iv (GL_NICEST), 3171 const_iv (GL_NICEST),
2653 const_iv (GL_V2F), 3172 const_iv (GL_V2F),
2654 const_iv (GL_V3F), 3173 const_iv (GL_V3F),
2655 const_iv (GL_T2F_V3F), 3174 const_iv (GL_T2F_V3F),
2656 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),
2657# undef const_iv 3179# undef const_iv
2658 }; 3180 };
2659 3181
2660 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--)
2661 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3183 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2662 3184
2663 texture_av = newAV (); 3185 texture_av = newAV ();
2664 AvREAL_off (texture_av); 3186 AvREAL_off (texture_av);
2665} 3187}
2666 3188
… …
2668disable_GL_EXT_blend_func_separate () 3190disable_GL_EXT_blend_func_separate ()
2669 CODE: 3191 CODE:
2670 gl.BlendFuncSeparate = 0; 3192 gl.BlendFuncSeparate = 0;
2671 gl.BlendFuncSeparateEXT = 0; 3193 gl.BlendFuncSeparateEXT = 0;
2672 3194
2673char * 3195void
3196apple_nvidia_bug (int enable)
3197
3198const char *
2674gl_vendor () 3199gl_vendor ()
2675 CODE: 3200 CODE:
2676 RETVAL = (char *)glGetString (GL_VENDOR); 3201 RETVAL = (const char *)glGetString (GL_VENDOR);
2677 OUTPUT: 3202 OUTPUT:
2678 RETVAL 3203 RETVAL
2679 3204
2680char * 3205const char *
2681gl_version () 3206gl_version ()
2682 CODE: 3207 CODE:
2683 RETVAL = (char *)glGetString (GL_VERSION); 3208 RETVAL = (const char *)glGetString (GL_VERSION);
2684 OUTPUT: 3209 OUTPUT:
2685 RETVAL 3210 RETVAL
2686 3211
2687char * 3212const char *
2688gl_extensions () 3213gl_extensions ()
2689 CODE: 3214 CODE:
2690 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3215 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2691 OUTPUT: 3216 OUTPUT:
2692 RETVAL 3217 RETVAL
2693 3218
2694const char *glGetString (GLenum pname) 3219const char *glGetString (GLenum pname)
3220 CODE:
3221 RETVAL = (const char *)glGetString (pname);
3222 OUTPUT:
3223 RETVAL
2695 3224
2696GLint glGetInteger (GLenum pname) 3225GLint glGetInteger (GLenum pname)
2697 CODE: 3226 CODE:
2698 glGetIntegerv (pname, &RETVAL); 3227 glGetIntegerv (pname, &RETVAL);
2699 OUTPUT: 3228 OUTPUT:
… …
2707 3236
2708int glGetError () 3237int glGetError ()
2709 3238
2710void glFinish () 3239void glFinish ()
2711 3240
3241void glFlush ()
3242
2712void glClear (int mask) 3243void glClear (int mask)
2713 3244
2714void glClearColor (float r, float g, float b, float a = 1.0) 3245void glClearColor (float r, float g, float b, float a = 1.0)
2715 PROTOTYPE: @ 3246 PROTOTYPE: @
2716 3247
… …
2725void glBlendFunc (int sfactor, int dfactor) 3256void glBlendFunc (int sfactor, int dfactor)
2726 3257
2727void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3258void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2728 CODE: 3259 CODE:
2729 gl_BlendFuncSeparate (sa, da, saa, daa); 3260 gl_BlendFuncSeparate (sa, da, saa, daa);
3261
3262# void glBlendEquation (int se)
2730 3263
2731void glDepthMask (int flag) 3264void glDepthMask (int flag)
2732 3265
2733void glLogicOp (int opcode) 3266void glLogicOp (int opcode)
2734 3267
… …
2769void glRotate (float angle, float x, float y, float z) 3302void glRotate (float angle, float x, float y, float z)
2770 CODE: 3303 CODE:
2771 glRotatef (angle, x, y, z); 3304 glRotatef (angle, x, y, z);
2772 3305
2773void 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: @
2774 ALIAS: 3308 ALIAS:
2775 glColor_premultiply = 1 3309 glColor_premultiply = 1
2776 CODE: 3310 CODE:
2777 if (ix) 3311 if (ix)
2778 { 3312 {
… …
2884 3418
2885void glEndList () 3419void glEndList ()
2886 3420
2887void glCallList (int list) 3421void glCallList (int list)
2888 3422
3423void c_init ()
3424 CODE:
3425 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3426 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3427
2889MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3428MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2890 3429
2891PROTOTYPES: DISABLE 3430PROTOTYPES: DISABLE
2892 3431
2893void 3432void
2894find_widget (SV *self, NV x, NV y) 3433find_widget (SV *self, NV x, NV y)
2895 PPCODE: 3434 PPCODE:
2896{ 3435{
2897 if (within_widget (self, x, y)) 3436 if (within_widget (self, x, y))
2898 XPUSHs (self); 3437 XPUSHs (self);
2899} 3438}
2900 3439
2901BOOT: 3440BOOT:
2902{ 3441{
… …
2910 3449
2911void 3450void
2912draw (SV *self) 3451draw (SV *self)
2913 CODE: 3452 CODE:
2914{ 3453{
2915 HV *hv; 3454 HV *hv;
2916 SV **svp; 3455 SV **svp;
2917 NV x, y, w, h; 3456 NV x, y, w, h;
2918 SV *draw_x_sv = GvSV (draw_x_gv); 3457 SV *draw_x_sv = GvSV (draw_x_gv);
2919 SV *draw_y_sv = GvSV (draw_y_gv); 3458 SV *draw_y_sv = GvSV (draw_y_gv);
2920 SV *draw_w_sv = GvSV (draw_w_gv); 3459 SV *draw_w_sv = GvSV (draw_w_gv);
2921 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