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.331 by root, Mon Nov 19 00:10:34 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines