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.330 by root, Sun Nov 18 15:24:24 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
81#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
83 89
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 91
92/* this is used as fow flag as well, so has to have a different value */
93/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
87 96
88#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
90 99
91#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
92 101
93/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
104
105#define KMOD_LRAM 0x10000 // our extension
106
107#define TEXID_SPEECH 1
108#define TEXID_NOFACE 2
109
110static char *
111fast_sv_grow (SV *sv, STRLEN need)
112{
113 STRLEN len = SvLEN (sv);
114 STRLEN want = SvCUR (sv) + need;
115
116 if (expect_false (len < want))
117 {
118 do
119 len *= 2;
120 while (len < want);
121
122 sv_grow (sv, len);
123 }
124
125 SvCUR_set (sv, want);
126 return SvEND (sv) - need;
127}
95 128
96static AV *texture_av; 129static AV *texture_av;
97 130
98static struct 131static struct
99{ 132{
156{ 189{
157 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
158 191
159 while (attrs) 192 while (attrs)
160 { 193 {
161 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
162 195
163 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
164 return 1; 197 return 1;
165 198
166 attrs = attrs->next; 199 attrs = attrs->next;
167 } 200 }
168 201
169 return 0; 202 return 0;
170} 203}
171 204
172typedef struct cf_layout { 205struct cf_layout {
173 PangoLayout *pl; 206 PangoLayout *pl;
174 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
175 int base_height; 208 int base_height;
176 DC__Font font; 209 DC__Font font;
177 rc_t *rc; 210 rc_t rc;
178} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
179 214
180static DC__Font default_font; 215static DC__Font default_font;
181static PangoContext *opengl_context; 216static PangoContext *opengl_context;
182static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
183 218
184static void 219static void
185substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
186{ 221{
187 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
188#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
189 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
190#endif 225#endif
191 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
192} 227}
193 228
194static void 229static void
224} 259}
225 260
226typedef uint16_t tileid; 261typedef uint16_t tileid;
227typedef uint16_t faceid; 262typedef uint16_t faceid;
228 263
229typedef struct { 264struct maptex
265{
230 GLuint name; 266 GLuint name;
231 int w, h; 267 int w, h;
232 float s, t; 268 float s, t;
233 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
234 tileid smoothtile; 270 tileid smoothtile;
235 uint8_t smoothlevel; 271 uint8_t smoothlevel;
236} maptex; 272 uint8_t unused; /* set to zero on use */
273};
237 274
238typedef struct { 275struct mapcell
276{
239 uint32_t player; 277 uint32_t player;
240 tileid tile[3]; 278 tileid tile[3];
241 uint16_t darkness; 279 uint16_t darkness;
242 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
243} mapcell; 281};
244 282
245typedef struct { 283struct maprow
284{
246 int32_t c0, c1; 285 int32_t c0, c1;
247 mapcell *col; 286 mapcell *col;
248} maprow; 287};
249 288
250typedef struct map { 289struct mapgrid {
251 int x, y, w, h; 290 int x, y, w, h;
252 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
253 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
254 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
255 294
256 int32_t rows; 295 int32_t rows;
257 maprow *row; 296 maprow *row;
258} *DC__Map; 297};
259 298
260static char * 299typedef mapgrid *DC__Map;
300
301template<typename T>
302static void
261prepend (char *ptr, int sze, int inc) 303prepend (T *&ptr, int sze, int inc)
262{ 304{
263 char *p; 305 T *p;
264 306
265 New (0, p, sze + inc, char); 307 Newxz (p, sze + inc, T);
266 Zero (p, inc, char);
267 Move (ptr, p + inc, sze, char); 308 Move (ptr, p + inc, sze, T);
268 Safefree (ptr); 309 Safefree (ptr);
269 310
270 return p; 311 ptr = p;
271} 312}
272 313
273static char * 314template<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 315static void
316append (T *&ptr, int sze, int inc)
317{
318 Renew (ptr, sze + inc, T);
319 Zero (ptr + sze, inc, T);
320}
321
322static void
286need_facenum (struct map *self, faceid face) 323need_facenum (struct mapgrid *self, faceid face)
287{ 324{
288 while (self->faces <= face) 325 while (self->faces <= face)
289 { 326 {
290 Append (tileid, self->face2tile, self->faces, self->faces); 327 append (self->face2tile, self->faces, self->faces);
291 self->faces *= 2; 328 self->faces *= 2;
292 } 329 }
293} 330}
294 331
295static void 332static void
296need_texid (struct map *self, int texid) 333need_texid (struct mapgrid *self, int texid)
297{ 334{
298 while (self->texs <= texid) 335 while (self->texs <= texid)
299 { 336 {
300 Append (maptex, self->tex, self->texs, self->texs); 337 append (self->tex, self->texs, self->texs);
301 self->texs *= 2; 338 self->texs *= 2;
302 } 339 }
303} 340}
304 341
305static maprow * 342static maprow *
306map_get_row (DC__Map self, int y) 343map_get_row (mapgrid *self, int y)
307{ 344{
308 if (0 > y) 345 if (0 > y)
309 { 346 {
310 int extend = - y + MAP_EXTEND_Y; 347 int extend = - y + MAP_EXTEND_Y;
311 Prepend (maprow, self->row, self->rows, extend); 348 prepend (self->row, self->rows, extend);
312 349
313 self->rows += extend; 350 self->rows += extend;
314 self->y += extend; 351 self->y += extend;
315 y += extend; 352 y += extend;
316 } 353 }
317 else if (y >= self->rows) 354 else if (y >= self->rows)
318 { 355 {
319 int extend = y - self->rows + MAP_EXTEND_Y; 356 int extend = y - self->rows + MAP_EXTEND_Y;
320 Append (maprow, self->row, self->rows, extend); 357 append (self->row, self->rows, extend);
321 self->rows += extend; 358 self->rows += extend;
322 } 359 }
323 360
324 return self->row + y; 361 return self->row + y;
325} 362}
335 } 372 }
336 373
337 if (row->c0 > x) 374 if (row->c0 > x)
338 { 375 {
339 int extend = row->c0 - x + MAP_EXTEND_X; 376 int extend = row->c0 - x + MAP_EXTEND_X;
340 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 377 prepend (row->col, row->c1 - row->c0, extend);
341 row->c0 -= extend; 378 row->c0 -= extend;
342 } 379 }
343 else if (x >= row->c1) 380 else if (x >= row->c1)
344 { 381 {
345 int extend = x - row->c1 + MAP_EXTEND_X; 382 int extend = x - row->c1 + MAP_EXTEND_X;
346 Append (mapcell, row->col, row->c1 - row->c0, extend); 383 append (row->col, row->c1 - row->c0, extend);
347 row->c1 += extend; 384 row->c1 += extend;
348 } 385 }
349 386
350 return row->col + (x - row->c0); 387 return row->col + (x - row->c0);
351} 388}
352 389
353static mapcell * 390static mapcell *
354map_get_cell (DC__Map self, int x, int y) 391map_get_cell (mapgrid *self, int x, int y)
355{ 392{
356 return row_get_cell (map_get_row (self, y), x); 393 return row_get_cell (map_get_row (self, y), x);
357} 394}
358 395
359static void 396static void
360map_clear (DC__Map self) 397map_clear (mapgrid *self)
361{ 398{
362 int r; 399 int r;
363 400
364 for (r = 0; r < self->rows; r++) 401 for (r = 0; r < self->rows; r++)
365 Safefree (self->row[r].col); 402 Safefree (self->row[r].col);
383 (cell)->flags = 0; \ 420 (cell)->flags = 0; \
384 (cell)->player = 0; \ 421 (cell)->player = 0; \
385 } while (0) 422 } while (0)
386 423
387static void 424static void
388map_blank (DC__Map self, int x0, int y0, int w, int h) 425map_blank (mapgrid *self, int x0, int y0, int w, int h)
389{ 426{
390 int x, y; 427 int x, y;
391 maprow *row; 428 maprow *row;
392 mapcell *cell; 429 mapcell *cell;
393 430
410 CELL_CLEAR (cell); 447 CELL_CLEAR (cell);
411 } 448 }
412 } 449 }
413} 450}
414 451
415typedef struct { 452struct smooth_key
453{
416 tileid tile; 454 tileid tile;
417 uint8_t x, y, level; 455 uint8_t x, y, level;
418} smooth_key; 456
457 bool operator == (const smooth_key &o) const
458 {
459 return tile == o.tile && x == o.x && y == o.y && level == o.level;
460 }
461};
462
463typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
464
465namespace std {
466 template <>
467 struct hash<smooth_key>
468 {
469 size_t operator () (const smooth_key &v) const
470 {
471 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
472 }
473 };
474}
419 475
420static void 476static void
421smooth_or_bits (HV *hv, smooth_key *key, IV bits) 477smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
422{ 478{
423 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 479 auto &&it = h.find (key);
424 480
425 if (SvIOK (*sv)) 481 if (it == h.end ())
426 SvIV_set (*sv, SvIVX (*sv) | bits); 482 h.insert (std::make_pair (key, bits));
427 else 483 else
428 sv_setiv (*sv, bits); 484 it->second |= bits;
429} 485}
430 486
431static void 487static void
432music_finished (void) 488music_finished (void)
433{ 489{
450 ev.code = 1; 506 ev.code = 1;
451 ev.data1 = (void *)(long)channel; 507 ev.data1 = (void *)(long)channel;
452 ev.data2 = 0; 508 ev.data2 = 0;
453 509
454 SDL_PushEvent ((SDL_Event *)&ev); 510 SDL_PushEvent ((SDL_Event *)&ev);
511}
512
513// approximately divide by 255
514static unsigned int
515div255 (unsigned int n)
516{
517 return (n + (n >> 8)) >> 8;
455} 518}
456 519
457static unsigned int 520static unsigned int
458minpot (unsigned int n) 521minpot (unsigned int n)
459{ 522{
527 return 0; 590 return 0;
528 591
529 return 1; 592 return 1;
530} 593}
531 594
595/******************************************************************************/
596
597/* process keyboard modifiers */
598static int
599mod_munge (int mod)
600{
601 mod &= MOD_MASK;
602
603 if (mod & (KMOD_META | KMOD_ALT))
604 mod |= KMOD_LRAM;
605
606 return mod;
607}
608
532static void 609static void
533deliantra_main () 610deliantra_main (SV *real_main)
534{ 611{
535 call_argv ("::main", G_DISCARD | G_VOID, 0);
536 dSP; 612 dSP;
613
614 PUSHMARK (SP);
615 call_sv (real_main, G_DISCARD | G_VOID);
537} 616}
538 617
539#ifdef __MACOSX__ 618#ifdef __MACOSX__
619 static SV *real_main;
620
540 /* to due surprising braindamage on the side of SDL design, we 621 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main() 622 * 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, 623 * 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, 624 * due to shared library magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back. 625 * and which calls our main (== SDL_main) back.
545 */ 626 */
546 extern C_LINKAGE int 627 extern C_LINKAGE int
547 main (int argc, char *argv[]) 628 main (int argc, char *argv[])
548 { 629 {
549 deliantra_main (); 630 deliantra_main (real_main);
550 } 631 }
551 632
552 #undef main 633 #undef main
553 634
554 extern C_LINKAGE int main (int argc, char *argv[]); 635 extern C_LINKAGE int main (int argc, char *argv[]);
555 636
556 static void 637 static void
557 SDL_braino (void) 638 SDL_main_hack (SV *real_main_)
558 { 639 {
640 real_main = real_main_;
641
559 char *argv[] = { "deliantra client", 0 }; 642 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv); 643 (main) (1, argv);
561 } 644 }
562#else 645#else
563 static void 646 static void
564 SDL_braino (void) 647 SDL_main_hack (SV *real_main)
565 { 648 {
566 deliantra_main (); 649 deliantra_main (real_main);
567 } 650 }
568#endif 651#endif
569 652
570MODULE = Deliantra::Client PACKAGE = DC 653MODULE = Deliantra::Client PACKAGE = DC
571 654
602 const_iv (SDL_USEREVENT), 685 const_iv (SDL_USEREVENT),
603 686
604 const_iv (SDL_APPINPUTFOCUS), 687 const_iv (SDL_APPINPUTFOCUS),
605 const_iv (SDL_APPMOUSEFOCUS), 688 const_iv (SDL_APPMOUSEFOCUS),
606 const_iv (SDL_APPACTIVE), 689 const_iv (SDL_APPACTIVE),
690
691
692 const_iv (SDLK_UNKNOWN),
693 const_iv (SDLK_FIRST),
694 const_iv (SDLK_BACKSPACE),
695 const_iv (SDLK_TAB),
696 const_iv (SDLK_CLEAR),
697 const_iv (SDLK_RETURN),
698 const_iv (SDLK_PAUSE),
699 const_iv (SDLK_ESCAPE),
700 const_iv (SDLK_SPACE),
701 const_iv (SDLK_EXCLAIM),
702 const_iv (SDLK_QUOTEDBL),
703 const_iv (SDLK_HASH),
704 const_iv (SDLK_DOLLAR),
705 const_iv (SDLK_AMPERSAND),
706 const_iv (SDLK_QUOTE),
707 const_iv (SDLK_LEFTPAREN),
708 const_iv (SDLK_RIGHTPAREN),
709 const_iv (SDLK_ASTERISK),
710 const_iv (SDLK_PLUS),
711 const_iv (SDLK_COMMA),
712 const_iv (SDLK_MINUS),
713 const_iv (SDLK_PERIOD),
714 const_iv (SDLK_SLASH),
715 const_iv (SDLK_0),
716 const_iv (SDLK_1),
717 const_iv (SDLK_2),
718 const_iv (SDLK_3),
719 const_iv (SDLK_4),
720 const_iv (SDLK_5),
721 const_iv (SDLK_6),
722 const_iv (SDLK_7),
723 const_iv (SDLK_8),
724 const_iv (SDLK_9),
725 const_iv (SDLK_COLON),
726 const_iv (SDLK_SEMICOLON),
727 const_iv (SDLK_LESS),
728 const_iv (SDLK_EQUALS),
729 const_iv (SDLK_GREATER),
730 const_iv (SDLK_QUESTION),
731 const_iv (SDLK_AT),
732
733 const_iv (SDLK_LEFTBRACKET),
734 const_iv (SDLK_BACKSLASH),
735 const_iv (SDLK_RIGHTBRACKET),
736 const_iv (SDLK_CARET),
737 const_iv (SDLK_UNDERSCORE),
738 const_iv (SDLK_BACKQUOTE),
739 const_iv (SDLK_DELETE),
607 740
608 const_iv (SDLK_FIRST), 741 const_iv (SDLK_FIRST),
609 const_iv (SDLK_LAST), 742 const_iv (SDLK_LAST),
610 const_iv (SDLK_KP0), 743 const_iv (SDLK_KP0),
611 const_iv (SDLK_KP1), 744 const_iv (SDLK_KP1),
687 const_iv (KMOD_RMETA), 820 const_iv (KMOD_RMETA),
688 const_iv (KMOD_NUM), 821 const_iv (KMOD_NUM),
689 const_iv (KMOD_CAPS), 822 const_iv (KMOD_CAPS),
690 const_iv (KMOD_MODE), 823 const_iv (KMOD_MODE),
691 824
825 const_iv (KMOD_LRAM),
826
692 const_iv (MIX_DEFAULT_FORMAT), 827 const_iv (MIX_DEFAULT_FORMAT),
693 828
694 const_iv (SDL_INIT_TIMER), 829 const_iv (SDL_INIT_TIMER),
695 const_iv (SDL_INIT_AUDIO), 830 const_iv (SDL_INIT_AUDIO),
696 const_iv (SDL_INIT_VIDEO), 831 const_iv (SDL_INIT_VIDEO),
720 855
721 const_iv (FOW_DARKNESS) 856 const_iv (FOW_DARKNESS)
722# undef const_iv 857# undef const_iv
723 }; 858 };
724 859
725 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 860 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
726 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 861 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
727 862
728 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 863 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
729 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 864 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
730} 865}
731 866
747NV ceil (NV x) 882NV ceil (NV x)
748 883
749IV minpot (UV n) 884IV minpot (UV n)
750 885
751IV popcount (UV n) 886IV popcount (UV n)
887
888NV distance (NV dx, NV dy)
889 CODE:
890 RETVAL = pow (dx * dx + dy * dy, 0.5);
891 OUTPUT:
892 RETVAL
752 893
753void 894void
754pango_init () 895pango_init ()
755 CODE: 896 CODE:
756{ 897{
764#endif 905#endif
765} 906}
766 907
767char *SDL_GetError () 908char *SDL_GetError ()
768 909
769void SDL_braino () 910void SDL_main_hack (SV *real_main)
911 PROTOTYPE: &
770 912
771int SDL_Init (U32 flags) 913int SDL_Init (U32 flags)
772 914
773int SDL_InitSubSystem (U32 flags) 915int SDL_InitSubSystem (U32 flags)
774 916
775void SDL_QuitSubSystem (U32 flags) 917void SDL_QuitSubSystem (U32 flags)
776 918
777void SDL_Quit () 919void SDL_Quit ()
778 920
779int SDL_GL_SetAttribute (int attr, int value) 921int SDL_GL_SetAttribute (int attr, int value)
922 C_ARGS: (SDL_GLattr)attr, value
780 923
781int SDL_GL_GetAttribute (int attr) 924int SDL_GL_GetAttribute (int attr)
782 CODE: 925 CODE:
783 if (SDL_GL_GetAttribute (attr, &RETVAL)) 926 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
784 XSRETURN_UNDEF; 927 XSRETURN_UNDEF;
785 OUTPUT: 928 OUTPUT:
786 RETVAL 929 RETVAL
787 930
788void 931void
843 ); 986 );
844 987
845 if (RETVAL) 988 if (RETVAL)
846 { 989 {
847 av_clear (texture_av); 990 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); 991#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
851#include "glfunc.h" 992#include "glfunc.h"
852#undef GL_FUNC 993#undef GL_FUNC
994 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
995 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
853 } 996 }
854} 997}
855 OUTPUT: 998 OUTPUT:
856 RETVAL 999 RETVAL
1000
1001void
1002SDL_WM_SetCaption (const char *title, const char *icon)
857 1003
858void 1004void
859SDL_GL_SwapBuffers () 1005SDL_GL_SwapBuffers ()
860 1006
861char * 1007char *
862SDL_GetKeyName (int sym) 1008SDL_GetKeyName (int sym)
1009 C_ARGS: (SDLKey)sym
863 1010
864int 1011int
865SDL_GetAppState () 1012SDL_GetAppState ()
866 1013
867int 1014int
868SDL_GetModState () 1015SDL_GetModState ()
869 1016
1017int
1018SDL_WaitEvent ()
1019 C_ARGS: 0
1020
870void 1021void
1022SDL_PumpEvents ()
1023
1024void
871poll_events () 1025peep_events ()
872 PPCODE: 1026 PPCODE:
873{ 1027{
874 SDL_Event ev; 1028 SDL_Event ev;
875 1029
876 SDL_PumpEvents (); 1030 SDL_PumpEvents ();
883 { 1037 {
884 case SDL_KEYDOWN: 1038 case SDL_KEYDOWN:
885 case SDL_KEYUP: 1039 case SDL_KEYUP:
886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1040 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1041 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); 1042 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 */ 1043 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); 1044 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
891 break; 1045 break;
892 1046
893 case SDL_ACTIVEEVENT: 1047 case SDL_ACTIVEEVENT:
894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1048 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
912 x = ev.motion.x; 1066 x = ev.motion.x;
913 y = ev.motion.y; 1067 y = ev.motion.y;
914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1068 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
915 } 1069 }
916 1070
917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1071 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
918 hv_store (hv, "state", 5, newSViv (state), 0); 1072 hv_store (hv, "state", 5, newSViv (state), 0);
919 hv_store (hv, "x", 1, newSViv (x), 0); 1073 hv_store (hv, "x", 1, newSViv (x), 0);
920 hv_store (hv, "y", 1, newSViv (y), 0); 1074 hv_store (hv, "y", 1, newSViv (y), 0);
921 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1075 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
922 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1076 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
942 1096
943 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1097 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
944 } 1098 }
945} 1099}
946 1100
1101char *
1102SDL_AudioDriverName ()
1103 CODE:
1104{
1105 char buf [256];
1106 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1107 XSRETURN_UNDEF;
1108
1109 RETVAL = buf;
1110}
1111 OUTPUT:
1112 RETVAL
1113
947int 1114int
948Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1115Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
949 POSTCALL: 1116 POSTCALL:
950 Mix_HookMusicFinished (music_finished); 1117 Mix_HookMusicFinished (music_finished);
951 Mix_ChannelFinished (channel_finished); 1118 Mix_ChannelFinished (channel_finished);
952 1119
953void 1120void
954Mix_QuerySpec () 1121Mix_QuerySpec ()
1013add_font (char *file) 1180add_font (char *file)
1014 CODE: 1181 CODE:
1015 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1182 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1016 OUTPUT: 1183 OUTPUT:
1017 RETVAL 1184 RETVAL
1185
1186void
1187IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1188
1189# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1190void
1191Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1018 1192
1019void 1193void
1020load_image_inline (SV *image_) 1194load_image_inline (SV *image_)
1021 ALIAS: 1195 ALIAS:
1022 load_image_file = 1 1196 load_image_file = 1
1068 1242
1069 SDL_LockSurface (surface2); 1243 SDL_LockSurface (surface2);
1070 EXTEND (SP, 6); 1244 EXTEND (SP, 6);
1071 PUSHs (sv_2mortal (newSViv (surface2->w))); 1245 PUSHs (sv_2mortal (newSViv (surface2->w)));
1072 PUSHs (sv_2mortal (newSViv (surface2->h))); 1246 PUSHs (sv_2mortal (newSViv (surface2->h)));
1073 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1247 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))); 1248 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1075 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1249 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1076 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1250 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1077 SDL_UnlockSurface (surface2); 1251 SDL_UnlockSurface (surface2);
1078 1252
1138#if DEBUG 1312#if DEBUG
1139 VALGRIND_DO_LEAK_CHECK; 1313 VALGRIND_DO_LEAK_CHECK;
1140#endif 1314#endif
1141} 1315}
1142 1316
1317int
1318SvREFCNT (SV *sv)
1319 CODE:
1320 RETVAL = SvREFCNT (sv);
1321 OUTPUT:
1322 RETVAL
1323
1143MODULE = Deliantra::Client PACKAGE = DC::Font 1324MODULE = Deliantra::Client PACKAGE = DC::Font
1144 1325
1145PROTOTYPES: DISABLE 1326PROTOTYPES: DISABLE
1146 1327
1147DC::Font 1328DC::Font
1148new_from_file (SV *class, char *path, int id = 0) 1329new_from_file (SV *klass, char *path, int id = 0)
1149 CODE: 1330 CODE:
1150{ 1331{
1151 int count; 1332 int count;
1152 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1333 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1153 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1334 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1182 PROTOTYPE: 1363 PROTOTYPE:
1183 CODE: 1364 CODE:
1184 tc_restore (); 1365 tc_restore ();
1185 1366
1186DC::Layout 1367DC::Layout
1187new (SV *class) 1368new (SV *klass)
1188 CODE: 1369 CODE:
1189 New (0, RETVAL, 1, struct cf_layout); 1370 RETVAL = new cf_layout;
1190 1371
1191 RETVAL->pl = pango_layout_new (opengl_context); 1372 RETVAL->pl = pango_layout_new (opengl_context);
1192 RETVAL->r = 1.; 1373 RETVAL->r = 1.;
1193 RETVAL->g = 1.; 1374 RETVAL->g = 1.;
1194 RETVAL->b = 1.; 1375 RETVAL->b = 1.;
1195 RETVAL->a = 1.; 1376 RETVAL->a = 1.;
1196 RETVAL->base_height = MIN_FONT_HEIGHT; 1377 RETVAL->base_height = MIN_FONT_HEIGHT;
1197 RETVAL->font = 0; 1378 RETVAL->font = 0;
1198 RETVAL->rc = rc_alloc ();
1199 1379
1200 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1380 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1201 layout_update_font (RETVAL); 1381 layout_update_font (RETVAL);
1202 OUTPUT: 1382 OUTPUT:
1203 RETVAL 1383 RETVAL
1204 1384
1205void 1385void
1206DESTROY (DC::Layout self) 1386DESTROY (DC::Layout self)
1207 CODE: 1387 CODE:
1208 g_object_unref (self->pl); 1388 g_object_unref (self->pl);
1209 rc_free (self->rc);
1210 Safefree (self); 1389 delete self;
1211 1390
1212void 1391void
1213set_text (DC::Layout self, SV *text_) 1392set_text (DC::Layout self, SV *text_)
1214 CODE: 1393 CODE:
1215{ 1394{
1341 1520
1342void 1521void
1343set_height (DC::Layout self, int base_height) 1522set_height (DC::Layout self, int base_height)
1344 CODE: 1523 CODE:
1345 if (self->base_height != base_height) 1524 if (self->base_height != base_height)
1346 { 1525 {
1347 self->base_height = base_height; 1526 self->base_height = base_height;
1348 layout_update_font (self); 1527 layout_update_font (self);
1349 } 1528 }
1350 1529
1351void 1530void
1469} 1648}
1470 1649
1471void 1650void
1472render (DC::Layout self, float x, float y, int flags = 0) 1651render (DC::Layout self, float x, float y, int flags = 0)
1473 CODE: 1652 CODE:
1474 rc_clear (self->rc); 1653 self->rc.clear ();
1475 pango_opengl_render_layout_subpixel ( 1654 pango_opengl_render_layout_subpixel (
1476 self->pl, 1655 self->pl,
1477 self->rc, 1656 &self->rc,
1478 x * PANGO_SCALE, y * PANGO_SCALE, 1657 x * PANGO_SCALE, y * PANGO_SCALE,
1479 self->r, self->g, self->b, self->a, 1658 self->r, self->g, self->b, self->a,
1480 flags 1659 flags
1481 ); 1660 );
1482 // we assume that context_change actually clears/frees stuff 1661 // we assume that context_change actually clears/frees stuff
1493 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1672 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1494 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1673 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1495 glEnable (GL_ALPHA_TEST); 1674 glEnable (GL_ALPHA_TEST);
1496 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1675 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1497 1676
1498 rc_draw (self->rc); 1677 self->rc.draw ();
1499 1678
1500 glDisable (GL_ALPHA_TEST); 1679 glDisable (GL_ALPHA_TEST);
1501 glDisable (GL_BLEND); 1680 glDisable (GL_BLEND);
1502 glDisable (GL_TEXTURE_2D); 1681 glDisable (GL_TEXTURE_2D);
1503} 1682}
1578 glDisable (GL_ALPHA_TEST); 1757 glDisable (GL_ALPHA_TEST);
1579 glDisable (GL_BLEND); 1758 glDisable (GL_BLEND);
1580 } 1759 }
1581} 1760}
1582 1761
1762void
1763draw_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)
1764 PROTOTYPE: @
1765 CODE:
1766{
1767 glEnable (GL_BLEND);
1768 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1769 glEnable (GL_TEXTURE_2D);
1770 glBindTexture (GL_TEXTURE_2D, name1);
1771
1772 glColor3f (intensity, intensity, intensity);
1773 glPushMatrix ();
1774 glScalef (1./3, 1./3, 1.);
1775
1776 if (blend > 0.f)
1777 {
1778 float dx3 = dx * -3.f / w;
1779 float dy3 = dy * -3.f / h;
1780 GLfloat env_color[4] = { 0., 0., 0., blend };
1781
1782 /* interpolate the two shadow textures */
1783 /* stage 0 == rgb(glcolor) + alpha(t0) */
1784 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1785
1786 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1787 gl.ActiveTexture (GL_TEXTURE1);
1788 glEnable (GL_TEXTURE_2D);
1789 glBindTexture (GL_TEXTURE_2D, name2);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1791
1792 /* rgb == rgb(glcolor) */
1793 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1796
1797 /* alpha = interpolate t0, t1 by env_alpha */
1798 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1799
1800 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1802 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1806
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1809
1810 glBegin (GL_QUADS);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1813 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1814 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1815 glEnd ();
1816
1817 glDisable (GL_TEXTURE_2D);
1818 gl.ActiveTexture (GL_TEXTURE0);
1819 }
1820 else
1821 {
1822 /* simple blending of one texture, also opengl <1.3 path */
1823 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1824
1825 glBegin (GL_QUADS);
1826 glTexCoord2f (0, 0); glVertex2f (0, 0);
1827 glTexCoord2f (0, t); glVertex2f (0, h);
1828 glTexCoord2f (s, t); glVertex2f (w, h);
1829 glTexCoord2f (s, 0); glVertex2f (w, 0);
1830 glEnd ();
1831 }
1832
1833 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1834 {
1835 int x, y;
1836 int dx3 = dx * 3;
1837 int dy3 = dy * 3;
1838
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1840 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1841 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1842 glTranslatef (-1., -1., 0);
1843 glBegin (GL_QUADS);
1844
1845 for (y = 1; y < h; y += 3)
1846 {
1847 int y1 = y - dy3;
1848 int y1valid = y1 >= 0 && y1 < h;
1849
1850 for (x = 1; x < w; x += 3)
1851 {
1852 int x1 = x - dx3;
1853 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1854 uint8_t h2;
1855
1856 if (y1valid && x1 >= 0 && x1 < w)
1857 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 else
1859 h2 = 1; /* out of range == invisible */
1860
1861 if (h1 || h2)
1862 {
1863 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1864 glColor4f (1., 1., 1., alpha);
1865
1866 glTexCoord2f (0, 0.); glVertex2i (x , y );
1867 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1868 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1869 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1870 }
1871 }
1872 }
1873 }
1874
1875 glEnd ();
1876
1877 glPopMatrix ();
1878
1879 glDisable (GL_TEXTURE_2D);
1880 glDisable (GL_BLEND);
1881}
1882
1583IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1883IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1584 CODE: 1884 CODE:
1585{ 1885{
1586 GLint width; 1886 GLint width;
1587 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1887 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1594MODULE = Deliantra::Client PACKAGE = DC::Map 1894MODULE = Deliantra::Client PACKAGE = DC::Map
1595 1895
1596PROTOTYPES: DISABLE 1896PROTOTYPES: DISABLE
1597 1897
1598DC::Map 1898DC::Map
1599new (SV *class) 1899new (SV *klass)
1600 CODE: 1900 CODE:
1601 New (0, RETVAL, 1, struct map); 1901 New (0, RETVAL, 1, mapgrid);
1602 RETVAL->x = 0; 1902 RETVAL->x = 0;
1603 RETVAL->y = 0; 1903 RETVAL->y = 0;
1604 RETVAL->w = 0; 1904 RETVAL->w = 0;
1605 RETVAL->h = 0; 1905 RETVAL->h = 0;
1606 RETVAL->ox = 0; 1906 RETVAL->ox = 0;
1643 1943
1644void 1944void
1645set_smooth (DC::Map self, int face, int smooth, int level) 1945set_smooth (DC::Map self, int face, int smooth, int level)
1646 CODE: 1946 CODE:
1647{ 1947{
1648 tileid texid; 1948 tileid texid;
1649 maptex *tex; 1949 maptex *tex;
1650 1950
1651 if (face < 0 || face >= self->faces) 1951 if (face < 0 || face >= self->faces)
1652 return; 1952 return;
1653 1953
1654 if (smooth < 0 || smooth >= self->faces) 1954 if (smooth < 0 || smooth >= self->faces)
1655 return; 1955 return;
1656 1956
1657 texid = self->face2tile [face]; 1957 texid = self->face2tile [face];
1658 1958
1659 if (!texid) 1959 if (!texid)
1660 return; 1960 return;
1661 1961
1662 tex = self->tex + texid; 1962 tex = self->tex + texid;
1691 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1991 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1692 // use uglier nearest interpolation because linear suffers 1992 // use uglier nearest interpolation because linear suffers
1693 // from transparent color bleeding and ugly wrapping effects. 1993 // from transparent color bleeding and ugly wrapping effects.
1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1994 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1695} 1995}
1996
1997void
1998expire_textures (DC::Map self, int texid, int count)
1999 PPCODE:
2000 for (; texid < self->texs && count; ++texid, --count)
2001 {
2002 maptex *tex = self->tex + texid;
2003
2004 if (tex->name)
2005 {
2006 if (tex->unused)
2007 {
2008 tex->name = 0;
2009 tex->unused = 0;
2010 XPUSHs (sv_2mortal (newSViv (texid)));
2011 }
2012 else
2013 tex->unused = 1;
2014 }
2015 }
1696 2016
1697int 2017int
1698ox (DC::Map self) 2018ox (DC::Map self)
1699 ALIAS: 2019 ALIAS:
1700 oy = 1 2020 oy = 1
1732 self->ox += dx; self->x += dx; 2052 self->ox += dx; self->x += dx;
1733 self->oy += dy; self->y += dy; 2053 self->oy += dy; self->y += dy;
1734 2054
1735 while (self->y < 0) 2055 while (self->y < 0)
1736 { 2056 {
1737 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2057 prepend (self->row, self->rows, MAP_EXTEND_Y);
1738 2058
1739 self->rows += MAP_EXTEND_Y; 2059 self->rows += MAP_EXTEND_Y;
1740 self->y += MAP_EXTEND_Y; 2060 self->y += MAP_EXTEND_Y;
1741 } 2061 }
1742} 2062}
1743 2063
1744SV * 2064SV *
1745map1a_update (DC::Map self, SV *data_, int extmap) 2065map1a_update (DC::Map self, SV *data_)
1746 CODE: 2066 CODE:
1747{ 2067{
1748 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2068 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1749 uint8_t *data_end = (uint8_t *)SvEND (data_); 2069 uint8_t *data_end = (uint8_t *)SvEND (data_);
1750 mapcell *cell; 2070 mapcell *cell;
1771 2091
1772 //TODO: don't trust server data to be in-range(!) 2092 //TODO: don't trust server data to be in-range(!)
1773 2093
1774 if (flags & 8) 2094 if (flags & 8)
1775 { 2095 {
2096 uint8_t ext, cmd;
2097
1776 if (extmap) 2098 do
1777 { 2099 {
1778 uint8_t ext, cmd; 2100 ext = *data++;
2101 cmd = ext & 0x7f;
1779 2102
1780 do 2103 if (cmd < 4)
2104 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2105 else if (cmd == 5) // health
1781 { 2106 {
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; 2107 cell->stat_width = 1;
1790 cell->stat_hp = *data++; 2108 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 } 2109 }
1810 while (ext & 0x80); 2110 else if (cmd == 6) // monster width
2111 cell->stat_width = *data++ + 1;
2112 else if (cmd == 0x47)
2113 {
2114 if (*data == 1) cell->player = data [1];
2115 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2116 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2117 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2118
2119 data += *data + 1;
2120 }
2121 else if (cmd == 8) // cell flags
2122 cell->flags = *data++;
2123 else if (ext & 0x40) // unknown, multibyte => skip
2124 data += *data + 1;
2125 else
2126 data++;
1811 } 2127 }
1812 else 2128 while (ext & 0x80);
1813 cell->darkness = *data++ + 1;
1814 } 2129 }
1815 2130
1816 for (z = 0; z <= 2; ++z) 2131 for (z = 0; z <= 2; ++z)
1817 if (flags & (4 >> z)) 2132 if (flags & (4 >> z))
1818 { 2133 {
1821 cell->tile [z] = self->face2tile [face]; 2136 cell->tile [z] = self->face2tile [face];
1822 2137
1823 if (cell->tile [z]) 2138 if (cell->tile [z])
1824 { 2139 {
1825 maptex *tex = self->tex + cell->tile [z]; 2140 maptex *tex = self->tex + cell->tile [z];
2141 tex->unused = 0;
1826 if (!tex->name) 2142 if (!tex->name)
1827 av_push (missing, newSViv (cell->tile [z])); 2143 av_push (missing, newSViv (cell->tile [z]));
1828 2144
1829 if (tex->smoothtile) 2145 if (tex->smoothtile)
1830 { 2146 {
1831 maptex *smooth = self->tex + tex->smoothtile; 2147 maptex *smooth = self->tex + tex->smoothtile;
2148 smooth->unused = 0;
1832 if (!smooth->name) 2149 if (!smooth->name)
1833 av_push (missing, newSViv (tex->smoothtile)); 2150 av_push (missing, newSViv (tex->smoothtile));
1834 } 2151 }
1835 } 2152 }
1836 } 2153 }
1864 ? self->row + y 2181 ? self->row + y
1865 : 0; 2182 : 0;
1866 2183
1867 for (x = x0; x < x1; x++) 2184 for (x = x0; x < x1; x++)
1868 { 2185 {
1869 int r = 32, g = 32, b = 32, a = 192; 2186 unsigned int r = 32, g = 32, b = 32, a = 192;
1870 2187
1871 if (row && row->c0 <= x && x < row->c1) 2188 if (row && row->c0 <= x && x < row->c1)
1872 { 2189 {
1873 mapcell *cell = row->col + (x - row->c0); 2190 mapcell *cell = row->col + (x - row->c0);
1874 2191
1876 { 2193 {
1877 maptex tex = self->tex [cell->tile [z]]; 2194 maptex tex = self->tex [cell->tile [z]];
1878 int a0 = 255 - tex.a; 2195 int a0 = 255 - tex.a;
1879 int a1 = tex.a; 2196 int a1 = tex.a;
1880 2197
1881 r = (r * a0 + tex.r * a1) / 255; 2198 r = div255 (r * a0 + tex.r * a1);
1882 g = (g * a0 + tex.g * a1) / 255; 2199 g = div255 (g * a0 + tex.g * a1);
1883 b = (b * a0 + tex.b * a1) / 255; 2200 b = div255 (b * a0 + tex.b * a1);
1884 a = (a * a0 + tex.a * a1) / 255; 2201 a = div255 (a * a0 + tex.a * a1);
1885 } 2202 }
1886 } 2203 }
1887 2204
1888 *map++ = (r ) 2205 *map++ = (r )
1889 | (g << 8) 2206 | (g << 8)
1890 | (b << 16) 2207 | (b << 16)
1891 | (a << 24); 2208 | (a << 24);
1892 } 2209 }
1893 } 2210 }
1894 2211
1895 RETVAL = map_sv; 2212 RETVAL = map_sv;
1896} 2213}
1897 OUTPUT: 2214 OUTPUT:
1898 RETVAL 2215 RETVAL
1899 2216
1900void 2217void
1901draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2218draw (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: 2219 CODE:
1903{ 2220{
1904 int x, y, z; 2221 int x, y, z;
1905 2222
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) 2223 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; 2224 int pl_x, pl_y;
1911 maptex pl_tex; 2225 maptex pl_tex;
1912 rc_t *rc = rc_alloc (); 2226 rc_t rc;
2227 rc_t rc_ov;
1913 rc_key_t key; 2228 rc_key_t key;
1914 rc_array_t *arr; 2229 rc_t::array_t *arr;
1915 2230
1916 pl_tex.name = 0; 2231 pl_tex.name = 0;
1917 2232
1918 // thats current max. sorry. 2233 // that's current max. sorry.
1919 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1920 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1921
1922 // clear key, in case of extra padding
1923 memset (&skey, 0, sizeof (skey));
1924 2236
1925 memset (&key, 0, sizeof (key)); 2237 memset (&key, 0, sizeof (key));
1926 key.r = 255; 2238 key.r = 255;
1927 key.g = 255; 2239 key.g = 255;
1928 key.b = 255; 2240 key.b = 255;
1929 key.a = 255; 2241 key.a = 255;
1930 key.mode = GL_QUADS; 2242 key.mode = GL_QUADS;
1931 key.format = GL_T2F_V3F; 2243 key.format = GL_T2F_V3F;
1932 key.texname = -1;
1933 2244
1934 mx += self->x; 2245 mx += self->x;
1935 my += self->y; 2246 my += self->y;
1936 2247
1937 // first pass: determine smooth_max 2248 // first pass: determine smooth_max
1938 // rather ugly, if you ask me 2249 // rather ugly, if you ask me
1939 // could also be stored inside mapcell and updated on change 2250 // could also be stored inside mapcell and updated on change
1940 memset (smooth_max, 0, sizeof (smooth_max)); 2251 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1941 2252
1942 for (y = 0; y < sh; y++) 2253 for (y = 0; y < sh; y++)
1943 if (0 <= y + my && y + my < self->rows) 2254 if (0 <= y + my && y + my < self->rows)
1944 { 2255 {
1945 maprow *row = self->row + (y + my); 2256 maprow *row = self->row + (y + my);
1960 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2271 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1961 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2272 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1962 2273
1963 for (z = 0; z <= 2; z++) 2274 for (z = 0; z <= 2; z++)
1964 { 2275 {
1965 memset (smooth_level, 0, sizeof (smooth_level)); 2276 std::bitset<256> smooth_level; // one bit for every possible smooth level
2277 smooth_key skey;
2278 smooth_hash smooth;
2279 key.texname = -1;
1966 2280
1967 for (y = 0; y < sh; y++) 2281 for (y = 0; y < sh; y++)
1968 if (0 <= y + my && y + my < self->rows) 2282 if (0 <= y + my && y + my < self->rows)
1969 { 2283 {
1970 maprow *row = self->row + (y + my); 2284 maprow *row = self->row + (y + my);
1976 tileid tile = cell->tile [z]; 2290 tileid tile = cell->tile [z];
1977 2291
1978 if (tile) 2292 if (tile)
1979 { 2293 {
1980 maptex tex = self->tex [tile]; 2294 maptex tex = self->tex [tile];
1981 int px = (x + 1) * T - tex.w; 2295 int px, py;
1982 int py = (y + 1) * T - tex.h;
1983 2296
1984 if (key.texname != tex.name) 2297 if (key.texname != tex.name)
1985 { 2298 {
2299 self->tex [tile].unused = 0;
2300
1986 if (!tex.name) 2301 if (!tex.name)
1987 tex = self->tex [2]; /* missing, replace by noface */ 2302 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1988 2303
1989 key.texname = tex.name; 2304 key.texname = tex.name;
1990 arr = rc_array (rc, &key); 2305 arr = &rc.array (key);
1991 } 2306 }
2307
2308 px = (x + 1) * Th - tex.w;
2309 py = (y + 1) * Tw - tex.h;
1992 2310
1993 if (expect_false (cell->player == player) && expect_false (z == 2)) 2311 if (expect_false (cell->player == player) && expect_false (z == 2))
1994 { 2312 {
1995 pl_x = px; 2313 pl_x = px;
1996 pl_y = py; 2314 pl_y = py;
1997 pl_tex = tex; 2315 pl_tex = tex;
1998 continue; 2316 continue;
1999 } 2317 }
2000 2318
2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2319 arr->t2f_v3f (0 , 0 , px , py , 0);
2002 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2320 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); 2321 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); 2322 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 2323
2031 // update smooth hash 2324 // update smooth hash
2032 if (tex.smoothtile) 2325 if (tex.smoothtile)
2033 { 2326 {
2034 skey.tile = tex.smoothtile; 2327 skey.tile = tex.smoothtile;
2035 skey.level = tex.smoothlevel; 2328 skey.level = tex.smoothlevel;
2036 2329
2037 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2330 smooth_level[tex.smoothlevel] = 1;
2038 2331
2039 // add bits to current tile and all neighbours. skey.x|y is 2332 // add bits to current tile and all neighbours. skey.x|y is
2040 // shifted +1|+1 so we always stay positive. 2333 // shifted +1|+1 so we always stay positive.
2041 2334
2042 // bits is ___n cccc CCCC bbbb 2335 // bits is ___n cccc CCCC bbbb
2050 2343
2051 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2344 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2052 // ·· ·· ·┏ ┓· 2345 // ·· ·· ·┏ ┓·
2053 2346
2054 // full tile 2347 // full tile
2055 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2348 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2056 2349
2057 // borders 2350 // borders
2058 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2351 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); 2352 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); 2353 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); 2354 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2062 2355
2063 // corners 2356 // corners
2064 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2357 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); 2358 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); 2359 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); 2360 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2361 }
2362 }
2363
2364 if (expect_false (z == 2) && expect_false (cell->flags))
2365 {
2366 // overlays such as the speech bubble, probably more to come
2367 if (cell->flags & 1)
2368 {
2369 rc_key_t key_ov = key;
2370 maptex tex = self->tex[TEXID_SPEECH];
2371 int px = x * Tw + Tw * 2 / 32;
2372 int py = y * Th - Th * 6 / 32;
2373
2374 key_ov.texname = tex.name;
2375 rc_t::array_t &arr = rc_ov.array (key_ov);
2376
2377 arr.t2f_v3f (0 , 0 , px , py , 0);
2378 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2379 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2380 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2068 } 2381 }
2069 } 2382 }
2070 } 2383 }
2071 } 2384 }
2072 2385
2073 rc_draw (rc); 2386 rc.draw ();
2074 rc_clear (rc); 2387 rc.clear ();
2075 2388
2076 // go through all smoothlevels, lowest to highest, then draw. 2389 // go through all smoothlevels, lowest to highest, then draw.
2077 // this is basically counting sort 2390 // this is basically counting sort
2078 { 2391 {
2079 int w, b; 2392 int w, b;
2080 2393
2081 glEnable (GL_TEXTURE_2D); 2394 glEnable (GL_TEXTURE_2D);
2082 glBegin (GL_QUADS); 2395 glBegin (GL_QUADS);
2083 for (w = 0; w < 256 / 32; ++w) 2396 for (int level = 0; level < smooth_level.size (); ++level)
2397 if (smooth_level[level])
2398 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2084 { 2399 {
2085 uint32_t smask = smooth_level [w]; 2400 smooth_key &skey = it->first;
2086 if (smask) 2401 IV bits = it->second;
2087 for (b = 0; b < 32; ++b) 2402
2088 if (smask & (((uint32_t)1) << b)) 2403 if (!(bits & 0x1000)
2404 && skey.level == level
2405 && level > smooth_max [skey.x][skey.y])
2089 { 2406 {
2090 int level = (w << 5) | b; 2407 maptex tex = self->tex [skey.tile];
2408 int px = (((int)skey.x) - 1) * Tw;
2409 int py = (((int)skey.y) - 1) * Th;
2410 int border = bits & 15;
2411 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2412 float dx = tex.s * .0625f; // 16 images/row
2413 float dy = tex.t * .5f ; // 2 images/column
2414
2091 HE *he; 2415 if (tex.name)
2092
2093 hv_iterinit (smooth);
2094 while ((he = hv_iternext (smooth)))
2095 { 2416 {
2096 smooth_key *skey = (smooth_key *)HeKEY (he); 2417 // this time avoiding texture state changes
2097 IV bits = SvIVX (HeVAL (he)); 2418 // save gobs of state changes.
2098 2419 if (key.texname != tex.name)
2099 if (!(bits & 0x1000)
2100 && skey->level == level
2101 && level > smooth_max [skey->x][skey->y])
2102 { 2420 {
2103 maptex tex = self->tex [skey->tile]; 2421 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 2422
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 (); 2423 glEnd ();
2118 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2424 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2119 glBegin (GL_QUADS); 2425 glBegin (GL_QUADS);
2120 } 2426 }
2121 2427
2122 if (border) 2428 if (border)
2123 { 2429 {
2124 float ox = border * dx; 2430 float ox = border * dx;
2125 2431
2126 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2432 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2127 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2128 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2129 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2435 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2130 } 2436 }
2131 2437
2132 if (corner) 2438 if (corner)
2133 { 2439 {
2134 float ox = corner * dx; 2440 float ox = corner * dx;
2135 2441
2136 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2442 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2137 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2443 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2138 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2444 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2139 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2140 }
2141 }
2142 } 2446 }
2143 } 2447 }
2144 } 2448 }
2145 } 2449 }
2146 2450
2147 glEnd (); 2451 glEnd ();
2148 glDisable (GL_TEXTURE_2D); 2452 glDisable (GL_TEXTURE_2D);
2149 key.texname = -1; 2453 key.texname = -1;
2150 } 2454 }
2151
2152 hv_clear (smooth);
2153 } 2455 }
2154 2456
2155 if (pl_tex.name) 2457 if (pl_tex.name)
2156 { 2458 {
2157 maptex tex = pl_tex; 2459 maptex tex = pl_tex;
2158 int px = pl_x + sdx; 2460 int px = pl_x + sdx;
2159 int py = pl_y + sdy; 2461 int py = pl_y + sdy;
2160 2462
2161 key.texname = tex.name; 2463 key.texname = tex.name;
2162 arr = rc_array (rc, &key); 2464 rc_t::array_t &arr = rc.array (key);
2163 2465
2164 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2466 arr.t2f_v3f (0 , 0 , px , py , 0);
2165 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2467 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); 2468 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); 2469 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2168 2470
2169 rc_draw (rc); 2471 rc.draw ();
2170 } 2472 }
2171 2473
2474 rc_ov.draw ();
2475 rc_ov.clear ();
2476
2172 glDisable (GL_BLEND); 2477 glDisable (GL_BLEND);
2173 rc_free (rc);
2174 2478
2175 // top layer: overlays such as the health bar 2479 // top layer: overlays such as the health bar
2176 for (y = 0; y < sh; y++) 2480 for (y = 0; y < sh; y++)
2177 if (0 <= y + my && y + my < self->rows) 2481 if (0 <= y + my && y + my < self->rows)
2178 { 2482 {
2181 for (x = 0; x < sw; x++) 2485 for (x = 0; x < sw; x++)
2182 if (row->c0 <= x + mx && x + mx < row->c1) 2486 if (row->c0 <= x + mx && x + mx < row->c1)
2183 { 2487 {
2184 mapcell *cell = row->col + (x + mx - row->c0); 2488 mapcell *cell = row->col + (x + mx - row->c0);
2185 2489
2186 int px = x * T; 2490 int px = x * Tw;
2187 int py = y * T; 2491 int py = y * Th;
2492
2493 if (expect_false (cell->player == player))
2494 {
2495 px += sdx;
2496 py += sdy;
2497 }
2188 2498
2189 if (cell->stat_hp) 2499 if (cell->stat_hp)
2190 { 2500 {
2191 int width = cell->stat_width * T; 2501 int width = cell->stat_width * Tw;
2192 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2502 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2193 2503
2194 glColor3ub (0, 0, 0); 2504 glColor3ub (0, 0, 0);
2195 glRectf (px + 1, py - thick - 2, 2505 glRectf (px + 1, py - thick - 2,
2196 px + width - 1, py); 2506 px + width - 1, py);
2197 2507
2203 } 2513 }
2204 } 2514 }
2205} 2515}
2206 2516
2207void 2517void
2208draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2518draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2209 CODE: 2519 CODE:
2210{ 2520{
2211 static float color[16][3] = { 2521 static float color[16][3] = {
2212 { 0.00F, 0.00F, 0.00F }, 2522 { 0.00f, 0.00f, 0.00f },
2213 { 1.00F, 1.00F, 1.00F }, 2523 { 1.00f, 1.00f, 1.00f },
2214 { 0.00F, 0.00F, 0.55F }, 2524 { 0.00f, 0.00f, 0.55f },
2215 { 1.00F, 0.00F, 0.00F }, 2525 { 1.00f, 0.00f, 0.00f },
2216 2526
2217 { 1.00F, 0.54F, 0.00F }, 2527 { 1.00f, 0.54f, 0.00f },
2218 { 0.11F, 0.56F, 1.00F }, 2528 { 0.11f, 0.56f, 1.00f },
2219 { 0.93F, 0.46F, 0.00F }, 2529 { 0.93f, 0.46f, 0.00f },
2220 { 0.18F, 0.54F, 0.34F }, 2530 { 0.18f, 0.54f, 0.34f },
2221 2531
2222 { 0.56F, 0.73F, 0.56F }, 2532 { 0.56f, 0.73f, 0.56f },
2223 { 0.80F, 0.80F, 0.80F }, 2533 { 0.80f, 0.80f, 0.80f },
2224 { 0.55F, 0.41F, 0.13F }, 2534 { 0.55f, 0.41f, 0.13f },
2225 { 0.99F, 0.77F, 0.26F }, 2535 { 0.99f, 0.77f, 0.26f },
2226 2536
2227 { 0.74F, 0.65F, 0.41F }, 2537 { 0.74f, 0.65f, 0.41f },
2228 2538
2229 { 0.00F, 1.00F, 1.00F }, 2539 { 0.00f, 1.00f, 1.00f },
2230 { 1.00F, 0.00F, 1.00F }, 2540 { 1.00f, 0.00f, 1.00f },
2231 { 1.00F, 1.00F, 0.00F }, 2541 { 1.00f, 1.00f, 0.00f },
2232 }; 2542 };
2233 2543
2234 int x, y; 2544 int x, y;
2235 2545
2236 glEnable (GL_TEXTURE_2D); 2546 glEnable (GL_TEXTURE_2D);
2547 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2548 * but the nvidia driver (185.18.14) mishandles alpha textures
2549 * and takes the colour from god knows where instead of using
2550 * Cp. MODULATE results in the same colour, but slightly different
2551 * alpha, but atcually gives us the correct colour with nvidia.
2552 */
2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2553 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2238 glEnable (GL_BLEND); 2554 glEnable (GL_BLEND);
2239 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2555 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2240 glBegin (GL_QUADS); 2556 glBegin (GL_QUADS);
2241 2557
2242 for (y = 0; y < h; y++) 2558 for (y = 0; y < h; y++)
2246 2562
2247 if (m) 2563 if (m)
2248 { 2564 {
2249 float *c = color [m & 15]; 2565 float *c = color [m & 15];
2250 2566
2251 float tx1 = m & 0x40 ? 0.5 : 0.; 2567 float tx1 = m & 0x40 ? 0.5f : 0.f;
2252 float tx2 = tx1 + 0.5; 2568 float tx2 = tx1 + 0.5f;
2253 2569
2254 glColor4f (c[0], c[1], c[2], 0.75); 2570 glColor4f (c[0], c[1], c[2], 1);
2255 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2571 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2256 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2572 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2257 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2573 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2258 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2574 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2259 } 2575 }
2267void 2583void
2268fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2584fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2269 PPCODE: 2585 PPCODE:
2270{ 2586{
2271 int x, y; 2587 int x, y;
2272 int sw1 = sw + 2; 2588 int sw1 = sw + 2;
2273 int sh1 = sh + 2; 2589 int sh1 = sh + 2;
2274 int sh3 = sh * 3; 2590 int sh3 = sh * 3;
2275 int sw34 = (sw * 3 + 3) & ~3; 2591 int sw3 = sw * 3;
2592 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2593 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2276 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2594 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2277 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2595 memset (darkness1, 0, sw1*sh1);
2278 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2279 2596
2280 SvPOK_only (darkness3_sv); 2597 SvPOK_only (darkness3_sv);
2281 SvCUR_set (darkness3_sv, sw34 * sh3); 2598 SvCUR_set (darkness3_sv, sw3 * sh3);
2282 2599
2283 mx += self->x - 1; 2600 mx += self->x - 1;
2284 my += self->y - 1; 2601 my += self->y - 1;
2285
2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2287 2602
2288 for (y = 0; y < sh1; y++) 2603 for (y = 0; y < sh1; y++)
2289 if (0 <= y + my && y + my < self->rows) 2604 if (0 <= y + my && y + my < self->rows)
2290 { 2605 {
2291 maprow *row = self->row + (y + my); 2606 maprow *row = self->row + (y + my);
2294 if (row->c0 <= x + mx && x + mx < row->c1) 2609 if (row->c0 <= x + mx && x + mx < row->c1)
2295 { 2610 {
2296 mapcell *cell = row->col + (x + mx - row->c0); 2611 mapcell *cell = row->col + (x + mx - row->c0);
2297 2612
2298 darkness1 [y * sw1 + x] = cell->darkness 2613 darkness1 [y * sw1 + x] = cell->darkness
2299 ? 255 - (cell->darkness - 1) 2614 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2300 : 255 - FOW_DARKNESS; 2615 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2301 } 2616 }
2302 } 2617 }
2303 2618
2304 for (y = 0; y < sh; ++y) 2619 for (y = 0; y < sh; ++y)
2305 for (x = 0; x < sw; ++x) 2620 for (x = 0; x < sw; ++x)
2324 2639
2325 uint8_t r13 = (d13 + d23 + d12) / 3; 2640 uint8_t r13 = (d13 + d23 + d12) / 3;
2326 uint8_t r23 = d23; 2641 uint8_t r23 = d23;
2327 uint8_t r33 = (d23 + d33 + d32) / 3; 2642 uint8_t r33 = (d23 + d33 + d32) / 3;
2328 2643
2329 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2330 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2645 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2331 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2646 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2332 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2333 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2648 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); 2649 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2335 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2336 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2651 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2337 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2652 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2338 } 2653 }
2339 2654
2340 free (darkness1); 2655 free (darkness1);
2341 2656
2342 EXTEND (SP, 3); 2657 EXTEND (SP, 3);
2343 PUSHs (sv_2mortal (newSViv (sw34))); 2658 PUSHs (sv_2mortal (newSViv (sw3)));
2344 PUSHs (sv_2mortal (newSViv (sh3))); 2659 PUSHs (sv_2mortal (newSViv (sh3)));
2345 PUSHs (darkness3_sv); 2660 PUSHs (darkness3_sv);
2346} 2661}
2347 2662
2348SV * 2663SV *
2411 else 2726 else
2412 *data++ = 0; 2727 *data++ = 0;
2413 } 2728 }
2414 } 2729 }
2415 2730
2416 /* if size is w*h + 5 then no data has been found */ 2731 /* if size is w*h + 5 then no data has been found */
2417 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2732 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2418 { 2733 {
2419 SvPOK_only (data_sv); 2734 SvPOK_only (data_sv);
2420 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2735 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2421 } 2736 }
2422 2737
2423 RETVAL = data_sv; 2738 RETVAL = data_sv;
2424} 2739}
2425 OUTPUT: 2740 OUTPUT:
2426 RETVAL 2741 RETVAL
2427 2742
2428void 2743void
2435 STRLEN len; 2750 STRLEN len;
2436 uint8_t *data, *end; 2751 uint8_t *data, *end;
2437 2752
2438 len = SvLEN (data_sv); 2753 len = SvLEN (data_sv);
2439 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2754 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2440 data = SvPVbyte_nolen (data_sv); 2755 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2441 end = data + len + 8; 2756 end = data + len + 8;
2442 2757
2443 if (len < 5) 2758 if (len < 5)
2444 XSRETURN_EMPTY; 2759 XSRETURN_EMPTY;
2445 2760
2506} 2821}
2507 2822
2508MODULE = Deliantra::Client PACKAGE = DC::RW 2823MODULE = Deliantra::Client PACKAGE = DC::RW
2509 2824
2510DC::RW 2825DC::RW
2511new (SV *class, SV *data_sv) 2826new (SV *klass, SV *data_sv)
2512 CODE: 2827 CODE:
2513{ 2828{
2514 STRLEN datalen; 2829 STRLEN datalen;
2515 char *data = SvPVbyte (data_sv, datalen); 2830 char *data = SvPVbyte (data_sv, datalen);
2516 2831
2518} 2833}
2519 OUTPUT: 2834 OUTPUT:
2520 RETVAL 2835 RETVAL
2521 2836
2522DC::RW 2837DC::RW
2523new_from_file (SV *class, const char *path, const char *mode = "rb") 2838new_from_file (SV *klass, const char *path, const char *mode = "rb")
2524 CODE: 2839 CODE:
2525 RETVAL = SDL_RWFromFile (path, mode); 2840 RETVAL = SDL_RWFromFile (path, mode);
2526 OUTPUT: 2841 OUTPUT:
2527 RETVAL 2842 RETVAL
2528 2843
2546 if (RETVAL < 0) 2861 if (RETVAL < 0)
2547 { 2862 {
2548 RETVAL = Mix_GroupOldest (-1); 2863 RETVAL = Mix_GroupOldest (-1);
2549 2864
2550 if (RETVAL < 0) 2865 if (RETVAL < 0)
2866 {
2867 // happens sometimes, maybe it just stopped playing(?)
2868 RETVAL = Mix_GroupAvailable (-1);
2869
2870 if (RETVAL < 0)
2551 XSRETURN_UNDEF; 2871 XSRETURN_UNDEF;
2552 2872 }
2873 else
2553 Mix_HaltChannel (RETVAL); 2874 Mix_HaltChannel (RETVAL);
2554 } 2875 }
2555 2876
2556 Mix_UnregisterAllEffects (RETVAL); 2877 Mix_UnregisterAllEffects (RETVAL);
2557 Mix_Volume (RETVAL, 128); 2878 Mix_Volume (RETVAL, 128);
2558} 2879}
2605void 2926void
2606set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2927set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2607 CODE: 2928 CODE:
2608{ 2929{
2609 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2930 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); 2931 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2611 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2932 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2612} 2933}
2613 2934
2614void 2935void
2615set_reverse_stereo (DC::Channel self, int flip) 2936set_reverse_stereo (DC::Channel self, int flip)
2618 2939
2619MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2940MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2620 2941
2621PROTOTYPES: DISABLE 2942PROTOTYPES: DISABLE
2622 2943
2944void
2945decoders ()
2946 PPCODE:
2947#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2948 int i, num = Mix_GetNumChunkDecoders ();
2949 EXTEND (SP, num);
2950 for (i = 0; i < num; ++i)
2951 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2952#else
2953 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2954#endif
2955
2623DC::MixChunk 2956DC::MixChunk
2624new (SV *class, DC::RW rwops) 2957new (SV *klass, DC::RW rwops)
2625 CODE: 2958 CODE:
2626 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2959 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2627 OUTPUT: 2960 OUTPUT:
2628 RETVAL 2961 RETVAL
2629 2962
2659 OUTPUT: 2992 OUTPUT:
2660 RETVAL 2993 RETVAL
2661 2994
2662MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2995MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2663 2996
2997void
2998decoders ()
2999 PPCODE:
3000#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3001 int i, num = Mix_GetNumMusicDecoders ();
3002 EXTEND (SP, num);
3003 for (i = 0; i < num; ++i)
3004 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3005#else
3006 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3007#endif
3008
2664int 3009int
2665volume (int volume = -1) 3010volume (int volume = -1)
2666 PROTOTYPE: ;$ 3011 PROTOTYPE: ;$
2667 CODE: 3012 CODE:
2668 if (items > 0) 3013 if (items > 0)
2679void 3024void
2680halt () 3025halt ()
2681 CODE: 3026 CODE:
2682 Mix_HaltMusic (); 3027 Mix_HaltMusic ();
2683 3028
3029int
3030playing ()
3031 CODE:
3032 RETVAL = Mix_PlayingMusic ();
3033 OUTPUT:
3034 RETVAL
3035
2684DC::MixMusic 3036DC::MixMusic
2685new (SV *class, DC::RW rwops) 3037new (SV *klass, DC::RW rwops)
2686 CODE: 3038 CODE:
2687 RETVAL = Mix_LoadMUS_RW (rwops); 3039 RETVAL = Mix_LoadMUS_RW (rwops);
2688 OUTPUT: 3040 OUTPUT:
2689 RETVAL 3041 RETVAL
2690 3042
2718 } *civ, const_iv[] = { 3070 } *civ, const_iv[] = {
2719# define const_iv(name) { # name, (IV)name } 3071# define const_iv(name) { # name, (IV)name }
2720 const_iv (GL_VENDOR), 3072 const_iv (GL_VENDOR),
2721 const_iv (GL_VERSION), 3073 const_iv (GL_VERSION),
2722 const_iv (GL_EXTENSIONS), 3074 const_iv (GL_EXTENSIONS),
3075 const_iv (GL_MAX_TEXTURE_UNITS),
2723 const_iv (GL_COLOR_MATERIAL), 3076 const_iv (GL_COLOR_MATERIAL),
2724 const_iv (GL_SMOOTH), 3077 const_iv (GL_SMOOTH),
2725 const_iv (GL_FLAT), 3078 const_iv (GL_FLAT),
2726 const_iv (GL_DITHER), 3079 const_iv (GL_DITHER),
2727 const_iv (GL_BLEND), 3080 const_iv (GL_BLEND),
2739 const_iv (GL_ZERO), 3092 const_iv (GL_ZERO),
2740 const_iv (GL_SRC_ALPHA), 3093 const_iv (GL_SRC_ALPHA),
2741 const_iv (GL_DST_ALPHA), 3094 const_iv (GL_DST_ALPHA),
2742 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3095 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2743 const_iv (GL_ONE_MINUS_DST_ALPHA), 3096 const_iv (GL_ONE_MINUS_DST_ALPHA),
3097 const_iv (GL_SRC_COLOR),
3098 const_iv (GL_DST_COLOR),
3099 const_iv (GL_ONE_MINUS_SRC_COLOR),
3100 const_iv (GL_ONE_MINUS_DST_COLOR),
2744 const_iv (GL_SRC_ALPHA_SATURATE), 3101 const_iv (GL_SRC_ALPHA_SATURATE),
2745 const_iv (GL_RGB), 3102 const_iv (GL_RGB),
2746 const_iv (GL_RGBA), 3103 const_iv (GL_RGBA),
2747 const_iv (GL_RGBA4), 3104 const_iv (GL_RGBA4),
2748 const_iv (GL_RGBA8), 3105 const_iv (GL_RGBA8),
2816 const_iv (GL_NICEST), 3173 const_iv (GL_NICEST),
2817 const_iv (GL_V2F), 3174 const_iv (GL_V2F),
2818 const_iv (GL_V3F), 3175 const_iv (GL_V3F),
2819 const_iv (GL_T2F_V3F), 3176 const_iv (GL_T2F_V3F),
2820 const_iv (GL_T2F_N3F_V3F), 3177 const_iv (GL_T2F_N3F_V3F),
3178 const_iv (GL_FUNC_ADD),
3179 const_iv (GL_FUNC_SUBTRACT),
3180 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2821# undef const_iv 3181# undef const_iv
2822 }; 3182 };
2823 3183
2824 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3184 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2825 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3185 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2826 3186
2827 texture_av = newAV (); 3187 texture_av = newAV ();
2828 AvREAL_off (texture_av); 3188 AvREAL_off (texture_av);
2829} 3189}
2830 3190
2832disable_GL_EXT_blend_func_separate () 3192disable_GL_EXT_blend_func_separate ()
2833 CODE: 3193 CODE:
2834 gl.BlendFuncSeparate = 0; 3194 gl.BlendFuncSeparate = 0;
2835 gl.BlendFuncSeparateEXT = 0; 3195 gl.BlendFuncSeparateEXT = 0;
2836 3196
2837char * 3197void
3198apple_nvidia_bug (int enable)
3199
3200const char *
2838gl_vendor () 3201gl_vendor ()
2839 CODE: 3202 CODE:
2840 RETVAL = (char *)glGetString (GL_VENDOR); 3203 RETVAL = (const char *)glGetString (GL_VENDOR);
2841 OUTPUT: 3204 OUTPUT:
2842 RETVAL 3205 RETVAL
2843 3206
2844char * 3207const char *
2845gl_version () 3208gl_version ()
2846 CODE: 3209 CODE:
2847 RETVAL = (char *)glGetString (GL_VERSION); 3210 RETVAL = (const char *)glGetString (GL_VERSION);
2848 OUTPUT: 3211 OUTPUT:
2849 RETVAL 3212 RETVAL
2850 3213
2851char * 3214const char *
2852gl_extensions () 3215gl_extensions ()
2853 CODE: 3216 CODE:
2854 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3217 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2855 OUTPUT: 3218 OUTPUT:
2856 RETVAL 3219 RETVAL
2857 3220
2858const char *glGetString (GLenum pname) 3221const char *glGetString (GLenum pname)
3222 CODE:
3223 RETVAL = (const char *)glGetString (pname);
3224 OUTPUT:
3225 RETVAL
2859 3226
2860GLint glGetInteger (GLenum pname) 3227GLint glGetInteger (GLenum pname)
2861 CODE: 3228 CODE:
2862 glGetIntegerv (pname, &RETVAL); 3229 glGetIntegerv (pname, &RETVAL);
2863 OUTPUT: 3230 OUTPUT:
2871 3238
2872int glGetError () 3239int glGetError ()
2873 3240
2874void glFinish () 3241void glFinish ()
2875 3242
3243void glFlush ()
3244
2876void glClear (int mask) 3245void glClear (int mask)
2877 3246
2878void glClearColor (float r, float g, float b, float a = 1.0) 3247void glClearColor (float r, float g, float b, float a = 1.0)
2879 PROTOTYPE: @ 3248 PROTOTYPE: @
2880 3249
2889void glBlendFunc (int sfactor, int dfactor) 3258void glBlendFunc (int sfactor, int dfactor)
2890 3259
2891void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3260void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2892 CODE: 3261 CODE:
2893 gl_BlendFuncSeparate (sa, da, saa, daa); 3262 gl_BlendFuncSeparate (sa, da, saa, daa);
3263
3264# void glBlendEquation (int se)
2894 3265
2895void glDepthMask (int flag) 3266void glDepthMask (int flag)
2896 3267
2897void glLogicOp (int opcode) 3268void glLogicOp (int opcode)
2898 3269
2933void glRotate (float angle, float x, float y, float z) 3304void glRotate (float angle, float x, float y, float z)
2934 CODE: 3305 CODE:
2935 glRotatef (angle, x, y, z); 3306 glRotatef (angle, x, y, z);
2936 3307
2937void glColor (float r, float g, float b, float a = 1.0) 3308void glColor (float r, float g, float b, float a = 1.0)
3309 PROTOTYPE: @
2938 ALIAS: 3310 ALIAS:
2939 glColor_premultiply = 1 3311 glColor_premultiply = 1
2940 CODE: 3312 CODE:
2941 if (ix) 3313 if (ix)
2942 { 3314 {
3048 3420
3049void glEndList () 3421void glEndList ()
3050 3422
3051void glCallList (int list) 3423void glCallList (int list)
3052 3424
3425void c_init ()
3426 CODE:
3427 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3428 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3429
3053MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3430MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3054 3431
3055PROTOTYPES: DISABLE 3432PROTOTYPES: DISABLE
3056 3433
3057void 3434void
3058find_widget (SV *self, NV x, NV y) 3435find_widget (SV *self, NV x, NV y)
3059 PPCODE: 3436 PPCODE:
3060{ 3437{
3061 if (within_widget (self, x, y)) 3438 if (within_widget (self, x, y))
3062 XPUSHs (self); 3439 XPUSHs (self);
3063} 3440}
3064 3441
3065BOOT: 3442BOOT:
3066{ 3443{
3074 3451
3075void 3452void
3076draw (SV *self) 3453draw (SV *self)
3077 CODE: 3454 CODE:
3078{ 3455{
3079 HV *hv; 3456 HV *hv;
3080 SV **svp; 3457 SV **svp;
3081 NV x, y, w, h; 3458 NV x, y, w, h;
3082 SV *draw_x_sv = GvSV (draw_x_gv); 3459 SV *draw_x_sv = GvSV (draw_x_gv);
3083 SV *draw_y_sv = GvSV (draw_y_gv); 3460 SV *draw_y_sv = GvSV (draw_y_gv);
3084 SV *draw_w_sv = GvSV (draw_w_gv); 3461 SV *draw_w_sv = GvSV (draw_w_gv);
3085 SV *draw_h_sv = GvSV (draw_h_gv); 3462 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines