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.335 by root, Mon Nov 19 01:56:11 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines