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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.268 by root, Sun Jul 20 02:57:43 2008 UTC vs.
Revision 1.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),
671 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 834 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
672 const_iv (SDL_GL_STEREO), 835 const_iv (SDL_GL_STEREO),
673 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 836 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
674 const_iv (SDL_GL_MULTISAMPLESAMPLES), 837 const_iv (SDL_GL_MULTISAMPLESAMPLES),
675 const_iv (SDL_GL_ACCELERATED_VISUAL), 838 const_iv (SDL_GL_ACCELERATED_VISUAL),
676 const_iv (SDL_GL_SWAP_CONTROL) 839 const_iv (SDL_GL_SWAP_CONTROL),
840
841 const_iv (FOW_DARKNESS)
677# undef const_iv 842# undef const_iv
678 }; 843 };
679 844
680 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--)
681 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
682 847
683 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
684 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
685} 850}
686 851
702NV ceil (NV x) 867NV ceil (NV x)
703 868
704IV minpot (UV n) 869IV minpot (UV n)
705 870
706IV popcount (UV n) 871IV popcount (UV n)
872 CODE:
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);
880 OUTPUT:
881 RETVAL
707 882
708void 883void
709pango_init () 884pango_init ()
710 CODE: 885 CODE:
711{ 886{
719#endif 894#endif
720} 895}
721 896
722char *SDL_GetError () 897char *SDL_GetError ()
723 898
899void SDL_main_hack (SV *real_main)
900 PROTOTYPE: &
901
724int SDL_Init (U32 flags) 902int SDL_Init (U32 flags)
725 903
726int SDL_InitSubSystem (U32 flags) 904int SDL_InitSubSystem (U32 flags)
727 905
728void SDL_QuitSubSystem (U32 flags) 906void SDL_QuitSubSystem (U32 flags)
729 907
730void SDL_Quit () 908void SDL_Quit ()
731 909
732int SDL_GL_SetAttribute (int attr, int value) 910int SDL_GL_SetAttribute (int attr, int value)
911 C_ARGS: (SDL_GLattr)attr, value
733 912
734int SDL_GL_GetAttribute (int attr) 913int SDL_GL_GetAttribute (int attr)
735 CODE: 914 CODE:
736 if (SDL_GL_GetAttribute (attr, &RETVAL)) 915 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
737 XSRETURN_UNDEF; 916 XSRETURN_UNDEF;
738 OUTPUT: 917 OUTPUT:
739 RETVAL 918 RETVAL
740 919
741void 920void
796 ); 975 );
797 976
798 if (RETVAL) 977 if (RETVAL)
799 { 978 {
800 av_clear (texture_av); 979 av_clear (texture_av);
801
802 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
803#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 980#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
804#include "glfunc.h" 981#include "glfunc.h"
805#undef GL_FUNC 982#undef GL_FUNC
983 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
984 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
806 } 985 }
807} 986}
808 OUTPUT: 987 OUTPUT:
809 RETVAL 988 RETVAL
989
990void
991SDL_WM_SetCaption (const char *title, const char *icon)
810 992
811void 993void
812SDL_GL_SwapBuffers () 994SDL_GL_SwapBuffers ()
813 995
814char * 996char *
815SDL_GetKeyName (int sym) 997SDL_GetKeyName (int sym)
998 C_ARGS: (SDLKey)sym
816 999
817int 1000int
818SDL_GetAppState () 1001SDL_GetAppState ()
819 1002
820int 1003int
821SDL_GetModState () 1004SDL_GetModState ()
822 1005
1006int
1007SDL_WaitEvent ()
1008 C_ARGS: 0
1009
823void 1010void
1011SDL_PumpEvents ()
1012
1013void
824poll_events () 1014peep_events ()
825 PPCODE: 1015 PPCODE:
826{ 1016{
827 SDL_Event ev; 1017 SDL_Event ev;
828 1018
829 SDL_PumpEvents (); 1019 SDL_PumpEvents ();
836 { 1026 {
837 case SDL_KEYDOWN: 1027 case SDL_KEYDOWN:
838 case SDL_KEYUP: 1028 case SDL_KEYUP:
839 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1029 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
840 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1030 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
841 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1031 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
842 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1032 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
843 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1033 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
844 break; 1034 break;
845 1035
846 case SDL_ACTIVEEVENT: 1036 case SDL_ACTIVEEVENT:
847 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1037 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
865 x = ev.motion.x; 1055 x = ev.motion.x;
866 y = ev.motion.y; 1056 y = ev.motion.y;
867 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1057 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
868 } 1058 }
869 1059
870 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1060 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
871 hv_store (hv, "state", 5, newSViv (state), 0); 1061 hv_store (hv, "state", 5, newSViv (state), 0);
872 hv_store (hv, "x", 1, newSViv (x), 0); 1062 hv_store (hv, "x", 1, newSViv (x), 0);
873 hv_store (hv, "y", 1, newSViv (y), 0); 1063 hv_store (hv, "y", 1, newSViv (y), 0);
874 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1064 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
875 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1065 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
895 1085
896 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))));
897 } 1087 }
898} 1088}
899 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
900int 1103int
901Mix_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)
902 POSTCALL: 1105 POSTCALL:
903 Mix_HookMusicFinished (music_finished); 1106 Mix_HookMusicFinished (music_finished);
904 Mix_ChannelFinished (channel_finished); 1107 Mix_ChannelFinished (channel_finished);
905 1108
906void 1109void
907Mix_QuerySpec () 1110Mix_QuerySpec ()
966add_font (char *file) 1169add_font (char *file)
967 CODE: 1170 CODE:
968 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1171 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
969 OUTPUT: 1172 OUTPUT:
970 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)
971 1181
972void 1182void
973load_image_inline (SV *image_) 1183load_image_inline (SV *image_)
974 ALIAS: 1184 ALIAS:
975 load_image_file = 1 1185 load_image_file = 1
1021 1231
1022 SDL_LockSurface (surface2); 1232 SDL_LockSurface (surface2);
1023 EXTEND (SP, 6); 1233 EXTEND (SP, 6);
1024 PUSHs (sv_2mortal (newSViv (surface2->w))); 1234 PUSHs (sv_2mortal (newSViv (surface2->w)));
1025 PUSHs (sv_2mortal (newSViv (surface2->h))); 1235 PUSHs (sv_2mortal (newSViv (surface2->h)));
1026 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1236 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1027 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1237 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1028 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1238 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1029 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1239 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1030 SDL_UnlockSurface (surface2); 1240 SDL_UnlockSurface (surface2);
1031 1241
1091#if DEBUG 1301#if DEBUG
1092 VALGRIND_DO_LEAK_CHECK; 1302 VALGRIND_DO_LEAK_CHECK;
1093#endif 1303#endif
1094} 1304}
1095 1305
1306int
1307SvREFCNT (SV *sv)
1308 CODE:
1309 RETVAL = SvREFCNT (sv);
1310 OUTPUT:
1311 RETVAL
1312
1096MODULE = Deliantra::Client PACKAGE = DC::Font 1313MODULE = Deliantra::Client PACKAGE = DC::Font
1097 1314
1098PROTOTYPES: DISABLE 1315PROTOTYPES: DISABLE
1099 1316
1100DC::Font 1317DC::Font
1101new_from_file (SV *class, char *path, int id = 0) 1318new_from_file (SV *klass, char *path, int id = 0)
1102 CODE: 1319 CODE:
1103{ 1320{
1104 int count; 1321 int count;
1105 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1322 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1106 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1323 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1135 PROTOTYPE: 1352 PROTOTYPE:
1136 CODE: 1353 CODE:
1137 tc_restore (); 1354 tc_restore ();
1138 1355
1139DC::Layout 1356DC::Layout
1140new (SV *class) 1357new (SV *klass)
1141 CODE: 1358 CODE:
1142 New (0, RETVAL, 1, struct cf_layout); 1359 RETVAL = new cf_layout;
1143 1360
1144 RETVAL->pl = pango_layout_new (opengl_context); 1361 RETVAL->pl = pango_layout_new (opengl_context);
1145 RETVAL->r = 1.; 1362 RETVAL->r = 1.;
1146 RETVAL->g = 1.; 1363 RETVAL->g = 1.;
1147 RETVAL->b = 1.; 1364 RETVAL->b = 1.;
1148 RETVAL->a = 1.; 1365 RETVAL->a = 1.;
1149 RETVAL->base_height = MIN_FONT_HEIGHT; 1366 RETVAL->base_height = MIN_FONT_HEIGHT;
1150 RETVAL->font = 0; 1367 RETVAL->font = 0;
1151 RETVAL->rc = rc_alloc ();
1152 1368
1153 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1369 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1154 layout_update_font (RETVAL); 1370 layout_update_font (RETVAL);
1155 OUTPUT: 1371 OUTPUT:
1156 RETVAL 1372 RETVAL
1157 1373
1158void 1374void
1159DESTROY (DC::Layout self) 1375DESTROY (DC::Layout self)
1160 CODE: 1376 CODE:
1161 g_object_unref (self->pl); 1377 g_object_unref (self->pl);
1162 rc_free (self->rc);
1163 Safefree (self); 1378 delete self;
1164 1379
1165void 1380void
1166set_text (DC::Layout self, SV *text_) 1381set_text (DC::Layout self, SV *text_)
1167 CODE: 1382 CODE:
1168{ 1383{
1294 1509
1295void 1510void
1296set_height (DC::Layout self, int base_height) 1511set_height (DC::Layout self, int base_height)
1297 CODE: 1512 CODE:
1298 if (self->base_height != base_height) 1513 if (self->base_height != base_height)
1299 { 1514 {
1300 self->base_height = base_height; 1515 self->base_height = base_height;
1301 layout_update_font (self); 1516 layout_update_font (self);
1302 } 1517 }
1303 1518
1304void 1519void
1422} 1637}
1423 1638
1424void 1639void
1425render (DC::Layout self, float x, float y, int flags = 0) 1640render (DC::Layout self, float x, float y, int flags = 0)
1426 CODE: 1641 CODE:
1427 rc_clear (self->rc); 1642 self->rc.clear ();
1428 pango_opengl_render_layout_subpixel ( 1643 pango_opengl_render_layout_subpixel (
1429 self->pl, 1644 self->pl,
1430 self->rc, 1645 &self->rc,
1431 x * PANGO_SCALE, y * PANGO_SCALE, 1646 x * PANGO_SCALE, y * PANGO_SCALE,
1432 self->r, self->g, self->b, self->a, 1647 self->r, self->g, self->b, self->a,
1433 flags 1648 flags
1434 ); 1649 );
1435 // we assume that context_change actually clears/frees stuff 1650 // we assume that context_change actually clears/frees stuff
1446 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1661 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1447 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1662 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1448 glEnable (GL_ALPHA_TEST); 1663 glEnable (GL_ALPHA_TEST);
1449 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1664 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1450 1665
1451 rc_draw (self->rc); 1666 self->rc.draw ();
1452 1667
1453 glDisable (GL_ALPHA_TEST); 1668 glDisable (GL_ALPHA_TEST);
1454 glDisable (GL_BLEND); 1669 glDisable (GL_BLEND);
1455 glDisable (GL_TEXTURE_2D); 1670 glDisable (GL_TEXTURE_2D);
1456} 1671}
1531 glDisable (GL_ALPHA_TEST); 1746 glDisable (GL_ALPHA_TEST);
1532 glDisable (GL_BLEND); 1747 glDisable (GL_BLEND);
1533 } 1748 }
1534} 1749}
1535 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
1536IV 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)
1537 CODE: 1873 CODE:
1538{ 1874{
1539 GLint width; 1875 GLint width;
1540 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);
1547MODULE = Deliantra::Client PACKAGE = DC::Map 1883MODULE = Deliantra::Client PACKAGE = DC::Map
1548 1884
1549PROTOTYPES: DISABLE 1885PROTOTYPES: DISABLE
1550 1886
1551DC::Map 1887DC::Map
1552new (SV *class) 1888new (SV *klass)
1553 CODE: 1889 CODE:
1554 New (0, RETVAL, 1, struct map); 1890 New (0, RETVAL, 1, mapgrid);
1555 RETVAL->x = 0; 1891 RETVAL->x = 0;
1556 RETVAL->y = 0; 1892 RETVAL->y = 0;
1557 RETVAL->w = 0; 1893 RETVAL->w = 0;
1558 RETVAL->h = 0; 1894 RETVAL->h = 0;
1559 RETVAL->ox = 0; 1895 RETVAL->ox = 0;
1596 1932
1597void 1933void
1598set_smooth (DC::Map self, int face, int smooth, int level) 1934set_smooth (DC::Map self, int face, int smooth, int level)
1599 CODE: 1935 CODE:
1600{ 1936{
1601 tileid texid; 1937 tileid texid;
1602 maptex *tex; 1938 maptex *tex;
1603 1939
1604 if (face < 0 || face >= self->faces) 1940 if (face < 0 || face >= self->faces)
1605 return; 1941 return;
1606 1942
1607 if (smooth < 0 || smooth >= self->faces) 1943 if (smooth < 0 || smooth >= self->faces)
1608 return; 1944 return;
1609 1945
1610 texid = self->face2tile [face]; 1946 texid = self->face2tile [face];
1611 1947
1612 if (!texid) 1948 if (!texid)
1613 return; 1949 return;
1614 1950
1615 tex = self->tex + texid; 1951 tex = self->tex + texid;
1644 //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);
1645 // use uglier nearest interpolation because linear suffers 1981 // use uglier nearest interpolation because linear suffers
1646 // from transparent color bleeding and ugly wrapping effects. 1982 // from transparent color bleeding and ugly wrapping effects.
1647 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1983 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1648} 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 }
1649 2005
1650int 2006int
1651ox (DC::Map self) 2007ox (DC::Map self)
1652 ALIAS: 2008 ALIAS:
1653 oy = 1 2009 oy = 1
1685 self->ox += dx; self->x += dx; 2041 self->ox += dx; self->x += dx;
1686 self->oy += dy; self->y += dy; 2042 self->oy += dy; self->y += dy;
1687 2043
1688 while (self->y < 0) 2044 while (self->y < 0)
1689 { 2045 {
1690 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2046 prepend (self->row, self->rows, MAP_EXTEND_Y);
1691 2047
1692 self->rows += MAP_EXTEND_Y; 2048 self->rows += MAP_EXTEND_Y;
1693 self->y += MAP_EXTEND_Y; 2049 self->y += MAP_EXTEND_Y;
1694 } 2050 }
1695} 2051}
1696 2052
1697SV * 2053SV *
1698map1a_update (DC::Map self, SV *data_, int extmap) 2054map1a_update (DC::Map self, SV *data_)
1699 CODE: 2055 CODE:
1700{ 2056{
1701 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2057 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1702 uint8_t *data_end = (uint8_t *)SvEND (data_); 2058 uint8_t *data_end = (uint8_t *)SvEND (data_);
1703 mapcell *cell; 2059 mapcell *cell;
1724 2080
1725 //TODO: don't trust server data to be in-range(!) 2081 //TODO: don't trust server data to be in-range(!)
1726 2082
1727 if (flags & 8) 2083 if (flags & 8)
1728 { 2084 {
2085 uint8_t ext, cmd;
2086
1729 if (extmap) 2087 do
1730 { 2088 {
1731 uint8_t ext, cmd; 2089 ext = *data++;
2090 cmd = ext & 0x7f;
1732 2091
1733 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
1734 { 2095 {
1735 ext = *data++;
1736 cmd = ext & 0x7f;
1737
1738 if (cmd < 4)
1739 cell->darkness = 255 - ext * 64 + 1;
1740 else if (cmd == 5) // health
1741 {
1742 cell->stat_width = 1; 2096 cell->stat_width = 1;
1743 cell->stat_hp = *data++; 2097 cell->stat_hp = *data++;
1744 }
1745 else if (cmd == 6) // monster width
1746 cell->stat_width = *data++ + 1;
1747 else if (cmd == 0x47)
1748 {
1749 if (*data == 1) cell->player = data [1];
1750 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1751 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1752 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1753
1754 data += *data + 1;
1755 }
1756 else if (cmd == 8) // cell flags
1757 cell->flags = *data++;
1758 else if (ext & 0x40) // unknown, multibyte => skip
1759 data += *data + 1;
1760 else
1761 data++;
1762 } 2098 }
1763 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++;
1764 } 2116 }
1765 else 2117 while (ext & 0x80);
1766 cell->darkness = *data++ + 1;
1767 } 2118 }
1768 2119
1769 for (z = 0; z <= 2; ++z) 2120 for (z = 0; z <= 2; ++z)
1770 if (flags & (4 >> z)) 2121 if (flags & (4 >> z))
1771 { 2122 {
1774 cell->tile [z] = self->face2tile [face]; 2125 cell->tile [z] = self->face2tile [face];
1775 2126
1776 if (cell->tile [z]) 2127 if (cell->tile [z])
1777 { 2128 {
1778 maptex *tex = self->tex + cell->tile [z]; 2129 maptex *tex = self->tex + cell->tile [z];
2130 tex->unused = 0;
1779 if (!tex->name) 2131 if (!tex->name)
1780 av_push (missing, newSViv (cell->tile [z])); 2132 av_push (missing, newSViv (cell->tile [z]));
1781 2133
1782 if (tex->smoothtile) 2134 if (tex->smoothtile)
1783 { 2135 {
1784 maptex *smooth = self->tex + tex->smoothtile; 2136 maptex *smooth = self->tex + tex->smoothtile;
2137 smooth->unused = 0;
1785 if (!smooth->name) 2138 if (!smooth->name)
1786 av_push (missing, newSViv (tex->smoothtile)); 2139 av_push (missing, newSViv (tex->smoothtile));
1787 } 2140 }
1788 } 2141 }
1789 } 2142 }
1817 ? self->row + y 2170 ? self->row + y
1818 : 0; 2171 : 0;
1819 2172
1820 for (x = x0; x < x1; x++) 2173 for (x = x0; x < x1; x++)
1821 { 2174 {
1822 int r = 32, g = 32, b = 32, a = 192; 2175 unsigned int r = 32, g = 32, b = 32, a = 192;
1823 2176
1824 if (row && row->c0 <= x && x < row->c1) 2177 if (row && row->c0 <= x && x < row->c1)
1825 { 2178 {
1826 mapcell *cell = row->col + (x - row->c0); 2179 mapcell *cell = row->col + (x - row->c0);
1827 2180
1829 { 2182 {
1830 maptex tex = self->tex [cell->tile [z]]; 2183 maptex tex = self->tex [cell->tile [z]];
1831 int a0 = 255 - tex.a; 2184 int a0 = 255 - tex.a;
1832 int a1 = tex.a; 2185 int a1 = tex.a;
1833 2186
1834 r = (r * a0 + tex.r * a1) / 255; 2187 r = div255 (r * a0 + tex.r * a1);
1835 g = (g * a0 + tex.g * a1) / 255; 2188 g = div255 (g * a0 + tex.g * a1);
1836 b = (b * a0 + tex.b * a1) / 255; 2189 b = div255 (b * a0 + tex.b * a1);
1837 a = (a * a0 + tex.a * a1) / 255; 2190 a = div255 (a * a0 + tex.a * a1);
1838 } 2191 }
1839 } 2192 }
1840 2193
1841 *map++ = (r ) 2194 *map++ = (r )
1842 | (g << 8) 2195 | (g << 8)
1843 | (b << 16) 2196 | (b << 16)
1844 | (a << 24); 2197 | (a << 24);
1845 } 2198 }
1846 } 2199 }
1847 2200
1848 RETVAL = map_sv; 2201 RETVAL = map_sv;
1849} 2202}
1850 OUTPUT: 2203 OUTPUT:
1851 RETVAL 2204 RETVAL
1852 2205
1853void 2206void
1854draw (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)
1855 CODE: 2208 CODE:
1856{ 2209{
1857 int x, y, z; 2210 int x, y, z;
1858 2211
1859 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1860 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1861 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2212 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1862 smooth_key skey;
1863 int pl_x, pl_y; 2213 int pl_x, pl_y;
1864 maptex pl_tex; 2214 maptex pl_tex;
1865 rc_t *rc = rc_alloc (); 2215 rc_t rc;
2216 rc_t rc_ov;
1866 rc_key_t key; 2217 rc_key_t key;
1867 rc_array_t *arr; 2218 rc_t::array_t *arr;
1868 2219
1869 pl_tex.name = 0; 2220 pl_tex.name = 0;
1870 2221
1871 // thats current max. sorry. 2222 // that's current max. sorry.
1872 if (sw > 255) sw = 255; 2223 if (sw > 255) sw = 255;
1873 if (sh > 255) sh = 255; 2224 if (sh > 255) sh = 255;
1874
1875 // clear key, in case of extra padding
1876 memset (&skey, 0, sizeof (skey));
1877 2225
1878 memset (&key, 0, sizeof (key)); 2226 memset (&key, 0, sizeof (key));
1879 key.r = 255; 2227 key.r = 255;
1880 key.g = 255; 2228 key.g = 255;
1881 key.b = 255; 2229 key.b = 255;
1882 key.a = 255; 2230 key.a = 255;
1883 key.mode = GL_QUADS; 2231 key.mode = GL_QUADS;
1884 key.format = GL_T2F_V3F; 2232 key.format = GL_T2F_V3F;
1885 key.texname = -1;
1886 2233
1887 mx += self->x; 2234 mx += self->x;
1888 my += self->y; 2235 my += self->y;
1889 2236
1890 // first pass: determine smooth_max 2237 // first pass: determine smooth_max
1891 // rather ugly, if you ask me 2238 // rather ugly, if you ask me
1892 // could also be stored inside mapcell and updated on change 2239 // could also be stored inside mapcell and updated on change
1893 memset (smooth_max, 0, sizeof (smooth_max)); 2240 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1894 2241
1895 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
1896 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
1897 { 2244 {
1898 maprow *row = self->row + (y + my); 2245 maprow *row = self->row + (y + my);
1913 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2260 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1914 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2261 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1915 2262
1916 for (z = 0; z <= 2; z++) 2263 for (z = 0; z <= 2; z++)
1917 { 2264 {
1918 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;
1919 2269
1920 for (y = 0; y < sh; y++) 2270 for (y = 0; y < sh; y++)
1921 if (0 <= y + my && y + my < self->rows) 2271 if (0 <= y + my && y + my < self->rows)
1922 { 2272 {
1923 maprow *row = self->row + (y + my); 2273 maprow *row = self->row + (y + my);
1929 tileid tile = cell->tile [z]; 2279 tileid tile = cell->tile [z];
1930 2280
1931 if (tile) 2281 if (tile)
1932 { 2282 {
1933 maptex tex = self->tex [tile]; 2283 maptex tex = self->tex [tile];
1934 int px = (x + 1) * T - tex.w; 2284 int px, py;
1935 int py = (y + 1) * T - tex.h;
1936 2285
1937 if (key.texname != tex.name) 2286 if (key.texname != tex.name)
1938 { 2287 {
2288 self->tex [tile].unused = 0;
2289
1939 if (!tex.name) 2290 if (!tex.name)
1940 tex = self->tex [2]; /* missing, replace by noface */ 2291 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1941 2292
1942 key.texname = tex.name; 2293 key.texname = tex.name;
1943 arr = rc_array (rc, &key); 2294 arr = &rc.array (key);
1944 } 2295 }
1945 2296
2297 px = (x + 1) * Th - tex.w;
2298 py = (y + 1) * Tw - tex.h;
2299
1946 if (expect_false (cell->player == player) && expect_false (z == 2)) 2300 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1947 { 2301 {
1948 pl_x = px; 2302 pl_x = px;
1949 pl_y = py; 2303 pl_y = py;
1950 pl_tex = tex; 2304 pl_tex = tex;
1951 continue; 2305 continue;
1952 } 2306 }
1953 2307
1954 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2308 arr->t2f_v3f (0 , 0 , px , py , 0);
1955 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2309 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
1956 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2310 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
1957 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2311 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1958
1959 if (expect_false (cell->flags) && expect_false (z == 2))
1960 {
1961 // overlays such as the speech bubble, probably more to come
1962 if (cell->flags & 1)
1963 {
1964 maptex tex = self->tex [1];
1965 int px = x * T + T * 2 / 32;
1966 int py = y * T - T * 6 / 32;
1967
1968 if (tex.name)
1969 {
1970 if (key.texname != tex.name)
1971 {
1972 key.texname = tex.name;
1973 arr = rc_array (rc, &key);
1974 }
1975
1976 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1977 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1978 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1979 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1980 }
1981 }
1982 }
1983 2312
1984 // update smooth hash 2313 // update smooth hash
1985 if (tex.smoothtile) 2314 if (tex.smoothtile)
1986 { 2315 {
1987 skey.tile = tex.smoothtile; 2316 skey.tile = tex.smoothtile;
1988 skey.level = tex.smoothlevel; 2317 skey.level = tex.smoothlevel;
1989 2318
1990 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2319 smooth_level[tex.smoothlevel] = 1;
1991 2320
1992 // 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
1993 // shifted +1|+1 so we always stay positive. 2322 // shifted +1|+1 so we always stay positive.
1994 2323
1995 // bits is ___n cccc CCCC bbbb 2324 // bits is ___n cccc CCCC bbbb
2003 2332
2004 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2333 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2005 // ·· ·· ·┏ ┓· 2334 // ·· ·· ·┏ ┓·
2006 2335
2007 // full tile 2336 // full tile
2008 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);
2009 2338
2010 // borders 2339 // borders
2011 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);
2012 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);
2013 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);
2014 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);
2015 2344
2016 // corners 2345 // corners
2017 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);
2018 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);
2019 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);
2020 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);
2021 } 2370 }
2022 } 2371 }
2023 } 2372 }
2024 } 2373 }
2025 2374
2026 rc_draw (rc); 2375 rc.draw ();
2027 rc_clear (rc); 2376 rc.clear ();
2028 2377
2029 // go through all smoothlevels, lowest to highest, then draw. 2378 // go through all smoothlevels, lowest to highest, then draw.
2030 // this is basically counting sort 2379 // this is basically counting sort
2031 { 2380 {
2032 int w, b; 2381 int w, b;
2033 2382
2034 glEnable (GL_TEXTURE_2D); 2383 glEnable (GL_TEXTURE_2D);
2035 glBegin (GL_QUADS); 2384 glBegin (GL_QUADS);
2036 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)
2037 { 2388 {
2038 uint32_t smask = smooth_level [w]; 2389 smooth_key &skey = it->first;
2039 if (smask) 2390 IV bits = it->second;
2040 for (b = 0; b < 32; ++b) 2391
2041 if (smask & (((uint32_t)1) << b)) 2392 if (!(bits & 0x1000)
2393 && skey.level == level
2394 && level > smooth_max [skey.x][skey.y])
2042 { 2395 {
2043 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
2044 HE *he; 2404 if (tex.name)
2045
2046 hv_iterinit (smooth);
2047 while ((he = hv_iternext (smooth)))
2048 { 2405 {
2049 smooth_key *skey = (smooth_key *)HeKEY (he); 2406 // this time avoiding texture state changes
2050 IV bits = SvIVX (HeVAL (he)); 2407 // save gobs of state changes.
2051 2408 if (key.texname != tex.name)
2052 if (!(bits & 0x1000)
2053 && skey->level == level
2054 && level > smooth_max [skey->x][skey->y])
2055 { 2409 {
2056 maptex tex = self->tex [skey->tile]; 2410 self->tex [skey.tile].unused = 0;
2057 int px = (((int)skey->x) - 1) * T;
2058 int py = (((int)skey->y) - 1) * T;
2059 int border = bits & 15;
2060 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2061 float dx = tex.s * .0625f; // 16 images/row
2062 float dy = tex.t * .5f ; // 2 images/column
2063 2411
2064 if (tex.name)
2065 {
2066 // this time avoiding texture state changes
2067 // save gobs of state changes.
2068 if (key.texname != tex.name)
2069 {
2070 glEnd (); 2412 glEnd ();
2071 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2072 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2073 } 2415 }
2074 2416
2075 if (border) 2417 if (border)
2076 { 2418 {
2077 float ox = border * dx; 2419 float ox = border * dx;
2078 2420
2079 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2080 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2081 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2082 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2083 } 2425 }
2084 2426
2085 if (corner) 2427 if (corner)
2086 { 2428 {
2087 float ox = corner * dx; 2429 float ox = corner * dx;
2088 2430
2089 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2090 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2091 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2092 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2093 }
2094 }
2095 } 2435 }
2096 } 2436 }
2097 } 2437 }
2098 } 2438 }
2099 2439
2100 glEnd (); 2440 glEnd ();
2101 glDisable (GL_TEXTURE_2D); 2441 glDisable (GL_TEXTURE_2D);
2102 key.texname = -1; 2442 key.texname = -1;
2103 } 2443 }
2104
2105 hv_clear (smooth);
2106 } 2444 }
2107 2445
2108 if (pl_tex.name) 2446 if (pl_tex.name)
2109 { 2447 {
2110 maptex tex = pl_tex; 2448 maptex tex = pl_tex;
2111 int px = pl_x + sdx; 2449 int px = pl_x + sdx;
2112 int py = pl_y + sdy; 2450 int py = pl_y + sdy;
2113 2451
2114 key.texname = tex.name; 2452 key.texname = tex.name;
2115 arr = rc_array (rc, &key); 2453 rc_t::array_t &arr = rc.array (key);
2116 2454
2117 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2455 arr.t2f_v3f (0 , 0 , px , py , 0);
2118 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2456 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2119 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2457 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2120 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2458 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2121 2459
2122 rc_draw (rc); 2460 rc.draw ();
2123 } 2461 }
2124 2462
2463 rc_ov.draw ();
2464 rc_ov.clear ();
2465
2125 glDisable (GL_BLEND); 2466 glDisable (GL_BLEND);
2126 rc_free (rc);
2127 2467
2128 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2129 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2130 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2131 { 2471 {
2134 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
2135 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
2136 { 2476 {
2137 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2138 2478
2139 int px = x * T; 2479 int px = x * Tw;
2140 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 }
2141 2487
2142 if (cell->stat_hp) 2488 if (cell->stat_hp)
2143 { 2489 {
2144 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
2145 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2146 2492
2147 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
2148 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
2149 px + width - 1, py); 2495 px + width - 1, py);
2150 2496
2156 } 2502 }
2157 } 2503 }
2158} 2504}
2159 2505
2160void 2506void
2161draw_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)
2162 CODE: 2508 CODE:
2163{ 2509{
2164 static float color[16][3] = { 2510 static float color[16][3] = {
2165 { 0.00F, 0.00F, 0.00F }, 2511 { 0.00f, 0.00f, 0.00f },
2166 { 1.00F, 1.00F, 1.00F }, 2512 { 1.00f, 1.00f, 1.00f },
2167 { 0.00F, 0.00F, 0.55F }, 2513 { 0.00f, 0.00f, 0.55f },
2168 { 1.00F, 0.00F, 0.00F }, 2514 { 1.00f, 0.00f, 0.00f },
2169 2515
2170 { 1.00F, 0.54F, 0.00F }, 2516 { 1.00f, 0.54f, 0.00f },
2171 { 0.11F, 0.56F, 1.00F }, 2517 { 0.11f, 0.56f, 1.00f },
2172 { 0.93F, 0.46F, 0.00F }, 2518 { 0.93f, 0.46f, 0.00f },
2173 { 0.18F, 0.54F, 0.34F }, 2519 { 0.18f, 0.54f, 0.34f },
2174 2520
2175 { 0.56F, 0.73F, 0.56F }, 2521 { 0.56f, 0.73f, 0.56f },
2176 { 0.80F, 0.80F, 0.80F }, 2522 { 0.80f, 0.80f, 0.80f },
2177 { 0.55F, 0.41F, 0.13F }, 2523 { 0.55f, 0.41f, 0.13f },
2178 { 0.99F, 0.77F, 0.26F }, 2524 { 0.99f, 0.77f, 0.26f },
2179 2525
2180 { 0.74F, 0.65F, 0.41F }, 2526 { 0.74f, 0.65f, 0.41f },
2181 2527
2182 { 0.00F, 1.00F, 1.00F }, 2528 { 0.00f, 1.00f, 1.00f },
2183 { 1.00F, 0.00F, 1.00F }, 2529 { 1.00f, 0.00f, 1.00f },
2184 { 1.00F, 1.00F, 0.00F }, 2530 { 1.00f, 1.00f, 0.00f },
2185 }; 2531 };
2186 2532
2187 int x, y; 2533 int x, y;
2188 2534
2189 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 */
2190 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2542 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2191 glEnable (GL_BLEND); 2543 glEnable (GL_BLEND);
2192 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2544 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2193 glBegin (GL_QUADS); 2545 glBegin (GL_QUADS);
2194 2546
2195 for (y = 0; y < h; y++) 2547 for (y = 0; y < h; y++)
2199 2551
2200 if (m) 2552 if (m)
2201 { 2553 {
2202 float *c = color [m & 15]; 2554 float *c = color [m & 15];
2203 2555
2204 float tx1 = m & 0x40 ? 0.5 : 0.; 2556 float tx1 = m & 0x40 ? 0.5f : 0.f;
2205 float tx2 = tx1 + 0.5; 2557 float tx2 = tx1 + 0.5f;
2206 2558
2207 glColor4f (c[0], c[1], c[2], 0.75); 2559 glColor4f (c[0], c[1], c[2], 1);
2208 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2560 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2209 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2561 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2210 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2562 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2211 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2563 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2212 } 2564 }
2220void 2572void
2221fow_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)
2222 PPCODE: 2574 PPCODE:
2223{ 2575{
2224 int x, y; 2576 int x, y;
2225 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2226 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2227 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2228 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);
2229 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2230 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2584 memset (darkness1, 0, sw1*sh1);
2231 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2232 2585
2233 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2234 SvCUR_set (darkness3_sv, sw34 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2235 2588
2236 mx += self->x - 1; 2589 mx += self->x - 1;
2237 my += self->y - 1; 2590 my += self->y - 1;
2238
2239 memset (darkness1, 255, sw1 * sh1);
2240 2591
2241 for (y = 0; y < sh1; y++) 2592 for (y = 0; y < sh1; y++)
2242 if (0 <= y + my && y + my < self->rows) 2593 if (0 <= y + my && y + my < self->rows)
2243 { 2594 {
2244 maprow *row = self->row + (y + my); 2595 maprow *row = self->row + (y + my);
2247 if (row->c0 <= x + mx && x + mx < row->c1) 2598 if (row->c0 <= x + mx && x + mx < row->c1)
2248 { 2599 {
2249 mapcell *cell = row->col + (x + mx - row->c0); 2600 mapcell *cell = row->col + (x + mx - row->c0);
2250 2601
2251 darkness1 [y * sw1 + x] = cell->darkness 2602 darkness1 [y * sw1 + x] = cell->darkness
2252 ? 255 - (cell->darkness - 1) 2603 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2253 : 255 - FOW_DARKNESS; 2604 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2254 } 2605 }
2255 } 2606 }
2256 2607
2257 for (y = 0; y < sh; ++y) 2608 for (y = 0; y < sh; ++y)
2258 for (x = 0; x < sw; ++x) 2609 for (x = 0; x < sw; ++x)
2277 2628
2278 uint8_t r13 = (d13 + d23 + d12) / 3; 2629 uint8_t r13 = (d13 + d23 + d12) / 3;
2279 uint8_t r23 = d23; 2630 uint8_t r23 = d23;
2280 uint8_t r33 = (d23 + d33 + d32) / 3; 2631 uint8_t r33 = (d23 + d33 + d32) / 3;
2281 2632
2282 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2633 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2283 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2284 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2636 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2286 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 */
2287 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2639 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2289 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2290 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2291 } 2642 }
2292 2643
2293 free (darkness1); 2644 free (darkness1);
2294 2645
2295 EXTEND (SP, 3); 2646 EXTEND (SP, 3);
2296 PUSHs (sv_2mortal (newSViv (sw34))); 2647 PUSHs (sv_2mortal (newSViv (sw3)));
2297 PUSHs (sv_2mortal (newSViv (sh3))); 2648 PUSHs (sv_2mortal (newSViv (sh3)));
2298 PUSHs (darkness3_sv); 2649 PUSHs (darkness3_sv);
2299} 2650}
2300 2651
2301SV * 2652SV *
2364 else 2715 else
2365 *data++ = 0; 2716 *data++ = 0;
2366 } 2717 }
2367 } 2718 }
2368 2719
2369 /* 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 */
2370 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2721 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2371 { 2722 {
2372 SvPOK_only (data_sv); 2723 SvPOK_only (data_sv);
2373 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2374 } 2725 }
2375 2726
2376 RETVAL = data_sv; 2727 RETVAL = data_sv;
2377} 2728}
2378 OUTPUT: 2729 OUTPUT:
2379 RETVAL 2730 RETVAL
2380 2731
2381void 2732void
2388 STRLEN len; 2739 STRLEN len;
2389 uint8_t *data, *end; 2740 uint8_t *data, *end;
2390 2741
2391 len = SvLEN (data_sv); 2742 len = SvLEN (data_sv);
2392 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2743 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2393 data = SvPVbyte_nolen (data_sv); 2744 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2394 end = data + len + 8; 2745 end = data + len + 8;
2395 2746
2396 if (len < 5) 2747 if (len < 5)
2397 XSRETURN_EMPTY; 2748 XSRETURN_EMPTY;
2398 2749
2459} 2810}
2460 2811
2461MODULE = Deliantra::Client PACKAGE = DC::RW 2812MODULE = Deliantra::Client PACKAGE = DC::RW
2462 2813
2463DC::RW 2814DC::RW
2464new (SV *class, SV *data_sv) 2815new (SV *klass, SV *data_sv)
2465 CODE: 2816 CODE:
2466{ 2817{
2467 STRLEN datalen; 2818 STRLEN datalen;
2468 char *data = SvPVbyte (data_sv, datalen); 2819 char *data = SvPVbyte (data_sv, datalen);
2469 2820
2471} 2822}
2472 OUTPUT: 2823 OUTPUT:
2473 RETVAL 2824 RETVAL
2474 2825
2475DC::RW 2826DC::RW
2476new_from_file (SV *class, const char *path, const char *mode = "rb") 2827new_from_file (SV *klass, const char *path, const char *mode = "rb")
2477 CODE: 2828 CODE:
2478 RETVAL = SDL_RWFromFile (path, mode); 2829 RETVAL = SDL_RWFromFile (path, mode);
2479 OUTPUT: 2830 OUTPUT:
2480 RETVAL 2831 RETVAL
2481 2832
2499 if (RETVAL < 0) 2850 if (RETVAL < 0)
2500 { 2851 {
2501 RETVAL = Mix_GroupOldest (-1); 2852 RETVAL = Mix_GroupOldest (-1);
2502 2853
2503 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)
2504 XSRETURN_UNDEF; 2860 XSRETURN_UNDEF;
2505 2861 }
2862 else
2506 Mix_HaltChannel (RETVAL); 2863 Mix_HaltChannel (RETVAL);
2507 } 2864 }
2508 2865
2509 Mix_UnregisterAllEffects (RETVAL); 2866 Mix_UnregisterAllEffects (RETVAL);
2510 Mix_Volume (RETVAL, 128); 2867 Mix_Volume (RETVAL, 128);
2511} 2868}
2558void 2915void
2559set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2916set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2560 CODE: 2917 CODE:
2561{ 2918{
2562 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));
2563 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;
2564 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2921 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2565} 2922}
2566 2923
2567void 2924void
2568set_reverse_stereo (DC::Channel self, int flip) 2925set_reverse_stereo (DC::Channel self, int flip)
2571 2928
2572MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2573 2930
2574PROTOTYPES: DISABLE 2931PROTOTYPES: DISABLE
2575 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
2576DC::MixChunk 2945DC::MixChunk
2577new (SV *class, DC::RW rwops) 2946new (SV *klass, DC::RW rwops)
2578 CODE: 2947 CODE:
2579 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2580 OUTPUT: 2949 OUTPUT:
2581 RETVAL 2950 RETVAL
2582 2951
2612 OUTPUT: 2981 OUTPUT:
2613 RETVAL 2982 RETVAL
2614 2983
2615MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2984MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2616 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
2617int 2998int
2618volume (int volume = -1) 2999volume (int volume = -1)
2619 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2620 CODE: 3001 CODE:
2621 if (items > 0) 3002 if (items > 0)
2632void 3013void
2633halt () 3014halt ()
2634 CODE: 3015 CODE:
2635 Mix_HaltMusic (); 3016 Mix_HaltMusic ();
2636 3017
3018int
3019playing ()
3020 CODE:
3021 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT:
3023 RETVAL
3024
2637DC::MixMusic 3025DC::MixMusic
2638new (SV *class, DC::RW rwops) 3026new (SV *klass, DC::RW rwops)
2639 CODE: 3027 CODE:
2640 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
2641 OUTPUT: 3029 OUTPUT:
2642 RETVAL 3030 RETVAL
2643 3031
2671 } *civ, const_iv[] = { 3059 } *civ, const_iv[] = {
2672# define const_iv(name) { # name, (IV)name } 3060# define const_iv(name) { # name, (IV)name }
2673 const_iv (GL_VENDOR), 3061 const_iv (GL_VENDOR),
2674 const_iv (GL_VERSION), 3062 const_iv (GL_VERSION),
2675 const_iv (GL_EXTENSIONS), 3063 const_iv (GL_EXTENSIONS),
3064 const_iv (GL_MAX_TEXTURE_UNITS),
2676 const_iv (GL_COLOR_MATERIAL), 3065 const_iv (GL_COLOR_MATERIAL),
2677 const_iv (GL_SMOOTH), 3066 const_iv (GL_SMOOTH),
2678 const_iv (GL_FLAT), 3067 const_iv (GL_FLAT),
2679 const_iv (GL_DITHER), 3068 const_iv (GL_DITHER),
2680 const_iv (GL_BLEND), 3069 const_iv (GL_BLEND),
2692 const_iv (GL_ZERO), 3081 const_iv (GL_ZERO),
2693 const_iv (GL_SRC_ALPHA), 3082 const_iv (GL_SRC_ALPHA),
2694 const_iv (GL_DST_ALPHA), 3083 const_iv (GL_DST_ALPHA),
2695 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3084 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2696 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),
2697 const_iv (GL_SRC_ALPHA_SATURATE), 3090 const_iv (GL_SRC_ALPHA_SATURATE),
2698 const_iv (GL_RGB), 3091 const_iv (GL_RGB),
2699 const_iv (GL_RGBA), 3092 const_iv (GL_RGBA),
2700 const_iv (GL_RGBA4), 3093 const_iv (GL_RGBA4),
2701 const_iv (GL_RGBA8), 3094 const_iv (GL_RGBA8),
2769 const_iv (GL_NICEST), 3162 const_iv (GL_NICEST),
2770 const_iv (GL_V2F), 3163 const_iv (GL_V2F),
2771 const_iv (GL_V3F), 3164 const_iv (GL_V3F),
2772 const_iv (GL_T2F_V3F), 3165 const_iv (GL_T2F_V3F),
2773 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),
2774# undef const_iv 3170# undef const_iv
2775 }; 3171 };
2776 3172
2777 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--)
2778 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2779 3175
2780 texture_av = newAV (); 3176 texture_av = newAV ();
2781 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
2782} 3178}
2783 3179
2785disable_GL_EXT_blend_func_separate () 3181disable_GL_EXT_blend_func_separate ()
2786 CODE: 3182 CODE:
2787 gl.BlendFuncSeparate = 0; 3183 gl.BlendFuncSeparate = 0;
2788 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
2789 3185
2790char * 3186void
3187apple_nvidia_bug (int enable)
3188
3189const char *
2791gl_vendor () 3190gl_vendor ()
2792 CODE: 3191 CODE:
2793 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (const char *)glGetString (GL_VENDOR);
2794 OUTPUT: 3193 OUTPUT:
2795 RETVAL 3194 RETVAL
2796 3195
2797char * 3196const char *
2798gl_version () 3197gl_version ()
2799 CODE: 3198 CODE:
2800 RETVAL = (char *)glGetString (GL_VERSION); 3199 RETVAL = (const char *)glGetString (GL_VERSION);
2801 OUTPUT: 3200 OUTPUT:
2802 RETVAL 3201 RETVAL
2803 3202
2804char * 3203const char *
2805gl_extensions () 3204gl_extensions ()
2806 CODE: 3205 CODE:
2807 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3206 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2808 OUTPUT: 3207 OUTPUT:
2809 RETVAL 3208 RETVAL
2810 3209
2811const char *glGetString (GLenum pname) 3210const char *glGetString (GLenum pname)
3211 CODE:
3212 RETVAL = (const char *)glGetString (pname);
3213 OUTPUT:
3214 RETVAL
2812 3215
2813GLint glGetInteger (GLenum pname) 3216GLint glGetInteger (GLenum pname)
2814 CODE: 3217 CODE:
2815 glGetIntegerv (pname, &RETVAL); 3218 glGetIntegerv (pname, &RETVAL);
2816 OUTPUT: 3219 OUTPUT:
2824 3227
2825int glGetError () 3228int glGetError ()
2826 3229
2827void glFinish () 3230void glFinish ()
2828 3231
3232void glFlush ()
3233
2829void glClear (int mask) 3234void glClear (int mask)
2830 3235
2831void glClearColor (float r, float g, float b, float a = 1.0) 3236void glClearColor (float r, float g, float b, float a = 1.0)
2832 PROTOTYPE: @ 3237 PROTOTYPE: @
2833 3238
2842void glBlendFunc (int sfactor, int dfactor) 3247void glBlendFunc (int sfactor, int dfactor)
2843 3248
2844void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3249void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2845 CODE: 3250 CODE:
2846 gl_BlendFuncSeparate (sa, da, saa, daa); 3251 gl_BlendFuncSeparate (sa, da, saa, daa);
3252
3253# void glBlendEquation (int se)
2847 3254
2848void glDepthMask (int flag) 3255void glDepthMask (int flag)
2849 3256
2850void glLogicOp (int opcode) 3257void glLogicOp (int opcode)
2851 3258
2886void glRotate (float angle, float x, float y, float z) 3293void glRotate (float angle, float x, float y, float z)
2887 CODE: 3294 CODE:
2888 glRotatef (angle, x, y, z); 3295 glRotatef (angle, x, y, z);
2889 3296
2890void 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: @
2891 ALIAS: 3299 ALIAS:
2892 glColor_premultiply = 1 3300 glColor_premultiply = 1
2893 CODE: 3301 CODE:
2894 if (ix) 3302 if (ix)
2895 { 3303 {
3001 3409
3002void glEndList () 3410void glEndList ()
3003 3411
3004void glCallList (int list) 3412void glCallList (int list)
3005 3413
3414void c_init ()
3415 CODE:
3416 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3417 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3418
3006MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3419MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3007 3420
3008PROTOTYPES: DISABLE 3421PROTOTYPES: DISABLE
3009 3422
3010void 3423void
3011find_widget (SV *self, NV x, NV y) 3424find_widget (SV *self, NV x, NV y)
3012 PPCODE: 3425 PPCODE:
3013{ 3426{
3014 if (within_widget (self, x, y)) 3427 if (within_widget (self, x, y))
3015 XPUSHs (self); 3428 XPUSHs (self);
3016} 3429}
3017 3430
3018BOOT: 3431BOOT:
3019{ 3432{
3027 3440
3028void 3441void
3029draw (SV *self) 3442draw (SV *self)
3030 CODE: 3443 CODE:
3031{ 3444{
3032 HV *hv; 3445 HV *hv;
3033 SV **svp; 3446 SV **svp;
3034 NV x, y, w, h; 3447 NV x, y, w, h;
3035 SV *draw_x_sv = GvSV (draw_x_gv); 3448 SV *draw_x_sv = GvSV (draw_x_gv);
3036 SV *draw_y_sv = GvSV (draw_y_gv); 3449 SV *draw_y_sv = GvSV (draw_y_gv);
3037 SV *draw_w_sv = GvSV (draw_w_gv); 3450 SV *draw_w_sv = GvSV (draw_w_gv);
3038 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