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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines