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.253 by root, Fri Dec 28 20:59:14 2007 UTC vs.
Revision 1.322 by root, Sun Nov 18 01:43:12 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>
34 37
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 39
37#include <SDL.h> 40#include <SDL.h>
38#include <SDL_thread.h> 41#include <SDL_thread.h>
39#include <SDL_endian.h> 42#include <SDL_endian.h>
40#include <SDL_image.h> 43#include <SDL_image.h>
41#include <SDL_mixer.h> 44#include <SDL_mixer.h>
42#include <SDL_opengl.h> 45#include <SDL_opengl.h>
43 46
47/* work around os x broken headers */
48#ifdef __MACOSX__
49typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
50typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
51typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
52#endif
53
44#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
46 56
47#include <glib/gmacros.h> 57#include <glib.h>
48 58
49#include <pango/pango.h> 59#include <pango/pango.h>
50 60
51#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)) 61#ifndef PANGO_VERSION_CHECK
62# define PANGO_VERSION_CHECK(a,b,c) 0
63#endif
64
65#if !PANGO_VERSION_CHECK (1, 15, 2)
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly 66# define pango_layout_get_line_readonly pango_layout_get_line
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly 67# define pango_layout_get_lines_readonly pango_layout_get_lines
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly 68# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
55# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly 69# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
56#endif 70#endif
57 71
58#ifndef _WIN32 72#ifndef _WIN32
59# include <sys/types.h> 73# include <sys/types.h>
60# include <sys/socket.h> 74# include <sys/socket.h>
61# include <netinet/in.h> 75# include <netinet/in.h>
62# include <netinet/tcp.h> 76# include <netinet/tcp.h>
63# include <inttypes.h> 77# include <inttypes.h>
64#endif 78#endif
65 79
80#if __GNUC__ >= 4
81# define expect(expr,value) __builtin_expect ((expr),(value))
82#else
83# define expect(expr,value) (expr)
84#endif
85
86#define expect_false(expr) expect ((expr) != 0, 0)
87#define expect_true(expr) expect ((expr) != 0, 1)
88
66#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
67 90
91/* this is used as fow flag as well, so has to have a different value */
92/* then anything that is computed by incoming darkness */
68#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
69 95
70#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
71#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
72 98
73#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
74 100
75/* mask out modifiers we are not interested in */ 101/* mask out modifiers we are not interested in */
76#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77 103
78#if 0 104#define KMOD_LRAM 0x10000 // our extension
79# define PARACHUTE SDL_INIT_NOPARACHUTE 105
80#else 106#define TEXID_SPEECH 1
81# define PARACHUTE 0 107#define TEXID_NOFACE 2
82#endif 108
109static char *
110fast_sv_grow (SV *sv, STRLEN need)
111{
112 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need;
114
115 if (expect_false (len < want))
116 {
117 do
118 len *= 2;
119 while (len < want);
120
121 sv_grow (sv, len);
122 }
123
124 SvCUR_set (sv, want);
125 return SvEND (sv) - need;
126}
83 127
84static AV *texture_av; 128static AV *texture_av;
85 129
86static struct 130static struct
87{ 131{
144{ 188{
145 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
146 190
147 while (attrs) 191 while (attrs)
148 { 192 {
149 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
150 194
151 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
152 return 1; 196 return 1;
153 197
154 attrs = attrs->next; 198 attrs = attrs->next;
172static void 216static void
173substitute_func (FcPattern *pattern, gpointer data) 217substitute_func (FcPattern *pattern, gpointer data)
174{ 218{
175 FcPatternAddBool (pattern, FC_HINTING, 1); 219 FcPatternAddBool (pattern, FC_HINTING, 1);
176#ifdef FC_HINT_STYLE 220#ifdef FC_HINT_STYLE
177 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 221 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
178#endif 222#endif
179 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 223 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
180} 224}
181 225
182static void 226static void
183layout_update_font (DC__Layout self) 227layout_update_font (DC__Layout self)
184{ 228{
185 /* use a random scale factor to account for unknown descenders, 0.8 works 229 /* use a random scale factor to account for unknown descenders, 0.8 works
186 * reasonably well with bitstream vera 230 * reasonably well with dejavu/bistream fonts
187 */ 231 */
188 PangoFontDescription *font = self->font ? self->font : default_font; 232 PangoFontDescription *font = self->font ? self->font : default_font;
189 233
190 pango_font_description_set_absolute_size (font, 234 pango_font_description_set_absolute_size (font,
191 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 235 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
219 int w, h; 263 int w, h;
220 float s, t; 264 float s, t;
221 uint8_t r, g, b, a; 265 uint8_t r, g, b, a;
222 tileid smoothtile; 266 tileid smoothtile;
223 uint8_t smoothlevel; 267 uint8_t smoothlevel;
268 uint8_t unused; /* set to zero on use */
224} maptex; 269} maptex;
225 270
226typedef struct { 271typedef struct {
227 uint32_t player; 272 uint32_t player;
228 tileid tile[3]; 273 tileid tile[3];
360 self->oy = 0; 405 self->oy = 0;
361 self->row = 0; 406 self->row = 0;
362 self->rows = 0; 407 self->rows = 0;
363} 408}
364 409
410#define CELL_CLEAR(cell) \
411 do { \
412 if ((cell)->player) \
413 (cell)->tile [2] = 0; \
414 (cell)->darkness = 0; \
415 (cell)->stat_hp = 0; \
416 (cell)->flags = 0; \
417 (cell)->player = 0; \
418 } while (0)
419
365static void 420static void
366map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (DC__Map self, int x0, int y0, int w, int h)
367{ 422{
368 int x, y; 423 int x, y;
369 maprow *row; 424 maprow *row;
383 if (x >= row->c1) 438 if (x >= row->c1)
384 break; 439 break;
385 440
386 cell = row->col + x - row->c0; 441 cell = row->col + x - row->c0;
387 442
388 cell->darkness = 0; 443 CELL_CLEAR (cell);
389 cell->stat_hp = 0;
390 cell->flags = 0;
391 cell->player = 0;
392 } 444 }
393 } 445 }
394} 446}
395 447
396typedef struct { 448struct smooth_key
449{
397 tileid tile; 450 tileid tile;
398 uint8_t x, y, level; 451 uint8_t x, y, level;
399} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
400 471
401static void 472static void
402smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
403{ 474{
404 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
405 476
406 if (SvIOK (*sv)) 477 if (it == h.end ())
407 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
408 else 479 else
409 sv_setiv (*sv, bits); 480 it->second |= bits;
410} 481}
411 482
412static void 483static void
413music_finished (void) 484music_finished (void)
414{ 485{
431 ev.code = 1; 502 ev.code = 1;
432 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
433 ev.data2 = 0; 504 ev.data2 = 0;
434 505
435 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
436} 514}
437 515
438static unsigned int 516static unsigned int
439minpot (unsigned int n) 517minpot (unsigned int n)
440{ 518{
507 if (!svp || !SvTRUE (*svp)) 585 if (!svp || !SvTRUE (*svp))
508 return 0; 586 return 0;
509 587
510 return 1; 588 return 1;
511} 589}
590
591/******************************************************************************/
592
593/* process keyboard modifiers */
594static int
595mod_munge (int mod)
596{
597 mod &= MOD_MASK;
598
599 if (mod & (KMOD_META | KMOD_ALT))
600 mod |= KMOD_LRAM;
601
602 return mod;
603}
604
605static void
606deliantra_main (SV *real_main)
607{
608 dSP;
609
610 PUSHMARK (SP);
611 call_sv (real_main, G_DISCARD | G_VOID);
612}
613
614#ifdef __MACOSX__
615 static SV *real_main;
616
617 /* to due surprising braindamage on the side of SDL design, we
618 * do some mind-boggling hack here: SDL requires a custom main()
619 * on OS X, so... we provide one and call the original main(), which,
620 * due to shared library magic, calls -lSDLmain's main, not perl's main,
621 * and which calls our main (== SDL_main) back.
622 */
623 extern C_LINKAGE int
624 main (int argc, char *argv[])
625 {
626 deliantra_main (real_main);
627 }
628
629 #undef main
630
631 extern C_LINKAGE int main (int argc, char *argv[]);
632
633 static void
634 SDL_main_hack (SV *real_main_)
635 {
636 real_main = real_main_;
637
638 char *argv[] = { "deliantra client", 0 };
639 (main) (1, argv);
640 }
641#else
642 static void
643 SDL_main_hack (SV *real_main)
644 {
645 deliantra_main (real_main);
646 }
647#endif
512 648
513MODULE = Deliantra::Client PACKAGE = DC 649MODULE = Deliantra::Client PACKAGE = DC
514 650
515PROTOTYPES: ENABLE 651PROTOTYPES: ENABLE
516 652
545 const_iv (SDL_USEREVENT), 681 const_iv (SDL_USEREVENT),
546 682
547 const_iv (SDL_APPINPUTFOCUS), 683 const_iv (SDL_APPINPUTFOCUS),
548 const_iv (SDL_APPMOUSEFOCUS), 684 const_iv (SDL_APPMOUSEFOCUS),
549 const_iv (SDL_APPACTIVE), 685 const_iv (SDL_APPACTIVE),
686
687
688 const_iv (SDLK_UNKNOWN),
689 const_iv (SDLK_FIRST),
690 const_iv (SDLK_BACKSPACE),
691 const_iv (SDLK_TAB),
692 const_iv (SDLK_CLEAR),
693 const_iv (SDLK_RETURN),
694 const_iv (SDLK_PAUSE),
695 const_iv (SDLK_ESCAPE),
696 const_iv (SDLK_SPACE),
697 const_iv (SDLK_EXCLAIM),
698 const_iv (SDLK_QUOTEDBL),
699 const_iv (SDLK_HASH),
700 const_iv (SDLK_DOLLAR),
701 const_iv (SDLK_AMPERSAND),
702 const_iv (SDLK_QUOTE),
703 const_iv (SDLK_LEFTPAREN),
704 const_iv (SDLK_RIGHTPAREN),
705 const_iv (SDLK_ASTERISK),
706 const_iv (SDLK_PLUS),
707 const_iv (SDLK_COMMA),
708 const_iv (SDLK_MINUS),
709 const_iv (SDLK_PERIOD),
710 const_iv (SDLK_SLASH),
711 const_iv (SDLK_0),
712 const_iv (SDLK_1),
713 const_iv (SDLK_2),
714 const_iv (SDLK_3),
715 const_iv (SDLK_4),
716 const_iv (SDLK_5),
717 const_iv (SDLK_6),
718 const_iv (SDLK_7),
719 const_iv (SDLK_8),
720 const_iv (SDLK_9),
721 const_iv (SDLK_COLON),
722 const_iv (SDLK_SEMICOLON),
723 const_iv (SDLK_LESS),
724 const_iv (SDLK_EQUALS),
725 const_iv (SDLK_GREATER),
726 const_iv (SDLK_QUESTION),
727 const_iv (SDLK_AT),
728
729 const_iv (SDLK_LEFTBRACKET),
730 const_iv (SDLK_BACKSLASH),
731 const_iv (SDLK_RIGHTBRACKET),
732 const_iv (SDLK_CARET),
733 const_iv (SDLK_UNDERSCORE),
734 const_iv (SDLK_BACKQUOTE),
735 const_iv (SDLK_DELETE),
550 736
551 const_iv (SDLK_FIRST), 737 const_iv (SDLK_FIRST),
552 const_iv (SDLK_LAST), 738 const_iv (SDLK_LAST),
553 const_iv (SDLK_KP0), 739 const_iv (SDLK_KP0),
554 const_iv (SDLK_KP1), 740 const_iv (SDLK_KP1),
630 const_iv (KMOD_RMETA), 816 const_iv (KMOD_RMETA),
631 const_iv (KMOD_NUM), 817 const_iv (KMOD_NUM),
632 const_iv (KMOD_CAPS), 818 const_iv (KMOD_CAPS),
633 const_iv (KMOD_MODE), 819 const_iv (KMOD_MODE),
634 820
821 const_iv (KMOD_LRAM),
822
635 const_iv (MIX_DEFAULT_FORMAT), 823 const_iv (MIX_DEFAULT_FORMAT),
824
825 const_iv (SDL_INIT_TIMER),
826 const_iv (SDL_INIT_AUDIO),
827 const_iv (SDL_INIT_VIDEO),
828 const_iv (SDL_INIT_CDROM),
829 const_iv (SDL_INIT_JOYSTICK),
830 const_iv (SDL_INIT_EVERYTHING),
831 const_iv (SDL_INIT_NOPARACHUTE),
832 const_iv (SDL_INIT_EVENTTHREAD),
833
834 const_iv (SDL_GL_RED_SIZE),
835 const_iv (SDL_GL_GREEN_SIZE),
836 const_iv (SDL_GL_BLUE_SIZE),
837 const_iv (SDL_GL_ALPHA_SIZE),
838 const_iv (SDL_GL_DOUBLEBUFFER),
839 const_iv (SDL_GL_BUFFER_SIZE),
840 const_iv (SDL_GL_DEPTH_SIZE),
841 const_iv (SDL_GL_STENCIL_SIZE),
842 const_iv (SDL_GL_ACCUM_RED_SIZE),
843 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
844 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
845 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
846 const_iv (SDL_GL_STEREO),
847 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
848 const_iv (SDL_GL_MULTISAMPLESAMPLES),
849 const_iv (SDL_GL_ACCELERATED_VISUAL),
850 const_iv (SDL_GL_SWAP_CONTROL),
851
852 const_iv (FOW_DARKNESS)
636# undef const_iv 853# undef const_iv
637 }; 854 };
638 855
639 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 856 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
641 858
642 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
643 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
644} 861}
645 862
661NV ceil (NV x) 878NV ceil (NV x)
662 879
663IV minpot (UV n) 880IV minpot (UV n)
664 881
665IV popcount (UV n) 882IV popcount (UV n)
883
884NV distance (NV dx, NV dy)
885 CODE:
886 RETVAL = pow (dx * dx + dy * dy, 0.5);
887 OUTPUT:
888 RETVAL
666 889
667void 890void
668pango_init () 891pango_init ()
669 CODE: 892 CODE:
670{ 893{
671 opengl_fontmap = pango_opengl_font_map_new (); 894 opengl_fontmap = pango_opengl_font_map_new ();
672 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 895 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
673 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 896 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 897 /*pango_context_set_font_description (opengl_context, default_font);*/
898#if PANGO_VERSION_CHECK (1, 15, 2)
675 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 899 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 900 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
677#endif 901#endif
678} 902}
679 903
680char *
681SDL_GetError () 904char *SDL_GetError ()
682 905
683int 906void SDL_main_hack (SV *real_main)
684SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 907 PROTOTYPE: &
685 908
686void 909int SDL_Init (U32 flags)
910
911int SDL_InitSubSystem (U32 flags)
912
913void SDL_QuitSubSystem (U32 flags)
914
687SDL_Quit () 915void SDL_Quit ()
916
917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
919
920int SDL_GL_GetAttribute (int attr)
921 CODE:
922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
923 XSRETURN_UNDEF;
924 OUTPUT:
925 RETVAL
688 926
689void 927void
690SDL_ListModes (int rgb, int alpha) 928SDL_ListModes (int rgb, int alpha)
691 PPCODE: 929 PPCODE:
692{ 930{
704 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 942 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
705 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 943 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
706 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 944 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
707 945
708 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 946 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
709#if SDL_VERSION_ATLEAST(1,2,10)
710 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
711 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 947 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
712#endif
713 948
714 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 949 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
715 950
716 if (m && m != (SDL_Rect **)-1) 951 if (m && m != (SDL_Rect **)-1)
717 while (*m) 952 while (*m)
718 { 953 {
719 if ((*m)->w >= 800 && (*m)->h >= 480) 954 if ((*m)->w >= 400 && (*m)->h >= 300)
720 { 955 {
721 AV *av = newAV (); 956 AV *av = newAV ();
722 av_push (av, newSViv ((*m)->w)); 957 av_push (av, newSViv ((*m)->w));
723 av_push (av, newSViv ((*m)->h)); 958 av_push (av, newSViv ((*m)->h));
724 av_push (av, newSViv (rgb)); 959 av_push (av, newSViv (rgb));
747 ); 982 );
748 983
749 if (RETVAL) 984 if (RETVAL)
750 { 985 {
751 av_clear (texture_av); 986 av_clear (texture_av);
752
753 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
754#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 987#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
755#include "glfunc.h" 988#include "glfunc.h"
756#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
757 } 992 }
758} 993}
759 OUTPUT: 994 OUTPUT:
760 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
761 999
762void 1000void
763SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
764 1002
765char * 1003char *
766SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
767 1006
768int 1007int
769SDL_GetAppState () 1008SDL_GetAppState ()
770 1009
1010int
1011SDL_GetModState ()
1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
771void 1017void
1018SDL_PumpEvents ()
1019
1020void
772poll_events () 1021peep_events ()
773 PPCODE: 1022 PPCODE:
774{ 1023{
775 SDL_Event ev; 1024 SDL_Event ev;
776 1025
777 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
784 { 1033 {
785 case SDL_KEYDOWN: 1034 case SDL_KEYDOWN:
786 case SDL_KEYUP: 1035 case SDL_KEYUP:
787 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1036 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
788 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1037 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
789 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1038 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
790 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1039 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
791 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1040 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
792 break; 1041 break;
793 1042
794 case SDL_ACTIVEEVENT: 1043 case SDL_ACTIVEEVENT:
795 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1044 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
813 x = ev.motion.x; 1062 x = ev.motion.x;
814 y = ev.motion.y; 1063 y = ev.motion.y;
815 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1064 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
816 } 1065 }
817 1066
818 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1067 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
819 hv_store (hv, "state", 5, newSViv (state), 0); 1068 hv_store (hv, "state", 5, newSViv (state), 0);
820 hv_store (hv, "x", 1, newSViv (x), 0); 1069 hv_store (hv, "x", 1, newSViv (x), 0);
821 hv_store (hv, "y", 1, newSViv (y), 0); 1070 hv_store (hv, "y", 1, newSViv (y), 0);
822 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1071 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
823 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1072 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
843 1092
844 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1093 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
845 } 1094 }
846} 1095}
847 1096
1097char *
1098SDL_AudioDriverName ()
1099 CODE:
1100{
1101 char buf [256];
1102 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1103 XSRETURN_UNDEF;
1104
1105 RETVAL = buf;
1106}
1107 OUTPUT:
1108 RETVAL
1109
848int 1110int
849Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1111Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
850 POSTCALL: 1112 POSTCALL:
851 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
852 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
853 1115
854void 1116void
855Mix_QuerySpec () 1117Mix_QuerySpec ()
908 } 1170 }
909 } 1171 }
910#endif 1172#endif
911} 1173}
912 1174
913void 1175int
914add_font (char *file) 1176add_font (char *file)
915 CODE: 1177 CODE:
916 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1179 OUTPUT:
1180 RETVAL
1181
1182void
1183IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1184
1185# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1186void
1187Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
917 1188
918void 1189void
919load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
920 ALIAS: 1191 ALIAS:
921 load_image_file = 1 1192 load_image_file = 1
967 1238
968 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
969 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
970 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
971 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
972 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
973 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1244 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
974 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
975 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
976 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
977 1248
1037#if DEBUG 1308#if DEBUG
1038 VALGRIND_DO_LEAK_CHECK; 1309 VALGRIND_DO_LEAK_CHECK;
1039#endif 1310#endif
1040} 1311}
1041 1312
1313int
1314SvREFCNT (SV *sv)
1315 CODE:
1316 RETVAL = SvREFCNT (sv);
1317 OUTPUT:
1318 RETVAL
1319
1042MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1043 1321
1044PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1045 1323
1046DC::Font 1324DC::Font
1047new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1048 CODE: 1326 CODE:
1049{ 1327{
1050 int count; 1328 int count;
1051 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1052 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1081 PROTOTYPE: 1359 PROTOTYPE:
1082 CODE: 1360 CODE:
1083 tc_restore (); 1361 tc_restore ();
1084 1362
1085DC::Layout 1363DC::Layout
1086new (SV *class) 1364new (SV *klass)
1087 CODE: 1365 CODE:
1088 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1089 1367
1090 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1091 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1240 1518
1241void 1519void
1242set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1243 CODE: 1521 CODE:
1244 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1245 { 1523 {
1246 self->base_height = base_height; 1524 self->base_height = base_height;
1247 layout_update_font (self); 1525 layout_update_font (self);
1248 } 1526 }
1249 1527
1250void 1528void
1331 PPCODE: 1609 PPCODE:
1332{ 1610{
1333 int line, x; 1611 int line, x;
1334 1612
1335 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1613 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1614#if !PANGO_VERSION_CHECK (1, 17, 3)
1337 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1615 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1338 --line; 1616 --line;
1339#endif 1617#endif
1340 EXTEND (SP, 2); 1618 EXTEND (SP, 2);
1341 PUSHs (sv_2mortal (newSViv (line))); 1619 PUSHs (sv_2mortal (newSViv (line)));
1477 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1478 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1479 } 1757 }
1480} 1758}
1481 1759
1760void
1761draw_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)
1762 PROTOTYPE: @
1763 CODE:
1764{
1765 glEnable (GL_BLEND);
1766 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1767 glEnable (GL_TEXTURE_2D);
1768 glBindTexture (GL_TEXTURE_2D, name1);
1769
1770 glColor3f (intensity, intensity, intensity);
1771 glPushMatrix ();
1772 glScalef (1./3, 1./3, 1.);
1773
1774 if (blend > 0.f)
1775 {
1776 float dx3 = dx * -3.f / w;
1777 float dy3 = dy * -3.f / h;
1778 GLfloat env_color[4] = { 0., 0., 0., blend };
1779
1780 /* interpolate the two shadow textures */
1781 /* stage 0 == rgb(glcolor) + alpha(t0) */
1782 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1783
1784 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1785 gl.ActiveTexture (GL_TEXTURE1);
1786 glEnable (GL_TEXTURE_2D);
1787 glBindTexture (GL_TEXTURE_2D, name2);
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1789
1790 /* rgb == rgb(glcolor) */
1791 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1792 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1793 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1794
1795 /* alpha = interpolate t0, t1 by env_alpha */
1796 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1797
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1807
1808 glBegin (GL_QUADS);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1810 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1813 glEnd ();
1814
1815 glDisable (GL_TEXTURE_2D);
1816 gl.ActiveTexture (GL_TEXTURE0);
1817 }
1818 else
1819 {
1820 /* simple blending of one texture, also opengl <1.3 path */
1821 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1822
1823 glBegin (GL_QUADS);
1824 glTexCoord2f (0, 0); glVertex2f (0, 0);
1825 glTexCoord2f (0, t); glVertex2f (0, h);
1826 glTexCoord2f (s, t); glVertex2f (w, h);
1827 glTexCoord2f (s, 0); glVertex2f (w, 0);
1828 glEnd ();
1829 }
1830
1831 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1832 {
1833 int x, y;
1834 int dx3 = dx * 3;
1835 int dy3 = dy * 3;
1836
1837 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1838 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1839 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1840 glTranslatef (-1., -1., 0);
1841 glBegin (GL_QUADS);
1842
1843 for (y = 1; y < h; y += 3)
1844 {
1845 int y1 = y - dy3;
1846 int y1valid = y1 >= 0 && y1 < h;
1847
1848 for (x = 1; x < w; x += 3)
1849 {
1850 int x1 = x - dx3;
1851 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1852 uint8_t h2;
1853
1854 if (y1valid && x1 >= 0 && x1 < w)
1855 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1856 else
1857 h2 = 1; /* out of range == invisible */
1858
1859 if (h1 || h2)
1860 {
1861 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1862 glColor4f (1., 1., 1., alpha);
1863
1864 glTexCoord2f (0, 0.); glVertex2i (x , y );
1865 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1866 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1867 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1868 }
1869 }
1870 }
1871 }
1872
1873 glEnd ();
1874
1875 glPopMatrix ();
1876
1877 glDisable (GL_TEXTURE_2D);
1878 glDisable (GL_BLEND);
1879}
1880
1482IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1881IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1483 CODE: 1882 CODE:
1484{ 1883{
1485 GLint width; 1884 GLint width;
1486 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1885 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1493MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1494 1893
1495PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1496 1895
1497DC::Map 1896DC::Map
1498new (SV *class) 1897new (SV *klass)
1499 CODE: 1898 CODE:
1500 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1501 RETVAL->x = 0; 1900 RETVAL->x = 0;
1502 RETVAL->y = 0; 1901 RETVAL->y = 0;
1503 RETVAL->w = 0; 1902 RETVAL->w = 0;
1542 1941
1543void 1942void
1544set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1545 CODE: 1944 CODE:
1546{ 1945{
1547 tileid texid; 1946 tileid texid;
1548 maptex *tex; 1947 maptex *tex;
1549 1948
1550 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1551 return; 1950 return;
1552 1951
1553 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1554 return; 1953 return;
1555 1954
1556 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1557 1956
1558 if (!texid) 1957 if (!texid)
1559 return; 1958 return;
1560 1959
1561 tex = self->tex + texid; 1960 tex = self->tex + texid;
1590 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1989 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1591 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1592 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1593 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1594} 1993}
1994
1995void
1996expire_textures (DC::Map self, int texid, int count)
1997 PPCODE:
1998 for (; texid < self->texs && count; ++texid, --count)
1999 {
2000 maptex *tex = self->tex + texid;
2001
2002 if (tex->name)
2003 {
2004 if (tex->unused)
2005 {
2006 tex->name = 0;
2007 tex->unused = 0;
2008 XPUSHs (sv_2mortal (newSViv (texid)));
2009 }
2010 else
2011 tex->unused = 1;
2012 }
2013 }
1595 2014
1596int 2015int
1597ox (DC::Map self) 2016ox (DC::Map self)
1598 ALIAS: 2017 ALIAS:
1599 oy = 1 2018 oy = 1
1639 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1640 } 2059 }
1641} 2060}
1642 2061
1643SV * 2062SV *
1644map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1645 CODE: 2064 CODE:
1646{ 2065{
1647 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1648 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1649 mapcell *cell; 2068 mapcell *cell;
1670 2089
1671 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1672 2091
1673 if (flags & 8) 2092 if (flags & 8)
1674 { 2093 {
2094 uint8_t ext, cmd;
2095
1675 if (extmap) 2096 do
1676 { 2097 {
1677 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1678 2100
1679 do 2101 if (cmd < 4)
2102 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2103 else if (cmd == 5) // health
1680 { 2104 {
1681 ext = *data++;
1682 cmd = ext & 0x3f;
1683
1684 if (cmd < 4)
1685 cell->darkness = 255 - ext * 64 + 1;
1686 else if (cmd == 5) // health
1687 {
1688 cell->stat_width = 1; 2105 cell->stat_width = 1;
1689 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1690 }
1691 else if (cmd == 6) // monster width
1692 cell->stat_width = *data++ + 1;
1693 else if (cmd == 0x47)
1694 {
1695 if (*data == 4)
1696 ; // decode player count
1697
1698 data += *data + 1;
1699 }
1700 else if (cmd == 8) // cell flags
1701 cell->flags = *data++;
1702 else if (ext & 0x40) // unknown, multibyte => skip
1703 data += *data + 1;
1704 else
1705 data++;
1706 } 2107 }
1707 while (ext & 0x80); 2108 else if (cmd == 6) // monster width
2109 cell->stat_width = *data++ + 1;
2110 else if (cmd == 0x47)
2111 {
2112 if (*data == 1) cell->player = data [1];
2113 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2114 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2115 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2116
2117 data += *data + 1;
2118 }
2119 else if (cmd == 8) // cell flags
2120 cell->flags = *data++;
2121 else if (ext & 0x40) // unknown, multibyte => skip
2122 data += *data + 1;
2123 else
2124 data++;
1708 } 2125 }
1709 else 2126 while (ext & 0x80);
1710 cell->darkness = *data++ + 1;
1711 } 2127 }
1712 2128
1713 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1714 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1715 { 2131 {
1718 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1719 2135
1720 if (cell->tile [z]) 2136 if (cell->tile [z])
1721 { 2137 {
1722 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1723 if (!tex->name) 2140 if (!tex->name)
1724 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1725 2142
1726 if (tex->smoothtile) 2143 if (tex->smoothtile)
1727 { 2144 {
1728 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1729 if (!smooth->name) 2147 if (!smooth->name)
1730 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1731 } 2149 }
1732 } 2150 }
1733 } 2151 }
1734 } 2152 }
1735 else 2153 else
1736 cell->darkness = 0; 2154 CELL_CLEAR (cell);
1737 } 2155 }
1738} 2156}
1739 OUTPUT: 2157 OUTPUT:
1740 RETVAL 2158 RETVAL
1741 2159
1761 ? self->row + y 2179 ? self->row + y
1762 : 0; 2180 : 0;
1763 2181
1764 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1765 { 2183 {
1766 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1767 2185
1768 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1769 { 2187 {
1770 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1771 2189
1773 { 2191 {
1774 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1775 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1776 int a1 = tex.a; 2194 int a1 = tex.a;
1777 2195
1778 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1779 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1780 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1781 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1782 } 2200 }
1783 } 2201 }
1784 2202
1785 *map++ = (r ) 2203 *map++ = (r )
1786 | (g << 8) 2204 | (g << 8)
1787 | (b << 16) 2205 | (b << 16)
1788 | (a << 24); 2206 | (a << 24);
1789 } 2207 }
1790 } 2208 }
1791 2209
1792 RETVAL = map_sv; 2210 RETVAL = map_sv;
1793} 2211}
1794 OUTPUT: 2212 OUTPUT:
1795 RETVAL 2213 RETVAL
1796 2214
1797void 2215void
1798draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2216draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1799 CODE: 2217 CODE:
1800{ 2218{
1801 int x, y, z; 2219 int x, y, z;
1802 2220
1803 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1804 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2221 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1805 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2222 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1806 smooth_key skey; 2223 smooth_key skey;
1807 2224 int pl_x, pl_y;
2225 maptex pl_tex;
1808 rc_t *rc = rc_alloc (); 2226 rc_t *rc = rc_alloc ();
2227 rc_t *rc_ov = rc_alloc ();
1809 rc_key_t key; 2228 rc_key_t key;
1810 rc_array_t *arr; 2229 rc_array_t *arr;
1811 2230
2231 pl_tex.name = 0;
2232
1812 // thats current max. sorry. 2233 // that's current max. sorry.
1813 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1814 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1815 2236
1816 // clear key, in case of extra padding 2237 // clear key, in case of extra padding
1817 memset (&skey, 0, sizeof (skey)); 2238 memset (&skey, 0, sizeof (skey));
1821 key.g = 255; 2242 key.g = 255;
1822 key.b = 255; 2243 key.b = 255;
1823 key.a = 255; 2244 key.a = 255;
1824 key.mode = GL_QUADS; 2245 key.mode = GL_QUADS;
1825 key.format = GL_T2F_V3F; 2246 key.format = GL_T2F_V3F;
1826 key.texname = -1;
1827 2247
1828 mx += self->x; 2248 mx += self->x;
1829 my += self->y; 2249 my += self->y;
1830 2250
1831 // first pass: determine smooth_max 2251 // first pass: determine smooth_max
1854 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1855 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1856 2276
1857 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
1858 { 2278 {
2279 smooth_hash smooth;
1859 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2281 key.texname = -1;
1860 2282
1861 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
1862 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
1863 { 2285 {
1864 maprow *row = self->row + (y + my); 2286 maprow *row = self->row + (y + my);
1874 maptex tex = self->tex [tile]; 2296 maptex tex = self->tex [tile];
1875 int px, py; 2297 int px, py;
1876 2298
1877 if (key.texname != tex.name) 2299 if (key.texname != tex.name)
1878 { 2300 {
2301 self->tex [tile].unused = 0;
2302
1879 if (!tex.name) 2303 if (!tex.name)
1880 tex = self->tex [2]; /* missing, replace by noface */ 2304 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1881 2305
1882 key.texname = tex.name; 2306 key.texname = tex.name;
1883 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
1884 } 2308 }
1885 2309
1886 px = (x + 1) * T - tex.w; 2310 px = (x + 1) * Th - tex.w;
1887 py = (y + 1) * T - tex.h; 2311 py = (y + 1) * Tw - tex.h;
2312
2313 if (expect_false (cell->player == player) && expect_false (z == 2))
2314 {
2315 pl_x = px;
2316 pl_y = py;
2317 pl_tex = tex;
2318 continue;
2319 }
1888 2320
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2321 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2322 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1891 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2323 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1892 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2324 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1893
1894 if (cell->flags && z == 2)
1895 {
1896 // overlays such as the speech bubble, probably more to come
1897 if (cell->flags & 1)
1898 {
1899 maptex tex = self->tex [1];
1900 int px = x * T + T * 2 / 32;
1901 int py = y * T - T * 6 / 32;
1902
1903 if (tex.name)
1904 {
1905 if (key.texname != tex.name)
1906 {
1907 key.texname = tex.name;
1908 arr = rc_array (rc, &key);
1909 }
1910
1911 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1912 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1913 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1914 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1915 }
1916 }
1917 }
1918 2325
1919 // update smooth hash 2326 // update smooth hash
1920 if (tex.smoothtile) 2327 if (tex.smoothtile)
1921 { 2328 {
1922 skey.tile = tex.smoothtile; 2329 skey.tile = tex.smoothtile;
1938 2345
1939 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1940 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
1941 2348
1942 // full tile 2349 // full tile
1943 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2350 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1944 2351
1945 // borders 2352 // borders
1946 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2353 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1947 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2354 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1948 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2355 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1949 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2356 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1950 2357
1951 // corners 2358 // corners
1952 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2359 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1953 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2360 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1954 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2361 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1955 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2362 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2363 }
2364 }
2365
2366 if (expect_false (z == 2) && expect_false (cell->flags))
2367 {
2368 // overlays such as the speech bubble, probably more to come
2369 if (cell->flags & 1)
2370 {
2371 rc_key_t key_ov = key;
2372 maptex tex = self->tex [TEXID_SPEECH];
2373 rc_array_t *arr;
2374 int px = x * Tw + Tw * 2 / 32;
2375 int py = y * Th - Th * 6 / 32;
2376
2377 key_ov.texname = tex.name;
2378 arr = rc_array (rc_ov, &key_ov);
2379
2380 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2381 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2382 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2383 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1956 } 2384 }
1957 } 2385 }
1958 } 2386 }
1959 } 2387 }
1960 2388
1976 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
1977 { 2405 {
1978 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
1979 HE *he; 2407 HE *he;
1980 2408
1981 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1982 while ((he = hv_iternext (smooth)))
1983 { 2410 {
1984 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
1985 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
1986 2413
1987 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
1988 && skey->level == level 2415 && skey.level == level
1989 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
1990 { 2417 {
1991 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
1992 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
1993 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
1994 int border = bits & 15; 2421 int border = bits & 15;
1995 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1996 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
1997 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
1998 2425
2000 { 2427 {
2001 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
2002 // save gobs of state changes. 2429 // save gobs of state changes.
2003 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
2004 { 2431 {
2432 self->tex [skey.tile].unused = 0;
2433
2005 glEnd (); 2434 glEnd ();
2006 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2007 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
2008 } 2437 }
2009 2438
2010 if (border) 2439 if (border)
2011 { 2440 {
2012 float ox = border * dx; 2441 float ox = border * dx;
2013 2442
2014 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2015 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2016 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2017 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2018 } 2447 }
2019 2448
2020 if (corner) 2449 if (corner)
2021 { 2450 {
2022 float ox = corner * dx; 2451 float ox = corner * dx;
2023 2452
2024 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2025 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2026 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2027 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2028 } 2457 }
2029 } 2458 }
2030 } 2459 }
2031 } 2460 }
2032 } 2461 }
2034 2463
2035 glEnd (); 2464 glEnd ();
2036 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
2037 key.texname = -1; 2466 key.texname = -1;
2038 } 2467 }
2039
2040 hv_clear (smooth);
2041 } 2468 }
2469
2470 if (pl_tex.name)
2471 {
2472 maptex tex = pl_tex;
2473 int px = pl_x + sdx;
2474 int py = pl_y + sdy;
2475
2476 key.texname = tex.name;
2477 arr = rc_array (rc, &key);
2478
2479 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2480 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2481 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2482 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2483
2484 rc_draw (rc);
2485 }
2486
2487 rc_draw (rc_ov);
2488 rc_clear (rc_ov);
2042 2489
2043 glDisable (GL_BLEND); 2490 glDisable (GL_BLEND);
2044 rc_free (rc); 2491 rc_free (rc);
2492 rc_free (rc_ov);
2045 2493
2046 // top layer: overlays such as the health bar 2494 // top layer: overlays such as the health bar
2047 for (y = 0; y < sh; y++) 2495 for (y = 0; y < sh; y++)
2048 if (0 <= y + my && y + my < self->rows) 2496 if (0 <= y + my && y + my < self->rows)
2049 { 2497 {
2052 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2053 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2054 { 2502 {
2055 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2056 2504
2057 int px = x * T; 2505 int px = x * Tw;
2058 int py = y * T; 2506 int py = y * Th;
2507
2508 if (expect_false (cell->player == player))
2509 {
2510 px += sdx;
2511 py += sdy;
2512 }
2059 2513
2060 if (cell->stat_hp) 2514 if (cell->stat_hp)
2061 { 2515 {
2062 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2063 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2064 2518
2065 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2066 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2067 px + width - 1, py); 2521 px + width - 1, py);
2068 2522
2074 } 2528 }
2075 } 2529 }
2076} 2530}
2077 2531
2078void 2532void
2079draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2533draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2080 CODE: 2534 CODE:
2081{ 2535{
2082 static float color[16][3] = { 2536 static float color[16][3] = {
2083 { 0.00F, 0.00F, 0.00F }, 2537 { 0.00f, 0.00f, 0.00f },
2084 { 1.00F, 1.00F, 1.00F }, 2538 { 1.00f, 1.00f, 1.00f },
2085 { 0.00F, 0.00F, 0.55F }, 2539 { 0.00f, 0.00f, 0.55f },
2086 { 1.00F, 0.00F, 0.00F }, 2540 { 1.00f, 0.00f, 0.00f },
2087 2541
2088 { 1.00F, 0.54F, 0.00F }, 2542 { 1.00f, 0.54f, 0.00f },
2089 { 0.11F, 0.56F, 1.00F }, 2543 { 0.11f, 0.56f, 1.00f },
2090 { 0.93F, 0.46F, 0.00F }, 2544 { 0.93f, 0.46f, 0.00f },
2091 { 0.18F, 0.54F, 0.34F }, 2545 { 0.18f, 0.54f, 0.34f },
2092 2546
2093 { 0.56F, 0.73F, 0.56F }, 2547 { 0.56f, 0.73f, 0.56f },
2094 { 0.80F, 0.80F, 0.80F }, 2548 { 0.80f, 0.80f, 0.80f },
2095 { 0.55F, 0.41F, 0.13F }, 2549 { 0.55f, 0.41f, 0.13f },
2096 { 0.99F, 0.77F, 0.26F }, 2550 { 0.99f, 0.77f, 0.26f },
2097 2551
2098 { 0.74F, 0.65F, 0.41F }, 2552 { 0.74f, 0.65f, 0.41f },
2099 2553
2100 { 0.00F, 1.00F, 1.00F }, 2554 { 0.00f, 1.00f, 1.00f },
2101 { 1.00F, 0.00F, 1.00F }, 2555 { 1.00f, 0.00f, 1.00f },
2102 { 1.00F, 1.00F, 0.00F }, 2556 { 1.00f, 1.00f, 0.00f },
2103 }; 2557 };
2104 2558
2105 int x, y; 2559 int x, y;
2106 2560
2107 glEnable (GL_TEXTURE_2D); 2561 glEnable (GL_TEXTURE_2D);
2562 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2563 * but the nvidia driver (185.18.14) mishandles alpha textures
2564 * and takes the colour from god knows where instead of using
2565 * Cp. MODULATE results in the same colour, but slightly different
2566 * alpha, but atcually gives us the correct colour with nvidia.
2567 */
2108 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2568 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2109 glEnable (GL_BLEND); 2569 glEnable (GL_BLEND);
2110 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2570 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2111 glBegin (GL_QUADS); 2571 glBegin (GL_QUADS);
2112 2572
2113 for (y = 0; y < h; y++) 2573 for (y = 0; y < h; y++)
2117 2577
2118 if (m) 2578 if (m)
2119 { 2579 {
2120 float *c = color [m & 15]; 2580 float *c = color [m & 15];
2121 2581
2122 float tx1 = m & 0x40 ? 0.5 : 0.; 2582 float tx1 = m & 0x40 ? 0.5f : 0.f;
2123 float tx2 = tx1 + 0.5; 2583 float tx2 = tx1 + 0.5f;
2124 2584
2125 glColor4f (c[0], c[1], c[2], 0.75); 2585 glColor4f (c[0], c[1], c[2], 1);
2126 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2586 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2127 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2587 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2128 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2588 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2129 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2589 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2130 } 2590 }
2138void 2598void
2139fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2599fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2140 PPCODE: 2600 PPCODE:
2141{ 2601{
2142 int x, y; 2602 int x, y;
2143 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2144 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2145 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2146 int sw34 = (sw * 3 + 3) & ~3; 2606 int sw3 = sw * 3;
2607 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2608 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2147 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2148 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2610 memset (darkness1, 0, sw1*sh1);
2149 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2150 2611
2151 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2152 SvCUR_set (darkness3_sv, sw34 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2153 2614
2154 mx += self->x - 1; 2615 mx += self->x - 1;
2155 my += self->y - 1; 2616 my += self->y - 1;
2156
2157 memset (darkness1, 255, sw1 * sh1);
2158 2617
2159 for (y = 0; y < sh1; y++) 2618 for (y = 0; y < sh1; y++)
2160 if (0 <= y + my && y + my < self->rows) 2619 if (0 <= y + my && y + my < self->rows)
2161 { 2620 {
2162 maprow *row = self->row + (y + my); 2621 maprow *row = self->row + (y + my);
2165 if (row->c0 <= x + mx && x + mx < row->c1) 2624 if (row->c0 <= x + mx && x + mx < row->c1)
2166 { 2625 {
2167 mapcell *cell = row->col + (x + mx - row->c0); 2626 mapcell *cell = row->col + (x + mx - row->c0);
2168 2627
2169 darkness1 [y * sw1 + x] = cell->darkness 2628 darkness1 [y * sw1 + x] = cell->darkness
2170 ? 255 - (cell->darkness - 1) 2629 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2171 : 255 - FOW_DARKNESS; 2630 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2172 } 2631 }
2173 } 2632 }
2174 2633
2175 for (y = 0; y < sh; ++y) 2634 for (y = 0; y < sh; ++y)
2176 for (x = 0; x < sw; ++x) 2635 for (x = 0; x < sw; ++x)
2195 2654
2196 uint8_t r13 = (d13 + d23 + d12) / 3; 2655 uint8_t r13 = (d13 + d23 + d12) / 3;
2197 uint8_t r23 = d23; 2656 uint8_t r23 = d23;
2198 uint8_t r33 = (d23 + d33 + d32) / 3; 2657 uint8_t r33 = (d23 + d33 + d32) / 3;
2199 2658
2200 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2659 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2201 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2660 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2202 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2661 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2203 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2662 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2204 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2663 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2205 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2664 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2206 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2665 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2207 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2666 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2208 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2667 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2209 } 2668 }
2210 2669
2211 free (darkness1); 2670 free (darkness1);
2212 2671
2213 EXTEND (SP, 3); 2672 EXTEND (SP, 3);
2214 PUSHs (sv_2mortal (newSViv (sw34))); 2673 PUSHs (sv_2mortal (newSViv (sw3)));
2215 PUSHs (sv_2mortal (newSViv (sh3))); 2674 PUSHs (sv_2mortal (newSViv (sh3)));
2216 PUSHs (darkness3_sv); 2675 PUSHs (darkness3_sv);
2217} 2676}
2218 2677
2219SV * 2678SV *
2282 else 2741 else
2283 *data++ = 0; 2742 *data++ = 0;
2284 } 2743 }
2285 } 2744 }
2286 2745
2746 /* if size is w*h + 5 then no data has been found */
2747 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2748 {
2287 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2288 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2751 }
2752
2289 RETVAL = data_sv; 2753 RETVAL = data_sv;
2290} 2754}
2291 OUTPUT: 2755 OUTPUT:
2292 RETVAL 2756 RETVAL
2293 2757
2294void 2758void
2295set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2759set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2296 PPCODE: 2760 PPCODE:
2297{ 2761{
2298 int x, y, z; 2762 int x, y, z;
2299 int w, h; 2763 int w, h;
2300 int x1, y1; 2764 int x1, y1;
2765 STRLEN len;
2766 uint8_t *data, *end;
2767
2768 len = SvLEN (data_sv);
2769 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2770 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2771 end = data + len + 8;
2772
2773 if (len < 5)
2774 XSRETURN_EMPTY;
2301 2775
2302 if (*data++ != 0) 2776 if (*data++ != 0)
2303 XSRETURN_EMPTY; /* version mismatch */ 2777 XSRETURN_EMPTY; /* version mismatch */
2304 2778
2305 w = *data++ << 8; w |= *data++; 2779 w = *data++ << 8; w |= *data++;
2320 { 2794 {
2321 maprow *row = map_get_row (self, y); 2795 maprow *row = map_get_row (self, y);
2322 2796
2323 for (x = x0; x < x1; x++) 2797 for (x = x0; x < x1; x++)
2324 { 2798 {
2799 uint8_t flags;
2800
2801 if (data + 7 >= end)
2802 XSRETURN_EMPTY;
2803
2325 uint8_t flags = *data++; 2804 flags = *data++;
2326 2805
2327 if (flags) 2806 if (flags)
2328 { 2807 {
2329 mapcell *cell = row_get_cell (row, x); 2808 mapcell *cell = row_get_cell (row, x);
2330 tileid tile[3] = { 0, 0, 0 }; 2809 tileid tile[3] = { 0, 0, 0 };
2333 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2812 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2334 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2813 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2335 2814
2336 if (cell->darkness == 0) 2815 if (cell->darkness == 0)
2337 { 2816 {
2338 cell->darkness = 0; 2817 /*cell->darkness = 0;*/
2818 EXTEND (SP, 3);
2339 2819
2340 for (z = 0; z <= 2; z++) 2820 for (z = 0; z <= 2; z++)
2341 { 2821 {
2342 tileid t = tile [z]; 2822 tileid t = tile [z];
2343 2823
2344 if (t >= self->texs || (t && !self->tex [t].name)) 2824 if (t >= self->texs || (t && !self->tex [t].name))
2345 { 2825 {
2346 XPUSHs (sv_2mortal (newSViv (t))); 2826 PUSHs (sv_2mortal (newSViv (t)));
2347 need_texid (self, t); 2827 need_texid (self, t);
2348 } 2828 }
2349 2829
2350 cell->tile [z] = t; 2830 cell->tile [z] = t;
2351 } 2831 }
2356} 2836}
2357 2837
2358MODULE = Deliantra::Client PACKAGE = DC::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2359 2839
2360DC::RW 2840DC::RW
2361new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2362 CODE: 2842 CODE:
2363{ 2843{
2364 STRLEN datalen; 2844 STRLEN datalen;
2365 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2366 2846
2368} 2848}
2369 OUTPUT: 2849 OUTPUT:
2370 RETVAL 2850 RETVAL
2371 2851
2372DC::RW 2852DC::RW
2373new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2374 CODE: 2854 CODE:
2375 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2376 OUTPUT: 2856 OUTPUT:
2377 RETVAL 2857 RETVAL
2378 2858
2396 if (RETVAL < 0) 2876 if (RETVAL < 0)
2397 { 2877 {
2398 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2399 2879
2400 if (RETVAL < 0) 2880 if (RETVAL < 0)
2881 {
2882 // happens sometimes, maybe it just stopped playing(?)
2883 RETVAL = Mix_GroupAvailable (-1);
2884
2885 if (RETVAL < 0)
2401 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2402 2887 }
2888 else
2403 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2404 } 2890 }
2405 2891
2406 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2407 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2408} 2894}
2455void 2941void
2456set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2942set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2457 CODE: 2943 CODE:
2458{ 2944{
2459 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2945 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2460 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2946 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2461 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2947 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2462} 2948}
2463 2949
2464void 2950void
2465set_reverse_stereo (DC::Channel self, int flip) 2951set_reverse_stereo (DC::Channel self, int flip)
2468 2954
2469MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2470 2956
2471PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2472 2958
2959void
2960decoders ()
2961 PPCODE:
2962#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2963 int i, num = Mix_GetNumChunkDecoders ();
2964 EXTEND (SP, num);
2965 for (i = 0; i < num; ++i)
2966 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2967#else
2968 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2969#endif
2970
2473DC::MixChunk 2971DC::MixChunk
2474new (SV *class, DC::RW rwops) 2972new (SV *klass, DC::RW rwops)
2475 CODE: 2973 CODE:
2476 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2477 OUTPUT: 2975 OUTPUT:
2478 RETVAL 2976 RETVAL
2479 2977
2509 OUTPUT: 3007 OUTPUT:
2510 RETVAL 3008 RETVAL
2511 3009
2512MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3010MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2513 3011
3012void
3013decoders ()
3014 PPCODE:
3015#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3016 int i, num = Mix_GetNumMusicDecoders ();
3017 EXTEND (SP, num);
3018 for (i = 0; i < num; ++i)
3019 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3020#else
3021 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3022#endif
3023
2514int 3024int
2515volume (int volume = -1) 3025volume (int volume = -1)
2516 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2517 CODE: 3027 CODE:
2518 if (items > 0) 3028 if (items > 0)
2529void 3039void
2530halt () 3040halt ()
2531 CODE: 3041 CODE:
2532 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2533 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2534DC::MixMusic 3051DC::MixMusic
2535new (SV *class, DC::RW rwops) 3052new (SV *klass, DC::RW rwops)
2536 CODE: 3053 CODE:
2537 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2538 OUTPUT: 3055 OUTPUT:
2539 RETVAL 3056 RETVAL
2540 3057
2568 } *civ, const_iv[] = { 3085 } *civ, const_iv[] = {
2569# define const_iv(name) { # name, (IV)name } 3086# define const_iv(name) { # name, (IV)name }
2570 const_iv (GL_VENDOR), 3087 const_iv (GL_VENDOR),
2571 const_iv (GL_VERSION), 3088 const_iv (GL_VERSION),
2572 const_iv (GL_EXTENSIONS), 3089 const_iv (GL_EXTENSIONS),
3090 const_iv (GL_MAX_TEXTURE_UNITS),
2573 const_iv (GL_COLOR_MATERIAL), 3091 const_iv (GL_COLOR_MATERIAL),
2574 const_iv (GL_SMOOTH), 3092 const_iv (GL_SMOOTH),
2575 const_iv (GL_FLAT), 3093 const_iv (GL_FLAT),
2576 const_iv (GL_DITHER), 3094 const_iv (GL_DITHER),
2577 const_iv (GL_BLEND), 3095 const_iv (GL_BLEND),
2589 const_iv (GL_ZERO), 3107 const_iv (GL_ZERO),
2590 const_iv (GL_SRC_ALPHA), 3108 const_iv (GL_SRC_ALPHA),
2591 const_iv (GL_DST_ALPHA), 3109 const_iv (GL_DST_ALPHA),
2592 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3110 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2593 const_iv (GL_ONE_MINUS_DST_ALPHA), 3111 const_iv (GL_ONE_MINUS_DST_ALPHA),
3112 const_iv (GL_SRC_COLOR),
3113 const_iv (GL_DST_COLOR),
3114 const_iv (GL_ONE_MINUS_SRC_COLOR),
3115 const_iv (GL_ONE_MINUS_DST_COLOR),
2594 const_iv (GL_SRC_ALPHA_SATURATE), 3116 const_iv (GL_SRC_ALPHA_SATURATE),
2595 const_iv (GL_RGB), 3117 const_iv (GL_RGB),
2596 const_iv (GL_RGBA), 3118 const_iv (GL_RGBA),
2597 const_iv (GL_RGBA4), 3119 const_iv (GL_RGBA4),
2598 const_iv (GL_RGBA8), 3120 const_iv (GL_RGBA8),
2666 const_iv (GL_NICEST), 3188 const_iv (GL_NICEST),
2667 const_iv (GL_V2F), 3189 const_iv (GL_V2F),
2668 const_iv (GL_V3F), 3190 const_iv (GL_V3F),
2669 const_iv (GL_T2F_V3F), 3191 const_iv (GL_T2F_V3F),
2670 const_iv (GL_T2F_N3F_V3F), 3192 const_iv (GL_T2F_N3F_V3F),
3193 const_iv (GL_FUNC_ADD),
3194 const_iv (GL_FUNC_SUBTRACT),
3195 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2671# undef const_iv 3196# undef const_iv
2672 }; 3197 };
2673 3198
2674 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3199 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2675 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2676 3201
2677 texture_av = newAV (); 3202 texture_av = newAV ();
2678 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
2679} 3204}
2680 3205
2682disable_GL_EXT_blend_func_separate () 3207disable_GL_EXT_blend_func_separate ()
2683 CODE: 3208 CODE:
2684 gl.BlendFuncSeparate = 0; 3209 gl.BlendFuncSeparate = 0;
2685 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
2686 3211
2687char * 3212void
3213apple_nvidia_bug (int enable)
3214
3215const char *
2688gl_vendor () 3216gl_vendor ()
2689 CODE: 3217 CODE:
2690 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
2691 OUTPUT: 3219 OUTPUT:
2692 RETVAL 3220 RETVAL
2693 3221
2694char * 3222const char *
2695gl_version () 3223gl_version ()
2696 CODE: 3224 CODE:
2697 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
2698 OUTPUT: 3226 OUTPUT:
2699 RETVAL 3227 RETVAL
2700 3228
2701char * 3229const char *
2702gl_extensions () 3230gl_extensions ()
2703 CODE: 3231 CODE:
2704 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2705 OUTPUT: 3233 OUTPUT:
2706 RETVAL 3234 RETVAL
2707 3235
2708const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
2709 3241
2710GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
2711 CODE: 3243 CODE:
2712 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
2713 OUTPUT: 3245 OUTPUT:
2721 3253
2722int glGetError () 3254int glGetError ()
2723 3255
2724void glFinish () 3256void glFinish ()
2725 3257
3258void glFlush ()
3259
2726void glClear (int mask) 3260void glClear (int mask)
2727 3261
2728void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
2729 PROTOTYPE: @ 3263 PROTOTYPE: @
2730 3264
2739void glBlendFunc (int sfactor, int dfactor) 3273void glBlendFunc (int sfactor, int dfactor)
2740 3274
2741void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3275void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2742 CODE: 3276 CODE:
2743 gl_BlendFuncSeparate (sa, da, saa, daa); 3277 gl_BlendFuncSeparate (sa, da, saa, daa);
3278
3279# void glBlendEquation (int se)
2744 3280
2745void glDepthMask (int flag) 3281void glDepthMask (int flag)
2746 3282
2747void glLogicOp (int opcode) 3283void glLogicOp (int opcode)
2748 3284
2783void glRotate (float angle, float x, float y, float z) 3319void glRotate (float angle, float x, float y, float z)
2784 CODE: 3320 CODE:
2785 glRotatef (angle, x, y, z); 3321 glRotatef (angle, x, y, z);
2786 3322
2787void glColor (float r, float g, float b, float a = 1.0) 3323void glColor (float r, float g, float b, float a = 1.0)
3324 PROTOTYPE: @
2788 ALIAS: 3325 ALIAS:
2789 glColor_premultiply = 1 3326 glColor_premultiply = 1
2790 CODE: 3327 CODE:
2791 if (ix) 3328 if (ix)
2792 { 3329 {
2898 3435
2899void glEndList () 3436void glEndList ()
2900 3437
2901void glCallList (int list) 3438void glCallList (int list)
2902 3439
3440void c_init ()
3441 CODE:
3442 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3443 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3444
2903MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3445MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2904 3446
2905PROTOTYPES: DISABLE 3447PROTOTYPES: DISABLE
2906 3448
2907void 3449void
2908find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
2909 PPCODE: 3451 PPCODE:
2910{ 3452{
2911 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
2912 XPUSHs (self); 3454 XPUSHs (self);
2913} 3455}
2914 3456
2915BOOT: 3457BOOT:
2916{ 3458{
2924 3466
2925void 3467void
2926draw (SV *self) 3468draw (SV *self)
2927 CODE: 3469 CODE:
2928{ 3470{
2929 HV *hv; 3471 HV *hv;
2930 SV **svp; 3472 SV **svp;
2931 NV x, y, w, h; 3473 NV x, y, w, h;
2932 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
2933 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
2934 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
2935 SV *draw_h_sv = GvSV (draw_h_gv); 3477 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines