ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.258 by root, Thu Apr 10 14:35:50 2008 UTC vs.
Revision 1.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
65# include <netinet/in.h> 76# include <netinet/in.h>
66# include <netinet/tcp.h> 77# include <netinet/tcp.h>
67# include <inttypes.h> 78# include <inttypes.h>
68#endif 79#endif
69 80
81#if __GNUC__ >= 4
82# define expect(expr,value) __builtin_expect ((expr),(value))
83#else
84# define expect(expr,value) (expr)
85#endif
86
87#define expect_false(expr) expect ((expr) != 0, 0)
88#define expect_true(expr) expect ((expr) != 0, 1)
89
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 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 */
72#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
73 96
74#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
75#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
76 99
77#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
78 101
79/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81 104
82#if 0 105#define KMOD_LRAM 0x10000 // our extension
83# define PARACHUTE SDL_INIT_NOPARACHUTE 106
84#else 107#define TEXID_SPEECH 1
85# define PARACHUTE 0 108#define TEXID_NOFACE 2
86#endif 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}
87 128
88static AV *texture_av; 129static AV *texture_av;
89 130
90static struct 131static struct
91{ 132{
148{ 189{
149 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
150 191
151 while (attrs) 192 while (attrs)
152 { 193 {
153 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
154 195
155 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
156 return 1; 197 return 1;
157 198
158 attrs = attrs->next; 199 attrs = attrs->next;
159 } 200 }
160 201
161 return 0; 202 return 0;
162} 203}
163 204
164typedef struct cf_layout { 205struct cf_layout {
165 PangoLayout *pl; 206 PangoLayout *pl;
166 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
167 int base_height; 208 int base_height;
168 DC__Font font; 209 DC__Font font;
169 rc_t *rc; 210 rc_t rc;
170} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
171 214
172static DC__Font default_font; 215static DC__Font default_font;
173static PangoContext *opengl_context; 216static PangoContext *opengl_context;
174static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
175 218
176static void 219static void
177substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
178{ 221{
179 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
180#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
181 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
182#endif 225#endif
183 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
184} 227}
185 228
186static void 229static void
216} 259}
217 260
218typedef uint16_t tileid; 261typedef uint16_t tileid;
219typedef uint16_t faceid; 262typedef uint16_t faceid;
220 263
221typedef struct { 264struct maptex
265{
222 GLuint name; 266 GLuint name;
223 int w, h; 267 int w, h;
224 float s, t; 268 float s, t;
225 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
226 tileid smoothtile; 270 tileid smoothtile;
227 uint8_t smoothlevel; 271 uint8_t smoothlevel;
228} maptex; 272 uint8_t unused; /* set to zero on use */
273};
229 274
230typedef struct { 275struct mapcell
276{
231 uint32_t player; 277 uint32_t player;
232 tileid tile[3]; 278 tileid tile[3];
233 uint16_t darkness; 279 uint16_t darkness;
234 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
235} mapcell; 281};
236 282
237typedef struct { 283struct maprow
284{
238 int32_t c0, c1; 285 int32_t c0, c1;
239 mapcell *col; 286 mapcell *col;
240} maprow; 287};
241 288
242typedef struct map { 289struct mapgrid {
243 int x, y, w, h; 290 int x, y, w, h;
244 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
245 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
246 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
247 294
248 int32_t rows; 295 int32_t rows;
249 maprow *row; 296 maprow *row;
250} *DC__Map; 297};
251 298
252static char * 299typedef mapgrid *DC__Map;
300
301template<typename T>
302static void
253prepend (char *ptr, int sze, int inc) 303prepend (T *&ptr, int sze, int inc)
254{ 304{
255 char *p; 305 T *p;
256 306
257 New (0, p, sze + inc, char); 307 New (0, p, sze + inc, T);
258 Zero (p, inc, char); 308 Zero (p, inc, T);
259 Move (ptr, p + inc, sze, char); 309 Move (ptr, p + inc, sze, T);
260 Safefree (ptr); 310 Safefree (ptr);
261 311
262 return p; 312 ptr = p;
263} 313}
264 314
265static char * 315template<typename T>
266append (char *ptr, int sze, int inc)
267{
268 Renew (ptr, sze + inc, char);
269 Zero (ptr + sze, inc, char);
270
271 return ptr;
272}
273
274#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
275#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
276
277static void 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
278need_facenum (struct map *self, faceid face) 324need_facenum (struct mapgrid *self, faceid face)
279{ 325{
280 while (self->faces <= face) 326 while (self->faces <= face)
281 { 327 {
282 Append (tileid, self->face2tile, self->faces, self->faces); 328 append (self->face2tile, self->faces, self->faces);
283 self->faces *= 2; 329 self->faces *= 2;
284 } 330 }
285} 331}
286 332
287static void 333static void
288need_texid (struct map *self, int texid) 334need_texid (struct mapgrid *self, int texid)
289{ 335{
290 while (self->texs <= texid) 336 while (self->texs <= texid)
291 { 337 {
292 Append (maptex, self->tex, self->texs, self->texs); 338 append (self->tex, self->texs, self->texs);
293 self->texs *= 2; 339 self->texs *= 2;
294 } 340 }
295} 341}
296 342
297static maprow * 343static maprow *
298map_get_row (DC__Map self, int y) 344map_get_row (mapgrid *self, int y)
299{ 345{
300 if (0 > y) 346 if (0 > y)
301 { 347 {
302 int extend = - y + MAP_EXTEND_Y; 348 int extend = - y + MAP_EXTEND_Y;
303 Prepend (maprow, self->row, self->rows, extend); 349 prepend (self->row, self->rows, extend);
304 350
305 self->rows += extend; 351 self->rows += extend;
306 self->y += extend; 352 self->y += extend;
307 y += extend; 353 y += extend;
308 } 354 }
309 else if (y >= self->rows) 355 else if (y >= self->rows)
310 { 356 {
311 int extend = y - self->rows + MAP_EXTEND_Y; 357 int extend = y - self->rows + MAP_EXTEND_Y;
312 Append (maprow, self->row, self->rows, extend); 358 append (self->row, self->rows, extend);
313 self->rows += extend; 359 self->rows += extend;
314 } 360 }
315 361
316 return self->row + y; 362 return self->row + y;
317} 363}
327 } 373 }
328 374
329 if (row->c0 > x) 375 if (row->c0 > x)
330 { 376 {
331 int extend = row->c0 - x + MAP_EXTEND_X; 377 int extend = row->c0 - x + MAP_EXTEND_X;
332 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 378 prepend (row->col, row->c1 - row->c0, extend);
333 row->c0 -= extend; 379 row->c0 -= extend;
334 } 380 }
335 else if (x >= row->c1) 381 else if (x >= row->c1)
336 { 382 {
337 int extend = x - row->c1 + MAP_EXTEND_X; 383 int extend = x - row->c1 + MAP_EXTEND_X;
338 Append (mapcell, row->col, row->c1 - row->c0, extend); 384 append (row->col, row->c1 - row->c0, extend);
339 row->c1 += extend; 385 row->c1 += extend;
340 } 386 }
341 387
342 return row->col + (x - row->c0); 388 return row->col + (x - row->c0);
343} 389}
344 390
345static mapcell * 391static mapcell *
346map_get_cell (DC__Map self, int x, int y) 392map_get_cell (mapgrid *self, int x, int y)
347{ 393{
348 return row_get_cell (map_get_row (self, y), x); 394 return row_get_cell (map_get_row (self, y), x);
349} 395}
350 396
351static void 397static void
352map_clear (DC__Map self) 398map_clear (mapgrid *self)
353{ 399{
354 int r; 400 int r;
355 401
356 for (r = 0; r < self->rows; r++) 402 for (r = 0; r < self->rows; r++)
357 Safefree (self->row[r].col); 403 Safefree (self->row[r].col);
364 self->oy = 0; 410 self->oy = 0;
365 self->row = 0; 411 self->row = 0;
366 self->rows = 0; 412 self->rows = 0;
367} 413}
368 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
369static void 425static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 426map_blank (mapgrid *self, int x0, int y0, int w, int h)
371{ 427{
372 int x, y; 428 int x, y;
373 maprow *row; 429 maprow *row;
374 mapcell *cell; 430 mapcell *cell;
375 431
387 if (x >= row->c1) 443 if (x >= row->c1)
388 break; 444 break;
389 445
390 cell = row->col + x - row->c0; 446 cell = row->col + x - row->c0;
391 447
392 cell->darkness = 0; 448 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 449 }
397 } 450 }
398} 451}
399 452
400typedef struct { 453struct smooth_key
454{
401 tileid tile; 455 tileid tile;
402 uint8_t x, y, level; 456 uint8_t x, y, level;
403} 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}
404 476
405static void 477static void
406smooth_or_bits (HV *hv, smooth_key *key, IV bits) 478smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
407{ 479{
408 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 480 auto &&it = h.find (key);
409 481
410 if (SvIOK (*sv)) 482 if (it == h.end ())
411 SvIV_set (*sv, SvIVX (*sv) | bits); 483 h.insert (std::make_pair (key, bits));
412 else 484 else
413 sv_setiv (*sv, bits); 485 it->second |= bits;
414} 486}
415 487
416static void 488static void
417music_finished (void) 489music_finished (void)
418{ 490{
435 ev.code = 1; 507 ev.code = 1;
436 ev.data1 = (void *)(long)channel; 508 ev.data1 = (void *)(long)channel;
437 ev.data2 = 0; 509 ev.data2 = 0;
438 510
439 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;
440} 519}
441 520
442static unsigned int 521static unsigned int
443minpot (unsigned int n) 522minpot (unsigned int n)
444{ 523{
511 if (!svp || !SvTRUE (*svp)) 590 if (!svp || !SvTRUE (*svp))
512 return 0; 591 return 0;
513 592
514 return 1; 593 return 1;
515} 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
516 653
517MODULE = Deliantra::Client PACKAGE = DC 654MODULE = Deliantra::Client PACKAGE = DC
518 655
519PROTOTYPES: ENABLE 656PROTOTYPES: ENABLE
520 657
549 const_iv (SDL_USEREVENT), 686 const_iv (SDL_USEREVENT),
550 687
551 const_iv (SDL_APPINPUTFOCUS), 688 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 689 const_iv (SDL_APPMOUSEFOCUS),
553 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),
554 741
555 const_iv (SDLK_FIRST), 742 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 743 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 744 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 745 const_iv (SDLK_KP1),
634 const_iv (KMOD_RMETA), 821 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 822 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 823 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 824 const_iv (KMOD_MODE),
638 825
826 const_iv (KMOD_LRAM),
827
639 const_iv (MIX_DEFAULT_FORMAT), 828 const_iv (MIX_DEFAULT_FORMAT),
829
830 const_iv (SDL_INIT_TIMER),
831 const_iv (SDL_INIT_AUDIO),
832 const_iv (SDL_INIT_VIDEO),
833 const_iv (SDL_INIT_CDROM),
834 const_iv (SDL_INIT_JOYSTICK),
835 const_iv (SDL_INIT_EVERYTHING),
836 const_iv (SDL_INIT_NOPARACHUTE),
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)
640# undef const_iv 858# undef const_iv
641 }; 859 };
642 860
643 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--)
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 862 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
645 863
646 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 864 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
647 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 865 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
648} 866}
649 867
665NV ceil (NV x) 883NV ceil (NV x)
666 884
667IV minpot (UV n) 885IV minpot (UV n)
668 886
669IV 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
670 894
671void 895void
672pango_init () 896pango_init ()
673 CODE: 897 CODE:
674{ 898{
680 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 904 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 905 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif 906#endif
683} 907}
684 908
685char *
686SDL_GetError () 909char *SDL_GetError ()
687 910
688int 911void SDL_main_hack (SV *real_main)
689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 912 PROTOTYPE: &
690 913
691void 914int SDL_Init (U32 flags)
915
916int SDL_InitSubSystem (U32 flags)
917
918void SDL_QuitSubSystem (U32 flags)
919
692SDL_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
693 931
694void 932void
695SDL_ListModes (int rgb, int alpha) 933SDL_ListModes (int rgb, int alpha)
696 PPCODE: 934 PPCODE:
697{ 935{
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 947 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 948 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 949 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712 950
713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 951 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
714#if SDL_VERSION_ATLEAST(1,2,10)
715 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
716 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 952 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717#endif
718 953
719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 954 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
720 955
721 if (m && m != (SDL_Rect **)-1) 956 if (m && m != (SDL_Rect **)-1)
722 while (*m) 957 while (*m)
723 { 958 {
724 if ((*m)->w >= 800 && (*m)->h >= 480) 959 if ((*m)->w >= 400 && (*m)->h >= 300)
725 { 960 {
726 AV *av = newAV (); 961 AV *av = newAV ();
727 av_push (av, newSViv ((*m)->w)); 962 av_push (av, newSViv ((*m)->w));
728 av_push (av, newSViv ((*m)->h)); 963 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb)); 964 av_push (av, newSViv (rgb));
752 ); 987 );
753 988
754 if (RETVAL) 989 if (RETVAL)
755 { 990 {
756 av_clear (texture_av); 991 av_clear (texture_av);
757
758 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
759#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 992#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
760#include "glfunc.h" 993#include "glfunc.h"
761#undef GL_FUNC 994#undef GL_FUNC
995 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
996 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
762 } 997 }
763} 998}
764 OUTPUT: 999 OUTPUT:
765 RETVAL 1000 RETVAL
1001
1002void
1003SDL_WM_SetCaption (const char *title, const char *icon)
766 1004
767void 1005void
768SDL_GL_SwapBuffers () 1006SDL_GL_SwapBuffers ()
769 1007
770char * 1008char *
771SDL_GetKeyName (int sym) 1009SDL_GetKeyName (int sym)
1010 C_ARGS: (SDLKey)sym
772 1011
773int 1012int
774SDL_GetAppState () 1013SDL_GetAppState ()
775 1014
776int 1015int
777SDL_GetModState () 1016SDL_GetModState ()
778 1017
1018int
1019SDL_WaitEvent ()
1020 C_ARGS: 0
1021
779void 1022void
1023SDL_PumpEvents ()
1024
1025void
780poll_events () 1026peep_events ()
781 PPCODE: 1027 PPCODE:
782{ 1028{
783 SDL_Event ev; 1029 SDL_Event ev;
784 1030
785 SDL_PumpEvents (); 1031 SDL_PumpEvents ();
792 { 1038 {
793 case SDL_KEYDOWN: 1039 case SDL_KEYDOWN:
794 case SDL_KEYUP: 1040 case SDL_KEYUP:
795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1041 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1042 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
797 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1043 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
798 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1044 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
799 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1045 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
800 break; 1046 break;
801 1047
802 case SDL_ACTIVEEVENT: 1048 case SDL_ACTIVEEVENT:
803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1049 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
821 x = ev.motion.x; 1067 x = ev.motion.x;
822 y = ev.motion.y; 1068 y = ev.motion.y;
823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1069 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
824 } 1070 }
825 1071
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1072 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
827 hv_store (hv, "state", 5, newSViv (state), 0); 1073 hv_store (hv, "state", 5, newSViv (state), 0);
828 hv_store (hv, "x", 1, newSViv (x), 0); 1074 hv_store (hv, "x", 1, newSViv (x), 0);
829 hv_store (hv, "y", 1, newSViv (y), 0); 1075 hv_store (hv, "y", 1, newSViv (y), 0);
830 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1076 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
831 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1077 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
851 1097
852 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))));
853 } 1099 }
854} 1100}
855 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
856int 1115int
857Mix_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)
858 POSTCALL: 1117 POSTCALL:
859 Mix_HookMusicFinished (music_finished); 1118 Mix_HookMusicFinished (music_finished);
860 Mix_ChannelFinished (channel_finished); 1119 Mix_ChannelFinished (channel_finished);
861 1120
862void 1121void
863Mix_QuerySpec () 1122Mix_QuerySpec ()
922add_font (char *file) 1181add_font (char *file)
923 CODE: 1182 CODE:
924 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1183 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
925 OUTPUT: 1184 OUTPUT:
926 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)
927 1193
928void 1194void
929load_image_inline (SV *image_) 1195load_image_inline (SV *image_)
930 ALIAS: 1196 ALIAS:
931 load_image_file = 1 1197 load_image_file = 1
977 1243
978 SDL_LockSurface (surface2); 1244 SDL_LockSurface (surface2);
979 EXTEND (SP, 6); 1245 EXTEND (SP, 6);
980 PUSHs (sv_2mortal (newSViv (surface2->w))); 1246 PUSHs (sv_2mortal (newSViv (surface2->w)));
981 PUSHs (sv_2mortal (newSViv (surface2->h))); 1247 PUSHs (sv_2mortal (newSViv (surface2->h)));
982 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1248 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
983 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1249 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
984 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1250 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
985 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1251 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
986 SDL_UnlockSurface (surface2); 1252 SDL_UnlockSurface (surface2);
987 1253
1047#if DEBUG 1313#if DEBUG
1048 VALGRIND_DO_LEAK_CHECK; 1314 VALGRIND_DO_LEAK_CHECK;
1049#endif 1315#endif
1050} 1316}
1051 1317
1318int
1319SvREFCNT (SV *sv)
1320 CODE:
1321 RETVAL = SvREFCNT (sv);
1322 OUTPUT:
1323 RETVAL
1324
1052MODULE = Deliantra::Client PACKAGE = DC::Font 1325MODULE = Deliantra::Client PACKAGE = DC::Font
1053 1326
1054PROTOTYPES: DISABLE 1327PROTOTYPES: DISABLE
1055 1328
1056DC::Font 1329DC::Font
1057new_from_file (SV *class, char *path, int id = 0) 1330new_from_file (SV *klass, char *path, int id = 0)
1058 CODE: 1331 CODE:
1059{ 1332{
1060 int count; 1333 int count;
1061 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1334 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1062 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1335 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1091 PROTOTYPE: 1364 PROTOTYPE:
1092 CODE: 1365 CODE:
1093 tc_restore (); 1366 tc_restore ();
1094 1367
1095DC::Layout 1368DC::Layout
1096new (SV *class) 1369new (SV *klass)
1097 CODE: 1370 CODE:
1098 New (0, RETVAL, 1, struct cf_layout); 1371 RETVAL = new cf_layout;
1099 1372
1100 RETVAL->pl = pango_layout_new (opengl_context); 1373 RETVAL->pl = pango_layout_new (opengl_context);
1101 RETVAL->r = 1.; 1374 RETVAL->r = 1.;
1102 RETVAL->g = 1.; 1375 RETVAL->g = 1.;
1103 RETVAL->b = 1.; 1376 RETVAL->b = 1.;
1104 RETVAL->a = 1.; 1377 RETVAL->a = 1.;
1105 RETVAL->base_height = MIN_FONT_HEIGHT; 1378 RETVAL->base_height = MIN_FONT_HEIGHT;
1106 RETVAL->font = 0; 1379 RETVAL->font = 0;
1107 RETVAL->rc = rc_alloc ();
1108 1380
1109 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1381 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1110 layout_update_font (RETVAL); 1382 layout_update_font (RETVAL);
1111 OUTPUT: 1383 OUTPUT:
1112 RETVAL 1384 RETVAL
1113 1385
1114void 1386void
1115DESTROY (DC::Layout self) 1387DESTROY (DC::Layout self)
1116 CODE: 1388 CODE:
1117 g_object_unref (self->pl); 1389 g_object_unref (self->pl);
1118 rc_free (self->rc);
1119 Safefree (self); 1390 delete self;
1120 1391
1121void 1392void
1122set_text (DC::Layout self, SV *text_) 1393set_text (DC::Layout self, SV *text_)
1123 CODE: 1394 CODE:
1124{ 1395{
1250 1521
1251void 1522void
1252set_height (DC::Layout self, int base_height) 1523set_height (DC::Layout self, int base_height)
1253 CODE: 1524 CODE:
1254 if (self->base_height != base_height) 1525 if (self->base_height != base_height)
1255 { 1526 {
1256 self->base_height = base_height; 1527 self->base_height = base_height;
1257 layout_update_font (self); 1528 layout_update_font (self);
1258 } 1529 }
1259 1530
1260void 1531void
1378} 1649}
1379 1650
1380void 1651void
1381render (DC::Layout self, float x, float y, int flags = 0) 1652render (DC::Layout self, float x, float y, int flags = 0)
1382 CODE: 1653 CODE:
1383 rc_clear (self->rc); 1654 self->rc.clear ();
1384 pango_opengl_render_layout_subpixel ( 1655 pango_opengl_render_layout_subpixel (
1385 self->pl, 1656 self->pl,
1386 self->rc, 1657 &self->rc,
1387 x * PANGO_SCALE, y * PANGO_SCALE, 1658 x * PANGO_SCALE, y * PANGO_SCALE,
1388 self->r, self->g, self->b, self->a, 1659 self->r, self->g, self->b, self->a,
1389 flags 1660 flags
1390 ); 1661 );
1391 // we assume that context_change actually clears/frees stuff 1662 // we assume that context_change actually clears/frees stuff
1402 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1673 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1403 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1674 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1404 glEnable (GL_ALPHA_TEST); 1675 glEnable (GL_ALPHA_TEST);
1405 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1676 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1406 1677
1407 rc_draw (self->rc); 1678 self->rc.draw ();
1408 1679
1409 glDisable (GL_ALPHA_TEST); 1680 glDisable (GL_ALPHA_TEST);
1410 glDisable (GL_BLEND); 1681 glDisable (GL_BLEND);
1411 glDisable (GL_TEXTURE_2D); 1682 glDisable (GL_TEXTURE_2D);
1412} 1683}
1487 glDisable (GL_ALPHA_TEST); 1758 glDisable (GL_ALPHA_TEST);
1488 glDisable (GL_BLEND); 1759 glDisable (GL_BLEND);
1489 } 1760 }
1490} 1761}
1491 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
1492IV 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)
1493 CODE: 1885 CODE:
1494{ 1886{
1495 GLint width; 1887 GLint width;
1496 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);
1503MODULE = Deliantra::Client PACKAGE = DC::Map 1895MODULE = Deliantra::Client PACKAGE = DC::Map
1504 1896
1505PROTOTYPES: DISABLE 1897PROTOTYPES: DISABLE
1506 1898
1507DC::Map 1899DC::Map
1508new (SV *class) 1900new (SV *klass)
1509 CODE: 1901 CODE:
1510 New (0, RETVAL, 1, struct map); 1902 New (0, RETVAL, 1, mapgrid);
1511 RETVAL->x = 0; 1903 RETVAL->x = 0;
1512 RETVAL->y = 0; 1904 RETVAL->y = 0;
1513 RETVAL->w = 0; 1905 RETVAL->w = 0;
1514 RETVAL->h = 0; 1906 RETVAL->h = 0;
1515 RETVAL->ox = 0; 1907 RETVAL->ox = 0;
1552 1944
1553void 1945void
1554set_smooth (DC::Map self, int face, int smooth, int level) 1946set_smooth (DC::Map self, int face, int smooth, int level)
1555 CODE: 1947 CODE:
1556{ 1948{
1557 tileid texid; 1949 tileid texid;
1558 maptex *tex; 1950 maptex *tex;
1559 1951
1560 if (face < 0 || face >= self->faces) 1952 if (face < 0 || face >= self->faces)
1561 return; 1953 return;
1562 1954
1563 if (smooth < 0 || smooth >= self->faces) 1955 if (smooth < 0 || smooth >= self->faces)
1564 return; 1956 return;
1565 1957
1566 texid = self->face2tile [face]; 1958 texid = self->face2tile [face];
1567 1959
1568 if (!texid) 1960 if (!texid)
1569 return; 1961 return;
1570 1962
1571 tex = self->tex + texid; 1963 tex = self->tex + texid;
1600 //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);
1601 // use uglier nearest interpolation because linear suffers 1993 // use uglier nearest interpolation because linear suffers
1602 // from transparent color bleeding and ugly wrapping effects. 1994 // from transparent color bleeding and ugly wrapping effects.
1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1995 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1604} 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 }
1605 2017
1606int 2018int
1607ox (DC::Map self) 2019ox (DC::Map self)
1608 ALIAS: 2020 ALIAS:
1609 oy = 1 2021 oy = 1
1641 self->ox += dx; self->x += dx; 2053 self->ox += dx; self->x += dx;
1642 self->oy += dy; self->y += dy; 2054 self->oy += dy; self->y += dy;
1643 2055
1644 while (self->y < 0) 2056 while (self->y < 0)
1645 { 2057 {
1646 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2058 prepend (self->row, self->rows, MAP_EXTEND_Y);
1647 2059
1648 self->rows += MAP_EXTEND_Y; 2060 self->rows += MAP_EXTEND_Y;
1649 self->y += MAP_EXTEND_Y; 2061 self->y += MAP_EXTEND_Y;
1650 } 2062 }
1651} 2063}
1652 2064
1653SV * 2065SV *
1654map1a_update (DC::Map self, SV *data_, int extmap) 2066map1a_update (DC::Map self, SV *data_)
1655 CODE: 2067 CODE:
1656{ 2068{
1657 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2069 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1658 uint8_t *data_end = (uint8_t *)SvEND (data_); 2070 uint8_t *data_end = (uint8_t *)SvEND (data_);
1659 mapcell *cell; 2071 mapcell *cell;
1680 2092
1681 //TODO: don't trust server data to be in-range(!) 2093 //TODO: don't trust server data to be in-range(!)
1682 2094
1683 if (flags & 8) 2095 if (flags & 8)
1684 { 2096 {
2097 uint8_t ext, cmd;
2098
1685 if (extmap) 2099 do
1686 { 2100 {
1687 uint8_t ext, cmd; 2101 ext = *data++;
2102 cmd = ext & 0x7f;
1688 2103
1689 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
1690 { 2107 {
1691 ext = *data++;
1692 cmd = ext & 0x3f;
1693
1694 if (cmd < 4)
1695 cell->darkness = 255 - ext * 64 + 1;
1696 else if (cmd == 5) // health
1697 {
1698 cell->stat_width = 1; 2108 cell->stat_width = 1;
1699 cell->stat_hp = *data++; 2109 cell->stat_hp = *data++;
1700 }
1701 else if (cmd == 6) // monster width
1702 cell->stat_width = *data++ + 1;
1703 else if (cmd == 0x47)
1704 {
1705 if (*data == 4)
1706 ; // decode player count
1707
1708 data += *data + 1;
1709 }
1710 else if (cmd == 8) // cell flags
1711 cell->flags = *data++;
1712 else if (ext & 0x40) // unknown, multibyte => skip
1713 data += *data + 1;
1714 else
1715 data++;
1716 } 2110 }
1717 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++;
1718 } 2128 }
1719 else 2129 while (ext & 0x80);
1720 cell->darkness = *data++ + 1;
1721 } 2130 }
1722 2131
1723 for (z = 0; z <= 2; ++z) 2132 for (z = 0; z <= 2; ++z)
1724 if (flags & (4 >> z)) 2133 if (flags & (4 >> z))
1725 { 2134 {
1728 cell->tile [z] = self->face2tile [face]; 2137 cell->tile [z] = self->face2tile [face];
1729 2138
1730 if (cell->tile [z]) 2139 if (cell->tile [z])
1731 { 2140 {
1732 maptex *tex = self->tex + cell->tile [z]; 2141 maptex *tex = self->tex + cell->tile [z];
2142 tex->unused = 0;
1733 if (!tex->name) 2143 if (!tex->name)
1734 av_push (missing, newSViv (cell->tile [z])); 2144 av_push (missing, newSViv (cell->tile [z]));
1735 2145
1736 if (tex->smoothtile) 2146 if (tex->smoothtile)
1737 { 2147 {
1738 maptex *smooth = self->tex + tex->smoothtile; 2148 maptex *smooth = self->tex + tex->smoothtile;
2149 smooth->unused = 0;
1739 if (!smooth->name) 2150 if (!smooth->name)
1740 av_push (missing, newSViv (tex->smoothtile)); 2151 av_push (missing, newSViv (tex->smoothtile));
1741 } 2152 }
1742 } 2153 }
1743 } 2154 }
1744 } 2155 }
1745 else 2156 else
1746 cell->darkness = 0; 2157 CELL_CLEAR (cell);
1747 } 2158 }
1748} 2159}
1749 OUTPUT: 2160 OUTPUT:
1750 RETVAL 2161 RETVAL
1751 2162
1771 ? self->row + y 2182 ? self->row + y
1772 : 0; 2183 : 0;
1773 2184
1774 for (x = x0; x < x1; x++) 2185 for (x = x0; x < x1; x++)
1775 { 2186 {
1776 int r = 32, g = 32, b = 32, a = 192; 2187 unsigned int r = 32, g = 32, b = 32, a = 192;
1777 2188
1778 if (row && row->c0 <= x && x < row->c1) 2189 if (row && row->c0 <= x && x < row->c1)
1779 { 2190 {
1780 mapcell *cell = row->col + (x - row->c0); 2191 mapcell *cell = row->col + (x - row->c0);
1781 2192
1783 { 2194 {
1784 maptex tex = self->tex [cell->tile [z]]; 2195 maptex tex = self->tex [cell->tile [z]];
1785 int a0 = 255 - tex.a; 2196 int a0 = 255 - tex.a;
1786 int a1 = tex.a; 2197 int a1 = tex.a;
1787 2198
1788 r = (r * a0 + tex.r * a1) / 255; 2199 r = div255 (r * a0 + tex.r * a1);
1789 g = (g * a0 + tex.g * a1) / 255; 2200 g = div255 (g * a0 + tex.g * a1);
1790 b = (b * a0 + tex.b * a1) / 255; 2201 b = div255 (b * a0 + tex.b * a1);
1791 a = (a * a0 + tex.a * a1) / 255; 2202 a = div255 (a * a0 + tex.a * a1);
1792 } 2203 }
1793 } 2204 }
1794 2205
1795 *map++ = (r ) 2206 *map++ = (r )
1796 | (g << 8) 2207 | (g << 8)
1797 | (b << 16) 2208 | (b << 16)
1798 | (a << 24); 2209 | (a << 24);
1799 } 2210 }
1800 } 2211 }
1801 2212
1802 RETVAL = map_sv; 2213 RETVAL = map_sv;
1803} 2214}
1804 OUTPUT: 2215 OUTPUT:
1805 RETVAL 2216 RETVAL
1806 2217
1807void 2218void
1808draw (DC::Map self, int mx, int my, int sw, int sh, int T) 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)
1809 CODE: 2220 CODE:
1810{ 2221{
1811 int x, y, z; 2222 int x, y, z;
1812 2223
1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1815 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2224 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1816 smooth_key skey; 2225 int pl_x, pl_y;
1817 2226 maptex pl_tex;
1818 rc_t *rc = rc_alloc (); 2227 rc_t rc;
2228 rc_t rc_ov;
1819 rc_key_t key; 2229 rc_key_t key;
1820 rc_array_t *arr; 2230 rc_t::array_t *arr;
1821 2231
2232 pl_tex.name = 0;
2233
1822 // thats current max. sorry. 2234 // that's current max. sorry.
1823 if (sw > 255) sw = 255; 2235 if (sw > 255) sw = 255;
1824 if (sh > 255) sh = 255; 2236 if (sh > 255) sh = 255;
1825
1826 // clear key, in case of extra padding
1827 memset (&skey, 0, sizeof (skey));
1828 2237
1829 memset (&key, 0, sizeof (key)); 2238 memset (&key, 0, sizeof (key));
1830 key.r = 255; 2239 key.r = 255;
1831 key.g = 255; 2240 key.g = 255;
1832 key.b = 255; 2241 key.b = 255;
1833 key.a = 255; 2242 key.a = 255;
1834 key.mode = GL_QUADS; 2243 key.mode = GL_QUADS;
1835 key.format = GL_T2F_V3F; 2244 key.format = GL_T2F_V3F;
1836 key.texname = -1;
1837 2245
1838 mx += self->x; 2246 mx += self->x;
1839 my += self->y; 2247 my += self->y;
1840 2248
1841 // first pass: determine smooth_max 2249 // first pass: determine smooth_max
1842 // rather ugly, if you ask me 2250 // rather ugly, if you ask me
1843 // could also be stored inside mapcell and updated on change 2251 // could also be stored inside mapcell and updated on change
1844 memset (smooth_max, 0, sizeof (smooth_max)); 2252 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1845 2253
1846 for (y = 0; y < sh; y++) 2254 for (y = 0; y < sh; y++)
1847 if (0 <= y + my && y + my < self->rows) 2255 if (0 <= y + my && y + my < self->rows)
1848 { 2256 {
1849 maprow *row = self->row + (y + my); 2257 maprow *row = self->row + (y + my);
1864 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2272 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1865 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2273 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1866 2274
1867 for (z = 0; z <= 2; z++) 2275 for (z = 0; z <= 2; z++)
1868 { 2276 {
1869 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;
1870 2281
1871 for (y = 0; y < sh; y++) 2282 for (y = 0; y < sh; y++)
1872 if (0 <= y + my && y + my < self->rows) 2283 if (0 <= y + my && y + my < self->rows)
1873 { 2284 {
1874 maprow *row = self->row + (y + my); 2285 maprow *row = self->row + (y + my);
1884 maptex tex = self->tex [tile]; 2295 maptex tex = self->tex [tile];
1885 int px, py; 2296 int px, py;
1886 2297
1887 if (key.texname != tex.name) 2298 if (key.texname != tex.name)
1888 { 2299 {
2300 self->tex [tile].unused = 0;
2301
1889 if (!tex.name) 2302 if (!tex.name)
1890 tex = self->tex [2]; /* missing, replace by noface */ 2303 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1891 2304
1892 key.texname = tex.name; 2305 key.texname = tex.name;
1893 arr = rc_array (rc, &key); 2306 arr = &rc.array (key);
1894 } 2307 }
1895 2308
1896 px = (x + 1) * T - tex.w; 2309 px = (x + 1) * Th - tex.w;
1897 py = (y + 1) * T - tex.h; 2310 py = (y + 1) * Tw - tex.h;
1898 2311
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2312 if (expect_false (cell->player == player) && expect_false (z == 2))
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1901 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1902 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1903
1904 if (cell->flags && z == 2)
1905 { 2313 {
1906 // overlays such as the speech bubble, probably more to come 2314 pl_x = px;
1907 if (cell->flags & 1) 2315 pl_y = py;
2316 pl_tex = tex;
1908 { 2317 continue;
1909 maptex tex = self->tex [1];
1910 int px = x * T + T * 2 / 32;
1911 int py = y * T - T * 6 / 32;
1912
1913 if (tex.name)
1914 {
1915 if (key.texname != tex.name)
1916 {
1917 key.texname = tex.name;
1918 arr = rc_array (rc, &key);
1919 }
1920
1921 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1922 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1923 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1924 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1925 }
1926 }
1927 } 2318 }
2319
2320 arr->t2f_v3f (0 , 0 , px , py , 0);
2321 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2322 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2323 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1928 2324
1929 // update smooth hash 2325 // update smooth hash
1930 if (tex.smoothtile) 2326 if (tex.smoothtile)
1931 { 2327 {
1932 skey.tile = tex.smoothtile; 2328 skey.tile = tex.smoothtile;
1933 skey.level = tex.smoothlevel; 2329 skey.level = tex.smoothlevel;
1934 2330
1935 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2331 smooth_level[tex.smoothlevel] = 1;
1936 2332
1937 // 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
1938 // shifted +1|+1 so we always stay positive. 2334 // shifted +1|+1 so we always stay positive.
1939 2335
1940 // bits is ___n cccc CCCC bbbb 2336 // bits is ___n cccc CCCC bbbb
1948 2344
1949 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2345 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1950 // ·· ·· ·┏ ┓· 2346 // ·· ·· ·┏ ┓·
1951 2347
1952 // full tile 2348 // full tile
1953 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);
1954 2350
1955 // borders 2351 // borders
1956 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);
1957 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);
1958 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);
1959 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);
1960 2356
1961 // corners 2357 // corners
1962 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);
1963 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);
1964 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);
1965 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);
1966 } 2382 }
1967 } 2383 }
1968 } 2384 }
1969 } 2385 }
1970 2386
1971 rc_draw (rc); 2387 rc.draw ();
1972 rc_clear (rc); 2388 rc.clear ();
1973 2389
1974 // go through all smoothlevels, lowest to highest, then draw. 2390 // go through all smoothlevels, lowest to highest, then draw.
1975 // this is basically counting sort 2391 // this is basically counting sort
1976 { 2392 {
1977 int w, b; 2393 int w, b;
1978 2394
1979 glEnable (GL_TEXTURE_2D); 2395 glEnable (GL_TEXTURE_2D);
1980 glBegin (GL_QUADS); 2396 glBegin (GL_QUADS);
1981 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)
1982 { 2400 {
1983 uint32_t smask = smooth_level [w]; 2401 smooth_key &skey = it->first;
1984 if (smask) 2402 IV bits = it->second;
1985 for (b = 0; b < 32; ++b) 2403
1986 if (smask & (((uint32_t)1) << b)) 2404 if (!(bits & 0x1000)
2405 && skey.level == level
2406 && level > smooth_max [skey.x][skey.y])
1987 { 2407 {
1988 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
1989 HE *he; 2416 if (tex.name)
1990
1991 hv_iterinit (smooth);
1992 while ((he = hv_iternext (smooth)))
1993 { 2417 {
1994 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 // this time avoiding texture state changes
1995 IV bits = SvIVX (HeVAL (he)); 2419 // save gobs of state changes.
1996 2420 if (key.texname != tex.name)
1997 if (!(bits & 0x1000)
1998 && skey->level == level
1999 && level > smooth_max [skey->x][skey->y])
2000 { 2421 {
2001 maptex tex = self->tex [skey->tile]; 2422 self->tex [skey.tile].unused = 0;
2002 int px = (((int)skey->x) - 1) * T;
2003 int py = (((int)skey->y) - 1) * T;
2004 int border = bits & 15;
2005 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2006 float dx = tex.s * .0625f; // 16 images/row
2007 float dy = tex.t * .5f ; // 2 images/column
2008 2423
2009 if (tex.name)
2010 {
2011 // this time avoiding texture state changes
2012 // save gobs of state changes.
2013 if (key.texname != tex.name)
2014 {
2015 glEnd (); 2424 glEnd ();
2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2425 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2017 glBegin (GL_QUADS); 2426 glBegin (GL_QUADS);
2018 } 2427 }
2019 2428
2020 if (border) 2429 if (border)
2021 { 2430 {
2022 float ox = border * dx; 2431 float ox = border * dx;
2023 2432
2024 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2433 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2025 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2434 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2026 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2435 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2027 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2436 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2028 } 2437 }
2029 2438
2030 if (corner) 2439 if (corner)
2031 { 2440 {
2032 float ox = corner * dx; 2441 float ox = corner * dx;
2033 2442
2034 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2035 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2036 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2037 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2038 }
2039 }
2040 } 2447 }
2041 } 2448 }
2042 } 2449 }
2043 } 2450 }
2044 2451
2045 glEnd (); 2452 glEnd ();
2046 glDisable (GL_TEXTURE_2D); 2453 glDisable (GL_TEXTURE_2D);
2047 key.texname = -1; 2454 key.texname = -1;
2048 } 2455 }
2049
2050 hv_clear (smooth);
2051 } 2456 }
2052 2457
2458 if (pl_tex.name)
2459 {
2460 maptex tex = pl_tex;
2461 int px = pl_x + sdx;
2462 int py = pl_y + sdy;
2463
2464 key.texname = tex.name;
2465 rc_t::array_t &arr = rc.array (key);
2466
2467 arr.t2f_v3f (0 , 0 , px , py , 0);
2468 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2469 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2470 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2471
2472 rc.draw ();
2473 }
2474
2475 rc_ov.draw ();
2476 rc_ov.clear ();
2477
2053 glDisable (GL_BLEND); 2478 glDisable (GL_BLEND);
2054 rc_free (rc);
2055 2479
2056 // top layer: overlays such as the health bar 2480 // top layer: overlays such as the health bar
2057 for (y = 0; y < sh; y++) 2481 for (y = 0; y < sh; y++)
2058 if (0 <= y + my && y + my < self->rows) 2482 if (0 <= y + my && y + my < self->rows)
2059 { 2483 {
2062 for (x = 0; x < sw; x++) 2486 for (x = 0; x < sw; x++)
2063 if (row->c0 <= x + mx && x + mx < row->c1) 2487 if (row->c0 <= x + mx && x + mx < row->c1)
2064 { 2488 {
2065 mapcell *cell = row->col + (x + mx - row->c0); 2489 mapcell *cell = row->col + (x + mx - row->c0);
2066 2490
2067 int px = x * T; 2491 int px = x * Tw;
2068 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 }
2069 2499
2070 if (cell->stat_hp) 2500 if (cell->stat_hp)
2071 { 2501 {
2072 int width = cell->stat_width * T; 2502 int width = cell->stat_width * Tw;
2073 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2503 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2074 2504
2075 glColor3ub (0, 0, 0); 2505 glColor3ub (0, 0, 0);
2076 glRectf (px + 1, py - thick - 2, 2506 glRectf (px + 1, py - thick - 2,
2077 px + width - 1, py); 2507 px + width - 1, py);
2078 2508
2084 } 2514 }
2085 } 2515 }
2086} 2516}
2087 2517
2088void 2518void
2089draw_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)
2090 CODE: 2520 CODE:
2091{ 2521{
2092 static float color[16][3] = { 2522 static float color[16][3] = {
2093 { 0.00F, 0.00F, 0.00F }, 2523 { 0.00f, 0.00f, 0.00f },
2094 { 1.00F, 1.00F, 1.00F }, 2524 { 1.00f, 1.00f, 1.00f },
2095 { 0.00F, 0.00F, 0.55F }, 2525 { 0.00f, 0.00f, 0.55f },
2096 { 1.00F, 0.00F, 0.00F }, 2526 { 1.00f, 0.00f, 0.00f },
2097 2527
2098 { 1.00F, 0.54F, 0.00F }, 2528 { 1.00f, 0.54f, 0.00f },
2099 { 0.11F, 0.56F, 1.00F }, 2529 { 0.11f, 0.56f, 1.00f },
2100 { 0.93F, 0.46F, 0.00F }, 2530 { 0.93f, 0.46f, 0.00f },
2101 { 0.18F, 0.54F, 0.34F }, 2531 { 0.18f, 0.54f, 0.34f },
2102 2532
2103 { 0.56F, 0.73F, 0.56F }, 2533 { 0.56f, 0.73f, 0.56f },
2104 { 0.80F, 0.80F, 0.80F }, 2534 { 0.80f, 0.80f, 0.80f },
2105 { 0.55F, 0.41F, 0.13F }, 2535 { 0.55f, 0.41f, 0.13f },
2106 { 0.99F, 0.77F, 0.26F }, 2536 { 0.99f, 0.77f, 0.26f },
2107 2537
2108 { 0.74F, 0.65F, 0.41F }, 2538 { 0.74f, 0.65f, 0.41f },
2109 2539
2110 { 0.00F, 1.00F, 1.00F }, 2540 { 0.00f, 1.00f, 1.00f },
2111 { 1.00F, 0.00F, 1.00F }, 2541 { 1.00f, 0.00f, 1.00f },
2112 { 1.00F, 1.00F, 0.00F }, 2542 { 1.00f, 1.00f, 0.00f },
2113 }; 2543 };
2114 2544
2115 int x, y; 2545 int x, y;
2116 2546
2117 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 */
2118 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2554 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2119 glEnable (GL_BLEND); 2555 glEnable (GL_BLEND);
2120 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2556 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2121 glBegin (GL_QUADS); 2557 glBegin (GL_QUADS);
2122 2558
2123 for (y = 0; y < h; y++) 2559 for (y = 0; y < h; y++)
2127 2563
2128 if (m) 2564 if (m)
2129 { 2565 {
2130 float *c = color [m & 15]; 2566 float *c = color [m & 15];
2131 2567
2132 float tx1 = m & 0x40 ? 0.5 : 0.; 2568 float tx1 = m & 0x40 ? 0.5f : 0.f;
2133 float tx2 = tx1 + 0.5; 2569 float tx2 = tx1 + 0.5f;
2134 2570
2135 glColor4f (c[0], c[1], c[2], 0.75); 2571 glColor4f (c[0], c[1], c[2], 1);
2136 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2572 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2137 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2573 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2138 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2574 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2139 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2575 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2140 } 2576 }
2148void 2584void
2149fow_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)
2150 PPCODE: 2586 PPCODE:
2151{ 2587{
2152 int x, y; 2588 int x, y;
2153 int sw1 = sw + 2; 2589 int sw1 = sw + 2;
2154 int sh1 = sh + 2; 2590 int sh1 = sh + 2;
2155 int sh3 = sh * 3; 2591 int sh3 = sh * 3;
2156 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);
2157 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2595 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2158 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2596 memset (darkness1, 0, sw1*sh1);
2159 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2160 2597
2161 SvPOK_only (darkness3_sv); 2598 SvPOK_only (darkness3_sv);
2162 SvCUR_set (darkness3_sv, sw34 * sh3); 2599 SvCUR_set (darkness3_sv, sw3 * sh3);
2163 2600
2164 mx += self->x - 1; 2601 mx += self->x - 1;
2165 my += self->y - 1; 2602 my += self->y - 1;
2166
2167 memset (darkness1, 255, sw1 * sh1);
2168 2603
2169 for (y = 0; y < sh1; y++) 2604 for (y = 0; y < sh1; y++)
2170 if (0 <= y + my && y + my < self->rows) 2605 if (0 <= y + my && y + my < self->rows)
2171 { 2606 {
2172 maprow *row = self->row + (y + my); 2607 maprow *row = self->row + (y + my);
2175 if (row->c0 <= x + mx && x + mx < row->c1) 2610 if (row->c0 <= x + mx && x + mx < row->c1)
2176 { 2611 {
2177 mapcell *cell = row->col + (x + mx - row->c0); 2612 mapcell *cell = row->col + (x + mx - row->c0);
2178 2613
2179 darkness1 [y * sw1 + x] = cell->darkness 2614 darkness1 [y * sw1 + x] = cell->darkness
2180 ? 255 - (cell->darkness - 1) 2615 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2181 : 255 - FOW_DARKNESS; 2616 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2182 } 2617 }
2183 } 2618 }
2184 2619
2185 for (y = 0; y < sh; ++y) 2620 for (y = 0; y < sh; ++y)
2186 for (x = 0; x < sw; ++x) 2621 for (x = 0; x < sw; ++x)
2205 2640
2206 uint8_t r13 = (d13 + d23 + d12) / 3; 2641 uint8_t r13 = (d13 + d23 + d12) / 3;
2207 uint8_t r23 = d23; 2642 uint8_t r23 = d23;
2208 uint8_t r33 = (d23 + d33 + d32) / 3; 2643 uint8_t r33 = (d23 + d33 + d32) / 3;
2209 2644
2210 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2645 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2211 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2646 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2212 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2647 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2213 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2648 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2214 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 */
2215 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2650 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2216 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2651 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2217 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2652 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2218 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2653 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2219 } 2654 }
2220 2655
2221 free (darkness1); 2656 free (darkness1);
2222 2657
2223 EXTEND (SP, 3); 2658 EXTEND (SP, 3);
2224 PUSHs (sv_2mortal (newSViv (sw34))); 2659 PUSHs (sv_2mortal (newSViv (sw3)));
2225 PUSHs (sv_2mortal (newSViv (sh3))); 2660 PUSHs (sv_2mortal (newSViv (sh3)));
2226 PUSHs (darkness3_sv); 2661 PUSHs (darkness3_sv);
2227} 2662}
2228 2663
2229SV * 2664SV *
2292 else 2727 else
2293 *data++ = 0; 2728 *data++ = 0;
2294 } 2729 }
2295 } 2730 }
2296 2731
2732 /* if size is w*h + 5 then no data has been found */
2733 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2734 {
2297 SvPOK_only (data_sv); 2735 SvPOK_only (data_sv);
2298 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2736 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2737 }
2738
2299 RETVAL = data_sv; 2739 RETVAL = data_sv;
2300} 2740}
2301 OUTPUT: 2741 OUTPUT:
2302 RETVAL 2742 RETVAL
2303 2743
2304void 2744void
2305set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2745set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2306 PPCODE: 2746 PPCODE:
2307{ 2747{
2308 int x, y, z; 2748 int x, y, z;
2309 int w, h; 2749 int w, h;
2310 int x1, y1; 2750 int x1, y1;
2751 STRLEN len;
2752 uint8_t *data, *end;
2753
2754 len = SvLEN (data_sv);
2755 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2756 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2757 end = data + len + 8;
2758
2759 if (len < 5)
2760 XSRETURN_EMPTY;
2311 2761
2312 if (*data++ != 0) 2762 if (*data++ != 0)
2313 XSRETURN_EMPTY; /* version mismatch */ 2763 XSRETURN_EMPTY; /* version mismatch */
2314 2764
2315 w = *data++ << 8; w |= *data++; 2765 w = *data++ << 8; w |= *data++;
2330 { 2780 {
2331 maprow *row = map_get_row (self, y); 2781 maprow *row = map_get_row (self, y);
2332 2782
2333 for (x = x0; x < x1; x++) 2783 for (x = x0; x < x1; x++)
2334 { 2784 {
2785 uint8_t flags;
2786
2787 if (data + 7 >= end)
2788 XSRETURN_EMPTY;
2789
2335 uint8_t flags = *data++; 2790 flags = *data++;
2336 2791
2337 if (flags) 2792 if (flags)
2338 { 2793 {
2339 mapcell *cell = row_get_cell (row, x); 2794 mapcell *cell = row_get_cell (row, x);
2340 tileid tile[3] = { 0, 0, 0 }; 2795 tileid tile[3] = { 0, 0, 0 };
2343 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2798 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2344 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2799 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2345 2800
2346 if (cell->darkness == 0) 2801 if (cell->darkness == 0)
2347 { 2802 {
2348 cell->darkness = 0; 2803 /*cell->darkness = 0;*/
2804 EXTEND (SP, 3);
2349 2805
2350 for (z = 0; z <= 2; z++) 2806 for (z = 0; z <= 2; z++)
2351 { 2807 {
2352 tileid t = tile [z]; 2808 tileid t = tile [z];
2353 2809
2354 if (t >= self->texs || (t && !self->tex [t].name)) 2810 if (t >= self->texs || (t && !self->tex [t].name))
2355 { 2811 {
2356 XPUSHs (sv_2mortal (newSViv (t))); 2812 PUSHs (sv_2mortal (newSViv (t)));
2357 need_texid (self, t); 2813 need_texid (self, t);
2358 } 2814 }
2359 2815
2360 cell->tile [z] = t; 2816 cell->tile [z] = t;
2361 } 2817 }
2366} 2822}
2367 2823
2368MODULE = Deliantra::Client PACKAGE = DC::RW 2824MODULE = Deliantra::Client PACKAGE = DC::RW
2369 2825
2370DC::RW 2826DC::RW
2371new (SV *class, SV *data_sv) 2827new (SV *klass, SV *data_sv)
2372 CODE: 2828 CODE:
2373{ 2829{
2374 STRLEN datalen; 2830 STRLEN datalen;
2375 char *data = SvPVbyte (data_sv, datalen); 2831 char *data = SvPVbyte (data_sv, datalen);
2376 2832
2378} 2834}
2379 OUTPUT: 2835 OUTPUT:
2380 RETVAL 2836 RETVAL
2381 2837
2382DC::RW 2838DC::RW
2383new_from_file (SV *class, const char *path, const char *mode = "rb") 2839new_from_file (SV *klass, const char *path, const char *mode = "rb")
2384 CODE: 2840 CODE:
2385 RETVAL = SDL_RWFromFile (path, mode); 2841 RETVAL = SDL_RWFromFile (path, mode);
2386 OUTPUT: 2842 OUTPUT:
2387 RETVAL 2843 RETVAL
2388 2844
2406 if (RETVAL < 0) 2862 if (RETVAL < 0)
2407 { 2863 {
2408 RETVAL = Mix_GroupOldest (-1); 2864 RETVAL = Mix_GroupOldest (-1);
2409 2865
2410 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)
2411 XSRETURN_UNDEF; 2872 XSRETURN_UNDEF;
2412 2873 }
2874 else
2413 Mix_HaltChannel (RETVAL); 2875 Mix_HaltChannel (RETVAL);
2414 } 2876 }
2415 2877
2416 Mix_UnregisterAllEffects (RETVAL); 2878 Mix_UnregisterAllEffects (RETVAL);
2417 Mix_Volume (RETVAL, 128); 2879 Mix_Volume (RETVAL, 128);
2418} 2880}
2465void 2927void
2466set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2928set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2467 CODE: 2929 CODE:
2468{ 2930{
2469 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));
2470 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;
2471 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2933 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2472} 2934}
2473 2935
2474void 2936void
2475set_reverse_stereo (DC::Channel self, int flip) 2937set_reverse_stereo (DC::Channel self, int flip)
2478 2940
2479MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2941MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2480 2942
2481PROTOTYPES: DISABLE 2943PROTOTYPES: DISABLE
2482 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
2483DC::MixChunk 2957DC::MixChunk
2484new (SV *class, DC::RW rwops) 2958new (SV *klass, DC::RW rwops)
2485 CODE: 2959 CODE:
2486 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2960 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2487 OUTPUT: 2961 OUTPUT:
2488 RETVAL 2962 RETVAL
2489 2963
2519 OUTPUT: 2993 OUTPUT:
2520 RETVAL 2994 RETVAL
2521 2995
2522MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2996MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2523 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
2524int 3010int
2525volume (int volume = -1) 3011volume (int volume = -1)
2526 PROTOTYPE: ;$ 3012 PROTOTYPE: ;$
2527 CODE: 3013 CODE:
2528 if (items > 0) 3014 if (items > 0)
2539void 3025void
2540halt () 3026halt ()
2541 CODE: 3027 CODE:
2542 Mix_HaltMusic (); 3028 Mix_HaltMusic ();
2543 3029
3030int
3031playing ()
3032 CODE:
3033 RETVAL = Mix_PlayingMusic ();
3034 OUTPUT:
3035 RETVAL
3036
2544DC::MixMusic 3037DC::MixMusic
2545new (SV *class, DC::RW rwops) 3038new (SV *klass, DC::RW rwops)
2546 CODE: 3039 CODE:
2547 RETVAL = Mix_LoadMUS_RW (rwops); 3040 RETVAL = Mix_LoadMUS_RW (rwops);
2548 OUTPUT: 3041 OUTPUT:
2549 RETVAL 3042 RETVAL
2550 3043
2578 } *civ, const_iv[] = { 3071 } *civ, const_iv[] = {
2579# define const_iv(name) { # name, (IV)name } 3072# define const_iv(name) { # name, (IV)name }
2580 const_iv (GL_VENDOR), 3073 const_iv (GL_VENDOR),
2581 const_iv (GL_VERSION), 3074 const_iv (GL_VERSION),
2582 const_iv (GL_EXTENSIONS), 3075 const_iv (GL_EXTENSIONS),
3076 const_iv (GL_MAX_TEXTURE_UNITS),
2583 const_iv (GL_COLOR_MATERIAL), 3077 const_iv (GL_COLOR_MATERIAL),
2584 const_iv (GL_SMOOTH), 3078 const_iv (GL_SMOOTH),
2585 const_iv (GL_FLAT), 3079 const_iv (GL_FLAT),
2586 const_iv (GL_DITHER), 3080 const_iv (GL_DITHER),
2587 const_iv (GL_BLEND), 3081 const_iv (GL_BLEND),
2599 const_iv (GL_ZERO), 3093 const_iv (GL_ZERO),
2600 const_iv (GL_SRC_ALPHA), 3094 const_iv (GL_SRC_ALPHA),
2601 const_iv (GL_DST_ALPHA), 3095 const_iv (GL_DST_ALPHA),
2602 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3096 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2603 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),
2604 const_iv (GL_SRC_ALPHA_SATURATE), 3102 const_iv (GL_SRC_ALPHA_SATURATE),
2605 const_iv (GL_RGB), 3103 const_iv (GL_RGB),
2606 const_iv (GL_RGBA), 3104 const_iv (GL_RGBA),
2607 const_iv (GL_RGBA4), 3105 const_iv (GL_RGBA4),
2608 const_iv (GL_RGBA8), 3106 const_iv (GL_RGBA8),
2676 const_iv (GL_NICEST), 3174 const_iv (GL_NICEST),
2677 const_iv (GL_V2F), 3175 const_iv (GL_V2F),
2678 const_iv (GL_V3F), 3176 const_iv (GL_V3F),
2679 const_iv (GL_T2F_V3F), 3177 const_iv (GL_T2F_V3F),
2680 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),
2681# undef const_iv 3182# undef const_iv
2682 }; 3183 };
2683 3184
2684 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--)
2685 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3186 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2686 3187
2687 texture_av = newAV (); 3188 texture_av = newAV ();
2688 AvREAL_off (texture_av); 3189 AvREAL_off (texture_av);
2689} 3190}
2690 3191
2692disable_GL_EXT_blend_func_separate () 3193disable_GL_EXT_blend_func_separate ()
2693 CODE: 3194 CODE:
2694 gl.BlendFuncSeparate = 0; 3195 gl.BlendFuncSeparate = 0;
2695 gl.BlendFuncSeparateEXT = 0; 3196 gl.BlendFuncSeparateEXT = 0;
2696 3197
2697char * 3198void
3199apple_nvidia_bug (int enable)
3200
3201const char *
2698gl_vendor () 3202gl_vendor ()
2699 CODE: 3203 CODE:
2700 RETVAL = (char *)glGetString (GL_VENDOR); 3204 RETVAL = (const char *)glGetString (GL_VENDOR);
2701 OUTPUT: 3205 OUTPUT:
2702 RETVAL 3206 RETVAL
2703 3207
2704char * 3208const char *
2705gl_version () 3209gl_version ()
2706 CODE: 3210 CODE:
2707 RETVAL = (char *)glGetString (GL_VERSION); 3211 RETVAL = (const char *)glGetString (GL_VERSION);
2708 OUTPUT: 3212 OUTPUT:
2709 RETVAL 3213 RETVAL
2710 3214
2711char * 3215const char *
2712gl_extensions () 3216gl_extensions ()
2713 CODE: 3217 CODE:
2714 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3218 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2715 OUTPUT: 3219 OUTPUT:
2716 RETVAL 3220 RETVAL
2717 3221
2718const char *glGetString (GLenum pname) 3222const char *glGetString (GLenum pname)
3223 CODE:
3224 RETVAL = (const char *)glGetString (pname);
3225 OUTPUT:
3226 RETVAL
2719 3227
2720GLint glGetInteger (GLenum pname) 3228GLint glGetInteger (GLenum pname)
2721 CODE: 3229 CODE:
2722 glGetIntegerv (pname, &RETVAL); 3230 glGetIntegerv (pname, &RETVAL);
2723 OUTPUT: 3231 OUTPUT:
2731 3239
2732int glGetError () 3240int glGetError ()
2733 3241
2734void glFinish () 3242void glFinish ()
2735 3243
3244void glFlush ()
3245
2736void glClear (int mask) 3246void glClear (int mask)
2737 3247
2738void glClearColor (float r, float g, float b, float a = 1.0) 3248void glClearColor (float r, float g, float b, float a = 1.0)
2739 PROTOTYPE: @ 3249 PROTOTYPE: @
2740 3250
2749void glBlendFunc (int sfactor, int dfactor) 3259void glBlendFunc (int sfactor, int dfactor)
2750 3260
2751void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3261void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2752 CODE: 3262 CODE:
2753 gl_BlendFuncSeparate (sa, da, saa, daa); 3263 gl_BlendFuncSeparate (sa, da, saa, daa);
3264
3265# void glBlendEquation (int se)
2754 3266
2755void glDepthMask (int flag) 3267void glDepthMask (int flag)
2756 3268
2757void glLogicOp (int opcode) 3269void glLogicOp (int opcode)
2758 3270
2793void glRotate (float angle, float x, float y, float z) 3305void glRotate (float angle, float x, float y, float z)
2794 CODE: 3306 CODE:
2795 glRotatef (angle, x, y, z); 3307 glRotatef (angle, x, y, z);
2796 3308
2797void 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: @
2798 ALIAS: 3311 ALIAS:
2799 glColor_premultiply = 1 3312 glColor_premultiply = 1
2800 CODE: 3313 CODE:
2801 if (ix) 3314 if (ix)
2802 { 3315 {
2908 3421
2909void glEndList () 3422void glEndList ()
2910 3423
2911void glCallList (int list) 3424void glCallList (int list)
2912 3425
3426void c_init ()
3427 CODE:
3428 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3429 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3430
2913MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3431MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2914 3432
2915PROTOTYPES: DISABLE 3433PROTOTYPES: DISABLE
2916 3434
2917void 3435void
2918find_widget (SV *self, NV x, NV y) 3436find_widget (SV *self, NV x, NV y)
2919 PPCODE: 3437 PPCODE:
2920{ 3438{
2921 if (within_widget (self, x, y)) 3439 if (within_widget (self, x, y))
2922 XPUSHs (self); 3440 XPUSHs (self);
2923} 3441}
2924 3442
2925BOOT: 3443BOOT:
2926{ 3444{
2934 3452
2935void 3453void
2936draw (SV *self) 3454draw (SV *self)
2937 CODE: 3455 CODE:
2938{ 3456{
2939 HV *hv; 3457 HV *hv;
2940 SV **svp; 3458 SV **svp;
2941 NV x, y, w, h; 3459 NV x, y, w, h;
2942 SV *draw_x_sv = GvSV (draw_x_gv); 3460 SV *draw_x_sv = GvSV (draw_x_gv);
2943 SV *draw_y_sv = GvSV (draw_y_gv); 3461 SV *draw_y_sv = GvSV (draw_y_gv);
2944 SV *draw_w_sv = GvSV (draw_w_gv); 3462 SV *draw_w_sv = GvSV (draw_w_gv);
2945 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