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.331 by root, Mon Nov 19 00:10:34 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
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 84
85/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
62 89
63#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
65 92
66#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
67 94
68#if 0 95/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 97
71# define PARACHUTE 0 98#define KMOD_LRAM 0x10000 // our extension
72#endif 99
100#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2
102
103static char *
104fast_sv_grow (SV *sv, STRLEN need)
105{
106 STRLEN len = SvLEN (sv);
107 STRLEN want = SvCUR (sv) + need;
108
109 if (ecb_expect_false (len < want))
110 {
111 do
112 len *= 2;
113 while (len < want);
114
115 sv_grow (sv, len);
116 }
117
118 SvCUR_set (sv, want);
119 return SvEND (sv) - need;
120}
73 121
74static AV *texture_av; 122static AV *texture_av;
75 123
76static struct 124static struct
77{ 125{
… …
134{ 182{
135 GSList *attrs = run->item->analysis.extra_attrs; 183 GSList *attrs = run->item->analysis.extra_attrs;
136 184
137 while (attrs) 185 while (attrs)
138 { 186 {
139 PangoAttribute *attr = attrs->data; 187 PangoAttribute *attr = (PangoAttribute *)attrs->data;
140 188
141 if (attr->klass->type == PANGO_ATTR_SHAPE) 189 if (attr->klass->type == PANGO_ATTR_SHAPE)
142 return 1; 190 return 1;
143 191
144 attrs = attrs->next; 192 attrs = attrs->next;
145 } 193 }
146 194
147 return 0; 195 return 0;
148} 196}
149 197
150typedef struct cf_layout { 198struct cf_layout {
151 PangoLayout *pl; 199 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
153 int base_height; 201 int base_height;
154 DC__Font font; 202 DC__Font font;
155 rc_t *rc; 203 rc_t rc;
156} *DC__Layout; 204};
205
206typedef cf_layout *DC__Layout;
157 207
158static DC__Font default_font; 208static DC__Font default_font;
159static PangoContext *opengl_context; 209static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
161 211
162static void 212static void
163substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
164{ 214{
165 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
166#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
167 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
168#endif 218#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 220}
171 221
172static void 222static void
173layout_update_font (DC__Layout self) 223layout_update_font (DC__Layout self)
174{ 224{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 225 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
177 */ 227 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
179 229
180 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
199 249
200 *w = rect.width; 250 *w = rect.width;
201 *h = rect.height; 251 *h = rect.height;
202} 252}
203 253
254/////////////////////////////////////////////////////////////////////////////
255
204typedef uint16_t tileid; 256typedef uint16_t tileid;
205typedef uint16_t faceid; 257typedef uint16_t faceid;
206 258
207typedef struct { 259struct maptex
260{
208 GLuint name; 261 GLuint name;
209 int w, h; 262 int w, h;
210 float s, t; 263 float s, t;
211 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
212 tileid smoothtile; 265 tileid smoothtile;
213 uint8_t smoothlevel; 266 uint8_t smoothlevel;
214} maptex; 267 uint8_t unused; /* set to zero on use */
268};
215 269
216typedef struct { 270struct mapcell
271{
217 uint32_t player; 272 uint32_t player;
218 tileid tile[3]; 273 tileid tile[3];
219 uint16_t darkness; 274 uint16_t darkness;
220 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
221} mapcell; 276};
222 277
223typedef struct { 278struct maprow
279{
224 int32_t c0, c1; 280 int32_t c0, c1;
225 mapcell *col; 281 mapcell *col;
226} maprow; 282};
227 283
228typedef struct map { 284struct mapgrid {
229 int x, y, w, h; 285 int x, y, w, h;
230 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
231 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
233 289
234 int32_t rows; 290 int32_t rows;
235 maprow *row; 291 maprow *row;
236} *DC__Map; 292};
237 293
238static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
239prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
240{ 299{
241 char *p; 300 T *p;
242 301
243 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
244 Zero (p, inc, char); 303 Zero (p, inc, T);
245 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
246 Safefree (ptr); 305 Safefree (ptr);
247 306
248 return p; 307 ptr = p;
249} 308}
250 309
251static char * 310template<typename T>
252append (char *ptr, int sze, int inc)
253{
254 Renew (ptr, sze + inc, char);
255 Zero (ptr + sze, inc, char);
256
257 return ptr;
258}
259
260#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
261#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
262
263static void 311static void
312append (T *&ptr, int sze, int inc)
313{
314 Renew (ptr, sze + inc, T);
315 Zero (ptr + sze, inc, T);
316}
317
318static void
264need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
265{ 320{
266 while (self->faces <= face) 321 while (self->faces <= face)
267 { 322 {
268 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
269 self->faces *= 2; 324 self->faces *= 2;
270 } 325 }
271} 326}
272 327
273static void 328static void
274need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
275{ 330{
276 while (self->texs <= texid) 331 while (self->texs <= texid)
277 { 332 {
278 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
279 self->texs *= 2; 334 self->texs *= 2;
280 } 335 }
281} 336}
282 337
283static maprow * 338static maprow *
284map_get_row (DC__Map self, int y) 339map_get_row (mapgrid *self, int y)
285{ 340{
286 if (0 > y) 341 if (0 > y)
287 { 342 {
288 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
290 345
291 self->rows += extend; 346 self->rows += extend;
292 self->y += extend; 347 self->y += extend;
293 y += extend; 348 y += extend;
294 } 349 }
295 else if (y >= self->rows) 350 else if (y >= self->rows)
296 { 351 {
297 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
298 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
299 self->rows += extend; 354 self->rows += extend;
300 } 355 }
301 356
302 return self->row + y; 357 return self->row + y;
303} 358}
… …
313 } 368 }
314 369
315 if (row->c0 > x) 370 if (row->c0 > x)
316 { 371 {
317 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
318 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
319 row->c0 -= extend; 374 row->c0 -= extend;
320 } 375 }
321 else if (x >= row->c1) 376 else if (x >= row->c1)
322 { 377 {
323 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
324 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
325 row->c1 += extend; 380 row->c1 += extend;
326 } 381 }
327 382
328 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
329} 384}
330 385
331static mapcell * 386static mapcell *
332map_get_cell (DC__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
333{ 388{
334 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
335} 390}
336 391
337static void 392static void
338map_clear (DC__Map self) 393map_clear (mapgrid *self)
339{ 394{
340 int r; 395 int r;
341 396
342 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
… …
350 self->oy = 0; 405 self->oy = 0;
351 self->row = 0; 406 self->row = 0;
352 self->rows = 0; 407 self->rows = 0;
353} 408}
354 409
410#define CELL_CLEAR(cell) \
411 do { \
412 if ((cell)->player) \
413 (cell)->tile [2] = 0; \
414 (cell)->darkness = 0; \
415 (cell)->stat_hp = 0; \
416 (cell)->flags = 0; \
417 (cell)->player = 0; \
418 } while (0)
419
355static void 420static void
356map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
357{ 422{
358 int x, y; 423 int x, y;
359 maprow *row; 424 maprow *row;
360 mapcell *cell; 425 mapcell *cell;
361 426
… …
373 if (x >= row->c1) 438 if (x >= row->c1)
374 break; 439 break;
375 440
376 cell = row->col + x - row->c0; 441 cell = row->col + x - row->c0;
377 442
378 cell->darkness = 0; 443 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 444 }
383 } 445 }
384} 446}
385 447
386typedef struct { 448struct smooth_key
449{
387 tileid tile; 450 tileid tile;
388 uint8_t x, y, level; 451 uint8_t x, y, level;
389} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
390 471
391static void 472static void
392smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
393{ 474{
394 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
395 476
396 if (SvIOK (*sv)) 477 if (it == h.end ())
397 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
398 else 479 else
399 sv_setiv (*sv, bits); 480 it->second |= bits;
400} 481}
401 482
402static void 483static void
403music_finished (void) 484music_finished (void)
404{ 485{
… …
421 ev.code = 1; 502 ev.code = 1;
422 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
423 ev.data2 = 0; 504 ev.data2 = 0;
424 505
425 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
426} 514}
427 515
428static unsigned int 516static unsigned int
429minpot (unsigned int n) 517minpot (unsigned int n)
430{ 518{
… …
440 n |= n >> 16; 528 n |= n >> 16;
441 529
442 return n + 1; 530 return n + 1;
443} 531}
444 532
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. */ 533/* SDL should provide this, really. */
457#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
458#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
459 536
460/******************************************************************************/ 537/******************************************************************************/
… …
497 if (!svp || !SvTRUE (*svp)) 574 if (!svp || !SvTRUE (*svp))
498 return 0; 575 return 0;
499 576
500 return 1; 577 return 1;
501} 578}
579
580/******************************************************************************/
581
582/* process keyboard modifiers */
583static int
584mod_munge (int mod)
585{
586 mod &= MOD_MASK;
587
588 if (mod & (KMOD_META | KMOD_ALT))
589 mod |= KMOD_LRAM;
590
591 return mod;
592}
593
594static void
595deliantra_main (SV *real_main)
596{
597 dSP;
598
599 PUSHMARK (SP);
600 call_sv (real_main, G_DISCARD | G_VOID);
601}
602
603#ifdef __MACOSX__
604 static SV *real_main;
605
606 /* to due surprising braindamage on the side of SDL design, we
607 * do some mind-boggling hack here: SDL requires a custom main()
608 * on OS X, so... we provide one and call the original main(), which,
609 * due to shared library magic, calls -lSDLmain's main, not perl's main,
610 * and which calls our main (== SDL_main) back.
611 */
612 extern C_LINKAGE int
613 main (int argc, char *argv[])
614 {
615 deliantra_main (real_main);
616 }
617
618 #undef main
619
620 extern C_LINKAGE int main (int argc, char *argv[]);
621
622 static void
623 SDL_main_hack (SV *real_main_)
624 {
625 real_main = real_main_;
626
627 char *argv[] = { "deliantra client", 0 };
628 (main) (1, argv);
629 }
630#else
631 static void
632 SDL_main_hack (SV *real_main)
633 {
634 deliantra_main (real_main);
635 }
636#endif
502 637
503MODULE = Deliantra::Client PACKAGE = DC 638MODULE = Deliantra::Client PACKAGE = DC
504 639
505PROTOTYPES: ENABLE 640PROTOTYPES: ENABLE
506 641
… …
535 const_iv (SDL_USEREVENT), 670 const_iv (SDL_USEREVENT),
536 671
537 const_iv (SDL_APPINPUTFOCUS), 672 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 673 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 674 const_iv (SDL_APPACTIVE),
675
676
677 const_iv (SDLK_UNKNOWN),
678 const_iv (SDLK_FIRST),
679 const_iv (SDLK_BACKSPACE),
680 const_iv (SDLK_TAB),
681 const_iv (SDLK_CLEAR),
682 const_iv (SDLK_RETURN),
683 const_iv (SDLK_PAUSE),
684 const_iv (SDLK_ESCAPE),
685 const_iv (SDLK_SPACE),
686 const_iv (SDLK_EXCLAIM),
687 const_iv (SDLK_QUOTEDBL),
688 const_iv (SDLK_HASH),
689 const_iv (SDLK_DOLLAR),
690 const_iv (SDLK_AMPERSAND),
691 const_iv (SDLK_QUOTE),
692 const_iv (SDLK_LEFTPAREN),
693 const_iv (SDLK_RIGHTPAREN),
694 const_iv (SDLK_ASTERISK),
695 const_iv (SDLK_PLUS),
696 const_iv (SDLK_COMMA),
697 const_iv (SDLK_MINUS),
698 const_iv (SDLK_PERIOD),
699 const_iv (SDLK_SLASH),
700 const_iv (SDLK_0),
701 const_iv (SDLK_1),
702 const_iv (SDLK_2),
703 const_iv (SDLK_3),
704 const_iv (SDLK_4),
705 const_iv (SDLK_5),
706 const_iv (SDLK_6),
707 const_iv (SDLK_7),
708 const_iv (SDLK_8),
709 const_iv (SDLK_9),
710 const_iv (SDLK_COLON),
711 const_iv (SDLK_SEMICOLON),
712 const_iv (SDLK_LESS),
713 const_iv (SDLK_EQUALS),
714 const_iv (SDLK_GREATER),
715 const_iv (SDLK_QUESTION),
716 const_iv (SDLK_AT),
717
718 const_iv (SDLK_LEFTBRACKET),
719 const_iv (SDLK_BACKSLASH),
720 const_iv (SDLK_RIGHTBRACKET),
721 const_iv (SDLK_CARET),
722 const_iv (SDLK_UNDERSCORE),
723 const_iv (SDLK_BACKQUOTE),
724 const_iv (SDLK_DELETE),
540 725
541 const_iv (SDLK_FIRST), 726 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 727 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 728 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 729 const_iv (SDLK_KP1),
… …
620 const_iv (KMOD_RMETA), 805 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 806 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 807 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 808 const_iv (KMOD_MODE),
624 809
810 const_iv (KMOD_LRAM),
811
625 const_iv (MIX_DEFAULT_FORMAT), 812 const_iv (MIX_DEFAULT_FORMAT),
813
814 const_iv (SDL_INIT_TIMER),
815 const_iv (SDL_INIT_AUDIO),
816 const_iv (SDL_INIT_VIDEO),
817 const_iv (SDL_INIT_CDROM),
818 const_iv (SDL_INIT_JOYSTICK),
819 const_iv (SDL_INIT_EVERYTHING),
820 const_iv (SDL_INIT_NOPARACHUTE),
821 const_iv (SDL_INIT_EVENTTHREAD),
822
823 const_iv (SDL_GL_RED_SIZE),
824 const_iv (SDL_GL_GREEN_SIZE),
825 const_iv (SDL_GL_BLUE_SIZE),
826 const_iv (SDL_GL_ALPHA_SIZE),
827 const_iv (SDL_GL_DOUBLEBUFFER),
828 const_iv (SDL_GL_BUFFER_SIZE),
829 const_iv (SDL_GL_DEPTH_SIZE),
830 const_iv (SDL_GL_STENCIL_SIZE),
831 const_iv (SDL_GL_ACCUM_RED_SIZE),
832 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
833 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
834 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
835 const_iv (SDL_GL_STEREO),
836 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
837 const_iv (SDL_GL_MULTISAMPLESAMPLES),
838 const_iv (SDL_GL_ACCELERATED_VISUAL),
839 const_iv (SDL_GL_SWAP_CONTROL),
840
841 const_iv (FOW_DARKNESS)
626# undef const_iv 842# undef const_iv
627 }; 843 };
628 844
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 845 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
631 847
632 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
633 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
634} 850}
635 851
… …
651NV ceil (NV x) 867NV ceil (NV x)
652 868
653IV minpot (UV n) 869IV minpot (UV n)
654 870
655IV popcount (UV n) 871IV popcount (UV n)
872 CODE:
873 RETVAL = ecb_popcount32 (n);
874 OUTPUT:
875 RETVAL
876
877NV distance (NV dx, NV dy)
878 CODE:
879 RETVAL = pow (dx * dx + dy * dy, 0.5);
880 OUTPUT:
881 RETVAL
656 882
657void 883void
658pango_init () 884pango_init ()
659 CODE: 885 CODE:
660{ 886{
661 opengl_fontmap = pango_opengl_font_map_new (); 887 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 888 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); 889 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
890 /*pango_context_set_font_description (opengl_context, default_font);*/
891#if PANGO_VERSION_CHECK (1, 15, 2)
892 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
893 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
894#endif
664} 895}
665 896
666char *
667SDL_GetError () 897char *SDL_GetError ()
668 898
669int 899void SDL_main_hack (SV *real_main)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 900 PROTOTYPE: &
671 901
672void 902int SDL_Init (U32 flags)
903
904int SDL_InitSubSystem (U32 flags)
905
906void SDL_QuitSubSystem (U32 flags)
907
673SDL_Quit () 908void SDL_Quit ()
909
910int SDL_GL_SetAttribute (int attr, int value)
911 C_ARGS: (SDL_GLattr)attr, value
912
913int SDL_GL_GetAttribute (int attr)
914 CODE:
915 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
916 XSRETURN_UNDEF;
917 OUTPUT:
918 RETVAL
674 919
675void 920void
676SDL_ListModes (int rgb, int alpha) 921SDL_ListModes (int rgb, int alpha)
677 PPCODE: 922 PPCODE:
678{ 923{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 935 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 936 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 937 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 938
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 939 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); 940 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 941
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 942 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 943
702 if (m && m != (SDL_Rect **)-1) 944 if (m && m != (SDL_Rect **)-1)
703 while (*m) 945 while (*m)
704 { 946 {
705 if ((*m)->w >= 800 && (*m)->h >= 480) 947 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 948 {
707 AV *av = newAV (); 949 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 950 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 951 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 952 av_push (av, newSViv (rgb));
… …
733 ); 975 );
734 976
735 if (RETVAL) 977 if (RETVAL)
736 { 978 {
737 av_clear (texture_av); 979 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); 980#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
741#include "glfunc.h" 981#include "glfunc.h"
742#undef GL_FUNC 982#undef GL_FUNC
983 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
984 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 985 }
744} 986}
745 OUTPUT: 987 OUTPUT:
746 RETVAL 988 RETVAL
989
990void
991SDL_WM_SetCaption (const char *title, const char *icon)
747 992
748void 993void
749SDL_GL_SwapBuffers () 994SDL_GL_SwapBuffers ()
750 995
751char * 996char *
752SDL_GetKeyName (int sym) 997SDL_GetKeyName (int sym)
998 C_ARGS: (SDLKey)sym
753 999
754int 1000int
755SDL_GetAppState () 1001SDL_GetAppState ()
756 1002
1003int
1004SDL_GetModState ()
1005
1006int
1007SDL_WaitEvent ()
1008 C_ARGS: 0
1009
757void 1010void
1011SDL_PumpEvents ()
1012
1013void
758poll_events () 1014peep_events ()
759 PPCODE: 1015 PPCODE:
760{ 1016{
761 SDL_Event ev; 1017 SDL_Event ev;
762 1018
763 SDL_PumpEvents (); 1019 SDL_PumpEvents ();
… …
770 { 1026 {
771 case SDL_KEYDOWN: 1027 case SDL_KEYDOWN:
772 case SDL_KEYUP: 1028 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1029 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1030 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1031 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 */ 1032 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); 1033 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 1034 break;
779 1035
780 case SDL_ACTIVEEVENT: 1036 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1037 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 1055 x = ev.motion.x;
800 y = ev.motion.y; 1056 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1057 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1058 }
803 1059
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1060 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1061 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1062 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1063 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1064 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1065 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1066 }
811 break; 1067 break;
812 1068
813 case SDL_MOUSEBUTTONDOWN: 1069 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1070 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1071 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1072
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1073 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1074 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1075 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1076 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
829 1085
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1086 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 1087 }
832} 1088}
833 1089
1090char *
1091SDL_AudioDriverName ()
1092 CODE:
1093{
1094 char buf [256];
1095 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1096 XSRETURN_UNDEF;
1097
1098 RETVAL = buf;
1099}
1100 OUTPUT:
1101 RETVAL
1102
834int 1103int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1104Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
836 POSTCALL: 1105 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1106 Mix_HookMusicFinished (music_finished);
838 Mix_ChannelFinished (channel_finished); 1107 Mix_ChannelFinished (channel_finished);
839 1108
840void 1109void
841Mix_QuerySpec () 1110Mix_QuerySpec ()
… …
894 } 1163 }
895 } 1164 }
896#endif 1165#endif
897} 1166}
898 1167
899void 1168int
900add_font (char *file) 1169add_font (char *file)
901 CODE: 1170 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1171 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1172 OUTPUT:
1173 RETVAL
1174
1175void
1176IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1177
1178# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1179void
1180Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
903 1181
904void 1182void
905load_image_inline (SV *image_) 1183load_image_inline (SV *image_)
906 ALIAS: 1184 ALIAS:
907 load_image_file = 1 1185 load_image_file = 1
… …
953 1231
954 SDL_LockSurface (surface2); 1232 SDL_LockSurface (surface2);
955 EXTEND (SP, 6); 1233 EXTEND (SP, 6);
956 PUSHs (sv_2mortal (newSViv (surface2->w))); 1234 PUSHs (sv_2mortal (newSViv (surface2->w)));
957 PUSHs (sv_2mortal (newSViv (surface2->h))); 1235 PUSHs (sv_2mortal (newSViv (surface2->h)));
958 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1236 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))); 1237 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
960 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1238 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
961 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1239 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
962 SDL_UnlockSurface (surface2); 1240 SDL_UnlockSurface (surface2);
963 1241
… …
1023#if DEBUG 1301#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1302 VALGRIND_DO_LEAK_CHECK;
1025#endif 1303#endif
1026} 1304}
1027 1305
1306int
1307SvREFCNT (SV *sv)
1308 CODE:
1309 RETVAL = SvREFCNT (sv);
1310 OUTPUT:
1311 RETVAL
1312
1028MODULE = Deliantra::Client PACKAGE = DC::Font 1313MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1314
1030PROTOTYPES: DISABLE 1315PROTOTYPES: DISABLE
1031 1316
1032DC::Font 1317DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1318new_from_file (SV *klass, char *path, int id = 0)
1034 CODE: 1319 CODE:
1035{ 1320{
1036 int count; 1321 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1322 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1038 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1323 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
1067 PROTOTYPE: 1352 PROTOTYPE:
1068 CODE: 1353 CODE:
1069 tc_restore (); 1354 tc_restore ();
1070 1355
1071DC::Layout 1356DC::Layout
1072new (SV *class) 1357new (SV *klass)
1073 CODE: 1358 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1359 RETVAL = new cf_layout;
1075 1360
1076 RETVAL->pl = pango_layout_new (opengl_context); 1361 RETVAL->pl = pango_layout_new (opengl_context);
1077 RETVAL->r = 1.; 1362 RETVAL->r = 1.;
1078 RETVAL->g = 1.; 1363 RETVAL->g = 1.;
1079 RETVAL->b = 1.; 1364 RETVAL->b = 1.;
1080 RETVAL->a = 1.; 1365 RETVAL->a = 1.;
1081 RETVAL->base_height = MIN_FONT_HEIGHT; 1366 RETVAL->base_height = MIN_FONT_HEIGHT;
1082 RETVAL->font = 0; 1367 RETVAL->font = 0;
1083 RETVAL->rc = rc_alloc ();
1084 1368
1085 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1369 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1086 layout_update_font (RETVAL); 1370 layout_update_font (RETVAL);
1087 OUTPUT: 1371 OUTPUT:
1088 RETVAL 1372 RETVAL
1089 1373
1090void 1374void
1091DESTROY (DC::Layout self) 1375DESTROY (DC::Layout self)
1092 CODE: 1376 CODE:
1093 g_object_unref (self->pl); 1377 g_object_unref (self->pl);
1094 rc_free (self->rc);
1095 Safefree (self); 1378 delete self;
1096 1379
1097void 1380void
1098set_text (DC::Layout self, SV *text_) 1381set_text (DC::Layout self, SV *text_)
1099 CODE: 1382 CODE:
1100{ 1383{
… …
1165{ 1448{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1449 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1450
1168 do 1451 do
1169 { 1452 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1453 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1454
1172 if (run && shape_attr_p (run)) 1455 if (run && shape_attr_p (run))
1173 { 1456 {
1174 PangoRectangle extents; 1457 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1458 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1226 1509
1227void 1510void
1228set_height (DC::Layout self, int base_height) 1511set_height (DC::Layout self, int base_height)
1229 CODE: 1512 CODE:
1230 if (self->base_height != base_height) 1513 if (self->base_height != base_height)
1231 { 1514 {
1232 self->base_height = base_height; 1515 self->base_height = base_height;
1233 layout_update_font (self); 1516 layout_update_font (self);
1234 } 1517 }
1235 1518
1236void 1519void
… …
1279int 1562int
1280descent (DC::Layout self) 1563descent (DC::Layout self)
1281 CODE: 1564 CODE:
1282{ 1565{
1283 PangoRectangle rect; 1566 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1567 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1568 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1569 RETVAL = PANGO_DESCENT (rect);
1287} 1570}
1288 OUTPUT: 1571 OUTPUT:
1289 RETVAL 1572 RETVAL
… …
1301 1584
1302void 1585void
1303cursor_pos (DC::Layout self, int index) 1586cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1587 PPCODE:
1305{ 1588{
1306 PangoRectangle strong_pos; 1589 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1590 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1591
1309 EXTEND (SP, 3); 1592 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1593 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1594 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1595 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1596}
1314 1597
1315void 1598void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1599index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1600 PPCODE:
1318{ 1601{
1319 int line, x; 1602 int line, x;
1320 1603
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1604 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1322#if !PANGO_VERSION_CHECK (1, 17. 3) 1605#if !PANGO_VERSION_CHECK (1, 17, 3)
1323 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1606 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1324 --line; 1607 --line;
1325#endif 1608#endif
1326 EXTEND (SP, 2); 1609 EXTEND (SP, 2);
1327 PUSHs (sv_2mortal (newSViv (line))); 1610 PUSHs (sv_2mortal (newSViv (line)));
… …
1336 int index, trailing; 1619 int index, trailing;
1337 1620
1338 if (line < 0) 1621 if (line < 0)
1339 XSRETURN_EMPTY; 1622 XSRETURN_EMPTY;
1340 1623
1341 if (!(lp = pango_layout_get_line (self->pl, line))) 1624 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1342 XSRETURN_EMPTY; /* do better */ 1625 XSRETURN_EMPTY; /* do better */
1343 1626
1344 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1627 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1345 1628
1346 EXTEND (SP, 2); 1629 EXTEND (SP, 2);
… …
1354} 1637}
1355 1638
1356void 1639void
1357render (DC::Layout self, float x, float y, int flags = 0) 1640render (DC::Layout self, float x, float y, int flags = 0)
1358 CODE: 1641 CODE:
1359 rc_clear (self->rc); 1642 self->rc.clear ();
1360 pango_opengl_render_layout_subpixel ( 1643 pango_opengl_render_layout_subpixel (
1361 self->pl, 1644 self->pl,
1362 self->rc, 1645 &self->rc,
1363 x * PANGO_SCALE, y * PANGO_SCALE, 1646 x * PANGO_SCALE, y * PANGO_SCALE,
1364 self->r, self->g, self->b, self->a, 1647 self->r, self->g, self->b, self->a,
1365 flags 1648 flags
1366 ); 1649 );
1367 // we assume that context_change actually clears/frees stuff 1650 // we assume that context_change actually clears/frees stuff
… …
1378 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1661 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1379 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1662 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1380 glEnable (GL_ALPHA_TEST); 1663 glEnable (GL_ALPHA_TEST);
1381 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1664 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1382 1665
1383 rc_draw (self->rc); 1666 self->rc.draw ();
1384 1667
1385 glDisable (GL_ALPHA_TEST); 1668 glDisable (GL_ALPHA_TEST);
1386 glDisable (GL_BLEND); 1669 glDisable (GL_BLEND);
1387 glDisable (GL_TEXTURE_2D); 1670 glDisable (GL_TEXTURE_2D);
1388} 1671}
… …
1463 glDisable (GL_ALPHA_TEST); 1746 glDisable (GL_ALPHA_TEST);
1464 glDisable (GL_BLEND); 1747 glDisable (GL_BLEND);
1465 } 1748 }
1466} 1749}
1467 1750
1751void
1752draw_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)
1753 PROTOTYPE: @
1754 CODE:
1755{
1756 glEnable (GL_BLEND);
1757 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1758 glEnable (GL_TEXTURE_2D);
1759 glBindTexture (GL_TEXTURE_2D, name1);
1760
1761 glColor3f (intensity, intensity, intensity);
1762 glPushMatrix ();
1763 glScalef (1./3, 1./3, 1.);
1764
1765 if (blend > 0.f)
1766 {
1767 float dx3 = dx * -3.f / w;
1768 float dy3 = dy * -3.f / h;
1769 GLfloat env_color[4] = { 0., 0., 0., blend };
1770
1771 /* interpolate the two shadow textures */
1772 /* stage 0 == rgb(glcolor) + alpha(t0) */
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774
1775 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1776 gl.ActiveTexture (GL_TEXTURE1);
1777 glEnable (GL_TEXTURE_2D);
1778 glBindTexture (GL_TEXTURE_2D, name2);
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1780
1781 /* rgb == rgb(glcolor) */
1782 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1783 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1784 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1785
1786 /* alpha = interpolate t0, t1 by env_alpha */
1787 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1788
1789 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1791 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1792
1793 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1795
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1798
1799 glBegin (GL_QUADS);
1800 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1801 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1802 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1803 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1804 glEnd ();
1805
1806 glDisable (GL_TEXTURE_2D);
1807 gl.ActiveTexture (GL_TEXTURE0);
1808 }
1809 else
1810 {
1811 /* simple blending of one texture, also opengl <1.3 path */
1812 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1813
1814 glBegin (GL_QUADS);
1815 glTexCoord2f (0, 0); glVertex2f (0, 0);
1816 glTexCoord2f (0, t); glVertex2f (0, h);
1817 glTexCoord2f (s, t); glVertex2f (w, h);
1818 glTexCoord2f (s, 0); glVertex2f (w, 0);
1819 glEnd ();
1820 }
1821
1822 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1823 {
1824 int x, y;
1825 int dx3 = dx * 3;
1826 int dy3 = dy * 3;
1827
1828 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1829 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1830 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1831 glTranslatef (-1., -1., 0);
1832 glBegin (GL_QUADS);
1833
1834 for (y = 1; y < h; y += 3)
1835 {
1836 int y1 = y - dy3;
1837 int y1valid = y1 >= 0 && y1 < h;
1838
1839 for (x = 1; x < w; x += 3)
1840 {
1841 int x1 = x - dx3;
1842 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1843 uint8_t h2;
1844
1845 if (y1valid && x1 >= 0 && x1 < w)
1846 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1847 else
1848 h2 = 1; /* out of range == invisible */
1849
1850 if (h1 || h2)
1851 {
1852 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1853 glColor4f (1., 1., 1., alpha);
1854
1855 glTexCoord2f (0, 0.); glVertex2i (x , y );
1856 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1857 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1858 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1859 }
1860 }
1861 }
1862 }
1863
1864 glEnd ();
1865
1866 glPopMatrix ();
1867
1868 glDisable (GL_TEXTURE_2D);
1869 glDisable (GL_BLEND);
1870}
1871
1468IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1872IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1469 CODE: 1873 CODE:
1470{ 1874{
1471 GLint width; 1875 GLint width;
1472 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1876 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1479MODULE = Deliantra::Client PACKAGE = DC::Map 1883MODULE = Deliantra::Client PACKAGE = DC::Map
1480 1884
1481PROTOTYPES: DISABLE 1885PROTOTYPES: DISABLE
1482 1886
1483DC::Map 1887DC::Map
1484new (SV *class) 1888new (SV *klass)
1485 CODE: 1889 CODE:
1486 New (0, RETVAL, 1, struct map); 1890 New (0, RETVAL, 1, mapgrid);
1487 RETVAL->x = 0; 1891 RETVAL->x = 0;
1488 RETVAL->y = 0; 1892 RETVAL->y = 0;
1489 RETVAL->w = 0; 1893 RETVAL->w = 0;
1490 RETVAL->h = 0; 1894 RETVAL->h = 0;
1491 RETVAL->ox = 0; 1895 RETVAL->ox = 0;
… …
1528 1932
1529void 1933void
1530set_smooth (DC::Map self, int face, int smooth, int level) 1934set_smooth (DC::Map self, int face, int smooth, int level)
1531 CODE: 1935 CODE:
1532{ 1936{
1533 tileid texid; 1937 tileid texid;
1534 maptex *tex; 1938 maptex *tex;
1535 1939
1536 if (face < 0 || face >= self->faces) 1940 if (face < 0 || face >= self->faces)
1537 return; 1941 return;
1538 1942
1539 if (smooth < 0 || smooth >= self->faces) 1943 if (smooth < 0 || smooth >= self->faces)
1540 return; 1944 return;
1541 1945
1542 texid = self->face2tile [face]; 1946 texid = self->face2tile [face];
1543 1947
1544 if (!texid) 1948 if (!texid)
1545 return; 1949 return;
1546 1950
1547 tex = self->tex + texid; 1951 tex = self->tex + texid;
… …
1576 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1980 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1577 // use uglier nearest interpolation because linear suffers 1981 // use uglier nearest interpolation because linear suffers
1578 // from transparent color bleeding and ugly wrapping effects. 1982 // from transparent color bleeding and ugly wrapping effects.
1579 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1983 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1580} 1984}
1985
1986void
1987expire_textures (DC::Map self, int texid, int count)
1988 PPCODE:
1989 for (; texid < self->texs && count; ++texid, --count)
1990 {
1991 maptex *tex = self->tex + texid;
1992
1993 if (tex->name)
1994 {
1995 if (tex->unused)
1996 {
1997 tex->name = 0;
1998 tex->unused = 0;
1999 XPUSHs (sv_2mortal (newSViv (texid)));
2000 }
2001 else
2002 tex->unused = 1;
2003 }
2004 }
1581 2005
1582int 2006int
1583ox (DC::Map self) 2007ox (DC::Map self)
1584 ALIAS: 2008 ALIAS:
1585 oy = 1 2009 oy = 1
… …
1617 self->ox += dx; self->x += dx; 2041 self->ox += dx; self->x += dx;
1618 self->oy += dy; self->y += dy; 2042 self->oy += dy; self->y += dy;
1619 2043
1620 while (self->y < 0) 2044 while (self->y < 0)
1621 { 2045 {
1622 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2046 prepend (self->row, self->rows, MAP_EXTEND_Y);
1623 2047
1624 self->rows += MAP_EXTEND_Y; 2048 self->rows += MAP_EXTEND_Y;
1625 self->y += MAP_EXTEND_Y; 2049 self->y += MAP_EXTEND_Y;
1626 } 2050 }
1627} 2051}
1628 2052
1629SV * 2053SV *
1630map1a_update (DC::Map self, SV *data_, int extmap) 2054map1a_update (DC::Map self, SV *data_)
1631 CODE: 2055 CODE:
1632{ 2056{
1633 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2057 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1634 uint8_t *data_end = (uint8_t *)SvEND (data_); 2058 uint8_t *data_end = (uint8_t *)SvEND (data_);
1635 mapcell *cell; 2059 mapcell *cell;
… …
1656 2080
1657 //TODO: don't trust server data to be in-range(!) 2081 //TODO: don't trust server data to be in-range(!)
1658 2082
1659 if (flags & 8) 2083 if (flags & 8)
1660 { 2084 {
2085 uint8_t ext, cmd;
2086
1661 if (extmap) 2087 do
1662 { 2088 {
1663 uint8_t ext, cmd; 2089 ext = *data++;
2090 cmd = ext & 0x7f;
1664 2091
1665 do 2092 if (cmd < 4)
2093 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2094 else if (cmd == 5) // health
1666 { 2095 {
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; 2096 cell->stat_width = 1;
1675 cell->stat_hp = *data++; 2097 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 } 2098 }
1693 while (ext & 0x80); 2099 else if (cmd == 6) // monster width
2100 cell->stat_width = *data++ + 1;
2101 else if (cmd == 0x47)
2102 {
2103 if (*data == 1) cell->player = data [1];
2104 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2105 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2106 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2107
2108 data += *data + 1;
2109 }
2110 else if (cmd == 8) // cell flags
2111 cell->flags = *data++;
2112 else if (ext & 0x40) // unknown, multibyte => skip
2113 data += *data + 1;
2114 else
2115 data++;
1694 } 2116 }
1695 else 2117 while (ext & 0x80);
1696 cell->darkness = *data++ + 1;
1697 } 2118 }
1698 2119
1699 for (z = 0; z <= 2; ++z) 2120 for (z = 0; z <= 2; ++z)
1700 if (flags & (4 >> z)) 2121 if (flags & (4 >> z))
1701 { 2122 {
… …
1704 cell->tile [z] = self->face2tile [face]; 2125 cell->tile [z] = self->face2tile [face];
1705 2126
1706 if (cell->tile [z]) 2127 if (cell->tile [z])
1707 { 2128 {
1708 maptex *tex = self->tex + cell->tile [z]; 2129 maptex *tex = self->tex + cell->tile [z];
2130 tex->unused = 0;
1709 if (!tex->name) 2131 if (!tex->name)
1710 av_push (missing, newSViv (cell->tile [z])); 2132 av_push (missing, newSViv (cell->tile [z]));
1711 2133
1712 if (tex->smoothtile) 2134 if (tex->smoothtile)
1713 { 2135 {
1714 maptex *smooth = self->tex + tex->smoothtile; 2136 maptex *smooth = self->tex + tex->smoothtile;
2137 smooth->unused = 0;
1715 if (!smooth->name) 2138 if (!smooth->name)
1716 av_push (missing, newSViv (tex->smoothtile)); 2139 av_push (missing, newSViv (tex->smoothtile));
1717 } 2140 }
1718 } 2141 }
1719 } 2142 }
1720 } 2143 }
1721 else 2144 else
1722 cell->darkness = 0; 2145 CELL_CLEAR (cell);
1723 } 2146 }
1724} 2147}
1725 OUTPUT: 2148 OUTPUT:
1726 RETVAL 2149 RETVAL
1727 2150
… …
1747 ? self->row + y 2170 ? self->row + y
1748 : 0; 2171 : 0;
1749 2172
1750 for (x = x0; x < x1; x++) 2173 for (x = x0; x < x1; x++)
1751 { 2174 {
1752 int r = 32, g = 32, b = 32, a = 192; 2175 unsigned int r = 32, g = 32, b = 32, a = 192;
1753 2176
1754 if (row && row->c0 <= x && x < row->c1) 2177 if (row && row->c0 <= x && x < row->c1)
1755 { 2178 {
1756 mapcell *cell = row->col + (x - row->c0); 2179 mapcell *cell = row->col + (x - row->c0);
1757 2180
… …
1759 { 2182 {
1760 maptex tex = self->tex [cell->tile [z]]; 2183 maptex tex = self->tex [cell->tile [z]];
1761 int a0 = 255 - tex.a; 2184 int a0 = 255 - tex.a;
1762 int a1 = tex.a; 2185 int a1 = tex.a;
1763 2186
1764 r = (r * a0 + tex.r * a1) / 255; 2187 r = div255 (r * a0 + tex.r * a1);
1765 g = (g * a0 + tex.g * a1) / 255; 2188 g = div255 (g * a0 + tex.g * a1);
1766 b = (b * a0 + tex.b * a1) / 255; 2189 b = div255 (b * a0 + tex.b * a1);
1767 a = (a * a0 + tex.a * a1) / 255; 2190 a = div255 (a * a0 + tex.a * a1);
1768 } 2191 }
1769 } 2192 }
1770 2193
1771 *map++ = (r ) 2194 *map++ = (r )
1772 | (g << 8) 2195 | (g << 8)
1773 | (b << 16) 2196 | (b << 16)
1774 | (a << 24); 2197 | (a << 24);
1775 } 2198 }
1776 } 2199 }
1777 2200
1778 RETVAL = map_sv; 2201 RETVAL = map_sv;
1779} 2202}
1780 OUTPUT: 2203 OUTPUT:
1781 RETVAL 2204 RETVAL
1782 2205
1783void 2206void
1784draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2207draw (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: 2208 CODE:
1786{ 2209{
1787 int x, y, z; 2210 int x, y, z;
1788 2211
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) 2212 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1792 smooth_key skey; 2213 int pl_x, pl_y;
1793 2214 maptex pl_tex;
1794 rc_t *rc = rc_alloc (); 2215 rc_t rc;
2216 rc_t rc_ov;
1795 rc_key_t key; 2217 rc_key_t key;
1796 rc_array_t *arr; 2218 rc_t::array_t *arr;
1797 2219
2220 pl_tex.name = 0;
2221
1798 // thats current max. sorry. 2222 // that's current max. sorry.
1799 if (sw > 255) sw = 255; 2223 if (sw > 255) sw = 255;
1800 if (sh > 255) sh = 255; 2224 if (sh > 255) sh = 255;
1801
1802 // clear key, in case of extra padding
1803 memset (&skey, 0, sizeof (skey));
1804 2225
1805 memset (&key, 0, sizeof (key)); 2226 memset (&key, 0, sizeof (key));
1806 key.r = 255; 2227 key.r = 255;
1807 key.g = 255; 2228 key.g = 255;
1808 key.b = 255; 2229 key.b = 255;
1809 key.a = 255; 2230 key.a = 255;
1810 key.mode = GL_QUADS; 2231 key.mode = GL_QUADS;
1811 key.format = GL_T2F_V3F; 2232 key.format = GL_T2F_V3F;
1812 key.texname = -1;
1813 2233
1814 mx += self->x; 2234 mx += self->x;
1815 my += self->y; 2235 my += self->y;
1816 2236
1817 // first pass: determine smooth_max 2237 // first pass: determine smooth_max
1818 // rather ugly, if you ask me 2238 // rather ugly, if you ask me
1819 // could also be stored inside mapcell and updated on change 2239 // could also be stored inside mapcell and updated on change
1820 memset (smooth_max, 0, sizeof (smooth_max)); 2240 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1821 2241
1822 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
1823 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
1824 { 2244 {
1825 maprow *row = self->row + (y + my); 2245 maprow *row = self->row + (y + my);
… …
1840 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2260 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1841 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2261 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1842 2262
1843 for (z = 0; z <= 2; z++) 2263 for (z = 0; z <= 2; z++)
1844 { 2264 {
1845 memset (smooth_level, 0, sizeof (smooth_level)); 2265 std::bitset<256> smooth_level; // one bit for every possible smooth level
2266 smooth_key skey;
2267 smooth_hash smooth;
2268 key.texname = -1;
1846 2269
1847 for (y = 0; y < sh; y++) 2270 for (y = 0; y < sh; y++)
1848 if (0 <= y + my && y + my < self->rows) 2271 if (0 <= y + my && y + my < self->rows)
1849 { 2272 {
1850 maprow *row = self->row + (y + my); 2273 maprow *row = self->row + (y + my);
… …
1860 maptex tex = self->tex [tile]; 2283 maptex tex = self->tex [tile];
1861 int px, py; 2284 int px, py;
1862 2285
1863 if (key.texname != tex.name) 2286 if (key.texname != tex.name)
1864 { 2287 {
2288 self->tex [tile].unused = 0;
2289
1865 if (!tex.name) 2290 if (!tex.name)
1866 tex = self->tex [2]; /* missing, replace by noface */ 2291 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1867 2292
1868 key.texname = tex.name; 2293 key.texname = tex.name;
1869 arr = rc_array (rc, &key); 2294 arr = &rc.array (key);
1870 } 2295 }
1871 2296
1872 px = (x + 1) * T - tex.w; 2297 px = (x + 1) * Th - tex.w;
1873 py = (y + 1) * T - tex.h; 2298 py = (y + 1) * Tw - tex.h;
1874 2299
1875 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2300 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 { 2301 {
1882 // overlays such as the speech bubble, probably more to come 2302 pl_x = px;
1883 if (cell->flags & 1) 2303 pl_y = py;
2304 pl_tex = tex;
1884 { 2305 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 } 2306 }
2307
2308 arr->t2f_v3f (0 , 0 , px , py , 0);
2309 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2310 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2311 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1904 2312
1905 // update smooth hash 2313 // update smooth hash
1906 if (tex.smoothtile) 2314 if (tex.smoothtile)
1907 { 2315 {
1908 skey.tile = tex.smoothtile; 2316 skey.tile = tex.smoothtile;
1909 skey.level = tex.smoothlevel; 2317 skey.level = tex.smoothlevel;
1910 2318
1911 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2319 smooth_level[tex.smoothlevel] = 1;
1912 2320
1913 // add bits to current tile and all neighbours. skey.x|y is 2321 // add bits to current tile and all neighbours. skey.x|y is
1914 // shifted +1|+1 so we always stay positive. 2322 // shifted +1|+1 so we always stay positive.
1915 2323
1916 // bits is ___n cccc CCCC bbbb 2324 // bits is ___n cccc CCCC bbbb
… …
1924 2332
1925 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2333 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1926 // ·· ·· ·┏ ┓· 2334 // ·· ·· ·┏ ┓·
1927 2335
1928 // full tile 2336 // full tile
1929 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2337 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1930 2338
1931 // borders 2339 // borders
1932 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2340 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); 2341 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); 2342 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); 2343 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1936 2344
1937 // corners 2345 // corners
1938 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2346 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); 2347 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); 2348 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); 2349 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2350 }
2351 }
2352
2353 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2354 {
2355 // overlays such as the speech bubble, probably more to come
2356 if (cell->flags & 1)
2357 {
2358 rc_key_t key_ov = key;
2359 maptex tex = self->tex[TEXID_SPEECH];
2360 int px = x * Tw + Tw * 2 / 32;
2361 int py = y * Th - Th * 6 / 32;
2362
2363 key_ov.texname = tex.name;
2364 rc_t::array_t &arr = rc_ov.array (key_ov);
2365
2366 arr.t2f_v3f (0 , 0 , px , py , 0);
2367 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2368 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2369 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
1942 } 2370 }
1943 } 2371 }
1944 } 2372 }
1945 } 2373 }
1946 2374
1947 rc_draw (rc); 2375 rc.draw ();
1948 rc_clear (rc); 2376 rc.clear ();
1949 2377
1950 // go through all smoothlevels, lowest to highest, then draw. 2378 // go through all smoothlevels, lowest to highest, then draw.
1951 // this is basically counting sort 2379 // this is basically counting sort
1952 { 2380 {
1953 int w, b; 2381 int w, b;
1954 2382
1955 glEnable (GL_TEXTURE_2D); 2383 glEnable (GL_TEXTURE_2D);
1956 glBegin (GL_QUADS); 2384 glBegin (GL_QUADS);
1957 for (w = 0; w < 256 / 32; ++w) 2385 for (int level = 0; level < smooth_level.size (); ++level)
2386 if (smooth_level[level])
2387 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1958 { 2388 {
1959 uint32_t smask = smooth_level [w]; 2389 smooth_key &skey = it->first;
1960 if (smask) 2390 IV bits = it->second;
1961 for (b = 0; b < 32; ++b) 2391
1962 if (smask & (((uint32_t)1) << b)) 2392 if (!(bits & 0x1000)
2393 && skey.level == level
2394 && level > smooth_max [skey.x][skey.y])
1963 { 2395 {
1964 int level = (w << 5) | b; 2396 maptex tex = self->tex [skey.tile];
2397 int px = (((int)skey.x) - 1) * Tw;
2398 int py = (((int)skey.y) - 1) * Th;
2399 int border = bits & 15;
2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2401 float dx = tex.s * .0625f; // 16 images/row
2402 float dy = tex.t * .5f ; // 2 images/column
2403
1965 HE *he; 2404 if (tex.name)
1966
1967 hv_iterinit (smooth);
1968 while ((he = hv_iternext (smooth)))
1969 { 2405 {
1970 smooth_key *skey = (smooth_key *)HeKEY (he); 2406 // this time avoiding texture state changes
1971 IV bits = SvIVX (HeVAL (he)); 2407 // save gobs of state changes.
1972 2408 if (key.texname != tex.name)
1973 if (!(bits & 0x1000)
1974 && skey->level == level
1975 && level > smooth_max [skey->x][skey->y])
1976 { 2409 {
1977 maptex tex = self->tex [skey->tile]; 2410 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 2411
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 (); 2412 glEnd ();
1992 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1993 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
1994 } 2415 }
1995 2416
1996 if (border) 2417 if (border)
1997 { 2418 {
1998 float ox = border * dx; 2419 float ox = border * dx;
1999 2420
2000 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2001 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2002 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2003 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2004 } 2425 }
2005 2426
2006 if (corner) 2427 if (corner)
2007 { 2428 {
2008 float ox = corner * dx; 2429 float ox = corner * dx;
2009 2430
2010 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2011 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2012 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2013 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2014 }
2015 }
2016 } 2435 }
2017 } 2436 }
2018 } 2437 }
2019 } 2438 }
2020 2439
2021 glEnd (); 2440 glEnd ();
2022 glDisable (GL_TEXTURE_2D); 2441 glDisable (GL_TEXTURE_2D);
2023 key.texname = -1; 2442 key.texname = -1;
2024 } 2443 }
2025
2026 hv_clear (smooth);
2027 } 2444 }
2028 2445
2446 if (pl_tex.name)
2447 {
2448 maptex tex = pl_tex;
2449 int px = pl_x + sdx;
2450 int py = pl_y + sdy;
2451
2452 key.texname = tex.name;
2453 rc_t::array_t &arr = rc.array (key);
2454
2455 arr.t2f_v3f (0 , 0 , px , py , 0);
2456 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2457 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2458 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2459
2460 rc.draw ();
2461 }
2462
2463 rc_ov.draw ();
2464 rc_ov.clear ();
2465
2029 glDisable (GL_BLEND); 2466 glDisable (GL_BLEND);
2030 rc_free (rc);
2031 2467
2032 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2033 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2034 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2035 { 2471 {
… …
2038 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
2039 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
2040 { 2476 {
2041 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2042 2478
2043 int px = x * T; 2479 int px = x * Tw;
2044 int py = y * T; 2480 int py = y * Th;
2481
2482 if (ecb_expect_false (cell->player == player))
2483 {
2484 px += sdx;
2485 py += sdy;
2486 }
2045 2487
2046 if (cell->stat_hp) 2488 if (cell->stat_hp)
2047 { 2489 {
2048 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
2049 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2050 2492
2051 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
2052 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
2053 px + width - 1, py); 2495 px + width - 1, py);
2054 2496
… …
2060 } 2502 }
2061 } 2503 }
2062} 2504}
2063 2505
2064void 2506void
2065draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2507draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2066 CODE: 2508 CODE:
2067{ 2509{
2068 static float color[16][3] = { 2510 static float color[16][3] = {
2069 { 0.00F, 0.00F, 0.00F }, 2511 { 0.00f, 0.00f, 0.00f },
2070 { 1.00F, 1.00F, 1.00F }, 2512 { 1.00f, 1.00f, 1.00f },
2071 { 0.00F, 0.00F, 0.55F }, 2513 { 0.00f, 0.00f, 0.55f },
2072 { 1.00F, 0.00F, 0.00F }, 2514 { 1.00f, 0.00f, 0.00f },
2073 2515
2074 { 1.00F, 0.54F, 0.00F }, 2516 { 1.00f, 0.54f, 0.00f },
2075 { 0.11F, 0.56F, 1.00F }, 2517 { 0.11f, 0.56f, 1.00f },
2076 { 0.93F, 0.46F, 0.00F }, 2518 { 0.93f, 0.46f, 0.00f },
2077 { 0.18F, 0.54F, 0.34F }, 2519 { 0.18f, 0.54f, 0.34f },
2078 2520
2079 { 0.56F, 0.73F, 0.56F }, 2521 { 0.56f, 0.73f, 0.56f },
2080 { 0.80F, 0.80F, 0.80F }, 2522 { 0.80f, 0.80f, 0.80f },
2081 { 0.55F, 0.41F, 0.13F }, 2523 { 0.55f, 0.41f, 0.13f },
2082 { 0.99F, 0.77F, 0.26F }, 2524 { 0.99f, 0.77f, 0.26f },
2083 2525
2084 { 0.74F, 0.65F, 0.41F }, 2526 { 0.74f, 0.65f, 0.41f },
2085 2527
2086 { 0.00F, 1.00F, 1.00F }, 2528 { 0.00f, 1.00f, 1.00f },
2087 { 1.00F, 0.00F, 1.00F }, 2529 { 1.00f, 0.00f, 1.00f },
2088 { 1.00F, 1.00F, 0.00F }, 2530 { 1.00f, 1.00f, 0.00f },
2089 }; 2531 };
2090 2532
2091 int x, y; 2533 int x, y;
2092 2534
2093 glEnable (GL_TEXTURE_2D); 2535 glEnable (GL_TEXTURE_2D);
2536 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2537 * but the nvidia driver (185.18.14) mishandles alpha textures
2538 * and takes the colour from god knows where instead of using
2539 * Cp. MODULATE results in the same colour, but slightly different
2540 * alpha, but atcually gives us the correct colour with nvidia.
2541 */
2094 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2542 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2095 glEnable (GL_BLEND); 2543 glEnable (GL_BLEND);
2096 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2544 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2097 glBegin (GL_QUADS); 2545 glBegin (GL_QUADS);
2098 2546
2099 for (y = 0; y < h; y++) 2547 for (y = 0; y < h; y++)
… …
2103 2551
2104 if (m) 2552 if (m)
2105 { 2553 {
2106 float *c = color [m & 15]; 2554 float *c = color [m & 15];
2107 2555
2108 float tx1 = m & 0x40 ? 0.5 : 0.; 2556 float tx1 = m & 0x40 ? 0.5f : 0.f;
2109 float tx2 = tx1 + 0.5; 2557 float tx2 = tx1 + 0.5f;
2110 2558
2111 glColor4f (c[0], c[1], c[2], 0.75); 2559 glColor4f (c[0], c[1], c[2], 1);
2112 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2560 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2113 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2561 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2114 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2562 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2115 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2563 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2116 } 2564 }
… …
2124void 2572void
2125fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2573fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2126 PPCODE: 2574 PPCODE:
2127{ 2575{
2128 int x, y; 2576 int x, y;
2129 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2130 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2131 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2132 int sw34 = (sw * 3 + 3) & ~3; 2580 int sw3 = sw * 3;
2581 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2582 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2133 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2134 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2584 memset (darkness1, 0, sw1*sh1);
2135 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2136 2585
2137 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2138 SvCUR_set (darkness3_sv, sw34 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2139 2588
2140 mx += self->x - 1; 2589 mx += self->x - 1;
2141 my += self->y - 1; 2590 my += self->y - 1;
2142
2143 memset (darkness1, 255, sw1 * sh1);
2144 2591
2145 for (y = 0; y < sh1; y++) 2592 for (y = 0; y < sh1; y++)
2146 if (0 <= y + my && y + my < self->rows) 2593 if (0 <= y + my && y + my < self->rows)
2147 { 2594 {
2148 maprow *row = self->row + (y + my); 2595 maprow *row = self->row + (y + my);
… …
2151 if (row->c0 <= x + mx && x + mx < row->c1) 2598 if (row->c0 <= x + mx && x + mx < row->c1)
2152 { 2599 {
2153 mapcell *cell = row->col + (x + mx - row->c0); 2600 mapcell *cell = row->col + (x + mx - row->c0);
2154 2601
2155 darkness1 [y * sw1 + x] = cell->darkness 2602 darkness1 [y * sw1 + x] = cell->darkness
2156 ? 255 - (cell->darkness - 1) 2603 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2157 : 255 - FOW_DARKNESS; 2604 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2158 } 2605 }
2159 } 2606 }
2160 2607
2161 for (y = 0; y < sh; ++y) 2608 for (y = 0; y < sh; ++y)
2162 for (x = 0; x < sw; ++x) 2609 for (x = 0; x < sw; ++x)
… …
2181 2628
2182 uint8_t r13 = (d13 + d23 + d12) / 3; 2629 uint8_t r13 = (d13 + d23 + d12) / 3;
2183 uint8_t r23 = d23; 2630 uint8_t r23 = d23;
2184 uint8_t r33 = (d23 + d33 + d32) / 3; 2631 uint8_t r33 = (d23 + d33 + d32) / 3;
2185 2632
2186 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2633 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2187 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2188 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2189 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2636 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2190 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2637 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); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2192 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2639 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2193 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2194 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2195 } 2642 }
2196 2643
2197 free (darkness1); 2644 free (darkness1);
2198 2645
2199 EXTEND (SP, 3); 2646 EXTEND (SP, 3);
2200 PUSHs (sv_2mortal (newSViv (sw34))); 2647 PUSHs (sv_2mortal (newSViv (sw3)));
2201 PUSHs (sv_2mortal (newSViv (sh3))); 2648 PUSHs (sv_2mortal (newSViv (sh3)));
2202 PUSHs (darkness3_sv); 2649 PUSHs (darkness3_sv);
2203} 2650}
2204 2651
2205SV * 2652SV *
… …
2268 else 2715 else
2269 *data++ = 0; 2716 *data++ = 0;
2270 } 2717 }
2271 } 2718 }
2272 2719
2720 /* if size is w*h + 5 then no data has been found */
2721 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2722 {
2273 SvPOK_only (data_sv); 2723 SvPOK_only (data_sv);
2274 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2725 }
2726
2275 RETVAL = data_sv; 2727 RETVAL = data_sv;
2276} 2728}
2277 OUTPUT: 2729 OUTPUT:
2278 RETVAL 2730 RETVAL
2279 2731
2280void 2732void
2281set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2733set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2282 PPCODE: 2734 PPCODE:
2283{ 2735{
2284 int x, y, z; 2736 int x, y, z;
2285 int w, h; 2737 int w, h;
2286 int x1, y1; 2738 int x1, y1;
2739 STRLEN len;
2740 uint8_t *data, *end;
2741
2742 len = SvLEN (data_sv);
2743 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2744 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2745 end = data + len + 8;
2746
2747 if (len < 5)
2748 XSRETURN_EMPTY;
2287 2749
2288 if (*data++ != 0) 2750 if (*data++ != 0)
2289 XSRETURN_EMPTY; /* version mismatch */ 2751 XSRETURN_EMPTY; /* version mismatch */
2290 2752
2291 w = *data++ << 8; w |= *data++; 2753 w = *data++ << 8; w |= *data++;
… …
2306 { 2768 {
2307 maprow *row = map_get_row (self, y); 2769 maprow *row = map_get_row (self, y);
2308 2770
2309 for (x = x0; x < x1; x++) 2771 for (x = x0; x < x1; x++)
2310 { 2772 {
2773 uint8_t flags;
2774
2775 if (data + 7 >= end)
2776 XSRETURN_EMPTY;
2777
2311 uint8_t flags = *data++; 2778 flags = *data++;
2312 2779
2313 if (flags) 2780 if (flags)
2314 { 2781 {
2315 mapcell *cell = row_get_cell (row, x); 2782 mapcell *cell = row_get_cell (row, x);
2316 tileid tile[3] = { 0, 0, 0 }; 2783 tileid tile[3] = { 0, 0, 0 };
… …
2319 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2786 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2320 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2787 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2321 2788
2322 if (cell->darkness == 0) 2789 if (cell->darkness == 0)
2323 { 2790 {
2324 cell->darkness = 0; 2791 /*cell->darkness = 0;*/
2792 EXTEND (SP, 3);
2325 2793
2326 for (z = 0; z <= 2; z++) 2794 for (z = 0; z <= 2; z++)
2327 { 2795 {
2328 tileid t = tile [z]; 2796 tileid t = tile [z];
2329 2797
2330 if (t >= self->texs || (t && !self->tex [t].name)) 2798 if (t >= self->texs || (t && !self->tex [t].name))
2331 { 2799 {
2332 XPUSHs (sv_2mortal (newSViv (t))); 2800 PUSHs (sv_2mortal (newSViv (t)));
2333 need_texid (self, t); 2801 need_texid (self, t);
2334 } 2802 }
2335 2803
2336 cell->tile [z] = t; 2804 cell->tile [z] = t;
2337 } 2805 }
… …
2342} 2810}
2343 2811
2344MODULE = Deliantra::Client PACKAGE = DC::RW 2812MODULE = Deliantra::Client PACKAGE = DC::RW
2345 2813
2346DC::RW 2814DC::RW
2347new (SV *class, SV *data_sv) 2815new (SV *klass, SV *data_sv)
2348 CODE: 2816 CODE:
2349{ 2817{
2350 STRLEN datalen; 2818 STRLEN datalen;
2351 char *data = SvPVbyte (data_sv, datalen); 2819 char *data = SvPVbyte (data_sv, datalen);
2352 2820
… …
2354} 2822}
2355 OUTPUT: 2823 OUTPUT:
2356 RETVAL 2824 RETVAL
2357 2825
2358DC::RW 2826DC::RW
2359new_from_file (SV *class, const char *path, const char *mode = "rb") 2827new_from_file (SV *klass, const char *path, const char *mode = "rb")
2360 CODE: 2828 CODE:
2361 RETVAL = SDL_RWFromFile (path, mode); 2829 RETVAL = SDL_RWFromFile (path, mode);
2362 OUTPUT: 2830 OUTPUT:
2363 RETVAL 2831 RETVAL
2364 2832
… …
2382 if (RETVAL < 0) 2850 if (RETVAL < 0)
2383 { 2851 {
2384 RETVAL = Mix_GroupOldest (-1); 2852 RETVAL = Mix_GroupOldest (-1);
2385 2853
2386 if (RETVAL < 0) 2854 if (RETVAL < 0)
2855 {
2856 // happens sometimes, maybe it just stopped playing(?)
2857 RETVAL = Mix_GroupAvailable (-1);
2858
2859 if (RETVAL < 0)
2387 XSRETURN_UNDEF; 2860 XSRETURN_UNDEF;
2388 2861 }
2862 else
2389 Mix_HaltChannel (RETVAL); 2863 Mix_HaltChannel (RETVAL);
2390 } 2864 }
2391 2865
2392 Mix_UnregisterAllEffects (RETVAL); 2866 Mix_UnregisterAllEffects (RETVAL);
2393 Mix_Volume (RETVAL, 128); 2867 Mix_Volume (RETVAL, 128);
2394} 2868}
… …
2441void 2915void
2442set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2916set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2443 CODE: 2917 CODE:
2444{ 2918{
2445 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2919 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); 2920 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2447 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2921 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2448} 2922}
2449 2923
2450void 2924void
2451set_reverse_stereo (DC::Channel self, int flip) 2925set_reverse_stereo (DC::Channel self, int flip)
… …
2454 2928
2455MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2456 2930
2457PROTOTYPES: DISABLE 2931PROTOTYPES: DISABLE
2458 2932
2933void
2934decoders ()
2935 PPCODE:
2936#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2937 int i, num = Mix_GetNumChunkDecoders ();
2938 EXTEND (SP, num);
2939 for (i = 0; i < num; ++i)
2940 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2941#else
2942 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2943#endif
2944
2459DC::MixChunk 2945DC::MixChunk
2460new (SV *class, DC::RW rwops) 2946new (SV *klass, DC::RW rwops)
2461 CODE: 2947 CODE:
2462 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2463 OUTPUT: 2949 OUTPUT:
2464 RETVAL 2950 RETVAL
2465 2951
… …
2495 OUTPUT: 2981 OUTPUT:
2496 RETVAL 2982 RETVAL
2497 2983
2498MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2984MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2499 2985
2986void
2987decoders ()
2988 PPCODE:
2989#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2990 int i, num = Mix_GetNumMusicDecoders ();
2991 EXTEND (SP, num);
2992 for (i = 0; i < num; ++i)
2993 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2994#else
2995 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2996#endif
2997
2500int 2998int
2501volume (int volume = -1) 2999volume (int volume = -1)
2502 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2503 CODE: 3001 CODE:
2504 if (items > 0) 3002 if (items > 0)
… …
2515void 3013void
2516halt () 3014halt ()
2517 CODE: 3015 CODE:
2518 Mix_HaltMusic (); 3016 Mix_HaltMusic ();
2519 3017
3018int
3019playing ()
3020 CODE:
3021 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT:
3023 RETVAL
3024
2520DC::MixMusic 3025DC::MixMusic
2521new (SV *class, DC::RW rwops) 3026new (SV *klass, DC::RW rwops)
2522 CODE: 3027 CODE:
2523 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
2524 OUTPUT: 3029 OUTPUT:
2525 RETVAL 3030 RETVAL
2526 3031
… …
2554 } *civ, const_iv[] = { 3059 } *civ, const_iv[] = {
2555# define const_iv(name) { # name, (IV)name } 3060# define const_iv(name) { # name, (IV)name }
2556 const_iv (GL_VENDOR), 3061 const_iv (GL_VENDOR),
2557 const_iv (GL_VERSION), 3062 const_iv (GL_VERSION),
2558 const_iv (GL_EXTENSIONS), 3063 const_iv (GL_EXTENSIONS),
3064 const_iv (GL_MAX_TEXTURE_UNITS),
2559 const_iv (GL_COLOR_MATERIAL), 3065 const_iv (GL_COLOR_MATERIAL),
2560 const_iv (GL_SMOOTH), 3066 const_iv (GL_SMOOTH),
2561 const_iv (GL_FLAT), 3067 const_iv (GL_FLAT),
2562 const_iv (GL_DITHER), 3068 const_iv (GL_DITHER),
2563 const_iv (GL_BLEND), 3069 const_iv (GL_BLEND),
… …
2575 const_iv (GL_ZERO), 3081 const_iv (GL_ZERO),
2576 const_iv (GL_SRC_ALPHA), 3082 const_iv (GL_SRC_ALPHA),
2577 const_iv (GL_DST_ALPHA), 3083 const_iv (GL_DST_ALPHA),
2578 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3084 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2579 const_iv (GL_ONE_MINUS_DST_ALPHA), 3085 const_iv (GL_ONE_MINUS_DST_ALPHA),
3086 const_iv (GL_SRC_COLOR),
3087 const_iv (GL_DST_COLOR),
3088 const_iv (GL_ONE_MINUS_SRC_COLOR),
3089 const_iv (GL_ONE_MINUS_DST_COLOR),
2580 const_iv (GL_SRC_ALPHA_SATURATE), 3090 const_iv (GL_SRC_ALPHA_SATURATE),
2581 const_iv (GL_RGB), 3091 const_iv (GL_RGB),
2582 const_iv (GL_RGBA), 3092 const_iv (GL_RGBA),
2583 const_iv (GL_RGBA4), 3093 const_iv (GL_RGBA4),
2584 const_iv (GL_RGBA8), 3094 const_iv (GL_RGBA8),
… …
2652 const_iv (GL_NICEST), 3162 const_iv (GL_NICEST),
2653 const_iv (GL_V2F), 3163 const_iv (GL_V2F),
2654 const_iv (GL_V3F), 3164 const_iv (GL_V3F),
2655 const_iv (GL_T2F_V3F), 3165 const_iv (GL_T2F_V3F),
2656 const_iv (GL_T2F_N3F_V3F), 3166 const_iv (GL_T2F_N3F_V3F),
3167 const_iv (GL_FUNC_ADD),
3168 const_iv (GL_FUNC_SUBTRACT),
3169 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2657# undef const_iv 3170# undef const_iv
2658 }; 3171 };
2659 3172
2660 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3173 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2661 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2662 3175
2663 texture_av = newAV (); 3176 texture_av = newAV ();
2664 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
2665} 3178}
2666 3179
… …
2668disable_GL_EXT_blend_func_separate () 3181disable_GL_EXT_blend_func_separate ()
2669 CODE: 3182 CODE:
2670 gl.BlendFuncSeparate = 0; 3183 gl.BlendFuncSeparate = 0;
2671 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
2672 3185
2673char * 3186void
3187apple_nvidia_bug (int enable)
3188
3189const char *
2674gl_vendor () 3190gl_vendor ()
2675 CODE: 3191 CODE:
2676 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (const char *)glGetString (GL_VENDOR);
2677 OUTPUT: 3193 OUTPUT:
2678 RETVAL 3194 RETVAL
2679 3195
2680char * 3196const char *
2681gl_version () 3197gl_version ()
2682 CODE: 3198 CODE:
2683 RETVAL = (char *)glGetString (GL_VERSION); 3199 RETVAL = (const char *)glGetString (GL_VERSION);
2684 OUTPUT: 3200 OUTPUT:
2685 RETVAL 3201 RETVAL
2686 3202
2687char * 3203const char *
2688gl_extensions () 3204gl_extensions ()
2689 CODE: 3205 CODE:
2690 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3206 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2691 OUTPUT: 3207 OUTPUT:
2692 RETVAL 3208 RETVAL
2693 3209
2694const char *glGetString (GLenum pname) 3210const char *glGetString (GLenum pname)
3211 CODE:
3212 RETVAL = (const char *)glGetString (pname);
3213 OUTPUT:
3214 RETVAL
2695 3215
2696GLint glGetInteger (GLenum pname) 3216GLint glGetInteger (GLenum pname)
2697 CODE: 3217 CODE:
2698 glGetIntegerv (pname, &RETVAL); 3218 glGetIntegerv (pname, &RETVAL);
2699 OUTPUT: 3219 OUTPUT:
… …
2707 3227
2708int glGetError () 3228int glGetError ()
2709 3229
2710void glFinish () 3230void glFinish ()
2711 3231
3232void glFlush ()
3233
2712void glClear (int mask) 3234void glClear (int mask)
2713 3235
2714void glClearColor (float r, float g, float b, float a = 1.0) 3236void glClearColor (float r, float g, float b, float a = 1.0)
2715 PROTOTYPE: @ 3237 PROTOTYPE: @
2716 3238
… …
2725void glBlendFunc (int sfactor, int dfactor) 3247void glBlendFunc (int sfactor, int dfactor)
2726 3248
2727void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3249void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2728 CODE: 3250 CODE:
2729 gl_BlendFuncSeparate (sa, da, saa, daa); 3251 gl_BlendFuncSeparate (sa, da, saa, daa);
3252
3253# void glBlendEquation (int se)
2730 3254
2731void glDepthMask (int flag) 3255void glDepthMask (int flag)
2732 3256
2733void glLogicOp (int opcode) 3257void glLogicOp (int opcode)
2734 3258
… …
2769void glRotate (float angle, float x, float y, float z) 3293void glRotate (float angle, float x, float y, float z)
2770 CODE: 3294 CODE:
2771 glRotatef (angle, x, y, z); 3295 glRotatef (angle, x, y, z);
2772 3296
2773void glColor (float r, float g, float b, float a = 1.0) 3297void glColor (float r, float g, float b, float a = 1.0)
3298 PROTOTYPE: @
2774 ALIAS: 3299 ALIAS:
2775 glColor_premultiply = 1 3300 glColor_premultiply = 1
2776 CODE: 3301 CODE:
2777 if (ix) 3302 if (ix)
2778 { 3303 {
… …
2884 3409
2885void glEndList () 3410void glEndList ()
2886 3411
2887void glCallList (int list) 3412void glCallList (int list)
2888 3413
3414void c_init ()
3415 CODE:
3416 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3417 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3418
2889MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3419MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2890 3420
2891PROTOTYPES: DISABLE 3421PROTOTYPES: DISABLE
2892 3422
2893void 3423void
2894find_widget (SV *self, NV x, NV y) 3424find_widget (SV *self, NV x, NV y)
2895 PPCODE: 3425 PPCODE:
2896{ 3426{
2897 if (within_widget (self, x, y)) 3427 if (within_widget (self, x, y))
2898 XPUSHs (self); 3428 XPUSHs (self);
2899} 3429}
2900 3430
2901BOOT: 3431BOOT:
2902{ 3432{
… …
2910 3440
2911void 3441void
2912draw (SV *self) 3442draw (SV *self)
2913 CODE: 3443 CODE:
2914{ 3444{
2915 HV *hv; 3445 HV *hv;
2916 SV **svp; 3446 SV **svp;
2917 NV x, y, w, h; 3447 NV x, y, w, h;
2918 SV *draw_x_sv = GvSV (draw_x_gv); 3448 SV *draw_x_sv = GvSV (draw_x_gv);
2919 SV *draw_y_sv = GvSV (draw_y_gv); 3449 SV *draw_y_sv = GvSV (draw_y_gv);
2920 SV *draw_w_sv = GvSV (draw_w_gv); 3450 SV *draw_w_sv = GvSV (draw_w_gv);
2921 SV *draw_h_sv = GvSV (draw_h_gv); 3451 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines