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.199 by root, Tue Jul 17 13:53:02 2007 UTC vs.
Revision 1.265 by root, Fri Jul 18 22:56:11 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>
29 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
30#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
31#include <SDL_endian.h> 39#include <SDL_endian.h>
32#include <SDL_image.h> 40#include <SDL_image.h>
33#include <SDL_mixer.h> 41#include <SDL_mixer.h>
34#include <SDL_opengl.h> 42#include <SDL_opengl.h>
35 43
… …
37#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
38 46
39#include <glib/gmacros.h> 47#include <glib/gmacros.h>
40 48
41#include <pango/pango.h> 49#include <pango/pango.h>
50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
42 61
43#ifndef _WIN32 62#ifndef _WIN32
44# include <sys/types.h> 63# include <sys/types.h>
45# include <sys/socket.h> 64# include <sys/socket.h>
46# include <netinet/in.h> 65# include <netinet/in.h>
47# include <netinet/tcp.h> 66# include <netinet/tcp.h>
48# include <inttypes.h> 67# include <inttypes.h>
49#endif 68#endif
50 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 80
53#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
54 82
55#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
57 85
58#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
59 87
60#if 0 88/* mask out modifiers we are not interested in */
61# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
62#else
63# define PARACHUTE 0
64#endif
65 90
66static AV *texture_av; 91static AV *texture_av;
67 92
68static struct 93static struct
69{ 94{
… …
106 av_push (texture_av, (SV *)(size_t)name); 131 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name); 132 glDeleteTextures (1, &name);
108} 133}
109 134
110#include "texcache.c" 135#include "texcache.c"
136#include "rendercache.c"
111 137
112#include "pango-font.c" 138#include "pango-font.c"
113#include "pango-fontmap.c" 139#include "pango-fontmap.c"
114#include "pango-render.c" 140#include "pango-render.c"
115 141
142typedef IV DC__Channel;
143typedef SDL_RWops *DC__RW;
116typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
117typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
118 146
119typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
120 148
121static int 149static int
122shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
123{ 151{
124 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
… …
138 166
139typedef struct cf_layout { 167typedef struct cf_layout {
140 PangoLayout *pl; 168 PangoLayout *pl;
141 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
142 int base_height; 170 int base_height;
143 CFPlus__Font font; 171 DC__Font font;
172 rc_t *rc;
144} *CFPlus__Layout; 173} *DC__Layout;
145 174
146static CFPlus__Font default_font; 175static DC__Font default_font;
147static PangoContext *opengl_context; 176static PangoContext *opengl_context;
148static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
149 178
150static void 179static void
151substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
… …
156#endif 185#endif
157 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
158} 187}
159 188
160static void 189static void
161layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
162{ 191{
163 /* use a random scale factor to account for unknown descenders, 0.8 works 192 /* use a random scale factor to account for unknown descenders, 0.8 works
164 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
165 */ 194 */
166 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
167 196
168 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
169 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
170 199
171 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
172} 201}
173 202
174static void 203static void
175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
176{ 205{
177 PangoRectangle rect; 206 PangoRectangle rect;
178 207
179 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
180 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
… …
191 220
192typedef uint16_t tileid; 221typedef uint16_t tileid;
193typedef uint16_t faceid; 222typedef uint16_t faceid;
194 223
195typedef struct { 224typedef struct {
196 int name; 225 GLuint name;
197 int w, h; 226 int w, h;
198 float s, t; 227 float s, t;
199 uint8_t r, g, b, a; 228 uint8_t r, g, b, a;
200 tileid smoothtile; 229 tileid smoothtile;
201 uint8_t smoothlevel; 230 uint8_t smoothlevel;
… …
219 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
220 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
221 250
222 int32_t rows; 251 int32_t rows;
223 maprow *row; 252 maprow *row;
224} *CFPlus__Map; 253} *DC__Map;
225 254
226static char * 255static char *
227prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
228{ 257{
229 char *p; 258 char *p;
… …
267 self->texs *= 2; 296 self->texs *= 2;
268 } 297 }
269} 298}
270 299
271static maprow * 300static maprow *
272map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
273{ 302{
274 if (0 > y) 303 if (0 > y)
275 { 304 {
276 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
277 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
… …
315 344
316 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
317} 346}
318 347
319static mapcell * 348static mapcell *
320map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
321{ 350{
322 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
323} 352}
324 353
325static void 354static void
326map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
327{ 356{
328 int r; 357 int r;
329 358
330 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
331 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
… …
339 self->row = 0; 368 self->row = 0;
340 self->rows = 0; 369 self->rows = 0;
341} 370}
342 371
343static void 372static void
344map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 373map_blank (DC__Map self, int x0, int y0, int w, int h)
345{ 374{
346 int x, y; 375 int x, y;
347 maprow *row; 376 maprow *row;
348 mapcell *cell; 377 mapcell *cell;
349 378
… …
428 n |= n >> 16; 457 n |= n >> 16;
429 458
430 return n + 1; 459 return n + 1;
431} 460}
432 461
462static unsigned int
463popcount (unsigned int n)
464{
465 n -= (n >> 1) & 0x55555555U;
466 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
467 n = ((n >> 4) + n) & 0x0f0f0f0fU;
468 n *= 0x01010101U;
469
470 return n >> 24;
471}
472
433/* SDL should provide this, really. */ 473/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300 474#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314 475#define SDLK_MODIFIER_MAX 314
436 476
437MODULE = CFPlus PACKAGE = CFPlus 477/******************************************************************************/
478
479static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
480static GV *hover_gv;
481
482static int
483within_widget (SV *widget, NV x, NV y)
484{
485 HV *self;
486 SV **svp;
487 NV wx, ww, wy, wh;
488
489 if (!SvROK (widget))
490 return 0;
491
492 self = (HV *)SvRV (widget);
493
494 if (SvTYPE (self) != SVt_PVHV)
495 return 0;
496
497 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
498 if (y < wy)
499 return 0;
500
501 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
502 if (y >= wy + wh)
503 return 0;
504
505 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
506 if (x < wx)
507 return 0;
508
509 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
510 if (x >= wx + ww)
511 return 0;
512
513 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
514 if (!svp || !SvTRUE (*svp))
515 return 0;
516
517 return 1;
518}
519
520MODULE = Deliantra::Client PACKAGE = DC
438 521
439PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
440 523
441BOOT: 524BOOT:
442{ 525{
443 HV *stash = gv_stashpv ("CFPlus", 1); 526 HV *stash = gv_stashpv ("DC", 1);
444 static const struct { 527 static const struct {
445 const char *name; 528 const char *name;
446 IV iv; 529 IV iv;
447 } *civ, const_iv[] = { 530 } *civ, const_iv[] = {
448# define const_iv(name) { # name, (IV)name } 531# define const_iv(name) { # name, (IV)name }
… …
470 553
471 const_iv (SDL_APPINPUTFOCUS), 554 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS), 555 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE), 556 const_iv (SDL_APPACTIVE),
474 557
558 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST),
475 const_iv (SDLK_KP0), 560 const_iv (SDLK_KP0),
476 const_iv (SDLK_KP1), 561 const_iv (SDLK_KP1),
477 const_iv (SDLK_KP2), 562 const_iv (SDLK_KP2),
478 const_iv (SDLK_KP3), 563 const_iv (SDLK_KP3),
479 const_iv (SDLK_KP4), 564 const_iv (SDLK_KP4),
… …
551 const_iv (KMOD_LMETA), 636 const_iv (KMOD_LMETA),
552 const_iv (KMOD_RMETA), 637 const_iv (KMOD_RMETA),
553 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
554 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
555 const_iv (KMOD_MODE), 640 const_iv (KMOD_MODE),
641
642 const_iv (MIX_DEFAULT_FORMAT),
643
644 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD),
652
653 const_iv (SDL_GL_RED_SIZE),
654 const_iv (SDL_GL_GREEN_SIZE),
655 const_iv (SDL_GL_BLUE_SIZE),
656 const_iv (SDL_GL_ALPHA_SIZE),
657 const_iv (SDL_GL_DOUBLEBUFFER),
658 const_iv (SDL_GL_BUFFER_SIZE),
659 const_iv (SDL_GL_DEPTH_SIZE),
660 const_iv (SDL_GL_STENCIL_SIZE),
661 const_iv (SDL_GL_ACCUM_RED_SIZE),
662 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
663 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL)
556# undef const_iv 670# undef const_iv
557 }; 671 };
558 672
559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
578 692
579NV floor (NV x) 693NV floor (NV x)
580 694
581NV ceil (NV x) 695NV ceil (NV x)
582 696
697IV minpot (UV n)
698
699IV popcount (UV n)
700
583void 701void
584pango_init () 702pango_init ()
585 CODE: 703 CODE:
586{ 704{
587 opengl_fontmap = pango_opengl_font_map_new (); 705 opengl_fontmap = pango_opengl_font_map_new ();
588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 706 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 707 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
708 /*pango_context_set_font_description (opengl_context, default_font);*/
709#if PANGO_VERSION_CHECK (1, 15, 2)
710 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
711 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
712#endif
590} 713}
591 714
592int 715char *SDL_GetError ()
593SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
594 716
595void 717int SDL_Init (U32 flags)
718
719int SDL_InitSubSystem (U32 flags)
720
721void SDL_QuitSubSystem (U32 flags)
722
596SDL_Quit () 723void SDL_Quit ()
597 724
725int SDL_GL_SetAttribute (int attr, int value)
726
727int SDL_GL_GetAttribute (int attr)
728 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL))
730 XSRETURN_UNDEF;
731 OUTPUT:
732 RETVAL
733
598void 734void
599SDL_ListModes () 735SDL_ListModes (int rgb, int alpha)
600 PPCODE: 736 PPCODE:
601{ 737{
602 SDL_Rect **m; 738 SDL_Rect **m;
603 739
604 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 740 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
605 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 741 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
606 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 742 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
607 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 743 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
608 744
609 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 745 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
610 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 746 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
611 747
612 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 748 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 749 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 750 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
616 752
617 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 753 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
618#if SDL_VERSION_ATLEAST(1,2,10)
619 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
620 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 754 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
621#endif
622
623 SDL_EnableUNICODE (1);
624 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
625 755
626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
627 757
628 if (m && m != (SDL_Rect **)-1) 758 if (m && m != (SDL_Rect **)-1)
629 while (*m) 759 while (*m)
630 { 760 {
761 if ((*m)->w >= 400 && (*m)->h >= 300)
762 {
631 AV *av = newAV (); 763 AV *av = newAV ();
632 av_push (av, newSViv ((*m)->w)); 764 av_push (av, newSViv ((*m)->w));
633 av_push (av, newSViv ((*m)->h)); 765 av_push (av, newSViv ((*m)->h));
766 av_push (av, newSViv (rgb));
767 av_push (av, newSViv (alpha));
634 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 768 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
769 }
635 770
636 ++m; 771 ++m;
637 } 772 }
638} 773}
639 774
640char *
641SDL_GetError ()
642
643int 775int
644SDL_SetVideoMode (int w, int h, int fullscreen) 776SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
645 CODE: 777 CODE:
778{
779 SDL_EnableUNICODE (1);
780 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
781
782 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
783 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
784 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
785 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
786
646 RETVAL = !!SDL_SetVideoMode ( 787 RETVAL = !!SDL_SetVideoMode (
647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 788 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
648 ); 789 );
790
649 if (RETVAL) 791 if (RETVAL)
650 { 792 {
651 av_clear (texture_av); 793 av_clear (texture_av);
652 794
653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 795 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 796#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
655# include "glfunc.h" 797#include "glfunc.h"
656# undef GL_FUNC 798#undef GL_FUNC
657
658 } 799 }
800}
659 OUTPUT: 801 OUTPUT:
660 RETVAL 802 RETVAL
661 803
662void 804void
663SDL_GL_SwapBuffers () 805SDL_GL_SwapBuffers ()
… …
665char * 807char *
666SDL_GetKeyName (int sym) 808SDL_GetKeyName (int sym)
667 809
668int 810int
669SDL_GetAppState () 811SDL_GetAppState ()
812
813int
814SDL_GetModState ()
670 815
671void 816void
672poll_events () 817poll_events ()
673 PPCODE: 818 PPCODE:
674{ 819{
… …
684 { 829 {
685 case SDL_KEYDOWN: 830 case SDL_KEYDOWN:
686 case SDL_KEYUP: 831 case SDL_KEYUP:
687 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 832 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
688 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 833 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
689 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 834 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
690 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 835 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
691 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 836 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
692 break; 837 break;
693 838
694 case SDL_ACTIVEEVENT: 839 case SDL_ACTIVEEVENT:
695 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 840 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
713 x = ev.motion.x; 858 x = ev.motion.x;
714 y = ev.motion.y; 859 y = ev.motion.y;
715 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 860 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
716 } 861 }
717 862
718 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 863 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
719 hv_store (hv, "state", 5, newSViv (state), 0); 864 hv_store (hv, "state", 5, newSViv (state), 0);
720 hv_store (hv, "x", 1, newSViv (x), 0); 865 hv_store (hv, "x", 1, newSViv (x), 0);
721 hv_store (hv, "y", 1, newSViv (y), 0); 866 hv_store (hv, "y", 1, newSViv (y), 0);
722 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 867 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
723 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 868 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
724 } 869 }
725 break; 870 break;
726 871
727 case SDL_MOUSEBUTTONDOWN: 872 case SDL_MOUSEBUTTONDOWN:
728 case SDL_MOUSEBUTTONUP: 873 case SDL_MOUSEBUTTONUP:
729 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 874 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
730 875
731 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 876 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
732 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 877 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
733 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 878 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
734 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 879 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
739 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 884 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
740 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 885 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
741 break; 886 break;
742 } 887 }
743 888
744 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 889 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
745 } 890 }
746} 891}
747 892
748int 893int
749Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 894Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
750 POSTCALL: 895 POSTCALL:
751 Mix_HookMusicFinished (music_finished); 896 Mix_HookMusicFinished (music_finished);
752 Mix_ChannelFinished (channel_finished); 897 Mix_ChannelFinished (channel_finished);
753 898
754void 899void
900Mix_QuerySpec ()
901 PPCODE:
902{
903 int freq, channels;
904 Uint16 format;
905
906 if (Mix_QuerySpec (&freq, &format, &channels))
907 {
908 EXTEND (SP, 3);
909 PUSHs (sv_2mortal (newSViv (freq)));
910 PUSHs (sv_2mortal (newSViv (format)));
911 PUSHs (sv_2mortal (newSViv (channels)));
912 }
913}
914
915void
755Mix_CloseAudio () 916Mix_CloseAudio ()
756 917
757int 918int
758Mix_AllocateChannels (int numchans = -1) 919Mix_AllocateChannels (int numchans = -1)
920
921const char *
922Mix_GetError ()
759 923
760void 924void
761lowdelay (int fd, int val = 1) 925lowdelay (int fd, int val = 1)
762 CODE: 926 CODE:
763 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 927 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
789 } 953 }
790 } 954 }
791#endif 955#endif
792} 956}
793 957
794void 958int
795add_font (char *file) 959add_font (char *file)
796 CODE: 960 CODE:
797 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 961 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
962 OUTPUT:
963 RETVAL
798 964
799void 965void
800load_image_inline (SV *image_) 966load_image_inline (SV *image_)
801 ALIAS: 967 ALIAS:
802 load_image_file = 1 968 load_image_file = 1
… …
805 STRLEN image_len; 971 STRLEN image_len;
806 char *image = (char *)SvPVbyte (image_, image_len); 972 char *image = (char *)SvPVbyte (image_, image_len);
807 SDL_Surface *surface, *surface2; 973 SDL_Surface *surface, *surface2;
808 SDL_PixelFormat fmt; 974 SDL_PixelFormat fmt;
809 SDL_RWops *rw = ix 975 SDL_RWops *rw = ix
810 ? SDL_RWFromFile (image, "r") 976 ? SDL_RWFromFile (image, "rb")
811 : SDL_RWFromConstMem (image, image_len); 977 : SDL_RWFromConstMem (image, image_len);
812 978
813 if (!rw) 979 if (!rw)
814 croak ("load_image: %s", SDL_GetError ()); 980 croak ("load_image: %s", SDL_GetError ());
815 981
… …
888void 1054void
889error (char *message) 1055error (char *message)
890 CODE: 1056 CODE:
891 fprintf (stderr, "ERROR: %s\n", message); 1057 fprintf (stderr, "ERROR: %s\n", message);
892#ifdef _WIN32 1058#ifdef _WIN32
893 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1059 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
894#endif 1060#endif
895 1061
896void 1062void
897fatal (char *message) 1063fatal (char *message)
898 CODE: 1064 CODE:
899 fprintf (stderr, "FATAL: %s\n", message); 1065 fprintf (stderr, "FATAL: %s\n", message);
900#ifdef _WIN32 1066#ifdef _WIN32
901 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1067 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
902#endif 1068#endif
903 _exit (1); 1069 _exit (1);
904 1070
905void 1071void
906_exit (int retval = 0) 1072_exit (int retval = 0)
… …
918#if DEBUG 1084#if DEBUG
919 VALGRIND_DO_LEAK_CHECK; 1085 VALGRIND_DO_LEAK_CHECK;
920#endif 1086#endif
921} 1087}
922 1088
923MODULE = CFPlus PACKAGE = CFPlus::Font 1089MODULE = Deliantra::Client PACKAGE = DC::Font
924 1090
925CFPlus::Font 1091PROTOTYPES: DISABLE
1092
1093DC::Font
926new_from_file (SV *class, char *path, int id = 0) 1094new_from_file (SV *class, char *path, int id = 0)
927 CODE: 1095 CODE:
928{ 1096{
929 int count; 1097 int count;
930 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1098 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
933} 1101}
934 OUTPUT: 1102 OUTPUT:
935 RETVAL 1103 RETVAL
936 1104
937void 1105void
938DESTROY (CFPlus::Font self) 1106DESTROY (DC::Font self)
939 CODE: 1107 CODE:
940 pango_font_description_free (self); 1108 pango_font_description_free (self);
941 1109
942void 1110void
943make_default (CFPlus::Font self) 1111make_default (DC::Font self)
1112 PROTOTYPE: $
944 CODE: 1113 CODE:
945 default_font = self; 1114 default_font = self;
946 1115
947MODULE = CFPlus PACKAGE = CFPlus::Layout 1116MODULE = Deliantra::Client PACKAGE = DC::Layout
948 1117
1118PROTOTYPES: DISABLE
1119
949void 1120void
950reset_glyph_cache () 1121glyph_cache_backup ()
1122 PROTOTYPE:
951 CODE: 1123 CODE:
1124 tc_backup ();
1125
1126void
1127glyph_cache_restore ()
1128 PROTOTYPE:
1129 CODE:
952 tc_clear (); 1130 tc_restore ();
953 1131
954CFPlus::Layout 1132DC::Layout
955new (SV *class) 1133new (SV *class)
956 CODE: 1134 CODE:
957 New (0, RETVAL, 1, struct cf_layout); 1135 New (0, RETVAL, 1, struct cf_layout);
958 1136
959 RETVAL->pl = pango_layout_new (opengl_context); 1137 RETVAL->pl = pango_layout_new (opengl_context);
… …
961 RETVAL->g = 1.; 1139 RETVAL->g = 1.;
962 RETVAL->b = 1.; 1140 RETVAL->b = 1.;
963 RETVAL->a = 1.; 1141 RETVAL->a = 1.;
964 RETVAL->base_height = MIN_FONT_HEIGHT; 1142 RETVAL->base_height = MIN_FONT_HEIGHT;
965 RETVAL->font = 0; 1143 RETVAL->font = 0;
1144 RETVAL->rc = rc_alloc ();
966 1145
967 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1146 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
968 layout_update_font (RETVAL); 1147 layout_update_font (RETVAL);
969 OUTPUT: 1148 OUTPUT:
970 RETVAL 1149 RETVAL
971 1150
972void 1151void
973DESTROY (CFPlus::Layout self) 1152DESTROY (DC::Layout self)
974 CODE: 1153 CODE:
975 g_object_unref (self->pl); 1154 g_object_unref (self->pl);
1155 rc_free (self->rc);
976 Safefree (self); 1156 Safefree (self);
977 1157
978void 1158void
979set_text (CFPlus::Layout self, SV *text_) 1159set_text (DC::Layout self, SV *text_)
980 CODE: 1160 CODE:
981{ 1161{
982 STRLEN textlen; 1162 STRLEN textlen;
983 char *text = SvPVutf8 (text_, textlen); 1163 char *text = SvPVutf8 (text_, textlen);
984 1164
985 pango_layout_set_text (self->pl, text, textlen); 1165 pango_layout_set_text (self->pl, text, textlen);
986} 1166}
987 1167
988void 1168void
989set_markup (CFPlus::Layout self, SV *text_) 1169set_markup (DC::Layout self, SV *text_)
990 CODE: 1170 CODE:
991{ 1171{
992 STRLEN textlen; 1172 STRLEN textlen;
993 char *text = SvPVutf8 (text_, textlen); 1173 char *text = SvPVutf8 (text_, textlen);
994 1174
995 pango_layout_set_markup (self->pl, text, textlen); 1175 pango_layout_set_markup (self->pl, text, textlen);
996} 1176}
997 1177
998void 1178void
999set_shapes (CFPlus::Layout self, ...) 1179set_shapes (DC::Layout self, ...)
1000 CODE: 1180 CODE:
1001{ 1181{
1002 PangoAttrList *attrs = 0; 1182 PangoAttrList *attrs = 0;
1003 const char *text = pango_layout_get_text (self->pl); 1183 const char *text = pango_layout_get_text (self->pl);
1004 const char *pos = text; 1184 const char *pos = text;
… …
1039 if (attrs) 1219 if (attrs)
1040 pango_layout_set_attributes (self->pl, attrs); 1220 pango_layout_set_attributes (self->pl, attrs);
1041} 1221}
1042 1222
1043void 1223void
1044get_shapes (CFPlus::Layout self) 1224get_shapes (DC::Layout self)
1045 PPCODE: 1225 PPCODE:
1046{ 1226{
1047 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1227 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1048 1228
1049 do 1229 do
1050 { 1230 {
1051 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1231 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1052 1232
1053 if (run && shape_attr_p (run)) 1233 if (run && shape_attr_p (run))
1054 { 1234 {
1055 PangoRectangle extents; 1235 PangoRectangle extents;
1056 pango_layout_iter_get_run_extents (iter, 0, &extents); 1236 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1064 1244
1065 pango_layout_iter_free (iter); 1245 pango_layout_iter_free (iter);
1066} 1246}
1067 1247
1068int 1248int
1069has_wrapped (CFPlus::Layout self) 1249has_wrapped (DC::Layout self)
1070 CODE: 1250 CODE:
1071{ 1251{
1072 int lines = 1; 1252 int lines = 1;
1073 const char *text = pango_layout_get_text (self->pl); 1253 const char *text = pango_layout_get_text (self->pl);
1074 1254
… …
1079} 1259}
1080 OUTPUT: 1260 OUTPUT:
1081 RETVAL 1261 RETVAL
1082 1262
1083SV * 1263SV *
1084get_text (CFPlus::Layout self) 1264get_text (DC::Layout self)
1085 CODE: 1265 CODE:
1086 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1266 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1087 sv_utf8_decode (RETVAL); 1267 sv_utf8_decode (RETVAL);
1088 OUTPUT: 1268 OUTPUT:
1089 RETVAL 1269 RETVAL
1090 1270
1091void 1271void
1092set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1272set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1093 CODE: 1273 CODE:
1094 self->r = r; 1274 self->r = r;
1095 self->g = g; 1275 self->g = g;
1096 self->b = b; 1276 self->b = b;
1097 self->a = a; 1277 self->a = a;
1098 1278
1099void 1279void
1100set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1280set_font (DC::Layout self, DC::Font font = 0)
1101 CODE: 1281 CODE:
1102 if (self->font != font) 1282 if (self->font != font)
1103 { 1283 {
1104 self->font = font; 1284 self->font = font;
1105 layout_update_font (self); 1285 layout_update_font (self);
1106 } 1286 }
1107 1287
1108void 1288void
1109set_height (CFPlus::Layout self, int base_height) 1289set_height (DC::Layout self, int base_height)
1110 CODE: 1290 CODE:
1111 if (self->base_height != base_height) 1291 if (self->base_height != base_height)
1112 { 1292 {
1113 self->base_height = base_height; 1293 self->base_height = base_height;
1114 layout_update_font (self); 1294 layout_update_font (self);
1115 } 1295 }
1116 1296
1117void 1297void
1118set_width (CFPlus::Layout self, int max_width = -1) 1298set_width (DC::Layout self, int max_width = -1)
1119 CODE: 1299 CODE:
1120 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1300 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1121 1301
1122void 1302void
1123set_indent (CFPlus::Layout self, int indent) 1303set_indent (DC::Layout self, int indent)
1124 CODE: 1304 CODE:
1125 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1305 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1126 1306
1127void 1307void
1128set_spacing (CFPlus::Layout self, int spacing) 1308set_spacing (DC::Layout self, int spacing)
1129 CODE: 1309 CODE:
1130 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1310 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1131 1311
1132void 1312void
1133set_ellipsise (CFPlus::Layout self, int ellipsise) 1313set_ellipsise (DC::Layout self, int ellipsise)
1134 CODE: 1314 CODE:
1135 pango_layout_set_ellipsize (self->pl, 1315 pango_layout_set_ellipsize (self->pl,
1136 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1316 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1137 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1317 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1138 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1318 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1139 : PANGO_ELLIPSIZE_NONE 1319 : PANGO_ELLIPSIZE_NONE
1140 ); 1320 );
1141 1321
1142void 1322void
1143set_single_paragraph_mode (CFPlus::Layout self, int spm) 1323set_single_paragraph_mode (DC::Layout self, int spm)
1144 CODE: 1324 CODE:
1145 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1325 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1146 1326
1147void 1327void
1148size (CFPlus::Layout self) 1328size (DC::Layout self)
1149 PPCODE: 1329 PPCODE:
1150{ 1330{
1151 int w, h; 1331 int w, h;
1152 1332
1153 layout_get_pixel_size (self, &w, &h); 1333 layout_get_pixel_size (self, &w, &h);
… …
1156 PUSHs (sv_2mortal (newSViv (w))); 1336 PUSHs (sv_2mortal (newSViv (w)));
1157 PUSHs (sv_2mortal (newSViv (h))); 1337 PUSHs (sv_2mortal (newSViv (h)));
1158} 1338}
1159 1339
1160int 1340int
1161descent (CFPlus::Layout self) 1341descent (DC::Layout self)
1162 CODE: 1342 CODE:
1163{ 1343{
1164 PangoRectangle rect; 1344 PangoRectangle rect;
1165 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1345 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1166 pango_layout_line_get_pixel_extents (line, 0, &rect); 1346 pango_layout_line_get_pixel_extents (line, 0, &rect);
1167 RETVAL = PANGO_DESCENT (rect); 1347 RETVAL = PANGO_DESCENT (rect);
1168} 1348}
1169 OUTPUT: 1349 OUTPUT:
1170 RETVAL 1350 RETVAL
1171 1351
1172int 1352int
1173xy_to_index (CFPlus::Layout self, int x, int y) 1353xy_to_index (DC::Layout self, int x, int y)
1174 CODE: 1354 CODE:
1175{ 1355{
1176 int index, trailing; 1356 int index, trailing;
1177 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1357 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1178 RETVAL = index + trailing; 1358 RETVAL = index + trailing;
1179} 1359}
1180 OUTPUT: 1360 OUTPUT:
1181 RETVAL 1361 RETVAL
1182 1362
1183void 1363void
1184cursor_pos (CFPlus::Layout self, int index) 1364cursor_pos (DC::Layout self, int index)
1185 PPCODE: 1365 PPCODE:
1186{ 1366{
1187 PangoRectangle strong_pos; 1367 PangoRectangle pos;
1188 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1368 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1189 1369
1190 EXTEND (SP, 3); 1370 EXTEND (SP, 3);
1191 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1371 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1192 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1372 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1193 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1373 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1194} 1374}
1195 1375
1196void 1376void
1197index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1377index_to_line_x (DC::Layout self, int index, int trailing = 0)
1198 PPCODE: 1378 PPCODE:
1199{ 1379{
1200 int line, x; 1380 int line, x;
1201 1381
1202 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1382 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1383#if !PANGO_VERSION_CHECK (1, 17, 3)
1203 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1384 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1204 1385 --line;
1386#endif
1205 EXTEND (SP, 2); 1387 EXTEND (SP, 2);
1206 PUSHs (sv_2mortal (newSViv (line - 1))); 1388 PUSHs (sv_2mortal (newSViv (line)));
1207 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1389 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1208} 1390}
1209 1391
1210void 1392void
1211line_x_to_index (CFPlus::Layout self, int line, int x) 1393line_x_to_index (DC::Layout self, int line, int x)
1212 PPCODE: 1394 PPCODE:
1213{ 1395{
1214 PangoLayoutLine *lp; 1396 PangoLayoutLine *lp;
1215 int index, trailing; 1397 int index, trailing;
1216 1398
1217 if (line < 0) 1399 if (line < 0)
1218 XSRETURN_EMPTY; 1400 XSRETURN_EMPTY;
1219 1401
1220 if (!(lp = pango_layout_get_line (self->pl, line))) 1402 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1221 XSRETURN_EMPTY; /* do better */ 1403 XSRETURN_EMPTY; /* do better */
1222 1404
1223 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1405 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1224 1406
1225 EXTEND (SP, 2); 1407 EXTEND (SP, 2);
… …
1231 PUSHs (sv_2mortal (newSViv (trailing))); 1413 PUSHs (sv_2mortal (newSViv (trailing)));
1232 } 1414 }
1233} 1415}
1234 1416
1235void 1417void
1236render (CFPlus::Layout self, float x, float y, int flags = 0) 1418render (DC::Layout self, float x, float y, int flags = 0)
1237 PPCODE: 1419 CODE:
1420 rc_clear (self->rc);
1238 pango_opengl_render_layout_subpixel ( 1421 pango_opengl_render_layout_subpixel (
1239 self->pl, 1422 self->pl,
1423 self->rc,
1240 x * PANGO_SCALE, y * PANGO_SCALE, 1424 x * PANGO_SCALE, y * PANGO_SCALE,
1241 self->r, self->g, self->b, self->a, 1425 self->r, self->g, self->b, self->a,
1242 flags 1426 flags
1243 ); 1427 );
1428 // we assume that context_change actually clears/frees stuff
1429 // and does not do any recomputation...
1430 pango_layout_context_changed (self->pl);
1244 1431
1245MODULE = CFPlus PACKAGE = CFPlus::Texture
1246
1247int minpot (int n)
1248
1249void 1432void
1250pad2pot (SV *data_, SV *w_, SV *h_) 1433draw (DC::Layout self)
1251 CODE: 1434 CODE:
1252{ 1435{
1253 int ow = SvIV (w_); 1436 glEnable (GL_TEXTURE_2D);
1254 int oh = SvIV (h_); 1437 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1438 glEnable (GL_BLEND);
1439 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1440 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1441 glEnable (GL_ALPHA_TEST);
1442 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1255 1443
1256 if (ow && oh) 1444 rc_draw (self->rc);
1445
1446 glDisable (GL_ALPHA_TEST);
1447 glDisable (GL_BLEND);
1448 glDisable (GL_TEXTURE_2D);
1449}
1450
1451MODULE = Deliantra::Client PACKAGE = DC::Texture
1452
1453PROTOTYPES: ENABLE
1454
1455void
1456pad (SV *data_, int ow, int oh, int nw, int nh)
1457 CODE:
1458{
1459 if ((nw != ow || nh != oh) && SvOK (data_))
1257 { 1460 {
1258 int nw = minpot (ow);
1259 int nh = minpot (oh);
1260
1261 if (nw != ow || nh != oh)
1262 {
1263 if (SvOK (data_))
1264 {
1265 STRLEN datalen; 1461 STRLEN datalen;
1266 char *data = SvPVbyte (data_, datalen); 1462 char *data = SvPVbyte (data_, datalen);
1267 int bpp = datalen / (ow * oh); 1463 int bpp = datalen / (ow * oh);
1268 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1464 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1269 1465
1270 SvPOK_only (result_); 1466 SvPOK_only (result_);
1271 SvCUR_set (result_, nw * nh * bpp); 1467 SvCUR_set (result_, nw * nh * bpp);
1272 1468
1273 memset (SvPVX (result_), 0, nw * nh * bpp); 1469 memset (SvPVX (result_), 0, nw * nh * bpp);
1274 while (oh--) 1470 while (oh--)
1275 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1471 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1276 1472
1277 sv_setsv (data_, result_); 1473 sv_setsv (data_, result_);
1278 }
1279
1280 sv_setiv (w_, nw);
1281 sv_setiv (h_, nh);
1282 }
1283 } 1474 }
1284} 1475}
1285 1476
1286void 1477void
1287draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1478draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1293{ 1484{
1294 HV *hv = (HV *)SvRV (self); 1485 HV *hv = (HV *)SvRV (self);
1295 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1486 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1296 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1487 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1297 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1488 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1489
1490 if (name <= 0)
1491 XSRETURN_EMPTY;
1298 1492
1299 if (items < 5) 1493 if (items < 5)
1300 { 1494 {
1301 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1495 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1302 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1496 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1341 RETVAL = width > 0; 1535 RETVAL = width > 0;
1342} 1536}
1343 OUTPUT: 1537 OUTPUT:
1344 RETVAL 1538 RETVAL
1345 1539
1346MODULE = CFPlus PACKAGE = CFPlus::Map 1540MODULE = Deliantra::Client PACKAGE = DC::Map
1347 1541
1348CFPlus::Map 1542PROTOTYPES: DISABLE
1543
1544DC::Map
1349new (SV *class) 1545new (SV *class)
1350 CODE: 1546 CODE:
1351 New (0, RETVAL, 1, struct map); 1547 New (0, RETVAL, 1, struct map);
1352 RETVAL->x = 0; 1548 RETVAL->x = 0;
1353 RETVAL->y = 0; 1549 RETVAL->y = 0;
… …
1361 RETVAL->row = 0; 1557 RETVAL->row = 0;
1362 OUTPUT: 1558 OUTPUT:
1363 RETVAL 1559 RETVAL
1364 1560
1365void 1561void
1366DESTROY (CFPlus::Map self) 1562DESTROY (DC::Map self)
1367 CODE: 1563 CODE:
1368{ 1564{
1369 map_clear (self); 1565 map_clear (self);
1370 Safefree (self->face2tile); 1566 Safefree (self->face2tile);
1371 Safefree (self->tex); 1567 Safefree (self->tex);
1372 Safefree (self); 1568 Safefree (self);
1373} 1569}
1374 1570
1375void 1571void
1376resize (CFPlus::Map self, int map_width, int map_height) 1572resize (DC::Map self, int map_width, int map_height)
1377 CODE: 1573 CODE:
1378 self->w = map_width; 1574 self->w = map_width;
1379 self->h = map_height; 1575 self->h = map_height;
1380 1576
1381void 1577void
1382clear (CFPlus::Map self) 1578clear (DC::Map self)
1383 CODE: 1579 CODE:
1384 map_clear (self); 1580 map_clear (self);
1385 1581
1386void 1582void
1387set_tileid (CFPlus::Map self, int face, int tile) 1583set_tileid (DC::Map self, int face, int tile)
1388 CODE: 1584 CODE:
1389{ 1585{
1390 need_facenum (self, face); self->face2tile [face] = tile; 1586 need_facenum (self, face); self->face2tile [face] = tile;
1391 need_texid (self, tile); 1587 need_texid (self, tile);
1392} 1588}
1393 1589
1394void 1590void
1395set_smooth (CFPlus::Map self, int face, int smooth, int level) 1591set_smooth (DC::Map self, int face, int smooth, int level)
1396 CODE: 1592 CODE:
1397{ 1593{
1398 tileid texid; 1594 tileid texid;
1399 maptex *tex; 1595 maptex *tex;
1400 1596
… …
1413 tex->smoothtile = self->face2tile [smooth]; 1609 tex->smoothtile = self->face2tile [smooth];
1414 tex->smoothlevel = level; 1610 tex->smoothlevel = level;
1415} 1611}
1416 1612
1417void 1613void
1418set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1614set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1419 CODE: 1615 CODE:
1420{ 1616{
1421 need_texid (self, texid); 1617 need_texid (self, texid);
1422 1618
1423 { 1619 {
… …
1443 // from transparent color bleeding and ugly wrapping effects. 1639 // from transparent color bleeding and ugly wrapping effects.
1444 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1640 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1445} 1641}
1446 1642
1447int 1643int
1448ox (CFPlus::Map self) 1644ox (DC::Map self)
1449 ALIAS: 1645 ALIAS:
1450 oy = 1 1646 oy = 1
1451 x = 2 1647 x = 2
1452 y = 3 1648 y = 3
1453 w = 4 1649 w = 4
… …
1464 } 1660 }
1465 OUTPUT: 1661 OUTPUT:
1466 RETVAL 1662 RETVAL
1467 1663
1468void 1664void
1469scroll (CFPlus::Map self, int dx, int dy) 1665scroll (DC::Map self, int dx, int dy)
1470 CODE: 1666 CODE:
1471{ 1667{
1472 if (dx > 0) 1668 if (dx > 0)
1473 map_blank (self, self->x, self->y, dx, self->h); 1669 map_blank (self, self->x, self->y, dx, self->h);
1474 else if (dx < 0) 1670 else if (dx < 0)
… …
1489 self->rows += MAP_EXTEND_Y; 1685 self->rows += MAP_EXTEND_Y;
1490 self->y += MAP_EXTEND_Y; 1686 self->y += MAP_EXTEND_Y;
1491 } 1687 }
1492} 1688}
1493 1689
1494void 1690SV *
1495map1a_update (CFPlus::Map self, SV *data_, int extmap) 1691map1a_update (DC::Map self, SV *data_, int extmap)
1496 CODE: 1692 CODE:
1497{ 1693{
1498 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1694 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1499 uint8_t *data_end = (uint8_t *)SvEND (data_); 1695 uint8_t *data_end = (uint8_t *)SvEND (data_);
1500 mapcell *cell; 1696 mapcell *cell;
1501 int x, y, flags; 1697 int x, y, z, flags;
1698 AV *missing = newAV ();
1699 RETVAL = newRV_noinc ((SV *)missing);
1502 1700
1503 while (data < data_end - 1) 1701 while (data < data_end - 1)
1504 { 1702 {
1505 flags = (data [0] << 8) + data [1]; data += 2; 1703 flags = (data [0] << 8) + data [1]; data += 2;
1506 1704
… …
1526 uint8_t ext, cmd; 1724 uint8_t ext, cmd;
1527 1725
1528 do 1726 do
1529 { 1727 {
1530 ext = *data++; 1728 ext = *data++;
1531 cmd = ext & 0x3f; 1729 cmd = ext & 0x7f;
1532 1730
1533 if (cmd < 4) 1731 if (cmd < 4)
1534 cell->darkness = 255 - ext * 64 + 1; 1732 cell->darkness = 255 - ext * 64 + 1;
1535 else if (cmd == 5) // health 1733 else if (cmd == 5) // health
1536 { 1734 {
… …
1539 } 1737 }
1540 else if (cmd == 6) // monster width 1738 else if (cmd == 6) // monster width
1541 cell->stat_width = *data++ + 1; 1739 cell->stat_width = *data++ + 1;
1542 else if (cmd == 0x47) 1740 else if (cmd == 0x47)
1543 { 1741 {
1544 if (*data == 4) 1742 if (*data == 1) cell->player = data [1];
1545 ; // decode player count 1743 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1744 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1745 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1546 1746
1547 data += *data + 1; 1747 data += *data + 1;
1548 } 1748 }
1549 else if (cmd == 8) // cell flags 1749 else if (cmd == 8) // cell flags
1550 cell->flags = *data++; 1750 cell->flags = *data++;
… …
1557 } 1757 }
1558 else 1758 else
1559 cell->darkness = *data++ + 1; 1759 cell->darkness = *data++ + 1;
1560 } 1760 }
1561 1761
1762 for (z = 0; z <= 2; ++z)
1562 if (flags & 4) 1763 if (flags & (4 >> z))
1563 { 1764 {
1564 faceid face = (data [0] << 8) + data [1]; data += 2; 1765 faceid face = (data [0] << 8) + data [1]; data += 2;
1565 need_facenum (self, face); 1766 need_facenum (self, face);
1566 cell->tile [0] = self->face2tile [face]; 1767 cell->tile [z] = self->face2tile [face];
1768
1769 if (cell->tile [z])
1770 {
1771 maptex *tex = self->tex + cell->tile [z];
1772 if (!tex->name)
1773 av_push (missing, newSViv (cell->tile [z]));
1774
1775 if (tex->smoothtile)
1776 {
1777 maptex *smooth = self->tex + tex->smoothtile;
1778 if (!smooth->name)
1779 av_push (missing, newSViv (tex->smoothtile));
1780 }
1781 }
1567 } 1782 }
1568
1569 if (flags & 2)
1570 {
1571 faceid face = (data [0] << 8) + data [1]; data += 2;
1572 need_facenum (self, face);
1573 cell->tile [1] = self->face2tile [face];
1574 }
1575
1576 if (flags & 1)
1577 {
1578 faceid face = (data [0] << 8) + data [1]; data += 2;
1579 need_facenum (self, face);
1580 cell->tile [2] = self->face2tile [face];
1581 }
1582 } 1783 }
1583 else 1784 else
1584 cell->darkness = 0; 1785 cell->darkness = 0;
1585 } 1786 }
1586} 1787}
1788 OUTPUT:
1789 RETVAL
1587 1790
1588SV * 1791SV *
1589mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1792mapmap (DC::Map self, int x0, int y0, int w, int h)
1590 CODE: 1793 CODE:
1591{ 1794{
1592 int x1, x; 1795 int x1, x;
1593 int y1, y; 1796 int y1, y;
1594 int z; 1797 int z;
… …
1639} 1842}
1640 OUTPUT: 1843 OUTPUT:
1641 RETVAL 1844 RETVAL
1642 1845
1643void 1846void
1644draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1847draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1645 CODE: 1848 CODE:
1646{ 1849{
1850 int x, y, z;
1851
1647 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1852 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1648 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1853 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1649 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1854 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1650 smooth_key skey; 1855 smooth_key skey;
1651 int x, y, z; 1856 int pl_x, pl_y;
1652 int last_name; 1857 maptex pl_tex;
1858 rc_t *rc = rc_alloc ();
1859 rc_key_t key;
1860 rc_array_t *arr;
1861
1862 pl_tex.name = 0;
1653 1863
1654 // thats current max. sorry. 1864 // thats current max. sorry.
1655 if (sw > 255) sw = 255; 1865 if (sw > 255) sw = 255;
1656 if (sh > 255) sh = 255; 1866 if (sh > 255) sh = 255;
1657 1867
1658 // clear key, in case of extra padding 1868 // clear key, in case of extra padding
1659 memset (&skey, 0, sizeof (skey)); 1869 memset (&skey, 0, sizeof (skey));
1660 1870
1661 glColor4ub (255, 255, 255, 255); 1871 memset (&key, 0, sizeof (key));
1662 1872 key.r = 255;
1663 glEnable (GL_BLEND); 1873 key.g = 255;
1664 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1874 key.b = 255;
1665 glEnable (GL_TEXTURE_2D); 1875 key.a = 255;
1666 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1876 key.mode = GL_QUADS;
1667 1877 key.format = GL_T2F_V3F;
1668 glBegin (GL_QUADS); 1878 key.texname = -1;
1669
1670 last_name = 0;
1671 1879
1672 mx += self->x; 1880 mx += self->x;
1673 my += self->y; 1881 my += self->y;
1674 1882
1675 // first pass: determine smooth_max 1883 // first pass: determine smooth_max
… …
1691 MAX (self->tex [cell->tile [0]].smoothlevel, 1899 MAX (self->tex [cell->tile [0]].smoothlevel,
1692 MAX (self->tex [cell->tile [1]].smoothlevel, 1900 MAX (self->tex [cell->tile [1]].smoothlevel,
1693 self->tex [cell->tile [2]].smoothlevel)); 1901 self->tex [cell->tile [2]].smoothlevel));
1694 } 1902 }
1695 } 1903 }
1904
1905 glEnable (GL_BLEND);
1906 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1907 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1696 1908
1697 for (z = 0; z <= 2; z++) 1909 for (z = 0; z <= 2; z++)
1698 { 1910 {
1699 memset (smooth_level, 0, sizeof (smooth_level)); 1911 memset (smooth_level, 0, sizeof (smooth_level));
1700 1912
… …
1713 { 1925 {
1714 maptex tex = self->tex [tile]; 1926 maptex tex = self->tex [tile];
1715 int px = (x + 1) * T - tex.w; 1927 int px = (x + 1) * T - tex.w;
1716 int py = (y + 1) * T - tex.h; 1928 int py = (y + 1) * T - tex.h;
1717 1929
1718 // suppressing texture state switches here
1719 // is only moderately effective, but worth the extra effort
1720 if (last_name != tex.name) 1930 if (key.texname != tex.name)
1721 { 1931 {
1722 if (!tex.name) 1932 if (!tex.name)
1723 tex = self->tex [2]; /* missing, replace by noface */ 1933 tex = self->tex [2]; /* missing, replace by noface */
1724 1934
1725 glEnd (); 1935 key.texname = tex.name;
1726 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1936 arr = rc_array (rc, &key);
1727 glBegin (GL_QUADS);
1728 } 1937 }
1729 1938
1730 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1939 if (expect_false (cell->player == player) && expect_false (z == 2))
1731 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1732 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1733 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1734
1735 if (cell->flags && z == 2)
1736 { 1940 {
1941 pl_x = px;
1942 pl_y = py;
1943 pl_tex = tex;
1944 continue;
1945 }
1946
1947 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1948 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1949 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1950 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1951
1952 if (expect_false (cell->flags) && expect_false (z == 2))
1953 {
1954 // overlays such as the speech bubble, probably more to come
1737 if (cell->flags & 1) 1955 if (cell->flags & 1)
1738 { 1956 {
1739 maptex tex = self->tex [1]; 1957 maptex tex = self->tex [1];
1740 int px = x * T + T * 2 / 32; 1958 int px = x * T + T * 2 / 32;
1741 int py = y * T - T * 6 / 32; 1959 int py = y * T - T * 6 / 32;
1742 1960
1961 if (tex.name)
1743 glEnd (); 1962 {
1744 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1963 if (key.texname != tex.name)
1964 {
1965 key.texname = tex.name;
1966 arr = rc_array (rc, &key);
1967 }
1968
1969 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1970 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1971 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1972 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1745 glBegin (GL_QUADS); 1973 }
1746
1747 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1748 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1749 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1750 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1751 } 1974 }
1752 } 1975 }
1753 1976
1754 // update smooth hash 1977 // update smooth hash
1755 if (tex.smoothtile) 1978 if (tex.smoothtile)
… …
1791 } 2014 }
1792 } 2015 }
1793 } 2016 }
1794 } 2017 }
1795 2018
2019 rc_draw (rc);
2020 rc_clear (rc);
2021
1796 // go through all smoothlevels, lowest to highest, then draw. 2022 // go through all smoothlevels, lowest to highest, then draw.
1797 // this is basically counting sort 2023 // this is basically counting sort
1798 { 2024 {
1799 int w, b; 2025 int w, b;
1800 2026
2027 glEnable (GL_TEXTURE_2D);
2028 glBegin (GL_QUADS);
1801 for (w = 0; w < 256 / 32; ++w) 2029 for (w = 0; w < 256 / 32; ++w)
1802 { 2030 {
1803 uint32_t smask = smooth_level [w]; 2031 uint32_t smask = smooth_level [w];
1804 if (smask) 2032 if (smask)
1805 for (b = 0; b < 32; ++b) 2033 for (b = 0; b < 32; ++b)
… …
1824 int border = bits & 15; 2052 int border = bits & 15;
1825 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2053 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1826 float dx = tex.s * .0625f; // 16 images/row 2054 float dx = tex.s * .0625f; // 16 images/row
1827 float dy = tex.t * .5f ; // 2 images/column 2055 float dy = tex.t * .5f ; // 2 images/column
1828 2056
1829 // this time naively avoiding texture state changes
1830 // save gobs of state changes.
1831 if (last_name != tex.name) 2057 if (tex.name)
1832 { 2058 {
2059 // this time avoiding texture state changes
2060 // save gobs of state changes.
1833 if (!tex.name) 2061 if (key.texname != tex.name)
1834 continue; // smoothing not yet available 2062 {
1835
1836 glEnd (); 2063 glEnd ();
1837 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2064 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1838 glBegin (GL_QUADS); 2065 glBegin (GL_QUADS);
1839 } 2066 }
1840 2067
1841 if (border) 2068 if (border)
1842 { 2069 {
1843 float ox = border * dx; 2070 float ox = border * dx;
1844 2071
1845 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2072 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1846 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2073 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1847 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2074 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1848 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2075 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1849 } 2076 }
1850 2077
1851 if (corner) 2078 if (corner)
1852 { 2079 {
1853 float ox = corner * dx; 2080 float ox = corner * dx;
1854 2081
1855 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2082 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1856 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2083 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1857 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2084 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1858 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2085 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2086 }
1859 } 2087 }
1860 } 2088 }
1861 } 2089 }
1862 } 2090 }
1863 } 2091 }
2092
2093 glEnd ();
2094 glDisable (GL_TEXTURE_2D);
2095 key.texname = -1;
1864 } 2096 }
1865 2097
1866 hv_clear (smooth); 2098 hv_clear (smooth);
1867 } 2099 }
1868 2100
1869 glEnd (); 2101 if (pl_tex.name)
2102 {
2103 maptex tex = pl_tex;
2104 int px = pl_x + pdx;
2105 int py = pl_y + pdy;
1870 2106
1871 glDisable (GL_TEXTURE_2D); 2107 key.texname = tex.name;
2108 arr = rc_array (rc, &key);
2109
2110 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2111 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2112 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2113 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2114
2115 rc_draw (rc);
2116 }
2117
1872 glDisable (GL_BLEND); 2118 glDisable (GL_BLEND);
2119 rc_free (rc);
1873 2120
1874 // top layer: overlays such as the health bar 2121 // top layer: overlays such as the health bar
1875 for (y = 0; y < sh; y++) 2122 for (y = 0; y < sh; y++)
1876 if (0 <= y + my && y + my < self->rows) 2123 if (0 <= y + my && y + my < self->rows)
1877 { 2124 {
… …
1902 } 2149 }
1903 } 2150 }
1904} 2151}
1905 2152
1906void 2153void
1907draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2154draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1908 CODE: 2155 CODE:
1909{ 2156{
1910 static float color[16][3] = { 2157 static float color[16][3] = {
1911 { 0.00F, 0.00F, 0.00F }, 2158 { 0.00F, 0.00F, 0.00F },
1912 { 1.00F, 1.00F, 1.00F }, 2159 { 1.00F, 1.00F, 1.00F },
… …
1962 glDisable (GL_BLEND); 2209 glDisable (GL_BLEND);
1963 glDisable (GL_TEXTURE_2D); 2210 glDisable (GL_TEXTURE_2D);
1964} 2211}
1965 2212
1966void 2213void
1967fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2214fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1968 PPCODE: 2215 PPCODE:
1969{ 2216{
1970 int x, y; 2217 int x, y;
2218 int sw1 = sw + 2;
2219 int sh1 = sh + 2;
2220 int sh3 = sh * 3;
1971 int sw4 = (sw + 3) & ~3; 2221 int sw34 = (sw * 3 + 3) & ~3;
2222 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1972 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2223 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1973 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2224 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1974 2225
1975 memset (darkness, 255, sw4 * sh);
1976 SvPOK_only (darkness_sv); 2226 SvPOK_only (darkness3_sv);
1977 SvCUR_set (darkness_sv, sw4 * sh); 2227 SvCUR_set (darkness3_sv, sw34 * sh3);
1978 2228
1979 mx += self->x; 2229 mx += self->x - 1;
1980 my += self->y; 2230 my += self->y - 1;
1981 2231
2232 memset (darkness1, 255, sw1 * sh1);
2233
1982 for (y = 0; y < sh; y++) 2234 for (y = 0; y < sh1; y++)
1983 if (0 <= y + my && y + my < self->rows) 2235 if (0 <= y + my && y + my < self->rows)
1984 { 2236 {
1985 maprow *row = self->row + (y + my); 2237 maprow *row = self->row + (y + my);
1986 2238
1987 for (x = 0; x < sw; x++) 2239 for (x = 0; x < sw1; x++)
1988 if (row->c0 <= x + mx && x + mx < row->c1) 2240 if (row->c0 <= x + mx && x + mx < row->c1)
1989 { 2241 {
1990 mapcell *cell = row->col + (x + mx - row->c0); 2242 mapcell *cell = row->col + (x + mx - row->c0);
1991 2243
1992 darkness[y * sw4 + x] = cell->darkness 2244 darkness1 [y * sw1 + x] = cell->darkness
1993 ? 255 - (cell->darkness - 1) 2245 ? 255 - (cell->darkness - 1)
1994 : 255 - FOW_DARKNESS; 2246 : 255 - FOW_DARKNESS;
1995 } 2247 }
1996 } 2248 }
1997 2249
2250 for (y = 0; y < sh; ++y)
2251 for (x = 0; x < sw; ++x)
2252 {
2253 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2254 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2255 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2256 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2257 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2258 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2259 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2260 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2261 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2262
2263 uint8_t r11 = (d11 + d21 + d12) / 3;
2264 uint8_t r21 = d21;
2265 uint8_t r31 = (d21 + d31 + d32) / 3;
2266
2267 uint8_t r12 = d12;
2268 uint8_t r22 = d22;
2269 uint8_t r32 = d32;
2270
2271 uint8_t r13 = (d13 + d23 + d12) / 3;
2272 uint8_t r23 = d23;
2273 uint8_t r33 = (d23 + d33 + d32) / 3;
2274
2275 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2276 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2277 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2278 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2279 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2280 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2281 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2282 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2283 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2284 }
2285
2286 free (darkness1);
2287
1998 EXTEND (SP, 3); 2288 EXTEND (SP, 3);
1999 PUSHs (sv_2mortal (newSViv (sw4))); 2289 PUSHs (sv_2mortal (newSViv (sw34)));
2000 PUSHs (sv_2mortal (newSViv (sh))); 2290 PUSHs (sv_2mortal (newSViv (sh3)));
2001 PUSHs (darkness_sv); 2291 PUSHs (darkness3_sv);
2002} 2292}
2003 2293
2004SV * 2294SV *
2005get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2295get_rect (DC::Map self, int x0, int y0, int w, int h)
2006 CODE: 2296 CODE:
2007{ 2297{
2008 int x, y, x1, y1; 2298 int x, y, x1, y1;
2009 SV *data_sv = newSV (w * h * 7 + 5); 2299 SV *data_sv = newSV (w * h * 7 + 5);
2010 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2300 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2067 else 2357 else
2068 *data++ = 0; 2358 *data++ = 0;
2069 } 2359 }
2070 } 2360 }
2071 2361
2362 /* if size is w*h + 5 then no data has been found */
2363 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2364 {
2072 SvPOK_only (data_sv); 2365 SvPOK_only (data_sv);
2073 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2366 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2367 }
2368
2074 RETVAL = data_sv; 2369 RETVAL = data_sv;
2075} 2370}
2076 OUTPUT: 2371 OUTPUT:
2077 RETVAL 2372 RETVAL
2078 2373
2079void 2374void
2080set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2375set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2081 PPCODE: 2376 PPCODE:
2082{ 2377{
2083 int x, y, z; 2378 int x, y, z;
2084 int w, h; 2379 int w, h;
2085 int x1, y1; 2380 int x1, y1;
2381 STRLEN len;
2382 uint8_t *data, *end;
2383
2384 len = SvLEN (data_sv);
2385 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2386 data = SvPVbyte_nolen (data_sv);
2387 end = data + len + 8;
2388
2389 if (len < 5)
2390 XSRETURN_EMPTY;
2086 2391
2087 if (*data++ != 0) 2392 if (*data++ != 0)
2088 return; /* version mismatch */ 2393 XSRETURN_EMPTY; /* version mismatch */
2089 2394
2090 w = *data++ << 8; w |= *data++; 2395 w = *data++ << 8; w |= *data++;
2091 h = *data++ << 8; h |= *data++; 2396 h = *data++ << 8; h |= *data++;
2092 2397
2093 // we need to do this 'cause we don't keep an absolute coord system for rows 2398 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2105 { 2410 {
2106 maprow *row = map_get_row (self, y); 2411 maprow *row = map_get_row (self, y);
2107 2412
2108 for (x = x0; x < x1; x++) 2413 for (x = x0; x < x1; x++)
2109 { 2414 {
2415 uint8_t flags;
2416
2417 if (data + 7 >= end)
2418 XSRETURN_EMPTY;
2419
2110 uint8_t flags = *data++; 2420 flags = *data++;
2111 2421
2112 if (flags) 2422 if (flags)
2113 { 2423 {
2114 mapcell *cell = row_get_cell (row, x); 2424 mapcell *cell = row_get_cell (row, x);
2115 tileid tile[3] = { 0, 0, 0 }; 2425 tileid tile[3] = { 0, 0, 0 };
… …
2118 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2428 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2119 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2429 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2120 2430
2121 if (cell->darkness == 0) 2431 if (cell->darkness == 0)
2122 { 2432 {
2123 cell->darkness = 0; 2433 /*cell->darkness = 0;*/
2434 EXTEND (SP, 3);
2124 2435
2125 for (z = 0; z <= 2; z++) 2436 for (z = 0; z <= 2; z++)
2126 { 2437 {
2127 tileid t = tile [z]; 2438 tileid t = tile [z];
2128 2439
2129 if (t >= self->texs || (t && !self->tex [t].name)) 2440 if (t >= self->texs || (t && !self->tex [t].name))
2130 { 2441 {
2131 XPUSHs (sv_2mortal (newSViv (t))); 2442 PUSHs (sv_2mortal (newSViv (t)));
2132 need_texid (self, t); 2443 need_texid (self, t);
2133 } 2444 }
2134 2445
2135 cell->tile [z] = t; 2446 cell->tile [z] = t;
2136 } 2447 }
… …
2138 } 2449 }
2139 } 2450 }
2140 } 2451 }
2141} 2452}
2142 2453
2143MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2454MODULE = Deliantra::Client PACKAGE = DC::RW
2144 2455
2145CFPlus::MixChunk 2456DC::RW
2146new_from_file (SV *class, char *path) 2457new (SV *class, SV *data_sv)
2147 CODE: 2458 CODE:
2148 RETVAL = Mix_LoadWAV (path); 2459{
2460 STRLEN datalen;
2461 char *data = SvPVbyte (data_sv, datalen);
2462
2463 RETVAL = SDL_RWFromConstMem (data, datalen);
2464}
2149 OUTPUT: 2465 OUTPUT:
2150 RETVAL 2466 RETVAL
2151 2467
2468DC::RW
2469new_from_file (SV *class, const char *path, const char *mode = "rb")
2470 CODE:
2471 RETVAL = SDL_RWFromFile (path, mode);
2472 OUTPUT:
2473 RETVAL
2474
2475# fails on win32:
2476# dc.xs(2268) : error C2059: syntax error : '('
2152void 2477#void
2478#close (DC::RW self)
2479# CODE:
2480# (self->(close)) (self);
2481
2482MODULE = Deliantra::Client PACKAGE = DC::Channel
2483
2484PROTOTYPES: DISABLE
2485
2486DC::Channel
2487find ()
2488 CODE:
2489{
2490 RETVAL = Mix_GroupAvailable (-1);
2491
2492 if (RETVAL < 0)
2493 {
2494 RETVAL = Mix_GroupOldest (-1);
2495
2496 if (RETVAL < 0)
2497 XSRETURN_UNDEF;
2498
2499 Mix_HaltChannel (RETVAL);
2500 }
2501
2502 Mix_UnregisterAllEffects (RETVAL);
2503 Mix_Volume (RETVAL, 128);
2504}
2505 OUTPUT:
2506 RETVAL
2507
2508void
2509halt (DC::Channel self)
2510 CODE:
2511 Mix_HaltChannel (self);
2512
2513void
2514expire (DC::Channel self, int ticks = -1)
2515 CODE:
2516 Mix_ExpireChannel (self, ticks);
2517
2518void
2519fade_out (DC::Channel self, int ticks = -1)
2520 CODE:
2521 Mix_FadeOutChannel (self, ticks);
2522
2523int
2524volume (DC::Channel self, int volume)
2525 CODE:
2526 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2527 OUTPUT:
2528 RETVAL
2529
2530void
2531unregister_all_effects (DC::Channel self)
2532 CODE:
2533 Mix_UnregisterAllEffects (self);
2534
2535void
2536set_panning (DC::Channel self, int left, int right)
2537 CODE:
2538 left = CLAMP (left , 0, 255);
2539 right = CLAMP (right, 0, 255);
2540 Mix_SetPanning (self, left, right);
2541
2542void
2543set_distance (DC::Channel self, int distance)
2544 CODE:
2545 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2546
2547void
2548set_position (DC::Channel self, int angle, int distance)
2549 CODE:
2550
2551void
2552set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2553 CODE:
2554{
2555 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2556 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2557 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2558}
2559
2560void
2561set_reverse_stereo (DC::Channel self, int flip)
2562 CODE:
2563 Mix_SetReverseStereo (self, flip);
2564
2565MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2566
2567PROTOTYPES: DISABLE
2568
2569DC::MixChunk
2570new (SV *class, DC::RW rwops)
2571 CODE:
2572 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2573 OUTPUT:
2574 RETVAL
2575
2576void
2153DESTROY (CFPlus::MixChunk self) 2577DESTROY (DC::MixChunk self)
2154 CODE: 2578 CODE:
2155 Mix_FreeChunk (self); 2579 Mix_FreeChunk (self);
2156 2580
2157int 2581int
2158volume (CFPlus::MixChunk self, int volume = -1) 2582volume (DC::MixChunk self, int volume = -1)
2159 CODE: 2583 CODE:
2584 if (items > 1)
2585 volume = CLAMP (volume, 0, 128);
2160 RETVAL = Mix_VolumeChunk (self, volume); 2586 RETVAL = Mix_VolumeChunk (self, volume);
2161 OUTPUT: 2587 OUTPUT:
2162 RETVAL 2588 RETVAL
2163 2589
2164int 2590DC::Channel
2165play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2591play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2166 CODE: 2592 CODE:
2593{
2167 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2594 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2595
2596 if (RETVAL < 0)
2597 XSRETURN_UNDEF;
2598
2599 if (channel < 0)
2600 {
2601 Mix_UnregisterAllEffects (RETVAL);
2602 Mix_Volume (RETVAL, 128);
2603 }
2604}
2168 OUTPUT: 2605 OUTPUT:
2169 RETVAL 2606 RETVAL
2170 2607
2171MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2608MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2172 2609
2173int 2610int
2174volume (int volume = -1) 2611volume (int volume = -1)
2612 PROTOTYPE: ;$
2175 CODE: 2613 CODE:
2614 if (items > 0)
2615 volume = CLAMP (volume, 0, 128);
2176 RETVAL = Mix_VolumeMusic (volume); 2616 RETVAL = Mix_VolumeMusic (volume);
2177 OUTPUT: 2617 OUTPUT:
2178 RETVAL 2618 RETVAL
2179 2619
2620void
2621fade_out (int ms)
2622 CODE:
2623 Mix_FadeOutMusic (ms);
2624
2625void
2626halt ()
2627 CODE:
2628 Mix_HaltMusic ();
2629
2630DC::MixMusic
2631new (SV *class, DC::RW rwops)
2632 CODE:
2633 RETVAL = Mix_LoadMUS_RW (rwops);
2634 OUTPUT:
2635 RETVAL
2636
2637void
2638DESTROY (DC::MixMusic self)
2639 CODE:
2640 Mix_FreeMusic (self);
2641
2180int 2642int
2181fade_out (int ms)
2182 CODE:
2183 RETVAL = Mix_FadeOutMusic (ms);
2184 OUTPUT:
2185 RETVAL
2186
2187CFPlus::MixMusic
2188new_from_file (SV *class, char *path)
2189 CODE:
2190 RETVAL = Mix_LoadMUS (path);
2191 OUTPUT:
2192 RETVAL
2193
2194void
2195DESTROY (CFPlus::MixMusic self)
2196 CODE:
2197 Mix_FreeMusic (self);
2198
2199int
2200play (CFPlus::MixMusic self, int loops = -1) 2643play (DC::MixMusic self, int loops = -1)
2201 CODE: 2644 CODE:
2202 RETVAL = Mix_PlayMusic (self, loops); 2645 RETVAL = Mix_PlayMusic (self, loops);
2203 OUTPUT: 2646 OUTPUT:
2204 RETVAL 2647 RETVAL
2205 2648
2206int 2649void
2207fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2650fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2208 CODE: 2651 CODE:
2209 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2652 Mix_FadeInMusicPos (self, loops, ms, position);
2210 OUTPUT:
2211 RETVAL
2212 2653
2213MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2654MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2655
2656PROTOTYPES: ENABLE
2214 2657
2215BOOT: 2658BOOT:
2216{ 2659{
2217 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2660 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2218 static const struct { 2661 static const struct {
2219 const char *name; 2662 const char *name;
2220 IV iv; 2663 IV iv;
2221 } *civ, const_iv[] = { 2664 } *civ, const_iv[] = {
2222# define const_iv(name) { # name, (IV)name } 2665# define const_iv(name) { # name, (IV)name }
… …
2234 const_iv (GL_ALPHA_TEST), 2677 const_iv (GL_ALPHA_TEST),
2235 const_iv (GL_NORMALIZE), 2678 const_iv (GL_NORMALIZE),
2236 const_iv (GL_RESCALE_NORMAL), 2679 const_iv (GL_RESCALE_NORMAL),
2237 const_iv (GL_FRONT), 2680 const_iv (GL_FRONT),
2238 const_iv (GL_BACK), 2681 const_iv (GL_BACK),
2682 const_iv (GL_AUX0),
2239 const_iv (GL_AND), 2683 const_iv (GL_AND),
2240 const_iv (GL_ONE), 2684 const_iv (GL_ONE),
2241 const_iv (GL_ZERO), 2685 const_iv (GL_ZERO),
2242 const_iv (GL_SRC_ALPHA), 2686 const_iv (GL_SRC_ALPHA),
2243 const_iv (GL_DST_ALPHA), 2687 const_iv (GL_DST_ALPHA),
… …
2256 const_iv (GL_INTENSITY), 2700 const_iv (GL_INTENSITY),
2257 const_iv (GL_LUMINANCE), 2701 const_iv (GL_LUMINANCE),
2258 const_iv (GL_LUMINANCE_ALPHA), 2702 const_iv (GL_LUMINANCE_ALPHA),
2259 const_iv (GL_FLOAT), 2703 const_iv (GL_FLOAT),
2260 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2704 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2705 const_iv (GL_COMPRESSED_ALPHA_ARB),
2706 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2707 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2708 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2709 const_iv (GL_COMPRESSED_RGB_ARB),
2710 const_iv (GL_COMPRESSED_RGBA_ARB),
2261 const_iv (GL_COMPILE), 2711 const_iv (GL_COMPILE),
2262 const_iv (GL_PROXY_TEXTURE_1D), 2712 const_iv (GL_PROXY_TEXTURE_1D),
2263 const_iv (GL_PROXY_TEXTURE_2D), 2713 const_iv (GL_PROXY_TEXTURE_2D),
2264 const_iv (GL_TEXTURE_1D), 2714 const_iv (GL_TEXTURE_1D),
2265 const_iv (GL_TEXTURE_2D), 2715 const_iv (GL_TEXTURE_2D),
… …
2289 const_iv (GL_COLOR_LOGIC_OP), 2739 const_iv (GL_COLOR_LOGIC_OP),
2290 const_iv (GL_SEPARABLE_2D), 2740 const_iv (GL_SEPARABLE_2D),
2291 const_iv (GL_CONVOLUTION_2D), 2741 const_iv (GL_CONVOLUTION_2D),
2292 const_iv (GL_CONVOLUTION_BORDER_MODE), 2742 const_iv (GL_CONVOLUTION_BORDER_MODE),
2293 const_iv (GL_CONSTANT_BORDER), 2743 const_iv (GL_CONSTANT_BORDER),
2744 const_iv (GL_POINTS),
2294 const_iv (GL_LINES), 2745 const_iv (GL_LINES),
2295 const_iv (GL_LINE_STRIP), 2746 const_iv (GL_LINE_STRIP),
2296 const_iv (GL_LINE_LOOP), 2747 const_iv (GL_LINE_LOOP),
2297 const_iv (GL_QUADS), 2748 const_iv (GL_QUADS),
2298 const_iv (GL_QUAD_STRIP), 2749 const_iv (GL_QUAD_STRIP),
2299 const_iv (GL_TRIANGLES), 2750 const_iv (GL_TRIANGLES),
2300 const_iv (GL_TRIANGLE_STRIP), 2751 const_iv (GL_TRIANGLE_STRIP),
2301 const_iv (GL_TRIANGLE_FAN), 2752 const_iv (GL_TRIANGLE_FAN),
2753 const_iv (GL_POLYGON),
2302 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2754 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2755 const_iv (GL_POINT_SMOOTH_HINT),
2756 const_iv (GL_LINE_SMOOTH_HINT),
2757 const_iv (GL_POLYGON_SMOOTH_HINT),
2758 const_iv (GL_GENERATE_MIPMAP_HINT),
2759 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2303 const_iv (GL_FASTEST), 2760 const_iv (GL_FASTEST),
2761 const_iv (GL_DONT_CARE),
2762 const_iv (GL_NICEST),
2304 const_iv (GL_V2F), 2763 const_iv (GL_V2F),
2305 const_iv (GL_V3F), 2764 const_iv (GL_V3F),
2306 const_iv (GL_T2F_V3F), 2765 const_iv (GL_T2F_V3F),
2307 const_iv (GL_T2F_N3F_V3F), 2766 const_iv (GL_T2F_N3F_V3F),
2308# undef const_iv 2767# undef const_iv
… …
2313 2772
2314 texture_av = newAV (); 2773 texture_av = newAV ();
2315 AvREAL_off (texture_av); 2774 AvREAL_off (texture_av);
2316} 2775}
2317 2776
2777void
2778disable_GL_EXT_blend_func_separate ()
2779 CODE:
2780 gl.BlendFuncSeparate = 0;
2781 gl.BlendFuncSeparateEXT = 0;
2782
2318char * 2783char *
2319gl_vendor () 2784gl_vendor ()
2320 CODE: 2785 CODE:
2321 RETVAL = (char *)glGetString (GL_VENDOR); 2786 RETVAL = (char *)glGetString (GL_VENDOR);
2322 OUTPUT: 2787 OUTPUT:
… …
2334 CODE: 2799 CODE:
2335 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2800 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2336 OUTPUT: 2801 OUTPUT:
2337 RETVAL 2802 RETVAL
2338 2803
2339char *glGetString (GLenum pname) 2804const char *glGetString (GLenum pname)
2340 2805
2341GLint glGetInteger (GLenum pname) 2806GLint glGetInteger (GLenum pname)
2342 CODE: 2807 CODE:
2343 glGetIntegerv (pname, &RETVAL); 2808 glGetIntegerv (pname, &RETVAL);
2344 OUTPUT: 2809 OUTPUT:
… …
2394# near_ and far_ are due to microsofts buggy "c" compiler 2859# near_ and far_ are due to microsofts buggy "c" compiler
2395void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2860void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2396 2861
2397# near_ and far_ are due to microsofts buggy "c" compiler 2862# near_ and far_ are due to microsofts buggy "c" compiler
2398void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2863void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2864
2865PROTOTYPES: DISABLE
2399 2866
2400void glViewport (int x, int y, int width, int height) 2867void glViewport (int x, int y, int width, int height)
2401 2868
2402void glScissor (int x, int y, int width, int height) 2869void glScissor (int x, int y, int width, int height)
2403 2870
… …
2411 2878
2412void glRotate (float angle, float x, float y, float z) 2879void glRotate (float angle, float x, float y, float z)
2413 CODE: 2880 CODE:
2414 glRotatef (angle, x, y, z); 2881 glRotatef (angle, x, y, z);
2415 2882
2416void glBegin (int mode)
2417
2418void glEnd ()
2419
2420void glColor (float r, float g, float b, float a = 1.0) 2883void glColor (float r, float g, float b, float a = 1.0)
2421 PROTOTYPE: @
2422 ALIAS: 2884 ALIAS:
2423 glColor_premultiply = 1 2885 glColor_premultiply = 1
2424 CODE: 2886 CODE:
2425 if (ix) 2887 if (ix)
2426 { 2888 {
… …
2429 b *= a; 2891 b *= a;
2430 } 2892 }
2431 // microsoft visual "c" rounds instead of truncating... 2893 // microsoft visual "c" rounds instead of truncating...
2432 glColor4f (r, g, b, a); 2894 glColor4f (r, g, b, a);
2433 2895
2434void glInterleavedArrays (int format, int stride, char *data)
2435
2436void glDrawElements (int mode, int count, int type, char *indices)
2437
2438# 1.2 void glDrawRangeElements (int mode, int start, int end
2439
2440void glRasterPos (float x, float y, float z = 0.) 2896void glRasterPos (float x, float y, float z = 0.)
2441 CODE: 2897 CODE:
2442 glRasterPos3f (0, 0, z); 2898 glRasterPos3f (0, 0, z);
2443 glBitmap (0, 0, 0, 0, x, y, 0); 2899 glBitmap (0, 0, 0, 0, x, y, 0);
2444 2900
… …
2448 2904
2449void glTexCoord (float s, float t) 2905void glTexCoord (float s, float t)
2450 CODE: 2906 CODE:
2451 glTexCoord2f (s, t); 2907 glTexCoord2f (s, t);
2452 2908
2909void glRect (float x1, float y1, float x2, float y2)
2910 CODE:
2911 glRectf (x1, y1, x2, y2);
2912
2913void glRect_lineloop (float x1, float y1, float x2, float y2)
2914 CODE:
2915 glBegin (GL_LINE_LOOP);
2916 glVertex2f (x1, y1);
2917 glVertex2f (x2, y1);
2918 glVertex2f (x2, y2);
2919 glVertex2f (x1, y2);
2920 glEnd ();
2921
2922PROTOTYPES: ENABLE
2923
2924void glBegin (int mode)
2925
2926void glEnd ()
2927
2928void glPointSize (GLfloat size)
2929
2930void glLineWidth (GLfloat width)
2931
2932void glInterleavedArrays (int format, int stride, char *data)
2933
2934void glDrawElements (int mode, int count, int type, char *indices)
2935
2936# 1.2 void glDrawRangeElements (int mode, int start, int end
2937
2453void glTexEnv (int target, int pname, float param) 2938void glTexEnv (int target, int pname, float param)
2454 CODE: 2939 CODE:
2455 glTexEnvf (target, pname, param); 2940 glTexEnvf (target, pname, param);
2456 2941
2457void glTexParameter (int target, int pname, float param) 2942void glTexParameter (int target, int pname, float param)
… …
2473void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2958void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2474 CODE: 2959 CODE:
2475 if (gl.SeparableFilter2D) 2960 if (gl.SeparableFilter2D)
2476 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2961 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2477 2962
2478void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2963void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2479 2964
2480void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2965void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2481 2966
2482void glDrawPixels (int width, int height, int format, int type, char *pixels) 2967void glDrawPixels (int width, int height, int format, int type, char *pixels)
2483 2968
… …
2509 2994
2510void glEndList () 2995void glEndList ()
2511 2996
2512void glCallList (int list) 2997void glCallList (int list)
2513 2998
2999MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3000
3001PROTOTYPES: DISABLE
3002
3003void
3004find_widget (SV *self, NV x, NV y)
3005 PPCODE:
3006{
3007 if (within_widget (self, x, y))
3008 XPUSHs (self);
3009}
3010
3011BOOT:
3012{
3013 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3014
3015 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3016 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3017 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3018 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3019}
3020
3021void
3022draw (SV *self)
3023 CODE:
3024{
3025 HV *hv;
3026 SV **svp;
3027 NV x, y, w, h;
3028 SV *draw_x_sv = GvSV (draw_x_gv);
3029 SV *draw_y_sv = GvSV (draw_y_gv);
3030 SV *draw_w_sv = GvSV (draw_w_gv);
3031 SV *draw_h_sv = GvSV (draw_h_gv);
3032 double draw_x, draw_y;
3033
3034 if (!SvROK (self))
3035 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3036
3037 hv = (HV *)SvRV (self);
3038
3039 if (SvTYPE (hv) != SVt_PVHV)
3040 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3041
3042 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3043 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3044
3045 if (!h || !w)
3046 XSRETURN_EMPTY;
3047
3048 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3049 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3050
3051 draw_x = SvNV (draw_x_sv) + x;
3052 draw_y = SvNV (draw_y_sv) + y;
3053
3054 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3055 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3056 XSRETURN_EMPTY;
3057
3058 sv_setnv (draw_x_sv, draw_x);
3059 sv_setnv (draw_y_sv, draw_y);
3060
3061 glPushMatrix ();
3062 glTranslated (x, y, 0);
3063
3064 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3065 {
3066 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3067
3068 if (svp && SvTRUE (*svp))
3069 {
3070 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3071 glEnable (GL_BLEND);
3072 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3073 glBegin (GL_QUADS);
3074 glVertex2f (0, 0);
3075 glVertex2f (w, 0);
3076 glVertex2f (w, h);
3077 glVertex2f (0, h);
3078 glEnd ();
3079 glDisable (GL_BLEND);
3080 }
3081 }
3082#if 0
3083 // draw borders, for debugging
3084 glPushMatrix ();
3085 glColor4f (1., 1., 0., 1.);
3086 glTranslatef (.5, .5, 0.);
3087 glBegin (GL_LINE_LOOP);
3088 glVertex2f (0 , 0);
3089 glVertex2f (w - 1, 0);
3090 glVertex2f (w - 1, h - 1);
3091 glVertex2f (0 , h - 1);
3092 glEnd ();
3093 glPopMatrix ();
3094#endif
3095 PUSHMARK (SP);
3096 XPUSHs (self);
3097 PUTBACK;
3098 call_method ("_draw", G_VOID | G_DISCARD);
3099 SPAGAIN;
3100
3101 glPopMatrix ();
3102
3103 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3104 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3105}
3106

Diff Legend

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