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.239 by root, Tue Dec 25 18:58:32 2007 UTC vs.
Revision 1.304 by root, Fri Apr 23 16:30:38 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),
… …
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),
624 765
766 const_iv (KMOD_LRAM),
767
625 const_iv (MIX_DEFAULT_FORMAT), 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)
626# undef const_iv 798# undef const_iv
627 }; 799 };
628 800
629 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; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
652 824
653IV minpot (UV n) 825IV minpot (UV n)
654 826
655IV popcount (UV n) 827IV popcount (UV n)
656 828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
834
657void 835void
658pango_init () 836pango_init ()
659 CODE: 837 CODE:
660{ 838{
661 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
662 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);
663 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
664} 847}
665 848
666char *
667SDL_GetError () 849char *SDL_GetError ()
668 850
669int 851void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 852
672void 853int SDL_Init (U32 flags)
854
855int SDL_InitSubSystem (U32 flags)
856
857void SDL_QuitSubSystem (U32 flags)
858
673SDL_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
674 869
675void 870void
676SDL_ListModes (int rgb, int alpha) 871SDL_ListModes (int rgb, int alpha)
677 PPCODE: 872 PPCODE:
678{ 873{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 888
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 891
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 893
702 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
703 while (*m) 895 while (*m)
704 { 896 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 897 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 898 {
707 AV *av = newAV (); 899 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 902 av_push (av, newSViv (rgb));
… …
738 930
739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#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);
741#include "glfunc.h" 933#include "glfunc.h"
742#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 938 }
744} 939}
745 OUTPUT: 940 OUTPUT:
746 RETVAL 941 RETVAL
747 942
… …
751char * 946char *
752SDL_GetKeyName (int sym) 947SDL_GetKeyName (int sym)
753 948
754int 949int
755SDL_GetAppState () 950SDL_GetAppState ()
951
952int
953SDL_GetModState ()
756 954
757void 955void
758poll_events () 956poll_events ()
759 PPCODE: 957 PPCODE:
760{ 958{
… …
770 { 968 {
771 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
772 case SDL_KEYUP: 970 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 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);
776 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 */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 976 break;
779 977
780 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 997 x = ev.motion.x;
800 y = ev.motion.y; 998 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1000 }
803 1001
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1008 }
811 break; 1009 break;
812 1010
813 case SDL_MOUSEBUTTONDOWN: 1011 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1012 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1013 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1014
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1015 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1016 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1017 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1018 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1023 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1024 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 1025 break;
828 } 1026 }
829 1027
830 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))));
831 } 1029 }
832} 1030}
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
833 1044
834int 1045int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1046Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
836 POSTCALL: 1047 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1048 Mix_HookMusicFinished (music_finished);
… …
894 } 1105 }
895 } 1106 }
896#endif 1107#endif
897} 1108}
898 1109
899void 1110int
900add_font (char *file) 1111add_font (char *file)
901 CODE: 1112 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1113 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1114 OUTPUT:
1115 RETVAL
903 1116
904void 1117void
905load_image_inline (SV *image_) 1118load_image_inline (SV *image_)
906 ALIAS: 1119 ALIAS:
907 load_image_file = 1 1120 load_image_file = 1
… …
993void 1206void
994error (char *message) 1207error (char *message)
995 CODE: 1208 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1209 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1210#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1211 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1212#endif
1000 1213
1001void 1214void
1002fatal (char *message) 1215fatal (char *message)
1003 CODE: 1216 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1217 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1218#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1219 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1220#endif
1008 _exit (1); 1221 _exit (1);
1009 1222
1010void 1223void
1011_exit (int retval = 0) 1224_exit (int retval = 0)
… …
1023#if DEBUG 1236#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1237 VALGRIND_DO_LEAK_CHECK;
1025#endif 1238#endif
1026} 1239}
1027 1240
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1241int
1242SvREFCNT (SV *sv)
1243 CODE:
1244 RETVAL = SvREFCNT (sv);
1245 OUTPUT:
1246 RETVAL
1247
1248MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1249
1030PROTOTYPES: DISABLE 1250PROTOTYPES: DISABLE
1031 1251
1032CFPlus::Font 1252DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1253new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1254 CODE:
1035{ 1255{
1036 int count; 1256 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1257 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
1040} 1260}
1041 OUTPUT: 1261 OUTPUT:
1042 RETVAL 1262 RETVAL
1043 1263
1044void 1264void
1045DESTROY (CFPlus::Font self) 1265DESTROY (DC::Font self)
1046 CODE: 1266 CODE:
1047 pango_font_description_free (self); 1267 pango_font_description_free (self);
1048 1268
1049void 1269void
1050make_default (CFPlus::Font self) 1270make_default (DC::Font self)
1051 PROTOTYPE: $ 1271 PROTOTYPE: $
1052 CODE: 1272 CODE:
1053 default_font = self; 1273 default_font = self;
1054 1274
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1275MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1276
1057PROTOTYPES: DISABLE 1277PROTOTYPES: DISABLE
1058 1278
1059void 1279void
1060glyph_cache_backup () 1280glyph_cache_backup ()
… …
1066glyph_cache_restore () 1286glyph_cache_restore ()
1067 PROTOTYPE: 1287 PROTOTYPE:
1068 CODE: 1288 CODE:
1069 tc_restore (); 1289 tc_restore ();
1070 1290
1071CFPlus::Layout 1291DC::Layout
1072new (SV *class) 1292new (SV *class)
1073 CODE: 1293 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1294 New (0, RETVAL, 1, struct cf_layout);
1075 1295
1076 RETVAL->pl = pango_layout_new (opengl_context); 1296 RETVAL->pl = pango_layout_new (opengl_context);
… …
1086 layout_update_font (RETVAL); 1306 layout_update_font (RETVAL);
1087 OUTPUT: 1307 OUTPUT:
1088 RETVAL 1308 RETVAL
1089 1309
1090void 1310void
1091DESTROY (CFPlus::Layout self) 1311DESTROY (DC::Layout self)
1092 CODE: 1312 CODE:
1093 g_object_unref (self->pl); 1313 g_object_unref (self->pl);
1094 rc_free (self->rc); 1314 rc_free (self->rc);
1095 Safefree (self); 1315 Safefree (self);
1096 1316
1097void 1317void
1098set_text (CFPlus::Layout self, SV *text_) 1318set_text (DC::Layout self, SV *text_)
1099 CODE: 1319 CODE:
1100{ 1320{
1101 STRLEN textlen; 1321 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1322 char *text = SvPVutf8 (text_, textlen);
1103 1323
1104 pango_layout_set_text (self->pl, text, textlen); 1324 pango_layout_set_text (self->pl, text, textlen);
1105} 1325}
1106 1326
1107void 1327void
1108set_markup (CFPlus::Layout self, SV *text_) 1328set_markup (DC::Layout self, SV *text_)
1109 CODE: 1329 CODE:
1110{ 1330{
1111 STRLEN textlen; 1331 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1332 char *text = SvPVutf8 (text_, textlen);
1113 1333
1114 pango_layout_set_markup (self->pl, text, textlen); 1334 pango_layout_set_markup (self->pl, text, textlen);
1115} 1335}
1116 1336
1117void 1337void
1118set_shapes (CFPlus::Layout self, ...) 1338set_shapes (DC::Layout self, ...)
1119 CODE: 1339 CODE:
1120{ 1340{
1121 PangoAttrList *attrs = 0; 1341 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1342 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1343 const char *pos = text;
… …
1158 if (attrs) 1378 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1379 pango_layout_set_attributes (self->pl, attrs);
1160} 1380}
1161 1381
1162void 1382void
1163get_shapes (CFPlus::Layout self) 1383get_shapes (DC::Layout self)
1164 PPCODE: 1384 PPCODE:
1165{ 1385{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1386 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1387
1168 do 1388 do
1169 { 1389 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1390 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1391
1172 if (run && shape_attr_p (run)) 1392 if (run && shape_attr_p (run))
1173 { 1393 {
1174 PangoRectangle extents; 1394 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1395 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1183 1403
1184 pango_layout_iter_free (iter); 1404 pango_layout_iter_free (iter);
1185} 1405}
1186 1406
1187int 1407int
1188has_wrapped (CFPlus::Layout self) 1408has_wrapped (DC::Layout self)
1189 CODE: 1409 CODE:
1190{ 1410{
1191 int lines = 1; 1411 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1412 const char *text = pango_layout_get_text (self->pl);
1193 1413
… …
1198} 1418}
1199 OUTPUT: 1419 OUTPUT:
1200 RETVAL 1420 RETVAL
1201 1421
1202SV * 1422SV *
1203get_text (CFPlus::Layout self) 1423get_text (DC::Layout self)
1204 CODE: 1424 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1425 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1426 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1427 OUTPUT:
1208 RETVAL 1428 RETVAL
1209 1429
1210void 1430void
1211set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1431set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1212 CODE: 1432 CODE:
1213 self->r = r; 1433 self->r = r;
1214 self->g = g; 1434 self->g = g;
1215 self->b = b; 1435 self->b = b;
1216 self->a = a; 1436 self->a = a;
1217 1437
1218void 1438void
1219set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1439set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1440 CODE:
1221 if (self->font != font) 1441 if (self->font != font)
1222 { 1442 {
1223 self->font = font; 1443 self->font = font;
1224 layout_update_font (self); 1444 layout_update_font (self);
1225 } 1445 }
1226 1446
1227void 1447void
1228set_height (CFPlus::Layout self, int base_height) 1448set_height (DC::Layout self, int base_height)
1229 CODE: 1449 CODE:
1230 if (self->base_height != base_height) 1450 if (self->base_height != base_height)
1231 { 1451 {
1232 self->base_height = base_height; 1452 self->base_height = base_height;
1233 layout_update_font (self); 1453 layout_update_font (self);
1234 } 1454 }
1235 1455
1236void 1456void
1237set_width (CFPlus::Layout self, int max_width = -1) 1457set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1458 CODE:
1239 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1459 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1240 1460
1241void 1461void
1242set_indent (CFPlus::Layout self, int indent) 1462set_indent (DC::Layout self, int indent)
1243 CODE: 1463 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1464 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1465
1246void 1466void
1247set_spacing (CFPlus::Layout self, int spacing) 1467set_spacing (DC::Layout self, int spacing)
1248 CODE: 1468 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1469 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1470
1251void 1471void
1252set_ellipsise (CFPlus::Layout self, int ellipsise) 1472set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1473 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1474 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1475 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1476 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1477 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1478 : PANGO_ELLIPSIZE_NONE
1259 ); 1479 );
1260 1480
1261void 1481void
1262set_single_paragraph_mode (CFPlus::Layout self, int spm) 1482set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1483 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1484 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1485
1266void 1486void
1267size (CFPlus::Layout self) 1487size (DC::Layout self)
1268 PPCODE: 1488 PPCODE:
1269{ 1489{
1270 int w, h; 1490 int w, h;
1271 1491
1272 layout_get_pixel_size (self, &w, &h); 1492 layout_get_pixel_size (self, &w, &h);
… …
1275 PUSHs (sv_2mortal (newSViv (w))); 1495 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1496 PUSHs (sv_2mortal (newSViv (h)));
1277} 1497}
1278 1498
1279int 1499int
1280descent (CFPlus::Layout self) 1500descent (DC::Layout self)
1281 CODE: 1501 CODE:
1282{ 1502{
1283 PangoRectangle rect; 1503 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1504 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1505 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1506 RETVAL = PANGO_DESCENT (rect);
1287} 1507}
1288 OUTPUT: 1508 OUTPUT:
1289 RETVAL 1509 RETVAL
1290 1510
1291int 1511int
1292xy_to_index (CFPlus::Layout self, int x, int y) 1512xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1513 CODE:
1294{ 1514{
1295 int index, trailing; 1515 int index, trailing;
1296 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1516 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1297 RETVAL = index + trailing; 1517 RETVAL = index + trailing;
1298} 1518}
1299 OUTPUT: 1519 OUTPUT:
1300 RETVAL 1520 RETVAL
1301 1521
1302void 1522void
1303cursor_pos (CFPlus::Layout self, int index) 1523cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1524 PPCODE:
1305{ 1525{
1306 PangoRectangle strong_pos; 1526 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1527 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1528
1309 EXTEND (SP, 3); 1529 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1530 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1531 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1532 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1533}
1314 1534
1315void 1535void
1316index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1536index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1537 PPCODE:
1318{ 1538{
1319 int line, x; 1539 int line, x;
1320 1540
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1541 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1542#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1543 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1544 --line;
1545#endif
1324 EXTEND (SP, 2); 1546 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1547 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1548 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1549}
1328 1550
1329void 1551void
1330line_x_to_index (CFPlus::Layout self, int line, int x) 1552line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1553 PPCODE:
1332{ 1554{
1333 PangoLayoutLine *lp; 1555 PangoLayoutLine *lp;
1334 int index, trailing; 1556 int index, trailing;
1335 1557
1336 if (line < 0) 1558 if (line < 0)
1337 XSRETURN_EMPTY; 1559 XSRETURN_EMPTY;
1338 1560
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1561 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1562 XSRETURN_EMPTY; /* do better */
1341 1563
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1564 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1565
1344 EXTEND (SP, 2); 1566 EXTEND (SP, 2);
… …
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1572 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1573 }
1352} 1574}
1353 1575
1354void 1576void
1355render (CFPlus::Layout self, float x, float y, int flags = 0) 1577render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1578 CODE:
1357 rc_clear (self->rc); 1579 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1580 pango_opengl_render_layout_subpixel (
1359 self->pl, 1581 self->pl,
1360 self->rc, 1582 self->rc,
… …
1365 // we assume that context_change actually clears/frees stuff 1587 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1588 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1589 pango_layout_context_changed (self->pl);
1368 1590
1369void 1591void
1370draw (CFPlus::Layout self) 1592draw (DC::Layout self)
1371 CODE: 1593 CODE:
1372{ 1594{
1373 glEnable (GL_TEXTURE_2D); 1595 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1596 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1597 glEnable (GL_BLEND);
… …
1383 glDisable (GL_ALPHA_TEST); 1605 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1606 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1607 glDisable (GL_TEXTURE_2D);
1386} 1608}
1387 1609
1388MODULE = CFPlus PACKAGE = CFPlus::Texture 1610MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1611
1390PROTOTYPES: ENABLE 1612PROTOTYPES: ENABLE
1391 1613
1392void 1614void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1615pad (SV *data_, int ow, int oh, int nw, int nh)
… …
1461 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1462 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1463 } 1685 }
1464} 1686}
1465 1687
1688void
1689draw_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)
1690 PROTOTYPE: @
1691 CODE:
1692{
1693 glEnable (GL_BLEND);
1694 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1695 glEnable (GL_TEXTURE_2D);
1696 glBindTexture (GL_TEXTURE_2D, name1);
1697
1698 glColor3f (intensity, intensity, intensity);
1699 glPushMatrix ();
1700 glScalef (1./3, 1./3, 1.);
1701
1702 if (blend > 0.f)
1703 {
1704 float dx3 = dx * -3.f / w;
1705 float dy3 = dy * -3.f / h;
1706 GLfloat env_color[4] = { 0., 0., 0., blend };
1707
1708 /* interpolate the two shadow textures */
1709 /* stage 0 == rgb(glcolor) + alpha(t0) */
1710 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1711
1712 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1713 gl.ActiveTexture (GL_TEXTURE1);
1714 glEnable (GL_TEXTURE_2D);
1715 glBindTexture (GL_TEXTURE_2D, name2);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1717
1718 /* rgb == rgb(glcolor) */
1719 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1720 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1721 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1722
1723 /* alpha = interpolate t0, t1 by env_alpha */
1724 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1725
1726 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1727 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1728 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1729
1730 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1731 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1732
1733 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1734 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1735
1736 glBegin (GL_QUADS);
1737 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1738 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1739 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1740 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1741 glEnd ();
1742
1743 glDisable (GL_TEXTURE_2D);
1744 gl.ActiveTexture (GL_TEXTURE0);
1745 }
1746 else
1747 {
1748 /* simple blending of one texture, also opengl <1.3 path */
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1750
1751 glBegin (GL_QUADS);
1752 glTexCoord2f (0, 0); glVertex2f (0, 0);
1753 glTexCoord2f (0, t); glVertex2f (0, h);
1754 glTexCoord2f (s, t); glVertex2f (w, h);
1755 glTexCoord2f (s, 0); glVertex2f (w, 0);
1756 glEnd ();
1757 }
1758
1759 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1760 {
1761 int x, y;
1762 int dx3 = dx * 3;
1763 int dy3 = dy * 3;
1764
1765 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1766 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1767 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1768 glTranslatef (-1., -1., 0);
1769 glBegin (GL_QUADS);
1770
1771 for (y = 1; y < h; y += 3)
1772 {
1773 int y1 = y - dy3;
1774 int y1valid = y1 >= 0 && y1 < h;
1775
1776 for (x = 1; x < w; x += 3)
1777 {
1778 int x1 = x - dx3;
1779 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1780 uint8_t h2;
1781
1782 if (y1valid && x1 >= 0 && x1 < w)
1783 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1784 else
1785 h2 = 1; /* out of range == invisible */
1786
1787 if (h1 || h2)
1788 {
1789 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1790 glColor4f (1., 1., 1., alpha);
1791
1792 glTexCoord2f (0, 0.); glVertex2i (x , y );
1793 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1794 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1795 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1796 }
1797 }
1798 }
1799 }
1800
1801 glEnd ();
1802
1803 glPopMatrix ();
1804
1805 glDisable (GL_TEXTURE_2D);
1806 glDisable (GL_BLEND);
1807}
1808
1466IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1809IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1467 CODE: 1810 CODE:
1468{ 1811{
1469 GLint width; 1812 GLint width;
1470 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1813 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1472 RETVAL = width > 0; 1815 RETVAL = width > 0;
1473} 1816}
1474 OUTPUT: 1817 OUTPUT:
1475 RETVAL 1818 RETVAL
1476 1819
1477MODULE = CFPlus PACKAGE = CFPlus::Map 1820MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1821
1479PROTOTYPES: DISABLE 1822PROTOTYPES: DISABLE
1480 1823
1481CFPlus::Map 1824DC::Map
1482new (SV *class) 1825new (SV *class)
1483 CODE: 1826 CODE:
1484 New (0, RETVAL, 1, struct map); 1827 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1828 RETVAL->x = 0;
1486 RETVAL->y = 0; 1829 RETVAL->y = 0;
… …
1494 RETVAL->row = 0; 1837 RETVAL->row = 0;
1495 OUTPUT: 1838 OUTPUT:
1496 RETVAL 1839 RETVAL
1497 1840
1498void 1841void
1499DESTROY (CFPlus::Map self) 1842DESTROY (DC::Map self)
1500 CODE: 1843 CODE:
1501{ 1844{
1502 map_clear (self); 1845 map_clear (self);
1503 Safefree (self->face2tile); 1846 Safefree (self->face2tile);
1504 Safefree (self->tex); 1847 Safefree (self->tex);
1505 Safefree (self); 1848 Safefree (self);
1506} 1849}
1507 1850
1508void 1851void
1509resize (CFPlus::Map self, int map_width, int map_height) 1852resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1853 CODE:
1511 self->w = map_width; 1854 self->w = map_width;
1512 self->h = map_height; 1855 self->h = map_height;
1513 1856
1514void 1857void
1515clear (CFPlus::Map self) 1858clear (DC::Map self)
1516 CODE: 1859 CODE:
1517 map_clear (self); 1860 map_clear (self);
1518 1861
1519void 1862void
1520set_tileid (CFPlus::Map self, int face, int tile) 1863set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1864 CODE:
1522{ 1865{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1866 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1867 need_texid (self, tile);
1525} 1868}
1526 1869
1527void 1870void
1528set_smooth (CFPlus::Map self, int face, int smooth, int level) 1871set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1872 CODE:
1530{ 1873{
1531 tileid texid; 1874 tileid texid;
1532 maptex *tex; 1875 maptex *tex;
1533 1876
… …
1546 tex->smoothtile = self->face2tile [smooth]; 1889 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1890 tex->smoothlevel = level;
1548} 1891}
1549 1892
1550void 1893void
1551set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1894set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1552 CODE: 1895 CODE:
1553{ 1896{
1554 need_texid (self, texid); 1897 need_texid (self, texid);
1555 1898
1556 { 1899 {
… …
1575 // use uglier nearest interpolation because linear suffers 1918 // use uglier nearest interpolation because linear suffers
1576 // from transparent color bleeding and ugly wrapping effects. 1919 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1920 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1921}
1579 1922
1923void
1924expire_textures (DC::Map self, int texid, int count)
1925 PPCODE:
1926 for (; texid < self->texs && count; ++texid, --count)
1927 {
1928 maptex *tex = self->tex + texid;
1929
1930 if (tex->name)
1931 {
1932 if (tex->unused)
1933 {
1934 tex->name = 0;
1935 tex->unused = 0;
1936 XPUSHs (sv_2mortal (newSViv (texid)));
1937 }
1938 else
1939 tex->unused = 1;
1940 }
1941 }
1942
1580int 1943int
1581ox (CFPlus::Map self) 1944ox (DC::Map self)
1582 ALIAS: 1945 ALIAS:
1583 oy = 1 1946 oy = 1
1584 x = 2 1947 x = 2
1585 y = 3 1948 y = 3
1586 w = 4 1949 w = 4
… …
1597 } 1960 }
1598 OUTPUT: 1961 OUTPUT:
1599 RETVAL 1962 RETVAL
1600 1963
1601void 1964void
1602scroll (CFPlus::Map self, int dx, int dy) 1965scroll (DC::Map self, int dx, int dy)
1603 CODE: 1966 CODE:
1604{ 1967{
1605 if (dx > 0) 1968 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 1969 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 1970 else if (dx < 0)
… …
1623 self->y += MAP_EXTEND_Y; 1986 self->y += MAP_EXTEND_Y;
1624 } 1987 }
1625} 1988}
1626 1989
1627SV * 1990SV *
1628map1a_update (CFPlus::Map self, SV *data_, int extmap) 1991map1a_update (DC::Map self, SV *data_, int extmap)
1629 CODE: 1992 CODE:
1630{ 1993{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1994 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 1995 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 1996 mapcell *cell;
… …
1661 uint8_t ext, cmd; 2024 uint8_t ext, cmd;
1662 2025
1663 do 2026 do
1664 { 2027 {
1665 ext = *data++; 2028 ext = *data++;
1666 cmd = ext & 0x3f; 2029 cmd = ext & 0x7f;
1667 2030
1668 if (cmd < 4) 2031 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 2032 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1670 else if (cmd == 5) // health 2033 else if (cmd == 5) // health
1671 { 2034 {
1672 cell->stat_width = 1; 2035 cell->stat_width = 1;
1673 cell->stat_hp = *data++; 2036 cell->stat_hp = *data++;
1674 } 2037 }
1675 else if (cmd == 6) // monster width 2038 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 2039 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 2040 else if (cmd == 0x47)
1678 { 2041 {
1679 if (*data == 4) 2042 if (*data == 1) cell->player = data [1];
1680 ; // decode player count 2043 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2044 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2045 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681 2046
1682 data += *data + 1; 2047 data += *data + 1;
1683 } 2048 }
1684 else if (cmd == 8) // cell flags 2049 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 2050 cell->flags = *data++;
… …
1702 cell->tile [z] = self->face2tile [face]; 2067 cell->tile [z] = self->face2tile [face];
1703 2068
1704 if (cell->tile [z]) 2069 if (cell->tile [z])
1705 { 2070 {
1706 maptex *tex = self->tex + cell->tile [z]; 2071 maptex *tex = self->tex + cell->tile [z];
2072 tex->unused = 0;
1707 if (!tex->name) 2073 if (!tex->name)
1708 av_push (missing, newSViv (cell->tile [z])); 2074 av_push (missing, newSViv (cell->tile [z]));
1709 2075
1710 if (tex->smoothtile) 2076 if (tex->smoothtile)
1711 { 2077 {
1712 maptex *smooth = self->tex + tex->smoothtile; 2078 maptex *smooth = self->tex + tex->smoothtile;
2079 smooth->unused = 0;
1713 if (!smooth->name) 2080 if (!smooth->name)
1714 av_push (missing, newSViv (tex->smoothtile)); 2081 av_push (missing, newSViv (tex->smoothtile));
1715 } 2082 }
1716 } 2083 }
1717 } 2084 }
1718 } 2085 }
1719 else 2086 else
1720 cell->darkness = 0; 2087 CELL_CLEAR (cell);
1721 } 2088 }
1722} 2089}
1723 OUTPUT: 2090 OUTPUT:
1724 RETVAL 2091 RETVAL
1725 2092
1726SV * 2093SV *
1727mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2094mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 2095 CODE:
1729{ 2096{
1730 int x1, x; 2097 int x1, x;
1731 int y1, y; 2098 int y1, y;
1732 int z; 2099 int z;
… …
1777} 2144}
1778 OUTPUT: 2145 OUTPUT:
1779 RETVAL 2146 RETVAL
1780 2147
1781void 2148void
1782draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2149draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1783 CODE: 2150 CODE:
1784{ 2151{
1785 int x, y, z; 2152 int x, y, z;
1786 2153
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2154 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2155 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1789 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2156 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790 smooth_key skey; 2157 smooth_key skey;
1791 2158 int pl_x, pl_y;
2159 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 2160 rc_t *rc = rc_alloc ();
2161 rc_t *rc_ov = rc_alloc ();
1793 rc_key_t key; 2162 rc_key_t key;
1794 rc_array_t *arr; 2163 rc_array_t *arr;
1795 2164
2165 pl_tex.name = 0;
2166
1796 // thats current max. sorry. 2167 // that's current max. sorry.
1797 if (sw > 255) sw = 255; 2168 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 2169 if (sh > 255) sh = 255;
1799 2170
1800 // clear key, in case of extra padding 2171 // clear key, in case of extra padding
1801 memset (&skey, 0, sizeof (skey)); 2172 memset (&skey, 0, sizeof (skey));
… …
1805 key.g = 255; 2176 key.g = 255;
1806 key.b = 255; 2177 key.b = 255;
1807 key.a = 255; 2178 key.a = 255;
1808 key.mode = GL_QUADS; 2179 key.mode = GL_QUADS;
1809 key.format = GL_T2F_V3F; 2180 key.format = GL_T2F_V3F;
1810 key.texname = -1;
1811 2181
1812 mx += self->x; 2182 mx += self->x;
1813 my += self->y; 2183 my += self->y;
1814 2184
1815 // first pass: determine smooth_max 2185 // first pass: determine smooth_max
… …
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2209 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1840 2210
1841 for (z = 0; z <= 2; z++) 2211 for (z = 0; z <= 2; z++)
1842 { 2212 {
1843 memset (smooth_level, 0, sizeof (smooth_level)); 2213 memset (smooth_level, 0, sizeof (smooth_level));
2214 key.texname = -1;
1844 2215
1845 for (y = 0; y < sh; y++) 2216 for (y = 0; y < sh; y++)
1846 if (0 <= y + my && y + my < self->rows) 2217 if (0 <= y + my && y + my < self->rows)
1847 { 2218 {
1848 maprow *row = self->row + (y + my); 2219 maprow *row = self->row + (y + my);
… …
1858 maptex tex = self->tex [tile]; 2229 maptex tex = self->tex [tile];
1859 int px, py; 2230 int px, py;
1860 2231
1861 if (key.texname != tex.name) 2232 if (key.texname != tex.name)
1862 { 2233 {
2234 self->tex [tile].unused = 0;
2235
1863 if (!tex.name) 2236 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2237 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1865 2238
1866 key.texname = tex.name; 2239 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2240 arr = rc_array (rc, &key);
1868 } 2241 }
1869 2242
1870 px = (x + 1) * T - tex.w; 2243 px = (x + 1) * T - tex.w;
1871 py = (y + 1) * T - tex.h; 2244 py = (y + 1) * T - tex.h;
2245
2246 if (expect_false (cell->player == player) && expect_false (z == 2))
2247 {
2248 pl_x = px;
2249 pl_y = py;
2250 pl_tex = tex;
2251 continue;
2252 }
1872 2253
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2254 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2255 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1875 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2256 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1876 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2257 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877
1878 if (cell->flags && z == 2)
1879 {
1880 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1)
1882 {
1883 maptex tex = self->tex [1];
1884 int px = x * T + T * 2 / 32;
1885 int py = y * T - T * 6 / 32;
1886
1887 if (tex.name)
1888 {
1889 if (key.texname != tex.name)
1890 {
1891 key.texname = tex.name;
1892 arr = rc_array (rc, &key);
1893 }
1894
1895 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1896 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1897 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1898 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1899 }
1900 }
1901 }
1902 2258
1903 // update smooth hash 2259 // update smooth hash
1904 if (tex.smoothtile) 2260 if (tex.smoothtile)
1905 { 2261 {
1906 skey.tile = tex.smoothtile; 2262 skey.tile = tex.smoothtile;
… …
1935 // corners 2291 // corners
1936 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2292 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1937 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2293 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1938 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2294 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1939 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2295 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2296 }
2297 }
2298
2299 if (expect_false (z == 2) && expect_false (cell->flags))
2300 {
2301 // overlays such as the speech bubble, probably more to come
2302 if (cell->flags & 1)
2303 {
2304 rc_key_t key_ov = key;
2305 maptex tex = self->tex [TEXID_SPEECH];
2306 rc_array_t *arr;
2307 int px = x * T + T * 2 / 32;
2308 int py = y * T - T * 6 / 32;
2309
2310 key_ov.texname = tex.name;
2311 arr = rc_array (rc_ov, &key_ov);
2312
2313 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2314 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2315 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2316 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1940 } 2317 }
1941 } 2318 }
1942 } 2319 }
1943 } 2320 }
1944 2321
… …
1984 { 2361 {
1985 // this time avoiding texture state changes 2362 // this time avoiding texture state changes
1986 // save gobs of state changes. 2363 // save gobs of state changes.
1987 if (key.texname != tex.name) 2364 if (key.texname != tex.name)
1988 { 2365 {
2366 self->tex [skey->tile].unused = 0;
2367
1989 glEnd (); 2368 glEnd ();
1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2369 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1991 glBegin (GL_QUADS); 2370 glBegin (GL_QUADS);
1992 } 2371 }
1993 2372
… …
2022 } 2401 }
2023 2402
2024 hv_clear (smooth); 2403 hv_clear (smooth);
2025 } 2404 }
2026 2405
2406 if (pl_tex.name)
2407 {
2408 maptex tex = pl_tex;
2409 int px = pl_x + sdx;
2410 int py = pl_y + sdy;
2411
2412 key.texname = tex.name;
2413 arr = rc_array (rc, &key);
2414
2415 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2416 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2417 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2418 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2419
2420 rc_draw (rc);
2421 }
2422
2423 rc_draw (rc_ov);
2424 rc_clear (rc_ov);
2425
2027 glDisable (GL_BLEND); 2426 glDisable (GL_BLEND);
2028 rc_free (rc); 2427 rc_free (rc);
2428 rc_free (rc_ov);
2029 2429
2030 // top layer: overlays such as the health bar 2430 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2431 for (y = 0; y < sh; y++)
2032 if (0 <= y + my && y + my < self->rows) 2432 if (0 <= y + my && y + my < self->rows)
2033 { 2433 {
… …
2038 { 2438 {
2039 mapcell *cell = row->col + (x + mx - row->c0); 2439 mapcell *cell = row->col + (x + mx - row->c0);
2040 2440
2041 int px = x * T; 2441 int px = x * T;
2042 int py = y * T; 2442 int py = y * T;
2443
2444 if (expect_false (cell->player == player))
2445 {
2446 px += sdx;
2447 py += sdy;
2448 }
2043 2449
2044 if (cell->stat_hp) 2450 if (cell->stat_hp)
2045 { 2451 {
2046 int width = cell->stat_width * T; 2452 int width = cell->stat_width * T;
2047 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2453 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2058 } 2464 }
2059 } 2465 }
2060} 2466}
2061 2467
2062void 2468void
2063draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2469draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2064 CODE: 2470 CODE:
2065{ 2471{
2066 static float color[16][3] = { 2472 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2473 { 0.00f, 0.00f, 0.00f },
2068 { 1.00F, 1.00F, 1.00F }, 2474 { 1.00f, 1.00f, 1.00f },
2069 { 0.00F, 0.00F, 0.55F }, 2475 { 0.00f, 0.00f, 0.55f },
2070 { 1.00F, 0.00F, 0.00F }, 2476 { 1.00f, 0.00f, 0.00f },
2071 2477
2072 { 1.00F, 0.54F, 0.00F }, 2478 { 1.00f, 0.54f, 0.00f },
2073 { 0.11F, 0.56F, 1.00F }, 2479 { 0.11f, 0.56f, 1.00f },
2074 { 0.93F, 0.46F, 0.00F }, 2480 { 0.93f, 0.46f, 0.00f },
2075 { 0.18F, 0.54F, 0.34F }, 2481 { 0.18f, 0.54f, 0.34f },
2076 2482
2077 { 0.56F, 0.73F, 0.56F }, 2483 { 0.56f, 0.73f, 0.56f },
2078 { 0.80F, 0.80F, 0.80F }, 2484 { 0.80f, 0.80f, 0.80f },
2079 { 0.55F, 0.41F, 0.13F }, 2485 { 0.55f, 0.41f, 0.13f },
2080 { 0.99F, 0.77F, 0.26F }, 2486 { 0.99f, 0.77f, 0.26f },
2081 2487
2082 { 0.74F, 0.65F, 0.41F }, 2488 { 0.74f, 0.65f, 0.41f },
2083 2489
2084 { 0.00F, 1.00F, 1.00F }, 2490 { 0.00f, 1.00f, 1.00f },
2085 { 1.00F, 0.00F, 1.00F }, 2491 { 1.00f, 0.00f, 1.00f },
2086 { 1.00F, 1.00F, 0.00F }, 2492 { 1.00f, 1.00f, 0.00f },
2087 }; 2493 };
2088 2494
2089 int x, y; 2495 int x, y;
2090 2496
2091 glEnable (GL_TEXTURE_2D); 2497 glEnable (GL_TEXTURE_2D);
2498 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2499 * but the nvidia driver (185.18.14) mishandles alpha textures
2500 * and takes the colour from god knows where instead of using
2501 * Cp. MODULATE results in the same colour, but slightly different
2502 * alpha, but atcually gives us the correct colour with nvidia.
2503 */
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2504 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2093 glEnable (GL_BLEND); 2505 glEnable (GL_BLEND);
2094 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2506 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2095 glBegin (GL_QUADS); 2507 glBegin (GL_QUADS);
2096 2508
2097 for (y = 0; y < h; y++) 2509 for (y = 0; y < h; y++)
… …
2101 2513
2102 if (m) 2514 if (m)
2103 { 2515 {
2104 float *c = color [m & 15]; 2516 float *c = color [m & 15];
2105 2517
2106 float tx1 = m & 0x40 ? 0.5 : 0.; 2518 float tx1 = m & 0x40 ? 0.5f : 0.f;
2107 float tx2 = tx1 + 0.5; 2519 float tx2 = tx1 + 0.5f;
2108 2520
2109 glColor4f (c[0], c[1], c[2], 0.75); 2521 glColor4f (c[0], c[1], c[2], 1);
2110 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2522 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2111 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2523 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2112 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2524 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2113 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2525 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2114 } 2526 }
… …
2118 glDisable (GL_BLEND); 2530 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2531 glDisable (GL_TEXTURE_2D);
2120} 2532}
2121 2533
2122void 2534void
2123fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2535fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124 PPCODE: 2536 PPCODE:
2125{ 2537{
2126 int x, y; 2538 int x, y;
2127 int sw1 = sw + 2; 2539 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2540 int sh1 = sh + 2;
2129 int sh3 = sh * 3; 2541 int sh3 = sh * 3;
2130 int sw34 = (sw * 3 + 3) & ~3; 2542 int sw3 = sw * 3;
2131 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2543 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2132 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2544 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2133 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2545 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2134 2546
2135 SvPOK_only (darkness3_sv); 2547 SvPOK_only (darkness3_sv);
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2548 SvCUR_set (darkness3_sv, sw3 * sh3);
2137 2549
2138 mx += self->x - 1; 2550 mx += self->x - 1;
2139 my += self->y - 1; 2551 my += self->y - 1;
2140
2141 memset (darkness1, 255, sw1 * sh1);
2142 2552
2143 for (y = 0; y < sh1; y++) 2553 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2554 if (0 <= y + my && y + my < self->rows)
2145 { 2555 {
2146 maprow *row = self->row + (y + my); 2556 maprow *row = self->row + (y + my);
… …
2149 if (row->c0 <= x + mx && x + mx < row->c1) 2559 if (row->c0 <= x + mx && x + mx < row->c1)
2150 { 2560 {
2151 mapcell *cell = row->col + (x + mx - row->c0); 2561 mapcell *cell = row->col + (x + mx - row->c0);
2152 2562
2153 darkness1 [y * sw1 + x] = cell->darkness 2563 darkness1 [y * sw1 + x] = cell->darkness
2154 ? 255 - (cell->darkness - 1) 2564 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2155 : 255 - FOW_DARKNESS; 2565 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2156 } 2566 }
2157 } 2567 }
2158 2568
2159 for (y = 0; y < sh; ++y) 2569 for (y = 0; y < sh; ++y)
2160 for (x = 0; x < sw; ++x) 2570 for (x = 0; x < sw; ++x)
… …
2179 2589
2180 uint8_t r13 = (d13 + d23 + d12) / 3; 2590 uint8_t r13 = (d13 + d23 + d12) / 3;
2181 uint8_t r23 = d23; 2591 uint8_t r23 = d23;
2182 uint8_t r33 = (d23 + d33 + d32) / 3; 2592 uint8_t r33 = (d23 + d33 + d32) / 3;
2183 2593
2184 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2594 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2185 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2595 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2186 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2596 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2187 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2597 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2188 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2598 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2189 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2599 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2190 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2600 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2191 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2601 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2192 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2602 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2193 } 2603 }
2194 2604
2195 free (darkness1); 2605 free (darkness1);
2196 2606
2197 EXTEND (SP, 3); 2607 EXTEND (SP, 3);
2198 PUSHs (sv_2mortal (newSViv (sw34))); 2608 PUSHs (sv_2mortal (newSViv (sw3)));
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2609 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2610 PUSHs (darkness3_sv);
2201} 2611}
2202 2612
2203SV * 2613SV *
2204get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2614get_rect (DC::Map self, int x0, int y0, int w, int h)
2205 CODE: 2615 CODE:
2206{ 2616{
2207 int x, y, x1, y1; 2617 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2618 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2619 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2266 else 2676 else
2267 *data++ = 0; 2677 *data++ = 0;
2268 } 2678 }
2269 } 2679 }
2270 2680
2681 /* if size is w*h + 5 then no data has been found */
2682 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2683 {
2271 SvPOK_only (data_sv); 2684 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2685 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2686 }
2687
2273 RETVAL = data_sv; 2688 RETVAL = data_sv;
2274} 2689}
2275 OUTPUT: 2690 OUTPUT:
2276 RETVAL 2691 RETVAL
2277 2692
2278void 2693void
2279set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2694set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2695 PPCODE:
2281{ 2696{
2282 int x, y, z; 2697 int x, y, z;
2283 int w, h; 2698 int w, h;
2284 int x1, y1; 2699 int x1, y1;
2700 STRLEN len;
2701 uint8_t *data, *end;
2702
2703 len = SvLEN (data_sv);
2704 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2705 data = SvPVbyte_nolen (data_sv);
2706 end = data + len + 8;
2707
2708 if (len < 5)
2709 XSRETURN_EMPTY;
2285 2710
2286 if (*data++ != 0) 2711 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2712 XSRETURN_EMPTY; /* version mismatch */
2288 2713
2289 w = *data++ << 8; w |= *data++; 2714 w = *data++ << 8; w |= *data++;
… …
2304 { 2729 {
2305 maprow *row = map_get_row (self, y); 2730 maprow *row = map_get_row (self, y);
2306 2731
2307 for (x = x0; x < x1; x++) 2732 for (x = x0; x < x1; x++)
2308 { 2733 {
2734 uint8_t flags;
2735
2736 if (data + 7 >= end)
2737 XSRETURN_EMPTY;
2738
2309 uint8_t flags = *data++; 2739 flags = *data++;
2310 2740
2311 if (flags) 2741 if (flags)
2312 { 2742 {
2313 mapcell *cell = row_get_cell (row, x); 2743 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2744 tileid tile[3] = { 0, 0, 0 };
… …
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2747 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2748 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2749
2320 if (cell->darkness == 0) 2750 if (cell->darkness == 0)
2321 { 2751 {
2322 cell->darkness = 0; 2752 /*cell->darkness = 0;*/
2753 EXTEND (SP, 3);
2323 2754
2324 for (z = 0; z <= 2; z++) 2755 for (z = 0; z <= 2; z++)
2325 { 2756 {
2326 tileid t = tile [z]; 2757 tileid t = tile [z];
2327 2758
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2759 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2760 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2761 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2762 need_texid (self, t);
2332 } 2763 }
2333 2764
2334 cell->tile [z] = t; 2765 cell->tile [z] = t;
2335 } 2766 }
… …
2337 } 2768 }
2338 } 2769 }
2339 } 2770 }
2340} 2771}
2341 2772
2342MODULE = CFPlus PACKAGE = CFPlus::RW 2773MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2774
2344CFPlus::RW 2775DC::RW
2345new (SV *class, SV *data_sv) 2776new (SV *class, SV *data_sv)
2346 CODE: 2777 CODE:
2347{ 2778{
2348 STRLEN datalen; 2779 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2780 char *data = SvPVbyte (data_sv, datalen);
… …
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2782 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2783}
2353 OUTPUT: 2784 OUTPUT:
2354 RETVAL 2785 RETVAL
2355 2786
2356CFPlus::RW 2787DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2788new_from_file (SV *class, const char *path, const char *mode = "rb")
2358 CODE: 2789 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2790 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2791 OUTPUT:
2361 RETVAL 2792 RETVAL
2362 2793
2363# fails on win32: 2794# fails on win32:
2364# CFPlus.xs(2268) : error C2059: syntax error : '(' 2795# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2796#void
2366#close (CFPlus::RW self) 2797#close (DC::RW self)
2367# CODE: 2798# CODE:
2368# (self->(close)) (self); 2799# (self->(close)) (self);
2369 2800
2370MODULE = CFPlus PACKAGE = CFPlus::Channel 2801MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2802
2372PROTOTYPES: DISABLE 2803PROTOTYPES: DISABLE
2373 2804
2374CFPlus::Channel 2805DC::Channel
2375find () 2806find ()
2376 CODE: 2807 CODE:
2377{ 2808{
2378 RETVAL = Mix_GroupAvailable (-1); 2809 RETVAL = Mix_GroupAvailable (-1);
2379 2810
2380 if (RETVAL < 0) 2811 if (RETVAL < 0)
2381 { 2812 {
2382 RETVAL = Mix_GroupOldest (-1); 2813 RETVAL = Mix_GroupOldest (-1);
2383 2814
2384 if (RETVAL < 0) 2815 if (RETVAL < 0)
2816 {
2817 // happens sometimes, maybe it just stopped playing(?)
2818 RETVAL = Mix_GroupAvailable (-1);
2819
2820 if (RETVAL < 0)
2385 XSRETURN_UNDEF; 2821 XSRETURN_UNDEF;
2386 2822 }
2823 else
2387 Mix_HaltChannel (RETVAL); 2824 Mix_HaltChannel (RETVAL);
2388 } 2825 }
2389 2826
2390 Mix_UnregisterAllEffects (RETVAL); 2827 Mix_UnregisterAllEffects (RETVAL);
2391 Mix_Volume (RETVAL, 128); 2828 Mix_Volume (RETVAL, 128);
2392} 2829}
2393 OUTPUT: 2830 OUTPUT:
2394 RETVAL 2831 RETVAL
2395 2832
2396void 2833void
2397halt (CFPlus::Channel self) 2834halt (DC::Channel self)
2398 CODE: 2835 CODE:
2399 Mix_HaltChannel (self); 2836 Mix_HaltChannel (self);
2400 2837
2401void 2838void
2402expire (CFPlus::Channel self, int ticks = -1) 2839expire (DC::Channel self, int ticks = -1)
2403 CODE: 2840 CODE:
2404 Mix_ExpireChannel (self, ticks); 2841 Mix_ExpireChannel (self, ticks);
2405 2842
2406void 2843void
2407fade_out (CFPlus::Channel self, int ticks = -1) 2844fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2845 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2846 Mix_FadeOutChannel (self, ticks);
2410 2847
2411int 2848int
2412volume (CFPlus::Channel self, int volume) 2849volume (DC::Channel self, int volume)
2413 CODE: 2850 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2851 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2852 OUTPUT:
2416 RETVAL 2853 RETVAL
2417 2854
2418void 2855void
2419unregister_all_effects (CFPlus::Channel self) 2856unregister_all_effects (DC::Channel self)
2420 CODE: 2857 CODE:
2421 Mix_UnregisterAllEffects (self); 2858 Mix_UnregisterAllEffects (self);
2422 2859
2423void 2860void
2424set_panning (CFPlus::Channel self, int left, int right) 2861set_panning (DC::Channel self, int left, int right)
2425 CODE: 2862 CODE:
2426 left = CLAMP (left , 0, 255); 2863 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2864 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2865 Mix_SetPanning (self, left, right);
2429 2866
2430void 2867void
2431set_distance (CFPlus::Channel self, int distance) 2868set_distance (DC::Channel self, int distance)
2432 CODE: 2869 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2870 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2871
2435void 2872void
2436set_position (CFPlus::Channel self, int angle, int distance) 2873set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2874 CODE:
2438 2875
2439void 2876void
2440set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2877set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2878 CODE:
2442{ 2879{
2443 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2880 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2444 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2881 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2882 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2883}
2447 2884
2448void 2885void
2449set_reverse_stereo (CFPlus::Channel self, int flip) 2886set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2887 CODE:
2451 Mix_SetReverseStereo (self, flip); 2888 Mix_SetReverseStereo (self, flip);
2452 2889
2453MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2890MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2891
2455PROTOTYPES: DISABLE 2892PROTOTYPES: DISABLE
2456 2893
2894void
2895decoders ()
2896 PPCODE:
2897#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2898 int i, num = Mix_GetNumChunkDecoders ();
2899 EXTEND (SP, num);
2900 for (i = 0; i < num; ++i)
2901 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2902#else
2903 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2904#endif
2905
2457CFPlus::MixChunk 2906DC::MixChunk
2458new (SV *class, CFPlus::RW rwops) 2907new (SV *class, DC::RW rwops)
2459 CODE: 2908 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2909 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2910 OUTPUT:
2462 RETVAL 2911 RETVAL
2463 2912
2464void 2913void
2465DESTROY (CFPlus::MixChunk self) 2914DESTROY (DC::MixChunk self)
2466 CODE: 2915 CODE:
2467 Mix_FreeChunk (self); 2916 Mix_FreeChunk (self);
2468 2917
2469int 2918int
2470volume (CFPlus::MixChunk self, int volume = -1) 2919volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2920 CODE:
2472 if (items > 1) 2921 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2922 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2923 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2924 OUTPUT:
2476 RETVAL 2925 RETVAL
2477 2926
2478CFPlus::Channel 2927DC::Channel
2479play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2928play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480 CODE: 2929 CODE:
2481{ 2930{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2931 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2932
2484 if (RETVAL < 0) 2933 if (RETVAL < 0)
… …
2491 } 2940 }
2492} 2941}
2493 OUTPUT: 2942 OUTPUT:
2494 RETVAL 2943 RETVAL
2495 2944
2496MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2945MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2946
2947void
2948decoders ()
2949 PPCODE:
2950#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2951 int i, num = Mix_GetNumMusicDecoders ();
2952 EXTEND (SP, num);
2953 for (i = 0; i < num; ++i)
2954 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2955#else
2956 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2957#endif
2497 2958
2498int 2959int
2499volume (int volume = -1) 2960volume (int volume = -1)
2500 PROTOTYPE: ;$ 2961 PROTOTYPE: ;$
2501 CODE: 2962 CODE:
… …
2513void 2974void
2514halt () 2975halt ()
2515 CODE: 2976 CODE:
2516 Mix_HaltMusic (); 2977 Mix_HaltMusic ();
2517 2978
2979int
2980playing ()
2981 CODE:
2982 RETVAL = Mix_PlayingMusic ();
2983 OUTPUT:
2984 RETVAL
2985
2518CFPlus::MixMusic 2986DC::MixMusic
2519new (SV *class, CFPlus::RW rwops) 2987new (SV *class, DC::RW rwops)
2520 CODE: 2988 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 2989 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 2990 OUTPUT:
2523 RETVAL 2991 RETVAL
2524 2992
2525void 2993void
2526DESTROY (CFPlus::MixMusic self) 2994DESTROY (DC::MixMusic self)
2527 CODE: 2995 CODE:
2528 Mix_FreeMusic (self); 2996 Mix_FreeMusic (self);
2529 2997
2530int 2998int
2531play (CFPlus::MixMusic self, int loops = -1) 2999play (DC::MixMusic self, int loops = -1)
2532 CODE: 3000 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 3001 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 3002 OUTPUT:
2535 RETVAL 3003 RETVAL
2536 3004
2537void 3005void
2538fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3006fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 3007 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 3008 Mix_FadeInMusicPos (self, loops, ms, position);
2541 3009
2542MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3010MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 3011
2544PROTOTYPES: ENABLE 3012PROTOTYPES: ENABLE
2545 3013
2546BOOT: 3014BOOT:
2547{ 3015{
2548 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3016 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 3017 static const struct {
2550 const char *name; 3018 const char *name;
2551 IV iv; 3019 IV iv;
2552 } *civ, const_iv[] = { 3020 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 3021# define const_iv(name) { # name, (IV)name }
2554 const_iv (GL_VENDOR), 3022 const_iv (GL_VENDOR),
2555 const_iv (GL_VERSION), 3023 const_iv (GL_VERSION),
2556 const_iv (GL_EXTENSIONS), 3024 const_iv (GL_EXTENSIONS),
3025 const_iv (GL_MAX_TEXTURE_UNITS),
2557 const_iv (GL_COLOR_MATERIAL), 3026 const_iv (GL_COLOR_MATERIAL),
2558 const_iv (GL_SMOOTH), 3027 const_iv (GL_SMOOTH),
2559 const_iv (GL_FLAT), 3028 const_iv (GL_FLAT),
2560 const_iv (GL_DITHER), 3029 const_iv (GL_DITHER),
2561 const_iv (GL_BLEND), 3030 const_iv (GL_BLEND),
… …
2573 const_iv (GL_ZERO), 3042 const_iv (GL_ZERO),
2574 const_iv (GL_SRC_ALPHA), 3043 const_iv (GL_SRC_ALPHA),
2575 const_iv (GL_DST_ALPHA), 3044 const_iv (GL_DST_ALPHA),
2576 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3045 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2577 const_iv (GL_ONE_MINUS_DST_ALPHA), 3046 const_iv (GL_ONE_MINUS_DST_ALPHA),
3047 const_iv (GL_SRC_COLOR),
3048 const_iv (GL_DST_COLOR),
3049 const_iv (GL_ONE_MINUS_SRC_COLOR),
3050 const_iv (GL_ONE_MINUS_DST_COLOR),
2578 const_iv (GL_SRC_ALPHA_SATURATE), 3051 const_iv (GL_SRC_ALPHA_SATURATE),
2579 const_iv (GL_RGB), 3052 const_iv (GL_RGB),
2580 const_iv (GL_RGBA), 3053 const_iv (GL_RGBA),
2581 const_iv (GL_RGBA4), 3054 const_iv (GL_RGBA4),
2582 const_iv (GL_RGBA8), 3055 const_iv (GL_RGBA8),
… …
2650 const_iv (GL_NICEST), 3123 const_iv (GL_NICEST),
2651 const_iv (GL_V2F), 3124 const_iv (GL_V2F),
2652 const_iv (GL_V3F), 3125 const_iv (GL_V3F),
2653 const_iv (GL_T2F_V3F), 3126 const_iv (GL_T2F_V3F),
2654 const_iv (GL_T2F_N3F_V3F), 3127 const_iv (GL_T2F_N3F_V3F),
3128 const_iv (GL_FUNC_ADD),
3129 const_iv (GL_FUNC_SUBTRACT),
3130 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2655# undef const_iv 3131# undef const_iv
2656 }; 3132 };
2657 3133
2658 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3134 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2659 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3135 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2666disable_GL_EXT_blend_func_separate () 3142disable_GL_EXT_blend_func_separate ()
2667 CODE: 3143 CODE:
2668 gl.BlendFuncSeparate = 0; 3144 gl.BlendFuncSeparate = 0;
2669 gl.BlendFuncSeparateEXT = 0; 3145 gl.BlendFuncSeparateEXT = 0;
2670 3146
3147void
3148apple_nvidia_bug (int enable)
3149
2671char * 3150char *
2672gl_vendor () 3151gl_vendor ()
2673 CODE: 3152 CODE:
2674 RETVAL = (char *)glGetString (GL_VENDOR); 3153 RETVAL = (char *)glGetString (GL_VENDOR);
2675 OUTPUT: 3154 OUTPUT:
… …
2705 3184
2706int glGetError () 3185int glGetError ()
2707 3186
2708void glFinish () 3187void glFinish ()
2709 3188
3189void glFlush ()
3190
2710void glClear (int mask) 3191void glClear (int mask)
2711 3192
2712void glClearColor (float r, float g, float b, float a = 1.0) 3193void glClearColor (float r, float g, float b, float a = 1.0)
2713 PROTOTYPE: @ 3194 PROTOTYPE: @
2714 3195
… …
2723void glBlendFunc (int sfactor, int dfactor) 3204void glBlendFunc (int sfactor, int dfactor)
2724 3205
2725void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3206void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2726 CODE: 3207 CODE:
2727 gl_BlendFuncSeparate (sa, da, saa, daa); 3208 gl_BlendFuncSeparate (sa, da, saa, daa);
3209
3210# void glBlendEquation (int se)
2728 3211
2729void glDepthMask (int flag) 3212void glDepthMask (int flag)
2730 3213
2731void glLogicOp (int opcode) 3214void glLogicOp (int opcode)
2732 3215
… …
2767void glRotate (float angle, float x, float y, float z) 3250void glRotate (float angle, float x, float y, float z)
2768 CODE: 3251 CODE:
2769 glRotatef (angle, x, y, z); 3252 glRotatef (angle, x, y, z);
2770 3253
2771void glColor (float r, float g, float b, float a = 1.0) 3254void glColor (float r, float g, float b, float a = 1.0)
3255 PROTOTYPE: @
2772 ALIAS: 3256 ALIAS:
2773 glColor_premultiply = 1 3257 glColor_premultiply = 1
2774 CODE: 3258 CODE:
2775 if (ix) 3259 if (ix)
2776 { 3260 {
… …
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3330void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3331 CODE:
2848 if (gl.SeparableFilter2D) 3332 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3333 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3334
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3335void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 3336
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3337void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 3338
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3339void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3340
… …
2882 3366
2883void glEndList () 3367void glEndList ()
2884 3368
2885void glCallList (int list) 3369void glCallList (int list)
2886 3370
2887MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3371void c_init ()
3372 CODE:
3373 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3374 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3375
3376MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 3377
2889PROTOTYPES: DISABLE 3378PROTOTYPES: DISABLE
2890 3379
2891void 3380void
2892find_widget (SV *self, NV x, NV y) 3381find_widget (SV *self, NV x, NV y)
… …
2896 XPUSHs (self); 3385 XPUSHs (self);
2897} 3386}
2898 3387
2899BOOT: 3388BOOT:
2900{ 3389{
2901 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3390 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 3391
2903 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3392 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2904 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3393 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2905 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3394 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2906 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3395 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907} 3396}
2908 3397
2909void 3398void
2910draw (SV *self) 3399draw (SV *self)
2911 CODE: 3400 CODE:
… …
2918 SV *draw_w_sv = GvSV (draw_w_gv); 3407 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 3408 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 3409 double draw_x, draw_y;
2921 3410
2922 if (!SvROK (self)) 3411 if (!SvROK (self))
2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3412 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 3413
2925 hv = (HV *)SvRV (self); 3414 hv = (HV *)SvRV (self);
2926 3415
2927 if (SvTYPE (hv) != SVt_PVHV) 3416 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3417 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 3418
2930 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3419 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2931 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3420 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932 3421
2933 if (!h || !w) 3422 if (!h || !w)

Diff Legend

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