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.299 by root, Tue Dec 22 01:37:41 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
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
741 } 938 }
742} 939}
743 OUTPUT: 940 OUTPUT:
744 RETVAL 941 RETVAL
745 942
… …
749char * 946char *
750SDL_GetKeyName (int sym) 947SDL_GetKeyName (int sym)
751 948
752int 949int
753SDL_GetAppState () 950SDL_GetAppState ()
951
952int
953SDL_GetModState ()
754 954
755void 955void
756poll_events () 956poll_events ()
757 PPCODE: 957 PPCODE:
758{ 958{
… …
768 { 968 {
769 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
770 case SDL_KEYUP: 970 case SDL_KEYUP:
771 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 973 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
774 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 974 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
775 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776 break; 976 break;
777 977
778 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
779 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
797 x = ev.motion.x; 997 x = ev.motion.x;
798 y = ev.motion.y; 998 y = ev.motion.y;
799 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800 } 1000 }
801 1001
802 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
803 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
804 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
805 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
806 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808 } 1008 }
809 break; 1009 break;
810 1010
811 case SDL_MOUSEBUTTONDOWN: 1011 case SDL_MOUSEBUTTONDOWN:
812 case SDL_MOUSEBUTTONUP: 1012 case SDL_MOUSEBUTTONUP:
813 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1013 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814 1014
815 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1015 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1016 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1017 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1018 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
823 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1023 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1024 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825 break; 1025 break;
826 } 1026 }
827 1027
828 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1028 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
829 } 1029 }
830} 1030}
831 1031
832int 1032int
833Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1033Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
834 POSTCALL: 1034 POSTCALL:
835 Mix_HookMusicFinished (music_finished); 1035 Mix_HookMusicFinished (music_finished);
836 Mix_ChannelFinished (channel_finished); 1036 Mix_ChannelFinished (channel_finished);
1037
1038void
1039Mix_QuerySpec ()
1040 PPCODE:
1041{
1042 int freq, channels;
1043 Uint16 format;
1044
1045 if (Mix_QuerySpec (&freq, &format, &channels))
1046 {
1047 EXTEND (SP, 3);
1048 PUSHs (sv_2mortal (newSViv (freq)));
1049 PUSHs (sv_2mortal (newSViv (format)));
1050 PUSHs (sv_2mortal (newSViv (channels)));
1051 }
1052}
837 1053
838void 1054void
839Mix_CloseAudio () 1055Mix_CloseAudio ()
840 1056
841int 1057int
… …
876 } 1092 }
877 } 1093 }
878#endif 1094#endif
879} 1095}
880 1096
881void 1097int
882add_font (char *file) 1098add_font (char *file)
883 CODE: 1099 CODE:
884 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1100 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1101 OUTPUT:
1102 RETVAL
885 1103
886void 1104void
887load_image_inline (SV *image_) 1105load_image_inline (SV *image_)
888 ALIAS: 1106 ALIAS:
889 load_image_file = 1 1107 load_image_file = 1
… …
975void 1193void
976error (char *message) 1194error (char *message)
977 CODE: 1195 CODE:
978 fprintf (stderr, "ERROR: %s\n", message); 1196 fprintf (stderr, "ERROR: %s\n", message);
979#ifdef _WIN32 1197#ifdef _WIN32
980 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1198 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
981#endif 1199#endif
982 1200
983void 1201void
984fatal (char *message) 1202fatal (char *message)
985 CODE: 1203 CODE:
986 fprintf (stderr, "FATAL: %s\n", message); 1204 fprintf (stderr, "FATAL: %s\n", message);
987#ifdef _WIN32 1205#ifdef _WIN32
988 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1206 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
989#endif 1207#endif
990 _exit (1); 1208 _exit (1);
991 1209
992void 1210void
993_exit (int retval = 0) 1211_exit (int retval = 0)
… …
1005#if DEBUG 1223#if DEBUG
1006 VALGRIND_DO_LEAK_CHECK; 1224 VALGRIND_DO_LEAK_CHECK;
1007#endif 1225#endif
1008} 1226}
1009 1227
1010MODULE = CFPlus PACKAGE = CFPlus::Font 1228int
1229SvREFCNT (SV *sv)
1230 CODE:
1231 RETVAL = SvREFCNT (sv);
1232 OUTPUT:
1233 RETVAL
1234
1235MODULE = Deliantra::Client PACKAGE = DC::Font
1011 1236
1012PROTOTYPES: DISABLE 1237PROTOTYPES: DISABLE
1013 1238
1014CFPlus::Font 1239DC::Font
1015new_from_file (SV *class, char *path, int id = 0) 1240new_from_file (SV *class, char *path, int id = 0)
1016 CODE: 1241 CODE:
1017{ 1242{
1018 int count; 1243 int count;
1019 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1244 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
1022} 1247}
1023 OUTPUT: 1248 OUTPUT:
1024 RETVAL 1249 RETVAL
1025 1250
1026void 1251void
1027DESTROY (CFPlus::Font self) 1252DESTROY (DC::Font self)
1028 CODE: 1253 CODE:
1029 pango_font_description_free (self); 1254 pango_font_description_free (self);
1030 1255
1031void 1256void
1032make_default (CFPlus::Font self) 1257make_default (DC::Font self)
1033 PROTOTYPE: $ 1258 PROTOTYPE: $
1034 CODE: 1259 CODE:
1035 default_font = self; 1260 default_font = self;
1036 1261
1037MODULE = CFPlus PACKAGE = CFPlus::Layout 1262MODULE = Deliantra::Client PACKAGE = DC::Layout
1038 1263
1039PROTOTYPES: DISABLE 1264PROTOTYPES: DISABLE
1040 1265
1041void 1266void
1042reset_glyph_cache () 1267glyph_cache_backup ()
1043 PROTOTYPE: 1268 PROTOTYPE:
1044 CODE: 1269 CODE:
1270 tc_backup ();
1271
1272void
1273glyph_cache_restore ()
1274 PROTOTYPE:
1275 CODE:
1045 tc_clear (); 1276 tc_restore ();
1046 1277
1047CFPlus::Layout 1278DC::Layout
1048new (SV *class) 1279new (SV *class)
1049 CODE: 1280 CODE:
1050 New (0, RETVAL, 1, struct cf_layout); 1281 New (0, RETVAL, 1, struct cf_layout);
1051 1282
1052 RETVAL->pl = pango_layout_new (opengl_context); 1283 RETVAL->pl = pango_layout_new (opengl_context);
… …
1062 layout_update_font (RETVAL); 1293 layout_update_font (RETVAL);
1063 OUTPUT: 1294 OUTPUT:
1064 RETVAL 1295 RETVAL
1065 1296
1066void 1297void
1067DESTROY (CFPlus::Layout self) 1298DESTROY (DC::Layout self)
1068 CODE: 1299 CODE:
1069 g_object_unref (self->pl); 1300 g_object_unref (self->pl);
1070 rc_free (self->rc); 1301 rc_free (self->rc);
1071 Safefree (self); 1302 Safefree (self);
1072 1303
1073void 1304void
1074set_text (CFPlus::Layout self, SV *text_) 1305set_text (DC::Layout self, SV *text_)
1075 CODE: 1306 CODE:
1076{ 1307{
1077 STRLEN textlen; 1308 STRLEN textlen;
1078 char *text = SvPVutf8 (text_, textlen); 1309 char *text = SvPVutf8 (text_, textlen);
1079 1310
1080 pango_layout_set_text (self->pl, text, textlen); 1311 pango_layout_set_text (self->pl, text, textlen);
1081} 1312}
1082 1313
1083void 1314void
1084set_markup (CFPlus::Layout self, SV *text_) 1315set_markup (DC::Layout self, SV *text_)
1085 CODE: 1316 CODE:
1086{ 1317{
1087 STRLEN textlen; 1318 STRLEN textlen;
1088 char *text = SvPVutf8 (text_, textlen); 1319 char *text = SvPVutf8 (text_, textlen);
1089 1320
1090 pango_layout_set_markup (self->pl, text, textlen); 1321 pango_layout_set_markup (self->pl, text, textlen);
1091} 1322}
1092 1323
1093void 1324void
1094set_shapes (CFPlus::Layout self, ...) 1325set_shapes (DC::Layout self, ...)
1095 CODE: 1326 CODE:
1096{ 1327{
1097 PangoAttrList *attrs = 0; 1328 PangoAttrList *attrs = 0;
1098 const char *text = pango_layout_get_text (self->pl); 1329 const char *text = pango_layout_get_text (self->pl);
1099 const char *pos = text; 1330 const char *pos = text;
… …
1134 if (attrs) 1365 if (attrs)
1135 pango_layout_set_attributes (self->pl, attrs); 1366 pango_layout_set_attributes (self->pl, attrs);
1136} 1367}
1137 1368
1138void 1369void
1139get_shapes (CFPlus::Layout self) 1370get_shapes (DC::Layout self)
1140 PPCODE: 1371 PPCODE:
1141{ 1372{
1142 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1373 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143 1374
1144 do 1375 do
1145 { 1376 {
1146 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1377 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147 1378
1148 if (run && shape_attr_p (run)) 1379 if (run && shape_attr_p (run))
1149 { 1380 {
1150 PangoRectangle extents; 1381 PangoRectangle extents;
1151 pango_layout_iter_get_run_extents (iter, 0, &extents); 1382 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1159 1390
1160 pango_layout_iter_free (iter); 1391 pango_layout_iter_free (iter);
1161} 1392}
1162 1393
1163int 1394int
1164has_wrapped (CFPlus::Layout self) 1395has_wrapped (DC::Layout self)
1165 CODE: 1396 CODE:
1166{ 1397{
1167 int lines = 1; 1398 int lines = 1;
1168 const char *text = pango_layout_get_text (self->pl); 1399 const char *text = pango_layout_get_text (self->pl);
1169 1400
… …
1174} 1405}
1175 OUTPUT: 1406 OUTPUT:
1176 RETVAL 1407 RETVAL
1177 1408
1178SV * 1409SV *
1179get_text (CFPlus::Layout self) 1410get_text (DC::Layout self)
1180 CODE: 1411 CODE:
1181 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1412 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182 sv_utf8_decode (RETVAL); 1413 sv_utf8_decode (RETVAL);
1183 OUTPUT: 1414 OUTPUT:
1184 RETVAL 1415 RETVAL
1185 1416
1186void 1417void
1187set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1418set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1188 CODE: 1419 CODE:
1189 self->r = r; 1420 self->r = r;
1190 self->g = g; 1421 self->g = g;
1191 self->b = b; 1422 self->b = b;
1192 self->a = a; 1423 self->a = a;
1193 1424
1194void 1425void
1195set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1426set_font (DC::Layout self, DC::Font font = 0)
1196 CODE: 1427 CODE:
1197 if (self->font != font) 1428 if (self->font != font)
1198 { 1429 {
1199 self->font = font; 1430 self->font = font;
1200 layout_update_font (self); 1431 layout_update_font (self);
1201 } 1432 }
1202 1433
1203void 1434void
1204set_height (CFPlus::Layout self, int base_height) 1435set_height (DC::Layout self, int base_height)
1205 CODE: 1436 CODE:
1206 if (self->base_height != base_height) 1437 if (self->base_height != base_height)
1207 { 1438 {
1208 self->base_height = base_height; 1439 self->base_height = base_height;
1209 layout_update_font (self); 1440 layout_update_font (self);
1210 } 1441 }
1211 1442
1212void 1443void
1213set_width (CFPlus::Layout self, int max_width = -1) 1444set_width (DC::Layout self, int max_width = -1)
1214 CODE: 1445 CODE:
1215 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1446 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1216 1447
1217void 1448void
1218set_indent (CFPlus::Layout self, int indent) 1449set_indent (DC::Layout self, int indent)
1219 CODE: 1450 CODE:
1220 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1451 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221 1452
1222void 1453void
1223set_spacing (CFPlus::Layout self, int spacing) 1454set_spacing (DC::Layout self, int spacing)
1224 CODE: 1455 CODE:
1225 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1456 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226 1457
1227void 1458void
1228set_ellipsise (CFPlus::Layout self, int ellipsise) 1459set_ellipsise (DC::Layout self, int ellipsise)
1229 CODE: 1460 CODE:
1230 pango_layout_set_ellipsize (self->pl, 1461 pango_layout_set_ellipsize (self->pl,
1231 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1462 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1463 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1464 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234 : PANGO_ELLIPSIZE_NONE 1465 : PANGO_ELLIPSIZE_NONE
1235 ); 1466 );
1236 1467
1237void 1468void
1238set_single_paragraph_mode (CFPlus::Layout self, int spm) 1469set_single_paragraph_mode (DC::Layout self, int spm)
1239 CODE: 1470 CODE:
1240 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1471 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241 1472
1242void 1473void
1243size (CFPlus::Layout self) 1474size (DC::Layout self)
1244 PPCODE: 1475 PPCODE:
1245{ 1476{
1246 int w, h; 1477 int w, h;
1247 1478
1248 layout_get_pixel_size (self, &w, &h); 1479 layout_get_pixel_size (self, &w, &h);
… …
1251 PUSHs (sv_2mortal (newSViv (w))); 1482 PUSHs (sv_2mortal (newSViv (w)));
1252 PUSHs (sv_2mortal (newSViv (h))); 1483 PUSHs (sv_2mortal (newSViv (h)));
1253} 1484}
1254 1485
1255int 1486int
1256descent (CFPlus::Layout self) 1487descent (DC::Layout self)
1257 CODE: 1488 CODE:
1258{ 1489{
1259 PangoRectangle rect; 1490 PangoRectangle rect;
1260 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1491 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261 pango_layout_line_get_pixel_extents (line, 0, &rect); 1492 pango_layout_line_get_pixel_extents (line, 0, &rect);
1262 RETVAL = PANGO_DESCENT (rect); 1493 RETVAL = PANGO_DESCENT (rect);
1263} 1494}
1264 OUTPUT: 1495 OUTPUT:
1265 RETVAL 1496 RETVAL
1266 1497
1267int 1498int
1268xy_to_index (CFPlus::Layout self, int x, int y) 1499xy_to_index (DC::Layout self, int x, int y)
1269 CODE: 1500 CODE:
1270{ 1501{
1271 int index, trailing; 1502 int index, trailing;
1272 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1503 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1273 RETVAL = index + trailing; 1504 RETVAL = index + trailing;
1274} 1505}
1275 OUTPUT: 1506 OUTPUT:
1276 RETVAL 1507 RETVAL
1277 1508
1278void 1509void
1279cursor_pos (CFPlus::Layout self, int index) 1510cursor_pos (DC::Layout self, int index)
1280 PPCODE: 1511 PPCODE:
1281{ 1512{
1282 PangoRectangle strong_pos; 1513 PangoRectangle pos;
1283 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1514 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284 1515
1285 EXTEND (SP, 3); 1516 EXTEND (SP, 3);
1286 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1517 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1518 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1519 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289} 1520}
1290 1521
1291void 1522void
1292index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1523index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293 PPCODE: 1524 PPCODE:
1294{ 1525{
1295 int line, x; 1526 int line, x;
1296 1527
1297 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1528 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1529#if !PANGO_VERSION_CHECK (1, 17, 3)
1298 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1530 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299 1531 --line;
1532#endif
1300 EXTEND (SP, 2); 1533 EXTEND (SP, 2);
1301 PUSHs (sv_2mortal (newSViv (line - 1))); 1534 PUSHs (sv_2mortal (newSViv (line)));
1302 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1535 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303} 1536}
1304 1537
1305void 1538void
1306line_x_to_index (CFPlus::Layout self, int line, int x) 1539line_x_to_index (DC::Layout self, int line, int x)
1307 PPCODE: 1540 PPCODE:
1308{ 1541{
1309 PangoLayoutLine *lp; 1542 PangoLayoutLine *lp;
1310 int index, trailing; 1543 int index, trailing;
1311 1544
1312 if (line < 0) 1545 if (line < 0)
1313 XSRETURN_EMPTY; 1546 XSRETURN_EMPTY;
1314 1547
1315 if (!(lp = pango_layout_get_line (self->pl, line))) 1548 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316 XSRETURN_EMPTY; /* do better */ 1549 XSRETURN_EMPTY; /* do better */
1317 1550
1318 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1551 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1319 1552
1320 EXTEND (SP, 2); 1553 EXTEND (SP, 2);
… …
1326 PUSHs (sv_2mortal (newSViv (trailing))); 1559 PUSHs (sv_2mortal (newSViv (trailing)));
1327 } 1560 }
1328} 1561}
1329 1562
1330void 1563void
1331render (CFPlus::Layout self, float x, float y, int flags = 0) 1564render (DC::Layout self, float x, float y, int flags = 0)
1332 CODE: 1565 CODE:
1333 rc_clear (self->rc); 1566 rc_clear (self->rc);
1334 pango_opengl_render_layout_subpixel ( 1567 pango_opengl_render_layout_subpixel (
1335 self->pl, 1568 self->pl,
1336 self->rc, 1569 self->rc,
… …
1341 // we assume that context_change actually clears/frees stuff 1574 // we assume that context_change actually clears/frees stuff
1342 // and does not do any recomputation... 1575 // and does not do any recomputation...
1343 pango_layout_context_changed (self->pl); 1576 pango_layout_context_changed (self->pl);
1344 1577
1345void 1578void
1346draw (CFPlus::Layout self) 1579draw (DC::Layout self)
1347 CODE: 1580 CODE:
1348{ 1581{
1349 glEnable (GL_TEXTURE_2D); 1582 glEnable (GL_TEXTURE_2D);
1350 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1583 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351 glEnable (GL_BLEND); 1584 glEnable (GL_BLEND);
… …
1359 glDisable (GL_ALPHA_TEST); 1592 glDisable (GL_ALPHA_TEST);
1360 glDisable (GL_BLEND); 1593 glDisable (GL_BLEND);
1361 glDisable (GL_TEXTURE_2D); 1594 glDisable (GL_TEXTURE_2D);
1362} 1595}
1363 1596
1364MODULE = CFPlus PACKAGE = CFPlus::Texture 1597MODULE = Deliantra::Client PACKAGE = DC::Texture
1365 1598
1366PROTOTYPES: ENABLE 1599PROTOTYPES: ENABLE
1367 1600
1368void 1601void
1369pad (SV *data_, int ow, int oh, int nw, int nh) 1602pad (SV *data_, int ow, int oh, int nw, int nh)
… …
1437 glDisable (GL_ALPHA_TEST); 1670 glDisable (GL_ALPHA_TEST);
1438 glDisable (GL_BLEND); 1671 glDisable (GL_BLEND);
1439 } 1672 }
1440} 1673}
1441 1674
1675void
1676draw_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)
1677 PROTOTYPE: @
1678 CODE:
1679{
1680 glEnable (GL_BLEND);
1681 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1682 glEnable (GL_TEXTURE_2D);
1683 glBindTexture (GL_TEXTURE_2D, name1);
1684
1685 glColor3f (intensity, intensity, intensity);
1686 glPushMatrix ();
1687 glScalef (1./3, 1./3, 1.);
1688
1689 if (blend > 0.f)
1690 {
1691 float dx3 = dx * -3.f / w;
1692 float dy3 = dy * -3.f / h;
1693 GLfloat env_color[4] = { 0., 0., 0., blend };
1694
1695 /* interpolate the two shadow textures */
1696 /* stage 0 == rgb(glcolor) + alpha(t0) */
1697 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1698
1699 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1700 gl.ActiveTexture (GL_TEXTURE1);
1701 glEnable (GL_TEXTURE_2D);
1702 glBindTexture (GL_TEXTURE_2D, name2);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1704
1705 /* rgb == rgb(glcolor) */
1706 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1707 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1708 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1709
1710 /* alpha = interpolate t0, t1 by env_alpha */
1711 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1712
1713 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1714 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1715 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1716
1717 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1718 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1719
1720 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1721 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1722
1723 glBegin (GL_QUADS);
1724 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1725 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1726 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1727 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1728 glEnd ();
1729
1730 glDisable (GL_TEXTURE_2D);
1731 gl.ActiveTexture (GL_TEXTURE0);
1732 }
1733 else
1734 {
1735 /* simple blending of one texture, also opengl <1.3 path */
1736 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1737
1738 glBegin (GL_QUADS);
1739 glTexCoord2f (0, 0); glVertex2f (0, 0);
1740 glTexCoord2f (0, t); glVertex2f (0, h);
1741 glTexCoord2f (s, t); glVertex2f (w, h);
1742 glTexCoord2f (s, 0); glVertex2f (w, 0);
1743 glEnd ();
1744 }
1745
1746 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1747 {
1748 int x, y;
1749 int dx3 = dx * 3;
1750 int dy3 = dy * 3;
1751
1752 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1753 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1754 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1755 glTranslatef (-1., -1., 0);
1756 glBegin (GL_QUADS);
1757
1758 for (y = 1; y < h; y += 3)
1759 {
1760 int y1 = y - dy3;
1761 int y1valid = y1 >= 0 && y1 < h;
1762
1763 for (x = 1; x < w; x += 3)
1764 {
1765 int x1 = x - dx3;
1766 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1767 uint8_t h2;
1768
1769 if (y1valid && x1 >= 0 && x1 < w)
1770 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1771 else
1772 h2 = 1; /* out of range == invisible */
1773
1774 if (h1 || h2)
1775 {
1776 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1777 glColor4f (1., 1., 1., alpha);
1778
1779 glTexCoord2f (0, 0.); glVertex2i (x , y );
1780 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1781 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1782 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1783 }
1784 }
1785 }
1786 }
1787
1788 glEnd ();
1789
1790 glPopMatrix ();
1791
1792 glDisable (GL_TEXTURE_2D);
1793 glDisable (GL_BLEND);
1794}
1795
1442IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1796IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1443 CODE: 1797 CODE:
1444{ 1798{
1445 GLint width; 1799 GLint width;
1446 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1800 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1448 RETVAL = width > 0; 1802 RETVAL = width > 0;
1449} 1803}
1450 OUTPUT: 1804 OUTPUT:
1451 RETVAL 1805 RETVAL
1452 1806
1453MODULE = CFPlus PACKAGE = CFPlus::Map 1807MODULE = Deliantra::Client PACKAGE = DC::Map
1454 1808
1455PROTOTYPES: DISABLE 1809PROTOTYPES: DISABLE
1456 1810
1457CFPlus::Map 1811DC::Map
1458new (SV *class) 1812new (SV *class)
1459 CODE: 1813 CODE:
1460 New (0, RETVAL, 1, struct map); 1814 New (0, RETVAL, 1, struct map);
1461 RETVAL->x = 0; 1815 RETVAL->x = 0;
1462 RETVAL->y = 0; 1816 RETVAL->y = 0;
… …
1470 RETVAL->row = 0; 1824 RETVAL->row = 0;
1471 OUTPUT: 1825 OUTPUT:
1472 RETVAL 1826 RETVAL
1473 1827
1474void 1828void
1475DESTROY (CFPlus::Map self) 1829DESTROY (DC::Map self)
1476 CODE: 1830 CODE:
1477{ 1831{
1478 map_clear (self); 1832 map_clear (self);
1479 Safefree (self->face2tile); 1833 Safefree (self->face2tile);
1480 Safefree (self->tex); 1834 Safefree (self->tex);
1481 Safefree (self); 1835 Safefree (self);
1482} 1836}
1483 1837
1484void 1838void
1485resize (CFPlus::Map self, int map_width, int map_height) 1839resize (DC::Map self, int map_width, int map_height)
1486 CODE: 1840 CODE:
1487 self->w = map_width; 1841 self->w = map_width;
1488 self->h = map_height; 1842 self->h = map_height;
1489 1843
1490void 1844void
1491clear (CFPlus::Map self) 1845clear (DC::Map self)
1492 CODE: 1846 CODE:
1493 map_clear (self); 1847 map_clear (self);
1494 1848
1495void 1849void
1496set_tileid (CFPlus::Map self, int face, int tile) 1850set_tileid (DC::Map self, int face, int tile)
1497 CODE: 1851 CODE:
1498{ 1852{
1499 need_facenum (self, face); self->face2tile [face] = tile; 1853 need_facenum (self, face); self->face2tile [face] = tile;
1500 need_texid (self, tile); 1854 need_texid (self, tile);
1501} 1855}
1502 1856
1503void 1857void
1504set_smooth (CFPlus::Map self, int face, int smooth, int level) 1858set_smooth (DC::Map self, int face, int smooth, int level)
1505 CODE: 1859 CODE:
1506{ 1860{
1507 tileid texid; 1861 tileid texid;
1508 maptex *tex; 1862 maptex *tex;
1509 1863
… …
1522 tex->smoothtile = self->face2tile [smooth]; 1876 tex->smoothtile = self->face2tile [smooth];
1523 tex->smoothlevel = level; 1877 tex->smoothlevel = level;
1524} 1878}
1525 1879
1526void 1880void
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) 1881set_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: 1882 CODE:
1529{ 1883{
1530 need_texid (self, texid); 1884 need_texid (self, texid);
1531 1885
1532 { 1886 {
… …
1551 // use uglier nearest interpolation because linear suffers 1905 // use uglier nearest interpolation because linear suffers
1552 // from transparent color bleeding and ugly wrapping effects. 1906 // from transparent color bleeding and ugly wrapping effects.
1553 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1907 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554} 1908}
1555 1909
1910void
1911expire_textures (DC::Map self, int texid, int count)
1912 PPCODE:
1913 for (; texid < self->texs && count; ++texid, --count)
1914 {
1915 maptex *tex = self->tex + texid;
1916
1917 if (tex->name)
1918 {
1919 if (tex->unused)
1920 {
1921 tex->name = 0;
1922 tex->unused = 0;
1923 XPUSHs (sv_2mortal (newSViv (texid)));
1924 }
1925 else
1926 tex->unused = 1;
1927 }
1928 }
1929
1556int 1930int
1557ox (CFPlus::Map self) 1931ox (DC::Map self)
1558 ALIAS: 1932 ALIAS:
1559 oy = 1 1933 oy = 1
1560 x = 2 1934 x = 2
1561 y = 3 1935 y = 3
1562 w = 4 1936 w = 4
… …
1573 } 1947 }
1574 OUTPUT: 1948 OUTPUT:
1575 RETVAL 1949 RETVAL
1576 1950
1577void 1951void
1578scroll (CFPlus::Map self, int dx, int dy) 1952scroll (DC::Map self, int dx, int dy)
1579 CODE: 1953 CODE:
1580{ 1954{
1581 if (dx > 0) 1955 if (dx > 0)
1582 map_blank (self, self->x, self->y, dx, self->h); 1956 map_blank (self, self->x, self->y, dx, self->h);
1583 else if (dx < 0) 1957 else if (dx < 0)
… …
1599 self->y += MAP_EXTEND_Y; 1973 self->y += MAP_EXTEND_Y;
1600 } 1974 }
1601} 1975}
1602 1976
1603SV * 1977SV *
1604map1a_update (CFPlus::Map self, SV *data_, int extmap) 1978map1a_update (DC::Map self, SV *data_, int extmap)
1605 CODE: 1979 CODE:
1606{ 1980{
1607 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1981 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1608 uint8_t *data_end = (uint8_t *)SvEND (data_); 1982 uint8_t *data_end = (uint8_t *)SvEND (data_);
1609 mapcell *cell; 1983 mapcell *cell;
… …
1637 uint8_t ext, cmd; 2011 uint8_t ext, cmd;
1638 2012
1639 do 2013 do
1640 { 2014 {
1641 ext = *data++; 2015 ext = *data++;
1642 cmd = ext & 0x3f; 2016 cmd = ext & 0x7f;
1643 2017
1644 if (cmd < 4) 2018 if (cmd < 4)
1645 cell->darkness = 255 - ext * 64 + 1; 2019 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1646 else if (cmd == 5) // health 2020 else if (cmd == 5) // health
1647 { 2021 {
1648 cell->stat_width = 1; 2022 cell->stat_width = 1;
1649 cell->stat_hp = *data++; 2023 cell->stat_hp = *data++;
1650 } 2024 }
1651 else if (cmd == 6) // monster width 2025 else if (cmd == 6) // monster width
1652 cell->stat_width = *data++ + 1; 2026 cell->stat_width = *data++ + 1;
1653 else if (cmd == 0x47) 2027 else if (cmd == 0x47)
1654 { 2028 {
1655 if (*data == 4) 2029 if (*data == 1) cell->player = data [1];
1656 ; // decode player count 2030 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2031 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2032 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1657 2033
1658 data += *data + 1; 2034 data += *data + 1;
1659 } 2035 }
1660 else if (cmd == 8) // cell flags 2036 else if (cmd == 8) // cell flags
1661 cell->flags = *data++; 2037 cell->flags = *data++;
… …
1678 cell->tile [z] = self->face2tile [face]; 2054 cell->tile [z] = self->face2tile [face];
1679 2055
1680 if (cell->tile [z]) 2056 if (cell->tile [z])
1681 { 2057 {
1682 maptex *tex = self->tex + cell->tile [z]; 2058 maptex *tex = self->tex + cell->tile [z];
2059 tex->unused = 0;
1683 if (!tex->name) 2060 if (!tex->name)
1684 av_push (missing, newSViv (cell->tile [z])); 2061 av_push (missing, newSViv (cell->tile [z]));
1685 2062
1686 if (tex->smoothtile) 2063 if (tex->smoothtile)
1687 { 2064 {
1688 maptex *smooth = self->tex + tex->smoothtile; 2065 maptex *smooth = self->tex + tex->smoothtile;
2066 smooth->unused = 0;
1689 if (!smooth->name) 2067 if (!smooth->name)
1690 av_push (missing, newSViv (tex->smoothtile)); 2068 av_push (missing, newSViv (tex->smoothtile));
1691 } 2069 }
1692 } 2070 }
1693 } 2071 }
1694 } 2072 }
1695 else 2073 else
1696 cell->darkness = 0; 2074 CELL_CLEAR (cell);
1697 } 2075 }
1698} 2076}
1699 OUTPUT: 2077 OUTPUT:
1700 RETVAL 2078 RETVAL
1701 2079
1702SV * 2080SV *
1703mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2081mapmap (DC::Map self, int x0, int y0, int w, int h)
1704 CODE: 2082 CODE:
1705{ 2083{
1706 int x1, x; 2084 int x1, x;
1707 int y1, y; 2085 int y1, y;
1708 int z; 2086 int z;
… …
1753} 2131}
1754 OUTPUT: 2132 OUTPUT:
1755 RETVAL 2133 RETVAL
1756 2134
1757void 2135void
1758draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2136draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1759 CODE: 2137 CODE:
1760{ 2138{
1761 int x, y, z; 2139 int x, y, z;
1762 2140
1763 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2141 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1764 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2142 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) 2143 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1766 smooth_key skey; 2144 smooth_key skey;
1767 2145 int pl_x, pl_y;
2146 maptex pl_tex;
1768 rc_t *rc = rc_alloc (); 2147 rc_t *rc = rc_alloc ();
2148 rc_t *rc_ov = rc_alloc ();
1769 rc_key_t key; 2149 rc_key_t key;
1770 rc_array_t *arr; 2150 rc_array_t *arr;
1771 2151
2152 pl_tex.name = 0;
2153
1772 // thats current max. sorry. 2154 // that's current max. sorry.
1773 if (sw > 255) sw = 255; 2155 if (sw > 255) sw = 255;
1774 if (sh > 255) sh = 255; 2156 if (sh > 255) sh = 255;
1775 2157
1776 // clear key, in case of extra padding 2158 // clear key, in case of extra padding
1777 memset (&skey, 0, sizeof (skey)); 2159 memset (&skey, 0, sizeof (skey));
… …
1781 key.g = 255; 2163 key.g = 255;
1782 key.b = 255; 2164 key.b = 255;
1783 key.a = 255; 2165 key.a = 255;
1784 key.mode = GL_QUADS; 2166 key.mode = GL_QUADS;
1785 key.format = GL_T2F_V3F; 2167 key.format = GL_T2F_V3F;
1786 key.texname = -1;
1787 2168
1788 mx += self->x; 2169 mx += self->x;
1789 my += self->y; 2170 my += self->y;
1790 2171
1791 // first pass: determine smooth_max 2172 // first pass: determine smooth_max
… …
1815 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2196 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1816 2197
1817 for (z = 0; z <= 2; z++) 2198 for (z = 0; z <= 2; z++)
1818 { 2199 {
1819 memset (smooth_level, 0, sizeof (smooth_level)); 2200 memset (smooth_level, 0, sizeof (smooth_level));
2201 key.texname = -1;
1820 2202
1821 for (y = 0; y < sh; y++) 2203 for (y = 0; y < sh; y++)
1822 if (0 <= y + my && y + my < self->rows) 2204 if (0 <= y + my && y + my < self->rows)
1823 { 2205 {
1824 maprow *row = self->row + (y + my); 2206 maprow *row = self->row + (y + my);
… …
1834 maptex tex = self->tex [tile]; 2216 maptex tex = self->tex [tile];
1835 int px, py; 2217 int px, py;
1836 2218
1837 if (key.texname != tex.name) 2219 if (key.texname != tex.name)
1838 { 2220 {
2221 self->tex [tile].unused = 0;
2222
1839 if (!tex.name) 2223 if (!tex.name)
1840 tex = self->tex [2]; /* missing, replace by noface */ 2224 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1841 2225
1842 key.texname = tex.name; 2226 key.texname = tex.name;
1843 arr = rc_array (rc, &key); 2227 arr = rc_array (rc, &key);
1844 } 2228 }
1845 2229
1846 px = (x + 1) * T - tex.w; 2230 px = (x + 1) * T - tex.w;
1847 py = (y + 1) * T - tex.h; 2231 py = (y + 1) * T - tex.h;
2232
2233 if (expect_false (cell->player == player) && expect_false (z == 2))
2234 {
2235 pl_x = px;
2236 pl_y = py;
2237 pl_tex = tex;
2238 continue;
2239 }
1848 2240
1849 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2241 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1850 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2242 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); 2243 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); 2244 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 2245
1879 // update smooth hash 2246 // update smooth hash
1880 if (tex.smoothtile) 2247 if (tex.smoothtile)
1881 { 2248 {
1882 skey.tile = tex.smoothtile; 2249 skey.tile = tex.smoothtile;
… …
1911 // corners 2278 // corners
1912 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2279 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); 2280 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); 2281 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); 2282 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2283 }
2284 }
2285
2286 if (expect_false (z == 2) && expect_false (cell->flags))
2287 {
2288 // overlays such as the speech bubble, probably more to come
2289 if (cell->flags & 1)
2290 {
2291 rc_key_t key_ov = key;
2292 maptex tex = self->tex [TEXID_SPEECH];
2293 rc_array_t *arr;
2294 int px = x * T + T * 2 / 32;
2295 int py = y * T - T * 6 / 32;
2296
2297 key_ov.texname = tex.name;
2298 arr = rc_array (rc_ov, &key_ov);
2299
2300 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2301 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2302 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2303 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1916 } 2304 }
1917 } 2305 }
1918 } 2306 }
1919 } 2307 }
1920 2308
… …
1960 { 2348 {
1961 // this time avoiding texture state changes 2349 // this time avoiding texture state changes
1962 // save gobs of state changes. 2350 // save gobs of state changes.
1963 if (key.texname != tex.name) 2351 if (key.texname != tex.name)
1964 { 2352 {
2353 self->tex [skey->tile].unused = 0;
2354
1965 glEnd (); 2355 glEnd ();
1966 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2356 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1967 glBegin (GL_QUADS); 2357 glBegin (GL_QUADS);
1968 } 2358 }
1969 2359
… …
1998 } 2388 }
1999 2389
2000 hv_clear (smooth); 2390 hv_clear (smooth);
2001 } 2391 }
2002 2392
2393 if (pl_tex.name)
2394 {
2395 maptex tex = pl_tex;
2396 int px = pl_x + sdx;
2397 int py = pl_y + sdy;
2398
2399 key.texname = tex.name;
2400 arr = rc_array (rc, &key);
2401
2402 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2403 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2404 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2405 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2406
2407 rc_draw (rc);
2408 }
2409
2410 rc_draw (rc_ov);
2411 rc_clear (rc_ov);
2412
2003 glDisable (GL_BLEND); 2413 glDisable (GL_BLEND);
2004 rc_free (rc); 2414 rc_free (rc);
2415 rc_free (rc_ov);
2005 2416
2006 // top layer: overlays such as the health bar 2417 // top layer: overlays such as the health bar
2007 for (y = 0; y < sh; y++) 2418 for (y = 0; y < sh; y++)
2008 if (0 <= y + my && y + my < self->rows) 2419 if (0 <= y + my && y + my < self->rows)
2009 { 2420 {
… …
2014 { 2425 {
2015 mapcell *cell = row->col + (x + mx - row->c0); 2426 mapcell *cell = row->col + (x + mx - row->c0);
2016 2427
2017 int px = x * T; 2428 int px = x * T;
2018 int py = y * T; 2429 int py = y * T;
2430
2431 if (expect_false (cell->player == player))
2432 {
2433 px += sdx;
2434 py += sdy;
2435 }
2019 2436
2020 if (cell->stat_hp) 2437 if (cell->stat_hp)
2021 { 2438 {
2022 int width = cell->stat_width * T; 2439 int width = cell->stat_width * T;
2023 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2440 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2034 } 2451 }
2035 } 2452 }
2036} 2453}
2037 2454
2038void 2455void
2039draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2456draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2040 CODE: 2457 CODE:
2041{ 2458{
2042 static float color[16][3] = { 2459 static float color[16][3] = {
2043 { 0.00F, 0.00F, 0.00F }, 2460 { 0.00f, 0.00f, 0.00f },
2044 { 1.00F, 1.00F, 1.00F }, 2461 { 1.00f, 1.00f, 1.00f },
2045 { 0.00F, 0.00F, 0.55F }, 2462 { 0.00f, 0.00f, 0.55f },
2046 { 1.00F, 0.00F, 0.00F }, 2463 { 1.00f, 0.00f, 0.00f },
2047 2464
2048 { 1.00F, 0.54F, 0.00F }, 2465 { 1.00f, 0.54f, 0.00f },
2049 { 0.11F, 0.56F, 1.00F }, 2466 { 0.11f, 0.56f, 1.00f },
2050 { 0.93F, 0.46F, 0.00F }, 2467 { 0.93f, 0.46f, 0.00f },
2051 { 0.18F, 0.54F, 0.34F }, 2468 { 0.18f, 0.54f, 0.34f },
2052 2469
2053 { 0.56F, 0.73F, 0.56F }, 2470 { 0.56f, 0.73f, 0.56f },
2054 { 0.80F, 0.80F, 0.80F }, 2471 { 0.80f, 0.80f, 0.80f },
2055 { 0.55F, 0.41F, 0.13F }, 2472 { 0.55f, 0.41f, 0.13f },
2056 { 0.99F, 0.77F, 0.26F }, 2473 { 0.99f, 0.77f, 0.26f },
2057 2474
2058 { 0.74F, 0.65F, 0.41F }, 2475 { 0.74f, 0.65f, 0.41f },
2059 2476
2060 { 0.00F, 1.00F, 1.00F }, 2477 { 0.00f, 1.00f, 1.00f },
2061 { 1.00F, 0.00F, 1.00F }, 2478 { 1.00f, 0.00f, 1.00f },
2062 { 1.00F, 1.00F, 0.00F }, 2479 { 1.00f, 1.00f, 0.00f },
2063 }; 2480 };
2064 2481
2065 int x, y; 2482 int x, y;
2066 2483
2067 glEnable (GL_TEXTURE_2D); 2484 glEnable (GL_TEXTURE_2D);
2485 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2486 * but the nvidia driver (185.18.14) mishandles alpha textures
2487 * and takes the colour from god knows where instead of using
2488 * Cp. MODULATE results in the same colour, but slightly different
2489 * alpha, but atcually gives us the correct colour with nvidia.
2490 */
2068 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2069 glEnable (GL_BLEND); 2492 glEnable (GL_BLEND);
2070 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2493 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2071 glBegin (GL_QUADS); 2494 glBegin (GL_QUADS);
2072 2495
2073 for (y = 0; y < h; y++) 2496 for (y = 0; y < h; y++)
… …
2077 2500
2078 if (m) 2501 if (m)
2079 { 2502 {
2080 float *c = color [m & 15]; 2503 float *c = color [m & 15];
2081 2504
2082 float tx1 = m & 0x40 ? 0.5 : 0.; 2505 float tx1 = m & 0x40 ? 0.5f : 0.f;
2083 float tx2 = tx1 + 0.5; 2506 float tx2 = tx1 + 0.5f;
2084 2507
2085 glColor4f (c[0], c[1], c[2], 0.75); 2508 glColor4f (c[0], c[1], c[2], 1);
2086 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2509 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2087 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2510 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2088 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2511 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2089 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2512 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2090 } 2513 }
… …
2094 glDisable (GL_BLEND); 2517 glDisable (GL_BLEND);
2095 glDisable (GL_TEXTURE_2D); 2518 glDisable (GL_TEXTURE_2D);
2096} 2519}
2097 2520
2098void 2521void
2099fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2522fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2100 PPCODE: 2523 PPCODE:
2101{ 2524{
2102 int x, y; 2525 int x, y;
2103 int sw1 = sw + 2; 2526 int sw1 = sw + 2;
2104 int sh1 = sh + 2; 2527 int sh1 = sh + 2;
2105 int sh3 = sh * 3; 2528 int sh3 = sh * 3;
2106 int sw34 = (sw * 3 + 3) & ~3; 2529 int sw3 = sw * 3;
2107 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2530 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2108 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2531 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2109 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2532 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2110 2533
2111 SvPOK_only (darkness3_sv); 2534 SvPOK_only (darkness3_sv);
2112 SvCUR_set (darkness3_sv, sw34 * sh3); 2535 SvCUR_set (darkness3_sv, sw3 * sh3);
2113 2536
2114 mx += self->x - 1; 2537 mx += self->x - 1;
2115 my += self->y - 1; 2538 my += self->y - 1;
2116
2117 memset (darkness1, 255, sw1 * sh1);
2118 2539
2119 for (y = 0; y < sh1; y++) 2540 for (y = 0; y < sh1; y++)
2120 if (0 <= y + my && y + my < self->rows) 2541 if (0 <= y + my && y + my < self->rows)
2121 { 2542 {
2122 maprow *row = self->row + (y + my); 2543 maprow *row = self->row + (y + my);
… …
2125 if (row->c0 <= x + mx && x + mx < row->c1) 2546 if (row->c0 <= x + mx && x + mx < row->c1)
2126 { 2547 {
2127 mapcell *cell = row->col + (x + mx - row->c0); 2548 mapcell *cell = row->col + (x + mx - row->c0);
2128 2549
2129 darkness1 [y * sw1 + x] = cell->darkness 2550 darkness1 [y * sw1 + x] = cell->darkness
2130 ? 255 - (cell->darkness - 1) 2551 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2131 : 255 - FOW_DARKNESS; 2552 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2132 } 2553 }
2133 } 2554 }
2134 2555
2135 for (y = 0; y < sh; ++y) 2556 for (y = 0; y < sh; ++y)
2136 for (x = 0; x < sw; ++x) 2557 for (x = 0; x < sw; ++x)
… …
2155 2576
2156 uint8_t r13 = (d13 + d23 + d12) / 3; 2577 uint8_t r13 = (d13 + d23 + d12) / 3;
2157 uint8_t r23 = d23; 2578 uint8_t r23 = d23;
2158 uint8_t r33 = (d23 + d33 + d32) / 3; 2579 uint8_t r33 = (d23 + d33 + d32) / 3;
2159 2580
2160 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2581 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2161 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2582 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2162 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2583 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2163 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2584 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2164 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2585 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); 2586 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2166 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2587 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2167 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2588 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2168 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2589 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2169 } 2590 }
2170 2591
2171 free (darkness1); 2592 free (darkness1);
2172 2593
2173 EXTEND (SP, 3); 2594 EXTEND (SP, 3);
2174 PUSHs (sv_2mortal (newSViv (sw34))); 2595 PUSHs (sv_2mortal (newSViv (sw3)));
2175 PUSHs (sv_2mortal (newSViv (sh3))); 2596 PUSHs (sv_2mortal (newSViv (sh3)));
2176 PUSHs (darkness3_sv); 2597 PUSHs (darkness3_sv);
2177} 2598}
2178 2599
2179SV * 2600SV *
2180get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2601get_rect (DC::Map self, int x0, int y0, int w, int h)
2181 CODE: 2602 CODE:
2182{ 2603{
2183 int x, y, x1, y1; 2604 int x, y, x1, y1;
2184 SV *data_sv = newSV (w * h * 7 + 5); 2605 SV *data_sv = newSV (w * h * 7 + 5);
2185 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2606 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2242 else 2663 else
2243 *data++ = 0; 2664 *data++ = 0;
2244 } 2665 }
2245 } 2666 }
2246 2667
2668 /* if size is w*h + 5 then no data has been found */
2669 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2670 {
2247 SvPOK_only (data_sv); 2671 SvPOK_only (data_sv);
2248 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2672 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2673 }
2674
2249 RETVAL = data_sv; 2675 RETVAL = data_sv;
2250} 2676}
2251 OUTPUT: 2677 OUTPUT:
2252 RETVAL 2678 RETVAL
2253 2679
2254void 2680void
2255set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2681set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2256 PPCODE: 2682 PPCODE:
2257{ 2683{
2258 int x, y, z; 2684 int x, y, z;
2259 int w, h; 2685 int w, h;
2260 int x1, y1; 2686 int x1, y1;
2687 STRLEN len;
2688 uint8_t *data, *end;
2689
2690 len = SvLEN (data_sv);
2691 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2692 data = SvPVbyte_nolen (data_sv);
2693 end = data + len + 8;
2694
2695 if (len < 5)
2696 XSRETURN_EMPTY;
2261 2697
2262 if (*data++ != 0) 2698 if (*data++ != 0)
2263 XSRETURN_EMPTY; /* version mismatch */ 2699 XSRETURN_EMPTY; /* version mismatch */
2264 2700
2265 w = *data++ << 8; w |= *data++; 2701 w = *data++ << 8; w |= *data++;
… …
2280 { 2716 {
2281 maprow *row = map_get_row (self, y); 2717 maprow *row = map_get_row (self, y);
2282 2718
2283 for (x = x0; x < x1; x++) 2719 for (x = x0; x < x1; x++)
2284 { 2720 {
2721 uint8_t flags;
2722
2723 if (data + 7 >= end)
2724 XSRETURN_EMPTY;
2725
2285 uint8_t flags = *data++; 2726 flags = *data++;
2286 2727
2287 if (flags) 2728 if (flags)
2288 { 2729 {
2289 mapcell *cell = row_get_cell (row, x); 2730 mapcell *cell = row_get_cell (row, x);
2290 tileid tile[3] = { 0, 0, 0 }; 2731 tileid tile[3] = { 0, 0, 0 };
… …
2293 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2734 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2294 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2735 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2295 2736
2296 if (cell->darkness == 0) 2737 if (cell->darkness == 0)
2297 { 2738 {
2298 cell->darkness = 0; 2739 /*cell->darkness = 0;*/
2740 EXTEND (SP, 3);
2299 2741
2300 for (z = 0; z <= 2; z++) 2742 for (z = 0; z <= 2; z++)
2301 { 2743 {
2302 tileid t = tile [z]; 2744 tileid t = tile [z];
2303 2745
2304 if (t >= self->texs || (t && !self->tex [t].name)) 2746 if (t >= self->texs || (t && !self->tex [t].name))
2305 { 2747 {
2306 XPUSHs (sv_2mortal (newSViv (t))); 2748 PUSHs (sv_2mortal (newSViv (t)));
2307 need_texid (self, t); 2749 need_texid (self, t);
2308 } 2750 }
2309 2751
2310 cell->tile [z] = t; 2752 cell->tile [z] = t;
2311 } 2753 }
… …
2313 } 2755 }
2314 } 2756 }
2315 } 2757 }
2316} 2758}
2317 2759
2318MODULE = CFPlus PACKAGE = CFPlus::RW 2760MODULE = Deliantra::Client PACKAGE = DC::RW
2319 2761
2320CFPlus::RW 2762DC::RW
2321new (SV *class, SV *data_sv) 2763new (SV *class, SV *data_sv)
2322 CODE: 2764 CODE:
2323{ 2765{
2324 STRLEN datalen; 2766 STRLEN datalen;
2325 char *data = SvPVbyte (data_sv, datalen); 2767 char *data = SvPVbyte (data_sv, datalen);
… …
2327 RETVAL = SDL_RWFromConstMem (data, datalen); 2769 RETVAL = SDL_RWFromConstMem (data, datalen);
2328} 2770}
2329 OUTPUT: 2771 OUTPUT:
2330 RETVAL 2772 RETVAL
2331 2773
2332CFPlus::RW 2774DC::RW
2333new_from_file (SV *class, const char *path, const char *mode = "rb") 2775new_from_file (SV *class, const char *path, const char *mode = "rb")
2334 CODE: 2776 CODE:
2335 RETVAL = SDL_RWFromFile (path, mode); 2777 RETVAL = SDL_RWFromFile (path, mode);
2336 OUTPUT: 2778 OUTPUT:
2337 RETVAL 2779 RETVAL
2338 2780
2339# fails on win32: 2781# fails on win32:
2340# CFPlus.xs(2268) : error C2059: syntax error : '(' 2782# dc.xs(2268) : error C2059: syntax error : '('
2341#void 2783#void
2342#close (CFPlus::RW self) 2784#close (DC::RW self)
2343# CODE: 2785# CODE:
2344# (self->(close)) (self); 2786# (self->(close)) (self);
2345 2787
2346MODULE = CFPlus PACKAGE = CFPlus::Channel 2788MODULE = Deliantra::Client PACKAGE = DC::Channel
2347 2789
2348PROTOTYPES: DISABLE 2790PROTOTYPES: DISABLE
2349 2791
2350CFPlus::Channel 2792DC::Channel
2351find () 2793find ()
2352 CODE: 2794 CODE:
2353{ 2795{
2354 RETVAL = Mix_GroupAvailable (-1); 2796 RETVAL = Mix_GroupAvailable (-1);
2355 2797
… …
2368} 2810}
2369 OUTPUT: 2811 OUTPUT:
2370 RETVAL 2812 RETVAL
2371 2813
2372void 2814void
2373halt (CFPlus::Channel self) 2815halt (DC::Channel self)
2374 CODE: 2816 CODE:
2375 Mix_HaltChannel (self); 2817 Mix_HaltChannel (self);
2376 2818
2377void 2819void
2378expire (CFPlus::Channel self, int ticks = -1) 2820expire (DC::Channel self, int ticks = -1)
2379 CODE: 2821 CODE:
2380 Mix_ExpireChannel (self, ticks); 2822 Mix_ExpireChannel (self, ticks);
2381 2823
2382void 2824void
2383fade_out (CFPlus::Channel self, int ticks = -1) 2825fade_out (DC::Channel self, int ticks = -1)
2384 CODE: 2826 CODE:
2385 Mix_FadeOutChannel (self, ticks); 2827 Mix_FadeOutChannel (self, ticks);
2386 2828
2387int 2829int
2388volume (CFPlus::Channel self, int volume) 2830volume (DC::Channel self, int volume)
2389 CODE: 2831 CODE:
2390 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2832 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391 OUTPUT: 2833 OUTPUT:
2392 RETVAL 2834 RETVAL
2393 2835
2394void 2836void
2395unregister_all_effects (CFPlus::Channel self) 2837unregister_all_effects (DC::Channel self)
2396 CODE: 2838 CODE:
2397 Mix_UnregisterAllEffects (self); 2839 Mix_UnregisterAllEffects (self);
2398 2840
2399void 2841void
2400set_panning (CFPlus::Channel self, int left, int right) 2842set_panning (DC::Channel self, int left, int right)
2401 CODE: 2843 CODE:
2402 left = CLAMP (left , 0, 255); 2844 left = CLAMP (left , 0, 255);
2403 right = CLAMP (right, 0, 255); 2845 right = CLAMP (right, 0, 255);
2404 Mix_SetPanning (self, left, right); 2846 Mix_SetPanning (self, left, right);
2405 2847
2406void 2848void
2407set_distance (CFPlus::Channel self, int distance) 2849set_distance (DC::Channel self, int distance)
2408 CODE: 2850 CODE:
2409 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2851 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410 2852
2411void 2853void
2412set_position (CFPlus::Channel self, int angle, int distance) 2854set_position (DC::Channel self, int angle, int distance)
2413 CODE: 2855 CODE:
2414 2856
2415void 2857void
2416set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2858set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417 CODE: 2859 CODE:
2418{ 2860{
2419 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2861 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); 2862 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2421 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2863 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422} 2864}
2423 2865
2424void 2866void
2425set_reverse_stereo (CFPlus::Channel self, int flip) 2867set_reverse_stereo (DC::Channel self, int flip)
2426 CODE: 2868 CODE:
2427 Mix_SetReverseStereo (self, flip); 2869 Mix_SetReverseStereo (self, flip);
2428 2870
2429MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2871MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430 2872
2431PROTOTYPES: DISABLE 2873PROTOTYPES: DISABLE
2432 2874
2433CFPlus::MixChunk 2875DC::MixChunk
2434new (SV *class, CFPlus::RW rwops) 2876new (SV *class, DC::RW rwops)
2435 CODE: 2877 CODE:
2436 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2878 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437 OUTPUT: 2879 OUTPUT:
2438 RETVAL 2880 RETVAL
2439 2881
2440void 2882void
2441DESTROY (CFPlus::MixChunk self) 2883DESTROY (DC::MixChunk self)
2442 CODE: 2884 CODE:
2443 Mix_FreeChunk (self); 2885 Mix_FreeChunk (self);
2444 2886
2445int 2887int
2446volume (CFPlus::MixChunk self, int volume = -1) 2888volume (DC::MixChunk self, int volume = -1)
2447 CODE: 2889 CODE:
2448 if (items > 1) 2890 if (items > 1)
2449 volume = CLAMP (volume, 0, 128); 2891 volume = CLAMP (volume, 0, 128);
2450 RETVAL = Mix_VolumeChunk (self, volume); 2892 RETVAL = Mix_VolumeChunk (self, volume);
2451 OUTPUT: 2893 OUTPUT:
2452 RETVAL 2894 RETVAL
2453 2895
2454CFPlus::Channel 2896DC::Channel
2455play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2897play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2456 CODE: 2898 CODE:
2457{ 2899{
2458 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2900 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459 2901
2460 if (RETVAL < 0) 2902 if (RETVAL < 0)
… …
2467 } 2909 }
2468} 2910}
2469 OUTPUT: 2911 OUTPUT:
2470 RETVAL 2912 RETVAL
2471 2913
2472MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2914MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2473 2915
2474int 2916int
2475volume (int volume = -1) 2917volume (int volume = -1)
2476 PROTOTYPE: ;$ 2918 PROTOTYPE: ;$
2477 CODE: 2919 CODE:
… …
2489void 2931void
2490halt () 2932halt ()
2491 CODE: 2933 CODE:
2492 Mix_HaltMusic (); 2934 Mix_HaltMusic ();
2493 2935
2494CFPlus::MixMusic 2936DC::MixMusic
2495new (SV *class, CFPlus::RW rwops) 2937new (SV *class, DC::RW rwops)
2496 CODE: 2938 CODE:
2497 RETVAL = Mix_LoadMUS_RW (rwops); 2939 RETVAL = Mix_LoadMUS_RW (rwops);
2498 OUTPUT: 2940 OUTPUT:
2499 RETVAL 2941 RETVAL
2500 2942
2501void 2943void
2502DESTROY (CFPlus::MixMusic self) 2944DESTROY (DC::MixMusic self)
2503 CODE: 2945 CODE:
2504 Mix_FreeMusic (self); 2946 Mix_FreeMusic (self);
2505 2947
2506int 2948int
2507play (CFPlus::MixMusic self, int loops = -1) 2949play (DC::MixMusic self, int loops = -1)
2508 CODE: 2950 CODE:
2509 RETVAL = Mix_PlayMusic (self, loops); 2951 RETVAL = Mix_PlayMusic (self, loops);
2510 OUTPUT: 2952 OUTPUT:
2511 RETVAL 2953 RETVAL
2512 2954
2513void 2955void
2514fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2956fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515 CODE: 2957 CODE:
2516 Mix_FadeInMusicPos (self, loops, ms, position); 2958 Mix_FadeInMusicPos (self, loops, ms, position);
2517 2959
2518MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2960MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519 2961
2520PROTOTYPES: ENABLE 2962PROTOTYPES: ENABLE
2521 2963
2522BOOT: 2964BOOT:
2523{ 2965{
2524 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2966 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525 static const struct { 2967 static const struct {
2526 const char *name; 2968 const char *name;
2527 IV iv; 2969 IV iv;
2528 } *civ, const_iv[] = { 2970 } *civ, const_iv[] = {
2529# define const_iv(name) { # name, (IV)name } 2971# define const_iv(name) { # name, (IV)name }
2530 const_iv (GL_VENDOR), 2972 const_iv (GL_VENDOR),
2531 const_iv (GL_VERSION), 2973 const_iv (GL_VERSION),
2532 const_iv (GL_EXTENSIONS), 2974 const_iv (GL_EXTENSIONS),
2975 const_iv (GL_MAX_TEXTURE_UNITS),
2533 const_iv (GL_COLOR_MATERIAL), 2976 const_iv (GL_COLOR_MATERIAL),
2534 const_iv (GL_SMOOTH), 2977 const_iv (GL_SMOOTH),
2535 const_iv (GL_FLAT), 2978 const_iv (GL_FLAT),
2536 const_iv (GL_DITHER), 2979 const_iv (GL_DITHER),
2537 const_iv (GL_BLEND), 2980 const_iv (GL_BLEND),
… …
2549 const_iv (GL_ZERO), 2992 const_iv (GL_ZERO),
2550 const_iv (GL_SRC_ALPHA), 2993 const_iv (GL_SRC_ALPHA),
2551 const_iv (GL_DST_ALPHA), 2994 const_iv (GL_DST_ALPHA),
2552 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2995 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2553 const_iv (GL_ONE_MINUS_DST_ALPHA), 2996 const_iv (GL_ONE_MINUS_DST_ALPHA),
2997 const_iv (GL_SRC_COLOR),
2998 const_iv (GL_DST_COLOR),
2999 const_iv (GL_ONE_MINUS_SRC_COLOR),
3000 const_iv (GL_ONE_MINUS_DST_COLOR),
2554 const_iv (GL_SRC_ALPHA_SATURATE), 3001 const_iv (GL_SRC_ALPHA_SATURATE),
2555 const_iv (GL_RGB), 3002 const_iv (GL_RGB),
2556 const_iv (GL_RGBA), 3003 const_iv (GL_RGBA),
2557 const_iv (GL_RGBA4), 3004 const_iv (GL_RGBA4),
2558 const_iv (GL_RGBA8), 3005 const_iv (GL_RGBA8),
… …
2626 const_iv (GL_NICEST), 3073 const_iv (GL_NICEST),
2627 const_iv (GL_V2F), 3074 const_iv (GL_V2F),
2628 const_iv (GL_V3F), 3075 const_iv (GL_V3F),
2629 const_iv (GL_T2F_V3F), 3076 const_iv (GL_T2F_V3F),
2630 const_iv (GL_T2F_N3F_V3F), 3077 const_iv (GL_T2F_N3F_V3F),
3078 const_iv (GL_FUNC_ADD),
3079 const_iv (GL_FUNC_SUBTRACT),
3080 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2631# undef const_iv 3081# undef const_iv
2632 }; 3082 };
2633 3083
2634 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3084 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2635 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3085 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2642disable_GL_EXT_blend_func_separate () 3092disable_GL_EXT_blend_func_separate ()
2643 CODE: 3093 CODE:
2644 gl.BlendFuncSeparate = 0; 3094 gl.BlendFuncSeparate = 0;
2645 gl.BlendFuncSeparateEXT = 0; 3095 gl.BlendFuncSeparateEXT = 0;
2646 3096
3097void
3098apple_nvidia_bug (int enable)
3099
2647char * 3100char *
2648gl_vendor () 3101gl_vendor ()
2649 CODE: 3102 CODE:
2650 RETVAL = (char *)glGetString (GL_VENDOR); 3103 RETVAL = (char *)glGetString (GL_VENDOR);
2651 OUTPUT: 3104 OUTPUT:
… …
2700 3153
2701void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3154void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2702 CODE: 3155 CODE:
2703 gl_BlendFuncSeparate (sa, da, saa, daa); 3156 gl_BlendFuncSeparate (sa, da, saa, daa);
2704 3157
3158# void glBlendEquation (int se)
3159
2705void glDepthMask (int flag) 3160void glDepthMask (int flag)
2706 3161
2707void glLogicOp (int opcode) 3162void glLogicOp (int opcode)
2708 3163
2709void glColorMask (int red, int green, int blue, int alpha) 3164void glColorMask (int red, int green, int blue, int alpha)
… …
2743void glRotate (float angle, float x, float y, float z) 3198void glRotate (float angle, float x, float y, float z)
2744 CODE: 3199 CODE:
2745 glRotatef (angle, x, y, z); 3200 glRotatef (angle, x, y, z);
2746 3201
2747void glColor (float r, float g, float b, float a = 1.0) 3202void glColor (float r, float g, float b, float a = 1.0)
3203 PROTOTYPE: @
2748 ALIAS: 3204 ALIAS:
2749 glColor_premultiply = 1 3205 glColor_premultiply = 1
2750 CODE: 3206 CODE:
2751 if (ix) 3207 if (ix)
2752 { 3208 {
… …
2822void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3278void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2823 CODE: 3279 CODE:
2824 if (gl.SeparableFilter2D) 3280 if (gl.SeparableFilter2D)
2825 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3281 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826 3282
2827void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3283void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2828 3284
2829void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3285void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2830 3286
2831void glDrawPixels (int width, int height, int format, int type, char *pixels) 3287void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832 3288
… …
2858 3314
2859void glEndList () 3315void glEndList ()
2860 3316
2861void glCallList (int list) 3317void glCallList (int list)
2862 3318
2863MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3319void c_init ()
3320 CODE:
3321 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3322 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3323
3324MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864 3325
2865PROTOTYPES: DISABLE 3326PROTOTYPES: DISABLE
2866 3327
2867void 3328void
2868find_widget (SV *self, NV x, NV y) 3329find_widget (SV *self, NV x, NV y)
… …
2872 XPUSHs (self); 3333 XPUSHs (self);
2873} 3334}
2874 3335
2875BOOT: 3336BOOT:
2876{ 3337{
2877 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3338 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878 3339
2879 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3340 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); 3341 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); 3342 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); 3343 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2883} 3344}
2884 3345
2885void 3346void
2886draw (SV *self) 3347draw (SV *self)
2887 CODE: 3348 CODE:
… …
2894 SV *draw_w_sv = GvSV (draw_w_gv); 3355 SV *draw_w_sv = GvSV (draw_w_gv);
2895 SV *draw_h_sv = GvSV (draw_h_gv); 3356 SV *draw_h_sv = GvSV (draw_h_gv);
2896 double draw_x, draw_y; 3357 double draw_x, draw_y;
2897 3358
2898 if (!SvROK (self)) 3359 if (!SvROK (self))
2899 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3360 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900 3361
2901 hv = (HV *)SvRV (self); 3362 hv = (HV *)SvRV (self);
2902 3363
2903 if (SvTYPE (hv) != SVt_PVHV) 3364 if (SvTYPE (hv) != SVt_PVHV)
2904 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3365 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905 3366
2906 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3367 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.; 3368 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2908 3369
2909 if (!h || !w) 3370 if (!h || !w)

Diff Legend

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