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.261 by root, Sun Jul 13 12:17:00 2008 UTC vs.
Revision 1.332 by root, Mon Nov 19 00:56:08 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines