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.238 by root, Sat Nov 3 12:08:43 2007 UTC vs.
Revision 1.303 by root, Thu Apr 22 11:18:04 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
1060reset_glyph_cache () 1280glyph_cache_backup ()
1061 PROTOTYPE: 1281 PROTOTYPE:
1062 CODE: 1282 CODE:
1283 tc_backup ();
1284
1285void
1286glyph_cache_restore ()
1287 PROTOTYPE:
1288 CODE:
1063 tc_clear (); 1289 tc_restore ();
1064 1290
1065CFPlus::Layout 1291DC::Layout
1066new (SV *class) 1292new (SV *class)
1067 CODE: 1293 CODE:
1068 New (0, RETVAL, 1, struct cf_layout); 1294 New (0, RETVAL, 1, struct cf_layout);
1069 1295
1070 RETVAL->pl = pango_layout_new (opengl_context); 1296 RETVAL->pl = pango_layout_new (opengl_context);
… …
1080 layout_update_font (RETVAL); 1306 layout_update_font (RETVAL);
1081 OUTPUT: 1307 OUTPUT:
1082 RETVAL 1308 RETVAL
1083 1309
1084void 1310void
1085DESTROY (CFPlus::Layout self) 1311DESTROY (DC::Layout self)
1086 CODE: 1312 CODE:
1087 g_object_unref (self->pl); 1313 g_object_unref (self->pl);
1088 rc_free (self->rc); 1314 rc_free (self->rc);
1089 Safefree (self); 1315 Safefree (self);
1090 1316
1091void 1317void
1092set_text (CFPlus::Layout self, SV *text_) 1318set_text (DC::Layout self, SV *text_)
1093 CODE: 1319 CODE:
1094{ 1320{
1095 STRLEN textlen; 1321 STRLEN textlen;
1096 char *text = SvPVutf8 (text_, textlen); 1322 char *text = SvPVutf8 (text_, textlen);
1097 1323
1098 pango_layout_set_text (self->pl, text, textlen); 1324 pango_layout_set_text (self->pl, text, textlen);
1099} 1325}
1100 1326
1101void 1327void
1102set_markup (CFPlus::Layout self, SV *text_) 1328set_markup (DC::Layout self, SV *text_)
1103 CODE: 1329 CODE:
1104{ 1330{
1105 STRLEN textlen; 1331 STRLEN textlen;
1106 char *text = SvPVutf8 (text_, textlen); 1332 char *text = SvPVutf8 (text_, textlen);
1107 1333
1108 pango_layout_set_markup (self->pl, text, textlen); 1334 pango_layout_set_markup (self->pl, text, textlen);
1109} 1335}
1110 1336
1111void 1337void
1112set_shapes (CFPlus::Layout self, ...) 1338set_shapes (DC::Layout self, ...)
1113 CODE: 1339 CODE:
1114{ 1340{
1115 PangoAttrList *attrs = 0; 1341 PangoAttrList *attrs = 0;
1116 const char *text = pango_layout_get_text (self->pl); 1342 const char *text = pango_layout_get_text (self->pl);
1117 const char *pos = text; 1343 const char *pos = text;
… …
1152 if (attrs) 1378 if (attrs)
1153 pango_layout_set_attributes (self->pl, attrs); 1379 pango_layout_set_attributes (self->pl, attrs);
1154} 1380}
1155 1381
1156void 1382void
1157get_shapes (CFPlus::Layout self) 1383get_shapes (DC::Layout self)
1158 PPCODE: 1384 PPCODE:
1159{ 1385{
1160 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1386 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161 1387
1162 do 1388 do
1163 { 1389 {
1164 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1390 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165 1391
1166 if (run && shape_attr_p (run)) 1392 if (run && shape_attr_p (run))
1167 { 1393 {
1168 PangoRectangle extents; 1394 PangoRectangle extents;
1169 pango_layout_iter_get_run_extents (iter, 0, &extents); 1395 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1177 1403
1178 pango_layout_iter_free (iter); 1404 pango_layout_iter_free (iter);
1179} 1405}
1180 1406
1181int 1407int
1182has_wrapped (CFPlus::Layout self) 1408has_wrapped (DC::Layout self)
1183 CODE: 1409 CODE:
1184{ 1410{
1185 int lines = 1; 1411 int lines = 1;
1186 const char *text = pango_layout_get_text (self->pl); 1412 const char *text = pango_layout_get_text (self->pl);
1187 1413
… …
1192} 1418}
1193 OUTPUT: 1419 OUTPUT:
1194 RETVAL 1420 RETVAL
1195 1421
1196SV * 1422SV *
1197get_text (CFPlus::Layout self) 1423get_text (DC::Layout self)
1198 CODE: 1424 CODE:
1199 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1425 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200 sv_utf8_decode (RETVAL); 1426 sv_utf8_decode (RETVAL);
1201 OUTPUT: 1427 OUTPUT:
1202 RETVAL 1428 RETVAL
1203 1429
1204void 1430void
1205set_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.)
1206 CODE: 1432 CODE:
1207 self->r = r; 1433 self->r = r;
1208 self->g = g; 1434 self->g = g;
1209 self->b = b; 1435 self->b = b;
1210 self->a = a; 1436 self->a = a;
1211 1437
1212void 1438void
1213set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1439set_font (DC::Layout self, DC::Font font = 0)
1214 CODE: 1440 CODE:
1215 if (self->font != font) 1441 if (self->font != font)
1216 { 1442 {
1217 self->font = font; 1443 self->font = font;
1218 layout_update_font (self); 1444 layout_update_font (self);
1219 } 1445 }
1220 1446
1221void 1447void
1222set_height (CFPlus::Layout self, int base_height) 1448set_height (DC::Layout self, int base_height)
1223 CODE: 1449 CODE:
1224 if (self->base_height != base_height) 1450 if (self->base_height != base_height)
1225 { 1451 {
1226 self->base_height = base_height; 1452 self->base_height = base_height;
1227 layout_update_font (self); 1453 layout_update_font (self);
1228 } 1454 }
1229 1455
1230void 1456void
1231set_width (CFPlus::Layout self, int max_width = -1) 1457set_width (DC::Layout self, int max_width = -1)
1232 CODE: 1458 CODE:
1233 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);
1234 1460
1235void 1461void
1236set_indent (CFPlus::Layout self, int indent) 1462set_indent (DC::Layout self, int indent)
1237 CODE: 1463 CODE:
1238 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1464 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239 1465
1240void 1466void
1241set_spacing (CFPlus::Layout self, int spacing) 1467set_spacing (DC::Layout self, int spacing)
1242 CODE: 1468 CODE:
1243 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1469 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244 1470
1245void 1471void
1246set_ellipsise (CFPlus::Layout self, int ellipsise) 1472set_ellipsise (DC::Layout self, int ellipsise)
1247 CODE: 1473 CODE:
1248 pango_layout_set_ellipsize (self->pl, 1474 pango_layout_set_ellipsize (self->pl,
1249 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1475 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1476 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1477 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252 : PANGO_ELLIPSIZE_NONE 1478 : PANGO_ELLIPSIZE_NONE
1253 ); 1479 );
1254 1480
1255void 1481void
1256set_single_paragraph_mode (CFPlus::Layout self, int spm) 1482set_single_paragraph_mode (DC::Layout self, int spm)
1257 CODE: 1483 CODE:
1258 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1484 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259 1485
1260void 1486void
1261size (CFPlus::Layout self) 1487size (DC::Layout self)
1262 PPCODE: 1488 PPCODE:
1263{ 1489{
1264 int w, h; 1490 int w, h;
1265 1491
1266 layout_get_pixel_size (self, &w, &h); 1492 layout_get_pixel_size (self, &w, &h);
… …
1269 PUSHs (sv_2mortal (newSViv (w))); 1495 PUSHs (sv_2mortal (newSViv (w)));
1270 PUSHs (sv_2mortal (newSViv (h))); 1496 PUSHs (sv_2mortal (newSViv (h)));
1271} 1497}
1272 1498
1273int 1499int
1274descent (CFPlus::Layout self) 1500descent (DC::Layout self)
1275 CODE: 1501 CODE:
1276{ 1502{
1277 PangoRectangle rect; 1503 PangoRectangle rect;
1278 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1504 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279 pango_layout_line_get_pixel_extents (line, 0, &rect); 1505 pango_layout_line_get_pixel_extents (line, 0, &rect);
1280 RETVAL = PANGO_DESCENT (rect); 1506 RETVAL = PANGO_DESCENT (rect);
1281} 1507}
1282 OUTPUT: 1508 OUTPUT:
1283 RETVAL 1509 RETVAL
1284 1510
1285int 1511int
1286xy_to_index (CFPlus::Layout self, int x, int y) 1512xy_to_index (DC::Layout self, int x, int y)
1287 CODE: 1513 CODE:
1288{ 1514{
1289 int index, trailing; 1515 int index, trailing;
1290 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);
1291 RETVAL = index + trailing; 1517 RETVAL = index + trailing;
1292} 1518}
1293 OUTPUT: 1519 OUTPUT:
1294 RETVAL 1520 RETVAL
1295 1521
1296void 1522void
1297cursor_pos (CFPlus::Layout self, int index) 1523cursor_pos (DC::Layout self, int index)
1298 PPCODE: 1524 PPCODE:
1299{ 1525{
1300 PangoRectangle strong_pos; 1526 PangoRectangle pos;
1301 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1527 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302 1528
1303 EXTEND (SP, 3); 1529 EXTEND (SP, 3);
1304 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1530 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1531 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1532 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307} 1533}
1308 1534
1309void 1535void
1310index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1536index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311 PPCODE: 1537 PPCODE:
1312{ 1538{
1313 int line, x; 1539 int line, x;
1314 1540
1315 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)
1316 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1543 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317 1544 --line;
1545#endif
1318 EXTEND (SP, 2); 1546 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSViv (line - 1))); 1547 PUSHs (sv_2mortal (newSViv (line)));
1320 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1548 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321} 1549}
1322 1550
1323void 1551void
1324line_x_to_index (CFPlus::Layout self, int line, int x) 1552line_x_to_index (DC::Layout self, int line, int x)
1325 PPCODE: 1553 PPCODE:
1326{ 1554{
1327 PangoLayoutLine *lp; 1555 PangoLayoutLine *lp;
1328 int index, trailing; 1556 int index, trailing;
1329 1557
1330 if (line < 0) 1558 if (line < 0)
1331 XSRETURN_EMPTY; 1559 XSRETURN_EMPTY;
1332 1560
1333 if (!(lp = pango_layout_get_line (self->pl, line))) 1561 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334 XSRETURN_EMPTY; /* do better */ 1562 XSRETURN_EMPTY; /* do better */
1335 1563
1336 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);
1337 1565
1338 EXTEND (SP, 2); 1566 EXTEND (SP, 2);
… …
1344 PUSHs (sv_2mortal (newSViv (trailing))); 1572 PUSHs (sv_2mortal (newSViv (trailing)));
1345 } 1573 }
1346} 1574}
1347 1575
1348void 1576void
1349render (CFPlus::Layout self, float x, float y, int flags = 0) 1577render (DC::Layout self, float x, float y, int flags = 0)
1350 CODE: 1578 CODE:
1351 rc_clear (self->rc); 1579 rc_clear (self->rc);
1352 pango_opengl_render_layout_subpixel ( 1580 pango_opengl_render_layout_subpixel (
1353 self->pl, 1581 self->pl,
1354 self->rc, 1582 self->rc,
… …
1359 // we assume that context_change actually clears/frees stuff 1587 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation... 1588 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl); 1589 pango_layout_context_changed (self->pl);
1362 1590
1363void 1591void
1364draw (CFPlus::Layout self) 1592draw (DC::Layout self)
1365 CODE: 1593 CODE:
1366{ 1594{
1367 glEnable (GL_TEXTURE_2D); 1595 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1596 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND); 1597 glEnable (GL_BLEND);
… …
1377 glDisable (GL_ALPHA_TEST); 1605 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND); 1606 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D); 1607 glDisable (GL_TEXTURE_2D);
1380} 1608}
1381 1609
1382MODULE = CFPlus PACKAGE = CFPlus::Texture 1610MODULE = Deliantra::Client PACKAGE = DC::Texture
1383 1611
1384PROTOTYPES: ENABLE 1612PROTOTYPES: ENABLE
1385 1613
1386void 1614void
1387pad (SV *data_, int ow, int oh, int nw, int nh) 1615pad (SV *data_, int ow, int oh, int nw, int nh)
… …
1455 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1456 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1457 } 1685 }
1458} 1686}
1459 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
1460IV 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)
1461 CODE: 1810 CODE:
1462{ 1811{
1463 GLint width; 1812 GLint width;
1464 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);
… …
1466 RETVAL = width > 0; 1815 RETVAL = width > 0;
1467} 1816}
1468 OUTPUT: 1817 OUTPUT:
1469 RETVAL 1818 RETVAL
1470 1819
1471MODULE = CFPlus PACKAGE = CFPlus::Map 1820MODULE = Deliantra::Client PACKAGE = DC::Map
1472 1821
1473PROTOTYPES: DISABLE 1822PROTOTYPES: DISABLE
1474 1823
1475CFPlus::Map 1824DC::Map
1476new (SV *class) 1825new (SV *class)
1477 CODE: 1826 CODE:
1478 New (0, RETVAL, 1, struct map); 1827 New (0, RETVAL, 1, struct map);
1479 RETVAL->x = 0; 1828 RETVAL->x = 0;
1480 RETVAL->y = 0; 1829 RETVAL->y = 0;
… …
1488 RETVAL->row = 0; 1837 RETVAL->row = 0;
1489 OUTPUT: 1838 OUTPUT:
1490 RETVAL 1839 RETVAL
1491 1840
1492void 1841void
1493DESTROY (CFPlus::Map self) 1842DESTROY (DC::Map self)
1494 CODE: 1843 CODE:
1495{ 1844{
1496 map_clear (self); 1845 map_clear (self);
1497 Safefree (self->face2tile); 1846 Safefree (self->face2tile);
1498 Safefree (self->tex); 1847 Safefree (self->tex);
1499 Safefree (self); 1848 Safefree (self);
1500} 1849}
1501 1850
1502void 1851void
1503resize (CFPlus::Map self, int map_width, int map_height) 1852resize (DC::Map self, int map_width, int map_height)
1504 CODE: 1853 CODE:
1505 self->w = map_width; 1854 self->w = map_width;
1506 self->h = map_height; 1855 self->h = map_height;
1507 1856
1508void 1857void
1509clear (CFPlus::Map self) 1858clear (DC::Map self)
1510 CODE: 1859 CODE:
1511 map_clear (self); 1860 map_clear (self);
1512 1861
1513void 1862void
1514set_tileid (CFPlus::Map self, int face, int tile) 1863set_tileid (DC::Map self, int face, int tile)
1515 CODE: 1864 CODE:
1516{ 1865{
1517 need_facenum (self, face); self->face2tile [face] = tile; 1866 need_facenum (self, face); self->face2tile [face] = tile;
1518 need_texid (self, tile); 1867 need_texid (self, tile);
1519} 1868}
1520 1869
1521void 1870void
1522set_smooth (CFPlus::Map self, int face, int smooth, int level) 1871set_smooth (DC::Map self, int face, int smooth, int level)
1523 CODE: 1872 CODE:
1524{ 1873{
1525 tileid texid; 1874 tileid texid;
1526 maptex *tex; 1875 maptex *tex;
1527 1876
… …
1540 tex->smoothtile = self->face2tile [smooth]; 1889 tex->smoothtile = self->face2tile [smooth];
1541 tex->smoothlevel = level; 1890 tex->smoothlevel = level;
1542} 1891}
1543 1892
1544void 1893void
1545set_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)
1546 CODE: 1895 CODE:
1547{ 1896{
1548 need_texid (self, texid); 1897 need_texid (self, texid);
1549 1898
1550 { 1899 {
… …
1569 // use uglier nearest interpolation because linear suffers 1918 // use uglier nearest interpolation because linear suffers
1570 // from transparent color bleeding and ugly wrapping effects. 1919 // from transparent color bleeding and ugly wrapping effects.
1571 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1920 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572} 1921}
1573 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
1574int 1943int
1575ox (CFPlus::Map self) 1944ox (DC::Map self)
1576 ALIAS: 1945 ALIAS:
1577 oy = 1 1946 oy = 1
1578 x = 2 1947 x = 2
1579 y = 3 1948 y = 3
1580 w = 4 1949 w = 4
… …
1591 } 1960 }
1592 OUTPUT: 1961 OUTPUT:
1593 RETVAL 1962 RETVAL
1594 1963
1595void 1964void
1596scroll (CFPlus::Map self, int dx, int dy) 1965scroll (DC::Map self, int dx, int dy)
1597 CODE: 1966 CODE:
1598{ 1967{
1599 if (dx > 0) 1968 if (dx > 0)
1600 map_blank (self, self->x, self->y, dx, self->h); 1969 map_blank (self, self->x, self->y, dx, self->h);
1601 else if (dx < 0) 1970 else if (dx < 0)
… …
1617 self->y += MAP_EXTEND_Y; 1986 self->y += MAP_EXTEND_Y;
1618 } 1987 }
1619} 1988}
1620 1989
1621SV * 1990SV *
1622map1a_update (CFPlus::Map self, SV *data_, int extmap) 1991map1a_update (DC::Map self, SV *data_, int extmap)
1623 CODE: 1992 CODE:
1624{ 1993{
1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1994 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626 uint8_t *data_end = (uint8_t *)SvEND (data_); 1995 uint8_t *data_end = (uint8_t *)SvEND (data_);
1627 mapcell *cell; 1996 mapcell *cell;
… …
1655 uint8_t ext, cmd; 2024 uint8_t ext, cmd;
1656 2025
1657 do 2026 do
1658 { 2027 {
1659 ext = *data++; 2028 ext = *data++;
1660 cmd = ext & 0x3f; 2029 cmd = ext & 0x7f;
1661 2030
1662 if (cmd < 4) 2031 if (cmd < 4)
1663 cell->darkness = 255 - ext * 64 + 1; 2032 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1664 else if (cmd == 5) // health 2033 else if (cmd == 5) // health
1665 { 2034 {
1666 cell->stat_width = 1; 2035 cell->stat_width = 1;
1667 cell->stat_hp = *data++; 2036 cell->stat_hp = *data++;
1668 } 2037 }
1669 else if (cmd == 6) // monster width 2038 else if (cmd == 6) // monster width
1670 cell->stat_width = *data++ + 1; 2039 cell->stat_width = *data++ + 1;
1671 else if (cmd == 0x47) 2040 else if (cmd == 0x47)
1672 { 2041 {
1673 if (*data == 4) 2042 if (*data == 1) cell->player = data [1];
1674 ; // 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);
1675 2046
1676 data += *data + 1; 2047 data += *data + 1;
1677 } 2048 }
1678 else if (cmd == 8) // cell flags 2049 else if (cmd == 8) // cell flags
1679 cell->flags = *data++; 2050 cell->flags = *data++;
… …
1696 cell->tile [z] = self->face2tile [face]; 2067 cell->tile [z] = self->face2tile [face];
1697 2068
1698 if (cell->tile [z]) 2069 if (cell->tile [z])
1699 { 2070 {
1700 maptex *tex = self->tex + cell->tile [z]; 2071 maptex *tex = self->tex + cell->tile [z];
2072 tex->unused = 0;
1701 if (!tex->name) 2073 if (!tex->name)
1702 av_push (missing, newSViv (cell->tile [z])); 2074 av_push (missing, newSViv (cell->tile [z]));
1703 2075
1704 if (tex->smoothtile) 2076 if (tex->smoothtile)
1705 { 2077 {
1706 maptex *smooth = self->tex + tex->smoothtile; 2078 maptex *smooth = self->tex + tex->smoothtile;
2079 smooth->unused = 0;
1707 if (!smooth->name) 2080 if (!smooth->name)
1708 av_push (missing, newSViv (tex->smoothtile)); 2081 av_push (missing, newSViv (tex->smoothtile));
1709 } 2082 }
1710 } 2083 }
1711 } 2084 }
1712 } 2085 }
1713 else 2086 else
1714 cell->darkness = 0; 2087 CELL_CLEAR (cell);
1715 } 2088 }
1716} 2089}
1717 OUTPUT: 2090 OUTPUT:
1718 RETVAL 2091 RETVAL
1719 2092
1720SV * 2093SV *
1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2094mapmap (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 2095 CODE:
1723{ 2096{
1724 int x1, x; 2097 int x1, x;
1725 int y1, y; 2098 int y1, y;
1726 int z; 2099 int z;
… …
1771} 2144}
1772 OUTPUT: 2145 OUTPUT:
1773 RETVAL 2146 RETVAL
1774 2147
1775void 2148void
1776draw (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)
1777 CODE: 2150 CODE:
1778{ 2151{
1779 int x, y, z; 2152 int x, y, z;
1780 2153
1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2154 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1782 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
1783 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)
1784 smooth_key skey; 2157 smooth_key skey;
1785 2158 int pl_x, pl_y;
2159 maptex pl_tex;
1786 rc_t *rc = rc_alloc (); 2160 rc_t *rc = rc_alloc ();
2161 rc_t *rc_ov = rc_alloc ();
1787 rc_key_t key; 2162 rc_key_t key;
1788 rc_array_t *arr; 2163 rc_array_t *arr;
1789 2164
2165 pl_tex.name = 0;
2166
1790 // thats current max. sorry. 2167 // that's current max. sorry.
1791 if (sw > 255) sw = 255; 2168 if (sw > 255) sw = 255;
1792 if (sh > 255) sh = 255; 2169 if (sh > 255) sh = 255;
1793 2170
1794 // clear key, in case of extra padding 2171 // clear key, in case of extra padding
1795 memset (&skey, 0, sizeof (skey)); 2172 memset (&skey, 0, sizeof (skey));
… …
1799 key.g = 255; 2176 key.g = 255;
1800 key.b = 255; 2177 key.b = 255;
1801 key.a = 255; 2178 key.a = 255;
1802 key.mode = GL_QUADS; 2179 key.mode = GL_QUADS;
1803 key.format = GL_T2F_V3F; 2180 key.format = GL_T2F_V3F;
1804 key.texname = -1;
1805 2181
1806 mx += self->x; 2182 mx += self->x;
1807 my += self->y; 2183 my += self->y;
1808 2184
1809 // first pass: determine smooth_max 2185 // first pass: determine smooth_max
… …
1833 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2209 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1834 2210
1835 for (z = 0; z <= 2; z++) 2211 for (z = 0; z <= 2; z++)
1836 { 2212 {
1837 memset (smooth_level, 0, sizeof (smooth_level)); 2213 memset (smooth_level, 0, sizeof (smooth_level));
2214 key.texname = -1;
1838 2215
1839 for (y = 0; y < sh; y++) 2216 for (y = 0; y < sh; y++)
1840 if (0 <= y + my && y + my < self->rows) 2217 if (0 <= y + my && y + my < self->rows)
1841 { 2218 {
1842 maprow *row = self->row + (y + my); 2219 maprow *row = self->row + (y + my);
… …
1852 maptex tex = self->tex [tile]; 2229 maptex tex = self->tex [tile];
1853 int px, py; 2230 int px, py;
1854 2231
1855 if (key.texname != tex.name) 2232 if (key.texname != tex.name)
1856 { 2233 {
2234 self->tex [tile].unused = 0;
2235
1857 if (!tex.name) 2236 if (!tex.name)
1858 tex = self->tex [2]; /* missing, replace by noface */ 2237 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1859 2238
1860 key.texname = tex.name; 2239 key.texname = tex.name;
1861 arr = rc_array (rc, &key); 2240 arr = rc_array (rc, &key);
1862 } 2241 }
1863 2242
1864 px = (x + 1) * T - tex.w; 2243 px = (x + 1) * T - tex.w;
1865 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 }
1866 2253
1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2254 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868 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);
1869 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);
1870 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);
1871
1872 if (cell->flags && z == 2)
1873 {
1874 // overlays such as the speech bubble, probably more to come
1875 if (cell->flags & 1)
1876 {
1877 maptex tex = self->tex [1];
1878 int px = x * T + T * 2 / 32;
1879 int py = y * T - T * 6 / 32;
1880
1881 if (tex.name)
1882 {
1883 if (key.texname != tex.name)
1884 {
1885 key.texname = tex.name;
1886 arr = rc_array (rc, &key);
1887 }
1888
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1891 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1892 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1893 }
1894 }
1895 }
1896 2258
1897 // update smooth hash 2259 // update smooth hash
1898 if (tex.smoothtile) 2260 if (tex.smoothtile)
1899 { 2261 {
1900 skey.tile = tex.smoothtile; 2262 skey.tile = tex.smoothtile;
… …
1929 // corners 2291 // corners
1930 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);
1931 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);
1932 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);
1933 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);
1934 } 2317 }
1935 } 2318 }
1936 } 2319 }
1937 } 2320 }
1938 2321
… …
1978 { 2361 {
1979 // this time avoiding texture state changes 2362 // this time avoiding texture state changes
1980 // save gobs of state changes. 2363 // save gobs of state changes.
1981 if (key.texname != tex.name) 2364 if (key.texname != tex.name)
1982 { 2365 {
2366 self->tex [skey->tile].unused = 0;
2367
1983 glEnd (); 2368 glEnd ();
1984 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2369 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1985 glBegin (GL_QUADS); 2370 glBegin (GL_QUADS);
1986 } 2371 }
1987 2372
… …
2016 } 2401 }
2017 2402
2018 hv_clear (smooth); 2403 hv_clear (smooth);
2019 } 2404 }
2020 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
2021 glDisable (GL_BLEND); 2426 glDisable (GL_BLEND);
2022 rc_free (rc); 2427 rc_free (rc);
2428 rc_free (rc_ov);
2023 2429
2024 // top layer: overlays such as the health bar 2430 // top layer: overlays such as the health bar
2025 for (y = 0; y < sh; y++) 2431 for (y = 0; y < sh; y++)
2026 if (0 <= y + my && y + my < self->rows) 2432 if (0 <= y + my && y + my < self->rows)
2027 { 2433 {
… …
2032 { 2438 {
2033 mapcell *cell = row->col + (x + mx - row->c0); 2439 mapcell *cell = row->col + (x + mx - row->c0);
2034 2440
2035 int px = x * T; 2441 int px = x * T;
2036 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 }
2037 2449
2038 if (cell->stat_hp) 2450 if (cell->stat_hp)
2039 { 2451 {
2040 int width = cell->stat_width * T; 2452 int width = cell->stat_width * T;
2041 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2453 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2052 } 2464 }
2053 } 2465 }
2054} 2466}
2055 2467
2056void 2468void
2057draw_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)
2058 CODE: 2470 CODE:
2059{ 2471{
2060 static float color[16][3] = { 2472 static float color[16][3] = {
2061 { 0.00F, 0.00F, 0.00F }, 2473 { 0.00f, 0.00f, 0.00f },
2062 { 1.00F, 1.00F, 1.00F }, 2474 { 1.00f, 1.00f, 1.00f },
2063 { 0.00F, 0.00F, 0.55F }, 2475 { 0.00f, 0.00f, 0.55f },
2064 { 1.00F, 0.00F, 0.00F }, 2476 { 1.00f, 0.00f, 0.00f },
2065 2477
2066 { 1.00F, 0.54F, 0.00F }, 2478 { 1.00f, 0.54f, 0.00f },
2067 { 0.11F, 0.56F, 1.00F }, 2479 { 0.11f, 0.56f, 1.00f },
2068 { 0.93F, 0.46F, 0.00F }, 2480 { 0.93f, 0.46f, 0.00f },
2069 { 0.18F, 0.54F, 0.34F }, 2481 { 0.18f, 0.54f, 0.34f },
2070 2482
2071 { 0.56F, 0.73F, 0.56F }, 2483 { 0.56f, 0.73f, 0.56f },
2072 { 0.80F, 0.80F, 0.80F }, 2484 { 0.80f, 0.80f, 0.80f },
2073 { 0.55F, 0.41F, 0.13F }, 2485 { 0.55f, 0.41f, 0.13f },
2074 { 0.99F, 0.77F, 0.26F }, 2486 { 0.99f, 0.77f, 0.26f },
2075 2487
2076 { 0.74F, 0.65F, 0.41F }, 2488 { 0.74f, 0.65f, 0.41f },
2077 2489
2078 { 0.00F, 1.00F, 1.00F }, 2490 { 0.00f, 1.00f, 1.00f },
2079 { 1.00F, 0.00F, 1.00F }, 2491 { 1.00f, 0.00f, 1.00f },
2080 { 1.00F, 1.00F, 0.00F }, 2492 { 1.00f, 1.00f, 0.00f },
2081 }; 2493 };
2082 2494
2083 int x, y; 2495 int x, y;
2084 2496
2085 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 */
2086 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2504 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2087 glEnable (GL_BLEND); 2505 glEnable (GL_BLEND);
2088 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2506 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2089 glBegin (GL_QUADS); 2507 glBegin (GL_QUADS);
2090 2508
2091 for (y = 0; y < h; y++) 2509 for (y = 0; y < h; y++)
… …
2095 2513
2096 if (m) 2514 if (m)
2097 { 2515 {
2098 float *c = color [m & 15]; 2516 float *c = color [m & 15];
2099 2517
2100 float tx1 = m & 0x40 ? 0.5 : 0.; 2518 float tx1 = m & 0x40 ? 0.5f : 0.f;
2101 float tx2 = tx1 + 0.5; 2519 float tx2 = tx1 + 0.5f;
2102 2520
2103 glColor4f (c[0], c[1], c[2], 0.75); 2521 glColor4f (c[0], c[1], c[2], 1);
2104 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2522 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2105 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2523 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2106 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2524 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2107 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2525 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2108 } 2526 }
… …
2112 glDisable (GL_BLEND); 2530 glDisable (GL_BLEND);
2113 glDisable (GL_TEXTURE_2D); 2531 glDisable (GL_TEXTURE_2D);
2114} 2532}
2115 2533
2116void 2534void
2117fow_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)
2118 PPCODE: 2536 PPCODE:
2119{ 2537{
2120 int x, y; 2538 int x, y;
2121 int sw1 = sw + 2; 2539 int sw1 = sw + 2;
2122 int sh1 = sh + 2; 2540 int sh1 = sh + 2;
2123 int sh3 = sh * 3; 2541 int sh3 = sh * 3;
2124 int sw34 = (sw * 3 + 3) & ~3; 2542 int sw3 = sw * 3;
2125 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2543 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2126 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2544 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2127 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2545 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2128 2546
2129 SvPOK_only (darkness3_sv); 2547 SvPOK_only (darkness3_sv);
2130 SvCUR_set (darkness3_sv, sw34 * sh3); 2548 SvCUR_set (darkness3_sv, sw3 * sh3);
2131 2549
2132 mx += self->x - 1; 2550 mx += self->x - 1;
2133 my += self->y - 1; 2551 my += self->y - 1;
2134
2135 memset (darkness1, 255, sw1 * sh1);
2136 2552
2137 for (y = 0; y < sh1; y++) 2553 for (y = 0; y < sh1; y++)
2138 if (0 <= y + my && y + my < self->rows) 2554 if (0 <= y + my && y + my < self->rows)
2139 { 2555 {
2140 maprow *row = self->row + (y + my); 2556 maprow *row = self->row + (y + my);
… …
2143 if (row->c0 <= x + mx && x + mx < row->c1) 2559 if (row->c0 <= x + mx && x + mx < row->c1)
2144 { 2560 {
2145 mapcell *cell = row->col + (x + mx - row->c0); 2561 mapcell *cell = row->col + (x + mx - row->c0);
2146 2562
2147 darkness1 [y * sw1 + x] = cell->darkness 2563 darkness1 [y * sw1 + x] = cell->darkness
2148 ? 255 - (cell->darkness - 1) 2564 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2149 : 255 - FOW_DARKNESS; 2565 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2150 } 2566 }
2151 } 2567 }
2152 2568
2153 for (y = 0; y < sh; ++y) 2569 for (y = 0; y < sh; ++y)
2154 for (x = 0; x < sw; ++x) 2570 for (x = 0; x < sw; ++x)
… …
2173 2589
2174 uint8_t r13 = (d13 + d23 + d12) / 3; 2590 uint8_t r13 = (d13 + d23 + d12) / 3;
2175 uint8_t r23 = d23; 2591 uint8_t r23 = d23;
2176 uint8_t r33 = (d23 + d33 + d32) / 3; 2592 uint8_t r33 = (d23 + d33 + d32) / 3;
2177 2593
2178 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2594 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2179 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2595 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2180 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2596 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2181 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2597 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2182 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 */
2183 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2599 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2184 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2600 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2185 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2601 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2186 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2602 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2187 } 2603 }
2188 2604
2189 free (darkness1); 2605 free (darkness1);
2190 2606
2191 EXTEND (SP, 3); 2607 EXTEND (SP, 3);
2192 PUSHs (sv_2mortal (newSViv (sw34))); 2608 PUSHs (sv_2mortal (newSViv (sw3)));
2193 PUSHs (sv_2mortal (newSViv (sh3))); 2609 PUSHs (sv_2mortal (newSViv (sh3)));
2194 PUSHs (darkness3_sv); 2610 PUSHs (darkness3_sv);
2195} 2611}
2196 2612
2197SV * 2613SV *
2198get_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)
2199 CODE: 2615 CODE:
2200{ 2616{
2201 int x, y, x1, y1; 2617 int x, y, x1, y1;
2202 SV *data_sv = newSV (w * h * 7 + 5); 2618 SV *data_sv = newSV (w * h * 7 + 5);
2203 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2619 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2260 else 2676 else
2261 *data++ = 0; 2677 *data++ = 0;
2262 } 2678 }
2263 } 2679 }
2264 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 {
2265 SvPOK_only (data_sv); 2684 SvPOK_only (data_sv);
2266 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2685 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2686 }
2687
2267 RETVAL = data_sv; 2688 RETVAL = data_sv;
2268} 2689}
2269 OUTPUT: 2690 OUTPUT:
2270 RETVAL 2691 RETVAL
2271 2692
2272void 2693void
2273set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2694set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274 PPCODE: 2695 PPCODE:
2275{ 2696{
2276 int x, y, z; 2697 int x, y, z;
2277 int w, h; 2698 int w, h;
2278 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;
2279 2710
2280 if (*data++ != 0) 2711 if (*data++ != 0)
2281 XSRETURN_EMPTY; /* version mismatch */ 2712 XSRETURN_EMPTY; /* version mismatch */
2282 2713
2283 w = *data++ << 8; w |= *data++; 2714 w = *data++ << 8; w |= *data++;
… …
2298 { 2729 {
2299 maprow *row = map_get_row (self, y); 2730 maprow *row = map_get_row (self, y);
2300 2731
2301 for (x = x0; x < x1; x++) 2732 for (x = x0; x < x1; x++)
2302 { 2733 {
2734 uint8_t flags;
2735
2736 if (data + 7 >= end)
2737 XSRETURN_EMPTY;
2738
2303 uint8_t flags = *data++; 2739 flags = *data++;
2304 2740
2305 if (flags) 2741 if (flags)
2306 { 2742 {
2307 mapcell *cell = row_get_cell (row, x); 2743 mapcell *cell = row_get_cell (row, x);
2308 tileid tile[3] = { 0, 0, 0 }; 2744 tileid tile[3] = { 0, 0, 0 };
… …
2311 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2747 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2312 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2748 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2313 2749
2314 if (cell->darkness == 0) 2750 if (cell->darkness == 0)
2315 { 2751 {
2316 cell->darkness = 0; 2752 /*cell->darkness = 0;*/
2753 EXTEND (SP, 3);
2317 2754
2318 for (z = 0; z <= 2; z++) 2755 for (z = 0; z <= 2; z++)
2319 { 2756 {
2320 tileid t = tile [z]; 2757 tileid t = tile [z];
2321 2758
2322 if (t >= self->texs || (t && !self->tex [t].name)) 2759 if (t >= self->texs || (t && !self->tex [t].name))
2323 { 2760 {
2324 XPUSHs (sv_2mortal (newSViv (t))); 2761 PUSHs (sv_2mortal (newSViv (t)));
2325 need_texid (self, t); 2762 need_texid (self, t);
2326 } 2763 }
2327 2764
2328 cell->tile [z] = t; 2765 cell->tile [z] = t;
2329 } 2766 }
… …
2331 } 2768 }
2332 } 2769 }
2333 } 2770 }
2334} 2771}
2335 2772
2336MODULE = CFPlus PACKAGE = CFPlus::RW 2773MODULE = Deliantra::Client PACKAGE = DC::RW
2337 2774
2338CFPlus::RW 2775DC::RW
2339new (SV *class, SV *data_sv) 2776new (SV *class, SV *data_sv)
2340 CODE: 2777 CODE:
2341{ 2778{
2342 STRLEN datalen; 2779 STRLEN datalen;
2343 char *data = SvPVbyte (data_sv, datalen); 2780 char *data = SvPVbyte (data_sv, datalen);
… …
2345 RETVAL = SDL_RWFromConstMem (data, datalen); 2782 RETVAL = SDL_RWFromConstMem (data, datalen);
2346} 2783}
2347 OUTPUT: 2784 OUTPUT:
2348 RETVAL 2785 RETVAL
2349 2786
2350CFPlus::RW 2787DC::RW
2351new_from_file (SV *class, const char *path, const char *mode = "rb") 2788new_from_file (SV *class, const char *path, const char *mode = "rb")
2352 CODE: 2789 CODE:
2353 RETVAL = SDL_RWFromFile (path, mode); 2790 RETVAL = SDL_RWFromFile (path, mode);
2354 OUTPUT: 2791 OUTPUT:
2355 RETVAL 2792 RETVAL
2356 2793
2357# fails on win32: 2794# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '(' 2795# dc.xs(2268) : error C2059: syntax error : '('
2359#void 2796#void
2360#close (CFPlus::RW self) 2797#close (DC::RW self)
2361# CODE: 2798# CODE:
2362# (self->(close)) (self); 2799# (self->(close)) (self);
2363 2800
2364MODULE = CFPlus PACKAGE = CFPlus::Channel 2801MODULE = Deliantra::Client PACKAGE = DC::Channel
2365 2802
2366PROTOTYPES: DISABLE 2803PROTOTYPES: DISABLE
2367 2804
2368CFPlus::Channel 2805DC::Channel
2369find () 2806find ()
2370 CODE: 2807 CODE:
2371{ 2808{
2372 RETVAL = Mix_GroupAvailable (-1); 2809 RETVAL = Mix_GroupAvailable (-1);
2373 2810
2374 if (RETVAL < 0) 2811 if (RETVAL < 0)
2375 { 2812 {
2376 RETVAL = Mix_GroupOldest (-1); 2813 RETVAL = Mix_GroupOldest (-1);
2377 2814
2378 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)
2379 XSRETURN_UNDEF; 2821 XSRETURN_UNDEF;
2380 2822 }
2823 else
2381 Mix_HaltChannel (RETVAL); 2824 Mix_HaltChannel (RETVAL);
2382 } 2825 }
2383 2826
2384 Mix_UnregisterAllEffects (RETVAL); 2827 Mix_UnregisterAllEffects (RETVAL);
2385 Mix_Volume (RETVAL, 128); 2828 Mix_Volume (RETVAL, 128);
2386} 2829}
2387 OUTPUT: 2830 OUTPUT:
2388 RETVAL 2831 RETVAL
2389 2832
2390void 2833void
2391halt (CFPlus::Channel self) 2834halt (DC::Channel self)
2392 CODE: 2835 CODE:
2393 Mix_HaltChannel (self); 2836 Mix_HaltChannel (self);
2394 2837
2395void 2838void
2396expire (CFPlus::Channel self, int ticks = -1) 2839expire (DC::Channel self, int ticks = -1)
2397 CODE: 2840 CODE:
2398 Mix_ExpireChannel (self, ticks); 2841 Mix_ExpireChannel (self, ticks);
2399 2842
2400void 2843void
2401fade_out (CFPlus::Channel self, int ticks = -1) 2844fade_out (DC::Channel self, int ticks = -1)
2402 CODE: 2845 CODE:
2403 Mix_FadeOutChannel (self, ticks); 2846 Mix_FadeOutChannel (self, ticks);
2404 2847
2405int 2848int
2406volume (CFPlus::Channel self, int volume) 2849volume (DC::Channel self, int volume)
2407 CODE: 2850 CODE:
2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2851 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409 OUTPUT: 2852 OUTPUT:
2410 RETVAL 2853 RETVAL
2411 2854
2412void 2855void
2413unregister_all_effects (CFPlus::Channel self) 2856unregister_all_effects (DC::Channel self)
2414 CODE: 2857 CODE:
2415 Mix_UnregisterAllEffects (self); 2858 Mix_UnregisterAllEffects (self);
2416 2859
2417void 2860void
2418set_panning (CFPlus::Channel self, int left, int right) 2861set_panning (DC::Channel self, int left, int right)
2419 CODE: 2862 CODE:
2420 left = CLAMP (left , 0, 255); 2863 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255); 2864 right = CLAMP (right, 0, 255);
2422 Mix_SetPanning (self, left, right); 2865 Mix_SetPanning (self, left, right);
2423 2866
2424void 2867void
2425set_distance (CFPlus::Channel self, int distance) 2868set_distance (DC::Channel self, int distance)
2426 CODE: 2869 CODE:
2427 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2870 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428 2871
2429void 2872void
2430set_position (CFPlus::Channel self, int angle, int distance) 2873set_position (DC::Channel self, int angle, int distance)
2431 CODE: 2874 CODE:
2432 2875
2433void 2876void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2877set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435 CODE: 2878 CODE:
2436{ 2879{
2437 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));
2438 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;
2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2882 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440} 2883}
2441 2884
2442void 2885void
2443set_reverse_stereo (CFPlus::Channel self, int flip) 2886set_reverse_stereo (DC::Channel self, int flip)
2444 CODE: 2887 CODE:
2445 Mix_SetReverseStereo (self, flip); 2888 Mix_SetReverseStereo (self, flip);
2446 2889
2447MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2890MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448 2891
2449PROTOTYPES: DISABLE 2892PROTOTYPES: DISABLE
2450 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
2451CFPlus::MixChunk 2906DC::MixChunk
2452new (SV *class, CFPlus::RW rwops) 2907new (SV *class, DC::RW rwops)
2453 CODE: 2908 CODE:
2454 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2909 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455 OUTPUT: 2910 OUTPUT:
2456 RETVAL 2911 RETVAL
2457 2912
2458void 2913void
2459DESTROY (CFPlus::MixChunk self) 2914DESTROY (DC::MixChunk self)
2460 CODE: 2915 CODE:
2461 Mix_FreeChunk (self); 2916 Mix_FreeChunk (self);
2462 2917
2463int 2918int
2464volume (CFPlus::MixChunk self, int volume = -1) 2919volume (DC::MixChunk self, int volume = -1)
2465 CODE: 2920 CODE:
2466 if (items > 1) 2921 if (items > 1)
2467 volume = CLAMP (volume, 0, 128); 2922 volume = CLAMP (volume, 0, 128);
2468 RETVAL = Mix_VolumeChunk (self, volume); 2923 RETVAL = Mix_VolumeChunk (self, volume);
2469 OUTPUT: 2924 OUTPUT:
2470 RETVAL 2925 RETVAL
2471 2926
2472CFPlus::Channel 2927DC::Channel
2473play (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)
2474 CODE: 2929 CODE:
2475{ 2930{
2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2931 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477 2932
2478 if (RETVAL < 0) 2933 if (RETVAL < 0)
… …
2485 } 2940 }
2486} 2941}
2487 OUTPUT: 2942 OUTPUT:
2488 RETVAL 2943 RETVAL
2489 2944
2490MODULE = 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
2491 2958
2492int 2959int
2493volume (int volume = -1) 2960volume (int volume = -1)
2494 PROTOTYPE: ;$ 2961 PROTOTYPE: ;$
2495 CODE: 2962 CODE:
… …
2507void 2974void
2508halt () 2975halt ()
2509 CODE: 2976 CODE:
2510 Mix_HaltMusic (); 2977 Mix_HaltMusic ();
2511 2978
2979int
2980playing ()
2981 CODE:
2982 RETVAL = Mix_PlayingMusic ();
2983 OUTPUT:
2984 RETVAL
2985
2512CFPlus::MixMusic 2986DC::MixMusic
2513new (SV *class, CFPlus::RW rwops) 2987new (SV *class, DC::RW rwops)
2514 CODE: 2988 CODE:
2515 RETVAL = Mix_LoadMUS_RW (rwops); 2989 RETVAL = Mix_LoadMUS_RW (rwops);
2516 OUTPUT: 2990 OUTPUT:
2517 RETVAL 2991 RETVAL
2518 2992
2519void 2993void
2520DESTROY (CFPlus::MixMusic self) 2994DESTROY (DC::MixMusic self)
2521 CODE: 2995 CODE:
2522 Mix_FreeMusic (self); 2996 Mix_FreeMusic (self);
2523 2997
2524int 2998int
2525play (CFPlus::MixMusic self, int loops = -1) 2999play (DC::MixMusic self, int loops = -1)
2526 CODE: 3000 CODE:
2527 RETVAL = Mix_PlayMusic (self, loops); 3001 RETVAL = Mix_PlayMusic (self, loops);
2528 OUTPUT: 3002 OUTPUT:
2529 RETVAL 3003 RETVAL
2530 3004
2531void 3005void
2532fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3006fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533 CODE: 3007 CODE:
2534 Mix_FadeInMusicPos (self, loops, ms, position); 3008 Mix_FadeInMusicPos (self, loops, ms, position);
2535 3009
2536MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3010MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537 3011
2538PROTOTYPES: ENABLE 3012PROTOTYPES: ENABLE
2539 3013
2540BOOT: 3014BOOT:
2541{ 3015{
2542 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3016 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543 static const struct { 3017 static const struct {
2544 const char *name; 3018 const char *name;
2545 IV iv; 3019 IV iv;
2546 } *civ, const_iv[] = { 3020 } *civ, const_iv[] = {
2547# define const_iv(name) { # name, (IV)name } 3021# define const_iv(name) { # name, (IV)name }
2548 const_iv (GL_VENDOR), 3022 const_iv (GL_VENDOR),
2549 const_iv (GL_VERSION), 3023 const_iv (GL_VERSION),
2550 const_iv (GL_EXTENSIONS), 3024 const_iv (GL_EXTENSIONS),
3025 const_iv (GL_MAX_TEXTURE_UNITS),
2551 const_iv (GL_COLOR_MATERIAL), 3026 const_iv (GL_COLOR_MATERIAL),
2552 const_iv (GL_SMOOTH), 3027 const_iv (GL_SMOOTH),
2553 const_iv (GL_FLAT), 3028 const_iv (GL_FLAT),
2554 const_iv (GL_DITHER), 3029 const_iv (GL_DITHER),
2555 const_iv (GL_BLEND), 3030 const_iv (GL_BLEND),
… …
2567 const_iv (GL_ZERO), 3042 const_iv (GL_ZERO),
2568 const_iv (GL_SRC_ALPHA), 3043 const_iv (GL_SRC_ALPHA),
2569 const_iv (GL_DST_ALPHA), 3044 const_iv (GL_DST_ALPHA),
2570 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3045 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2571 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),
2572 const_iv (GL_SRC_ALPHA_SATURATE), 3051 const_iv (GL_SRC_ALPHA_SATURATE),
2573 const_iv (GL_RGB), 3052 const_iv (GL_RGB),
2574 const_iv (GL_RGBA), 3053 const_iv (GL_RGBA),
2575 const_iv (GL_RGBA4), 3054 const_iv (GL_RGBA4),
2576 const_iv (GL_RGBA8), 3055 const_iv (GL_RGBA8),
… …
2644 const_iv (GL_NICEST), 3123 const_iv (GL_NICEST),
2645 const_iv (GL_V2F), 3124 const_iv (GL_V2F),
2646 const_iv (GL_V3F), 3125 const_iv (GL_V3F),
2647 const_iv (GL_T2F_V3F), 3126 const_iv (GL_T2F_V3F),
2648 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),
2649# undef const_iv 3131# undef const_iv
2650 }; 3132 };
2651 3133
2652 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; )
2653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3135 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2660disable_GL_EXT_blend_func_separate () 3142disable_GL_EXT_blend_func_separate ()
2661 CODE: 3143 CODE:
2662 gl.BlendFuncSeparate = 0; 3144 gl.BlendFuncSeparate = 0;
2663 gl.BlendFuncSeparateEXT = 0; 3145 gl.BlendFuncSeparateEXT = 0;
2664 3146
3147void
3148apple_nvidia_bug (int enable)
3149
2665char * 3150char *
2666gl_vendor () 3151gl_vendor ()
2667 CODE: 3152 CODE:
2668 RETVAL = (char *)glGetString (GL_VENDOR); 3153 RETVAL = (char *)glGetString (GL_VENDOR);
2669 OUTPUT: 3154 OUTPUT:
… …
2717void glBlendFunc (int sfactor, int dfactor) 3202void glBlendFunc (int sfactor, int dfactor)
2718 3203
2719void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3204void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2720 CODE: 3205 CODE:
2721 gl_BlendFuncSeparate (sa, da, saa, daa); 3206 gl_BlendFuncSeparate (sa, da, saa, daa);
3207
3208# void glBlendEquation (int se)
2722 3209
2723void glDepthMask (int flag) 3210void glDepthMask (int flag)
2724 3211
2725void glLogicOp (int opcode) 3212void glLogicOp (int opcode)
2726 3213
… …
2761void glRotate (float angle, float x, float y, float z) 3248void glRotate (float angle, float x, float y, float z)
2762 CODE: 3249 CODE:
2763 glRotatef (angle, x, y, z); 3250 glRotatef (angle, x, y, z);
2764 3251
2765void glColor (float r, float g, float b, float a = 1.0) 3252void glColor (float r, float g, float b, float a = 1.0)
3253 PROTOTYPE: @
2766 ALIAS: 3254 ALIAS:
2767 glColor_premultiply = 1 3255 glColor_premultiply = 1
2768 CODE: 3256 CODE:
2769 if (ix) 3257 if (ix)
2770 { 3258 {
… …
2840void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3328void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2841 CODE: 3329 CODE:
2842 if (gl.SeparableFilter2D) 3330 if (gl.SeparableFilter2D)
2843 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3331 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844 3332
2845void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3333void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846 3334
2847void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3335void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848 3336
2849void glDrawPixels (int width, int height, int format, int type, char *pixels) 3337void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850 3338
… …
2876 3364
2877void glEndList () 3365void glEndList ()
2878 3366
2879void glCallList (int list) 3367void glCallList (int list)
2880 3368
2881MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3369void c_init ()
3370 CODE:
3371 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3372 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3373
3374MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882 3375
2883PROTOTYPES: DISABLE 3376PROTOTYPES: DISABLE
2884 3377
2885void 3378void
2886find_widget (SV *self, NV x, NV y) 3379find_widget (SV *self, NV x, NV y)
… …
2890 XPUSHs (self); 3383 XPUSHs (self);
2891} 3384}
2892 3385
2893BOOT: 3386BOOT:
2894{ 3387{
2895 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3388 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896 3389
2897 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3390 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2898 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3391 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2899 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3392 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2900 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3393 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901} 3394}
2902 3395
2903void 3396void
2904draw (SV *self) 3397draw (SV *self)
2905 CODE: 3398 CODE:
… …
2912 SV *draw_w_sv = GvSV (draw_w_gv); 3405 SV *draw_w_sv = GvSV (draw_w_gv);
2913 SV *draw_h_sv = GvSV (draw_h_gv); 3406 SV *draw_h_sv = GvSV (draw_h_gv);
2914 double draw_x, draw_y; 3407 double draw_x, draw_y;
2915 3408
2916 if (!SvROK (self)) 3409 if (!SvROK (self))
2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3410 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918 3411
2919 hv = (HV *)SvRV (self); 3412 hv = (HV *)SvRV (self);
2920 3413
2921 if (SvTYPE (hv) != SVt_PVHV) 3414 if (SvTYPE (hv) != SVt_PVHV)
2922 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3415 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923 3416
2924 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3417 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2925 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3418 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926 3419
2927 if (!h || !w) 3420 if (!h || !w)

Diff Legend

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