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.210 by root, Tue Jul 24 18:24:03 2007 UTC vs.
Revision 1.278 by root, Wed Sep 3 10:36:25 2008 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
27#include <stdio.h> 32#include <stdio.h>
28#include <stdlib.h> 33#include <stdlib.h>
34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 36
30#include <SDL.h> 37#include <SDL.h>
31#include <SDL_thread.h> 38#include <SDL_thread.h>
32#include <SDL_endian.h> 39#include <SDL_endian.h>
33#include <SDL_image.h> 40#include <SDL_image.h>
34#include <SDL_mixer.h> 41#include <SDL_mixer.h>
35#include <SDL_opengl.h> 42#include <SDL_opengl.h>
36 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
37#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
39 51
40#include <glib/gmacros.h> 52#include <glib/gmacros.h>
41 53
42#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
43 66
44#ifndef _WIN32 67#ifndef _WIN32
45# include <sys/types.h> 68# include <sys/types.h>
46# include <sys/socket.h> 69# include <sys/socket.h>
47# include <netinet/in.h> 70# include <netinet/in.h>
48# include <netinet/tcp.h> 71# include <netinet/tcp.h>
49# include <inttypes.h> 72# include <inttypes.h>
50#endif 73#endif
51 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 85
54#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
55 87
56#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
58 90
59#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
60 92
61#if 0 93/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else 95
64# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
65#endif
66 97
67static AV *texture_av; 98static AV *texture_av;
68 99
69static struct 100static struct
70{ 101{
107 av_push (texture_av, (SV *)(size_t)name); 138 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 139 glDeleteTextures (1, &name);
109} 140}
110 141
111#include "texcache.c" 142#include "texcache.c"
143#include "rendercache.c"
112 144
113#include "pango-font.c" 145#include "pango-font.c"
114#include "pango-fontmap.c" 146#include "pango-fontmap.c"
115#include "pango-render.c" 147#include "pango-render.c"
116 148
149typedef IV DC__Channel;
150typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 151typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 152typedef Mix_Music *DC__MixMusic;
119 153
120typedef PangoFontDescription *CFPlus__Font; 154typedef PangoFontDescription *DC__Font;
121 155
122static int 156static int
123shape_attr_p (PangoLayoutRun *run) 157shape_attr_p (PangoLayoutRun *run)
124{ 158{
125 GSList *attrs = run->item->analysis.extra_attrs; 159 GSList *attrs = run->item->analysis.extra_attrs;
139 173
140typedef struct cf_layout { 174typedef struct cf_layout {
141 PangoLayout *pl; 175 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 176 float r, g, b, a; // default color for rgba mode
143 int base_height; 177 int base_height;
144 CFPlus__Font font; 178 DC__Font font;
179 rc_t *rc;
145} *CFPlus__Layout; 180} *DC__Layout;
146 181
147static CFPlus__Font default_font; 182static DC__Font default_font;
148static PangoContext *opengl_context; 183static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 184static PangoFontMap *opengl_fontmap;
150 185
151static void 186static void
152substitute_func (FcPattern *pattern, gpointer data) 187substitute_func (FcPattern *pattern, gpointer data)
157#endif 192#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 193 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 194}
160 195
161static void 196static void
162layout_update_font (CFPlus__Layout self) 197layout_update_font (DC__Layout self)
163{ 198{
164 /* use a random scale factor to account for unknown descenders, 0.8 works 199 /* use a random scale factor to account for unknown descenders, 0.8 works
165 * reasonably well with bitstream vera 200 * reasonably well with dejavu/bistream fonts
166 */ 201 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 202 PangoFontDescription *font = self->font ? self->font : default_font;
168 203
169 pango_font_description_set_absolute_size (font, 204 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 205 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 206
172 pango_layout_set_font_description (self->pl, font); 207 pango_layout_set_font_description (self->pl, font);
173} 208}
174 209
175static void 210static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 211layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 212{
178 PangoRectangle rect; 213 PangoRectangle rect;
179 214
180 // get_pixel_* wrongly rounds down 215 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 216 pango_layout_get_extents (self->pl, 0, &rect);
192 227
193typedef uint16_t tileid; 228typedef uint16_t tileid;
194typedef uint16_t faceid; 229typedef uint16_t faceid;
195 230
196typedef struct { 231typedef struct {
197 int name; 232 GLuint name;
198 int w, h; 233 int w, h;
199 float s, t; 234 float s, t;
200 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
201 tileid smoothtile; 236 tileid smoothtile;
202 uint8_t smoothlevel; 237 uint8_t smoothlevel;
220 int faces; tileid *face2tile; // [faceid] 255 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 256 int texs; maptex *tex; // [tileid]
222 257
223 int32_t rows; 258 int32_t rows;
224 maprow *row; 259 maprow *row;
225} *CFPlus__Map; 260} *DC__Map;
226 261
227static char * 262static char *
228prepend (char *ptr, int sze, int inc) 263prepend (char *ptr, int sze, int inc)
229{ 264{
230 char *p; 265 char *p;
268 self->texs *= 2; 303 self->texs *= 2;
269 } 304 }
270} 305}
271 306
272static maprow * 307static maprow *
273map_get_row (CFPlus__Map self, int y) 308map_get_row (DC__Map self, int y)
274{ 309{
275 if (0 > y) 310 if (0 > y)
276 { 311 {
277 int extend = - y + MAP_EXTEND_Y; 312 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 313 Prepend (maprow, self->row, self->rows, extend);
316 351
317 return row->col + (x - row->c0); 352 return row->col + (x - row->c0);
318} 353}
319 354
320static mapcell * 355static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 356map_get_cell (DC__Map self, int x, int y)
322{ 357{
323 return row_get_cell (map_get_row (self, y), x); 358 return row_get_cell (map_get_row (self, y), x);
324} 359}
325 360
326static void 361static void
327map_clear (CFPlus__Map self) 362map_clear (DC__Map self)
328{ 363{
329 int r; 364 int r;
330 365
331 for (r = 0; r < self->rows; r++) 366 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 367 Safefree (self->row[r].col);
339 self->oy = 0; 374 self->oy = 0;
340 self->row = 0; 375 self->row = 0;
341 self->rows = 0; 376 self->rows = 0;
342} 377}
343 378
379#define CELL_CLEAR(cell) \
380 do { \
381 if ((cell)->player) \
382 (cell)->tile [2] = 0; \
383 (cell)->darkness = 0; \
384 (cell)->stat_hp = 0; \
385 (cell)->flags = 0; \
386 (cell)->player = 0; \
387 } while (0)
388
344static void 389static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 390map_blank (DC__Map self, int x0, int y0, int w, int h)
346{ 391{
347 int x, y; 392 int x, y;
348 maprow *row; 393 maprow *row;
349 mapcell *cell; 394 mapcell *cell;
350 395
362 if (x >= row->c1) 407 if (x >= row->c1)
363 break; 408 break;
364 409
365 cell = row->col + x - row->c0; 410 cell = row->col + x - row->c0;
366 411
367 cell->darkness = 0; 412 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 413 }
372 } 414 }
373} 415}
374 416
375typedef struct { 417typedef struct {
429 n |= n >> 16; 471 n |= n >> 16;
430 472
431 return n + 1; 473 return n + 1;
432} 474}
433 475
476static unsigned int
477popcount (unsigned int n)
478{
479 n -= (n >> 1) & 0x55555555U;
480 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
481 n = ((n >> 4) + n) & 0x0f0f0f0fU;
482 n *= 0x01010101U;
483
484 return n >> 24;
485}
486
434/* SDL should provide this, really. */ 487/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 488#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 489#define SDLK_MODIFIER_MAX 314
437 490
438/******************************************************************************/ 491/******************************************************************************/
476 return 0; 529 return 0;
477 530
478 return 1; 531 return 1;
479} 532}
480 533
481MODULE = CFPlus PACKAGE = CFPlus 534/******************************************************************************/
535
536/* process keyboard modifiers */
537static int
538mod_munge (int mod)
539{
540 mod &= MOD_MASK;
541
542 if (mod & (KMOD_META | KMOD_ALT))
543 mod |= KMOD_LRAM;
544
545 return mod;
546}
547
548static void
549deliantra_main ()
550{
551 char *argv[] = { 0 };
552 call_argv ("::main", G_DISCARD | G_VOID, argv);
553}
554
555#ifdef __MACOSX__
556 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main()
558 * on OS X, so... we provide one and call the original main(), which,
559 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
560 * and which calls our main (== SDL_main) back.
561 */
562 extern C_LINKAGE int
563 main (int argc, char *argv[])
564 {
565 deliantra_main ();
566 }
567
568 #undef main
569
570 extern C_LINKAGE int main (int argc, char *argv[]);
571
572 static void
573 SDL_braino (void)
574 {
575 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv);
577 }
578#else
579 static void
580 SDL_braino (void)
581 {
582 deliantra_main ();
583 }
584#endif
585
586MODULE = Deliantra::Client PACKAGE = DC
482 587
483PROTOTYPES: ENABLE 588PROTOTYPES: ENABLE
484 589
485BOOT: 590BOOT:
486{ 591{
487 HV *stash = gv_stashpv ("CFPlus", 1); 592 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 593 static const struct {
489 const char *name; 594 const char *name;
490 IV iv; 595 IV iv;
491 } *civ, const_iv[] = { 596 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 597# define const_iv(name) { # name, (IV)name }
514 619
515 const_iv (SDL_APPINPUTFOCUS), 620 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 621 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 622 const_iv (SDL_APPACTIVE),
518 623
624
625 const_iv (SDLK_UNKNOWN),
626 const_iv (SDLK_FIRST),
627 const_iv (SDLK_BACKSPACE),
628 const_iv (SDLK_TAB),
629 const_iv (SDLK_CLEAR),
630 const_iv (SDLK_RETURN),
631 const_iv (SDLK_PAUSE),
632 const_iv (SDLK_ESCAPE),
633 const_iv (SDLK_SPACE),
634 const_iv (SDLK_EXCLAIM),
635 const_iv (SDLK_QUOTEDBL),
636 const_iv (SDLK_HASH),
637 const_iv (SDLK_DOLLAR),
638 const_iv (SDLK_AMPERSAND),
639 const_iv (SDLK_QUOTE),
640 const_iv (SDLK_LEFTPAREN),
641 const_iv (SDLK_RIGHTPAREN),
642 const_iv (SDLK_ASTERISK),
643 const_iv (SDLK_PLUS),
644 const_iv (SDLK_COMMA),
645 const_iv (SDLK_MINUS),
646 const_iv (SDLK_PERIOD),
647 const_iv (SDLK_SLASH),
648 const_iv (SDLK_0),
649 const_iv (SDLK_1),
650 const_iv (SDLK_2),
651 const_iv (SDLK_3),
652 const_iv (SDLK_4),
653 const_iv (SDLK_5),
654 const_iv (SDLK_6),
655 const_iv (SDLK_7),
656 const_iv (SDLK_8),
657 const_iv (SDLK_9),
658 const_iv (SDLK_COLON),
659 const_iv (SDLK_SEMICOLON),
660 const_iv (SDLK_LESS),
661 const_iv (SDLK_EQUALS),
662 const_iv (SDLK_GREATER),
663 const_iv (SDLK_QUESTION),
664 const_iv (SDLK_AT),
665
666 const_iv (SDLK_LEFTBRACKET),
667 const_iv (SDLK_BACKSLASH),
668 const_iv (SDLK_RIGHTBRACKET),
669 const_iv (SDLK_CARET),
670 const_iv (SDLK_UNDERSCORE),
671 const_iv (SDLK_BACKQUOTE),
672 const_iv (SDLK_DELETE),
673
674 const_iv (SDLK_FIRST),
675 const_iv (SDLK_LAST),
519 const_iv (SDLK_KP0), 676 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 677 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 678 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 679 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 680 const_iv (SDLK_KP4),
595 const_iv (KMOD_LMETA), 752 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 753 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 754 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 755 const_iv (KMOD_CAPS),
599 const_iv (KMOD_MODE), 756 const_iv (KMOD_MODE),
757
758 const_iv (KMOD_LRAM),
759
760 const_iv (MIX_DEFAULT_FORMAT),
761
762 const_iv (SDL_INIT_TIMER),
763 const_iv (SDL_INIT_AUDIO),
764 const_iv (SDL_INIT_VIDEO),
765 const_iv (SDL_INIT_CDROM),
766 const_iv (SDL_INIT_JOYSTICK),
767 const_iv (SDL_INIT_EVERYTHING),
768 const_iv (SDL_INIT_NOPARACHUTE),
769 const_iv (SDL_INIT_EVENTTHREAD),
770
771 const_iv (SDL_GL_RED_SIZE),
772 const_iv (SDL_GL_GREEN_SIZE),
773 const_iv (SDL_GL_BLUE_SIZE),
774 const_iv (SDL_GL_ALPHA_SIZE),
775 const_iv (SDL_GL_DOUBLEBUFFER),
776 const_iv (SDL_GL_BUFFER_SIZE),
777 const_iv (SDL_GL_DEPTH_SIZE),
778 const_iv (SDL_GL_STENCIL_SIZE),
779 const_iv (SDL_GL_ACCUM_RED_SIZE),
780 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
781 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
782 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
783 const_iv (SDL_GL_STEREO),
784 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
785 const_iv (SDL_GL_MULTISAMPLESAMPLES),
786 const_iv (SDL_GL_ACCELERATED_VISUAL),
787 const_iv (SDL_GL_SWAP_CONTROL),
788
789 const_iv (FOW_DARKNESS)
600# undef const_iv 790# undef const_iv
601 }; 791 };
602 792
603 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 793 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
622 812
623NV floor (NV x) 813NV floor (NV x)
624 814
625NV ceil (NV x) 815NV ceil (NV x)
626 816
817IV minpot (UV n)
818
819IV popcount (UV n)
820
627void 821void
628pango_init () 822pango_init ()
629 CODE: 823 CODE:
630{ 824{
631 opengl_fontmap = pango_opengl_font_map_new (); 825 opengl_fontmap = pango_opengl_font_map_new ();
632 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 826 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
633 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 827 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
828 /*pango_context_set_font_description (opengl_context, default_font);*/
829#if PANGO_VERSION_CHECK (1, 15, 2)
830 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
831 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
832#endif
634} 833}
635 834
636char *
637SDL_GetError () 835char *SDL_GetError ()
638 836
639int 837void SDL_braino ()
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
641 838
642void 839int SDL_Init (U32 flags)
840
841int SDL_InitSubSystem (U32 flags)
842
843void SDL_QuitSubSystem (U32 flags)
844
643SDL_Quit () 845void SDL_Quit ()
846
847int SDL_GL_SetAttribute (int attr, int value)
848
849int SDL_GL_GetAttribute (int attr)
850 CODE:
851 if (SDL_GL_GetAttribute (attr, &RETVAL))
852 XSRETURN_UNDEF;
853 OUTPUT:
854 RETVAL
644 855
645void 856void
646SDL_ListModes (int rgb, int alpha) 857SDL_ListModes (int rgb, int alpha)
647 PPCODE: 858 PPCODE:
648{ 859{
660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
663 874
664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 875 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
665#if SDL_VERSION_ATLEAST(1,2,10)
666 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
667 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 876 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
669 877
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 878 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 879
672 if (m && m != (SDL_Rect **)-1) 880 if (m && m != (SDL_Rect **)-1)
673 while (*m) 881 while (*m)
674 { 882 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 883 if ((*m)->w >= 400 && (*m)->h >= 300)
676 { 884 {
677 AV *av = newAV (); 885 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 886 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 887 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 888 av_push (av, newSViv (rgb));
704 912
705 if (RETVAL) 913 if (RETVAL)
706 { 914 {
707 av_clear (texture_av); 915 av_clear (texture_av);
708 916
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 917 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 918#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
711#include "glfunc.h" 919#include "glfunc.h"
712#undef GL_FUNC 920#undef GL_FUNC
713 } 921 }
714} 922}
721char * 929char *
722SDL_GetKeyName (int sym) 930SDL_GetKeyName (int sym)
723 931
724int 932int
725SDL_GetAppState () 933SDL_GetAppState ()
934
935int
936SDL_GetModState ()
726 937
727void 938void
728poll_events () 939poll_events ()
729 PPCODE: 940 PPCODE:
730{ 941{
740 { 951 {
741 case SDL_KEYDOWN: 952 case SDL_KEYDOWN:
742 case SDL_KEYUP: 953 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 954 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 955 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 956 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
746 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 957 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 958 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 959 break;
749 960
750 case SDL_ACTIVEEVENT: 961 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 962 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
769 x = ev.motion.x; 980 x = ev.motion.x;
770 y = ev.motion.y; 981 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 982 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 983 }
773 984
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 985 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 986 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 987 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 988 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 989 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 990 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 991 }
781 break; 992 break;
782 993
783 case SDL_MOUSEBUTTONDOWN: 994 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 995 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 997
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 998 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 999 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1000 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1001 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1006 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1007 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 1008 break;
798 } 1009 }
799 1010
800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1011 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
801 } 1012 }
802} 1013}
803 1014
804int 1015int
805Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1016Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 1017 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 1018 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 1019 Mix_ChannelFinished (channel_finished);
809 1020
810void 1021void
1022Mix_QuerySpec ()
1023 PPCODE:
1024{
1025 int freq, channels;
1026 Uint16 format;
1027
1028 if (Mix_QuerySpec (&freq, &format, &channels))
1029 {
1030 EXTEND (SP, 3);
1031 PUSHs (sv_2mortal (newSViv (freq)));
1032 PUSHs (sv_2mortal (newSViv (format)));
1033 PUSHs (sv_2mortal (newSViv (channels)));
1034 }
1035}
1036
1037void
811Mix_CloseAudio () 1038Mix_CloseAudio ()
812 1039
813int 1040int
814Mix_AllocateChannels (int numchans = -1) 1041Mix_AllocateChannels (int numchans = -1)
1042
1043const char *
1044Mix_GetError ()
815 1045
816void 1046void
817lowdelay (int fd, int val = 1) 1047lowdelay (int fd, int val = 1)
818 CODE: 1048 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1049 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
845 } 1075 }
846 } 1076 }
847#endif 1077#endif
848} 1078}
849 1079
850void 1080int
851add_font (char *file) 1081add_font (char *file)
852 CODE: 1082 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT:
1085 RETVAL
854 1086
855void 1087void
856load_image_inline (SV *image_) 1088load_image_inline (SV *image_)
857 ALIAS: 1089 ALIAS:
858 load_image_file = 1 1090 load_image_file = 1
861 STRLEN image_len; 1093 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 1094 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 1095 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 1096 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 1097 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 1098 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 1099 : SDL_RWFromConstMem (image, image_len);
868 1100
869 if (!rw) 1101 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 1102 croak ("load_image: %s", SDL_GetError ());
871 1103
944void 1176void
945error (char *message) 1177error (char *message)
946 CODE: 1178 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1179 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1180#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1181 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1182#endif
951 1183
952void 1184void
953fatal (char *message) 1185fatal (char *message)
954 CODE: 1186 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1187 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1188#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1189 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1190#endif
959 _exit (1); 1191 _exit (1);
960 1192
961void 1193void
962_exit (int retval = 0) 1194_exit (int retval = 0)
974#if DEBUG 1206#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1207 VALGRIND_DO_LEAK_CHECK;
976#endif 1208#endif
977} 1209}
978 1210
979MODULE = CFPlus PACKAGE = CFPlus::Font 1211MODULE = Deliantra::Client PACKAGE = DC::Font
980 1212
981PROTOTYPES: DISABLE 1213PROTOTYPES: DISABLE
982 1214
983CFPlus::Font 1215DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1216new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1217 CODE:
986{ 1218{
987 int count; 1219 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1220 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1223}
992 OUTPUT: 1224 OUTPUT:
993 RETVAL 1225 RETVAL
994 1226
995void 1227void
996DESTROY (CFPlus::Font self) 1228DESTROY (DC::Font self)
997 CODE: 1229 CODE:
998 pango_font_description_free (self); 1230 pango_font_description_free (self);
999 1231
1000void 1232void
1001make_default (CFPlus::Font self) 1233make_default (DC::Font self)
1002 PROTOTYPE: $ 1234 PROTOTYPE: $
1003 CODE: 1235 CODE:
1004 default_font = self; 1236 default_font = self;
1005 1237
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1238MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1239
1008PROTOTYPES: DISABLE 1240PROTOTYPES: DISABLE
1009 1241
1010void 1242void
1011reset_glyph_cache () 1243glyph_cache_backup ()
1012 PROTOTYPE: 1244 PROTOTYPE:
1013 CODE: 1245 CODE:
1246 tc_backup ();
1247
1248void
1249glyph_cache_restore ()
1250 PROTOTYPE:
1251 CODE:
1014 tc_clear (); 1252 tc_restore ();
1015 1253
1016CFPlus::Layout 1254DC::Layout
1017new (SV *class) 1255new (SV *class)
1018 CODE: 1256 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1257 New (0, RETVAL, 1, struct cf_layout);
1020 1258
1021 RETVAL->pl = pango_layout_new (opengl_context); 1259 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1261 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1262 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1263 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1264 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1265 RETVAL->font = 0;
1266 RETVAL->rc = rc_alloc ();
1028 1267
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1268 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1269 layout_update_font (RETVAL);
1031 OUTPUT: 1270 OUTPUT:
1032 RETVAL 1271 RETVAL
1033 1272
1034void 1273void
1035DESTROY (CFPlus::Layout self) 1274DESTROY (DC::Layout self)
1036 CODE: 1275 CODE:
1037 g_object_unref (self->pl); 1276 g_object_unref (self->pl);
1277 rc_free (self->rc);
1038 Safefree (self); 1278 Safefree (self);
1039 1279
1040void 1280void
1041set_text (CFPlus::Layout self, SV *text_) 1281set_text (DC::Layout self, SV *text_)
1042 CODE: 1282 CODE:
1043{ 1283{
1044 STRLEN textlen; 1284 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1285 char *text = SvPVutf8 (text_, textlen);
1046 1286
1047 pango_layout_set_text (self->pl, text, textlen); 1287 pango_layout_set_text (self->pl, text, textlen);
1048} 1288}
1049 1289
1050void 1290void
1051set_markup (CFPlus::Layout self, SV *text_) 1291set_markup (DC::Layout self, SV *text_)
1052 CODE: 1292 CODE:
1053{ 1293{
1054 STRLEN textlen; 1294 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1295 char *text = SvPVutf8 (text_, textlen);
1056 1296
1057 pango_layout_set_markup (self->pl, text, textlen); 1297 pango_layout_set_markup (self->pl, text, textlen);
1058} 1298}
1059 1299
1060void 1300void
1061set_shapes (CFPlus::Layout self, ...) 1301set_shapes (DC::Layout self, ...)
1062 CODE: 1302 CODE:
1063{ 1303{
1064 PangoAttrList *attrs = 0; 1304 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1305 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1306 const char *pos = text;
1101 if (attrs) 1341 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1342 pango_layout_set_attributes (self->pl, attrs);
1103} 1343}
1104 1344
1105void 1345void
1106get_shapes (CFPlus::Layout self) 1346get_shapes (DC::Layout self)
1107 PPCODE: 1347 PPCODE:
1108{ 1348{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1349 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1350
1111 do 1351 do
1112 { 1352 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1353 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1354
1115 if (run && shape_attr_p (run)) 1355 if (run && shape_attr_p (run))
1116 { 1356 {
1117 PangoRectangle extents; 1357 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1358 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1366
1127 pango_layout_iter_free (iter); 1367 pango_layout_iter_free (iter);
1128} 1368}
1129 1369
1130int 1370int
1131has_wrapped (CFPlus::Layout self) 1371has_wrapped (DC::Layout self)
1132 CODE: 1372 CODE:
1133{ 1373{
1134 int lines = 1; 1374 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1375 const char *text = pango_layout_get_text (self->pl);
1136 1376
1141} 1381}
1142 OUTPUT: 1382 OUTPUT:
1143 RETVAL 1383 RETVAL
1144 1384
1145SV * 1385SV *
1146get_text (CFPlus::Layout self) 1386get_text (DC::Layout self)
1147 CODE: 1387 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1388 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1389 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1390 OUTPUT:
1151 RETVAL 1391 RETVAL
1152 1392
1153void 1393void
1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1394set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1155 CODE: 1395 CODE:
1156 self->r = r; 1396 self->r = r;
1157 self->g = g; 1397 self->g = g;
1158 self->b = b; 1398 self->b = b;
1159 self->a = a; 1399 self->a = a;
1160 1400
1161void 1401void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1402set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1403 CODE:
1164 if (self->font != font) 1404 if (self->font != font)
1165 { 1405 {
1166 self->font = font; 1406 self->font = font;
1167 layout_update_font (self); 1407 layout_update_font (self);
1168 } 1408 }
1169 1409
1170void 1410void
1171set_height (CFPlus::Layout self, int base_height) 1411set_height (DC::Layout self, int base_height)
1172 CODE: 1412 CODE:
1173 if (self->base_height != base_height) 1413 if (self->base_height != base_height)
1174 { 1414 {
1175 self->base_height = base_height; 1415 self->base_height = base_height;
1176 layout_update_font (self); 1416 layout_update_font (self);
1177 } 1417 }
1178 1418
1179void 1419void
1180set_width (CFPlus::Layout self, int max_width = -1) 1420set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1421 CODE:
1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1422 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1183 1423
1184void 1424void
1185set_indent (CFPlus::Layout self, int indent) 1425set_indent (DC::Layout self, int indent)
1186 CODE: 1426 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1427 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1428
1189void 1429void
1190set_spacing (CFPlus::Layout self, int spacing) 1430set_spacing (DC::Layout self, int spacing)
1191 CODE: 1431 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1432 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1433
1194void 1434void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1435set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1436 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1437 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1438 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1439 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1440 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1441 : PANGO_ELLIPSIZE_NONE
1202 ); 1442 );
1203 1443
1204void 1444void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1445set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1446 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1447 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1448
1209void 1449void
1210size (CFPlus::Layout self) 1450size (DC::Layout self)
1211 PPCODE: 1451 PPCODE:
1212{ 1452{
1213 int w, h; 1453 int w, h;
1214 1454
1215 layout_get_pixel_size (self, &w, &h); 1455 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1458 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1459 PUSHs (sv_2mortal (newSViv (h)));
1220} 1460}
1221 1461
1222int 1462int
1223descent (CFPlus::Layout self) 1463descent (DC::Layout self)
1224 CODE: 1464 CODE:
1225{ 1465{
1226 PangoRectangle rect; 1466 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1467 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1468 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1469 RETVAL = PANGO_DESCENT (rect);
1230} 1470}
1231 OUTPUT: 1471 OUTPUT:
1232 RETVAL 1472 RETVAL
1233 1473
1234int 1474int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1475xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1476 CODE:
1237{ 1477{
1238 int index, trailing; 1478 int index, trailing;
1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1479 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1240 RETVAL = index + trailing; 1480 RETVAL = index + trailing;
1241} 1481}
1242 OUTPUT: 1482 OUTPUT:
1243 RETVAL 1483 RETVAL
1244 1484
1245void 1485void
1246cursor_pos (CFPlus::Layout self, int index) 1486cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1487 PPCODE:
1248{ 1488{
1249 PangoRectangle strong_pos; 1489 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1490 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1491
1252 EXTEND (SP, 3); 1492 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1494 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1495 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1496}
1257 1497
1258void 1498void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1499index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1500 PPCODE:
1261{ 1501{
1262 int line, x; 1502 int line, x;
1263 1503
1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1504 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1505#if !PANGO_VERSION_CHECK (1, 17, 3)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1506 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1507 --line;
1508#endif
1267 EXTEND (SP, 2); 1509 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1510 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1512}
1271 1513
1272void 1514void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1515line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1516 PPCODE:
1275{ 1517{
1276 PangoLayoutLine *lp; 1518 PangoLayoutLine *lp;
1277 int index, trailing; 1519 int index, trailing;
1278 1520
1279 if (line < 0) 1521 if (line < 0)
1280 XSRETURN_EMPTY; 1522 XSRETURN_EMPTY;
1281 1523
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1524 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1525 XSRETURN_EMPTY; /* do better */
1284 1526
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1527 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286 1528
1287 EXTEND (SP, 2); 1529 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1535 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1536 }
1295} 1537}
1296 1538
1297void 1539void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1540render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1541 CODE:
1542 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1543 pango_opengl_render_layout_subpixel (
1301 self->pl, 1544 self->pl,
1545 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1546 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1547 self->r, self->g, self->b, self->a,
1304 flags 1548 flags
1305 ); 1549 );
1550 // we assume that context_change actually clears/frees stuff
1551 // and does not do any recomputation...
1552 pango_layout_context_changed (self->pl);
1306 1553
1307MODULE = CFPlus PACKAGE = CFPlus::Texture 1554void
1555draw (DC::Layout self)
1556 CODE:
1557{
1558 glEnable (GL_TEXTURE_2D);
1559 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1560 glEnable (GL_BLEND);
1561 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1562 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1563 glEnable (GL_ALPHA_TEST);
1564 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1565
1566 rc_draw (self->rc);
1567
1568 glDisable (GL_ALPHA_TEST);
1569 glDisable (GL_BLEND);
1570 glDisable (GL_TEXTURE_2D);
1571}
1572
1573MODULE = Deliantra::Client PACKAGE = DC::Texture
1308 1574
1309PROTOTYPES: ENABLE 1575PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1576
1313void 1577void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1578pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1579 CODE:
1316{ 1580{
1343 HV *hv = (HV *)SvRV (self); 1607 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1608 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1609 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1610 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1611
1612 if (name <= 0)
1613 XSRETURN_EMPTY;
1614
1348 if (items < 5) 1615 if (items < 5)
1349 { 1616 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1617 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1618 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1619 }
1390 RETVAL = width > 0; 1657 RETVAL = width > 0;
1391} 1658}
1392 OUTPUT: 1659 OUTPUT:
1393 RETVAL 1660 RETVAL
1394 1661
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1662MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1663
1397PROTOTYPES: DISABLE 1664PROTOTYPES: DISABLE
1398 1665
1399CFPlus::Map 1666DC::Map
1400new (SV *class) 1667new (SV *class)
1401 CODE: 1668 CODE:
1402 New (0, RETVAL, 1, struct map); 1669 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1670 RETVAL->x = 0;
1404 RETVAL->y = 0; 1671 RETVAL->y = 0;
1412 RETVAL->row = 0; 1679 RETVAL->row = 0;
1413 OUTPUT: 1680 OUTPUT:
1414 RETVAL 1681 RETVAL
1415 1682
1416void 1683void
1417DESTROY (CFPlus::Map self) 1684DESTROY (DC::Map self)
1418 CODE: 1685 CODE:
1419{ 1686{
1420 map_clear (self); 1687 map_clear (self);
1421 Safefree (self->face2tile); 1688 Safefree (self->face2tile);
1422 Safefree (self->tex); 1689 Safefree (self->tex);
1423 Safefree (self); 1690 Safefree (self);
1424} 1691}
1425 1692
1426void 1693void
1427resize (CFPlus::Map self, int map_width, int map_height) 1694resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1695 CODE:
1429 self->w = map_width; 1696 self->w = map_width;
1430 self->h = map_height; 1697 self->h = map_height;
1431 1698
1432void 1699void
1433clear (CFPlus::Map self) 1700clear (DC::Map self)
1434 CODE: 1701 CODE:
1435 map_clear (self); 1702 map_clear (self);
1436 1703
1437void 1704void
1438set_tileid (CFPlus::Map self, int face, int tile) 1705set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1706 CODE:
1440{ 1707{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1708 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1709 need_texid (self, tile);
1443} 1710}
1444 1711
1445void 1712void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1713set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1714 CODE:
1448{ 1715{
1449 tileid texid; 1716 tileid texid;
1450 maptex *tex; 1717 maptex *tex;
1451 1718
1464 tex->smoothtile = self->face2tile [smooth]; 1731 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1732 tex->smoothlevel = level;
1466} 1733}
1467 1734
1468void 1735void
1469set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1736set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1470 CODE: 1737 CODE:
1471{ 1738{
1472 need_texid (self, texid); 1739 need_texid (self, texid);
1473 1740
1474 { 1741 {
1494 // from transparent color bleeding and ugly wrapping effects. 1761 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1763}
1497 1764
1498int 1765int
1499ox (CFPlus::Map self) 1766ox (DC::Map self)
1500 ALIAS: 1767 ALIAS:
1501 oy = 1 1768 oy = 1
1502 x = 2 1769 x = 2
1503 y = 3 1770 y = 3
1504 w = 4 1771 w = 4
1515 } 1782 }
1516 OUTPUT: 1783 OUTPUT:
1517 RETVAL 1784 RETVAL
1518 1785
1519void 1786void
1520scroll (CFPlus::Map self, int dx, int dy) 1787scroll (DC::Map self, int dx, int dy)
1521 CODE: 1788 CODE:
1522{ 1789{
1523 if (dx > 0) 1790 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1791 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1792 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 1807 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 1808 self->y += MAP_EXTEND_Y;
1542 } 1809 }
1543} 1810}
1544 1811
1545void 1812SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 1813map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 1814 CODE:
1548{ 1815{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 1817 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 1818 mapcell *cell;
1552 int x, y, flags; 1819 int x, y, z, flags;
1820 AV *missing = newAV ();
1821 RETVAL = newRV_noinc ((SV *)missing);
1553 1822
1554 while (data < data_end - 1) 1823 while (data < data_end - 1)
1555 { 1824 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 1825 flags = (data [0] << 8) + data [1]; data += 2;
1557 1826
1577 uint8_t ext, cmd; 1846 uint8_t ext, cmd;
1578 1847
1579 do 1848 do
1580 { 1849 {
1581 ext = *data++; 1850 ext = *data++;
1582 cmd = ext & 0x3f; 1851 cmd = ext & 0x7f;
1583 1852
1584 if (cmd < 4) 1853 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1; 1854 cell->darkness = 255 - ext * 64 + 1;
1586 else if (cmd == 5) // health 1855 else if (cmd == 5) // health
1587 { 1856 {
1590 } 1859 }
1591 else if (cmd == 6) // monster width 1860 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1; 1861 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47) 1862 else if (cmd == 0x47)
1594 { 1863 {
1595 if (*data == 4) 1864 if (*data == 1) cell->player = data [1];
1596 ; // decode player count 1865 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1866 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1867 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1597 1868
1598 data += *data + 1; 1869 data += *data + 1;
1599 } 1870 }
1600 else if (cmd == 8) // cell flags 1871 else if (cmd == 8) // cell flags
1601 cell->flags = *data++; 1872 cell->flags = *data++;
1608 } 1879 }
1609 else 1880 else
1610 cell->darkness = *data++ + 1; 1881 cell->darkness = *data++ + 1;
1611 } 1882 }
1612 1883
1884 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 1885 if (flags & (4 >> z))
1614 { 1886 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 1887 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 1888 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 1889 cell->tile [z] = self->face2tile [face];
1890
1891 if (cell->tile [z])
1892 {
1893 maptex *tex = self->tex + cell->tile [z];
1894 if (!tex->name)
1895 av_push (missing, newSViv (cell->tile [z]));
1896
1897 if (tex->smoothtile)
1898 {
1899 maptex *smooth = self->tex + tex->smoothtile;
1900 if (!smooth->name)
1901 av_push (missing, newSViv (tex->smoothtile));
1902 }
1903 }
1618 } 1904 }
1619
1620 if (flags & 2)
1621 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1625 }
1626
1627 if (flags & 1)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1632 }
1633 } 1905 }
1634 else 1906 else
1635 cell->darkness = 0; 1907 CELL_CLEAR (cell);
1636 } 1908 }
1637} 1909}
1910 OUTPUT:
1911 RETVAL
1638 1912
1639SV * 1913SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1914mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 1915 CODE:
1642{ 1916{
1643 int x1, x; 1917 int x1, x;
1644 int y1, y; 1918 int y1, y;
1645 int z; 1919 int z;
1690} 1964}
1691 OUTPUT: 1965 OUTPUT:
1692 RETVAL 1966 RETVAL
1693 1967
1694void 1968void
1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1696 CODE: 1970 CODE:
1697{ 1971{
1972 int x, y, z;
1973
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1975 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1700 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1976 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1701 smooth_key skey; 1977 smooth_key skey;
1702 int x, y, z; 1978 int pl_x, pl_y;
1703 int last_name; 1979 maptex pl_tex;
1980 rc_t *rc = rc_alloc ();
1981 rc_key_t key;
1982 rc_array_t *arr;
1983
1984 pl_tex.name = 0;
1704 1985
1705 // thats current max. sorry. 1986 // thats current max. sorry.
1706 if (sw > 255) sw = 255; 1987 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 1988 if (sh > 255) sh = 255;
1708 1989
1709 // clear key, in case of extra padding 1990 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 1991 memset (&skey, 0, sizeof (skey));
1711 1992
1712 glColor4ub (255, 255, 255, 255); 1993 memset (&key, 0, sizeof (key));
1713 1994 key.r = 255;
1714 glEnable (GL_BLEND); 1995 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1996 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 1997 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1998 key.mode = GL_QUADS;
1718 1999 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS); 2000 key.texname = -1;
1720
1721 last_name = 0;
1722 2001
1723 mx += self->x; 2002 mx += self->x;
1724 my += self->y; 2003 my += self->y;
1725 2004
1726 // first pass: determine smooth_max 2005 // first pass: determine smooth_max
1742 MAX (self->tex [cell->tile [0]].smoothlevel, 2021 MAX (self->tex [cell->tile [0]].smoothlevel,
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 2022 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 2023 self->tex [cell->tile [2]].smoothlevel));
1745 } 2024 }
1746 } 2025 }
2026
2027 glEnable (GL_BLEND);
2028 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2029 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1747 2030
1748 for (z = 0; z <= 2; z++) 2031 for (z = 0; z <= 2; z++)
1749 { 2032 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 2033 memset (smooth_level, 0, sizeof (smooth_level));
1751 2034
1764 { 2047 {
1765 maptex tex = self->tex [tile]; 2048 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 2049 int px = (x + 1) * T - tex.w;
1767 int py = (y + 1) * T - tex.h; 2050 int py = (y + 1) * T - tex.h;
1768 2051
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 2052 if (key.texname != tex.name)
1772 { 2053 {
1773 if (!tex.name) 2054 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 2055 tex = self->tex [2]; /* missing, replace by noface */
1775 2056
1776 glEnd (); 2057 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2058 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 2059 }
1780 2060
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2061 if (expect_false (cell->player == player) && expect_false (z == 2))
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1783 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1785
1786 if (cell->flags && z == 2)
1787 { 2062 {
2063 pl_x = px;
2064 pl_y = py;
2065 pl_tex = tex;
2066 continue;
2067 }
2068
2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2071 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2073
2074 if (expect_false (cell->flags) && expect_false (z == 2))
2075 {
2076 // overlays such as the speech bubble, probably more to come
1788 if (cell->flags & 1) 2077 if (cell->flags & 1)
1789 { 2078 {
1790 maptex tex = self->tex [1]; 2079 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32; 2080 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32; 2081 int py = y * T - T * 6 / 32;
1793 2082
2083 if (tex.name)
1794 glEnd (); 2084 {
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2085 if (key.texname != tex.name)
2086 {
2087 key.texname = tex.name;
2088 arr = rc_array (rc, &key);
2089 }
2090
2091 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2092 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2093 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2094 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1796 glBegin (GL_QUADS); 2095 }
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 } 2096 }
1803 } 2097 }
1804 2098
1805 // update smooth hash 2099 // update smooth hash
1806 if (tex.smoothtile) 2100 if (tex.smoothtile)
1842 } 2136 }
1843 } 2137 }
1844 } 2138 }
1845 } 2139 }
1846 2140
2141 rc_draw (rc);
2142 rc_clear (rc);
2143
1847 // go through all smoothlevels, lowest to highest, then draw. 2144 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2145 // this is basically counting sort
1849 { 2146 {
1850 int w, b; 2147 int w, b;
1851 2148
2149 glEnable (GL_TEXTURE_2D);
2150 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 2151 for (w = 0; w < 256 / 32; ++w)
1853 { 2152 {
1854 uint32_t smask = smooth_level [w]; 2153 uint32_t smask = smooth_level [w];
1855 if (smask) 2154 if (smask)
1856 for (b = 0; b < 32; ++b) 2155 for (b = 0; b < 32; ++b)
1875 int border = bits & 15; 2174 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2175 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 2176 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 2177 float dy = tex.t * .5f ; // 2 images/column
1879 2178
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 2179 if (tex.name)
1883 { 2180 {
2181 // this time avoiding texture state changes
2182 // save gobs of state changes.
1884 if (!tex.name) 2183 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2184 {
1886
1887 glEnd (); 2185 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2187 glBegin (GL_QUADS);
1890 } 2188 }
1891 2189
1892 if (border) 2190 if (border)
1893 { 2191 {
1894 float ox = border * dx; 2192 float ox = border * dx;
1895 2193
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900 } 2198 }
1901 2199
1902 if (corner) 2200 if (corner)
1903 { 2201 {
1904 float ox = corner * dx; 2202 float ox = corner * dx;
1905 2203
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2204 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2208 }
1910 } 2209 }
1911 } 2210 }
1912 } 2211 }
1913 } 2212 }
1914 } 2213 }
2214
2215 glEnd ();
2216 glDisable (GL_TEXTURE_2D);
2217 key.texname = -1;
1915 } 2218 }
1916 2219
1917 hv_clear (smooth); 2220 hv_clear (smooth);
1918 } 2221 }
1919 2222
1920 glEnd (); 2223 if (pl_tex.name)
2224 {
2225 maptex tex = pl_tex;
2226 int px = pl_x + sdx;
2227 int py = pl_y + sdy;
1921 2228
1922 glDisable (GL_TEXTURE_2D); 2229 key.texname = tex.name;
2230 arr = rc_array (rc, &key);
2231
2232 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2233 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2234 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236
2237 rc_draw (rc);
2238 }
2239
1923 glDisable (GL_BLEND); 2240 glDisable (GL_BLEND);
2241 rc_free (rc);
1924 2242
1925 // top layer: overlays such as the health bar 2243 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2245 if (0 <= y + my && y + my < self->rows)
1928 { 2246 {
1953 } 2271 }
1954 } 2272 }
1955} 2273}
1956 2274
1957void 2275void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2276draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1959 CODE: 2277 CODE:
1960{ 2278{
1961 static float color[16][3] = { 2279 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2280 { 0.00F, 0.00F, 0.00F },
1963 { 1.00F, 1.00F, 1.00F }, 2281 { 1.00F, 1.00F, 1.00F },
2013 glDisable (GL_BLEND); 2331 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2332 glDisable (GL_TEXTURE_2D);
2015} 2333}
2016 2334
2017void 2335void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2336fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2019 PPCODE: 2337 PPCODE:
2020{ 2338{
2021 int x, y; 2339 int x, y;
2022 int sw1 = sw + 2; 2340 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2341 int sh1 = sh + 2;
2031 SvCUR_set (darkness3_sv, sw34 * sh3); 2349 SvCUR_set (darkness3_sv, sw34 * sh3);
2032 2350
2033 mx += self->x - 1; 2351 mx += self->x - 1;
2034 my += self->y - 1; 2352 my += self->y - 1;
2035 2353
2036 memset (darkness1, 255, sw1 * sh1); 2354 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2037 2355
2038 for (y = 0; y < sh1; y++) 2356 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows) 2357 if (0 <= y + my && y + my < self->rows)
2040 { 2358 {
2041 maprow *row = self->row + (y + my); 2359 maprow *row = self->row + (y + my);
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2412 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2413 PUSHs (darkness3_sv);
2096} 2414}
2097 2415
2098SV * 2416SV *
2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2417get_rect (DC::Map self, int x0, int y0, int w, int h)
2100 CODE: 2418 CODE:
2101{ 2419{
2102 int x, y, x1, y1; 2420 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2421 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2422 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2161 else 2479 else
2162 *data++ = 0; 2480 *data++ = 0;
2163 } 2481 }
2164 } 2482 }
2165 2483
2484 /* if size is w*h + 5 then no data has been found */
2485 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2486 {
2166 SvPOK_only (data_sv); 2487 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2488 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2489 }
2490
2168 RETVAL = data_sv; 2491 RETVAL = data_sv;
2169} 2492}
2170 OUTPUT: 2493 OUTPUT:
2171 RETVAL 2494 RETVAL
2172 2495
2173void 2496void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2497set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2498 PPCODE:
2176{ 2499{
2177 int x, y, z; 2500 int x, y, z;
2178 int w, h; 2501 int w, h;
2179 int x1, y1; 2502 int x1, y1;
2503 STRLEN len;
2504 uint8_t *data, *end;
2505
2506 len = SvLEN (data_sv);
2507 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2508 data = SvPVbyte_nolen (data_sv);
2509 end = data + len + 8;
2510
2511 if (len < 5)
2512 XSRETURN_EMPTY;
2180 2513
2181 if (*data++ != 0) 2514 if (*data++ != 0)
2182 return; /* version mismatch */ 2515 XSRETURN_EMPTY; /* version mismatch */
2183 2516
2184 w = *data++ << 8; w |= *data++; 2517 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2518 h = *data++ << 8; h |= *data++;
2186 2519
2187 // we need to do this 'cause we don't keep an absolute coord system for rows 2520 // we need to do this 'cause we don't keep an absolute coord system for rows
2199 { 2532 {
2200 maprow *row = map_get_row (self, y); 2533 maprow *row = map_get_row (self, y);
2201 2534
2202 for (x = x0; x < x1; x++) 2535 for (x = x0; x < x1; x++)
2203 { 2536 {
2537 uint8_t flags;
2538
2539 if (data + 7 >= end)
2540 XSRETURN_EMPTY;
2541
2204 uint8_t flags = *data++; 2542 flags = *data++;
2205 2543
2206 if (flags) 2544 if (flags)
2207 { 2545 {
2208 mapcell *cell = row_get_cell (row, x); 2546 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2547 tileid tile[3] = { 0, 0, 0 };
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2550 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2551 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2552
2215 if (cell->darkness == 0) 2553 if (cell->darkness == 0)
2216 { 2554 {
2217 cell->darkness = 0; 2555 /*cell->darkness = 0;*/
2556 EXTEND (SP, 3);
2218 2557
2219 for (z = 0; z <= 2; z++) 2558 for (z = 0; z <= 2; z++)
2220 { 2559 {
2221 tileid t = tile [z]; 2560 tileid t = tile [z];
2222 2561
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2562 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2563 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2564 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2565 need_texid (self, t);
2227 } 2566 }
2228 2567
2229 cell->tile [z] = t; 2568 cell->tile [z] = t;
2230 } 2569 }
2232 } 2571 }
2233 } 2572 }
2234 } 2573 }
2235} 2574}
2236 2575
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2576MODULE = Deliantra::Client PACKAGE = DC::RW
2238 2577
2239PROTOTYPES: DISABLE 2578DC::RW
2240 2579new (SV *class, SV *data_sv)
2241CFPlus::MixChunk
2242new_from_file (SV *class, char *path)
2243 CODE: 2580 CODE:
2244 RETVAL = Mix_LoadWAV (path); 2581{
2582 STRLEN datalen;
2583 char *data = SvPVbyte (data_sv, datalen);
2584
2585 RETVAL = SDL_RWFromConstMem (data, datalen);
2586}
2245 OUTPUT: 2587 OUTPUT:
2246 RETVAL 2588 RETVAL
2247 2589
2590DC::RW
2591new_from_file (SV *class, const char *path, const char *mode = "rb")
2592 CODE:
2593 RETVAL = SDL_RWFromFile (path, mode);
2594 OUTPUT:
2595 RETVAL
2596
2597# fails on win32:
2598# dc.xs(2268) : error C2059: syntax error : '('
2248void 2599#void
2600#close (DC::RW self)
2601# CODE:
2602# (self->(close)) (self);
2603
2604MODULE = Deliantra::Client PACKAGE = DC::Channel
2605
2606PROTOTYPES: DISABLE
2607
2608DC::Channel
2609find ()
2610 CODE:
2611{
2612 RETVAL = Mix_GroupAvailable (-1);
2613
2614 if (RETVAL < 0)
2615 {
2616 RETVAL = Mix_GroupOldest (-1);
2617
2618 if (RETVAL < 0)
2619 XSRETURN_UNDEF;
2620
2621 Mix_HaltChannel (RETVAL);
2622 }
2623
2624 Mix_UnregisterAllEffects (RETVAL);
2625 Mix_Volume (RETVAL, 128);
2626}
2627 OUTPUT:
2628 RETVAL
2629
2630void
2631halt (DC::Channel self)
2632 CODE:
2633 Mix_HaltChannel (self);
2634
2635void
2636expire (DC::Channel self, int ticks = -1)
2637 CODE:
2638 Mix_ExpireChannel (self, ticks);
2639
2640void
2641fade_out (DC::Channel self, int ticks = -1)
2642 CODE:
2643 Mix_FadeOutChannel (self, ticks);
2644
2645int
2646volume (DC::Channel self, int volume)
2647 CODE:
2648 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2649 OUTPUT:
2650 RETVAL
2651
2652void
2653unregister_all_effects (DC::Channel self)
2654 CODE:
2655 Mix_UnregisterAllEffects (self);
2656
2657void
2658set_panning (DC::Channel self, int left, int right)
2659 CODE:
2660 left = CLAMP (left , 0, 255);
2661 right = CLAMP (right, 0, 255);
2662 Mix_SetPanning (self, left, right);
2663
2664void
2665set_distance (DC::Channel self, int distance)
2666 CODE:
2667 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2668
2669void
2670set_position (DC::Channel self, int angle, int distance)
2671 CODE:
2672
2673void
2674set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2675 CODE:
2676{
2677 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2678 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2679 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2680}
2681
2682void
2683set_reverse_stereo (DC::Channel self, int flip)
2684 CODE:
2685 Mix_SetReverseStereo (self, flip);
2686
2687MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2688
2689PROTOTYPES: DISABLE
2690
2691DC::MixChunk
2692new (SV *class, DC::RW rwops)
2693 CODE:
2694 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2695 OUTPUT:
2696 RETVAL
2697
2698void
2249DESTROY (CFPlus::MixChunk self) 2699DESTROY (DC::MixChunk self)
2250 CODE: 2700 CODE:
2251 Mix_FreeChunk (self); 2701 Mix_FreeChunk (self);
2252 2702
2253int 2703int
2254volume (CFPlus::MixChunk self, int volume = -1) 2704volume (DC::MixChunk self, int volume = -1)
2255 CODE: 2705 CODE:
2706 if (items > 1)
2707 volume = CLAMP (volume, 0, 128);
2256 RETVAL = Mix_VolumeChunk (self, volume); 2708 RETVAL = Mix_VolumeChunk (self, volume);
2257 OUTPUT: 2709 OUTPUT:
2258 RETVAL 2710 RETVAL
2259 2711
2260int 2712DC::Channel
2261play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2713play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2262 CODE: 2714 CODE:
2715{
2263 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2716 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2717
2718 if (RETVAL < 0)
2719 XSRETURN_UNDEF;
2720
2721 if (channel < 0)
2722 {
2723 Mix_UnregisterAllEffects (RETVAL);
2724 Mix_Volume (RETVAL, 128);
2725 }
2726}
2264 OUTPUT: 2727 OUTPUT:
2265 RETVAL 2728 RETVAL
2266 2729
2267MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2730MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2268 2731
2269int 2732int
2270volume (int volume = -1) 2733volume (int volume = -1)
2271 PROTOTYPE: ;$ 2734 PROTOTYPE: ;$
2272 CODE: 2735 CODE:
2736 if (items > 0)
2737 volume = CLAMP (volume, 0, 128);
2273 RETVAL = Mix_VolumeMusic (volume); 2738 RETVAL = Mix_VolumeMusic (volume);
2274 OUTPUT: 2739 OUTPUT:
2275 RETVAL 2740 RETVAL
2276 2741
2277int 2742void
2278fade_out (int ms) 2743fade_out (int ms)
2279 CODE: 2744 CODE:
2280 RETVAL = Mix_FadeOutMusic (ms); 2745 Mix_FadeOutMusic (ms);
2746
2747void
2748halt ()
2749 CODE:
2750 Mix_HaltMusic ();
2751
2752DC::MixMusic
2753new (SV *class, DC::RW rwops)
2754 CODE:
2755 RETVAL = Mix_LoadMUS_RW (rwops);
2281 OUTPUT: 2756 OUTPUT:
2282 RETVAL 2757 RETVAL
2283 2758
2284CFPlus::MixMusic
2285new_from_file (SV *class, char *path)
2286 CODE:
2287 RETVAL = Mix_LoadMUS (path);
2288 OUTPUT:
2289 RETVAL
2290
2291void 2759void
2292DESTROY (CFPlus::MixMusic self) 2760DESTROY (DC::MixMusic self)
2293 CODE: 2761 CODE:
2294 Mix_FreeMusic (self); 2762 Mix_FreeMusic (self);
2295 2763
2296int 2764int
2297play (CFPlus::MixMusic self, int loops = -1) 2765play (DC::MixMusic self, int loops = -1)
2298 CODE: 2766 CODE:
2299 RETVAL = Mix_PlayMusic (self, loops); 2767 RETVAL = Mix_PlayMusic (self, loops);
2300 OUTPUT: 2768 OUTPUT:
2301 RETVAL 2769 RETVAL
2302 2770
2303int 2771void
2304fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2772fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2305 CODE: 2773 CODE:
2306 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2774 Mix_FadeInMusicPos (self, loops, ms, position);
2307 OUTPUT:
2308 RETVAL
2309 2775
2310MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2776MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2311 2777
2312PROTOTYPES: ENABLE 2778PROTOTYPES: ENABLE
2313 2779
2314BOOT: 2780BOOT:
2315{ 2781{
2316 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2782 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2317 static const struct { 2783 static const struct {
2318 const char *name; 2784 const char *name;
2319 IV iv; 2785 IV iv;
2320 } *civ, const_iv[] = { 2786 } *civ, const_iv[] = {
2321# define const_iv(name) { # name, (IV)name } 2787# define const_iv(name) { # name, (IV)name }
2356 const_iv (GL_INTENSITY), 2822 const_iv (GL_INTENSITY),
2357 const_iv (GL_LUMINANCE), 2823 const_iv (GL_LUMINANCE),
2358 const_iv (GL_LUMINANCE_ALPHA), 2824 const_iv (GL_LUMINANCE_ALPHA),
2359 const_iv (GL_FLOAT), 2825 const_iv (GL_FLOAT),
2360 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2826 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2827 const_iv (GL_COMPRESSED_ALPHA_ARB),
2828 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2829 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2830 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2831 const_iv (GL_COMPRESSED_RGB_ARB),
2832 const_iv (GL_COMPRESSED_RGBA_ARB),
2361 const_iv (GL_COMPILE), 2833 const_iv (GL_COMPILE),
2362 const_iv (GL_PROXY_TEXTURE_1D), 2834 const_iv (GL_PROXY_TEXTURE_1D),
2363 const_iv (GL_PROXY_TEXTURE_2D), 2835 const_iv (GL_PROXY_TEXTURE_2D),
2364 const_iv (GL_TEXTURE_1D), 2836 const_iv (GL_TEXTURE_1D),
2365 const_iv (GL_TEXTURE_2D), 2837 const_iv (GL_TEXTURE_2D),
2404 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2876 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405 const_iv (GL_POINT_SMOOTH_HINT), 2877 const_iv (GL_POINT_SMOOTH_HINT),
2406 const_iv (GL_LINE_SMOOTH_HINT), 2878 const_iv (GL_LINE_SMOOTH_HINT),
2407 const_iv (GL_POLYGON_SMOOTH_HINT), 2879 const_iv (GL_POLYGON_SMOOTH_HINT),
2408 const_iv (GL_GENERATE_MIPMAP_HINT), 2880 const_iv (GL_GENERATE_MIPMAP_HINT),
2881 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409 const_iv (GL_FASTEST), 2882 const_iv (GL_FASTEST),
2410 const_iv (GL_DONT_CARE), 2883 const_iv (GL_DONT_CARE),
2411 const_iv (GL_NICEST), 2884 const_iv (GL_NICEST),
2412 const_iv (GL_V2F), 2885 const_iv (GL_V2F),
2413 const_iv (GL_V3F), 2886 const_iv (GL_V3F),
2421 2894
2422 texture_av = newAV (); 2895 texture_av = newAV ();
2423 AvREAL_off (texture_av); 2896 AvREAL_off (texture_av);
2424} 2897}
2425 2898
2899void
2900disable_GL_EXT_blend_func_separate ()
2901 CODE:
2902 gl.BlendFuncSeparate = 0;
2903 gl.BlendFuncSeparateEXT = 0;
2904
2426char * 2905char *
2427gl_vendor () 2906gl_vendor ()
2428 CODE: 2907 CODE:
2429 RETVAL = (char *)glGetString (GL_VENDOR); 2908 RETVAL = (char *)glGetString (GL_VENDOR);
2430 OUTPUT: 2909 OUTPUT:
2522void glRotate (float angle, float x, float y, float z) 3001void glRotate (float angle, float x, float y, float z)
2523 CODE: 3002 CODE:
2524 glRotatef (angle, x, y, z); 3003 glRotatef (angle, x, y, z);
2525 3004
2526void glColor (float r, float g, float b, float a = 1.0) 3005void glColor (float r, float g, float b, float a = 1.0)
3006 PROTOTYPE: @
2527 ALIAS: 3007 ALIAS:
2528 glColor_premultiply = 1 3008 glColor_premultiply = 1
2529 CODE: 3009 CODE:
2530 if (ix) 3010 if (ix)
2531 { 3011 {
2551 3031
2552void glRect (float x1, float y1, float x2, float y2) 3032void glRect (float x1, float y1, float x2, float y2)
2553 CODE: 3033 CODE:
2554 glRectf (x1, y1, x2, y2); 3034 glRectf (x1, y1, x2, y2);
2555 3035
3036void glRect_lineloop (float x1, float y1, float x2, float y2)
3037 CODE:
3038 glBegin (GL_LINE_LOOP);
3039 glVertex2f (x1, y1);
3040 glVertex2f (x2, y1);
3041 glVertex2f (x2, y2);
3042 glVertex2f (x1, y2);
3043 glEnd ();
3044
2556PROTOTYPES: ENABLE 3045PROTOTYPES: ENABLE
2557 3046
2558void glBegin (int mode) 3047void glBegin (int mode)
2559 3048
2560void glEnd () 3049void glEnd ()
2592void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3081void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2593 CODE: 3082 CODE:
2594 if (gl.SeparableFilter2D) 3083 if (gl.SeparableFilter2D)
2595 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3084 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2596 3085
2597void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3086void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2598 3087
2599void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3088void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2600 3089
2601void glDrawPixels (int width, int height, int format, int type, char *pixels) 3090void glDrawPixels (int width, int height, int format, int type, char *pixels)
2602 3091
2628 3117
2629void glEndList () 3118void glEndList ()
2630 3119
2631void glCallList (int list) 3120void glCallList (int list)
2632 3121
2633MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3122MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2634 3123
2635PROTOTYPES: DISABLE 3124PROTOTYPES: DISABLE
2636 3125
2637void 3126void
2638find_widget (SV *self, NV x, NV y) 3127find_widget (SV *self, NV x, NV y)
2642 XPUSHs (self); 3131 XPUSHs (self);
2643} 3132}
2644 3133
2645BOOT: 3134BOOT:
2646{ 3135{
2647 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3136 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2648 3137
2649 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3138 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2650 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3139 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2651 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3140 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2652 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3141 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2653} 3142}
2654 3143
2655void 3144void
2656draw (SV *self) 3145draw (SV *self)
2657 CODE: 3146 CODE:
2661 NV x, y, w, h; 3150 NV x, y, w, h;
2662 SV *draw_x_sv = GvSV (draw_x_gv); 3151 SV *draw_x_sv = GvSV (draw_x_gv);
2663 SV *draw_y_sv = GvSV (draw_y_gv); 3152 SV *draw_y_sv = GvSV (draw_y_gv);
2664 SV *draw_w_sv = GvSV (draw_w_gv); 3153 SV *draw_w_sv = GvSV (draw_w_gv);
2665 SV *draw_h_sv = GvSV (draw_h_gv); 3154 SV *draw_h_sv = GvSV (draw_h_gv);
2666 SV *hover;
2667 double draw_x, draw_y, draw_w, draw_h; 3155 double draw_x, draw_y;
2668 3156
2669 if (!SvROK (self)) 3157 if (!SvROK (self))
2670 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3158 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2671 3159
2672 hv = (HV *)SvRV (self); 3160 hv = (HV *)SvRV (self);
2673 3161
2674 if (SvTYPE (hv) != SVt_PVHV) 3162 if (SvTYPE (hv) != SVt_PVHV)
2675 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3163 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2676 3164
2677 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3165 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2678 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3166 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2679 3167
2680 if (!h || !w) 3168 if (!h || !w)
2700 { 3188 {
2701 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3189 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2702 3190
2703 if (svp && SvTRUE (*svp)) 3191 if (svp && SvTRUE (*svp))
2704 { 3192 {
2705 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3193 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2706 glEnable (GL_BLEND); 3194 glEnable (GL_BLEND);
2707 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3195 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2708 glBegin (GL_QUADS); 3196 glBegin (GL_QUADS);
2709 glVertex2f (0, 0); 3197 glVertex2f (0, 0);
2710 glVertex2f (w, 0); 3198 glVertex2f (w, 0);
2713 glEnd (); 3201 glEnd ();
2714 glDisable (GL_BLEND); 3202 glDisable (GL_BLEND);
2715 } 3203 }
2716 } 3204 }
2717#if 0 3205#if 0
2718 if ($ENV{CFPLUS_DEBUG} & 1) { 3206 // draw borders, for debugging
2719 glPushMatrix; 3207 glPushMatrix ();
2720 glColor 1, 1, 0, 1; 3208 glColor4f (1., 1., 0., 1.);
2721 glTranslate 0.375, 0.375; 3209 glTranslatef (.5, .5, 0.);
2722 glBegin GL_LINE_LOOP; 3210 glBegin (GL_LINE_LOOP);
2723 glVertex 0 , 0; 3211 glVertex2f (0 , 0);
2724 glVertex $self->{w} - 1, 0; 3212 glVertex2f (w - 1, 0);
2725 glVertex $self->{w} - 1, $self->{h} - 1; 3213 glVertex2f (w - 1, h - 1);
2726 glVertex 0 , $self->{h} - 1; 3214 glVertex2f (0 , h - 1);
2727 glEnd; 3215 glEnd ();
2728 glPopMatrix; 3216 glPopMatrix ();
2729 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2730 }
2731#endif 3217#endif
2732 PUSHMARK (SP); 3218 PUSHMARK (SP);
2733 XPUSHs (self); 3219 XPUSHs (self);
2734 PUTBACK; 3220 PUTBACK;
2735 call_method ("_draw", G_VOID | G_DISCARD); 3221 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines