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.235 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.296 by root, Mon Dec 21 23:52:34 2009 UTC

… …
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
… …
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46#endif
47
44#define PANGO_ENABLE_BACKEND 48#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 49#define G_DISABLE_CAST_CHECKS
46 50
47#include <glib/gmacros.h> 51#include <glib/gmacros.h>
48 52
49#include <pango/pango.h> 53#include <pango/pango.h>
54
55#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0
57#endif
58
59#if !PANGO_VERSION_CHECK (1, 15, 2)
60# define pango_layout_get_line_readonly pango_layout_get_line
61# define pango_layout_get_lines_readonly pango_layout_get_lines
62# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
63# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
64#endif
50 65
51#ifndef _WIN32 66#ifndef _WIN32
52# include <sys/types.h> 67# include <sys/types.h>
53# include <sys/socket.h> 68# include <sys/socket.h>
54# include <netinet/in.h> 69# include <netinet/in.h>
55# include <netinet/tcp.h> 70# include <netinet/tcp.h>
56# include <inttypes.h> 71# include <inttypes.h>
57#endif 72#endif
58 73
74#if __GNUC__ >= 4
75# define expect(expr,value) __builtin_expect ((expr),(value))
76#else
77# define expect(expr,value) (expr)
78#endif
79
80#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1)
82
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 84
85/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
62 89
63#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
65 92
66#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
67 94
68#if 0 95/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 97
71# define PARACHUTE 0 98#define KMOD_LRAM 0x10000 // our extension
72#endif 99
100#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2
102#define TEXID_HIDDEN 3
73 103
74static AV *texture_av; 104static AV *texture_av;
75 105
76static struct 106static struct
77{ 107{
… …
120 150
121#include "pango-font.c" 151#include "pango-font.c"
122#include "pango-fontmap.c" 152#include "pango-fontmap.c"
123#include "pango-render.c" 153#include "pango-render.c"
124 154
125typedef IV CFPlus__Channel; 155typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 156typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 157typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 158typedef Mix_Music *DC__MixMusic;
129 159
130typedef PangoFontDescription *CFPlus__Font; 160typedef PangoFontDescription *DC__Font;
131 161
132static int 162static int
133shape_attr_p (PangoLayoutRun *run) 163shape_attr_p (PangoLayoutRun *run)
134{ 164{
135 GSList *attrs = run->item->analysis.extra_attrs; 165 GSList *attrs = run->item->analysis.extra_attrs;
… …
149 179
150typedef struct cf_layout { 180typedef struct cf_layout {
151 PangoLayout *pl; 181 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 182 float r, g, b, a; // default color for rgba mode
153 int base_height; 183 int base_height;
154 CFPlus__Font font; 184 DC__Font font;
155 rc_t *rc; 185 rc_t *rc;
156} *CFPlus__Layout; 186} *DC__Layout;
157 187
158static CFPlus__Font default_font; 188static DC__Font default_font;
159static PangoContext *opengl_context; 189static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 190static PangoFontMap *opengl_fontmap;
161 191
162static void 192static void
163substitute_func (FcPattern *pattern, gpointer data) 193substitute_func (FcPattern *pattern, gpointer data)
… …
168#endif 198#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 199 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 200}
171 201
172static void 202static void
173layout_update_font (CFPlus__Layout self) 203layout_update_font (DC__Layout self)
174{ 204{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 205 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 206 * reasonably well with dejavu/bistream fonts
177 */ 207 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 208 PangoFontDescription *font = self->font ? self->font : default_font;
179 209
180 pango_font_description_set_absolute_size (font, 210 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 211 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 212
183 pango_layout_set_font_description (self->pl, font); 213 pango_layout_set_font_description (self->pl, font);
184} 214}
185 215
186static void 216static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 217layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 218{
189 PangoRectangle rect; 219 PangoRectangle rect;
190 220
191 // get_pixel_* wrongly rounds down 221 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 222 pango_layout_get_extents (self->pl, 0, &rect);
… …
209 int w, h; 239 int w, h;
210 float s, t; 240 float s, t;
211 uint8_t r, g, b, a; 241 uint8_t r, g, b, a;
212 tileid smoothtile; 242 tileid smoothtile;
213 uint8_t smoothlevel; 243 uint8_t smoothlevel;
244 uint8_t unused; /* set to zero on use */
214} maptex; 245} maptex;
215 246
216typedef struct { 247typedef struct {
217 uint32_t player; 248 uint32_t player;
218 tileid tile[3]; 249 tileid tile[3];
… …
231 int faces; tileid *face2tile; // [faceid] 262 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 263 int texs; maptex *tex; // [tileid]
233 264
234 int32_t rows; 265 int32_t rows;
235 maprow *row; 266 maprow *row;
236} *CFPlus__Map; 267} *DC__Map;
237 268
238static char * 269static char *
239prepend (char *ptr, int sze, int inc) 270prepend (char *ptr, int sze, int inc)
240{ 271{
241 char *p; 272 char *p;
… …
279 self->texs *= 2; 310 self->texs *= 2;
280 } 311 }
281} 312}
282 313
283static maprow * 314static maprow *
284map_get_row (CFPlus__Map self, int y) 315map_get_row (DC__Map self, int y)
285{ 316{
286 if (0 > y) 317 if (0 > y)
287 { 318 {
288 int extend = - y + MAP_EXTEND_Y; 319 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 320 Prepend (maprow, self->row, self->rows, extend);
… …
327 358
328 return row->col + (x - row->c0); 359 return row->col + (x - row->c0);
329} 360}
330 361
331static mapcell * 362static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 363map_get_cell (DC__Map self, int x, int y)
333{ 364{
334 return row_get_cell (map_get_row (self, y), x); 365 return row_get_cell (map_get_row (self, y), x);
335} 366}
336 367
337static void 368static void
338map_clear (CFPlus__Map self) 369map_clear (DC__Map self)
339{ 370{
340 int r; 371 int r;
341 372
342 for (r = 0; r < self->rows; r++) 373 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 374 Safefree (self->row[r].col);
… …
350 self->oy = 0; 381 self->oy = 0;
351 self->row = 0; 382 self->row = 0;
352 self->rows = 0; 383 self->rows = 0;
353} 384}
354 385
386#define CELL_CLEAR(cell) \
387 do { \
388 if ((cell)->player) \
389 (cell)->tile [2] = 0; \
390 (cell)->darkness = 0; \
391 (cell)->stat_hp = 0; \
392 (cell)->flags = 0; \
393 (cell)->player = 0; \
394 } while (0)
395
355static void 396static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 397map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 398{
358 int x, y; 399 int x, y;
359 maprow *row; 400 maprow *row;
360 mapcell *cell; 401 mapcell *cell;
361 402
… …
373 if (x >= row->c1) 414 if (x >= row->c1)
374 break; 415 break;
375 416
376 cell = row->col + x - row->c0; 417 cell = row->col + x - row->c0;
377 418
378 cell->darkness = 0; 419 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 420 }
383 } 421 }
384} 422}
385 423
386typedef struct { 424typedef struct {
… …
498 return 0; 536 return 0;
499 537
500 return 1; 538 return 1;
501} 539}
502 540
503MODULE = CFPlus PACKAGE = CFPlus 541/******************************************************************************/
542
543/* process keyboard modifiers */
544static int
545mod_munge (int mod)
546{
547 mod &= MOD_MASK;
548
549 if (mod & (KMOD_META | KMOD_ALT))
550 mod |= KMOD_LRAM;
551
552 return mod;
553}
554
555static void
556deliantra_main ()
557{
558 char *argv[] = { 0 };
559 call_argv ("::main", G_DISCARD | G_VOID, argv);
560}
561
562#ifdef __MACOSX__
563 /* to due surprising braindamage on the side of SDL design, we
564 * do some mind-boggling hack here: SDL requires a custom main()
565 * on OS X, so... we provide one and call the original main(), which,
566 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
567 * and which calls our main (== SDL_main) back.
568 */
569 extern C_LINKAGE int
570 main (int argc, char *argv[])
571 {
572 deliantra_main ();
573 }
574
575 #undef main
576
577 extern C_LINKAGE int main (int argc, char *argv[]);
578
579 static void
580 SDL_braino (void)
581 {
582 char *argv[] = { "deliantra client", 0 };
583 (main) (1, argv);
584 }
585#else
586 static void
587 SDL_braino (void)
588 {
589 deliantra_main ();
590 }
591#endif
592
593MODULE = Deliantra::Client PACKAGE = DC
504 594
505PROTOTYPES: ENABLE 595PROTOTYPES: ENABLE
506 596
507BOOT: 597BOOT:
508{ 598{
509 HV *stash = gv_stashpv ("CFPlus", 1); 599 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 600 static const struct {
511 const char *name; 601 const char *name;
512 IV iv; 602 IV iv;
513 } *civ, const_iv[] = { 603 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 604# define const_iv(name) { # name, (IV)name }
… …
535 const_iv (SDL_USEREVENT), 625 const_iv (SDL_USEREVENT),
536 626
537 const_iv (SDL_APPINPUTFOCUS), 627 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 628 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 629 const_iv (SDL_APPACTIVE),
630
631
632 const_iv (SDLK_UNKNOWN),
633 const_iv (SDLK_FIRST),
634 const_iv (SDLK_BACKSPACE),
635 const_iv (SDLK_TAB),
636 const_iv (SDLK_CLEAR),
637 const_iv (SDLK_RETURN),
638 const_iv (SDLK_PAUSE),
639 const_iv (SDLK_ESCAPE),
640 const_iv (SDLK_SPACE),
641 const_iv (SDLK_EXCLAIM),
642 const_iv (SDLK_QUOTEDBL),
643 const_iv (SDLK_HASH),
644 const_iv (SDLK_DOLLAR),
645 const_iv (SDLK_AMPERSAND),
646 const_iv (SDLK_QUOTE),
647 const_iv (SDLK_LEFTPAREN),
648 const_iv (SDLK_RIGHTPAREN),
649 const_iv (SDLK_ASTERISK),
650 const_iv (SDLK_PLUS),
651 const_iv (SDLK_COMMA),
652 const_iv (SDLK_MINUS),
653 const_iv (SDLK_PERIOD),
654 const_iv (SDLK_SLASH),
655 const_iv (SDLK_0),
656 const_iv (SDLK_1),
657 const_iv (SDLK_2),
658 const_iv (SDLK_3),
659 const_iv (SDLK_4),
660 const_iv (SDLK_5),
661 const_iv (SDLK_6),
662 const_iv (SDLK_7),
663 const_iv (SDLK_8),
664 const_iv (SDLK_9),
665 const_iv (SDLK_COLON),
666 const_iv (SDLK_SEMICOLON),
667 const_iv (SDLK_LESS),
668 const_iv (SDLK_EQUALS),
669 const_iv (SDLK_GREATER),
670 const_iv (SDLK_QUESTION),
671 const_iv (SDLK_AT),
672
673 const_iv (SDLK_LEFTBRACKET),
674 const_iv (SDLK_BACKSLASH),
675 const_iv (SDLK_RIGHTBRACKET),
676 const_iv (SDLK_CARET),
677 const_iv (SDLK_UNDERSCORE),
678 const_iv (SDLK_BACKQUOTE),
679 const_iv (SDLK_DELETE),
540 680
541 const_iv (SDLK_FIRST), 681 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 682 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 683 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 684 const_iv (SDLK_KP1),
… …
619 const_iv (KMOD_LMETA), 759 const_iv (KMOD_LMETA),
620 const_iv (KMOD_RMETA), 760 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 761 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 762 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 763 const_iv (KMOD_MODE),
764
765 const_iv (KMOD_LRAM),
766
767 const_iv (MIX_DEFAULT_FORMAT),
768
769 const_iv (SDL_INIT_TIMER),
770 const_iv (SDL_INIT_AUDIO),
771 const_iv (SDL_INIT_VIDEO),
772 const_iv (SDL_INIT_CDROM),
773 const_iv (SDL_INIT_JOYSTICK),
774 const_iv (SDL_INIT_EVERYTHING),
775 const_iv (SDL_INIT_NOPARACHUTE),
776 const_iv (SDL_INIT_EVENTTHREAD),
777
778 const_iv (SDL_GL_RED_SIZE),
779 const_iv (SDL_GL_GREEN_SIZE),
780 const_iv (SDL_GL_BLUE_SIZE),
781 const_iv (SDL_GL_ALPHA_SIZE),
782 const_iv (SDL_GL_DOUBLEBUFFER),
783 const_iv (SDL_GL_BUFFER_SIZE),
784 const_iv (SDL_GL_DEPTH_SIZE),
785 const_iv (SDL_GL_STENCIL_SIZE),
786 const_iv (SDL_GL_ACCUM_RED_SIZE),
787 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
788 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
789 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
790 const_iv (SDL_GL_STEREO),
791 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
792 const_iv (SDL_GL_MULTISAMPLESAMPLES),
793 const_iv (SDL_GL_ACCELERATED_VISUAL),
794 const_iv (SDL_GL_SWAP_CONTROL),
795
796 const_iv (FOW_DARKNESS)
624# undef const_iv 797# undef const_iv
625 }; 798 };
626 799
627 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 800 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
628 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 801 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
650 823
651IV minpot (UV n) 824IV minpot (UV n)
652 825
653IV popcount (UV n) 826IV popcount (UV n)
654 827
828NV distance (NV dx, NV dy)
829 CODE:
830 RETVAL = pow (dx * dx + dy * dy, 0.5);
831 OUTPUT:
832 RETVAL
833
655void 834void
656pango_init () 835pango_init ()
657 CODE: 836 CODE:
658{ 837{
659 opengl_fontmap = pango_opengl_font_map_new (); 838 opengl_fontmap = pango_opengl_font_map_new ();
660 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 839 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
661 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 840 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
841 /*pango_context_set_font_description (opengl_context, default_font);*/
842#if PANGO_VERSION_CHECK (1, 15, 2)
843 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
844 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
845#endif
662} 846}
663 847
664char *
665SDL_GetError () 848char *SDL_GetError ()
666 849
667int 850void SDL_braino ()
668SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
669 851
670void 852int SDL_Init (U32 flags)
853
854int SDL_InitSubSystem (U32 flags)
855
856void SDL_QuitSubSystem (U32 flags)
857
671SDL_Quit () 858void SDL_Quit ()
859
860int SDL_GL_SetAttribute (int attr, int value)
861
862int SDL_GL_GetAttribute (int attr)
863 CODE:
864 if (SDL_GL_GetAttribute (attr, &RETVAL))
865 XSRETURN_UNDEF;
866 OUTPUT:
867 RETVAL
672 868
673void 869void
674SDL_ListModes (int rgb, int alpha) 870SDL_ListModes (int rgb, int alpha)
675 PPCODE: 871 PPCODE:
676{ 872{
… …
688 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
689 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
691 887
692 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 888 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
693#if SDL_VERSION_ATLEAST(1,2,10)
694 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
695 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 889 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
696#endif
697 890
698 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 891 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
699 892
700 if (m && m != (SDL_Rect **)-1) 893 if (m && m != (SDL_Rect **)-1)
701 while (*m) 894 while (*m)
702 { 895 {
703 if ((*m)->w >= 640 && (*m)->h >= 480) 896 if ((*m)->w >= 400 && (*m)->h >= 300)
704 { 897 {
705 AV *av = newAV (); 898 AV *av = newAV ();
706 av_push (av, newSViv ((*m)->w)); 899 av_push (av, newSViv ((*m)->w));
707 av_push (av, newSViv ((*m)->h)); 900 av_push (av, newSViv ((*m)->h));
708 av_push (av, newSViv (rgb)); 901 av_push (av, newSViv (rgb));
… …
732 925
733 if (RETVAL) 926 if (RETVAL)
734 { 927 {
735 av_clear (texture_av); 928 av_clear (texture_av);
736 929
737 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 930 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
738#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 931#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
739#include "glfunc.h" 932#include "glfunc.h"
740#undef GL_FUNC 933#undef GL_FUNC
741 } 934 }
742} 935}
… …
749char * 942char *
750SDL_GetKeyName (int sym) 943SDL_GetKeyName (int sym)
751 944
752int 945int
753SDL_GetAppState () 946SDL_GetAppState ()
947
948int
949SDL_GetModState ()
754 950
755void 951void
756poll_events () 952poll_events ()
757 PPCODE: 953 PPCODE:
758{ 954{
… …
768 { 964 {
769 case SDL_KEYDOWN: 965 case SDL_KEYDOWN:
770 case SDL_KEYUP: 966 case SDL_KEYUP:
771 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 967 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 968 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 969 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
774 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 970 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
775 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 971 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776 break; 972 break;
777 973
778 case SDL_ACTIVEEVENT: 974 case SDL_ACTIVEEVENT:
779 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 975 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
797 x = ev.motion.x; 993 x = ev.motion.x;
798 y = ev.motion.y; 994 y = ev.motion.y;
799 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 995 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800 } 996 }
801 997
802 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 998 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
803 hv_store (hv, "state", 5, newSViv (state), 0); 999 hv_store (hv, "state", 5, newSViv (state), 0);
804 hv_store (hv, "x", 1, newSViv (x), 0); 1000 hv_store (hv, "x", 1, newSViv (x), 0);
805 hv_store (hv, "y", 1, newSViv (y), 0); 1001 hv_store (hv, "y", 1, newSViv (y), 0);
806 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1002 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1003 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808 } 1004 }
809 break; 1005 break;
810 1006
811 case SDL_MOUSEBUTTONDOWN: 1007 case SDL_MOUSEBUTTONDOWN:
812 case SDL_MOUSEBUTTONUP: 1008 case SDL_MOUSEBUTTONUP:
813 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1009 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814 1010
815 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1011 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1012 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1013 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1014 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
823 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1019 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1020 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825 break; 1021 break;
826 } 1022 }
827 1023
828 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1024 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
829 } 1025 }
830} 1026}
831 1027
832int 1028int
833Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1029Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
834 POSTCALL: 1030 POSTCALL:
835 Mix_HookMusicFinished (music_finished); 1031 Mix_HookMusicFinished (music_finished);
836 Mix_ChannelFinished (channel_finished); 1032 Mix_ChannelFinished (channel_finished);
1033
1034void
1035Mix_QuerySpec ()
1036 PPCODE:
1037{
1038 int freq, channels;
1039 Uint16 format;
1040
1041 if (Mix_QuerySpec (&freq, &format, &channels))
1042 {
1043 EXTEND (SP, 3);
1044 PUSHs (sv_2mortal (newSViv (freq)));
1045 PUSHs (sv_2mortal (newSViv (format)));
1046 PUSHs (sv_2mortal (newSViv (channels)));
1047 }
1048}
837 1049
838void 1050void
839Mix_CloseAudio () 1051Mix_CloseAudio ()
840 1052
841int 1053int
… …
876 } 1088 }
877 } 1089 }
878#endif 1090#endif
879} 1091}
880 1092
881void 1093int
882add_font (char *file) 1094add_font (char *file)
883 CODE: 1095 CODE:
884 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1096 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1097 OUTPUT:
1098 RETVAL
885 1099
886void 1100void
887load_image_inline (SV *image_) 1101load_image_inline (SV *image_)
888 ALIAS: 1102 ALIAS:
889 load_image_file = 1 1103 load_image_file = 1
… …
975void 1189void
976error (char *message) 1190error (char *message)
977 CODE: 1191 CODE:
978 fprintf (stderr, "ERROR: %s\n", message); 1192 fprintf (stderr, "ERROR: %s\n", message);
979#ifdef _WIN32 1193#ifdef _WIN32
980 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1194 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
981#endif 1195#endif
982 1196
983void 1197void
984fatal (char *message) 1198fatal (char *message)
985 CODE: 1199 CODE:
986 fprintf (stderr, "FATAL: %s\n", message); 1200 fprintf (stderr, "FATAL: %s\n", message);
987#ifdef _WIN32 1201#ifdef _WIN32
988 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1202 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
989#endif 1203#endif
990 _exit (1); 1204 _exit (1);
991 1205
992void 1206void
993_exit (int retval = 0) 1207_exit (int retval = 0)
… …
1005#if DEBUG 1219#if DEBUG
1006 VALGRIND_DO_LEAK_CHECK; 1220 VALGRIND_DO_LEAK_CHECK;
1007#endif 1221#endif
1008} 1222}
1009 1223
1010MODULE = CFPlus PACKAGE = CFPlus::Font 1224int
1225SvREFCNT (SV *sv)
1226 CODE:
1227 RETVAL = SvREFCNT (sv);
1228 OUTPUT:
1229 RETVAL
1230
1231MODULE = Deliantra::Client PACKAGE = DC::Font
1011 1232
1012PROTOTYPES: DISABLE 1233PROTOTYPES: DISABLE
1013 1234
1014CFPlus::Font 1235DC::Font
1015new_from_file (SV *class, char *path, int id = 0) 1236new_from_file (SV *class, char *path, int id = 0)
1016 CODE: 1237 CODE:
1017{ 1238{
1018 int count; 1239 int count;
1019 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1240 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
1022} 1243}
1023 OUTPUT: 1244 OUTPUT:
1024 RETVAL 1245 RETVAL
1025 1246
1026void 1247void
1027DESTROY (CFPlus::Font self) 1248DESTROY (DC::Font self)
1028 CODE: 1249 CODE:
1029 pango_font_description_free (self); 1250 pango_font_description_free (self);
1030 1251
1031void 1252void
1032make_default (CFPlus::Font self) 1253make_default (DC::Font self)
1033 PROTOTYPE: $ 1254 PROTOTYPE: $
1034 CODE: 1255 CODE:
1035 default_font = self; 1256 default_font = self;
1036 1257
1037MODULE = CFPlus PACKAGE = CFPlus::Layout 1258MODULE = Deliantra::Client PACKAGE = DC::Layout
1038 1259
1039PROTOTYPES: DISABLE 1260PROTOTYPES: DISABLE
1040 1261
1041void 1262void
1042reset_glyph_cache () 1263glyph_cache_backup ()
1043 PROTOTYPE: 1264 PROTOTYPE:
1044 CODE: 1265 CODE:
1266 tc_backup ();
1267
1268void
1269glyph_cache_restore ()
1270 PROTOTYPE:
1271 CODE:
1045 tc_clear (); 1272 tc_restore ();
1046 1273
1047CFPlus::Layout 1274DC::Layout
1048new (SV *class) 1275new (SV *class)
1049 CODE: 1276 CODE:
1050 New (0, RETVAL, 1, struct cf_layout); 1277 New (0, RETVAL, 1, struct cf_layout);
1051 1278
1052 RETVAL->pl = pango_layout_new (opengl_context); 1279 RETVAL->pl = pango_layout_new (opengl_context);
… …
1062 layout_update_font (RETVAL); 1289 layout_update_font (RETVAL);
1063 OUTPUT: 1290 OUTPUT:
1064 RETVAL 1291 RETVAL
1065 1292
1066void 1293void
1067DESTROY (CFPlus::Layout self) 1294DESTROY (DC::Layout self)
1068 CODE: 1295 CODE:
1069 g_object_unref (self->pl); 1296 g_object_unref (self->pl);
1070 rc_free (self->rc); 1297 rc_free (self->rc);
1071 Safefree (self); 1298 Safefree (self);
1072 1299
1073void 1300void
1074set_text (CFPlus::Layout self, SV *text_) 1301set_text (DC::Layout self, SV *text_)
1075 CODE: 1302 CODE:
1076{ 1303{
1077 STRLEN textlen; 1304 STRLEN textlen;
1078 char *text = SvPVutf8 (text_, textlen); 1305 char *text = SvPVutf8 (text_, textlen);
1079 1306
1080 pango_layout_set_text (self->pl, text, textlen); 1307 pango_layout_set_text (self->pl, text, textlen);
1081} 1308}
1082 1309
1083void 1310void
1084set_markup (CFPlus::Layout self, SV *text_) 1311set_markup (DC::Layout self, SV *text_)
1085 CODE: 1312 CODE:
1086{ 1313{
1087 STRLEN textlen; 1314 STRLEN textlen;
1088 char *text = SvPVutf8 (text_, textlen); 1315 char *text = SvPVutf8 (text_, textlen);
1089 1316
1090 pango_layout_set_markup (self->pl, text, textlen); 1317 pango_layout_set_markup (self->pl, text, textlen);
1091} 1318}
1092 1319
1093void 1320void
1094set_shapes (CFPlus::Layout self, ...) 1321set_shapes (DC::Layout self, ...)
1095 CODE: 1322 CODE:
1096{ 1323{
1097 PangoAttrList *attrs = 0; 1324 PangoAttrList *attrs = 0;
1098 const char *text = pango_layout_get_text (self->pl); 1325 const char *text = pango_layout_get_text (self->pl);
1099 const char *pos = text; 1326 const char *pos = text;
… …
1134 if (attrs) 1361 if (attrs)
1135 pango_layout_set_attributes (self->pl, attrs); 1362 pango_layout_set_attributes (self->pl, attrs);
1136} 1363}
1137 1364
1138void 1365void
1139get_shapes (CFPlus::Layout self) 1366get_shapes (DC::Layout self)
1140 PPCODE: 1367 PPCODE:
1141{ 1368{
1142 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1369 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143 1370
1144 do 1371 do
1145 { 1372 {
1146 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1373 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147 1374
1148 if (run && shape_attr_p (run)) 1375 if (run && shape_attr_p (run))
1149 { 1376 {
1150 PangoRectangle extents; 1377 PangoRectangle extents;
1151 pango_layout_iter_get_run_extents (iter, 0, &extents); 1378 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1159 1386
1160 pango_layout_iter_free (iter); 1387 pango_layout_iter_free (iter);
1161} 1388}
1162 1389
1163int 1390int
1164has_wrapped (CFPlus::Layout self) 1391has_wrapped (DC::Layout self)
1165 CODE: 1392 CODE:
1166{ 1393{
1167 int lines = 1; 1394 int lines = 1;
1168 const char *text = pango_layout_get_text (self->pl); 1395 const char *text = pango_layout_get_text (self->pl);
1169 1396
… …
1174} 1401}
1175 OUTPUT: 1402 OUTPUT:
1176 RETVAL 1403 RETVAL
1177 1404
1178SV * 1405SV *
1179get_text (CFPlus::Layout self) 1406get_text (DC::Layout self)
1180 CODE: 1407 CODE:
1181 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1408 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182 sv_utf8_decode (RETVAL); 1409 sv_utf8_decode (RETVAL);
1183 OUTPUT: 1410 OUTPUT:
1184 RETVAL 1411 RETVAL
1185 1412
1186void 1413void
1187set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1414set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1188 CODE: 1415 CODE:
1189 self->r = r; 1416 self->r = r;
1190 self->g = g; 1417 self->g = g;
1191 self->b = b; 1418 self->b = b;
1192 self->a = a; 1419 self->a = a;
1193 1420
1194void 1421void
1195set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1422set_font (DC::Layout self, DC::Font font = 0)
1196 CODE: 1423 CODE:
1197 if (self->font != font) 1424 if (self->font != font)
1198 { 1425 {
1199 self->font = font; 1426 self->font = font;
1200 layout_update_font (self); 1427 layout_update_font (self);
1201 } 1428 }
1202 1429
1203void 1430void
1204set_height (CFPlus::Layout self, int base_height) 1431set_height (DC::Layout self, int base_height)
1205 CODE: 1432 CODE:
1206 if (self->base_height != base_height) 1433 if (self->base_height != base_height)
1207 { 1434 {
1208 self->base_height = base_height; 1435 self->base_height = base_height;
1209 layout_update_font (self); 1436 layout_update_font (self);
1210 } 1437 }
1211 1438
1212void 1439void
1213set_width (CFPlus::Layout self, int max_width = -1) 1440set_width (DC::Layout self, int max_width = -1)
1214 CODE: 1441 CODE:
1215 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1442 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1216 1443
1217void 1444void
1218set_indent (CFPlus::Layout self, int indent) 1445set_indent (DC::Layout self, int indent)
1219 CODE: 1446 CODE:
1220 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1447 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221 1448
1222void 1449void
1223set_spacing (CFPlus::Layout self, int spacing) 1450set_spacing (DC::Layout self, int spacing)
1224 CODE: 1451 CODE:
1225 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1452 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226 1453
1227void 1454void
1228set_ellipsise (CFPlus::Layout self, int ellipsise) 1455set_ellipsise (DC::Layout self, int ellipsise)
1229 CODE: 1456 CODE:
1230 pango_layout_set_ellipsize (self->pl, 1457 pango_layout_set_ellipsize (self->pl,
1231 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1458 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1459 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1460 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234 : PANGO_ELLIPSIZE_NONE 1461 : PANGO_ELLIPSIZE_NONE
1235 ); 1462 );
1236 1463
1237void 1464void
1238set_single_paragraph_mode (CFPlus::Layout self, int spm) 1465set_single_paragraph_mode (DC::Layout self, int spm)
1239 CODE: 1466 CODE:
1240 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1467 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241 1468
1242void 1469void
1243size (CFPlus::Layout self) 1470size (DC::Layout self)
1244 PPCODE: 1471 PPCODE:
1245{ 1472{
1246 int w, h; 1473 int w, h;
1247 1474
1248 layout_get_pixel_size (self, &w, &h); 1475 layout_get_pixel_size (self, &w, &h);
… …
1251 PUSHs (sv_2mortal (newSViv (w))); 1478 PUSHs (sv_2mortal (newSViv (w)));
1252 PUSHs (sv_2mortal (newSViv (h))); 1479 PUSHs (sv_2mortal (newSViv (h)));
1253} 1480}
1254 1481
1255int 1482int
1256descent (CFPlus::Layout self) 1483descent (DC::Layout self)
1257 CODE: 1484 CODE:
1258{ 1485{
1259 PangoRectangle rect; 1486 PangoRectangle rect;
1260 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1487 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261 pango_layout_line_get_pixel_extents (line, 0, &rect); 1488 pango_layout_line_get_pixel_extents (line, 0, &rect);
1262 RETVAL = PANGO_DESCENT (rect); 1489 RETVAL = PANGO_DESCENT (rect);
1263} 1490}
1264 OUTPUT: 1491 OUTPUT:
1265 RETVAL 1492 RETVAL
1266 1493
1267int 1494int
1268xy_to_index (CFPlus::Layout self, int x, int y) 1495xy_to_index (DC::Layout self, int x, int y)
1269 CODE: 1496 CODE:
1270{ 1497{
1271 int index, trailing; 1498 int index, trailing;
1272 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1499 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1273 RETVAL = index + trailing; 1500 RETVAL = index + trailing;
1274} 1501}
1275 OUTPUT: 1502 OUTPUT:
1276 RETVAL 1503 RETVAL
1277 1504
1278void 1505void
1279cursor_pos (CFPlus::Layout self, int index) 1506cursor_pos (DC::Layout self, int index)
1280 PPCODE: 1507 PPCODE:
1281{ 1508{
1282 PangoRectangle strong_pos; 1509 PangoRectangle pos;
1283 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1510 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284 1511
1285 EXTEND (SP, 3); 1512 EXTEND (SP, 3);
1286 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1514 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1515 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289} 1516}
1290 1517
1291void 1518void
1292index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1519index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293 PPCODE: 1520 PPCODE:
1294{ 1521{
1295 int line, x; 1522 int line, x;
1296 1523
1297 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1524 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1525#if !PANGO_VERSION_CHECK (1, 17, 3)
1298 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1526 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299 1527 --line;
1528#endif
1300 EXTEND (SP, 2); 1529 EXTEND (SP, 2);
1301 PUSHs (sv_2mortal (newSViv (line - 1))); 1530 PUSHs (sv_2mortal (newSViv (line)));
1302 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1531 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303} 1532}
1304 1533
1305void 1534void
1306line_x_to_index (CFPlus::Layout self, int line, int x) 1535line_x_to_index (DC::Layout self, int line, int x)
1307 PPCODE: 1536 PPCODE:
1308{ 1537{
1309 PangoLayoutLine *lp; 1538 PangoLayoutLine *lp;
1310 int index, trailing; 1539 int index, trailing;
1311 1540
1312 if (line < 0) 1541 if (line < 0)
1313 XSRETURN_EMPTY; 1542 XSRETURN_EMPTY;
1314 1543
1315 if (!(lp = pango_layout_get_line (self->pl, line))) 1544 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316 XSRETURN_EMPTY; /* do better */ 1545 XSRETURN_EMPTY; /* do better */
1317 1546
1318 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1547 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1319 1548
1320 EXTEND (SP, 2); 1549 EXTEND (SP, 2);
… …
1326 PUSHs (sv_2mortal (newSViv (trailing))); 1555 PUSHs (sv_2mortal (newSViv (trailing)));
1327 } 1556 }
1328} 1557}
1329 1558
1330void 1559void
1331render (CFPlus::Layout self, float x, float y, int flags = 0) 1560render (DC::Layout self, float x, float y, int flags = 0)
1332 CODE: 1561 CODE:
1333 rc_clear (self->rc); 1562 rc_clear (self->rc);
1334 pango_opengl_render_layout_subpixel ( 1563 pango_opengl_render_layout_subpixel (
1335 self->pl, 1564 self->pl,
1336 self->rc, 1565 self->rc,
… …
1341 // we assume that context_change actually clears/frees stuff 1570 // we assume that context_change actually clears/frees stuff
1342 // and does not do any recomputation... 1571 // and does not do any recomputation...
1343 pango_layout_context_changed (self->pl); 1572 pango_layout_context_changed (self->pl);
1344 1573
1345void 1574void
1346draw (CFPlus::Layout self) 1575draw (DC::Layout self)
1347 CODE: 1576 CODE:
1348{ 1577{
1349 glEnable (GL_TEXTURE_2D); 1578 glEnable (GL_TEXTURE_2D);
1350 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1579 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351 glEnable (GL_BLEND); 1580 glEnable (GL_BLEND);
… …
1359 glDisable (GL_ALPHA_TEST); 1588 glDisable (GL_ALPHA_TEST);
1360 glDisable (GL_BLEND); 1589 glDisable (GL_BLEND);
1361 glDisable (GL_TEXTURE_2D); 1590 glDisable (GL_TEXTURE_2D);
1362} 1591}
1363 1592
1364MODULE = CFPlus PACKAGE = CFPlus::Texture 1593MODULE = Deliantra::Client PACKAGE = DC::Texture
1365 1594
1366PROTOTYPES: ENABLE 1595PROTOTYPES: ENABLE
1367 1596
1368void 1597void
1369pad (SV *data_, int ow, int oh, int nw, int nh) 1598pad (SV *data_, int ow, int oh, int nw, int nh)
… …
1437 glDisable (GL_ALPHA_TEST); 1666 glDisable (GL_ALPHA_TEST);
1438 glDisable (GL_BLEND); 1667 glDisable (GL_BLEND);
1439 } 1668 }
1440} 1669}
1441 1670
1671void
1672draw_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)
1673 PROTOTYPE: @
1674 CODE:
1675{
1676 glEnable (GL_TEXTURE_2D);
1677 glEnable (GL_BLEND);
1678 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1679 glBindTexture (GL_TEXTURE_2D, name1);
1680
1681 glColor3f (intensity, intensity, intensity);
1682 glPushMatrix ();
1683 glScalef (1./3, 1./3, 1.);
1684
1685 if (blend > 0.f)
1686 {
1687 float dx3 = dx * -3.f / w;
1688 float dy3 = dy * -3.f / h;
1689 GLfloat env_color[4] = { 0., 0., 0., blend };
1690
1691 /* interpolate the two shadow textures */
1692 /* stage 0 == rgb(glcolor) + alpha(t0) */
1693 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1694
1695 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1696 gl.ActiveTexture (GL_TEXTURE1);
1697 glEnable (GL_TEXTURE_2D);
1698 glBindTexture (GL_TEXTURE_2D, name2);
1699 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1700
1701 /* rgb == rgb(glcolor) */
1702 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1705
1706 /* alpha = interpolate t0, t1 by env_alpha */
1707 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1708
1709 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1710 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1712
1713 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1714 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1715
1716 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1717 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1718
1719 glBegin (GL_QUADS);
1720 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1721 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1722 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1723 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1724 glEnd ();
1725
1726 glDisable (GL_TEXTURE_2D);
1727 gl.ActiveTexture (GL_TEXTURE0);
1728 }
1729 else
1730 {
1731 /* simple blending of one texture, also opengl <1.3 path */
1732 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1733
1734 glBegin (GL_QUADS);
1735 glTexCoord2f (0, 0); glVertex2f (0, 0);
1736 glTexCoord2f (0, t); glVertex2f (0, h);
1737 glTexCoord2f (s, t); glVertex2f (w, h);
1738 glTexCoord2f (s, 0); glVertex2f (w, 0);
1739 glEnd ();
1740 }
1741
1742 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1743 {
1744 int x, y;
1745 int dx3 = dx * 3;
1746 int dy3 = dy * 3;
1747
1748 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1749 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1750 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1751 glTranslatef (-1., -1., 0);
1752 glBegin (GL_QUADS);
1753
1754 for (y = 1; y < h; y += 3)
1755 {
1756 int y1 = y - dy3;
1757 int y1valid = y1 >= 0 && y1 < h;
1758
1759 for (x = 1; x < w; x += 3)
1760 {
1761 int x1 = x - dx3;
1762 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1763 uint8_t h2;
1764
1765 if (y1valid && x1 >= 0 && x1 < w)
1766 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1767 else
1768 h2 = 1; /* out of range == invisible */
1769
1770 if (h1 || h2)
1771 {
1772 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1773 glColor4f (1., 1., 1., alpha);
1774
1775 glTexCoord2f (0, 0.); glVertex2i (x , y );
1776 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1777 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1778 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1779 }
1780 }
1781 }
1782 }
1783
1784 glEnd ();
1785
1786 glPopMatrix ();
1787
1788 glDisable (GL_TEXTURE_2D);
1789 glDisable (GL_BLEND);
1790}
1791
1442IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1792IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1443 CODE: 1793 CODE:
1444{ 1794{
1445 GLint width; 1795 GLint width;
1446 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1796 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1448 RETVAL = width > 0; 1798 RETVAL = width > 0;
1449} 1799}
1450 OUTPUT: 1800 OUTPUT:
1451 RETVAL 1801 RETVAL
1452 1802
1453MODULE = CFPlus PACKAGE = CFPlus::Map 1803MODULE = Deliantra::Client PACKAGE = DC::Map
1454 1804
1455PROTOTYPES: DISABLE 1805PROTOTYPES: DISABLE
1456 1806
1457CFPlus::Map 1807DC::Map
1458new (SV *class) 1808new (SV *class)
1459 CODE: 1809 CODE:
1460 New (0, RETVAL, 1, struct map); 1810 New (0, RETVAL, 1, struct map);
1461 RETVAL->x = 0; 1811 RETVAL->x = 0;
1462 RETVAL->y = 0; 1812 RETVAL->y = 0;
… …
1470 RETVAL->row = 0; 1820 RETVAL->row = 0;
1471 OUTPUT: 1821 OUTPUT:
1472 RETVAL 1822 RETVAL
1473 1823
1474void 1824void
1475DESTROY (CFPlus::Map self) 1825DESTROY (DC::Map self)
1476 CODE: 1826 CODE:
1477{ 1827{
1478 map_clear (self); 1828 map_clear (self);
1479 Safefree (self->face2tile); 1829 Safefree (self->face2tile);
1480 Safefree (self->tex); 1830 Safefree (self->tex);
1481 Safefree (self); 1831 Safefree (self);
1482} 1832}
1483 1833
1484void 1834void
1485resize (CFPlus::Map self, int map_width, int map_height) 1835resize (DC::Map self, int map_width, int map_height)
1486 CODE: 1836 CODE:
1487 self->w = map_width; 1837 self->w = map_width;
1488 self->h = map_height; 1838 self->h = map_height;
1489 1839
1490void 1840void
1491clear (CFPlus::Map self) 1841clear (DC::Map self)
1492 CODE: 1842 CODE:
1493 map_clear (self); 1843 map_clear (self);
1494 1844
1495void 1845void
1496set_tileid (CFPlus::Map self, int face, int tile) 1846set_tileid (DC::Map self, int face, int tile)
1497 CODE: 1847 CODE:
1498{ 1848{
1499 need_facenum (self, face); self->face2tile [face] = tile; 1849 need_facenum (self, face); self->face2tile [face] = tile;
1500 need_texid (self, tile); 1850 need_texid (self, tile);
1501} 1851}
1502 1852
1503void 1853void
1504set_smooth (CFPlus::Map self, int face, int smooth, int level) 1854set_smooth (DC::Map self, int face, int smooth, int level)
1505 CODE: 1855 CODE:
1506{ 1856{
1507 tileid texid; 1857 tileid texid;
1508 maptex *tex; 1858 maptex *tex;
1509 1859
… …
1522 tex->smoothtile = self->face2tile [smooth]; 1872 tex->smoothtile = self->face2tile [smooth];
1523 tex->smoothlevel = level; 1873 tex->smoothlevel = level;
1524} 1874}
1525 1875
1526void 1876void
1527set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1877set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1528 CODE: 1878 CODE:
1529{ 1879{
1530 need_texid (self, texid); 1880 need_texid (self, texid);
1531 1881
1532 { 1882 {
… …
1551 // use uglier nearest interpolation because linear suffers 1901 // use uglier nearest interpolation because linear suffers
1552 // from transparent color bleeding and ugly wrapping effects. 1902 // from transparent color bleeding and ugly wrapping effects.
1553 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1903 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554} 1904}
1555 1905
1906void
1907expire_textures (DC::Map self, int texid, int count)
1908 PPCODE:
1909 for (; texid < self->texs && count; ++texid, --count)
1910 {
1911 maptex *tex = self->tex + texid;
1912
1913 if (tex->name)
1914 {
1915 if (tex->unused)
1916 {
1917 tex->name = 0;
1918 tex->unused = 0;
1919 XPUSHs (sv_2mortal (newSViv (texid)));
1920 }
1921 else
1922 tex->unused = 1;
1923 }
1924 }
1925
1556int 1926int
1557ox (CFPlus::Map self) 1927ox (DC::Map self)
1558 ALIAS: 1928 ALIAS:
1559 oy = 1 1929 oy = 1
1560 x = 2 1930 x = 2
1561 y = 3 1931 y = 3
1562 w = 4 1932 w = 4
… …
1573 } 1943 }
1574 OUTPUT: 1944 OUTPUT:
1575 RETVAL 1945 RETVAL
1576 1946
1577void 1947void
1578scroll (CFPlus::Map self, int dx, int dy) 1948scroll (DC::Map self, int dx, int dy)
1579 CODE: 1949 CODE:
1580{ 1950{
1581 if (dx > 0) 1951 if (dx > 0)
1582 map_blank (self, self->x, self->y, dx, self->h); 1952 map_blank (self, self->x, self->y, dx, self->h);
1583 else if (dx < 0) 1953 else if (dx < 0)
… …
1599 self->y += MAP_EXTEND_Y; 1969 self->y += MAP_EXTEND_Y;
1600 } 1970 }
1601} 1971}
1602 1972
1603SV * 1973SV *
1604map1a_update (CFPlus::Map self, SV *data_, int extmap) 1974map1a_update (DC::Map self, SV *data_, int extmap)
1605 CODE: 1975 CODE:
1606{ 1976{
1607 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1977 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1608 uint8_t *data_end = (uint8_t *)SvEND (data_); 1978 uint8_t *data_end = (uint8_t *)SvEND (data_);
1609 mapcell *cell; 1979 mapcell *cell;
… …
1637 uint8_t ext, cmd; 2007 uint8_t ext, cmd;
1638 2008
1639 do 2009 do
1640 { 2010 {
1641 ext = *data++; 2011 ext = *data++;
1642 cmd = ext & 0x3f; 2012 cmd = ext & 0x7f;
1643 2013
1644 if (cmd < 4) 2014 if (cmd < 4)
1645 cell->darkness = 255 - ext * 64 + 1; 2015 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1646 else if (cmd == 5) // health 2016 else if (cmd == 5) // health
1647 { 2017 {
1648 cell->stat_width = 1; 2018 cell->stat_width = 1;
1649 cell->stat_hp = *data++; 2019 cell->stat_hp = *data++;
1650 } 2020 }
1651 else if (cmd == 6) // monster width 2021 else if (cmd == 6) // monster width
1652 cell->stat_width = *data++ + 1; 2022 cell->stat_width = *data++ + 1;
1653 else if (cmd == 0x47) 2023 else if (cmd == 0x47)
1654 { 2024 {
1655 if (*data == 4) 2025 if (*data == 1) cell->player = data [1];
1656 ; // decode player count 2026 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2027 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2028 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1657 2029
1658 data += *data + 1; 2030 data += *data + 1;
1659 } 2031 }
1660 else if (cmd == 8) // cell flags 2032 else if (cmd == 8) // cell flags
1661 cell->flags = *data++; 2033 cell->flags = *data++;
… …
1678 cell->tile [z] = self->face2tile [face]; 2050 cell->tile [z] = self->face2tile [face];
1679 2051
1680 if (cell->tile [z]) 2052 if (cell->tile [z])
1681 { 2053 {
1682 maptex *tex = self->tex + cell->tile [z]; 2054 maptex *tex = self->tex + cell->tile [z];
2055 tex->unused = 0;
1683 if (!tex->name) 2056 if (!tex->name)
1684 av_push (missing, newSViv (cell->tile [z])); 2057 av_push (missing, newSViv (cell->tile [z]));
1685 2058
1686 if (tex->smoothtile) 2059 if (tex->smoothtile)
1687 { 2060 {
1688 maptex *smooth = self->tex + tex->smoothtile; 2061 maptex *smooth = self->tex + tex->smoothtile;
2062 smooth->unused = 0;
1689 if (!smooth->name) 2063 if (!smooth->name)
1690 av_push (missing, newSViv (tex->smoothtile)); 2064 av_push (missing, newSViv (tex->smoothtile));
1691 } 2065 }
1692 } 2066 }
1693 } 2067 }
1694 } 2068 }
1695 else 2069 else
1696 cell->darkness = 0; 2070 CELL_CLEAR (cell);
1697 } 2071 }
1698} 2072}
1699 OUTPUT: 2073 OUTPUT:
1700 RETVAL 2074 RETVAL
1701 2075
1702SV * 2076SV *
1703mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2077mapmap (DC::Map self, int x0, int y0, int w, int h)
1704 CODE: 2078 CODE:
1705{ 2079{
1706 int x1, x; 2080 int x1, x;
1707 int y1, y; 2081 int y1, y;
1708 int z; 2082 int z;
… …
1753} 2127}
1754 OUTPUT: 2128 OUTPUT:
1755 RETVAL 2129 RETVAL
1756 2130
1757void 2131void
1758draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2132draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1759 CODE: 2133 CODE:
1760{ 2134{
1761 int x, y, z; 2135 int x, y, z;
1762 2136
1763 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2137 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1764 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2138 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1765 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2139 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1766 smooth_key skey; 2140 smooth_key skey;
1767 2141 int pl_x, pl_y;
2142 maptex pl_tex;
1768 rc_t *rc = rc_alloc (); 2143 rc_t *rc = rc_alloc ();
2144 rc_t *rc_ov = rc_alloc ();
1769 rc_key_t key; 2145 rc_key_t key;
1770 rc_array_t *arr; 2146 rc_array_t *arr, *arr_hidden;
1771 2147
2148 pl_tex.name = 0;
2149
1772 // thats current max. sorry. 2150 // that's current max. sorry.
1773 if (sw > 255) sw = 255; 2151 if (sw > 255) sw = 255;
1774 if (sh > 255) sh = 255; 2152 if (sh > 255) sh = 255;
1775 2153
1776 // clear key, in case of extra padding 2154 // clear key, in case of extra padding
1777 memset (&skey, 0, sizeof (skey)); 2155 memset (&skey, 0, sizeof (skey));
… …
1781 key.g = 255; 2159 key.g = 255;
1782 key.b = 255; 2160 key.b = 255;
1783 key.a = 255; 2161 key.a = 255;
1784 key.mode = GL_QUADS; 2162 key.mode = GL_QUADS;
1785 key.format = GL_T2F_V3F; 2163 key.format = GL_T2F_V3F;
1786 key.texname = -1;
1787 2164
1788 mx += self->x; 2165 mx += self->x;
1789 my += self->y; 2166 my += self->y;
1790 2167
1791 // first pass: determine smooth_max 2168 // first pass: determine smooth_max
… …
1812 2189
1813 glEnable (GL_BLEND); 2190 glEnable (GL_BLEND);
1814 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2191 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1815 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2192 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1816 2193
2194 key.texname = self->tex [TEXID_HIDDEN].name;
2195 arr_hidden = rc_array (rc_ov, &key);
2196
1817 for (z = 0; z <= 2; z++) 2197 for (z = 0; z <= 2; z++)
1818 { 2198 {
1819 memset (smooth_level, 0, sizeof (smooth_level)); 2199 memset (smooth_level, 0, sizeof (smooth_level));
2200 key.texname = -1;
1820 2201
1821 for (y = 0; y < sh; y++) 2202 for (y = 0; y < sh; y++)
1822 if (0 <= y + my && y + my < self->rows) 2203 if (0 <= y + my && y + my < self->rows)
1823 { 2204 {
1824 maprow *row = self->row + (y + my); 2205 maprow *row = self->row + (y + my);
… …
1834 maptex tex = self->tex [tile]; 2215 maptex tex = self->tex [tile];
1835 int px, py; 2216 int px, py;
1836 2217
1837 if (key.texname != tex.name) 2218 if (key.texname != tex.name)
1838 { 2219 {
2220 self->tex [tile].unused = 0;
2221
1839 if (!tex.name) 2222 if (!tex.name)
1840 tex = self->tex [2]; /* missing, replace by noface */ 2223 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1841 2224
1842 key.texname = tex.name; 2225 key.texname = tex.name;
1843 arr = rc_array (rc, &key); 2226 arr = rc_array (rc, &key);
1844 } 2227 }
1845 2228
1846 px = (x + 1) * T - tex.w; 2229 px = (x + 1) * T - tex.w;
1847 py = (y + 1) * T - tex.h; 2230 py = (y + 1) * T - tex.h;
2231
2232 if (expect_false (cell->player == player) && expect_false (z == 2))
2233 {
2234 pl_x = px;
2235 pl_y = py;
2236 pl_tex = tex;
2237 continue;
2238 }
1848 2239
1849 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2240 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1850 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2241 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1851 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2242 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1852 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2243 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1853
1854 if (cell->flags && z == 2)
1855 {
1856 // overlays such as the speech bubble, probably more to come
1857 if (cell->flags & 1)
1858 {
1859 maptex tex = self->tex [1];
1860 int px = x * T + T * 2 / 32;
1861 int py = y * T - T * 6 / 32;
1862
1863 if (tex.name)
1864 {
1865 if (key.texname != tex.name)
1866 {
1867 key.texname = tex.name;
1868 arr = rc_array (rc, &key);
1869 }
1870
1871 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1872 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1873 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1874 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1875 }
1876 }
1877 }
1878 2244
1879 // update smooth hash 2245 // update smooth hash
1880 if (tex.smoothtile) 2246 if (tex.smoothtile)
1881 { 2247 {
1882 skey.tile = tex.smoothtile; 2248 skey.tile = tex.smoothtile;
… …
1911 // corners 2277 // corners
1912 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2278 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1913 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2279 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1914 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2280 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1915 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2281 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2282 }
2283 }
2284
2285 if (expect_false (z == 2) && expect_false (cell->flags))
2286 {
2287 // overlays such as the speech bubble, probably more to come
2288 if (cell->flags & 1)
2289 {
2290 rc_key_t key_ov = key;
2291 maptex tex = self->tex [TEXID_SPEECH];
2292 rc_array_t *arr;
2293 int px = x * T + T * 2 / 32;
2294 int py = y * T - T * 6 / 32;
2295
2296 key_ov.texname = tex.name;
2297 arr = rc_array (rc_ov, &key_ov);
2298
2299 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2300 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2301 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2302 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1916 } 2303 }
1917 } 2304 }
1918 } 2305 }
1919 } 2306 }
1920 2307
… …
1960 { 2347 {
1961 // this time avoiding texture state changes 2348 // this time avoiding texture state changes
1962 // save gobs of state changes. 2349 // save gobs of state changes.
1963 if (key.texname != tex.name) 2350 if (key.texname != tex.name)
1964 { 2351 {
2352 self->tex [skey->tile].unused = 0;
2353
1965 glEnd (); 2354 glEnd ();
1966 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2355 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1967 glBegin (GL_QUADS); 2356 glBegin (GL_QUADS);
1968 } 2357 }
1969 2358
… …
1998 } 2387 }
1999 2388
2000 hv_clear (smooth); 2389 hv_clear (smooth);
2001 } 2390 }
2002 2391
2392 if (pl_tex.name)
2393 {
2394 maptex tex = pl_tex;
2395 int px = pl_x + sdx;
2396 int py = pl_y + sdy;
2397
2398 key.texname = tex.name;
2399 arr = rc_array (rc, &key);
2400
2401 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2402 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2403 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2404 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2405
2406 rc_draw (rc);
2407 }
2408
2409 rc_draw (rc_ov);
2410 rc_clear (rc_ov);
2411
2003 glDisable (GL_BLEND); 2412 glDisable (GL_BLEND);
2004 rc_free (rc); 2413 rc_free (rc);
2414 rc_free (rc_ov);
2005 2415
2006 // top layer: overlays such as the health bar 2416 // top layer: overlays such as the health bar
2007 for (y = 0; y < sh; y++) 2417 for (y = 0; y < sh; y++)
2008 if (0 <= y + my && y + my < self->rows) 2418 if (0 <= y + my && y + my < self->rows)
2009 { 2419 {
… …
2014 { 2424 {
2015 mapcell *cell = row->col + (x + mx - row->c0); 2425 mapcell *cell = row->col + (x + mx - row->c0);
2016 2426
2017 int px = x * T; 2427 int px = x * T;
2018 int py = y * T; 2428 int py = y * T;
2429
2430 if (expect_false (cell->player == player))
2431 {
2432 px += sdx;
2433 py += sdy;
2434 }
2019 2435
2020 if (cell->stat_hp) 2436 if (cell->stat_hp)
2021 { 2437 {
2022 int width = cell->stat_width * T; 2438 int width = cell->stat_width * T;
2023 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2439 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2034 } 2450 }
2035 } 2451 }
2036} 2452}
2037 2453
2038void 2454void
2039draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2455draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2040 CODE: 2456 CODE:
2041{ 2457{
2042 static float color[16][3] = { 2458 static float color[16][3] = {
2043 { 0.00F, 0.00F, 0.00F }, 2459 { 0.00f, 0.00f, 0.00f },
2044 { 1.00F, 1.00F, 1.00F }, 2460 { 1.00f, 1.00f, 1.00f },
2045 { 0.00F, 0.00F, 0.55F }, 2461 { 0.00f, 0.00f, 0.55f },
2046 { 1.00F, 0.00F, 0.00F }, 2462 { 1.00f, 0.00f, 0.00f },
2047 2463
2048 { 1.00F, 0.54F, 0.00F }, 2464 { 1.00f, 0.54f, 0.00f },
2049 { 0.11F, 0.56F, 1.00F }, 2465 { 0.11f, 0.56f, 1.00f },
2050 { 0.93F, 0.46F, 0.00F }, 2466 { 0.93f, 0.46f, 0.00f },
2051 { 0.18F, 0.54F, 0.34F }, 2467 { 0.18f, 0.54f, 0.34f },
2052 2468
2053 { 0.56F, 0.73F, 0.56F }, 2469 { 0.56f, 0.73f, 0.56f },
2054 { 0.80F, 0.80F, 0.80F }, 2470 { 0.80f, 0.80f, 0.80f },
2055 { 0.55F, 0.41F, 0.13F }, 2471 { 0.55f, 0.41f, 0.13f },
2056 { 0.99F, 0.77F, 0.26F }, 2472 { 0.99f, 0.77f, 0.26f },
2057 2473
2058 { 0.74F, 0.65F, 0.41F }, 2474 { 0.74f, 0.65f, 0.41f },
2059 2475
2060 { 0.00F, 1.00F, 1.00F }, 2476 { 0.00f, 1.00f, 1.00f },
2061 { 1.00F, 0.00F, 1.00F }, 2477 { 1.00f, 0.00f, 1.00f },
2062 { 1.00F, 1.00F, 0.00F }, 2478 { 1.00f, 1.00f, 0.00f },
2063 }; 2479 };
2064 2480
2065 int x, y; 2481 int x, y;
2066 2482
2067 glEnable (GL_TEXTURE_2D); 2483 glEnable (GL_TEXTURE_2D);
2484 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2485 * but the nvidia driver (185.18.14) mishandles alpha textures
2486 * and takes the colour from god knows where instead of using
2487 * Cp. MODULATE results in the same colour, but slightly different
2488 * alpha, but atcually gives us the correct colour with nvidia.
2489 */
2068 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2490 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2069 glEnable (GL_BLEND); 2491 glEnable (GL_BLEND);
2070 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2492 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2071 glBegin (GL_QUADS); 2493 glBegin (GL_QUADS);
2072 2494
2073 for (y = 0; y < h; y++) 2495 for (y = 0; y < h; y++)
… …
2077 2499
2078 if (m) 2500 if (m)
2079 { 2501 {
2080 float *c = color [m & 15]; 2502 float *c = color [m & 15];
2081 2503
2082 float tx1 = m & 0x40 ? 0.5 : 0.; 2504 float tx1 = m & 0x40 ? 0.5f : 0.f;
2083 float tx2 = tx1 + 0.5; 2505 float tx2 = tx1 + 0.5f;
2084 2506
2085 glColor4f (c[0], c[1], c[2], 0.75); 2507 glColor4f (c[0], c[1], c[2], 1);
2086 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2508 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2087 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2509 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2088 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2510 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2089 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2511 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2090 } 2512 }
… …
2094 glDisable (GL_BLEND); 2516 glDisable (GL_BLEND);
2095 glDisable (GL_TEXTURE_2D); 2517 glDisable (GL_TEXTURE_2D);
2096} 2518}
2097 2519
2098void 2520void
2099fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2521fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2100 PPCODE: 2522 PPCODE:
2101{ 2523{
2102 int x, y; 2524 int x, y;
2103 int sw1 = sw + 2; 2525 int sw1 = sw + 2;
2104 int sh1 = sh + 2; 2526 int sh1 = sh + 2;
2105 int sh3 = sh * 3; 2527 int sh3 = sh * 3;
2106 int sw34 = (sw * 3 + 3) & ~3; 2528 int sw3 = sw * 3;
2107 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2529 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2108 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2530 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2109 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2531 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2110 2532
2111 SvPOK_only (darkness3_sv); 2533 SvPOK_only (darkness3_sv);
2112 SvCUR_set (darkness3_sv, sw34 * sh3); 2534 SvCUR_set (darkness3_sv, sw3 * sh3);
2113 2535
2114 mx += self->x - 1; 2536 mx += self->x - 1;
2115 my += self->y - 1; 2537 my += self->y - 1;
2116
2117 memset (darkness1, 255, sw1 * sh1);
2118 2538
2119 for (y = 0; y < sh1; y++) 2539 for (y = 0; y < sh1; y++)
2120 if (0 <= y + my && y + my < self->rows) 2540 if (0 <= y + my && y + my < self->rows)
2121 { 2541 {
2122 maprow *row = self->row + (y + my); 2542 maprow *row = self->row + (y + my);
… …
2125 if (row->c0 <= x + mx && x + mx < row->c1) 2545 if (row->c0 <= x + mx && x + mx < row->c1)
2126 { 2546 {
2127 mapcell *cell = row->col + (x + mx - row->c0); 2547 mapcell *cell = row->col + (x + mx - row->c0);
2128 2548
2129 darkness1 [y * sw1 + x] = cell->darkness 2549 darkness1 [y * sw1 + x] = cell->darkness
2130 ? 255 - (cell->darkness - 1) 2550 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2131 : 255 - FOW_DARKNESS; 2551 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2132 } 2552 }
2133 } 2553 }
2134 2554
2135 for (y = 0; y < sh; ++y) 2555 for (y = 0; y < sh; ++y)
2136 for (x = 0; x < sw; ++x) 2556 for (x = 0; x < sw; ++x)
… …
2155 2575
2156 uint8_t r13 = (d13 + d23 + d12) / 3; 2576 uint8_t r13 = (d13 + d23 + d12) / 3;
2157 uint8_t r23 = d23; 2577 uint8_t r23 = d23;
2158 uint8_t r33 = (d23 + d33 + d32) / 3; 2578 uint8_t r33 = (d23 + d33 + d32) / 3;
2159 2579
2160 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2580 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2161 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2581 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2162 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2582 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2163 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2583 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2164 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2584 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2165 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2585 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2166 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2586 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2167 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2587 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2168 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2588 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2169 } 2589 }
2170 2590
2171 free (darkness1); 2591 free (darkness1);
2172 2592
2173 EXTEND (SP, 3); 2593 EXTEND (SP, 3);
2174 PUSHs (sv_2mortal (newSViv (sw34))); 2594 PUSHs (sv_2mortal (newSViv (sw3)));
2175 PUSHs (sv_2mortal (newSViv (sh3))); 2595 PUSHs (sv_2mortal (newSViv (sh3)));
2176 PUSHs (darkness3_sv); 2596 PUSHs (darkness3_sv);
2177} 2597}
2178 2598
2179SV * 2599SV *
2180get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2600get_rect (DC::Map self, int x0, int y0, int w, int h)
2181 CODE: 2601 CODE:
2182{ 2602{
2183 int x, y, x1, y1; 2603 int x, y, x1, y1;
2184 SV *data_sv = newSV (w * h * 7 + 5); 2604 SV *data_sv = newSV (w * h * 7 + 5);
2185 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2605 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2242 else 2662 else
2243 *data++ = 0; 2663 *data++ = 0;
2244 } 2664 }
2245 } 2665 }
2246 2666
2667 /* if size is w*h + 5 then no data has been found */
2668 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2669 {
2247 SvPOK_only (data_sv); 2670 SvPOK_only (data_sv);
2248 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2671 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2672 }
2673
2249 RETVAL = data_sv; 2674 RETVAL = data_sv;
2250} 2675}
2251 OUTPUT: 2676 OUTPUT:
2252 RETVAL 2677 RETVAL
2253 2678
2254void 2679void
2255set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2680set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2256 PPCODE: 2681 PPCODE:
2257{ 2682{
2258 int x, y, z; 2683 int x, y, z;
2259 int w, h; 2684 int w, h;
2260 int x1, y1; 2685 int x1, y1;
2686 STRLEN len;
2687 uint8_t *data, *end;
2688
2689 len = SvLEN (data_sv);
2690 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2691 data = SvPVbyte_nolen (data_sv);
2692 end = data + len + 8;
2693
2694 if (len < 5)
2695 XSRETURN_EMPTY;
2261 2696
2262 if (*data++ != 0) 2697 if (*data++ != 0)
2263 XSRETURN_EMPTY; /* version mismatch */ 2698 XSRETURN_EMPTY; /* version mismatch */
2264 2699
2265 w = *data++ << 8; w |= *data++; 2700 w = *data++ << 8; w |= *data++;
… …
2280 { 2715 {
2281 maprow *row = map_get_row (self, y); 2716 maprow *row = map_get_row (self, y);
2282 2717
2283 for (x = x0; x < x1; x++) 2718 for (x = x0; x < x1; x++)
2284 { 2719 {
2720 uint8_t flags;
2721
2722 if (data + 7 >= end)
2723 XSRETURN_EMPTY;
2724
2285 uint8_t flags = *data++; 2725 flags = *data++;
2286 2726
2287 if (flags) 2727 if (flags)
2288 { 2728 {
2289 mapcell *cell = row_get_cell (row, x); 2729 mapcell *cell = row_get_cell (row, x);
2290 tileid tile[3] = { 0, 0, 0 }; 2730 tileid tile[3] = { 0, 0, 0 };
… …
2293 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2733 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2294 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2734 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2295 2735
2296 if (cell->darkness == 0) 2736 if (cell->darkness == 0)
2297 { 2737 {
2298 cell->darkness = 0; 2738 /*cell->darkness = 0;*/
2739 EXTEND (SP, 3);
2299 2740
2300 for (z = 0; z <= 2; z++) 2741 for (z = 0; z <= 2; z++)
2301 { 2742 {
2302 tileid t = tile [z]; 2743 tileid t = tile [z];
2303 2744
2304 if (t >= self->texs || (t && !self->tex [t].name)) 2745 if (t >= self->texs || (t && !self->tex [t].name))
2305 { 2746 {
2306 XPUSHs (sv_2mortal (newSViv (t))); 2747 PUSHs (sv_2mortal (newSViv (t)));
2307 need_texid (self, t); 2748 need_texid (self, t);
2308 } 2749 }
2309 2750
2310 cell->tile [z] = t; 2751 cell->tile [z] = t;
2311 } 2752 }
… …
2313 } 2754 }
2314 } 2755 }
2315 } 2756 }
2316} 2757}
2317 2758
2318MODULE = CFPlus PACKAGE = CFPlus::RW 2759MODULE = Deliantra::Client PACKAGE = DC::RW
2319 2760
2320CFPlus::RW 2761DC::RW
2321new (SV *class, SV *data_sv) 2762new (SV *class, SV *data_sv)
2322 CODE: 2763 CODE:
2323{ 2764{
2324 STRLEN datalen; 2765 STRLEN datalen;
2325 char *data = SvPVbyte (data_sv, datalen); 2766 char *data = SvPVbyte (data_sv, datalen);
… …
2327 RETVAL = SDL_RWFromConstMem (data, datalen); 2768 RETVAL = SDL_RWFromConstMem (data, datalen);
2328} 2769}
2329 OUTPUT: 2770 OUTPUT:
2330 RETVAL 2771 RETVAL
2331 2772
2332CFPlus::RW 2773DC::RW
2333new_from_file (SV *class, const char *path, const char *mode = "rb") 2774new_from_file (SV *class, const char *path, const char *mode = "rb")
2334 CODE: 2775 CODE:
2335 RETVAL = SDL_RWFromFile (path, mode); 2776 RETVAL = SDL_RWFromFile (path, mode);
2336 OUTPUT: 2777 OUTPUT:
2337 RETVAL 2778 RETVAL
2338 2779
2339# fails on win32: 2780# fails on win32:
2340# CFPlus.xs(2268) : error C2059: syntax error : '(' 2781# dc.xs(2268) : error C2059: syntax error : '('
2341#void 2782#void
2342#close (CFPlus::RW self) 2783#close (DC::RW self)
2343# CODE: 2784# CODE:
2344# (self->(close)) (self); 2785# (self->(close)) (self);
2345 2786
2346MODULE = CFPlus PACKAGE = CFPlus::Channel 2787MODULE = Deliantra::Client PACKAGE = DC::Channel
2347 2788
2348PROTOTYPES: DISABLE 2789PROTOTYPES: DISABLE
2349 2790
2350CFPlus::Channel 2791DC::Channel
2351find () 2792find ()
2352 CODE: 2793 CODE:
2353{ 2794{
2354 RETVAL = Mix_GroupAvailable (-1); 2795 RETVAL = Mix_GroupAvailable (-1);
2355 2796
… …
2368} 2809}
2369 OUTPUT: 2810 OUTPUT:
2370 RETVAL 2811 RETVAL
2371 2812
2372void 2813void
2373halt (CFPlus::Channel self) 2814halt (DC::Channel self)
2374 CODE: 2815 CODE:
2375 Mix_HaltChannel (self); 2816 Mix_HaltChannel (self);
2376 2817
2377void 2818void
2378expire (CFPlus::Channel self, int ticks = -1) 2819expire (DC::Channel self, int ticks = -1)
2379 CODE: 2820 CODE:
2380 Mix_ExpireChannel (self, ticks); 2821 Mix_ExpireChannel (self, ticks);
2381 2822
2382void 2823void
2383fade_out (CFPlus::Channel self, int ticks = -1) 2824fade_out (DC::Channel self, int ticks = -1)
2384 CODE: 2825 CODE:
2385 Mix_FadeOutChannel (self, ticks); 2826 Mix_FadeOutChannel (self, ticks);
2386 2827
2387int 2828int
2388volume (CFPlus::Channel self, int volume) 2829volume (DC::Channel self, int volume)
2389 CODE: 2830 CODE:
2390 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2831 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391 OUTPUT: 2832 OUTPUT:
2392 RETVAL 2833 RETVAL
2393 2834
2394void 2835void
2395unregister_all_effects (CFPlus::Channel self) 2836unregister_all_effects (DC::Channel self)
2396 CODE: 2837 CODE:
2397 Mix_UnregisterAllEffects (self); 2838 Mix_UnregisterAllEffects (self);
2398 2839
2399void 2840void
2400set_panning (CFPlus::Channel self, int left, int right) 2841set_panning (DC::Channel self, int left, int right)
2401 CODE: 2842 CODE:
2402 left = CLAMP (left , 0, 255); 2843 left = CLAMP (left , 0, 255);
2403 right = CLAMP (right, 0, 255); 2844 right = CLAMP (right, 0, 255);
2404 Mix_SetPanning (self, left, right); 2845 Mix_SetPanning (self, left, right);
2405 2846
2406void 2847void
2407set_distance (CFPlus::Channel self, int distance) 2848set_distance (DC::Channel self, int distance)
2408 CODE: 2849 CODE:
2409 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2850 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410 2851
2411void 2852void
2412set_position (CFPlus::Channel self, int angle, int distance) 2853set_position (DC::Channel self, int angle, int distance)
2413 CODE: 2854 CODE:
2414 2855
2415void 2856void
2416set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2857set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417 CODE: 2858 CODE:
2418{ 2859{
2419 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2860 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2420 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2861 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2421 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2862 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422} 2863}
2423 2864
2424void 2865void
2425set_reverse_stereo (CFPlus::Channel self, int flip) 2866set_reverse_stereo (DC::Channel self, int flip)
2426 CODE: 2867 CODE:
2427 Mix_SetReverseStereo (self, flip); 2868 Mix_SetReverseStereo (self, flip);
2428 2869
2429MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2870MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430 2871
2431PROTOTYPES: DISABLE 2872PROTOTYPES: DISABLE
2432 2873
2433CFPlus::MixChunk 2874DC::MixChunk
2434new (SV *class, CFPlus::RW rwops) 2875new (SV *class, DC::RW rwops)
2435 CODE: 2876 CODE:
2436 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2877 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437 OUTPUT: 2878 OUTPUT:
2438 RETVAL 2879 RETVAL
2439 2880
2440void 2881void
2441DESTROY (CFPlus::MixChunk self) 2882DESTROY (DC::MixChunk self)
2442 CODE: 2883 CODE:
2443 Mix_FreeChunk (self); 2884 Mix_FreeChunk (self);
2444 2885
2445int 2886int
2446volume (CFPlus::MixChunk self, int volume = -1) 2887volume (DC::MixChunk self, int volume = -1)
2447 CODE: 2888 CODE:
2448 if (items > 1) 2889 if (items > 1)
2449 volume = CLAMP (volume, 0, 128); 2890 volume = CLAMP (volume, 0, 128);
2450 RETVAL = Mix_VolumeChunk (self, volume); 2891 RETVAL = Mix_VolumeChunk (self, volume);
2451 OUTPUT: 2892 OUTPUT:
2452 RETVAL 2893 RETVAL
2453 2894
2454CFPlus::Channel 2895DC::Channel
2455play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2896play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2456 CODE: 2897 CODE:
2457{ 2898{
2458 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2899 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459 2900
2460 if (RETVAL < 0) 2901 if (RETVAL < 0)
… …
2467 } 2908 }
2468} 2909}
2469 OUTPUT: 2910 OUTPUT:
2470 RETVAL 2911 RETVAL
2471 2912
2472MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2913MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2473 2914
2474int 2915int
2475volume (int volume = -1) 2916volume (int volume = -1)
2476 PROTOTYPE: ;$ 2917 PROTOTYPE: ;$
2477 CODE: 2918 CODE:
… …
2489void 2930void
2490halt () 2931halt ()
2491 CODE: 2932 CODE:
2492 Mix_HaltMusic (); 2933 Mix_HaltMusic ();
2493 2934
2494CFPlus::MixMusic 2935DC::MixMusic
2495new (SV *class, CFPlus::RW rwops) 2936new (SV *class, DC::RW rwops)
2496 CODE: 2937 CODE:
2497 RETVAL = Mix_LoadMUS_RW (rwops); 2938 RETVAL = Mix_LoadMUS_RW (rwops);
2498 OUTPUT: 2939 OUTPUT:
2499 RETVAL 2940 RETVAL
2500 2941
2501void 2942void
2502DESTROY (CFPlus::MixMusic self) 2943DESTROY (DC::MixMusic self)
2503 CODE: 2944 CODE:
2504 Mix_FreeMusic (self); 2945 Mix_FreeMusic (self);
2505 2946
2506int 2947int
2507play (CFPlus::MixMusic self, int loops = -1) 2948play (DC::MixMusic self, int loops = -1)
2508 CODE: 2949 CODE:
2509 RETVAL = Mix_PlayMusic (self, loops); 2950 RETVAL = Mix_PlayMusic (self, loops);
2510 OUTPUT: 2951 OUTPUT:
2511 RETVAL 2952 RETVAL
2512 2953
2513void 2954void
2514fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2955fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515 CODE: 2956 CODE:
2516 Mix_FadeInMusicPos (self, loops, ms, position); 2957 Mix_FadeInMusicPos (self, loops, ms, position);
2517 2958
2518MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2959MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519 2960
2520PROTOTYPES: ENABLE 2961PROTOTYPES: ENABLE
2521 2962
2522BOOT: 2963BOOT:
2523{ 2964{
2524 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2965 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525 static const struct { 2966 static const struct {
2526 const char *name; 2967 const char *name;
2527 IV iv; 2968 IV iv;
2528 } *civ, const_iv[] = { 2969 } *civ, const_iv[] = {
2529# define const_iv(name) { # name, (IV)name } 2970# define const_iv(name) { # name, (IV)name }
2530 const_iv (GL_VENDOR), 2971 const_iv (GL_VENDOR),
2531 const_iv (GL_VERSION), 2972 const_iv (GL_VERSION),
2532 const_iv (GL_EXTENSIONS), 2973 const_iv (GL_EXTENSIONS),
2974 const_iv (GL_MAX_TEXTURE_UNITS),
2533 const_iv (GL_COLOR_MATERIAL), 2975 const_iv (GL_COLOR_MATERIAL),
2534 const_iv (GL_SMOOTH), 2976 const_iv (GL_SMOOTH),
2535 const_iv (GL_FLAT), 2977 const_iv (GL_FLAT),
2536 const_iv (GL_DITHER), 2978 const_iv (GL_DITHER),
2537 const_iv (GL_BLEND), 2979 const_iv (GL_BLEND),
… …
2549 const_iv (GL_ZERO), 2991 const_iv (GL_ZERO),
2550 const_iv (GL_SRC_ALPHA), 2992 const_iv (GL_SRC_ALPHA),
2551 const_iv (GL_DST_ALPHA), 2993 const_iv (GL_DST_ALPHA),
2552 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2994 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2553 const_iv (GL_ONE_MINUS_DST_ALPHA), 2995 const_iv (GL_ONE_MINUS_DST_ALPHA),
2996 const_iv (GL_SRC_COLOR),
2997 const_iv (GL_DST_COLOR),
2998 const_iv (GL_ONE_MINUS_SRC_COLOR),
2999 const_iv (GL_ONE_MINUS_DST_COLOR),
2554 const_iv (GL_SRC_ALPHA_SATURATE), 3000 const_iv (GL_SRC_ALPHA_SATURATE),
2555 const_iv (GL_RGB), 3001 const_iv (GL_RGB),
2556 const_iv (GL_RGBA), 3002 const_iv (GL_RGBA),
2557 const_iv (GL_RGBA4), 3003 const_iv (GL_RGBA4),
2558 const_iv (GL_RGBA8), 3004 const_iv (GL_RGBA8),
… …
2626 const_iv (GL_NICEST), 3072 const_iv (GL_NICEST),
2627 const_iv (GL_V2F), 3073 const_iv (GL_V2F),
2628 const_iv (GL_V3F), 3074 const_iv (GL_V3F),
2629 const_iv (GL_T2F_V3F), 3075 const_iv (GL_T2F_V3F),
2630 const_iv (GL_T2F_N3F_V3F), 3076 const_iv (GL_T2F_N3F_V3F),
3077 const_iv (GL_FUNC_ADD),
3078 const_iv (GL_FUNC_SUBTRACT),
3079 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2631# undef const_iv 3080# undef const_iv
2632 }; 3081 };
2633 3082
2634 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3083 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2635 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3084 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2642disable_GL_EXT_blend_func_separate () 3091disable_GL_EXT_blend_func_separate ()
2643 CODE: 3092 CODE:
2644 gl.BlendFuncSeparate = 0; 3093 gl.BlendFuncSeparate = 0;
2645 gl.BlendFuncSeparateEXT = 0; 3094 gl.BlendFuncSeparateEXT = 0;
2646 3095
3096void
3097apple_nvidia_bug (int enable)
3098
2647char * 3099char *
2648gl_vendor () 3100gl_vendor ()
2649 CODE: 3101 CODE:
2650 RETVAL = (char *)glGetString (GL_VENDOR); 3102 RETVAL = (char *)glGetString (GL_VENDOR);
2651 OUTPUT: 3103 OUTPUT:
… …
2700 3152
2701void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3153void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2702 CODE: 3154 CODE:
2703 gl_BlendFuncSeparate (sa, da, saa, daa); 3155 gl_BlendFuncSeparate (sa, da, saa, daa);
2704 3156
3157# void glBlendEquation (int se)
3158
2705void glDepthMask (int flag) 3159void glDepthMask (int flag)
2706 3160
2707void glLogicOp (int opcode) 3161void glLogicOp (int opcode)
2708 3162
2709void glColorMask (int red, int green, int blue, int alpha) 3163void glColorMask (int red, int green, int blue, int alpha)
… …
2743void glRotate (float angle, float x, float y, float z) 3197void glRotate (float angle, float x, float y, float z)
2744 CODE: 3198 CODE:
2745 glRotatef (angle, x, y, z); 3199 glRotatef (angle, x, y, z);
2746 3200
2747void glColor (float r, float g, float b, float a = 1.0) 3201void glColor (float r, float g, float b, float a = 1.0)
3202 PROTOTYPE: @
2748 ALIAS: 3203 ALIAS:
2749 glColor_premultiply = 1 3204 glColor_premultiply = 1
2750 CODE: 3205 CODE:
2751 if (ix) 3206 if (ix)
2752 { 3207 {
… …
2822void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3277void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2823 CODE: 3278 CODE:
2824 if (gl.SeparableFilter2D) 3279 if (gl.SeparableFilter2D)
2825 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3280 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826 3281
2827void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3282void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2828 3283
2829void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3284void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2830 3285
2831void glDrawPixels (int width, int height, int format, int type, char *pixels) 3286void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832 3287
… …
2858 3313
2859void glEndList () 3314void glEndList ()
2860 3315
2861void glCallList (int list) 3316void glCallList (int list)
2862 3317
2863MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3318void c_init ()
3319 CODE:
3320 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3321 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3322
3323MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864 3324
2865PROTOTYPES: DISABLE 3325PROTOTYPES: DISABLE
2866 3326
2867void 3327void
2868find_widget (SV *self, NV x, NV y) 3328find_widget (SV *self, NV x, NV y)
… …
2872 XPUSHs (self); 3332 XPUSHs (self);
2873} 3333}
2874 3334
2875BOOT: 3335BOOT:
2876{ 3336{
2877 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3337 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878 3338
2879 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3339 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2880 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3340 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2881 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3341 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2882 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3342 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2883} 3343}
2884 3344
2885void 3345void
2886draw (SV *self) 3346draw (SV *self)
2887 CODE: 3347 CODE:
… …
2894 SV *draw_w_sv = GvSV (draw_w_gv); 3354 SV *draw_w_sv = GvSV (draw_w_gv);
2895 SV *draw_h_sv = GvSV (draw_h_gv); 3355 SV *draw_h_sv = GvSV (draw_h_gv);
2896 double draw_x, draw_y; 3356 double draw_x, draw_y;
2897 3357
2898 if (!SvROK (self)) 3358 if (!SvROK (self))
2899 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3359 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900 3360
2901 hv = (HV *)SvRV (self); 3361 hv = (HV *)SvRV (self);
2902 3362
2903 if (SvTYPE (hv) != SVt_PVHV) 3363 if (SvTYPE (hv) != SVt_PVHV)
2904 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3364 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905 3365
2906 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3366 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2907 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3367 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2908 3368
2909 if (!h || !w) 3369 if (!h || !w)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines