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.263 by root, Fri Jul 18 21:18:42 2008 UTC vs.
Revision 1.329 by root, Sun Nov 18 13:07:51 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
76#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
78 89
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 91
92/* this is used as fow flag as well, so has to have a different value */
93/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
82 96
83#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
85 99
86#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
87 101
88/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
104
105#define KMOD_LRAM 0x10000 // our extension
106
107#define TEXID_SPEECH 1
108#define TEXID_NOFACE 2
109
110static char *
111fast_sv_grow (SV *sv, STRLEN need)
112{
113 STRLEN len = SvLEN (sv);
114 STRLEN want = SvCUR (sv) + need;
115
116 if (expect_false (len < want))
117 {
118 do
119 len *= 2;
120 while (len < want);
121
122 sv_grow (sv, len);
123 }
124
125 SvCUR_set (sv, want);
126 return SvEND (sv) - need;
127}
90 128
91static AV *texture_av; 129static AV *texture_av;
92 130
93static struct 131static struct
94{ 132{
151{ 189{
152 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
153 191
154 while (attrs) 192 while (attrs)
155 { 193 {
156 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
157 195
158 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
159 return 1; 197 return 1;
160 198
161 attrs = attrs->next; 199 attrs = attrs->next;
162 } 200 }
163 201
164 return 0; 202 return 0;
165} 203}
166 204
167typedef struct cf_layout { 205struct cf_layout {
168 PangoLayout *pl; 206 PangoLayout *pl;
169 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
170 int base_height; 208 int base_height;
171 DC__Font font; 209 DC__Font font;
172 rc_t *rc; 210 rc_t rc;
173} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
174 214
175static DC__Font default_font; 215static DC__Font default_font;
176static PangoContext *opengl_context; 216static PangoContext *opengl_context;
177static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
178 218
179static void 219static void
180substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
181{ 221{
182 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
183#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
184 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
185#endif 225#endif
186 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
187} 227}
188 228
189static void 229static void
219} 259}
220 260
221typedef uint16_t tileid; 261typedef uint16_t tileid;
222typedef uint16_t faceid; 262typedef uint16_t faceid;
223 263
224typedef struct { 264struct maptex
265{
225 GLuint name; 266 GLuint name;
226 int w, h; 267 int w, h;
227 float s, t; 268 float s, t;
228 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
229 tileid smoothtile; 270 tileid smoothtile;
230 uint8_t smoothlevel; 271 uint8_t smoothlevel;
231} maptex; 272 uint8_t unused; /* set to zero on use */
273};
232 274
233typedef struct { 275struct mapcell
276{
234 uint32_t player; 277 uint32_t player;
235 tileid tile[3]; 278 tileid tile[3];
236 uint16_t darkness; 279 uint16_t darkness;
237 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
238} mapcell; 281};
239 282
240typedef struct { 283struct maprow
284{
241 int32_t c0, c1; 285 int32_t c0, c1;
242 mapcell *col; 286 mapcell *col;
243} maprow; 287};
244 288
245typedef struct map { 289struct mapgrid {
246 int x, y, w, h; 290 int x, y, w, h;
247 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
248 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
249 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
250 294
251 int32_t rows; 295 int32_t rows;
252 maprow *row; 296 maprow *row;
253} *DC__Map; 297};
254 298
255static char * 299typedef mapgrid *DC__Map;
300
301template<typename T>
302static void
256prepend (char *ptr, int sze, int inc) 303prepend (T *&ptr, int sze, int inc)
257{ 304{
258 char *p; 305 T *p;
259 306
260 New (0, p, sze + inc, char); 307 New (0, p, sze + inc, T);
261 Zero (p, inc, char); 308 Zero (p, inc, T);
262 Move (ptr, p + inc, sze, char); 309 Move (ptr, p + inc, sze, T);
263 Safefree (ptr); 310 Safefree (ptr);
264 311
265 return p; 312 ptr = p;
266} 313}
267 314
268static char * 315template<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 316static void
317append (T *&ptr, int sze, int inc)
318{
319 Renew (ptr, sze + inc, T);
320 Zero (ptr + sze, inc, T);
321}
322
323static void
281need_facenum (struct map *self, faceid face) 324need_facenum (struct mapgrid *self, faceid face)
282{ 325{
283 while (self->faces <= face) 326 while (self->faces <= face)
284 { 327 {
285 Append (tileid, self->face2tile, self->faces, self->faces); 328 append (self->face2tile, self->faces, self->faces);
286 self->faces *= 2; 329 self->faces *= 2;
287 } 330 }
288} 331}
289 332
290static void 333static void
291need_texid (struct map *self, int texid) 334need_texid (struct mapgrid *self, int texid)
292{ 335{
293 while (self->texs <= texid) 336 while (self->texs <= texid)
294 { 337 {
295 Append (maptex, self->tex, self->texs, self->texs); 338 append (self->tex, self->texs, self->texs);
296 self->texs *= 2; 339 self->texs *= 2;
297 } 340 }
298} 341}
299 342
300static maprow * 343static maprow *
301map_get_row (DC__Map self, int y) 344map_get_row (mapgrid *self, int y)
302{ 345{
303 if (0 > y) 346 if (0 > y)
304 { 347 {
305 int extend = - y + MAP_EXTEND_Y; 348 int extend = - y + MAP_EXTEND_Y;
306 Prepend (maprow, self->row, self->rows, extend); 349 prepend (self->row, self->rows, extend);
307 350
308 self->rows += extend; 351 self->rows += extend;
309 self->y += extend; 352 self->y += extend;
310 y += extend; 353 y += extend;
311 } 354 }
312 else if (y >= self->rows) 355 else if (y >= self->rows)
313 { 356 {
314 int extend = y - self->rows + MAP_EXTEND_Y; 357 int extend = y - self->rows + MAP_EXTEND_Y;
315 Append (maprow, self->row, self->rows, extend); 358 append (self->row, self->rows, extend);
316 self->rows += extend; 359 self->rows += extend;
317 } 360 }
318 361
319 return self->row + y; 362 return self->row + y;
320} 363}
330 } 373 }
331 374
332 if (row->c0 > x) 375 if (row->c0 > x)
333 { 376 {
334 int extend = row->c0 - x + MAP_EXTEND_X; 377 int extend = row->c0 - x + MAP_EXTEND_X;
335 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 378 prepend (row->col, row->c1 - row->c0, extend);
336 row->c0 -= extend; 379 row->c0 -= extend;
337 } 380 }
338 else if (x >= row->c1) 381 else if (x >= row->c1)
339 { 382 {
340 int extend = x - row->c1 + MAP_EXTEND_X; 383 int extend = x - row->c1 + MAP_EXTEND_X;
341 Append (mapcell, row->col, row->c1 - row->c0, extend); 384 append (row->col, row->c1 - row->c0, extend);
342 row->c1 += extend; 385 row->c1 += extend;
343 } 386 }
344 387
345 return row->col + (x - row->c0); 388 return row->col + (x - row->c0);
346} 389}
347 390
348static mapcell * 391static mapcell *
349map_get_cell (DC__Map self, int x, int y) 392map_get_cell (mapgrid *self, int x, int y)
350{ 393{
351 return row_get_cell (map_get_row (self, y), x); 394 return row_get_cell (map_get_row (self, y), x);
352} 395}
353 396
354static void 397static void
355map_clear (DC__Map self) 398map_clear (mapgrid *self)
356{ 399{
357 int r; 400 int r;
358 401
359 for (r = 0; r < self->rows; r++) 402 for (r = 0; r < self->rows; r++)
360 Safefree (self->row[r].col); 403 Safefree (self->row[r].col);
367 self->oy = 0; 410 self->oy = 0;
368 self->row = 0; 411 self->row = 0;
369 self->rows = 0; 412 self->rows = 0;
370} 413}
371 414
415#define CELL_CLEAR(cell) \
416 do { \
417 if ((cell)->player) \
418 (cell)->tile [2] = 0; \
419 (cell)->darkness = 0; \
420 (cell)->stat_hp = 0; \
421 (cell)->flags = 0; \
422 (cell)->player = 0; \
423 } while (0)
424
372static void 425static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 426map_blank (mapgrid *self, int x0, int y0, int w, int h)
374{ 427{
375 int x, y; 428 int x, y;
376 maprow *row; 429 maprow *row;
377 mapcell *cell; 430 mapcell *cell;
378 431
390 if (x >= row->c1) 443 if (x >= row->c1)
391 break; 444 break;
392 445
393 cell = row->col + x - row->c0; 446 cell = row->col + x - row->c0;
394 447
395 cell->darkness = 0; 448 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 449 }
400 } 450 }
401} 451}
402 452
403typedef struct { 453struct smooth_key
454{
404 tileid tile; 455 tileid tile;
405 uint8_t x, y, level; 456 uint8_t x, y, level;
406} smooth_key; 457
458 bool operator == (const smooth_key &o) const
459 {
460 return tile == o.tile && x == o.x && y == o.y && level == o.level;
461 }
462};
463
464typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
465
466namespace std {
467 template <>
468 struct hash<smooth_key>
469 {
470 size_t operator () (const smooth_key &v) const
471 {
472 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
473 }
474 };
475}
407 476
408static void 477static void
409smooth_or_bits (HV *hv, smooth_key *key, IV bits) 478smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
410{ 479{
411 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 480 auto &&it = h.find (key);
412 481
413 if (SvIOK (*sv)) 482 if (it == h.end ())
414 SvIV_set (*sv, SvIVX (*sv) | bits); 483 h.insert (std::make_pair (key, bits));
415 else 484 else
416 sv_setiv (*sv, bits); 485 it->second |= bits;
417} 486}
418 487
419static void 488static void
420music_finished (void) 489music_finished (void)
421{ 490{
438 ev.code = 1; 507 ev.code = 1;
439 ev.data1 = (void *)(long)channel; 508 ev.data1 = (void *)(long)channel;
440 ev.data2 = 0; 509 ev.data2 = 0;
441 510
442 SDL_PushEvent ((SDL_Event *)&ev); 511 SDL_PushEvent ((SDL_Event *)&ev);
512}
513
514// approximately divide by 255
515static unsigned int
516div255 (unsigned int n)
517{
518 return (n + (n >> 8)) >> 8;
443} 519}
444 520
445static unsigned int 521static unsigned int
446minpot (unsigned int n) 522minpot (unsigned int n)
447{ 523{
514 if (!svp || !SvTRUE (*svp)) 590 if (!svp || !SvTRUE (*svp))
515 return 0; 591 return 0;
516 592
517 return 1; 593 return 1;
518} 594}
595
596/******************************************************************************/
597
598/* process keyboard modifiers */
599static int
600mod_munge (int mod)
601{
602 mod &= MOD_MASK;
603
604 if (mod & (KMOD_META | KMOD_ALT))
605 mod |= KMOD_LRAM;
606
607 return mod;
608}
609
610static void
611deliantra_main (SV *real_main)
612{
613 dSP;
614
615 PUSHMARK (SP);
616 call_sv (real_main, G_DISCARD | G_VOID);
617}
618
619#ifdef __MACOSX__
620 static SV *real_main;
621
622 /* to due surprising braindamage on the side of SDL design, we
623 * do some mind-boggling hack here: SDL requires a custom main()
624 * on OS X, so... we provide one and call the original main(), which,
625 * due to shared library magic, calls -lSDLmain's main, not perl's main,
626 * and which calls our main (== SDL_main) back.
627 */
628 extern C_LINKAGE int
629 main (int argc, char *argv[])
630 {
631 deliantra_main (real_main);
632 }
633
634 #undef main
635
636 extern C_LINKAGE int main (int argc, char *argv[]);
637
638 static void
639 SDL_main_hack (SV *real_main_)
640 {
641 real_main = real_main_;
642
643 char *argv[] = { "deliantra client", 0 };
644 (main) (1, argv);
645 }
646#else
647 static void
648 SDL_main_hack (SV *real_main)
649 {
650 deliantra_main (real_main);
651 }
652#endif
519 653
520MODULE = Deliantra::Client PACKAGE = DC 654MODULE = Deliantra::Client PACKAGE = DC
521 655
522PROTOTYPES: ENABLE 656PROTOTYPES: ENABLE
523 657
552 const_iv (SDL_USEREVENT), 686 const_iv (SDL_USEREVENT),
553 687
554 const_iv (SDL_APPINPUTFOCUS), 688 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 689 const_iv (SDL_APPMOUSEFOCUS),
556 const_iv (SDL_APPACTIVE), 690 const_iv (SDL_APPACTIVE),
691
692
693 const_iv (SDLK_UNKNOWN),
694 const_iv (SDLK_FIRST),
695 const_iv (SDLK_BACKSPACE),
696 const_iv (SDLK_TAB),
697 const_iv (SDLK_CLEAR),
698 const_iv (SDLK_RETURN),
699 const_iv (SDLK_PAUSE),
700 const_iv (SDLK_ESCAPE),
701 const_iv (SDLK_SPACE),
702 const_iv (SDLK_EXCLAIM),
703 const_iv (SDLK_QUOTEDBL),
704 const_iv (SDLK_HASH),
705 const_iv (SDLK_DOLLAR),
706 const_iv (SDLK_AMPERSAND),
707 const_iv (SDLK_QUOTE),
708 const_iv (SDLK_LEFTPAREN),
709 const_iv (SDLK_RIGHTPAREN),
710 const_iv (SDLK_ASTERISK),
711 const_iv (SDLK_PLUS),
712 const_iv (SDLK_COMMA),
713 const_iv (SDLK_MINUS),
714 const_iv (SDLK_PERIOD),
715 const_iv (SDLK_SLASH),
716 const_iv (SDLK_0),
717 const_iv (SDLK_1),
718 const_iv (SDLK_2),
719 const_iv (SDLK_3),
720 const_iv (SDLK_4),
721 const_iv (SDLK_5),
722 const_iv (SDLK_6),
723 const_iv (SDLK_7),
724 const_iv (SDLK_8),
725 const_iv (SDLK_9),
726 const_iv (SDLK_COLON),
727 const_iv (SDLK_SEMICOLON),
728 const_iv (SDLK_LESS),
729 const_iv (SDLK_EQUALS),
730 const_iv (SDLK_GREATER),
731 const_iv (SDLK_QUESTION),
732 const_iv (SDLK_AT),
733
734 const_iv (SDLK_LEFTBRACKET),
735 const_iv (SDLK_BACKSLASH),
736 const_iv (SDLK_RIGHTBRACKET),
737 const_iv (SDLK_CARET),
738 const_iv (SDLK_UNDERSCORE),
739 const_iv (SDLK_BACKQUOTE),
740 const_iv (SDLK_DELETE),
557 741
558 const_iv (SDLK_FIRST), 742 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 743 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 744 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 745 const_iv (SDLK_KP1),
637 const_iv (KMOD_RMETA), 821 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 822 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 823 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 824 const_iv (KMOD_MODE),
641 825
826 const_iv (KMOD_LRAM),
827
642 const_iv (MIX_DEFAULT_FORMAT), 828 const_iv (MIX_DEFAULT_FORMAT),
643 829
644 const_iv (SDL_INIT_TIMER), 830 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 831 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 832 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM), 833 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK), 834 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING), 835 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE), 836 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD), 837 const_iv (SDL_INIT_EVENTTHREAD),
838
839 const_iv (SDL_GL_RED_SIZE),
840 const_iv (SDL_GL_GREEN_SIZE),
841 const_iv (SDL_GL_BLUE_SIZE),
842 const_iv (SDL_GL_ALPHA_SIZE),
843 const_iv (SDL_GL_DOUBLEBUFFER),
844 const_iv (SDL_GL_BUFFER_SIZE),
845 const_iv (SDL_GL_DEPTH_SIZE),
846 const_iv (SDL_GL_STENCIL_SIZE),
847 const_iv (SDL_GL_ACCUM_RED_SIZE),
848 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
849 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
850 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
851 const_iv (SDL_GL_STEREO),
852 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
853 const_iv (SDL_GL_MULTISAMPLESAMPLES),
854 const_iv (SDL_GL_ACCELERATED_VISUAL),
855 const_iv (SDL_GL_SWAP_CONTROL),
856
857 const_iv (FOW_DARKNESS)
652# undef const_iv 858# undef const_iv
653 }; 859 };
654 860
655 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 861 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
656 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 862 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
657 863
658 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 864 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
659 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 865 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
660} 866}
661 867
677NV ceil (NV x) 883NV ceil (NV x)
678 884
679IV minpot (UV n) 885IV minpot (UV n)
680 886
681IV popcount (UV n) 887IV popcount (UV n)
888
889NV distance (NV dx, NV dy)
890 CODE:
891 RETVAL = pow (dx * dx + dy * dy, 0.5);
892 OUTPUT:
893 RETVAL
682 894
683void 895void
684pango_init () 896pango_init ()
685 CODE: 897 CODE:
686{ 898{
694#endif 906#endif
695} 907}
696 908
697char *SDL_GetError () 909char *SDL_GetError ()
698 910
911void SDL_main_hack (SV *real_main)
912 PROTOTYPE: &
913
699int SDL_Init (U32 flags) 914int SDL_Init (U32 flags)
700 915
701int SDL_InitSubSystem (U32 flags) 916int SDL_InitSubSystem (U32 flags)
702 917
703void SDL_QuitSubSystem (U32 flags) 918void SDL_QuitSubSystem (U32 flags)
704 919
705void SDL_Quit () 920void SDL_Quit ()
921
922int SDL_GL_SetAttribute (int attr, int value)
923 C_ARGS: (SDL_GLattr)attr, value
924
925int SDL_GL_GetAttribute (int attr)
926 CODE:
927 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
928 XSRETURN_UNDEF;
929 OUTPUT:
930 RETVAL
706 931
707void 932void
708SDL_ListModes (int rgb, int alpha) 933SDL_ListModes (int rgb, int alpha)
709 PPCODE: 934 PPCODE:
710{ 935{
722 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 947 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
723 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 948 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
724 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 949 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
725 950
726 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 951 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
727#if SDL_VERSION_ATLEAST(1,2,10)
728 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
729 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 952 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
730#endif
731 953
732 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 954 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
733 955
734 if (m && m != (SDL_Rect **)-1) 956 if (m && m != (SDL_Rect **)-1)
735 while (*m) 957 while (*m)
736 { 958 {
959 if ((*m)->w >= 400 && (*m)->h >= 300)
960 {
737 AV *av = newAV (); 961 AV *av = newAV ();
738 av_push (av, newSViv ((*m)->w)); 962 av_push (av, newSViv ((*m)->w));
739 av_push (av, newSViv ((*m)->h)); 963 av_push (av, newSViv ((*m)->h));
740 av_push (av, newSViv (rgb)); 964 av_push (av, newSViv (rgb));
741 av_push (av, newSViv (alpha)); 965 av_push (av, newSViv (alpha));
742 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 966 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
967 }
743 968
744 ++m; 969 ++m;
745 } 970 }
746} 971}
747 972
762 ); 987 );
763 988
764 if (RETVAL) 989 if (RETVAL)
765 { 990 {
766 av_clear (texture_av); 991 av_clear (texture_av);
767
768 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
769#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 992#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
770#include "glfunc.h" 993#include "glfunc.h"
771#undef GL_FUNC 994#undef GL_FUNC
995 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
996 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
772 } 997 }
773} 998}
774 OUTPUT: 999 OUTPUT:
775 RETVAL 1000 RETVAL
1001
1002void
1003SDL_WM_SetCaption (const char *title, const char *icon)
776 1004
777void 1005void
778SDL_GL_SwapBuffers () 1006SDL_GL_SwapBuffers ()
779 1007
780char * 1008char *
781SDL_GetKeyName (int sym) 1009SDL_GetKeyName (int sym)
1010 C_ARGS: (SDLKey)sym
782 1011
783int 1012int
784SDL_GetAppState () 1013SDL_GetAppState ()
785 1014
786int 1015int
787SDL_GetModState () 1016SDL_GetModState ()
788 1017
1018int
1019SDL_WaitEvent ()
1020 C_ARGS: 0
1021
789void 1022void
1023SDL_PumpEvents ()
1024
1025void
790poll_events () 1026peep_events ()
791 PPCODE: 1027 PPCODE:
792{ 1028{
793 SDL_Event ev; 1029 SDL_Event ev;
794 1030
795 SDL_PumpEvents (); 1031 SDL_PumpEvents ();
802 { 1038 {
803 case SDL_KEYDOWN: 1039 case SDL_KEYDOWN:
804 case SDL_KEYUP: 1040 case SDL_KEYUP:
805 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1041 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
806 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1042 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
807 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1043 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
808 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1044 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
809 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1045 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
810 break; 1046 break;
811 1047
812 case SDL_ACTIVEEVENT: 1048 case SDL_ACTIVEEVENT:
813 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1049 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
831 x = ev.motion.x; 1067 x = ev.motion.x;
832 y = ev.motion.y; 1068 y = ev.motion.y;
833 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1069 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
834 } 1070 }
835 1071
836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1072 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
837 hv_store (hv, "state", 5, newSViv (state), 0); 1073 hv_store (hv, "state", 5, newSViv (state), 0);
838 hv_store (hv, "x", 1, newSViv (x), 0); 1074 hv_store (hv, "x", 1, newSViv (x), 0);
839 hv_store (hv, "y", 1, newSViv (y), 0); 1075 hv_store (hv, "y", 1, newSViv (y), 0);
840 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1076 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
841 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1077 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
861 1097
862 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1098 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
863 } 1099 }
864} 1100}
865 1101
1102char *
1103SDL_AudioDriverName ()
1104 CODE:
1105{
1106 char buf [256];
1107 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1108 XSRETURN_UNDEF;
1109
1110 RETVAL = buf;
1111}
1112 OUTPUT:
1113 RETVAL
1114
866int 1115int
867Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1116Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
868 POSTCALL: 1117 POSTCALL:
869 Mix_HookMusicFinished (music_finished); 1118 Mix_HookMusicFinished (music_finished);
870 Mix_ChannelFinished (channel_finished); 1119 Mix_ChannelFinished (channel_finished);
871 1120
872void 1121void
873Mix_QuerySpec () 1122Mix_QuerySpec ()
932add_font (char *file) 1181add_font (char *file)
933 CODE: 1182 CODE:
934 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1183 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
935 OUTPUT: 1184 OUTPUT:
936 RETVAL 1185 RETVAL
1186
1187void
1188IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1189
1190# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1191void
1192Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
937 1193
938void 1194void
939load_image_inline (SV *image_) 1195load_image_inline (SV *image_)
940 ALIAS: 1196 ALIAS:
941 load_image_file = 1 1197 load_image_file = 1
987 1243
988 SDL_LockSurface (surface2); 1244 SDL_LockSurface (surface2);
989 EXTEND (SP, 6); 1245 EXTEND (SP, 6);
990 PUSHs (sv_2mortal (newSViv (surface2->w))); 1246 PUSHs (sv_2mortal (newSViv (surface2->w)));
991 PUSHs (sv_2mortal (newSViv (surface2->h))); 1247 PUSHs (sv_2mortal (newSViv (surface2->h)));
992 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1248 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
993 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1249 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
994 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1250 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
995 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1251 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
996 SDL_UnlockSurface (surface2); 1252 SDL_UnlockSurface (surface2);
997 1253
1057#if DEBUG 1313#if DEBUG
1058 VALGRIND_DO_LEAK_CHECK; 1314 VALGRIND_DO_LEAK_CHECK;
1059#endif 1315#endif
1060} 1316}
1061 1317
1318int
1319SvREFCNT (SV *sv)
1320 CODE:
1321 RETVAL = SvREFCNT (sv);
1322 OUTPUT:
1323 RETVAL
1324
1062MODULE = Deliantra::Client PACKAGE = DC::Font 1325MODULE = Deliantra::Client PACKAGE = DC::Font
1063 1326
1064PROTOTYPES: DISABLE 1327PROTOTYPES: DISABLE
1065 1328
1066DC::Font 1329DC::Font
1067new_from_file (SV *class, char *path, int id = 0) 1330new_from_file (SV *klass, char *path, int id = 0)
1068 CODE: 1331 CODE:
1069{ 1332{
1070 int count; 1333 int count;
1071 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1334 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1072 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1335 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1101 PROTOTYPE: 1364 PROTOTYPE:
1102 CODE: 1365 CODE:
1103 tc_restore (); 1366 tc_restore ();
1104 1367
1105DC::Layout 1368DC::Layout
1106new (SV *class) 1369new (SV *klass)
1107 CODE: 1370 CODE:
1108 New (0, RETVAL, 1, struct cf_layout); 1371 RETVAL = new cf_layout;
1109 1372
1110 RETVAL->pl = pango_layout_new (opengl_context); 1373 RETVAL->pl = pango_layout_new (opengl_context);
1111 RETVAL->r = 1.; 1374 RETVAL->r = 1.;
1112 RETVAL->g = 1.; 1375 RETVAL->g = 1.;
1113 RETVAL->b = 1.; 1376 RETVAL->b = 1.;
1114 RETVAL->a = 1.; 1377 RETVAL->a = 1.;
1115 RETVAL->base_height = MIN_FONT_HEIGHT; 1378 RETVAL->base_height = MIN_FONT_HEIGHT;
1116 RETVAL->font = 0; 1379 RETVAL->font = 0;
1117 RETVAL->rc = rc_alloc ();
1118 1380
1119 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1381 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1120 layout_update_font (RETVAL); 1382 layout_update_font (RETVAL);
1121 OUTPUT: 1383 OUTPUT:
1122 RETVAL 1384 RETVAL
1123 1385
1124void 1386void
1125DESTROY (DC::Layout self) 1387DESTROY (DC::Layout self)
1126 CODE: 1388 CODE:
1127 g_object_unref (self->pl); 1389 g_object_unref (self->pl);
1128 rc_free (self->rc);
1129 Safefree (self); 1390 delete self;
1130 1391
1131void 1392void
1132set_text (DC::Layout self, SV *text_) 1393set_text (DC::Layout self, SV *text_)
1133 CODE: 1394 CODE:
1134{ 1395{
1260 1521
1261void 1522void
1262set_height (DC::Layout self, int base_height) 1523set_height (DC::Layout self, int base_height)
1263 CODE: 1524 CODE:
1264 if (self->base_height != base_height) 1525 if (self->base_height != base_height)
1265 { 1526 {
1266 self->base_height = base_height; 1527 self->base_height = base_height;
1267 layout_update_font (self); 1528 layout_update_font (self);
1268 } 1529 }
1269 1530
1270void 1531void
1388} 1649}
1389 1650
1390void 1651void
1391render (DC::Layout self, float x, float y, int flags = 0) 1652render (DC::Layout self, float x, float y, int flags = 0)
1392 CODE: 1653 CODE:
1393 rc_clear (self->rc); 1654 self->rc.clear ();
1394 pango_opengl_render_layout_subpixel ( 1655 pango_opengl_render_layout_subpixel (
1395 self->pl, 1656 self->pl,
1396 self->rc, 1657 &self->rc,
1397 x * PANGO_SCALE, y * PANGO_SCALE, 1658 x * PANGO_SCALE, y * PANGO_SCALE,
1398 self->r, self->g, self->b, self->a, 1659 self->r, self->g, self->b, self->a,
1399 flags 1660 flags
1400 ); 1661 );
1401 // we assume that context_change actually clears/frees stuff 1662 // we assume that context_change actually clears/frees stuff
1412 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1673 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1413 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1674 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1414 glEnable (GL_ALPHA_TEST); 1675 glEnable (GL_ALPHA_TEST);
1415 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1676 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1416 1677
1417 rc_draw (self->rc); 1678 self->rc.draw ();
1418 1679
1419 glDisable (GL_ALPHA_TEST); 1680 glDisable (GL_ALPHA_TEST);
1420 glDisable (GL_BLEND); 1681 glDisable (GL_BLEND);
1421 glDisable (GL_TEXTURE_2D); 1682 glDisable (GL_TEXTURE_2D);
1422} 1683}
1497 glDisable (GL_ALPHA_TEST); 1758 glDisable (GL_ALPHA_TEST);
1498 glDisable (GL_BLEND); 1759 glDisable (GL_BLEND);
1499 } 1760 }
1500} 1761}
1501 1762
1763void
1764draw_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)
1765 PROTOTYPE: @
1766 CODE:
1767{
1768 glEnable (GL_BLEND);
1769 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1770 glEnable (GL_TEXTURE_2D);
1771 glBindTexture (GL_TEXTURE_2D, name1);
1772
1773 glColor3f (intensity, intensity, intensity);
1774 glPushMatrix ();
1775 glScalef (1./3, 1./3, 1.);
1776
1777 if (blend > 0.f)
1778 {
1779 float dx3 = dx * -3.f / w;
1780 float dy3 = dy * -3.f / h;
1781 GLfloat env_color[4] = { 0., 0., 0., blend };
1782
1783 /* interpolate the two shadow textures */
1784 /* stage 0 == rgb(glcolor) + alpha(t0) */
1785 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1786
1787 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1788 gl.ActiveTexture (GL_TEXTURE1);
1789 glEnable (GL_TEXTURE_2D);
1790 glBindTexture (GL_TEXTURE_2D, name2);
1791 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1792
1793 /* rgb == rgb(glcolor) */
1794 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1797
1798 /* alpha = interpolate t0, t1 by env_alpha */
1799 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1800
1801 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1807
1808 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1809 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1810
1811 glBegin (GL_QUADS);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1813 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1814 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1815 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1816 glEnd ();
1817
1818 glDisable (GL_TEXTURE_2D);
1819 gl.ActiveTexture (GL_TEXTURE0);
1820 }
1821 else
1822 {
1823 /* simple blending of one texture, also opengl <1.3 path */
1824 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1825
1826 glBegin (GL_QUADS);
1827 glTexCoord2f (0, 0); glVertex2f (0, 0);
1828 glTexCoord2f (0, t); glVertex2f (0, h);
1829 glTexCoord2f (s, t); glVertex2f (w, h);
1830 glTexCoord2f (s, 0); glVertex2f (w, 0);
1831 glEnd ();
1832 }
1833
1834 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1835 {
1836 int x, y;
1837 int dx3 = dx * 3;
1838 int dy3 = dy * 3;
1839
1840 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1841 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1842 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1843 glTranslatef (-1., -1., 0);
1844 glBegin (GL_QUADS);
1845
1846 for (y = 1; y < h; y += 3)
1847 {
1848 int y1 = y - dy3;
1849 int y1valid = y1 >= 0 && y1 < h;
1850
1851 for (x = 1; x < w; x += 3)
1852 {
1853 int x1 = x - dx3;
1854 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1855 uint8_t h2;
1856
1857 if (y1valid && x1 >= 0 && x1 < w)
1858 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1859 else
1860 h2 = 1; /* out of range == invisible */
1861
1862 if (h1 || h2)
1863 {
1864 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1865 glColor4f (1., 1., 1., alpha);
1866
1867 glTexCoord2f (0, 0.); glVertex2i (x , y );
1868 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1869 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1870 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1871 }
1872 }
1873 }
1874 }
1875
1876 glEnd ();
1877
1878 glPopMatrix ();
1879
1880 glDisable (GL_TEXTURE_2D);
1881 glDisable (GL_BLEND);
1882}
1883
1502IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1884IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1503 CODE: 1885 CODE:
1504{ 1886{
1505 GLint width; 1887 GLint width;
1506 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1888 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1513MODULE = Deliantra::Client PACKAGE = DC::Map 1895MODULE = Deliantra::Client PACKAGE = DC::Map
1514 1896
1515PROTOTYPES: DISABLE 1897PROTOTYPES: DISABLE
1516 1898
1517DC::Map 1899DC::Map
1518new (SV *class) 1900new (SV *klass)
1519 CODE: 1901 CODE:
1520 New (0, RETVAL, 1, struct map); 1902 New (0, RETVAL, 1, mapgrid);
1521 RETVAL->x = 0; 1903 RETVAL->x = 0;
1522 RETVAL->y = 0; 1904 RETVAL->y = 0;
1523 RETVAL->w = 0; 1905 RETVAL->w = 0;
1524 RETVAL->h = 0; 1906 RETVAL->h = 0;
1525 RETVAL->ox = 0; 1907 RETVAL->ox = 0;
1562 1944
1563void 1945void
1564set_smooth (DC::Map self, int face, int smooth, int level) 1946set_smooth (DC::Map self, int face, int smooth, int level)
1565 CODE: 1947 CODE:
1566{ 1948{
1567 tileid texid; 1949 tileid texid;
1568 maptex *tex; 1950 maptex *tex;
1569 1951
1570 if (face < 0 || face >= self->faces) 1952 if (face < 0 || face >= self->faces)
1571 return; 1953 return;
1572 1954
1573 if (smooth < 0 || smooth >= self->faces) 1955 if (smooth < 0 || smooth >= self->faces)
1574 return; 1956 return;
1575 1957
1576 texid = self->face2tile [face]; 1958 texid = self->face2tile [face];
1577 1959
1578 if (!texid) 1960 if (!texid)
1579 return; 1961 return;
1580 1962
1581 tex = self->tex + texid; 1963 tex = self->tex + texid;
1610 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1992 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1611 // use uglier nearest interpolation because linear suffers 1993 // use uglier nearest interpolation because linear suffers
1612 // from transparent color bleeding and ugly wrapping effects. 1994 // from transparent color bleeding and ugly wrapping effects.
1613 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1995 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1614} 1996}
1997
1998void
1999expire_textures (DC::Map self, int texid, int count)
2000 PPCODE:
2001 for (; texid < self->texs && count; ++texid, --count)
2002 {
2003 maptex *tex = self->tex + texid;
2004
2005 if (tex->name)
2006 {
2007 if (tex->unused)
2008 {
2009 tex->name = 0;
2010 tex->unused = 0;
2011 XPUSHs (sv_2mortal (newSViv (texid)));
2012 }
2013 else
2014 tex->unused = 1;
2015 }
2016 }
1615 2017
1616int 2018int
1617ox (DC::Map self) 2019ox (DC::Map self)
1618 ALIAS: 2020 ALIAS:
1619 oy = 1 2021 oy = 1
1651 self->ox += dx; self->x += dx; 2053 self->ox += dx; self->x += dx;
1652 self->oy += dy; self->y += dy; 2054 self->oy += dy; self->y += dy;
1653 2055
1654 while (self->y < 0) 2056 while (self->y < 0)
1655 { 2057 {
1656 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2058 prepend (self->row, self->rows, MAP_EXTEND_Y);
1657 2059
1658 self->rows += MAP_EXTEND_Y; 2060 self->rows += MAP_EXTEND_Y;
1659 self->y += MAP_EXTEND_Y; 2061 self->y += MAP_EXTEND_Y;
1660 } 2062 }
1661} 2063}
1662 2064
1663SV * 2065SV *
1664map1a_update (DC::Map self, SV *data_, int extmap) 2066map1a_update (DC::Map self, SV *data_)
1665 CODE: 2067 CODE:
1666{ 2068{
1667 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2069 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1668 uint8_t *data_end = (uint8_t *)SvEND (data_); 2070 uint8_t *data_end = (uint8_t *)SvEND (data_);
1669 mapcell *cell; 2071 mapcell *cell;
1690 2092
1691 //TODO: don't trust server data to be in-range(!) 2093 //TODO: don't trust server data to be in-range(!)
1692 2094
1693 if (flags & 8) 2095 if (flags & 8)
1694 { 2096 {
2097 uint8_t ext, cmd;
2098
1695 if (extmap) 2099 do
1696 { 2100 {
1697 uint8_t ext, cmd; 2101 ext = *data++;
2102 cmd = ext & 0x7f;
1698 2103
1699 do 2104 if (cmd < 4)
2105 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2106 else if (cmd == 5) // health
1700 { 2107 {
1701 ext = *data++;
1702 cmd = ext & 0x7f;
1703
1704 if (cmd < 4)
1705 cell->darkness = 255 - ext * 64 + 1;
1706 else if (cmd == 5) // health
1707 {
1708 cell->stat_width = 1; 2108 cell->stat_width = 1;
1709 cell->stat_hp = *data++; 2109 cell->stat_hp = *data++;
1710 }
1711 else if (cmd == 6) // monster width
1712 cell->stat_width = *data++ + 1;
1713 else if (cmd == 0x47)
1714 {
1715 if (*data == 1) cell->player = data [1];
1716 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1717 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1718 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1719
1720 data += *data + 1;
1721 }
1722 else if (cmd == 8) // cell flags
1723 cell->flags = *data++;
1724 else if (ext & 0x40) // unknown, multibyte => skip
1725 data += *data + 1;
1726 else
1727 data++;
1728 } 2110 }
1729 while (ext & 0x80); 2111 else if (cmd == 6) // monster width
2112 cell->stat_width = *data++ + 1;
2113 else if (cmd == 0x47)
2114 {
2115 if (*data == 1) cell->player = data [1];
2116 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2117 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2118 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2119
2120 data += *data + 1;
2121 }
2122 else if (cmd == 8) // cell flags
2123 cell->flags = *data++;
2124 else if (ext & 0x40) // unknown, multibyte => skip
2125 data += *data + 1;
2126 else
2127 data++;
1730 } 2128 }
1731 else 2129 while (ext & 0x80);
1732 cell->darkness = *data++ + 1;
1733 } 2130 }
1734 2131
1735 for (z = 0; z <= 2; ++z) 2132 for (z = 0; z <= 2; ++z)
1736 if (flags & (4 >> z)) 2133 if (flags & (4 >> z))
1737 { 2134 {
1740 cell->tile [z] = self->face2tile [face]; 2137 cell->tile [z] = self->face2tile [face];
1741 2138
1742 if (cell->tile [z]) 2139 if (cell->tile [z])
1743 { 2140 {
1744 maptex *tex = self->tex + cell->tile [z]; 2141 maptex *tex = self->tex + cell->tile [z];
2142 tex->unused = 0;
1745 if (!tex->name) 2143 if (!tex->name)
1746 av_push (missing, newSViv (cell->tile [z])); 2144 av_push (missing, newSViv (cell->tile [z]));
1747 2145
1748 if (tex->smoothtile) 2146 if (tex->smoothtile)
1749 { 2147 {
1750 maptex *smooth = self->tex + tex->smoothtile; 2148 maptex *smooth = self->tex + tex->smoothtile;
2149 smooth->unused = 0;
1751 if (!smooth->name) 2150 if (!smooth->name)
1752 av_push (missing, newSViv (tex->smoothtile)); 2151 av_push (missing, newSViv (tex->smoothtile));
1753 } 2152 }
1754 } 2153 }
1755 } 2154 }
1756 } 2155 }
1757 else 2156 else
1758 cell->darkness = 0; 2157 CELL_CLEAR (cell);
1759 } 2158 }
1760} 2159}
1761 OUTPUT: 2160 OUTPUT:
1762 RETVAL 2161 RETVAL
1763 2162
1783 ? self->row + y 2182 ? self->row + y
1784 : 0; 2183 : 0;
1785 2184
1786 for (x = x0; x < x1; x++) 2185 for (x = x0; x < x1; x++)
1787 { 2186 {
1788 int r = 32, g = 32, b = 32, a = 192; 2187 unsigned int r = 32, g = 32, b = 32, a = 192;
1789 2188
1790 if (row && row->c0 <= x && x < row->c1) 2189 if (row && row->c0 <= x && x < row->c1)
1791 { 2190 {
1792 mapcell *cell = row->col + (x - row->c0); 2191 mapcell *cell = row->col + (x - row->c0);
1793 2192
1795 { 2194 {
1796 maptex tex = self->tex [cell->tile [z]]; 2195 maptex tex = self->tex [cell->tile [z]];
1797 int a0 = 255 - tex.a; 2196 int a0 = 255 - tex.a;
1798 int a1 = tex.a; 2197 int a1 = tex.a;
1799 2198
1800 r = (r * a0 + tex.r * a1) / 255; 2199 r = div255 (r * a0 + tex.r * a1);
1801 g = (g * a0 + tex.g * a1) / 255; 2200 g = div255 (g * a0 + tex.g * a1);
1802 b = (b * a0 + tex.b * a1) / 255; 2201 b = div255 (b * a0 + tex.b * a1);
1803 a = (a * a0 + tex.a * a1) / 255; 2202 a = div255 (a * a0 + tex.a * a1);
1804 } 2203 }
1805 } 2204 }
1806 2205
1807 *map++ = (r ) 2206 *map++ = (r )
1808 | (g << 8) 2207 | (g << 8)
1809 | (b << 16) 2208 | (b << 16)
1810 | (a << 24); 2209 | (a << 24);
1811 } 2210 }
1812 } 2211 }
1813 2212
1814 RETVAL = map_sv; 2213 RETVAL = map_sv;
1815} 2214}
1816 OUTPUT: 2215 OUTPUT:
1817 RETVAL 2216 RETVAL
1818 2217
1819void 2218void
1820draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2219draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1821 CODE: 2220 CODE:
1822{ 2221{
1823 int x, y, z; 2222 int x, y, z;
1824 2223
1825 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1826 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1827 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2224 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1828 smooth_key skey;
1829 int pl_x, pl_y; 2225 int pl_x, pl_y;
1830 maptex pl_tex; 2226 maptex pl_tex;
1831 rc_t *rc = rc_alloc (); 2227 rc_t rc;
2228 rc_t rc_ov;
1832 rc_key_t key; 2229 rc_key_t key;
1833 rc_array_t *arr; 2230 rc_t::array_t *arr;
1834 2231
1835 pl_tex.name = 0; 2232 pl_tex.name = 0;
1836 2233
1837 // thats current max. sorry. 2234 // that's current max. sorry.
1838 if (sw > 255) sw = 255; 2235 if (sw > 255) sw = 255;
1839 if (sh > 255) sh = 255; 2236 if (sh > 255) sh = 255;
1840
1841 // clear key, in case of extra padding
1842 memset (&skey, 0, sizeof (skey));
1843 2237
1844 memset (&key, 0, sizeof (key)); 2238 memset (&key, 0, sizeof (key));
1845 key.r = 255; 2239 key.r = 255;
1846 key.g = 255; 2240 key.g = 255;
1847 key.b = 255; 2241 key.b = 255;
1848 key.a = 255; 2242 key.a = 255;
1849 key.mode = GL_QUADS; 2243 key.mode = GL_QUADS;
1850 key.format = GL_T2F_V3F; 2244 key.format = GL_T2F_V3F;
1851 key.texname = -1;
1852 2245
1853 mx += self->x; 2246 mx += self->x;
1854 my += self->y; 2247 my += self->y;
1855 2248
1856 // first pass: determine smooth_max 2249 // first pass: determine smooth_max
1857 // rather ugly, if you ask me 2250 // rather ugly, if you ask me
1858 // could also be stored inside mapcell and updated on change 2251 // could also be stored inside mapcell and updated on change
1859 memset (smooth_max, 0, sizeof (smooth_max)); 2252 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1860 2253
1861 for (y = 0; y < sh; y++) 2254 for (y = 0; y < sh; y++)
1862 if (0 <= y + my && y + my < self->rows) 2255 if (0 <= y + my && y + my < self->rows)
1863 { 2256 {
1864 maprow *row = self->row + (y + my); 2257 maprow *row = self->row + (y + my);
1879 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2272 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1880 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2273 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1881 2274
1882 for (z = 0; z <= 2; z++) 2275 for (z = 0; z <= 2; z++)
1883 { 2276 {
1884 memset (smooth_level, 0, sizeof (smooth_level)); 2277 std::bitset<256> smooth_level; // one bit for every possible smooth level
2278 smooth_key skey;
2279 smooth_hash smooth;
2280 key.texname = -1;
1885 2281
1886 for (y = 0; y < sh; y++) 2282 for (y = 0; y < sh; y++)
1887 if (0 <= y + my && y + my < self->rows) 2283 if (0 <= y + my && y + my < self->rows)
1888 { 2284 {
1889 maprow *row = self->row + (y + my); 2285 maprow *row = self->row + (y + my);
1895 tileid tile = cell->tile [z]; 2291 tileid tile = cell->tile [z];
1896 2292
1897 if (tile) 2293 if (tile)
1898 { 2294 {
1899 maptex tex = self->tex [tile]; 2295 maptex tex = self->tex [tile];
1900 int px = (x + 1) * T - tex.w; 2296 int px, py;
1901 int py = (y + 1) * T - tex.h;
1902 2297
1903 if (key.texname != tex.name) 2298 if (key.texname != tex.name)
1904 { 2299 {
2300 self->tex [tile].unused = 0;
2301
1905 if (!tex.name) 2302 if (!tex.name)
1906 tex = self->tex [2]; /* missing, replace by noface */ 2303 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1907 2304
1908 key.texname = tex.name; 2305 key.texname = tex.name;
1909 arr = rc_array (rc, &key); 2306 arr = &rc.array (key);
1910 } 2307 }
2308
2309 px = (x + 1) * Th - tex.w;
2310 py = (y + 1) * Tw - tex.h;
1911 2311
1912 if (expect_false (cell->player == player) && expect_false (z == 2)) 2312 if (expect_false (cell->player == player) && expect_false (z == 2))
1913 { 2313 {
1914 pl_x = px; 2314 pl_x = px;
1915 pl_y = py; 2315 pl_y = py;
1916 pl_tex = tex; 2316 pl_tex = tex;
1917 continue; 2317 continue;
1918 } 2318 }
1919 2319
1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2320 arr->t2f_v3f (0 , 0 , px , py , 0);
1921 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2321 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
1922 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2322 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
1923 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2323 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1924
1925 if (expect_false (cell->flags) && expect_false (z == 2))
1926 {
1927 // overlays such as the speech bubble, probably more to come
1928 if (cell->flags & 1)
1929 {
1930 maptex tex = self->tex [1];
1931 int px = x * T + T * 2 / 32;
1932 int py = y * T - T * 6 / 32;
1933
1934 if (tex.name)
1935 {
1936 if (key.texname != tex.name)
1937 {
1938 key.texname = tex.name;
1939 arr = rc_array (rc, &key);
1940 }
1941
1942 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1943 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1945 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1946 }
1947 }
1948 }
1949 2324
1950 // update smooth hash 2325 // update smooth hash
1951 if (tex.smoothtile) 2326 if (tex.smoothtile)
1952 { 2327 {
1953 skey.tile = tex.smoothtile; 2328 skey.tile = tex.smoothtile;
1954 skey.level = tex.smoothlevel; 2329 skey.level = tex.smoothlevel;
1955 2330
1956 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2331 smooth_level[tex.smoothlevel] = 1;
1957 2332
1958 // add bits to current tile and all neighbours. skey.x|y is 2333 // add bits to current tile and all neighbours. skey.x|y is
1959 // shifted +1|+1 so we always stay positive. 2334 // shifted +1|+1 so we always stay positive.
1960 2335
1961 // bits is ___n cccc CCCC bbbb 2336 // bits is ___n cccc CCCC bbbb
1969 2344
1970 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2345 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1971 // ·· ·· ·┏ ┓· 2346 // ·· ·· ·┏ ┓·
1972 2347
1973 // full tile 2348 // full tile
1974 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2349 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1975 2350
1976 // borders 2351 // borders
1977 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2352 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1978 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2353 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1979 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2354 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1980 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2355 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1981 2356
1982 // corners 2357 // corners
1983 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2358 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1984 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2359 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1985 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2360 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1986 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2361 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2362 }
2363 }
2364
2365 if (expect_false (z == 2) && expect_false (cell->flags))
2366 {
2367 // overlays such as the speech bubble, probably more to come
2368 if (cell->flags & 1)
2369 {
2370 rc_key_t key_ov = key;
2371 maptex tex = self->tex[TEXID_SPEECH];
2372 int px = x * Tw + Tw * 2 / 32;
2373 int py = y * Th - Th * 6 / 32;
2374
2375 key_ov.texname = tex.name;
2376 rc_t::array_t &arr = rc_ov.array (key_ov);
2377
2378 arr.t2f_v3f (0 , 0 , px , py , 0);
2379 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2380 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2381 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
1987 } 2382 }
1988 } 2383 }
1989 } 2384 }
1990 } 2385 }
1991 2386
1992 rc_draw (rc); 2387 rc.draw ();
1993 rc_clear (rc); 2388 rc.clear ();
1994 2389
1995 // go through all smoothlevels, lowest to highest, then draw. 2390 // go through all smoothlevels, lowest to highest, then draw.
1996 // this is basically counting sort 2391 // this is basically counting sort
1997 { 2392 {
1998 int w, b; 2393 int w, b;
1999 2394
2000 glEnable (GL_TEXTURE_2D); 2395 glEnable (GL_TEXTURE_2D);
2001 glBegin (GL_QUADS); 2396 glBegin (GL_QUADS);
2002 for (w = 0; w < 256 / 32; ++w) 2397 for (int level = 0; level < smooth_level.size (); ++level)
2398 if (smooth_level[level])
2399 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2003 { 2400 {
2004 uint32_t smask = smooth_level [w]; 2401 smooth_key &skey = it->first;
2005 if (smask) 2402 IV bits = it->second;
2006 for (b = 0; b < 32; ++b) 2403
2007 if (smask & (((uint32_t)1) << b)) 2404 if (!(bits & 0x1000)
2405 && skey.level == level
2406 && level > smooth_max [skey.x][skey.y])
2008 { 2407 {
2009 int level = (w << 5) | b; 2408 maptex tex = self->tex [skey.tile];
2409 int px = (((int)skey.x) - 1) * Tw;
2410 int py = (((int)skey.y) - 1) * Th;
2411 int border = bits & 15;
2412 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2413 float dx = tex.s * .0625f; // 16 images/row
2414 float dy = tex.t * .5f ; // 2 images/column
2415
2010 HE *he; 2416 if (tex.name)
2011
2012 hv_iterinit (smooth);
2013 while ((he = hv_iternext (smooth)))
2014 { 2417 {
2015 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 // this time avoiding texture state changes
2016 IV bits = SvIVX (HeVAL (he)); 2419 // save gobs of state changes.
2017 2420 if (key.texname != tex.name)
2018 if (!(bits & 0x1000)
2019 && skey->level == level
2020 && level > smooth_max [skey->x][skey->y])
2021 { 2421 {
2022 maptex tex = self->tex [skey->tile]; 2422 self->tex [skey.tile].unused = 0;
2023 int px = (((int)skey->x) - 1) * T;
2024 int py = (((int)skey->y) - 1) * T;
2025 int border = bits & 15;
2026 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2027 float dx = tex.s * .0625f; // 16 images/row
2028 float dy = tex.t * .5f ; // 2 images/column
2029 2423
2030 if (tex.name)
2031 {
2032 // this time avoiding texture state changes
2033 // save gobs of state changes.
2034 if (key.texname != tex.name)
2035 {
2036 glEnd (); 2424 glEnd ();
2037 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2425 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2038 glBegin (GL_QUADS); 2426 glBegin (GL_QUADS);
2039 } 2427 }
2040 2428
2041 if (border) 2429 if (border)
2042 { 2430 {
2043 float ox = border * dx; 2431 float ox = border * dx;
2044 2432
2045 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2433 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2046 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2434 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2047 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2435 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2048 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2436 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2049 } 2437 }
2050 2438
2051 if (corner) 2439 if (corner)
2052 { 2440 {
2053 float ox = corner * dx; 2441 float ox = corner * dx;
2054 2442
2055 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2056 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2057 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2058 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2059 }
2060 }
2061 } 2447 }
2062 } 2448 }
2063 } 2449 }
2064 } 2450 }
2065 2451
2066 glEnd (); 2452 glEnd ();
2067 glDisable (GL_TEXTURE_2D); 2453 glDisable (GL_TEXTURE_2D);
2068 key.texname = -1; 2454 key.texname = -1;
2069 } 2455 }
2070
2071 hv_clear (smooth);
2072 } 2456 }
2073 2457
2074 if (pl_tex.name) 2458 if (pl_tex.name)
2075 { 2459 {
2076 maptex tex = pl_tex; 2460 maptex tex = pl_tex;
2077 int px = pl_x + pdx; 2461 int px = pl_x + sdx;
2078 int py = pl_y + pdy; 2462 int py = pl_y + sdy;
2079 2463
2080 key.texname = tex.name; 2464 key.texname = tex.name;
2081 arr = rc_array (rc, &key); 2465 rc_t::array_t &arr = rc.array (key);
2082 2466
2083 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2467 arr.t2f_v3f (0 , 0 , px , py , 0);
2084 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2468 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2085 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2469 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2086 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2470 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2087 2471
2088 rc_draw (rc); 2472 rc.draw ();
2089 } 2473 }
2090 2474
2475 rc_ov.draw ();
2476 rc_ov.clear ();
2477
2091 glDisable (GL_BLEND); 2478 glDisable (GL_BLEND);
2092 rc_free (rc);
2093 2479
2094 // top layer: overlays such as the health bar 2480 // top layer: overlays such as the health bar
2095 for (y = 0; y < sh; y++) 2481 for (y = 0; y < sh; y++)
2096 if (0 <= y + my && y + my < self->rows) 2482 if (0 <= y + my && y + my < self->rows)
2097 { 2483 {
2100 for (x = 0; x < sw; x++) 2486 for (x = 0; x < sw; x++)
2101 if (row->c0 <= x + mx && x + mx < row->c1) 2487 if (row->c0 <= x + mx && x + mx < row->c1)
2102 { 2488 {
2103 mapcell *cell = row->col + (x + mx - row->c0); 2489 mapcell *cell = row->col + (x + mx - row->c0);
2104 2490
2105 int px = x * T; 2491 int px = x * Tw;
2106 int py = y * T; 2492 int py = y * Th;
2493
2494 if (expect_false (cell->player == player))
2495 {
2496 px += sdx;
2497 py += sdy;
2498 }
2107 2499
2108 if (cell->stat_hp) 2500 if (cell->stat_hp)
2109 { 2501 {
2110 int width = cell->stat_width * T; 2502 int width = cell->stat_width * Tw;
2111 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2503 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2112 2504
2113 glColor3ub (0, 0, 0); 2505 glColor3ub (0, 0, 0);
2114 glRectf (px + 1, py - thick - 2, 2506 glRectf (px + 1, py - thick - 2,
2115 px + width - 1, py); 2507 px + width - 1, py);
2116 2508
2122 } 2514 }
2123 } 2515 }
2124} 2516}
2125 2517
2126void 2518void
2127draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2519draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2128 CODE: 2520 CODE:
2129{ 2521{
2130 static float color[16][3] = { 2522 static float color[16][3] = {
2131 { 0.00F, 0.00F, 0.00F }, 2523 { 0.00f, 0.00f, 0.00f },
2132 { 1.00F, 1.00F, 1.00F }, 2524 { 1.00f, 1.00f, 1.00f },
2133 { 0.00F, 0.00F, 0.55F }, 2525 { 0.00f, 0.00f, 0.55f },
2134 { 1.00F, 0.00F, 0.00F }, 2526 { 1.00f, 0.00f, 0.00f },
2135 2527
2136 { 1.00F, 0.54F, 0.00F }, 2528 { 1.00f, 0.54f, 0.00f },
2137 { 0.11F, 0.56F, 1.00F }, 2529 { 0.11f, 0.56f, 1.00f },
2138 { 0.93F, 0.46F, 0.00F }, 2530 { 0.93f, 0.46f, 0.00f },
2139 { 0.18F, 0.54F, 0.34F }, 2531 { 0.18f, 0.54f, 0.34f },
2140 2532
2141 { 0.56F, 0.73F, 0.56F }, 2533 { 0.56f, 0.73f, 0.56f },
2142 { 0.80F, 0.80F, 0.80F }, 2534 { 0.80f, 0.80f, 0.80f },
2143 { 0.55F, 0.41F, 0.13F }, 2535 { 0.55f, 0.41f, 0.13f },
2144 { 0.99F, 0.77F, 0.26F }, 2536 { 0.99f, 0.77f, 0.26f },
2145 2537
2146 { 0.74F, 0.65F, 0.41F }, 2538 { 0.74f, 0.65f, 0.41f },
2147 2539
2148 { 0.00F, 1.00F, 1.00F }, 2540 { 0.00f, 1.00f, 1.00f },
2149 { 1.00F, 0.00F, 1.00F }, 2541 { 1.00f, 0.00f, 1.00f },
2150 { 1.00F, 1.00F, 0.00F }, 2542 { 1.00f, 1.00f, 0.00f },
2151 }; 2543 };
2152 2544
2153 int x, y; 2545 int x, y;
2154 2546
2155 glEnable (GL_TEXTURE_2D); 2547 glEnable (GL_TEXTURE_2D);
2548 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2549 * but the nvidia driver (185.18.14) mishandles alpha textures
2550 * and takes the colour from god knows where instead of using
2551 * Cp. MODULATE results in the same colour, but slightly different
2552 * alpha, but atcually gives us the correct colour with nvidia.
2553 */
2156 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2554 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2157 glEnable (GL_BLEND); 2555 glEnable (GL_BLEND);
2158 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2556 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2159 glBegin (GL_QUADS); 2557 glBegin (GL_QUADS);
2160 2558
2161 for (y = 0; y < h; y++) 2559 for (y = 0; y < h; y++)
2165 2563
2166 if (m) 2564 if (m)
2167 { 2565 {
2168 float *c = color [m & 15]; 2566 float *c = color [m & 15];
2169 2567
2170 float tx1 = m & 0x40 ? 0.5 : 0.; 2568 float tx1 = m & 0x40 ? 0.5f : 0.f;
2171 float tx2 = tx1 + 0.5; 2569 float tx2 = tx1 + 0.5f;
2172 2570
2173 glColor4f (c[0], c[1], c[2], 0.75); 2571 glColor4f (c[0], c[1], c[2], 1);
2174 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2572 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2175 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2573 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2176 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2574 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2177 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2575 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2178 } 2576 }
2186void 2584void
2187fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2585fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2188 PPCODE: 2586 PPCODE:
2189{ 2587{
2190 int x, y; 2588 int x, y;
2191 int sw1 = sw + 2; 2589 int sw1 = sw + 2;
2192 int sh1 = sh + 2; 2590 int sh1 = sh + 2;
2193 int sh3 = sh * 3; 2591 int sh3 = sh * 3;
2194 int sw34 = (sw * 3 + 3) & ~3; 2592 int sw3 = sw * 3;
2593 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2594 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2195 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2595 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2196 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2596 memset (darkness1, 0, sw1*sh1);
2197 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2198 2597
2199 SvPOK_only (darkness3_sv); 2598 SvPOK_only (darkness3_sv);
2200 SvCUR_set (darkness3_sv, sw34 * sh3); 2599 SvCUR_set (darkness3_sv, sw3 * sh3);
2201 2600
2202 mx += self->x - 1; 2601 mx += self->x - 1;
2203 my += self->y - 1; 2602 my += self->y - 1;
2204
2205 memset (darkness1, 255, sw1 * sh1);
2206 2603
2207 for (y = 0; y < sh1; y++) 2604 for (y = 0; y < sh1; y++)
2208 if (0 <= y + my && y + my < self->rows) 2605 if (0 <= y + my && y + my < self->rows)
2209 { 2606 {
2210 maprow *row = self->row + (y + my); 2607 maprow *row = self->row + (y + my);
2213 if (row->c0 <= x + mx && x + mx < row->c1) 2610 if (row->c0 <= x + mx && x + mx < row->c1)
2214 { 2611 {
2215 mapcell *cell = row->col + (x + mx - row->c0); 2612 mapcell *cell = row->col + (x + mx - row->c0);
2216 2613
2217 darkness1 [y * sw1 + x] = cell->darkness 2614 darkness1 [y * sw1 + x] = cell->darkness
2218 ? 255 - (cell->darkness - 1) 2615 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2219 : 255 - FOW_DARKNESS; 2616 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2220 } 2617 }
2221 } 2618 }
2222 2619
2223 for (y = 0; y < sh; ++y) 2620 for (y = 0; y < sh; ++y)
2224 for (x = 0; x < sw; ++x) 2621 for (x = 0; x < sw; ++x)
2243 2640
2244 uint8_t r13 = (d13 + d23 + d12) / 3; 2641 uint8_t r13 = (d13 + d23 + d12) / 3;
2245 uint8_t r23 = d23; 2642 uint8_t r23 = d23;
2246 uint8_t r33 = (d23 + d33 + d32) / 3; 2643 uint8_t r33 = (d23 + d33 + d32) / 3;
2247 2644
2248 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2645 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2249 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2646 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2250 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2647 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2251 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2648 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2252 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2649 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2253 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2650 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2254 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2651 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2255 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2652 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2256 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2653 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2257 } 2654 }
2258 2655
2259 free (darkness1); 2656 free (darkness1);
2260 2657
2261 EXTEND (SP, 3); 2658 EXTEND (SP, 3);
2262 PUSHs (sv_2mortal (newSViv (sw34))); 2659 PUSHs (sv_2mortal (newSViv (sw3)));
2263 PUSHs (sv_2mortal (newSViv (sh3))); 2660 PUSHs (sv_2mortal (newSViv (sh3)));
2264 PUSHs (darkness3_sv); 2661 PUSHs (darkness3_sv);
2265} 2662}
2266 2663
2267SV * 2664SV *
2330 else 2727 else
2331 *data++ = 0; 2728 *data++ = 0;
2332 } 2729 }
2333 } 2730 }
2334 2731
2335 /* if size is w*h + 5 then no data has been found */ 2732 /* if size is w*h + 5 then no data has been found */
2336 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2733 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2337 { 2734 {
2338 SvPOK_only (data_sv); 2735 SvPOK_only (data_sv);
2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2736 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 } 2737 }
2341 2738
2342 RETVAL = data_sv; 2739 RETVAL = data_sv;
2343} 2740}
2344 OUTPUT: 2741 OUTPUT:
2345 RETVAL 2742 RETVAL
2346 2743
2347void 2744void
2354 STRLEN len; 2751 STRLEN len;
2355 uint8_t *data, *end; 2752 uint8_t *data, *end;
2356 2753
2357 len = SvLEN (data_sv); 2754 len = SvLEN (data_sv);
2358 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2755 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2359 data = SvPVbyte_nolen (data_sv); 2756 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2360 end = data + len + 8; 2757 end = data + len + 8;
2361 2758
2362 if (len < 5) 2759 if (len < 5)
2363 XSRETURN_EMPTY; 2760 XSRETURN_EMPTY;
2364 2761
2425} 2822}
2426 2823
2427MODULE = Deliantra::Client PACKAGE = DC::RW 2824MODULE = Deliantra::Client PACKAGE = DC::RW
2428 2825
2429DC::RW 2826DC::RW
2430new (SV *class, SV *data_sv) 2827new (SV *klass, SV *data_sv)
2431 CODE: 2828 CODE:
2432{ 2829{
2433 STRLEN datalen; 2830 STRLEN datalen;
2434 char *data = SvPVbyte (data_sv, datalen); 2831 char *data = SvPVbyte (data_sv, datalen);
2435 2832
2437} 2834}
2438 OUTPUT: 2835 OUTPUT:
2439 RETVAL 2836 RETVAL
2440 2837
2441DC::RW 2838DC::RW
2442new_from_file (SV *class, const char *path, const char *mode = "rb") 2839new_from_file (SV *klass, const char *path, const char *mode = "rb")
2443 CODE: 2840 CODE:
2444 RETVAL = SDL_RWFromFile (path, mode); 2841 RETVAL = SDL_RWFromFile (path, mode);
2445 OUTPUT: 2842 OUTPUT:
2446 RETVAL 2843 RETVAL
2447 2844
2465 if (RETVAL < 0) 2862 if (RETVAL < 0)
2466 { 2863 {
2467 RETVAL = Mix_GroupOldest (-1); 2864 RETVAL = Mix_GroupOldest (-1);
2468 2865
2469 if (RETVAL < 0) 2866 if (RETVAL < 0)
2867 {
2868 // happens sometimes, maybe it just stopped playing(?)
2869 RETVAL = Mix_GroupAvailable (-1);
2870
2871 if (RETVAL < 0)
2470 XSRETURN_UNDEF; 2872 XSRETURN_UNDEF;
2471 2873 }
2874 else
2472 Mix_HaltChannel (RETVAL); 2875 Mix_HaltChannel (RETVAL);
2473 } 2876 }
2474 2877
2475 Mix_UnregisterAllEffects (RETVAL); 2878 Mix_UnregisterAllEffects (RETVAL);
2476 Mix_Volume (RETVAL, 128); 2879 Mix_Volume (RETVAL, 128);
2477} 2880}
2524void 2927void
2525set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2928set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2526 CODE: 2929 CODE:
2527{ 2930{
2528 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2931 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2529 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2932 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2530 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2933 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2531} 2934}
2532 2935
2533void 2936void
2534set_reverse_stereo (DC::Channel self, int flip) 2937set_reverse_stereo (DC::Channel self, int flip)
2537 2940
2538MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2941MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2539 2942
2540PROTOTYPES: DISABLE 2943PROTOTYPES: DISABLE
2541 2944
2945void
2946decoders ()
2947 PPCODE:
2948#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2949 int i, num = Mix_GetNumChunkDecoders ();
2950 EXTEND (SP, num);
2951 for (i = 0; i < num; ++i)
2952 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2953#else
2954 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2955#endif
2956
2542DC::MixChunk 2957DC::MixChunk
2543new (SV *class, DC::RW rwops) 2958new (SV *klass, DC::RW rwops)
2544 CODE: 2959 CODE:
2545 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2960 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2546 OUTPUT: 2961 OUTPUT:
2547 RETVAL 2962 RETVAL
2548 2963
2578 OUTPUT: 2993 OUTPUT:
2579 RETVAL 2994 RETVAL
2580 2995
2581MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2996MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2582 2997
2998void
2999decoders ()
3000 PPCODE:
3001#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3002 int i, num = Mix_GetNumMusicDecoders ();
3003 EXTEND (SP, num);
3004 for (i = 0; i < num; ++i)
3005 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3006#else
3007 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3008#endif
3009
2583int 3010int
2584volume (int volume = -1) 3011volume (int volume = -1)
2585 PROTOTYPE: ;$ 3012 PROTOTYPE: ;$
2586 CODE: 3013 CODE:
2587 if (items > 0) 3014 if (items > 0)
2598void 3025void
2599halt () 3026halt ()
2600 CODE: 3027 CODE:
2601 Mix_HaltMusic (); 3028 Mix_HaltMusic ();
2602 3029
3030int
3031playing ()
3032 CODE:
3033 RETVAL = Mix_PlayingMusic ();
3034 OUTPUT:
3035 RETVAL
3036
2603DC::MixMusic 3037DC::MixMusic
2604new (SV *class, DC::RW rwops) 3038new (SV *klass, DC::RW rwops)
2605 CODE: 3039 CODE:
2606 RETVAL = Mix_LoadMUS_RW (rwops); 3040 RETVAL = Mix_LoadMUS_RW (rwops);
2607 OUTPUT: 3041 OUTPUT:
2608 RETVAL 3042 RETVAL
2609 3043
2637 } *civ, const_iv[] = { 3071 } *civ, const_iv[] = {
2638# define const_iv(name) { # name, (IV)name } 3072# define const_iv(name) { # name, (IV)name }
2639 const_iv (GL_VENDOR), 3073 const_iv (GL_VENDOR),
2640 const_iv (GL_VERSION), 3074 const_iv (GL_VERSION),
2641 const_iv (GL_EXTENSIONS), 3075 const_iv (GL_EXTENSIONS),
3076 const_iv (GL_MAX_TEXTURE_UNITS),
2642 const_iv (GL_COLOR_MATERIAL), 3077 const_iv (GL_COLOR_MATERIAL),
2643 const_iv (GL_SMOOTH), 3078 const_iv (GL_SMOOTH),
2644 const_iv (GL_FLAT), 3079 const_iv (GL_FLAT),
2645 const_iv (GL_DITHER), 3080 const_iv (GL_DITHER),
2646 const_iv (GL_BLEND), 3081 const_iv (GL_BLEND),
2658 const_iv (GL_ZERO), 3093 const_iv (GL_ZERO),
2659 const_iv (GL_SRC_ALPHA), 3094 const_iv (GL_SRC_ALPHA),
2660 const_iv (GL_DST_ALPHA), 3095 const_iv (GL_DST_ALPHA),
2661 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3096 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2662 const_iv (GL_ONE_MINUS_DST_ALPHA), 3097 const_iv (GL_ONE_MINUS_DST_ALPHA),
3098 const_iv (GL_SRC_COLOR),
3099 const_iv (GL_DST_COLOR),
3100 const_iv (GL_ONE_MINUS_SRC_COLOR),
3101 const_iv (GL_ONE_MINUS_DST_COLOR),
2663 const_iv (GL_SRC_ALPHA_SATURATE), 3102 const_iv (GL_SRC_ALPHA_SATURATE),
2664 const_iv (GL_RGB), 3103 const_iv (GL_RGB),
2665 const_iv (GL_RGBA), 3104 const_iv (GL_RGBA),
2666 const_iv (GL_RGBA4), 3105 const_iv (GL_RGBA4),
2667 const_iv (GL_RGBA8), 3106 const_iv (GL_RGBA8),
2735 const_iv (GL_NICEST), 3174 const_iv (GL_NICEST),
2736 const_iv (GL_V2F), 3175 const_iv (GL_V2F),
2737 const_iv (GL_V3F), 3176 const_iv (GL_V3F),
2738 const_iv (GL_T2F_V3F), 3177 const_iv (GL_T2F_V3F),
2739 const_iv (GL_T2F_N3F_V3F), 3178 const_iv (GL_T2F_N3F_V3F),
3179 const_iv (GL_FUNC_ADD),
3180 const_iv (GL_FUNC_SUBTRACT),
3181 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2740# undef const_iv 3182# undef const_iv
2741 }; 3183 };
2742 3184
2743 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3185 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2744 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3186 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2745 3187
2746 texture_av = newAV (); 3188 texture_av = newAV ();
2747 AvREAL_off (texture_av); 3189 AvREAL_off (texture_av);
2748} 3190}
2749 3191
2751disable_GL_EXT_blend_func_separate () 3193disable_GL_EXT_blend_func_separate ()
2752 CODE: 3194 CODE:
2753 gl.BlendFuncSeparate = 0; 3195 gl.BlendFuncSeparate = 0;
2754 gl.BlendFuncSeparateEXT = 0; 3196 gl.BlendFuncSeparateEXT = 0;
2755 3197
2756char * 3198void
3199apple_nvidia_bug (int enable)
3200
3201const char *
2757gl_vendor () 3202gl_vendor ()
2758 CODE: 3203 CODE:
2759 RETVAL = (char *)glGetString (GL_VENDOR); 3204 RETVAL = (const char *)glGetString (GL_VENDOR);
2760 OUTPUT: 3205 OUTPUT:
2761 RETVAL 3206 RETVAL
2762 3207
2763char * 3208const char *
2764gl_version () 3209gl_version ()
2765 CODE: 3210 CODE:
2766 RETVAL = (char *)glGetString (GL_VERSION); 3211 RETVAL = (const char *)glGetString (GL_VERSION);
2767 OUTPUT: 3212 OUTPUT:
2768 RETVAL 3213 RETVAL
2769 3214
2770char * 3215const char *
2771gl_extensions () 3216gl_extensions ()
2772 CODE: 3217 CODE:
2773 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3218 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2774 OUTPUT: 3219 OUTPUT:
2775 RETVAL 3220 RETVAL
2776 3221
2777const char *glGetString (GLenum pname) 3222const char *glGetString (GLenum pname)
3223 CODE:
3224 RETVAL = (const char *)glGetString (pname);
3225 OUTPUT:
3226 RETVAL
2778 3227
2779GLint glGetInteger (GLenum pname) 3228GLint glGetInteger (GLenum pname)
2780 CODE: 3229 CODE:
2781 glGetIntegerv (pname, &RETVAL); 3230 glGetIntegerv (pname, &RETVAL);
2782 OUTPUT: 3231 OUTPUT:
2790 3239
2791int glGetError () 3240int glGetError ()
2792 3241
2793void glFinish () 3242void glFinish ()
2794 3243
3244void glFlush ()
3245
2795void glClear (int mask) 3246void glClear (int mask)
2796 3247
2797void glClearColor (float r, float g, float b, float a = 1.0) 3248void glClearColor (float r, float g, float b, float a = 1.0)
2798 PROTOTYPE: @ 3249 PROTOTYPE: @
2799 3250
2808void glBlendFunc (int sfactor, int dfactor) 3259void glBlendFunc (int sfactor, int dfactor)
2809 3260
2810void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3261void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2811 CODE: 3262 CODE:
2812 gl_BlendFuncSeparate (sa, da, saa, daa); 3263 gl_BlendFuncSeparate (sa, da, saa, daa);
3264
3265# void glBlendEquation (int se)
2813 3266
2814void glDepthMask (int flag) 3267void glDepthMask (int flag)
2815 3268
2816void glLogicOp (int opcode) 3269void glLogicOp (int opcode)
2817 3270
2852void glRotate (float angle, float x, float y, float z) 3305void glRotate (float angle, float x, float y, float z)
2853 CODE: 3306 CODE:
2854 glRotatef (angle, x, y, z); 3307 glRotatef (angle, x, y, z);
2855 3308
2856void glColor (float r, float g, float b, float a = 1.0) 3309void glColor (float r, float g, float b, float a = 1.0)
3310 PROTOTYPE: @
2857 ALIAS: 3311 ALIAS:
2858 glColor_premultiply = 1 3312 glColor_premultiply = 1
2859 CODE: 3313 CODE:
2860 if (ix) 3314 if (ix)
2861 { 3315 {
2967 3421
2968void glEndList () 3422void glEndList ()
2969 3423
2970void glCallList (int list) 3424void glCallList (int list)
2971 3425
3426void c_init ()
3427 CODE:
3428 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3429 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3430
2972MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3431MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2973 3432
2974PROTOTYPES: DISABLE 3433PROTOTYPES: DISABLE
2975 3434
2976void 3435void
2977find_widget (SV *self, NV x, NV y) 3436find_widget (SV *self, NV x, NV y)
2978 PPCODE: 3437 PPCODE:
2979{ 3438{
2980 if (within_widget (self, x, y)) 3439 if (within_widget (self, x, y))
2981 XPUSHs (self); 3440 XPUSHs (self);
2982} 3441}
2983 3442
2984BOOT: 3443BOOT:
2985{ 3444{
2993 3452
2994void 3453void
2995draw (SV *self) 3454draw (SV *self)
2996 CODE: 3455 CODE:
2997{ 3456{
2998 HV *hv; 3457 HV *hv;
2999 SV **svp; 3458 SV **svp;
3000 NV x, y, w, h; 3459 NV x, y, w, h;
3001 SV *draw_x_sv = GvSV (draw_x_gv); 3460 SV *draw_x_sv = GvSV (draw_x_gv);
3002 SV *draw_y_sv = GvSV (draw_y_gv); 3461 SV *draw_y_sv = GvSV (draw_y_gv);
3003 SV *draw_w_sv = GvSV (draw_w_gv); 3462 SV *draw_w_sv = GvSV (draw_w_gv);
3004 SV *draw_h_sv = GvSV (draw_h_gv); 3463 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines