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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.239 by root, Tue Dec 25 18:58:32 2007 UTC vs.
Revision 1.301 by root, Thu Feb 4 20:01:08 2010 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib/gmacros.h>
48 54
49#include <pango/pango.h> 55#include <pango/pango.h>
56
57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
62# define pango_layout_get_line_readonly pango_layout_get_line
63# define pango_layout_get_lines_readonly pango_layout_get_lines
64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
66#endif
50 67
51#ifndef _WIN32 68#ifndef _WIN32
52# include <sys/types.h> 69# include <sys/types.h>
53# include <sys/socket.h> 70# include <sys/socket.h>
54# include <netinet/in.h> 71# include <netinet/in.h>
55# include <netinet/tcp.h> 72# include <netinet/tcp.h>
56# include <inttypes.h> 73# include <inttypes.h>
57#endif 74#endif
58 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
62 91
63#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
65 94
66#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
67 96
68#if 0 97/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 99
71# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
72#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
73 104
74static AV *texture_av; 105static AV *texture_av;
75 106
76static struct 107static struct
77{ 108{
120 151
121#include "pango-font.c" 152#include "pango-font.c"
122#include "pango-fontmap.c" 153#include "pango-fontmap.c"
123#include "pango-render.c" 154#include "pango-render.c"
124 155
125typedef IV CFPlus__Channel; 156typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 157typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 158typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 159typedef Mix_Music *DC__MixMusic;
129 160
130typedef PangoFontDescription *CFPlus__Font; 161typedef PangoFontDescription *DC__Font;
131 162
132static int 163static int
133shape_attr_p (PangoLayoutRun *run) 164shape_attr_p (PangoLayoutRun *run)
134{ 165{
135 GSList *attrs = run->item->analysis.extra_attrs; 166 GSList *attrs = run->item->analysis.extra_attrs;
149 180
150typedef struct cf_layout { 181typedef struct cf_layout {
151 PangoLayout *pl; 182 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 183 float r, g, b, a; // default color for rgba mode
153 int base_height; 184 int base_height;
154 CFPlus__Font font; 185 DC__Font font;
155 rc_t *rc; 186 rc_t *rc;
156} *CFPlus__Layout; 187} *DC__Layout;
157 188
158static CFPlus__Font default_font; 189static DC__Font default_font;
159static PangoContext *opengl_context; 190static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 191static PangoFontMap *opengl_fontmap;
161 192
162static void 193static void
163substitute_func (FcPattern *pattern, gpointer data) 194substitute_func (FcPattern *pattern, gpointer data)
168#endif 199#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 200 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 201}
171 202
172static void 203static void
173layout_update_font (CFPlus__Layout self) 204layout_update_font (DC__Layout self)
174{ 205{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 206 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 207 * reasonably well with dejavu/bistream fonts
177 */ 208 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 209 PangoFontDescription *font = self->font ? self->font : default_font;
179 210
180 pango_font_description_set_absolute_size (font, 211 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 212 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 213
183 pango_layout_set_font_description (self->pl, font); 214 pango_layout_set_font_description (self->pl, font);
184} 215}
185 216
186static void 217static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 218layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 219{
189 PangoRectangle rect; 220 PangoRectangle rect;
190 221
191 // get_pixel_* wrongly rounds down 222 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 223 pango_layout_get_extents (self->pl, 0, &rect);
209 int w, h; 240 int w, h;
210 float s, t; 241 float s, t;
211 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
212 tileid smoothtile; 243 tileid smoothtile;
213 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
214} maptex; 246} maptex;
215 247
216typedef struct { 248typedef struct {
217 uint32_t player; 249 uint32_t player;
218 tileid tile[3]; 250 tileid tile[3];
231 int faces; tileid *face2tile; // [faceid] 263 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 264 int texs; maptex *tex; // [tileid]
233 265
234 int32_t rows; 266 int32_t rows;
235 maprow *row; 267 maprow *row;
236} *CFPlus__Map; 268} *DC__Map;
237 269
238static char * 270static char *
239prepend (char *ptr, int sze, int inc) 271prepend (char *ptr, int sze, int inc)
240{ 272{
241 char *p; 273 char *p;
279 self->texs *= 2; 311 self->texs *= 2;
280 } 312 }
281} 313}
282 314
283static maprow * 315static maprow *
284map_get_row (CFPlus__Map self, int y) 316map_get_row (DC__Map self, int y)
285{ 317{
286 if (0 > y) 318 if (0 > y)
287 { 319 {
288 int extend = - y + MAP_EXTEND_Y; 320 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 321 Prepend (maprow, self->row, self->rows, extend);
327 359
328 return row->col + (x - row->c0); 360 return row->col + (x - row->c0);
329} 361}
330 362
331static mapcell * 363static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 364map_get_cell (DC__Map self, int x, int y)
333{ 365{
334 return row_get_cell (map_get_row (self, y), x); 366 return row_get_cell (map_get_row (self, y), x);
335} 367}
336 368
337static void 369static void
338map_clear (CFPlus__Map self) 370map_clear (DC__Map self)
339{ 371{
340 int r; 372 int r;
341 373
342 for (r = 0; r < self->rows; r++) 374 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 375 Safefree (self->row[r].col);
350 self->oy = 0; 382 self->oy = 0;
351 self->row = 0; 383 self->row = 0;
352 self->rows = 0; 384 self->rows = 0;
353} 385}
354 386
387#define CELL_CLEAR(cell) \
388 do { \
389 if ((cell)->player) \
390 (cell)->tile [2] = 0; \
391 (cell)->darkness = 0; \
392 (cell)->stat_hp = 0; \
393 (cell)->flags = 0; \
394 (cell)->player = 0; \
395 } while (0)
396
355static void 397static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 398map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 399{
358 int x, y; 400 int x, y;
359 maprow *row; 401 maprow *row;
360 mapcell *cell; 402 mapcell *cell;
361 403
373 if (x >= row->c1) 415 if (x >= row->c1)
374 break; 416 break;
375 417
376 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
377 419
378 cell->darkness = 0; 420 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 421 }
383 } 422 }
384} 423}
385 424
386typedef struct { 425typedef struct {
498 return 0; 537 return 0;
499 538
500 return 1; 539 return 1;
501} 540}
502 541
503MODULE = CFPlus PACKAGE = CFPlus 542/******************************************************************************/
543
544/* process keyboard modifiers */
545static int
546mod_munge (int mod)
547{
548 mod &= MOD_MASK;
549
550 if (mod & (KMOD_META | KMOD_ALT))
551 mod |= KMOD_LRAM;
552
553 return mod;
554}
555
556static void
557deliantra_main ()
558{
559 char *argv[] = { 0 };
560 call_argv ("::main", G_DISCARD | G_VOID, argv);
561}
562
563#ifdef __MACOSX__
564 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back.
569 */
570 extern C_LINKAGE int
571 main (int argc, char *argv[])
572 {
573 deliantra_main ();
574 }
575
576 #undef main
577
578 extern C_LINKAGE int main (int argc, char *argv[]);
579
580 static void
581 SDL_braino (void)
582 {
583 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv);
585 }
586#else
587 static void
588 SDL_braino (void)
589 {
590 deliantra_main ();
591 }
592#endif
593
594MODULE = Deliantra::Client PACKAGE = DC
504 595
505PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
506 597
507BOOT: 598BOOT:
508{ 599{
509 HV *stash = gv_stashpv ("CFPlus", 1); 600 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 601 static const struct {
511 const char *name; 602 const char *name;
512 IV iv; 603 IV iv;
513 } *civ, const_iv[] = { 604 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 605# define const_iv(name) { # name, (IV)name }
535 const_iv (SDL_USEREVENT), 626 const_iv (SDL_USEREVENT),
536 627
537 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
631
632
633 const_iv (SDLK_UNKNOWN),
634 const_iv (SDLK_FIRST),
635 const_iv (SDLK_BACKSPACE),
636 const_iv (SDLK_TAB),
637 const_iv (SDLK_CLEAR),
638 const_iv (SDLK_RETURN),
639 const_iv (SDLK_PAUSE),
640 const_iv (SDLK_ESCAPE),
641 const_iv (SDLK_SPACE),
642 const_iv (SDLK_EXCLAIM),
643 const_iv (SDLK_QUOTEDBL),
644 const_iv (SDLK_HASH),
645 const_iv (SDLK_DOLLAR),
646 const_iv (SDLK_AMPERSAND),
647 const_iv (SDLK_QUOTE),
648 const_iv (SDLK_LEFTPAREN),
649 const_iv (SDLK_RIGHTPAREN),
650 const_iv (SDLK_ASTERISK),
651 const_iv (SDLK_PLUS),
652 const_iv (SDLK_COMMA),
653 const_iv (SDLK_MINUS),
654 const_iv (SDLK_PERIOD),
655 const_iv (SDLK_SLASH),
656 const_iv (SDLK_0),
657 const_iv (SDLK_1),
658 const_iv (SDLK_2),
659 const_iv (SDLK_3),
660 const_iv (SDLK_4),
661 const_iv (SDLK_5),
662 const_iv (SDLK_6),
663 const_iv (SDLK_7),
664 const_iv (SDLK_8),
665 const_iv (SDLK_9),
666 const_iv (SDLK_COLON),
667 const_iv (SDLK_SEMICOLON),
668 const_iv (SDLK_LESS),
669 const_iv (SDLK_EQUALS),
670 const_iv (SDLK_GREATER),
671 const_iv (SDLK_QUESTION),
672 const_iv (SDLK_AT),
673
674 const_iv (SDLK_LEFTBRACKET),
675 const_iv (SDLK_BACKSLASH),
676 const_iv (SDLK_RIGHTBRACKET),
677 const_iv (SDLK_CARET),
678 const_iv (SDLK_UNDERSCORE),
679 const_iv (SDLK_BACKQUOTE),
680 const_iv (SDLK_DELETE),
540 681
541 const_iv (SDLK_FIRST), 682 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 683 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
620 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 764 const_iv (KMOD_MODE),
624 765
766 const_iv (KMOD_LRAM),
767
625 const_iv (MIX_DEFAULT_FORMAT), 768 const_iv (MIX_DEFAULT_FORMAT),
769
770 const_iv (SDL_INIT_TIMER),
771 const_iv (SDL_INIT_AUDIO),
772 const_iv (SDL_INIT_VIDEO),
773 const_iv (SDL_INIT_CDROM),
774 const_iv (SDL_INIT_JOYSTICK),
775 const_iv (SDL_INIT_EVERYTHING),
776 const_iv (SDL_INIT_NOPARACHUTE),
777 const_iv (SDL_INIT_EVENTTHREAD),
778
779 const_iv (SDL_GL_RED_SIZE),
780 const_iv (SDL_GL_GREEN_SIZE),
781 const_iv (SDL_GL_BLUE_SIZE),
782 const_iv (SDL_GL_ALPHA_SIZE),
783 const_iv (SDL_GL_DOUBLEBUFFER),
784 const_iv (SDL_GL_BUFFER_SIZE),
785 const_iv (SDL_GL_DEPTH_SIZE),
786 const_iv (SDL_GL_STENCIL_SIZE),
787 const_iv (SDL_GL_ACCUM_RED_SIZE),
788 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
789 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
790 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
791 const_iv (SDL_GL_STEREO),
792 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
793 const_iv (SDL_GL_MULTISAMPLESAMPLES),
794 const_iv (SDL_GL_ACCELERATED_VISUAL),
795 const_iv (SDL_GL_SWAP_CONTROL),
796
797 const_iv (FOW_DARKNESS)
626# undef const_iv 798# undef const_iv
627 }; 799 };
628 800
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
652 824
653IV minpot (UV n) 825IV minpot (UV n)
654 826
655IV popcount (UV n) 827IV popcount (UV n)
656 828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
834
657void 835void
658pango_init () 836pango_init ()
659 CODE: 837 CODE:
660{ 838{
661 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 840 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 841 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
842 /*pango_context_set_font_description (opengl_context, default_font);*/
843#if PANGO_VERSION_CHECK (1, 15, 2)
844 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
845 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
846#endif
664} 847}
665 848
666char *
667SDL_GetError () 849char *SDL_GetError ()
668 850
669int 851void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 852
672void 853int SDL_Init (U32 flags)
854
855int SDL_InitSubSystem (U32 flags)
856
857void SDL_QuitSubSystem (U32 flags)
858
673SDL_Quit () 859void SDL_Quit ()
860
861int SDL_GL_SetAttribute (int attr, int value)
862
863int SDL_GL_GetAttribute (int attr)
864 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL))
866 XSRETURN_UNDEF;
867 OUTPUT:
868 RETVAL
674 869
675void 870void
676SDL_ListModes (int rgb, int alpha) 871SDL_ListModes (int rgb, int alpha)
677 PPCODE: 872 PPCODE:
678{ 873{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 888
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 891
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 893
702 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
703 while (*m) 895 while (*m)
704 { 896 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 897 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 898 {
707 AV *av = newAV (); 899 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 902 av_push (av, newSViv (rgb));
738 930
739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
741#include "glfunc.h" 933#include "glfunc.h"
742#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 938 }
744} 939}
745 OUTPUT: 940 OUTPUT:
746 RETVAL 941 RETVAL
747 942
751char * 946char *
752SDL_GetKeyName (int sym) 947SDL_GetKeyName (int sym)
753 948
754int 949int
755SDL_GetAppState () 950SDL_GetAppState ()
951
952int
953SDL_GetModState ()
756 954
757void 955void
758poll_events () 956poll_events ()
759 PPCODE: 957 PPCODE:
760{ 958{
770 { 968 {
771 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
772 case SDL_KEYUP: 970 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 973 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 974 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 976 break;
779 977
780 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 997 x = ev.motion.x;
800 y = ev.motion.y; 998 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1000 }
803 1001
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1008 }
811 break; 1009 break;
812 1010
813 case SDL_MOUSEBUTTONDOWN: 1011 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1012 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1013 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1014
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1015 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1016 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1017 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1018 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1023 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1024 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 1025 break;
828 } 1026 }
829 1027
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1028 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 1029 }
832} 1030}
833 1031
834int 1032int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1033Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
894 } 1092 }
895 } 1093 }
896#endif 1094#endif
897} 1095}
898 1096
899void 1097int
900add_font (char *file) 1098add_font (char *file)
901 CODE: 1099 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1100 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1101 OUTPUT:
1102 RETVAL
903 1103
904void 1104void
905load_image_inline (SV *image_) 1105load_image_inline (SV *image_)
906 ALIAS: 1106 ALIAS:
907 load_image_file = 1 1107 load_image_file = 1
993void 1193void
994error (char *message) 1194error (char *message)
995 CODE: 1195 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1196 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1197#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1198 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1199#endif
1000 1200
1001void 1201void
1002fatal (char *message) 1202fatal (char *message)
1003 CODE: 1203 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1204 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1205#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1206 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1207#endif
1008 _exit (1); 1208 _exit (1);
1009 1209
1010void 1210void
1011_exit (int retval = 0) 1211_exit (int retval = 0)
1023#if DEBUG 1223#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1224 VALGRIND_DO_LEAK_CHECK;
1025#endif 1225#endif
1026} 1226}
1027 1227
1028MODULE = 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
1029 1236
1030PROTOTYPES: DISABLE 1237PROTOTYPES: DISABLE
1031 1238
1032CFPlus::Font 1239DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1240new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1241 CODE:
1035{ 1242{
1036 int count; 1243 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1244 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1247}
1041 OUTPUT: 1248 OUTPUT:
1042 RETVAL 1249 RETVAL
1043 1250
1044void 1251void
1045DESTROY (CFPlus::Font self) 1252DESTROY (DC::Font self)
1046 CODE: 1253 CODE:
1047 pango_font_description_free (self); 1254 pango_font_description_free (self);
1048 1255
1049void 1256void
1050make_default (CFPlus::Font self) 1257make_default (DC::Font self)
1051 PROTOTYPE: $ 1258 PROTOTYPE: $
1052 CODE: 1259 CODE:
1053 default_font = self; 1260 default_font = self;
1054 1261
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1262MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1263
1057PROTOTYPES: DISABLE 1264PROTOTYPES: DISABLE
1058 1265
1059void 1266void
1060glyph_cache_backup () 1267glyph_cache_backup ()
1066glyph_cache_restore () 1273glyph_cache_restore ()
1067 PROTOTYPE: 1274 PROTOTYPE:
1068 CODE: 1275 CODE:
1069 tc_restore (); 1276 tc_restore ();
1070 1277
1071CFPlus::Layout 1278DC::Layout
1072new (SV *class) 1279new (SV *class)
1073 CODE: 1280 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1281 New (0, RETVAL, 1, struct cf_layout);
1075 1282
1076 RETVAL->pl = pango_layout_new (opengl_context); 1283 RETVAL->pl = pango_layout_new (opengl_context);
1086 layout_update_font (RETVAL); 1293 layout_update_font (RETVAL);
1087 OUTPUT: 1294 OUTPUT:
1088 RETVAL 1295 RETVAL
1089 1296
1090void 1297void
1091DESTROY (CFPlus::Layout self) 1298DESTROY (DC::Layout self)
1092 CODE: 1299 CODE:
1093 g_object_unref (self->pl); 1300 g_object_unref (self->pl);
1094 rc_free (self->rc); 1301 rc_free (self->rc);
1095 Safefree (self); 1302 Safefree (self);
1096 1303
1097void 1304void
1098set_text (CFPlus::Layout self, SV *text_) 1305set_text (DC::Layout self, SV *text_)
1099 CODE: 1306 CODE:
1100{ 1307{
1101 STRLEN textlen; 1308 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1309 char *text = SvPVutf8 (text_, textlen);
1103 1310
1104 pango_layout_set_text (self->pl, text, textlen); 1311 pango_layout_set_text (self->pl, text, textlen);
1105} 1312}
1106 1313
1107void 1314void
1108set_markup (CFPlus::Layout self, SV *text_) 1315set_markup (DC::Layout self, SV *text_)
1109 CODE: 1316 CODE:
1110{ 1317{
1111 STRLEN textlen; 1318 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1319 char *text = SvPVutf8 (text_, textlen);
1113 1320
1114 pango_layout_set_markup (self->pl, text, textlen); 1321 pango_layout_set_markup (self->pl, text, textlen);
1115} 1322}
1116 1323
1117void 1324void
1118set_shapes (CFPlus::Layout self, ...) 1325set_shapes (DC::Layout self, ...)
1119 CODE: 1326 CODE:
1120{ 1327{
1121 PangoAttrList *attrs = 0; 1328 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1329 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1330 const char *pos = text;
1158 if (attrs) 1365 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1366 pango_layout_set_attributes (self->pl, attrs);
1160} 1367}
1161 1368
1162void 1369void
1163get_shapes (CFPlus::Layout self) 1370get_shapes (DC::Layout self)
1164 PPCODE: 1371 PPCODE:
1165{ 1372{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1373 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1374
1168 do 1375 do
1169 { 1376 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1377 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1378
1172 if (run && shape_attr_p (run)) 1379 if (run && shape_attr_p (run))
1173 { 1380 {
1174 PangoRectangle extents; 1381 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1382 pango_layout_iter_get_run_extents (iter, 0, &extents);
1183 1390
1184 pango_layout_iter_free (iter); 1391 pango_layout_iter_free (iter);
1185} 1392}
1186 1393
1187int 1394int
1188has_wrapped (CFPlus::Layout self) 1395has_wrapped (DC::Layout self)
1189 CODE: 1396 CODE:
1190{ 1397{
1191 int lines = 1; 1398 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1399 const char *text = pango_layout_get_text (self->pl);
1193 1400
1198} 1405}
1199 OUTPUT: 1406 OUTPUT:
1200 RETVAL 1407 RETVAL
1201 1408
1202SV * 1409SV *
1203get_text (CFPlus::Layout self) 1410get_text (DC::Layout self)
1204 CODE: 1411 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1412 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1413 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1414 OUTPUT:
1208 RETVAL 1415 RETVAL
1209 1416
1210void 1417void
1211set_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.)
1212 CODE: 1419 CODE:
1213 self->r = r; 1420 self->r = r;
1214 self->g = g; 1421 self->g = g;
1215 self->b = b; 1422 self->b = b;
1216 self->a = a; 1423 self->a = a;
1217 1424
1218void 1425void
1219set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1426set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1427 CODE:
1221 if (self->font != font) 1428 if (self->font != font)
1222 { 1429 {
1223 self->font = font; 1430 self->font = font;
1224 layout_update_font (self); 1431 layout_update_font (self);
1225 } 1432 }
1226 1433
1227void 1434void
1228set_height (CFPlus::Layout self, int base_height) 1435set_height (DC::Layout self, int base_height)
1229 CODE: 1436 CODE:
1230 if (self->base_height != base_height) 1437 if (self->base_height != base_height)
1231 { 1438 {
1232 self->base_height = base_height; 1439 self->base_height = base_height;
1233 layout_update_font (self); 1440 layout_update_font (self);
1234 } 1441 }
1235 1442
1236void 1443void
1237set_width (CFPlus::Layout self, int max_width = -1) 1444set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1445 CODE:
1239 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);
1240 1447
1241void 1448void
1242set_indent (CFPlus::Layout self, int indent) 1449set_indent (DC::Layout self, int indent)
1243 CODE: 1450 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1451 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1452
1246void 1453void
1247set_spacing (CFPlus::Layout self, int spacing) 1454set_spacing (DC::Layout self, int spacing)
1248 CODE: 1455 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1456 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1457
1251void 1458void
1252set_ellipsise (CFPlus::Layout self, int ellipsise) 1459set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1460 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1461 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1462 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1463 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1464 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1465 : PANGO_ELLIPSIZE_NONE
1259 ); 1466 );
1260 1467
1261void 1468void
1262set_single_paragraph_mode (CFPlus::Layout self, int spm) 1469set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1470 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1471 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1472
1266void 1473void
1267size (CFPlus::Layout self) 1474size (DC::Layout self)
1268 PPCODE: 1475 PPCODE:
1269{ 1476{
1270 int w, h; 1477 int w, h;
1271 1478
1272 layout_get_pixel_size (self, &w, &h); 1479 layout_get_pixel_size (self, &w, &h);
1275 PUSHs (sv_2mortal (newSViv (w))); 1482 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1483 PUSHs (sv_2mortal (newSViv (h)));
1277} 1484}
1278 1485
1279int 1486int
1280descent (CFPlus::Layout self) 1487descent (DC::Layout self)
1281 CODE: 1488 CODE:
1282{ 1489{
1283 PangoRectangle rect; 1490 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1491 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1492 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1493 RETVAL = PANGO_DESCENT (rect);
1287} 1494}
1288 OUTPUT: 1495 OUTPUT:
1289 RETVAL 1496 RETVAL
1290 1497
1291int 1498int
1292xy_to_index (CFPlus::Layout self, int x, int y) 1499xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1500 CODE:
1294{ 1501{
1295 int index, trailing; 1502 int index, trailing;
1296 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);
1297 RETVAL = index + trailing; 1504 RETVAL = index + trailing;
1298} 1505}
1299 OUTPUT: 1506 OUTPUT:
1300 RETVAL 1507 RETVAL
1301 1508
1302void 1509void
1303cursor_pos (CFPlus::Layout self, int index) 1510cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1511 PPCODE:
1305{ 1512{
1306 PangoRectangle strong_pos; 1513 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1514 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1515
1309 EXTEND (SP, 3); 1516 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1517 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1518 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1519 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1520}
1314 1521
1315void 1522void
1316index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1523index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1524 PPCODE:
1318{ 1525{
1319 int line, x; 1526 int line, x;
1320 1527
1321 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)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1530 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1531 --line;
1532#endif
1324 EXTEND (SP, 2); 1533 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1534 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1535 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1536}
1328 1537
1329void 1538void
1330line_x_to_index (CFPlus::Layout self, int line, int x) 1539line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1540 PPCODE:
1332{ 1541{
1333 PangoLayoutLine *lp; 1542 PangoLayoutLine *lp;
1334 int index, trailing; 1543 int index, trailing;
1335 1544
1336 if (line < 0) 1545 if (line < 0)
1337 XSRETURN_EMPTY; 1546 XSRETURN_EMPTY;
1338 1547
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1548 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1549 XSRETURN_EMPTY; /* do better */
1341 1550
1342 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);
1343 1552
1344 EXTEND (SP, 2); 1553 EXTEND (SP, 2);
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1559 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1560 }
1352} 1561}
1353 1562
1354void 1563void
1355render (CFPlus::Layout self, float x, float y, int flags = 0) 1564render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1565 CODE:
1357 rc_clear (self->rc); 1566 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1567 pango_opengl_render_layout_subpixel (
1359 self->pl, 1568 self->pl,
1360 self->rc, 1569 self->rc,
1365 // we assume that context_change actually clears/frees stuff 1574 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1575 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1576 pango_layout_context_changed (self->pl);
1368 1577
1369void 1578void
1370draw (CFPlus::Layout self) 1579draw (DC::Layout self)
1371 CODE: 1580 CODE:
1372{ 1581{
1373 glEnable (GL_TEXTURE_2D); 1582 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1583 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1584 glEnable (GL_BLEND);
1383 glDisable (GL_ALPHA_TEST); 1592 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1593 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1594 glDisable (GL_TEXTURE_2D);
1386} 1595}
1387 1596
1388MODULE = CFPlus PACKAGE = CFPlus::Texture 1597MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1598
1390PROTOTYPES: ENABLE 1599PROTOTYPES: ENABLE
1391 1600
1392void 1601void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1602pad (SV *data_, int ow, int oh, int nw, int nh)
1461 glDisable (GL_ALPHA_TEST); 1670 glDisable (GL_ALPHA_TEST);
1462 glDisable (GL_BLEND); 1671 glDisable (GL_BLEND);
1463 } 1672 }
1464} 1673}
1465 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 (intensity ? GL_SRC_ALPHA : 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_PRIMARY_COLOR);
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
1466IV 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)
1467 CODE: 1797 CODE:
1468{ 1798{
1469 GLint width; 1799 GLint width;
1470 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);
1472 RETVAL = width > 0; 1802 RETVAL = width > 0;
1473} 1803}
1474 OUTPUT: 1804 OUTPUT:
1475 RETVAL 1805 RETVAL
1476 1806
1477MODULE = CFPlus PACKAGE = CFPlus::Map 1807MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1808
1479PROTOTYPES: DISABLE 1809PROTOTYPES: DISABLE
1480 1810
1481CFPlus::Map 1811DC::Map
1482new (SV *class) 1812new (SV *class)
1483 CODE: 1813 CODE:
1484 New (0, RETVAL, 1, struct map); 1814 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1815 RETVAL->x = 0;
1486 RETVAL->y = 0; 1816 RETVAL->y = 0;
1494 RETVAL->row = 0; 1824 RETVAL->row = 0;
1495 OUTPUT: 1825 OUTPUT:
1496 RETVAL 1826 RETVAL
1497 1827
1498void 1828void
1499DESTROY (CFPlus::Map self) 1829DESTROY (DC::Map self)
1500 CODE: 1830 CODE:
1501{ 1831{
1502 map_clear (self); 1832 map_clear (self);
1503 Safefree (self->face2tile); 1833 Safefree (self->face2tile);
1504 Safefree (self->tex); 1834 Safefree (self->tex);
1505 Safefree (self); 1835 Safefree (self);
1506} 1836}
1507 1837
1508void 1838void
1509resize (CFPlus::Map self, int map_width, int map_height) 1839resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1840 CODE:
1511 self->w = map_width; 1841 self->w = map_width;
1512 self->h = map_height; 1842 self->h = map_height;
1513 1843
1514void 1844void
1515clear (CFPlus::Map self) 1845clear (DC::Map self)
1516 CODE: 1846 CODE:
1517 map_clear (self); 1847 map_clear (self);
1518 1848
1519void 1849void
1520set_tileid (CFPlus::Map self, int face, int tile) 1850set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1851 CODE:
1522{ 1852{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1853 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1854 need_texid (self, tile);
1525} 1855}
1526 1856
1527void 1857void
1528set_smooth (CFPlus::Map self, int face, int smooth, int level) 1858set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1859 CODE:
1530{ 1860{
1531 tileid texid; 1861 tileid texid;
1532 maptex *tex; 1862 maptex *tex;
1533 1863
1546 tex->smoothtile = self->face2tile [smooth]; 1876 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1877 tex->smoothlevel = level;
1548} 1878}
1549 1879
1550void 1880void
1551set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 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)
1552 CODE: 1882 CODE:
1553{ 1883{
1554 need_texid (self, texid); 1884 need_texid (self, texid);
1555 1885
1556 { 1886 {
1575 // use uglier nearest interpolation because linear suffers 1905 // use uglier nearest interpolation because linear suffers
1576 // from transparent color bleeding and ugly wrapping effects. 1906 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1907 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1908}
1579 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
1580int 1930int
1581ox (CFPlus::Map self) 1931ox (DC::Map self)
1582 ALIAS: 1932 ALIAS:
1583 oy = 1 1933 oy = 1
1584 x = 2 1934 x = 2
1585 y = 3 1935 y = 3
1586 w = 4 1936 w = 4
1597 } 1947 }
1598 OUTPUT: 1948 OUTPUT:
1599 RETVAL 1949 RETVAL
1600 1950
1601void 1951void
1602scroll (CFPlus::Map self, int dx, int dy) 1952scroll (DC::Map self, int dx, int dy)
1603 CODE: 1953 CODE:
1604{ 1954{
1605 if (dx > 0) 1955 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 1956 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 1957 else if (dx < 0)
1623 self->y += MAP_EXTEND_Y; 1973 self->y += MAP_EXTEND_Y;
1624 } 1974 }
1625} 1975}
1626 1976
1627SV * 1977SV *
1628map1a_update (CFPlus::Map self, SV *data_, int extmap) 1978map1a_update (DC::Map self, SV *data_, int extmap)
1629 CODE: 1979 CODE:
1630{ 1980{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1981 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 1982 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 1983 mapcell *cell;
1661 uint8_t ext, cmd; 2011 uint8_t ext, cmd;
1662 2012
1663 do 2013 do
1664 { 2014 {
1665 ext = *data++; 2015 ext = *data++;
1666 cmd = ext & 0x3f; 2016 cmd = ext & 0x7f;
1667 2017
1668 if (cmd < 4) 2018 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 2019 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1670 else if (cmd == 5) // health 2020 else if (cmd == 5) // health
1671 { 2021 {
1672 cell->stat_width = 1; 2022 cell->stat_width = 1;
1673 cell->stat_hp = *data++; 2023 cell->stat_hp = *data++;
1674 } 2024 }
1675 else if (cmd == 6) // monster width 2025 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 2026 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 2027 else if (cmd == 0x47)
1678 { 2028 {
1679 if (*data == 4) 2029 if (*data == 1) cell->player = data [1];
1680 ; // 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);
1681 2033
1682 data += *data + 1; 2034 data += *data + 1;
1683 } 2035 }
1684 else if (cmd == 8) // cell flags 2036 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 2037 cell->flags = *data++;
1702 cell->tile [z] = self->face2tile [face]; 2054 cell->tile [z] = self->face2tile [face];
1703 2055
1704 if (cell->tile [z]) 2056 if (cell->tile [z])
1705 { 2057 {
1706 maptex *tex = self->tex + cell->tile [z]; 2058 maptex *tex = self->tex + cell->tile [z];
2059 tex->unused = 0;
1707 if (!tex->name) 2060 if (!tex->name)
1708 av_push (missing, newSViv (cell->tile [z])); 2061 av_push (missing, newSViv (cell->tile [z]));
1709 2062
1710 if (tex->smoothtile) 2063 if (tex->smoothtile)
1711 { 2064 {
1712 maptex *smooth = self->tex + tex->smoothtile; 2065 maptex *smooth = self->tex + tex->smoothtile;
2066 smooth->unused = 0;
1713 if (!smooth->name) 2067 if (!smooth->name)
1714 av_push (missing, newSViv (tex->smoothtile)); 2068 av_push (missing, newSViv (tex->smoothtile));
1715 } 2069 }
1716 } 2070 }
1717 } 2071 }
1718 } 2072 }
1719 else 2073 else
1720 cell->darkness = 0; 2074 CELL_CLEAR (cell);
1721 } 2075 }
1722} 2076}
1723 OUTPUT: 2077 OUTPUT:
1724 RETVAL 2078 RETVAL
1725 2079
1726SV * 2080SV *
1727mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2081mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 2082 CODE:
1729{ 2083{
1730 int x1, x; 2084 int x1, x;
1731 int y1, y; 2085 int y1, y;
1732 int z; 2086 int z;
1777} 2131}
1778 OUTPUT: 2132 OUTPUT:
1779 RETVAL 2133 RETVAL
1780 2134
1781void 2135void
1782draw (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)
1783 CODE: 2137 CODE:
1784{ 2138{
1785 int x, y, z; 2139 int x, y, z;
1786 2140
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2141 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 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
1789 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)
1790 smooth_key skey; 2144 smooth_key skey;
1791 2145 int pl_x, pl_y;
2146 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 2147 rc_t *rc = rc_alloc ();
2148 rc_t *rc_ov = rc_alloc ();
1793 rc_key_t key; 2149 rc_key_t key;
1794 rc_array_t *arr; 2150 rc_array_t *arr;
1795 2151
2152 pl_tex.name = 0;
2153
1796 // thats current max. sorry. 2154 // that's current max. sorry.
1797 if (sw > 255) sw = 255; 2155 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 2156 if (sh > 255) sh = 255;
1799 2157
1800 // clear key, in case of extra padding 2158 // clear key, in case of extra padding
1801 memset (&skey, 0, sizeof (skey)); 2159 memset (&skey, 0, sizeof (skey));
1805 key.g = 255; 2163 key.g = 255;
1806 key.b = 255; 2164 key.b = 255;
1807 key.a = 255; 2165 key.a = 255;
1808 key.mode = GL_QUADS; 2166 key.mode = GL_QUADS;
1809 key.format = GL_T2F_V3F; 2167 key.format = GL_T2F_V3F;
1810 key.texname = -1;
1811 2168
1812 mx += self->x; 2169 mx += self->x;
1813 my += self->y; 2170 my += self->y;
1814 2171
1815 // first pass: determine smooth_max 2172 // first pass: determine smooth_max
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2196 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1840 2197
1841 for (z = 0; z <= 2; z++) 2198 for (z = 0; z <= 2; z++)
1842 { 2199 {
1843 memset (smooth_level, 0, sizeof (smooth_level)); 2200 memset (smooth_level, 0, sizeof (smooth_level));
2201 key.texname = -1;
1844 2202
1845 for (y = 0; y < sh; y++) 2203 for (y = 0; y < sh; y++)
1846 if (0 <= y + my && y + my < self->rows) 2204 if (0 <= y + my && y + my < self->rows)
1847 { 2205 {
1848 maprow *row = self->row + (y + my); 2206 maprow *row = self->row + (y + my);
1858 maptex tex = self->tex [tile]; 2216 maptex tex = self->tex [tile];
1859 int px, py; 2217 int px, py;
1860 2218
1861 if (key.texname != tex.name) 2219 if (key.texname != tex.name)
1862 { 2220 {
2221 self->tex [tile].unused = 0;
2222
1863 if (!tex.name) 2223 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2224 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1865 2225
1866 key.texname = tex.name; 2226 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2227 arr = rc_array (rc, &key);
1868 } 2228 }
1869 2229
1870 px = (x + 1) * T - tex.w; 2230 px = (x + 1) * T - tex.w;
1871 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 }
1872 2240
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2241 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 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);
1875 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);
1876 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);
1877
1878 if (cell->flags && z == 2)
1879 {
1880 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1)
1882 {
1883 maptex tex = self->tex [1];
1884 int px = x * T + T * 2 / 32;
1885 int py = y * T - T * 6 / 32;
1886
1887 if (tex.name)
1888 {
1889 if (key.texname != tex.name)
1890 {
1891 key.texname = tex.name;
1892 arr = rc_array (rc, &key);
1893 }
1894
1895 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1896 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1897 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1898 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1899 }
1900 }
1901 }
1902 2245
1903 // update smooth hash 2246 // update smooth hash
1904 if (tex.smoothtile) 2247 if (tex.smoothtile)
1905 { 2248 {
1906 skey.tile = tex.smoothtile; 2249 skey.tile = tex.smoothtile;
1935 // corners 2278 // corners
1936 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);
1937 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);
1938 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);
1939 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);
1940 } 2304 }
1941 } 2305 }
1942 } 2306 }
1943 } 2307 }
1944 2308
1984 { 2348 {
1985 // this time avoiding texture state changes 2349 // this time avoiding texture state changes
1986 // save gobs of state changes. 2350 // save gobs of state changes.
1987 if (key.texname != tex.name) 2351 if (key.texname != tex.name)
1988 { 2352 {
2353 self->tex [skey->tile].unused = 0;
2354
1989 glEnd (); 2355 glEnd ();
1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2356 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1991 glBegin (GL_QUADS); 2357 glBegin (GL_QUADS);
1992 } 2358 }
1993 2359
2022 } 2388 }
2023 2389
2024 hv_clear (smooth); 2390 hv_clear (smooth);
2025 } 2391 }
2026 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
2027 glDisable (GL_BLEND); 2413 glDisable (GL_BLEND);
2028 rc_free (rc); 2414 rc_free (rc);
2415 rc_free (rc_ov);
2029 2416
2030 // top layer: overlays such as the health bar 2417 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2418 for (y = 0; y < sh; y++)
2032 if (0 <= y + my && y + my < self->rows) 2419 if (0 <= y + my && y + my < self->rows)
2033 { 2420 {
2038 { 2425 {
2039 mapcell *cell = row->col + (x + mx - row->c0); 2426 mapcell *cell = row->col + (x + mx - row->c0);
2040 2427
2041 int px = x * T; 2428 int px = x * T;
2042 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 }
2043 2436
2044 if (cell->stat_hp) 2437 if (cell->stat_hp)
2045 { 2438 {
2046 int width = cell->stat_width * T; 2439 int width = cell->stat_width * T;
2047 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2440 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2058 } 2451 }
2059 } 2452 }
2060} 2453}
2061 2454
2062void 2455void
2063draw_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)
2064 CODE: 2457 CODE:
2065{ 2458{
2066 static float color[16][3] = { 2459 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2460 { 0.00f, 0.00f, 0.00f },
2068 { 1.00F, 1.00F, 1.00F }, 2461 { 1.00f, 1.00f, 1.00f },
2069 { 0.00F, 0.00F, 0.55F }, 2462 { 0.00f, 0.00f, 0.55f },
2070 { 1.00F, 0.00F, 0.00F }, 2463 { 1.00f, 0.00f, 0.00f },
2071 2464
2072 { 1.00F, 0.54F, 0.00F }, 2465 { 1.00f, 0.54f, 0.00f },
2073 { 0.11F, 0.56F, 1.00F }, 2466 { 0.11f, 0.56f, 1.00f },
2074 { 0.93F, 0.46F, 0.00F }, 2467 { 0.93f, 0.46f, 0.00f },
2075 { 0.18F, 0.54F, 0.34F }, 2468 { 0.18f, 0.54f, 0.34f },
2076 2469
2077 { 0.56F, 0.73F, 0.56F }, 2470 { 0.56f, 0.73f, 0.56f },
2078 { 0.80F, 0.80F, 0.80F }, 2471 { 0.80f, 0.80f, 0.80f },
2079 { 0.55F, 0.41F, 0.13F }, 2472 { 0.55f, 0.41f, 0.13f },
2080 { 0.99F, 0.77F, 0.26F }, 2473 { 0.99f, 0.77f, 0.26f },
2081 2474
2082 { 0.74F, 0.65F, 0.41F }, 2475 { 0.74f, 0.65f, 0.41f },
2083 2476
2084 { 0.00F, 1.00F, 1.00F }, 2477 { 0.00f, 1.00f, 1.00f },
2085 { 1.00F, 0.00F, 1.00F }, 2478 { 1.00f, 0.00f, 1.00f },
2086 { 1.00F, 1.00F, 0.00F }, 2479 { 1.00f, 1.00f, 0.00f },
2087 }; 2480 };
2088 2481
2089 int x, y; 2482 int x, y;
2090 2483
2091 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 */
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2093 glEnable (GL_BLEND); 2492 glEnable (GL_BLEND);
2094 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2493 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2095 glBegin (GL_QUADS); 2494 glBegin (GL_QUADS);
2096 2495
2097 for (y = 0; y < h; y++) 2496 for (y = 0; y < h; y++)
2101 2500
2102 if (m) 2501 if (m)
2103 { 2502 {
2104 float *c = color [m & 15]; 2503 float *c = color [m & 15];
2105 2504
2106 float tx1 = m & 0x40 ? 0.5 : 0.; 2505 float tx1 = m & 0x40 ? 0.5f : 0.f;
2107 float tx2 = tx1 + 0.5; 2506 float tx2 = tx1 + 0.5f;
2108 2507
2109 glColor4f (c[0], c[1], c[2], 0.75); 2508 glColor4f (c[0], c[1], c[2], 1);
2110 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2509 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2111 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2510 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2112 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2511 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2113 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2512 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2114 } 2513 }
2118 glDisable (GL_BLEND); 2517 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2518 glDisable (GL_TEXTURE_2D);
2120} 2519}
2121 2520
2122void 2521void
2123fow_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)
2124 PPCODE: 2523 PPCODE:
2125{ 2524{
2126 int x, y; 2525 int x, y;
2127 int sw1 = sw + 2; 2526 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2527 int sh1 = sh + 2;
2129 int sh3 = sh * 3; 2528 int sh3 = sh * 3;
2130 int sw34 = (sw * 3 + 3) & ~3; 2529 int sw3 = sw * 3;
2131 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2530 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2132 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2531 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2133 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2532 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2134 2533
2135 SvPOK_only (darkness3_sv); 2534 SvPOK_only (darkness3_sv);
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2535 SvCUR_set (darkness3_sv, sw3 * sh3);
2137 2536
2138 mx += self->x - 1; 2537 mx += self->x - 1;
2139 my += self->y - 1; 2538 my += self->y - 1;
2140
2141 memset (darkness1, 255, sw1 * sh1);
2142 2539
2143 for (y = 0; y < sh1; y++) 2540 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2541 if (0 <= y + my && y + my < self->rows)
2145 { 2542 {
2146 maprow *row = self->row + (y + my); 2543 maprow *row = self->row + (y + my);
2149 if (row->c0 <= x + mx && x + mx < row->c1) 2546 if (row->c0 <= x + mx && x + mx < row->c1)
2150 { 2547 {
2151 mapcell *cell = row->col + (x + mx - row->c0); 2548 mapcell *cell = row->col + (x + mx - row->c0);
2152 2549
2153 darkness1 [y * sw1 + x] = cell->darkness 2550 darkness1 [y * sw1 + x] = cell->darkness
2154 ? 255 - (cell->darkness - 1) 2551 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2155 : 255 - FOW_DARKNESS; 2552 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2156 } 2553 }
2157 } 2554 }
2158 2555
2159 for (y = 0; y < sh; ++y) 2556 for (y = 0; y < sh; ++y)
2160 for (x = 0; x < sw; ++x) 2557 for (x = 0; x < sw; ++x)
2179 2576
2180 uint8_t r13 = (d13 + d23 + d12) / 3; 2577 uint8_t r13 = (d13 + d23 + d12) / 3;
2181 uint8_t r23 = d23; 2578 uint8_t r23 = d23;
2182 uint8_t r33 = (d23 + d33 + d32) / 3; 2579 uint8_t r33 = (d23 + d33 + d32) / 3;
2183 2580
2184 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2581 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2185 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2582 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2186 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2583 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2187 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2584 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2188 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 */
2189 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2586 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2190 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2587 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2191 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2588 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2192 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2589 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2193 } 2590 }
2194 2591
2195 free (darkness1); 2592 free (darkness1);
2196 2593
2197 EXTEND (SP, 3); 2594 EXTEND (SP, 3);
2198 PUSHs (sv_2mortal (newSViv (sw34))); 2595 PUSHs (sv_2mortal (newSViv (sw3)));
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2596 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2597 PUSHs (darkness3_sv);
2201} 2598}
2202 2599
2203SV * 2600SV *
2204get_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)
2205 CODE: 2602 CODE:
2206{ 2603{
2207 int x, y, x1, y1; 2604 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2605 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2606 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2266 else 2663 else
2267 *data++ = 0; 2664 *data++ = 0;
2268 } 2665 }
2269 } 2666 }
2270 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 {
2271 SvPOK_only (data_sv); 2671 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2672 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2673 }
2674
2273 RETVAL = data_sv; 2675 RETVAL = data_sv;
2274} 2676}
2275 OUTPUT: 2677 OUTPUT:
2276 RETVAL 2678 RETVAL
2277 2679
2278void 2680void
2279set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2681set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2682 PPCODE:
2281{ 2683{
2282 int x, y, z; 2684 int x, y, z;
2283 int w, h; 2685 int w, h;
2284 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;
2285 2697
2286 if (*data++ != 0) 2698 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2699 XSRETURN_EMPTY; /* version mismatch */
2288 2700
2289 w = *data++ << 8; w |= *data++; 2701 w = *data++ << 8; w |= *data++;
2304 { 2716 {
2305 maprow *row = map_get_row (self, y); 2717 maprow *row = map_get_row (self, y);
2306 2718
2307 for (x = x0; x < x1; x++) 2719 for (x = x0; x < x1; x++)
2308 { 2720 {
2721 uint8_t flags;
2722
2723 if (data + 7 >= end)
2724 XSRETURN_EMPTY;
2725
2309 uint8_t flags = *data++; 2726 flags = *data++;
2310 2727
2311 if (flags) 2728 if (flags)
2312 { 2729 {
2313 mapcell *cell = row_get_cell (row, x); 2730 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2731 tileid tile[3] = { 0, 0, 0 };
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2734 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2735 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2736
2320 if (cell->darkness == 0) 2737 if (cell->darkness == 0)
2321 { 2738 {
2322 cell->darkness = 0; 2739 /*cell->darkness = 0;*/
2740 EXTEND (SP, 3);
2323 2741
2324 for (z = 0; z <= 2; z++) 2742 for (z = 0; z <= 2; z++)
2325 { 2743 {
2326 tileid t = tile [z]; 2744 tileid t = tile [z];
2327 2745
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2746 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2747 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2748 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2749 need_texid (self, t);
2332 } 2750 }
2333 2751
2334 cell->tile [z] = t; 2752 cell->tile [z] = t;
2335 } 2753 }
2337 } 2755 }
2338 } 2756 }
2339 } 2757 }
2340} 2758}
2341 2759
2342MODULE = CFPlus PACKAGE = CFPlus::RW 2760MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2761
2344CFPlus::RW 2762DC::RW
2345new (SV *class, SV *data_sv) 2763new (SV *class, SV *data_sv)
2346 CODE: 2764 CODE:
2347{ 2765{
2348 STRLEN datalen; 2766 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2767 char *data = SvPVbyte (data_sv, datalen);
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2769 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2770}
2353 OUTPUT: 2771 OUTPUT:
2354 RETVAL 2772 RETVAL
2355 2773
2356CFPlus::RW 2774DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2775new_from_file (SV *class, const char *path, const char *mode = "rb")
2358 CODE: 2776 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2777 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2778 OUTPUT:
2361 RETVAL 2779 RETVAL
2362 2780
2363# fails on win32: 2781# fails on win32:
2364# CFPlus.xs(2268) : error C2059: syntax error : '(' 2782# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2783#void
2366#close (CFPlus::RW self) 2784#close (DC::RW self)
2367# CODE: 2785# CODE:
2368# (self->(close)) (self); 2786# (self->(close)) (self);
2369 2787
2370MODULE = CFPlus PACKAGE = CFPlus::Channel 2788MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2789
2372PROTOTYPES: DISABLE 2790PROTOTYPES: DISABLE
2373 2791
2374CFPlus::Channel 2792DC::Channel
2375find () 2793find ()
2376 CODE: 2794 CODE:
2377{ 2795{
2378 RETVAL = Mix_GroupAvailable (-1); 2796 RETVAL = Mix_GroupAvailable (-1);
2379 2797
2392} 2810}
2393 OUTPUT: 2811 OUTPUT:
2394 RETVAL 2812 RETVAL
2395 2813
2396void 2814void
2397halt (CFPlus::Channel self) 2815halt (DC::Channel self)
2398 CODE: 2816 CODE:
2399 Mix_HaltChannel (self); 2817 Mix_HaltChannel (self);
2400 2818
2401void 2819void
2402expire (CFPlus::Channel self, int ticks = -1) 2820expire (DC::Channel self, int ticks = -1)
2403 CODE: 2821 CODE:
2404 Mix_ExpireChannel (self, ticks); 2822 Mix_ExpireChannel (self, ticks);
2405 2823
2406void 2824void
2407fade_out (CFPlus::Channel self, int ticks = -1) 2825fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2826 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2827 Mix_FadeOutChannel (self, ticks);
2410 2828
2411int 2829int
2412volume (CFPlus::Channel self, int volume) 2830volume (DC::Channel self, int volume)
2413 CODE: 2831 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2832 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2833 OUTPUT:
2416 RETVAL 2834 RETVAL
2417 2835
2418void 2836void
2419unregister_all_effects (CFPlus::Channel self) 2837unregister_all_effects (DC::Channel self)
2420 CODE: 2838 CODE:
2421 Mix_UnregisterAllEffects (self); 2839 Mix_UnregisterAllEffects (self);
2422 2840
2423void 2841void
2424set_panning (CFPlus::Channel self, int left, int right) 2842set_panning (DC::Channel self, int left, int right)
2425 CODE: 2843 CODE:
2426 left = CLAMP (left , 0, 255); 2844 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2845 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2846 Mix_SetPanning (self, left, right);
2429 2847
2430void 2848void
2431set_distance (CFPlus::Channel self, int distance) 2849set_distance (DC::Channel self, int distance)
2432 CODE: 2850 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2851 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2852
2435void 2853void
2436set_position (CFPlus::Channel self, int angle, int distance) 2854set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2855 CODE:
2438 2856
2439void 2857void
2440set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2858set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2859 CODE:
2442{ 2860{
2443 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));
2444 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;
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2863 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2864}
2447 2865
2448void 2866void
2449set_reverse_stereo (CFPlus::Channel self, int flip) 2867set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2868 CODE:
2451 Mix_SetReverseStereo (self, flip); 2869 Mix_SetReverseStereo (self, flip);
2452 2870
2453MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2871MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2872
2455PROTOTYPES: DISABLE 2873PROTOTYPES: DISABLE
2456 2874
2875void
2876decoders ()
2877 PPCODE:
2878#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2879 int i, num = Mix_GetNumChunkDecoders ();
2880 EXTEND (SP, num);
2881 for (i = 0; i < num; ++i)
2882 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2883#else
2884 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2885#endif
2886
2457CFPlus::MixChunk 2887DC::MixChunk
2458new (SV *class, CFPlus::RW rwops) 2888new (SV *class, DC::RW rwops)
2459 CODE: 2889 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2890 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2891 OUTPUT:
2462 RETVAL 2892 RETVAL
2463 2893
2464void 2894void
2465DESTROY (CFPlus::MixChunk self) 2895DESTROY (DC::MixChunk self)
2466 CODE: 2896 CODE:
2467 Mix_FreeChunk (self); 2897 Mix_FreeChunk (self);
2468 2898
2469int 2899int
2470volume (CFPlus::MixChunk self, int volume = -1) 2900volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2901 CODE:
2472 if (items > 1) 2902 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2903 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2904 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2905 OUTPUT:
2476 RETVAL 2906 RETVAL
2477 2907
2478CFPlus::Channel 2908DC::Channel
2479play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2909play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480 CODE: 2910 CODE:
2481{ 2911{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2912 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2913
2484 if (RETVAL < 0) 2914 if (RETVAL < 0)
2491 } 2921 }
2492} 2922}
2493 OUTPUT: 2923 OUTPUT:
2494 RETVAL 2924 RETVAL
2495 2925
2496MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2926MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2927
2928void
2929decoders ()
2930 PPCODE:
2931#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2932 int i, num = Mix_GetNumMusicDecoders ();
2933 EXTEND (SP, num);
2934 for (i = 0; i < num; ++i)
2935 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2936#else
2937 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2938#endif
2497 2939
2498int 2940int
2499volume (int volume = -1) 2941volume (int volume = -1)
2500 PROTOTYPE: ;$ 2942 PROTOTYPE: ;$
2501 CODE: 2943 CODE:
2513void 2955void
2514halt () 2956halt ()
2515 CODE: 2957 CODE:
2516 Mix_HaltMusic (); 2958 Mix_HaltMusic ();
2517 2959
2960int
2961playing ()
2962 CODE:
2963 RETVAL = Mix_PlayingMusic ();
2964 OUTPUT:
2965 RETVAL
2966
2518CFPlus::MixMusic 2967DC::MixMusic
2519new (SV *class, CFPlus::RW rwops) 2968new (SV *class, DC::RW rwops)
2520 CODE: 2969 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 2970 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 2971 OUTPUT:
2523 RETVAL 2972 RETVAL
2524 2973
2525void 2974void
2526DESTROY (CFPlus::MixMusic self) 2975DESTROY (DC::MixMusic self)
2527 CODE: 2976 CODE:
2528 Mix_FreeMusic (self); 2977 Mix_FreeMusic (self);
2529 2978
2530int 2979int
2531play (CFPlus::MixMusic self, int loops = -1) 2980play (DC::MixMusic self, int loops = -1)
2532 CODE: 2981 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 2982 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 2983 OUTPUT:
2535 RETVAL 2984 RETVAL
2536 2985
2537void 2986void
2538fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2987fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 2988 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 2989 Mix_FadeInMusicPos (self, loops, ms, position);
2541 2990
2542MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2991MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 2992
2544PROTOTYPES: ENABLE 2993PROTOTYPES: ENABLE
2545 2994
2546BOOT: 2995BOOT:
2547{ 2996{
2548 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2997 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 2998 static const struct {
2550 const char *name; 2999 const char *name;
2551 IV iv; 3000 IV iv;
2552 } *civ, const_iv[] = { 3001 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 3002# define const_iv(name) { # name, (IV)name }
2554 const_iv (GL_VENDOR), 3003 const_iv (GL_VENDOR),
2555 const_iv (GL_VERSION), 3004 const_iv (GL_VERSION),
2556 const_iv (GL_EXTENSIONS), 3005 const_iv (GL_EXTENSIONS),
3006 const_iv (GL_MAX_TEXTURE_UNITS),
2557 const_iv (GL_COLOR_MATERIAL), 3007 const_iv (GL_COLOR_MATERIAL),
2558 const_iv (GL_SMOOTH), 3008 const_iv (GL_SMOOTH),
2559 const_iv (GL_FLAT), 3009 const_iv (GL_FLAT),
2560 const_iv (GL_DITHER), 3010 const_iv (GL_DITHER),
2561 const_iv (GL_BLEND), 3011 const_iv (GL_BLEND),
2573 const_iv (GL_ZERO), 3023 const_iv (GL_ZERO),
2574 const_iv (GL_SRC_ALPHA), 3024 const_iv (GL_SRC_ALPHA),
2575 const_iv (GL_DST_ALPHA), 3025 const_iv (GL_DST_ALPHA),
2576 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3026 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2577 const_iv (GL_ONE_MINUS_DST_ALPHA), 3027 const_iv (GL_ONE_MINUS_DST_ALPHA),
3028 const_iv (GL_SRC_COLOR),
3029 const_iv (GL_DST_COLOR),
3030 const_iv (GL_ONE_MINUS_SRC_COLOR),
3031 const_iv (GL_ONE_MINUS_DST_COLOR),
2578 const_iv (GL_SRC_ALPHA_SATURATE), 3032 const_iv (GL_SRC_ALPHA_SATURATE),
2579 const_iv (GL_RGB), 3033 const_iv (GL_RGB),
2580 const_iv (GL_RGBA), 3034 const_iv (GL_RGBA),
2581 const_iv (GL_RGBA4), 3035 const_iv (GL_RGBA4),
2582 const_iv (GL_RGBA8), 3036 const_iv (GL_RGBA8),
2650 const_iv (GL_NICEST), 3104 const_iv (GL_NICEST),
2651 const_iv (GL_V2F), 3105 const_iv (GL_V2F),
2652 const_iv (GL_V3F), 3106 const_iv (GL_V3F),
2653 const_iv (GL_T2F_V3F), 3107 const_iv (GL_T2F_V3F),
2654 const_iv (GL_T2F_N3F_V3F), 3108 const_iv (GL_T2F_N3F_V3F),
3109 const_iv (GL_FUNC_ADD),
3110 const_iv (GL_FUNC_SUBTRACT),
3111 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2655# undef const_iv 3112# undef const_iv
2656 }; 3113 };
2657 3114
2658 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3115 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2659 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3116 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2666disable_GL_EXT_blend_func_separate () 3123disable_GL_EXT_blend_func_separate ()
2667 CODE: 3124 CODE:
2668 gl.BlendFuncSeparate = 0; 3125 gl.BlendFuncSeparate = 0;
2669 gl.BlendFuncSeparateEXT = 0; 3126 gl.BlendFuncSeparateEXT = 0;
2670 3127
3128void
3129apple_nvidia_bug (int enable)
3130
2671char * 3131char *
2672gl_vendor () 3132gl_vendor ()
2673 CODE: 3133 CODE:
2674 RETVAL = (char *)glGetString (GL_VENDOR); 3134 RETVAL = (char *)glGetString (GL_VENDOR);
2675 OUTPUT: 3135 OUTPUT:
2724 3184
2725void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3185void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2726 CODE: 3186 CODE:
2727 gl_BlendFuncSeparate (sa, da, saa, daa); 3187 gl_BlendFuncSeparate (sa, da, saa, daa);
2728 3188
3189# void glBlendEquation (int se)
3190
2729void glDepthMask (int flag) 3191void glDepthMask (int flag)
2730 3192
2731void glLogicOp (int opcode) 3193void glLogicOp (int opcode)
2732 3194
2733void glColorMask (int red, int green, int blue, int alpha) 3195void glColorMask (int red, int green, int blue, int alpha)
2767void glRotate (float angle, float x, float y, float z) 3229void glRotate (float angle, float x, float y, float z)
2768 CODE: 3230 CODE:
2769 glRotatef (angle, x, y, z); 3231 glRotatef (angle, x, y, z);
2770 3232
2771void glColor (float r, float g, float b, float a = 1.0) 3233void glColor (float r, float g, float b, float a = 1.0)
3234 PROTOTYPE: @
2772 ALIAS: 3235 ALIAS:
2773 glColor_premultiply = 1 3236 glColor_premultiply = 1
2774 CODE: 3237 CODE:
2775 if (ix) 3238 if (ix)
2776 { 3239 {
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3309void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3310 CODE:
2848 if (gl.SeparableFilter2D) 3311 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3312 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3313
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3314void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 3315
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3316void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 3317
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3318void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3319
2882 3345
2883void glEndList () 3346void glEndList ()
2884 3347
2885void glCallList (int list) 3348void glCallList (int list)
2886 3349
2887MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3350void c_init ()
3351 CODE:
3352 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3353 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3354
3355MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 3356
2889PROTOTYPES: DISABLE 3357PROTOTYPES: DISABLE
2890 3358
2891void 3359void
2892find_widget (SV *self, NV x, NV y) 3360find_widget (SV *self, NV x, NV y)
2896 XPUSHs (self); 3364 XPUSHs (self);
2897} 3365}
2898 3366
2899BOOT: 3367BOOT:
2900{ 3368{
2901 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3369 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 3370
2903 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3371 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2904 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3372 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2905 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3373 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2906 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3374 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907} 3375}
2908 3376
2909void 3377void
2910draw (SV *self) 3378draw (SV *self)
2911 CODE: 3379 CODE:
2918 SV *draw_w_sv = GvSV (draw_w_gv); 3386 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 3387 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 3388 double draw_x, draw_y;
2921 3389
2922 if (!SvROK (self)) 3390 if (!SvROK (self))
2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3391 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 3392
2925 hv = (HV *)SvRV (self); 3393 hv = (HV *)SvRV (self);
2926 3394
2927 if (SvTYPE (hv) != SVt_PVHV) 3395 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3396 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 3397
2930 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3398 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2931 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3399 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932 3400
2933 if (!h || !w) 3401 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines