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.211 by root, Sat Jul 28 00:45:28 2007 UTC vs.
Revision 1.276 by root, Sat Aug 30 08:04:01 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/* process keyboard modifiers */
535static int
536mod_munge (int mod)
537{
538 mod &= MOD_MASK;
539
540 if (mod & (KMOD_META | KMOD_ALT))
541 mod |= KMOD_LRAM;
542
543 return mod;
544}
545
546static void
547deliantra_main ()
548{
549 char *argv[] = { 0 };
550 call_argv ("::main", G_DISCARD | G_VOID, argv);
551}
552
553#ifdef __MACOSX__
554 /* to due surprising braindamage on the side of SDL design, we
555 * do some mind-boggling hack here: SDL requires a custom main()
556 * on OS X, so... we provide one and call the original main(), which,
557 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
558 * and which calls our main (== SDL_main) back.
559 */
560 extern C_LINKAGE int
561 main (int argc, char *argv[])
562 {
563 deliantra_main ();
564 }
565
566 #undef main
567
568 extern C_LINKAGE int main (int argc, char *argv[]);
569
570 static void
571 SDL_braino (void)
572 {
573 char *argv[] = { "deliantra client", 0 };
574 (main) (1, argv);
575 }
576#else
577 static void
578 SDL_braino (void)
579 {
580 deliantra_main ();
581 }
582#endif
583
584MODULE = Deliantra::Client PACKAGE = DC
482 585
483PROTOTYPES: ENABLE 586PROTOTYPES: ENABLE
484 587
485BOOT: 588BOOT:
486{ 589{
487 HV *stash = gv_stashpv ("CFPlus", 1); 590 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 591 static const struct {
489 const char *name; 592 const char *name;
490 IV iv; 593 IV iv;
491 } *civ, const_iv[] = { 594 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 595# define const_iv(name) { # name, (IV)name }
514 617
515 const_iv (SDL_APPINPUTFOCUS), 618 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 619 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 620 const_iv (SDL_APPACTIVE),
518 621
622
623 const_iv (SDLK_UNKNOWN),
624 const_iv (SDLK_FIRST),
625 const_iv (SDLK_BACKSPACE),
626 const_iv (SDLK_TAB),
627 const_iv (SDLK_CLEAR),
628 const_iv (SDLK_RETURN),
629 const_iv (SDLK_PAUSE),
630 const_iv (SDLK_ESCAPE),
631 const_iv (SDLK_SPACE),
632 const_iv (SDLK_EXCLAIM),
633 const_iv (SDLK_QUOTEDBL),
634 const_iv (SDLK_HASH),
635 const_iv (SDLK_DOLLAR),
636 const_iv (SDLK_AMPERSAND),
637 const_iv (SDLK_QUOTE),
638 const_iv (SDLK_LEFTPAREN),
639 const_iv (SDLK_RIGHTPAREN),
640 const_iv (SDLK_ASTERISK),
641 const_iv (SDLK_PLUS),
642 const_iv (SDLK_COMMA),
643 const_iv (SDLK_MINUS),
644 const_iv (SDLK_PERIOD),
645 const_iv (SDLK_SLASH),
646 const_iv (SDLK_0),
647 const_iv (SDLK_1),
648 const_iv (SDLK_2),
649 const_iv (SDLK_3),
650 const_iv (SDLK_4),
651 const_iv (SDLK_5),
652 const_iv (SDLK_6),
653 const_iv (SDLK_7),
654 const_iv (SDLK_8),
655 const_iv (SDLK_9),
656 const_iv (SDLK_COLON),
657 const_iv (SDLK_SEMICOLON),
658 const_iv (SDLK_LESS),
659 const_iv (SDLK_EQUALS),
660 const_iv (SDLK_GREATER),
661 const_iv (SDLK_QUESTION),
662 const_iv (SDLK_AT),
663
664 const_iv (SDLK_LEFTBRACKET),
665 const_iv (SDLK_BACKSLASH),
666 const_iv (SDLK_RIGHTBRACKET),
667 const_iv (SDLK_CARET),
668 const_iv (SDLK_UNDERSCORE),
669 const_iv (SDLK_BACKQUOTE),
670 const_iv (SDLK_DELETE),
671
672 const_iv (SDLK_FIRST),
673 const_iv (SDLK_LAST),
519 const_iv (SDLK_KP0), 674 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 675 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 676 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 677 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 678 const_iv (SDLK_KP4),
595 const_iv (KMOD_LMETA), 750 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 751 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 752 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 753 const_iv (KMOD_CAPS),
599 const_iv (KMOD_MODE), 754 const_iv (KMOD_MODE),
755
756 const_iv (KMOD_LRAM),
757
758 const_iv (MIX_DEFAULT_FORMAT),
759
760 const_iv (SDL_INIT_TIMER),
761 const_iv (SDL_INIT_AUDIO),
762 const_iv (SDL_INIT_VIDEO),
763 const_iv (SDL_INIT_CDROM),
764 const_iv (SDL_INIT_JOYSTICK),
765 const_iv (SDL_INIT_EVERYTHING),
766 const_iv (SDL_INIT_NOPARACHUTE),
767 const_iv (SDL_INIT_EVENTTHREAD),
768
769 const_iv (SDL_GL_RED_SIZE),
770 const_iv (SDL_GL_GREEN_SIZE),
771 const_iv (SDL_GL_BLUE_SIZE),
772 const_iv (SDL_GL_ALPHA_SIZE),
773 const_iv (SDL_GL_DOUBLEBUFFER),
774 const_iv (SDL_GL_BUFFER_SIZE),
775 const_iv (SDL_GL_DEPTH_SIZE),
776 const_iv (SDL_GL_STENCIL_SIZE),
777 const_iv (SDL_GL_ACCUM_RED_SIZE),
778 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
779 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
780 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
781 const_iv (SDL_GL_STEREO),
782 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
783 const_iv (SDL_GL_MULTISAMPLESAMPLES),
784 const_iv (SDL_GL_ACCELERATED_VISUAL),
785 const_iv (SDL_GL_SWAP_CONTROL),
786
787 const_iv (FOW_DARKNESS)
600# undef const_iv 788# undef const_iv
601 }; 789 };
602 790
603 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 791 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 792 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
622 810
623NV floor (NV x) 811NV floor (NV x)
624 812
625NV ceil (NV x) 813NV ceil (NV x)
626 814
815IV minpot (UV n)
816
817IV popcount (UV n)
818
627void 819void
628pango_init () 820pango_init ()
629 CODE: 821 CODE:
630{ 822{
631 opengl_fontmap = pango_opengl_font_map_new (); 823 opengl_fontmap = pango_opengl_font_map_new ();
632 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 824 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); 825 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
826 /*pango_context_set_font_description (opengl_context, default_font);*/
827#if PANGO_VERSION_CHECK (1, 15, 2)
828 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
829 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
830#endif
634} 831}
635 832
636char *
637SDL_GetError () 833char *SDL_GetError ()
638 834
639int 835void SDL_braino ()
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
641 836
642void 837int SDL_Init (U32 flags)
838
839int SDL_InitSubSystem (U32 flags)
840
841void SDL_QuitSubSystem (U32 flags)
842
643SDL_Quit () 843void SDL_Quit ()
844
845int SDL_GL_SetAttribute (int attr, int value)
846
847int SDL_GL_GetAttribute (int attr)
848 CODE:
849 if (SDL_GL_GetAttribute (attr, &RETVAL))
850 XSRETURN_UNDEF;
851 OUTPUT:
852 RETVAL
644 853
645void 854void
646SDL_ListModes (int rgb, int alpha) 855SDL_ListModes (int rgb, int alpha)
647 PPCODE: 856 PPCODE:
648{ 857{
660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 869 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 870 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
663 872
664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 873 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); 874 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
669 875
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 876 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 877
672 if (m && m != (SDL_Rect **)-1) 878 if (m && m != (SDL_Rect **)-1)
673 while (*m) 879 while (*m)
674 { 880 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 881 if ((*m)->w >= 400 && (*m)->h >= 300)
676 { 882 {
677 AV *av = newAV (); 883 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 884 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 885 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 886 av_push (av, newSViv (rgb));
704 910
705 if (RETVAL) 911 if (RETVAL)
706 { 912 {
707 av_clear (texture_av); 913 av_clear (texture_av);
708 914
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 915 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 916#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
711#include "glfunc.h" 917#include "glfunc.h"
712#undef GL_FUNC 918#undef GL_FUNC
713 } 919 }
714} 920}
721char * 927char *
722SDL_GetKeyName (int sym) 928SDL_GetKeyName (int sym)
723 929
724int 930int
725SDL_GetAppState () 931SDL_GetAppState ()
932
933int
934SDL_GetModState ()
726 935
727void 936void
728poll_events () 937poll_events ()
729 PPCODE: 938 PPCODE:
730{ 939{
740 { 949 {
741 case SDL_KEYDOWN: 950 case SDL_KEYDOWN:
742 case SDL_KEYUP: 951 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 952 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 953 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 954 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 */ 955 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); 956 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 957 break;
749 958
750 case SDL_ACTIVEEVENT: 959 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 960 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
769 x = ev.motion.x; 978 x = ev.motion.x;
770 y = ev.motion.y; 979 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 980 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 981 }
773 982
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 983 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 984 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 985 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 986 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 987 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 988 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 989 }
781 break; 990 break;
782 991
783 case SDL_MOUSEBUTTONDOWN: 992 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 993 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 994 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 995
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 996 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 997 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 998 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 999 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1004 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1005 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 1006 break;
798 } 1007 }
799 1008
800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1009 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
801 } 1010 }
802} 1011}
803 1012
804int 1013int
805Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1014Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 1015 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 1016 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 1017 Mix_ChannelFinished (channel_finished);
809 1018
810void 1019void
1020Mix_QuerySpec ()
1021 PPCODE:
1022{
1023 int freq, channels;
1024 Uint16 format;
1025
1026 if (Mix_QuerySpec (&freq, &format, &channels))
1027 {
1028 EXTEND (SP, 3);
1029 PUSHs (sv_2mortal (newSViv (freq)));
1030 PUSHs (sv_2mortal (newSViv (format)));
1031 PUSHs (sv_2mortal (newSViv (channels)));
1032 }
1033}
1034
1035void
811Mix_CloseAudio () 1036Mix_CloseAudio ()
812 1037
813int 1038int
814Mix_AllocateChannels (int numchans = -1) 1039Mix_AllocateChannels (int numchans = -1)
1040
1041const char *
1042Mix_GetError ()
815 1043
816void 1044void
817lowdelay (int fd, int val = 1) 1045lowdelay (int fd, int val = 1)
818 CODE: 1046 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1047 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
845 } 1073 }
846 } 1074 }
847#endif 1075#endif
848} 1076}
849 1077
850void 1078int
851add_font (char *file) 1079add_font (char *file)
852 CODE: 1080 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1081 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082 OUTPUT:
1083 RETVAL
854 1084
855void 1085void
856load_image_inline (SV *image_) 1086load_image_inline (SV *image_)
857 ALIAS: 1087 ALIAS:
858 load_image_file = 1 1088 load_image_file = 1
861 STRLEN image_len; 1091 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 1092 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 1093 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 1094 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 1095 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 1096 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 1097 : SDL_RWFromConstMem (image, image_len);
868 1098
869 if (!rw) 1099 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 1100 croak ("load_image: %s", SDL_GetError ());
871 1101
944void 1174void
945error (char *message) 1175error (char *message)
946 CODE: 1176 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1177 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1178#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1179 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1180#endif
951 1181
952void 1182void
953fatal (char *message) 1183fatal (char *message)
954 CODE: 1184 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1185 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1186#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1187 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1188#endif
959 _exit (1); 1189 _exit (1);
960 1190
961void 1191void
962_exit (int retval = 0) 1192_exit (int retval = 0)
974#if DEBUG 1204#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1205 VALGRIND_DO_LEAK_CHECK;
976#endif 1206#endif
977} 1207}
978 1208
979MODULE = CFPlus PACKAGE = CFPlus::Font 1209MODULE = Deliantra::Client PACKAGE = DC::Font
980 1210
981PROTOTYPES: DISABLE 1211PROTOTYPES: DISABLE
982 1212
983CFPlus::Font 1213DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1214new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1215 CODE:
986{ 1216{
987 int count; 1217 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1218 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1221}
992 OUTPUT: 1222 OUTPUT:
993 RETVAL 1223 RETVAL
994 1224
995void 1225void
996DESTROY (CFPlus::Font self) 1226DESTROY (DC::Font self)
997 CODE: 1227 CODE:
998 pango_font_description_free (self); 1228 pango_font_description_free (self);
999 1229
1000void 1230void
1001make_default (CFPlus::Font self) 1231make_default (DC::Font self)
1002 PROTOTYPE: $ 1232 PROTOTYPE: $
1003 CODE: 1233 CODE:
1004 default_font = self; 1234 default_font = self;
1005 1235
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1236MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1237
1008PROTOTYPES: DISABLE 1238PROTOTYPES: DISABLE
1009 1239
1010void 1240void
1011reset_glyph_cache () 1241glyph_cache_backup ()
1012 PROTOTYPE: 1242 PROTOTYPE:
1013 CODE: 1243 CODE:
1244 tc_backup ();
1245
1246void
1247glyph_cache_restore ()
1248 PROTOTYPE:
1249 CODE:
1014 tc_clear (); 1250 tc_restore ();
1015 1251
1016CFPlus::Layout 1252DC::Layout
1017new (SV *class) 1253new (SV *class)
1018 CODE: 1254 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1255 New (0, RETVAL, 1, struct cf_layout);
1020 1256
1021 RETVAL->pl = pango_layout_new (opengl_context); 1257 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1259 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1260 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1261 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1262 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1263 RETVAL->font = 0;
1264 RETVAL->rc = rc_alloc ();
1028 1265
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1266 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1267 layout_update_font (RETVAL);
1031 OUTPUT: 1268 OUTPUT:
1032 RETVAL 1269 RETVAL
1033 1270
1034void 1271void
1035DESTROY (CFPlus::Layout self) 1272DESTROY (DC::Layout self)
1036 CODE: 1273 CODE:
1037 g_object_unref (self->pl); 1274 g_object_unref (self->pl);
1275 rc_free (self->rc);
1038 Safefree (self); 1276 Safefree (self);
1039 1277
1040void 1278void
1041set_text (CFPlus::Layout self, SV *text_) 1279set_text (DC::Layout self, SV *text_)
1042 CODE: 1280 CODE:
1043{ 1281{
1044 STRLEN textlen; 1282 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1283 char *text = SvPVutf8 (text_, textlen);
1046 1284
1047 pango_layout_set_text (self->pl, text, textlen); 1285 pango_layout_set_text (self->pl, text, textlen);
1048} 1286}
1049 1287
1050void 1288void
1051set_markup (CFPlus::Layout self, SV *text_) 1289set_markup (DC::Layout self, SV *text_)
1052 CODE: 1290 CODE:
1053{ 1291{
1054 STRLEN textlen; 1292 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1293 char *text = SvPVutf8 (text_, textlen);
1056 1294
1057 pango_layout_set_markup (self->pl, text, textlen); 1295 pango_layout_set_markup (self->pl, text, textlen);
1058} 1296}
1059 1297
1060void 1298void
1061set_shapes (CFPlus::Layout self, ...) 1299set_shapes (DC::Layout self, ...)
1062 CODE: 1300 CODE:
1063{ 1301{
1064 PangoAttrList *attrs = 0; 1302 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1303 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1304 const char *pos = text;
1101 if (attrs) 1339 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1340 pango_layout_set_attributes (self->pl, attrs);
1103} 1341}
1104 1342
1105void 1343void
1106get_shapes (CFPlus::Layout self) 1344get_shapes (DC::Layout self)
1107 PPCODE: 1345 PPCODE:
1108{ 1346{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1347 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1348
1111 do 1349 do
1112 { 1350 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1351 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1352
1115 if (run && shape_attr_p (run)) 1353 if (run && shape_attr_p (run))
1116 { 1354 {
1117 PangoRectangle extents; 1355 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1356 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1364
1127 pango_layout_iter_free (iter); 1365 pango_layout_iter_free (iter);
1128} 1366}
1129 1367
1130int 1368int
1131has_wrapped (CFPlus::Layout self) 1369has_wrapped (DC::Layout self)
1132 CODE: 1370 CODE:
1133{ 1371{
1134 int lines = 1; 1372 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1373 const char *text = pango_layout_get_text (self->pl);
1136 1374
1141} 1379}
1142 OUTPUT: 1380 OUTPUT:
1143 RETVAL 1381 RETVAL
1144 1382
1145SV * 1383SV *
1146get_text (CFPlus::Layout self) 1384get_text (DC::Layout self)
1147 CODE: 1385 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1386 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1387 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1388 OUTPUT:
1151 RETVAL 1389 RETVAL
1152 1390
1153void 1391void
1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1392set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1155 CODE: 1393 CODE:
1156 self->r = r; 1394 self->r = r;
1157 self->g = g; 1395 self->g = g;
1158 self->b = b; 1396 self->b = b;
1159 self->a = a; 1397 self->a = a;
1160 1398
1161void 1399void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1400set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1401 CODE:
1164 if (self->font != font) 1402 if (self->font != font)
1165 { 1403 {
1166 self->font = font; 1404 self->font = font;
1167 layout_update_font (self); 1405 layout_update_font (self);
1168 } 1406 }
1169 1407
1170void 1408void
1171set_height (CFPlus::Layout self, int base_height) 1409set_height (DC::Layout self, int base_height)
1172 CODE: 1410 CODE:
1173 if (self->base_height != base_height) 1411 if (self->base_height != base_height)
1174 { 1412 {
1175 self->base_height = base_height; 1413 self->base_height = base_height;
1176 layout_update_font (self); 1414 layout_update_font (self);
1177 } 1415 }
1178 1416
1179void 1417void
1180set_width (CFPlus::Layout self, int max_width = -1) 1418set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1419 CODE:
1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1420 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1183 1421
1184void 1422void
1185set_indent (CFPlus::Layout self, int indent) 1423set_indent (DC::Layout self, int indent)
1186 CODE: 1424 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1425 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1426
1189void 1427void
1190set_spacing (CFPlus::Layout self, int spacing) 1428set_spacing (DC::Layout self, int spacing)
1191 CODE: 1429 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1430 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1431
1194void 1432void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1433set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1434 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1435 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1436 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1437 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1438 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1439 : PANGO_ELLIPSIZE_NONE
1202 ); 1440 );
1203 1441
1204void 1442void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1443set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1444 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1445 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1446
1209void 1447void
1210size (CFPlus::Layout self) 1448size (DC::Layout self)
1211 PPCODE: 1449 PPCODE:
1212{ 1450{
1213 int w, h; 1451 int w, h;
1214 1452
1215 layout_get_pixel_size (self, &w, &h); 1453 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1456 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1457 PUSHs (sv_2mortal (newSViv (h)));
1220} 1458}
1221 1459
1222int 1460int
1223descent (CFPlus::Layout self) 1461descent (DC::Layout self)
1224 CODE: 1462 CODE:
1225{ 1463{
1226 PangoRectangle rect; 1464 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1465 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1466 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1467 RETVAL = PANGO_DESCENT (rect);
1230} 1468}
1231 OUTPUT: 1469 OUTPUT:
1232 RETVAL 1470 RETVAL
1233 1471
1234int 1472int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1473xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1474 CODE:
1237{ 1475{
1238 int index, trailing; 1476 int index, trailing;
1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1477 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1240 RETVAL = index + trailing; 1478 RETVAL = index + trailing;
1241} 1479}
1242 OUTPUT: 1480 OUTPUT:
1243 RETVAL 1481 RETVAL
1244 1482
1245void 1483void
1246cursor_pos (CFPlus::Layout self, int index) 1484cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1485 PPCODE:
1248{ 1486{
1249 PangoRectangle strong_pos; 1487 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1488 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1489
1252 EXTEND (SP, 3); 1490 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1491 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1492 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1494}
1257 1495
1258void 1496void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1497index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1498 PPCODE:
1261{ 1499{
1262 int line, x; 1500 int line, x;
1263 1501
1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1502 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1503#if !PANGO_VERSION_CHECK (1, 17, 3)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1504 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1505 --line;
1506#endif
1267 EXTEND (SP, 2); 1507 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1508 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1509 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1510}
1271 1511
1272void 1512void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1513line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1514 PPCODE:
1275{ 1515{
1276 PangoLayoutLine *lp; 1516 PangoLayoutLine *lp;
1277 int index, trailing; 1517 int index, trailing;
1278 1518
1279 if (line < 0) 1519 if (line < 0)
1280 XSRETURN_EMPTY; 1520 XSRETURN_EMPTY;
1281 1521
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1522 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1523 XSRETURN_EMPTY; /* do better */
1284 1524
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1525 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286 1526
1287 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1533 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1534 }
1295} 1535}
1296 1536
1297void 1537void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1538render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1539 CODE:
1540 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1541 pango_opengl_render_layout_subpixel (
1301 self->pl, 1542 self->pl,
1543 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1544 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1545 self->r, self->g, self->b, self->a,
1304 flags 1546 flags
1305 ); 1547 );
1548 // we assume that context_change actually clears/frees stuff
1549 // and does not do any recomputation...
1550 pango_layout_context_changed (self->pl);
1306 1551
1307MODULE = CFPlus PACKAGE = CFPlus::Texture 1552void
1553draw (DC::Layout self)
1554 CODE:
1555{
1556 glEnable (GL_TEXTURE_2D);
1557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1558 glEnable (GL_BLEND);
1559 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1560 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1561 glEnable (GL_ALPHA_TEST);
1562 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1563
1564 rc_draw (self->rc);
1565
1566 glDisable (GL_ALPHA_TEST);
1567 glDisable (GL_BLEND);
1568 glDisable (GL_TEXTURE_2D);
1569}
1570
1571MODULE = Deliantra::Client PACKAGE = DC::Texture
1308 1572
1309PROTOTYPES: ENABLE 1573PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1574
1313void 1575void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1576pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1577 CODE:
1316{ 1578{
1343 HV *hv = (HV *)SvRV (self); 1605 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1606 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1607 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1608 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1609
1610 if (name <= 0)
1611 XSRETURN_EMPTY;
1612
1348 if (items < 5) 1613 if (items < 5)
1349 { 1614 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1615 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1616 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1617 }
1390 RETVAL = width > 0; 1655 RETVAL = width > 0;
1391} 1656}
1392 OUTPUT: 1657 OUTPUT:
1393 RETVAL 1658 RETVAL
1394 1659
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1660MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1661
1397PROTOTYPES: DISABLE 1662PROTOTYPES: DISABLE
1398 1663
1399CFPlus::Map 1664DC::Map
1400new (SV *class) 1665new (SV *class)
1401 CODE: 1666 CODE:
1402 New (0, RETVAL, 1, struct map); 1667 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1668 RETVAL->x = 0;
1404 RETVAL->y = 0; 1669 RETVAL->y = 0;
1412 RETVAL->row = 0; 1677 RETVAL->row = 0;
1413 OUTPUT: 1678 OUTPUT:
1414 RETVAL 1679 RETVAL
1415 1680
1416void 1681void
1417DESTROY (CFPlus::Map self) 1682DESTROY (DC::Map self)
1418 CODE: 1683 CODE:
1419{ 1684{
1420 map_clear (self); 1685 map_clear (self);
1421 Safefree (self->face2tile); 1686 Safefree (self->face2tile);
1422 Safefree (self->tex); 1687 Safefree (self->tex);
1423 Safefree (self); 1688 Safefree (self);
1424} 1689}
1425 1690
1426void 1691void
1427resize (CFPlus::Map self, int map_width, int map_height) 1692resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1693 CODE:
1429 self->w = map_width; 1694 self->w = map_width;
1430 self->h = map_height; 1695 self->h = map_height;
1431 1696
1432void 1697void
1433clear (CFPlus::Map self) 1698clear (DC::Map self)
1434 CODE: 1699 CODE:
1435 map_clear (self); 1700 map_clear (self);
1436 1701
1437void 1702void
1438set_tileid (CFPlus::Map self, int face, int tile) 1703set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1704 CODE:
1440{ 1705{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1706 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1707 need_texid (self, tile);
1443} 1708}
1444 1709
1445void 1710void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1711set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1712 CODE:
1448{ 1713{
1449 tileid texid; 1714 tileid texid;
1450 maptex *tex; 1715 maptex *tex;
1451 1716
1464 tex->smoothtile = self->face2tile [smooth]; 1729 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1730 tex->smoothlevel = level;
1466} 1731}
1467 1732
1468void 1733void
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) 1734set_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: 1735 CODE:
1471{ 1736{
1472 need_texid (self, texid); 1737 need_texid (self, texid);
1473 1738
1474 { 1739 {
1494 // from transparent color bleeding and ugly wrapping effects. 1759 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1760 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1761}
1497 1762
1498int 1763int
1499ox (CFPlus::Map self) 1764ox (DC::Map self)
1500 ALIAS: 1765 ALIAS:
1501 oy = 1 1766 oy = 1
1502 x = 2 1767 x = 2
1503 y = 3 1768 y = 3
1504 w = 4 1769 w = 4
1515 } 1780 }
1516 OUTPUT: 1781 OUTPUT:
1517 RETVAL 1782 RETVAL
1518 1783
1519void 1784void
1520scroll (CFPlus::Map self, int dx, int dy) 1785scroll (DC::Map self, int dx, int dy)
1521 CODE: 1786 CODE:
1522{ 1787{
1523 if (dx > 0) 1788 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1789 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1790 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 1805 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 1806 self->y += MAP_EXTEND_Y;
1542 } 1807 }
1543} 1808}
1544 1809
1545void 1810SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 1811map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 1812 CODE:
1548{ 1813{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1814 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 1815 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 1816 mapcell *cell;
1552 int x, y, flags; 1817 int x, y, z, flags;
1818 AV *missing = newAV ();
1819 RETVAL = newRV_noinc ((SV *)missing);
1553 1820
1554 while (data < data_end - 1) 1821 while (data < data_end - 1)
1555 { 1822 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 1823 flags = (data [0] << 8) + data [1]; data += 2;
1557 1824
1577 uint8_t ext, cmd; 1844 uint8_t ext, cmd;
1578 1845
1579 do 1846 do
1580 { 1847 {
1581 ext = *data++; 1848 ext = *data++;
1582 cmd = ext & 0x3f; 1849 cmd = ext & 0x7f;
1583 1850
1584 if (cmd < 4) 1851 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1; 1852 cell->darkness = 255 - ext * 64 + 1;
1586 else if (cmd == 5) // health 1853 else if (cmd == 5) // health
1587 { 1854 {
1590 } 1857 }
1591 else if (cmd == 6) // monster width 1858 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1; 1859 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47) 1860 else if (cmd == 0x47)
1594 { 1861 {
1595 if (*data == 4) 1862 if (*data == 1) cell->player = data [1];
1596 ; // decode player count 1863 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1864 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1865 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1597 1866
1598 data += *data + 1; 1867 data += *data + 1;
1599 } 1868 }
1600 else if (cmd == 8) // cell flags 1869 else if (cmd == 8) // cell flags
1601 cell->flags = *data++; 1870 cell->flags = *data++;
1608 } 1877 }
1609 else 1878 else
1610 cell->darkness = *data++ + 1; 1879 cell->darkness = *data++ + 1;
1611 } 1880 }
1612 1881
1882 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 1883 if (flags & (4 >> z))
1614 { 1884 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 1885 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 1886 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 1887 cell->tile [z] = self->face2tile [face];
1888
1889 if (cell->tile [z])
1890 {
1891 maptex *tex = self->tex + cell->tile [z];
1892 if (!tex->name)
1893 av_push (missing, newSViv (cell->tile [z]));
1894
1895 if (tex->smoothtile)
1896 {
1897 maptex *smooth = self->tex + tex->smoothtile;
1898 if (!smooth->name)
1899 av_push (missing, newSViv (tex->smoothtile));
1900 }
1901 }
1618 } 1902 }
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 } 1903 }
1634 else 1904 else
1635 cell->darkness = 0; 1905 CELL_CLEAR (cell);
1636 } 1906 }
1637} 1907}
1908 OUTPUT:
1909 RETVAL
1638 1910
1639SV * 1911SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1912mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 1913 CODE:
1642{ 1914{
1643 int x1, x; 1915 int x1, x;
1644 int y1, y; 1916 int y1, y;
1645 int z; 1917 int z;
1690} 1962}
1691 OUTPUT: 1963 OUTPUT:
1692 RETVAL 1964 RETVAL
1693 1965
1694void 1966void
1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1967draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1696 CODE: 1968 CODE:
1697{ 1969{
1970 int x, y, z;
1971
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1972 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1973 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) 1974 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1701 smooth_key skey; 1975 smooth_key skey;
1702 int x, y, z; 1976 int pl_x, pl_y;
1703 int last_name; 1977 maptex pl_tex;
1978 rc_t *rc = rc_alloc ();
1979 rc_key_t key;
1980 rc_array_t *arr;
1981
1982 pl_tex.name = 0;
1704 1983
1705 // thats current max. sorry. 1984 // thats current max. sorry.
1706 if (sw > 255) sw = 255; 1985 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 1986 if (sh > 255) sh = 255;
1708 1987
1709 // clear key, in case of extra padding 1988 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 1989 memset (&skey, 0, sizeof (skey));
1711 1990
1712 glColor4ub (255, 255, 255, 255); 1991 memset (&key, 0, sizeof (key));
1713 1992 key.r = 255;
1714 glEnable (GL_BLEND); 1993 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1994 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 1995 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1996 key.mode = GL_QUADS;
1718 1997 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS); 1998 key.texname = -1;
1720
1721 last_name = 0;
1722 1999
1723 mx += self->x; 2000 mx += self->x;
1724 my += self->y; 2001 my += self->y;
1725 2002
1726 // first pass: determine smooth_max 2003 // first pass: determine smooth_max
1742 MAX (self->tex [cell->tile [0]].smoothlevel, 2019 MAX (self->tex [cell->tile [0]].smoothlevel,
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 2020 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 2021 self->tex [cell->tile [2]].smoothlevel));
1745 } 2022 }
1746 } 2023 }
2024
2025 glEnable (GL_BLEND);
2026 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2027 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1747 2028
1748 for (z = 0; z <= 2; z++) 2029 for (z = 0; z <= 2; z++)
1749 { 2030 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 2031 memset (smooth_level, 0, sizeof (smooth_level));
1751 2032
1764 { 2045 {
1765 maptex tex = self->tex [tile]; 2046 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 2047 int px = (x + 1) * T - tex.w;
1767 int py = (y + 1) * T - tex.h; 2048 int py = (y + 1) * T - tex.h;
1768 2049
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 2050 if (key.texname != tex.name)
1772 { 2051 {
1773 if (!tex.name) 2052 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 2053 tex = self->tex [2]; /* missing, replace by noface */
1775 2054
1776 glEnd (); 2055 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2056 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 2057 }
1780 2058
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2059 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 { 2060 {
2061 pl_x = px;
2062 pl_y = py;
2063 pl_tex = tex;
2064 continue;
2065 }
2066
2067 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2068 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2069 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2070 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2071
2072 if (expect_false (cell->flags) && expect_false (z == 2))
2073 {
2074 // overlays such as the speech bubble, probably more to come
1788 if (cell->flags & 1) 2075 if (cell->flags & 1)
1789 { 2076 {
1790 maptex tex = self->tex [1]; 2077 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32; 2078 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32; 2079 int py = y * T - T * 6 / 32;
1793 2080
2081 if (tex.name)
1794 glEnd (); 2082 {
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2083 if (key.texname != tex.name)
2084 {
2085 key.texname = tex.name;
2086 arr = rc_array (rc, &key);
2087 }
2088
2089 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2090 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2091 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2092 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1796 glBegin (GL_QUADS); 2093 }
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 } 2094 }
1803 } 2095 }
1804 2096
1805 // update smooth hash 2097 // update smooth hash
1806 if (tex.smoothtile) 2098 if (tex.smoothtile)
1842 } 2134 }
1843 } 2135 }
1844 } 2136 }
1845 } 2137 }
1846 2138
2139 rc_draw (rc);
2140 rc_clear (rc);
2141
1847 // go through all smoothlevels, lowest to highest, then draw. 2142 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2143 // this is basically counting sort
1849 { 2144 {
1850 int w, b; 2145 int w, b;
1851 2146
2147 glEnable (GL_TEXTURE_2D);
2148 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 2149 for (w = 0; w < 256 / 32; ++w)
1853 { 2150 {
1854 uint32_t smask = smooth_level [w]; 2151 uint32_t smask = smooth_level [w];
1855 if (smask) 2152 if (smask)
1856 for (b = 0; b < 32; ++b) 2153 for (b = 0; b < 32; ++b)
1875 int border = bits & 15; 2172 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2173 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 2174 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 2175 float dy = tex.t * .5f ; // 2 images/column
1879 2176
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 2177 if (tex.name)
1883 { 2178 {
2179 // this time avoiding texture state changes
2180 // save gobs of state changes.
1884 if (!tex.name) 2181 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2182 {
1886
1887 glEnd (); 2183 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2184 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2185 glBegin (GL_QUADS);
1890 } 2186 }
1891 2187
1892 if (border) 2188 if (border)
1893 { 2189 {
1894 float ox = border * dx; 2190 float ox = border * dx;
1895 2191
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2192 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2193 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2194 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2195 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900 } 2196 }
1901 2197
1902 if (corner) 2198 if (corner)
1903 { 2199 {
1904 float ox = corner * dx; 2200 float ox = corner * dx;
1905 2201
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2202 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2203 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2204 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2205 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2206 }
1910 } 2207 }
1911 } 2208 }
1912 } 2209 }
1913 } 2210 }
1914 } 2211 }
2212
2213 glEnd ();
2214 glDisable (GL_TEXTURE_2D);
2215 key.texname = -1;
1915 } 2216 }
1916 2217
1917 hv_clear (smooth); 2218 hv_clear (smooth);
1918 } 2219 }
1919 2220
1920 glEnd (); 2221 if (pl_tex.name)
2222 {
2223 maptex tex = pl_tex;
2224 int px = pl_x + sdx;
2225 int py = pl_y + sdy;
1921 2226
1922 glDisable (GL_TEXTURE_2D); 2227 key.texname = tex.name;
2228 arr = rc_array (rc, &key);
2229
2230 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2231 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2232 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2233 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2234
2235 rc_draw (rc);
2236 }
2237
1923 glDisable (GL_BLEND); 2238 glDisable (GL_BLEND);
2239 rc_free (rc);
1924 2240
1925 // top layer: overlays such as the health bar 2241 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
1928 { 2244 {
1953 } 2269 }
1954 } 2270 }
1955} 2271}
1956 2272
1957void 2273void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2274draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1959 CODE: 2275 CODE:
1960{ 2276{
1961 static float color[16][3] = { 2277 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2278 { 0.00F, 0.00F, 0.00F },
1963 { 1.00F, 1.00F, 1.00F }, 2279 { 1.00F, 1.00F, 1.00F },
2013 glDisable (GL_BLEND); 2329 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2330 glDisable (GL_TEXTURE_2D);
2015} 2331}
2016 2332
2017void 2333void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2334fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2019 PPCODE: 2335 PPCODE:
2020{ 2336{
2021 int x, y; 2337 int x, y;
2022 int sw1 = sw + 2; 2338 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2339 int sh1 = sh + 2;
2031 SvCUR_set (darkness3_sv, sw34 * sh3); 2347 SvCUR_set (darkness3_sv, sw34 * sh3);
2032 2348
2033 mx += self->x - 1; 2349 mx += self->x - 1;
2034 my += self->y - 1; 2350 my += self->y - 1;
2035 2351
2036 memset (darkness1, 255, sw1 * sh1); 2352 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2037 2353
2038 for (y = 0; y < sh1; y++) 2354 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows) 2355 if (0 <= y + my && y + my < self->rows)
2040 { 2356 {
2041 maprow *row = self->row + (y + my); 2357 maprow *row = self->row + (y + my);
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2410 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2411 PUSHs (darkness3_sv);
2096} 2412}
2097 2413
2098SV * 2414SV *
2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2415get_rect (DC::Map self, int x0, int y0, int w, int h)
2100 CODE: 2416 CODE:
2101{ 2417{
2102 int x, y, x1, y1; 2418 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2419 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2420 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2161 else 2477 else
2162 *data++ = 0; 2478 *data++ = 0;
2163 } 2479 }
2164 } 2480 }
2165 2481
2482 /* if size is w*h + 5 then no data has been found */
2483 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2484 {
2166 SvPOK_only (data_sv); 2485 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2486 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2487 }
2488
2168 RETVAL = data_sv; 2489 RETVAL = data_sv;
2169} 2490}
2170 OUTPUT: 2491 OUTPUT:
2171 RETVAL 2492 RETVAL
2172 2493
2173void 2494void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2495set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2496 PPCODE:
2176{ 2497{
2177 int x, y, z; 2498 int x, y, z;
2178 int w, h; 2499 int w, h;
2179 int x1, y1; 2500 int x1, y1;
2501 STRLEN len;
2502 uint8_t *data, *end;
2503
2504 len = SvLEN (data_sv);
2505 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2506 data = SvPVbyte_nolen (data_sv);
2507 end = data + len + 8;
2508
2509 if (len < 5)
2510 XSRETURN_EMPTY;
2180 2511
2181 if (*data++ != 0) 2512 if (*data++ != 0)
2182 return; /* version mismatch */ 2513 XSRETURN_EMPTY; /* version mismatch */
2183 2514
2184 w = *data++ << 8; w |= *data++; 2515 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2516 h = *data++ << 8; h |= *data++;
2186 2517
2187 // we need to do this 'cause we don't keep an absolute coord system for rows 2518 // we need to do this 'cause we don't keep an absolute coord system for rows
2199 { 2530 {
2200 maprow *row = map_get_row (self, y); 2531 maprow *row = map_get_row (self, y);
2201 2532
2202 for (x = x0; x < x1; x++) 2533 for (x = x0; x < x1; x++)
2203 { 2534 {
2535 uint8_t flags;
2536
2537 if (data + 7 >= end)
2538 XSRETURN_EMPTY;
2539
2204 uint8_t flags = *data++; 2540 flags = *data++;
2205 2541
2206 if (flags) 2542 if (flags)
2207 { 2543 {
2208 mapcell *cell = row_get_cell (row, x); 2544 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2545 tileid tile[3] = { 0, 0, 0 };
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2548 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2549 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2550
2215 if (cell->darkness == 0) 2551 if (cell->darkness == 0)
2216 { 2552 {
2217 cell->darkness = 0; 2553 /*cell->darkness = 0;*/
2554 EXTEND (SP, 3);
2218 2555
2219 for (z = 0; z <= 2; z++) 2556 for (z = 0; z <= 2; z++)
2220 { 2557 {
2221 tileid t = tile [z]; 2558 tileid t = tile [z];
2222 2559
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2560 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2561 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2562 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2563 need_texid (self, t);
2227 } 2564 }
2228 2565
2229 cell->tile [z] = t; 2566 cell->tile [z] = t;
2230 } 2567 }
2232 } 2569 }
2233 } 2570 }
2234 } 2571 }
2235} 2572}
2236 2573
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2574MODULE = Deliantra::Client PACKAGE = DC::RW
2238 2575
2239PROTOTYPES: DISABLE 2576DC::RW
2240
2241CFPlus::MixChunk
2242new (SV *class, SV *data_sv) 2577new (SV *class, SV *data_sv)
2243 CODE: 2578 CODE:
2244{ 2579{
2245 STRLEN datalen; 2580 STRLEN datalen;
2246 char *data = SvPVbyte (data_sv, datalen); 2581 char *data = SvPVbyte (data_sv, datalen);
2247 2582
2248 RETVAL = Mix_LoadWAV_RW (SDL_RWFromConstMem (data, datalen), 1); 2583 RETVAL = SDL_RWFromConstMem (data, datalen);
2249} 2584}
2250 OUTPUT: 2585 OUTPUT:
2251 RETVAL 2586 RETVAL
2252 2587
2253CFPlus::MixChunk 2588DC::RW
2254new_from_file (SV *class, char *path) 2589new_from_file (SV *class, const char *path, const char *mode = "rb")
2255 CODE: 2590 CODE:
2256 RETVAL = Mix_LoadWAV (path); 2591 RETVAL = SDL_RWFromFile (path, mode);
2257 OUTPUT: 2592 OUTPUT:
2258 RETVAL 2593 RETVAL
2259 2594
2595# fails on win32:
2596# dc.xs(2268) : error C2059: syntax error : '('
2260void 2597#void
2598#close (DC::RW self)
2599# CODE:
2600# (self->(close)) (self);
2601
2602MODULE = Deliantra::Client PACKAGE = DC::Channel
2603
2604PROTOTYPES: DISABLE
2605
2606DC::Channel
2607find ()
2608 CODE:
2609{
2610 RETVAL = Mix_GroupAvailable (-1);
2611
2612 if (RETVAL < 0)
2613 {
2614 RETVAL = Mix_GroupOldest (-1);
2615
2616 if (RETVAL < 0)
2617 XSRETURN_UNDEF;
2618
2619 Mix_HaltChannel (RETVAL);
2620 }
2621
2622 Mix_UnregisterAllEffects (RETVAL);
2623 Mix_Volume (RETVAL, 128);
2624}
2625 OUTPUT:
2626 RETVAL
2627
2628void
2629halt (DC::Channel self)
2630 CODE:
2631 Mix_HaltChannel (self);
2632
2633void
2634expire (DC::Channel self, int ticks = -1)
2635 CODE:
2636 Mix_ExpireChannel (self, ticks);
2637
2638void
2639fade_out (DC::Channel self, int ticks = -1)
2640 CODE:
2641 Mix_FadeOutChannel (self, ticks);
2642
2643int
2644volume (DC::Channel self, int volume)
2645 CODE:
2646 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2647 OUTPUT:
2648 RETVAL
2649
2650void
2651unregister_all_effects (DC::Channel self)
2652 CODE:
2653 Mix_UnregisterAllEffects (self);
2654
2655void
2656set_panning (DC::Channel self, int left, int right)
2657 CODE:
2658 left = CLAMP (left , 0, 255);
2659 right = CLAMP (right, 0, 255);
2660 Mix_SetPanning (self, left, right);
2661
2662void
2663set_distance (DC::Channel self, int distance)
2664 CODE:
2665 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2666
2667void
2668set_position (DC::Channel self, int angle, int distance)
2669 CODE:
2670
2671void
2672set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2673 CODE:
2674{
2675 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2676 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2677 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2678}
2679
2680void
2681set_reverse_stereo (DC::Channel self, int flip)
2682 CODE:
2683 Mix_SetReverseStereo (self, flip);
2684
2685MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2686
2687PROTOTYPES: DISABLE
2688
2689DC::MixChunk
2690new (SV *class, DC::RW rwops)
2691 CODE:
2692 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2693 OUTPUT:
2694 RETVAL
2695
2696void
2261DESTROY (CFPlus::MixChunk self) 2697DESTROY (DC::MixChunk self)
2262 CODE: 2698 CODE:
2263 Mix_FreeChunk (self); 2699 Mix_FreeChunk (self);
2264 2700
2265int 2701int
2266volume (CFPlus::MixChunk self, int volume = -1) 2702volume (DC::MixChunk self, int volume = -1)
2267 CODE: 2703 CODE:
2704 if (items > 1)
2705 volume = CLAMP (volume, 0, 128);
2268 RETVAL = Mix_VolumeChunk (self, volume); 2706 RETVAL = Mix_VolumeChunk (self, volume);
2269 OUTPUT: 2707 OUTPUT:
2270 RETVAL 2708 RETVAL
2271 2709
2272int 2710DC::Channel
2273play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2711play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2274 CODE: 2712 CODE:
2713{
2275 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2714 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2715
2716 if (RETVAL < 0)
2717 XSRETURN_UNDEF;
2718
2719 if (channel < 0)
2720 {
2721 Mix_UnregisterAllEffects (RETVAL);
2722 Mix_Volume (RETVAL, 128);
2723 }
2724}
2276 OUTPUT: 2725 OUTPUT:
2277 RETVAL 2726 RETVAL
2278 2727
2279MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2728MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2280 2729
2281int 2730int
2282volume (int volume = -1) 2731volume (int volume = -1)
2283 PROTOTYPE: ;$ 2732 PROTOTYPE: ;$
2284 CODE: 2733 CODE:
2734 if (items > 0)
2735 volume = CLAMP (volume, 0, 128);
2285 RETVAL = Mix_VolumeMusic (volume); 2736 RETVAL = Mix_VolumeMusic (volume);
2286 OUTPUT: 2737 OUTPUT:
2287 RETVAL 2738 RETVAL
2288 2739
2289int 2740void
2290fade_out (int ms) 2741fade_out (int ms)
2291 CODE: 2742 CODE:
2292 RETVAL = Mix_FadeOutMusic (ms); 2743 Mix_FadeOutMusic (ms);
2744
2745void
2746halt ()
2747 CODE:
2748 Mix_HaltMusic ();
2749
2750DC::MixMusic
2751new (SV *class, DC::RW rwops)
2752 CODE:
2753 RETVAL = Mix_LoadMUS_RW (rwops);
2293 OUTPUT: 2754 OUTPUT:
2294 RETVAL 2755 RETVAL
2295 2756
2296CFPlus::MixMusic
2297new_from_file (SV *class, char *path)
2298 CODE:
2299 RETVAL = Mix_LoadMUS (path);
2300 OUTPUT:
2301 RETVAL
2302
2303void 2757void
2304DESTROY (CFPlus::MixMusic self) 2758DESTROY (DC::MixMusic self)
2305 CODE: 2759 CODE:
2306 Mix_FreeMusic (self); 2760 Mix_FreeMusic (self);
2307 2761
2308int 2762int
2309play (CFPlus::MixMusic self, int loops = -1) 2763play (DC::MixMusic self, int loops = -1)
2310 CODE: 2764 CODE:
2311 RETVAL = Mix_PlayMusic (self, loops); 2765 RETVAL = Mix_PlayMusic (self, loops);
2312 OUTPUT: 2766 OUTPUT:
2313 RETVAL 2767 RETVAL
2314 2768
2315int 2769void
2316fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2770fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2317 CODE: 2771 CODE:
2318 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2772 Mix_FadeInMusicPos (self, loops, ms, position);
2319 OUTPUT:
2320 RETVAL
2321 2773
2322MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2774MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2323 2775
2324PROTOTYPES: ENABLE 2776PROTOTYPES: ENABLE
2325 2777
2326BOOT: 2778BOOT:
2327{ 2779{
2328 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2780 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2329 static const struct { 2781 static const struct {
2330 const char *name; 2782 const char *name;
2331 IV iv; 2783 IV iv;
2332 } *civ, const_iv[] = { 2784 } *civ, const_iv[] = {
2333# define const_iv(name) { # name, (IV)name } 2785# define const_iv(name) { # name, (IV)name }
2368 const_iv (GL_INTENSITY), 2820 const_iv (GL_INTENSITY),
2369 const_iv (GL_LUMINANCE), 2821 const_iv (GL_LUMINANCE),
2370 const_iv (GL_LUMINANCE_ALPHA), 2822 const_iv (GL_LUMINANCE_ALPHA),
2371 const_iv (GL_FLOAT), 2823 const_iv (GL_FLOAT),
2372 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2824 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2825 const_iv (GL_COMPRESSED_ALPHA_ARB),
2826 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2827 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2828 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2829 const_iv (GL_COMPRESSED_RGB_ARB),
2830 const_iv (GL_COMPRESSED_RGBA_ARB),
2373 const_iv (GL_COMPILE), 2831 const_iv (GL_COMPILE),
2374 const_iv (GL_PROXY_TEXTURE_1D), 2832 const_iv (GL_PROXY_TEXTURE_1D),
2375 const_iv (GL_PROXY_TEXTURE_2D), 2833 const_iv (GL_PROXY_TEXTURE_2D),
2376 const_iv (GL_TEXTURE_1D), 2834 const_iv (GL_TEXTURE_1D),
2377 const_iv (GL_TEXTURE_2D), 2835 const_iv (GL_TEXTURE_2D),
2416 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2874 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2417 const_iv (GL_POINT_SMOOTH_HINT), 2875 const_iv (GL_POINT_SMOOTH_HINT),
2418 const_iv (GL_LINE_SMOOTH_HINT), 2876 const_iv (GL_LINE_SMOOTH_HINT),
2419 const_iv (GL_POLYGON_SMOOTH_HINT), 2877 const_iv (GL_POLYGON_SMOOTH_HINT),
2420 const_iv (GL_GENERATE_MIPMAP_HINT), 2878 const_iv (GL_GENERATE_MIPMAP_HINT),
2879 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2421 const_iv (GL_FASTEST), 2880 const_iv (GL_FASTEST),
2422 const_iv (GL_DONT_CARE), 2881 const_iv (GL_DONT_CARE),
2423 const_iv (GL_NICEST), 2882 const_iv (GL_NICEST),
2424 const_iv (GL_V2F), 2883 const_iv (GL_V2F),
2425 const_iv (GL_V3F), 2884 const_iv (GL_V3F),
2433 2892
2434 texture_av = newAV (); 2893 texture_av = newAV ();
2435 AvREAL_off (texture_av); 2894 AvREAL_off (texture_av);
2436} 2895}
2437 2896
2897void
2898disable_GL_EXT_blend_func_separate ()
2899 CODE:
2900 gl.BlendFuncSeparate = 0;
2901 gl.BlendFuncSeparateEXT = 0;
2902
2438char * 2903char *
2439gl_vendor () 2904gl_vendor ()
2440 CODE: 2905 CODE:
2441 RETVAL = (char *)glGetString (GL_VENDOR); 2906 RETVAL = (char *)glGetString (GL_VENDOR);
2442 OUTPUT: 2907 OUTPUT:
2563 3028
2564void glRect (float x1, float y1, float x2, float y2) 3029void glRect (float x1, float y1, float x2, float y2)
2565 CODE: 3030 CODE:
2566 glRectf (x1, y1, x2, y2); 3031 glRectf (x1, y1, x2, y2);
2567 3032
3033void glRect_lineloop (float x1, float y1, float x2, float y2)
3034 CODE:
3035 glBegin (GL_LINE_LOOP);
3036 glVertex2f (x1, y1);
3037 glVertex2f (x2, y1);
3038 glVertex2f (x2, y2);
3039 glVertex2f (x1, y2);
3040 glEnd ();
3041
2568PROTOTYPES: ENABLE 3042PROTOTYPES: ENABLE
2569 3043
2570void glBegin (int mode) 3044void glBegin (int mode)
2571 3045
2572void glEnd () 3046void glEnd ()
2604void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3078void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2605 CODE: 3079 CODE:
2606 if (gl.SeparableFilter2D) 3080 if (gl.SeparableFilter2D)
2607 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3081 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2608 3082
2609void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3083void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2610 3084
2611void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3085void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2612 3086
2613void glDrawPixels (int width, int height, int format, int type, char *pixels) 3087void glDrawPixels (int width, int height, int format, int type, char *pixels)
2614 3088
2640 3114
2641void glEndList () 3115void glEndList ()
2642 3116
2643void glCallList (int list) 3117void glCallList (int list)
2644 3118
2645MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3119MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2646 3120
2647PROTOTYPES: DISABLE 3121PROTOTYPES: DISABLE
2648 3122
2649void 3123void
2650find_widget (SV *self, NV x, NV y) 3124find_widget (SV *self, NV x, NV y)
2654 XPUSHs (self); 3128 XPUSHs (self);
2655} 3129}
2656 3130
2657BOOT: 3131BOOT:
2658{ 3132{
2659 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3133 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2660 3134
2661 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3135 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2662 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3136 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2663 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3137 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2664 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3138 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2665} 3139}
2666 3140
2667void 3141void
2668draw (SV *self) 3142draw (SV *self)
2669 CODE: 3143 CODE:
2673 NV x, y, w, h; 3147 NV x, y, w, h;
2674 SV *draw_x_sv = GvSV (draw_x_gv); 3148 SV *draw_x_sv = GvSV (draw_x_gv);
2675 SV *draw_y_sv = GvSV (draw_y_gv); 3149 SV *draw_y_sv = GvSV (draw_y_gv);
2676 SV *draw_w_sv = GvSV (draw_w_gv); 3150 SV *draw_w_sv = GvSV (draw_w_gv);
2677 SV *draw_h_sv = GvSV (draw_h_gv); 3151 SV *draw_h_sv = GvSV (draw_h_gv);
2678 SV *hover;
2679 double draw_x, draw_y, draw_w, draw_h; 3152 double draw_x, draw_y;
2680 3153
2681 if (!SvROK (self)) 3154 if (!SvROK (self))
2682 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3155 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2683 3156
2684 hv = (HV *)SvRV (self); 3157 hv = (HV *)SvRV (self);
2685 3158
2686 if (SvTYPE (hv) != SVt_PVHV) 3159 if (SvTYPE (hv) != SVt_PVHV)
2687 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3160 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2688 3161
2689 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3162 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2690 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3163 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2691 3164
2692 if (!h || !w) 3165 if (!h || !w)
2712 { 3185 {
2713 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3186 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2714 3187
2715 if (svp && SvTRUE (*svp)) 3188 if (svp && SvTRUE (*svp))
2716 { 3189 {
2717 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3190 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2718 glEnable (GL_BLEND); 3191 glEnable (GL_BLEND);
2719 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3192 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2720 glBegin (GL_QUADS); 3193 glBegin (GL_QUADS);
2721 glVertex2f (0, 0); 3194 glVertex2f (0, 0);
2722 glVertex2f (w, 0); 3195 glVertex2f (w, 0);
2725 glEnd (); 3198 glEnd ();
2726 glDisable (GL_BLEND); 3199 glDisable (GL_BLEND);
2727 } 3200 }
2728 } 3201 }
2729#if 0 3202#if 0
2730 if ($ENV{CFPLUS_DEBUG} & 1) { 3203 // draw borders, for debugging
2731 glPushMatrix; 3204 glPushMatrix ();
2732 glColor 1, 1, 0, 1; 3205 glColor4f (1., 1., 0., 1.);
2733 glTranslate 0.375, 0.375; 3206 glTranslatef (.5, .5, 0.);
2734 glBegin GL_LINE_LOOP; 3207 glBegin (GL_LINE_LOOP);
2735 glVertex 0 , 0; 3208 glVertex2f (0 , 0);
2736 glVertex $self->{w} - 1, 0; 3209 glVertex2f (w - 1, 0);
2737 glVertex $self->{w} - 1, $self->{h} - 1; 3210 glVertex2f (w - 1, h - 1);
2738 glVertex 0 , $self->{h} - 1; 3211 glVertex2f (0 , h - 1);
2739 glEnd; 3212 glEnd ();
2740 glPopMatrix; 3213 glPopMatrix ();
2741 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2742 }
2743#endif 3214#endif
2744 PUSHMARK (SP); 3215 PUSHMARK (SP);
2745 XPUSHs (self); 3216 XPUSHs (self);
2746 PUTBACK; 3217 PUTBACK;
2747 call_method ("_draw", G_VOID | G_DISCARD); 3218 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines