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.258 by root, Thu Apr 10 14:35:50 2008 UTC vs.
Revision 1.324 by root, Sun Nov 18 01:58:53 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
39#include <SDL_endian.h> 43#include <SDL_endian.h>
40#include <SDL_image.h> 44#include <SDL_image.h>
41#include <SDL_mixer.h> 45#include <SDL_mixer.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
48/* work around os x broken headers */
49#ifdef __MACOSX__
50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
53#endif
54
44#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
46 57
47#include <glib/gmacros.h> 58#include <glib.h>
48 59
49#include <pango/pango.h> 60#include <pango/pango.h>
50 61
51#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
65# include <netinet/in.h> 76# include <netinet/in.h>
66# include <netinet/tcp.h> 77# include <netinet/tcp.h>
67# include <inttypes.h> 78# include <inttypes.h>
68#endif 79#endif
69 80
81#if __GNUC__ >= 4
82# define expect(expr,value) __builtin_expect ((expr),(value))
83#else
84# define expect(expr,value) (expr)
85#endif
86
87#define expect_false(expr) expect ((expr) != 0, 0)
88#define expect_true(expr) expect ((expr) != 0, 1)
89
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 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 */
72#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
73 96
74#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
75#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
76 99
77#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
78 101
79/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81 104
82#if 0 105#define KMOD_LRAM 0x10000 // our extension
83# define PARACHUTE SDL_INIT_NOPARACHUTE 106
84#else 107#define TEXID_SPEECH 1
85# define PARACHUTE 0 108#define TEXID_NOFACE 2
86#endif 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}
87 128
88static AV *texture_av; 129static AV *texture_av;
89 130
90static struct 131static struct
91{ 132{
148{ 189{
149 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
150 191
151 while (attrs) 192 while (attrs)
152 { 193 {
153 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
154 195
155 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
156 return 1; 197 return 1;
157 198
158 attrs = attrs->next; 199 attrs = attrs->next;
159 } 200 }
160 201
161 return 0; 202 return 0;
162} 203}
163 204
164typedef struct cf_layout { 205struct cf_layout {
165 PangoLayout *pl; 206 PangoLayout *pl;
166 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
167 int base_height; 208 int base_height;
168 DC__Font font; 209 DC__Font font;
169 rc_t *rc; 210 rc_t *rc;
170} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
171 214
172static DC__Font default_font; 215static DC__Font default_font;
173static PangoContext *opengl_context; 216static PangoContext *opengl_context;
174static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
175 218
176static void 219static void
177substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
178{ 221{
179 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
180#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
181 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
182#endif 225#endif
183 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
184} 227}
185 228
186static void 229static void
216} 259}
217 260
218typedef uint16_t tileid; 261typedef uint16_t tileid;
219typedef uint16_t faceid; 262typedef uint16_t faceid;
220 263
221typedef struct { 264struct maptex
265{
222 GLuint name; 266 GLuint name;
223 int w, h; 267 int w, h;
224 float s, t; 268 float s, t;
225 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
226 tileid smoothtile; 270 tileid smoothtile;
227 uint8_t smoothlevel; 271 uint8_t smoothlevel;
228} maptex; 272 uint8_t unused; /* set to zero on use */
273};
229 274
230typedef struct { 275struct mapcell
276{
231 uint32_t player; 277 uint32_t player;
232 tileid tile[3]; 278 tileid tile[3];
233 uint16_t darkness; 279 uint16_t darkness;
234 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
235} mapcell; 281};
236 282
237typedef struct { 283struct maprow
284{
238 int32_t c0, c1; 285 int32_t c0, c1;
239 mapcell *col; 286 mapcell *col;
240} maprow; 287};
241 288
242typedef struct map { 289struct mapgrid {
243 int x, y, w, h; 290 int x, y, w, h;
244 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
245 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
246 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
247 294
248 int32_t rows; 295 int32_t rows;
249 maprow *row; 296 maprow *row;
250} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
251 300
252static char * 301static char *
253prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
254{ 303{
255 char *p; 304 char *p;
273 322
274#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
275#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 324#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
276 325
277static void 326static void
278need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
279{ 328{
280 while (self->faces <= face) 329 while (self->faces <= face)
281 { 330 {
282 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
283 self->faces *= 2; 332 self->faces *= 2;
284 } 333 }
285} 334}
286 335
287static void 336static void
288need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
289{ 338{
290 while (self->texs <= texid) 339 while (self->texs <= texid)
291 { 340 {
292 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
293 self->texs *= 2; 342 self->texs *= 2;
294 } 343 }
295} 344}
296 345
297static maprow * 346static maprow *
298map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
299{ 348{
300 if (0 > y) 349 if (0 > y)
301 { 350 {
302 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
303 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
341 390
342 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
343} 392}
344 393
345static mapcell * 394static mapcell *
346map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
347{ 396{
348 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
349} 398}
350 399
351static void 400static void
352map_clear (DC__Map self) 401map_clear (mapgrid *self)
353{ 402{
354 int r; 403 int r;
355 404
356 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
357 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
364 self->oy = 0; 413 self->oy = 0;
365 self->row = 0; 414 self->row = 0;
366 self->rows = 0; 415 self->rows = 0;
367} 416}
368 417
418#define CELL_CLEAR(cell) \
419 do { \
420 if ((cell)->player) \
421 (cell)->tile [2] = 0; \
422 (cell)->darkness = 0; \
423 (cell)->stat_hp = 0; \
424 (cell)->flags = 0; \
425 (cell)->player = 0; \
426 } while (0)
427
369static void 428static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
371{ 430{
372 int x, y; 431 int x, y;
373 maprow *row; 432 maprow *row;
374 mapcell *cell; 433 mapcell *cell;
375 434
387 if (x >= row->c1) 446 if (x >= row->c1)
388 break; 447 break;
389 448
390 cell = row->col + x - row->c0; 449 cell = row->col + x - row->c0;
391 450
392 cell->darkness = 0; 451 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 452 }
397 } 453 }
398} 454}
399 455
400typedef struct { 456struct smooth_key
457{
401 tileid tile; 458 tileid tile;
402 uint8_t x, y, level; 459 uint8_t x, y, level;
403} smooth_key; 460
461 bool operator == (const smooth_key &o) const
462 {
463 return tile == o.tile && x == o.x && y == o.y && level == o.level;
464 }
465};
466
467typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
468
469namespace std {
470 template <>
471 struct hash<smooth_key>
472 {
473 size_t operator () (const smooth_key &v) const
474 {
475 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
476 }
477 };
478}
404 479
405static void 480static void
406smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
407{ 482{
408 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
409 484
410 if (SvIOK (*sv)) 485 if (it == h.end ())
411 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
412 else 487 else
413 sv_setiv (*sv, bits); 488 it->second |= bits;
414} 489}
415 490
416static void 491static void
417music_finished (void) 492music_finished (void)
418{ 493{
435 ev.code = 1; 510 ev.code = 1;
436 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
437 ev.data2 = 0; 512 ev.data2 = 0;
438 513
439 SDL_PushEvent ((SDL_Event *)&ev); 514 SDL_PushEvent ((SDL_Event *)&ev);
515}
516
517// approximately divide by 255
518static unsigned int
519div255 (unsigned int n)
520{
521 return (n + (n >> 8)) >> 8;
440} 522}
441 523
442static unsigned int 524static unsigned int
443minpot (unsigned int n) 525minpot (unsigned int n)
444{ 526{
511 if (!svp || !SvTRUE (*svp)) 593 if (!svp || !SvTRUE (*svp))
512 return 0; 594 return 0;
513 595
514 return 1; 596 return 1;
515} 597}
598
599/******************************************************************************/
600
601/* process keyboard modifiers */
602static int
603mod_munge (int mod)
604{
605 mod &= MOD_MASK;
606
607 if (mod & (KMOD_META | KMOD_ALT))
608 mod |= KMOD_LRAM;
609
610 return mod;
611}
612
613static void
614deliantra_main (SV *real_main)
615{
616 dSP;
617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
620}
621
622#ifdef __MACOSX__
623 static SV *real_main;
624
625 /* to due surprising braindamage on the side of SDL design, we
626 * do some mind-boggling hack here: SDL requires a custom main()
627 * on OS X, so... we provide one and call the original main(), which,
628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
629 * and which calls our main (== SDL_main) back.
630 */
631 extern C_LINKAGE int
632 main (int argc, char *argv[])
633 {
634 deliantra_main (real_main);
635 }
636
637 #undef main
638
639 extern C_LINKAGE int main (int argc, char *argv[]);
640
641 static void
642 SDL_main_hack (SV *real_main_)
643 {
644 real_main = real_main_;
645
646 char *argv[] = { "deliantra client", 0 };
647 (main) (1, argv);
648 }
649#else
650 static void
651 SDL_main_hack (SV *real_main)
652 {
653 deliantra_main (real_main);
654 }
655#endif
516 656
517MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
518 658
519PROTOTYPES: ENABLE 659PROTOTYPES: ENABLE
520 660
549 const_iv (SDL_USEREVENT), 689 const_iv (SDL_USEREVENT),
550 690
551 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
553 const_iv (SDL_APPACTIVE), 693 const_iv (SDL_APPACTIVE),
694
695
696 const_iv (SDLK_UNKNOWN),
697 const_iv (SDLK_FIRST),
698 const_iv (SDLK_BACKSPACE),
699 const_iv (SDLK_TAB),
700 const_iv (SDLK_CLEAR),
701 const_iv (SDLK_RETURN),
702 const_iv (SDLK_PAUSE),
703 const_iv (SDLK_ESCAPE),
704 const_iv (SDLK_SPACE),
705 const_iv (SDLK_EXCLAIM),
706 const_iv (SDLK_QUOTEDBL),
707 const_iv (SDLK_HASH),
708 const_iv (SDLK_DOLLAR),
709 const_iv (SDLK_AMPERSAND),
710 const_iv (SDLK_QUOTE),
711 const_iv (SDLK_LEFTPAREN),
712 const_iv (SDLK_RIGHTPAREN),
713 const_iv (SDLK_ASTERISK),
714 const_iv (SDLK_PLUS),
715 const_iv (SDLK_COMMA),
716 const_iv (SDLK_MINUS),
717 const_iv (SDLK_PERIOD),
718 const_iv (SDLK_SLASH),
719 const_iv (SDLK_0),
720 const_iv (SDLK_1),
721 const_iv (SDLK_2),
722 const_iv (SDLK_3),
723 const_iv (SDLK_4),
724 const_iv (SDLK_5),
725 const_iv (SDLK_6),
726 const_iv (SDLK_7),
727 const_iv (SDLK_8),
728 const_iv (SDLK_9),
729 const_iv (SDLK_COLON),
730 const_iv (SDLK_SEMICOLON),
731 const_iv (SDLK_LESS),
732 const_iv (SDLK_EQUALS),
733 const_iv (SDLK_GREATER),
734 const_iv (SDLK_QUESTION),
735 const_iv (SDLK_AT),
736
737 const_iv (SDLK_LEFTBRACKET),
738 const_iv (SDLK_BACKSLASH),
739 const_iv (SDLK_RIGHTBRACKET),
740 const_iv (SDLK_CARET),
741 const_iv (SDLK_UNDERSCORE),
742 const_iv (SDLK_BACKQUOTE),
743 const_iv (SDLK_DELETE),
554 744
555 const_iv (SDLK_FIRST), 745 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 746 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
634 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
638 828
829 const_iv (KMOD_LRAM),
830
639 const_iv (MIX_DEFAULT_FORMAT), 831 const_iv (MIX_DEFAULT_FORMAT),
832
833 const_iv (SDL_INIT_TIMER),
834 const_iv (SDL_INIT_AUDIO),
835 const_iv (SDL_INIT_VIDEO),
836 const_iv (SDL_INIT_CDROM),
837 const_iv (SDL_INIT_JOYSTICK),
838 const_iv (SDL_INIT_EVERYTHING),
839 const_iv (SDL_INIT_NOPARACHUTE),
840 const_iv (SDL_INIT_EVENTTHREAD),
841
842 const_iv (SDL_GL_RED_SIZE),
843 const_iv (SDL_GL_GREEN_SIZE),
844 const_iv (SDL_GL_BLUE_SIZE),
845 const_iv (SDL_GL_ALPHA_SIZE),
846 const_iv (SDL_GL_DOUBLEBUFFER),
847 const_iv (SDL_GL_BUFFER_SIZE),
848 const_iv (SDL_GL_DEPTH_SIZE),
849 const_iv (SDL_GL_STENCIL_SIZE),
850 const_iv (SDL_GL_ACCUM_RED_SIZE),
851 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
852 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
853 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
854 const_iv (SDL_GL_STEREO),
855 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
856 const_iv (SDL_GL_MULTISAMPLESAMPLES),
857 const_iv (SDL_GL_ACCELERATED_VISUAL),
858 const_iv (SDL_GL_SWAP_CONTROL),
859
860 const_iv (FOW_DARKNESS)
640# undef const_iv 861# undef const_iv
641 }; 862 };
642 863
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 864 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
645 866
646 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
647 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
648} 869}
649 870
665NV ceil (NV x) 886NV ceil (NV x)
666 887
667IV minpot (UV n) 888IV minpot (UV n)
668 889
669IV popcount (UV n) 890IV popcount (UV n)
891
892NV distance (NV dx, NV dy)
893 CODE:
894 RETVAL = pow (dx * dx + dy * dy, 0.5);
895 OUTPUT:
896 RETVAL
670 897
671void 898void
672pango_init () 899pango_init ()
673 CODE: 900 CODE:
674{ 901{
680 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 907 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 908 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif 909#endif
683} 910}
684 911
685char *
686SDL_GetError () 912char *SDL_GetError ()
687 913
688int 914void SDL_main_hack (SV *real_main)
689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 915 PROTOTYPE: &
690 916
691void 917int SDL_Init (U32 flags)
918
919int SDL_InitSubSystem (U32 flags)
920
921void SDL_QuitSubSystem (U32 flags)
922
692SDL_Quit () 923void SDL_Quit ()
924
925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
927
928int SDL_GL_GetAttribute (int attr)
929 CODE:
930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
931 XSRETURN_UNDEF;
932 OUTPUT:
933 RETVAL
693 934
694void 935void
695SDL_ListModes (int rgb, int alpha) 936SDL_ListModes (int rgb, int alpha)
696 PPCODE: 937 PPCODE:
697{ 938{
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 950 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 951 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 952 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712 953
713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 954 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
714#if SDL_VERSION_ATLEAST(1,2,10)
715 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
716 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 955 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717#endif
718 956
719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 957 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
720 958
721 if (m && m != (SDL_Rect **)-1) 959 if (m && m != (SDL_Rect **)-1)
722 while (*m) 960 while (*m)
723 { 961 {
724 if ((*m)->w >= 800 && (*m)->h >= 480) 962 if ((*m)->w >= 400 && (*m)->h >= 300)
725 { 963 {
726 AV *av = newAV (); 964 AV *av = newAV ();
727 av_push (av, newSViv ((*m)->w)); 965 av_push (av, newSViv ((*m)->w));
728 av_push (av, newSViv ((*m)->h)); 966 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb)); 967 av_push (av, newSViv (rgb));
752 ); 990 );
753 991
754 if (RETVAL) 992 if (RETVAL)
755 { 993 {
756 av_clear (texture_av); 994 av_clear (texture_av);
757
758 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
759#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 995#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
760#include "glfunc.h" 996#include "glfunc.h"
761#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
762 } 1000 }
763} 1001}
764 OUTPUT: 1002 OUTPUT:
765 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
766 1007
767void 1008void
768SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
769 1010
770char * 1011char *
771SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
772 1014
773int 1015int
774SDL_GetAppState () 1016SDL_GetAppState ()
775 1017
776int 1018int
777SDL_GetModState () 1019SDL_GetModState ()
778 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
779void 1025void
1026SDL_PumpEvents ()
1027
1028void
780poll_events () 1029peep_events ()
781 PPCODE: 1030 PPCODE:
782{ 1031{
783 SDL_Event ev; 1032 SDL_Event ev;
784 1033
785 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
792 { 1041 {
793 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
794 case SDL_KEYUP: 1043 case SDL_KEYUP:
795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
797 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1046 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
798 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1047 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
799 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
800 break; 1049 break;
801 1050
802 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
821 x = ev.motion.x; 1070 x = ev.motion.x;
822 y = ev.motion.y; 1071 y = ev.motion.y;
823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
824 } 1073 }
825 1074
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
827 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
828 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
829 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
830 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
831 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
851 1100
852 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1101 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
853 } 1102 }
854} 1103}
855 1104
1105char *
1106SDL_AudioDriverName ()
1107 CODE:
1108{
1109 char buf [256];
1110 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1111 XSRETURN_UNDEF;
1112
1113 RETVAL = buf;
1114}
1115 OUTPUT:
1116 RETVAL
1117
856int 1118int
857Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1119Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
858 POSTCALL: 1120 POSTCALL:
859 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
860 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
861 1123
862void 1124void
863Mix_QuerySpec () 1125Mix_QuerySpec ()
922add_font (char *file) 1184add_font (char *file)
923 CODE: 1185 CODE:
924 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
925 OUTPUT: 1187 OUTPUT:
926 RETVAL 1188 RETVAL
1189
1190void
1191IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1192
1193# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1194void
1195Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
927 1196
928void 1197void
929load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
930 ALIAS: 1199 ALIAS:
931 load_image_file = 1 1200 load_image_file = 1
977 1246
978 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
979 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
980 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
981 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
982 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
983 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
984 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
985 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
986 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
987 1256
1047#if DEBUG 1316#if DEBUG
1048 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1049#endif 1318#endif
1050} 1319}
1051 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1052MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1053 1329
1054PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1055 1331
1056DC::Font 1332DC::Font
1057new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1058 CODE: 1334 CODE:
1059{ 1335{
1060 int count; 1336 int count;
1061 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1062 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1091 PROTOTYPE: 1367 PROTOTYPE:
1092 CODE: 1368 CODE:
1093 tc_restore (); 1369 tc_restore ();
1094 1370
1095DC::Layout 1371DC::Layout
1096new (SV *class) 1372new (SV *klass)
1097 CODE: 1373 CODE:
1098 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1099 1375
1100 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1101 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1250 1526
1251void 1527void
1252set_height (DC::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1253 CODE: 1529 CODE:
1254 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1255 { 1531 {
1256 self->base_height = base_height; 1532 self->base_height = base_height;
1257 layout_update_font (self); 1533 layout_update_font (self);
1258 } 1534 }
1259 1535
1260void 1536void
1487 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1488 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1489 } 1765 }
1490} 1766}
1491 1767
1768void
1769draw_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)
1770 PROTOTYPE: @
1771 CODE:
1772{
1773 glEnable (GL_BLEND);
1774 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1775 glEnable (GL_TEXTURE_2D);
1776 glBindTexture (GL_TEXTURE_2D, name1);
1777
1778 glColor3f (intensity, intensity, intensity);
1779 glPushMatrix ();
1780 glScalef (1./3, 1./3, 1.);
1781
1782 if (blend > 0.f)
1783 {
1784 float dx3 = dx * -3.f / w;
1785 float dy3 = dy * -3.f / h;
1786 GLfloat env_color[4] = { 0., 0., 0., blend };
1787
1788 /* interpolate the two shadow textures */
1789 /* stage 0 == rgb(glcolor) + alpha(t0) */
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1791
1792 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1793 gl.ActiveTexture (GL_TEXTURE1);
1794 glEnable (GL_TEXTURE_2D);
1795 glBindTexture (GL_TEXTURE_2D, name2);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1797
1798 /* rgb == rgb(glcolor) */
1799 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1802
1803 /* alpha = interpolate t0, t1 by env_alpha */
1804 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1805
1806 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1809
1810 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1811 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1814 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1815
1816 glBegin (GL_QUADS);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1820 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1821 glEnd ();
1822
1823 glDisable (GL_TEXTURE_2D);
1824 gl.ActiveTexture (GL_TEXTURE0);
1825 }
1826 else
1827 {
1828 /* simple blending of one texture, also opengl <1.3 path */
1829 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1830
1831 glBegin (GL_QUADS);
1832 glTexCoord2f (0, 0); glVertex2f (0, 0);
1833 glTexCoord2f (0, t); glVertex2f (0, h);
1834 glTexCoord2f (s, t); glVertex2f (w, h);
1835 glTexCoord2f (s, 0); glVertex2f (w, 0);
1836 glEnd ();
1837 }
1838
1839 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1840 {
1841 int x, y;
1842 int dx3 = dx * 3;
1843 int dy3 = dy * 3;
1844
1845 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1846 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1847 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1848 glTranslatef (-1., -1., 0);
1849 glBegin (GL_QUADS);
1850
1851 for (y = 1; y < h; y += 3)
1852 {
1853 int y1 = y - dy3;
1854 int y1valid = y1 >= 0 && y1 < h;
1855
1856 for (x = 1; x < w; x += 3)
1857 {
1858 int x1 = x - dx3;
1859 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1860 uint8_t h2;
1861
1862 if (y1valid && x1 >= 0 && x1 < w)
1863 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1864 else
1865 h2 = 1; /* out of range == invisible */
1866
1867 if (h1 || h2)
1868 {
1869 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1870 glColor4f (1., 1., 1., alpha);
1871
1872 glTexCoord2f (0, 0.); glVertex2i (x , y );
1873 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1874 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1875 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1876 }
1877 }
1878 }
1879 }
1880
1881 glEnd ();
1882
1883 glPopMatrix ();
1884
1885 glDisable (GL_TEXTURE_2D);
1886 glDisable (GL_BLEND);
1887}
1888
1492IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1889IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1493 CODE: 1890 CODE:
1494{ 1891{
1495 GLint width; 1892 GLint width;
1496 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1893 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1503MODULE = Deliantra::Client PACKAGE = DC::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1504 1901
1505PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1506 1903
1507DC::Map 1904DC::Map
1508new (SV *class) 1905new (SV *klass)
1509 CODE: 1906 CODE:
1510 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1511 RETVAL->x = 0; 1908 RETVAL->x = 0;
1512 RETVAL->y = 0; 1909 RETVAL->y = 0;
1513 RETVAL->w = 0; 1910 RETVAL->w = 0;
1514 RETVAL->h = 0; 1911 RETVAL->h = 0;
1515 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1552 1949
1553void 1950void
1554set_smooth (DC::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1555 CODE: 1952 CODE:
1556{ 1953{
1557 tileid texid; 1954 tileid texid;
1558 maptex *tex; 1955 maptex *tex;
1559 1956
1560 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1561 return; 1958 return;
1562 1959
1563 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1564 return; 1961 return;
1565 1962
1566 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1567 1964
1568 if (!texid) 1965 if (!texid)
1569 return; 1966 return;
1570 1967
1571 tex = self->tex + texid; 1968 tex = self->tex + texid;
1600 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1997 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1601 // use uglier nearest interpolation because linear suffers 1998 // use uglier nearest interpolation because linear suffers
1602 // from transparent color bleeding and ugly wrapping effects. 1999 // from transparent color bleeding and ugly wrapping effects.
1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 2000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1604} 2001}
2002
2003void
2004expire_textures (DC::Map self, int texid, int count)
2005 PPCODE:
2006 for (; texid < self->texs && count; ++texid, --count)
2007 {
2008 maptex *tex = self->tex + texid;
2009
2010 if (tex->name)
2011 {
2012 if (tex->unused)
2013 {
2014 tex->name = 0;
2015 tex->unused = 0;
2016 XPUSHs (sv_2mortal (newSViv (texid)));
2017 }
2018 else
2019 tex->unused = 1;
2020 }
2021 }
1605 2022
1606int 2023int
1607ox (DC::Map self) 2024ox (DC::Map self)
1608 ALIAS: 2025 ALIAS:
1609 oy = 1 2026 oy = 1
1649 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1650 } 2067 }
1651} 2068}
1652 2069
1653SV * 2070SV *
1654map1a_update (DC::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1655 CODE: 2072 CODE:
1656{ 2073{
1657 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1658 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1659 mapcell *cell; 2076 mapcell *cell;
1680 2097
1681 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1682 2099
1683 if (flags & 8) 2100 if (flags & 8)
1684 { 2101 {
2102 uint8_t ext, cmd;
2103
1685 if (extmap) 2104 do
1686 { 2105 {
1687 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1688 2108
1689 do 2109 if (cmd < 4)
2110 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2111 else if (cmd == 5) // health
1690 { 2112 {
1691 ext = *data++;
1692 cmd = ext & 0x3f;
1693
1694 if (cmd < 4)
1695 cell->darkness = 255 - ext * 64 + 1;
1696 else if (cmd == 5) // health
1697 {
1698 cell->stat_width = 1; 2113 cell->stat_width = 1;
1699 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1700 }
1701 else if (cmd == 6) // monster width
1702 cell->stat_width = *data++ + 1;
1703 else if (cmd == 0x47)
1704 {
1705 if (*data == 4)
1706 ; // decode player count
1707
1708 data += *data + 1;
1709 }
1710 else if (cmd == 8) // cell flags
1711 cell->flags = *data++;
1712 else if (ext & 0x40) // unknown, multibyte => skip
1713 data += *data + 1;
1714 else
1715 data++;
1716 } 2115 }
1717 while (ext & 0x80); 2116 else if (cmd == 6) // monster width
2117 cell->stat_width = *data++ + 1;
2118 else if (cmd == 0x47)
2119 {
2120 if (*data == 1) cell->player = data [1];
2121 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2122 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2123 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2124
2125 data += *data + 1;
2126 }
2127 else if (cmd == 8) // cell flags
2128 cell->flags = *data++;
2129 else if (ext & 0x40) // unknown, multibyte => skip
2130 data += *data + 1;
2131 else
2132 data++;
1718 } 2133 }
1719 else 2134 while (ext & 0x80);
1720 cell->darkness = *data++ + 1;
1721 } 2135 }
1722 2136
1723 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
1724 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
1725 { 2139 {
1728 cell->tile [z] = self->face2tile [face]; 2142 cell->tile [z] = self->face2tile [face];
1729 2143
1730 if (cell->tile [z]) 2144 if (cell->tile [z])
1731 { 2145 {
1732 maptex *tex = self->tex + cell->tile [z]; 2146 maptex *tex = self->tex + cell->tile [z];
2147 tex->unused = 0;
1733 if (!tex->name) 2148 if (!tex->name)
1734 av_push (missing, newSViv (cell->tile [z])); 2149 av_push (missing, newSViv (cell->tile [z]));
1735 2150
1736 if (tex->smoothtile) 2151 if (tex->smoothtile)
1737 { 2152 {
1738 maptex *smooth = self->tex + tex->smoothtile; 2153 maptex *smooth = self->tex + tex->smoothtile;
2154 smooth->unused = 0;
1739 if (!smooth->name) 2155 if (!smooth->name)
1740 av_push (missing, newSViv (tex->smoothtile)); 2156 av_push (missing, newSViv (tex->smoothtile));
1741 } 2157 }
1742 } 2158 }
1743 } 2159 }
1744 } 2160 }
1745 else 2161 else
1746 cell->darkness = 0; 2162 CELL_CLEAR (cell);
1747 } 2163 }
1748} 2164}
1749 OUTPUT: 2165 OUTPUT:
1750 RETVAL 2166 RETVAL
1751 2167
1771 ? self->row + y 2187 ? self->row + y
1772 : 0; 2188 : 0;
1773 2189
1774 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1775 { 2191 {
1776 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1777 2193
1778 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1779 { 2195 {
1780 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1781 2197
1783 { 2199 {
1784 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1785 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1786 int a1 = tex.a; 2202 int a1 = tex.a;
1787 2203
1788 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1789 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1790 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1791 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1792 } 2208 }
1793 } 2209 }
1794 2210
1795 *map++ = (r ) 2211 *map++ = (r )
1796 | (g << 8) 2212 | (g << 8)
1797 | (b << 16) 2213 | (b << 16)
1798 | (a << 24); 2214 | (a << 24);
1799 } 2215 }
1800 } 2216 }
1801 2217
1802 RETVAL = map_sv; 2218 RETVAL = map_sv;
1803} 2219}
1804 OUTPUT: 2220 OUTPUT:
1805 RETVAL 2221 RETVAL
1806 2222
1807void 2223void
1808draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2224draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1809 CODE: 2225 CODE:
1810{ 2226{
1811 int x, y, z; 2227 int x, y, z;
1812 2228
1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1815 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1816 smooth_key skey; 2230 int pl_x, pl_y;
1817 2231 maptex pl_tex;
1818 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2233 rc_t *rc_ov = rc_alloc ();
1819 rc_key_t key; 2234 rc_key_t key;
1820 rc_array_t *arr; 2235 rc_array_t *arr;
1821 2236
2237 pl_tex.name = 0;
2238
1822 // thats current max. sorry. 2239 // that's current max. sorry.
1823 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
1824 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
1825
1826 // clear key, in case of extra padding
1827 memset (&skey, 0, sizeof (skey));
1828 2242
1829 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
1830 key.r = 255; 2244 key.r = 255;
1831 key.g = 255; 2245 key.g = 255;
1832 key.b = 255; 2246 key.b = 255;
1833 key.a = 255; 2247 key.a = 255;
1834 key.mode = GL_QUADS; 2248 key.mode = GL_QUADS;
1835 key.format = GL_T2F_V3F; 2249 key.format = GL_T2F_V3F;
1836 key.texname = -1;
1837 2250
1838 mx += self->x; 2251 mx += self->x;
1839 my += self->y; 2252 my += self->y;
1840 2253
1841 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
1842 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
1843 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
1844 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1845 2258
1846 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1847 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1848 { 2261 {
1849 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
1864 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1865 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1866 2279
1867 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
1868 { 2281 {
2282 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2283 smooth_key skey;
2284 smooth_hash smooth;
1869 memset (smooth_level, 0, sizeof (smooth_level)); 2285 memset (smooth_level, 0, sizeof (smooth_level));
2286 key.texname = -1;
1870 2287
1871 for (y = 0; y < sh; y++) 2288 for (y = 0; y < sh; y++)
1872 if (0 <= y + my && y + my < self->rows) 2289 if (0 <= y + my && y + my < self->rows)
1873 { 2290 {
1874 maprow *row = self->row + (y + my); 2291 maprow *row = self->row + (y + my);
1884 maptex tex = self->tex [tile]; 2301 maptex tex = self->tex [tile];
1885 int px, py; 2302 int px, py;
1886 2303
1887 if (key.texname != tex.name) 2304 if (key.texname != tex.name)
1888 { 2305 {
2306 self->tex [tile].unused = 0;
2307
1889 if (!tex.name) 2308 if (!tex.name)
1890 tex = self->tex [2]; /* missing, replace by noface */ 2309 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1891 2310
1892 key.texname = tex.name; 2311 key.texname = tex.name;
1893 arr = rc_array (rc, &key); 2312 arr = rc_array (rc, &key);
1894 } 2313 }
1895 2314
1896 px = (x + 1) * T - tex.w; 2315 px = (x + 1) * Th - tex.w;
1897 py = (y + 1) * T - tex.h; 2316 py = (y + 1) * Tw - tex.h;
2317
2318 if (expect_false (cell->player == player) && expect_false (z == 2))
2319 {
2320 pl_x = px;
2321 pl_y = py;
2322 pl_tex = tex;
2323 continue;
2324 }
1898 2325
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2326 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2327 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1901 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2328 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1902 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2329 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1903
1904 if (cell->flags && z == 2)
1905 {
1906 // overlays such as the speech bubble, probably more to come
1907 if (cell->flags & 1)
1908 {
1909 maptex tex = self->tex [1];
1910 int px = x * T + T * 2 / 32;
1911 int py = y * T - T * 6 / 32;
1912
1913 if (tex.name)
1914 {
1915 if (key.texname != tex.name)
1916 {
1917 key.texname = tex.name;
1918 arr = rc_array (rc, &key);
1919 }
1920
1921 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1922 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1923 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1924 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1925 }
1926 }
1927 }
1928 2330
1929 // update smooth hash 2331 // update smooth hash
1930 if (tex.smoothtile) 2332 if (tex.smoothtile)
1931 { 2333 {
1932 skey.tile = tex.smoothtile; 2334 skey.tile = tex.smoothtile;
1948 2350
1949 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2351 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1950 // ·· ·· ·┏ ┓· 2352 // ·· ·· ·┏ ┓·
1951 2353
1952 // full tile 2354 // full tile
1953 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2355 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1954 2356
1955 // borders 2357 // borders
1956 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2358 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1957 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2359 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1958 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2360 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1959 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2361 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1960 2362
1961 // corners 2363 // corners
1962 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2364 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1963 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2365 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1964 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2366 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1965 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2367 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2368 }
2369 }
2370
2371 if (expect_false (z == 2) && expect_false (cell->flags))
2372 {
2373 // overlays such as the speech bubble, probably more to come
2374 if (cell->flags & 1)
2375 {
2376 rc_key_t key_ov = key;
2377 maptex tex = self->tex [TEXID_SPEECH];
2378 rc_array_t *arr;
2379 int px = x * Tw + Tw * 2 / 32;
2380 int py = y * Th - Th * 6 / 32;
2381
2382 key_ov.texname = tex.name;
2383 arr = rc_array (rc_ov, &key_ov);
2384
2385 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2386 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2387 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2388 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1966 } 2389 }
1967 } 2390 }
1968 } 2391 }
1969 } 2392 }
1970 2393
1986 if (smask & (((uint32_t)1) << b)) 2409 if (smask & (((uint32_t)1) << b))
1987 { 2410 {
1988 int level = (w << 5) | b; 2411 int level = (w << 5) | b;
1989 HE *he; 2412 HE *he;
1990 2413
1991 hv_iterinit (smooth); 2414 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1992 while ((he = hv_iternext (smooth)))
1993 { 2415 {
1994 smooth_key *skey = (smooth_key *)HeKEY (he); 2416 smooth_key &skey = it->first;
1995 IV bits = SvIVX (HeVAL (he)); 2417 IV bits = it->second;
1996 2418
1997 if (!(bits & 0x1000) 2419 if (!(bits & 0x1000)
1998 && skey->level == level 2420 && skey.level == level
1999 && level > smooth_max [skey->x][skey->y]) 2421 && level > smooth_max [skey.x][skey.y])
2000 { 2422 {
2001 maptex tex = self->tex [skey->tile]; 2423 maptex tex = self->tex [skey.tile];
2002 int px = (((int)skey->x) - 1) * T; 2424 int px = (((int)skey.x) - 1) * Tw;
2003 int py = (((int)skey->y) - 1) * T; 2425 int py = (((int)skey.y) - 1) * Th;
2004 int border = bits & 15; 2426 int border = bits & 15;
2005 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2427 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2006 float dx = tex.s * .0625f; // 16 images/row 2428 float dx = tex.s * .0625f; // 16 images/row
2007 float dy = tex.t * .5f ; // 2 images/column 2429 float dy = tex.t * .5f ; // 2 images/column
2008 2430
2010 { 2432 {
2011 // this time avoiding texture state changes 2433 // this time avoiding texture state changes
2012 // save gobs of state changes. 2434 // save gobs of state changes.
2013 if (key.texname != tex.name) 2435 if (key.texname != tex.name)
2014 { 2436 {
2437 self->tex [skey.tile].unused = 0;
2438
2015 glEnd (); 2439 glEnd ();
2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2440 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2017 glBegin (GL_QUADS); 2441 glBegin (GL_QUADS);
2018 } 2442 }
2019 2443
2020 if (border) 2444 if (border)
2021 { 2445 {
2022 float ox = border * dx; 2446 float ox = border * dx;
2023 2447
2024 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2448 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2025 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2026 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2450 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2027 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2451 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2028 } 2452 }
2029 2453
2030 if (corner) 2454 if (corner)
2031 { 2455 {
2032 float ox = corner * dx; 2456 float ox = corner * dx;
2033 2457
2034 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2458 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2035 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2459 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2036 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2460 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2037 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2461 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2038 } 2462 }
2039 } 2463 }
2040 } 2464 }
2041 } 2465 }
2042 } 2466 }
2044 2468
2045 glEnd (); 2469 glEnd ();
2046 glDisable (GL_TEXTURE_2D); 2470 glDisable (GL_TEXTURE_2D);
2047 key.texname = -1; 2471 key.texname = -1;
2048 } 2472 }
2049
2050 hv_clear (smooth);
2051 } 2473 }
2474
2475 if (pl_tex.name)
2476 {
2477 maptex tex = pl_tex;
2478 int px = pl_x + sdx;
2479 int py = pl_y + sdy;
2480
2481 key.texname = tex.name;
2482 arr = rc_array (rc, &key);
2483
2484 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2485 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2486 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2487 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2488
2489 rc_draw (rc);
2490 }
2491
2492 rc_draw (rc_ov);
2493 rc_clear (rc_ov);
2052 2494
2053 glDisable (GL_BLEND); 2495 glDisable (GL_BLEND);
2054 rc_free (rc); 2496 rc_free (rc);
2497 rc_free (rc_ov);
2055 2498
2056 // top layer: overlays such as the health bar 2499 // top layer: overlays such as the health bar
2057 for (y = 0; y < sh; y++) 2500 for (y = 0; y < sh; y++)
2058 if (0 <= y + my && y + my < self->rows) 2501 if (0 <= y + my && y + my < self->rows)
2059 { 2502 {
2062 for (x = 0; x < sw; x++) 2505 for (x = 0; x < sw; x++)
2063 if (row->c0 <= x + mx && x + mx < row->c1) 2506 if (row->c0 <= x + mx && x + mx < row->c1)
2064 { 2507 {
2065 mapcell *cell = row->col + (x + mx - row->c0); 2508 mapcell *cell = row->col + (x + mx - row->c0);
2066 2509
2067 int px = x * T; 2510 int px = x * Tw;
2068 int py = y * T; 2511 int py = y * Th;
2512
2513 if (expect_false (cell->player == player))
2514 {
2515 px += sdx;
2516 py += sdy;
2517 }
2069 2518
2070 if (cell->stat_hp) 2519 if (cell->stat_hp)
2071 { 2520 {
2072 int width = cell->stat_width * T; 2521 int width = cell->stat_width * Tw;
2073 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2522 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2074 2523
2075 glColor3ub (0, 0, 0); 2524 glColor3ub (0, 0, 0);
2076 glRectf (px + 1, py - thick - 2, 2525 glRectf (px + 1, py - thick - 2,
2077 px + width - 1, py); 2526 px + width - 1, py);
2078 2527
2084 } 2533 }
2085 } 2534 }
2086} 2535}
2087 2536
2088void 2537void
2089draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2538draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2090 CODE: 2539 CODE:
2091{ 2540{
2092 static float color[16][3] = { 2541 static float color[16][3] = {
2093 { 0.00F, 0.00F, 0.00F }, 2542 { 0.00f, 0.00f, 0.00f },
2094 { 1.00F, 1.00F, 1.00F }, 2543 { 1.00f, 1.00f, 1.00f },
2095 { 0.00F, 0.00F, 0.55F }, 2544 { 0.00f, 0.00f, 0.55f },
2096 { 1.00F, 0.00F, 0.00F }, 2545 { 1.00f, 0.00f, 0.00f },
2097 2546
2098 { 1.00F, 0.54F, 0.00F }, 2547 { 1.00f, 0.54f, 0.00f },
2099 { 0.11F, 0.56F, 1.00F }, 2548 { 0.11f, 0.56f, 1.00f },
2100 { 0.93F, 0.46F, 0.00F }, 2549 { 0.93f, 0.46f, 0.00f },
2101 { 0.18F, 0.54F, 0.34F }, 2550 { 0.18f, 0.54f, 0.34f },
2102 2551
2103 { 0.56F, 0.73F, 0.56F }, 2552 { 0.56f, 0.73f, 0.56f },
2104 { 0.80F, 0.80F, 0.80F }, 2553 { 0.80f, 0.80f, 0.80f },
2105 { 0.55F, 0.41F, 0.13F }, 2554 { 0.55f, 0.41f, 0.13f },
2106 { 0.99F, 0.77F, 0.26F }, 2555 { 0.99f, 0.77f, 0.26f },
2107 2556
2108 { 0.74F, 0.65F, 0.41F }, 2557 { 0.74f, 0.65f, 0.41f },
2109 2558
2110 { 0.00F, 1.00F, 1.00F }, 2559 { 0.00f, 1.00f, 1.00f },
2111 { 1.00F, 0.00F, 1.00F }, 2560 { 1.00f, 0.00f, 1.00f },
2112 { 1.00F, 1.00F, 0.00F }, 2561 { 1.00f, 1.00f, 0.00f },
2113 }; 2562 };
2114 2563
2115 int x, y; 2564 int x, y;
2116 2565
2117 glEnable (GL_TEXTURE_2D); 2566 glEnable (GL_TEXTURE_2D);
2567 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2568 * but the nvidia driver (185.18.14) mishandles alpha textures
2569 * and takes the colour from god knows where instead of using
2570 * Cp. MODULATE results in the same colour, but slightly different
2571 * alpha, but atcually gives us the correct colour with nvidia.
2572 */
2118 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2573 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2119 glEnable (GL_BLEND); 2574 glEnable (GL_BLEND);
2120 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2575 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2121 glBegin (GL_QUADS); 2576 glBegin (GL_QUADS);
2122 2577
2123 for (y = 0; y < h; y++) 2578 for (y = 0; y < h; y++)
2127 2582
2128 if (m) 2583 if (m)
2129 { 2584 {
2130 float *c = color [m & 15]; 2585 float *c = color [m & 15];
2131 2586
2132 float tx1 = m & 0x40 ? 0.5 : 0.; 2587 float tx1 = m & 0x40 ? 0.5f : 0.f;
2133 float tx2 = tx1 + 0.5; 2588 float tx2 = tx1 + 0.5f;
2134 2589
2135 glColor4f (c[0], c[1], c[2], 0.75); 2590 glColor4f (c[0], c[1], c[2], 1);
2136 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2591 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2137 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2592 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2138 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2593 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2139 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2594 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2140 } 2595 }
2148void 2603void
2149fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2604fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2150 PPCODE: 2605 PPCODE:
2151{ 2606{
2152 int x, y; 2607 int x, y;
2153 int sw1 = sw + 2; 2608 int sw1 = sw + 2;
2154 int sh1 = sh + 2; 2609 int sh1 = sh + 2;
2155 int sh3 = sh * 3; 2610 int sh3 = sh * 3;
2156 int sw34 = (sw * 3 + 3) & ~3; 2611 int sw3 = sw * 3;
2612 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2613 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2157 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2614 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2158 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2615 memset (darkness1, 0, sw1*sh1);
2159 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2160 2616
2161 SvPOK_only (darkness3_sv); 2617 SvPOK_only (darkness3_sv);
2162 SvCUR_set (darkness3_sv, sw34 * sh3); 2618 SvCUR_set (darkness3_sv, sw3 * sh3);
2163 2619
2164 mx += self->x - 1; 2620 mx += self->x - 1;
2165 my += self->y - 1; 2621 my += self->y - 1;
2166
2167 memset (darkness1, 255, sw1 * sh1);
2168 2622
2169 for (y = 0; y < sh1; y++) 2623 for (y = 0; y < sh1; y++)
2170 if (0 <= y + my && y + my < self->rows) 2624 if (0 <= y + my && y + my < self->rows)
2171 { 2625 {
2172 maprow *row = self->row + (y + my); 2626 maprow *row = self->row + (y + my);
2175 if (row->c0 <= x + mx && x + mx < row->c1) 2629 if (row->c0 <= x + mx && x + mx < row->c1)
2176 { 2630 {
2177 mapcell *cell = row->col + (x + mx - row->c0); 2631 mapcell *cell = row->col + (x + mx - row->c0);
2178 2632
2179 darkness1 [y * sw1 + x] = cell->darkness 2633 darkness1 [y * sw1 + x] = cell->darkness
2180 ? 255 - (cell->darkness - 1) 2634 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2181 : 255 - FOW_DARKNESS; 2635 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2182 } 2636 }
2183 } 2637 }
2184 2638
2185 for (y = 0; y < sh; ++y) 2639 for (y = 0; y < sh; ++y)
2186 for (x = 0; x < sw; ++x) 2640 for (x = 0; x < sw; ++x)
2205 2659
2206 uint8_t r13 = (d13 + d23 + d12) / 3; 2660 uint8_t r13 = (d13 + d23 + d12) / 3;
2207 uint8_t r23 = d23; 2661 uint8_t r23 = d23;
2208 uint8_t r33 = (d23 + d33 + d32) / 3; 2662 uint8_t r33 = (d23 + d33 + d32) / 3;
2209 2663
2210 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2664 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2211 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2665 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2212 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2666 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2213 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2667 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2214 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2668 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2215 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2216 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2670 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2217 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2671 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2218 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2219 } 2673 }
2220 2674
2221 free (darkness1); 2675 free (darkness1);
2222 2676
2223 EXTEND (SP, 3); 2677 EXTEND (SP, 3);
2224 PUSHs (sv_2mortal (newSViv (sw34))); 2678 PUSHs (sv_2mortal (newSViv (sw3)));
2225 PUSHs (sv_2mortal (newSViv (sh3))); 2679 PUSHs (sv_2mortal (newSViv (sh3)));
2226 PUSHs (darkness3_sv); 2680 PUSHs (darkness3_sv);
2227} 2681}
2228 2682
2229SV * 2683SV *
2292 else 2746 else
2293 *data++ = 0; 2747 *data++ = 0;
2294 } 2748 }
2295 } 2749 }
2296 2750
2751 /* if size is w*h + 5 then no data has been found */
2752 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2753 {
2297 SvPOK_only (data_sv); 2754 SvPOK_only (data_sv);
2298 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2755 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2756 }
2757
2299 RETVAL = data_sv; 2758 RETVAL = data_sv;
2300} 2759}
2301 OUTPUT: 2760 OUTPUT:
2302 RETVAL 2761 RETVAL
2303 2762
2304void 2763void
2305set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2764set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2306 PPCODE: 2765 PPCODE:
2307{ 2766{
2308 int x, y, z; 2767 int x, y, z;
2309 int w, h; 2768 int w, h;
2310 int x1, y1; 2769 int x1, y1;
2770 STRLEN len;
2771 uint8_t *data, *end;
2772
2773 len = SvLEN (data_sv);
2774 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2775 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2776 end = data + len + 8;
2777
2778 if (len < 5)
2779 XSRETURN_EMPTY;
2311 2780
2312 if (*data++ != 0) 2781 if (*data++ != 0)
2313 XSRETURN_EMPTY; /* version mismatch */ 2782 XSRETURN_EMPTY; /* version mismatch */
2314 2783
2315 w = *data++ << 8; w |= *data++; 2784 w = *data++ << 8; w |= *data++;
2330 { 2799 {
2331 maprow *row = map_get_row (self, y); 2800 maprow *row = map_get_row (self, y);
2332 2801
2333 for (x = x0; x < x1; x++) 2802 for (x = x0; x < x1; x++)
2334 { 2803 {
2804 uint8_t flags;
2805
2806 if (data + 7 >= end)
2807 XSRETURN_EMPTY;
2808
2335 uint8_t flags = *data++; 2809 flags = *data++;
2336 2810
2337 if (flags) 2811 if (flags)
2338 { 2812 {
2339 mapcell *cell = row_get_cell (row, x); 2813 mapcell *cell = row_get_cell (row, x);
2340 tileid tile[3] = { 0, 0, 0 }; 2814 tileid tile[3] = { 0, 0, 0 };
2343 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2817 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2344 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2818 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2345 2819
2346 if (cell->darkness == 0) 2820 if (cell->darkness == 0)
2347 { 2821 {
2348 cell->darkness = 0; 2822 /*cell->darkness = 0;*/
2823 EXTEND (SP, 3);
2349 2824
2350 for (z = 0; z <= 2; z++) 2825 for (z = 0; z <= 2; z++)
2351 { 2826 {
2352 tileid t = tile [z]; 2827 tileid t = tile [z];
2353 2828
2354 if (t >= self->texs || (t && !self->tex [t].name)) 2829 if (t >= self->texs || (t && !self->tex [t].name))
2355 { 2830 {
2356 XPUSHs (sv_2mortal (newSViv (t))); 2831 PUSHs (sv_2mortal (newSViv (t)));
2357 need_texid (self, t); 2832 need_texid (self, t);
2358 } 2833 }
2359 2834
2360 cell->tile [z] = t; 2835 cell->tile [z] = t;
2361 } 2836 }
2366} 2841}
2367 2842
2368MODULE = Deliantra::Client PACKAGE = DC::RW 2843MODULE = Deliantra::Client PACKAGE = DC::RW
2369 2844
2370DC::RW 2845DC::RW
2371new (SV *class, SV *data_sv) 2846new (SV *klass, SV *data_sv)
2372 CODE: 2847 CODE:
2373{ 2848{
2374 STRLEN datalen; 2849 STRLEN datalen;
2375 char *data = SvPVbyte (data_sv, datalen); 2850 char *data = SvPVbyte (data_sv, datalen);
2376 2851
2378} 2853}
2379 OUTPUT: 2854 OUTPUT:
2380 RETVAL 2855 RETVAL
2381 2856
2382DC::RW 2857DC::RW
2383new_from_file (SV *class, const char *path, const char *mode = "rb") 2858new_from_file (SV *klass, const char *path, const char *mode = "rb")
2384 CODE: 2859 CODE:
2385 RETVAL = SDL_RWFromFile (path, mode); 2860 RETVAL = SDL_RWFromFile (path, mode);
2386 OUTPUT: 2861 OUTPUT:
2387 RETVAL 2862 RETVAL
2388 2863
2406 if (RETVAL < 0) 2881 if (RETVAL < 0)
2407 { 2882 {
2408 RETVAL = Mix_GroupOldest (-1); 2883 RETVAL = Mix_GroupOldest (-1);
2409 2884
2410 if (RETVAL < 0) 2885 if (RETVAL < 0)
2886 {
2887 // happens sometimes, maybe it just stopped playing(?)
2888 RETVAL = Mix_GroupAvailable (-1);
2889
2890 if (RETVAL < 0)
2411 XSRETURN_UNDEF; 2891 XSRETURN_UNDEF;
2412 2892 }
2893 else
2413 Mix_HaltChannel (RETVAL); 2894 Mix_HaltChannel (RETVAL);
2414 } 2895 }
2415 2896
2416 Mix_UnregisterAllEffects (RETVAL); 2897 Mix_UnregisterAllEffects (RETVAL);
2417 Mix_Volume (RETVAL, 128); 2898 Mix_Volume (RETVAL, 128);
2418} 2899}
2465void 2946void
2466set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2947set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2467 CODE: 2948 CODE:
2468{ 2949{
2469 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2950 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2470 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2951 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2471 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2952 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2472} 2953}
2473 2954
2474void 2955void
2475set_reverse_stereo (DC::Channel self, int flip) 2956set_reverse_stereo (DC::Channel self, int flip)
2478 2959
2479MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2960MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2480 2961
2481PROTOTYPES: DISABLE 2962PROTOTYPES: DISABLE
2482 2963
2964void
2965decoders ()
2966 PPCODE:
2967#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2968 int i, num = Mix_GetNumChunkDecoders ();
2969 EXTEND (SP, num);
2970 for (i = 0; i < num; ++i)
2971 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2972#else
2973 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2974#endif
2975
2483DC::MixChunk 2976DC::MixChunk
2484new (SV *class, DC::RW rwops) 2977new (SV *klass, DC::RW rwops)
2485 CODE: 2978 CODE:
2486 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2979 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2487 OUTPUT: 2980 OUTPUT:
2488 RETVAL 2981 RETVAL
2489 2982
2519 OUTPUT: 3012 OUTPUT:
2520 RETVAL 3013 RETVAL
2521 3014
2522MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3015MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2523 3016
3017void
3018decoders ()
3019 PPCODE:
3020#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3021 int i, num = Mix_GetNumMusicDecoders ();
3022 EXTEND (SP, num);
3023 for (i = 0; i < num; ++i)
3024 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3025#else
3026 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3027#endif
3028
2524int 3029int
2525volume (int volume = -1) 3030volume (int volume = -1)
2526 PROTOTYPE: ;$ 3031 PROTOTYPE: ;$
2527 CODE: 3032 CODE:
2528 if (items > 0) 3033 if (items > 0)
2539void 3044void
2540halt () 3045halt ()
2541 CODE: 3046 CODE:
2542 Mix_HaltMusic (); 3047 Mix_HaltMusic ();
2543 3048
3049int
3050playing ()
3051 CODE:
3052 RETVAL = Mix_PlayingMusic ();
3053 OUTPUT:
3054 RETVAL
3055
2544DC::MixMusic 3056DC::MixMusic
2545new (SV *class, DC::RW rwops) 3057new (SV *klass, DC::RW rwops)
2546 CODE: 3058 CODE:
2547 RETVAL = Mix_LoadMUS_RW (rwops); 3059 RETVAL = Mix_LoadMUS_RW (rwops);
2548 OUTPUT: 3060 OUTPUT:
2549 RETVAL 3061 RETVAL
2550 3062
2578 } *civ, const_iv[] = { 3090 } *civ, const_iv[] = {
2579# define const_iv(name) { # name, (IV)name } 3091# define const_iv(name) { # name, (IV)name }
2580 const_iv (GL_VENDOR), 3092 const_iv (GL_VENDOR),
2581 const_iv (GL_VERSION), 3093 const_iv (GL_VERSION),
2582 const_iv (GL_EXTENSIONS), 3094 const_iv (GL_EXTENSIONS),
3095 const_iv (GL_MAX_TEXTURE_UNITS),
2583 const_iv (GL_COLOR_MATERIAL), 3096 const_iv (GL_COLOR_MATERIAL),
2584 const_iv (GL_SMOOTH), 3097 const_iv (GL_SMOOTH),
2585 const_iv (GL_FLAT), 3098 const_iv (GL_FLAT),
2586 const_iv (GL_DITHER), 3099 const_iv (GL_DITHER),
2587 const_iv (GL_BLEND), 3100 const_iv (GL_BLEND),
2599 const_iv (GL_ZERO), 3112 const_iv (GL_ZERO),
2600 const_iv (GL_SRC_ALPHA), 3113 const_iv (GL_SRC_ALPHA),
2601 const_iv (GL_DST_ALPHA), 3114 const_iv (GL_DST_ALPHA),
2602 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3115 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2603 const_iv (GL_ONE_MINUS_DST_ALPHA), 3116 const_iv (GL_ONE_MINUS_DST_ALPHA),
3117 const_iv (GL_SRC_COLOR),
3118 const_iv (GL_DST_COLOR),
3119 const_iv (GL_ONE_MINUS_SRC_COLOR),
3120 const_iv (GL_ONE_MINUS_DST_COLOR),
2604 const_iv (GL_SRC_ALPHA_SATURATE), 3121 const_iv (GL_SRC_ALPHA_SATURATE),
2605 const_iv (GL_RGB), 3122 const_iv (GL_RGB),
2606 const_iv (GL_RGBA), 3123 const_iv (GL_RGBA),
2607 const_iv (GL_RGBA4), 3124 const_iv (GL_RGBA4),
2608 const_iv (GL_RGBA8), 3125 const_iv (GL_RGBA8),
2676 const_iv (GL_NICEST), 3193 const_iv (GL_NICEST),
2677 const_iv (GL_V2F), 3194 const_iv (GL_V2F),
2678 const_iv (GL_V3F), 3195 const_iv (GL_V3F),
2679 const_iv (GL_T2F_V3F), 3196 const_iv (GL_T2F_V3F),
2680 const_iv (GL_T2F_N3F_V3F), 3197 const_iv (GL_T2F_N3F_V3F),
3198 const_iv (GL_FUNC_ADD),
3199 const_iv (GL_FUNC_SUBTRACT),
3200 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2681# undef const_iv 3201# undef const_iv
2682 }; 3202 };
2683 3203
2684 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3204 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2685 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3205 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2686 3206
2687 texture_av = newAV (); 3207 texture_av = newAV ();
2688 AvREAL_off (texture_av); 3208 AvREAL_off (texture_av);
2689} 3209}
2690 3210
2692disable_GL_EXT_blend_func_separate () 3212disable_GL_EXT_blend_func_separate ()
2693 CODE: 3213 CODE:
2694 gl.BlendFuncSeparate = 0; 3214 gl.BlendFuncSeparate = 0;
2695 gl.BlendFuncSeparateEXT = 0; 3215 gl.BlendFuncSeparateEXT = 0;
2696 3216
2697char * 3217void
3218apple_nvidia_bug (int enable)
3219
3220const char *
2698gl_vendor () 3221gl_vendor ()
2699 CODE: 3222 CODE:
2700 RETVAL = (char *)glGetString (GL_VENDOR); 3223 RETVAL = (const char *)glGetString (GL_VENDOR);
2701 OUTPUT: 3224 OUTPUT:
2702 RETVAL 3225 RETVAL
2703 3226
2704char * 3227const char *
2705gl_version () 3228gl_version ()
2706 CODE: 3229 CODE:
2707 RETVAL = (char *)glGetString (GL_VERSION); 3230 RETVAL = (const char *)glGetString (GL_VERSION);
2708 OUTPUT: 3231 OUTPUT:
2709 RETVAL 3232 RETVAL
2710 3233
2711char * 3234const char *
2712gl_extensions () 3235gl_extensions ()
2713 CODE: 3236 CODE:
2714 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3237 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2715 OUTPUT: 3238 OUTPUT:
2716 RETVAL 3239 RETVAL
2717 3240
2718const char *glGetString (GLenum pname) 3241const char *glGetString (GLenum pname)
3242 CODE:
3243 RETVAL = (const char *)glGetString (pname);
3244 OUTPUT:
3245 RETVAL
2719 3246
2720GLint glGetInteger (GLenum pname) 3247GLint glGetInteger (GLenum pname)
2721 CODE: 3248 CODE:
2722 glGetIntegerv (pname, &RETVAL); 3249 glGetIntegerv (pname, &RETVAL);
2723 OUTPUT: 3250 OUTPUT:
2731 3258
2732int glGetError () 3259int glGetError ()
2733 3260
2734void glFinish () 3261void glFinish ()
2735 3262
3263void glFlush ()
3264
2736void glClear (int mask) 3265void glClear (int mask)
2737 3266
2738void glClearColor (float r, float g, float b, float a = 1.0) 3267void glClearColor (float r, float g, float b, float a = 1.0)
2739 PROTOTYPE: @ 3268 PROTOTYPE: @
2740 3269
2749void glBlendFunc (int sfactor, int dfactor) 3278void glBlendFunc (int sfactor, int dfactor)
2750 3279
2751void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3280void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2752 CODE: 3281 CODE:
2753 gl_BlendFuncSeparate (sa, da, saa, daa); 3282 gl_BlendFuncSeparate (sa, da, saa, daa);
3283
3284# void glBlendEquation (int se)
2754 3285
2755void glDepthMask (int flag) 3286void glDepthMask (int flag)
2756 3287
2757void glLogicOp (int opcode) 3288void glLogicOp (int opcode)
2758 3289
2793void glRotate (float angle, float x, float y, float z) 3324void glRotate (float angle, float x, float y, float z)
2794 CODE: 3325 CODE:
2795 glRotatef (angle, x, y, z); 3326 glRotatef (angle, x, y, z);
2796 3327
2797void glColor (float r, float g, float b, float a = 1.0) 3328void glColor (float r, float g, float b, float a = 1.0)
3329 PROTOTYPE: @
2798 ALIAS: 3330 ALIAS:
2799 glColor_premultiply = 1 3331 glColor_premultiply = 1
2800 CODE: 3332 CODE:
2801 if (ix) 3333 if (ix)
2802 { 3334 {
2908 3440
2909void glEndList () 3441void glEndList ()
2910 3442
2911void glCallList (int list) 3443void glCallList (int list)
2912 3444
3445void c_init ()
3446 CODE:
3447 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3448 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3449
2913MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3450MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2914 3451
2915PROTOTYPES: DISABLE 3452PROTOTYPES: DISABLE
2916 3453
2917void 3454void
2918find_widget (SV *self, NV x, NV y) 3455find_widget (SV *self, NV x, NV y)
2919 PPCODE: 3456 PPCODE:
2920{ 3457{
2921 if (within_widget (self, x, y)) 3458 if (within_widget (self, x, y))
2922 XPUSHs (self); 3459 XPUSHs (self);
2923} 3460}
2924 3461
2925BOOT: 3462BOOT:
2926{ 3463{
2934 3471
2935void 3472void
2936draw (SV *self) 3473draw (SV *self)
2937 CODE: 3474 CODE:
2938{ 3475{
2939 HV *hv; 3476 HV *hv;
2940 SV **svp; 3477 SV **svp;
2941 NV x, y, w, h; 3478 NV x, y, w, h;
2942 SV *draw_x_sv = GvSV (draw_x_gv); 3479 SV *draw_x_sv = GvSV (draw_x_gv);
2943 SV *draw_y_sv = GvSV (draw_y_gv); 3480 SV *draw_y_sv = GvSV (draw_y_gv);
2944 SV *draw_w_sv = GvSV (draw_w_gv); 3481 SV *draw_w_sv = GvSV (draw_w_gv);
2945 SV *draw_h_sv = GvSV (draw_h_gv); 3482 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines