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

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

Diff Legend

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