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.273 by root, Wed Aug 20 13:30:02 2008 UTC vs.
Revision 1.328 by root, Sun Nov 18 12:47:55 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};
298
299typedef mapgrid *DC__Map;
259 300
260static char * 301static char *
261prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
262{ 303{
263 char *p; 304 char *p;
281 322
282#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))
283#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))
284 325
285static void 326static void
286need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
287{ 328{
288 while (self->faces <= face) 329 while (self->faces <= face)
289 { 330 {
290 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
291 self->faces *= 2; 332 self->faces *= 2;
292 } 333 }
293} 334}
294 335
295static void 336static void
296need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
297{ 338{
298 while (self->texs <= texid) 339 while (self->texs <= texid)
299 { 340 {
300 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
301 self->texs *= 2; 342 self->texs *= 2;
302 } 343 }
303} 344}
304 345
305static maprow * 346static maprow *
306map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
307{ 348{
308 if (0 > y) 349 if (0 > y)
309 { 350 {
310 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
311 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
349 390
350 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
351} 392}
352 393
353static mapcell * 394static mapcell *
354map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
355{ 396{
356 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
357} 398}
358 399
359static void 400static void
360map_clear (DC__Map self) 401map_clear (mapgrid *self)
361{ 402{
362 int r; 403 int r;
363 404
364 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
365 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
383 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
384 (cell)->player = 0; \ 425 (cell)->player = 0; \
385 } while (0) 426 } while (0)
386 427
387static void 428static void
388map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
389{ 430{
390 int x, y; 431 int x, y;
391 maprow *row; 432 maprow *row;
392 mapcell *cell; 433 mapcell *cell;
393 434
410 CELL_CLEAR (cell); 451 CELL_CLEAR (cell);
411 } 452 }
412 } 453 }
413} 454}
414 455
415typedef struct { 456struct smooth_key
457{
416 tileid tile; 458 tileid tile;
417 uint8_t x, y, level; 459 uint8_t x, y, level;
418} 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}
419 479
420static void 480static void
421smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
422{ 482{
423 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
424 484
425 if (SvIOK (*sv)) 485 if (it == h.end ())
426 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
427 else 487 else
428 sv_setiv (*sv, bits); 488 it->second |= bits;
429} 489}
430 490
431static void 491static void
432music_finished (void) 492music_finished (void)
433{ 493{
450 ev.code = 1; 510 ev.code = 1;
451 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
452 ev.data2 = 0; 512 ev.data2 = 0;
453 513
454 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;
455} 522}
456 523
457static unsigned int 524static unsigned int
458minpot (unsigned int n) 525minpot (unsigned int n)
459{ 526{
527 return 0; 594 return 0;
528 595
529 return 1; 596 return 1;
530} 597}
531 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
532static void 613static void
533deliantra_main () 614deliantra_main (SV *real_main)
534{ 615{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537 dSP; 616 dSP;
617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
538} 620}
539 621
540#ifdef __MACOSX__ 622#ifdef __MACOSX__
623 static SV *real_main;
624
541 /* to due surprising braindamage on the side of SDL design, we 625 /* to due surprising braindamage on the side of SDL design, we
542 * do some mind-boggling hack here: SDL requires a custom main() 626 * do some mind-boggling hack here: SDL requires a custom main()
543 * on OS X, so... we provide one and call the original main(), which, 627 * on OS X, so... we provide one and call the original main(), which,
544 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
545 * and which calls our main (== SDL_main) back. 629 * and which calls our main (== SDL_main) back.
546 */ 630 */
547 extern C_LINKAGE int 631 extern C_LINKAGE int
548 main (int argc, char *argv[]) 632 main (int argc, char *argv[])
549 { 633 {
550 deliantra_main (); 634 deliantra_main (real_main);
551 } 635 }
552 636
553 #undef main 637 #undef main
554 638
555 extern C_LINKAGE int main (int argc, char *argv[]); 639 extern C_LINKAGE int main (int argc, char *argv[]);
556 640
557 static void 641 static void
558 SDL_braino (void) 642 SDL_main_hack (SV *real_main_)
559 { 643 {
644 real_main = real_main_;
645
560 char *argv[] = { "deliantra client", 0 }; 646 char *argv[] = { "deliantra client", 0 };
561 (main) (1, argv); 647 (main) (1, argv);
562 } 648 }
563#else 649#else
564 static void 650 static void
565 SDL_braino (void) 651 SDL_main_hack (SV *real_main)
566 { 652 {
567 deliantra_main (); 653 deliantra_main (real_main);
568 } 654 }
569#endif 655#endif
570 656
571MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
572 658
603 const_iv (SDL_USEREVENT), 689 const_iv (SDL_USEREVENT),
604 690
605 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
606 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
607 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),
608 744
609 const_iv (SDLK_FIRST), 745 const_iv (SDLK_FIRST),
610 const_iv (SDLK_LAST), 746 const_iv (SDLK_LAST),
611 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
612 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
688 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
689 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
690 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
691 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
692 828
829 const_iv (KMOD_LRAM),
830
693 const_iv (MIX_DEFAULT_FORMAT), 831 const_iv (MIX_DEFAULT_FORMAT),
694 832
695 const_iv (SDL_INIT_TIMER), 833 const_iv (SDL_INIT_TIMER),
696 const_iv (SDL_INIT_AUDIO), 834 const_iv (SDL_INIT_AUDIO),
697 const_iv (SDL_INIT_VIDEO), 835 const_iv (SDL_INIT_VIDEO),
721 859
722 const_iv (FOW_DARKNESS) 860 const_iv (FOW_DARKNESS)
723# undef const_iv 861# undef const_iv
724 }; 862 };
725 863
726 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--)
727 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
728 866
729 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
730 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
731} 869}
732 870
748NV ceil (NV x) 886NV ceil (NV x)
749 887
750IV minpot (UV n) 888IV minpot (UV n)
751 889
752IV 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
753 897
754void 898void
755pango_init () 899pango_init ()
756 CODE: 900 CODE:
757{ 901{
765#endif 909#endif
766} 910}
767 911
768char *SDL_GetError () 912char *SDL_GetError ()
769 913
770void SDL_braino () 914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
771 916
772int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
773 918
774int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
775 920
776void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
777 922
778void SDL_Quit () 923void SDL_Quit ()
779 924
780int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
781 927
782int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
783 CODE: 929 CODE:
784 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
785 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
786 OUTPUT: 932 OUTPUT:
787 RETVAL 933 RETVAL
788 934
789void 935void
844 ); 990 );
845 991
846 if (RETVAL) 992 if (RETVAL)
847 { 993 {
848 av_clear (texture_av); 994 av_clear (texture_av);
849
850 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
851#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);
852#include "glfunc.h" 996#include "glfunc.h"
853#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
854 } 1000 }
855} 1001}
856 OUTPUT: 1002 OUTPUT:
857 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
858 1007
859void 1008void
860SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
861 1010
862char * 1011char *
863SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
864 1014
865int 1015int
866SDL_GetAppState () 1016SDL_GetAppState ()
867 1017
868int 1018int
869SDL_GetModState () 1019SDL_GetModState ()
870 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
871void 1025void
1026SDL_PumpEvents ()
1027
1028void
872poll_events () 1029peep_events ()
873 PPCODE: 1030 PPCODE:
874{ 1031{
875 SDL_Event ev; 1032 SDL_Event ev;
876 1033
877 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
884 { 1041 {
885 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
886 case SDL_KEYUP: 1043 case SDL_KEYUP:
887 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
888 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
889 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);
890 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 */
891 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
892 break; 1049 break;
893 1050
894 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
895 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
913 x = ev.motion.x; 1070 x = ev.motion.x;
914 y = ev.motion.y; 1071 y = ev.motion.y;
915 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
916 } 1073 }
917 1074
918 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
919 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
920 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
921 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
922 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
923 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
943 1100
944 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))));
945 } 1102 }
946} 1103}
947 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
948int 1118int
949Mix_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)
950 POSTCALL: 1120 POSTCALL:
951 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
952 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
953 1123
954void 1124void
955Mix_QuerySpec () 1125Mix_QuerySpec ()
1014add_font (char *file) 1184add_font (char *file)
1015 CODE: 1185 CODE:
1016 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1017 OUTPUT: 1187 OUTPUT:
1018 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)
1019 1196
1020void 1197void
1021load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
1022 ALIAS: 1199 ALIAS:
1023 load_image_file = 1 1200 load_image_file = 1
1069 1246
1070 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1071 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1072 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1073 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1074 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1075 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)));
1076 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1077 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1078 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1079 1256
1139#if DEBUG 1316#if DEBUG
1140 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1141#endif 1318#endif
1142} 1319}
1143 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1144MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1145 1329
1146PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1147 1331
1148DC::Font 1332DC::Font
1149new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1150 CODE: 1334 CODE:
1151{ 1335{
1152 int count; 1336 int count;
1153 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1154 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1183 PROTOTYPE: 1367 PROTOTYPE:
1184 CODE: 1368 CODE:
1185 tc_restore (); 1369 tc_restore ();
1186 1370
1187DC::Layout 1371DC::Layout
1188new (SV *class) 1372new (SV *klass)
1189 CODE: 1373 CODE:
1190 New (0, RETVAL, 1, struct cf_layout); 1374 RETVAL = new cf_layout;
1191 1375
1192 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1193 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1194 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1195 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1196 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1197 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1198 RETVAL->font = 0; 1382 RETVAL->font = 0;
1199 RETVAL->rc = rc_alloc ();
1200 1383
1201 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1202 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1203 OUTPUT: 1386 OUTPUT:
1204 RETVAL 1387 RETVAL
1205 1388
1206void 1389void
1207DESTROY (DC::Layout self) 1390DESTROY (DC::Layout self)
1208 CODE: 1391 CODE:
1209 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1210 rc_free (self->rc);
1211 Safefree (self); 1393 delete self;
1212 1394
1213void 1395void
1214set_text (DC::Layout self, SV *text_) 1396set_text (DC::Layout self, SV *text_)
1215 CODE: 1397 CODE:
1216{ 1398{
1342 1524
1343void 1525void
1344set_height (DC::Layout self, int base_height) 1526set_height (DC::Layout self, int base_height)
1345 CODE: 1527 CODE:
1346 if (self->base_height != base_height) 1528 if (self->base_height != base_height)
1347 { 1529 {
1348 self->base_height = base_height; 1530 self->base_height = base_height;
1349 layout_update_font (self); 1531 layout_update_font (self);
1350 } 1532 }
1351 1533
1352void 1534void
1470} 1652}
1471 1653
1472void 1654void
1473render (DC::Layout self, float x, float y, int flags = 0) 1655render (DC::Layout self, float x, float y, int flags = 0)
1474 CODE: 1656 CODE:
1475 rc_clear (self->rc); 1657 self->rc.clear ();
1476 pango_opengl_render_layout_subpixel ( 1658 pango_opengl_render_layout_subpixel (
1477 self->pl, 1659 self->pl,
1478 self->rc, 1660 &self->rc,
1479 x * PANGO_SCALE, y * PANGO_SCALE, 1661 x * PANGO_SCALE, y * PANGO_SCALE,
1480 self->r, self->g, self->b, self->a, 1662 self->r, self->g, self->b, self->a,
1481 flags 1663 flags
1482 ); 1664 );
1483 // we assume that context_change actually clears/frees stuff 1665 // we assume that context_change actually clears/frees stuff
1494 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1676 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1495 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1677 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1496 glEnable (GL_ALPHA_TEST); 1678 glEnable (GL_ALPHA_TEST);
1497 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1679 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1498 1680
1499 rc_draw (self->rc); 1681 self->rc.draw ();
1500 1682
1501 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1502 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1503 glDisable (GL_TEXTURE_2D); 1685 glDisable (GL_TEXTURE_2D);
1504} 1686}
1579 glDisable (GL_ALPHA_TEST); 1761 glDisable (GL_ALPHA_TEST);
1580 glDisable (GL_BLEND); 1762 glDisable (GL_BLEND);
1581 } 1763 }
1582} 1764}
1583 1765
1766void
1767draw_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)
1768 PROTOTYPE: @
1769 CODE:
1770{
1771 glEnable (GL_BLEND);
1772 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1773 glEnable (GL_TEXTURE_2D);
1774 glBindTexture (GL_TEXTURE_2D, name1);
1775
1776 glColor3f (intensity, intensity, intensity);
1777 glPushMatrix ();
1778 glScalef (1./3, 1./3, 1.);
1779
1780 if (blend > 0.f)
1781 {
1782 float dx3 = dx * -3.f / w;
1783 float dy3 = dy * -3.f / h;
1784 GLfloat env_color[4] = { 0., 0., 0., blend };
1785
1786 /* interpolate the two shadow textures */
1787 /* stage 0 == rgb(glcolor) + alpha(t0) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1789
1790 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1791 gl.ActiveTexture (GL_TEXTURE1);
1792 glEnable (GL_TEXTURE_2D);
1793 glBindTexture (GL_TEXTURE_2D, name2);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1795
1796 /* rgb == rgb(glcolor) */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1798 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1800
1801 /* alpha = interpolate t0, t1 by env_alpha */
1802 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1807
1808 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1809 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1812 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1813
1814 glBegin (GL_QUADS);
1815 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1819 glEnd ();
1820
1821 glDisable (GL_TEXTURE_2D);
1822 gl.ActiveTexture (GL_TEXTURE0);
1823 }
1824 else
1825 {
1826 /* simple blending of one texture, also opengl <1.3 path */
1827 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1828
1829 glBegin (GL_QUADS);
1830 glTexCoord2f (0, 0); glVertex2f (0, 0);
1831 glTexCoord2f (0, t); glVertex2f (0, h);
1832 glTexCoord2f (s, t); glVertex2f (w, h);
1833 glTexCoord2f (s, 0); glVertex2f (w, 0);
1834 glEnd ();
1835 }
1836
1837 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1838 {
1839 int x, y;
1840 int dx3 = dx * 3;
1841 int dy3 = dy * 3;
1842
1843 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1844 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1845 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1846 glTranslatef (-1., -1., 0);
1847 glBegin (GL_QUADS);
1848
1849 for (y = 1; y < h; y += 3)
1850 {
1851 int y1 = y - dy3;
1852 int y1valid = y1 >= 0 && y1 < h;
1853
1854 for (x = 1; x < w; x += 3)
1855 {
1856 int x1 = x - dx3;
1857 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 uint8_t h2;
1859
1860 if (y1valid && x1 >= 0 && x1 < w)
1861 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1862 else
1863 h2 = 1; /* out of range == invisible */
1864
1865 if (h1 || h2)
1866 {
1867 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1868 glColor4f (1., 1., 1., alpha);
1869
1870 glTexCoord2f (0, 0.); glVertex2i (x , y );
1871 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1872 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1873 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1874 }
1875 }
1876 }
1877 }
1878
1879 glEnd ();
1880
1881 glPopMatrix ();
1882
1883 glDisable (GL_TEXTURE_2D);
1884 glDisable (GL_BLEND);
1885}
1886
1584IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1887IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1585 CODE: 1888 CODE:
1586{ 1889{
1587 GLint width; 1890 GLint width;
1588 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1891 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1595MODULE = Deliantra::Client PACKAGE = DC::Map 1898MODULE = Deliantra::Client PACKAGE = DC::Map
1596 1899
1597PROTOTYPES: DISABLE 1900PROTOTYPES: DISABLE
1598 1901
1599DC::Map 1902DC::Map
1600new (SV *class) 1903new (SV *klass)
1601 CODE: 1904 CODE:
1602 New (0, RETVAL, 1, struct map); 1905 New (0, RETVAL, 1, mapgrid);
1603 RETVAL->x = 0; 1906 RETVAL->x = 0;
1604 RETVAL->y = 0; 1907 RETVAL->y = 0;
1605 RETVAL->w = 0; 1908 RETVAL->w = 0;
1606 RETVAL->h = 0; 1909 RETVAL->h = 0;
1607 RETVAL->ox = 0; 1910 RETVAL->ox = 0;
1644 1947
1645void 1948void
1646set_smooth (DC::Map self, int face, int smooth, int level) 1949set_smooth (DC::Map self, int face, int smooth, int level)
1647 CODE: 1950 CODE:
1648{ 1951{
1649 tileid texid; 1952 tileid texid;
1650 maptex *tex; 1953 maptex *tex;
1651 1954
1652 if (face < 0 || face >= self->faces) 1955 if (face < 0 || face >= self->faces)
1653 return; 1956 return;
1654 1957
1655 if (smooth < 0 || smooth >= self->faces) 1958 if (smooth < 0 || smooth >= self->faces)
1656 return; 1959 return;
1657 1960
1658 texid = self->face2tile [face]; 1961 texid = self->face2tile [face];
1659 1962
1660 if (!texid) 1963 if (!texid)
1661 return; 1964 return;
1662 1965
1663 tex = self->tex + texid; 1966 tex = self->tex + texid;
1692 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1995 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1693 // use uglier nearest interpolation because linear suffers 1996 // use uglier nearest interpolation because linear suffers
1694 // from transparent color bleeding and ugly wrapping effects. 1997 // from transparent color bleeding and ugly wrapping effects.
1695 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1998 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1696} 1999}
2000
2001void
2002expire_textures (DC::Map self, int texid, int count)
2003 PPCODE:
2004 for (; texid < self->texs && count; ++texid, --count)
2005 {
2006 maptex *tex = self->tex + texid;
2007
2008 if (tex->name)
2009 {
2010 if (tex->unused)
2011 {
2012 tex->name = 0;
2013 tex->unused = 0;
2014 XPUSHs (sv_2mortal (newSViv (texid)));
2015 }
2016 else
2017 tex->unused = 1;
2018 }
2019 }
1697 2020
1698int 2021int
1699ox (DC::Map self) 2022ox (DC::Map self)
1700 ALIAS: 2023 ALIAS:
1701 oy = 1 2024 oy = 1
1741 self->y += MAP_EXTEND_Y; 2064 self->y += MAP_EXTEND_Y;
1742 } 2065 }
1743} 2066}
1744 2067
1745SV * 2068SV *
1746map1a_update (DC::Map self, SV *data_, int extmap) 2069map1a_update (DC::Map self, SV *data_)
1747 CODE: 2070 CODE:
1748{ 2071{
1749 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2072 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1750 uint8_t *data_end = (uint8_t *)SvEND (data_); 2073 uint8_t *data_end = (uint8_t *)SvEND (data_);
1751 mapcell *cell; 2074 mapcell *cell;
1772 2095
1773 //TODO: don't trust server data to be in-range(!) 2096 //TODO: don't trust server data to be in-range(!)
1774 2097
1775 if (flags & 8) 2098 if (flags & 8)
1776 { 2099 {
2100 uint8_t ext, cmd;
2101
1777 if (extmap) 2102 do
1778 { 2103 {
1779 uint8_t ext, cmd; 2104 ext = *data++;
2105 cmd = ext & 0x7f;
1780 2106
1781 do 2107 if (cmd < 4)
2108 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2109 else if (cmd == 5) // health
1782 { 2110 {
1783 ext = *data++;
1784 cmd = ext & 0x7f;
1785
1786 if (cmd < 4)
1787 cell->darkness = 255 - ext * 64 + 1;
1788 else if (cmd == 5) // health
1789 {
1790 cell->stat_width = 1; 2111 cell->stat_width = 1;
1791 cell->stat_hp = *data++; 2112 cell->stat_hp = *data++;
1792 }
1793 else if (cmd == 6) // monster width
1794 cell->stat_width = *data++ + 1;
1795 else if (cmd == 0x47)
1796 {
1797 if (*data == 1) cell->player = data [1];
1798 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1799 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1800 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1801
1802 data += *data + 1;
1803 }
1804 else if (cmd == 8) // cell flags
1805 cell->flags = *data++;
1806 else if (ext & 0x40) // unknown, multibyte => skip
1807 data += *data + 1;
1808 else
1809 data++;
1810 } 2113 }
1811 while (ext & 0x80); 2114 else if (cmd == 6) // monster width
2115 cell->stat_width = *data++ + 1;
2116 else if (cmd == 0x47)
2117 {
2118 if (*data == 1) cell->player = data [1];
2119 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2120 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2121 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2122
2123 data += *data + 1;
2124 }
2125 else if (cmd == 8) // cell flags
2126 cell->flags = *data++;
2127 else if (ext & 0x40) // unknown, multibyte => skip
2128 data += *data + 1;
2129 else
2130 data++;
1812 } 2131 }
1813 else 2132 while (ext & 0x80);
1814 cell->darkness = *data++ + 1;
1815 } 2133 }
1816 2134
1817 for (z = 0; z <= 2; ++z) 2135 for (z = 0; z <= 2; ++z)
1818 if (flags & (4 >> z)) 2136 if (flags & (4 >> z))
1819 { 2137 {
1822 cell->tile [z] = self->face2tile [face]; 2140 cell->tile [z] = self->face2tile [face];
1823 2141
1824 if (cell->tile [z]) 2142 if (cell->tile [z])
1825 { 2143 {
1826 maptex *tex = self->tex + cell->tile [z]; 2144 maptex *tex = self->tex + cell->tile [z];
2145 tex->unused = 0;
1827 if (!tex->name) 2146 if (!tex->name)
1828 av_push (missing, newSViv (cell->tile [z])); 2147 av_push (missing, newSViv (cell->tile [z]));
1829 2148
1830 if (tex->smoothtile) 2149 if (tex->smoothtile)
1831 { 2150 {
1832 maptex *smooth = self->tex + tex->smoothtile; 2151 maptex *smooth = self->tex + tex->smoothtile;
2152 smooth->unused = 0;
1833 if (!smooth->name) 2153 if (!smooth->name)
1834 av_push (missing, newSViv (tex->smoothtile)); 2154 av_push (missing, newSViv (tex->smoothtile));
1835 } 2155 }
1836 } 2156 }
1837 } 2157 }
1865 ? self->row + y 2185 ? self->row + y
1866 : 0; 2186 : 0;
1867 2187
1868 for (x = x0; x < x1; x++) 2188 for (x = x0; x < x1; x++)
1869 { 2189 {
1870 int r = 32, g = 32, b = 32, a = 192; 2190 unsigned int r = 32, g = 32, b = 32, a = 192;
1871 2191
1872 if (row && row->c0 <= x && x < row->c1) 2192 if (row && row->c0 <= x && x < row->c1)
1873 { 2193 {
1874 mapcell *cell = row->col + (x - row->c0); 2194 mapcell *cell = row->col + (x - row->c0);
1875 2195
1877 { 2197 {
1878 maptex tex = self->tex [cell->tile [z]]; 2198 maptex tex = self->tex [cell->tile [z]];
1879 int a0 = 255 - tex.a; 2199 int a0 = 255 - tex.a;
1880 int a1 = tex.a; 2200 int a1 = tex.a;
1881 2201
1882 r = (r * a0 + tex.r * a1) / 255; 2202 r = div255 (r * a0 + tex.r * a1);
1883 g = (g * a0 + tex.g * a1) / 255; 2203 g = div255 (g * a0 + tex.g * a1);
1884 b = (b * a0 + tex.b * a1) / 255; 2204 b = div255 (b * a0 + tex.b * a1);
1885 a = (a * a0 + tex.a * a1) / 255; 2205 a = div255 (a * a0 + tex.a * a1);
1886 } 2206 }
1887 } 2207 }
1888 2208
1889 *map++ = (r ) 2209 *map++ = (r )
1890 | (g << 8) 2210 | (g << 8)
1891 | (b << 16) 2211 | (b << 16)
1892 | (a << 24); 2212 | (a << 24);
1893 } 2213 }
1894 } 2214 }
1895 2215
1896 RETVAL = map_sv; 2216 RETVAL = map_sv;
1897} 2217}
1898 OUTPUT: 2218 OUTPUT:
1899 RETVAL 2219 RETVAL
1900 2220
1901void 2221void
1902draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2222draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1903 CODE: 2223 CODE:
1904{ 2224{
1905 int x, y, z; 2225 int x, y, z;
1906 2226
1907 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1908 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1909 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2227 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1910 smooth_key skey;
1911 int pl_x, pl_y; 2228 int pl_x, pl_y;
1912 maptex pl_tex; 2229 maptex pl_tex;
1913 rc_t *rc = rc_alloc (); 2230 rc_t rc;
2231 rc_t rc_ov;
1914 rc_key_t key; 2232 rc_key_t key;
1915 rc_array_t *arr; 2233 rc_t::array_t *arr;
1916 2234
1917 pl_tex.name = 0; 2235 pl_tex.name = 0;
1918 2236
1919 // thats current max. sorry. 2237 // that's current max. sorry.
1920 if (sw > 255) sw = 255; 2238 if (sw > 255) sw = 255;
1921 if (sh > 255) sh = 255; 2239 if (sh > 255) sh = 255;
1922
1923 // clear key, in case of extra padding
1924 memset (&skey, 0, sizeof (skey));
1925 2240
1926 memset (&key, 0, sizeof (key)); 2241 memset (&key, 0, sizeof (key));
1927 key.r = 255; 2242 key.r = 255;
1928 key.g = 255; 2243 key.g = 255;
1929 key.b = 255; 2244 key.b = 255;
1930 key.a = 255; 2245 key.a = 255;
1931 key.mode = GL_QUADS; 2246 key.mode = GL_QUADS;
1932 key.format = GL_T2F_V3F; 2247 key.format = GL_T2F_V3F;
1933 key.texname = -1;
1934 2248
1935 mx += self->x; 2249 mx += self->x;
1936 my += self->y; 2250 my += self->y;
1937 2251
1938 // first pass: determine smooth_max 2252 // first pass: determine smooth_max
1939 // rather ugly, if you ask me 2253 // rather ugly, if you ask me
1940 // could also be stored inside mapcell and updated on change 2254 // could also be stored inside mapcell and updated on change
1941 memset (smooth_max, 0, sizeof (smooth_max)); 2255 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1942 2256
1943 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
1944 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
1945 { 2259 {
1946 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
1961 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1962 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2276 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1963 2277
1964 for (z = 0; z <= 2; z++) 2278 for (z = 0; z <= 2; z++)
1965 { 2279 {
1966 memset (smooth_level, 0, sizeof (smooth_level)); 2280 std::bitset<256> smooth_level; // one bit for every possible smooth level
2281 smooth_key skey;
2282 smooth_hash smooth;
2283 key.texname = -1;
1967 2284
1968 for (y = 0; y < sh; y++) 2285 for (y = 0; y < sh; y++)
1969 if (0 <= y + my && y + my < self->rows) 2286 if (0 <= y + my && y + my < self->rows)
1970 { 2287 {
1971 maprow *row = self->row + (y + my); 2288 maprow *row = self->row + (y + my);
1977 tileid tile = cell->tile [z]; 2294 tileid tile = cell->tile [z];
1978 2295
1979 if (tile) 2296 if (tile)
1980 { 2297 {
1981 maptex tex = self->tex [tile]; 2298 maptex tex = self->tex [tile];
1982 int px = (x + 1) * T - tex.w; 2299 int px, py;
1983 int py = (y + 1) * T - tex.h;
1984 2300
1985 if (key.texname != tex.name) 2301 if (key.texname != tex.name)
1986 { 2302 {
2303 self->tex [tile].unused = 0;
2304
1987 if (!tex.name) 2305 if (!tex.name)
1988 tex = self->tex [2]; /* missing, replace by noface */ 2306 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1989 2307
1990 key.texname = tex.name; 2308 key.texname = tex.name;
1991 arr = rc_array (rc, &key); 2309 arr = &rc.array (key);
1992 } 2310 }
2311
2312 px = (x + 1) * Th - tex.w;
2313 py = (y + 1) * Tw - tex.h;
1993 2314
1994 if (expect_false (cell->player == player) && expect_false (z == 2)) 2315 if (expect_false (cell->player == player) && expect_false (z == 2))
1995 { 2316 {
1996 pl_x = px; 2317 pl_x = px;
1997 pl_y = py; 2318 pl_y = py;
1998 pl_tex = tex; 2319 pl_tex = tex;
1999 continue; 2320 continue;
2000 } 2321 }
2001 2322
2002 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2323 arr->t2f_v3f (0 , 0 , px , py , 0);
2003 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2324 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2004 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2325 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2005 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2326 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2006
2007 if (expect_false (cell->flags) && expect_false (z == 2))
2008 {
2009 // overlays such as the speech bubble, probably more to come
2010 if (cell->flags & 1)
2011 {
2012 maptex tex = self->tex [1];
2013 int px = x * T + T * 2 / 32;
2014 int py = y * T - T * 6 / 32;
2015
2016 if (tex.name)
2017 {
2018 if (key.texname != tex.name)
2019 {
2020 key.texname = tex.name;
2021 arr = rc_array (rc, &key);
2022 }
2023
2024 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2025 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2027 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2028 }
2029 }
2030 }
2031 2327
2032 // update smooth hash 2328 // update smooth hash
2033 if (tex.smoothtile) 2329 if (tex.smoothtile)
2034 { 2330 {
2035 skey.tile = tex.smoothtile; 2331 skey.tile = tex.smoothtile;
2036 skey.level = tex.smoothlevel; 2332 skey.level = tex.smoothlevel;
2037 2333
2038 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2334 smooth_level[tex.smoothlevel] = 1;
2039 2335
2040 // add bits to current tile and all neighbours. skey.x|y is 2336 // add bits to current tile and all neighbours. skey.x|y is
2041 // shifted +1|+1 so we always stay positive. 2337 // shifted +1|+1 so we always stay positive.
2042 2338
2043 // bits is ___n cccc CCCC bbbb 2339 // bits is ___n cccc CCCC bbbb
2051 2347
2052 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2348 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2053 // ·· ·· ·┏ ┓· 2349 // ·· ·· ·┏ ┓·
2054 2350
2055 // full tile 2351 // full tile
2056 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2352 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2057 2353
2058 // borders 2354 // borders
2059 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2355 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2060 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2356 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2061 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2357 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2062 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2358 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2063 2359
2064 // corners 2360 // corners
2065 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2361 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2066 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2362 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2067 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2363 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2068 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2364 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2365 }
2366 }
2367
2368 if (expect_false (z == 2) && expect_false (cell->flags))
2369 {
2370 // overlays such as the speech bubble, probably more to come
2371 if (cell->flags & 1)
2372 {
2373 rc_key_t key_ov = key;
2374 maptex tex = self->tex[TEXID_SPEECH];
2375 int px = x * Tw + Tw * 2 / 32;
2376 int py = y * Th - Th * 6 / 32;
2377
2378 key_ov.texname = tex.name;
2379 rc_t::array_t &arr = rc_ov.array (key_ov);
2380
2381 arr.t2f_v3f (0 , 0 , px , py , 0);
2382 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2383 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2384 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2069 } 2385 }
2070 } 2386 }
2071 } 2387 }
2072 } 2388 }
2073 2389
2074 rc_draw (rc); 2390 rc.draw ();
2075 rc_clear (rc); 2391 rc.clear ();
2076 2392
2077 // go through all smoothlevels, lowest to highest, then draw. 2393 // go through all smoothlevels, lowest to highest, then draw.
2078 // this is basically counting sort 2394 // this is basically counting sort
2079 { 2395 {
2080 int w, b; 2396 int w, b;
2081 2397
2082 glEnable (GL_TEXTURE_2D); 2398 glEnable (GL_TEXTURE_2D);
2083 glBegin (GL_QUADS); 2399 glBegin (GL_QUADS);
2084 for (w = 0; w < 256 / 32; ++w) 2400 for (int level = 0; level < smooth_level.size (); ++level)
2401 if (smooth_level[level])
2402 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2085 { 2403 {
2086 uint32_t smask = smooth_level [w]; 2404 smooth_key &skey = it->first;
2087 if (smask) 2405 IV bits = it->second;
2088 for (b = 0; b < 32; ++b) 2406
2089 if (smask & (((uint32_t)1) << b)) 2407 if (!(bits & 0x1000)
2408 && skey.level == level
2409 && level > smooth_max [skey.x][skey.y])
2090 { 2410 {
2091 int level = (w << 5) | b; 2411 maptex tex = self->tex [skey.tile];
2412 int px = (((int)skey.x) - 1) * Tw;
2413 int py = (((int)skey.y) - 1) * Th;
2414 int border = bits & 15;
2415 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2416 float dx = tex.s * .0625f; // 16 images/row
2417 float dy = tex.t * .5f ; // 2 images/column
2418
2092 HE *he; 2419 if (tex.name)
2093
2094 hv_iterinit (smooth);
2095 while ((he = hv_iternext (smooth)))
2096 { 2420 {
2097 smooth_key *skey = (smooth_key *)HeKEY (he); 2421 // this time avoiding texture state changes
2098 IV bits = SvIVX (HeVAL (he)); 2422 // save gobs of state changes.
2099 2423 if (key.texname != tex.name)
2100 if (!(bits & 0x1000)
2101 && skey->level == level
2102 && level > smooth_max [skey->x][skey->y])
2103 { 2424 {
2104 maptex tex = self->tex [skey->tile]; 2425 self->tex [skey.tile].unused = 0;
2105 int px = (((int)skey->x) - 1) * T;
2106 int py = (((int)skey->y) - 1) * T;
2107 int border = bits & 15;
2108 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2109 float dx = tex.s * .0625f; // 16 images/row
2110 float dy = tex.t * .5f ; // 2 images/column
2111 2426
2112 if (tex.name)
2113 {
2114 // this time avoiding texture state changes
2115 // save gobs of state changes.
2116 if (key.texname != tex.name)
2117 {
2118 glEnd (); 2427 glEnd ();
2119 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2428 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2120 glBegin (GL_QUADS); 2429 glBegin (GL_QUADS);
2121 } 2430 }
2122 2431
2123 if (border) 2432 if (border)
2124 { 2433 {
2125 float ox = border * dx; 2434 float ox = border * dx;
2126 2435
2127 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2436 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2128 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2129 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2438 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2130 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2439 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2131 } 2440 }
2132 2441
2133 if (corner) 2442 if (corner)
2134 { 2443 {
2135 float ox = corner * dx; 2444 float ox = corner * dx;
2136 2445
2137 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2446 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2138 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2447 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2139 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2448 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2140 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2449 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2141 }
2142 }
2143 } 2450 }
2144 } 2451 }
2145 } 2452 }
2146 } 2453 }
2147 2454
2148 glEnd (); 2455 glEnd ();
2149 glDisable (GL_TEXTURE_2D); 2456 glDisable (GL_TEXTURE_2D);
2150 key.texname = -1; 2457 key.texname = -1;
2151 } 2458 }
2152
2153 hv_clear (smooth);
2154 } 2459 }
2155 2460
2156 if (pl_tex.name) 2461 if (pl_tex.name)
2157 { 2462 {
2158 maptex tex = pl_tex; 2463 maptex tex = pl_tex;
2159 int px = pl_x + sdx; 2464 int px = pl_x + sdx;
2160 int py = pl_y + sdy; 2465 int py = pl_y + sdy;
2161 2466
2162 key.texname = tex.name; 2467 key.texname = tex.name;
2163 arr = rc_array (rc, &key); 2468 rc_t::array_t &arr = rc.array (key);
2164 2469
2165 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2470 arr.t2f_v3f (0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2471 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2472 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2473 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2169 2474
2170 rc_draw (rc); 2475 rc.draw ();
2171 } 2476 }
2172 2477
2478 rc_ov.draw ();
2479 rc_ov.clear ();
2480
2173 glDisable (GL_BLEND); 2481 glDisable (GL_BLEND);
2174 rc_free (rc);
2175 2482
2176 // top layer: overlays such as the health bar 2483 // top layer: overlays such as the health bar
2177 for (y = 0; y < sh; y++) 2484 for (y = 0; y < sh; y++)
2178 if (0 <= y + my && y + my < self->rows) 2485 if (0 <= y + my && y + my < self->rows)
2179 { 2486 {
2182 for (x = 0; x < sw; x++) 2489 for (x = 0; x < sw; x++)
2183 if (row->c0 <= x + mx && x + mx < row->c1) 2490 if (row->c0 <= x + mx && x + mx < row->c1)
2184 { 2491 {
2185 mapcell *cell = row->col + (x + mx - row->c0); 2492 mapcell *cell = row->col + (x + mx - row->c0);
2186 2493
2187 int px = x * T; 2494 int px = x * Tw;
2188 int py = y * T; 2495 int py = y * Th;
2496
2497 if (expect_false (cell->player == player))
2498 {
2499 px += sdx;
2500 py += sdy;
2501 }
2189 2502
2190 if (cell->stat_hp) 2503 if (cell->stat_hp)
2191 { 2504 {
2192 int width = cell->stat_width * T; 2505 int width = cell->stat_width * Tw;
2193 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2506 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2194 2507
2195 glColor3ub (0, 0, 0); 2508 glColor3ub (0, 0, 0);
2196 glRectf (px + 1, py - thick - 2, 2509 glRectf (px + 1, py - thick - 2,
2197 px + width - 1, py); 2510 px + width - 1, py);
2198 2511
2204 } 2517 }
2205 } 2518 }
2206} 2519}
2207 2520
2208void 2521void
2209draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2522draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2210 CODE: 2523 CODE:
2211{ 2524{
2212 static float color[16][3] = { 2525 static float color[16][3] = {
2213 { 0.00F, 0.00F, 0.00F }, 2526 { 0.00f, 0.00f, 0.00f },
2214 { 1.00F, 1.00F, 1.00F }, 2527 { 1.00f, 1.00f, 1.00f },
2215 { 0.00F, 0.00F, 0.55F }, 2528 { 0.00f, 0.00f, 0.55f },
2216 { 1.00F, 0.00F, 0.00F }, 2529 { 1.00f, 0.00f, 0.00f },
2217 2530
2218 { 1.00F, 0.54F, 0.00F }, 2531 { 1.00f, 0.54f, 0.00f },
2219 { 0.11F, 0.56F, 1.00F }, 2532 { 0.11f, 0.56f, 1.00f },
2220 { 0.93F, 0.46F, 0.00F }, 2533 { 0.93f, 0.46f, 0.00f },
2221 { 0.18F, 0.54F, 0.34F }, 2534 { 0.18f, 0.54f, 0.34f },
2222 2535
2223 { 0.56F, 0.73F, 0.56F }, 2536 { 0.56f, 0.73f, 0.56f },
2224 { 0.80F, 0.80F, 0.80F }, 2537 { 0.80f, 0.80f, 0.80f },
2225 { 0.55F, 0.41F, 0.13F }, 2538 { 0.55f, 0.41f, 0.13f },
2226 { 0.99F, 0.77F, 0.26F }, 2539 { 0.99f, 0.77f, 0.26f },
2227 2540
2228 { 0.74F, 0.65F, 0.41F }, 2541 { 0.74f, 0.65f, 0.41f },
2229 2542
2230 { 0.00F, 1.00F, 1.00F }, 2543 { 0.00f, 1.00f, 1.00f },
2231 { 1.00F, 0.00F, 1.00F }, 2544 { 1.00f, 0.00f, 1.00f },
2232 { 1.00F, 1.00F, 0.00F }, 2545 { 1.00f, 1.00f, 0.00f },
2233 }; 2546 };
2234 2547
2235 int x, y; 2548 int x, y;
2236 2549
2237 glEnable (GL_TEXTURE_2D); 2550 glEnable (GL_TEXTURE_2D);
2551 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2552 * but the nvidia driver (185.18.14) mishandles alpha textures
2553 * and takes the colour from god knows where instead of using
2554 * Cp. MODULATE results in the same colour, but slightly different
2555 * alpha, but atcually gives us the correct colour with nvidia.
2556 */
2238 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2239 glEnable (GL_BLEND); 2558 glEnable (GL_BLEND);
2240 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2559 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2241 glBegin (GL_QUADS); 2560 glBegin (GL_QUADS);
2242 2561
2243 for (y = 0; y < h; y++) 2562 for (y = 0; y < h; y++)
2247 2566
2248 if (m) 2567 if (m)
2249 { 2568 {
2250 float *c = color [m & 15]; 2569 float *c = color [m & 15];
2251 2570
2252 float tx1 = m & 0x40 ? 0.5 : 0.; 2571 float tx1 = m & 0x40 ? 0.5f : 0.f;
2253 float tx2 = tx1 + 0.5; 2572 float tx2 = tx1 + 0.5f;
2254 2573
2255 glColor4f (c[0], c[1], c[2], 0.75); 2574 glColor4f (c[0], c[1], c[2], 1);
2256 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2575 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2257 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2576 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2258 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2577 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2259 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2578 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2260 } 2579 }
2268void 2587void
2269fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2588fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2270 PPCODE: 2589 PPCODE:
2271{ 2590{
2272 int x, y; 2591 int x, y;
2273 int sw1 = sw + 2; 2592 int sw1 = sw + 2;
2274 int sh1 = sh + 2; 2593 int sh1 = sh + 2;
2275 int sh3 = sh * 3; 2594 int sh3 = sh * 3;
2276 int sw34 = (sw * 3 + 3) & ~3; 2595 int sw3 = sw * 3;
2596 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2597 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2277 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2598 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2278 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2599 memset (darkness1, 0, sw1*sh1);
2279 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2280 2600
2281 SvPOK_only (darkness3_sv); 2601 SvPOK_only (darkness3_sv);
2282 SvCUR_set (darkness3_sv, sw34 * sh3); 2602 SvCUR_set (darkness3_sv, sw3 * sh3);
2283 2603
2284 mx += self->x - 1; 2604 mx += self->x - 1;
2285 my += self->y - 1; 2605 my += self->y - 1;
2286
2287 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2288 2606
2289 for (y = 0; y < sh1; y++) 2607 for (y = 0; y < sh1; y++)
2290 if (0 <= y + my && y + my < self->rows) 2608 if (0 <= y + my && y + my < self->rows)
2291 { 2609 {
2292 maprow *row = self->row + (y + my); 2610 maprow *row = self->row + (y + my);
2295 if (row->c0 <= x + mx && x + mx < row->c1) 2613 if (row->c0 <= x + mx && x + mx < row->c1)
2296 { 2614 {
2297 mapcell *cell = row->col + (x + mx - row->c0); 2615 mapcell *cell = row->col + (x + mx - row->c0);
2298 2616
2299 darkness1 [y * sw1 + x] = cell->darkness 2617 darkness1 [y * sw1 + x] = cell->darkness
2300 ? 255 - (cell->darkness - 1) 2618 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2301 : 255 - FOW_DARKNESS; 2619 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2302 } 2620 }
2303 } 2621 }
2304 2622
2305 for (y = 0; y < sh; ++y) 2623 for (y = 0; y < sh; ++y)
2306 for (x = 0; x < sw; ++x) 2624 for (x = 0; x < sw; ++x)
2325 2643
2326 uint8_t r13 = (d13 + d23 + d12) / 3; 2644 uint8_t r13 = (d13 + d23 + d12) / 3;
2327 uint8_t r23 = d23; 2645 uint8_t r23 = d23;
2328 uint8_t r33 = (d23 + d33 + d32) / 3; 2646 uint8_t r33 = (d23 + d33 + d32) / 3;
2329 2647
2330 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2648 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2331 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2649 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2332 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2650 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2333 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2651 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2334 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2652 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2335 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2653 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2336 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2654 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2337 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2655 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2338 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2656 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2339 } 2657 }
2340 2658
2341 free (darkness1); 2659 free (darkness1);
2342 2660
2343 EXTEND (SP, 3); 2661 EXTEND (SP, 3);
2344 PUSHs (sv_2mortal (newSViv (sw34))); 2662 PUSHs (sv_2mortal (newSViv (sw3)));
2345 PUSHs (sv_2mortal (newSViv (sh3))); 2663 PUSHs (sv_2mortal (newSViv (sh3)));
2346 PUSHs (darkness3_sv); 2664 PUSHs (darkness3_sv);
2347} 2665}
2348 2666
2349SV * 2667SV *
2412 else 2730 else
2413 *data++ = 0; 2731 *data++ = 0;
2414 } 2732 }
2415 } 2733 }
2416 2734
2417 /* if size is w*h + 5 then no data has been found */ 2735 /* if size is w*h + 5 then no data has been found */
2418 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2736 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2419 { 2737 {
2420 SvPOK_only (data_sv); 2738 SvPOK_only (data_sv);
2421 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2739 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2422 } 2740 }
2423 2741
2424 RETVAL = data_sv; 2742 RETVAL = data_sv;
2425} 2743}
2426 OUTPUT: 2744 OUTPUT:
2427 RETVAL 2745 RETVAL
2428 2746
2429void 2747void
2436 STRLEN len; 2754 STRLEN len;
2437 uint8_t *data, *end; 2755 uint8_t *data, *end;
2438 2756
2439 len = SvLEN (data_sv); 2757 len = SvLEN (data_sv);
2440 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2758 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2441 data = SvPVbyte_nolen (data_sv); 2759 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2442 end = data + len + 8; 2760 end = data + len + 8;
2443 2761
2444 if (len < 5) 2762 if (len < 5)
2445 XSRETURN_EMPTY; 2763 XSRETURN_EMPTY;
2446 2764
2507} 2825}
2508 2826
2509MODULE = Deliantra::Client PACKAGE = DC::RW 2827MODULE = Deliantra::Client PACKAGE = DC::RW
2510 2828
2511DC::RW 2829DC::RW
2512new (SV *class, SV *data_sv) 2830new (SV *klass, SV *data_sv)
2513 CODE: 2831 CODE:
2514{ 2832{
2515 STRLEN datalen; 2833 STRLEN datalen;
2516 char *data = SvPVbyte (data_sv, datalen); 2834 char *data = SvPVbyte (data_sv, datalen);
2517 2835
2519} 2837}
2520 OUTPUT: 2838 OUTPUT:
2521 RETVAL 2839 RETVAL
2522 2840
2523DC::RW 2841DC::RW
2524new_from_file (SV *class, const char *path, const char *mode = "rb") 2842new_from_file (SV *klass, const char *path, const char *mode = "rb")
2525 CODE: 2843 CODE:
2526 RETVAL = SDL_RWFromFile (path, mode); 2844 RETVAL = SDL_RWFromFile (path, mode);
2527 OUTPUT: 2845 OUTPUT:
2528 RETVAL 2846 RETVAL
2529 2847
2547 if (RETVAL < 0) 2865 if (RETVAL < 0)
2548 { 2866 {
2549 RETVAL = Mix_GroupOldest (-1); 2867 RETVAL = Mix_GroupOldest (-1);
2550 2868
2551 if (RETVAL < 0) 2869 if (RETVAL < 0)
2870 {
2871 // happens sometimes, maybe it just stopped playing(?)
2872 RETVAL = Mix_GroupAvailable (-1);
2873
2874 if (RETVAL < 0)
2552 XSRETURN_UNDEF; 2875 XSRETURN_UNDEF;
2553 2876 }
2877 else
2554 Mix_HaltChannel (RETVAL); 2878 Mix_HaltChannel (RETVAL);
2555 } 2879 }
2556 2880
2557 Mix_UnregisterAllEffects (RETVAL); 2881 Mix_UnregisterAllEffects (RETVAL);
2558 Mix_Volume (RETVAL, 128); 2882 Mix_Volume (RETVAL, 128);
2559} 2883}
2606void 2930void
2607set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2931set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2608 CODE: 2932 CODE:
2609{ 2933{
2610 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2934 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2611 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2935 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2612 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2936 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2613} 2937}
2614 2938
2615void 2939void
2616set_reverse_stereo (DC::Channel self, int flip) 2940set_reverse_stereo (DC::Channel self, int flip)
2619 2943
2620MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2944MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2621 2945
2622PROTOTYPES: DISABLE 2946PROTOTYPES: DISABLE
2623 2947
2948void
2949decoders ()
2950 PPCODE:
2951#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2952 int i, num = Mix_GetNumChunkDecoders ();
2953 EXTEND (SP, num);
2954 for (i = 0; i < num; ++i)
2955 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2956#else
2957 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2958#endif
2959
2624DC::MixChunk 2960DC::MixChunk
2625new (SV *class, DC::RW rwops) 2961new (SV *klass, DC::RW rwops)
2626 CODE: 2962 CODE:
2627 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2963 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2628 OUTPUT: 2964 OUTPUT:
2629 RETVAL 2965 RETVAL
2630 2966
2660 OUTPUT: 2996 OUTPUT:
2661 RETVAL 2997 RETVAL
2662 2998
2663MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2999MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2664 3000
3001void
3002decoders ()
3003 PPCODE:
3004#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3005 int i, num = Mix_GetNumMusicDecoders ();
3006 EXTEND (SP, num);
3007 for (i = 0; i < num; ++i)
3008 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3009#else
3010 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3011#endif
3012
2665int 3013int
2666volume (int volume = -1) 3014volume (int volume = -1)
2667 PROTOTYPE: ;$ 3015 PROTOTYPE: ;$
2668 CODE: 3016 CODE:
2669 if (items > 0) 3017 if (items > 0)
2680void 3028void
2681halt () 3029halt ()
2682 CODE: 3030 CODE:
2683 Mix_HaltMusic (); 3031 Mix_HaltMusic ();
2684 3032
3033int
3034playing ()
3035 CODE:
3036 RETVAL = Mix_PlayingMusic ();
3037 OUTPUT:
3038 RETVAL
3039
2685DC::MixMusic 3040DC::MixMusic
2686new (SV *class, DC::RW rwops) 3041new (SV *klass, DC::RW rwops)
2687 CODE: 3042 CODE:
2688 RETVAL = Mix_LoadMUS_RW (rwops); 3043 RETVAL = Mix_LoadMUS_RW (rwops);
2689 OUTPUT: 3044 OUTPUT:
2690 RETVAL 3045 RETVAL
2691 3046
2719 } *civ, const_iv[] = { 3074 } *civ, const_iv[] = {
2720# define const_iv(name) { # name, (IV)name } 3075# define const_iv(name) { # name, (IV)name }
2721 const_iv (GL_VENDOR), 3076 const_iv (GL_VENDOR),
2722 const_iv (GL_VERSION), 3077 const_iv (GL_VERSION),
2723 const_iv (GL_EXTENSIONS), 3078 const_iv (GL_EXTENSIONS),
3079 const_iv (GL_MAX_TEXTURE_UNITS),
2724 const_iv (GL_COLOR_MATERIAL), 3080 const_iv (GL_COLOR_MATERIAL),
2725 const_iv (GL_SMOOTH), 3081 const_iv (GL_SMOOTH),
2726 const_iv (GL_FLAT), 3082 const_iv (GL_FLAT),
2727 const_iv (GL_DITHER), 3083 const_iv (GL_DITHER),
2728 const_iv (GL_BLEND), 3084 const_iv (GL_BLEND),
2740 const_iv (GL_ZERO), 3096 const_iv (GL_ZERO),
2741 const_iv (GL_SRC_ALPHA), 3097 const_iv (GL_SRC_ALPHA),
2742 const_iv (GL_DST_ALPHA), 3098 const_iv (GL_DST_ALPHA),
2743 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3099 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2744 const_iv (GL_ONE_MINUS_DST_ALPHA), 3100 const_iv (GL_ONE_MINUS_DST_ALPHA),
3101 const_iv (GL_SRC_COLOR),
3102 const_iv (GL_DST_COLOR),
3103 const_iv (GL_ONE_MINUS_SRC_COLOR),
3104 const_iv (GL_ONE_MINUS_DST_COLOR),
2745 const_iv (GL_SRC_ALPHA_SATURATE), 3105 const_iv (GL_SRC_ALPHA_SATURATE),
2746 const_iv (GL_RGB), 3106 const_iv (GL_RGB),
2747 const_iv (GL_RGBA), 3107 const_iv (GL_RGBA),
2748 const_iv (GL_RGBA4), 3108 const_iv (GL_RGBA4),
2749 const_iv (GL_RGBA8), 3109 const_iv (GL_RGBA8),
2817 const_iv (GL_NICEST), 3177 const_iv (GL_NICEST),
2818 const_iv (GL_V2F), 3178 const_iv (GL_V2F),
2819 const_iv (GL_V3F), 3179 const_iv (GL_V3F),
2820 const_iv (GL_T2F_V3F), 3180 const_iv (GL_T2F_V3F),
2821 const_iv (GL_T2F_N3F_V3F), 3181 const_iv (GL_T2F_N3F_V3F),
3182 const_iv (GL_FUNC_ADD),
3183 const_iv (GL_FUNC_SUBTRACT),
3184 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2822# undef const_iv 3185# undef const_iv
2823 }; 3186 };
2824 3187
2825 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3188 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2826 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3189 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2827 3190
2828 texture_av = newAV (); 3191 texture_av = newAV ();
2829 AvREAL_off (texture_av); 3192 AvREAL_off (texture_av);
2830} 3193}
2831 3194
2833disable_GL_EXT_blend_func_separate () 3196disable_GL_EXT_blend_func_separate ()
2834 CODE: 3197 CODE:
2835 gl.BlendFuncSeparate = 0; 3198 gl.BlendFuncSeparate = 0;
2836 gl.BlendFuncSeparateEXT = 0; 3199 gl.BlendFuncSeparateEXT = 0;
2837 3200
2838char * 3201void
3202apple_nvidia_bug (int enable)
3203
3204const char *
2839gl_vendor () 3205gl_vendor ()
2840 CODE: 3206 CODE:
2841 RETVAL = (char *)glGetString (GL_VENDOR); 3207 RETVAL = (const char *)glGetString (GL_VENDOR);
2842 OUTPUT: 3208 OUTPUT:
2843 RETVAL 3209 RETVAL
2844 3210
2845char * 3211const char *
2846gl_version () 3212gl_version ()
2847 CODE: 3213 CODE:
2848 RETVAL = (char *)glGetString (GL_VERSION); 3214 RETVAL = (const char *)glGetString (GL_VERSION);
2849 OUTPUT: 3215 OUTPUT:
2850 RETVAL 3216 RETVAL
2851 3217
2852char * 3218const char *
2853gl_extensions () 3219gl_extensions ()
2854 CODE: 3220 CODE:
2855 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3221 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2856 OUTPUT: 3222 OUTPUT:
2857 RETVAL 3223 RETVAL
2858 3224
2859const char *glGetString (GLenum pname) 3225const char *glGetString (GLenum pname)
3226 CODE:
3227 RETVAL = (const char *)glGetString (pname);
3228 OUTPUT:
3229 RETVAL
2860 3230
2861GLint glGetInteger (GLenum pname) 3231GLint glGetInteger (GLenum pname)
2862 CODE: 3232 CODE:
2863 glGetIntegerv (pname, &RETVAL); 3233 glGetIntegerv (pname, &RETVAL);
2864 OUTPUT: 3234 OUTPUT:
2872 3242
2873int glGetError () 3243int glGetError ()
2874 3244
2875void glFinish () 3245void glFinish ()
2876 3246
3247void glFlush ()
3248
2877void glClear (int mask) 3249void glClear (int mask)
2878 3250
2879void glClearColor (float r, float g, float b, float a = 1.0) 3251void glClearColor (float r, float g, float b, float a = 1.0)
2880 PROTOTYPE: @ 3252 PROTOTYPE: @
2881 3253
2890void glBlendFunc (int sfactor, int dfactor) 3262void glBlendFunc (int sfactor, int dfactor)
2891 3263
2892void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3264void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2893 CODE: 3265 CODE:
2894 gl_BlendFuncSeparate (sa, da, saa, daa); 3266 gl_BlendFuncSeparate (sa, da, saa, daa);
3267
3268# void glBlendEquation (int se)
2895 3269
2896void glDepthMask (int flag) 3270void glDepthMask (int flag)
2897 3271
2898void glLogicOp (int opcode) 3272void glLogicOp (int opcode)
2899 3273
2934void glRotate (float angle, float x, float y, float z) 3308void glRotate (float angle, float x, float y, float z)
2935 CODE: 3309 CODE:
2936 glRotatef (angle, x, y, z); 3310 glRotatef (angle, x, y, z);
2937 3311
2938void glColor (float r, float g, float b, float a = 1.0) 3312void glColor (float r, float g, float b, float a = 1.0)
3313 PROTOTYPE: @
2939 ALIAS: 3314 ALIAS:
2940 glColor_premultiply = 1 3315 glColor_premultiply = 1
2941 CODE: 3316 CODE:
2942 if (ix) 3317 if (ix)
2943 { 3318 {
3049 3424
3050void glEndList () 3425void glEndList ()
3051 3426
3052void glCallList (int list) 3427void glCallList (int list)
3053 3428
3429void c_init ()
3430 CODE:
3431 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3432 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3433
3054MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3434MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3055 3435
3056PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
3057 3437
3058void 3438void
3059find_widget (SV *self, NV x, NV y) 3439find_widget (SV *self, NV x, NV y)
3060 PPCODE: 3440 PPCODE:
3061{ 3441{
3062 if (within_widget (self, x, y)) 3442 if (within_widget (self, x, y))
3063 XPUSHs (self); 3443 XPUSHs (self);
3064} 3444}
3065 3445
3066BOOT: 3446BOOT:
3067{ 3447{
3075 3455
3076void 3456void
3077draw (SV *self) 3457draw (SV *self)
3078 CODE: 3458 CODE:
3079{ 3459{
3080 HV *hv; 3460 HV *hv;
3081 SV **svp; 3461 SV **svp;
3082 NV x, y, w, h; 3462 NV x, y, w, h;
3083 SV *draw_x_sv = GvSV (draw_x_gv); 3463 SV *draw_x_sv = GvSV (draw_x_gv);
3084 SV *draw_y_sv = GvSV (draw_y_gv); 3464 SV *draw_y_sv = GvSV (draw_y_gv);
3085 SV *draw_w_sv = GvSV (draw_w_gv); 3465 SV *draw_w_sv = GvSV (draw_w_gv);
3086 SV *draw_h_sv = GvSV (draw_h_gv); 3466 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines