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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.272 by root, Tue Aug 19 17:38:29 2008 UTC vs.
Revision 1.332 by root, Mon Nov 19 00:56:08 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 call_argv ("::main", G_DISCARD | G_VOID, 0);
536 dSP; 597 dSP;
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
746 866
747NV ceil (NV x) 867NV ceil (NV x)
748 868
749IV minpot (UV n) 869IV minpot (UV n)
750 870
871UV ld32 (UV n)
872 CODE:
873 RETVAL = ecb_ld32 (n);
874 OUTPUT:
875 RETVAL
876
751IV popcount (UV n) 877IV popcount (UV n)
878 CODE:
879 RETVAL = ecb_popcount32 (n);
880 OUTPUT:
881 RETVAL
882
883NV distance (NV dx, NV dy)
884 CODE:
885 RETVAL = pow (dx * dx + dy * dy, 0.5);
886 OUTPUT:
887 RETVAL
752 888
753void 889void
754pango_init () 890pango_init ()
755 CODE: 891 CODE:
756{ 892{
764#endif 900#endif
765} 901}
766 902
767char *SDL_GetError () 903char *SDL_GetError ()
768 904
769void SDL_braino () 905void SDL_main_hack (SV *real_main)
906 PROTOTYPE: &
770 907
771int SDL_Init (U32 flags) 908int SDL_Init (U32 flags)
772 909
773int SDL_InitSubSystem (U32 flags) 910int SDL_InitSubSystem (U32 flags)
774 911
775void SDL_QuitSubSystem (U32 flags) 912void SDL_QuitSubSystem (U32 flags)
776 913
777void SDL_Quit () 914void SDL_Quit ()
778 915
779int SDL_GL_SetAttribute (int attr, int value) 916int SDL_GL_SetAttribute (int attr, int value)
917 C_ARGS: (SDL_GLattr)attr, value
780 918
781int SDL_GL_GetAttribute (int attr) 919int SDL_GL_GetAttribute (int attr)
782 CODE: 920 CODE:
783 if (SDL_GL_GetAttribute (attr, &RETVAL)) 921 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
784 XSRETURN_UNDEF; 922 XSRETURN_UNDEF;
785 OUTPUT: 923 OUTPUT:
786 RETVAL 924 RETVAL
787 925
788void 926void
843 ); 981 );
844 982
845 if (RETVAL) 983 if (RETVAL)
846 { 984 {
847 av_clear (texture_av); 985 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); 986#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
851#include "glfunc.h" 987#include "glfunc.h"
852#undef GL_FUNC 988#undef GL_FUNC
989 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
990 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
853 } 991 }
854} 992}
855 OUTPUT: 993 OUTPUT:
856 RETVAL 994 RETVAL
995
996void
997SDL_WM_SetCaption (const char *title, const char *icon)
857 998
858void 999void
859SDL_GL_SwapBuffers () 1000SDL_GL_SwapBuffers ()
860 1001
861char * 1002char *
862SDL_GetKeyName (int sym) 1003SDL_GetKeyName (int sym)
1004 C_ARGS: (SDLKey)sym
863 1005
864int 1006int
865SDL_GetAppState () 1007SDL_GetAppState ()
866 1008
867int 1009int
868SDL_GetModState () 1010SDL_GetModState ()
869 1011
1012int
1013SDL_WaitEvent ()
1014 C_ARGS: 0
1015
870void 1016void
1017SDL_PumpEvents ()
1018
1019void
871poll_events () 1020peep_events ()
872 PPCODE: 1021 PPCODE:
873{ 1022{
874 SDL_Event ev; 1023 SDL_Event ev;
875 1024
876 SDL_PumpEvents (); 1025 SDL_PumpEvents ();
883 { 1032 {
884 case SDL_KEYDOWN: 1033 case SDL_KEYDOWN:
885 case SDL_KEYUP: 1034 case SDL_KEYUP:
886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1035 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1036 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); 1037 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 */ 1038 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); 1039 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
891 break; 1040 break;
892 1041
893 case SDL_ACTIVEEVENT: 1042 case SDL_ACTIVEEVENT:
894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1043 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
912 x = ev.motion.x; 1061 x = ev.motion.x;
913 y = ev.motion.y; 1062 y = ev.motion.y;
914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1063 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
915 } 1064 }
916 1065
917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1066 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
918 hv_store (hv, "state", 5, newSViv (state), 0); 1067 hv_store (hv, "state", 5, newSViv (state), 0);
919 hv_store (hv, "x", 1, newSViv (x), 0); 1068 hv_store (hv, "x", 1, newSViv (x), 0);
920 hv_store (hv, "y", 1, newSViv (y), 0); 1069 hv_store (hv, "y", 1, newSViv (y), 0);
921 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1070 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
922 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1071 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
942 1091
943 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1092 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
944 } 1093 }
945} 1094}
946 1095
1096char *
1097SDL_AudioDriverName ()
1098 CODE:
1099{
1100 char buf [256];
1101 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1102 XSRETURN_UNDEF;
1103
1104 RETVAL = buf;
1105}
1106 OUTPUT:
1107 RETVAL
1108
947int 1109int
948Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1110Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
949 POSTCALL: 1111 POSTCALL:
950 Mix_HookMusicFinished (music_finished); 1112 Mix_HookMusicFinished (music_finished);
951 Mix_ChannelFinished (channel_finished); 1113 Mix_ChannelFinished (channel_finished);
952 1114
953void 1115void
954Mix_QuerySpec () 1116Mix_QuerySpec ()
1013add_font (char *file) 1175add_font (char *file)
1014 CODE: 1176 CODE:
1015 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1177 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1016 OUTPUT: 1178 OUTPUT:
1017 RETVAL 1179 RETVAL
1180
1181void
1182IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1183
1184# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1185void
1186Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1018 1187
1019void 1188void
1020load_image_inline (SV *image_) 1189load_image_inline (SV *image_)
1021 ALIAS: 1190 ALIAS:
1022 load_image_file = 1 1191 load_image_file = 1
1068 1237
1069 SDL_LockSurface (surface2); 1238 SDL_LockSurface (surface2);
1070 EXTEND (SP, 6); 1239 EXTEND (SP, 6);
1071 PUSHs (sv_2mortal (newSViv (surface2->w))); 1240 PUSHs (sv_2mortal (newSViv (surface2->w)));
1072 PUSHs (sv_2mortal (newSViv (surface2->h))); 1241 PUSHs (sv_2mortal (newSViv (surface2->h)));
1073 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1242 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))); 1243 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1075 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1244 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1076 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1245 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1077 SDL_UnlockSurface (surface2); 1246 SDL_UnlockSurface (surface2);
1078 1247
1138#if DEBUG 1307#if DEBUG
1139 VALGRIND_DO_LEAK_CHECK; 1308 VALGRIND_DO_LEAK_CHECK;
1140#endif 1309#endif
1141} 1310}
1142 1311
1312int
1313SvREFCNT (SV *sv)
1314 CODE:
1315 RETVAL = SvREFCNT (sv);
1316 OUTPUT:
1317 RETVAL
1318
1143MODULE = Deliantra::Client PACKAGE = DC::Font 1319MODULE = Deliantra::Client PACKAGE = DC::Font
1144 1320
1145PROTOTYPES: DISABLE 1321PROTOTYPES: DISABLE
1146 1322
1147DC::Font 1323DC::Font
1148new_from_file (SV *class, char *path, int id = 0) 1324new_from_file (SV *klass, char *path, int id = 0)
1149 CODE: 1325 CODE:
1150{ 1326{
1151 int count; 1327 int count;
1152 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1328 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1153 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1329 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1182 PROTOTYPE: 1358 PROTOTYPE:
1183 CODE: 1359 CODE:
1184 tc_restore (); 1360 tc_restore ();
1185 1361
1186DC::Layout 1362DC::Layout
1187new (SV *class) 1363new (SV *klass)
1188 CODE: 1364 CODE:
1189 New (0, RETVAL, 1, struct cf_layout); 1365 RETVAL = new cf_layout;
1190 1366
1191 RETVAL->pl = pango_layout_new (opengl_context); 1367 RETVAL->pl = pango_layout_new (opengl_context);
1192 RETVAL->r = 1.; 1368 RETVAL->r = 1.;
1193 RETVAL->g = 1.; 1369 RETVAL->g = 1.;
1194 RETVAL->b = 1.; 1370 RETVAL->b = 1.;
1195 RETVAL->a = 1.; 1371 RETVAL->a = 1.;
1196 RETVAL->base_height = MIN_FONT_HEIGHT; 1372 RETVAL->base_height = MIN_FONT_HEIGHT;
1197 RETVAL->font = 0; 1373 RETVAL->font = 0;
1198 RETVAL->rc = rc_alloc ();
1199 1374
1200 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1375 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1201 layout_update_font (RETVAL); 1376 layout_update_font (RETVAL);
1202 OUTPUT: 1377 OUTPUT:
1203 RETVAL 1378 RETVAL
1204 1379
1205void 1380void
1206DESTROY (DC::Layout self) 1381DESTROY (DC::Layout self)
1207 CODE: 1382 CODE:
1208 g_object_unref (self->pl); 1383 g_object_unref (self->pl);
1209 rc_free (self->rc);
1210 Safefree (self); 1384 delete self;
1211 1385
1212void 1386void
1213set_text (DC::Layout self, SV *text_) 1387set_text (DC::Layout self, SV *text_)
1214 CODE: 1388 CODE:
1215{ 1389{
1341 1515
1342void 1516void
1343set_height (DC::Layout self, int base_height) 1517set_height (DC::Layout self, int base_height)
1344 CODE: 1518 CODE:
1345 if (self->base_height != base_height) 1519 if (self->base_height != base_height)
1346 { 1520 {
1347 self->base_height = base_height; 1521 self->base_height = base_height;
1348 layout_update_font (self); 1522 layout_update_font (self);
1349 } 1523 }
1350 1524
1351void 1525void
1469} 1643}
1470 1644
1471void 1645void
1472render (DC::Layout self, float x, float y, int flags = 0) 1646render (DC::Layout self, float x, float y, int flags = 0)
1473 CODE: 1647 CODE:
1474 rc_clear (self->rc); 1648 self->rc.clear ();
1475 pango_opengl_render_layout_subpixel ( 1649 pango_opengl_render_layout_subpixel (
1476 self->pl, 1650 self->pl,
1477 self->rc, 1651 &self->rc,
1478 x * PANGO_SCALE, y * PANGO_SCALE, 1652 x * PANGO_SCALE, y * PANGO_SCALE,
1479 self->r, self->g, self->b, self->a, 1653 self->r, self->g, self->b, self->a,
1480 flags 1654 flags
1481 ); 1655 );
1482 // we assume that context_change actually clears/frees stuff 1656 // we assume that context_change actually clears/frees stuff
1493 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1667 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1494 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1668 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1495 glEnable (GL_ALPHA_TEST); 1669 glEnable (GL_ALPHA_TEST);
1496 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1670 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1497 1671
1498 rc_draw (self->rc); 1672 self->rc.draw ();
1499 1673
1500 glDisable (GL_ALPHA_TEST); 1674 glDisable (GL_ALPHA_TEST);
1501 glDisable (GL_BLEND); 1675 glDisable (GL_BLEND);
1502 glDisable (GL_TEXTURE_2D); 1676 glDisable (GL_TEXTURE_2D);
1503} 1677}
1578 glDisable (GL_ALPHA_TEST); 1752 glDisable (GL_ALPHA_TEST);
1579 glDisable (GL_BLEND); 1753 glDisable (GL_BLEND);
1580 } 1754 }
1581} 1755}
1582 1756
1757void
1758draw_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)
1759 PROTOTYPE: @
1760 CODE:
1761{
1762 glEnable (GL_BLEND);
1763 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1764 glEnable (GL_TEXTURE_2D);
1765 glBindTexture (GL_TEXTURE_2D, name1);
1766
1767 glColor3f (intensity, intensity, intensity);
1768 glPushMatrix ();
1769 glScalef (1./3, 1./3, 1.);
1770
1771 if (blend > 0.f)
1772 {
1773 float dx3 = dx * -3.f / w;
1774 float dy3 = dy * -3.f / h;
1775 GLfloat env_color[4] = { 0., 0., 0., blend };
1776
1777 /* interpolate the two shadow textures */
1778 /* stage 0 == rgb(glcolor) + alpha(t0) */
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1780
1781 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1782 gl.ActiveTexture (GL_TEXTURE1);
1783 glEnable (GL_TEXTURE_2D);
1784 glBindTexture (GL_TEXTURE_2D, name2);
1785 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1786
1787 /* rgb == rgb(glcolor) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1789 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1791
1792 /* alpha = interpolate t0, t1 by env_alpha */
1793 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1794
1795 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1798
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1804
1805 glBegin (GL_QUADS);
1806 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1807 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1808 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1810 glEnd ();
1811
1812 glDisable (GL_TEXTURE_2D);
1813 gl.ActiveTexture (GL_TEXTURE0);
1814 }
1815 else
1816 {
1817 /* simple blending of one texture, also opengl <1.3 path */
1818 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1819
1820 glBegin (GL_QUADS);
1821 glTexCoord2f (0, 0); glVertex2f (0, 0);
1822 glTexCoord2f (0, t); glVertex2f (0, h);
1823 glTexCoord2f (s, t); glVertex2f (w, h);
1824 glTexCoord2f (s, 0); glVertex2f (w, 0);
1825 glEnd ();
1826 }
1827
1828 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1829 {
1830 int x, y;
1831 int dx3 = dx * 3;
1832 int dy3 = dy * 3;
1833
1834 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1835 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1836 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1837 glTranslatef (-1., -1., 0);
1838 glBegin (GL_QUADS);
1839
1840 for (y = 1; y < h; y += 3)
1841 {
1842 int y1 = y - dy3;
1843 int y1valid = y1 >= 0 && y1 < h;
1844
1845 for (x = 1; x < w; x += 3)
1846 {
1847 int x1 = x - dx3;
1848 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1849 uint8_t h2;
1850
1851 if (y1valid && x1 >= 0 && x1 < w)
1852 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1853 else
1854 h2 = 1; /* out of range == invisible */
1855
1856 if (h1 || h2)
1857 {
1858 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1859 glColor4f (1., 1., 1., alpha);
1860
1861 glTexCoord2f (0, 0.); glVertex2i (x , y );
1862 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1863 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1864 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1865 }
1866 }
1867 }
1868 }
1869
1870 glEnd ();
1871
1872 glPopMatrix ();
1873
1874 glDisable (GL_TEXTURE_2D);
1875 glDisable (GL_BLEND);
1876}
1877
1583IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1878IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1584 CODE: 1879 CODE:
1585{ 1880{
1586 GLint width; 1881 GLint width;
1587 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1882 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1594MODULE = Deliantra::Client PACKAGE = DC::Map 1889MODULE = Deliantra::Client PACKAGE = DC::Map
1595 1890
1596PROTOTYPES: DISABLE 1891PROTOTYPES: DISABLE
1597 1892
1598DC::Map 1893DC::Map
1599new (SV *class) 1894new (SV *klass)
1600 CODE: 1895 CODE:
1601 New (0, RETVAL, 1, struct map); 1896 New (0, RETVAL, 1, mapgrid);
1602 RETVAL->x = 0; 1897 RETVAL->x = 0;
1603 RETVAL->y = 0; 1898 RETVAL->y = 0;
1604 RETVAL->w = 0; 1899 RETVAL->w = 0;
1605 RETVAL->h = 0; 1900 RETVAL->h = 0;
1606 RETVAL->ox = 0; 1901 RETVAL->ox = 0;
1643 1938
1644void 1939void
1645set_smooth (DC::Map self, int face, int smooth, int level) 1940set_smooth (DC::Map self, int face, int smooth, int level)
1646 CODE: 1941 CODE:
1647{ 1942{
1648 tileid texid; 1943 tileid texid;
1649 maptex *tex; 1944 maptex *tex;
1650 1945
1651 if (face < 0 || face >= self->faces) 1946 if (face < 0 || face >= self->faces)
1652 return; 1947 return;
1653 1948
1654 if (smooth < 0 || smooth >= self->faces) 1949 if (smooth < 0 || smooth >= self->faces)
1655 return; 1950 return;
1656 1951
1657 texid = self->face2tile [face]; 1952 texid = self->face2tile [face];
1658 1953
1659 if (!texid) 1954 if (!texid)
1660 return; 1955 return;
1661 1956
1662 tex = self->tex + texid; 1957 tex = self->tex + texid;
1691 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1986 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1692 // use uglier nearest interpolation because linear suffers 1987 // use uglier nearest interpolation because linear suffers
1693 // from transparent color bleeding and ugly wrapping effects. 1988 // from transparent color bleeding and ugly wrapping effects.
1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1989 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1695} 1990}
1991
1992void
1993expire_textures (DC::Map self, int texid, int count)
1994 PPCODE:
1995 for (; texid < self->texs && count; ++texid, --count)
1996 {
1997 maptex *tex = self->tex + texid;
1998
1999 if (tex->name)
2000 {
2001 if (tex->unused)
2002 {
2003 tex->name = 0;
2004 tex->unused = 0;
2005 XPUSHs (sv_2mortal (newSViv (texid)));
2006 }
2007 else
2008 tex->unused = 1;
2009 }
2010 }
1696 2011
1697int 2012int
1698ox (DC::Map self) 2013ox (DC::Map self)
1699 ALIAS: 2014 ALIAS:
1700 oy = 1 2015 oy = 1
1732 self->ox += dx; self->x += dx; 2047 self->ox += dx; self->x += dx;
1733 self->oy += dy; self->y += dy; 2048 self->oy += dy; self->y += dy;
1734 2049
1735 while (self->y < 0) 2050 while (self->y < 0)
1736 { 2051 {
1737 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2052 prepend (self->row, self->rows, MAP_EXTEND_Y);
1738 2053
1739 self->rows += MAP_EXTEND_Y; 2054 self->rows += MAP_EXTEND_Y;
1740 self->y += MAP_EXTEND_Y; 2055 self->y += MAP_EXTEND_Y;
1741 } 2056 }
1742} 2057}
1743 2058
1744SV * 2059SV *
1745map1a_update (DC::Map self, SV *data_, int extmap) 2060map1a_update (DC::Map self, SV *data_)
1746 CODE: 2061 CODE:
1747{ 2062{
1748 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2063 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1749 uint8_t *data_end = (uint8_t *)SvEND (data_); 2064 uint8_t *data_end = (uint8_t *)SvEND (data_);
1750 mapcell *cell; 2065 mapcell *cell;
1771 2086
1772 //TODO: don't trust server data to be in-range(!) 2087 //TODO: don't trust server data to be in-range(!)
1773 2088
1774 if (flags & 8) 2089 if (flags & 8)
1775 { 2090 {
2091 uint8_t ext, cmd;
2092
1776 if (extmap) 2093 do
1777 { 2094 {
1778 uint8_t ext, cmd; 2095 ext = *data++;
2096 cmd = ext & 0x7f;
1779 2097
1780 do 2098 if (cmd < 4)
2099 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2100 else if (cmd == 5) // health
1781 { 2101 {
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; 2102 cell->stat_width = 1;
1790 cell->stat_hp = *data++; 2103 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 } 2104 }
1810 while (ext & 0x80); 2105 else if (cmd == 6) // monster width
2106 cell->stat_width = *data++ + 1;
2107 else if (cmd == 0x47)
2108 {
2109 if (*data == 1) cell->player = data [1];
2110 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2111 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2112 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2113
2114 data += *data + 1;
2115 }
2116 else if (cmd == 8) // cell flags
2117 cell->flags = *data++;
2118 else if (ext & 0x40) // unknown, multibyte => skip
2119 data += *data + 1;
2120 else
2121 data++;
1811 } 2122 }
1812 else 2123 while (ext & 0x80);
1813 cell->darkness = *data++ + 1;
1814 } 2124 }
1815 2125
1816 for (z = 0; z <= 2; ++z) 2126 for (z = 0; z <= 2; ++z)
1817 if (flags & (4 >> z)) 2127 if (flags & (4 >> z))
1818 { 2128 {
1821 cell->tile [z] = self->face2tile [face]; 2131 cell->tile [z] = self->face2tile [face];
1822 2132
1823 if (cell->tile [z]) 2133 if (cell->tile [z])
1824 { 2134 {
1825 maptex *tex = self->tex + cell->tile [z]; 2135 maptex *tex = self->tex + cell->tile [z];
2136 tex->unused = 0;
1826 if (!tex->name) 2137 if (!tex->name)
1827 av_push (missing, newSViv (cell->tile [z])); 2138 av_push (missing, newSViv (cell->tile [z]));
1828 2139
1829 if (tex->smoothtile) 2140 if (tex->smoothtile)
1830 { 2141 {
1831 maptex *smooth = self->tex + tex->smoothtile; 2142 maptex *smooth = self->tex + tex->smoothtile;
2143 smooth->unused = 0;
1832 if (!smooth->name) 2144 if (!smooth->name)
1833 av_push (missing, newSViv (tex->smoothtile)); 2145 av_push (missing, newSViv (tex->smoothtile));
1834 } 2146 }
1835 } 2147 }
1836 } 2148 }
1864 ? self->row + y 2176 ? self->row + y
1865 : 0; 2177 : 0;
1866 2178
1867 for (x = x0; x < x1; x++) 2179 for (x = x0; x < x1; x++)
1868 { 2180 {
1869 int r = 32, g = 32, b = 32, a = 192; 2181 unsigned int r = 32, g = 32, b = 32, a = 192;
1870 2182
1871 if (row && row->c0 <= x && x < row->c1) 2183 if (row && row->c0 <= x && x < row->c1)
1872 { 2184 {
1873 mapcell *cell = row->col + (x - row->c0); 2185 mapcell *cell = row->col + (x - row->c0);
1874 2186
1876 { 2188 {
1877 maptex tex = self->tex [cell->tile [z]]; 2189 maptex tex = self->tex [cell->tile [z]];
1878 int a0 = 255 - tex.a; 2190 int a0 = 255 - tex.a;
1879 int a1 = tex.a; 2191 int a1 = tex.a;
1880 2192
1881 r = (r * a0 + tex.r * a1) / 255; 2193 r = div255 (r * a0 + tex.r * a1);
1882 g = (g * a0 + tex.g * a1) / 255; 2194 g = div255 (g * a0 + tex.g * a1);
1883 b = (b * a0 + tex.b * a1) / 255; 2195 b = div255 (b * a0 + tex.b * a1);
1884 a = (a * a0 + tex.a * a1) / 255; 2196 a = div255 (a * a0 + tex.a * a1);
1885 } 2197 }
1886 } 2198 }
1887 2199
1888 *map++ = (r ) 2200 *map++ = (r )
1889 | (g << 8) 2201 | (g << 8)
1890 | (b << 16) 2202 | (b << 16)
1891 | (a << 24); 2203 | (a << 24);
1892 } 2204 }
1893 } 2205 }
1894 2206
1895 RETVAL = map_sv; 2207 RETVAL = map_sv;
1896} 2208}
1897 OUTPUT: 2209 OUTPUT:
1898 RETVAL 2210 RETVAL
1899 2211
1900void 2212void
1901draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2213draw (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: 2214 CODE:
1903{ 2215{
1904 int x, y, z; 2216 int x, y, z;
1905 2217
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) 2218 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; 2219 int pl_x, pl_y;
1911 maptex pl_tex; 2220 maptex pl_tex;
1912 rc_t *rc = rc_alloc (); 2221 rc_t rc;
2222 rc_t rc_ov;
1913 rc_key_t key; 2223 rc_key_t key;
1914 rc_array_t *arr; 2224 rc_t::array_t *arr;
1915 2225
1916 pl_tex.name = 0; 2226 pl_tex.name = 0;
1917 2227
1918 // thats current max. sorry. 2228 // that's current max. sorry.
1919 if (sw > 255) sw = 255; 2229 if (sw > 255) sw = 255;
1920 if (sh > 255) sh = 255; 2230 if (sh > 255) sh = 255;
1921
1922 // clear key, in case of extra padding
1923 memset (&skey, 0, sizeof (skey));
1924 2231
1925 memset (&key, 0, sizeof (key)); 2232 memset (&key, 0, sizeof (key));
1926 key.r = 255; 2233 key.r = 255;
1927 key.g = 255; 2234 key.g = 255;
1928 key.b = 255; 2235 key.b = 255;
1929 key.a = 255; 2236 key.a = 255;
1930 key.mode = GL_QUADS; 2237 key.mode = GL_QUADS;
1931 key.format = GL_T2F_V3F; 2238 key.format = GL_T2F_V3F;
1932 key.texname = -1;
1933 2239
1934 mx += self->x; 2240 mx += self->x;
1935 my += self->y; 2241 my += self->y;
1936 2242
1937 // first pass: determine smooth_max 2243 // first pass: determine smooth_max
1938 // rather ugly, if you ask me 2244 // rather ugly, if you ask me
1939 // could also be stored inside mapcell and updated on change 2245 // could also be stored inside mapcell and updated on change
1940 memset (smooth_max, 0, sizeof (smooth_max)); 2246 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1941 2247
1942 for (y = 0; y < sh; y++) 2248 for (y = 0; y < sh; y++)
1943 if (0 <= y + my && y + my < self->rows) 2249 if (0 <= y + my && y + my < self->rows)
1944 { 2250 {
1945 maprow *row = self->row + (y + my); 2251 maprow *row = self->row + (y + my);
1960 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2266 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1961 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2267 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1962 2268
1963 for (z = 0; z <= 2; z++) 2269 for (z = 0; z <= 2; z++)
1964 { 2270 {
1965 memset (smooth_level, 0, sizeof (smooth_level)); 2271 std::bitset<256> smooth_level; // one bit for every possible smooth level
2272 smooth_key skey;
2273 smooth_hash smooth;
2274 key.texname = -1;
1966 2275
1967 for (y = 0; y < sh; y++) 2276 for (y = 0; y < sh; y++)
1968 if (0 <= y + my && y + my < self->rows) 2277 if (0 <= y + my && y + my < self->rows)
1969 { 2278 {
1970 maprow *row = self->row + (y + my); 2279 maprow *row = self->row + (y + my);
1976 tileid tile = cell->tile [z]; 2285 tileid tile = cell->tile [z];
1977 2286
1978 if (tile) 2287 if (tile)
1979 { 2288 {
1980 maptex tex = self->tex [tile]; 2289 maptex tex = self->tex [tile];
1981 int px = (x + 1) * T - tex.w; 2290 int px, py;
1982 int py = (y + 1) * T - tex.h;
1983 2291
1984 if (key.texname != tex.name) 2292 if (key.texname != tex.name)
1985 { 2293 {
2294 self->tex [tile].unused = 0;
2295
1986 if (!tex.name) 2296 if (!tex.name)
1987 tex = self->tex [2]; /* missing, replace by noface */ 2297 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1988 2298
1989 key.texname = tex.name; 2299 key.texname = tex.name;
1990 arr = rc_array (rc, &key); 2300 arr = &rc.array (key);
1991 } 2301 }
1992 2302
2303 px = (x + 1) * Th - tex.w;
2304 py = (y + 1) * Tw - tex.h;
2305
1993 if (expect_false (cell->player == player) && expect_false (z == 2)) 2306 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1994 { 2307 {
1995 pl_x = px; 2308 pl_x = px;
1996 pl_y = py; 2309 pl_y = py;
1997 pl_tex = tex; 2310 pl_tex = tex;
1998 continue; 2311 continue;
1999 } 2312 }
2000 2313
2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2314 arr->t2f_v3f (0 , 0 , px , py , 0);
2002 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2315 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); 2316 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); 2317 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 2318
2031 // update smooth hash 2319 // update smooth hash
2032 if (tex.smoothtile) 2320 if (tex.smoothtile)
2033 { 2321 {
2034 skey.tile = tex.smoothtile; 2322 skey.tile = tex.smoothtile;
2035 skey.level = tex.smoothlevel; 2323 skey.level = tex.smoothlevel;
2036 2324
2037 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2325 smooth_level[tex.smoothlevel] = 1;
2038 2326
2039 // add bits to current tile and all neighbours. skey.x|y is 2327 // add bits to current tile and all neighbours. skey.x|y is
2040 // shifted +1|+1 so we always stay positive. 2328 // shifted +1|+1 so we always stay positive.
2041 2329
2042 // bits is ___n cccc CCCC bbbb 2330 // bits is ___n cccc CCCC bbbb
2050 2338
2051 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2339 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2052 // ·· ·· ·┏ ┓· 2340 // ·· ·· ·┏ ┓·
2053 2341
2054 // full tile 2342 // full tile
2055 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2343 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2056 2344
2057 // borders 2345 // borders
2058 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2346 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); 2347 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); 2348 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); 2349 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2062 2350
2063 // corners 2351 // corners
2064 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2352 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); 2353 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); 2354 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); 2355 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2356 }
2357 }
2358
2359 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2360 {
2361 // overlays such as the speech bubble, probably more to come
2362 if (cell->flags & 1)
2363 {
2364 rc_key_t key_ov = key;
2365 maptex tex = self->tex[TEXID_SPEECH];
2366 int px = x * Tw + Tw * 2 / 32;
2367 int py = y * Th - Th * 6 / 32;
2368
2369 key_ov.texname = tex.name;
2370 rc_t::array_t &arr = rc_ov.array (key_ov);
2371
2372 arr.t2f_v3f (0 , 0 , px , py , 0);
2373 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2374 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2375 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2068 } 2376 }
2069 } 2377 }
2070 } 2378 }
2071 } 2379 }
2072 2380
2073 rc_draw (rc); 2381 rc.draw ();
2074 rc_clear (rc); 2382 rc.clear ();
2075 2383
2076 // go through all smoothlevels, lowest to highest, then draw. 2384 // go through all smoothlevels, lowest to highest, then draw.
2077 // this is basically counting sort 2385 // this is basically counting sort
2078 { 2386 {
2079 int w, b; 2387 int w, b;
2080 2388
2081 glEnable (GL_TEXTURE_2D); 2389 glEnable (GL_TEXTURE_2D);
2082 glBegin (GL_QUADS); 2390 glBegin (GL_QUADS);
2083 for (w = 0; w < 256 / 32; ++w) 2391 for (int level = 0; level < smooth_level.size (); ++level)
2392 if (smooth_level[level])
2393 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2084 { 2394 {
2085 uint32_t smask = smooth_level [w]; 2395 smooth_key &skey = it->first;
2086 if (smask) 2396 IV bits = it->second;
2087 for (b = 0; b < 32; ++b) 2397
2088 if (smask & (((uint32_t)1) << b)) 2398 if (!(bits & 0x1000)
2399 && skey.level == level
2400 && level > smooth_max [skey.x][skey.y])
2089 { 2401 {
2090 int level = (w << 5) | b; 2402 maptex tex = self->tex [skey.tile];
2403 int px = (((int)skey.x) - 1) * Tw;
2404 int py = (((int)skey.y) - 1) * Th;
2405 int border = bits & 15;
2406 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2407 float dx = tex.s * .0625f; // 16 images/row
2408 float dy = tex.t * .5f ; // 2 images/column
2409
2091 HE *he; 2410 if (tex.name)
2092
2093 hv_iterinit (smooth);
2094 while ((he = hv_iternext (smooth)))
2095 { 2411 {
2096 smooth_key *skey = (smooth_key *)HeKEY (he); 2412 // this time avoiding texture state changes
2097 IV bits = SvIVX (HeVAL (he)); 2413 // save gobs of state changes.
2098 2414 if (key.texname != tex.name)
2099 if (!(bits & 0x1000)
2100 && skey->level == level
2101 && level > smooth_max [skey->x][skey->y])
2102 { 2415 {
2103 maptex tex = self->tex [skey->tile]; 2416 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 2417
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 (); 2418 glEnd ();
2118 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2419 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2119 glBegin (GL_QUADS); 2420 glBegin (GL_QUADS);
2120 } 2421 }
2121 2422
2122 if (border) 2423 if (border)
2123 { 2424 {
2124 float ox = border * dx; 2425 float ox = border * dx;
2125 2426
2126 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2427 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2127 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2128 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2129 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2430 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2130 } 2431 }
2131 2432
2132 if (corner) 2433 if (corner)
2133 { 2434 {
2134 float ox = corner * dx; 2435 float ox = corner * dx;
2135 2436
2136 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2137 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2438 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2138 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2439 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2139 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2440 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2140 }
2141 }
2142 } 2441 }
2143 } 2442 }
2144 } 2443 }
2145 } 2444 }
2146 2445
2147 glEnd (); 2446 glEnd ();
2148 glDisable (GL_TEXTURE_2D); 2447 glDisable (GL_TEXTURE_2D);
2149 key.texname = -1; 2448 key.texname = -1;
2150 } 2449 }
2151
2152 hv_clear (smooth);
2153 } 2450 }
2154 2451
2155 if (pl_tex.name) 2452 if (pl_tex.name)
2156 { 2453 {
2157 maptex tex = pl_tex; 2454 maptex tex = pl_tex;
2158 int px = pl_x + sdx; 2455 int px = pl_x + sdx;
2159 int py = pl_y + sdy; 2456 int py = pl_y + sdy;
2160 2457
2161 key.texname = tex.name; 2458 key.texname = tex.name;
2162 arr = rc_array (rc, &key); 2459 rc_t::array_t &arr = rc.array (key);
2163 2460
2164 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2461 arr.t2f_v3f (0 , 0 , px , py , 0);
2165 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2462 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); 2463 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); 2464 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2168 2465
2169 rc_draw (rc); 2466 rc.draw ();
2170 } 2467 }
2171 2468
2469 rc_ov.draw ();
2470 rc_ov.clear ();
2471
2172 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
2173 rc_free (rc);
2174 2473
2175 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2176 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2177 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2178 { 2477 {
2181 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2182 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2183 { 2482 {
2184 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2185 2484
2186 int px = x * T; 2485 int px = x * Tw;
2187 int py = y * T; 2486 int py = y * Th;
2487
2488 if (ecb_expect_false (cell->player == player))
2489 {
2490 px += sdx;
2491 py += sdy;
2492 }
2188 2493
2189 if (cell->stat_hp) 2494 if (cell->stat_hp)
2190 { 2495 {
2191 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2192 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2193 2498
2194 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2195 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2196 px + width - 1, py); 2501 px + width - 1, py);
2197 2502
2203 } 2508 }
2204 } 2509 }
2205} 2510}
2206 2511
2207void 2512void
2208draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2513draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2209 CODE: 2514 CODE:
2210{ 2515{
2211 static float color[16][3] = { 2516 static float color[16][3] = {
2212 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2213 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2214 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2215 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2216 2521
2217 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2218 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2219 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2220 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2221 2526
2222 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2223 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2224 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2225 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2226 2531
2227 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2228 2533
2229 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2230 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2231 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2232 }; 2537 };
2233 2538
2234 int x, y; 2539 int x, y;
2235 2540
2236 glEnable (GL_TEXTURE_2D); 2541 glEnable (GL_TEXTURE_2D);
2542 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2543 * but the nvidia driver (185.18.14) mishandles alpha textures
2544 * and takes the colour from god knows where instead of using
2545 * Cp. MODULATE results in the same colour, but slightly different
2546 * alpha, but atcually gives us the correct colour with nvidia.
2547 */
2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2238 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2239 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2240 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2241 2552
2242 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2246 2557
2247 if (m) 2558 if (m)
2248 { 2559 {
2249 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2250 2561
2251 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2252 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2253 2564
2254 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2255 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2256 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2257 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2258 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2259 } 2570 }
2267void 2578void
2268fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2579fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2269 PPCODE: 2580 PPCODE:
2270{ 2581{
2271 int x, y; 2582 int x, y;
2272 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2273 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2274 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2275 int sw34 = (sw * 3 + 3) & ~3; 2586 int sw3 = sw * 3;
2587 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2588 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2276 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2277 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2278 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2279 2591
2280 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2281 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2282 2594
2283 mx += self->x - 1; 2595 mx += self->x - 1;
2284 my += self->y - 1; 2596 my += self->y - 1;
2285
2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2287 2597
2288 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2289 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2290 { 2600 {
2291 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2294 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2295 { 2605 {
2296 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2297 2607
2298 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2299 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2300 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2301 } 2611 }
2302 } 2612 }
2303 2613
2304 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2305 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2324 2634
2325 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2326 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2327 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2328 2638
2329 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2330 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2331 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2332 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2333 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2643 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); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2335 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2336 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2337 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2338 } 2648 }
2339 2649
2340 free (darkness1); 2650 free (darkness1);
2341 2651
2342 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2343 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2344 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2345 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2346} 2656}
2347 2657
2348SV * 2658SV *
2411 else 2721 else
2412 *data++ = 0; 2722 *data++ = 0;
2413 } 2723 }
2414 } 2724 }
2415 2725
2416 /* if size is w*h + 5 then no data has been found */ 2726 /* if size is w*h + 5 then no data has been found */
2417 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2418 { 2728 {
2419 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2420 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2421 } 2731 }
2422 2732
2423 RETVAL = data_sv; 2733 RETVAL = data_sv;
2424} 2734}
2425 OUTPUT: 2735 OUTPUT:
2426 RETVAL 2736 RETVAL
2427 2737
2428void 2738void
2435 STRLEN len; 2745 STRLEN len;
2436 uint8_t *data, *end; 2746 uint8_t *data, *end;
2437 2747
2438 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2439 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2440 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2441 end = data + len + 8; 2751 end = data + len + 8;
2442 2752
2443 if (len < 5) 2753 if (len < 5)
2444 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2445 2755
2506} 2816}
2507 2817
2508MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2509 2819
2510DC::RW 2820DC::RW
2511new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2512 CODE: 2822 CODE:
2513{ 2823{
2514 STRLEN datalen; 2824 STRLEN datalen;
2515 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2516 2826
2518} 2828}
2519 OUTPUT: 2829 OUTPUT:
2520 RETVAL 2830 RETVAL
2521 2831
2522DC::RW 2832DC::RW
2523new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2524 CODE: 2834 CODE:
2525 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2526 OUTPUT: 2836 OUTPUT:
2527 RETVAL 2837 RETVAL
2528 2838
2546 if (RETVAL < 0) 2856 if (RETVAL < 0)
2547 { 2857 {
2548 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2549 2859
2550 if (RETVAL < 0) 2860 if (RETVAL < 0)
2861 {
2862 // happens sometimes, maybe it just stopped playing(?)
2863 RETVAL = Mix_GroupAvailable (-1);
2864
2865 if (RETVAL < 0)
2551 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2552 2867 }
2868 else
2553 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2554 } 2870 }
2555 2871
2556 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2557 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2558} 2874}
2605void 2921void
2606set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2607 CODE: 2923 CODE:
2608{ 2924{
2609 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2925 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); 2926 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2611 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2612} 2928}
2613 2929
2614void 2930void
2615set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2618 2934
2619MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2620 2936
2621PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2622 2938
2939void
2940decoders ()
2941 PPCODE:
2942#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2943 int i, num = Mix_GetNumChunkDecoders ();
2944 EXTEND (SP, num);
2945 for (i = 0; i < num; ++i)
2946 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2947#else
2948 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2949#endif
2950
2623DC::MixChunk 2951DC::MixChunk
2624new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2625 CODE: 2953 CODE:
2626 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2627 OUTPUT: 2955 OUTPUT:
2628 RETVAL 2956 RETVAL
2629 2957
2659 OUTPUT: 2987 OUTPUT:
2660 RETVAL 2988 RETVAL
2661 2989
2662MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2663 2991
2992void
2993decoders ()
2994 PPCODE:
2995#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2996 int i, num = Mix_GetNumMusicDecoders ();
2997 EXTEND (SP, num);
2998 for (i = 0; i < num; ++i)
2999 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3000#else
3001 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3002#endif
3003
2664int 3004int
2665volume (int volume = -1) 3005volume (int volume = -1)
2666 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2667 CODE: 3007 CODE:
2668 if (items > 0) 3008 if (items > 0)
2679void 3019void
2680halt () 3020halt ()
2681 CODE: 3021 CODE:
2682 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2683 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2684DC::MixMusic 3031DC::MixMusic
2685new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2686 CODE: 3033 CODE:
2687 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2688 OUTPUT: 3035 OUTPUT:
2689 RETVAL 3036 RETVAL
2690 3037
2718 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2719# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2720 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2721 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2722 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2723 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2724 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2725 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2726 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2727 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2739 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2740 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2741 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2742 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2743 const_iv (GL_ONE_MINUS_DST_ALPHA), 3091 const_iv (GL_ONE_MINUS_DST_ALPHA),
3092 const_iv (GL_SRC_COLOR),
3093 const_iv (GL_DST_COLOR),
3094 const_iv (GL_ONE_MINUS_SRC_COLOR),
3095 const_iv (GL_ONE_MINUS_DST_COLOR),
2744 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2745 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2746 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2747 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2748 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2816 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2817 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2818 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2819 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2820 const_iv (GL_T2F_N3F_V3F), 3172 const_iv (GL_T2F_N3F_V3F),
3173 const_iv (GL_FUNC_ADD),
3174 const_iv (GL_FUNC_SUBTRACT),
3175 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2821# undef const_iv 3176# undef const_iv
2822 }; 3177 };
2823 3178
2824 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3179 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2825 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2826 3181
2827 texture_av = newAV (); 3182 texture_av = newAV ();
2828 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2829} 3184}
2830 3185
2832disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2833 CODE: 3188 CODE:
2834 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2835 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2836 3191
2837char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2838gl_vendor () 3196gl_vendor ()
2839 CODE: 3197 CODE:
2840 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2841 OUTPUT: 3199 OUTPUT:
2842 RETVAL 3200 RETVAL
2843 3201
2844char * 3202const char *
2845gl_version () 3203gl_version ()
2846 CODE: 3204 CODE:
2847 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2848 OUTPUT: 3206 OUTPUT:
2849 RETVAL 3207 RETVAL
2850 3208
2851char * 3209const char *
2852gl_extensions () 3210gl_extensions ()
2853 CODE: 3211 CODE:
2854 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2855 OUTPUT: 3213 OUTPUT:
2856 RETVAL 3214 RETVAL
2857 3215
2858const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2859 3221
2860GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2861 CODE: 3223 CODE:
2862 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2863 OUTPUT: 3225 OUTPUT:
2871 3233
2872int glGetError () 3234int glGetError ()
2873 3235
2874void glFinish () 3236void glFinish ()
2875 3237
3238void glFlush ()
3239
2876void glClear (int mask) 3240void glClear (int mask)
2877 3241
2878void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2879 PROTOTYPE: @ 3243 PROTOTYPE: @
2880 3244
2889void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2890 3254
2891void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2892 CODE: 3256 CODE:
2893 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2894 3260
2895void glDepthMask (int flag) 3261void glDepthMask (int flag)
2896 3262
2897void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2898 3264
2933void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2934 CODE: 3300 CODE:
2935 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2936 3302
2937void glColor (float r, float g, float b, float a = 1.0) 3303void glColor (float r, float g, float b, float a = 1.0)
3304 PROTOTYPE: @
2938 ALIAS: 3305 ALIAS:
2939 glColor_premultiply = 1 3306 glColor_premultiply = 1
2940 CODE: 3307 CODE:
2941 if (ix) 3308 if (ix)
2942 { 3309 {
3048 3415
3049void glEndList () 3416void glEndList ()
3050 3417
3051void glCallList (int list) 3418void glCallList (int list)
3052 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3053MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3054 3426
3055PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3056 3428
3057void 3429void
3058find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3059 PPCODE: 3431 PPCODE:
3060{ 3432{
3061 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3062 XPUSHs (self); 3434 XPUSHs (self);
3063} 3435}
3064 3436
3065BOOT: 3437BOOT:
3066{ 3438{
3074 3446
3075void 3447void
3076draw (SV *self) 3448draw (SV *self)
3077 CODE: 3449 CODE:
3078{ 3450{
3079 HV *hv; 3451 HV *hv;
3080 SV **svp; 3452 SV **svp;
3081 NV x, y, w, h; 3453 NV x, y, w, h;
3082 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3083 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3084 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3085 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines