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.247 by root, Fri Dec 28 15:06:08 2007 UTC vs.
Revision 1.334 by root, Mon Nov 19 01:37:28 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines