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.272 by root, Tue Aug 19 17:38:29 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>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
44/* work around os x broken headers */ 48/* work around os x broken headers */
45#ifdef __MACOSX__ 49#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 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);
47#endif 53#endif
48 54
49#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
51 57
52#include <glib/gmacros.h> 58#include <glib.h>
53 59
54#include <pango/pango.h> 60#include <pango/pango.h>
55 61
56#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
70# include <netinet/in.h> 76# include <netinet/in.h>
71# include <netinet/tcp.h> 77# include <netinet/tcp.h>
72# include <inttypes.h> 78# include <inttypes.h>
73#endif 79#endif
74 80
75#if __GNUC__ >= 4 81#include "ecb.h"
76# define expect(expr,value) __builtin_expect ((expr),(value)) 82#include "salloc.h"
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83 83
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 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 */
86#define FOW_DARKNESS 32 88#define FOW_DARKNESS 50
89#define DARKNESS_ADJUST(n) (n)
87 90
88#define MAP_EXTEND_X 32 91#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 92#define MAP_EXTEND_Y 512
90 93
91#define MIN_FONT_HEIGHT 10 94#define MIN_FONT_HEIGHT 10
92 95
93/* mask out modifiers we are not interested in */ 96/* mask out modifiers we are not interested in */
94#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}
95 146
96static AV *texture_av; 147static AV *texture_av;
97 148
98static struct 149static struct
99{ 150{
156{ 207{
157 GSList *attrs = run->item->analysis.extra_attrs; 208 GSList *attrs = run->item->analysis.extra_attrs;
158 209
159 while (attrs) 210 while (attrs)
160 { 211 {
161 PangoAttribute *attr = attrs->data; 212 PangoAttribute *attr = (PangoAttribute *)attrs->data;
162 213
163 if (attr->klass->type == PANGO_ATTR_SHAPE) 214 if (attr->klass->type == PANGO_ATTR_SHAPE)
164 return 1; 215 return 1;
165 216
166 attrs = attrs->next; 217 attrs = attrs->next;
167 } 218 }
168 219
169 return 0; 220 return 0;
170} 221}
171 222
172typedef struct cf_layout { 223struct cf_layout {
173 PangoLayout *pl; 224 PangoLayout *pl;
174 float r, g, b, a; // default color for rgba mode 225 float r, g, b, a; // default color for rgba mode
175 int base_height; 226 int base_height;
176 DC__Font font; 227 DC__Font font;
177 rc_t *rc; 228 rc_t rc;
178} *DC__Layout; 229};
230
231typedef cf_layout *DC__Layout;
179 232
180static DC__Font default_font; 233static DC__Font default_font;
181static PangoContext *opengl_context; 234static PangoContext *opengl_context;
182static PangoFontMap *opengl_fontmap; 235static PangoFontMap *opengl_fontmap;
183 236
184static void 237static void
185substitute_func (FcPattern *pattern, gpointer data) 238substitute_func (FcPattern *pattern, gpointer data)
186{ 239{
187 FcPatternAddBool (pattern, FC_HINTING, 1); 240 FcPatternAddBool (pattern, FC_HINTING, 1);
188#ifdef FC_HINT_STYLE 241#ifdef FC_HINT_STYLE
189 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 242 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
190#endif 243#endif
191 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 244 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
192} 245}
193 246
194static void 247static void
221 274
222 *w = rect.width; 275 *w = rect.width;
223 *h = rect.height; 276 *h = rect.height;
224} 277}
225 278
279/////////////////////////////////////////////////////////////////////////////
280
226typedef uint16_t tileid; 281typedef uint16_t tileid;
227typedef uint16_t faceid; 282typedef uint16_t faceid;
228 283
229typedef struct { 284struct maptex
285{
230 GLuint name; 286 GLuint name;
231 int w, h; 287 int w, h;
232 float s, t; 288 float s, t;
233 uint8_t r, g, b, a; 289 uint8_t r, g, b, a;
234 tileid smoothtile; 290 tileid smoothtile;
235 uint8_t smoothlevel; 291 uint8_t smoothlevel;
236} maptex; 292 uint8_t unused; /* set to zero on use */
293};
237 294
238typedef struct { 295struct mapcell
296{
239 uint32_t player; 297 uint32_t player;
240 tileid tile[3]; 298 tileid tile[3];
241 uint16_t darkness; 299 uint16_t darkness;
242 uint8_t stat_width, stat_hp, flags, smoothmax; 300 uint8_t stat_width, stat_hp, flags, smoothmax;
243} mapcell; 301};
244 302
245typedef struct { 303struct maprow
304{
246 int32_t c0, c1; 305 int32_t c0, c1;
247 mapcell *col; 306 mapcell *col;
248} maprow; 307};
249 308
250typedef struct map { 309struct mapgrid {
251 int x, y, w, h; 310 int x, y, w, h;
252 int ox, oy; /* offset to virtual global coordinate system */ 311 int ox, oy; /* offset to virtual global coordinate system */
253 int faces; tileid *face2tile; // [faceid] 312 int faces; tileid *face2tile; // [faceid]
254 int texs; maptex *tex; // [tileid] 313 int texs; maptex *tex; // [tileid]
255 314
256 int32_t rows; 315 int32_t rows;
257 maprow *row; 316 maprow *row;
258} *DC__Map; 317};
259 318
260static char * 319typedef mapgrid *DC__Map;
320
321template<typename T>
322ecb_cold static void
261prepend (char *ptr, int sze, int inc) 323prepend (T *&ptr, int sze, int inc)
262{ 324{
263 char *p; 325 T *p;
264 326
265 New (0, p, sze + inc, char); 327 Newx (p, inc + sze, T);
266 Zero (p, inc, char); 328 Zero (p, inc, T);
267 Move (ptr, p + inc, sze, char); 329 Move (ptr, p + inc, sze, T);
268 Safefree (ptr); 330 Safefree (ptr);
269 331
270 return p; 332 ptr = p;
271} 333}
272 334
273static char * 335template<typename T>
336ecb_cold static void
274append (char *ptr, int sze, int inc) 337append (T *&ptr, int sze, int inc)
275{ 338{
276 Renew (ptr, sze + inc, char); 339 Renew (ptr, sze + inc, T);
277 Zero (ptr + sze, inc, char); 340 Zero (ptr + sze, inc, T);
278
279 return ptr;
280} 341}
281
282#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
283#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
284 342
285static void 343static void
286need_facenum (struct map *self, faceid face) 344need_facenum (struct mapgrid *self, faceid face)
287{ 345{
288 while (self->faces <= face) 346 if (ecb_expect_true (self->faces > face))
289 { 347 return;
348
349 size_t newsize = minpot (face + 1);
290 Append (tileid, self->face2tile, self->faces, self->faces); 350 append (self->face2tile, self->faces, newsize - self->faces);
291 self->faces *= 2; 351 self->faces = newsize;
292 }
293} 352}
294 353
295static void 354static void
296need_texid (struct map *self, int texid) 355need_texid (struct mapgrid *self, int texid)
297{ 356{
298 while (self->texs <= texid) 357 if (ecb_expect_true (self->texs > texid))
299 { 358 return;
359
360 size_t newsize = minpot (texid + 1);
300 Append (maptex, self->tex, self->texs, self->texs); 361 append (self->tex, self->texs, newsize - self->texs);
301 self->texs *= 2; 362 self->texs = newsize;
302 }
303} 363}
304 364
305static maprow * 365static maprow *
306map_get_row (DC__Map self, int y) 366map_get_row (mapgrid *self, int y)
307{ 367{
308 if (0 > y) 368 if (0 > y)
309 { 369 {
310 int extend = - y + MAP_EXTEND_Y; 370 int extend = - y + MAP_EXTEND_Y;
311 Prepend (maprow, self->row, self->rows, extend); 371 prepend (self->row, self->rows, extend);
312 372
313 self->rows += extend; 373 self->rows += extend;
314 self->y += extend; 374 self->y += extend;
315 y += extend; 375 y += extend;
316 } 376 }
317 else if (y >= self->rows) 377 else if (y >= self->rows)
318 { 378 {
319 int extend = y - self->rows + MAP_EXTEND_Y; 379 int extend = y - self->rows + MAP_EXTEND_Y;
320 Append (maprow, self->row, self->rows, extend); 380 append (self->row, self->rows, extend);
321 self->rows += extend; 381 self->rows += extend;
322 } 382 }
323 383
324 return self->row + y; 384 return self->row + y;
325} 385}
335 } 395 }
336 396
337 if (row->c0 > x) 397 if (row->c0 > x)
338 { 398 {
339 int extend = row->c0 - x + MAP_EXTEND_X; 399 int extend = row->c0 - x + MAP_EXTEND_X;
340 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 400 prepend (row->col, row->c1 - row->c0, extend);
341 row->c0 -= extend; 401 row->c0 -= extend;
342 } 402 }
343 else if (x >= row->c1) 403 else if (x >= row->c1)
344 { 404 {
345 int extend = x - row->c1 + MAP_EXTEND_X; 405 int extend = x - row->c1 + MAP_EXTEND_X;
346 Append (mapcell, row->col, row->c1 - row->c0, extend); 406 append (row->col, row->c1 - row->c0, extend);
347 row->c1 += extend; 407 row->c1 += extend;
348 } 408 }
349 409
350 return row->col + (x - row->c0); 410 return row->col + (x - row->c0);
351} 411}
352 412
353static mapcell * 413static mapcell *
354map_get_cell (DC__Map self, int x, int y) 414map_get_cell (mapgrid *self, int x, int y)
355{ 415{
356 return row_get_cell (map_get_row (self, y), x); 416 return row_get_cell (map_get_row (self, y), x);
357} 417}
358 418
359static void 419static void
360map_clear (DC__Map self) 420map_clear (mapgrid *self)
361{ 421{
362 int r; 422 int r;
363 423
364 for (r = 0; r < self->rows; r++) 424 for (r = 0; r < self->rows; r++)
365 Safefree (self->row[r].col); 425 Safefree (self->row[r].col);
383 (cell)->flags = 0; \ 443 (cell)->flags = 0; \
384 (cell)->player = 0; \ 444 (cell)->player = 0; \
385 } while (0) 445 } while (0)
386 446
387static void 447static void
388map_blank (DC__Map self, int x0, int y0, int w, int h) 448map_blank (mapgrid *self, int x0, int y0, int w, int h)
389{ 449{
390 int x, y; 450 int x, y;
391 maprow *row; 451 maprow *row;
392 mapcell *cell; 452 mapcell *cell;
393 453
410 CELL_CLEAR (cell); 470 CELL_CLEAR (cell);
411 } 471 }
412 } 472 }
413} 473}
414 474
415typedef struct { 475struct smooth_key
476{
416 tileid tile; 477 tileid tile;
417 uint8_t x, y, level; 478 uint8_t x, y, level;
418} 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}
419 498
420static void 499static void
421smooth_or_bits (HV *hv, smooth_key *key, IV bits) 500smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
422{ 501{
423 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 502 auto &&it = h.find (key);
424 503
425 if (SvIOK (*sv)) 504 if (it == h.end ())
426 SvIV_set (*sv, SvIVX (*sv) | bits); 505 h.insert (std::make_pair (key, bits));
427 else 506 else
428 sv_setiv (*sv, bits); 507 it->second |= bits;
429} 508}
430 509
431static void 510static void
432music_finished (void) 511music_finished (void)
433{ 512{
452 ev.data2 = 0; 531 ev.data2 = 0;
453 532
454 SDL_PushEvent ((SDL_Event *)&ev); 533 SDL_PushEvent ((SDL_Event *)&ev);
455} 534}
456 535
457static unsigned int
458minpot (unsigned int n)
459{
460 if (!n)
461 return 0;
462
463 --n;
464
465 n |= n >> 1;
466 n |= n >> 2;
467 n |= n >> 4;
468 n |= n >> 8;
469 n |= n >> 16;
470
471 return n + 1;
472}
473
474static unsigned int
475popcount (unsigned int n)
476{
477 n -= (n >> 1) & 0x55555555U;
478 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
479 n = ((n >> 4) + n) & 0x0f0f0f0fU;
480 n *= 0x01010101U;
481
482 return n >> 24;
483}
484
485/* SDL should provide this, really. */ 536/* SDL should provide this, really. */
486#define SDLK_MODIFIER_MIN 300 537#define SDLK_MODIFIER_MIN 300
487#define SDLK_MODIFIER_MAX 314 538#define SDLK_MODIFIER_MAX 314
488 539
489/******************************************************************************/ 540/******************************************************************************/
527 return 0; 578 return 0;
528 579
529 return 1; 580 return 1;
530} 581}
531 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
532static void 597static void
533deliantra_main () 598deliantra_main (SV *real_main)
534{ 599{
535 call_argv ("::main", G_DISCARD | G_VOID, 0);
536 dSP; 600 dSP;
601
602 PUSHMARK (SP);
603 call_sv (real_main, G_DISCARD | G_VOID);
537} 604}
538 605
539#ifdef __MACOSX__ 606#ifdef __MACOSX__
607 static SV *real_main;
608
540 /* to due surprising braindamage on the side of SDL design, we 609 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main() 610 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which, 611 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 612 * due to shared library magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back. 613 * and which calls our main (== SDL_main) back.
545 */ 614 */
546 extern C_LINKAGE int 615 extern C_LINKAGE int
547 main (int argc, char *argv[]) 616 main (int argc, char *argv[])
548 { 617 {
549 deliantra_main (); 618 deliantra_main (real_main);
550 } 619 }
551 620
552 #undef main 621 #undef main
553 622
554 extern C_LINKAGE int main (int argc, char *argv[]); 623 extern C_LINKAGE int main (int argc, char *argv[]);
555 624
556 static void 625 static void
557 SDL_braino (void) 626 SDL_main_hack (SV *real_main_)
558 { 627 {
628 real_main = real_main_;
629
559 char *argv[] = { "deliantra client", 0 }; 630 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv); 631 (main) (1, argv);
561 } 632 }
562#else 633#else
563 static void 634 static void
564 SDL_braino (void) 635 SDL_main_hack (SV *real_main)
565 { 636 {
566 deliantra_main (); 637 deliantra_main (real_main);
567 } 638 }
568#endif 639#endif
569 640
570MODULE = Deliantra::Client PACKAGE = DC 641MODULE = Deliantra::Client PACKAGE = DC
571 642
602 const_iv (SDL_USEREVENT), 673 const_iv (SDL_USEREVENT),
603 674
604 const_iv (SDL_APPINPUTFOCUS), 675 const_iv (SDL_APPINPUTFOCUS),
605 const_iv (SDL_APPMOUSEFOCUS), 676 const_iv (SDL_APPMOUSEFOCUS),
606 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),
607 728
608 const_iv (SDLK_FIRST), 729 const_iv (SDLK_FIRST),
609 const_iv (SDLK_LAST), 730 const_iv (SDLK_LAST),
610 const_iv (SDLK_KP0), 731 const_iv (SDLK_KP0),
611 const_iv (SDLK_KP1), 732 const_iv (SDLK_KP1),
687 const_iv (KMOD_RMETA), 808 const_iv (KMOD_RMETA),
688 const_iv (KMOD_NUM), 809 const_iv (KMOD_NUM),
689 const_iv (KMOD_CAPS), 810 const_iv (KMOD_CAPS),
690 const_iv (KMOD_MODE), 811 const_iv (KMOD_MODE),
691 812
813 const_iv (KMOD_LRAM),
814
692 const_iv (MIX_DEFAULT_FORMAT), 815 const_iv (MIX_DEFAULT_FORMAT),
693 816
694 const_iv (SDL_INIT_TIMER), 817 const_iv (SDL_INIT_TIMER),
695 const_iv (SDL_INIT_AUDIO), 818 const_iv (SDL_INIT_AUDIO),
696 const_iv (SDL_INIT_VIDEO), 819 const_iv (SDL_INIT_VIDEO),
720 843
721 const_iv (FOW_DARKNESS) 844 const_iv (FOW_DARKNESS)
722# undef const_iv 845# undef const_iv
723 }; 846 };
724 847
725 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--)
726 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 849 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
727 850
728 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 851 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
729 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 852 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
730} 853}
731 854
746 869
747NV ceil (NV x) 870NV ceil (NV x)
748 871
749IV minpot (UV n) 872IV minpot (UV n)
750 873
874UV ld32 (UV n)
875 CODE:
876 RETVAL = ecb_ld32 (n);
877 OUTPUT:
878 RETVAL
879
751IV 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
752 891
753void 892void
754pango_init () 893pango_init ()
755 CODE: 894 CODE:
756{ 895{
764#endif 903#endif
765} 904}
766 905
767char *SDL_GetError () 906char *SDL_GetError ()
768 907
769void SDL_braino () 908void SDL_main_hack (SV *real_main)
909 PROTOTYPE: &
770 910
771int SDL_Init (U32 flags) 911int SDL_Init (U32 flags)
772 912
773int SDL_InitSubSystem (U32 flags) 913int SDL_InitSubSystem (U32 flags)
774 914
775void SDL_QuitSubSystem (U32 flags) 915void SDL_QuitSubSystem (U32 flags)
776 916
777void SDL_Quit () 917void SDL_Quit ()
778 918
779int SDL_GL_SetAttribute (int attr, int value) 919int SDL_GL_SetAttribute (int attr, int value)
920 C_ARGS: (SDL_GLattr)attr, value
780 921
781int SDL_GL_GetAttribute (int attr) 922int SDL_GL_GetAttribute (int attr)
782 CODE: 923 CODE:
783 if (SDL_GL_GetAttribute (attr, &RETVAL)) 924 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
784 XSRETURN_UNDEF; 925 XSRETURN_UNDEF;
785 OUTPUT: 926 OUTPUT:
786 RETVAL 927 RETVAL
787 928
788void 929void
843 ); 984 );
844 985
845 if (RETVAL) 986 if (RETVAL)
846 { 987 {
847 av_clear (texture_av); 988 av_clear (texture_av);
848
849 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
850#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);
851#include "glfunc.h" 990#include "glfunc.h"
852#undef GL_FUNC 991#undef GL_FUNC
992 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
993 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
853 } 994 }
854} 995}
855 OUTPUT: 996 OUTPUT:
856 RETVAL 997 RETVAL
998
999void
1000SDL_WM_SetCaption (const char *title, const char *icon)
857 1001
858void 1002void
859SDL_GL_SwapBuffers () 1003SDL_GL_SwapBuffers ()
860 1004
861char * 1005char *
862SDL_GetKeyName (int sym) 1006SDL_GetKeyName (int sym)
1007 C_ARGS: (SDLKey)sym
863 1008
864int 1009int
865SDL_GetAppState () 1010SDL_GetAppState ()
866 1011
867int 1012int
868SDL_GetModState () 1013SDL_GetModState ()
869 1014
1015int
1016SDL_WaitEvent ()
1017 C_ARGS: 0
1018
870void 1019void
1020SDL_PumpEvents ()
1021
1022void
871poll_events () 1023peep_events ()
872 PPCODE: 1024 PPCODE:
873{ 1025{
874 SDL_Event ev; 1026 SDL_Event ev;
875 1027
876 SDL_PumpEvents (); 1028 SDL_PumpEvents ();
883 { 1035 {
884 case SDL_KEYDOWN: 1036 case SDL_KEYDOWN:
885 case SDL_KEYUP: 1037 case SDL_KEYUP:
886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1038 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1039 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
888 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);
889 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 */
890 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1042 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
891 break; 1043 break;
892 1044
893 case SDL_ACTIVEEVENT: 1045 case SDL_ACTIVEEVENT:
894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1046 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
912 x = ev.motion.x; 1064 x = ev.motion.x;
913 y = ev.motion.y; 1065 y = ev.motion.y;
914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1066 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
915 } 1067 }
916 1068
917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1069 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
918 hv_store (hv, "state", 5, newSViv (state), 0); 1070 hv_store (hv, "state", 5, newSViv (state), 0);
919 hv_store (hv, "x", 1, newSViv (x), 0); 1071 hv_store (hv, "x", 1, newSViv (x), 0);
920 hv_store (hv, "y", 1, newSViv (y), 0); 1072 hv_store (hv, "y", 1, newSViv (y), 0);
921 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1073 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
922 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1074 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
942 1094
943 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))));
944 } 1096 }
945} 1097}
946 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
947int 1112int
948Mix_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)
949 POSTCALL: 1114 POSTCALL:
950 Mix_HookMusicFinished (music_finished); 1115 Mix_HookMusicFinished (music_finished);
951 Mix_ChannelFinished (channel_finished); 1116 Mix_ChannelFinished (channel_finished);
952 1117
953void 1118void
954Mix_QuerySpec () 1119Mix_QuerySpec ()
1013add_font (char *file) 1178add_font (char *file)
1014 CODE: 1179 CODE:
1015 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1180 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1016 OUTPUT: 1181 OUTPUT:
1017 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)
1018 1190
1019void 1191void
1020load_image_inline (SV *image_) 1192load_image_inline (SV *image_)
1021 ALIAS: 1193 ALIAS:
1022 load_image_file = 1 1194 load_image_file = 1
1068 1240
1069 SDL_LockSurface (surface2); 1241 SDL_LockSurface (surface2);
1070 EXTEND (SP, 6); 1242 EXTEND (SP, 6);
1071 PUSHs (sv_2mortal (newSViv (surface2->w))); 1243 PUSHs (sv_2mortal (newSViv (surface2->w)));
1072 PUSHs (sv_2mortal (newSViv (surface2->h))); 1244 PUSHs (sv_2mortal (newSViv (surface2->h)));
1073 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1245 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1074 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)));
1075 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1247 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1076 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1248 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1077 SDL_UnlockSurface (surface2); 1249 SDL_UnlockSurface (surface2);
1078 1250
1138#if DEBUG 1310#if DEBUG
1139 VALGRIND_DO_LEAK_CHECK; 1311 VALGRIND_DO_LEAK_CHECK;
1140#endif 1312#endif
1141} 1313}
1142 1314
1315int
1316SvREFCNT (SV *sv)
1317 CODE:
1318 RETVAL = SvREFCNT (sv);
1319 OUTPUT:
1320 RETVAL
1321
1143MODULE = Deliantra::Client PACKAGE = DC::Font 1322MODULE = Deliantra::Client PACKAGE = DC::Font
1144 1323
1145PROTOTYPES: DISABLE 1324PROTOTYPES: DISABLE
1146 1325
1147DC::Font 1326DC::Font
1148new_from_file (SV *class, char *path, int id = 0) 1327new_from_file (SV *klass, char *path, int id = 0)
1149 CODE: 1328 CODE:
1150{ 1329{
1151 int count; 1330 int count;
1152 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1331 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1153 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1332 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1182 PROTOTYPE: 1361 PROTOTYPE:
1183 CODE: 1362 CODE:
1184 tc_restore (); 1363 tc_restore ();
1185 1364
1186DC::Layout 1365DC::Layout
1187new (SV *class) 1366new (SV *klass)
1188 CODE: 1367 CODE:
1189 New (0, RETVAL, 1, struct cf_layout); 1368 RETVAL = new cf_layout;
1190 1369
1191 RETVAL->pl = pango_layout_new (opengl_context); 1370 RETVAL->pl = pango_layout_new (opengl_context);
1192 RETVAL->r = 1.; 1371 RETVAL->r = 1.;
1193 RETVAL->g = 1.; 1372 RETVAL->g = 1.;
1194 RETVAL->b = 1.; 1373 RETVAL->b = 1.;
1195 RETVAL->a = 1.; 1374 RETVAL->a = 1.;
1196 RETVAL->base_height = MIN_FONT_HEIGHT; 1375 RETVAL->base_height = MIN_FONT_HEIGHT;
1197 RETVAL->font = 0; 1376 RETVAL->font = 0;
1198 RETVAL->rc = rc_alloc ();
1199 1377
1200 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1378 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1201 layout_update_font (RETVAL); 1379 layout_update_font (RETVAL);
1202 OUTPUT: 1380 OUTPUT:
1203 RETVAL 1381 RETVAL
1204 1382
1205void 1383void
1206DESTROY (DC::Layout self) 1384DESTROY (DC::Layout self)
1207 CODE: 1385 CODE:
1208 g_object_unref (self->pl); 1386 g_object_unref (self->pl);
1209 rc_free (self->rc);
1210 Safefree (self); 1387 delete self;
1211 1388
1212void 1389void
1213set_text (DC::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1214 CODE: 1391 CODE:
1215{ 1392{
1341 1518
1342void 1519void
1343set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1344 CODE: 1521 CODE:
1345 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1346 { 1523 {
1347 self->base_height = base_height; 1524 self->base_height = base_height;
1348 layout_update_font (self); 1525 layout_update_font (self);
1349 } 1526 }
1350 1527
1351void 1528void
1469} 1646}
1470 1647
1471void 1648void
1472render (DC::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1473 CODE: 1650 CODE:
1474 rc_clear (self->rc); 1651 self->rc.clear ();
1475 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1476 self->pl, 1653 self->pl,
1477 self->rc, 1654 &self->rc,
1478 x * PANGO_SCALE, y * PANGO_SCALE, 1655 x * PANGO_SCALE, y * PANGO_SCALE,
1479 self->r, self->g, self->b, self->a, 1656 self->r, self->g, self->b, self->a,
1480 flags 1657 flags
1481 ); 1658 );
1482 // we assume that context_change actually clears/frees stuff 1659 // we assume that context_change actually clears/frees stuff
1493 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1670 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1494 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1671 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1495 glEnable (GL_ALPHA_TEST); 1672 glEnable (GL_ALPHA_TEST);
1496 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1673 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1497 1674
1498 rc_draw (self->rc); 1675 self->rc.draw ();
1499 1676
1500 glDisable (GL_ALPHA_TEST); 1677 glDisable (GL_ALPHA_TEST);
1501 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1502 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1503} 1680}
1578 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1579 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1580 } 1757 }
1581} 1758}
1582 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
1583IV 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)
1584 CODE: 1882 CODE:
1585{ 1883{
1586 GLint width; 1884 GLint width;
1587 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);
1594MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1595 1893
1596PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1597 1895
1598DC::Map 1896DC::Map
1599new (SV *class) 1897new (SV *klass)
1600 CODE: 1898 CODE:
1601 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, mapgrid);
1602 RETVAL->x = 0; 1900 RETVAL->x = 0;
1603 RETVAL->y = 0; 1901 RETVAL->y = 0;
1604 RETVAL->w = 0; 1902 RETVAL->w = 0;
1605 RETVAL->h = 0; 1903 RETVAL->h = 0;
1606 RETVAL->ox = 0; 1904 RETVAL->ox = 0;
1643 1941
1644void 1942void
1645set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1646 CODE: 1944 CODE:
1647{ 1945{
1648 tileid texid; 1946 tileid texid;
1649 maptex *tex; 1947 maptex *tex;
1650 1948
1651 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1652 return; 1950 return;
1653 1951
1654 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1655 return; 1953 return;
1656 1954
1657 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1658 1956
1659 if (!texid) 1957 if (!texid)
1660 return; 1958 return;
1661 1959
1662 tex = self->tex + texid; 1960 tex = self->tex + texid;
1691 //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);
1692 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1693 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1695} 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 }
1696 2014
1697int 2015int
1698ox (DC::Map self) 2016ox (DC::Map self)
1699 ALIAS: 2017 ALIAS:
1700 oy = 1 2018 oy = 1
1732 self->ox += dx; self->x += dx; 2050 self->ox += dx; self->x += dx;
1733 self->oy += dy; self->y += dy; 2051 self->oy += dy; self->y += dy;
1734 2052
1735 while (self->y < 0) 2053 while (self->y < 0)
1736 { 2054 {
1737 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2055 prepend (self->row, self->rows, MAP_EXTEND_Y);
1738 2056
1739 self->rows += MAP_EXTEND_Y; 2057 self->rows += MAP_EXTEND_Y;
1740 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1741 } 2059 }
1742} 2060}
1743 2061
1744SV * 2062SV *
1745map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1746 CODE: 2064 CODE:
1747{ 2065{
1748 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1749 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1750 mapcell *cell; 2068 mapcell *cell;
1771 2089
1772 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1773 2091
1774 if (flags & 8) 2092 if (flags & 8)
1775 { 2093 {
2094 uint8_t ext, cmd;
2095
1776 if (extmap) 2096 do
1777 { 2097 {
1778 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1779 2100
1780 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
1781 { 2104 {
1782 ext = *data++;
1783 cmd = ext & 0x7f;
1784
1785 if (cmd < 4)
1786 cell->darkness = 255 - ext * 64 + 1;
1787 else if (cmd == 5) // health
1788 {
1789 cell->stat_width = 1; 2105 cell->stat_width = 1;
1790 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1791 }
1792 else if (cmd == 6) // monster width
1793 cell->stat_width = *data++ + 1;
1794 else if (cmd == 0x47)
1795 {
1796 if (*data == 1) cell->player = data [1];
1797 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1798 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1799 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1800
1801 data += *data + 1;
1802 }
1803 else if (cmd == 8) // cell flags
1804 cell->flags = *data++;
1805 else if (ext & 0x40) // unknown, multibyte => skip
1806 data += *data + 1;
1807 else
1808 data++;
1809 } 2107 }
1810 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++;
1811 } 2125 }
1812 else 2126 while (ext & 0x80);
1813 cell->darkness = *data++ + 1;
1814 } 2127 }
1815 2128
1816 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1817 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1818 { 2131 {
1821 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1822 2135
1823 if (cell->tile [z]) 2136 if (cell->tile [z])
1824 { 2137 {
1825 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1826 if (!tex->name) 2140 if (!tex->name)
1827 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1828 2142
1829 if (tex->smoothtile) 2143 if (tex->smoothtile)
1830 { 2144 {
1831 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1832 if (!smooth->name) 2147 if (!smooth->name)
1833 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1834 } 2149 }
1835 } 2150 }
1836 } 2151 }
1864 ? self->row + y 2179 ? self->row + y
1865 : 0; 2180 : 0;
1866 2181
1867 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1868 { 2183 {
1869 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1870 2185
1871 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1872 { 2187 {
1873 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1874 2189
1876 { 2191 {
1877 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1878 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1879 int a1 = tex.a; 2194 int a1 = tex.a;
1880 2195
1881 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1882 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1883 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1884 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1885 } 2200 }
1886 } 2201 }
1887 2202
1888 *map++ = (r ) 2203 *map++ = (r )
1889 | (g << 8) 2204 | (g << 8)
1890 | (b << 16) 2205 | (b << 16)
1891 | (a << 24); 2206 | (a << 24);
1892 } 2207 }
1893 } 2208 }
1894 2209
1895 RETVAL = map_sv; 2210 RETVAL = map_sv;
1896} 2211}
1897 OUTPUT: 2212 OUTPUT:
1898 RETVAL 2213 RETVAL
1899 2214
1900void 2215void
1901draw (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)
1902 CODE: 2217 CODE:
1903{ 2218{
1904 int x, y, z; 2219 int x, y, z;
1905 2220
1906 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1907 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1908 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!
1909 smooth_key skey;
1910 int pl_x, pl_y; 2222 int pl_x, pl_y;
1911 maptex pl_tex; 2223 maptex pl_tex;
1912 rc_t *rc = rc_alloc (); 2224 rc_t rc;
2225 rc_t rc_ov;
1913 rc_key_t key; 2226 rc_key_t key;
1914 rc_array_t *arr; 2227 rc_t::array_t *arr;
1915 2228
1916 pl_tex.name = 0; 2229 pl_tex.name = 0;
1917 2230
1918 // thats current max. sorry. 2231 // that's current max. sorry.
1919 if (sw > 255) sw = 255; 2232 if (sw > 255) sw = 255;
1920 if (sh > 255) sh = 255; 2233 if (sh > 255) sh = 255;
1921
1922 // clear key, in case of extra padding
1923 memset (&skey, 0, sizeof (skey));
1924 2234
1925 memset (&key, 0, sizeof (key)); 2235 memset (&key, 0, sizeof (key));
1926 key.r = 255; 2236 key.r = 255;
1927 key.g = 255; 2237 key.g = 255;
1928 key.b = 255; 2238 key.b = 255;
1929 key.a = 255; 2239 key.a = 255;
1930 key.mode = GL_QUADS; 2240 key.mode = GL_QUADS;
1931 key.format = GL_T2F_V3F; 2241 key.format = GL_T2F_V3F;
1932 key.texname = -1;
1933 2242
1934 mx += self->x; 2243 mx += self->x;
1935 my += self->y; 2244 my += self->y;
1936 2245
1937 // first pass: determine smooth_max 2246 // first pass: determine smooth_max
1938 // rather ugly, if you ask me 2247 // rather ugly, if you ask me
1939 // could also be stored inside mapcell and updated on change 2248 // could also be stored inside mapcell and updated on change
1940 memset (smooth_max, 0, sizeof (smooth_max)); 2249 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1941 2250
1942 for (y = 0; y < sh; y++) 2251 for (y = 0; y < sh; y++)
1943 if (0 <= y + my && y + my < self->rows) 2252 if (0 <= y + my && y + my < self->rows)
1944 { 2253 {
1945 maprow *row = self->row + (y + my); 2254 maprow *row = self->row + (y + my);
1960 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2269 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1961 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2270 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1962 2271
1963 for (z = 0; z <= 2; z++) 2272 for (z = 0; z <= 2; z++)
1964 { 2273 {
1965 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;
1966 2278
1967 for (y = 0; y < sh; y++) 2279 for (y = 0; y < sh; y++)
1968 if (0 <= y + my && y + my < self->rows) 2280 if (0 <= y + my && y + my < self->rows)
1969 { 2281 {
1970 maprow *row = self->row + (y + my); 2282 maprow *row = self->row + (y + my);
1976 tileid tile = cell->tile [z]; 2288 tileid tile = cell->tile [z];
1977 2289
1978 if (tile) 2290 if (tile)
1979 { 2291 {
1980 maptex tex = self->tex [tile]; 2292 maptex tex = self->tex [tile];
1981 int px = (x + 1) * T - tex.w; 2293 int px, py;
1982 int py = (y + 1) * T - tex.h;
1983 2294
1984 if (key.texname != tex.name) 2295 if (key.texname != tex.name)
1985 { 2296 {
2297 self->tex [tile].unused = 0;
2298
1986 if (!tex.name) 2299 if (!tex.name)
1987 tex = self->tex [2]; /* missing, replace by noface */ 2300 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1988 2301
1989 key.texname = tex.name; 2302 key.texname = tex.name;
1990 arr = rc_array (rc, &key); 2303 arr = &rc.array (key);
1991 } 2304 }
1992 2305
2306 px = (x + 1) * Th - tex.w;
2307 py = (y + 1) * Tw - tex.h;
2308
1993 if (expect_false (cell->player == player) && expect_false (z == 2)) 2309 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1994 { 2310 {
1995 pl_x = px; 2311 pl_x = px;
1996 pl_y = py; 2312 pl_y = py;
1997 pl_tex = tex; 2313 pl_tex = tex;
1998 continue; 2314 continue;
1999 } 2315 }
2000 2316
2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2317 arr->t2f_v3f (0 , 0 , px , py , 0);
2002 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2318 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2003 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);
2004 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2320 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2005
2006 if (expect_false (cell->flags) && expect_false (z == 2))
2007 {
2008 // overlays such as the speech bubble, probably more to come
2009 if (cell->flags & 1)
2010 {
2011 maptex tex = self->tex [1];
2012 int px = x * T + T * 2 / 32;
2013 int py = y * T - T * 6 / 32;
2014
2015 if (tex.name)
2016 {
2017 if (key.texname != tex.name)
2018 {
2019 key.texname = tex.name;
2020 arr = rc_array (rc, &key);
2021 }
2022
2023 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2024 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2025 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2027 }
2028 }
2029 }
2030 2321
2031 // update smooth hash 2322 // update smooth hash
2032 if (tex.smoothtile) 2323 if (tex.smoothtile)
2033 { 2324 {
2034 skey.tile = tex.smoothtile; 2325 skey.tile = tex.smoothtile;
2035 skey.level = tex.smoothlevel; 2326 skey.level = tex.smoothlevel;
2036 2327
2037 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2328 smooth_level[tex.smoothlevel] = 1;
2038 2329
2039 // 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
2040 // shifted +1|+1 so we always stay positive. 2331 // shifted +1|+1 so we always stay positive.
2041 2332
2042 // bits is ___n cccc CCCC bbbb 2333 // bits is ___n cccc CCCC bbbb
2050 2341
2051 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2342 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2052 // ·· ·· ·┏ ┓· 2343 // ·· ·· ·┏ ┓·
2053 2344
2054 // full tile 2345 // full tile
2055 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);
2056 2347
2057 // borders 2348 // borders
2058 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);
2059 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);
2060 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);
2061 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);
2062 2353
2063 // corners 2354 // corners
2064 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);
2065 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);
2066 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);
2067 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);
2068 } 2379 }
2069 } 2380 }
2070 } 2381 }
2071 } 2382 }
2072 2383
2073 rc_draw (rc); 2384 rc.draw ();
2074 rc_clear (rc); 2385 rc.clear ();
2075 2386
2076 // go through all smoothlevels, lowest to highest, then draw. 2387 // go through all smoothlevels, lowest to highest, then draw.
2077 // this is basically counting sort 2388 // this is basically counting sort
2078 { 2389 {
2079 int w, b; 2390 int w, b;
2080 2391
2081 glEnable (GL_TEXTURE_2D); 2392 glEnable (GL_TEXTURE_2D);
2082 glBegin (GL_QUADS); 2393 glBegin (GL_QUADS);
2083 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)
2084 { 2397 {
2085 uint32_t smask = smooth_level [w]; 2398 smooth_key &skey = it->first;
2086 if (smask) 2399 IV bits = it->second;
2087 for (b = 0; b < 32; ++b) 2400
2088 if (smask & (((uint32_t)1) << b)) 2401 if (!(bits & 0x1000)
2402 && skey.level == level
2403 && level > smooth_max [skey.x][skey.y])
2089 { 2404 {
2090 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
2091 HE *he; 2413 if (tex.name)
2092
2093 hv_iterinit (smooth);
2094 while ((he = hv_iternext (smooth)))
2095 { 2414 {
2096 smooth_key *skey = (smooth_key *)HeKEY (he); 2415 // this time avoiding texture state changes
2097 IV bits = SvIVX (HeVAL (he)); 2416 // save gobs of state changes.
2098 2417 if (key.texname != tex.name)
2099 if (!(bits & 0x1000)
2100 && skey->level == level
2101 && level > smooth_max [skey->x][skey->y])
2102 { 2418 {
2103 maptex tex = self->tex [skey->tile]; 2419 self->tex [skey.tile].unused = 0;
2104 int px = (((int)skey->x) - 1) * T;
2105 int py = (((int)skey->y) - 1) * T;
2106 int border = bits & 15;
2107 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2108 float dx = tex.s * .0625f; // 16 images/row
2109 float dy = tex.t * .5f ; // 2 images/column
2110 2420
2111 if (tex.name)
2112 {
2113 // this time avoiding texture state changes
2114 // save gobs of state changes.
2115 if (key.texname != tex.name)
2116 {
2117 glEnd (); 2421 glEnd ();
2118 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2422 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2119 glBegin (GL_QUADS); 2423 glBegin (GL_QUADS);
2120 } 2424 }
2121 2425
2122 if (border) 2426 if (border)
2123 { 2427 {
2124 float ox = border * dx; 2428 float ox = border * dx;
2125 2429
2126 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2127 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2128 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2129 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2130 } 2434 }
2131 2435
2132 if (corner) 2436 if (corner)
2133 { 2437 {
2134 float ox = corner * dx; 2438 float ox = corner * dx;
2135 2439
2136 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2137 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2441 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2138 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2442 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2139 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2443 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2140 }
2141 }
2142 } 2444 }
2143 } 2445 }
2144 } 2446 }
2145 } 2447 }
2146 2448
2147 glEnd (); 2449 glEnd ();
2148 glDisable (GL_TEXTURE_2D); 2450 glDisable (GL_TEXTURE_2D);
2149 key.texname = -1; 2451 key.texname = -1;
2150 } 2452 }
2151
2152 hv_clear (smooth);
2153 } 2453 }
2154 2454
2155 if (pl_tex.name) 2455 if (pl_tex.name)
2156 { 2456 {
2157 maptex tex = pl_tex; 2457 maptex tex = pl_tex;
2158 int px = pl_x + sdx; 2458 int px = pl_x + sdx;
2159 int py = pl_y + sdy; 2459 int py = pl_y + sdy;
2160 2460
2161 key.texname = tex.name; 2461 key.texname = tex.name;
2162 arr = rc_array (rc, &key); 2462 rc_t::array_t &arr = rc.array (key);
2163 2463
2164 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2464 arr.t2f_v3f (0 , 0 , px , py , 0);
2165 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2465 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2166 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);
2167 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2467 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2168 2468
2169 rc_draw (rc); 2469 rc.draw ();
2170 } 2470 }
2171 2471
2472 rc_ov.draw ();
2473 rc_ov.clear ();
2474
2172 glDisable (GL_BLEND); 2475 glDisable (GL_BLEND);
2173 rc_free (rc);
2174 2476
2175 // top layer: overlays such as the health bar 2477 // top layer: overlays such as the health bar
2176 for (y = 0; y < sh; y++) 2478 for (y = 0; y < sh; y++)
2177 if (0 <= y + my && y + my < self->rows) 2479 if (0 <= y + my && y + my < self->rows)
2178 { 2480 {
2181 for (x = 0; x < sw; x++) 2483 for (x = 0; x < sw; x++)
2182 if (row->c0 <= x + mx && x + mx < row->c1) 2484 if (row->c0 <= x + mx && x + mx < row->c1)
2183 { 2485 {
2184 mapcell *cell = row->col + (x + mx - row->c0); 2486 mapcell *cell = row->col + (x + mx - row->c0);
2185 2487
2186 int px = x * T; 2488 int px = x * Tw;
2187 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 }
2188 2496
2189 if (cell->stat_hp) 2497 if (cell->stat_hp)
2190 { 2498 {
2191 int width = cell->stat_width * T; 2499 int width = cell->stat_width * Tw;
2192 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2500 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2193 2501
2194 glColor3ub (0, 0, 0); 2502 glColor3ub (0, 0, 0);
2195 glRectf (px + 1, py - thick - 2, 2503 glRectf (px + 1, py - thick - 2,
2196 px + width - 1, py); 2504 px + width - 1, py);
2197 2505
2203 } 2511 }
2204 } 2512 }
2205} 2513}
2206 2514
2207void 2515void
2208draw_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)
2209 CODE: 2517 CODE:
2210{ 2518{
2211 static float color[16][3] = { 2519 static float color[16][3] = {
2212 { 0.00F, 0.00F, 0.00F }, 2520 { 0.00f, 0.00f, 0.00f },
2213 { 1.00F, 1.00F, 1.00F }, 2521 { 1.00f, 1.00f, 1.00f },
2214 { 0.00F, 0.00F, 0.55F }, 2522 { 0.00f, 0.00f, 0.55f },
2215 { 1.00F, 0.00F, 0.00F }, 2523 { 1.00f, 0.00f, 0.00f },
2216 2524
2217 { 1.00F, 0.54F, 0.00F }, 2525 { 1.00f, 0.54f, 0.00f },
2218 { 0.11F, 0.56F, 1.00F }, 2526 { 0.11f, 0.56f, 1.00f },
2219 { 0.93F, 0.46F, 0.00F }, 2527 { 0.93f, 0.46f, 0.00f },
2220 { 0.18F, 0.54F, 0.34F }, 2528 { 0.18f, 0.54f, 0.34f },
2221 2529
2222 { 0.56F, 0.73F, 0.56F }, 2530 { 0.56f, 0.73f, 0.56f },
2223 { 0.80F, 0.80F, 0.80F }, 2531 { 0.80f, 0.80f, 0.80f },
2224 { 0.55F, 0.41F, 0.13F }, 2532 { 0.55f, 0.41f, 0.13f },
2225 { 0.99F, 0.77F, 0.26F }, 2533 { 0.99f, 0.77f, 0.26f },
2226 2534
2227 { 0.74F, 0.65F, 0.41F }, 2535 { 0.74f, 0.65f, 0.41f },
2228 2536
2229 { 0.00F, 1.00F, 1.00F }, 2537 { 0.00f, 1.00f, 1.00f },
2230 { 1.00F, 0.00F, 1.00F }, 2538 { 1.00f, 0.00f, 1.00f },
2231 { 1.00F, 1.00F, 0.00F }, 2539 { 1.00f, 1.00f, 0.00f },
2232 }; 2540 };
2233 2541
2234 int x, y; 2542 int x, y;
2235 2543
2236 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 */
2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2551 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2238 glEnable (GL_BLEND); 2552 glEnable (GL_BLEND);
2239 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2553 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2240 glBegin (GL_QUADS); 2554 glBegin (GL_QUADS);
2241 2555
2242 for (y = 0; y < h; y++) 2556 for (y = 0; y < h; y++)
2246 2560
2247 if (m) 2561 if (m)
2248 { 2562 {
2249 float *c = color [m & 15]; 2563 float *c = color [m & 15];
2250 2564
2251 float tx1 = m & 0x40 ? 0.5 : 0.; 2565 float tx1 = m & 0x40 ? 0.5f : 0.f;
2252 float tx2 = tx1 + 0.5; 2566 float tx2 = tx1 + 0.5f;
2253 2567
2254 glColor4f (c[0], c[1], c[2], 0.75); 2568 glColor4f (c[0], c[1], c[2], 1);
2255 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2569 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2256 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2570 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2257 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2571 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2258 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2572 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2259 } 2573 }
2267void 2581void
2268fow_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)
2269 PPCODE: 2583 PPCODE:
2270{ 2584{
2271 int x, y; 2585 int x, y;
2272 int sw1 = sw + 2; 2586 int sw1 = sw + 2;
2273 int sh1 = sh + 2; 2587 int sh1 = sh + 2;
2274 int sh3 = sh * 3; 2588 int sh3 = sh * 3;
2275 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);
2276 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2592 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2277 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2593 memset (darkness1, 0, sw1*sh1);
2278 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2279 2594
2280 SvPOK_only (darkness3_sv); 2595 SvPOK_only (darkness3_sv);
2281 SvCUR_set (darkness3_sv, sw34 * sh3); 2596 SvCUR_set (darkness3_sv, sw3 * sh3);
2282 2597
2283 mx += self->x - 1; 2598 mx += self->x - 1;
2284 my += self->y - 1; 2599 my += self->y - 1;
2285
2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2287 2600
2288 for (y = 0; y < sh1; y++) 2601 for (y = 0; y < sh1; y++)
2289 if (0 <= y + my && y + my < self->rows) 2602 if (0 <= y + my && y + my < self->rows)
2290 { 2603 {
2291 maprow *row = self->row + (y + my); 2604 maprow *row = self->row + (y + my);
2294 if (row->c0 <= x + mx && x + mx < row->c1) 2607 if (row->c0 <= x + mx && x + mx < row->c1)
2295 { 2608 {
2296 mapcell *cell = row->col + (x + mx - row->c0); 2609 mapcell *cell = row->col + (x + mx - row->c0);
2297 2610
2298 darkness1 [y * sw1 + x] = cell->darkness 2611 darkness1 [y * sw1 + x] = cell->darkness
2299 ? 255 - (cell->darkness - 1) 2612 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2300 : 255 - FOW_DARKNESS; 2613 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2301 } 2614 }
2302 } 2615 }
2303 2616
2304 for (y = 0; y < sh; ++y) 2617 for (y = 0; y < sh; ++y)
2305 for (x = 0; x < sw; ++x) 2618 for (x = 0; x < sw; ++x)
2324 2637
2325 uint8_t r13 = (d13 + d23 + d12) / 3; 2638 uint8_t r13 = (d13 + d23 + d12) / 3;
2326 uint8_t r23 = d23; 2639 uint8_t r23 = d23;
2327 uint8_t r33 = (d23 + d33 + d32) / 3; 2640 uint8_t r33 = (d23 + d33 + d32) / 3;
2328 2641
2329 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2330 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2331 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2332 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2645 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2333 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 */
2334 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2335 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2336 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2337 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2338 } 2651 }
2339 2652
2340 free (darkness1); 2653 free (darkness1);
2341 2654
2342 EXTEND (SP, 3); 2655 EXTEND (SP, 3);
2343 PUSHs (sv_2mortal (newSViv (sw34))); 2656 PUSHs (sv_2mortal (newSViv (sw3)));
2344 PUSHs (sv_2mortal (newSViv (sh3))); 2657 PUSHs (sv_2mortal (newSViv (sh3)));
2345 PUSHs (darkness3_sv); 2658 PUSHs (darkness3_sv);
2346} 2659}
2347 2660
2348SV * 2661SV *
2411 else 2724 else
2412 *data++ = 0; 2725 *data++ = 0;
2413 } 2726 }
2414 } 2727 }
2415 2728
2416 /* 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 */
2417 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2730 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2418 { 2731 {
2419 SvPOK_only (data_sv); 2732 SvPOK_only (data_sv);
2420 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2733 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2421 } 2734 }
2422 2735
2423 RETVAL = data_sv; 2736 RETVAL = data_sv;
2424} 2737}
2425 OUTPUT: 2738 OUTPUT:
2426 RETVAL 2739 RETVAL
2427 2740
2428void 2741void
2435 STRLEN len; 2748 STRLEN len;
2436 uint8_t *data, *end; 2749 uint8_t *data, *end;
2437 2750
2438 len = SvLEN (data_sv); 2751 len = SvLEN (data_sv);
2439 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2752 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2440 data = SvPVbyte_nolen (data_sv); 2753 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2441 end = data + len + 8; 2754 end = data + len + 8;
2442 2755
2443 if (len < 5) 2756 if (len < 5)
2444 XSRETURN_EMPTY; 2757 XSRETURN_EMPTY;
2445 2758
2506} 2819}
2507 2820
2508MODULE = Deliantra::Client PACKAGE = DC::RW 2821MODULE = Deliantra::Client PACKAGE = DC::RW
2509 2822
2510DC::RW 2823DC::RW
2511new (SV *class, SV *data_sv) 2824new (SV *klass, SV *data_sv)
2512 CODE: 2825 CODE:
2513{ 2826{
2514 STRLEN datalen; 2827 STRLEN datalen;
2515 char *data = SvPVbyte (data_sv, datalen); 2828 char *data = SvPVbyte (data_sv, datalen);
2516 2829
2518} 2831}
2519 OUTPUT: 2832 OUTPUT:
2520 RETVAL 2833 RETVAL
2521 2834
2522DC::RW 2835DC::RW
2523new_from_file (SV *class, const char *path, const char *mode = "rb") 2836new_from_file (SV *klass, const char *path, const char *mode = "rb")
2524 CODE: 2837 CODE:
2525 RETVAL = SDL_RWFromFile (path, mode); 2838 RETVAL = SDL_RWFromFile (path, mode);
2526 OUTPUT: 2839 OUTPUT:
2527 RETVAL 2840 RETVAL
2528 2841
2546 if (RETVAL < 0) 2859 if (RETVAL < 0)
2547 { 2860 {
2548 RETVAL = Mix_GroupOldest (-1); 2861 RETVAL = Mix_GroupOldest (-1);
2549 2862
2550 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)
2551 XSRETURN_UNDEF; 2869 XSRETURN_UNDEF;
2552 2870 }
2871 else
2553 Mix_HaltChannel (RETVAL); 2872 Mix_HaltChannel (RETVAL);
2554 } 2873 }
2555 2874
2556 Mix_UnregisterAllEffects (RETVAL); 2875 Mix_UnregisterAllEffects (RETVAL);
2557 Mix_Volume (RETVAL, 128); 2876 Mix_Volume (RETVAL, 128);
2558} 2877}
2605void 2924void
2606set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2925set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2607 CODE: 2926 CODE:
2608{ 2927{
2609 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));
2610 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;
2611 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2930 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2612} 2931}
2613 2932
2614void 2933void
2615set_reverse_stereo (DC::Channel self, int flip) 2934set_reverse_stereo (DC::Channel self, int flip)
2618 2937
2619MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2938MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2620 2939
2621PROTOTYPES: DISABLE 2940PROTOTYPES: DISABLE
2622 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
2623DC::MixChunk 2954DC::MixChunk
2624new (SV *class, DC::RW rwops) 2955new (SV *klass, DC::RW rwops)
2625 CODE: 2956 CODE:
2626 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2957 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2627 OUTPUT: 2958 OUTPUT:
2628 RETVAL 2959 RETVAL
2629 2960
2659 OUTPUT: 2990 OUTPUT:
2660 RETVAL 2991 RETVAL
2661 2992
2662MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2993MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2663 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
2664int 3007int
2665volume (int volume = -1) 3008volume (int volume = -1)
2666 PROTOTYPE: ;$ 3009 PROTOTYPE: ;$
2667 CODE: 3010 CODE:
2668 if (items > 0) 3011 if (items > 0)
2679void 3022void
2680halt () 3023halt ()
2681 CODE: 3024 CODE:
2682 Mix_HaltMusic (); 3025 Mix_HaltMusic ();
2683 3026
3027int
3028playing ()
3029 CODE:
3030 RETVAL = Mix_PlayingMusic ();
3031 OUTPUT:
3032 RETVAL
3033
2684DC::MixMusic 3034DC::MixMusic
2685new (SV *class, DC::RW rwops) 3035new (SV *klass, DC::RW rwops)
2686 CODE: 3036 CODE:
2687 RETVAL = Mix_LoadMUS_RW (rwops); 3037 RETVAL = Mix_LoadMUS_RW (rwops);
2688 OUTPUT: 3038 OUTPUT:
2689 RETVAL 3039 RETVAL
2690 3040
2718 } *civ, const_iv[] = { 3068 } *civ, const_iv[] = {
2719# define const_iv(name) { # name, (IV)name } 3069# define const_iv(name) { # name, (IV)name }
2720 const_iv (GL_VENDOR), 3070 const_iv (GL_VENDOR),
2721 const_iv (GL_VERSION), 3071 const_iv (GL_VERSION),
2722 const_iv (GL_EXTENSIONS), 3072 const_iv (GL_EXTENSIONS),
3073 const_iv (GL_MAX_TEXTURE_UNITS),
2723 const_iv (GL_COLOR_MATERIAL), 3074 const_iv (GL_COLOR_MATERIAL),
2724 const_iv (GL_SMOOTH), 3075 const_iv (GL_SMOOTH),
2725 const_iv (GL_FLAT), 3076 const_iv (GL_FLAT),
2726 const_iv (GL_DITHER), 3077 const_iv (GL_DITHER),
2727 const_iv (GL_BLEND), 3078 const_iv (GL_BLEND),
2739 const_iv (GL_ZERO), 3090 const_iv (GL_ZERO),
2740 const_iv (GL_SRC_ALPHA), 3091 const_iv (GL_SRC_ALPHA),
2741 const_iv (GL_DST_ALPHA), 3092 const_iv (GL_DST_ALPHA),
2742 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3093 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2743 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),
2744 const_iv (GL_SRC_ALPHA_SATURATE), 3099 const_iv (GL_SRC_ALPHA_SATURATE),
2745 const_iv (GL_RGB), 3100 const_iv (GL_RGB),
2746 const_iv (GL_RGBA), 3101 const_iv (GL_RGBA),
2747 const_iv (GL_RGBA4), 3102 const_iv (GL_RGBA4),
2748 const_iv (GL_RGBA8), 3103 const_iv (GL_RGBA8),
2816 const_iv (GL_NICEST), 3171 const_iv (GL_NICEST),
2817 const_iv (GL_V2F), 3172 const_iv (GL_V2F),
2818 const_iv (GL_V3F), 3173 const_iv (GL_V3F),
2819 const_iv (GL_T2F_V3F), 3174 const_iv (GL_T2F_V3F),
2820 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),
2821# undef const_iv 3179# undef const_iv
2822 }; 3180 };
2823 3181
2824 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--)
2825 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3183 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2826 3184
2827 texture_av = newAV (); 3185 texture_av = newAV ();
2828 AvREAL_off (texture_av); 3186 AvREAL_off (texture_av);
2829} 3187}
2830 3188
2832disable_GL_EXT_blend_func_separate () 3190disable_GL_EXT_blend_func_separate ()
2833 CODE: 3191 CODE:
2834 gl.BlendFuncSeparate = 0; 3192 gl.BlendFuncSeparate = 0;
2835 gl.BlendFuncSeparateEXT = 0; 3193 gl.BlendFuncSeparateEXT = 0;
2836 3194
2837char * 3195void
3196apple_nvidia_bug (int enable)
3197
3198const char *
2838gl_vendor () 3199gl_vendor ()
2839 CODE: 3200 CODE:
2840 RETVAL = (char *)glGetString (GL_VENDOR); 3201 RETVAL = (const char *)glGetString (GL_VENDOR);
2841 OUTPUT: 3202 OUTPUT:
2842 RETVAL 3203 RETVAL
2843 3204
2844char * 3205const char *
2845gl_version () 3206gl_version ()
2846 CODE: 3207 CODE:
2847 RETVAL = (char *)glGetString (GL_VERSION); 3208 RETVAL = (const char *)glGetString (GL_VERSION);
2848 OUTPUT: 3209 OUTPUT:
2849 RETVAL 3210 RETVAL
2850 3211
2851char * 3212const char *
2852gl_extensions () 3213gl_extensions ()
2853 CODE: 3214 CODE:
2854 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3215 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2855 OUTPUT: 3216 OUTPUT:
2856 RETVAL 3217 RETVAL
2857 3218
2858const char *glGetString (GLenum pname) 3219const char *glGetString (GLenum pname)
3220 CODE:
3221 RETVAL = (const char *)glGetString (pname);
3222 OUTPUT:
3223 RETVAL
2859 3224
2860GLint glGetInteger (GLenum pname) 3225GLint glGetInteger (GLenum pname)
2861 CODE: 3226 CODE:
2862 glGetIntegerv (pname, &RETVAL); 3227 glGetIntegerv (pname, &RETVAL);
2863 OUTPUT: 3228 OUTPUT:
2871 3236
2872int glGetError () 3237int glGetError ()
2873 3238
2874void glFinish () 3239void glFinish ()
2875 3240
3241void glFlush ()
3242
2876void glClear (int mask) 3243void glClear (int mask)
2877 3244
2878void glClearColor (float r, float g, float b, float a = 1.0) 3245void glClearColor (float r, float g, float b, float a = 1.0)
2879 PROTOTYPE: @ 3246 PROTOTYPE: @
2880 3247
2889void glBlendFunc (int sfactor, int dfactor) 3256void glBlendFunc (int sfactor, int dfactor)
2890 3257
2891void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3258void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2892 CODE: 3259 CODE:
2893 gl_BlendFuncSeparate (sa, da, saa, daa); 3260 gl_BlendFuncSeparate (sa, da, saa, daa);
3261
3262# void glBlendEquation (int se)
2894 3263
2895void glDepthMask (int flag) 3264void glDepthMask (int flag)
2896 3265
2897void glLogicOp (int opcode) 3266void glLogicOp (int opcode)
2898 3267
2933void glRotate (float angle, float x, float y, float z) 3302void glRotate (float angle, float x, float y, float z)
2934 CODE: 3303 CODE:
2935 glRotatef (angle, x, y, z); 3304 glRotatef (angle, x, y, z);
2936 3305
2937void 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: @
2938 ALIAS: 3308 ALIAS:
2939 glColor_premultiply = 1 3309 glColor_premultiply = 1
2940 CODE: 3310 CODE:
2941 if (ix) 3311 if (ix)
2942 { 3312 {
3048 3418
3049void glEndList () 3419void glEndList ()
3050 3420
3051void glCallList (int list) 3421void glCallList (int list)
3052 3422
3423void c_init ()
3424 CODE:
3425 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3426 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3427
3053MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3428MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3054 3429
3055PROTOTYPES: DISABLE 3430PROTOTYPES: DISABLE
3056 3431
3057void 3432void
3058find_widget (SV *self, NV x, NV y) 3433find_widget (SV *self, NV x, NV y)
3059 PPCODE: 3434 PPCODE:
3060{ 3435{
3061 if (within_widget (self, x, y)) 3436 if (within_widget (self, x, y))
3062 XPUSHs (self); 3437 XPUSHs (self);
3063} 3438}
3064 3439
3065BOOT: 3440BOOT:
3066{ 3441{
3074 3449
3075void 3450void
3076draw (SV *self) 3451draw (SV *self)
3077 CODE: 3452 CODE:
3078{ 3453{
3079 HV *hv; 3454 HV *hv;
3080 SV **svp; 3455 SV **svp;
3081 NV x, y, w, h; 3456 NV x, y, w, h;
3082 SV *draw_x_sv = GvSV (draw_x_gv); 3457 SV *draw_x_sv = GvSV (draw_x_gv);
3083 SV *draw_y_sv = GvSV (draw_y_gv); 3458 SV *draw_y_sv = GvSV (draw_y_gv);
3084 SV *draw_w_sv = GvSV (draw_w_gv); 3459 SV *draw_w_sv = GvSV (draw_w_gv);
3085 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