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.265 by root, Fri Jul 18 22:56:11 2008 UTC vs.
Revision 1.332 by root, Mon Nov 19 00:56:08 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
694 866
695NV ceil (NV x) 867NV ceil (NV x)
696 868
697IV minpot (UV n) 869IV minpot (UV n)
698 870
871UV ld32 (UV n)
872 CODE:
873 RETVAL = ecb_ld32 (n);
874 OUTPUT:
875 RETVAL
876
699IV popcount (UV n) 877IV popcount (UV n)
878 CODE:
879 RETVAL = ecb_popcount32 (n);
880 OUTPUT:
881 RETVAL
882
883NV distance (NV dx, NV dy)
884 CODE:
885 RETVAL = pow (dx * dx + dy * dy, 0.5);
886 OUTPUT:
887 RETVAL
700 888
701void 889void
702pango_init () 890pango_init ()
703 CODE: 891 CODE:
704{ 892{
712#endif 900#endif
713} 901}
714 902
715char *SDL_GetError () 903char *SDL_GetError ()
716 904
905void SDL_main_hack (SV *real_main)
906 PROTOTYPE: &
907
717int SDL_Init (U32 flags) 908int SDL_Init (U32 flags)
718 909
719int SDL_InitSubSystem (U32 flags) 910int SDL_InitSubSystem (U32 flags)
720 911
721void SDL_QuitSubSystem (U32 flags) 912void SDL_QuitSubSystem (U32 flags)
722 913
723void SDL_Quit () 914void SDL_Quit ()
724 915
725int SDL_GL_SetAttribute (int attr, int value) 916int SDL_GL_SetAttribute (int attr, int value)
917 C_ARGS: (SDL_GLattr)attr, value
726 918
727int SDL_GL_GetAttribute (int attr) 919int SDL_GL_GetAttribute (int attr)
728 CODE: 920 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL)) 921 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
730 XSRETURN_UNDEF; 922 XSRETURN_UNDEF;
731 OUTPUT: 923 OUTPUT:
732 RETVAL 924 RETVAL
733 925
734void 926void
789 ); 981 );
790 982
791 if (RETVAL) 983 if (RETVAL)
792 { 984 {
793 av_clear (texture_av); 985 av_clear (texture_av);
794
795 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
796#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 986#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
797#include "glfunc.h" 987#include "glfunc.h"
798#undef GL_FUNC 988#undef GL_FUNC
989 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
990 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
799 } 991 }
800} 992}
801 OUTPUT: 993 OUTPUT:
802 RETVAL 994 RETVAL
995
996void
997SDL_WM_SetCaption (const char *title, const char *icon)
803 998
804void 999void
805SDL_GL_SwapBuffers () 1000SDL_GL_SwapBuffers ()
806 1001
807char * 1002char *
808SDL_GetKeyName (int sym) 1003SDL_GetKeyName (int sym)
1004 C_ARGS: (SDLKey)sym
809 1005
810int 1006int
811SDL_GetAppState () 1007SDL_GetAppState ()
812 1008
813int 1009int
814SDL_GetModState () 1010SDL_GetModState ()
815 1011
1012int
1013SDL_WaitEvent ()
1014 C_ARGS: 0
1015
816void 1016void
1017SDL_PumpEvents ()
1018
1019void
817poll_events () 1020peep_events ()
818 PPCODE: 1021 PPCODE:
819{ 1022{
820 SDL_Event ev; 1023 SDL_Event ev;
821 1024
822 SDL_PumpEvents (); 1025 SDL_PumpEvents ();
829 { 1032 {
830 case SDL_KEYDOWN: 1033 case SDL_KEYDOWN:
831 case SDL_KEYUP: 1034 case SDL_KEYUP:
832 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1035 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
833 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1036 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
834 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1037 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
835 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1038 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
836 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1039 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
837 break; 1040 break;
838 1041
839 case SDL_ACTIVEEVENT: 1042 case SDL_ACTIVEEVENT:
840 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1043 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
858 x = ev.motion.x; 1061 x = ev.motion.x;
859 y = ev.motion.y; 1062 y = ev.motion.y;
860 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1063 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
861 } 1064 }
862 1065
863 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1066 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
864 hv_store (hv, "state", 5, newSViv (state), 0); 1067 hv_store (hv, "state", 5, newSViv (state), 0);
865 hv_store (hv, "x", 1, newSViv (x), 0); 1068 hv_store (hv, "x", 1, newSViv (x), 0);
866 hv_store (hv, "y", 1, newSViv (y), 0); 1069 hv_store (hv, "y", 1, newSViv (y), 0);
867 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1070 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
868 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1071 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
888 1091
889 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1092 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
890 } 1093 }
891} 1094}
892 1095
1096char *
1097SDL_AudioDriverName ()
1098 CODE:
1099{
1100 char buf [256];
1101 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1102 XSRETURN_UNDEF;
1103
1104 RETVAL = buf;
1105}
1106 OUTPUT:
1107 RETVAL
1108
893int 1109int
894Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1110Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
895 POSTCALL: 1111 POSTCALL:
896 Mix_HookMusicFinished (music_finished); 1112 Mix_HookMusicFinished (music_finished);
897 Mix_ChannelFinished (channel_finished); 1113 Mix_ChannelFinished (channel_finished);
898 1114
899void 1115void
900Mix_QuerySpec () 1116Mix_QuerySpec ()
959add_font (char *file) 1175add_font (char *file)
960 CODE: 1176 CODE:
961 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1177 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
962 OUTPUT: 1178 OUTPUT:
963 RETVAL 1179 RETVAL
1180
1181void
1182IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1183
1184# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1185void
1186Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
964 1187
965void 1188void
966load_image_inline (SV *image_) 1189load_image_inline (SV *image_)
967 ALIAS: 1190 ALIAS:
968 load_image_file = 1 1191 load_image_file = 1
1014 1237
1015 SDL_LockSurface (surface2); 1238 SDL_LockSurface (surface2);
1016 EXTEND (SP, 6); 1239 EXTEND (SP, 6);
1017 PUSHs (sv_2mortal (newSViv (surface2->w))); 1240 PUSHs (sv_2mortal (newSViv (surface2->w)));
1018 PUSHs (sv_2mortal (newSViv (surface2->h))); 1241 PUSHs (sv_2mortal (newSViv (surface2->h)));
1019 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1242 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1020 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1243 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1021 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1244 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1022 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1245 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1023 SDL_UnlockSurface (surface2); 1246 SDL_UnlockSurface (surface2);
1024 1247
1084#if DEBUG 1307#if DEBUG
1085 VALGRIND_DO_LEAK_CHECK; 1308 VALGRIND_DO_LEAK_CHECK;
1086#endif 1309#endif
1087} 1310}
1088 1311
1312int
1313SvREFCNT (SV *sv)
1314 CODE:
1315 RETVAL = SvREFCNT (sv);
1316 OUTPUT:
1317 RETVAL
1318
1089MODULE = Deliantra::Client PACKAGE = DC::Font 1319MODULE = Deliantra::Client PACKAGE = DC::Font
1090 1320
1091PROTOTYPES: DISABLE 1321PROTOTYPES: DISABLE
1092 1322
1093DC::Font 1323DC::Font
1094new_from_file (SV *class, char *path, int id = 0) 1324new_from_file (SV *klass, char *path, int id = 0)
1095 CODE: 1325 CODE:
1096{ 1326{
1097 int count; 1327 int count;
1098 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1328 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1099 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1329 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1128 PROTOTYPE: 1358 PROTOTYPE:
1129 CODE: 1359 CODE:
1130 tc_restore (); 1360 tc_restore ();
1131 1361
1132DC::Layout 1362DC::Layout
1133new (SV *class) 1363new (SV *klass)
1134 CODE: 1364 CODE:
1135 New (0, RETVAL, 1, struct cf_layout); 1365 RETVAL = new cf_layout;
1136 1366
1137 RETVAL->pl = pango_layout_new (opengl_context); 1367 RETVAL->pl = pango_layout_new (opengl_context);
1138 RETVAL->r = 1.; 1368 RETVAL->r = 1.;
1139 RETVAL->g = 1.; 1369 RETVAL->g = 1.;
1140 RETVAL->b = 1.; 1370 RETVAL->b = 1.;
1141 RETVAL->a = 1.; 1371 RETVAL->a = 1.;
1142 RETVAL->base_height = MIN_FONT_HEIGHT; 1372 RETVAL->base_height = MIN_FONT_HEIGHT;
1143 RETVAL->font = 0; 1373 RETVAL->font = 0;
1144 RETVAL->rc = rc_alloc ();
1145 1374
1146 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1375 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1147 layout_update_font (RETVAL); 1376 layout_update_font (RETVAL);
1148 OUTPUT: 1377 OUTPUT:
1149 RETVAL 1378 RETVAL
1150 1379
1151void 1380void
1152DESTROY (DC::Layout self) 1381DESTROY (DC::Layout self)
1153 CODE: 1382 CODE:
1154 g_object_unref (self->pl); 1383 g_object_unref (self->pl);
1155 rc_free (self->rc);
1156 Safefree (self); 1384 delete self;
1157 1385
1158void 1386void
1159set_text (DC::Layout self, SV *text_) 1387set_text (DC::Layout self, SV *text_)
1160 CODE: 1388 CODE:
1161{ 1389{
1287 1515
1288void 1516void
1289set_height (DC::Layout self, int base_height) 1517set_height (DC::Layout self, int base_height)
1290 CODE: 1518 CODE:
1291 if (self->base_height != base_height) 1519 if (self->base_height != base_height)
1292 { 1520 {
1293 self->base_height = base_height; 1521 self->base_height = base_height;
1294 layout_update_font (self); 1522 layout_update_font (self);
1295 } 1523 }
1296 1524
1297void 1525void
1415} 1643}
1416 1644
1417void 1645void
1418render (DC::Layout self, float x, float y, int flags = 0) 1646render (DC::Layout self, float x, float y, int flags = 0)
1419 CODE: 1647 CODE:
1420 rc_clear (self->rc); 1648 self->rc.clear ();
1421 pango_opengl_render_layout_subpixel ( 1649 pango_opengl_render_layout_subpixel (
1422 self->pl, 1650 self->pl,
1423 self->rc, 1651 &self->rc,
1424 x * PANGO_SCALE, y * PANGO_SCALE, 1652 x * PANGO_SCALE, y * PANGO_SCALE,
1425 self->r, self->g, self->b, self->a, 1653 self->r, self->g, self->b, self->a,
1426 flags 1654 flags
1427 ); 1655 );
1428 // we assume that context_change actually clears/frees stuff 1656 // we assume that context_change actually clears/frees stuff
1439 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1667 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1440 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1668 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1441 glEnable (GL_ALPHA_TEST); 1669 glEnable (GL_ALPHA_TEST);
1442 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1670 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1443 1671
1444 rc_draw (self->rc); 1672 self->rc.draw ();
1445 1673
1446 glDisable (GL_ALPHA_TEST); 1674 glDisable (GL_ALPHA_TEST);
1447 glDisable (GL_BLEND); 1675 glDisable (GL_BLEND);
1448 glDisable (GL_TEXTURE_2D); 1676 glDisable (GL_TEXTURE_2D);
1449} 1677}
1524 glDisable (GL_ALPHA_TEST); 1752 glDisable (GL_ALPHA_TEST);
1525 glDisable (GL_BLEND); 1753 glDisable (GL_BLEND);
1526 } 1754 }
1527} 1755}
1528 1756
1757void
1758draw_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)
1759 PROTOTYPE: @
1760 CODE:
1761{
1762 glEnable (GL_BLEND);
1763 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1764 glEnable (GL_TEXTURE_2D);
1765 glBindTexture (GL_TEXTURE_2D, name1);
1766
1767 glColor3f (intensity, intensity, intensity);
1768 glPushMatrix ();
1769 glScalef (1./3, 1./3, 1.);
1770
1771 if (blend > 0.f)
1772 {
1773 float dx3 = dx * -3.f / w;
1774 float dy3 = dy * -3.f / h;
1775 GLfloat env_color[4] = { 0., 0., 0., blend };
1776
1777 /* interpolate the two shadow textures */
1778 /* stage 0 == rgb(glcolor) + alpha(t0) */
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1780
1781 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1782 gl.ActiveTexture (GL_TEXTURE1);
1783 glEnable (GL_TEXTURE_2D);
1784 glBindTexture (GL_TEXTURE_2D, name2);
1785 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1786
1787 /* rgb == rgb(glcolor) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1789 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1791
1792 /* alpha = interpolate t0, t1 by env_alpha */
1793 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1794
1795 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1798
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1804
1805 glBegin (GL_QUADS);
1806 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1807 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1808 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1810 glEnd ();
1811
1812 glDisable (GL_TEXTURE_2D);
1813 gl.ActiveTexture (GL_TEXTURE0);
1814 }
1815 else
1816 {
1817 /* simple blending of one texture, also opengl <1.3 path */
1818 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1819
1820 glBegin (GL_QUADS);
1821 glTexCoord2f (0, 0); glVertex2f (0, 0);
1822 glTexCoord2f (0, t); glVertex2f (0, h);
1823 glTexCoord2f (s, t); glVertex2f (w, h);
1824 glTexCoord2f (s, 0); glVertex2f (w, 0);
1825 glEnd ();
1826 }
1827
1828 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1829 {
1830 int x, y;
1831 int dx3 = dx * 3;
1832 int dy3 = dy * 3;
1833
1834 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1835 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1836 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1837 glTranslatef (-1., -1., 0);
1838 glBegin (GL_QUADS);
1839
1840 for (y = 1; y < h; y += 3)
1841 {
1842 int y1 = y - dy3;
1843 int y1valid = y1 >= 0 && y1 < h;
1844
1845 for (x = 1; x < w; x += 3)
1846 {
1847 int x1 = x - dx3;
1848 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1849 uint8_t h2;
1850
1851 if (y1valid && x1 >= 0 && x1 < w)
1852 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1853 else
1854 h2 = 1; /* out of range == invisible */
1855
1856 if (h1 || h2)
1857 {
1858 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1859 glColor4f (1., 1., 1., alpha);
1860
1861 glTexCoord2f (0, 0.); glVertex2i (x , y );
1862 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1863 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1864 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1865 }
1866 }
1867 }
1868 }
1869
1870 glEnd ();
1871
1872 glPopMatrix ();
1873
1874 glDisable (GL_TEXTURE_2D);
1875 glDisable (GL_BLEND);
1876}
1877
1529IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1878IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1530 CODE: 1879 CODE:
1531{ 1880{
1532 GLint width; 1881 GLint width;
1533 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1882 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1540MODULE = Deliantra::Client PACKAGE = DC::Map 1889MODULE = Deliantra::Client PACKAGE = DC::Map
1541 1890
1542PROTOTYPES: DISABLE 1891PROTOTYPES: DISABLE
1543 1892
1544DC::Map 1893DC::Map
1545new (SV *class) 1894new (SV *klass)
1546 CODE: 1895 CODE:
1547 New (0, RETVAL, 1, struct map); 1896 New (0, RETVAL, 1, mapgrid);
1548 RETVAL->x = 0; 1897 RETVAL->x = 0;
1549 RETVAL->y = 0; 1898 RETVAL->y = 0;
1550 RETVAL->w = 0; 1899 RETVAL->w = 0;
1551 RETVAL->h = 0; 1900 RETVAL->h = 0;
1552 RETVAL->ox = 0; 1901 RETVAL->ox = 0;
1589 1938
1590void 1939void
1591set_smooth (DC::Map self, int face, int smooth, int level) 1940set_smooth (DC::Map self, int face, int smooth, int level)
1592 CODE: 1941 CODE:
1593{ 1942{
1594 tileid texid; 1943 tileid texid;
1595 maptex *tex; 1944 maptex *tex;
1596 1945
1597 if (face < 0 || face >= self->faces) 1946 if (face < 0 || face >= self->faces)
1598 return; 1947 return;
1599 1948
1600 if (smooth < 0 || smooth >= self->faces) 1949 if (smooth < 0 || smooth >= self->faces)
1601 return; 1950 return;
1602 1951
1603 texid = self->face2tile [face]; 1952 texid = self->face2tile [face];
1604 1953
1605 if (!texid) 1954 if (!texid)
1606 return; 1955 return;
1607 1956
1608 tex = self->tex + texid; 1957 tex = self->tex + texid;
1637 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1986 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1638 // use uglier nearest interpolation because linear suffers 1987 // use uglier nearest interpolation because linear suffers
1639 // from transparent color bleeding and ugly wrapping effects. 1988 // from transparent color bleeding and ugly wrapping effects.
1640 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1989 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1641} 1990}
1991
1992void
1993expire_textures (DC::Map self, int texid, int count)
1994 PPCODE:
1995 for (; texid < self->texs && count; ++texid, --count)
1996 {
1997 maptex *tex = self->tex + texid;
1998
1999 if (tex->name)
2000 {
2001 if (tex->unused)
2002 {
2003 tex->name = 0;
2004 tex->unused = 0;
2005 XPUSHs (sv_2mortal (newSViv (texid)));
2006 }
2007 else
2008 tex->unused = 1;
2009 }
2010 }
1642 2011
1643int 2012int
1644ox (DC::Map self) 2013ox (DC::Map self)
1645 ALIAS: 2014 ALIAS:
1646 oy = 1 2015 oy = 1
1678 self->ox += dx; self->x += dx; 2047 self->ox += dx; self->x += dx;
1679 self->oy += dy; self->y += dy; 2048 self->oy += dy; self->y += dy;
1680 2049
1681 while (self->y < 0) 2050 while (self->y < 0)
1682 { 2051 {
1683 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2052 prepend (self->row, self->rows, MAP_EXTEND_Y);
1684 2053
1685 self->rows += MAP_EXTEND_Y; 2054 self->rows += MAP_EXTEND_Y;
1686 self->y += MAP_EXTEND_Y; 2055 self->y += MAP_EXTEND_Y;
1687 } 2056 }
1688} 2057}
1689 2058
1690SV * 2059SV *
1691map1a_update (DC::Map self, SV *data_, int extmap) 2060map1a_update (DC::Map self, SV *data_)
1692 CODE: 2061 CODE:
1693{ 2062{
1694 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2063 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1695 uint8_t *data_end = (uint8_t *)SvEND (data_); 2064 uint8_t *data_end = (uint8_t *)SvEND (data_);
1696 mapcell *cell; 2065 mapcell *cell;
1717 2086
1718 //TODO: don't trust server data to be in-range(!) 2087 //TODO: don't trust server data to be in-range(!)
1719 2088
1720 if (flags & 8) 2089 if (flags & 8)
1721 { 2090 {
2091 uint8_t ext, cmd;
2092
1722 if (extmap) 2093 do
1723 { 2094 {
1724 uint8_t ext, cmd; 2095 ext = *data++;
2096 cmd = ext & 0x7f;
1725 2097
1726 do 2098 if (cmd < 4)
2099 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2100 else if (cmd == 5) // health
1727 { 2101 {
1728 ext = *data++;
1729 cmd = ext & 0x7f;
1730
1731 if (cmd < 4)
1732 cell->darkness = 255 - ext * 64 + 1;
1733 else if (cmd == 5) // health
1734 {
1735 cell->stat_width = 1; 2102 cell->stat_width = 1;
1736 cell->stat_hp = *data++; 2103 cell->stat_hp = *data++;
1737 }
1738 else if (cmd == 6) // monster width
1739 cell->stat_width = *data++ + 1;
1740 else if (cmd == 0x47)
1741 {
1742 if (*data == 1) cell->player = data [1];
1743 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1744 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1745 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1746
1747 data += *data + 1;
1748 }
1749 else if (cmd == 8) // cell flags
1750 cell->flags = *data++;
1751 else if (ext & 0x40) // unknown, multibyte => skip
1752 data += *data + 1;
1753 else
1754 data++;
1755 } 2104 }
1756 while (ext & 0x80); 2105 else if (cmd == 6) // monster width
2106 cell->stat_width = *data++ + 1;
2107 else if (cmd == 0x47)
2108 {
2109 if (*data == 1) cell->player = data [1];
2110 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2111 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2112 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2113
2114 data += *data + 1;
2115 }
2116 else if (cmd == 8) // cell flags
2117 cell->flags = *data++;
2118 else if (ext & 0x40) // unknown, multibyte => skip
2119 data += *data + 1;
2120 else
2121 data++;
1757 } 2122 }
1758 else 2123 while (ext & 0x80);
1759 cell->darkness = *data++ + 1;
1760 } 2124 }
1761 2125
1762 for (z = 0; z <= 2; ++z) 2126 for (z = 0; z <= 2; ++z)
1763 if (flags & (4 >> z)) 2127 if (flags & (4 >> z))
1764 { 2128 {
1767 cell->tile [z] = self->face2tile [face]; 2131 cell->tile [z] = self->face2tile [face];
1768 2132
1769 if (cell->tile [z]) 2133 if (cell->tile [z])
1770 { 2134 {
1771 maptex *tex = self->tex + cell->tile [z]; 2135 maptex *tex = self->tex + cell->tile [z];
2136 tex->unused = 0;
1772 if (!tex->name) 2137 if (!tex->name)
1773 av_push (missing, newSViv (cell->tile [z])); 2138 av_push (missing, newSViv (cell->tile [z]));
1774 2139
1775 if (tex->smoothtile) 2140 if (tex->smoothtile)
1776 { 2141 {
1777 maptex *smooth = self->tex + tex->smoothtile; 2142 maptex *smooth = self->tex + tex->smoothtile;
2143 smooth->unused = 0;
1778 if (!smooth->name) 2144 if (!smooth->name)
1779 av_push (missing, newSViv (tex->smoothtile)); 2145 av_push (missing, newSViv (tex->smoothtile));
1780 } 2146 }
1781 } 2147 }
1782 } 2148 }
1783 } 2149 }
1784 else 2150 else
1785 cell->darkness = 0; 2151 CELL_CLEAR (cell);
1786 } 2152 }
1787} 2153}
1788 OUTPUT: 2154 OUTPUT:
1789 RETVAL 2155 RETVAL
1790 2156
1810 ? self->row + y 2176 ? self->row + y
1811 : 0; 2177 : 0;
1812 2178
1813 for (x = x0; x < x1; x++) 2179 for (x = x0; x < x1; x++)
1814 { 2180 {
1815 int r = 32, g = 32, b = 32, a = 192; 2181 unsigned int r = 32, g = 32, b = 32, a = 192;
1816 2182
1817 if (row && row->c0 <= x && x < row->c1) 2183 if (row && row->c0 <= x && x < row->c1)
1818 { 2184 {
1819 mapcell *cell = row->col + (x - row->c0); 2185 mapcell *cell = row->col + (x - row->c0);
1820 2186
1822 { 2188 {
1823 maptex tex = self->tex [cell->tile [z]]; 2189 maptex tex = self->tex [cell->tile [z]];
1824 int a0 = 255 - tex.a; 2190 int a0 = 255 - tex.a;
1825 int a1 = tex.a; 2191 int a1 = tex.a;
1826 2192
1827 r = (r * a0 + tex.r * a1) / 255; 2193 r = div255 (r * a0 + tex.r * a1);
1828 g = (g * a0 + tex.g * a1) / 255; 2194 g = div255 (g * a0 + tex.g * a1);
1829 b = (b * a0 + tex.b * a1) / 255; 2195 b = div255 (b * a0 + tex.b * a1);
1830 a = (a * a0 + tex.a * a1) / 255; 2196 a = div255 (a * a0 + tex.a * a1);
1831 } 2197 }
1832 } 2198 }
1833 2199
1834 *map++ = (r ) 2200 *map++ = (r )
1835 | (g << 8) 2201 | (g << 8)
1836 | (b << 16) 2202 | (b << 16)
1837 | (a << 24); 2203 | (a << 24);
1838 } 2204 }
1839 } 2205 }
1840 2206
1841 RETVAL = map_sv; 2207 RETVAL = map_sv;
1842} 2208}
1843 OUTPUT: 2209 OUTPUT:
1844 RETVAL 2210 RETVAL
1845 2211
1846void 2212void
1847draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2213draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1848 CODE: 2214 CODE:
1849{ 2215{
1850 int x, y, z; 2216 int x, y, z;
1851 2217
1852 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1853 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1854 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2218 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1855 smooth_key skey;
1856 int pl_x, pl_y; 2219 int pl_x, pl_y;
1857 maptex pl_tex; 2220 maptex pl_tex;
1858 rc_t *rc = rc_alloc (); 2221 rc_t rc;
2222 rc_t rc_ov;
1859 rc_key_t key; 2223 rc_key_t key;
1860 rc_array_t *arr; 2224 rc_t::array_t *arr;
1861 2225
1862 pl_tex.name = 0; 2226 pl_tex.name = 0;
1863 2227
1864 // thats current max. sorry. 2228 // that's current max. sorry.
1865 if (sw > 255) sw = 255; 2229 if (sw > 255) sw = 255;
1866 if (sh > 255) sh = 255; 2230 if (sh > 255) sh = 255;
1867
1868 // clear key, in case of extra padding
1869 memset (&skey, 0, sizeof (skey));
1870 2231
1871 memset (&key, 0, sizeof (key)); 2232 memset (&key, 0, sizeof (key));
1872 key.r = 255; 2233 key.r = 255;
1873 key.g = 255; 2234 key.g = 255;
1874 key.b = 255; 2235 key.b = 255;
1875 key.a = 255; 2236 key.a = 255;
1876 key.mode = GL_QUADS; 2237 key.mode = GL_QUADS;
1877 key.format = GL_T2F_V3F; 2238 key.format = GL_T2F_V3F;
1878 key.texname = -1;
1879 2239
1880 mx += self->x; 2240 mx += self->x;
1881 my += self->y; 2241 my += self->y;
1882 2242
1883 // first pass: determine smooth_max 2243 // first pass: determine smooth_max
1884 // rather ugly, if you ask me 2244 // rather ugly, if you ask me
1885 // could also be stored inside mapcell and updated on change 2245 // could also be stored inside mapcell and updated on change
1886 memset (smooth_max, 0, sizeof (smooth_max)); 2246 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1887 2247
1888 for (y = 0; y < sh; y++) 2248 for (y = 0; y < sh; y++)
1889 if (0 <= y + my && y + my < self->rows) 2249 if (0 <= y + my && y + my < self->rows)
1890 { 2250 {
1891 maprow *row = self->row + (y + my); 2251 maprow *row = self->row + (y + my);
1906 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2266 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1907 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2267 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1908 2268
1909 for (z = 0; z <= 2; z++) 2269 for (z = 0; z <= 2; z++)
1910 { 2270 {
1911 memset (smooth_level, 0, sizeof (smooth_level)); 2271 std::bitset<256> smooth_level; // one bit for every possible smooth level
2272 smooth_key skey;
2273 smooth_hash smooth;
2274 key.texname = -1;
1912 2275
1913 for (y = 0; y < sh; y++) 2276 for (y = 0; y < sh; y++)
1914 if (0 <= y + my && y + my < self->rows) 2277 if (0 <= y + my && y + my < self->rows)
1915 { 2278 {
1916 maprow *row = self->row + (y + my); 2279 maprow *row = self->row + (y + my);
1922 tileid tile = cell->tile [z]; 2285 tileid tile = cell->tile [z];
1923 2286
1924 if (tile) 2287 if (tile)
1925 { 2288 {
1926 maptex tex = self->tex [tile]; 2289 maptex tex = self->tex [tile];
1927 int px = (x + 1) * T - tex.w; 2290 int px, py;
1928 int py = (y + 1) * T - tex.h;
1929 2291
1930 if (key.texname != tex.name) 2292 if (key.texname != tex.name)
1931 { 2293 {
2294 self->tex [tile].unused = 0;
2295
1932 if (!tex.name) 2296 if (!tex.name)
1933 tex = self->tex [2]; /* missing, replace by noface */ 2297 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1934 2298
1935 key.texname = tex.name; 2299 key.texname = tex.name;
1936 arr = rc_array (rc, &key); 2300 arr = &rc.array (key);
1937 } 2301 }
1938 2302
2303 px = (x + 1) * Th - tex.w;
2304 py = (y + 1) * Tw - tex.h;
2305
1939 if (expect_false (cell->player == player) && expect_false (z == 2)) 2306 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1940 { 2307 {
1941 pl_x = px; 2308 pl_x = px;
1942 pl_y = py; 2309 pl_y = py;
1943 pl_tex = tex; 2310 pl_tex = tex;
1944 continue; 2311 continue;
1945 } 2312 }
1946 2313
1947 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2314 arr->t2f_v3f (0 , 0 , px , py , 0);
1948 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2315 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
1949 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2316 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
1950 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2317 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1951
1952 if (expect_false (cell->flags) && expect_false (z == 2))
1953 {
1954 // overlays such as the speech bubble, probably more to come
1955 if (cell->flags & 1)
1956 {
1957 maptex tex = self->tex [1];
1958 int px = x * T + T * 2 / 32;
1959 int py = y * T - T * 6 / 32;
1960
1961 if (tex.name)
1962 {
1963 if (key.texname != tex.name)
1964 {
1965 key.texname = tex.name;
1966 arr = rc_array (rc, &key);
1967 }
1968
1969 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1970 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1971 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1972 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1973 }
1974 }
1975 }
1976 2318
1977 // update smooth hash 2319 // update smooth hash
1978 if (tex.smoothtile) 2320 if (tex.smoothtile)
1979 { 2321 {
1980 skey.tile = tex.smoothtile; 2322 skey.tile = tex.smoothtile;
1981 skey.level = tex.smoothlevel; 2323 skey.level = tex.smoothlevel;
1982 2324
1983 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2325 smooth_level[tex.smoothlevel] = 1;
1984 2326
1985 // add bits to current tile and all neighbours. skey.x|y is 2327 // add bits to current tile and all neighbours. skey.x|y is
1986 // shifted +1|+1 so we always stay positive. 2328 // shifted +1|+1 so we always stay positive.
1987 2329
1988 // bits is ___n cccc CCCC bbbb 2330 // bits is ___n cccc CCCC bbbb
1996 2338
1997 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2339 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1998 // ·· ·· ·┏ ┓· 2340 // ·· ·· ·┏ ┓·
1999 2341
2000 // full tile 2342 // full tile
2001 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2343 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2002 2344
2003 // borders 2345 // borders
2004 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2346 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2005 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2347 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2006 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2348 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2007 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2349 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2008 2350
2009 // corners 2351 // corners
2010 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2352 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2011 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2353 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2012 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2354 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2013 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2355 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2356 }
2357 }
2358
2359 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2360 {
2361 // overlays such as the speech bubble, probably more to come
2362 if (cell->flags & 1)
2363 {
2364 rc_key_t key_ov = key;
2365 maptex tex = self->tex[TEXID_SPEECH];
2366 int px = x * Tw + Tw * 2 / 32;
2367 int py = y * Th - Th * 6 / 32;
2368
2369 key_ov.texname = tex.name;
2370 rc_t::array_t &arr = rc_ov.array (key_ov);
2371
2372 arr.t2f_v3f (0 , 0 , px , py , 0);
2373 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2374 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2375 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2014 } 2376 }
2015 } 2377 }
2016 } 2378 }
2017 } 2379 }
2018 2380
2019 rc_draw (rc); 2381 rc.draw ();
2020 rc_clear (rc); 2382 rc.clear ();
2021 2383
2022 // go through all smoothlevels, lowest to highest, then draw. 2384 // go through all smoothlevels, lowest to highest, then draw.
2023 // this is basically counting sort 2385 // this is basically counting sort
2024 { 2386 {
2025 int w, b; 2387 int w, b;
2026 2388
2027 glEnable (GL_TEXTURE_2D); 2389 glEnable (GL_TEXTURE_2D);
2028 glBegin (GL_QUADS); 2390 glBegin (GL_QUADS);
2029 for (w = 0; w < 256 / 32; ++w) 2391 for (int level = 0; level < smooth_level.size (); ++level)
2392 if (smooth_level[level])
2393 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2030 { 2394 {
2031 uint32_t smask = smooth_level [w]; 2395 smooth_key &skey = it->first;
2032 if (smask) 2396 IV bits = it->second;
2033 for (b = 0; b < 32; ++b) 2397
2034 if (smask & (((uint32_t)1) << b)) 2398 if (!(bits & 0x1000)
2399 && skey.level == level
2400 && level > smooth_max [skey.x][skey.y])
2035 { 2401 {
2036 int level = (w << 5) | b; 2402 maptex tex = self->tex [skey.tile];
2403 int px = (((int)skey.x) - 1) * Tw;
2404 int py = (((int)skey.y) - 1) * Th;
2405 int border = bits & 15;
2406 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2407 float dx = tex.s * .0625f; // 16 images/row
2408 float dy = tex.t * .5f ; // 2 images/column
2409
2037 HE *he; 2410 if (tex.name)
2038
2039 hv_iterinit (smooth);
2040 while ((he = hv_iternext (smooth)))
2041 { 2411 {
2042 smooth_key *skey = (smooth_key *)HeKEY (he); 2412 // this time avoiding texture state changes
2043 IV bits = SvIVX (HeVAL (he)); 2413 // save gobs of state changes.
2044 2414 if (key.texname != tex.name)
2045 if (!(bits & 0x1000)
2046 && skey->level == level
2047 && level > smooth_max [skey->x][skey->y])
2048 { 2415 {
2049 maptex tex = self->tex [skey->tile]; 2416 self->tex [skey.tile].unused = 0;
2050 int px = (((int)skey->x) - 1) * T;
2051 int py = (((int)skey->y) - 1) * T;
2052 int border = bits & 15;
2053 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2054 float dx = tex.s * .0625f; // 16 images/row
2055 float dy = tex.t * .5f ; // 2 images/column
2056 2417
2057 if (tex.name)
2058 {
2059 // this time avoiding texture state changes
2060 // save gobs of state changes.
2061 if (key.texname != tex.name)
2062 {
2063 glEnd (); 2418 glEnd ();
2064 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2419 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2065 glBegin (GL_QUADS); 2420 glBegin (GL_QUADS);
2066 } 2421 }
2067 2422
2068 if (border) 2423 if (border)
2069 { 2424 {
2070 float ox = border * dx; 2425 float ox = border * dx;
2071 2426
2072 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2427 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2073 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2074 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2075 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2430 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2076 } 2431 }
2077 2432
2078 if (corner) 2433 if (corner)
2079 { 2434 {
2080 float ox = corner * dx; 2435 float ox = corner * dx;
2081 2436
2082 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2083 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2438 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2084 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2439 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2085 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2440 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2086 }
2087 }
2088 } 2441 }
2089 } 2442 }
2090 } 2443 }
2091 } 2444 }
2092 2445
2093 glEnd (); 2446 glEnd ();
2094 glDisable (GL_TEXTURE_2D); 2447 glDisable (GL_TEXTURE_2D);
2095 key.texname = -1; 2448 key.texname = -1;
2096 } 2449 }
2097
2098 hv_clear (smooth);
2099 } 2450 }
2100 2451
2101 if (pl_tex.name) 2452 if (pl_tex.name)
2102 { 2453 {
2103 maptex tex = pl_tex; 2454 maptex tex = pl_tex;
2104 int px = pl_x + pdx; 2455 int px = pl_x + sdx;
2105 int py = pl_y + pdy; 2456 int py = pl_y + sdy;
2106 2457
2107 key.texname = tex.name; 2458 key.texname = tex.name;
2108 arr = rc_array (rc, &key); 2459 rc_t::array_t &arr = rc.array (key);
2109 2460
2110 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2461 arr.t2f_v3f (0 , 0 , px , py , 0);
2111 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2462 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2112 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2463 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2113 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2464 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2114 2465
2115 rc_draw (rc); 2466 rc.draw ();
2116 } 2467 }
2117 2468
2469 rc_ov.draw ();
2470 rc_ov.clear ();
2471
2118 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
2119 rc_free (rc);
2120 2473
2121 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2122 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2123 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2124 { 2477 {
2127 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2128 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2129 { 2482 {
2130 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2131 2484
2132 int px = x * T; 2485 int px = x * Tw;
2133 int py = y * T; 2486 int py = y * Th;
2487
2488 if (ecb_expect_false (cell->player == player))
2489 {
2490 px += sdx;
2491 py += sdy;
2492 }
2134 2493
2135 if (cell->stat_hp) 2494 if (cell->stat_hp)
2136 { 2495 {
2137 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2138 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2139 2498
2140 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2141 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2142 px + width - 1, py); 2501 px + width - 1, py);
2143 2502
2149 } 2508 }
2150 } 2509 }
2151} 2510}
2152 2511
2153void 2512void
2154draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2513draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2155 CODE: 2514 CODE:
2156{ 2515{
2157 static float color[16][3] = { 2516 static float color[16][3] = {
2158 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2159 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2160 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2161 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2162 2521
2163 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2164 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2165 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2166 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2167 2526
2168 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2169 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2170 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2171 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2172 2531
2173 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2174 2533
2175 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2176 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2177 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2178 }; 2537 };
2179 2538
2180 int x, y; 2539 int x, y;
2181 2540
2182 glEnable (GL_TEXTURE_2D); 2541 glEnable (GL_TEXTURE_2D);
2542 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2543 * but the nvidia driver (185.18.14) mishandles alpha textures
2544 * and takes the colour from god knows where instead of using
2545 * Cp. MODULATE results in the same colour, but slightly different
2546 * alpha, but atcually gives us the correct colour with nvidia.
2547 */
2183 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2184 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2185 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2186 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2187 2552
2188 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2192 2557
2193 if (m) 2558 if (m)
2194 { 2559 {
2195 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2196 2561
2197 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2198 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2199 2564
2200 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2201 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2202 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2203 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2204 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2205 } 2570 }
2213void 2578void
2214fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2579fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2215 PPCODE: 2580 PPCODE:
2216{ 2581{
2217 int x, y; 2582 int x, y;
2218 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2219 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2220 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2221 int sw34 = (sw * 3 + 3) & ~3; 2586 int sw3 = sw * 3;
2587 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2588 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2222 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2223 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2224 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2225 2591
2226 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2227 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2228 2594
2229 mx += self->x - 1; 2595 mx += self->x - 1;
2230 my += self->y - 1; 2596 my += self->y - 1;
2231
2232 memset (darkness1, 255, sw1 * sh1);
2233 2597
2234 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2235 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2236 { 2600 {
2237 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2240 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2241 { 2605 {
2242 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2243 2607
2244 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2245 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2246 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2247 } 2611 }
2248 } 2612 }
2249 2613
2250 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2251 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2270 2634
2271 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2272 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2273 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2274 2638
2275 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2276 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2277 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2278 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2279 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2280 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2281 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2282 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2283 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2284 } 2648 }
2285 2649
2286 free (darkness1); 2650 free (darkness1);
2287 2651
2288 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2289 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2290 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2291 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2292} 2656}
2293 2657
2294SV * 2658SV *
2357 else 2721 else
2358 *data++ = 0; 2722 *data++ = 0;
2359 } 2723 }
2360 } 2724 }
2361 2725
2362 /* if size is w*h + 5 then no data has been found */ 2726 /* if size is w*h + 5 then no data has been found */
2363 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2364 { 2728 {
2365 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2366 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2367 } 2731 }
2368 2732
2369 RETVAL = data_sv; 2733 RETVAL = data_sv;
2370} 2734}
2371 OUTPUT: 2735 OUTPUT:
2372 RETVAL 2736 RETVAL
2373 2737
2374void 2738void
2381 STRLEN len; 2745 STRLEN len;
2382 uint8_t *data, *end; 2746 uint8_t *data, *end;
2383 2747
2384 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2385 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2386 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2387 end = data + len + 8; 2751 end = data + len + 8;
2388 2752
2389 if (len < 5) 2753 if (len < 5)
2390 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2391 2755
2452} 2816}
2453 2817
2454MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2455 2819
2456DC::RW 2820DC::RW
2457new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2458 CODE: 2822 CODE:
2459{ 2823{
2460 STRLEN datalen; 2824 STRLEN datalen;
2461 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2462 2826
2464} 2828}
2465 OUTPUT: 2829 OUTPUT:
2466 RETVAL 2830 RETVAL
2467 2831
2468DC::RW 2832DC::RW
2469new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2470 CODE: 2834 CODE:
2471 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2472 OUTPUT: 2836 OUTPUT:
2473 RETVAL 2837 RETVAL
2474 2838
2492 if (RETVAL < 0) 2856 if (RETVAL < 0)
2493 { 2857 {
2494 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2495 2859
2496 if (RETVAL < 0) 2860 if (RETVAL < 0)
2861 {
2862 // happens sometimes, maybe it just stopped playing(?)
2863 RETVAL = Mix_GroupAvailable (-1);
2864
2865 if (RETVAL < 0)
2497 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2498 2867 }
2868 else
2499 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2500 } 2870 }
2501 2871
2502 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2503 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2504} 2874}
2551void 2921void
2552set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2553 CODE: 2923 CODE:
2554{ 2924{
2555 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2925 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2556 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2926 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2557 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2558} 2928}
2559 2929
2560void 2930void
2561set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2564 2934
2565MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2566 2936
2567PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2568 2938
2939void
2940decoders ()
2941 PPCODE:
2942#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2943 int i, num = Mix_GetNumChunkDecoders ();
2944 EXTEND (SP, num);
2945 for (i = 0; i < num; ++i)
2946 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2947#else
2948 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2949#endif
2950
2569DC::MixChunk 2951DC::MixChunk
2570new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2571 CODE: 2953 CODE:
2572 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2573 OUTPUT: 2955 OUTPUT:
2574 RETVAL 2956 RETVAL
2575 2957
2605 OUTPUT: 2987 OUTPUT:
2606 RETVAL 2988 RETVAL
2607 2989
2608MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2609 2991
2992void
2993decoders ()
2994 PPCODE:
2995#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2996 int i, num = Mix_GetNumMusicDecoders ();
2997 EXTEND (SP, num);
2998 for (i = 0; i < num; ++i)
2999 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3000#else
3001 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3002#endif
3003
2610int 3004int
2611volume (int volume = -1) 3005volume (int volume = -1)
2612 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2613 CODE: 3007 CODE:
2614 if (items > 0) 3008 if (items > 0)
2625void 3019void
2626halt () 3020halt ()
2627 CODE: 3021 CODE:
2628 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2629 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2630DC::MixMusic 3031DC::MixMusic
2631new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2632 CODE: 3033 CODE:
2633 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2634 OUTPUT: 3035 OUTPUT:
2635 RETVAL 3036 RETVAL
2636 3037
2664 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2665# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2666 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2667 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2668 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2669 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2670 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2671 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2672 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2673 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2685 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2686 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2687 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2688 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2689 const_iv (GL_ONE_MINUS_DST_ALPHA), 3091 const_iv (GL_ONE_MINUS_DST_ALPHA),
3092 const_iv (GL_SRC_COLOR),
3093 const_iv (GL_DST_COLOR),
3094 const_iv (GL_ONE_MINUS_SRC_COLOR),
3095 const_iv (GL_ONE_MINUS_DST_COLOR),
2690 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2691 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2692 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2693 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2694 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2762 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2763 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2764 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2765 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2766 const_iv (GL_T2F_N3F_V3F), 3172 const_iv (GL_T2F_N3F_V3F),
3173 const_iv (GL_FUNC_ADD),
3174 const_iv (GL_FUNC_SUBTRACT),
3175 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2767# undef const_iv 3176# undef const_iv
2768 }; 3177 };
2769 3178
2770 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3179 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2771 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2772 3181
2773 texture_av = newAV (); 3182 texture_av = newAV ();
2774 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2775} 3184}
2776 3185
2778disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2779 CODE: 3188 CODE:
2780 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2781 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2782 3191
2783char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2784gl_vendor () 3196gl_vendor ()
2785 CODE: 3197 CODE:
2786 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2787 OUTPUT: 3199 OUTPUT:
2788 RETVAL 3200 RETVAL
2789 3201
2790char * 3202const char *
2791gl_version () 3203gl_version ()
2792 CODE: 3204 CODE:
2793 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2794 OUTPUT: 3206 OUTPUT:
2795 RETVAL 3207 RETVAL
2796 3208
2797char * 3209const char *
2798gl_extensions () 3210gl_extensions ()
2799 CODE: 3211 CODE:
2800 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2801 OUTPUT: 3213 OUTPUT:
2802 RETVAL 3214 RETVAL
2803 3215
2804const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2805 3221
2806GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2807 CODE: 3223 CODE:
2808 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2809 OUTPUT: 3225 OUTPUT:
2817 3233
2818int glGetError () 3234int glGetError ()
2819 3235
2820void glFinish () 3236void glFinish ()
2821 3237
3238void glFlush ()
3239
2822void glClear (int mask) 3240void glClear (int mask)
2823 3241
2824void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2825 PROTOTYPE: @ 3243 PROTOTYPE: @
2826 3244
2835void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2836 3254
2837void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2838 CODE: 3256 CODE:
2839 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2840 3260
2841void glDepthMask (int flag) 3261void glDepthMask (int flag)
2842 3262
2843void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2844 3264
2879void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2880 CODE: 3300 CODE:
2881 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2882 3302
2883void glColor (float r, float g, float b, float a = 1.0) 3303void glColor (float r, float g, float b, float a = 1.0)
3304 PROTOTYPE: @
2884 ALIAS: 3305 ALIAS:
2885 glColor_premultiply = 1 3306 glColor_premultiply = 1
2886 CODE: 3307 CODE:
2887 if (ix) 3308 if (ix)
2888 { 3309 {
2994 3415
2995void glEndList () 3416void glEndList ()
2996 3417
2997void glCallList (int list) 3418void glCallList (int list)
2998 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
2999MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3000 3426
3001PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3002 3428
3003void 3429void
3004find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3005 PPCODE: 3431 PPCODE:
3006{ 3432{
3007 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3008 XPUSHs (self); 3434 XPUSHs (self);
3009} 3435}
3010 3436
3011BOOT: 3437BOOT:
3012{ 3438{
3020 3446
3021void 3447void
3022draw (SV *self) 3448draw (SV *self)
3023 CODE: 3449 CODE:
3024{ 3450{
3025 HV *hv; 3451 HV *hv;
3026 SV **svp; 3452 SV **svp;
3027 NV x, y, w, h; 3453 NV x, y, w, h;
3028 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3029 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3030 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3031 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines