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.258 by root, Thu Apr 10 14:35:50 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
81#include "ecb.h"
82
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 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 */
72#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
73 89
74#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
75#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
76 92
77#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
78 94
79/* mask out modifiers we are not interested in */ 95/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81 97
82#if 0 98#define KMOD_LRAM 0x10000 // our extension
83# define PARACHUTE SDL_INIT_NOPARACHUTE 99
84#else 100#define TEXID_SPEECH 1
85# define PARACHUTE 0 101#define TEXID_NOFACE 2
86#endif 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}
87 121
88static AV *texture_av; 122static AV *texture_av;
89 123
90static struct 124static struct
91{ 125{
148{ 182{
149 GSList *attrs = run->item->analysis.extra_attrs; 183 GSList *attrs = run->item->analysis.extra_attrs;
150 184
151 while (attrs) 185 while (attrs)
152 { 186 {
153 PangoAttribute *attr = attrs->data; 187 PangoAttribute *attr = (PangoAttribute *)attrs->data;
154 188
155 if (attr->klass->type == PANGO_ATTR_SHAPE) 189 if (attr->klass->type == PANGO_ATTR_SHAPE)
156 return 1; 190 return 1;
157 191
158 attrs = attrs->next; 192 attrs = attrs->next;
159 } 193 }
160 194
161 return 0; 195 return 0;
162} 196}
163 197
164typedef struct cf_layout { 198struct cf_layout {
165 PangoLayout *pl; 199 PangoLayout *pl;
166 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
167 int base_height; 201 int base_height;
168 DC__Font font; 202 DC__Font font;
169 rc_t *rc; 203 rc_t rc;
170} *DC__Layout; 204};
205
206typedef cf_layout *DC__Layout;
171 207
172static DC__Font default_font; 208static DC__Font default_font;
173static PangoContext *opengl_context; 209static PangoContext *opengl_context;
174static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
175 211
176static void 212static void
177substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
178{ 214{
179 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
180#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
181 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
182#endif 218#endif
183 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
184} 220}
185 221
186static void 222static void
213 249
214 *w = rect.width; 250 *w = rect.width;
215 *h = rect.height; 251 *h = rect.height;
216} 252}
217 253
254/////////////////////////////////////////////////////////////////////////////
255
218typedef uint16_t tileid; 256typedef uint16_t tileid;
219typedef uint16_t faceid; 257typedef uint16_t faceid;
220 258
221typedef struct { 259struct maptex
260{
222 GLuint name; 261 GLuint name;
223 int w, h; 262 int w, h;
224 float s, t; 263 float s, t;
225 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
226 tileid smoothtile; 265 tileid smoothtile;
227 uint8_t smoothlevel; 266 uint8_t smoothlevel;
228} maptex; 267 uint8_t unused; /* set to zero on use */
268};
229 269
230typedef struct { 270struct mapcell
271{
231 uint32_t player; 272 uint32_t player;
232 tileid tile[3]; 273 tileid tile[3];
233 uint16_t darkness; 274 uint16_t darkness;
234 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
235} mapcell; 276};
236 277
237typedef struct { 278struct maprow
279{
238 int32_t c0, c1; 280 int32_t c0, c1;
239 mapcell *col; 281 mapcell *col;
240} maprow; 282};
241 283
242typedef struct map { 284struct mapgrid {
243 int x, y, w, h; 285 int x, y, w, h;
244 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
245 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
246 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
247 289
248 int32_t rows; 290 int32_t rows;
249 maprow *row; 291 maprow *row;
250} *DC__Map; 292};
251 293
252static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
253prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
254{ 299{
255 char *p; 300 T *p;
256 301
257 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
258 Zero (p, inc, char); 303 Zero (p, inc, T);
259 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
260 Safefree (ptr); 305 Safefree (ptr);
261 306
262 return p; 307 ptr = p;
263} 308}
264 309
265static char * 310template<typename T>
266append (char *ptr, int sze, int inc)
267{
268 Renew (ptr, sze + inc, char);
269 Zero (ptr + sze, inc, char);
270
271 return ptr;
272}
273
274#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
275#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
276
277static 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
278need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
279{ 320{
280 while (self->faces <= face) 321 while (self->faces <= face)
281 { 322 {
282 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
283 self->faces *= 2; 324 self->faces *= 2;
284 } 325 }
285} 326}
286 327
287static void 328static void
288need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
289{ 330{
290 while (self->texs <= texid) 331 while (self->texs <= texid)
291 { 332 {
292 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
293 self->texs *= 2; 334 self->texs *= 2;
294 } 335 }
295} 336}
296 337
297static maprow * 338static maprow *
298map_get_row (DC__Map self, int y) 339map_get_row (mapgrid *self, int y)
299{ 340{
300 if (0 > y) 341 if (0 > y)
301 { 342 {
302 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
303 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
304 345
305 self->rows += extend; 346 self->rows += extend;
306 self->y += extend; 347 self->y += extend;
307 y += extend; 348 y += extend;
308 } 349 }
309 else if (y >= self->rows) 350 else if (y >= self->rows)
310 { 351 {
311 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
312 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
313 self->rows += extend; 354 self->rows += extend;
314 } 355 }
315 356
316 return self->row + y; 357 return self->row + y;
317} 358}
327 } 368 }
328 369
329 if (row->c0 > x) 370 if (row->c0 > x)
330 { 371 {
331 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
332 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
333 row->c0 -= extend; 374 row->c0 -= extend;
334 } 375 }
335 else if (x >= row->c1) 376 else if (x >= row->c1)
336 { 377 {
337 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
338 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
339 row->c1 += extend; 380 row->c1 += extend;
340 } 381 }
341 382
342 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
343} 384}
344 385
345static mapcell * 386static mapcell *
346map_get_cell (DC__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
347{ 388{
348 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
349} 390}
350 391
351static void 392static void
352map_clear (DC__Map self) 393map_clear (mapgrid *self)
353{ 394{
354 int r; 395 int r;
355 396
356 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
357 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
364 self->oy = 0; 405 self->oy = 0;
365 self->row = 0; 406 self->row = 0;
366 self->rows = 0; 407 self->rows = 0;
367} 408}
368 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
369static void 420static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
371{ 422{
372 int x, y; 423 int x, y;
373 maprow *row; 424 maprow *row;
374 mapcell *cell; 425 mapcell *cell;
375 426
387 if (x >= row->c1) 438 if (x >= row->c1)
388 break; 439 break;
389 440
390 cell = row->col + x - row->c0; 441 cell = row->col + x - row->c0;
391 442
392 cell->darkness = 0; 443 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 444 }
397 } 445 }
398} 446}
399 447
400typedef struct { 448struct smooth_key
449{
401 tileid tile; 450 tileid tile;
402 uint8_t x, y, level; 451 uint8_t x, y, level;
403} 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}
404 471
405static void 472static void
406smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
407{ 474{
408 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
409 476
410 if (SvIOK (*sv)) 477 if (it == h.end ())
411 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
412 else 479 else
413 sv_setiv (*sv, bits); 480 it->second |= bits;
414} 481}
415 482
416static void 483static void
417music_finished (void) 484music_finished (void)
418{ 485{
435 ev.code = 1; 502 ev.code = 1;
436 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
437 ev.data2 = 0; 504 ev.data2 = 0;
438 505
439 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;
440} 514}
441 515
442static unsigned int 516static unsigned int
443minpot (unsigned int n) 517minpot (unsigned int n)
444{ 518{
454 n |= n >> 16; 528 n |= n >> 16;
455 529
456 return n + 1; 530 return n + 1;
457} 531}
458 532
459static unsigned int
460popcount (unsigned int n)
461{
462 n -= (n >> 1) & 0x55555555U;
463 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
464 n = ((n >> 4) + n) & 0x0f0f0f0fU;
465 n *= 0x01010101U;
466
467 return n >> 24;
468}
469
470/* SDL should provide this, really. */ 533/* SDL should provide this, really. */
471#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
472#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
473 536
474/******************************************************************************/ 537/******************************************************************************/
511 if (!svp || !SvTRUE (*svp)) 574 if (!svp || !SvTRUE (*svp))
512 return 0; 575 return 0;
513 576
514 return 1; 577 return 1;
515} 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
516 637
517MODULE = Deliantra::Client PACKAGE = DC 638MODULE = Deliantra::Client PACKAGE = DC
518 639
519PROTOTYPES: ENABLE 640PROTOTYPES: ENABLE
520 641
549 const_iv (SDL_USEREVENT), 670 const_iv (SDL_USEREVENT),
550 671
551 const_iv (SDL_APPINPUTFOCUS), 672 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 673 const_iv (SDL_APPMOUSEFOCUS),
553 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),
554 725
555 const_iv (SDLK_FIRST), 726 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 727 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 728 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 729 const_iv (SDLK_KP1),
634 const_iv (KMOD_RMETA), 805 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 806 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 807 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 808 const_iv (KMOD_MODE),
638 809
810 const_iv (KMOD_LRAM),
811
639 const_iv (MIX_DEFAULT_FORMAT), 812 const_iv (MIX_DEFAULT_FORMAT),
813
814 const_iv (SDL_INIT_TIMER),
815 const_iv (SDL_INIT_AUDIO),
816 const_iv (SDL_INIT_VIDEO),
817 const_iv (SDL_INIT_CDROM),
818 const_iv (SDL_INIT_JOYSTICK),
819 const_iv (SDL_INIT_EVERYTHING),
820 const_iv (SDL_INIT_NOPARACHUTE),
821 const_iv (SDL_INIT_EVENTTHREAD),
822
823 const_iv (SDL_GL_RED_SIZE),
824 const_iv (SDL_GL_GREEN_SIZE),
825 const_iv (SDL_GL_BLUE_SIZE),
826 const_iv (SDL_GL_ALPHA_SIZE),
827 const_iv (SDL_GL_DOUBLEBUFFER),
828 const_iv (SDL_GL_BUFFER_SIZE),
829 const_iv (SDL_GL_DEPTH_SIZE),
830 const_iv (SDL_GL_STENCIL_SIZE),
831 const_iv (SDL_GL_ACCUM_RED_SIZE),
832 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
833 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
834 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
835 const_iv (SDL_GL_STEREO),
836 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
837 const_iv (SDL_GL_MULTISAMPLESAMPLES),
838 const_iv (SDL_GL_ACCELERATED_VISUAL),
839 const_iv (SDL_GL_SWAP_CONTROL),
840
841 const_iv (FOW_DARKNESS)
640# undef const_iv 842# undef const_iv
641 }; 843 };
642 844
643 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--)
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
645 847
646 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
647 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
648} 850}
649 851
665NV ceil (NV x) 867NV ceil (NV x)
666 868
667IV minpot (UV n) 869IV minpot (UV n)
668 870
669IV 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
670 882
671void 883void
672pango_init () 884pango_init ()
673 CODE: 885 CODE:
674{ 886{
680 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 892 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 893 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif 894#endif
683} 895}
684 896
685char *
686SDL_GetError () 897char *SDL_GetError ()
687 898
688int 899void SDL_main_hack (SV *real_main)
689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 900 PROTOTYPE: &
690 901
691void 902int SDL_Init (U32 flags)
903
904int SDL_InitSubSystem (U32 flags)
905
906void SDL_QuitSubSystem (U32 flags)
907
692SDL_Quit () 908void SDL_Quit ()
909
910int SDL_GL_SetAttribute (int attr, int value)
911 C_ARGS: (SDL_GLattr)attr, value
912
913int SDL_GL_GetAttribute (int attr)
914 CODE:
915 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
916 XSRETURN_UNDEF;
917 OUTPUT:
918 RETVAL
693 919
694void 920void
695SDL_ListModes (int rgb, int alpha) 921SDL_ListModes (int rgb, int alpha)
696 PPCODE: 922 PPCODE:
697{ 923{
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 935 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 936 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 937 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712 938
713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 939 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
714#if SDL_VERSION_ATLEAST(1,2,10)
715 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
716 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 940 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717#endif
718 941
719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 942 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
720 943
721 if (m && m != (SDL_Rect **)-1) 944 if (m && m != (SDL_Rect **)-1)
722 while (*m) 945 while (*m)
723 { 946 {
724 if ((*m)->w >= 800 && (*m)->h >= 480) 947 if ((*m)->w >= 400 && (*m)->h >= 300)
725 { 948 {
726 AV *av = newAV (); 949 AV *av = newAV ();
727 av_push (av, newSViv ((*m)->w)); 950 av_push (av, newSViv ((*m)->w));
728 av_push (av, newSViv ((*m)->h)); 951 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb)); 952 av_push (av, newSViv (rgb));
752 ); 975 );
753 976
754 if (RETVAL) 977 if (RETVAL)
755 { 978 {
756 av_clear (texture_av); 979 av_clear (texture_av);
757
758 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
759#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 980#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
760#include "glfunc.h" 981#include "glfunc.h"
761#undef GL_FUNC 982#undef GL_FUNC
983 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
984 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
762 } 985 }
763} 986}
764 OUTPUT: 987 OUTPUT:
765 RETVAL 988 RETVAL
989
990void
991SDL_WM_SetCaption (const char *title, const char *icon)
766 992
767void 993void
768SDL_GL_SwapBuffers () 994SDL_GL_SwapBuffers ()
769 995
770char * 996char *
771SDL_GetKeyName (int sym) 997SDL_GetKeyName (int sym)
998 C_ARGS: (SDLKey)sym
772 999
773int 1000int
774SDL_GetAppState () 1001SDL_GetAppState ()
775 1002
776int 1003int
777SDL_GetModState () 1004SDL_GetModState ()
778 1005
1006int
1007SDL_WaitEvent ()
1008 C_ARGS: 0
1009
779void 1010void
1011SDL_PumpEvents ()
1012
1013void
780poll_events () 1014peep_events ()
781 PPCODE: 1015 PPCODE:
782{ 1016{
783 SDL_Event ev; 1017 SDL_Event ev;
784 1018
785 SDL_PumpEvents (); 1019 SDL_PumpEvents ();
792 { 1026 {
793 case SDL_KEYDOWN: 1027 case SDL_KEYDOWN:
794 case SDL_KEYUP: 1028 case SDL_KEYUP:
795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1029 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1030 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
797 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1031 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
798 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1032 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
799 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1033 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
800 break; 1034 break;
801 1035
802 case SDL_ACTIVEEVENT: 1036 case SDL_ACTIVEEVENT:
803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1037 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
821 x = ev.motion.x; 1055 x = ev.motion.x;
822 y = ev.motion.y; 1056 y = ev.motion.y;
823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1057 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
824 } 1058 }
825 1059
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1060 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
827 hv_store (hv, "state", 5, newSViv (state), 0); 1061 hv_store (hv, "state", 5, newSViv (state), 0);
828 hv_store (hv, "x", 1, newSViv (x), 0); 1062 hv_store (hv, "x", 1, newSViv (x), 0);
829 hv_store (hv, "y", 1, newSViv (y), 0); 1063 hv_store (hv, "y", 1, newSViv (y), 0);
830 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1064 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
831 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1065 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
851 1085
852 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))));
853 } 1087 }
854} 1088}
855 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
856int 1103int
857Mix_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)
858 POSTCALL: 1105 POSTCALL:
859 Mix_HookMusicFinished (music_finished); 1106 Mix_HookMusicFinished (music_finished);
860 Mix_ChannelFinished (channel_finished); 1107 Mix_ChannelFinished (channel_finished);
861 1108
862void 1109void
863Mix_QuerySpec () 1110Mix_QuerySpec ()
922add_font (char *file) 1169add_font (char *file)
923 CODE: 1170 CODE:
924 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1171 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
925 OUTPUT: 1172 OUTPUT:
926 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)
927 1181
928void 1182void
929load_image_inline (SV *image_) 1183load_image_inline (SV *image_)
930 ALIAS: 1184 ALIAS:
931 load_image_file = 1 1185 load_image_file = 1
977 1231
978 SDL_LockSurface (surface2); 1232 SDL_LockSurface (surface2);
979 EXTEND (SP, 6); 1233 EXTEND (SP, 6);
980 PUSHs (sv_2mortal (newSViv (surface2->w))); 1234 PUSHs (sv_2mortal (newSViv (surface2->w)));
981 PUSHs (sv_2mortal (newSViv (surface2->h))); 1235 PUSHs (sv_2mortal (newSViv (surface2->h)));
982 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1236 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
983 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1237 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
984 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1238 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
985 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1239 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
986 SDL_UnlockSurface (surface2); 1240 SDL_UnlockSurface (surface2);
987 1241
1047#if DEBUG 1301#if DEBUG
1048 VALGRIND_DO_LEAK_CHECK; 1302 VALGRIND_DO_LEAK_CHECK;
1049#endif 1303#endif
1050} 1304}
1051 1305
1306int
1307SvREFCNT (SV *sv)
1308 CODE:
1309 RETVAL = SvREFCNT (sv);
1310 OUTPUT:
1311 RETVAL
1312
1052MODULE = Deliantra::Client PACKAGE = DC::Font 1313MODULE = Deliantra::Client PACKAGE = DC::Font
1053 1314
1054PROTOTYPES: DISABLE 1315PROTOTYPES: DISABLE
1055 1316
1056DC::Font 1317DC::Font
1057new_from_file (SV *class, char *path, int id = 0) 1318new_from_file (SV *klass, char *path, int id = 0)
1058 CODE: 1319 CODE:
1059{ 1320{
1060 int count; 1321 int count;
1061 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1322 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1062 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1323 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1091 PROTOTYPE: 1352 PROTOTYPE:
1092 CODE: 1353 CODE:
1093 tc_restore (); 1354 tc_restore ();
1094 1355
1095DC::Layout 1356DC::Layout
1096new (SV *class) 1357new (SV *klass)
1097 CODE: 1358 CODE:
1098 New (0, RETVAL, 1, struct cf_layout); 1359 RETVAL = new cf_layout;
1099 1360
1100 RETVAL->pl = pango_layout_new (opengl_context); 1361 RETVAL->pl = pango_layout_new (opengl_context);
1101 RETVAL->r = 1.; 1362 RETVAL->r = 1.;
1102 RETVAL->g = 1.; 1363 RETVAL->g = 1.;
1103 RETVAL->b = 1.; 1364 RETVAL->b = 1.;
1104 RETVAL->a = 1.; 1365 RETVAL->a = 1.;
1105 RETVAL->base_height = MIN_FONT_HEIGHT; 1366 RETVAL->base_height = MIN_FONT_HEIGHT;
1106 RETVAL->font = 0; 1367 RETVAL->font = 0;
1107 RETVAL->rc = rc_alloc ();
1108 1368
1109 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1369 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1110 layout_update_font (RETVAL); 1370 layout_update_font (RETVAL);
1111 OUTPUT: 1371 OUTPUT:
1112 RETVAL 1372 RETVAL
1113 1373
1114void 1374void
1115DESTROY (DC::Layout self) 1375DESTROY (DC::Layout self)
1116 CODE: 1376 CODE:
1117 g_object_unref (self->pl); 1377 g_object_unref (self->pl);
1118 rc_free (self->rc);
1119 Safefree (self); 1378 delete self;
1120 1379
1121void 1380void
1122set_text (DC::Layout self, SV *text_) 1381set_text (DC::Layout self, SV *text_)
1123 CODE: 1382 CODE:
1124{ 1383{
1250 1509
1251void 1510void
1252set_height (DC::Layout self, int base_height) 1511set_height (DC::Layout self, int base_height)
1253 CODE: 1512 CODE:
1254 if (self->base_height != base_height) 1513 if (self->base_height != base_height)
1255 { 1514 {
1256 self->base_height = base_height; 1515 self->base_height = base_height;
1257 layout_update_font (self); 1516 layout_update_font (self);
1258 } 1517 }
1259 1518
1260void 1519void
1378} 1637}
1379 1638
1380void 1639void
1381render (DC::Layout self, float x, float y, int flags = 0) 1640render (DC::Layout self, float x, float y, int flags = 0)
1382 CODE: 1641 CODE:
1383 rc_clear (self->rc); 1642 self->rc.clear ();
1384 pango_opengl_render_layout_subpixel ( 1643 pango_opengl_render_layout_subpixel (
1385 self->pl, 1644 self->pl,
1386 self->rc, 1645 &self->rc,
1387 x * PANGO_SCALE, y * PANGO_SCALE, 1646 x * PANGO_SCALE, y * PANGO_SCALE,
1388 self->r, self->g, self->b, self->a, 1647 self->r, self->g, self->b, self->a,
1389 flags 1648 flags
1390 ); 1649 );
1391 // we assume that context_change actually clears/frees stuff 1650 // we assume that context_change actually clears/frees stuff
1402 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1661 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1403 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1662 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1404 glEnable (GL_ALPHA_TEST); 1663 glEnable (GL_ALPHA_TEST);
1405 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1664 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1406 1665
1407 rc_draw (self->rc); 1666 self->rc.draw ();
1408 1667
1409 glDisable (GL_ALPHA_TEST); 1668 glDisable (GL_ALPHA_TEST);
1410 glDisable (GL_BLEND); 1669 glDisable (GL_BLEND);
1411 glDisable (GL_TEXTURE_2D); 1670 glDisable (GL_TEXTURE_2D);
1412} 1671}
1487 glDisable (GL_ALPHA_TEST); 1746 glDisable (GL_ALPHA_TEST);
1488 glDisable (GL_BLEND); 1747 glDisable (GL_BLEND);
1489 } 1748 }
1490} 1749}
1491 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
1492IV 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)
1493 CODE: 1873 CODE:
1494{ 1874{
1495 GLint width; 1875 GLint width;
1496 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);
1503MODULE = Deliantra::Client PACKAGE = DC::Map 1883MODULE = Deliantra::Client PACKAGE = DC::Map
1504 1884
1505PROTOTYPES: DISABLE 1885PROTOTYPES: DISABLE
1506 1886
1507DC::Map 1887DC::Map
1508new (SV *class) 1888new (SV *klass)
1509 CODE: 1889 CODE:
1510 New (0, RETVAL, 1, struct map); 1890 New (0, RETVAL, 1, mapgrid);
1511 RETVAL->x = 0; 1891 RETVAL->x = 0;
1512 RETVAL->y = 0; 1892 RETVAL->y = 0;
1513 RETVAL->w = 0; 1893 RETVAL->w = 0;
1514 RETVAL->h = 0; 1894 RETVAL->h = 0;
1515 RETVAL->ox = 0; 1895 RETVAL->ox = 0;
1552 1932
1553void 1933void
1554set_smooth (DC::Map self, int face, int smooth, int level) 1934set_smooth (DC::Map self, int face, int smooth, int level)
1555 CODE: 1935 CODE:
1556{ 1936{
1557 tileid texid; 1937 tileid texid;
1558 maptex *tex; 1938 maptex *tex;
1559 1939
1560 if (face < 0 || face >= self->faces) 1940 if (face < 0 || face >= self->faces)
1561 return; 1941 return;
1562 1942
1563 if (smooth < 0 || smooth >= self->faces) 1943 if (smooth < 0 || smooth >= self->faces)
1564 return; 1944 return;
1565 1945
1566 texid = self->face2tile [face]; 1946 texid = self->face2tile [face];
1567 1947
1568 if (!texid) 1948 if (!texid)
1569 return; 1949 return;
1570 1950
1571 tex = self->tex + texid; 1951 tex = self->tex + texid;
1600 //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);
1601 // use uglier nearest interpolation because linear suffers 1981 // use uglier nearest interpolation because linear suffers
1602 // from transparent color bleeding and ugly wrapping effects. 1982 // from transparent color bleeding and ugly wrapping effects.
1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1983 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1604} 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 }
1605 2005
1606int 2006int
1607ox (DC::Map self) 2007ox (DC::Map self)
1608 ALIAS: 2008 ALIAS:
1609 oy = 1 2009 oy = 1
1641 self->ox += dx; self->x += dx; 2041 self->ox += dx; self->x += dx;
1642 self->oy += dy; self->y += dy; 2042 self->oy += dy; self->y += dy;
1643 2043
1644 while (self->y < 0) 2044 while (self->y < 0)
1645 { 2045 {
1646 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2046 prepend (self->row, self->rows, MAP_EXTEND_Y);
1647 2047
1648 self->rows += MAP_EXTEND_Y; 2048 self->rows += MAP_EXTEND_Y;
1649 self->y += MAP_EXTEND_Y; 2049 self->y += MAP_EXTEND_Y;
1650 } 2050 }
1651} 2051}
1652 2052
1653SV * 2053SV *
1654map1a_update (DC::Map self, SV *data_, int extmap) 2054map1a_update (DC::Map self, SV *data_)
1655 CODE: 2055 CODE:
1656{ 2056{
1657 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2057 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1658 uint8_t *data_end = (uint8_t *)SvEND (data_); 2058 uint8_t *data_end = (uint8_t *)SvEND (data_);
1659 mapcell *cell; 2059 mapcell *cell;
1680 2080
1681 //TODO: don't trust server data to be in-range(!) 2081 //TODO: don't trust server data to be in-range(!)
1682 2082
1683 if (flags & 8) 2083 if (flags & 8)
1684 { 2084 {
2085 uint8_t ext, cmd;
2086
1685 if (extmap) 2087 do
1686 { 2088 {
1687 uint8_t ext, cmd; 2089 ext = *data++;
2090 cmd = ext & 0x7f;
1688 2091
1689 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
1690 { 2095 {
1691 ext = *data++;
1692 cmd = ext & 0x3f;
1693
1694 if (cmd < 4)
1695 cell->darkness = 255 - ext * 64 + 1;
1696 else if (cmd == 5) // health
1697 {
1698 cell->stat_width = 1; 2096 cell->stat_width = 1;
1699 cell->stat_hp = *data++; 2097 cell->stat_hp = *data++;
1700 }
1701 else if (cmd == 6) // monster width
1702 cell->stat_width = *data++ + 1;
1703 else if (cmd == 0x47)
1704 {
1705 if (*data == 4)
1706 ; // decode player count
1707
1708 data += *data + 1;
1709 }
1710 else if (cmd == 8) // cell flags
1711 cell->flags = *data++;
1712 else if (ext & 0x40) // unknown, multibyte => skip
1713 data += *data + 1;
1714 else
1715 data++;
1716 } 2098 }
1717 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++;
1718 } 2116 }
1719 else 2117 while (ext & 0x80);
1720 cell->darkness = *data++ + 1;
1721 } 2118 }
1722 2119
1723 for (z = 0; z <= 2; ++z) 2120 for (z = 0; z <= 2; ++z)
1724 if (flags & (4 >> z)) 2121 if (flags & (4 >> z))
1725 { 2122 {
1728 cell->tile [z] = self->face2tile [face]; 2125 cell->tile [z] = self->face2tile [face];
1729 2126
1730 if (cell->tile [z]) 2127 if (cell->tile [z])
1731 { 2128 {
1732 maptex *tex = self->tex + cell->tile [z]; 2129 maptex *tex = self->tex + cell->tile [z];
2130 tex->unused = 0;
1733 if (!tex->name) 2131 if (!tex->name)
1734 av_push (missing, newSViv (cell->tile [z])); 2132 av_push (missing, newSViv (cell->tile [z]));
1735 2133
1736 if (tex->smoothtile) 2134 if (tex->smoothtile)
1737 { 2135 {
1738 maptex *smooth = self->tex + tex->smoothtile; 2136 maptex *smooth = self->tex + tex->smoothtile;
2137 smooth->unused = 0;
1739 if (!smooth->name) 2138 if (!smooth->name)
1740 av_push (missing, newSViv (tex->smoothtile)); 2139 av_push (missing, newSViv (tex->smoothtile));
1741 } 2140 }
1742 } 2141 }
1743 } 2142 }
1744 } 2143 }
1745 else 2144 else
1746 cell->darkness = 0; 2145 CELL_CLEAR (cell);
1747 } 2146 }
1748} 2147}
1749 OUTPUT: 2148 OUTPUT:
1750 RETVAL 2149 RETVAL
1751 2150
1771 ? self->row + y 2170 ? self->row + y
1772 : 0; 2171 : 0;
1773 2172
1774 for (x = x0; x < x1; x++) 2173 for (x = x0; x < x1; x++)
1775 { 2174 {
1776 int r = 32, g = 32, b = 32, a = 192; 2175 unsigned int r = 32, g = 32, b = 32, a = 192;
1777 2176
1778 if (row && row->c0 <= x && x < row->c1) 2177 if (row && row->c0 <= x && x < row->c1)
1779 { 2178 {
1780 mapcell *cell = row->col + (x - row->c0); 2179 mapcell *cell = row->col + (x - row->c0);
1781 2180
1783 { 2182 {
1784 maptex tex = self->tex [cell->tile [z]]; 2183 maptex tex = self->tex [cell->tile [z]];
1785 int a0 = 255 - tex.a; 2184 int a0 = 255 - tex.a;
1786 int a1 = tex.a; 2185 int a1 = tex.a;
1787 2186
1788 r = (r * a0 + tex.r * a1) / 255; 2187 r = div255 (r * a0 + tex.r * a1);
1789 g = (g * a0 + tex.g * a1) / 255; 2188 g = div255 (g * a0 + tex.g * a1);
1790 b = (b * a0 + tex.b * a1) / 255; 2189 b = div255 (b * a0 + tex.b * a1);
1791 a = (a * a0 + tex.a * a1) / 255; 2190 a = div255 (a * a0 + tex.a * a1);
1792 } 2191 }
1793 } 2192 }
1794 2193
1795 *map++ = (r ) 2194 *map++ = (r )
1796 | (g << 8) 2195 | (g << 8)
1797 | (b << 16) 2196 | (b << 16)
1798 | (a << 24); 2197 | (a << 24);
1799 } 2198 }
1800 } 2199 }
1801 2200
1802 RETVAL = map_sv; 2201 RETVAL = map_sv;
1803} 2202}
1804 OUTPUT: 2203 OUTPUT:
1805 RETVAL 2204 RETVAL
1806 2205
1807void 2206void
1808draw (DC::Map self, int mx, int my, int sw, int sh, int T) 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)
1809 CODE: 2208 CODE:
1810{ 2209{
1811 int x, y, z; 2210 int x, y, z;
1812 2211
1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1815 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2212 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1816 smooth_key skey; 2213 int pl_x, pl_y;
1817 2214 maptex pl_tex;
1818 rc_t *rc = rc_alloc (); 2215 rc_t rc;
2216 rc_t rc_ov;
1819 rc_key_t key; 2217 rc_key_t key;
1820 rc_array_t *arr; 2218 rc_t::array_t *arr;
1821 2219
2220 pl_tex.name = 0;
2221
1822 // thats current max. sorry. 2222 // that's current max. sorry.
1823 if (sw > 255) sw = 255; 2223 if (sw > 255) sw = 255;
1824 if (sh > 255) sh = 255; 2224 if (sh > 255) sh = 255;
1825
1826 // clear key, in case of extra padding
1827 memset (&skey, 0, sizeof (skey));
1828 2225
1829 memset (&key, 0, sizeof (key)); 2226 memset (&key, 0, sizeof (key));
1830 key.r = 255; 2227 key.r = 255;
1831 key.g = 255; 2228 key.g = 255;
1832 key.b = 255; 2229 key.b = 255;
1833 key.a = 255; 2230 key.a = 255;
1834 key.mode = GL_QUADS; 2231 key.mode = GL_QUADS;
1835 key.format = GL_T2F_V3F; 2232 key.format = GL_T2F_V3F;
1836 key.texname = -1;
1837 2233
1838 mx += self->x; 2234 mx += self->x;
1839 my += self->y; 2235 my += self->y;
1840 2236
1841 // first pass: determine smooth_max 2237 // first pass: determine smooth_max
1842 // rather ugly, if you ask me 2238 // rather ugly, if you ask me
1843 // could also be stored inside mapcell and updated on change 2239 // could also be stored inside mapcell and updated on change
1844 memset (smooth_max, 0, sizeof (smooth_max)); 2240 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1845 2241
1846 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
1847 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
1848 { 2244 {
1849 maprow *row = self->row + (y + my); 2245 maprow *row = self->row + (y + my);
1864 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2260 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1865 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2261 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1866 2262
1867 for (z = 0; z <= 2; z++) 2263 for (z = 0; z <= 2; z++)
1868 { 2264 {
1869 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;
1870 2269
1871 for (y = 0; y < sh; y++) 2270 for (y = 0; y < sh; y++)
1872 if (0 <= y + my && y + my < self->rows) 2271 if (0 <= y + my && y + my < self->rows)
1873 { 2272 {
1874 maprow *row = self->row + (y + my); 2273 maprow *row = self->row + (y + my);
1884 maptex tex = self->tex [tile]; 2283 maptex tex = self->tex [tile];
1885 int px, py; 2284 int px, py;
1886 2285
1887 if (key.texname != tex.name) 2286 if (key.texname != tex.name)
1888 { 2287 {
2288 self->tex [tile].unused = 0;
2289
1889 if (!tex.name) 2290 if (!tex.name)
1890 tex = self->tex [2]; /* missing, replace by noface */ 2291 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1891 2292
1892 key.texname = tex.name; 2293 key.texname = tex.name;
1893 arr = rc_array (rc, &key); 2294 arr = &rc.array (key);
1894 } 2295 }
1895 2296
1896 px = (x + 1) * T - tex.w; 2297 px = (x + 1) * Th - tex.w;
1897 py = (y + 1) * T - tex.h; 2298 py = (y + 1) * Tw - tex.h;
1898 2299
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2300 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1901 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1902 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1903
1904 if (cell->flags && z == 2)
1905 { 2301 {
1906 // overlays such as the speech bubble, probably more to come 2302 pl_x = px;
1907 if (cell->flags & 1) 2303 pl_y = py;
2304 pl_tex = tex;
1908 { 2305 continue;
1909 maptex tex = self->tex [1];
1910 int px = x * T + T * 2 / 32;
1911 int py = y * T - T * 6 / 32;
1912
1913 if (tex.name)
1914 {
1915 if (key.texname != tex.name)
1916 {
1917 key.texname = tex.name;
1918 arr = rc_array (rc, &key);
1919 }
1920
1921 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1922 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1923 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1924 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1925 }
1926 }
1927 } 2306 }
2307
2308 arr->t2f_v3f (0 , 0 , px , py , 0);
2309 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2310 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2311 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1928 2312
1929 // update smooth hash 2313 // update smooth hash
1930 if (tex.smoothtile) 2314 if (tex.smoothtile)
1931 { 2315 {
1932 skey.tile = tex.smoothtile; 2316 skey.tile = tex.smoothtile;
1933 skey.level = tex.smoothlevel; 2317 skey.level = tex.smoothlevel;
1934 2318
1935 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2319 smooth_level[tex.smoothlevel] = 1;
1936 2320
1937 // 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
1938 // shifted +1|+1 so we always stay positive. 2322 // shifted +1|+1 so we always stay positive.
1939 2323
1940 // bits is ___n cccc CCCC bbbb 2324 // bits is ___n cccc CCCC bbbb
1948 2332
1949 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2333 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1950 // ·· ·· ·┏ ┓· 2334 // ·· ·· ·┏ ┓·
1951 2335
1952 // full tile 2336 // full tile
1953 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);
1954 2338
1955 // borders 2339 // borders
1956 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);
1957 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);
1958 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);
1959 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);
1960 2344
1961 // corners 2345 // corners
1962 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);
1963 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);
1964 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);
1965 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);
1966 } 2370 }
1967 } 2371 }
1968 } 2372 }
1969 } 2373 }
1970 2374
1971 rc_draw (rc); 2375 rc.draw ();
1972 rc_clear (rc); 2376 rc.clear ();
1973 2377
1974 // go through all smoothlevels, lowest to highest, then draw. 2378 // go through all smoothlevels, lowest to highest, then draw.
1975 // this is basically counting sort 2379 // this is basically counting sort
1976 { 2380 {
1977 int w, b; 2381 int w, b;
1978 2382
1979 glEnable (GL_TEXTURE_2D); 2383 glEnable (GL_TEXTURE_2D);
1980 glBegin (GL_QUADS); 2384 glBegin (GL_QUADS);
1981 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)
1982 { 2388 {
1983 uint32_t smask = smooth_level [w]; 2389 smooth_key &skey = it->first;
1984 if (smask) 2390 IV bits = it->second;
1985 for (b = 0; b < 32; ++b) 2391
1986 if (smask & (((uint32_t)1) << b)) 2392 if (!(bits & 0x1000)
2393 && skey.level == level
2394 && level > smooth_max [skey.x][skey.y])
1987 { 2395 {
1988 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
1989 HE *he; 2404 if (tex.name)
1990
1991 hv_iterinit (smooth);
1992 while ((he = hv_iternext (smooth)))
1993 { 2405 {
1994 smooth_key *skey = (smooth_key *)HeKEY (he); 2406 // this time avoiding texture state changes
1995 IV bits = SvIVX (HeVAL (he)); 2407 // save gobs of state changes.
1996 2408 if (key.texname != tex.name)
1997 if (!(bits & 0x1000)
1998 && skey->level == level
1999 && level > smooth_max [skey->x][skey->y])
2000 { 2409 {
2001 maptex tex = self->tex [skey->tile]; 2410 self->tex [skey.tile].unused = 0;
2002 int px = (((int)skey->x) - 1) * T;
2003 int py = (((int)skey->y) - 1) * T;
2004 int border = bits & 15;
2005 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2006 float dx = tex.s * .0625f; // 16 images/row
2007 float dy = tex.t * .5f ; // 2 images/column
2008 2411
2009 if (tex.name)
2010 {
2011 // this time avoiding texture state changes
2012 // save gobs of state changes.
2013 if (key.texname != tex.name)
2014 {
2015 glEnd (); 2412 glEnd ();
2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2017 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2018 } 2415 }
2019 2416
2020 if (border) 2417 if (border)
2021 { 2418 {
2022 float ox = border * dx; 2419 float ox = border * dx;
2023 2420
2024 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2025 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2026 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2027 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2028 } 2425 }
2029 2426
2030 if (corner) 2427 if (corner)
2031 { 2428 {
2032 float ox = corner * dx; 2429 float ox = corner * dx;
2033 2430
2034 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2035 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2036 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2037 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2038 }
2039 }
2040 } 2435 }
2041 } 2436 }
2042 } 2437 }
2043 } 2438 }
2044 2439
2045 glEnd (); 2440 glEnd ();
2046 glDisable (GL_TEXTURE_2D); 2441 glDisable (GL_TEXTURE_2D);
2047 key.texname = -1; 2442 key.texname = -1;
2048 } 2443 }
2049
2050 hv_clear (smooth);
2051 } 2444 }
2052 2445
2446 if (pl_tex.name)
2447 {
2448 maptex tex = pl_tex;
2449 int px = pl_x + sdx;
2450 int py = pl_y + sdy;
2451
2452 key.texname = tex.name;
2453 rc_t::array_t &arr = rc.array (key);
2454
2455 arr.t2f_v3f (0 , 0 , px , py , 0);
2456 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2457 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2458 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2459
2460 rc.draw ();
2461 }
2462
2463 rc_ov.draw ();
2464 rc_ov.clear ();
2465
2053 glDisable (GL_BLEND); 2466 glDisable (GL_BLEND);
2054 rc_free (rc);
2055 2467
2056 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2057 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2058 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2059 { 2471 {
2062 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
2063 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
2064 { 2476 {
2065 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2066 2478
2067 int px = x * T; 2479 int px = x * Tw;
2068 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 }
2069 2487
2070 if (cell->stat_hp) 2488 if (cell->stat_hp)
2071 { 2489 {
2072 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
2073 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2074 2492
2075 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
2076 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
2077 px + width - 1, py); 2495 px + width - 1, py);
2078 2496
2084 } 2502 }
2085 } 2503 }
2086} 2504}
2087 2505
2088void 2506void
2089draw_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)
2090 CODE: 2508 CODE:
2091{ 2509{
2092 static float color[16][3] = { 2510 static float color[16][3] = {
2093 { 0.00F, 0.00F, 0.00F }, 2511 { 0.00f, 0.00f, 0.00f },
2094 { 1.00F, 1.00F, 1.00F }, 2512 { 1.00f, 1.00f, 1.00f },
2095 { 0.00F, 0.00F, 0.55F }, 2513 { 0.00f, 0.00f, 0.55f },
2096 { 1.00F, 0.00F, 0.00F }, 2514 { 1.00f, 0.00f, 0.00f },
2097 2515
2098 { 1.00F, 0.54F, 0.00F }, 2516 { 1.00f, 0.54f, 0.00f },
2099 { 0.11F, 0.56F, 1.00F }, 2517 { 0.11f, 0.56f, 1.00f },
2100 { 0.93F, 0.46F, 0.00F }, 2518 { 0.93f, 0.46f, 0.00f },
2101 { 0.18F, 0.54F, 0.34F }, 2519 { 0.18f, 0.54f, 0.34f },
2102 2520
2103 { 0.56F, 0.73F, 0.56F }, 2521 { 0.56f, 0.73f, 0.56f },
2104 { 0.80F, 0.80F, 0.80F }, 2522 { 0.80f, 0.80f, 0.80f },
2105 { 0.55F, 0.41F, 0.13F }, 2523 { 0.55f, 0.41f, 0.13f },
2106 { 0.99F, 0.77F, 0.26F }, 2524 { 0.99f, 0.77f, 0.26f },
2107 2525
2108 { 0.74F, 0.65F, 0.41F }, 2526 { 0.74f, 0.65f, 0.41f },
2109 2527
2110 { 0.00F, 1.00F, 1.00F }, 2528 { 0.00f, 1.00f, 1.00f },
2111 { 1.00F, 0.00F, 1.00F }, 2529 { 1.00f, 0.00f, 1.00f },
2112 { 1.00F, 1.00F, 0.00F }, 2530 { 1.00f, 1.00f, 0.00f },
2113 }; 2531 };
2114 2532
2115 int x, y; 2533 int x, y;
2116 2534
2117 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 */
2118 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2542 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2119 glEnable (GL_BLEND); 2543 glEnable (GL_BLEND);
2120 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2544 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2121 glBegin (GL_QUADS); 2545 glBegin (GL_QUADS);
2122 2546
2123 for (y = 0; y < h; y++) 2547 for (y = 0; y < h; y++)
2127 2551
2128 if (m) 2552 if (m)
2129 { 2553 {
2130 float *c = color [m & 15]; 2554 float *c = color [m & 15];
2131 2555
2132 float tx1 = m & 0x40 ? 0.5 : 0.; 2556 float tx1 = m & 0x40 ? 0.5f : 0.f;
2133 float tx2 = tx1 + 0.5; 2557 float tx2 = tx1 + 0.5f;
2134 2558
2135 glColor4f (c[0], c[1], c[2], 0.75); 2559 glColor4f (c[0], c[1], c[2], 1);
2136 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2560 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2137 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2561 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2138 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2562 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2139 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2563 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2140 } 2564 }
2148void 2572void
2149fow_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)
2150 PPCODE: 2574 PPCODE:
2151{ 2575{
2152 int x, y; 2576 int x, y;
2153 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2154 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2155 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2156 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);
2157 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2158 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2584 memset (darkness1, 0, sw1*sh1);
2159 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2160 2585
2161 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2162 SvCUR_set (darkness3_sv, sw34 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2163 2588
2164 mx += self->x - 1; 2589 mx += self->x - 1;
2165 my += self->y - 1; 2590 my += self->y - 1;
2166
2167 memset (darkness1, 255, sw1 * sh1);
2168 2591
2169 for (y = 0; y < sh1; y++) 2592 for (y = 0; y < sh1; y++)
2170 if (0 <= y + my && y + my < self->rows) 2593 if (0 <= y + my && y + my < self->rows)
2171 { 2594 {
2172 maprow *row = self->row + (y + my); 2595 maprow *row = self->row + (y + my);
2175 if (row->c0 <= x + mx && x + mx < row->c1) 2598 if (row->c0 <= x + mx && x + mx < row->c1)
2176 { 2599 {
2177 mapcell *cell = row->col + (x + mx - row->c0); 2600 mapcell *cell = row->col + (x + mx - row->c0);
2178 2601
2179 darkness1 [y * sw1 + x] = cell->darkness 2602 darkness1 [y * sw1 + x] = cell->darkness
2180 ? 255 - (cell->darkness - 1) 2603 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2181 : 255 - FOW_DARKNESS; 2604 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2182 } 2605 }
2183 } 2606 }
2184 2607
2185 for (y = 0; y < sh; ++y) 2608 for (y = 0; y < sh; ++y)
2186 for (x = 0; x < sw; ++x) 2609 for (x = 0; x < sw; ++x)
2205 2628
2206 uint8_t r13 = (d13 + d23 + d12) / 3; 2629 uint8_t r13 = (d13 + d23 + d12) / 3;
2207 uint8_t r23 = d23; 2630 uint8_t r23 = d23;
2208 uint8_t r33 = (d23 + d33 + d32) / 3; 2631 uint8_t r33 = (d23 + d33 + d32) / 3;
2209 2632
2210 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2633 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2211 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2212 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2213 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2636 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2214 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 */
2215 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2216 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2639 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2217 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2218 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2219 } 2642 }
2220 2643
2221 free (darkness1); 2644 free (darkness1);
2222 2645
2223 EXTEND (SP, 3); 2646 EXTEND (SP, 3);
2224 PUSHs (sv_2mortal (newSViv (sw34))); 2647 PUSHs (sv_2mortal (newSViv (sw3)));
2225 PUSHs (sv_2mortal (newSViv (sh3))); 2648 PUSHs (sv_2mortal (newSViv (sh3)));
2226 PUSHs (darkness3_sv); 2649 PUSHs (darkness3_sv);
2227} 2650}
2228 2651
2229SV * 2652SV *
2292 else 2715 else
2293 *data++ = 0; 2716 *data++ = 0;
2294 } 2717 }
2295 } 2718 }
2296 2719
2720 /* if size is w*h + 5 then no data has been found */
2721 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2722 {
2297 SvPOK_only (data_sv); 2723 SvPOK_only (data_sv);
2298 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2725 }
2726
2299 RETVAL = data_sv; 2727 RETVAL = data_sv;
2300} 2728}
2301 OUTPUT: 2729 OUTPUT:
2302 RETVAL 2730 RETVAL
2303 2731
2304void 2732void
2305set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2733set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2306 PPCODE: 2734 PPCODE:
2307{ 2735{
2308 int x, y, z; 2736 int x, y, z;
2309 int w, h; 2737 int w, h;
2310 int x1, y1; 2738 int x1, y1;
2739 STRLEN len;
2740 uint8_t *data, *end;
2741
2742 len = SvLEN (data_sv);
2743 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2744 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2745 end = data + len + 8;
2746
2747 if (len < 5)
2748 XSRETURN_EMPTY;
2311 2749
2312 if (*data++ != 0) 2750 if (*data++ != 0)
2313 XSRETURN_EMPTY; /* version mismatch */ 2751 XSRETURN_EMPTY; /* version mismatch */
2314 2752
2315 w = *data++ << 8; w |= *data++; 2753 w = *data++ << 8; w |= *data++;
2330 { 2768 {
2331 maprow *row = map_get_row (self, y); 2769 maprow *row = map_get_row (self, y);
2332 2770
2333 for (x = x0; x < x1; x++) 2771 for (x = x0; x < x1; x++)
2334 { 2772 {
2773 uint8_t flags;
2774
2775 if (data + 7 >= end)
2776 XSRETURN_EMPTY;
2777
2335 uint8_t flags = *data++; 2778 flags = *data++;
2336 2779
2337 if (flags) 2780 if (flags)
2338 { 2781 {
2339 mapcell *cell = row_get_cell (row, x); 2782 mapcell *cell = row_get_cell (row, x);
2340 tileid tile[3] = { 0, 0, 0 }; 2783 tileid tile[3] = { 0, 0, 0 };
2343 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2786 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2344 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2787 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2345 2788
2346 if (cell->darkness == 0) 2789 if (cell->darkness == 0)
2347 { 2790 {
2348 cell->darkness = 0; 2791 /*cell->darkness = 0;*/
2792 EXTEND (SP, 3);
2349 2793
2350 for (z = 0; z <= 2; z++) 2794 for (z = 0; z <= 2; z++)
2351 { 2795 {
2352 tileid t = tile [z]; 2796 tileid t = tile [z];
2353 2797
2354 if (t >= self->texs || (t && !self->tex [t].name)) 2798 if (t >= self->texs || (t && !self->tex [t].name))
2355 { 2799 {
2356 XPUSHs (sv_2mortal (newSViv (t))); 2800 PUSHs (sv_2mortal (newSViv (t)));
2357 need_texid (self, t); 2801 need_texid (self, t);
2358 } 2802 }
2359 2803
2360 cell->tile [z] = t; 2804 cell->tile [z] = t;
2361 } 2805 }
2366} 2810}
2367 2811
2368MODULE = Deliantra::Client PACKAGE = DC::RW 2812MODULE = Deliantra::Client PACKAGE = DC::RW
2369 2813
2370DC::RW 2814DC::RW
2371new (SV *class, SV *data_sv) 2815new (SV *klass, SV *data_sv)
2372 CODE: 2816 CODE:
2373{ 2817{
2374 STRLEN datalen; 2818 STRLEN datalen;
2375 char *data = SvPVbyte (data_sv, datalen); 2819 char *data = SvPVbyte (data_sv, datalen);
2376 2820
2378} 2822}
2379 OUTPUT: 2823 OUTPUT:
2380 RETVAL 2824 RETVAL
2381 2825
2382DC::RW 2826DC::RW
2383new_from_file (SV *class, const char *path, const char *mode = "rb") 2827new_from_file (SV *klass, const char *path, const char *mode = "rb")
2384 CODE: 2828 CODE:
2385 RETVAL = SDL_RWFromFile (path, mode); 2829 RETVAL = SDL_RWFromFile (path, mode);
2386 OUTPUT: 2830 OUTPUT:
2387 RETVAL 2831 RETVAL
2388 2832
2406 if (RETVAL < 0) 2850 if (RETVAL < 0)
2407 { 2851 {
2408 RETVAL = Mix_GroupOldest (-1); 2852 RETVAL = Mix_GroupOldest (-1);
2409 2853
2410 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)
2411 XSRETURN_UNDEF; 2860 XSRETURN_UNDEF;
2412 2861 }
2862 else
2413 Mix_HaltChannel (RETVAL); 2863 Mix_HaltChannel (RETVAL);
2414 } 2864 }
2415 2865
2416 Mix_UnregisterAllEffects (RETVAL); 2866 Mix_UnregisterAllEffects (RETVAL);
2417 Mix_Volume (RETVAL, 128); 2867 Mix_Volume (RETVAL, 128);
2418} 2868}
2465void 2915void
2466set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2916set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2467 CODE: 2917 CODE:
2468{ 2918{
2469 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));
2470 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;
2471 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2921 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2472} 2922}
2473 2923
2474void 2924void
2475set_reverse_stereo (DC::Channel self, int flip) 2925set_reverse_stereo (DC::Channel self, int flip)
2478 2928
2479MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2480 2930
2481PROTOTYPES: DISABLE 2931PROTOTYPES: DISABLE
2482 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
2483DC::MixChunk 2945DC::MixChunk
2484new (SV *class, DC::RW rwops) 2946new (SV *klass, DC::RW rwops)
2485 CODE: 2947 CODE:
2486 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2487 OUTPUT: 2949 OUTPUT:
2488 RETVAL 2950 RETVAL
2489 2951
2519 OUTPUT: 2981 OUTPUT:
2520 RETVAL 2982 RETVAL
2521 2983
2522MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2984MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2523 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
2524int 2998int
2525volume (int volume = -1) 2999volume (int volume = -1)
2526 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2527 CODE: 3001 CODE:
2528 if (items > 0) 3002 if (items > 0)
2539void 3013void
2540halt () 3014halt ()
2541 CODE: 3015 CODE:
2542 Mix_HaltMusic (); 3016 Mix_HaltMusic ();
2543 3017
3018int
3019playing ()
3020 CODE:
3021 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT:
3023 RETVAL
3024
2544DC::MixMusic 3025DC::MixMusic
2545new (SV *class, DC::RW rwops) 3026new (SV *klass, DC::RW rwops)
2546 CODE: 3027 CODE:
2547 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
2548 OUTPUT: 3029 OUTPUT:
2549 RETVAL 3030 RETVAL
2550 3031
2578 } *civ, const_iv[] = { 3059 } *civ, const_iv[] = {
2579# define const_iv(name) { # name, (IV)name } 3060# define const_iv(name) { # name, (IV)name }
2580 const_iv (GL_VENDOR), 3061 const_iv (GL_VENDOR),
2581 const_iv (GL_VERSION), 3062 const_iv (GL_VERSION),
2582 const_iv (GL_EXTENSIONS), 3063 const_iv (GL_EXTENSIONS),
3064 const_iv (GL_MAX_TEXTURE_UNITS),
2583 const_iv (GL_COLOR_MATERIAL), 3065 const_iv (GL_COLOR_MATERIAL),
2584 const_iv (GL_SMOOTH), 3066 const_iv (GL_SMOOTH),
2585 const_iv (GL_FLAT), 3067 const_iv (GL_FLAT),
2586 const_iv (GL_DITHER), 3068 const_iv (GL_DITHER),
2587 const_iv (GL_BLEND), 3069 const_iv (GL_BLEND),
2599 const_iv (GL_ZERO), 3081 const_iv (GL_ZERO),
2600 const_iv (GL_SRC_ALPHA), 3082 const_iv (GL_SRC_ALPHA),
2601 const_iv (GL_DST_ALPHA), 3083 const_iv (GL_DST_ALPHA),
2602 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3084 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2603 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),
2604 const_iv (GL_SRC_ALPHA_SATURATE), 3090 const_iv (GL_SRC_ALPHA_SATURATE),
2605 const_iv (GL_RGB), 3091 const_iv (GL_RGB),
2606 const_iv (GL_RGBA), 3092 const_iv (GL_RGBA),
2607 const_iv (GL_RGBA4), 3093 const_iv (GL_RGBA4),
2608 const_iv (GL_RGBA8), 3094 const_iv (GL_RGBA8),
2676 const_iv (GL_NICEST), 3162 const_iv (GL_NICEST),
2677 const_iv (GL_V2F), 3163 const_iv (GL_V2F),
2678 const_iv (GL_V3F), 3164 const_iv (GL_V3F),
2679 const_iv (GL_T2F_V3F), 3165 const_iv (GL_T2F_V3F),
2680 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),
2681# undef const_iv 3170# undef const_iv
2682 }; 3171 };
2683 3172
2684 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--)
2685 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2686 3175
2687 texture_av = newAV (); 3176 texture_av = newAV ();
2688 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
2689} 3178}
2690 3179
2692disable_GL_EXT_blend_func_separate () 3181disable_GL_EXT_blend_func_separate ()
2693 CODE: 3182 CODE:
2694 gl.BlendFuncSeparate = 0; 3183 gl.BlendFuncSeparate = 0;
2695 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
2696 3185
2697char * 3186void
3187apple_nvidia_bug (int enable)
3188
3189const char *
2698gl_vendor () 3190gl_vendor ()
2699 CODE: 3191 CODE:
2700 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (const char *)glGetString (GL_VENDOR);
2701 OUTPUT: 3193 OUTPUT:
2702 RETVAL 3194 RETVAL
2703 3195
2704char * 3196const char *
2705gl_version () 3197gl_version ()
2706 CODE: 3198 CODE:
2707 RETVAL = (char *)glGetString (GL_VERSION); 3199 RETVAL = (const char *)glGetString (GL_VERSION);
2708 OUTPUT: 3200 OUTPUT:
2709 RETVAL 3201 RETVAL
2710 3202
2711char * 3203const char *
2712gl_extensions () 3204gl_extensions ()
2713 CODE: 3205 CODE:
2714 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3206 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2715 OUTPUT: 3207 OUTPUT:
2716 RETVAL 3208 RETVAL
2717 3209
2718const char *glGetString (GLenum pname) 3210const char *glGetString (GLenum pname)
3211 CODE:
3212 RETVAL = (const char *)glGetString (pname);
3213 OUTPUT:
3214 RETVAL
2719 3215
2720GLint glGetInteger (GLenum pname) 3216GLint glGetInteger (GLenum pname)
2721 CODE: 3217 CODE:
2722 glGetIntegerv (pname, &RETVAL); 3218 glGetIntegerv (pname, &RETVAL);
2723 OUTPUT: 3219 OUTPUT:
2731 3227
2732int glGetError () 3228int glGetError ()
2733 3229
2734void glFinish () 3230void glFinish ()
2735 3231
3232void glFlush ()
3233
2736void glClear (int mask) 3234void glClear (int mask)
2737 3235
2738void glClearColor (float r, float g, float b, float a = 1.0) 3236void glClearColor (float r, float g, float b, float a = 1.0)
2739 PROTOTYPE: @ 3237 PROTOTYPE: @
2740 3238
2749void glBlendFunc (int sfactor, int dfactor) 3247void glBlendFunc (int sfactor, int dfactor)
2750 3248
2751void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3249void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2752 CODE: 3250 CODE:
2753 gl_BlendFuncSeparate (sa, da, saa, daa); 3251 gl_BlendFuncSeparate (sa, da, saa, daa);
3252
3253# void glBlendEquation (int se)
2754 3254
2755void glDepthMask (int flag) 3255void glDepthMask (int flag)
2756 3256
2757void glLogicOp (int opcode) 3257void glLogicOp (int opcode)
2758 3258
2793void glRotate (float angle, float x, float y, float z) 3293void glRotate (float angle, float x, float y, float z)
2794 CODE: 3294 CODE:
2795 glRotatef (angle, x, y, z); 3295 glRotatef (angle, x, y, z);
2796 3296
2797void 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: @
2798 ALIAS: 3299 ALIAS:
2799 glColor_premultiply = 1 3300 glColor_premultiply = 1
2800 CODE: 3301 CODE:
2801 if (ix) 3302 if (ix)
2802 { 3303 {
2908 3409
2909void glEndList () 3410void glEndList ()
2910 3411
2911void glCallList (int list) 3412void glCallList (int list)
2912 3413
3414void c_init ()
3415 CODE:
3416 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3417 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3418
2913MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3419MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2914 3420
2915PROTOTYPES: DISABLE 3421PROTOTYPES: DISABLE
2916 3422
2917void 3423void
2918find_widget (SV *self, NV x, NV y) 3424find_widget (SV *self, NV x, NV y)
2919 PPCODE: 3425 PPCODE:
2920{ 3426{
2921 if (within_widget (self, x, y)) 3427 if (within_widget (self, x, y))
2922 XPUSHs (self); 3428 XPUSHs (self);
2923} 3429}
2924 3430
2925BOOT: 3431BOOT:
2926{ 3432{
2934 3440
2935void 3441void
2936draw (SV *self) 3442draw (SV *self)
2937 CODE: 3443 CODE:
2938{ 3444{
2939 HV *hv; 3445 HV *hv;
2940 SV **svp; 3446 SV **svp;
2941 NV x, y, w, h; 3447 NV x, y, w, h;
2942 SV *draw_x_sv = GvSV (draw_x_gv); 3448 SV *draw_x_sv = GvSV (draw_x_gv);
2943 SV *draw_y_sv = GvSV (draw_y_gv); 3449 SV *draw_y_sv = GvSV (draw_y_gv);
2944 SV *draw_w_sv = GvSV (draw_w_gv); 3450 SV *draw_w_sv = GvSV (draw_w_gv);
2945 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