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