ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines