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.255 by root, Sun Jan 6 18:25:59 2008 UTC vs.
Revision 1.335 by root, Mon Nov 19 01:56:11 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines