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.330 by root, Sun Nov 18 15:24:24 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 Newxz (p, sze + inc, T);
258 Zero (p, inc, char);
259 Move (ptr, p + inc, sze, char); 308 Move (ptr, p + inc, sze, T);
260 Safefree (ptr); 309 Safefree (ptr);
261 310
262 return p; 311 ptr = p;
263} 312}
264 313
265static char * 314template<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 315static void
316append (T *&ptr, int sze, int inc)
317{
318 Renew (ptr, sze + inc, T);
319 Zero (ptr + sze, inc, T);
320}
321
322static void
278need_facenum (struct map *self, faceid face) 323need_facenum (struct mapgrid *self, faceid face)
279{ 324{
280 while (self->faces <= face) 325 while (self->faces <= face)
281 { 326 {
282 Append (tileid, self->face2tile, self->faces, self->faces); 327 append (self->face2tile, self->faces, self->faces);
283 self->faces *= 2; 328 self->faces *= 2;
284 } 329 }
285} 330}
286 331
287static void 332static void
288need_texid (struct map *self, int texid) 333need_texid (struct mapgrid *self, int texid)
289{ 334{
290 while (self->texs <= texid) 335 while (self->texs <= texid)
291 { 336 {
292 Append (maptex, self->tex, self->texs, self->texs); 337 append (self->tex, self->texs, self->texs);
293 self->texs *= 2; 338 self->texs *= 2;
294 } 339 }
295} 340}
296 341
297static maprow * 342static maprow *
298map_get_row (DC__Map self, int y) 343map_get_row (mapgrid *self, int y)
299{ 344{
300 if (0 > y) 345 if (0 > y)
301 { 346 {
302 int extend = - y + MAP_EXTEND_Y; 347 int extend = - y + MAP_EXTEND_Y;
303 Prepend (maprow, self->row, self->rows, extend); 348 prepend (self->row, self->rows, extend);
304 349
305 self->rows += extend; 350 self->rows += extend;
306 self->y += extend; 351 self->y += extend;
307 y += extend; 352 y += extend;
308 } 353 }
309 else if (y >= self->rows) 354 else if (y >= self->rows)
310 { 355 {
311 int extend = y - self->rows + MAP_EXTEND_Y; 356 int extend = y - self->rows + MAP_EXTEND_Y;
312 Append (maprow, self->row, self->rows, extend); 357 append (self->row, self->rows, extend);
313 self->rows += extend; 358 self->rows += extend;
314 } 359 }
315 360
316 return self->row + y; 361 return self->row + y;
317} 362}
327 } 372 }
328 373
329 if (row->c0 > x) 374 if (row->c0 > x)
330 { 375 {
331 int extend = row->c0 - x + MAP_EXTEND_X; 376 int extend = row->c0 - x + MAP_EXTEND_X;
332 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 377 prepend (row->col, row->c1 - row->c0, extend);
333 row->c0 -= extend; 378 row->c0 -= extend;
334 } 379 }
335 else if (x >= row->c1) 380 else if (x >= row->c1)
336 { 381 {
337 int extend = x - row->c1 + MAP_EXTEND_X; 382 int extend = x - row->c1 + MAP_EXTEND_X;
338 Append (mapcell, row->col, row->c1 - row->c0, extend); 383 append (row->col, row->c1 - row->c0, extend);
339 row->c1 += extend; 384 row->c1 += extend;
340 } 385 }
341 386
342 return row->col + (x - row->c0); 387 return row->col + (x - row->c0);
343} 388}
344 389
345static mapcell * 390static mapcell *
346map_get_cell (DC__Map self, int x, int y) 391map_get_cell (mapgrid *self, int x, int y)
347{ 392{
348 return row_get_cell (map_get_row (self, y), x); 393 return row_get_cell (map_get_row (self, y), x);
349} 394}
350 395
351static void 396static void
352map_clear (DC__Map self) 397map_clear (mapgrid *self)
353{ 398{
354 int r; 399 int r;
355 400
356 for (r = 0; r < self->rows; r++) 401 for (r = 0; r < self->rows; r++)
357 Safefree (self->row[r].col); 402 Safefree (self->row[r].col);
364 self->oy = 0; 409 self->oy = 0;
365 self->row = 0; 410 self->row = 0;
366 self->rows = 0; 411 self->rows = 0;
367} 412}
368 413
414#define CELL_CLEAR(cell) \
415 do { \
416 if ((cell)->player) \
417 (cell)->tile [2] = 0; \
418 (cell)->darkness = 0; \
419 (cell)->stat_hp = 0; \
420 (cell)->flags = 0; \
421 (cell)->player = 0; \
422 } while (0)
423
369static void 424static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 425map_blank (mapgrid *self, int x0, int y0, int w, int h)
371{ 426{
372 int x, y; 427 int x, y;
373 maprow *row; 428 maprow *row;
374 mapcell *cell; 429 mapcell *cell;
375 430
387 if (x >= row->c1) 442 if (x >= row->c1)
388 break; 443 break;
389 444
390 cell = row->col + x - row->c0; 445 cell = row->col + x - row->c0;
391 446
392 cell->darkness = 0; 447 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 448 }
397 } 449 }
398} 450}
399 451
400typedef struct { 452struct smooth_key
453{
401 tileid tile; 454 tileid tile;
402 uint8_t x, y, level; 455 uint8_t x, y, level;
403} smooth_key; 456
457 bool operator == (const smooth_key &o) const
458 {
459 return tile == o.tile && x == o.x && y == o.y && level == o.level;
460 }
461};
462
463typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
464
465namespace std {
466 template <>
467 struct hash<smooth_key>
468 {
469 size_t operator () (const smooth_key &v) const
470 {
471 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
472 }
473 };
474}
404 475
405static void 476static void
406smooth_or_bits (HV *hv, smooth_key *key, IV bits) 477smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
407{ 478{
408 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 479 auto &&it = h.find (key);
409 480
410 if (SvIOK (*sv)) 481 if (it == h.end ())
411 SvIV_set (*sv, SvIVX (*sv) | bits); 482 h.insert (std::make_pair (key, bits));
412 else 483 else
413 sv_setiv (*sv, bits); 484 it->second |= bits;
414} 485}
415 486
416static void 487static void
417music_finished (void) 488music_finished (void)
418{ 489{
435 ev.code = 1; 506 ev.code = 1;
436 ev.data1 = (void *)(long)channel; 507 ev.data1 = (void *)(long)channel;
437 ev.data2 = 0; 508 ev.data2 = 0;
438 509
439 SDL_PushEvent ((SDL_Event *)&ev); 510 SDL_PushEvent ((SDL_Event *)&ev);
511}
512
513// approximately divide by 255
514static unsigned int
515div255 (unsigned int n)
516{
517 return (n + (n >> 8)) >> 8;
440} 518}
441 519
442static unsigned int 520static unsigned int
443minpot (unsigned int n) 521minpot (unsigned int n)
444{ 522{
511 if (!svp || !SvTRUE (*svp)) 589 if (!svp || !SvTRUE (*svp))
512 return 0; 590 return 0;
513 591
514 return 1; 592 return 1;
515} 593}
594
595/******************************************************************************/
596
597/* process keyboard modifiers */
598static int
599mod_munge (int mod)
600{
601 mod &= MOD_MASK;
602
603 if (mod & (KMOD_META | KMOD_ALT))
604 mod |= KMOD_LRAM;
605
606 return mod;
607}
608
609static void
610deliantra_main (SV *real_main)
611{
612 dSP;
613
614 PUSHMARK (SP);
615 call_sv (real_main, G_DISCARD | G_VOID);
616}
617
618#ifdef __MACOSX__
619 static SV *real_main;
620
621 /* to due surprising braindamage on the side of SDL design, we
622 * do some mind-boggling hack here: SDL requires a custom main()
623 * on OS X, so... we provide one and call the original main(), which,
624 * due to shared library magic, calls -lSDLmain's main, not perl's main,
625 * and which calls our main (== SDL_main) back.
626 */
627 extern C_LINKAGE int
628 main (int argc, char *argv[])
629 {
630 deliantra_main (real_main);
631 }
632
633 #undef main
634
635 extern C_LINKAGE int main (int argc, char *argv[]);
636
637 static void
638 SDL_main_hack (SV *real_main_)
639 {
640 real_main = real_main_;
641
642 char *argv[] = { "deliantra client", 0 };
643 (main) (1, argv);
644 }
645#else
646 static void
647 SDL_main_hack (SV *real_main)
648 {
649 deliantra_main (real_main);
650 }
651#endif
516 652
517MODULE = Deliantra::Client PACKAGE = DC 653MODULE = Deliantra::Client PACKAGE = DC
518 654
519PROTOTYPES: ENABLE 655PROTOTYPES: ENABLE
520 656
549 const_iv (SDL_USEREVENT), 685 const_iv (SDL_USEREVENT),
550 686
551 const_iv (SDL_APPINPUTFOCUS), 687 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 688 const_iv (SDL_APPMOUSEFOCUS),
553 const_iv (SDL_APPACTIVE), 689 const_iv (SDL_APPACTIVE),
690
691
692 const_iv (SDLK_UNKNOWN),
693 const_iv (SDLK_FIRST),
694 const_iv (SDLK_BACKSPACE),
695 const_iv (SDLK_TAB),
696 const_iv (SDLK_CLEAR),
697 const_iv (SDLK_RETURN),
698 const_iv (SDLK_PAUSE),
699 const_iv (SDLK_ESCAPE),
700 const_iv (SDLK_SPACE),
701 const_iv (SDLK_EXCLAIM),
702 const_iv (SDLK_QUOTEDBL),
703 const_iv (SDLK_HASH),
704 const_iv (SDLK_DOLLAR),
705 const_iv (SDLK_AMPERSAND),
706 const_iv (SDLK_QUOTE),
707 const_iv (SDLK_LEFTPAREN),
708 const_iv (SDLK_RIGHTPAREN),
709 const_iv (SDLK_ASTERISK),
710 const_iv (SDLK_PLUS),
711 const_iv (SDLK_COMMA),
712 const_iv (SDLK_MINUS),
713 const_iv (SDLK_PERIOD),
714 const_iv (SDLK_SLASH),
715 const_iv (SDLK_0),
716 const_iv (SDLK_1),
717 const_iv (SDLK_2),
718 const_iv (SDLK_3),
719 const_iv (SDLK_4),
720 const_iv (SDLK_5),
721 const_iv (SDLK_6),
722 const_iv (SDLK_7),
723 const_iv (SDLK_8),
724 const_iv (SDLK_9),
725 const_iv (SDLK_COLON),
726 const_iv (SDLK_SEMICOLON),
727 const_iv (SDLK_LESS),
728 const_iv (SDLK_EQUALS),
729 const_iv (SDLK_GREATER),
730 const_iv (SDLK_QUESTION),
731 const_iv (SDLK_AT),
732
733 const_iv (SDLK_LEFTBRACKET),
734 const_iv (SDLK_BACKSLASH),
735 const_iv (SDLK_RIGHTBRACKET),
736 const_iv (SDLK_CARET),
737 const_iv (SDLK_UNDERSCORE),
738 const_iv (SDLK_BACKQUOTE),
739 const_iv (SDLK_DELETE),
554 740
555 const_iv (SDLK_FIRST), 741 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 742 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 743 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 744 const_iv (SDLK_KP1),
634 const_iv (KMOD_RMETA), 820 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 821 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 822 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 823 const_iv (KMOD_MODE),
638 824
825 const_iv (KMOD_LRAM),
826
639 const_iv (MIX_DEFAULT_FORMAT), 827 const_iv (MIX_DEFAULT_FORMAT),
828
829 const_iv (SDL_INIT_TIMER),
830 const_iv (SDL_INIT_AUDIO),
831 const_iv (SDL_INIT_VIDEO),
832 const_iv (SDL_INIT_CDROM),
833 const_iv (SDL_INIT_JOYSTICK),
834 const_iv (SDL_INIT_EVERYTHING),
835 const_iv (SDL_INIT_NOPARACHUTE),
836 const_iv (SDL_INIT_EVENTTHREAD),
837
838 const_iv (SDL_GL_RED_SIZE),
839 const_iv (SDL_GL_GREEN_SIZE),
840 const_iv (SDL_GL_BLUE_SIZE),
841 const_iv (SDL_GL_ALPHA_SIZE),
842 const_iv (SDL_GL_DOUBLEBUFFER),
843 const_iv (SDL_GL_BUFFER_SIZE),
844 const_iv (SDL_GL_DEPTH_SIZE),
845 const_iv (SDL_GL_STENCIL_SIZE),
846 const_iv (SDL_GL_ACCUM_RED_SIZE),
847 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
848 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
849 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
850 const_iv (SDL_GL_STEREO),
851 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
852 const_iv (SDL_GL_MULTISAMPLESAMPLES),
853 const_iv (SDL_GL_ACCELERATED_VISUAL),
854 const_iv (SDL_GL_SWAP_CONTROL),
855
856 const_iv (FOW_DARKNESS)
640# undef const_iv 857# undef const_iv
641 }; 858 };
642 859
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 860 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 861 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
645 862
646 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 863 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
647 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 864 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
648} 865}
649 866
665NV ceil (NV x) 882NV ceil (NV x)
666 883
667IV minpot (UV n) 884IV minpot (UV n)
668 885
669IV popcount (UV n) 886IV popcount (UV n)
887
888NV distance (NV dx, NV dy)
889 CODE:
890 RETVAL = pow (dx * dx + dy * dy, 0.5);
891 OUTPUT:
892 RETVAL
670 893
671void 894void
672pango_init () 895pango_init ()
673 CODE: 896 CODE:
674{ 897{
680 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 903 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 904 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif 905#endif
683} 906}
684 907
685char *
686SDL_GetError () 908char *SDL_GetError ()
687 909
688int 910void SDL_main_hack (SV *real_main)
689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 911 PROTOTYPE: &
690 912
691void 913int SDL_Init (U32 flags)
914
915int SDL_InitSubSystem (U32 flags)
916
917void SDL_QuitSubSystem (U32 flags)
918
692SDL_Quit () 919void SDL_Quit ()
920
921int SDL_GL_SetAttribute (int attr, int value)
922 C_ARGS: (SDL_GLattr)attr, value
923
924int SDL_GL_GetAttribute (int attr)
925 CODE:
926 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
927 XSRETURN_UNDEF;
928 OUTPUT:
929 RETVAL
693 930
694void 931void
695SDL_ListModes (int rgb, int alpha) 932SDL_ListModes (int rgb, int alpha)
696 PPCODE: 933 PPCODE:
697{ 934{
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 946 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 947 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 948 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712 949
713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 950 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); 951 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717#endif
718 952
719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 953 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
720 954
721 if (m && m != (SDL_Rect **)-1) 955 if (m && m != (SDL_Rect **)-1)
722 while (*m) 956 while (*m)
723 { 957 {
724 if ((*m)->w >= 800 && (*m)->h >= 480) 958 if ((*m)->w >= 400 && (*m)->h >= 300)
725 { 959 {
726 AV *av = newAV (); 960 AV *av = newAV ();
727 av_push (av, newSViv ((*m)->w)); 961 av_push (av, newSViv ((*m)->w));
728 av_push (av, newSViv ((*m)->h)); 962 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb)); 963 av_push (av, newSViv (rgb));
752 ); 986 );
753 987
754 if (RETVAL) 988 if (RETVAL)
755 { 989 {
756 av_clear (texture_av); 990 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); 991#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
760#include "glfunc.h" 992#include "glfunc.h"
761#undef GL_FUNC 993#undef GL_FUNC
994 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
995 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
762 } 996 }
763} 997}
764 OUTPUT: 998 OUTPUT:
765 RETVAL 999 RETVAL
1000
1001void
1002SDL_WM_SetCaption (const char *title, const char *icon)
766 1003
767void 1004void
768SDL_GL_SwapBuffers () 1005SDL_GL_SwapBuffers ()
769 1006
770char * 1007char *
771SDL_GetKeyName (int sym) 1008SDL_GetKeyName (int sym)
1009 C_ARGS: (SDLKey)sym
772 1010
773int 1011int
774SDL_GetAppState () 1012SDL_GetAppState ()
775 1013
776int 1014int
777SDL_GetModState () 1015SDL_GetModState ()
778 1016
1017int
1018SDL_WaitEvent ()
1019 C_ARGS: 0
1020
779void 1021void
1022SDL_PumpEvents ()
1023
1024void
780poll_events () 1025peep_events ()
781 PPCODE: 1026 PPCODE:
782{ 1027{
783 SDL_Event ev; 1028 SDL_Event ev;
784 1029
785 SDL_PumpEvents (); 1030 SDL_PumpEvents ();
792 { 1037 {
793 case SDL_KEYDOWN: 1038 case SDL_KEYDOWN:
794 case SDL_KEYUP: 1039 case SDL_KEYUP:
795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1040 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1041 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); 1042 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 */ 1043 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); 1044 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
800 break; 1045 break;
801 1046
802 case SDL_ACTIVEEVENT: 1047 case SDL_ACTIVEEVENT:
803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1048 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
821 x = ev.motion.x; 1066 x = ev.motion.x;
822 y = ev.motion.y; 1067 y = ev.motion.y;
823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1068 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
824 } 1069 }
825 1070
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1071 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
827 hv_store (hv, "state", 5, newSViv (state), 0); 1072 hv_store (hv, "state", 5, newSViv (state), 0);
828 hv_store (hv, "x", 1, newSViv (x), 0); 1073 hv_store (hv, "x", 1, newSViv (x), 0);
829 hv_store (hv, "y", 1, newSViv (y), 0); 1074 hv_store (hv, "y", 1, newSViv (y), 0);
830 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1075 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
831 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1076 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
851 1096
852 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1097 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
853 } 1098 }
854} 1099}
855 1100
1101char *
1102SDL_AudioDriverName ()
1103 CODE:
1104{
1105 char buf [256];
1106 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1107 XSRETURN_UNDEF;
1108
1109 RETVAL = buf;
1110}
1111 OUTPUT:
1112 RETVAL
1113
856int 1114int
857Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1115Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
858 POSTCALL: 1116 POSTCALL:
859 Mix_HookMusicFinished (music_finished); 1117 Mix_HookMusicFinished (music_finished);
860 Mix_ChannelFinished (channel_finished); 1118 Mix_ChannelFinished (channel_finished);
861 1119
862void 1120void
863Mix_QuerySpec () 1121Mix_QuerySpec ()
922add_font (char *file) 1180add_font (char *file)
923 CODE: 1181 CODE:
924 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1182 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
925 OUTPUT: 1183 OUTPUT:
926 RETVAL 1184 RETVAL
1185
1186void
1187IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1188
1189# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1190void
1191Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
927 1192
928void 1193void
929load_image_inline (SV *image_) 1194load_image_inline (SV *image_)
930 ALIAS: 1195 ALIAS:
931 load_image_file = 1 1196 load_image_file = 1
977 1242
978 SDL_LockSurface (surface2); 1243 SDL_LockSurface (surface2);
979 EXTEND (SP, 6); 1244 EXTEND (SP, 6);
980 PUSHs (sv_2mortal (newSViv (surface2->w))); 1245 PUSHs (sv_2mortal (newSViv (surface2->w)));
981 PUSHs (sv_2mortal (newSViv (surface2->h))); 1246 PUSHs (sv_2mortal (newSViv (surface2->h)));
982 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1247 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))); 1248 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
984 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1249 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
985 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1250 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
986 SDL_UnlockSurface (surface2); 1251 SDL_UnlockSurface (surface2);
987 1252
1047#if DEBUG 1312#if DEBUG
1048 VALGRIND_DO_LEAK_CHECK; 1313 VALGRIND_DO_LEAK_CHECK;
1049#endif 1314#endif
1050} 1315}
1051 1316
1317int
1318SvREFCNT (SV *sv)
1319 CODE:
1320 RETVAL = SvREFCNT (sv);
1321 OUTPUT:
1322 RETVAL
1323
1052MODULE = Deliantra::Client PACKAGE = DC::Font 1324MODULE = Deliantra::Client PACKAGE = DC::Font
1053 1325
1054PROTOTYPES: DISABLE 1326PROTOTYPES: DISABLE
1055 1327
1056DC::Font 1328DC::Font
1057new_from_file (SV *class, char *path, int id = 0) 1329new_from_file (SV *klass, char *path, int id = 0)
1058 CODE: 1330 CODE:
1059{ 1331{
1060 int count; 1332 int count;
1061 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1333 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1062 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1334 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1091 PROTOTYPE: 1363 PROTOTYPE:
1092 CODE: 1364 CODE:
1093 tc_restore (); 1365 tc_restore ();
1094 1366
1095DC::Layout 1367DC::Layout
1096new (SV *class) 1368new (SV *klass)
1097 CODE: 1369 CODE:
1098 New (0, RETVAL, 1, struct cf_layout); 1370 RETVAL = new cf_layout;
1099 1371
1100 RETVAL->pl = pango_layout_new (opengl_context); 1372 RETVAL->pl = pango_layout_new (opengl_context);
1101 RETVAL->r = 1.; 1373 RETVAL->r = 1.;
1102 RETVAL->g = 1.; 1374 RETVAL->g = 1.;
1103 RETVAL->b = 1.; 1375 RETVAL->b = 1.;
1104 RETVAL->a = 1.; 1376 RETVAL->a = 1.;
1105 RETVAL->base_height = MIN_FONT_HEIGHT; 1377 RETVAL->base_height = MIN_FONT_HEIGHT;
1106 RETVAL->font = 0; 1378 RETVAL->font = 0;
1107 RETVAL->rc = rc_alloc ();
1108 1379
1109 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1380 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1110 layout_update_font (RETVAL); 1381 layout_update_font (RETVAL);
1111 OUTPUT: 1382 OUTPUT:
1112 RETVAL 1383 RETVAL
1113 1384
1114void 1385void
1115DESTROY (DC::Layout self) 1386DESTROY (DC::Layout self)
1116 CODE: 1387 CODE:
1117 g_object_unref (self->pl); 1388 g_object_unref (self->pl);
1118 rc_free (self->rc);
1119 Safefree (self); 1389 delete self;
1120 1390
1121void 1391void
1122set_text (DC::Layout self, SV *text_) 1392set_text (DC::Layout self, SV *text_)
1123 CODE: 1393 CODE:
1124{ 1394{
1250 1520
1251void 1521void
1252set_height (DC::Layout self, int base_height) 1522set_height (DC::Layout self, int base_height)
1253 CODE: 1523 CODE:
1254 if (self->base_height != base_height) 1524 if (self->base_height != base_height)
1255 { 1525 {
1256 self->base_height = base_height; 1526 self->base_height = base_height;
1257 layout_update_font (self); 1527 layout_update_font (self);
1258 } 1528 }
1259 1529
1260void 1530void
1378} 1648}
1379 1649
1380void 1650void
1381render (DC::Layout self, float x, float y, int flags = 0) 1651render (DC::Layout self, float x, float y, int flags = 0)
1382 CODE: 1652 CODE:
1383 rc_clear (self->rc); 1653 self->rc.clear ();
1384 pango_opengl_render_layout_subpixel ( 1654 pango_opengl_render_layout_subpixel (
1385 self->pl, 1655 self->pl,
1386 self->rc, 1656 &self->rc,
1387 x * PANGO_SCALE, y * PANGO_SCALE, 1657 x * PANGO_SCALE, y * PANGO_SCALE,
1388 self->r, self->g, self->b, self->a, 1658 self->r, self->g, self->b, self->a,
1389 flags 1659 flags
1390 ); 1660 );
1391 // we assume that context_change actually clears/frees stuff 1661 // we assume that context_change actually clears/frees stuff
1402 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1672 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1403 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1673 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1404 glEnable (GL_ALPHA_TEST); 1674 glEnable (GL_ALPHA_TEST);
1405 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1675 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1406 1676
1407 rc_draw (self->rc); 1677 self->rc.draw ();
1408 1678
1409 glDisable (GL_ALPHA_TEST); 1679 glDisable (GL_ALPHA_TEST);
1410 glDisable (GL_BLEND); 1680 glDisable (GL_BLEND);
1411 glDisable (GL_TEXTURE_2D); 1681 glDisable (GL_TEXTURE_2D);
1412} 1682}
1487 glDisable (GL_ALPHA_TEST); 1757 glDisable (GL_ALPHA_TEST);
1488 glDisable (GL_BLEND); 1758 glDisable (GL_BLEND);
1489 } 1759 }
1490} 1760}
1491 1761
1762void
1763draw_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)
1764 PROTOTYPE: @
1765 CODE:
1766{
1767 glEnable (GL_BLEND);
1768 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1769 glEnable (GL_TEXTURE_2D);
1770 glBindTexture (GL_TEXTURE_2D, name1);
1771
1772 glColor3f (intensity, intensity, intensity);
1773 glPushMatrix ();
1774 glScalef (1./3, 1./3, 1.);
1775
1776 if (blend > 0.f)
1777 {
1778 float dx3 = dx * -3.f / w;
1779 float dy3 = dy * -3.f / h;
1780 GLfloat env_color[4] = { 0., 0., 0., blend };
1781
1782 /* interpolate the two shadow textures */
1783 /* stage 0 == rgb(glcolor) + alpha(t0) */
1784 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1785
1786 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1787 gl.ActiveTexture (GL_TEXTURE1);
1788 glEnable (GL_TEXTURE_2D);
1789 glBindTexture (GL_TEXTURE_2D, name2);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1791
1792 /* rgb == rgb(glcolor) */
1793 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1796
1797 /* alpha = interpolate t0, t1 by env_alpha */
1798 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1799
1800 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1802 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1806
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1809
1810 glBegin (GL_QUADS);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1813 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1814 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1815 glEnd ();
1816
1817 glDisable (GL_TEXTURE_2D);
1818 gl.ActiveTexture (GL_TEXTURE0);
1819 }
1820 else
1821 {
1822 /* simple blending of one texture, also opengl <1.3 path */
1823 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1824
1825 glBegin (GL_QUADS);
1826 glTexCoord2f (0, 0); glVertex2f (0, 0);
1827 glTexCoord2f (0, t); glVertex2f (0, h);
1828 glTexCoord2f (s, t); glVertex2f (w, h);
1829 glTexCoord2f (s, 0); glVertex2f (w, 0);
1830 glEnd ();
1831 }
1832
1833 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1834 {
1835 int x, y;
1836 int dx3 = dx * 3;
1837 int dy3 = dy * 3;
1838
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1840 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1841 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1842 glTranslatef (-1., -1., 0);
1843 glBegin (GL_QUADS);
1844
1845 for (y = 1; y < h; y += 3)
1846 {
1847 int y1 = y - dy3;
1848 int y1valid = y1 >= 0 && y1 < h;
1849
1850 for (x = 1; x < w; x += 3)
1851 {
1852 int x1 = x - dx3;
1853 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1854 uint8_t h2;
1855
1856 if (y1valid && x1 >= 0 && x1 < w)
1857 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 else
1859 h2 = 1; /* out of range == invisible */
1860
1861 if (h1 || h2)
1862 {
1863 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1864 glColor4f (1., 1., 1., alpha);
1865
1866 glTexCoord2f (0, 0.); glVertex2i (x , y );
1867 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1868 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1869 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1870 }
1871 }
1872 }
1873 }
1874
1875 glEnd ();
1876
1877 glPopMatrix ();
1878
1879 glDisable (GL_TEXTURE_2D);
1880 glDisable (GL_BLEND);
1881}
1882
1492IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1883IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1493 CODE: 1884 CODE:
1494{ 1885{
1495 GLint width; 1886 GLint width;
1496 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1887 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1503MODULE = Deliantra::Client PACKAGE = DC::Map 1894MODULE = Deliantra::Client PACKAGE = DC::Map
1504 1895
1505PROTOTYPES: DISABLE 1896PROTOTYPES: DISABLE
1506 1897
1507DC::Map 1898DC::Map
1508new (SV *class) 1899new (SV *klass)
1509 CODE: 1900 CODE:
1510 New (0, RETVAL, 1, struct map); 1901 New (0, RETVAL, 1, mapgrid);
1511 RETVAL->x = 0; 1902 RETVAL->x = 0;
1512 RETVAL->y = 0; 1903 RETVAL->y = 0;
1513 RETVAL->w = 0; 1904 RETVAL->w = 0;
1514 RETVAL->h = 0; 1905 RETVAL->h = 0;
1515 RETVAL->ox = 0; 1906 RETVAL->ox = 0;
1552 1943
1553void 1944void
1554set_smooth (DC::Map self, int face, int smooth, int level) 1945set_smooth (DC::Map self, int face, int smooth, int level)
1555 CODE: 1946 CODE:
1556{ 1947{
1557 tileid texid; 1948 tileid texid;
1558 maptex *tex; 1949 maptex *tex;
1559 1950
1560 if (face < 0 || face >= self->faces) 1951 if (face < 0 || face >= self->faces)
1561 return; 1952 return;
1562 1953
1563 if (smooth < 0 || smooth >= self->faces) 1954 if (smooth < 0 || smooth >= self->faces)
1564 return; 1955 return;
1565 1956
1566 texid = self->face2tile [face]; 1957 texid = self->face2tile [face];
1567 1958
1568 if (!texid) 1959 if (!texid)
1569 return; 1960 return;
1570 1961
1571 tex = self->tex + texid; 1962 tex = self->tex + texid;
1600 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1991 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1601 // use uglier nearest interpolation because linear suffers 1992 // use uglier nearest interpolation because linear suffers
1602 // from transparent color bleeding and ugly wrapping effects. 1993 // from transparent color bleeding and ugly wrapping effects.
1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1994 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1604} 1995}
1996
1997void
1998expire_textures (DC::Map self, int texid, int count)
1999 PPCODE:
2000 for (; texid < self->texs && count; ++texid, --count)
2001 {
2002 maptex *tex = self->tex + texid;
2003
2004 if (tex->name)
2005 {
2006 if (tex->unused)
2007 {
2008 tex->name = 0;
2009 tex->unused = 0;
2010 XPUSHs (sv_2mortal (newSViv (texid)));
2011 }
2012 else
2013 tex->unused = 1;
2014 }
2015 }
1605 2016
1606int 2017int
1607ox (DC::Map self) 2018ox (DC::Map self)
1608 ALIAS: 2019 ALIAS:
1609 oy = 1 2020 oy = 1
1641 self->ox += dx; self->x += dx; 2052 self->ox += dx; self->x += dx;
1642 self->oy += dy; self->y += dy; 2053 self->oy += dy; self->y += dy;
1643 2054
1644 while (self->y < 0) 2055 while (self->y < 0)
1645 { 2056 {
1646 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2057 prepend (self->row, self->rows, MAP_EXTEND_Y);
1647 2058
1648 self->rows += MAP_EXTEND_Y; 2059 self->rows += MAP_EXTEND_Y;
1649 self->y += MAP_EXTEND_Y; 2060 self->y += MAP_EXTEND_Y;
1650 } 2061 }
1651} 2062}
1652 2063
1653SV * 2064SV *
1654map1a_update (DC::Map self, SV *data_, int extmap) 2065map1a_update (DC::Map self, SV *data_)
1655 CODE: 2066 CODE:
1656{ 2067{
1657 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2068 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1658 uint8_t *data_end = (uint8_t *)SvEND (data_); 2069 uint8_t *data_end = (uint8_t *)SvEND (data_);
1659 mapcell *cell; 2070 mapcell *cell;
1680 2091
1681 //TODO: don't trust server data to be in-range(!) 2092 //TODO: don't trust server data to be in-range(!)
1682 2093
1683 if (flags & 8) 2094 if (flags & 8)
1684 { 2095 {
2096 uint8_t ext, cmd;
2097
1685 if (extmap) 2098 do
1686 { 2099 {
1687 uint8_t ext, cmd; 2100 ext = *data++;
2101 cmd = ext & 0x7f;
1688 2102
1689 do 2103 if (cmd < 4)
2104 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2105 else if (cmd == 5) // health
1690 { 2106 {
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; 2107 cell->stat_width = 1;
1699 cell->stat_hp = *data++; 2108 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 } 2109 }
1717 while (ext & 0x80); 2110 else if (cmd == 6) // monster width
2111 cell->stat_width = *data++ + 1;
2112 else if (cmd == 0x47)
2113 {
2114 if (*data == 1) cell->player = data [1];
2115 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2116 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2117 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2118
2119 data += *data + 1;
2120 }
2121 else if (cmd == 8) // cell flags
2122 cell->flags = *data++;
2123 else if (ext & 0x40) // unknown, multibyte => skip
2124 data += *data + 1;
2125 else
2126 data++;
1718 } 2127 }
1719 else 2128 while (ext & 0x80);
1720 cell->darkness = *data++ + 1;
1721 } 2129 }
1722 2130
1723 for (z = 0; z <= 2; ++z) 2131 for (z = 0; z <= 2; ++z)
1724 if (flags & (4 >> z)) 2132 if (flags & (4 >> z))
1725 { 2133 {
1728 cell->tile [z] = self->face2tile [face]; 2136 cell->tile [z] = self->face2tile [face];
1729 2137
1730 if (cell->tile [z]) 2138 if (cell->tile [z])
1731 { 2139 {
1732 maptex *tex = self->tex + cell->tile [z]; 2140 maptex *tex = self->tex + cell->tile [z];
2141 tex->unused = 0;
1733 if (!tex->name) 2142 if (!tex->name)
1734 av_push (missing, newSViv (cell->tile [z])); 2143 av_push (missing, newSViv (cell->tile [z]));
1735 2144
1736 if (tex->smoothtile) 2145 if (tex->smoothtile)
1737 { 2146 {
1738 maptex *smooth = self->tex + tex->smoothtile; 2147 maptex *smooth = self->tex + tex->smoothtile;
2148 smooth->unused = 0;
1739 if (!smooth->name) 2149 if (!smooth->name)
1740 av_push (missing, newSViv (tex->smoothtile)); 2150 av_push (missing, newSViv (tex->smoothtile));
1741 } 2151 }
1742 } 2152 }
1743 } 2153 }
1744 } 2154 }
1745 else 2155 else
1746 cell->darkness = 0; 2156 CELL_CLEAR (cell);
1747 } 2157 }
1748} 2158}
1749 OUTPUT: 2159 OUTPUT:
1750 RETVAL 2160 RETVAL
1751 2161
1771 ? self->row + y 2181 ? self->row + y
1772 : 0; 2182 : 0;
1773 2183
1774 for (x = x0; x < x1; x++) 2184 for (x = x0; x < x1; x++)
1775 { 2185 {
1776 int r = 32, g = 32, b = 32, a = 192; 2186 unsigned int r = 32, g = 32, b = 32, a = 192;
1777 2187
1778 if (row && row->c0 <= x && x < row->c1) 2188 if (row && row->c0 <= x && x < row->c1)
1779 { 2189 {
1780 mapcell *cell = row->col + (x - row->c0); 2190 mapcell *cell = row->col + (x - row->c0);
1781 2191
1783 { 2193 {
1784 maptex tex = self->tex [cell->tile [z]]; 2194 maptex tex = self->tex [cell->tile [z]];
1785 int a0 = 255 - tex.a; 2195 int a0 = 255 - tex.a;
1786 int a1 = tex.a; 2196 int a1 = tex.a;
1787 2197
1788 r = (r * a0 + tex.r * a1) / 255; 2198 r = div255 (r * a0 + tex.r * a1);
1789 g = (g * a0 + tex.g * a1) / 255; 2199 g = div255 (g * a0 + tex.g * a1);
1790 b = (b * a0 + tex.b * a1) / 255; 2200 b = div255 (b * a0 + tex.b * a1);
1791 a = (a * a0 + tex.a * a1) / 255; 2201 a = div255 (a * a0 + tex.a * a1);
1792 } 2202 }
1793 } 2203 }
1794 2204
1795 *map++ = (r ) 2205 *map++ = (r )
1796 | (g << 8) 2206 | (g << 8)
1797 | (b << 16) 2207 | (b << 16)
1798 | (a << 24); 2208 | (a << 24);
1799 } 2209 }
1800 } 2210 }
1801 2211
1802 RETVAL = map_sv; 2212 RETVAL = map_sv;
1803} 2213}
1804 OUTPUT: 2214 OUTPUT:
1805 RETVAL 2215 RETVAL
1806 2216
1807void 2217void
1808draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2218draw (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: 2219 CODE:
1810{ 2220{
1811 int x, y, z; 2221 int x, y, z;
1812 2222
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) 2223 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1816 smooth_key skey; 2224 int pl_x, pl_y;
1817 2225 maptex pl_tex;
1818 rc_t *rc = rc_alloc (); 2226 rc_t rc;
2227 rc_t rc_ov;
1819 rc_key_t key; 2228 rc_key_t key;
1820 rc_array_t *arr; 2229 rc_t::array_t *arr;
1821 2230
2231 pl_tex.name = 0;
2232
1822 // thats current max. sorry. 2233 // that's current max. sorry.
1823 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1824 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1825
1826 // clear key, in case of extra padding
1827 memset (&skey, 0, sizeof (skey));
1828 2236
1829 memset (&key, 0, sizeof (key)); 2237 memset (&key, 0, sizeof (key));
1830 key.r = 255; 2238 key.r = 255;
1831 key.g = 255; 2239 key.g = 255;
1832 key.b = 255; 2240 key.b = 255;
1833 key.a = 255; 2241 key.a = 255;
1834 key.mode = GL_QUADS; 2242 key.mode = GL_QUADS;
1835 key.format = GL_T2F_V3F; 2243 key.format = GL_T2F_V3F;
1836 key.texname = -1;
1837 2244
1838 mx += self->x; 2245 mx += self->x;
1839 my += self->y; 2246 my += self->y;
1840 2247
1841 // first pass: determine smooth_max 2248 // first pass: determine smooth_max
1842 // rather ugly, if you ask me 2249 // rather ugly, if you ask me
1843 // could also be stored inside mapcell and updated on change 2250 // could also be stored inside mapcell and updated on change
1844 memset (smooth_max, 0, sizeof (smooth_max)); 2251 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1845 2252
1846 for (y = 0; y < sh; y++) 2253 for (y = 0; y < sh; y++)
1847 if (0 <= y + my && y + my < self->rows) 2254 if (0 <= y + my && y + my < self->rows)
1848 { 2255 {
1849 maprow *row = self->row + (y + my); 2256 maprow *row = self->row + (y + my);
1864 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2271 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1865 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2272 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1866 2273
1867 for (z = 0; z <= 2; z++) 2274 for (z = 0; z <= 2; z++)
1868 { 2275 {
1869 memset (smooth_level, 0, sizeof (smooth_level)); 2276 std::bitset<256> smooth_level; // one bit for every possible smooth level
2277 smooth_key skey;
2278 smooth_hash smooth;
2279 key.texname = -1;
1870 2280
1871 for (y = 0; y < sh; y++) 2281 for (y = 0; y < sh; y++)
1872 if (0 <= y + my && y + my < self->rows) 2282 if (0 <= y + my && y + my < self->rows)
1873 { 2283 {
1874 maprow *row = self->row + (y + my); 2284 maprow *row = self->row + (y + my);
1884 maptex tex = self->tex [tile]; 2294 maptex tex = self->tex [tile];
1885 int px, py; 2295 int px, py;
1886 2296
1887 if (key.texname != tex.name) 2297 if (key.texname != tex.name)
1888 { 2298 {
2299 self->tex [tile].unused = 0;
2300
1889 if (!tex.name) 2301 if (!tex.name)
1890 tex = self->tex [2]; /* missing, replace by noface */ 2302 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1891 2303
1892 key.texname = tex.name; 2304 key.texname = tex.name;
1893 arr = rc_array (rc, &key); 2305 arr = &rc.array (key);
1894 } 2306 }
1895 2307
1896 px = (x + 1) * T - tex.w; 2308 px = (x + 1) * Th - tex.w;
1897 py = (y + 1) * T - tex.h; 2309 py = (y + 1) * Tw - tex.h;
1898 2310
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2311 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 { 2312 {
1906 // overlays such as the speech bubble, probably more to come 2313 pl_x = px;
1907 if (cell->flags & 1) 2314 pl_y = py;
2315 pl_tex = tex;
1908 { 2316 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 } 2317 }
2318
2319 arr->t2f_v3f (0 , 0 , px , py , 0);
2320 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2321 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2322 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1928 2323
1929 // update smooth hash 2324 // update smooth hash
1930 if (tex.smoothtile) 2325 if (tex.smoothtile)
1931 { 2326 {
1932 skey.tile = tex.smoothtile; 2327 skey.tile = tex.smoothtile;
1933 skey.level = tex.smoothlevel; 2328 skey.level = tex.smoothlevel;
1934 2329
1935 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2330 smooth_level[tex.smoothlevel] = 1;
1936 2331
1937 // add bits to current tile and all neighbours. skey.x|y is 2332 // add bits to current tile and all neighbours. skey.x|y is
1938 // shifted +1|+1 so we always stay positive. 2333 // shifted +1|+1 so we always stay positive.
1939 2334
1940 // bits is ___n cccc CCCC bbbb 2335 // bits is ___n cccc CCCC bbbb
1948 2343
1949 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2344 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1950 // ·· ·· ·┏ ┓· 2345 // ·· ·· ·┏ ┓·
1951 2346
1952 // full tile 2347 // full tile
1953 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2348 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1954 2349
1955 // borders 2350 // borders
1956 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2351 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); 2352 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); 2353 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); 2354 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1960 2355
1961 // corners 2356 // corners
1962 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2357 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); 2358 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); 2359 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); 2360 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2361 }
2362 }
2363
2364 if (expect_false (z == 2) && expect_false (cell->flags))
2365 {
2366 // overlays such as the speech bubble, probably more to come
2367 if (cell->flags & 1)
2368 {
2369 rc_key_t key_ov = key;
2370 maptex tex = self->tex[TEXID_SPEECH];
2371 int px = x * Tw + Tw * 2 / 32;
2372 int py = y * Th - Th * 6 / 32;
2373
2374 key_ov.texname = tex.name;
2375 rc_t::array_t &arr = rc_ov.array (key_ov);
2376
2377 arr.t2f_v3f (0 , 0 , px , py , 0);
2378 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2379 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2380 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
1966 } 2381 }
1967 } 2382 }
1968 } 2383 }
1969 } 2384 }
1970 2385
1971 rc_draw (rc); 2386 rc.draw ();
1972 rc_clear (rc); 2387 rc.clear ();
1973 2388
1974 // go through all smoothlevels, lowest to highest, then draw. 2389 // go through all smoothlevels, lowest to highest, then draw.
1975 // this is basically counting sort 2390 // this is basically counting sort
1976 { 2391 {
1977 int w, b; 2392 int w, b;
1978 2393
1979 glEnable (GL_TEXTURE_2D); 2394 glEnable (GL_TEXTURE_2D);
1980 glBegin (GL_QUADS); 2395 glBegin (GL_QUADS);
1981 for (w = 0; w < 256 / 32; ++w) 2396 for (int level = 0; level < smooth_level.size (); ++level)
2397 if (smooth_level[level])
2398 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1982 { 2399 {
1983 uint32_t smask = smooth_level [w]; 2400 smooth_key &skey = it->first;
1984 if (smask) 2401 IV bits = it->second;
1985 for (b = 0; b < 32; ++b) 2402
1986 if (smask & (((uint32_t)1) << b)) 2403 if (!(bits & 0x1000)
2404 && skey.level == level
2405 && level > smooth_max [skey.x][skey.y])
1987 { 2406 {
1988 int level = (w << 5) | b; 2407 maptex tex = self->tex [skey.tile];
2408 int px = (((int)skey.x) - 1) * Tw;
2409 int py = (((int)skey.y) - 1) * Th;
2410 int border = bits & 15;
2411 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2412 float dx = tex.s * .0625f; // 16 images/row
2413 float dy = tex.t * .5f ; // 2 images/column
2414
1989 HE *he; 2415 if (tex.name)
1990
1991 hv_iterinit (smooth);
1992 while ((he = hv_iternext (smooth)))
1993 { 2416 {
1994 smooth_key *skey = (smooth_key *)HeKEY (he); 2417 // this time avoiding texture state changes
1995 IV bits = SvIVX (HeVAL (he)); 2418 // save gobs of state changes.
1996 2419 if (key.texname != tex.name)
1997 if (!(bits & 0x1000)
1998 && skey->level == level
1999 && level > smooth_max [skey->x][skey->y])
2000 { 2420 {
2001 maptex tex = self->tex [skey->tile]; 2421 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 2422
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 (); 2423 glEnd ();
2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2424 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2017 glBegin (GL_QUADS); 2425 glBegin (GL_QUADS);
2018 } 2426 }
2019 2427
2020 if (border) 2428 if (border)
2021 { 2429 {
2022 float ox = border * dx; 2430 float ox = border * dx;
2023 2431
2024 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2432 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2025 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2026 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2027 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2435 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2028 } 2436 }
2029 2437
2030 if (corner) 2438 if (corner)
2031 { 2439 {
2032 float ox = corner * dx; 2440 float ox = corner * dx;
2033 2441
2034 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2442 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2035 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2443 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2036 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2444 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2037 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2038 }
2039 }
2040 } 2446 }
2041 } 2447 }
2042 } 2448 }
2043 } 2449 }
2044 2450
2045 glEnd (); 2451 glEnd ();
2046 glDisable (GL_TEXTURE_2D); 2452 glDisable (GL_TEXTURE_2D);
2047 key.texname = -1; 2453 key.texname = -1;
2048 } 2454 }
2049
2050 hv_clear (smooth);
2051 } 2455 }
2052 2456
2457 if (pl_tex.name)
2458 {
2459 maptex tex = pl_tex;
2460 int px = pl_x + sdx;
2461 int py = pl_y + sdy;
2462
2463 key.texname = tex.name;
2464 rc_t::array_t &arr = rc.array (key);
2465
2466 arr.t2f_v3f (0 , 0 , px , py , 0);
2467 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2468 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2469 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2470
2471 rc.draw ();
2472 }
2473
2474 rc_ov.draw ();
2475 rc_ov.clear ();
2476
2053 glDisable (GL_BLEND); 2477 glDisable (GL_BLEND);
2054 rc_free (rc);
2055 2478
2056 // top layer: overlays such as the health bar 2479 // top layer: overlays such as the health bar
2057 for (y = 0; y < sh; y++) 2480 for (y = 0; y < sh; y++)
2058 if (0 <= y + my && y + my < self->rows) 2481 if (0 <= y + my && y + my < self->rows)
2059 { 2482 {
2062 for (x = 0; x < sw; x++) 2485 for (x = 0; x < sw; x++)
2063 if (row->c0 <= x + mx && x + mx < row->c1) 2486 if (row->c0 <= x + mx && x + mx < row->c1)
2064 { 2487 {
2065 mapcell *cell = row->col + (x + mx - row->c0); 2488 mapcell *cell = row->col + (x + mx - row->c0);
2066 2489
2067 int px = x * T; 2490 int px = x * Tw;
2068 int py = y * T; 2491 int py = y * Th;
2492
2493 if (expect_false (cell->player == player))
2494 {
2495 px += sdx;
2496 py += sdy;
2497 }
2069 2498
2070 if (cell->stat_hp) 2499 if (cell->stat_hp)
2071 { 2500 {
2072 int width = cell->stat_width * T; 2501 int width = cell->stat_width * Tw;
2073 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2502 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2074 2503
2075 glColor3ub (0, 0, 0); 2504 glColor3ub (0, 0, 0);
2076 glRectf (px + 1, py - thick - 2, 2505 glRectf (px + 1, py - thick - 2,
2077 px + width - 1, py); 2506 px + width - 1, py);
2078 2507
2084 } 2513 }
2085 } 2514 }
2086} 2515}
2087 2516
2088void 2517void
2089draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2518draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2090 CODE: 2519 CODE:
2091{ 2520{
2092 static float color[16][3] = { 2521 static float color[16][3] = {
2093 { 0.00F, 0.00F, 0.00F }, 2522 { 0.00f, 0.00f, 0.00f },
2094 { 1.00F, 1.00F, 1.00F }, 2523 { 1.00f, 1.00f, 1.00f },
2095 { 0.00F, 0.00F, 0.55F }, 2524 { 0.00f, 0.00f, 0.55f },
2096 { 1.00F, 0.00F, 0.00F }, 2525 { 1.00f, 0.00f, 0.00f },
2097 2526
2098 { 1.00F, 0.54F, 0.00F }, 2527 { 1.00f, 0.54f, 0.00f },
2099 { 0.11F, 0.56F, 1.00F }, 2528 { 0.11f, 0.56f, 1.00f },
2100 { 0.93F, 0.46F, 0.00F }, 2529 { 0.93f, 0.46f, 0.00f },
2101 { 0.18F, 0.54F, 0.34F }, 2530 { 0.18f, 0.54f, 0.34f },
2102 2531
2103 { 0.56F, 0.73F, 0.56F }, 2532 { 0.56f, 0.73f, 0.56f },
2104 { 0.80F, 0.80F, 0.80F }, 2533 { 0.80f, 0.80f, 0.80f },
2105 { 0.55F, 0.41F, 0.13F }, 2534 { 0.55f, 0.41f, 0.13f },
2106 { 0.99F, 0.77F, 0.26F }, 2535 { 0.99f, 0.77f, 0.26f },
2107 2536
2108 { 0.74F, 0.65F, 0.41F }, 2537 { 0.74f, 0.65f, 0.41f },
2109 2538
2110 { 0.00F, 1.00F, 1.00F }, 2539 { 0.00f, 1.00f, 1.00f },
2111 { 1.00F, 0.00F, 1.00F }, 2540 { 1.00f, 0.00f, 1.00f },
2112 { 1.00F, 1.00F, 0.00F }, 2541 { 1.00f, 1.00f, 0.00f },
2113 }; 2542 };
2114 2543
2115 int x, y; 2544 int x, y;
2116 2545
2117 glEnable (GL_TEXTURE_2D); 2546 glEnable (GL_TEXTURE_2D);
2547 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2548 * but the nvidia driver (185.18.14) mishandles alpha textures
2549 * and takes the colour from god knows where instead of using
2550 * Cp. MODULATE results in the same colour, but slightly different
2551 * alpha, but atcually gives us the correct colour with nvidia.
2552 */
2118 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2553 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2119 glEnable (GL_BLEND); 2554 glEnable (GL_BLEND);
2120 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2555 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2121 glBegin (GL_QUADS); 2556 glBegin (GL_QUADS);
2122 2557
2123 for (y = 0; y < h; y++) 2558 for (y = 0; y < h; y++)
2127 2562
2128 if (m) 2563 if (m)
2129 { 2564 {
2130 float *c = color [m & 15]; 2565 float *c = color [m & 15];
2131 2566
2132 float tx1 = m & 0x40 ? 0.5 : 0.; 2567 float tx1 = m & 0x40 ? 0.5f : 0.f;
2133 float tx2 = tx1 + 0.5; 2568 float tx2 = tx1 + 0.5f;
2134 2569
2135 glColor4f (c[0], c[1], c[2], 0.75); 2570 glColor4f (c[0], c[1], c[2], 1);
2136 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2571 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2137 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2572 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2138 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2573 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2139 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2574 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2140 } 2575 }
2148void 2583void
2149fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2584fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2150 PPCODE: 2585 PPCODE:
2151{ 2586{
2152 int x, y; 2587 int x, y;
2153 int sw1 = sw + 2; 2588 int sw1 = sw + 2;
2154 int sh1 = sh + 2; 2589 int sh1 = sh + 2;
2155 int sh3 = sh * 3; 2590 int sh3 = sh * 3;
2156 int sw34 = (sw * 3 + 3) & ~3; 2591 int sw3 = sw * 3;
2592 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2593 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2157 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2594 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2158 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2595 memset (darkness1, 0, sw1*sh1);
2159 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2160 2596
2161 SvPOK_only (darkness3_sv); 2597 SvPOK_only (darkness3_sv);
2162 SvCUR_set (darkness3_sv, sw34 * sh3); 2598 SvCUR_set (darkness3_sv, sw3 * sh3);
2163 2599
2164 mx += self->x - 1; 2600 mx += self->x - 1;
2165 my += self->y - 1; 2601 my += self->y - 1;
2166
2167 memset (darkness1, 255, sw1 * sh1);
2168 2602
2169 for (y = 0; y < sh1; y++) 2603 for (y = 0; y < sh1; y++)
2170 if (0 <= y + my && y + my < self->rows) 2604 if (0 <= y + my && y + my < self->rows)
2171 { 2605 {
2172 maprow *row = self->row + (y + my); 2606 maprow *row = self->row + (y + my);
2175 if (row->c0 <= x + mx && x + mx < row->c1) 2609 if (row->c0 <= x + mx && x + mx < row->c1)
2176 { 2610 {
2177 mapcell *cell = row->col + (x + mx - row->c0); 2611 mapcell *cell = row->col + (x + mx - row->c0);
2178 2612
2179 darkness1 [y * sw1 + x] = cell->darkness 2613 darkness1 [y * sw1 + x] = cell->darkness
2180 ? 255 - (cell->darkness - 1) 2614 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2181 : 255 - FOW_DARKNESS; 2615 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2182 } 2616 }
2183 } 2617 }
2184 2618
2185 for (y = 0; y < sh; ++y) 2619 for (y = 0; y < sh; ++y)
2186 for (x = 0; x < sw; ++x) 2620 for (x = 0; x < sw; ++x)
2205 2639
2206 uint8_t r13 = (d13 + d23 + d12) / 3; 2640 uint8_t r13 = (d13 + d23 + d12) / 3;
2207 uint8_t r23 = d23; 2641 uint8_t r23 = d23;
2208 uint8_t r33 = (d23 + d33 + d32) / 3; 2642 uint8_t r33 = (d23 + d33 + d32) / 3;
2209 2643
2210 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2211 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2645 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2212 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2646 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2213 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2214 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2648 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); 2649 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2216 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2217 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2651 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2218 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2652 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2219 } 2653 }
2220 2654
2221 free (darkness1); 2655 free (darkness1);
2222 2656
2223 EXTEND (SP, 3); 2657 EXTEND (SP, 3);
2224 PUSHs (sv_2mortal (newSViv (sw34))); 2658 PUSHs (sv_2mortal (newSViv (sw3)));
2225 PUSHs (sv_2mortal (newSViv (sh3))); 2659 PUSHs (sv_2mortal (newSViv (sh3)));
2226 PUSHs (darkness3_sv); 2660 PUSHs (darkness3_sv);
2227} 2661}
2228 2662
2229SV * 2663SV *
2292 else 2726 else
2293 *data++ = 0; 2727 *data++ = 0;
2294 } 2728 }
2295 } 2729 }
2296 2730
2731 /* if size is w*h + 5 then no data has been found */
2732 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2733 {
2297 SvPOK_only (data_sv); 2734 SvPOK_only (data_sv);
2298 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2735 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2736 }
2737
2299 RETVAL = data_sv; 2738 RETVAL = data_sv;
2300} 2739}
2301 OUTPUT: 2740 OUTPUT:
2302 RETVAL 2741 RETVAL
2303 2742
2304void 2743void
2305set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2744set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2306 PPCODE: 2745 PPCODE:
2307{ 2746{
2308 int x, y, z; 2747 int x, y, z;
2309 int w, h; 2748 int w, h;
2310 int x1, y1; 2749 int x1, y1;
2750 STRLEN len;
2751 uint8_t *data, *end;
2752
2753 len = SvLEN (data_sv);
2754 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2755 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2756 end = data + len + 8;
2757
2758 if (len < 5)
2759 XSRETURN_EMPTY;
2311 2760
2312 if (*data++ != 0) 2761 if (*data++ != 0)
2313 XSRETURN_EMPTY; /* version mismatch */ 2762 XSRETURN_EMPTY; /* version mismatch */
2314 2763
2315 w = *data++ << 8; w |= *data++; 2764 w = *data++ << 8; w |= *data++;
2330 { 2779 {
2331 maprow *row = map_get_row (self, y); 2780 maprow *row = map_get_row (self, y);
2332 2781
2333 for (x = x0; x < x1; x++) 2782 for (x = x0; x < x1; x++)
2334 { 2783 {
2784 uint8_t flags;
2785
2786 if (data + 7 >= end)
2787 XSRETURN_EMPTY;
2788
2335 uint8_t flags = *data++; 2789 flags = *data++;
2336 2790
2337 if (flags) 2791 if (flags)
2338 { 2792 {
2339 mapcell *cell = row_get_cell (row, x); 2793 mapcell *cell = row_get_cell (row, x);
2340 tileid tile[3] = { 0, 0, 0 }; 2794 tileid tile[3] = { 0, 0, 0 };
2343 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2797 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2344 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2798 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2345 2799
2346 if (cell->darkness == 0) 2800 if (cell->darkness == 0)
2347 { 2801 {
2348 cell->darkness = 0; 2802 /*cell->darkness = 0;*/
2803 EXTEND (SP, 3);
2349 2804
2350 for (z = 0; z <= 2; z++) 2805 for (z = 0; z <= 2; z++)
2351 { 2806 {
2352 tileid t = tile [z]; 2807 tileid t = tile [z];
2353 2808
2354 if (t >= self->texs || (t && !self->tex [t].name)) 2809 if (t >= self->texs || (t && !self->tex [t].name))
2355 { 2810 {
2356 XPUSHs (sv_2mortal (newSViv (t))); 2811 PUSHs (sv_2mortal (newSViv (t)));
2357 need_texid (self, t); 2812 need_texid (self, t);
2358 } 2813 }
2359 2814
2360 cell->tile [z] = t; 2815 cell->tile [z] = t;
2361 } 2816 }
2366} 2821}
2367 2822
2368MODULE = Deliantra::Client PACKAGE = DC::RW 2823MODULE = Deliantra::Client PACKAGE = DC::RW
2369 2824
2370DC::RW 2825DC::RW
2371new (SV *class, SV *data_sv) 2826new (SV *klass, SV *data_sv)
2372 CODE: 2827 CODE:
2373{ 2828{
2374 STRLEN datalen; 2829 STRLEN datalen;
2375 char *data = SvPVbyte (data_sv, datalen); 2830 char *data = SvPVbyte (data_sv, datalen);
2376 2831
2378} 2833}
2379 OUTPUT: 2834 OUTPUT:
2380 RETVAL 2835 RETVAL
2381 2836
2382DC::RW 2837DC::RW
2383new_from_file (SV *class, const char *path, const char *mode = "rb") 2838new_from_file (SV *klass, const char *path, const char *mode = "rb")
2384 CODE: 2839 CODE:
2385 RETVAL = SDL_RWFromFile (path, mode); 2840 RETVAL = SDL_RWFromFile (path, mode);
2386 OUTPUT: 2841 OUTPUT:
2387 RETVAL 2842 RETVAL
2388 2843
2406 if (RETVAL < 0) 2861 if (RETVAL < 0)
2407 { 2862 {
2408 RETVAL = Mix_GroupOldest (-1); 2863 RETVAL = Mix_GroupOldest (-1);
2409 2864
2410 if (RETVAL < 0) 2865 if (RETVAL < 0)
2866 {
2867 // happens sometimes, maybe it just stopped playing(?)
2868 RETVAL = Mix_GroupAvailable (-1);
2869
2870 if (RETVAL < 0)
2411 XSRETURN_UNDEF; 2871 XSRETURN_UNDEF;
2412 2872 }
2873 else
2413 Mix_HaltChannel (RETVAL); 2874 Mix_HaltChannel (RETVAL);
2414 } 2875 }
2415 2876
2416 Mix_UnregisterAllEffects (RETVAL); 2877 Mix_UnregisterAllEffects (RETVAL);
2417 Mix_Volume (RETVAL, 128); 2878 Mix_Volume (RETVAL, 128);
2418} 2879}
2465void 2926void
2466set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2927set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2467 CODE: 2928 CODE:
2468{ 2929{
2469 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2930 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); 2931 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2471 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2932 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2472} 2933}
2473 2934
2474void 2935void
2475set_reverse_stereo (DC::Channel self, int flip) 2936set_reverse_stereo (DC::Channel self, int flip)
2478 2939
2479MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2940MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2480 2941
2481PROTOTYPES: DISABLE 2942PROTOTYPES: DISABLE
2482 2943
2944void
2945decoders ()
2946 PPCODE:
2947#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2948 int i, num = Mix_GetNumChunkDecoders ();
2949 EXTEND (SP, num);
2950 for (i = 0; i < num; ++i)
2951 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2952#else
2953 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2954#endif
2955
2483DC::MixChunk 2956DC::MixChunk
2484new (SV *class, DC::RW rwops) 2957new (SV *klass, DC::RW rwops)
2485 CODE: 2958 CODE:
2486 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2959 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2487 OUTPUT: 2960 OUTPUT:
2488 RETVAL 2961 RETVAL
2489 2962
2519 OUTPUT: 2992 OUTPUT:
2520 RETVAL 2993 RETVAL
2521 2994
2522MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2995MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2523 2996
2997void
2998decoders ()
2999 PPCODE:
3000#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3001 int i, num = Mix_GetNumMusicDecoders ();
3002 EXTEND (SP, num);
3003 for (i = 0; i < num; ++i)
3004 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3005#else
3006 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3007#endif
3008
2524int 3009int
2525volume (int volume = -1) 3010volume (int volume = -1)
2526 PROTOTYPE: ;$ 3011 PROTOTYPE: ;$
2527 CODE: 3012 CODE:
2528 if (items > 0) 3013 if (items > 0)
2539void 3024void
2540halt () 3025halt ()
2541 CODE: 3026 CODE:
2542 Mix_HaltMusic (); 3027 Mix_HaltMusic ();
2543 3028
3029int
3030playing ()
3031 CODE:
3032 RETVAL = Mix_PlayingMusic ();
3033 OUTPUT:
3034 RETVAL
3035
2544DC::MixMusic 3036DC::MixMusic
2545new (SV *class, DC::RW rwops) 3037new (SV *klass, DC::RW rwops)
2546 CODE: 3038 CODE:
2547 RETVAL = Mix_LoadMUS_RW (rwops); 3039 RETVAL = Mix_LoadMUS_RW (rwops);
2548 OUTPUT: 3040 OUTPUT:
2549 RETVAL 3041 RETVAL
2550 3042
2578 } *civ, const_iv[] = { 3070 } *civ, const_iv[] = {
2579# define const_iv(name) { # name, (IV)name } 3071# define const_iv(name) { # name, (IV)name }
2580 const_iv (GL_VENDOR), 3072 const_iv (GL_VENDOR),
2581 const_iv (GL_VERSION), 3073 const_iv (GL_VERSION),
2582 const_iv (GL_EXTENSIONS), 3074 const_iv (GL_EXTENSIONS),
3075 const_iv (GL_MAX_TEXTURE_UNITS),
2583 const_iv (GL_COLOR_MATERIAL), 3076 const_iv (GL_COLOR_MATERIAL),
2584 const_iv (GL_SMOOTH), 3077 const_iv (GL_SMOOTH),
2585 const_iv (GL_FLAT), 3078 const_iv (GL_FLAT),
2586 const_iv (GL_DITHER), 3079 const_iv (GL_DITHER),
2587 const_iv (GL_BLEND), 3080 const_iv (GL_BLEND),
2599 const_iv (GL_ZERO), 3092 const_iv (GL_ZERO),
2600 const_iv (GL_SRC_ALPHA), 3093 const_iv (GL_SRC_ALPHA),
2601 const_iv (GL_DST_ALPHA), 3094 const_iv (GL_DST_ALPHA),
2602 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3095 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2603 const_iv (GL_ONE_MINUS_DST_ALPHA), 3096 const_iv (GL_ONE_MINUS_DST_ALPHA),
3097 const_iv (GL_SRC_COLOR),
3098 const_iv (GL_DST_COLOR),
3099 const_iv (GL_ONE_MINUS_SRC_COLOR),
3100 const_iv (GL_ONE_MINUS_DST_COLOR),
2604 const_iv (GL_SRC_ALPHA_SATURATE), 3101 const_iv (GL_SRC_ALPHA_SATURATE),
2605 const_iv (GL_RGB), 3102 const_iv (GL_RGB),
2606 const_iv (GL_RGBA), 3103 const_iv (GL_RGBA),
2607 const_iv (GL_RGBA4), 3104 const_iv (GL_RGBA4),
2608 const_iv (GL_RGBA8), 3105 const_iv (GL_RGBA8),
2676 const_iv (GL_NICEST), 3173 const_iv (GL_NICEST),
2677 const_iv (GL_V2F), 3174 const_iv (GL_V2F),
2678 const_iv (GL_V3F), 3175 const_iv (GL_V3F),
2679 const_iv (GL_T2F_V3F), 3176 const_iv (GL_T2F_V3F),
2680 const_iv (GL_T2F_N3F_V3F), 3177 const_iv (GL_T2F_N3F_V3F),
3178 const_iv (GL_FUNC_ADD),
3179 const_iv (GL_FUNC_SUBTRACT),
3180 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2681# undef const_iv 3181# undef const_iv
2682 }; 3182 };
2683 3183
2684 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3184 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2685 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3185 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2686 3186
2687 texture_av = newAV (); 3187 texture_av = newAV ();
2688 AvREAL_off (texture_av); 3188 AvREAL_off (texture_av);
2689} 3189}
2690 3190
2692disable_GL_EXT_blend_func_separate () 3192disable_GL_EXT_blend_func_separate ()
2693 CODE: 3193 CODE:
2694 gl.BlendFuncSeparate = 0; 3194 gl.BlendFuncSeparate = 0;
2695 gl.BlendFuncSeparateEXT = 0; 3195 gl.BlendFuncSeparateEXT = 0;
2696 3196
2697char * 3197void
3198apple_nvidia_bug (int enable)
3199
3200const char *
2698gl_vendor () 3201gl_vendor ()
2699 CODE: 3202 CODE:
2700 RETVAL = (char *)glGetString (GL_VENDOR); 3203 RETVAL = (const char *)glGetString (GL_VENDOR);
2701 OUTPUT: 3204 OUTPUT:
2702 RETVAL 3205 RETVAL
2703 3206
2704char * 3207const char *
2705gl_version () 3208gl_version ()
2706 CODE: 3209 CODE:
2707 RETVAL = (char *)glGetString (GL_VERSION); 3210 RETVAL = (const char *)glGetString (GL_VERSION);
2708 OUTPUT: 3211 OUTPUT:
2709 RETVAL 3212 RETVAL
2710 3213
2711char * 3214const char *
2712gl_extensions () 3215gl_extensions ()
2713 CODE: 3216 CODE:
2714 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3217 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2715 OUTPUT: 3218 OUTPUT:
2716 RETVAL 3219 RETVAL
2717 3220
2718const char *glGetString (GLenum pname) 3221const char *glGetString (GLenum pname)
3222 CODE:
3223 RETVAL = (const char *)glGetString (pname);
3224 OUTPUT:
3225 RETVAL
2719 3226
2720GLint glGetInteger (GLenum pname) 3227GLint glGetInteger (GLenum pname)
2721 CODE: 3228 CODE:
2722 glGetIntegerv (pname, &RETVAL); 3229 glGetIntegerv (pname, &RETVAL);
2723 OUTPUT: 3230 OUTPUT:
2731 3238
2732int glGetError () 3239int glGetError ()
2733 3240
2734void glFinish () 3241void glFinish ()
2735 3242
3243void glFlush ()
3244
2736void glClear (int mask) 3245void glClear (int mask)
2737 3246
2738void glClearColor (float r, float g, float b, float a = 1.0) 3247void glClearColor (float r, float g, float b, float a = 1.0)
2739 PROTOTYPE: @ 3248 PROTOTYPE: @
2740 3249
2749void glBlendFunc (int sfactor, int dfactor) 3258void glBlendFunc (int sfactor, int dfactor)
2750 3259
2751void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3260void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2752 CODE: 3261 CODE:
2753 gl_BlendFuncSeparate (sa, da, saa, daa); 3262 gl_BlendFuncSeparate (sa, da, saa, daa);
3263
3264# void glBlendEquation (int se)
2754 3265
2755void glDepthMask (int flag) 3266void glDepthMask (int flag)
2756 3267
2757void glLogicOp (int opcode) 3268void glLogicOp (int opcode)
2758 3269
2793void glRotate (float angle, float x, float y, float z) 3304void glRotate (float angle, float x, float y, float z)
2794 CODE: 3305 CODE:
2795 glRotatef (angle, x, y, z); 3306 glRotatef (angle, x, y, z);
2796 3307
2797void glColor (float r, float g, float b, float a = 1.0) 3308void glColor (float r, float g, float b, float a = 1.0)
3309 PROTOTYPE: @
2798 ALIAS: 3310 ALIAS:
2799 glColor_premultiply = 1 3311 glColor_premultiply = 1
2800 CODE: 3312 CODE:
2801 if (ix) 3313 if (ix)
2802 { 3314 {
2908 3420
2909void glEndList () 3421void glEndList ()
2910 3422
2911void glCallList (int list) 3423void glCallList (int list)
2912 3424
3425void c_init ()
3426 CODE:
3427 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3428 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3429
2913MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3430MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2914 3431
2915PROTOTYPES: DISABLE 3432PROTOTYPES: DISABLE
2916 3433
2917void 3434void
2918find_widget (SV *self, NV x, NV y) 3435find_widget (SV *self, NV x, NV y)
2919 PPCODE: 3436 PPCODE:
2920{ 3437{
2921 if (within_widget (self, x, y)) 3438 if (within_widget (self, x, y))
2922 XPUSHs (self); 3439 XPUSHs (self);
2923} 3440}
2924 3441
2925BOOT: 3442BOOT:
2926{ 3443{
2934 3451
2935void 3452void
2936draw (SV *self) 3453draw (SV *self)
2937 CODE: 3454 CODE:
2938{ 3455{
2939 HV *hv; 3456 HV *hv;
2940 SV **svp; 3457 SV **svp;
2941 NV x, y, w, h; 3458 NV x, y, w, h;
2942 SV *draw_x_sv = GvSV (draw_x_gv); 3459 SV *draw_x_sv = GvSV (draw_x_gv);
2943 SV *draw_y_sv = GvSV (draw_y_gv); 3460 SV *draw_y_sv = GvSV (draw_y_gv);
2944 SV *draw_w_sv = GvSV (draw_w_gv); 3461 SV *draw_w_sv = GvSV (draw_w_gv);
2945 SV *draw_h_sv = GvSV (draw_h_gv); 3462 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines