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

Diff Legend

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