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.270 by root, Sun Jul 20 15:05:13 2008 UTC vs.
Revision 1.335 by root, Mon Nov 19 01:56:11 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines