ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.235 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.298 by root, Tue Dec 22 00:46:05 2009 UTC

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

Diff Legend

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