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.268 by root, Sun Jul 20 02:57:43 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),
671 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 837 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
672 const_iv (SDL_GL_STEREO), 838 const_iv (SDL_GL_STEREO),
673 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 839 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
674 const_iv (SDL_GL_MULTISAMPLESAMPLES), 840 const_iv (SDL_GL_MULTISAMPLESAMPLES),
675 const_iv (SDL_GL_ACCELERATED_VISUAL), 841 const_iv (SDL_GL_ACCELERATED_VISUAL),
676 const_iv (SDL_GL_SWAP_CONTROL) 842 const_iv (SDL_GL_SWAP_CONTROL),
843
844 const_iv (FOW_DARKNESS)
677# undef const_iv 845# undef const_iv
678 }; 846 };
679 847
680 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--)
681 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 849 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
682 850
683 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 851 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
684 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 852 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
685} 853}
686 854
701 869
702NV ceil (NV x) 870NV ceil (NV x)
703 871
704IV minpot (UV n) 872IV minpot (UV n)
705 873
874UV ld32 (UV n)
875 CODE:
876 RETVAL = ecb_ld32 (n);
877 OUTPUT:
878 RETVAL
879
706IV popcount (UV n) 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);
889 OUTPUT:
890 RETVAL
707 891
708void 892void
709pango_init () 893pango_init ()
710 CODE: 894 CODE:
711{ 895{
719#endif 903#endif
720} 904}
721 905
722char *SDL_GetError () 906char *SDL_GetError ()
723 907
908void SDL_main_hack (SV *real_main)
909 PROTOTYPE: &
910
724int SDL_Init (U32 flags) 911int SDL_Init (U32 flags)
725 912
726int SDL_InitSubSystem (U32 flags) 913int SDL_InitSubSystem (U32 flags)
727 914
728void SDL_QuitSubSystem (U32 flags) 915void SDL_QuitSubSystem (U32 flags)
729 916
730void SDL_Quit () 917void SDL_Quit ()
731 918
732int SDL_GL_SetAttribute (int attr, int value) 919int SDL_GL_SetAttribute (int attr, int value)
920 C_ARGS: (SDL_GLattr)attr, value
733 921
734int SDL_GL_GetAttribute (int attr) 922int SDL_GL_GetAttribute (int attr)
735 CODE: 923 CODE:
736 if (SDL_GL_GetAttribute (attr, &RETVAL)) 924 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
737 XSRETURN_UNDEF; 925 XSRETURN_UNDEF;
738 OUTPUT: 926 OUTPUT:
739 RETVAL 927 RETVAL
740 928
741void 929void
796 ); 984 );
797 985
798 if (RETVAL) 986 if (RETVAL)
799 { 987 {
800 av_clear (texture_av); 988 av_clear (texture_av);
801
802 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
803#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);
804#include "glfunc.h" 990#include "glfunc.h"
805#undef GL_FUNC 991#undef GL_FUNC
992 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
993 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
806 } 994 }
807} 995}
808 OUTPUT: 996 OUTPUT:
809 RETVAL 997 RETVAL
998
999void
1000SDL_WM_SetCaption (const char *title, const char *icon)
810 1001
811void 1002void
812SDL_GL_SwapBuffers () 1003SDL_GL_SwapBuffers ()
813 1004
814char * 1005char *
815SDL_GetKeyName (int sym) 1006SDL_GetKeyName (int sym)
1007 C_ARGS: (SDLKey)sym
816 1008
817int 1009int
818SDL_GetAppState () 1010SDL_GetAppState ()
819 1011
820int 1012int
821SDL_GetModState () 1013SDL_GetModState ()
822 1014
1015int
1016SDL_WaitEvent ()
1017 C_ARGS: 0
1018
823void 1019void
1020SDL_PumpEvents ()
1021
1022void
824poll_events () 1023peep_events ()
825 PPCODE: 1024 PPCODE:
826{ 1025{
827 SDL_Event ev; 1026 SDL_Event ev;
828 1027
829 SDL_PumpEvents (); 1028 SDL_PumpEvents ();
836 { 1035 {
837 case SDL_KEYDOWN: 1036 case SDL_KEYDOWN:
838 case SDL_KEYUP: 1037 case SDL_KEYUP:
839 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1038 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
840 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1039 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
841 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);
842 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 */
843 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1042 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
844 break; 1043 break;
845 1044
846 case SDL_ACTIVEEVENT: 1045 case SDL_ACTIVEEVENT:
847 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1046 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
865 x = ev.motion.x; 1064 x = ev.motion.x;
866 y = ev.motion.y; 1065 y = ev.motion.y;
867 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1066 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
868 } 1067 }
869 1068
870 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1069 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
871 hv_store (hv, "state", 5, newSViv (state), 0); 1070 hv_store (hv, "state", 5, newSViv (state), 0);
872 hv_store (hv, "x", 1, newSViv (x), 0); 1071 hv_store (hv, "x", 1, newSViv (x), 0);
873 hv_store (hv, "y", 1, newSViv (y), 0); 1072 hv_store (hv, "y", 1, newSViv (y), 0);
874 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1073 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
875 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1074 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
895 1094
896 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))));
897 } 1096 }
898} 1097}
899 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
900int 1112int
901Mix_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)
902 POSTCALL: 1114 POSTCALL:
903 Mix_HookMusicFinished (music_finished); 1115 Mix_HookMusicFinished (music_finished);
904 Mix_ChannelFinished (channel_finished); 1116 Mix_ChannelFinished (channel_finished);
905 1117
906void 1118void
907Mix_QuerySpec () 1119Mix_QuerySpec ()
966add_font (char *file) 1178add_font (char *file)
967 CODE: 1179 CODE:
968 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1180 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
969 OUTPUT: 1181 OUTPUT:
970 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)
971 1190
972void 1191void
973load_image_inline (SV *image_) 1192load_image_inline (SV *image_)
974 ALIAS: 1193 ALIAS:
975 load_image_file = 1 1194 load_image_file = 1
1021 1240
1022 SDL_LockSurface (surface2); 1241 SDL_LockSurface (surface2);
1023 EXTEND (SP, 6); 1242 EXTEND (SP, 6);
1024 PUSHs (sv_2mortal (newSViv (surface2->w))); 1243 PUSHs (sv_2mortal (newSViv (surface2->w)));
1025 PUSHs (sv_2mortal (newSViv (surface2->h))); 1244 PUSHs (sv_2mortal (newSViv (surface2->h)));
1026 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1245 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1027 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)));
1028 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1247 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1029 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1248 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1030 SDL_UnlockSurface (surface2); 1249 SDL_UnlockSurface (surface2);
1031 1250
1091#if DEBUG 1310#if DEBUG
1092 VALGRIND_DO_LEAK_CHECK; 1311 VALGRIND_DO_LEAK_CHECK;
1093#endif 1312#endif
1094} 1313}
1095 1314
1315int
1316SvREFCNT (SV *sv)
1317 CODE:
1318 RETVAL = SvREFCNT (sv);
1319 OUTPUT:
1320 RETVAL
1321
1096MODULE = Deliantra::Client PACKAGE = DC::Font 1322MODULE = Deliantra::Client PACKAGE = DC::Font
1097 1323
1098PROTOTYPES: DISABLE 1324PROTOTYPES: DISABLE
1099 1325
1100DC::Font 1326DC::Font
1101new_from_file (SV *class, char *path, int id = 0) 1327new_from_file (SV *klass, char *path, int id = 0)
1102 CODE: 1328 CODE:
1103{ 1329{
1104 int count; 1330 int count;
1105 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1331 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1106 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1332 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1135 PROTOTYPE: 1361 PROTOTYPE:
1136 CODE: 1362 CODE:
1137 tc_restore (); 1363 tc_restore ();
1138 1364
1139DC::Layout 1365DC::Layout
1140new (SV *class) 1366new (SV *klass)
1141 CODE: 1367 CODE:
1142 New (0, RETVAL, 1, struct cf_layout); 1368 RETVAL = new cf_layout;
1143 1369
1144 RETVAL->pl = pango_layout_new (opengl_context); 1370 RETVAL->pl = pango_layout_new (opengl_context);
1145 RETVAL->r = 1.; 1371 RETVAL->r = 1.;
1146 RETVAL->g = 1.; 1372 RETVAL->g = 1.;
1147 RETVAL->b = 1.; 1373 RETVAL->b = 1.;
1148 RETVAL->a = 1.; 1374 RETVAL->a = 1.;
1149 RETVAL->base_height = MIN_FONT_HEIGHT; 1375 RETVAL->base_height = MIN_FONT_HEIGHT;
1150 RETVAL->font = 0; 1376 RETVAL->font = 0;
1151 RETVAL->rc = rc_alloc ();
1152 1377
1153 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1378 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1154 layout_update_font (RETVAL); 1379 layout_update_font (RETVAL);
1155 OUTPUT: 1380 OUTPUT:
1156 RETVAL 1381 RETVAL
1157 1382
1158void 1383void
1159DESTROY (DC::Layout self) 1384DESTROY (DC::Layout self)
1160 CODE: 1385 CODE:
1161 g_object_unref (self->pl); 1386 g_object_unref (self->pl);
1162 rc_free (self->rc);
1163 Safefree (self); 1387 delete self;
1164 1388
1165void 1389void
1166set_text (DC::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1167 CODE: 1391 CODE:
1168{ 1392{
1294 1518
1295void 1519void
1296set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1297 CODE: 1521 CODE:
1298 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1299 { 1523 {
1300 self->base_height = base_height; 1524 self->base_height = base_height;
1301 layout_update_font (self); 1525 layout_update_font (self);
1302 } 1526 }
1303 1527
1304void 1528void
1422} 1646}
1423 1647
1424void 1648void
1425render (DC::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1426 CODE: 1650 CODE:
1427 rc_clear (self->rc); 1651 self->rc.clear ();
1428 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1429 self->pl, 1653 self->pl,
1430 self->rc, 1654 &self->rc,
1431 x * PANGO_SCALE, y * PANGO_SCALE, 1655 x * PANGO_SCALE, y * PANGO_SCALE,
1432 self->r, self->g, self->b, self->a, 1656 self->r, self->g, self->b, self->a,
1433 flags 1657 flags
1434 ); 1658 );
1435 // we assume that context_change actually clears/frees stuff 1659 // we assume that context_change actually clears/frees stuff
1446 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1670 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1447 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1671 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1448 glEnable (GL_ALPHA_TEST); 1672 glEnable (GL_ALPHA_TEST);
1449 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1673 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1450 1674
1451 rc_draw (self->rc); 1675 self->rc.draw ();
1452 1676
1453 glDisable (GL_ALPHA_TEST); 1677 glDisable (GL_ALPHA_TEST);
1454 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1455 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1456} 1680}
1531 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1532 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1533 } 1757 }
1534} 1758}
1535 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
1536IV 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)
1537 CODE: 1882 CODE:
1538{ 1883{
1539 GLint width; 1884 GLint width;
1540 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);
1547MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1548 1893
1549PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1550 1895
1551DC::Map 1896DC::Map
1552new (SV *class) 1897new (SV *klass)
1553 CODE: 1898 CODE:
1554 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, mapgrid);
1555 RETVAL->x = 0; 1900 RETVAL->x = 0;
1556 RETVAL->y = 0; 1901 RETVAL->y = 0;
1557 RETVAL->w = 0; 1902 RETVAL->w = 0;
1558 RETVAL->h = 0; 1903 RETVAL->h = 0;
1559 RETVAL->ox = 0; 1904 RETVAL->ox = 0;
1596 1941
1597void 1942void
1598set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1599 CODE: 1944 CODE:
1600{ 1945{
1601 tileid texid; 1946 tileid texid;
1602 maptex *tex; 1947 maptex *tex;
1603 1948
1604 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1605 return; 1950 return;
1606 1951
1607 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1608 return; 1953 return;
1609 1954
1610 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1611 1956
1612 if (!texid) 1957 if (!texid)
1613 return; 1958 return;
1614 1959
1615 tex = self->tex + texid; 1960 tex = self->tex + texid;
1644 //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);
1645 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1646 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1647 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1648} 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 }
1649 2014
1650int 2015int
1651ox (DC::Map self) 2016ox (DC::Map self)
1652 ALIAS: 2017 ALIAS:
1653 oy = 1 2018 oy = 1
1685 self->ox += dx; self->x += dx; 2050 self->ox += dx; self->x += dx;
1686 self->oy += dy; self->y += dy; 2051 self->oy += dy; self->y += dy;
1687 2052
1688 while (self->y < 0) 2053 while (self->y < 0)
1689 { 2054 {
1690 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2055 prepend (self->row, self->rows, MAP_EXTEND_Y);
1691 2056
1692 self->rows += MAP_EXTEND_Y; 2057 self->rows += MAP_EXTEND_Y;
1693 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1694 } 2059 }
1695} 2060}
1696 2061
1697SV * 2062SV *
1698map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1699 CODE: 2064 CODE:
1700{ 2065{
1701 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1702 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1703 mapcell *cell; 2068 mapcell *cell;
1724 2089
1725 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1726 2091
1727 if (flags & 8) 2092 if (flags & 8)
1728 { 2093 {
2094 uint8_t ext, cmd;
2095
1729 if (extmap) 2096 do
1730 { 2097 {
1731 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1732 2100
1733 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
1734 { 2104 {
1735 ext = *data++;
1736 cmd = ext & 0x7f;
1737
1738 if (cmd < 4)
1739 cell->darkness = 255 - ext * 64 + 1;
1740 else if (cmd == 5) // health
1741 {
1742 cell->stat_width = 1; 2105 cell->stat_width = 1;
1743 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1744 }
1745 else if (cmd == 6) // monster width
1746 cell->stat_width = *data++ + 1;
1747 else if (cmd == 0x47)
1748 {
1749 if (*data == 1) cell->player = data [1];
1750 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1751 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1752 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1753
1754 data += *data + 1;
1755 }
1756 else if (cmd == 8) // cell flags
1757 cell->flags = *data++;
1758 else if (ext & 0x40) // unknown, multibyte => skip
1759 data += *data + 1;
1760 else
1761 data++;
1762 } 2107 }
1763 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++;
1764 } 2125 }
1765 else 2126 while (ext & 0x80);
1766 cell->darkness = *data++ + 1;
1767 } 2127 }
1768 2128
1769 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1770 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1771 { 2131 {
1774 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1775 2135
1776 if (cell->tile [z]) 2136 if (cell->tile [z])
1777 { 2137 {
1778 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1779 if (!tex->name) 2140 if (!tex->name)
1780 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1781 2142
1782 if (tex->smoothtile) 2143 if (tex->smoothtile)
1783 { 2144 {
1784 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1785 if (!smooth->name) 2147 if (!smooth->name)
1786 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1787 } 2149 }
1788 } 2150 }
1789 } 2151 }
1817 ? self->row + y 2179 ? self->row + y
1818 : 0; 2180 : 0;
1819 2181
1820 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1821 { 2183 {
1822 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1823 2185
1824 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1825 { 2187 {
1826 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1827 2189
1829 { 2191 {
1830 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1831 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1832 int a1 = tex.a; 2194 int a1 = tex.a;
1833 2195
1834 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1835 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1836 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1837 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1838 } 2200 }
1839 } 2201 }
1840 2202
1841 *map++ = (r ) 2203 *map++ = (r )
1842 | (g << 8) 2204 | (g << 8)
1843 | (b << 16) 2205 | (b << 16)
1844 | (a << 24); 2206 | (a << 24);
1845 } 2207 }
1846 } 2208 }
1847 2209
1848 RETVAL = map_sv; 2210 RETVAL = map_sv;
1849} 2211}
1850 OUTPUT: 2212 OUTPUT:
1851 RETVAL 2213 RETVAL
1852 2214
1853void 2215void
1854draw (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)
1855 CODE: 2217 CODE:
1856{ 2218{
1857 int x, y, z; 2219 int x, y, z;
1858 2220
1859 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1860 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1861 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!
1862 smooth_key skey;
1863 int pl_x, pl_y; 2222 int pl_x, pl_y;
1864 maptex pl_tex; 2223 maptex pl_tex;
1865 rc_t *rc = rc_alloc (); 2224 rc_t rc;
2225 rc_t rc_ov;
1866 rc_key_t key; 2226 rc_key_t key;
1867 rc_array_t *arr; 2227 rc_t::array_t *arr;
1868 2228
1869 pl_tex.name = 0; 2229 pl_tex.name = 0;
1870 2230
1871 // thats current max. sorry. 2231 // that's current max. sorry.
1872 if (sw > 255) sw = 255; 2232 if (sw > 255) sw = 255;
1873 if (sh > 255) sh = 255; 2233 if (sh > 255) sh = 255;
1874
1875 // clear key, in case of extra padding
1876 memset (&skey, 0, sizeof (skey));
1877 2234
1878 memset (&key, 0, sizeof (key)); 2235 memset (&key, 0, sizeof (key));
1879 key.r = 255; 2236 key.r = 255;
1880 key.g = 255; 2237 key.g = 255;
1881 key.b = 255; 2238 key.b = 255;
1882 key.a = 255; 2239 key.a = 255;
1883 key.mode = GL_QUADS; 2240 key.mode = GL_QUADS;
1884 key.format = GL_T2F_V3F; 2241 key.format = GL_T2F_V3F;
1885 key.texname = -1;
1886 2242
1887 mx += self->x; 2243 mx += self->x;
1888 my += self->y; 2244 my += self->y;
1889 2245
1890 // first pass: determine smooth_max 2246 // first pass: determine smooth_max
1891 // rather ugly, if you ask me 2247 // rather ugly, if you ask me
1892 // could also be stored inside mapcell and updated on change 2248 // could also be stored inside mapcell and updated on change
1893 memset (smooth_max, 0, sizeof (smooth_max)); 2249 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1894 2250
1895 for (y = 0; y < sh; y++) 2251 for (y = 0; y < sh; y++)
1896 if (0 <= y + my && y + my < self->rows) 2252 if (0 <= y + my && y + my < self->rows)
1897 { 2253 {
1898 maprow *row = self->row + (y + my); 2254 maprow *row = self->row + (y + my);
1913 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2269 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1914 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2270 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1915 2271
1916 for (z = 0; z <= 2; z++) 2272 for (z = 0; z <= 2; z++)
1917 { 2273 {
1918 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;
1919 2278
1920 for (y = 0; y < sh; y++) 2279 for (y = 0; y < sh; y++)
1921 if (0 <= y + my && y + my < self->rows) 2280 if (0 <= y + my && y + my < self->rows)
1922 { 2281 {
1923 maprow *row = self->row + (y + my); 2282 maprow *row = self->row + (y + my);
1929 tileid tile = cell->tile [z]; 2288 tileid tile = cell->tile [z];
1930 2289
1931 if (tile) 2290 if (tile)
1932 { 2291 {
1933 maptex tex = self->tex [tile]; 2292 maptex tex = self->tex [tile];
1934 int px = (x + 1) * T - tex.w; 2293 int px, py;
1935 int py = (y + 1) * T - tex.h;
1936 2294
1937 if (key.texname != tex.name) 2295 if (key.texname != tex.name)
1938 { 2296 {
2297 self->tex [tile].unused = 0;
2298
1939 if (!tex.name) 2299 if (!tex.name)
1940 tex = self->tex [2]; /* missing, replace by noface */ 2300 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1941 2301
1942 key.texname = tex.name; 2302 key.texname = tex.name;
1943 arr = rc_array (rc, &key); 2303 arr = &rc.array (key);
1944 } 2304 }
1945 2305
2306 px = (x + 1) * Th - tex.w;
2307 py = (y + 1) * Tw - tex.h;
2308
1946 if (expect_false (cell->player == player) && expect_false (z == 2)) 2309 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1947 { 2310 {
1948 pl_x = px; 2311 pl_x = px;
1949 pl_y = py; 2312 pl_y = py;
1950 pl_tex = tex; 2313 pl_tex = tex;
1951 continue; 2314 continue;
1952 } 2315 }
1953 2316
1954 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2317 arr->t2f_v3f (0 , 0 , px , py , 0);
1955 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2318 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
1956 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);
1957 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2320 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1958
1959 if (expect_false (cell->flags) && expect_false (z == 2))
1960 {
1961 // overlays such as the speech bubble, probably more to come
1962 if (cell->flags & 1)
1963 {
1964 maptex tex = self->tex [1];
1965 int px = x * T + T * 2 / 32;
1966 int py = y * T - T * 6 / 32;
1967
1968 if (tex.name)
1969 {
1970 if (key.texname != tex.name)
1971 {
1972 key.texname = tex.name;
1973 arr = rc_array (rc, &key);
1974 }
1975
1976 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1977 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1978 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1979 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1980 }
1981 }
1982 }
1983 2321
1984 // update smooth hash 2322 // update smooth hash
1985 if (tex.smoothtile) 2323 if (tex.smoothtile)
1986 { 2324 {
1987 skey.tile = tex.smoothtile; 2325 skey.tile = tex.smoothtile;
1988 skey.level = tex.smoothlevel; 2326 skey.level = tex.smoothlevel;
1989 2327
1990 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2328 smooth_level[tex.smoothlevel] = 1;
1991 2329
1992 // 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
1993 // shifted +1|+1 so we always stay positive. 2331 // shifted +1|+1 so we always stay positive.
1994 2332
1995 // bits is ___n cccc CCCC bbbb 2333 // bits is ___n cccc CCCC bbbb
2003 2341
2004 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2342 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2005 // ·· ·· ·┏ ┓· 2343 // ·· ·· ·┏ ┓·
2006 2344
2007 // full tile 2345 // full tile
2008 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);
2009 2347
2010 // borders 2348 // borders
2011 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);
2012 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);
2013 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);
2014 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);
2015 2353
2016 // corners 2354 // corners
2017 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);
2018 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);
2019 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);
2020 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);
2021 } 2379 }
2022 } 2380 }
2023 } 2381 }
2024 } 2382 }
2025 2383
2026 rc_draw (rc); 2384 rc.draw ();
2027 rc_clear (rc); 2385 rc.clear ();
2028 2386
2029 // go through all smoothlevels, lowest to highest, then draw. 2387 // go through all smoothlevels, lowest to highest, then draw.
2030 // this is basically counting sort 2388 // this is basically counting sort
2031 { 2389 {
2032 int w, b; 2390 int w, b;
2033 2391
2034 glEnable (GL_TEXTURE_2D); 2392 glEnable (GL_TEXTURE_2D);
2035 glBegin (GL_QUADS); 2393 glBegin (GL_QUADS);
2036 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)
2037 { 2397 {
2038 uint32_t smask = smooth_level [w]; 2398 smooth_key &skey = it->first;
2039 if (smask) 2399 IV bits = it->second;
2040 for (b = 0; b < 32; ++b) 2400
2041 if (smask & (((uint32_t)1) << b)) 2401 if (!(bits & 0x1000)
2402 && skey.level == level
2403 && level > smooth_max [skey.x][skey.y])
2042 { 2404 {
2043 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
2044 HE *he; 2413 if (tex.name)
2045
2046 hv_iterinit (smooth);
2047 while ((he = hv_iternext (smooth)))
2048 { 2414 {
2049 smooth_key *skey = (smooth_key *)HeKEY (he); 2415 // this time avoiding texture state changes
2050 IV bits = SvIVX (HeVAL (he)); 2416 // save gobs of state changes.
2051 2417 if (key.texname != tex.name)
2052 if (!(bits & 0x1000)
2053 && skey->level == level
2054 && level > smooth_max [skey->x][skey->y])
2055 { 2418 {
2056 maptex tex = self->tex [skey->tile]; 2419 self->tex [skey.tile].unused = 0;
2057 int px = (((int)skey->x) - 1) * T;
2058 int py = (((int)skey->y) - 1) * T;
2059 int border = bits & 15;
2060 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2061 float dx = tex.s * .0625f; // 16 images/row
2062 float dy = tex.t * .5f ; // 2 images/column
2063 2420
2064 if (tex.name)
2065 {
2066 // this time avoiding texture state changes
2067 // save gobs of state changes.
2068 if (key.texname != tex.name)
2069 {
2070 glEnd (); 2421 glEnd ();
2071 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2422 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2072 glBegin (GL_QUADS); 2423 glBegin (GL_QUADS);
2073 } 2424 }
2074 2425
2075 if (border) 2426 if (border)
2076 { 2427 {
2077 float ox = border * dx; 2428 float ox = border * dx;
2078 2429
2079 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2080 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2081 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2082 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2083 } 2434 }
2084 2435
2085 if (corner) 2436 if (corner)
2086 { 2437 {
2087 float ox = corner * dx; 2438 float ox = corner * dx;
2088 2439
2089 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2090 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2441 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2091 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2442 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2092 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2443 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2093 }
2094 }
2095 } 2444 }
2096 } 2445 }
2097 } 2446 }
2098 } 2447 }
2099 2448
2100 glEnd (); 2449 glEnd ();
2101 glDisable (GL_TEXTURE_2D); 2450 glDisable (GL_TEXTURE_2D);
2102 key.texname = -1; 2451 key.texname = -1;
2103 } 2452 }
2104
2105 hv_clear (smooth);
2106 } 2453 }
2107 2454
2108 if (pl_tex.name) 2455 if (pl_tex.name)
2109 { 2456 {
2110 maptex tex = pl_tex; 2457 maptex tex = pl_tex;
2111 int px = pl_x + sdx; 2458 int px = pl_x + sdx;
2112 int py = pl_y + sdy; 2459 int py = pl_y + sdy;
2113 2460
2114 key.texname = tex.name; 2461 key.texname = tex.name;
2115 arr = rc_array (rc, &key); 2462 rc_t::array_t &arr = rc.array (key);
2116 2463
2117 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2464 arr.t2f_v3f (0 , 0 , px , py , 0);
2118 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2465 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2119 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);
2120 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2467 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2121 2468
2122 rc_draw (rc); 2469 rc.draw ();
2123 } 2470 }
2124 2471
2472 rc_ov.draw ();
2473 rc_ov.clear ();
2474
2125 glDisable (GL_BLEND); 2475 glDisable (GL_BLEND);
2126 rc_free (rc);
2127 2476
2128 // top layer: overlays such as the health bar 2477 // top layer: overlays such as the health bar
2129 for (y = 0; y < sh; y++) 2478 for (y = 0; y < sh; y++)
2130 if (0 <= y + my && y + my < self->rows) 2479 if (0 <= y + my && y + my < self->rows)
2131 { 2480 {
2134 for (x = 0; x < sw; x++) 2483 for (x = 0; x < sw; x++)
2135 if (row->c0 <= x + mx && x + mx < row->c1) 2484 if (row->c0 <= x + mx && x + mx < row->c1)
2136 { 2485 {
2137 mapcell *cell = row->col + (x + mx - row->c0); 2486 mapcell *cell = row->col + (x + mx - row->c0);
2138 2487
2139 int px = x * T; 2488 int px = x * Tw;
2140 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 }
2141 2496
2142 if (cell->stat_hp) 2497 if (cell->stat_hp)
2143 { 2498 {
2144 int width = cell->stat_width * T; 2499 int width = cell->stat_width * Tw;
2145 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2500 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2146 2501
2147 glColor3ub (0, 0, 0); 2502 glColor3ub (0, 0, 0);
2148 glRectf (px + 1, py - thick - 2, 2503 glRectf (px + 1, py - thick - 2,
2149 px + width - 1, py); 2504 px + width - 1, py);
2150 2505
2156 } 2511 }
2157 } 2512 }
2158} 2513}
2159 2514
2160void 2515void
2161draw_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)
2162 CODE: 2517 CODE:
2163{ 2518{
2164 static float color[16][3] = { 2519 static float color[16][3] = {
2165 { 0.00F, 0.00F, 0.00F }, 2520 { 0.00f, 0.00f, 0.00f },
2166 { 1.00F, 1.00F, 1.00F }, 2521 { 1.00f, 1.00f, 1.00f },
2167 { 0.00F, 0.00F, 0.55F }, 2522 { 0.00f, 0.00f, 0.55f },
2168 { 1.00F, 0.00F, 0.00F }, 2523 { 1.00f, 0.00f, 0.00f },
2169 2524
2170 { 1.00F, 0.54F, 0.00F }, 2525 { 1.00f, 0.54f, 0.00f },
2171 { 0.11F, 0.56F, 1.00F }, 2526 { 0.11f, 0.56f, 1.00f },
2172 { 0.93F, 0.46F, 0.00F }, 2527 { 0.93f, 0.46f, 0.00f },
2173 { 0.18F, 0.54F, 0.34F }, 2528 { 0.18f, 0.54f, 0.34f },
2174 2529
2175 { 0.56F, 0.73F, 0.56F }, 2530 { 0.56f, 0.73f, 0.56f },
2176 { 0.80F, 0.80F, 0.80F }, 2531 { 0.80f, 0.80f, 0.80f },
2177 { 0.55F, 0.41F, 0.13F }, 2532 { 0.55f, 0.41f, 0.13f },
2178 { 0.99F, 0.77F, 0.26F }, 2533 { 0.99f, 0.77f, 0.26f },
2179 2534
2180 { 0.74F, 0.65F, 0.41F }, 2535 { 0.74f, 0.65f, 0.41f },
2181 2536
2182 { 0.00F, 1.00F, 1.00F }, 2537 { 0.00f, 1.00f, 1.00f },
2183 { 1.00F, 0.00F, 1.00F }, 2538 { 1.00f, 0.00f, 1.00f },
2184 { 1.00F, 1.00F, 0.00F }, 2539 { 1.00f, 1.00f, 0.00f },
2185 }; 2540 };
2186 2541
2187 int x, y; 2542 int x, y;
2188 2543
2189 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 */
2190 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2551 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2191 glEnable (GL_BLEND); 2552 glEnable (GL_BLEND);
2192 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2553 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2193 glBegin (GL_QUADS); 2554 glBegin (GL_QUADS);
2194 2555
2195 for (y = 0; y < h; y++) 2556 for (y = 0; y < h; y++)
2199 2560
2200 if (m) 2561 if (m)
2201 { 2562 {
2202 float *c = color [m & 15]; 2563 float *c = color [m & 15];
2203 2564
2204 float tx1 = m & 0x40 ? 0.5 : 0.; 2565 float tx1 = m & 0x40 ? 0.5f : 0.f;
2205 float tx2 = tx1 + 0.5; 2566 float tx2 = tx1 + 0.5f;
2206 2567
2207 glColor4f (c[0], c[1], c[2], 0.75); 2568 glColor4f (c[0], c[1], c[2], 1);
2208 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2569 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2209 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2570 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2210 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2571 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2211 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2572 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2212 } 2573 }
2220void 2581void
2221fow_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)
2222 PPCODE: 2583 PPCODE:
2223{ 2584{
2224 int x, y; 2585 int x, y;
2225 int sw1 = sw + 2; 2586 int sw1 = sw + 2;
2226 int sh1 = sh + 2; 2587 int sh1 = sh + 2;
2227 int sh3 = sh * 3; 2588 int sh3 = sh * 3;
2228 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);
2229 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2592 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2230 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2593 memset (darkness1, 0, sw1*sh1);
2231 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2232 2594
2233 SvPOK_only (darkness3_sv); 2595 SvPOK_only (darkness3_sv);
2234 SvCUR_set (darkness3_sv, sw34 * sh3); 2596 SvCUR_set (darkness3_sv, sw3 * sh3);
2235 2597
2236 mx += self->x - 1; 2598 mx += self->x - 1;
2237 my += self->y - 1; 2599 my += self->y - 1;
2238
2239 memset (darkness1, 255, sw1 * sh1);
2240 2600
2241 for (y = 0; y < sh1; y++) 2601 for (y = 0; y < sh1; y++)
2242 if (0 <= y + my && y + my < self->rows) 2602 if (0 <= y + my && y + my < self->rows)
2243 { 2603 {
2244 maprow *row = self->row + (y + my); 2604 maprow *row = self->row + (y + my);
2247 if (row->c0 <= x + mx && x + mx < row->c1) 2607 if (row->c0 <= x + mx && x + mx < row->c1)
2248 { 2608 {
2249 mapcell *cell = row->col + (x + mx - row->c0); 2609 mapcell *cell = row->col + (x + mx - row->c0);
2250 2610
2251 darkness1 [y * sw1 + x] = cell->darkness 2611 darkness1 [y * sw1 + x] = cell->darkness
2252 ? 255 - (cell->darkness - 1) 2612 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2253 : 255 - FOW_DARKNESS; 2613 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2254 } 2614 }
2255 } 2615 }
2256 2616
2257 for (y = 0; y < sh; ++y) 2617 for (y = 0; y < sh; ++y)
2258 for (x = 0; x < sw; ++x) 2618 for (x = 0; x < sw; ++x)
2277 2637
2278 uint8_t r13 = (d13 + d23 + d12) / 3; 2638 uint8_t r13 = (d13 + d23 + d12) / 3;
2279 uint8_t r23 = d23; 2639 uint8_t r23 = d23;
2280 uint8_t r33 = (d23 + d33 + d32) / 3; 2640 uint8_t r33 = (d23 + d33 + d32) / 3;
2281 2641
2282 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2283 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2284 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2645 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2286 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 */
2287 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2289 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2290 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2291 } 2651 }
2292 2652
2293 free (darkness1); 2653 free (darkness1);
2294 2654
2295 EXTEND (SP, 3); 2655 EXTEND (SP, 3);
2296 PUSHs (sv_2mortal (newSViv (sw34))); 2656 PUSHs (sv_2mortal (newSViv (sw3)));
2297 PUSHs (sv_2mortal (newSViv (sh3))); 2657 PUSHs (sv_2mortal (newSViv (sh3)));
2298 PUSHs (darkness3_sv); 2658 PUSHs (darkness3_sv);
2299} 2659}
2300 2660
2301SV * 2661SV *
2364 else 2724 else
2365 *data++ = 0; 2725 *data++ = 0;
2366 } 2726 }
2367 } 2727 }
2368 2728
2369 /* 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 */
2370 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2730 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2371 { 2731 {
2372 SvPOK_only (data_sv); 2732 SvPOK_only (data_sv);
2373 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2733 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2374 } 2734 }
2375 2735
2376 RETVAL = data_sv; 2736 RETVAL = data_sv;
2377} 2737}
2378 OUTPUT: 2738 OUTPUT:
2379 RETVAL 2739 RETVAL
2380 2740
2381void 2741void
2388 STRLEN len; 2748 STRLEN len;
2389 uint8_t *data, *end; 2749 uint8_t *data, *end;
2390 2750
2391 len = SvLEN (data_sv); 2751 len = SvLEN (data_sv);
2392 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2752 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2393 data = SvPVbyte_nolen (data_sv); 2753 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2394 end = data + len + 8; 2754 end = data + len + 8;
2395 2755
2396 if (len < 5) 2756 if (len < 5)
2397 XSRETURN_EMPTY; 2757 XSRETURN_EMPTY;
2398 2758
2459} 2819}
2460 2820
2461MODULE = Deliantra::Client PACKAGE = DC::RW 2821MODULE = Deliantra::Client PACKAGE = DC::RW
2462 2822
2463DC::RW 2823DC::RW
2464new (SV *class, SV *data_sv) 2824new (SV *klass, SV *data_sv)
2465 CODE: 2825 CODE:
2466{ 2826{
2467 STRLEN datalen; 2827 STRLEN datalen;
2468 char *data = SvPVbyte (data_sv, datalen); 2828 char *data = SvPVbyte (data_sv, datalen);
2469 2829
2471} 2831}
2472 OUTPUT: 2832 OUTPUT:
2473 RETVAL 2833 RETVAL
2474 2834
2475DC::RW 2835DC::RW
2476new_from_file (SV *class, const char *path, const char *mode = "rb") 2836new_from_file (SV *klass, const char *path, const char *mode = "rb")
2477 CODE: 2837 CODE:
2478 RETVAL = SDL_RWFromFile (path, mode); 2838 RETVAL = SDL_RWFromFile (path, mode);
2479 OUTPUT: 2839 OUTPUT:
2480 RETVAL 2840 RETVAL
2481 2841
2499 if (RETVAL < 0) 2859 if (RETVAL < 0)
2500 { 2860 {
2501 RETVAL = Mix_GroupOldest (-1); 2861 RETVAL = Mix_GroupOldest (-1);
2502 2862
2503 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)
2504 XSRETURN_UNDEF; 2869 XSRETURN_UNDEF;
2505 2870 }
2871 else
2506 Mix_HaltChannel (RETVAL); 2872 Mix_HaltChannel (RETVAL);
2507 } 2873 }
2508 2874
2509 Mix_UnregisterAllEffects (RETVAL); 2875 Mix_UnregisterAllEffects (RETVAL);
2510 Mix_Volume (RETVAL, 128); 2876 Mix_Volume (RETVAL, 128);
2511} 2877}
2558void 2924void
2559set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2925set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2560 CODE: 2926 CODE:
2561{ 2927{
2562 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));
2563 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;
2564 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2930 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2565} 2931}
2566 2932
2567void 2933void
2568set_reverse_stereo (DC::Channel self, int flip) 2934set_reverse_stereo (DC::Channel self, int flip)
2571 2937
2572MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2938MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2573 2939
2574PROTOTYPES: DISABLE 2940PROTOTYPES: DISABLE
2575 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
2576DC::MixChunk 2954DC::MixChunk
2577new (SV *class, DC::RW rwops) 2955new (SV *klass, DC::RW rwops)
2578 CODE: 2956 CODE:
2579 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2957 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2580 OUTPUT: 2958 OUTPUT:
2581 RETVAL 2959 RETVAL
2582 2960
2612 OUTPUT: 2990 OUTPUT:
2613 RETVAL 2991 RETVAL
2614 2992
2615MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2993MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2616 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
2617int 3007int
2618volume (int volume = -1) 3008volume (int volume = -1)
2619 PROTOTYPE: ;$ 3009 PROTOTYPE: ;$
2620 CODE: 3010 CODE:
2621 if (items > 0) 3011 if (items > 0)
2632void 3022void
2633halt () 3023halt ()
2634 CODE: 3024 CODE:
2635 Mix_HaltMusic (); 3025 Mix_HaltMusic ();
2636 3026
3027int
3028playing ()
3029 CODE:
3030 RETVAL = Mix_PlayingMusic ();
3031 OUTPUT:
3032 RETVAL
3033
2637DC::MixMusic 3034DC::MixMusic
2638new (SV *class, DC::RW rwops) 3035new (SV *klass, DC::RW rwops)
2639 CODE: 3036 CODE:
2640 RETVAL = Mix_LoadMUS_RW (rwops); 3037 RETVAL = Mix_LoadMUS_RW (rwops);
2641 OUTPUT: 3038 OUTPUT:
2642 RETVAL 3039 RETVAL
2643 3040
2671 } *civ, const_iv[] = { 3068 } *civ, const_iv[] = {
2672# define const_iv(name) { # name, (IV)name } 3069# define const_iv(name) { # name, (IV)name }
2673 const_iv (GL_VENDOR), 3070 const_iv (GL_VENDOR),
2674 const_iv (GL_VERSION), 3071 const_iv (GL_VERSION),
2675 const_iv (GL_EXTENSIONS), 3072 const_iv (GL_EXTENSIONS),
3073 const_iv (GL_MAX_TEXTURE_UNITS),
2676 const_iv (GL_COLOR_MATERIAL), 3074 const_iv (GL_COLOR_MATERIAL),
2677 const_iv (GL_SMOOTH), 3075 const_iv (GL_SMOOTH),
2678 const_iv (GL_FLAT), 3076 const_iv (GL_FLAT),
2679 const_iv (GL_DITHER), 3077 const_iv (GL_DITHER),
2680 const_iv (GL_BLEND), 3078 const_iv (GL_BLEND),
2692 const_iv (GL_ZERO), 3090 const_iv (GL_ZERO),
2693 const_iv (GL_SRC_ALPHA), 3091 const_iv (GL_SRC_ALPHA),
2694 const_iv (GL_DST_ALPHA), 3092 const_iv (GL_DST_ALPHA),
2695 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3093 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2696 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),
2697 const_iv (GL_SRC_ALPHA_SATURATE), 3099 const_iv (GL_SRC_ALPHA_SATURATE),
2698 const_iv (GL_RGB), 3100 const_iv (GL_RGB),
2699 const_iv (GL_RGBA), 3101 const_iv (GL_RGBA),
2700 const_iv (GL_RGBA4), 3102 const_iv (GL_RGBA4),
2701 const_iv (GL_RGBA8), 3103 const_iv (GL_RGBA8),
2769 const_iv (GL_NICEST), 3171 const_iv (GL_NICEST),
2770 const_iv (GL_V2F), 3172 const_iv (GL_V2F),
2771 const_iv (GL_V3F), 3173 const_iv (GL_V3F),
2772 const_iv (GL_T2F_V3F), 3174 const_iv (GL_T2F_V3F),
2773 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),
2774# undef const_iv 3179# undef const_iv
2775 }; 3180 };
2776 3181
2777 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--)
2778 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3183 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2779 3184
2780 texture_av = newAV (); 3185 texture_av = newAV ();
2781 AvREAL_off (texture_av); 3186 AvREAL_off (texture_av);
2782} 3187}
2783 3188
2785disable_GL_EXT_blend_func_separate () 3190disable_GL_EXT_blend_func_separate ()
2786 CODE: 3191 CODE:
2787 gl.BlendFuncSeparate = 0; 3192 gl.BlendFuncSeparate = 0;
2788 gl.BlendFuncSeparateEXT = 0; 3193 gl.BlendFuncSeparateEXT = 0;
2789 3194
2790char * 3195void
3196apple_nvidia_bug (int enable)
3197
3198const char *
2791gl_vendor () 3199gl_vendor ()
2792 CODE: 3200 CODE:
2793 RETVAL = (char *)glGetString (GL_VENDOR); 3201 RETVAL = (const char *)glGetString (GL_VENDOR);
2794 OUTPUT: 3202 OUTPUT:
2795 RETVAL 3203 RETVAL
2796 3204
2797char * 3205const char *
2798gl_version () 3206gl_version ()
2799 CODE: 3207 CODE:
2800 RETVAL = (char *)glGetString (GL_VERSION); 3208 RETVAL = (const char *)glGetString (GL_VERSION);
2801 OUTPUT: 3209 OUTPUT:
2802 RETVAL 3210 RETVAL
2803 3211
2804char * 3212const char *
2805gl_extensions () 3213gl_extensions ()
2806 CODE: 3214 CODE:
2807 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3215 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2808 OUTPUT: 3216 OUTPUT:
2809 RETVAL 3217 RETVAL
2810 3218
2811const char *glGetString (GLenum pname) 3219const char *glGetString (GLenum pname)
3220 CODE:
3221 RETVAL = (const char *)glGetString (pname);
3222 OUTPUT:
3223 RETVAL
2812 3224
2813GLint glGetInteger (GLenum pname) 3225GLint glGetInteger (GLenum pname)
2814 CODE: 3226 CODE:
2815 glGetIntegerv (pname, &RETVAL); 3227 glGetIntegerv (pname, &RETVAL);
2816 OUTPUT: 3228 OUTPUT:
2824 3236
2825int glGetError () 3237int glGetError ()
2826 3238
2827void glFinish () 3239void glFinish ()
2828 3240
3241void glFlush ()
3242
2829void glClear (int mask) 3243void glClear (int mask)
2830 3244
2831void glClearColor (float r, float g, float b, float a = 1.0) 3245void glClearColor (float r, float g, float b, float a = 1.0)
2832 PROTOTYPE: @ 3246 PROTOTYPE: @
2833 3247
2842void glBlendFunc (int sfactor, int dfactor) 3256void glBlendFunc (int sfactor, int dfactor)
2843 3257
2844void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3258void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2845 CODE: 3259 CODE:
2846 gl_BlendFuncSeparate (sa, da, saa, daa); 3260 gl_BlendFuncSeparate (sa, da, saa, daa);
3261
3262# void glBlendEquation (int se)
2847 3263
2848void glDepthMask (int flag) 3264void glDepthMask (int flag)
2849 3265
2850void glLogicOp (int opcode) 3266void glLogicOp (int opcode)
2851 3267
2886void glRotate (float angle, float x, float y, float z) 3302void glRotate (float angle, float x, float y, float z)
2887 CODE: 3303 CODE:
2888 glRotatef (angle, x, y, z); 3304 glRotatef (angle, x, y, z);
2889 3305
2890void 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: @
2891 ALIAS: 3308 ALIAS:
2892 glColor_premultiply = 1 3309 glColor_premultiply = 1
2893 CODE: 3310 CODE:
2894 if (ix) 3311 if (ix)
2895 { 3312 {
3001 3418
3002void glEndList () 3419void glEndList ()
3003 3420
3004void glCallList (int list) 3421void glCallList (int list)
3005 3422
3423void c_init ()
3424 CODE:
3425 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3426 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3427
3006MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3428MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3007 3429
3008PROTOTYPES: DISABLE 3430PROTOTYPES: DISABLE
3009 3431
3010void 3432void
3011find_widget (SV *self, NV x, NV y) 3433find_widget (SV *self, NV x, NV y)
3012 PPCODE: 3434 PPCODE:
3013{ 3435{
3014 if (within_widget (self, x, y)) 3436 if (within_widget (self, x, y))
3015 XPUSHs (self); 3437 XPUSHs (self);
3016} 3438}
3017 3439
3018BOOT: 3440BOOT:
3019{ 3441{
3027 3449
3028void 3450void
3029draw (SV *self) 3451draw (SV *self)
3030 CODE: 3452 CODE:
3031{ 3453{
3032 HV *hv; 3454 HV *hv;
3033 SV **svp; 3455 SV **svp;
3034 NV x, y, w, h; 3456 NV x, y, w, h;
3035 SV *draw_x_sv = GvSV (draw_x_gv); 3457 SV *draw_x_sv = GvSV (draw_x_gv);
3036 SV *draw_y_sv = GvSV (draw_y_gv); 3458 SV *draw_y_sv = GvSV (draw_y_gv);
3037 SV *draw_w_sv = GvSV (draw_w_gv); 3459 SV *draw_w_sv = GvSV (draw_w_gv);
3038 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