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.257 by root, Mon Mar 24 01:15:21 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{
680 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 901 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 902 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif 903#endif
683} 904}
684 905
685char *
686SDL_GetError () 906char *SDL_GetError ()
687 907
688int 908void SDL_main_hack (SV *real_main)
689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 909 PROTOTYPE: &
690 910
691void 911int SDL_Init (U32 flags)
912
913int SDL_InitSubSystem (U32 flags)
914
915void SDL_QuitSubSystem (U32 flags)
916
692SDL_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
693 928
694void 929void
695SDL_ListModes (int rgb, int alpha) 930SDL_ListModes (int rgb, int alpha)
696 PPCODE: 931 PPCODE:
697{ 932{
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 944 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 945 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 946 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712 947
713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 948 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
714#if SDL_VERSION_ATLEAST(1,2,10)
715 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
716 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 949 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717#endif
718 950
719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 951 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
720 952
721 if (m && m != (SDL_Rect **)-1) 953 if (m && m != (SDL_Rect **)-1)
722 while (*m) 954 while (*m)
723 { 955 {
724 if ((*m)->w >= 800 && (*m)->h >= 480) 956 if ((*m)->w >= 400 && (*m)->h >= 300)
725 { 957 {
726 AV *av = newAV (); 958 AV *av = newAV ();
727 av_push (av, newSViv ((*m)->w)); 959 av_push (av, newSViv ((*m)->w));
728 av_push (av, newSViv ((*m)->h)); 960 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb)); 961 av_push (av, newSViv (rgb));
752 ); 984 );
753 985
754 if (RETVAL) 986 if (RETVAL)
755 { 987 {
756 av_clear (texture_av); 988 av_clear (texture_av);
757
758 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
759#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);
760#include "glfunc.h" 990#include "glfunc.h"
761#undef GL_FUNC 991#undef GL_FUNC
992 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
993 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
762 } 994 }
763} 995}
764 OUTPUT: 996 OUTPUT:
765 RETVAL 997 RETVAL
998
999void
1000SDL_WM_SetCaption (const char *title, const char *icon)
766 1001
767void 1002void
768SDL_GL_SwapBuffers () 1003SDL_GL_SwapBuffers ()
769 1004
770char * 1005char *
771SDL_GetKeyName (int sym) 1006SDL_GetKeyName (int sym)
1007 C_ARGS: (SDLKey)sym
772 1008
773int 1009int
774SDL_GetAppState () 1010SDL_GetAppState ()
775 1011
776int 1012int
777SDL_GetModState () 1013SDL_GetModState ()
778 1014
1015int
1016SDL_WaitEvent ()
1017 C_ARGS: 0
1018
779void 1019void
1020SDL_PumpEvents ()
1021
1022void
780poll_events () 1023peep_events ()
781 PPCODE: 1024 PPCODE:
782{ 1025{
783 SDL_Event ev; 1026 SDL_Event ev;
784 1027
785 SDL_PumpEvents (); 1028 SDL_PumpEvents ();
792 { 1035 {
793 case SDL_KEYDOWN: 1036 case SDL_KEYDOWN:
794 case SDL_KEYUP: 1037 case SDL_KEYUP:
795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1038 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1039 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
797 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);
798 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 */
799 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1042 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
800 break; 1043 break;
801 1044
802 case SDL_ACTIVEEVENT: 1045 case SDL_ACTIVEEVENT:
803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1046 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
821 x = ev.motion.x; 1064 x = ev.motion.x;
822 y = ev.motion.y; 1065 y = ev.motion.y;
823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1066 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
824 } 1067 }
825 1068
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1069 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
827 hv_store (hv, "state", 5, newSViv (state), 0); 1070 hv_store (hv, "state", 5, newSViv (state), 0);
828 hv_store (hv, "x", 1, newSViv (x), 0); 1071 hv_store (hv, "x", 1, newSViv (x), 0);
829 hv_store (hv, "y", 1, newSViv (y), 0); 1072 hv_store (hv, "y", 1, newSViv (y), 0);
830 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1073 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
831 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1074 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
851 1094
852 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))));
853 } 1096 }
854} 1097}
855 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
856int 1112int
857Mix_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)
858 POSTCALL: 1114 POSTCALL:
859 Mix_HookMusicFinished (music_finished); 1115 Mix_HookMusicFinished (music_finished);
860 Mix_ChannelFinished (channel_finished); 1116 Mix_ChannelFinished (channel_finished);
861 1117
862void 1118void
863Mix_QuerySpec () 1119Mix_QuerySpec ()
922add_font (char *file) 1178add_font (char *file)
923 CODE: 1179 CODE:
924 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1180 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
925 OUTPUT: 1181 OUTPUT:
926 RETVAL 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)
927 1190
928void 1191void
929load_image_inline (SV *image_) 1192load_image_inline (SV *image_)
930 ALIAS: 1193 ALIAS:
931 load_image_file = 1 1194 load_image_file = 1
977 1240
978 SDL_LockSurface (surface2); 1241 SDL_LockSurface (surface2);
979 EXTEND (SP, 6); 1242 EXTEND (SP, 6);
980 PUSHs (sv_2mortal (newSViv (surface2->w))); 1243 PUSHs (sv_2mortal (newSViv (surface2->w)));
981 PUSHs (sv_2mortal (newSViv (surface2->h))); 1244 PUSHs (sv_2mortal (newSViv (surface2->h)));
982 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1245 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
983 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)));
984 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1247 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
985 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1248 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
986 SDL_UnlockSurface (surface2); 1249 SDL_UnlockSurface (surface2);
987 1250
1047#if DEBUG 1310#if DEBUG
1048 VALGRIND_DO_LEAK_CHECK; 1311 VALGRIND_DO_LEAK_CHECK;
1049#endif 1312#endif
1050} 1313}
1051 1314
1315int
1316SvREFCNT (SV *sv)
1317 CODE:
1318 RETVAL = SvREFCNT (sv);
1319 OUTPUT:
1320 RETVAL
1321
1052MODULE = Deliantra::Client PACKAGE = DC::Font 1322MODULE = Deliantra::Client PACKAGE = DC::Font
1053 1323
1054PROTOTYPES: DISABLE 1324PROTOTYPES: DISABLE
1055 1325
1056DC::Font 1326DC::Font
1057new_from_file (SV *class, char *path, int id = 0) 1327new_from_file (SV *klass, char *path, int id = 0)
1058 CODE: 1328 CODE:
1059{ 1329{
1060 int count; 1330 int count;
1061 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1331 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1062 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1332 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1091 PROTOTYPE: 1361 PROTOTYPE:
1092 CODE: 1362 CODE:
1093 tc_restore (); 1363 tc_restore ();
1094 1364
1095DC::Layout 1365DC::Layout
1096new (SV *class) 1366new (SV *klass)
1097 CODE: 1367 CODE:
1098 New (0, RETVAL, 1, struct cf_layout); 1368 RETVAL = new cf_layout;
1099 1369
1100 RETVAL->pl = pango_layout_new (opengl_context); 1370 RETVAL->pl = pango_layout_new (opengl_context);
1101 RETVAL->r = 1.; 1371 RETVAL->r = 1.;
1102 RETVAL->g = 1.; 1372 RETVAL->g = 1.;
1103 RETVAL->b = 1.; 1373 RETVAL->b = 1.;
1104 RETVAL->a = 1.; 1374 RETVAL->a = 1.;
1105 RETVAL->base_height = MIN_FONT_HEIGHT; 1375 RETVAL->base_height = MIN_FONT_HEIGHT;
1106 RETVAL->font = 0; 1376 RETVAL->font = 0;
1107 RETVAL->rc = rc_alloc ();
1108 1377
1109 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1378 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1110 layout_update_font (RETVAL); 1379 layout_update_font (RETVAL);
1111 OUTPUT: 1380 OUTPUT:
1112 RETVAL 1381 RETVAL
1113 1382
1114void 1383void
1115DESTROY (DC::Layout self) 1384DESTROY (DC::Layout self)
1116 CODE: 1385 CODE:
1117 g_object_unref (self->pl); 1386 g_object_unref (self->pl);
1118 rc_free (self->rc);
1119 Safefree (self); 1387 delete self;
1120 1388
1121void 1389void
1122set_text (DC::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1123 CODE: 1391 CODE:
1124{ 1392{
1250 1518
1251void 1519void
1252set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1253 CODE: 1521 CODE:
1254 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1255 { 1523 {
1256 self->base_height = base_height; 1524 self->base_height = base_height;
1257 layout_update_font (self); 1525 layout_update_font (self);
1258 } 1526 }
1259 1527
1260void 1528void
1378} 1646}
1379 1647
1380void 1648void
1381render (DC::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1382 CODE: 1650 CODE:
1383 rc_clear (self->rc); 1651 self->rc.clear ();
1384 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1385 self->pl, 1653 self->pl,
1386 self->rc, 1654 &self->rc,
1387 x * PANGO_SCALE, y * PANGO_SCALE, 1655 x * PANGO_SCALE, y * PANGO_SCALE,
1388 self->r, self->g, self->b, self->a, 1656 self->r, self->g, self->b, self->a,
1389 flags 1657 flags
1390 ); 1658 );
1391 // we assume that context_change actually clears/frees stuff 1659 // we assume that context_change actually clears/frees stuff
1402 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1670 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1403 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1671 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1404 glEnable (GL_ALPHA_TEST); 1672 glEnable (GL_ALPHA_TEST);
1405 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1673 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1406 1674
1407 rc_draw (self->rc); 1675 self->rc.draw ();
1408 1676
1409 glDisable (GL_ALPHA_TEST); 1677 glDisable (GL_ALPHA_TEST);
1410 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1411 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1412} 1680}
1487 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1488 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1489 } 1757 }
1490} 1758}
1491 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
1492IV 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)
1493 CODE: 1882 CODE:
1494{ 1883{
1495 GLint width; 1884 GLint width;
1496 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);
1503MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1504 1893
1505PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1506 1895
1507DC::Map 1896DC::Map
1508new (SV *class) 1897new (SV *klass)
1509 CODE: 1898 CODE:
1510 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, mapgrid);
1511 RETVAL->x = 0; 1900 RETVAL->x = 0;
1512 RETVAL->y = 0; 1901 RETVAL->y = 0;
1513 RETVAL->w = 0; 1902 RETVAL->w = 0;
1514 RETVAL->h = 0; 1903 RETVAL->h = 0;
1515 RETVAL->ox = 0; 1904 RETVAL->ox = 0;
1552 1941
1553void 1942void
1554set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1555 CODE: 1944 CODE:
1556{ 1945{
1557 tileid texid; 1946 tileid texid;
1558 maptex *tex; 1947 maptex *tex;
1559 1948
1560 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1561 return; 1950 return;
1562 1951
1563 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1564 return; 1953 return;
1565 1954
1566 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1567 1956
1568 if (!texid) 1957 if (!texid)
1569 return; 1958 return;
1570 1959
1571 tex = self->tex + texid; 1960 tex = self->tex + texid;
1600 //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);
1601 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1602 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1604} 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 }
1605 2014
1606int 2015int
1607ox (DC::Map self) 2016ox (DC::Map self)
1608 ALIAS: 2017 ALIAS:
1609 oy = 1 2018 oy = 1
1641 self->ox += dx; self->x += dx; 2050 self->ox += dx; self->x += dx;
1642 self->oy += dy; self->y += dy; 2051 self->oy += dy; self->y += dy;
1643 2052
1644 while (self->y < 0) 2053 while (self->y < 0)
1645 { 2054 {
1646 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2055 prepend (self->row, self->rows, MAP_EXTEND_Y);
1647 2056
1648 self->rows += MAP_EXTEND_Y; 2057 self->rows += MAP_EXTEND_Y;
1649 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1650 } 2059 }
1651} 2060}
1652 2061
1653SV * 2062SV *
1654map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1655 CODE: 2064 CODE:
1656{ 2065{
1657 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1658 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1659 mapcell *cell; 2068 mapcell *cell;
1680 2089
1681 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1682 2091
1683 if (flags & 8) 2092 if (flags & 8)
1684 { 2093 {
2094 uint8_t ext, cmd;
2095
1685 if (extmap) 2096 do
1686 { 2097 {
1687 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1688 2100
1689 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
1690 { 2104 {
1691 ext = *data++;
1692 cmd = ext & 0x3f;
1693
1694 if (cmd < 4)
1695 cell->darkness = 255 - ext * 64 + 1;
1696 else if (cmd == 5) // health
1697 {
1698 cell->stat_width = 1; 2105 cell->stat_width = 1;
1699 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1700 }
1701 else if (cmd == 6) // monster width
1702 cell->stat_width = *data++ + 1;
1703 else if (cmd == 0x47)
1704 {
1705 if (*data == 4)
1706 ; // decode player count
1707
1708 data += *data + 1;
1709 }
1710 else if (cmd == 8) // cell flags
1711 cell->flags = *data++;
1712 else if (ext & 0x40) // unknown, multibyte => skip
1713 data += *data + 1;
1714 else
1715 data++;
1716 } 2107 }
1717 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++;
1718 } 2125 }
1719 else 2126 while (ext & 0x80);
1720 cell->darkness = *data++ + 1;
1721 } 2127 }
1722 2128
1723 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1724 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1725 { 2131 {
1728 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1729 2135
1730 if (cell->tile [z]) 2136 if (cell->tile [z])
1731 { 2137 {
1732 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1733 if (!tex->name) 2140 if (!tex->name)
1734 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1735 2142
1736 if (tex->smoothtile) 2143 if (tex->smoothtile)
1737 { 2144 {
1738 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1739 if (!smooth->name) 2147 if (!smooth->name)
1740 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1741 } 2149 }
1742 } 2150 }
1743 } 2151 }
1744 } 2152 }
1745 else 2153 else
1746 cell->darkness = 0; 2154 CELL_CLEAR (cell);
1747 } 2155 }
1748} 2156}
1749 OUTPUT: 2157 OUTPUT:
1750 RETVAL 2158 RETVAL
1751 2159
1771 ? self->row + y 2179 ? self->row + y
1772 : 0; 2180 : 0;
1773 2181
1774 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1775 { 2183 {
1776 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1777 2185
1778 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1779 { 2187 {
1780 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1781 2189
1783 { 2191 {
1784 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1785 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1786 int a1 = tex.a; 2194 int a1 = tex.a;
1787 2195
1788 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1789 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1790 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1791 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1792 } 2200 }
1793 } 2201 }
1794 2202
1795 *map++ = (r ) 2203 *map++ = (r )
1796 | (g << 8) 2204 | (g << 8)
1797 | (b << 16) 2205 | (b << 16)
1798 | (a << 24); 2206 | (a << 24);
1799 } 2207 }
1800 } 2208 }
1801 2209
1802 RETVAL = map_sv; 2210 RETVAL = map_sv;
1803} 2211}
1804 OUTPUT: 2212 OUTPUT:
1805 RETVAL 2213 RETVAL
1806 2214
1807void 2215void
1808draw (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)
1809 CODE: 2217 CODE:
1810{ 2218{
1811 int x, y, z; 2219 int x, y, z;
1812 2220
1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1815 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!
1816 smooth_key skey; 2222 int pl_x, pl_y;
1817 2223 maptex pl_tex;
1818 rc_t *rc = rc_alloc (); 2224 rc_t rc;
2225 rc_t rc_ov;
1819 rc_key_t key; 2226 rc_key_t key;
1820 rc_array_t *arr; 2227 rc_t::array_t *arr;
1821 2228
2229 pl_tex.name = 0;
2230
1822 // thats current max. sorry. 2231 // that's current max. sorry.
1823 if (sw > 255) sw = 255; 2232 if (sw > 255) sw = 255;
1824 if (sh > 255) sh = 255; 2233 if (sh > 255) sh = 255;
1825
1826 // clear key, in case of extra padding
1827 memset (&skey, 0, sizeof (skey));
1828 2234
1829 memset (&key, 0, sizeof (key)); 2235 memset (&key, 0, sizeof (key));
1830 key.r = 255; 2236 key.r = 255;
1831 key.g = 255; 2237 key.g = 255;
1832 key.b = 255; 2238 key.b = 255;
1833 key.a = 255; 2239 key.a = 255;
1834 key.mode = GL_QUADS; 2240 key.mode = GL_QUADS;
1835 key.format = GL_T2F_V3F; 2241 key.format = GL_T2F_V3F;
1836 key.texname = -1;
1837 2242
1838 mx += self->x; 2243 mx += self->x;
1839 my += self->y; 2244 my += self->y;
1840 2245
1841 // first pass: determine smooth_max 2246 // first pass: determine smooth_max
1842 // rather ugly, if you ask me 2247 // rather ugly, if you ask me
1843 // could also be stored inside mapcell and updated on change 2248 // could also be stored inside mapcell and updated on change
1844 memset (smooth_max, 0, sizeof (smooth_max)); 2249 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1845 2250
1846 for (y = 0; y < sh; y++) 2251 for (y = 0; y < sh; y++)
1847 if (0 <= y + my && y + my < self->rows) 2252 if (0 <= y + my && y + my < self->rows)
1848 { 2253 {
1849 maprow *row = self->row + (y + my); 2254 maprow *row = self->row + (y + my);
1864 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2269 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1865 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2270 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1866 2271
1867 for (z = 0; z <= 2; z++) 2272 for (z = 0; z <= 2; z++)
1868 { 2273 {
1869 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;
1870 2278
1871 for (y = 0; y < sh; y++) 2279 for (y = 0; y < sh; y++)
1872 if (0 <= y + my && y + my < self->rows) 2280 if (0 <= y + my && y + my < self->rows)
1873 { 2281 {
1874 maprow *row = self->row + (y + my); 2282 maprow *row = self->row + (y + my);
1884 maptex tex = self->tex [tile]; 2292 maptex tex = self->tex [tile];
1885 int px, py; 2293 int px, py;
1886 2294
1887 if (key.texname != tex.name) 2295 if (key.texname != tex.name)
1888 { 2296 {
2297 self->tex [tile].unused = 0;
2298
1889 if (!tex.name) 2299 if (!tex.name)
1890 tex = self->tex [2]; /* missing, replace by noface */ 2300 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1891 2301
1892 key.texname = tex.name; 2302 key.texname = tex.name;
1893 arr = rc_array (rc, &key); 2303 arr = &rc.array (key);
1894 } 2304 }
1895 2305
1896 px = (x + 1) * T - tex.w; 2306 px = (x + 1) * Th - tex.w;
1897 py = (y + 1) * T - tex.h; 2307 py = (y + 1) * Tw - tex.h;
1898 2308
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2309 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1901 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1902 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1903
1904 if (cell->flags && z == 2)
1905 { 2310 {
1906 // overlays such as the speech bubble, probably more to come 2311 pl_x = px;
1907 if (cell->flags & 1) 2312 pl_y = py;
2313 pl_tex = tex;
1908 { 2314 continue;
1909 maptex tex = self->tex [1];
1910 int px = x * T + T * 2 / 32;
1911 int py = y * T - T * 6 / 32;
1912
1913 if (tex.name)
1914 {
1915 if (key.texname != tex.name)
1916 {
1917 key.texname = tex.name;
1918 arr = rc_array (rc, &key);
1919 }
1920
1921 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1922 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1923 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1924 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1925 }
1926 }
1927 } 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);
1928 2321
1929 // update smooth hash 2322 // update smooth hash
1930 if (tex.smoothtile) 2323 if (tex.smoothtile)
1931 { 2324 {
1932 skey.tile = tex.smoothtile; 2325 skey.tile = tex.smoothtile;
1933 skey.level = tex.smoothlevel; 2326 skey.level = tex.smoothlevel;
1934 2327
1935 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2328 smooth_level[tex.smoothlevel] = 1;
1936 2329
1937 // 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
1938 // shifted +1|+1 so we always stay positive. 2331 // shifted +1|+1 so we always stay positive.
1939 2332
1940 // bits is ___n cccc CCCC bbbb 2333 // bits is ___n cccc CCCC bbbb
1948 2341
1949 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2342 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1950 // ·· ·· ·┏ ┓· 2343 // ·· ·· ·┏ ┓·
1951 2344
1952 // full tile 2345 // full tile
1953 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);
1954 2347
1955 // borders 2348 // borders
1956 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);
1957 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);
1958 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);
1959 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);
1960 2353
1961 // corners 2354 // corners
1962 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);
1963 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);
1964 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);
1965 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);
1966 } 2379 }
1967 } 2380 }
1968 } 2381 }
1969 } 2382 }
1970 2383
1971 rc_draw (rc); 2384 rc.draw ();
1972 rc_clear (rc); 2385 rc.clear ();
1973 2386
1974 // go through all smoothlevels, lowest to highest, then draw. 2387 // go through all smoothlevels, lowest to highest, then draw.
1975 // this is basically counting sort 2388 // this is basically counting sort
1976 { 2389 {
1977 int w, b; 2390 int w, b;
1978 2391
1979 glEnable (GL_TEXTURE_2D); 2392 glEnable (GL_TEXTURE_2D);
1980 glBegin (GL_QUADS); 2393 glBegin (GL_QUADS);
1981 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)
1982 { 2397 {
1983 uint32_t smask = smooth_level [w]; 2398 smooth_key &skey = it->first;
1984 if (smask) 2399 IV bits = it->second;
1985 for (b = 0; b < 32; ++b) 2400
1986 if (smask & (((uint32_t)1) << b)) 2401 if (!(bits & 0x1000)
2402 && skey.level == level
2403 && level > smooth_max [skey.x][skey.y])
1987 { 2404 {
1988 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
1989 HE *he; 2413 if (tex.name)
1990
1991 hv_iterinit (smooth);
1992 while ((he = hv_iternext (smooth)))
1993 { 2414 {
1994 smooth_key *skey = (smooth_key *)HeKEY (he); 2415 // this time avoiding texture state changes
1995 IV bits = SvIVX (HeVAL (he)); 2416 // save gobs of state changes.
1996 2417 if (key.texname != tex.name)
1997 if (!(bits & 0x1000)
1998 && skey->level == level
1999 && level > smooth_max [skey->x][skey->y])
2000 { 2418 {
2001 maptex tex = self->tex [skey->tile]; 2419 self->tex [skey.tile].unused = 0;
2002 int px = (((int)skey->x) - 1) * T;
2003 int py = (((int)skey->y) - 1) * T;
2004 int border = bits & 15;
2005 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2006 float dx = tex.s * .0625f; // 16 images/row
2007 float dy = tex.t * .5f ; // 2 images/column
2008 2420
2009 if (tex.name)
2010 {
2011 // this time avoiding texture state changes
2012 // save gobs of state changes.
2013 if (key.texname != tex.name)
2014 {
2015 glEnd (); 2421 glEnd ();
2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2422 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2017 glBegin (GL_QUADS); 2423 glBegin (GL_QUADS);
2018 } 2424 }
2019 2425
2020 if (border) 2426 if (border)
2021 { 2427 {
2022 float ox = border * dx; 2428 float ox = border * dx;
2023 2429
2024 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2025 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2026 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2027 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2028 } 2434 }
2029 2435
2030 if (corner) 2436 if (corner)
2031 { 2437 {
2032 float ox = corner * dx; 2438 float ox = corner * dx;
2033 2439
2034 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2035 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2441 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2036 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2442 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2037 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2443 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2038 }
2039 }
2040 } 2444 }
2041 } 2445 }
2042 } 2446 }
2043 } 2447 }
2044 2448
2045 glEnd (); 2449 glEnd ();
2046 glDisable (GL_TEXTURE_2D); 2450 glDisable (GL_TEXTURE_2D);
2047 key.texname = -1; 2451 key.texname = -1;
2048 } 2452 }
2049
2050 hv_clear (smooth);
2051 } 2453 }
2052 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
2053 glDisable (GL_BLEND); 2475 glDisable (GL_BLEND);
2054 rc_free (rc);
2055 2476
2056 // top layer: overlays such as the health bar 2477 // top layer: overlays such as the health bar
2057 for (y = 0; y < sh; y++) 2478 for (y = 0; y < sh; y++)
2058 if (0 <= y + my && y + my < self->rows) 2479 if (0 <= y + my && y + my < self->rows)
2059 { 2480 {
2062 for (x = 0; x < sw; x++) 2483 for (x = 0; x < sw; x++)
2063 if (row->c0 <= x + mx && x + mx < row->c1) 2484 if (row->c0 <= x + mx && x + mx < row->c1)
2064 { 2485 {
2065 mapcell *cell = row->col + (x + mx - row->c0); 2486 mapcell *cell = row->col + (x + mx - row->c0);
2066 2487
2067 int px = x * T; 2488 int px = x * Tw;
2068 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 }
2069 2496
2070 if (cell->stat_hp) 2497 if (cell->stat_hp)
2071 { 2498 {
2072 int width = cell->stat_width * T; 2499 int width = cell->stat_width * Tw;
2073 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2500 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2074 2501
2075 glColor3ub (0, 0, 0); 2502 glColor3ub (0, 0, 0);
2076 glRectf (px + 1, py - thick - 2, 2503 glRectf (px + 1, py - thick - 2,
2077 px + width - 1, py); 2504 px + width - 1, py);
2078 2505
2084 } 2511 }
2085 } 2512 }
2086} 2513}
2087 2514
2088void 2515void
2089draw_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)
2090 CODE: 2517 CODE:
2091{ 2518{
2092 static float color[16][3] = { 2519 static float color[16][3] = {
2093 { 0.00F, 0.00F, 0.00F }, 2520 { 0.00f, 0.00f, 0.00f },
2094 { 1.00F, 1.00F, 1.00F }, 2521 { 1.00f, 1.00f, 1.00f },
2095 { 0.00F, 0.00F, 0.55F }, 2522 { 0.00f, 0.00f, 0.55f },
2096 { 1.00F, 0.00F, 0.00F }, 2523 { 1.00f, 0.00f, 0.00f },
2097 2524
2098 { 1.00F, 0.54F, 0.00F }, 2525 { 1.00f, 0.54f, 0.00f },
2099 { 0.11F, 0.56F, 1.00F }, 2526 { 0.11f, 0.56f, 1.00f },
2100 { 0.93F, 0.46F, 0.00F }, 2527 { 0.93f, 0.46f, 0.00f },
2101 { 0.18F, 0.54F, 0.34F }, 2528 { 0.18f, 0.54f, 0.34f },
2102 2529
2103 { 0.56F, 0.73F, 0.56F }, 2530 { 0.56f, 0.73f, 0.56f },
2104 { 0.80F, 0.80F, 0.80F }, 2531 { 0.80f, 0.80f, 0.80f },
2105 { 0.55F, 0.41F, 0.13F }, 2532 { 0.55f, 0.41f, 0.13f },
2106 { 0.99F, 0.77F, 0.26F }, 2533 { 0.99f, 0.77f, 0.26f },
2107 2534
2108 { 0.74F, 0.65F, 0.41F }, 2535 { 0.74f, 0.65f, 0.41f },
2109 2536
2110 { 0.00F, 1.00F, 1.00F }, 2537 { 0.00f, 1.00f, 1.00f },
2111 { 1.00F, 0.00F, 1.00F }, 2538 { 1.00f, 0.00f, 1.00f },
2112 { 1.00F, 1.00F, 0.00F }, 2539 { 1.00f, 1.00f, 0.00f },
2113 }; 2540 };
2114 2541
2115 int x, y; 2542 int x, y;
2116 2543
2117 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 */
2118 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2551 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2119 glEnable (GL_BLEND); 2552 glEnable (GL_BLEND);
2120 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2553 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2121 glBegin (GL_QUADS); 2554 glBegin (GL_QUADS);
2122 2555
2123 for (y = 0; y < h; y++) 2556 for (y = 0; y < h; y++)
2127 2560
2128 if (m) 2561 if (m)
2129 { 2562 {
2130 float *c = color [m & 15]; 2563 float *c = color [m & 15];
2131 2564
2132 float tx1 = m & 0x40 ? 0.5 : 0.; 2565 float tx1 = m & 0x40 ? 0.5f : 0.f;
2133 float tx2 = tx1 + 0.5; 2566 float tx2 = tx1 + 0.5f;
2134 2567
2135 glColor4f (c[0], c[1], c[2], 0.75); 2568 glColor4f (c[0], c[1], c[2], 1);
2136 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2569 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2137 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2570 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2138 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2571 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2139 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2572 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2140 } 2573 }
2148void 2581void
2149fow_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)
2150 PPCODE: 2583 PPCODE:
2151{ 2584{
2152 int x, y; 2585 int x, y;
2153 int sw1 = sw + 2; 2586 int sw1 = sw + 2;
2154 int sh1 = sh + 2; 2587 int sh1 = sh + 2;
2155 int sh3 = sh * 3; 2588 int sh3 = sh * 3;
2156 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);
2157 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2592 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2158 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2593 memset (darkness1, 0, sw1*sh1);
2159 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2160 2594
2161 SvPOK_only (darkness3_sv); 2595 SvPOK_only (darkness3_sv);
2162 SvCUR_set (darkness3_sv, sw34 * sh3); 2596 SvCUR_set (darkness3_sv, sw3 * sh3);
2163 2597
2164 mx += self->x - 1; 2598 mx += self->x - 1;
2165 my += self->y - 1; 2599 my += self->y - 1;
2166
2167 memset (darkness1, 255, sw1 * sh1);
2168 2600
2169 for (y = 0; y < sh1; y++) 2601 for (y = 0; y < sh1; y++)
2170 if (0 <= y + my && y + my < self->rows) 2602 if (0 <= y + my && y + my < self->rows)
2171 { 2603 {
2172 maprow *row = self->row + (y + my); 2604 maprow *row = self->row + (y + my);
2175 if (row->c0 <= x + mx && x + mx < row->c1) 2607 if (row->c0 <= x + mx && x + mx < row->c1)
2176 { 2608 {
2177 mapcell *cell = row->col + (x + mx - row->c0); 2609 mapcell *cell = row->col + (x + mx - row->c0);
2178 2610
2179 darkness1 [y * sw1 + x] = cell->darkness 2611 darkness1 [y * sw1 + x] = cell->darkness
2180 ? 255 - (cell->darkness - 1) 2612 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2181 : 255 - FOW_DARKNESS; 2613 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2182 } 2614 }
2183 } 2615 }
2184 2616
2185 for (y = 0; y < sh; ++y) 2617 for (y = 0; y < sh; ++y)
2186 for (x = 0; x < sw; ++x) 2618 for (x = 0; x < sw; ++x)
2205 2637
2206 uint8_t r13 = (d13 + d23 + d12) / 3; 2638 uint8_t r13 = (d13 + d23 + d12) / 3;
2207 uint8_t r23 = d23; 2639 uint8_t r23 = d23;
2208 uint8_t r33 = (d23 + d33 + d32) / 3; 2640 uint8_t r33 = (d23 + d33 + d32) / 3;
2209 2641
2210 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2211 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2212 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2213 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2645 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2214 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 */
2215 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2216 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2217 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2218 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2219 } 2651 }
2220 2652
2221 free (darkness1); 2653 free (darkness1);
2222 2654
2223 EXTEND (SP, 3); 2655 EXTEND (SP, 3);
2224 PUSHs (sv_2mortal (newSViv (sw34))); 2656 PUSHs (sv_2mortal (newSViv (sw3)));
2225 PUSHs (sv_2mortal (newSViv (sh3))); 2657 PUSHs (sv_2mortal (newSViv (sh3)));
2226 PUSHs (darkness3_sv); 2658 PUSHs (darkness3_sv);
2227} 2659}
2228 2660
2229SV * 2661SV *
2292 else 2724 else
2293 *data++ = 0; 2725 *data++ = 0;
2294 } 2726 }
2295 } 2727 }
2296 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 {
2297 SvPOK_only (data_sv); 2732 SvPOK_only (data_sv);
2298 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2733 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2734 }
2735
2299 RETVAL = data_sv; 2736 RETVAL = data_sv;
2300} 2737}
2301 OUTPUT: 2738 OUTPUT:
2302 RETVAL 2739 RETVAL
2303 2740
2304void 2741void
2305set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2742set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2306 PPCODE: 2743 PPCODE:
2307{ 2744{
2308 int x, y, z; 2745 int x, y, z;
2309 int w, h; 2746 int w, h;
2310 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;
2311 2758
2312 if (*data++ != 0) 2759 if (*data++ != 0)
2313 XSRETURN_EMPTY; /* version mismatch */ 2760 XSRETURN_EMPTY; /* version mismatch */
2314 2761
2315 w = *data++ << 8; w |= *data++; 2762 w = *data++ << 8; w |= *data++;
2330 { 2777 {
2331 maprow *row = map_get_row (self, y); 2778 maprow *row = map_get_row (self, y);
2332 2779
2333 for (x = x0; x < x1; x++) 2780 for (x = x0; x < x1; x++)
2334 { 2781 {
2782 uint8_t flags;
2783
2784 if (data + 7 >= end)
2785 XSRETURN_EMPTY;
2786
2335 uint8_t flags = *data++; 2787 flags = *data++;
2336 2788
2337 if (flags) 2789 if (flags)
2338 { 2790 {
2339 mapcell *cell = row_get_cell (row, x); 2791 mapcell *cell = row_get_cell (row, x);
2340 tileid tile[3] = { 0, 0, 0 }; 2792 tileid tile[3] = { 0, 0, 0 };
2343 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2795 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2344 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2796 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2345 2797
2346 if (cell->darkness == 0) 2798 if (cell->darkness == 0)
2347 { 2799 {
2348 cell->darkness = 0; 2800 /*cell->darkness = 0;*/
2801 EXTEND (SP, 3);
2349 2802
2350 for (z = 0; z <= 2; z++) 2803 for (z = 0; z <= 2; z++)
2351 { 2804 {
2352 tileid t = tile [z]; 2805 tileid t = tile [z];
2353 2806
2354 if (t >= self->texs || (t && !self->tex [t].name)) 2807 if (t >= self->texs || (t && !self->tex [t].name))
2355 { 2808 {
2356 XPUSHs (sv_2mortal (newSViv (t))); 2809 PUSHs (sv_2mortal (newSViv (t)));
2357 need_texid (self, t); 2810 need_texid (self, t);
2358 } 2811 }
2359 2812
2360 cell->tile [z] = t; 2813 cell->tile [z] = t;
2361 } 2814 }
2366} 2819}
2367 2820
2368MODULE = Deliantra::Client PACKAGE = DC::RW 2821MODULE = Deliantra::Client PACKAGE = DC::RW
2369 2822
2370DC::RW 2823DC::RW
2371new (SV *class, SV *data_sv) 2824new (SV *klass, SV *data_sv)
2372 CODE: 2825 CODE:
2373{ 2826{
2374 STRLEN datalen; 2827 STRLEN datalen;
2375 char *data = SvPVbyte (data_sv, datalen); 2828 char *data = SvPVbyte (data_sv, datalen);
2376 2829
2378} 2831}
2379 OUTPUT: 2832 OUTPUT:
2380 RETVAL 2833 RETVAL
2381 2834
2382DC::RW 2835DC::RW
2383new_from_file (SV *class, const char *path, const char *mode = "rb") 2836new_from_file (SV *klass, const char *path, const char *mode = "rb")
2384 CODE: 2837 CODE:
2385 RETVAL = SDL_RWFromFile (path, mode); 2838 RETVAL = SDL_RWFromFile (path, mode);
2386 OUTPUT: 2839 OUTPUT:
2387 RETVAL 2840 RETVAL
2388 2841
2406 if (RETVAL < 0) 2859 if (RETVAL < 0)
2407 { 2860 {
2408 RETVAL = Mix_GroupOldest (-1); 2861 RETVAL = Mix_GroupOldest (-1);
2409 2862
2410 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)
2411 XSRETURN_UNDEF; 2869 XSRETURN_UNDEF;
2412 2870 }
2871 else
2413 Mix_HaltChannel (RETVAL); 2872 Mix_HaltChannel (RETVAL);
2414 } 2873 }
2415 2874
2416 Mix_UnregisterAllEffects (RETVAL); 2875 Mix_UnregisterAllEffects (RETVAL);
2417 Mix_Volume (RETVAL, 128); 2876 Mix_Volume (RETVAL, 128);
2418} 2877}
2465void 2924void
2466set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2925set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2467 CODE: 2926 CODE:
2468{ 2927{
2469 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));
2470 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;
2471 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2930 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2472} 2931}
2473 2932
2474void 2933void
2475set_reverse_stereo (DC::Channel self, int flip) 2934set_reverse_stereo (DC::Channel self, int flip)
2478 2937
2479MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2938MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2480 2939
2481PROTOTYPES: DISABLE 2940PROTOTYPES: DISABLE
2482 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
2483DC::MixChunk 2954DC::MixChunk
2484new (SV *class, DC::RW rwops) 2955new (SV *klass, DC::RW rwops)
2485 CODE: 2956 CODE:
2486 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2957 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2487 OUTPUT: 2958 OUTPUT:
2488 RETVAL 2959 RETVAL
2489 2960
2519 OUTPUT: 2990 OUTPUT:
2520 RETVAL 2991 RETVAL
2521 2992
2522MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2993MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2523 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
2524int 3007int
2525volume (int volume = -1) 3008volume (int volume = -1)
2526 PROTOTYPE: ;$ 3009 PROTOTYPE: ;$
2527 CODE: 3010 CODE:
2528 if (items > 0) 3011 if (items > 0)
2539void 3022void
2540halt () 3023halt ()
2541 CODE: 3024 CODE:
2542 Mix_HaltMusic (); 3025 Mix_HaltMusic ();
2543 3026
3027int
3028playing ()
3029 CODE:
3030 RETVAL = Mix_PlayingMusic ();
3031 OUTPUT:
3032 RETVAL
3033
2544DC::MixMusic 3034DC::MixMusic
2545new (SV *class, DC::RW rwops) 3035new (SV *klass, DC::RW rwops)
2546 CODE: 3036 CODE:
2547 RETVAL = Mix_LoadMUS_RW (rwops); 3037 RETVAL = Mix_LoadMUS_RW (rwops);
2548 OUTPUT: 3038 OUTPUT:
2549 RETVAL 3039 RETVAL
2550 3040
2578 } *civ, const_iv[] = { 3068 } *civ, const_iv[] = {
2579# define const_iv(name) { # name, (IV)name } 3069# define const_iv(name) { # name, (IV)name }
2580 const_iv (GL_VENDOR), 3070 const_iv (GL_VENDOR),
2581 const_iv (GL_VERSION), 3071 const_iv (GL_VERSION),
2582 const_iv (GL_EXTENSIONS), 3072 const_iv (GL_EXTENSIONS),
3073 const_iv (GL_MAX_TEXTURE_UNITS),
2583 const_iv (GL_COLOR_MATERIAL), 3074 const_iv (GL_COLOR_MATERIAL),
2584 const_iv (GL_SMOOTH), 3075 const_iv (GL_SMOOTH),
2585 const_iv (GL_FLAT), 3076 const_iv (GL_FLAT),
2586 const_iv (GL_DITHER), 3077 const_iv (GL_DITHER),
2587 const_iv (GL_BLEND), 3078 const_iv (GL_BLEND),
2599 const_iv (GL_ZERO), 3090 const_iv (GL_ZERO),
2600 const_iv (GL_SRC_ALPHA), 3091 const_iv (GL_SRC_ALPHA),
2601 const_iv (GL_DST_ALPHA), 3092 const_iv (GL_DST_ALPHA),
2602 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3093 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2603 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),
2604 const_iv (GL_SRC_ALPHA_SATURATE), 3099 const_iv (GL_SRC_ALPHA_SATURATE),
2605 const_iv (GL_RGB), 3100 const_iv (GL_RGB),
2606 const_iv (GL_RGBA), 3101 const_iv (GL_RGBA),
2607 const_iv (GL_RGBA4), 3102 const_iv (GL_RGBA4),
2608 const_iv (GL_RGBA8), 3103 const_iv (GL_RGBA8),
2676 const_iv (GL_NICEST), 3171 const_iv (GL_NICEST),
2677 const_iv (GL_V2F), 3172 const_iv (GL_V2F),
2678 const_iv (GL_V3F), 3173 const_iv (GL_V3F),
2679 const_iv (GL_T2F_V3F), 3174 const_iv (GL_T2F_V3F),
2680 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),
2681# undef const_iv 3179# undef const_iv
2682 }; 3180 };
2683 3181
2684 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--)
2685 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3183 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2686 3184
2687 texture_av = newAV (); 3185 texture_av = newAV ();
2688 AvREAL_off (texture_av); 3186 AvREAL_off (texture_av);
2689} 3187}
2690 3188
2692disable_GL_EXT_blend_func_separate () 3190disable_GL_EXT_blend_func_separate ()
2693 CODE: 3191 CODE:
2694 gl.BlendFuncSeparate = 0; 3192 gl.BlendFuncSeparate = 0;
2695 gl.BlendFuncSeparateEXT = 0; 3193 gl.BlendFuncSeparateEXT = 0;
2696 3194
2697char * 3195void
3196apple_nvidia_bug (int enable)
3197
3198const char *
2698gl_vendor () 3199gl_vendor ()
2699 CODE: 3200 CODE:
2700 RETVAL = (char *)glGetString (GL_VENDOR); 3201 RETVAL = (const char *)glGetString (GL_VENDOR);
2701 OUTPUT: 3202 OUTPUT:
2702 RETVAL 3203 RETVAL
2703 3204
2704char * 3205const char *
2705gl_version () 3206gl_version ()
2706 CODE: 3207 CODE:
2707 RETVAL = (char *)glGetString (GL_VERSION); 3208 RETVAL = (const char *)glGetString (GL_VERSION);
2708 OUTPUT: 3209 OUTPUT:
2709 RETVAL 3210 RETVAL
2710 3211
2711char * 3212const char *
2712gl_extensions () 3213gl_extensions ()
2713 CODE: 3214 CODE:
2714 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3215 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2715 OUTPUT: 3216 OUTPUT:
2716 RETVAL 3217 RETVAL
2717 3218
2718const char *glGetString (GLenum pname) 3219const char *glGetString (GLenum pname)
3220 CODE:
3221 RETVAL = (const char *)glGetString (pname);
3222 OUTPUT:
3223 RETVAL
2719 3224
2720GLint glGetInteger (GLenum pname) 3225GLint glGetInteger (GLenum pname)
2721 CODE: 3226 CODE:
2722 glGetIntegerv (pname, &RETVAL); 3227 glGetIntegerv (pname, &RETVAL);
2723 OUTPUT: 3228 OUTPUT:
2731 3236
2732int glGetError () 3237int glGetError ()
2733 3238
2734void glFinish () 3239void glFinish ()
2735 3240
3241void glFlush ()
3242
2736void glClear (int mask) 3243void glClear (int mask)
2737 3244
2738void glClearColor (float r, float g, float b, float a = 1.0) 3245void glClearColor (float r, float g, float b, float a = 1.0)
2739 PROTOTYPE: @ 3246 PROTOTYPE: @
2740 3247
2749void glBlendFunc (int sfactor, int dfactor) 3256void glBlendFunc (int sfactor, int dfactor)
2750 3257
2751void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3258void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2752 CODE: 3259 CODE:
2753 gl_BlendFuncSeparate (sa, da, saa, daa); 3260 gl_BlendFuncSeparate (sa, da, saa, daa);
3261
3262# void glBlendEquation (int se)
2754 3263
2755void glDepthMask (int flag) 3264void glDepthMask (int flag)
2756 3265
2757void glLogicOp (int opcode) 3266void glLogicOp (int opcode)
2758 3267
2793void glRotate (float angle, float x, float y, float z) 3302void glRotate (float angle, float x, float y, float z)
2794 CODE: 3303 CODE:
2795 glRotatef (angle, x, y, z); 3304 glRotatef (angle, x, y, z);
2796 3305
2797void 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: @
2798 ALIAS: 3308 ALIAS:
2799 glColor_premultiply = 1 3309 glColor_premultiply = 1
2800 CODE: 3310 CODE:
2801 if (ix) 3311 if (ix)
2802 { 3312 {
2908 3418
2909void glEndList () 3419void glEndList ()
2910 3420
2911void glCallList (int list) 3421void glCallList (int list)
2912 3422
3423void c_init ()
3424 CODE:
3425 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3426 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3427
2913MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3428MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2914 3429
2915PROTOTYPES: DISABLE 3430PROTOTYPES: DISABLE
2916 3431
2917void 3432void
2918find_widget (SV *self, NV x, NV y) 3433find_widget (SV *self, NV x, NV y)
2919 PPCODE: 3434 PPCODE:
2920{ 3435{
2921 if (within_widget (self, x, y)) 3436 if (within_widget (self, x, y))
2922 XPUSHs (self); 3437 XPUSHs (self);
2923} 3438}
2924 3439
2925BOOT: 3440BOOT:
2926{ 3441{
2934 3449
2935void 3450void
2936draw (SV *self) 3451draw (SV *self)
2937 CODE: 3452 CODE:
2938{ 3453{
2939 HV *hv; 3454 HV *hv;
2940 SV **svp; 3455 SV **svp;
2941 NV x, y, w, h; 3456 NV x, y, w, h;
2942 SV *draw_x_sv = GvSV (draw_x_gv); 3457 SV *draw_x_sv = GvSV (draw_x_gv);
2943 SV *draw_y_sv = GvSV (draw_y_gv); 3458 SV *draw_y_sv = GvSV (draw_y_gv);
2944 SV *draw_w_sv = GvSV (draw_w_gv); 3459 SV *draw_w_sv = GvSV (draw_w_gv);
2945 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