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.331 by root, Mon Nov 19 00:10:34 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines