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.245 by root, Fri Dec 28 15:05:20 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>
60
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)
66# define pango_layout_get_line_readonly pango_layout_get_line
67# define pango_layout_get_lines_readonly pango_layout_get_lines
68# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
69# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
70#endif
50 71
51#ifndef _WIN32 72#ifndef _WIN32
52# include <sys/types.h> 73# include <sys/types.h>
53# include <sys/socket.h> 74# include <sys/socket.h>
54# include <netinet/in.h> 75# include <netinet/in.h>
55# include <netinet/tcp.h> 76# include <netinet/tcp.h>
56# include <inttypes.h> 77# include <inttypes.h>
57#endif 78#endif
58 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
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 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 */
61#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
62 95
63#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
65 98
66#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
67 100
68#if 0 101/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 103
71# define PARACHUTE 0 104#define KMOD_LRAM 0x10000 // our extension
72#endif 105
106#define TEXID_SPEECH 1
107#define TEXID_NOFACE 2
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}
73 127
74static AV *texture_av; 128static AV *texture_av;
75 129
76static struct 130static struct
77{ 131{
134{ 188{
135 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
136 190
137 while (attrs) 191 while (attrs)
138 { 192 {
139 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
140 194
141 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
142 return 1; 196 return 1;
143 197
144 attrs = attrs->next; 198 attrs = attrs->next;
162static void 216static void
163substitute_func (FcPattern *pattern, gpointer data) 217substitute_func (FcPattern *pattern, gpointer data)
164{ 218{
165 FcPatternAddBool (pattern, FC_HINTING, 1); 219 FcPatternAddBool (pattern, FC_HINTING, 1);
166#ifdef FC_HINT_STYLE 220#ifdef FC_HINT_STYLE
167 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 221 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
168#endif 222#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 223 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 224}
171 225
172static void 226static void
173layout_update_font (DC__Layout self) 227layout_update_font (DC__Layout self)
174{ 228{
175 /* 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
176 * reasonably well with bitstream vera 230 * reasonably well with dejavu/bistream fonts
177 */ 231 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 232 PangoFontDescription *font = self->font ? self->font : default_font;
179 233
180 pango_font_description_set_absolute_size (font, 234 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 235 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
209 int w, h; 263 int w, h;
210 float s, t; 264 float s, t;
211 uint8_t r, g, b, a; 265 uint8_t r, g, b, a;
212 tileid smoothtile; 266 tileid smoothtile;
213 uint8_t smoothlevel; 267 uint8_t smoothlevel;
268 uint8_t unused; /* set to zero on use */
214} maptex; 269} maptex;
215 270
216typedef struct { 271typedef struct {
217 uint32_t player; 272 uint32_t player;
218 tileid tile[3]; 273 tileid tile[3];
350 self->oy = 0; 405 self->oy = 0;
351 self->row = 0; 406 self->row = 0;
352 self->rows = 0; 407 self->rows = 0;
353} 408}
354 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
355static void 420static void
356map_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)
357{ 422{
358 int x, y; 423 int x, y;
359 maprow *row; 424 maprow *row;
373 if (x >= row->c1) 438 if (x >= row->c1)
374 break; 439 break;
375 440
376 cell = row->col + x - row->c0; 441 cell = row->col + x - row->c0;
377 442
378 cell->darkness = 0; 443 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 444 }
383 } 445 }
384} 446}
385 447
386typedef struct { 448struct smooth_key
449{
387 tileid tile; 450 tileid tile;
388 uint8_t x, y, level; 451 uint8_t x, y, level;
389} 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}
390 471
391static void 472static void
392smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
393{ 474{
394 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
395 476
396 if (SvIOK (*sv)) 477 if (it == h.end ())
397 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
398 else 479 else
399 sv_setiv (*sv, bits); 480 it->second |= bits;
400} 481}
401 482
402static void 483static void
403music_finished (void) 484music_finished (void)
404{ 485{
421 ev.code = 1; 502 ev.code = 1;
422 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
423 ev.data2 = 0; 504 ev.data2 = 0;
424 505
425 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;
426} 514}
427 515
428static unsigned int 516static unsigned int
429minpot (unsigned int n) 517minpot (unsigned int n)
430{ 518{
497 if (!svp || !SvTRUE (*svp)) 585 if (!svp || !SvTRUE (*svp))
498 return 0; 586 return 0;
499 587
500 return 1; 588 return 1;
501} 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
502 648
503MODULE = Deliantra::Client PACKAGE = DC 649MODULE = Deliantra::Client PACKAGE = DC
504 650
505PROTOTYPES: ENABLE 651PROTOTYPES: ENABLE
506 652
535 const_iv (SDL_USEREVENT), 681 const_iv (SDL_USEREVENT),
536 682
537 const_iv (SDL_APPINPUTFOCUS), 683 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 684 const_iv (SDL_APPMOUSEFOCUS),
539 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),
540 736
541 const_iv (SDLK_FIRST), 737 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 738 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 739 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 740 const_iv (SDLK_KP1),
620 const_iv (KMOD_RMETA), 816 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 817 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 818 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 819 const_iv (KMOD_MODE),
624 820
821 const_iv (KMOD_LRAM),
822
625 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)
626# undef const_iv 853# undef const_iv
627 }; 854 };
628 855
629 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--)
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
631 858
632 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
633 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
634} 861}
635 862
651NV ceil (NV x) 878NV ceil (NV x)
652 879
653IV minpot (UV n) 880IV minpot (UV n)
654 881
655IV 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
656 889
657void 890void
658pango_init () 891pango_init ()
659 CODE: 892 CODE:
660{ 893{
661 opengl_fontmap = pango_opengl_font_map_new (); 894 opengl_fontmap = pango_opengl_font_map_new ();
662 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);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 896 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
897 /*pango_context_set_font_description (opengl_context, default_font);*/
898#if PANGO_VERSION_CHECK (1, 15, 2)
899 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
900 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
901#endif
664} 902}
665 903
666char *
667SDL_GetError () 904char *SDL_GetError ()
668 905
669int 906void SDL_main_hack (SV *real_main)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 907 PROTOTYPE: &
671 908
672void 909int SDL_Init (U32 flags)
910
911int SDL_InitSubSystem (U32 flags)
912
913void SDL_QuitSubSystem (U32 flags)
914
673SDL_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
674 926
675void 927void
676SDL_ListModes (int rgb, int alpha) 928SDL_ListModes (int rgb, int alpha)
677 PPCODE: 929 PPCODE:
678{ 930{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 942 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 943 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 944 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 945
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 946 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 947 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 948
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 949 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 950
702 if (m && m != (SDL_Rect **)-1) 951 if (m && m != (SDL_Rect **)-1)
703 while (*m) 952 while (*m)
704 { 953 {
705 if ((*m)->w >= 800 && (*m)->h >= 480) 954 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 955 {
707 AV *av = newAV (); 956 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 957 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 958 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 959 av_push (av, newSViv (rgb));
733 ); 982 );
734 983
735 if (RETVAL) 984 if (RETVAL)
736 { 985 {
737 av_clear (texture_av); 986 av_clear (texture_av);
738
739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#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);
741#include "glfunc.h" 988#include "glfunc.h"
742#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 992 }
744} 993}
745 OUTPUT: 994 OUTPUT:
746 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
747 999
748void 1000void
749SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
750 1002
751char * 1003char *
752SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
753 1006
754int 1007int
755SDL_GetAppState () 1008SDL_GetAppState ()
756 1009
1010int
1011SDL_GetModState ()
1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
757void 1017void
1018SDL_PumpEvents ()
1019
1020void
758poll_events () 1021peep_events ()
759 PPCODE: 1022 PPCODE:
760{ 1023{
761 SDL_Event ev; 1024 SDL_Event ev;
762 1025
763 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
770 { 1033 {
771 case SDL_KEYDOWN: 1034 case SDL_KEYDOWN:
772 case SDL_KEYUP: 1035 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1036 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1037 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1038 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1039 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1040 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 1041 break;
779 1042
780 case SDL_ACTIVEEVENT: 1043 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1044 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 1062 x = ev.motion.x;
800 y = ev.motion.y; 1063 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1064 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1065 }
803 1066
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1067 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1068 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1069 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1070 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1071 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1072 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1073 }
811 break; 1074 break;
812 1075
813 case SDL_MOUSEBUTTONDOWN: 1076 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1077 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1078 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1079
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1080 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1081 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1082 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1083 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
829 1092
830 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))));
831 } 1094 }
832} 1095}
833 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
834int 1110int
835Mix_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)
836 POSTCALL: 1112 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
838 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
839 1115
840void 1116void
841Mix_QuerySpec () 1117Mix_QuerySpec ()
894 } 1170 }
895 } 1171 }
896#endif 1172#endif
897} 1173}
898 1174
899void 1175int
900add_font (char *file) 1176add_font (char *file)
901 CODE: 1177 CODE:
902 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)
903 1188
904void 1189void
905load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
906 ALIAS: 1191 ALIAS:
907 load_image_file = 1 1192 load_image_file = 1
953 1238
954 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
955 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
956 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
957 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
958 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
959 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)));
960 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
961 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
962 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
963 1248
1023#if DEBUG 1308#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1309 VALGRIND_DO_LEAK_CHECK;
1025#endif 1310#endif
1026} 1311}
1027 1312
1313int
1314SvREFCNT (SV *sv)
1315 CODE:
1316 RETVAL = SvREFCNT (sv);
1317 OUTPUT:
1318 RETVAL
1319
1028MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1321
1030PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1031 1323
1032DC::Font 1324DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1034 CODE: 1326 CODE:
1035{ 1327{
1036 int count; 1328 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1038 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1067 PROTOTYPE: 1359 PROTOTYPE:
1068 CODE: 1360 CODE:
1069 tc_restore (); 1361 tc_restore ();
1070 1362
1071DC::Layout 1363DC::Layout
1072new (SV *class) 1364new (SV *klass)
1073 CODE: 1365 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1075 1367
1076 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1077 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1165{ 1457{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1458 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1459
1168 do 1460 do
1169 { 1461 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1462 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1463
1172 if (run && shape_attr_p (run)) 1464 if (run && shape_attr_p (run))
1173 { 1465 {
1174 PangoRectangle extents; 1466 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1467 pango_layout_iter_get_run_extents (iter, 0, &extents);
1226 1518
1227void 1519void
1228set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1229 CODE: 1521 CODE:
1230 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1231 { 1523 {
1232 self->base_height = base_height; 1524 self->base_height = base_height;
1233 layout_update_font (self); 1525 layout_update_font (self);
1234 } 1526 }
1235 1527
1236void 1528void
1279int 1571int
1280descent (DC::Layout self) 1572descent (DC::Layout self)
1281 CODE: 1573 CODE:
1282{ 1574{
1283 PangoRectangle rect; 1575 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1576 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1577 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1578 RETVAL = PANGO_DESCENT (rect);
1287} 1579}
1288 OUTPUT: 1580 OUTPUT:
1289 RETVAL 1581 RETVAL
1301 1593
1302void 1594void
1303cursor_pos (DC::Layout self, int index) 1595cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1596 PPCODE:
1305{ 1597{
1306 PangoRectangle strong_pos; 1598 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1599 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1600
1309 EXTEND (SP, 3); 1601 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1602 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1603 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1604 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1605}
1314 1606
1315void 1607void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1608index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1609 PPCODE:
1318{ 1610{
1319 int line, x; 1611 int line, x;
1320 1612
1321 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);
1322
1323#if !PANGO_VERSION_CHECK (1, 17. 3) 1614#if !PANGO_VERSION_CHECK (1, 17, 3)
1324 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1615 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1325 --line; 1616 --line;
1326#endif 1617#endif
1327
1328 EXTEND (SP, 2); 1618 EXTEND (SP, 2);
1329 PUSHs (sv_2mortal (newSViv (line))); 1619 PUSHs (sv_2mortal (newSViv (line)));
1330 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1620 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1331} 1621}
1332 1622
1338 int index, trailing; 1628 int index, trailing;
1339 1629
1340 if (line < 0) 1630 if (line < 0)
1341 XSRETURN_EMPTY; 1631 XSRETURN_EMPTY;
1342 1632
1343 if (!(lp = pango_layout_get_line (self->pl, line))) 1633 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1344 XSRETURN_EMPTY; /* do better */ 1634 XSRETURN_EMPTY; /* do better */
1345 1635
1346 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1636 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1347 1637
1348 EXTEND (SP, 2); 1638 EXTEND (SP, 2);
1465 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1466 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1467 } 1757 }
1468} 1758}
1469 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
1470IV 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)
1471 CODE: 1882 CODE:
1472{ 1883{
1473 GLint width; 1884 GLint width;
1474 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);
1481MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1482 1893
1483PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1484 1895
1485DC::Map 1896DC::Map
1486new (SV *class) 1897new (SV *klass)
1487 CODE: 1898 CODE:
1488 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1489 RETVAL->x = 0; 1900 RETVAL->x = 0;
1490 RETVAL->y = 0; 1901 RETVAL->y = 0;
1491 RETVAL->w = 0; 1902 RETVAL->w = 0;
1530 1941
1531void 1942void
1532set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1533 CODE: 1944 CODE:
1534{ 1945{
1535 tileid texid; 1946 tileid texid;
1536 maptex *tex; 1947 maptex *tex;
1537 1948
1538 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1539 return; 1950 return;
1540 1951
1541 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1542 return; 1953 return;
1543 1954
1544 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1545 1956
1546 if (!texid) 1957 if (!texid)
1547 return; 1958 return;
1548 1959
1549 tex = self->tex + texid; 1960 tex = self->tex + texid;
1578 //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);
1579 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1580 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1581 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1582} 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 }
1583 2014
1584int 2015int
1585ox (DC::Map self) 2016ox (DC::Map self)
1586 ALIAS: 2017 ALIAS:
1587 oy = 1 2018 oy = 1
1627 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1628 } 2059 }
1629} 2060}
1630 2061
1631SV * 2062SV *
1632map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1633 CODE: 2064 CODE:
1634{ 2065{
1635 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1636 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1637 mapcell *cell; 2068 mapcell *cell;
1658 2089
1659 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1660 2091
1661 if (flags & 8) 2092 if (flags & 8)
1662 { 2093 {
2094 uint8_t ext, cmd;
2095
1663 if (extmap) 2096 do
1664 { 2097 {
1665 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1666 2100
1667 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
1668 { 2104 {
1669 ext = *data++;
1670 cmd = ext & 0x3f;
1671
1672 if (cmd < 4)
1673 cell->darkness = 255 - ext * 64 + 1;
1674 else if (cmd == 5) // health
1675 {
1676 cell->stat_width = 1; 2105 cell->stat_width = 1;
1677 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1678 }
1679 else if (cmd == 6) // monster width
1680 cell->stat_width = *data++ + 1;
1681 else if (cmd == 0x47)
1682 {
1683 if (*data == 4)
1684 ; // decode player count
1685
1686 data += *data + 1;
1687 }
1688 else if (cmd == 8) // cell flags
1689 cell->flags = *data++;
1690 else if (ext & 0x40) // unknown, multibyte => skip
1691 data += *data + 1;
1692 else
1693 data++;
1694 } 2107 }
1695 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++;
1696 } 2125 }
1697 else 2126 while (ext & 0x80);
1698 cell->darkness = *data++ + 1;
1699 } 2127 }
1700 2128
1701 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1702 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1703 { 2131 {
1706 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1707 2135
1708 if (cell->tile [z]) 2136 if (cell->tile [z])
1709 { 2137 {
1710 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1711 if (!tex->name) 2140 if (!tex->name)
1712 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1713 2142
1714 if (tex->smoothtile) 2143 if (tex->smoothtile)
1715 { 2144 {
1716 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1717 if (!smooth->name) 2147 if (!smooth->name)
1718 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1719 } 2149 }
1720 } 2150 }
1721 } 2151 }
1722 } 2152 }
1723 else 2153 else
1724 cell->darkness = 0; 2154 CELL_CLEAR (cell);
1725 } 2155 }
1726} 2156}
1727 OUTPUT: 2157 OUTPUT:
1728 RETVAL 2158 RETVAL
1729 2159
1749 ? self->row + y 2179 ? self->row + y
1750 : 0; 2180 : 0;
1751 2181
1752 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1753 { 2183 {
1754 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1755 2185
1756 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1757 { 2187 {
1758 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1759 2189
1761 { 2191 {
1762 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1763 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1764 int a1 = tex.a; 2194 int a1 = tex.a;
1765 2195
1766 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1767 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1768 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1769 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1770 } 2200 }
1771 } 2201 }
1772 2202
1773 *map++ = (r ) 2203 *map++ = (r )
1774 | (g << 8) 2204 | (g << 8)
1775 | (b << 16) 2205 | (b << 16)
1776 | (a << 24); 2206 | (a << 24);
1777 } 2207 }
1778 } 2208 }
1779 2209
1780 RETVAL = map_sv; 2210 RETVAL = map_sv;
1781} 2211}
1782 OUTPUT: 2212 OUTPUT:
1783 RETVAL 2213 RETVAL
1784 2214
1785void 2215void
1786draw (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)
1787 CODE: 2217 CODE:
1788{ 2218{
1789 int x, y, z; 2219 int x, y, z;
1790 2220
1791 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1792 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
1793 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)
1794 smooth_key skey; 2223 smooth_key skey;
1795 2224 int pl_x, pl_y;
2225 maptex pl_tex;
1796 rc_t *rc = rc_alloc (); 2226 rc_t *rc = rc_alloc ();
2227 rc_t *rc_ov = rc_alloc ();
1797 rc_key_t key; 2228 rc_key_t key;
1798 rc_array_t *arr; 2229 rc_array_t *arr;
1799 2230
2231 pl_tex.name = 0;
2232
1800 // thats current max. sorry. 2233 // that's current max. sorry.
1801 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1802 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1803 2236
1804 // clear key, in case of extra padding 2237 // clear key, in case of extra padding
1805 memset (&skey, 0, sizeof (skey)); 2238 memset (&skey, 0, sizeof (skey));
1809 key.g = 255; 2242 key.g = 255;
1810 key.b = 255; 2243 key.b = 255;
1811 key.a = 255; 2244 key.a = 255;
1812 key.mode = GL_QUADS; 2245 key.mode = GL_QUADS;
1813 key.format = GL_T2F_V3F; 2246 key.format = GL_T2F_V3F;
1814 key.texname = -1;
1815 2247
1816 mx += self->x; 2248 mx += self->x;
1817 my += self->y; 2249 my += self->y;
1818 2250
1819 // first pass: determine smooth_max 2251 // first pass: determine smooth_max
1842 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1843 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1844 2276
1845 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
1846 { 2278 {
2279 smooth_hash smooth;
1847 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2281 key.texname = -1;
1848 2282
1849 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
1850 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
1851 { 2285 {
1852 maprow *row = self->row + (y + my); 2286 maprow *row = self->row + (y + my);
1862 maptex tex = self->tex [tile]; 2296 maptex tex = self->tex [tile];
1863 int px, py; 2297 int px, py;
1864 2298
1865 if (key.texname != tex.name) 2299 if (key.texname != tex.name)
1866 { 2300 {
2301 self->tex [tile].unused = 0;
2302
1867 if (!tex.name) 2303 if (!tex.name)
1868 tex = self->tex [2]; /* missing, replace by noface */ 2304 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1869 2305
1870 key.texname = tex.name; 2306 key.texname = tex.name;
1871 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
1872 } 2308 }
1873 2309
1874 px = (x + 1) * T - tex.w; 2310 px = (x + 1) * Th - tex.w;
1875 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 }
1876 2320
1877 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2321 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1878 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);
1879 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);
1880 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);
1881
1882 if (cell->flags && z == 2)
1883 {
1884 // overlays such as the speech bubble, probably more to come
1885 if (cell->flags & 1)
1886 {
1887 maptex tex = self->tex [1];
1888 int px = x * T + T * 2 / 32;
1889 int py = y * T - T * 6 / 32;
1890
1891 if (tex.name)
1892 {
1893 if (key.texname != tex.name)
1894 {
1895 key.texname = tex.name;
1896 arr = rc_array (rc, &key);
1897 }
1898
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1901 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1902 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1903 }
1904 }
1905 }
1906 2325
1907 // update smooth hash 2326 // update smooth hash
1908 if (tex.smoothtile) 2327 if (tex.smoothtile)
1909 { 2328 {
1910 skey.tile = tex.smoothtile; 2329 skey.tile = tex.smoothtile;
1926 2345
1927 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1928 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
1929 2348
1930 // full tile 2349 // full tile
1931 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);
1932 2351
1933 // borders 2352 // borders
1934 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);
1935 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);
1936 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);
1937 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);
1938 2357
1939 // corners 2358 // corners
1940 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);
1941 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);
1942 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);
1943 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);
1944 } 2384 }
1945 } 2385 }
1946 } 2386 }
1947 } 2387 }
1948 2388
1964 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
1965 { 2405 {
1966 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
1967 HE *he; 2407 HE *he;
1968 2408
1969 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1970 while ((he = hv_iternext (smooth)))
1971 { 2410 {
1972 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
1973 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
1974 2413
1975 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
1976 && skey->level == level 2415 && skey.level == level
1977 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
1978 { 2417 {
1979 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
1980 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
1981 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
1982 int border = bits & 15; 2421 int border = bits & 15;
1983 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1984 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
1985 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
1986 2425
1988 { 2427 {
1989 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
1990 // save gobs of state changes. 2429 // save gobs of state changes.
1991 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
1992 { 2431 {
2432 self->tex [skey.tile].unused = 0;
2433
1993 glEnd (); 2434 glEnd ();
1994 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1995 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
1996 } 2437 }
1997 2438
1998 if (border) 2439 if (border)
1999 { 2440 {
2000 float ox = border * dx; 2441 float ox = border * dx;
2001 2442
2002 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2003 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2004 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2005 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2006 } 2447 }
2007 2448
2008 if (corner) 2449 if (corner)
2009 { 2450 {
2010 float ox = corner * dx; 2451 float ox = corner * dx;
2011 2452
2012 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2013 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2014 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2015 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2016 } 2457 }
2017 } 2458 }
2018 } 2459 }
2019 } 2460 }
2020 } 2461 }
2022 2463
2023 glEnd (); 2464 glEnd ();
2024 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
2025 key.texname = -1; 2466 key.texname = -1;
2026 } 2467 }
2027
2028 hv_clear (smooth);
2029 } 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);
2030 2489
2031 glDisable (GL_BLEND); 2490 glDisable (GL_BLEND);
2032 rc_free (rc); 2491 rc_free (rc);
2492 rc_free (rc_ov);
2033 2493
2034 // top layer: overlays such as the health bar 2494 // top layer: overlays such as the health bar
2035 for (y = 0; y < sh; y++) 2495 for (y = 0; y < sh; y++)
2036 if (0 <= y + my && y + my < self->rows) 2496 if (0 <= y + my && y + my < self->rows)
2037 { 2497 {
2040 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2041 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2042 { 2502 {
2043 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2044 2504
2045 int px = x * T; 2505 int px = x * Tw;
2046 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 }
2047 2513
2048 if (cell->stat_hp) 2514 if (cell->stat_hp)
2049 { 2515 {
2050 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2051 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2052 2518
2053 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2054 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2055 px + width - 1, py); 2521 px + width - 1, py);
2056 2522
2062 } 2528 }
2063 } 2529 }
2064} 2530}
2065 2531
2066void 2532void
2067draw_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)
2068 CODE: 2534 CODE:
2069{ 2535{
2070 static float color[16][3] = { 2536 static float color[16][3] = {
2071 { 0.00F, 0.00F, 0.00F }, 2537 { 0.00f, 0.00f, 0.00f },
2072 { 1.00F, 1.00F, 1.00F }, 2538 { 1.00f, 1.00f, 1.00f },
2073 { 0.00F, 0.00F, 0.55F }, 2539 { 0.00f, 0.00f, 0.55f },
2074 { 1.00F, 0.00F, 0.00F }, 2540 { 1.00f, 0.00f, 0.00f },
2075 2541
2076 { 1.00F, 0.54F, 0.00F }, 2542 { 1.00f, 0.54f, 0.00f },
2077 { 0.11F, 0.56F, 1.00F }, 2543 { 0.11f, 0.56f, 1.00f },
2078 { 0.93F, 0.46F, 0.00F }, 2544 { 0.93f, 0.46f, 0.00f },
2079 { 0.18F, 0.54F, 0.34F }, 2545 { 0.18f, 0.54f, 0.34f },
2080 2546
2081 { 0.56F, 0.73F, 0.56F }, 2547 { 0.56f, 0.73f, 0.56f },
2082 { 0.80F, 0.80F, 0.80F }, 2548 { 0.80f, 0.80f, 0.80f },
2083 { 0.55F, 0.41F, 0.13F }, 2549 { 0.55f, 0.41f, 0.13f },
2084 { 0.99F, 0.77F, 0.26F }, 2550 { 0.99f, 0.77f, 0.26f },
2085 2551
2086 { 0.74F, 0.65F, 0.41F }, 2552 { 0.74f, 0.65f, 0.41f },
2087 2553
2088 { 0.00F, 1.00F, 1.00F }, 2554 { 0.00f, 1.00f, 1.00f },
2089 { 1.00F, 0.00F, 1.00F }, 2555 { 1.00f, 0.00f, 1.00f },
2090 { 1.00F, 1.00F, 0.00F }, 2556 { 1.00f, 1.00f, 0.00f },
2091 }; 2557 };
2092 2558
2093 int x, y; 2559 int x, y;
2094 2560
2095 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 */
2096 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2568 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2097 glEnable (GL_BLEND); 2569 glEnable (GL_BLEND);
2098 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2570 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2099 glBegin (GL_QUADS); 2571 glBegin (GL_QUADS);
2100 2572
2101 for (y = 0; y < h; y++) 2573 for (y = 0; y < h; y++)
2105 2577
2106 if (m) 2578 if (m)
2107 { 2579 {
2108 float *c = color [m & 15]; 2580 float *c = color [m & 15];
2109 2581
2110 float tx1 = m & 0x40 ? 0.5 : 0.; 2582 float tx1 = m & 0x40 ? 0.5f : 0.f;
2111 float tx2 = tx1 + 0.5; 2583 float tx2 = tx1 + 0.5f;
2112 2584
2113 glColor4f (c[0], c[1], c[2], 0.75); 2585 glColor4f (c[0], c[1], c[2], 1);
2114 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2586 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2115 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2587 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2116 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2588 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2117 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2589 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2118 } 2590 }
2126void 2598void
2127fow_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)
2128 PPCODE: 2600 PPCODE:
2129{ 2601{
2130 int x, y; 2602 int x, y;
2131 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2132 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2133 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2134 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);
2135 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2136 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2610 memset (darkness1, 0, sw1*sh1);
2137 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2138 2611
2139 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2140 SvCUR_set (darkness3_sv, sw34 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2141 2614
2142 mx += self->x - 1; 2615 mx += self->x - 1;
2143 my += self->y - 1; 2616 my += self->y - 1;
2144
2145 memset (darkness1, 255, sw1 * sh1);
2146 2617
2147 for (y = 0; y < sh1; y++) 2618 for (y = 0; y < sh1; y++)
2148 if (0 <= y + my && y + my < self->rows) 2619 if (0 <= y + my && y + my < self->rows)
2149 { 2620 {
2150 maprow *row = self->row + (y + my); 2621 maprow *row = self->row + (y + my);
2153 if (row->c0 <= x + mx && x + mx < row->c1) 2624 if (row->c0 <= x + mx && x + mx < row->c1)
2154 { 2625 {
2155 mapcell *cell = row->col + (x + mx - row->c0); 2626 mapcell *cell = row->col + (x + mx - row->c0);
2156 2627
2157 darkness1 [y * sw1 + x] = cell->darkness 2628 darkness1 [y * sw1 + x] = cell->darkness
2158 ? 255 - (cell->darkness - 1) 2629 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2159 : 255 - FOW_DARKNESS; 2630 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2160 } 2631 }
2161 } 2632 }
2162 2633
2163 for (y = 0; y < sh; ++y) 2634 for (y = 0; y < sh; ++y)
2164 for (x = 0; x < sw; ++x) 2635 for (x = 0; x < sw; ++x)
2183 2654
2184 uint8_t r13 = (d13 + d23 + d12) / 3; 2655 uint8_t r13 = (d13 + d23 + d12) / 3;
2185 uint8_t r23 = d23; 2656 uint8_t r23 = d23;
2186 uint8_t r33 = (d23 + d33 + d32) / 3; 2657 uint8_t r33 = (d23 + d33 + d32) / 3;
2187 2658
2188 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2659 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2189 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2660 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2190 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2661 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2191 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2662 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2192 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 */
2193 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2664 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2194 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2665 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2195 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2666 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2196 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2667 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2197 } 2668 }
2198 2669
2199 free (darkness1); 2670 free (darkness1);
2200 2671
2201 EXTEND (SP, 3); 2672 EXTEND (SP, 3);
2202 PUSHs (sv_2mortal (newSViv (sw34))); 2673 PUSHs (sv_2mortal (newSViv (sw3)));
2203 PUSHs (sv_2mortal (newSViv (sh3))); 2674 PUSHs (sv_2mortal (newSViv (sh3)));
2204 PUSHs (darkness3_sv); 2675 PUSHs (darkness3_sv);
2205} 2676}
2206 2677
2207SV * 2678SV *
2270 else 2741 else
2271 *data++ = 0; 2742 *data++ = 0;
2272 } 2743 }
2273 } 2744 }
2274 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 {
2275 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2276 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2751 }
2752
2277 RETVAL = data_sv; 2753 RETVAL = data_sv;
2278} 2754}
2279 OUTPUT: 2755 OUTPUT:
2280 RETVAL 2756 RETVAL
2281 2757
2282void 2758void
2283set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2759set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2284 PPCODE: 2760 PPCODE:
2285{ 2761{
2286 int x, y, z; 2762 int x, y, z;
2287 int w, h; 2763 int w, h;
2288 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;
2289 2775
2290 if (*data++ != 0) 2776 if (*data++ != 0)
2291 XSRETURN_EMPTY; /* version mismatch */ 2777 XSRETURN_EMPTY; /* version mismatch */
2292 2778
2293 w = *data++ << 8; w |= *data++; 2779 w = *data++ << 8; w |= *data++;
2308 { 2794 {
2309 maprow *row = map_get_row (self, y); 2795 maprow *row = map_get_row (self, y);
2310 2796
2311 for (x = x0; x < x1; x++) 2797 for (x = x0; x < x1; x++)
2312 { 2798 {
2799 uint8_t flags;
2800
2801 if (data + 7 >= end)
2802 XSRETURN_EMPTY;
2803
2313 uint8_t flags = *data++; 2804 flags = *data++;
2314 2805
2315 if (flags) 2806 if (flags)
2316 { 2807 {
2317 mapcell *cell = row_get_cell (row, x); 2808 mapcell *cell = row_get_cell (row, x);
2318 tileid tile[3] = { 0, 0, 0 }; 2809 tileid tile[3] = { 0, 0, 0 };
2321 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2812 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2322 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2813 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2323 2814
2324 if (cell->darkness == 0) 2815 if (cell->darkness == 0)
2325 { 2816 {
2326 cell->darkness = 0; 2817 /*cell->darkness = 0;*/
2818 EXTEND (SP, 3);
2327 2819
2328 for (z = 0; z <= 2; z++) 2820 for (z = 0; z <= 2; z++)
2329 { 2821 {
2330 tileid t = tile [z]; 2822 tileid t = tile [z];
2331 2823
2332 if (t >= self->texs || (t && !self->tex [t].name)) 2824 if (t >= self->texs || (t && !self->tex [t].name))
2333 { 2825 {
2334 XPUSHs (sv_2mortal (newSViv (t))); 2826 PUSHs (sv_2mortal (newSViv (t)));
2335 need_texid (self, t); 2827 need_texid (self, t);
2336 } 2828 }
2337 2829
2338 cell->tile [z] = t; 2830 cell->tile [z] = t;
2339 } 2831 }
2344} 2836}
2345 2837
2346MODULE = Deliantra::Client PACKAGE = DC::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2347 2839
2348DC::RW 2840DC::RW
2349new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2350 CODE: 2842 CODE:
2351{ 2843{
2352 STRLEN datalen; 2844 STRLEN datalen;
2353 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2354 2846
2356} 2848}
2357 OUTPUT: 2849 OUTPUT:
2358 RETVAL 2850 RETVAL
2359 2851
2360DC::RW 2852DC::RW
2361new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2362 CODE: 2854 CODE:
2363 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2364 OUTPUT: 2856 OUTPUT:
2365 RETVAL 2857 RETVAL
2366 2858
2384 if (RETVAL < 0) 2876 if (RETVAL < 0)
2385 { 2877 {
2386 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2387 2879
2388 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)
2389 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2390 2887 }
2888 else
2391 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2392 } 2890 }
2393 2891
2394 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2395 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2396} 2894}
2443void 2941void
2444set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2942set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2445 CODE: 2943 CODE:
2446{ 2944{
2447 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));
2448 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;
2449 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2947 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2450} 2948}
2451 2949
2452void 2950void
2453set_reverse_stereo (DC::Channel self, int flip) 2951set_reverse_stereo (DC::Channel self, int flip)
2456 2954
2457MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2458 2956
2459PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2460 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
2461DC::MixChunk 2971DC::MixChunk
2462new (SV *class, DC::RW rwops) 2972new (SV *klass, DC::RW rwops)
2463 CODE: 2973 CODE:
2464 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2465 OUTPUT: 2975 OUTPUT:
2466 RETVAL 2976 RETVAL
2467 2977
2497 OUTPUT: 3007 OUTPUT:
2498 RETVAL 3008 RETVAL
2499 3009
2500MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3010MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2501 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
2502int 3024int
2503volume (int volume = -1) 3025volume (int volume = -1)
2504 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2505 CODE: 3027 CODE:
2506 if (items > 0) 3028 if (items > 0)
2517void 3039void
2518halt () 3040halt ()
2519 CODE: 3041 CODE:
2520 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2521 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2522DC::MixMusic 3051DC::MixMusic
2523new (SV *class, DC::RW rwops) 3052new (SV *klass, DC::RW rwops)
2524 CODE: 3053 CODE:
2525 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2526 OUTPUT: 3055 OUTPUT:
2527 RETVAL 3056 RETVAL
2528 3057
2556 } *civ, const_iv[] = { 3085 } *civ, const_iv[] = {
2557# define const_iv(name) { # name, (IV)name } 3086# define const_iv(name) { # name, (IV)name }
2558 const_iv (GL_VENDOR), 3087 const_iv (GL_VENDOR),
2559 const_iv (GL_VERSION), 3088 const_iv (GL_VERSION),
2560 const_iv (GL_EXTENSIONS), 3089 const_iv (GL_EXTENSIONS),
3090 const_iv (GL_MAX_TEXTURE_UNITS),
2561 const_iv (GL_COLOR_MATERIAL), 3091 const_iv (GL_COLOR_MATERIAL),
2562 const_iv (GL_SMOOTH), 3092 const_iv (GL_SMOOTH),
2563 const_iv (GL_FLAT), 3093 const_iv (GL_FLAT),
2564 const_iv (GL_DITHER), 3094 const_iv (GL_DITHER),
2565 const_iv (GL_BLEND), 3095 const_iv (GL_BLEND),
2577 const_iv (GL_ZERO), 3107 const_iv (GL_ZERO),
2578 const_iv (GL_SRC_ALPHA), 3108 const_iv (GL_SRC_ALPHA),
2579 const_iv (GL_DST_ALPHA), 3109 const_iv (GL_DST_ALPHA),
2580 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3110 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2581 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),
2582 const_iv (GL_SRC_ALPHA_SATURATE), 3116 const_iv (GL_SRC_ALPHA_SATURATE),
2583 const_iv (GL_RGB), 3117 const_iv (GL_RGB),
2584 const_iv (GL_RGBA), 3118 const_iv (GL_RGBA),
2585 const_iv (GL_RGBA4), 3119 const_iv (GL_RGBA4),
2586 const_iv (GL_RGBA8), 3120 const_iv (GL_RGBA8),
2654 const_iv (GL_NICEST), 3188 const_iv (GL_NICEST),
2655 const_iv (GL_V2F), 3189 const_iv (GL_V2F),
2656 const_iv (GL_V3F), 3190 const_iv (GL_V3F),
2657 const_iv (GL_T2F_V3F), 3191 const_iv (GL_T2F_V3F),
2658 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),
2659# undef const_iv 3196# undef const_iv
2660 }; 3197 };
2661 3198
2662 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--)
2663 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2664 3201
2665 texture_av = newAV (); 3202 texture_av = newAV ();
2666 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
2667} 3204}
2668 3205
2670disable_GL_EXT_blend_func_separate () 3207disable_GL_EXT_blend_func_separate ()
2671 CODE: 3208 CODE:
2672 gl.BlendFuncSeparate = 0; 3209 gl.BlendFuncSeparate = 0;
2673 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
2674 3211
2675char * 3212void
3213apple_nvidia_bug (int enable)
3214
3215const char *
2676gl_vendor () 3216gl_vendor ()
2677 CODE: 3217 CODE:
2678 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
2679 OUTPUT: 3219 OUTPUT:
2680 RETVAL 3220 RETVAL
2681 3221
2682char * 3222const char *
2683gl_version () 3223gl_version ()
2684 CODE: 3224 CODE:
2685 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
2686 OUTPUT: 3226 OUTPUT:
2687 RETVAL 3227 RETVAL
2688 3228
2689char * 3229const char *
2690gl_extensions () 3230gl_extensions ()
2691 CODE: 3231 CODE:
2692 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2693 OUTPUT: 3233 OUTPUT:
2694 RETVAL 3234 RETVAL
2695 3235
2696const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
2697 3241
2698GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
2699 CODE: 3243 CODE:
2700 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
2701 OUTPUT: 3245 OUTPUT:
2709 3253
2710int glGetError () 3254int glGetError ()
2711 3255
2712void glFinish () 3256void glFinish ()
2713 3257
3258void glFlush ()
3259
2714void glClear (int mask) 3260void glClear (int mask)
2715 3261
2716void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
2717 PROTOTYPE: @ 3263 PROTOTYPE: @
2718 3264
2727void glBlendFunc (int sfactor, int dfactor) 3273void glBlendFunc (int sfactor, int dfactor)
2728 3274
2729void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3275void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2730 CODE: 3276 CODE:
2731 gl_BlendFuncSeparate (sa, da, saa, daa); 3277 gl_BlendFuncSeparate (sa, da, saa, daa);
3278
3279# void glBlendEquation (int se)
2732 3280
2733void glDepthMask (int flag) 3281void glDepthMask (int flag)
2734 3282
2735void glLogicOp (int opcode) 3283void glLogicOp (int opcode)
2736 3284
2771void glRotate (float angle, float x, float y, float z) 3319void glRotate (float angle, float x, float y, float z)
2772 CODE: 3320 CODE:
2773 glRotatef (angle, x, y, z); 3321 glRotatef (angle, x, y, z);
2774 3322
2775void 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: @
2776 ALIAS: 3325 ALIAS:
2777 glColor_premultiply = 1 3326 glColor_premultiply = 1
2778 CODE: 3327 CODE:
2779 if (ix) 3328 if (ix)
2780 { 3329 {
2886 3435
2887void glEndList () 3436void glEndList ()
2888 3437
2889void glCallList (int list) 3438void glCallList (int list)
2890 3439
3440void c_init ()
3441 CODE:
3442 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3443 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3444
2891MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3445MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2892 3446
2893PROTOTYPES: DISABLE 3447PROTOTYPES: DISABLE
2894 3448
2895void 3449void
2896find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
2897 PPCODE: 3451 PPCODE:
2898{ 3452{
2899 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
2900 XPUSHs (self); 3454 XPUSHs (self);
2901} 3455}
2902 3456
2903BOOT: 3457BOOT:
2904{ 3458{
2912 3466
2913void 3467void
2914draw (SV *self) 3468draw (SV *self)
2915 CODE: 3469 CODE:
2916{ 3470{
2917 HV *hv; 3471 HV *hv;
2918 SV **svp; 3472 SV **svp;
2919 NV x, y, w, h; 3473 NV x, y, w, h;
2920 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
2921 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
2922 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
2923 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