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.236 by root, Mon Oct 8 16:10:14 2007 UTC vs.
Revision 1.295 by root, Mon Dec 21 03:30:22 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);
46#endif
47
44#define PANGO_ENABLE_BACKEND 48#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 49#define G_DISABLE_CAST_CHECKS
46 50
47#include <glib/gmacros.h> 51#include <glib/gmacros.h>
48 52
49#include <pango/pango.h> 53#include <pango/pango.h>
54
55#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0
57#endif
58
59#if !PANGO_VERSION_CHECK (1, 15, 2)
60# define pango_layout_get_line_readonly pango_layout_get_line
61# define pango_layout_get_lines_readonly pango_layout_get_lines
62# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
63# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
64#endif
50 65
51#ifndef _WIN32 66#ifndef _WIN32
52# include <sys/types.h> 67# include <sys/types.h>
53# include <sys/socket.h> 68# include <sys/socket.h>
54# include <netinet/in.h> 69# include <netinet/in.h>
55# include <netinet/tcp.h> 70# include <netinet/tcp.h>
56# include <inttypes.h> 71# include <inttypes.h>
57#endif 72#endif
58 73
74#if __GNUC__ >= 4
75# define expect(expr,value) __builtin_expect ((expr),(value))
76#else
77# define expect(expr,value) (expr)
78#endif
79
80#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1)
82
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 84
61#define FOW_DARKNESS 32 85#define FOW_DARKNESS 64
86#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */
62 87
63#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
65 90
66#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
67 92
68#if 0 93/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 95
71# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
72#endif 97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
73 101
74static AV *texture_av; 102static AV *texture_av;
75 103
76static struct 104static struct
77{ 105{
… …
120 148
121#include "pango-font.c" 149#include "pango-font.c"
122#include "pango-fontmap.c" 150#include "pango-fontmap.c"
123#include "pango-render.c" 151#include "pango-render.c"
124 152
125typedef IV CFPlus__Channel; 153typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 154typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 155typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 156typedef Mix_Music *DC__MixMusic;
129 157
130typedef PangoFontDescription *CFPlus__Font; 158typedef PangoFontDescription *DC__Font;
131 159
132static int 160static int
133shape_attr_p (PangoLayoutRun *run) 161shape_attr_p (PangoLayoutRun *run)
134{ 162{
135 GSList *attrs = run->item->analysis.extra_attrs; 163 GSList *attrs = run->item->analysis.extra_attrs;
… …
149 177
150typedef struct cf_layout { 178typedef struct cf_layout {
151 PangoLayout *pl; 179 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 180 float r, g, b, a; // default color for rgba mode
153 int base_height; 181 int base_height;
154 CFPlus__Font font; 182 DC__Font font;
155 rc_t *rc; 183 rc_t *rc;
156} *CFPlus__Layout; 184} *DC__Layout;
157 185
158static CFPlus__Font default_font; 186static DC__Font default_font;
159static PangoContext *opengl_context; 187static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 188static PangoFontMap *opengl_fontmap;
161 189
162static void 190static void
163substitute_func (FcPattern *pattern, gpointer data) 191substitute_func (FcPattern *pattern, gpointer data)
… …
168#endif 196#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 197 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 198}
171 199
172static void 200static void
173layout_update_font (CFPlus__Layout self) 201layout_update_font (DC__Layout self)
174{ 202{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 203 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
177 */ 205 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
179 207
180 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 210
183 pango_layout_set_font_description (self->pl, font); 211 pango_layout_set_font_description (self->pl, font);
184} 212}
185 213
186static void 214static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 215layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 216{
189 PangoRectangle rect; 217 PangoRectangle rect;
190 218
191 // get_pixel_* wrongly rounds down 219 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 220 pango_layout_get_extents (self->pl, 0, &rect);
… …
209 int w, h; 237 int w, h;
210 float s, t; 238 float s, t;
211 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
212 tileid smoothtile; 240 tileid smoothtile;
213 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
214} maptex; 243} maptex;
215 244
216typedef struct { 245typedef struct {
217 uint32_t player; 246 uint32_t player;
218 tileid tile[3]; 247 tileid tile[3];
… …
231 int faces; tileid *face2tile; // [faceid] 260 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 261 int texs; maptex *tex; // [tileid]
233 262
234 int32_t rows; 263 int32_t rows;
235 maprow *row; 264 maprow *row;
236} *CFPlus__Map; 265} *DC__Map;
237 266
238static char * 267static char *
239prepend (char *ptr, int sze, int inc) 268prepend (char *ptr, int sze, int inc)
240{ 269{
241 char *p; 270 char *p;
… …
279 self->texs *= 2; 308 self->texs *= 2;
280 } 309 }
281} 310}
282 311
283static maprow * 312static maprow *
284map_get_row (CFPlus__Map self, int y) 313map_get_row (DC__Map self, int y)
285{ 314{
286 if (0 > y) 315 if (0 > y)
287 { 316 {
288 int extend = - y + MAP_EXTEND_Y; 317 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 318 Prepend (maprow, self->row, self->rows, extend);
… …
327 356
328 return row->col + (x - row->c0); 357 return row->col + (x - row->c0);
329} 358}
330 359
331static mapcell * 360static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 361map_get_cell (DC__Map self, int x, int y)
333{ 362{
334 return row_get_cell (map_get_row (self, y), x); 363 return row_get_cell (map_get_row (self, y), x);
335} 364}
336 365
337static void 366static void
338map_clear (CFPlus__Map self) 367map_clear (DC__Map self)
339{ 368{
340 int r; 369 int r;
341 370
342 for (r = 0; r < self->rows; r++) 371 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 372 Safefree (self->row[r].col);
… …
350 self->oy = 0; 379 self->oy = 0;
351 self->row = 0; 380 self->row = 0;
352 self->rows = 0; 381 self->rows = 0;
353} 382}
354 383
384#define CELL_CLEAR(cell) \
385 do { \
386 if ((cell)->player) \
387 (cell)->tile [2] = 0; \
388 (cell)->darkness = 0; \
389 (cell)->stat_hp = 0; \
390 (cell)->flags = 0; \
391 (cell)->player = 0; \
392 } while (0)
393
355static void 394static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 395map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 396{
358 int x, y; 397 int x, y;
359 maprow *row; 398 maprow *row;
360 mapcell *cell; 399 mapcell *cell;
361 400
… …
373 if (x >= row->c1) 412 if (x >= row->c1)
374 break; 413 break;
375 414
376 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
377 416
378 cell->darkness = 0; 417 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 418 }
383 } 419 }
384} 420}
385 421
386typedef struct { 422typedef struct {
… …
498 return 0; 534 return 0;
499 535
500 return 1; 536 return 1;
501} 537}
502 538
503MODULE = CFPlus PACKAGE = CFPlus 539/******************************************************************************/
540
541/* process keyboard modifiers */
542static int
543mod_munge (int mod)
544{
545 mod &= MOD_MASK;
546
547 if (mod & (KMOD_META | KMOD_ALT))
548 mod |= KMOD_LRAM;
549
550 return mod;
551}
552
553static void
554deliantra_main ()
555{
556 char *argv[] = { 0 };
557 call_argv ("::main", G_DISCARD | G_VOID, argv);
558}
559
560#ifdef __MACOSX__
561 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back.
566 */
567 extern C_LINKAGE int
568 main (int argc, char *argv[])
569 {
570 deliantra_main ();
571 }
572
573 #undef main
574
575 extern C_LINKAGE int main (int argc, char *argv[]);
576
577 static void
578 SDL_braino (void)
579 {
580 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv);
582 }
583#else
584 static void
585 SDL_braino (void)
586 {
587 deliantra_main ();
588 }
589#endif
590
591MODULE = Deliantra::Client PACKAGE = DC
504 592
505PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
506 594
507BOOT: 595BOOT:
508{ 596{
509 HV *stash = gv_stashpv ("CFPlus", 1); 597 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 598 static const struct {
511 const char *name; 599 const char *name;
512 IV iv; 600 IV iv;
513 } *civ, const_iv[] = { 601 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 602# define const_iv(name) { # name, (IV)name }
… …
535 const_iv (SDL_USEREVENT), 623 const_iv (SDL_USEREVENT),
536 624
537 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
628
629
630 const_iv (SDLK_UNKNOWN),
631 const_iv (SDLK_FIRST),
632 const_iv (SDLK_BACKSPACE),
633 const_iv (SDLK_TAB),
634 const_iv (SDLK_CLEAR),
635 const_iv (SDLK_RETURN),
636 const_iv (SDLK_PAUSE),
637 const_iv (SDLK_ESCAPE),
638 const_iv (SDLK_SPACE),
639 const_iv (SDLK_EXCLAIM),
640 const_iv (SDLK_QUOTEDBL),
641 const_iv (SDLK_HASH),
642 const_iv (SDLK_DOLLAR),
643 const_iv (SDLK_AMPERSAND),
644 const_iv (SDLK_QUOTE),
645 const_iv (SDLK_LEFTPAREN),
646 const_iv (SDLK_RIGHTPAREN),
647 const_iv (SDLK_ASTERISK),
648 const_iv (SDLK_PLUS),
649 const_iv (SDLK_COMMA),
650 const_iv (SDLK_MINUS),
651 const_iv (SDLK_PERIOD),
652 const_iv (SDLK_SLASH),
653 const_iv (SDLK_0),
654 const_iv (SDLK_1),
655 const_iv (SDLK_2),
656 const_iv (SDLK_3),
657 const_iv (SDLK_4),
658 const_iv (SDLK_5),
659 const_iv (SDLK_6),
660 const_iv (SDLK_7),
661 const_iv (SDLK_8),
662 const_iv (SDLK_9),
663 const_iv (SDLK_COLON),
664 const_iv (SDLK_SEMICOLON),
665 const_iv (SDLK_LESS),
666 const_iv (SDLK_EQUALS),
667 const_iv (SDLK_GREATER),
668 const_iv (SDLK_QUESTION),
669 const_iv (SDLK_AT),
670
671 const_iv (SDLK_LEFTBRACKET),
672 const_iv (SDLK_BACKSLASH),
673 const_iv (SDLK_RIGHTBRACKET),
674 const_iv (SDLK_CARET),
675 const_iv (SDLK_UNDERSCORE),
676 const_iv (SDLK_BACKQUOTE),
677 const_iv (SDLK_DELETE),
540 678
541 const_iv (SDLK_FIRST), 679 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 680 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
… …
620 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
624 762
763 const_iv (KMOD_LRAM),
764
625 const_iv (MIX_DEFAULT_FORMAT), 765 const_iv (MIX_DEFAULT_FORMAT),
766
767 const_iv (SDL_INIT_TIMER),
768 const_iv (SDL_INIT_AUDIO),
769 const_iv (SDL_INIT_VIDEO),
770 const_iv (SDL_INIT_CDROM),
771 const_iv (SDL_INIT_JOYSTICK),
772 const_iv (SDL_INIT_EVERYTHING),
773 const_iv (SDL_INIT_NOPARACHUTE),
774 const_iv (SDL_INIT_EVENTTHREAD),
775
776 const_iv (SDL_GL_RED_SIZE),
777 const_iv (SDL_GL_GREEN_SIZE),
778 const_iv (SDL_GL_BLUE_SIZE),
779 const_iv (SDL_GL_ALPHA_SIZE),
780 const_iv (SDL_GL_DOUBLEBUFFER),
781 const_iv (SDL_GL_BUFFER_SIZE),
782 const_iv (SDL_GL_DEPTH_SIZE),
783 const_iv (SDL_GL_STENCIL_SIZE),
784 const_iv (SDL_GL_ACCUM_RED_SIZE),
785 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
786 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
787 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
788 const_iv (SDL_GL_STEREO),
789 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
790 const_iv (SDL_GL_MULTISAMPLESAMPLES),
791 const_iv (SDL_GL_ACCELERATED_VISUAL),
792 const_iv (SDL_GL_SWAP_CONTROL),
793
794 const_iv (FOW_DARKNESS)
626# undef const_iv 795# undef const_iv
627 }; 796 };
628 797
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
652 821
653IV minpot (UV n) 822IV minpot (UV n)
654 823
655IV popcount (UV n) 824IV popcount (UV n)
656 825
826NV distance (NV dx, NV dy)
827 CODE:
828 RETVAL = pow (dx * dx + dy * dy, 0.5);
829 OUTPUT:
830 RETVAL
831
657void 832void
658pango_init () 833pango_init ()
659 CODE: 834 CODE:
660{ 835{
661 opengl_fontmap = pango_opengl_font_map_new (); 836 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 837 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); 838 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
839 /*pango_context_set_font_description (opengl_context, default_font);*/
840#if PANGO_VERSION_CHECK (1, 15, 2)
841 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
842 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
843#endif
664} 844}
665 845
666char *
667SDL_GetError () 846char *SDL_GetError ()
668 847
669int 848void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 849
672void 850int SDL_Init (U32 flags)
851
852int SDL_InitSubSystem (U32 flags)
853
854void SDL_QuitSubSystem (U32 flags)
855
673SDL_Quit () 856void SDL_Quit ()
857
858int SDL_GL_SetAttribute (int attr, int value)
859
860int SDL_GL_GetAttribute (int attr)
861 CODE:
862 if (SDL_GL_GetAttribute (attr, &RETVAL))
863 XSRETURN_UNDEF;
864 OUTPUT:
865 RETVAL
674 866
675void 867void
676SDL_ListModes (int rgb, int alpha) 868SDL_ListModes (int rgb, int alpha)
677 PPCODE: 869 PPCODE:
678{ 870{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 882 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 883 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 885
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 886 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); 887 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 888
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 889 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 890
702 if (m && m != (SDL_Rect **)-1) 891 if (m && m != (SDL_Rect **)-1)
703 while (*m) 892 while (*m)
704 { 893 {
705 if ((*m)->w >= 640 && (*m)->h >= 480) 894 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 895 {
707 AV *av = newAV (); 896 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 897 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 898 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 899 av_push (av, newSViv (rgb));
… …
734 923
735 if (RETVAL) 924 if (RETVAL)
736 { 925 {
737 av_clear (texture_av); 926 av_clear (texture_av);
738 927
739 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 928 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 929#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
741#include "glfunc.h" 930#include "glfunc.h"
742#undef GL_FUNC 931#undef GL_FUNC
743 } 932 }
744} 933}
… …
751char * 940char *
752SDL_GetKeyName (int sym) 941SDL_GetKeyName (int sym)
753 942
754int 943int
755SDL_GetAppState () 944SDL_GetAppState ()
945
946int
947SDL_GetModState ()
756 948
757void 949void
758poll_events () 950poll_events ()
759 PPCODE: 951 PPCODE:
760{ 952{
… …
770 { 962 {
771 case SDL_KEYDOWN: 963 case SDL_KEYDOWN:
772 case SDL_KEYUP: 964 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 965 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 966 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 967 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 */ 968 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); 969 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 970 break;
779 971
780 case SDL_ACTIVEEVENT: 972 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 973 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 991 x = ev.motion.x;
800 y = ev.motion.y; 992 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 993 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 994 }
803 995
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 997 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 998 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 999 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1000 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1001 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1002 }
811 break; 1003 break;
812 1004
813 case SDL_MOUSEBUTTONDOWN: 1005 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1006 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1007 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1008
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1009 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1011 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1012 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1017 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1018 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 1019 break;
828 } 1020 }
829 1021
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1022 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 1023 }
832} 1024}
833 1025
834int 1026int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1027Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
… …
894 } 1086 }
895 } 1087 }
896#endif 1088#endif
897} 1089}
898 1090
899void 1091int
900add_font (char *file) 1092add_font (char *file)
901 CODE: 1093 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT:
1096 RETVAL
903 1097
904void 1098void
905load_image_inline (SV *image_) 1099load_image_inline (SV *image_)
906 ALIAS: 1100 ALIAS:
907 load_image_file = 1 1101 load_image_file = 1
… …
993void 1187void
994error (char *message) 1188error (char *message)
995 CODE: 1189 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1190 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1191#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1192 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1193#endif
1000 1194
1001void 1195void
1002fatal (char *message) 1196fatal (char *message)
1003 CODE: 1197 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1198 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1199#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1200 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1201#endif
1008 _exit (1); 1202 _exit (1);
1009 1203
1010void 1204void
1011_exit (int retval = 0) 1205_exit (int retval = 0)
… …
1023#if DEBUG 1217#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1218 VALGRIND_DO_LEAK_CHECK;
1025#endif 1219#endif
1026} 1220}
1027 1221
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1222int
1223SvREFCNT (SV *sv)
1224 CODE:
1225 RETVAL = SvREFCNT (sv);
1226 OUTPUT:
1227 RETVAL
1228
1229MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1230
1030PROTOTYPES: DISABLE 1231PROTOTYPES: DISABLE
1031 1232
1032CFPlus::Font 1233DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1234new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1235 CODE:
1035{ 1236{
1036 int count; 1237 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1238 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
1040} 1241}
1041 OUTPUT: 1242 OUTPUT:
1042 RETVAL 1243 RETVAL
1043 1244
1044void 1245void
1045DESTROY (CFPlus::Font self) 1246DESTROY (DC::Font self)
1046 CODE: 1247 CODE:
1047 pango_font_description_free (self); 1248 pango_font_description_free (self);
1048 1249
1049void 1250void
1050make_default (CFPlus::Font self) 1251make_default (DC::Font self)
1051 PROTOTYPE: $ 1252 PROTOTYPE: $
1052 CODE: 1253 CODE:
1053 default_font = self; 1254 default_font = self;
1054 1255
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1256MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1257
1057PROTOTYPES: DISABLE 1258PROTOTYPES: DISABLE
1058 1259
1059void 1260void
1060reset_glyph_cache () 1261glyph_cache_backup ()
1061 PROTOTYPE: 1262 PROTOTYPE:
1062 CODE: 1263 CODE:
1264 tc_backup ();
1265
1266void
1267glyph_cache_restore ()
1268 PROTOTYPE:
1269 CODE:
1063 tc_clear (); 1270 tc_restore ();
1064 1271
1065CFPlus::Layout 1272DC::Layout
1066new (SV *class) 1273new (SV *class)
1067 CODE: 1274 CODE:
1068 New (0, RETVAL, 1, struct cf_layout); 1275 New (0, RETVAL, 1, struct cf_layout);
1069 1276
1070 RETVAL->pl = pango_layout_new (opengl_context); 1277 RETVAL->pl = pango_layout_new (opengl_context);
… …
1080 layout_update_font (RETVAL); 1287 layout_update_font (RETVAL);
1081 OUTPUT: 1288 OUTPUT:
1082 RETVAL 1289 RETVAL
1083 1290
1084void 1291void
1085DESTROY (CFPlus::Layout self) 1292DESTROY (DC::Layout self)
1086 CODE: 1293 CODE:
1087 g_object_unref (self->pl); 1294 g_object_unref (self->pl);
1088 rc_free (self->rc); 1295 rc_free (self->rc);
1089 Safefree (self); 1296 Safefree (self);
1090 1297
1091void 1298void
1092set_text (CFPlus::Layout self, SV *text_) 1299set_text (DC::Layout self, SV *text_)
1093 CODE: 1300 CODE:
1094{ 1301{
1095 STRLEN textlen; 1302 STRLEN textlen;
1096 char *text = SvPVutf8 (text_, textlen); 1303 char *text = SvPVutf8 (text_, textlen);
1097 1304
1098 pango_layout_set_text (self->pl, text, textlen); 1305 pango_layout_set_text (self->pl, text, textlen);
1099} 1306}
1100 1307
1101void 1308void
1102set_markup (CFPlus::Layout self, SV *text_) 1309set_markup (DC::Layout self, SV *text_)
1103 CODE: 1310 CODE:
1104{ 1311{
1105 STRLEN textlen; 1312 STRLEN textlen;
1106 char *text = SvPVutf8 (text_, textlen); 1313 char *text = SvPVutf8 (text_, textlen);
1107 1314
1108 pango_layout_set_markup (self->pl, text, textlen); 1315 pango_layout_set_markup (self->pl, text, textlen);
1109} 1316}
1110 1317
1111void 1318void
1112set_shapes (CFPlus::Layout self, ...) 1319set_shapes (DC::Layout self, ...)
1113 CODE: 1320 CODE:
1114{ 1321{
1115 PangoAttrList *attrs = 0; 1322 PangoAttrList *attrs = 0;
1116 const char *text = pango_layout_get_text (self->pl); 1323 const char *text = pango_layout_get_text (self->pl);
1117 const char *pos = text; 1324 const char *pos = text;
… …
1152 if (attrs) 1359 if (attrs)
1153 pango_layout_set_attributes (self->pl, attrs); 1360 pango_layout_set_attributes (self->pl, attrs);
1154} 1361}
1155 1362
1156void 1363void
1157get_shapes (CFPlus::Layout self) 1364get_shapes (DC::Layout self)
1158 PPCODE: 1365 PPCODE:
1159{ 1366{
1160 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1367 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161 1368
1162 do 1369 do
1163 { 1370 {
1164 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1371 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165 1372
1166 if (run && shape_attr_p (run)) 1373 if (run && shape_attr_p (run))
1167 { 1374 {
1168 PangoRectangle extents; 1375 PangoRectangle extents;
1169 pango_layout_iter_get_run_extents (iter, 0, &extents); 1376 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1177 1384
1178 pango_layout_iter_free (iter); 1385 pango_layout_iter_free (iter);
1179} 1386}
1180 1387
1181int 1388int
1182has_wrapped (CFPlus::Layout self) 1389has_wrapped (DC::Layout self)
1183 CODE: 1390 CODE:
1184{ 1391{
1185 int lines = 1; 1392 int lines = 1;
1186 const char *text = pango_layout_get_text (self->pl); 1393 const char *text = pango_layout_get_text (self->pl);
1187 1394
… …
1192} 1399}
1193 OUTPUT: 1400 OUTPUT:
1194 RETVAL 1401 RETVAL
1195 1402
1196SV * 1403SV *
1197get_text (CFPlus::Layout self) 1404get_text (DC::Layout self)
1198 CODE: 1405 CODE:
1199 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1406 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200 sv_utf8_decode (RETVAL); 1407 sv_utf8_decode (RETVAL);
1201 OUTPUT: 1408 OUTPUT:
1202 RETVAL 1409 RETVAL
1203 1410
1204void 1411void
1205set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1412set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1206 CODE: 1413 CODE:
1207 self->r = r; 1414 self->r = r;
1208 self->g = g; 1415 self->g = g;
1209 self->b = b; 1416 self->b = b;
1210 self->a = a; 1417 self->a = a;
1211 1418
1212void 1419void
1213set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1420set_font (DC::Layout self, DC::Font font = 0)
1214 CODE: 1421 CODE:
1215 if (self->font != font) 1422 if (self->font != font)
1216 { 1423 {
1217 self->font = font; 1424 self->font = font;
1218 layout_update_font (self); 1425 layout_update_font (self);
1219 } 1426 }
1220 1427
1221void 1428void
1222set_height (CFPlus::Layout self, int base_height) 1429set_height (DC::Layout self, int base_height)
1223 CODE: 1430 CODE:
1224 if (self->base_height != base_height) 1431 if (self->base_height != base_height)
1225 { 1432 {
1226 self->base_height = base_height; 1433 self->base_height = base_height;
1227 layout_update_font (self); 1434 layout_update_font (self);
1228 } 1435 }
1229 1436
1230void 1437void
1231set_width (CFPlus::Layout self, int max_width = -1) 1438set_width (DC::Layout self, int max_width = -1)
1232 CODE: 1439 CODE:
1233 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1440 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1234 1441
1235void 1442void
1236set_indent (CFPlus::Layout self, int indent) 1443set_indent (DC::Layout self, int indent)
1237 CODE: 1444 CODE:
1238 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1445 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239 1446
1240void 1447void
1241set_spacing (CFPlus::Layout self, int spacing) 1448set_spacing (DC::Layout self, int spacing)
1242 CODE: 1449 CODE:
1243 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1450 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244 1451
1245void 1452void
1246set_ellipsise (CFPlus::Layout self, int ellipsise) 1453set_ellipsise (DC::Layout self, int ellipsise)
1247 CODE: 1454 CODE:
1248 pango_layout_set_ellipsize (self->pl, 1455 pango_layout_set_ellipsize (self->pl,
1249 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1456 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1457 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1458 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252 : PANGO_ELLIPSIZE_NONE 1459 : PANGO_ELLIPSIZE_NONE
1253 ); 1460 );
1254 1461
1255void 1462void
1256set_single_paragraph_mode (CFPlus::Layout self, int spm) 1463set_single_paragraph_mode (DC::Layout self, int spm)
1257 CODE: 1464 CODE:
1258 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1465 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259 1466
1260void 1467void
1261size (CFPlus::Layout self) 1468size (DC::Layout self)
1262 PPCODE: 1469 PPCODE:
1263{ 1470{
1264 int w, h; 1471 int w, h;
1265 1472
1266 layout_get_pixel_size (self, &w, &h); 1473 layout_get_pixel_size (self, &w, &h);
… …
1269 PUSHs (sv_2mortal (newSViv (w))); 1476 PUSHs (sv_2mortal (newSViv (w)));
1270 PUSHs (sv_2mortal (newSViv (h))); 1477 PUSHs (sv_2mortal (newSViv (h)));
1271} 1478}
1272 1479
1273int 1480int
1274descent (CFPlus::Layout self) 1481descent (DC::Layout self)
1275 CODE: 1482 CODE:
1276{ 1483{
1277 PangoRectangle rect; 1484 PangoRectangle rect;
1278 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1485 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279 pango_layout_line_get_pixel_extents (line, 0, &rect); 1486 pango_layout_line_get_pixel_extents (line, 0, &rect);
1280 RETVAL = PANGO_DESCENT (rect); 1487 RETVAL = PANGO_DESCENT (rect);
1281} 1488}
1282 OUTPUT: 1489 OUTPUT:
1283 RETVAL 1490 RETVAL
1284 1491
1285int 1492int
1286xy_to_index (CFPlus::Layout self, int x, int y) 1493xy_to_index (DC::Layout self, int x, int y)
1287 CODE: 1494 CODE:
1288{ 1495{
1289 int index, trailing; 1496 int index, trailing;
1290 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1497 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1291 RETVAL = index + trailing; 1498 RETVAL = index + trailing;
1292} 1499}
1293 OUTPUT: 1500 OUTPUT:
1294 RETVAL 1501 RETVAL
1295 1502
1296void 1503void
1297cursor_pos (CFPlus::Layout self, int index) 1504cursor_pos (DC::Layout self, int index)
1298 PPCODE: 1505 PPCODE:
1299{ 1506{
1300 PangoRectangle strong_pos; 1507 PangoRectangle pos;
1301 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1508 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302 1509
1303 EXTEND (SP, 3); 1510 EXTEND (SP, 3);
1304 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1512 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307} 1514}
1308 1515
1309void 1516void
1310index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1517index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311 PPCODE: 1518 PPCODE:
1312{ 1519{
1313 int line, x; 1520 int line, x;
1314 1521
1315 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1522 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1523#if !PANGO_VERSION_CHECK (1, 17, 3)
1316 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1524 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317 1525 --line;
1526#endif
1318 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSViv (line - 1))); 1528 PUSHs (sv_2mortal (newSViv (line)));
1320 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1529 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321} 1530}
1322 1531
1323void 1532void
1324line_x_to_index (CFPlus::Layout self, int line, int x) 1533line_x_to_index (DC::Layout self, int line, int x)
1325 PPCODE: 1534 PPCODE:
1326{ 1535{
1327 PangoLayoutLine *lp; 1536 PangoLayoutLine *lp;
1328 int index, trailing; 1537 int index, trailing;
1329 1538
1330 if (line < 0) 1539 if (line < 0)
1331 XSRETURN_EMPTY; 1540 XSRETURN_EMPTY;
1332 1541
1333 if (!(lp = pango_layout_get_line (self->pl, line))) 1542 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334 XSRETURN_EMPTY; /* do better */ 1543 XSRETURN_EMPTY; /* do better */
1335 1544
1336 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1545 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1337 1546
1338 EXTEND (SP, 2); 1547 EXTEND (SP, 2);
… …
1344 PUSHs (sv_2mortal (newSViv (trailing))); 1553 PUSHs (sv_2mortal (newSViv (trailing)));
1345 } 1554 }
1346} 1555}
1347 1556
1348void 1557void
1349render (CFPlus::Layout self, float x, float y, int flags = 0) 1558render (DC::Layout self, float x, float y, int flags = 0)
1350 CODE: 1559 CODE:
1351 rc_clear (self->rc); 1560 rc_clear (self->rc);
1352 pango_opengl_render_layout_subpixel ( 1561 pango_opengl_render_layout_subpixel (
1353 self->pl, 1562 self->pl,
1354 self->rc, 1563 self->rc,
… …
1359 // we assume that context_change actually clears/frees stuff 1568 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation... 1569 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl); 1570 pango_layout_context_changed (self->pl);
1362 1571
1363void 1572void
1364draw (CFPlus::Layout self) 1573draw (DC::Layout self)
1365 CODE: 1574 CODE:
1366{ 1575{
1367 glEnable (GL_TEXTURE_2D); 1576 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1577 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND); 1578 glEnable (GL_BLEND);
… …
1377 glDisable (GL_ALPHA_TEST); 1586 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND); 1587 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D); 1588 glDisable (GL_TEXTURE_2D);
1380} 1589}
1381 1590
1382MODULE = CFPlus PACKAGE = CFPlus::Texture 1591MODULE = Deliantra::Client PACKAGE = DC::Texture
1383 1592
1384PROTOTYPES: ENABLE 1593PROTOTYPES: ENABLE
1385 1594
1386void 1595void
1387pad (SV *data_, int ow, int oh, int nw, int nh) 1596pad (SV *data_, int ow, int oh, int nw, int nh)
… …
1455 glDisable (GL_ALPHA_TEST); 1664 glDisable (GL_ALPHA_TEST);
1456 glDisable (GL_BLEND); 1665 glDisable (GL_BLEND);
1457 } 1666 }
1458} 1667}
1459 1668
1669void
1670draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)
1671 PROTOTYPE: @
1672 CODE:
1673{
1674 glEnable (GL_TEXTURE_2D);
1675 glEnable (GL_BLEND);
1676 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glBindTexture (GL_TEXTURE_2D, name1);
1678
1679 glColor3f (intensity, intensity, intensity);
1680 glPushMatrix ();
1681 glScalef (1./3, 1./3, 1.);
1682
1683 if (blend > 0.f)
1684 {
1685 float S2, T2; /* 0. 0. for texture 2 */
1686 float w = w1 > w2 ? w1 : w2;
1687 float h = h1 > h2 ? h1 : h2;
1688 GLfloat env_color[4] = { 0., 0., 0., blend };
1689
1690 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1693
1694 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1695 gl.ActiveTexture (GL_TEXTURE1);
1696 glEnable (GL_TEXTURE_2D);
1697 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699
1700 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704
1705 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707
1708 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1709 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1710 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1711
1712 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717
1718 s1 *= w / w1;
1719 t1 *= h / h1;
1720
1721 dx *= -3.f / w2;
1722 dy *= -3.f / h2;
1723 dx *= w / w2;
1724 dy *= h / h2;
1725
1726 s2 *= w / w2;
1727 t2 *= h / h2;
1728
1729 glBegin (GL_QUADS);
1730 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);
1731 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);
1732 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);
1733 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);
1734 glEnd ();
1735
1736 glDisable (GL_TEXTURE_2D);
1737 gl.ActiveTexture (GL_TEXTURE0);
1738 }
1739 else
1740 {
1741 /* simple blending of one texture, also opengl <1.3 path */
1742 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743
1744 glBegin (GL_QUADS);
1745 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1746 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1747 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1748 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1749 glEnd ();
1750 }
1751
1752 glPopMatrix ();
1753
1754 glDisable (GL_TEXTURE_2D);
1755 glDisable (GL_BLEND);
1756}
1757
1460IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1758IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1461 CODE: 1759 CODE:
1462{ 1760{
1463 GLint width; 1761 GLint width;
1464 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1762 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1466 RETVAL = width > 0; 1764 RETVAL = width > 0;
1467} 1765}
1468 OUTPUT: 1766 OUTPUT:
1469 RETVAL 1767 RETVAL
1470 1768
1471MODULE = CFPlus PACKAGE = CFPlus::Map 1769MODULE = Deliantra::Client PACKAGE = DC::Map
1472 1770
1473PROTOTYPES: DISABLE 1771PROTOTYPES: DISABLE
1474 1772
1475CFPlus::Map 1773DC::Map
1476new (SV *class) 1774new (SV *class)
1477 CODE: 1775 CODE:
1478 New (0, RETVAL, 1, struct map); 1776 New (0, RETVAL, 1, struct map);
1479 RETVAL->x = 0; 1777 RETVAL->x = 0;
1480 RETVAL->y = 0; 1778 RETVAL->y = 0;
… …
1488 RETVAL->row = 0; 1786 RETVAL->row = 0;
1489 OUTPUT: 1787 OUTPUT:
1490 RETVAL 1788 RETVAL
1491 1789
1492void 1790void
1493DESTROY (CFPlus::Map self) 1791DESTROY (DC::Map self)
1494 CODE: 1792 CODE:
1495{ 1793{
1496 map_clear (self); 1794 map_clear (self);
1497 Safefree (self->face2tile); 1795 Safefree (self->face2tile);
1498 Safefree (self->tex); 1796 Safefree (self->tex);
1499 Safefree (self); 1797 Safefree (self);
1500} 1798}
1501 1799
1502void 1800void
1503resize (CFPlus::Map self, int map_width, int map_height) 1801resize (DC::Map self, int map_width, int map_height)
1504 CODE: 1802 CODE:
1505 self->w = map_width; 1803 self->w = map_width;
1506 self->h = map_height; 1804 self->h = map_height;
1507 1805
1508void 1806void
1509clear (CFPlus::Map self) 1807clear (DC::Map self)
1510 CODE: 1808 CODE:
1511 map_clear (self); 1809 map_clear (self);
1512 1810
1513void 1811void
1514set_tileid (CFPlus::Map self, int face, int tile) 1812set_tileid (DC::Map self, int face, int tile)
1515 CODE: 1813 CODE:
1516{ 1814{
1517 need_facenum (self, face); self->face2tile [face] = tile; 1815 need_facenum (self, face); self->face2tile [face] = tile;
1518 need_texid (self, tile); 1816 need_texid (self, tile);
1519} 1817}
1520 1818
1521void 1819void
1522set_smooth (CFPlus::Map self, int face, int smooth, int level) 1820set_smooth (DC::Map self, int face, int smooth, int level)
1523 CODE: 1821 CODE:
1524{ 1822{
1525 tileid texid; 1823 tileid texid;
1526 maptex *tex; 1824 maptex *tex;
1527 1825
… …
1540 tex->smoothtile = self->face2tile [smooth]; 1838 tex->smoothtile = self->face2tile [smooth];
1541 tex->smoothlevel = level; 1839 tex->smoothlevel = level;
1542} 1840}
1543 1841
1544void 1842void
1545set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1843set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1546 CODE: 1844 CODE:
1547{ 1845{
1548 need_texid (self, texid); 1846 need_texid (self, texid);
1549 1847
1550 { 1848 {
… …
1569 // use uglier nearest interpolation because linear suffers 1867 // use uglier nearest interpolation because linear suffers
1570 // from transparent color bleeding and ugly wrapping effects. 1868 // from transparent color bleeding and ugly wrapping effects.
1571 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1869 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572} 1870}
1573 1871
1872void
1873expire_textures (DC::Map self, int texid, int count)
1874 PPCODE:
1875 for (; texid < self->texs && count; ++texid, --count)
1876 {
1877 maptex *tex = self->tex + texid;
1878
1879 if (tex->name)
1880 {
1881 if (tex->unused)
1882 {
1883 tex->name = 0;
1884 tex->unused = 0;
1885 XPUSHs (sv_2mortal (newSViv (texid)));
1886 }
1887 else
1888 tex->unused = 1;
1889 }
1890 }
1891
1574int 1892int
1575ox (CFPlus::Map self) 1893ox (DC::Map self)
1576 ALIAS: 1894 ALIAS:
1577 oy = 1 1895 oy = 1
1578 x = 2 1896 x = 2
1579 y = 3 1897 y = 3
1580 w = 4 1898 w = 4
… …
1591 } 1909 }
1592 OUTPUT: 1910 OUTPUT:
1593 RETVAL 1911 RETVAL
1594 1912
1595void 1913void
1596scroll (CFPlus::Map self, int dx, int dy) 1914scroll (DC::Map self, int dx, int dy)
1597 CODE: 1915 CODE:
1598{ 1916{
1599 if (dx > 0) 1917 if (dx > 0)
1600 map_blank (self, self->x, self->y, dx, self->h); 1918 map_blank (self, self->x, self->y, dx, self->h);
1601 else if (dx < 0) 1919 else if (dx < 0)
… …
1617 self->y += MAP_EXTEND_Y; 1935 self->y += MAP_EXTEND_Y;
1618 } 1936 }
1619} 1937}
1620 1938
1621SV * 1939SV *
1622map1a_update (CFPlus::Map self, SV *data_, int extmap) 1940map1a_update (DC::Map self, SV *data_, int extmap)
1623 CODE: 1941 CODE:
1624{ 1942{
1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1943 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626 uint8_t *data_end = (uint8_t *)SvEND (data_); 1944 uint8_t *data_end = (uint8_t *)SvEND (data_);
1627 mapcell *cell; 1945 mapcell *cell;
… …
1655 uint8_t ext, cmd; 1973 uint8_t ext, cmd;
1656 1974
1657 do 1975 do
1658 { 1976 {
1659 ext = *data++; 1977 ext = *data++;
1660 cmd = ext & 0x3f; 1978 cmd = ext & 0x7f;
1661 1979
1662 if (cmd < 4) 1980 if (cmd < 4)
1663 cell->darkness = 255 - ext * 64 + 1; 1981 cell->darkness = 255 - ext * 64 + 1;
1664 else if (cmd == 5) // health 1982 else if (cmd == 5) // health
1665 { 1983 {
… …
1668 } 1986 }
1669 else if (cmd == 6) // monster width 1987 else if (cmd == 6) // monster width
1670 cell->stat_width = *data++ + 1; 1988 cell->stat_width = *data++ + 1;
1671 else if (cmd == 0x47) 1989 else if (cmd == 0x47)
1672 { 1990 {
1673 if (*data == 4) 1991 if (*data == 1) cell->player = data [1];
1674 ; // decode player count 1992 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1993 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1994 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1675 1995
1676 data += *data + 1; 1996 data += *data + 1;
1677 } 1997 }
1678 else if (cmd == 8) // cell flags 1998 else if (cmd == 8) // cell flags
1679 cell->flags = *data++; 1999 cell->flags = *data++;
… …
1696 cell->tile [z] = self->face2tile [face]; 2016 cell->tile [z] = self->face2tile [face];
1697 2017
1698 if (cell->tile [z]) 2018 if (cell->tile [z])
1699 { 2019 {
1700 maptex *tex = self->tex + cell->tile [z]; 2020 maptex *tex = self->tex + cell->tile [z];
2021 tex->unused = 0;
1701 if (!tex->name) 2022 if (!tex->name)
1702 av_push (missing, newSViv (cell->tile [z])); 2023 av_push (missing, newSViv (cell->tile [z]));
1703 2024
1704 if (tex->smoothtile) 2025 if (tex->smoothtile)
1705 { 2026 {
1706 maptex *smooth = self->tex + tex->smoothtile; 2027 maptex *smooth = self->tex + tex->smoothtile;
2028 smooth->unused = 0;
1707 if (!smooth->name) 2029 if (!smooth->name)
1708 av_push (missing, newSViv (tex->smoothtile)); 2030 av_push (missing, newSViv (tex->smoothtile));
1709 } 2031 }
1710 } 2032 }
1711 } 2033 }
1712 } 2034 }
1713 else 2035 else
1714 cell->darkness = 0; 2036 CELL_CLEAR (cell);
1715 } 2037 }
1716} 2038}
1717 OUTPUT: 2039 OUTPUT:
1718 RETVAL 2040 RETVAL
1719 2041
1720SV * 2042SV *
1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2043mapmap (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 2044 CODE:
1723{ 2045{
1724 int x1, x; 2046 int x1, x;
1725 int y1, y; 2047 int y1, y;
1726 int z; 2048 int z;
… …
1771} 2093}
1772 OUTPUT: 2094 OUTPUT:
1773 RETVAL 2095 RETVAL
1774 2096
1775void 2097void
1776draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2098draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1777 CODE: 2099 CODE:
1778{ 2100{
1779 int x, y, z; 2101 int x, y, z;
1780 2102
1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1782 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2104 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1783 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2105 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1784 smooth_key skey; 2106 smooth_key skey;
1785 2107 int pl_x, pl_y;
2108 maptex pl_tex;
1786 rc_t *rc = rc_alloc (); 2109 rc_t *rc = rc_alloc ();
2110 rc_t *rc_ov = rc_alloc ();
1787 rc_key_t key; 2111 rc_key_t key;
1788 rc_array_t *arr; 2112 rc_array_t *arr, *arr_hidden;
1789 2113
2114 pl_tex.name = 0;
2115
1790 // thats current max. sorry. 2116 // that's current max. sorry.
1791 if (sw > 255) sw = 255; 2117 if (sw > 255) sw = 255;
1792 if (sh > 255) sh = 255; 2118 if (sh > 255) sh = 255;
1793 2119
1794 // clear key, in case of extra padding 2120 // clear key, in case of extra padding
1795 memset (&skey, 0, sizeof (skey)); 2121 memset (&skey, 0, sizeof (skey));
… …
1799 key.g = 255; 2125 key.g = 255;
1800 key.b = 255; 2126 key.b = 255;
1801 key.a = 255; 2127 key.a = 255;
1802 key.mode = GL_QUADS; 2128 key.mode = GL_QUADS;
1803 key.format = GL_T2F_V3F; 2129 key.format = GL_T2F_V3F;
1804 key.texname = -1;
1805 2130
1806 mx += self->x; 2131 mx += self->x;
1807 my += self->y; 2132 my += self->y;
1808 2133
1809 // first pass: determine smooth_max 2134 // first pass: determine smooth_max
… …
1830 2155
1831 glEnable (GL_BLEND); 2156 glEnable (GL_BLEND);
1832 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1833 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2158 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1834 2159
2160 key.texname = self->tex [TEXID_HIDDEN].name;
2161 arr_hidden = rc_array (rc_ov, &key);
2162
1835 for (z = 0; z <= 2; z++) 2163 for (z = 0; z <= 2; z++)
1836 { 2164 {
1837 memset (smooth_level, 0, sizeof (smooth_level)); 2165 memset (smooth_level, 0, sizeof (smooth_level));
2166 key.texname = -1;
1838 2167
1839 for (y = 0; y < sh; y++) 2168 for (y = 0; y < sh; y++)
1840 if (0 <= y + my && y + my < self->rows) 2169 if (0 <= y + my && y + my < self->rows)
1841 { 2170 {
1842 maprow *row = self->row + (y + my); 2171 maprow *row = self->row + (y + my);
… …
1852 maptex tex = self->tex [tile]; 2181 maptex tex = self->tex [tile];
1853 int px, py; 2182 int px, py;
1854 2183
1855 if (key.texname != tex.name) 2184 if (key.texname != tex.name)
1856 { 2185 {
2186 self->tex [tile].unused = 0;
2187
1857 if (!tex.name) 2188 if (!tex.name)
1858 tex = self->tex [2]; /* missing, replace by noface */ 2189 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1859 2190
1860 key.texname = tex.name; 2191 key.texname = tex.name;
1861 arr = rc_array (rc, &key); 2192 arr = rc_array (rc, &key);
1862 } 2193 }
1863 2194
1864 px = (x + 1) * T - tex.w; 2195 px = (x + 1) * T - tex.w;
1865 py = (y + 1) * T - tex.h; 2196 py = (y + 1) * T - tex.h;
2197
2198 if (expect_false (cell->player == player) && expect_false (z == 2))
2199 {
2200 pl_x = px;
2201 pl_y = py;
2202 pl_tex = tex;
2203 continue;
2204 }
1866 2205
1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2206 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2207 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1869 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2208 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1870 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2209 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1871
1872 if (cell->flags && z == 2)
1873 {
1874 // overlays such as the speech bubble, probably more to come
1875 if (cell->flags & 1)
1876 {
1877 maptex tex = self->tex [1];
1878 int px = x * T + T * 2 / 32;
1879 int py = y * T - T * 6 / 32;
1880
1881 if (tex.name)
1882 {
1883 if (key.texname != tex.name)
1884 {
1885 key.texname = tex.name;
1886 arr = rc_array (rc, &key);
1887 }
1888
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1891 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1892 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1893 }
1894 }
1895 }
1896 2210
1897 // update smooth hash 2211 // update smooth hash
1898 if (tex.smoothtile) 2212 if (tex.smoothtile)
1899 { 2213 {
1900 skey.tile = tex.smoothtile; 2214 skey.tile = tex.smoothtile;
… …
1929 // corners 2243 // corners
1930 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2244 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1931 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2245 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1932 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2246 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1933 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2247 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2248 }
2249 }
2250
2251 if (expect_false (z == 2))
2252 {
2253 /* draw question marks on top of hidden spaces */
2254 if (!cell->darkness)
2255 {
2256 maptex tex = self->tex [TEXID_HIDDEN];
2257 int px = (x + 1) * T - tex.w;
2258 int py = (y + 1) * T - tex.h;
2259
2260 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264 }
2265
2266 if (expect_false (cell->flags))
2267 {
2268 // overlays such as the speech bubble, probably more to come
2269 if (cell->flags & 1)
2270 {
2271 rc_key_t key_ov = key;
2272 maptex tex = self->tex [TEXID_SPEECH];
2273 rc_array_t *arr;
2274 int px = x * T + T * 2 / 32;
2275 int py = y * T - T * 6 / 32;
2276
2277 key_ov.texname = tex.name;
2278 arr = rc_array (rc_ov, &key_ov);
2279
2280 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2281 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2282 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2283 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2284 }
1934 } 2285 }
1935 } 2286 }
1936 } 2287 }
1937 } 2288 }
1938 2289
… …
1978 { 2329 {
1979 // this time avoiding texture state changes 2330 // this time avoiding texture state changes
1980 // save gobs of state changes. 2331 // save gobs of state changes.
1981 if (key.texname != tex.name) 2332 if (key.texname != tex.name)
1982 { 2333 {
2334 self->tex [skey->tile].unused = 0;
2335
1983 glEnd (); 2336 glEnd ();
1984 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2337 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1985 glBegin (GL_QUADS); 2338 glBegin (GL_QUADS);
1986 } 2339 }
1987 2340
… …
2016 } 2369 }
2017 2370
2018 hv_clear (smooth); 2371 hv_clear (smooth);
2019 } 2372 }
2020 2373
2374 if (pl_tex.name)
2375 {
2376 maptex tex = pl_tex;
2377 int px = pl_x + sdx;
2378 int py = pl_y + sdy;
2379
2380 key.texname = tex.name;
2381 arr = rc_array (rc, &key);
2382
2383 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2384 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2385 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2386 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2387
2388 rc_draw (rc);
2389 }
2390
2391 rc_draw (rc_ov);
2392 rc_clear (rc_ov);
2393
2021 glDisable (GL_BLEND); 2394 glDisable (GL_BLEND);
2022 rc_free (rc); 2395 rc_free (rc);
2396 rc_free (rc_ov);
2023 2397
2024 // top layer: overlays such as the health bar 2398 // top layer: overlays such as the health bar
2025 for (y = 0; y < sh; y++) 2399 for (y = 0; y < sh; y++)
2026 if (0 <= y + my && y + my < self->rows) 2400 if (0 <= y + my && y + my < self->rows)
2027 { 2401 {
… …
2032 { 2406 {
2033 mapcell *cell = row->col + (x + mx - row->c0); 2407 mapcell *cell = row->col + (x + mx - row->c0);
2034 2408
2035 int px = x * T; 2409 int px = x * T;
2036 int py = y * T; 2410 int py = y * T;
2411
2412 if (expect_false (cell->player == player))
2413 {
2414 px += sdx;
2415 py += sdy;
2416 }
2037 2417
2038 if (cell->stat_hp) 2418 if (cell->stat_hp)
2039 { 2419 {
2040 int width = cell->stat_width * T; 2420 int width = cell->stat_width * T;
2041 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2052 } 2432 }
2053 } 2433 }
2054} 2434}
2055 2435
2056void 2436void
2057draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2437draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2058 CODE: 2438 CODE:
2059{ 2439{
2060 static float color[16][3] = { 2440 static float color[16][3] = {
2061 { 0.00F, 0.00F, 0.00F }, 2441 { 0.00f, 0.00f, 0.00f },
2062 { 1.00F, 1.00F, 1.00F }, 2442 { 1.00f, 1.00f, 1.00f },
2063 { 0.00F, 0.00F, 0.55F }, 2443 { 0.00f, 0.00f, 0.55f },
2064 { 1.00F, 0.00F, 0.00F }, 2444 { 1.00f, 0.00f, 0.00f },
2065 2445
2066 { 1.00F, 0.54F, 0.00F }, 2446 { 1.00f, 0.54f, 0.00f },
2067 { 0.11F, 0.56F, 1.00F }, 2447 { 0.11f, 0.56f, 1.00f },
2068 { 0.93F, 0.46F, 0.00F }, 2448 { 0.93f, 0.46f, 0.00f },
2069 { 0.18F, 0.54F, 0.34F }, 2449 { 0.18f, 0.54f, 0.34f },
2070 2450
2071 { 0.56F, 0.73F, 0.56F }, 2451 { 0.56f, 0.73f, 0.56f },
2072 { 0.80F, 0.80F, 0.80F }, 2452 { 0.80f, 0.80f, 0.80f },
2073 { 0.55F, 0.41F, 0.13F }, 2453 { 0.55f, 0.41f, 0.13f },
2074 { 0.99F, 0.77F, 0.26F }, 2454 { 0.99f, 0.77f, 0.26f },
2075 2455
2076 { 0.74F, 0.65F, 0.41F }, 2456 { 0.74f, 0.65f, 0.41f },
2077 2457
2078 { 0.00F, 1.00F, 1.00F }, 2458 { 0.00f, 1.00f, 1.00f },
2079 { 1.00F, 0.00F, 1.00F }, 2459 { 1.00f, 0.00f, 1.00f },
2080 { 1.00F, 1.00F, 0.00F }, 2460 { 1.00f, 1.00f, 0.00f },
2081 }; 2461 };
2082 2462
2083 int x, y; 2463 int x, y;
2084 2464
2085 glEnable (GL_TEXTURE_2D); 2465 glEnable (GL_TEXTURE_2D);
2466 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467 * but the nvidia driver (185.18.14) mishandles alpha textures
2468 * ansd takes the colour from god knows where instead of using
2469 * Cp. MODULATE results in the same colour, but slightly different
2470 * alpha, but atcually gives us the correct colour with nvidia.
2471 */
2086 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2087 glEnable (GL_BLEND); 2473 glEnable (GL_BLEND);
2088 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2474 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2089 glBegin (GL_QUADS); 2475 glBegin (GL_QUADS);
2090 2476
2091 for (y = 0; y < h; y++) 2477 for (y = 0; y < h; y++)
… …
2095 2481
2096 if (m) 2482 if (m)
2097 { 2483 {
2098 float *c = color [m & 15]; 2484 float *c = color [m & 15];
2099 2485
2100 float tx1 = m & 0x40 ? 0.5 : 0.; 2486 float tx1 = m & 0x40 ? 0.5f : 0.f;
2101 float tx2 = tx1 + 0.5; 2487 float tx2 = tx1 + 0.5f;
2102 2488
2103 glColor4f (c[0], c[1], c[2], 0.75); 2489 glColor4f (c[0], c[1], c[2], 1);
2104 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2490 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2105 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2491 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2106 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2492 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2107 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2493 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2108 } 2494 }
… …
2112 glDisable (GL_BLEND); 2498 glDisable (GL_BLEND);
2113 glDisable (GL_TEXTURE_2D); 2499 glDisable (GL_TEXTURE_2D);
2114} 2500}
2115 2501
2116void 2502void
2117fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2503fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2118 PPCODE: 2504 PPCODE:
2119{ 2505{
2120 int x, y; 2506 int x, y;
2121 int sw1 = sw + 2; 2507 int sw1 = sw + 2;
2122 int sh1 = sh + 2; 2508 int sh1 = sh + 2;
… …
2130 SvCUR_set (darkness3_sv, sw34 * sh3); 2516 SvCUR_set (darkness3_sv, sw34 * sh3);
2131 2517
2132 mx += self->x - 1; 2518 mx += self->x - 1;
2133 my += self->y - 1; 2519 my += self->y - 1;
2134 2520
2135 memset (darkness1, 255, sw1 * sh1); 2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2136 2522
2137 for (y = 0; y < sh1; y++) 2523 for (y = 0; y < sh1; y++)
2138 if (0 <= y + my && y + my < self->rows) 2524 if (0 <= y + my && y + my < self->rows)
2139 { 2525 {
2140 maprow *row = self->row + (y + my); 2526 maprow *row = self->row + (y + my);
… …
2143 if (row->c0 <= x + mx && x + mx < row->c1) 2529 if (row->c0 <= x + mx && x + mx < row->c1)
2144 { 2530 {
2145 mapcell *cell = row->col + (x + mx - row->c0); 2531 mapcell *cell = row->col + (x + mx - row->c0);
2146 2532
2147 darkness1 [y * sw1 + x] = cell->darkness 2533 darkness1 [y * sw1 + x] = cell->darkness
2148 ? 255 - (cell->darkness - 1) 2534 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2149 : 255 - FOW_DARKNESS; 2535 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2150 } 2536 }
2151 } 2537 }
2152 2538
2153 for (y = 0; y < sh; ++y) 2539 for (y = 0; y < sh; ++y)
2154 for (x = 0; x < sw; ++x) 2540 for (x = 0; x < sw; ++x)
… …
2193 PUSHs (sv_2mortal (newSViv (sh3))); 2579 PUSHs (sv_2mortal (newSViv (sh3)));
2194 PUSHs (darkness3_sv); 2580 PUSHs (darkness3_sv);
2195} 2581}
2196 2582
2197SV * 2583SV *
2198get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2584get_rect (DC::Map self, int x0, int y0, int w, int h)
2199 CODE: 2585 CODE:
2200{ 2586{
2201 int x, y, x1, y1; 2587 int x, y, x1, y1;
2202 SV *data_sv = newSV (w * h * 7 + 5); 2588 SV *data_sv = newSV (w * h * 7 + 5);
2203 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2589 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2260 else 2646 else
2261 *data++ = 0; 2647 *data++ = 0;
2262 } 2648 }
2263 } 2649 }
2264 2650
2651 /* if size is w*h + 5 then no data has been found */
2652 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2653 {
2265 SvPOK_only (data_sv); 2654 SvPOK_only (data_sv);
2266 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2655 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656 }
2657
2267 RETVAL = data_sv; 2658 RETVAL = data_sv;
2268} 2659}
2269 OUTPUT: 2660 OUTPUT:
2270 RETVAL 2661 RETVAL
2271 2662
2272void 2663void
2273set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2664set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274 PPCODE: 2665 PPCODE:
2275{ 2666{
2276 int x, y, z; 2667 int x, y, z;
2277 int w, h; 2668 int w, h;
2278 int x1, y1; 2669 int x1, y1;
2670 STRLEN len;
2671 uint8_t *data, *end;
2672
2673 len = SvLEN (data_sv);
2674 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2675 data = SvPVbyte_nolen (data_sv);
2676 end = data + len + 8;
2677
2678 if (len < 5)
2679 XSRETURN_EMPTY;
2279 2680
2280 if (*data++ != 0) 2681 if (*data++ != 0)
2281 XSRETURN_EMPTY; /* version mismatch */ 2682 XSRETURN_EMPTY; /* version mismatch */
2282 2683
2283 w = *data++ << 8; w |= *data++; 2684 w = *data++ << 8; w |= *data++;
… …
2298 { 2699 {
2299 maprow *row = map_get_row (self, y); 2700 maprow *row = map_get_row (self, y);
2300 2701
2301 for (x = x0; x < x1; x++) 2702 for (x = x0; x < x1; x++)
2302 { 2703 {
2704 uint8_t flags;
2705
2706 if (data + 7 >= end)
2707 XSRETURN_EMPTY;
2708
2303 uint8_t flags = *data++; 2709 flags = *data++;
2304 2710
2305 if (flags) 2711 if (flags)
2306 { 2712 {
2307 mapcell *cell = row_get_cell (row, x); 2713 mapcell *cell = row_get_cell (row, x);
2308 tileid tile[3] = { 0, 0, 0 }; 2714 tileid tile[3] = { 0, 0, 0 };
… …
2311 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2717 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2312 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2718 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2313 2719
2314 if (cell->darkness == 0) 2720 if (cell->darkness == 0)
2315 { 2721 {
2316 cell->darkness = 0; 2722 /*cell->darkness = 0;*/
2723 EXTEND (SP, 3);
2317 2724
2318 for (z = 0; z <= 2; z++) 2725 for (z = 0; z <= 2; z++)
2319 { 2726 {
2320 tileid t = tile [z]; 2727 tileid t = tile [z];
2321 2728
2322 if (t >= self->texs || (t && !self->tex [t].name)) 2729 if (t >= self->texs || (t && !self->tex [t].name))
2323 { 2730 {
2324 XPUSHs (sv_2mortal (newSViv (t))); 2731 PUSHs (sv_2mortal (newSViv (t)));
2325 need_texid (self, t); 2732 need_texid (self, t);
2326 } 2733 }
2327 2734
2328 cell->tile [z] = t; 2735 cell->tile [z] = t;
2329 } 2736 }
… …
2331 } 2738 }
2332 } 2739 }
2333 } 2740 }
2334} 2741}
2335 2742
2336MODULE = CFPlus PACKAGE = CFPlus::RW 2743MODULE = Deliantra::Client PACKAGE = DC::RW
2337 2744
2338CFPlus::RW 2745DC::RW
2339new (SV *class, SV *data_sv) 2746new (SV *class, SV *data_sv)
2340 CODE: 2747 CODE:
2341{ 2748{
2342 STRLEN datalen; 2749 STRLEN datalen;
2343 char *data = SvPVbyte (data_sv, datalen); 2750 char *data = SvPVbyte (data_sv, datalen);
… …
2345 RETVAL = SDL_RWFromConstMem (data, datalen); 2752 RETVAL = SDL_RWFromConstMem (data, datalen);
2346} 2753}
2347 OUTPUT: 2754 OUTPUT:
2348 RETVAL 2755 RETVAL
2349 2756
2350CFPlus::RW 2757DC::RW
2351new_from_file (SV *class, const char *path, const char *mode = "rb") 2758new_from_file (SV *class, const char *path, const char *mode = "rb")
2352 CODE: 2759 CODE:
2353 RETVAL = SDL_RWFromFile (path, mode); 2760 RETVAL = SDL_RWFromFile (path, mode);
2354 OUTPUT: 2761 OUTPUT:
2355 RETVAL 2762 RETVAL
2356 2763
2357# fails on win32: 2764# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '(' 2765# dc.xs(2268) : error C2059: syntax error : '('
2359#void 2766#void
2360#close (CFPlus::RW self) 2767#close (DC::RW self)
2361# CODE: 2768# CODE:
2362# (self->(close)) (self); 2769# (self->(close)) (self);
2363 2770
2364MODULE = CFPlus PACKAGE = CFPlus::Channel 2771MODULE = Deliantra::Client PACKAGE = DC::Channel
2365 2772
2366PROTOTYPES: DISABLE 2773PROTOTYPES: DISABLE
2367 2774
2368CFPlus::Channel 2775DC::Channel
2369find () 2776find ()
2370 CODE: 2777 CODE:
2371{ 2778{
2372 RETVAL = Mix_GroupAvailable (-1); 2779 RETVAL = Mix_GroupAvailable (-1);
2373 2780
… …
2386} 2793}
2387 OUTPUT: 2794 OUTPUT:
2388 RETVAL 2795 RETVAL
2389 2796
2390void 2797void
2391halt (CFPlus::Channel self) 2798halt (DC::Channel self)
2392 CODE: 2799 CODE:
2393 Mix_HaltChannel (self); 2800 Mix_HaltChannel (self);
2394 2801
2395void 2802void
2396expire (CFPlus::Channel self, int ticks = -1) 2803expire (DC::Channel self, int ticks = -1)
2397 CODE: 2804 CODE:
2398 Mix_ExpireChannel (self, ticks); 2805 Mix_ExpireChannel (self, ticks);
2399 2806
2400void 2807void
2401fade_out (CFPlus::Channel self, int ticks = -1) 2808fade_out (DC::Channel self, int ticks = -1)
2402 CODE: 2809 CODE:
2403 Mix_FadeOutChannel (self, ticks); 2810 Mix_FadeOutChannel (self, ticks);
2404 2811
2405int 2812int
2406volume (CFPlus::Channel self, int volume) 2813volume (DC::Channel self, int volume)
2407 CODE: 2814 CODE:
2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2815 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409 OUTPUT: 2816 OUTPUT:
2410 RETVAL 2817 RETVAL
2411 2818
2412void 2819void
2413unregister_all_effects (CFPlus::Channel self) 2820unregister_all_effects (DC::Channel self)
2414 CODE: 2821 CODE:
2415 Mix_UnregisterAllEffects (self); 2822 Mix_UnregisterAllEffects (self);
2416 2823
2417void 2824void
2418set_panning (CFPlus::Channel self, int left, int right) 2825set_panning (DC::Channel self, int left, int right)
2419 CODE: 2826 CODE:
2420 left = CLAMP (left , 0, 255); 2827 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255); 2828 right = CLAMP (right, 0, 255);
2422 Mix_SetPanning (self, left, right); 2829 Mix_SetPanning (self, left, right);
2423 2830
2424void 2831void
2425set_distance (CFPlus::Channel self, int distance) 2832set_distance (DC::Channel self, int distance)
2426 CODE: 2833 CODE:
2427 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2834 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428 2835
2429void 2836void
2430set_position (CFPlus::Channel self, int angle, int distance) 2837set_position (DC::Channel self, int angle, int distance)
2431 CODE: 2838 CODE:
2432 2839
2433void 2840void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2841set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435 CODE: 2842 CODE:
2436{ 2843{
2437 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2844 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2438 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2845 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2846 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440} 2847}
2441 2848
2442void 2849void
2443set_reverse_stereo (CFPlus::Channel self, int flip) 2850set_reverse_stereo (DC::Channel self, int flip)
2444 CODE: 2851 CODE:
2445 Mix_SetReverseStereo (self, flip); 2852 Mix_SetReverseStereo (self, flip);
2446 2853
2447MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2854MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448 2855
2449PROTOTYPES: DISABLE 2856PROTOTYPES: DISABLE
2450 2857
2451CFPlus::MixChunk 2858DC::MixChunk
2452new (SV *class, CFPlus::RW rwops) 2859new (SV *class, DC::RW rwops)
2453 CODE: 2860 CODE:
2454 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2861 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455 OUTPUT: 2862 OUTPUT:
2456 RETVAL 2863 RETVAL
2457 2864
2458void 2865void
2459DESTROY (CFPlus::MixChunk self) 2866DESTROY (DC::MixChunk self)
2460 CODE: 2867 CODE:
2461 Mix_FreeChunk (self); 2868 Mix_FreeChunk (self);
2462 2869
2463int 2870int
2464volume (CFPlus::MixChunk self, int volume = -1) 2871volume (DC::MixChunk self, int volume = -1)
2465 CODE: 2872 CODE:
2466 if (items > 1) 2873 if (items > 1)
2467 volume = CLAMP (volume, 0, 128); 2874 volume = CLAMP (volume, 0, 128);
2468 RETVAL = Mix_VolumeChunk (self, volume); 2875 RETVAL = Mix_VolumeChunk (self, volume);
2469 OUTPUT: 2876 OUTPUT:
2470 RETVAL 2877 RETVAL
2471 2878
2472CFPlus::Channel 2879DC::Channel
2473play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2880play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2474 CODE: 2881 CODE:
2475{ 2882{
2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2883 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477 2884
2478 if (RETVAL < 0) 2885 if (RETVAL < 0)
… …
2485 } 2892 }
2486} 2893}
2487 OUTPUT: 2894 OUTPUT:
2488 RETVAL 2895 RETVAL
2489 2896
2490MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2897MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491 2898
2492int 2899int
2493volume (int volume = -1) 2900volume (int volume = -1)
2494 PROTOTYPE: ;$ 2901 PROTOTYPE: ;$
2495 CODE: 2902 CODE:
… …
2507void 2914void
2508halt () 2915halt ()
2509 CODE: 2916 CODE:
2510 Mix_HaltMusic (); 2917 Mix_HaltMusic ();
2511 2918
2512CFPlus::MixMusic 2919DC::MixMusic
2513new (SV *class, CFPlus::RW rwops) 2920new (SV *class, DC::RW rwops)
2514 CODE: 2921 CODE:
2515 RETVAL = Mix_LoadMUS_RW (rwops); 2922 RETVAL = Mix_LoadMUS_RW (rwops);
2516 OUTPUT: 2923 OUTPUT:
2517 RETVAL 2924 RETVAL
2518 2925
2519void 2926void
2520DESTROY (CFPlus::MixMusic self) 2927DESTROY (DC::MixMusic self)
2521 CODE: 2928 CODE:
2522 Mix_FreeMusic (self); 2929 Mix_FreeMusic (self);
2523 2930
2524int 2931int
2525play (CFPlus::MixMusic self, int loops = -1) 2932play (DC::MixMusic self, int loops = -1)
2526 CODE: 2933 CODE:
2527 RETVAL = Mix_PlayMusic (self, loops); 2934 RETVAL = Mix_PlayMusic (self, loops);
2528 OUTPUT: 2935 OUTPUT:
2529 RETVAL 2936 RETVAL
2530 2937
2531void 2938void
2532fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2939fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533 CODE: 2940 CODE:
2534 Mix_FadeInMusicPos (self, loops, ms, position); 2941 Mix_FadeInMusicPos (self, loops, ms, position);
2535 2942
2536MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2943MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537 2944
2538PROTOTYPES: ENABLE 2945PROTOTYPES: ENABLE
2539 2946
2540BOOT: 2947BOOT:
2541{ 2948{
2542 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2949 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543 static const struct { 2950 static const struct {
2544 const char *name; 2951 const char *name;
2545 IV iv; 2952 IV iv;
2546 } *civ, const_iv[] = { 2953 } *civ, const_iv[] = {
2547# define const_iv(name) { # name, (IV)name } 2954# define const_iv(name) { # name, (IV)name }
2548 const_iv (GL_VENDOR), 2955 const_iv (GL_VENDOR),
2549 const_iv (GL_VERSION), 2956 const_iv (GL_VERSION),
2550 const_iv (GL_EXTENSIONS), 2957 const_iv (GL_EXTENSIONS),
2958 const_iv (GL_MAX_TEXTURE_UNITS),
2551 const_iv (GL_COLOR_MATERIAL), 2959 const_iv (GL_COLOR_MATERIAL),
2552 const_iv (GL_SMOOTH), 2960 const_iv (GL_SMOOTH),
2553 const_iv (GL_FLAT), 2961 const_iv (GL_FLAT),
2554 const_iv (GL_DITHER), 2962 const_iv (GL_DITHER),
2555 const_iv (GL_BLEND), 2963 const_iv (GL_BLEND),
… …
2567 const_iv (GL_ZERO), 2975 const_iv (GL_ZERO),
2568 const_iv (GL_SRC_ALPHA), 2976 const_iv (GL_SRC_ALPHA),
2569 const_iv (GL_DST_ALPHA), 2977 const_iv (GL_DST_ALPHA),
2570 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2978 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2571 const_iv (GL_ONE_MINUS_DST_ALPHA), 2979 const_iv (GL_ONE_MINUS_DST_ALPHA),
2980 const_iv (GL_SRC_COLOR),
2981 const_iv (GL_DST_COLOR),
2982 const_iv (GL_ONE_MINUS_SRC_COLOR),
2983 const_iv (GL_ONE_MINUS_DST_COLOR),
2572 const_iv (GL_SRC_ALPHA_SATURATE), 2984 const_iv (GL_SRC_ALPHA_SATURATE),
2573 const_iv (GL_RGB), 2985 const_iv (GL_RGB),
2574 const_iv (GL_RGBA), 2986 const_iv (GL_RGBA),
2575 const_iv (GL_RGBA4), 2987 const_iv (GL_RGBA4),
2576 const_iv (GL_RGBA8), 2988 const_iv (GL_RGBA8),
… …
2644 const_iv (GL_NICEST), 3056 const_iv (GL_NICEST),
2645 const_iv (GL_V2F), 3057 const_iv (GL_V2F),
2646 const_iv (GL_V3F), 3058 const_iv (GL_V3F),
2647 const_iv (GL_T2F_V3F), 3059 const_iv (GL_T2F_V3F),
2648 const_iv (GL_T2F_N3F_V3F), 3060 const_iv (GL_T2F_N3F_V3F),
3061 const_iv (GL_FUNC_ADD),
3062 const_iv (GL_FUNC_SUBTRACT),
3063 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2649# undef const_iv 3064# undef const_iv
2650 }; 3065 };
2651 3066
2652 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3067 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2660disable_GL_EXT_blend_func_separate () 3075disable_GL_EXT_blend_func_separate ()
2661 CODE: 3076 CODE:
2662 gl.BlendFuncSeparate = 0; 3077 gl.BlendFuncSeparate = 0;
2663 gl.BlendFuncSeparateEXT = 0; 3078 gl.BlendFuncSeparateEXT = 0;
2664 3079
3080void
3081apple_nvidia_bug (int enable)
3082
2665char * 3083char *
2666gl_vendor () 3084gl_vendor ()
2667 CODE: 3085 CODE:
2668 RETVAL = (char *)glGetString (GL_VENDOR); 3086 RETVAL = (char *)glGetString (GL_VENDOR);
2669 OUTPUT: 3087 OUTPUT:
… …
2718 3136
2719void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3137void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2720 CODE: 3138 CODE:
2721 gl_BlendFuncSeparate (sa, da, saa, daa); 3139 gl_BlendFuncSeparate (sa, da, saa, daa);
2722 3140
3141# void glBlendEquation (int se)
3142
2723void glDepthMask (int flag) 3143void glDepthMask (int flag)
2724 3144
2725void glLogicOp (int opcode) 3145void glLogicOp (int opcode)
2726 3146
2727void glColorMask (int red, int green, int blue, int alpha) 3147void glColorMask (int red, int green, int blue, int alpha)
… …
2761void glRotate (float angle, float x, float y, float z) 3181void glRotate (float angle, float x, float y, float z)
2762 CODE: 3182 CODE:
2763 glRotatef (angle, x, y, z); 3183 glRotatef (angle, x, y, z);
2764 3184
2765void glColor (float r, float g, float b, float a = 1.0) 3185void glColor (float r, float g, float b, float a = 1.0)
3186 PROTOTYPE: @
2766 ALIAS: 3187 ALIAS:
2767 glColor_premultiply = 1 3188 glColor_premultiply = 1
2768 CODE: 3189 CODE:
2769 if (ix) 3190 if (ix)
2770 { 3191 {
… …
2840void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3261void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2841 CODE: 3262 CODE:
2842 if (gl.SeparableFilter2D) 3263 if (gl.SeparableFilter2D)
2843 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3264 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844 3265
2845void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3266void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846 3267
2847void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3268void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848 3269
2849void glDrawPixels (int width, int height, int format, int type, char *pixels) 3270void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850 3271
… …
2876 3297
2877void glEndList () 3298void glEndList ()
2878 3299
2879void glCallList (int list) 3300void glCallList (int list)
2880 3301
2881MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3302MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882 3303
2883PROTOTYPES: DISABLE 3304PROTOTYPES: DISABLE
2884 3305
2885void 3306void
2886find_widget (SV *self, NV x, NV y) 3307find_widget (SV *self, NV x, NV y)
… …
2890 XPUSHs (self); 3311 XPUSHs (self);
2891} 3312}
2892 3313
2893BOOT: 3314BOOT:
2894{ 3315{
2895 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3316 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896 3317
2897 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3318 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2898 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3319 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2899 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3320 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2900 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3321 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901} 3322}
2902 3323
2903void 3324void
2904draw (SV *self) 3325draw (SV *self)
2905 CODE: 3326 CODE:
… …
2912 SV *draw_w_sv = GvSV (draw_w_gv); 3333 SV *draw_w_sv = GvSV (draw_w_gv);
2913 SV *draw_h_sv = GvSV (draw_h_gv); 3334 SV *draw_h_sv = GvSV (draw_h_gv);
2914 double draw_x, draw_y; 3335 double draw_x, draw_y;
2915 3336
2916 if (!SvROK (self)) 3337 if (!SvROK (self))
2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3338 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918 3339
2919 hv = (HV *)SvRV (self); 3340 hv = (HV *)SvRV (self);
2920 3341
2921 if (SvTYPE (hv) != SVt_PVHV) 3342 if (SvTYPE (hv) != SVt_PVHV)
2922 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3343 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923 3344
2924 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3345 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2925 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3346 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926 3347
2927 if (!h || !w) 3348 if (!h || !w)

Diff Legend

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