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.196 by root, Sun Jul 15 21:02:20 2007 UTC vs.
Revision 1.266 by root, Sun Jul 20 02:51:40 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 ()
664 806
665char * 807char *
666SDL_GetKeyName (int sym) 808SDL_GetKeyName (int sym)
667 809
810int
811SDL_GetAppState ()
812
813int
814SDL_GetModState ()
815
668void 816void
669SDL_PollEvent () 817poll_events ()
670 PPCODE: 818 PPCODE:
671{ 819{
672 SDL_Event ev; 820 SDL_Event ev;
673 821
674 while (SDL_PollEvent (&ev)) 822 SDL_PumpEvents ();
823 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
675 { 824 {
676 HV *hv = newHV (); 825 HV *hv = newHV ();
677 hv_store (hv, "type", 4, newSViv (ev.type), 0); 826 hv_store (hv, "type", 4, newSViv (ev.type), 0);
678 827
679 switch (ev.type) 828 switch (ev.type)
680 { 829 {
681 case SDL_KEYDOWN: 830 case SDL_KEYDOWN:
682 case SDL_KEYUP: 831 case SDL_KEYUP:
683 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 832 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
684 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 833 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
685 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);
686 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 */
687 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 836 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
688 break; 837 break;
689 838
690 case SDL_ACTIVEEVENT: 839 case SDL_ACTIVEEVENT:
691 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 840 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
709 x = ev.motion.x; 858 x = ev.motion.x;
710 y = ev.motion.y; 859 y = ev.motion.y;
711 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 860 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
712 } 861 }
713 862
714 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 863 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
715 hv_store (hv, "state", 5, newSViv (state), 0); 864 hv_store (hv, "state", 5, newSViv (state), 0);
716 hv_store (hv, "x", 1, newSViv (x), 0); 865 hv_store (hv, "x", 1, newSViv (x), 0);
717 hv_store (hv, "y", 1, newSViv (y), 0); 866 hv_store (hv, "y", 1, newSViv (y), 0);
718 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 867 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
719 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 868 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
720 } 869 }
721 break; 870 break;
722 871
723 case SDL_MOUSEBUTTONDOWN: 872 case SDL_MOUSEBUTTONDOWN:
724 case SDL_MOUSEBUTTONUP: 873 case SDL_MOUSEBUTTONUP:
725 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 874 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
726 875
727 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 876 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
728 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 877 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
729 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 878 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
730 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 879 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
735 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 884 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
736 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 885 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
737 break; 886 break;
738 } 887 }
739 888
740 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))));
741 } 890 }
742} 891}
743 892
744int 893int
745Mix_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)
746 POSTCALL: 895 POSTCALL:
747 Mix_HookMusicFinished (music_finished); 896 Mix_HookMusicFinished (music_finished);
748 Mix_ChannelFinished (channel_finished); 897 Mix_ChannelFinished (channel_finished);
749 898
750void 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
751Mix_CloseAudio () 916Mix_CloseAudio ()
752 917
753int 918int
754Mix_AllocateChannels (int numchans = -1) 919Mix_AllocateChannels (int numchans = -1)
920
921const char *
922Mix_GetError ()
755 923
756void 924void
757lowdelay (int fd, int val = 1) 925lowdelay (int fd, int val = 1)
758 CODE: 926 CODE:
759 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 927 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
785 } 953 }
786 } 954 }
787#endif 955#endif
788} 956}
789 957
790void 958int
791add_font (char *file) 959add_font (char *file)
792 CODE: 960 CODE:
793 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 961 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
962 OUTPUT:
963 RETVAL
794 964
795void 965void
796load_image_inline (SV *image_) 966load_image_inline (SV *image_)
797 ALIAS: 967 ALIAS:
798 load_image_file = 1 968 load_image_file = 1
… …
801 STRLEN image_len; 971 STRLEN image_len;
802 char *image = (char *)SvPVbyte (image_, image_len); 972 char *image = (char *)SvPVbyte (image_, image_len);
803 SDL_Surface *surface, *surface2; 973 SDL_Surface *surface, *surface2;
804 SDL_PixelFormat fmt; 974 SDL_PixelFormat fmt;
805 SDL_RWops *rw = ix 975 SDL_RWops *rw = ix
806 ? SDL_RWFromFile (image, "r") 976 ? SDL_RWFromFile (image, "rb")
807 : SDL_RWFromConstMem (image, image_len); 977 : SDL_RWFromConstMem (image, image_len);
808 978
809 if (!rw) 979 if (!rw)
810 croak ("load_image: %s", SDL_GetError ()); 980 croak ("load_image: %s", SDL_GetError ());
811 981
… …
884void 1054void
885error (char *message) 1055error (char *message)
886 CODE: 1056 CODE:
887 fprintf (stderr, "ERROR: %s\n", message); 1057 fprintf (stderr, "ERROR: %s\n", message);
888#ifdef _WIN32 1058#ifdef _WIN32
889 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1059 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
890#endif 1060#endif
891 1061
892void 1062void
893fatal (char *message) 1063fatal (char *message)
894 CODE: 1064 CODE:
895 fprintf (stderr, "FATAL: %s\n", message); 1065 fprintf (stderr, "FATAL: %s\n", message);
896#ifdef _WIN32 1066#ifdef _WIN32
897 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1067 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
898#endif 1068#endif
899 _exit (1); 1069 _exit (1);
900 1070
901void 1071void
902_exit (int retval = 0) 1072_exit (int retval = 0)
… …
914#if DEBUG 1084#if DEBUG
915 VALGRIND_DO_LEAK_CHECK; 1085 VALGRIND_DO_LEAK_CHECK;
916#endif 1086#endif
917} 1087}
918 1088
919MODULE = CFPlus PACKAGE = CFPlus::Font 1089MODULE = Deliantra::Client PACKAGE = DC::Font
920 1090
921CFPlus::Font 1091PROTOTYPES: DISABLE
1092
1093DC::Font
922new_from_file (SV *class, char *path, int id = 0) 1094new_from_file (SV *class, char *path, int id = 0)
923 CODE: 1095 CODE:
924{ 1096{
925 int count; 1097 int count;
926 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1098 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
929} 1101}
930 OUTPUT: 1102 OUTPUT:
931 RETVAL 1103 RETVAL
932 1104
933void 1105void
934DESTROY (CFPlus::Font self) 1106DESTROY (DC::Font self)
935 CODE: 1107 CODE:
936 pango_font_description_free (self); 1108 pango_font_description_free (self);
937 1109
938void 1110void
939make_default (CFPlus::Font self) 1111make_default (DC::Font self)
1112 PROTOTYPE: $
940 CODE: 1113 CODE:
941 default_font = self; 1114 default_font = self;
942 1115
943MODULE = CFPlus PACKAGE = CFPlus::Layout 1116MODULE = Deliantra::Client PACKAGE = DC::Layout
944 1117
1118PROTOTYPES: DISABLE
1119
945void 1120void
946reset_glyph_cache () 1121glyph_cache_backup ()
1122 PROTOTYPE:
947 CODE: 1123 CODE:
1124 tc_backup ();
1125
1126void
1127glyph_cache_restore ()
1128 PROTOTYPE:
1129 CODE:
948 tc_clear (); 1130 tc_restore ();
949 1131
950CFPlus::Layout 1132DC::Layout
951new (SV *class) 1133new (SV *class)
952 CODE: 1134 CODE:
953 New (0, RETVAL, 1, struct cf_layout); 1135 New (0, RETVAL, 1, struct cf_layout);
954 1136
955 RETVAL->pl = pango_layout_new (opengl_context); 1137 RETVAL->pl = pango_layout_new (opengl_context);
… …
957 RETVAL->g = 1.; 1139 RETVAL->g = 1.;
958 RETVAL->b = 1.; 1140 RETVAL->b = 1.;
959 RETVAL->a = 1.; 1141 RETVAL->a = 1.;
960 RETVAL->base_height = MIN_FONT_HEIGHT; 1142 RETVAL->base_height = MIN_FONT_HEIGHT;
961 RETVAL->font = 0; 1143 RETVAL->font = 0;
1144 RETVAL->rc = rc_alloc ();
962 1145
963 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1146 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
964 layout_update_font (RETVAL); 1147 layout_update_font (RETVAL);
965 OUTPUT: 1148 OUTPUT:
966 RETVAL 1149 RETVAL
967 1150
968void 1151void
969DESTROY (CFPlus::Layout self) 1152DESTROY (DC::Layout self)
970 CODE: 1153 CODE:
971 g_object_unref (self->pl); 1154 g_object_unref (self->pl);
1155 rc_free (self->rc);
972 Safefree (self); 1156 Safefree (self);
973 1157
974void 1158void
975set_text (CFPlus::Layout self, SV *text_) 1159set_text (DC::Layout self, SV *text_)
976 CODE: 1160 CODE:
977{ 1161{
978 STRLEN textlen; 1162 STRLEN textlen;
979 char *text = SvPVutf8 (text_, textlen); 1163 char *text = SvPVutf8 (text_, textlen);
980 1164
981 pango_layout_set_text (self->pl, text, textlen); 1165 pango_layout_set_text (self->pl, text, textlen);
982} 1166}
983 1167
984void 1168void
985set_markup (CFPlus::Layout self, SV *text_) 1169set_markup (DC::Layout self, SV *text_)
986 CODE: 1170 CODE:
987{ 1171{
988 STRLEN textlen; 1172 STRLEN textlen;
989 char *text = SvPVutf8 (text_, textlen); 1173 char *text = SvPVutf8 (text_, textlen);
990 1174
991 pango_layout_set_markup (self->pl, text, textlen); 1175 pango_layout_set_markup (self->pl, text, textlen);
992} 1176}
993 1177
994void 1178void
995set_shapes (CFPlus::Layout self, ...) 1179set_shapes (DC::Layout self, ...)
996 CODE: 1180 CODE:
997{ 1181{
998 PangoAttrList *attrs = 0; 1182 PangoAttrList *attrs = 0;
999 const char *text = pango_layout_get_text (self->pl); 1183 const char *text = pango_layout_get_text (self->pl);
1000 const char *pos = text; 1184 const char *pos = text;
… …
1035 if (attrs) 1219 if (attrs)
1036 pango_layout_set_attributes (self->pl, attrs); 1220 pango_layout_set_attributes (self->pl, attrs);
1037} 1221}
1038 1222
1039void 1223void
1040get_shapes (CFPlus::Layout self) 1224get_shapes (DC::Layout self)
1041 PPCODE: 1225 PPCODE:
1042{ 1226{
1043 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1227 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1044 1228
1045 do 1229 do
1046 { 1230 {
1047 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1231 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1048 1232
1049 if (run && shape_attr_p (run)) 1233 if (run && shape_attr_p (run))
1050 { 1234 {
1051 PangoRectangle extents; 1235 PangoRectangle extents;
1052 pango_layout_iter_get_run_extents (iter, 0, &extents); 1236 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1060 1244
1061 pango_layout_iter_free (iter); 1245 pango_layout_iter_free (iter);
1062} 1246}
1063 1247
1064int 1248int
1065has_wrapped (CFPlus::Layout self) 1249has_wrapped (DC::Layout self)
1066 CODE: 1250 CODE:
1067{ 1251{
1068 int lines = 1; 1252 int lines = 1;
1069 const char *text = pango_layout_get_text (self->pl); 1253 const char *text = pango_layout_get_text (self->pl);
1070 1254
… …
1075} 1259}
1076 OUTPUT: 1260 OUTPUT:
1077 RETVAL 1261 RETVAL
1078 1262
1079SV * 1263SV *
1080get_text (CFPlus::Layout self) 1264get_text (DC::Layout self)
1081 CODE: 1265 CODE:
1082 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1266 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1083 sv_utf8_decode (RETVAL); 1267 sv_utf8_decode (RETVAL);
1084 OUTPUT: 1268 OUTPUT:
1085 RETVAL 1269 RETVAL
1086 1270
1087void 1271void
1088set_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.)
1089 CODE: 1273 CODE:
1090 self->r = r; 1274 self->r = r;
1091 self->g = g; 1275 self->g = g;
1092 self->b = b; 1276 self->b = b;
1093 self->a = a; 1277 self->a = a;
1094 1278
1095void 1279void
1096set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1280set_font (DC::Layout self, DC::Font font = 0)
1097 CODE: 1281 CODE:
1098 if (self->font != font) 1282 if (self->font != font)
1099 { 1283 {
1100 self->font = font; 1284 self->font = font;
1101 layout_update_font (self); 1285 layout_update_font (self);
1102 } 1286 }
1103 1287
1104void 1288void
1105set_height (CFPlus::Layout self, int base_height) 1289set_height (DC::Layout self, int base_height)
1106 CODE: 1290 CODE:
1107 if (self->base_height != base_height) 1291 if (self->base_height != base_height)
1108 { 1292 {
1109 self->base_height = base_height; 1293 self->base_height = base_height;
1110 layout_update_font (self); 1294 layout_update_font (self);
1111 } 1295 }
1112 1296
1113void 1297void
1114set_width (CFPlus::Layout self, int max_width = -1) 1298set_width (DC::Layout self, int max_width = -1)
1115 CODE: 1299 CODE:
1116 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);
1117 1301
1118void 1302void
1119set_indent (CFPlus::Layout self, int indent) 1303set_indent (DC::Layout self, int indent)
1120 CODE: 1304 CODE:
1121 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1305 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1122 1306
1123void 1307void
1124set_spacing (CFPlus::Layout self, int spacing) 1308set_spacing (DC::Layout self, int spacing)
1125 CODE: 1309 CODE:
1126 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1310 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1127 1311
1128void 1312void
1129set_ellipsise (CFPlus::Layout self, int ellipsise) 1313set_ellipsise (DC::Layout self, int ellipsise)
1130 CODE: 1314 CODE:
1131 pango_layout_set_ellipsize (self->pl, 1315 pango_layout_set_ellipsize (self->pl,
1132 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1316 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1133 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1317 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1134 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1318 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1135 : PANGO_ELLIPSIZE_NONE 1319 : PANGO_ELLIPSIZE_NONE
1136 ); 1320 );
1137 1321
1138void 1322void
1139set_single_paragraph_mode (CFPlus::Layout self, int spm) 1323set_single_paragraph_mode (DC::Layout self, int spm)
1140 CODE: 1324 CODE:
1141 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1325 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1142 1326
1143void 1327void
1144size (CFPlus::Layout self) 1328size (DC::Layout self)
1145 PPCODE: 1329 PPCODE:
1146{ 1330{
1147 int w, h; 1331 int w, h;
1148 1332
1149 layout_get_pixel_size (self, &w, &h); 1333 layout_get_pixel_size (self, &w, &h);
… …
1152 PUSHs (sv_2mortal (newSViv (w))); 1336 PUSHs (sv_2mortal (newSViv (w)));
1153 PUSHs (sv_2mortal (newSViv (h))); 1337 PUSHs (sv_2mortal (newSViv (h)));
1154} 1338}
1155 1339
1156int 1340int
1157descent (CFPlus::Layout self) 1341descent (DC::Layout self)
1158 CODE: 1342 CODE:
1159{ 1343{
1160 PangoRectangle rect; 1344 PangoRectangle rect;
1161 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1345 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1162 pango_layout_line_get_pixel_extents (line, 0, &rect); 1346 pango_layout_line_get_pixel_extents (line, 0, &rect);
1163 RETVAL = PANGO_DESCENT (rect); 1347 RETVAL = PANGO_DESCENT (rect);
1164} 1348}
1165 OUTPUT: 1349 OUTPUT:
1166 RETVAL 1350 RETVAL
1167 1351
1168int 1352int
1169xy_to_index (CFPlus::Layout self, int x, int y) 1353xy_to_index (DC::Layout self, int x, int y)
1170 CODE: 1354 CODE:
1171{ 1355{
1172 int index, trailing; 1356 int index, trailing;
1173 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);
1174 RETVAL = index + trailing; 1358 RETVAL = index + trailing;
1175} 1359}
1176 OUTPUT: 1360 OUTPUT:
1177 RETVAL 1361 RETVAL
1178 1362
1179void 1363void
1180cursor_pos (CFPlus::Layout self, int index) 1364cursor_pos (DC::Layout self, int index)
1181 PPCODE: 1365 PPCODE:
1182{ 1366{
1183 PangoRectangle strong_pos; 1367 PangoRectangle pos;
1184 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1368 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1185 1369
1186 EXTEND (SP, 3); 1370 EXTEND (SP, 3);
1187 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1371 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1188 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1372 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1189 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1373 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1190} 1374}
1191 1375
1192void 1376void
1193index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1377index_to_line_x (DC::Layout self, int index, int trailing = 0)
1194 PPCODE: 1378 PPCODE:
1195{ 1379{
1196 int line, x; 1380 int line, x;
1197 1381
1198 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)
1199 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1384 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1200 1385 --line;
1386#endif
1201 EXTEND (SP, 2); 1387 EXTEND (SP, 2);
1202 PUSHs (sv_2mortal (newSViv (line - 1))); 1388 PUSHs (sv_2mortal (newSViv (line)));
1203 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1389 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1204} 1390}
1205 1391
1206void 1392void
1207line_x_to_index (CFPlus::Layout self, int line, int x) 1393line_x_to_index (DC::Layout self, int line, int x)
1208 PPCODE: 1394 PPCODE:
1209{ 1395{
1210 PangoLayoutLine *lp; 1396 PangoLayoutLine *lp;
1211 int index, trailing; 1397 int index, trailing;
1212 1398
1213 if (line < 0) 1399 if (line < 0)
1214 XSRETURN_EMPTY; 1400 XSRETURN_EMPTY;
1215 1401
1216 if (!(lp = pango_layout_get_line (self->pl, line))) 1402 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1217 XSRETURN_EMPTY; /* do better */ 1403 XSRETURN_EMPTY; /* do better */
1218 1404
1219 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);
1220 1406
1221 EXTEND (SP, 2); 1407 EXTEND (SP, 2);
… …
1227 PUSHs (sv_2mortal (newSViv (trailing))); 1413 PUSHs (sv_2mortal (newSViv (trailing)));
1228 } 1414 }
1229} 1415}
1230 1416
1231void 1417void
1232render (CFPlus::Layout self, float x, float y, int flags = 0) 1418render (DC::Layout self, float x, float y, int flags = 0)
1233 PPCODE: 1419 CODE:
1420 rc_clear (self->rc);
1234 pango_opengl_render_layout_subpixel ( 1421 pango_opengl_render_layout_subpixel (
1235 self->pl, 1422 self->pl,
1423 self->rc,
1236 x * PANGO_SCALE, y * PANGO_SCALE, 1424 x * PANGO_SCALE, y * PANGO_SCALE,
1237 self->r, self->g, self->b, self->a, 1425 self->r, self->g, self->b, self->a,
1238 flags 1426 flags
1239 ); 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);
1240 1431
1241MODULE = CFPlus PACKAGE = CFPlus::Texture
1242
1243void 1432void
1244pad2pot (SV *data_, SV *w_, SV *h_) 1433draw (DC::Layout self)
1245 CODE: 1434 CODE:
1246{ 1435{
1247 int ow = SvIV (w_); 1436 glEnable (GL_TEXTURE_2D);
1248 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);
1249 1443
1250 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_))
1251 { 1460 {
1252 int nw = minpot (ow);
1253 int nh = minpot (oh);
1254
1255 if (nw != ow || nh != oh)
1256 {
1257 if (SvOK (data_))
1258 {
1259 STRLEN datalen; 1461 STRLEN datalen;
1260 char *data = SvPVbyte (data_, datalen); 1462 char *data = SvPVbyte (data_, datalen);
1261 int bpp = datalen / (ow * oh); 1463 int bpp = datalen / (ow * oh);
1262 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1464 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1263 1465
1264 SvPOK_only (result_); 1466 SvPOK_only (result_);
1265 SvCUR_set (result_, nw * nh * bpp); 1467 SvCUR_set (result_, nw * nh * bpp);
1266 1468
1267 memset (SvPVX (result_), 0, nw * nh * bpp); 1469 memset (SvPVX (result_), 0, nw * nh * bpp);
1268 while (oh--) 1470 while (oh--)
1269 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);
1270 1472
1271 sv_setsv (data_, result_); 1473 sv_setsv (data_, result_);
1272 }
1273
1274 sv_setiv (w_, nw);
1275 sv_setiv (h_, nh);
1276 }
1277 } 1474 }
1278} 1475}
1279 1476
1280void 1477void
1281draw_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.)
… …
1287{ 1484{
1288 HV *hv = (HV *)SvRV (self); 1485 HV *hv = (HV *)SvRV (self);
1289 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1486 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1290 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1487 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1291 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;
1292 1492
1293 if (items < 5) 1493 if (items < 5)
1294 { 1494 {
1295 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1495 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1296 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1496 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1324 glDisable (GL_ALPHA_TEST); 1524 glDisable (GL_ALPHA_TEST);
1325 glDisable (GL_BLEND); 1525 glDisable (GL_BLEND);
1326 } 1526 }
1327} 1527}
1328 1528
1329MODULE = CFPlus PACKAGE = CFPlus::Map 1529IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1530 CODE:
1531{
1532 GLint width;
1533 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1534 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1535 RETVAL = width > 0;
1536}
1537 OUTPUT:
1538 RETVAL
1330 1539
1331CFPlus::Map 1540MODULE = Deliantra::Client PACKAGE = DC::Map
1541
1542PROTOTYPES: DISABLE
1543
1544DC::Map
1332new (SV *class) 1545new (SV *class)
1333 CODE: 1546 CODE:
1334 New (0, RETVAL, 1, struct map); 1547 New (0, RETVAL, 1, struct map);
1335 RETVAL->x = 0; 1548 RETVAL->x = 0;
1336 RETVAL->y = 0; 1549 RETVAL->y = 0;
… …
1344 RETVAL->row = 0; 1557 RETVAL->row = 0;
1345 OUTPUT: 1558 OUTPUT:
1346 RETVAL 1559 RETVAL
1347 1560
1348void 1561void
1349DESTROY (CFPlus::Map self) 1562DESTROY (DC::Map self)
1350 CODE: 1563 CODE:
1351{ 1564{
1352 map_clear (self); 1565 map_clear (self);
1353 Safefree (self->face2tile); 1566 Safefree (self->face2tile);
1354 Safefree (self->tex); 1567 Safefree (self->tex);
1355 Safefree (self); 1568 Safefree (self);
1356} 1569}
1357 1570
1358void 1571void
1359resize (CFPlus::Map self, int map_width, int map_height) 1572resize (DC::Map self, int map_width, int map_height)
1360 CODE: 1573 CODE:
1361 self->w = map_width; 1574 self->w = map_width;
1362 self->h = map_height; 1575 self->h = map_height;
1363 1576
1364void 1577void
1365clear (CFPlus::Map self) 1578clear (DC::Map self)
1366 CODE: 1579 CODE:
1367 map_clear (self); 1580 map_clear (self);
1368 1581
1369void 1582void
1370set_tileid (CFPlus::Map self, int face, int tile) 1583set_tileid (DC::Map self, int face, int tile)
1371 CODE: 1584 CODE:
1372{ 1585{
1373 need_facenum (self, face); self->face2tile [face] = tile; 1586 need_facenum (self, face); self->face2tile [face] = tile;
1374 need_texid (self, tile); 1587 need_texid (self, tile);
1375} 1588}
1376 1589
1377void 1590void
1378set_smooth (CFPlus::Map self, int face, int smooth, int level) 1591set_smooth (DC::Map self, int face, int smooth, int level)
1379 CODE: 1592 CODE:
1380{ 1593{
1381 tileid texid; 1594 tileid texid;
1382 maptex *tex; 1595 maptex *tex;
1383 1596
… …
1396 tex->smoothtile = self->face2tile [smooth]; 1609 tex->smoothtile = self->face2tile [smooth];
1397 tex->smoothlevel = level; 1610 tex->smoothlevel = level;
1398} 1611}
1399 1612
1400void 1613void
1401set_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)
1402 CODE: 1615 CODE:
1403{ 1616{
1404 need_texid (self, texid); 1617 need_texid (self, texid);
1405 1618
1406 { 1619 {
… …
1426 // from transparent color bleeding and ugly wrapping effects. 1639 // from transparent color bleeding and ugly wrapping effects.
1427 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1640 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1428} 1641}
1429 1642
1430int 1643int
1431ox (CFPlus::Map self) 1644ox (DC::Map self)
1432 ALIAS: 1645 ALIAS:
1433 oy = 1 1646 oy = 1
1434 x = 2 1647 x = 2
1435 y = 3 1648 y = 3
1436 w = 4 1649 w = 4
… …
1447 } 1660 }
1448 OUTPUT: 1661 OUTPUT:
1449 RETVAL 1662 RETVAL
1450 1663
1451void 1664void
1452scroll (CFPlus::Map self, int dx, int dy) 1665scroll (DC::Map self, int dx, int dy)
1453 CODE: 1666 CODE:
1454{ 1667{
1455 if (dx > 0) 1668 if (dx > 0)
1456 map_blank (self, self->x, self->y, dx, self->h); 1669 map_blank (self, self->x, self->y, dx, self->h);
1457 else if (dx < 0) 1670 else if (dx < 0)
… …
1472 self->rows += MAP_EXTEND_Y; 1685 self->rows += MAP_EXTEND_Y;
1473 self->y += MAP_EXTEND_Y; 1686 self->y += MAP_EXTEND_Y;
1474 } 1687 }
1475} 1688}
1476 1689
1477void 1690SV *
1478map1a_update (CFPlus::Map self, SV *data_, int extmap) 1691map1a_update (DC::Map self, SV *data_, int extmap)
1479 CODE: 1692 CODE:
1480{ 1693{
1481 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1694 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1482 uint8_t *data_end = (uint8_t *)SvEND (data_); 1695 uint8_t *data_end = (uint8_t *)SvEND (data_);
1483 mapcell *cell; 1696 mapcell *cell;
1484 int x, y, flags; 1697 int x, y, z, flags;
1698 AV *missing = newAV ();
1699 RETVAL = newRV_noinc ((SV *)missing);
1485 1700
1486 while (data < data_end - 1) 1701 while (data < data_end - 1)
1487 { 1702 {
1488 flags = (data [0] << 8) + data [1]; data += 2; 1703 flags = (data [0] << 8) + data [1]; data += 2;
1489 1704
… …
1509 uint8_t ext, cmd; 1724 uint8_t ext, cmd;
1510 1725
1511 do 1726 do
1512 { 1727 {
1513 ext = *data++; 1728 ext = *data++;
1514 cmd = ext & 0x3f; 1729 cmd = ext & 0x7f;
1515 1730
1516 if (cmd < 4) 1731 if (cmd < 4)
1517 cell->darkness = 255 - ext * 64 + 1; 1732 cell->darkness = 255 - ext * 64 + 1;
1518 else if (cmd == 5) // health 1733 else if (cmd == 5) // health
1519 { 1734 {
… …
1522 } 1737 }
1523 else if (cmd == 6) // monster width 1738 else if (cmd == 6) // monster width
1524 cell->stat_width = *data++ + 1; 1739 cell->stat_width = *data++ + 1;
1525 else if (cmd == 0x47) 1740 else if (cmd == 0x47)
1526 { 1741 {
1527 if (*data == 4) 1742 if (*data == 1) cell->player = data [1];
1528 ; // 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);
1529 1746
1530 data += *data + 1; 1747 data += *data + 1;
1531 } 1748 }
1532 else if (cmd == 8) // cell flags 1749 else if (cmd == 8) // cell flags
1533 cell->flags = *data++; 1750 cell->flags = *data++;
… …
1540 } 1757 }
1541 else 1758 else
1542 cell->darkness = *data++ + 1; 1759 cell->darkness = *data++ + 1;
1543 } 1760 }
1544 1761
1762 for (z = 0; z <= 2; ++z)
1545 if (flags & 4) 1763 if (flags & (4 >> z))
1546 { 1764 {
1547 faceid face = (data [0] << 8) + data [1]; data += 2; 1765 faceid face = (data [0] << 8) + data [1]; data += 2;
1548 need_facenum (self, face); 1766 need_facenum (self, face);
1549 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 }
1550 } 1782 }
1551
1552 if (flags & 2)
1553 {
1554 faceid face = (data [0] << 8) + data [1]; data += 2;
1555 need_facenum (self, face);
1556 cell->tile [1] = self->face2tile [face];
1557 }
1558
1559 if (flags & 1)
1560 {
1561 faceid face = (data [0] << 8) + data [1]; data += 2;
1562 need_facenum (self, face);
1563 cell->tile [2] = self->face2tile [face];
1564 }
1565 } 1783 }
1566 else 1784 else
1785 {
1567 cell->darkness = 0; 1786 cell->darkness = 0;
1787 cell->stat_hp = 0;
1788 cell->flags = 0;
1789 cell->player = 0;
1790 }
1568 } 1791 }
1569} 1792}
1793 OUTPUT:
1794 RETVAL
1570 1795
1571SV * 1796SV *
1572mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1797mapmap (DC::Map self, int x0, int y0, int w, int h)
1573 CODE: 1798 CODE:
1574{ 1799{
1575 int x1, x; 1800 int x1, x;
1576 int y1, y; 1801 int y1, y;
1577 int z; 1802 int z;
… …
1622} 1847}
1623 OUTPUT: 1848 OUTPUT:
1624 RETVAL 1849 RETVAL
1625 1850
1626void 1851void
1627draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1852draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1628 CODE: 1853 CODE:
1629{ 1854{
1855 int x, y, z;
1856
1630 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1857 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1631 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1858 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1632 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1859 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1633 smooth_key skey; 1860 smooth_key skey;
1634 int x, y, z; 1861 int pl_x, pl_y;
1635 int last_name; 1862 maptex pl_tex;
1863 rc_t *rc = rc_alloc ();
1864 rc_key_t key;
1865 rc_array_t *arr;
1866
1867 pl_tex.name = 0;
1636 1868
1637 // thats current max. sorry. 1869 // thats current max. sorry.
1638 if (sw > 255) sw = 255; 1870 if (sw > 255) sw = 255;
1639 if (sh > 255) sh = 255; 1871 if (sh > 255) sh = 255;
1640 1872
1641 // clear key, in case of extra padding 1873 // clear key, in case of extra padding
1642 memset (&skey, 0, sizeof (skey)); 1874 memset (&skey, 0, sizeof (skey));
1643 1875
1644 glColor4ub (255, 255, 255, 255); 1876 memset (&key, 0, sizeof (key));
1645 1877 key.r = 255;
1646 glEnable (GL_BLEND); 1878 key.g = 255;
1647 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1879 key.b = 255;
1648 glEnable (GL_TEXTURE_2D); 1880 key.a = 255;
1649 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1881 key.mode = GL_QUADS;
1650 1882 key.format = GL_T2F_V3F;
1651 glBegin (GL_QUADS); 1883 key.texname = -1;
1652
1653 last_name = 0;
1654 1884
1655 mx += self->x; 1885 mx += self->x;
1656 my += self->y; 1886 my += self->y;
1657 1887
1658 // first pass: determine smooth_max 1888 // first pass: determine smooth_max
… …
1674 MAX (self->tex [cell->tile [0]].smoothlevel, 1904 MAX (self->tex [cell->tile [0]].smoothlevel,
1675 MAX (self->tex [cell->tile [1]].smoothlevel, 1905 MAX (self->tex [cell->tile [1]].smoothlevel,
1676 self->tex [cell->tile [2]].smoothlevel)); 1906 self->tex [cell->tile [2]].smoothlevel));
1677 } 1907 }
1678 } 1908 }
1909
1910 glEnable (GL_BLEND);
1911 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1912 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1679 1913
1680 for (z = 0; z <= 2; z++) 1914 for (z = 0; z <= 2; z++)
1681 { 1915 {
1682 memset (smooth_level, 0, sizeof (smooth_level)); 1916 memset (smooth_level, 0, sizeof (smooth_level));
1683 1917
… …
1696 { 1930 {
1697 maptex tex = self->tex [tile]; 1931 maptex tex = self->tex [tile];
1698 int px = (x + 1) * T - tex.w; 1932 int px = (x + 1) * T - tex.w;
1699 int py = (y + 1) * T - tex.h; 1933 int py = (y + 1) * T - tex.h;
1700 1934
1701 // suppressing texture state switches here
1702 // is only moderately effective, but worth the extra effort
1703 if (last_name != tex.name) 1935 if (key.texname != tex.name)
1704 { 1936 {
1705 if (!tex.name) 1937 if (!tex.name)
1706 tex = self->tex [2]; /* missing, replace by noface */ 1938 tex = self->tex [2]; /* missing, replace by noface */
1707 1939
1708 glEnd (); 1940 key.texname = tex.name;
1709 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1941 arr = rc_array (rc, &key);
1710 glBegin (GL_QUADS);
1711 } 1942 }
1712 1943
1713 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1944 if (expect_false (cell->player == player) && expect_false (z == 2))
1714 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1715 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1716 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1717
1718 if (cell->flags && z == 2)
1719 { 1945 {
1946 pl_x = px;
1947 pl_y = py;
1948 pl_tex = tex;
1949 continue;
1950 }
1951
1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1953 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1954 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1955 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1956
1957 if (expect_false (cell->flags) && expect_false (z == 2))
1958 {
1959 // overlays such as the speech bubble, probably more to come
1720 if (cell->flags & 1) 1960 if (cell->flags & 1)
1721 { 1961 {
1722 maptex tex = self->tex [1]; 1962 maptex tex = self->tex [1];
1723 int px = x * T + T * 2 / 32; 1963 int px = x * T + T * 2 / 32;
1724 int py = y * T - T * 6 / 32; 1964 int py = y * T - T * 6 / 32;
1725 1965
1966 if (tex.name)
1726 glEnd (); 1967 {
1727 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1968 if (key.texname != tex.name)
1969 {
1970 key.texname = tex.name;
1971 arr = rc_array (rc, &key);
1972 }
1973
1974 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1975 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1976 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1977 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1728 glBegin (GL_QUADS); 1978 }
1729
1730 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1731 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1732 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1733 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1734 } 1979 }
1735 } 1980 }
1736 1981
1737 // update smooth hash 1982 // update smooth hash
1738 if (tex.smoothtile) 1983 if (tex.smoothtile)
… …
1774 } 2019 }
1775 } 2020 }
1776 } 2021 }
1777 } 2022 }
1778 2023
2024 rc_draw (rc);
2025 rc_clear (rc);
2026
1779 // go through all smoothlevels, lowest to highest, then draw. 2027 // go through all smoothlevels, lowest to highest, then draw.
1780 // this is basically counting sort 2028 // this is basically counting sort
1781 { 2029 {
1782 int w, b; 2030 int w, b;
1783 2031
2032 glEnable (GL_TEXTURE_2D);
2033 glBegin (GL_QUADS);
1784 for (w = 0; w < 256 / 32; ++w) 2034 for (w = 0; w < 256 / 32; ++w)
1785 { 2035 {
1786 uint32_t smask = smooth_level [w]; 2036 uint32_t smask = smooth_level [w];
1787 if (smask) 2037 if (smask)
1788 for (b = 0; b < 32; ++b) 2038 for (b = 0; b < 32; ++b)
… …
1807 int border = bits & 15; 2057 int border = bits & 15;
1808 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2058 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1809 float dx = tex.s * .0625f; // 16 images/row 2059 float dx = tex.s * .0625f; // 16 images/row
1810 float dy = tex.t * .5f ; // 2 images/column 2060 float dy = tex.t * .5f ; // 2 images/column
1811 2061
1812 // this time naively avoiding texture state changes
1813 // save gobs of state changes.
1814 if (last_name != tex.name) 2062 if (tex.name)
1815 { 2063 {
2064 // this time avoiding texture state changes
2065 // save gobs of state changes.
1816 if (!tex.name) 2066 if (key.texname != tex.name)
1817 continue; // smoothing not yet available 2067 {
1818
1819 glEnd (); 2068 glEnd ();
1820 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2069 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1821 glBegin (GL_QUADS); 2070 glBegin (GL_QUADS);
1822 } 2071 }
1823 2072
1824 if (border) 2073 if (border)
1825 { 2074 {
1826 float ox = border * dx; 2075 float ox = border * dx;
1827 2076
1828 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2077 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1829 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2078 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1830 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2079 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1831 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2080 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1832 } 2081 }
1833 2082
1834 if (corner) 2083 if (corner)
1835 { 2084 {
1836 float ox = corner * dx; 2085 float ox = corner * dx;
1837 2086
1838 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2087 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1839 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2088 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1840 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2089 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1841 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2090 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2091 }
1842 } 2092 }
1843 } 2093 }
1844 } 2094 }
1845 } 2095 }
1846 } 2096 }
2097
2098 glEnd ();
2099 glDisable (GL_TEXTURE_2D);
2100 key.texname = -1;
1847 } 2101 }
1848 2102
1849 hv_clear (smooth); 2103 hv_clear (smooth);
1850 } 2104 }
1851 2105
1852 glEnd (); 2106 if (pl_tex.name)
2107 {
2108 maptex tex = pl_tex;
2109 int px = pl_x + sdx;
2110 int py = pl_y + sdy;
1853 2111
1854 glDisable (GL_TEXTURE_2D); 2112 key.texname = tex.name;
2113 arr = rc_array (rc, &key);
2114
2115 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2116 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2117 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2118 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2119
2120 rc_draw (rc);
2121 }
2122
1855 glDisable (GL_BLEND); 2123 glDisable (GL_BLEND);
2124 rc_free (rc);
1856 2125
1857 // top layer: overlays such as the health bar 2126 // top layer: overlays such as the health bar
1858 for (y = 0; y < sh; y++) 2127 for (y = 0; y < sh; y++)
1859 if (0 <= y + my && y + my < self->rows) 2128 if (0 <= y + my && y + my < self->rows)
1860 { 2129 {
… …
1885 } 2154 }
1886 } 2155 }
1887} 2156}
1888 2157
1889void 2158void
1890draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2159draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1891 CODE: 2160 CODE:
1892{ 2161{
1893 static float color[16][3] = { 2162 static float color[16][3] = {
1894 { 0.00F, 0.00F, 0.00F }, 2163 { 0.00F, 0.00F, 0.00F },
1895 { 1.00F, 1.00F, 1.00F }, 2164 { 1.00F, 1.00F, 1.00F },
… …
1945 glDisable (GL_BLEND); 2214 glDisable (GL_BLEND);
1946 glDisable (GL_TEXTURE_2D); 2215 glDisable (GL_TEXTURE_2D);
1947} 2216}
1948 2217
1949void 2218void
1950fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2219fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1951 PPCODE: 2220 PPCODE:
1952{ 2221{
1953 int x, y; 2222 int x, y;
2223 int sw1 = sw + 2;
2224 int sh1 = sh + 2;
2225 int sh3 = sh * 3;
1954 int sw4 = (sw + 3) & ~3; 2226 int sw34 = (sw * 3 + 3) & ~3;
2227 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1955 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2228 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1956 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2229 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1957 2230
1958 memset (darkness, 255, sw4 * sh);
1959 SvPOK_only (darkness_sv); 2231 SvPOK_only (darkness3_sv);
1960 SvCUR_set (darkness_sv, sw4 * sh); 2232 SvCUR_set (darkness3_sv, sw34 * sh3);
1961 2233
1962 mx += self->x; 2234 mx += self->x - 1;
1963 my += self->y; 2235 my += self->y - 1;
1964 2236
2237 memset (darkness1, 255, sw1 * sh1);
2238
1965 for (y = 0; y < sh; y++) 2239 for (y = 0; y < sh1; y++)
1966 if (0 <= y + my && y + my < self->rows) 2240 if (0 <= y + my && y + my < self->rows)
1967 { 2241 {
1968 maprow *row = self->row + (y + my); 2242 maprow *row = self->row + (y + my);
1969 2243
1970 for (x = 0; x < sw; x++) 2244 for (x = 0; x < sw1; x++)
1971 if (row->c0 <= x + mx && x + mx < row->c1) 2245 if (row->c0 <= x + mx && x + mx < row->c1)
1972 { 2246 {
1973 mapcell *cell = row->col + (x + mx - row->c0); 2247 mapcell *cell = row->col + (x + mx - row->c0);
1974 2248
1975 darkness[y * sw4 + x] = cell->darkness 2249 darkness1 [y * sw1 + x] = cell->darkness
1976 ? 255 - (cell->darkness - 1) 2250 ? 255 - (cell->darkness - 1)
1977 : 255 - FOW_DARKNESS; 2251 : 255 - FOW_DARKNESS;
1978 } 2252 }
1979 } 2253 }
1980 2254
2255 for (y = 0; y < sh; ++y)
2256 for (x = 0; x < sw; ++x)
2257 {
2258 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2259 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2260 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2261 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2262 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2263 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2264 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2265 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2266 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2267
2268 uint8_t r11 = (d11 + d21 + d12) / 3;
2269 uint8_t r21 = d21;
2270 uint8_t r31 = (d21 + d31 + d32) / 3;
2271
2272 uint8_t r12 = d12;
2273 uint8_t r22 = d22;
2274 uint8_t r32 = d32;
2275
2276 uint8_t r13 = (d13 + d23 + d12) / 3;
2277 uint8_t r23 = d23;
2278 uint8_t r33 = (d23 + d33 + d32) / 3;
2279
2280 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2281 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2282 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2283 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2284 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2286 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2287 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2289 }
2290
2291 free (darkness1);
2292
1981 EXTEND (SP, 3); 2293 EXTEND (SP, 3);
1982 PUSHs (sv_2mortal (newSViv (sw4))); 2294 PUSHs (sv_2mortal (newSViv (sw34)));
1983 PUSHs (sv_2mortal (newSViv (sh))); 2295 PUSHs (sv_2mortal (newSViv (sh3)));
1984 PUSHs (darkness_sv); 2296 PUSHs (darkness3_sv);
1985} 2297}
1986 2298
1987SV * 2299SV *
1988get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2300get_rect (DC::Map self, int x0, int y0, int w, int h)
1989 CODE: 2301 CODE:
1990{ 2302{
1991 int x, y, x1, y1; 2303 int x, y, x1, y1;
1992 SV *data_sv = newSV (w * h * 7 + 5); 2304 SV *data_sv = newSV (w * h * 7 + 5);
1993 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2305 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2050 else 2362 else
2051 *data++ = 0; 2363 *data++ = 0;
2052 } 2364 }
2053 } 2365 }
2054 2366
2367 /* if size is w*h + 5 then no data has been found */
2368 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2369 {
2055 SvPOK_only (data_sv); 2370 SvPOK_only (data_sv);
2056 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2371 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2372 }
2373
2057 RETVAL = data_sv; 2374 RETVAL = data_sv;
2058} 2375}
2059 OUTPUT: 2376 OUTPUT:
2060 RETVAL 2377 RETVAL
2061 2378
2062void 2379void
2063set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2380set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2064 PPCODE: 2381 PPCODE:
2065{ 2382{
2066 int x, y, z; 2383 int x, y, z;
2067 int w, h; 2384 int w, h;
2068 int x1, y1; 2385 int x1, y1;
2386 STRLEN len;
2387 uint8_t *data, *end;
2388
2389 len = SvLEN (data_sv);
2390 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2391 data = SvPVbyte_nolen (data_sv);
2392 end = data + len + 8;
2393
2394 if (len < 5)
2395 XSRETURN_EMPTY;
2069 2396
2070 if (*data++ != 0) 2397 if (*data++ != 0)
2071 return; /* version mismatch */ 2398 XSRETURN_EMPTY; /* version mismatch */
2072 2399
2073 w = *data++ << 8; w |= *data++; 2400 w = *data++ << 8; w |= *data++;
2074 h = *data++ << 8; h |= *data++; 2401 h = *data++ << 8; h |= *data++;
2075 2402
2076 // we need to do this 'cause we don't keep an absolute coord system for rows 2403 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2088 { 2415 {
2089 maprow *row = map_get_row (self, y); 2416 maprow *row = map_get_row (self, y);
2090 2417
2091 for (x = x0; x < x1; x++) 2418 for (x = x0; x < x1; x++)
2092 { 2419 {
2420 uint8_t flags;
2421
2422 if (data + 7 >= end)
2423 XSRETURN_EMPTY;
2424
2093 uint8_t flags = *data++; 2425 flags = *data++;
2094 2426
2095 if (flags) 2427 if (flags)
2096 { 2428 {
2097 mapcell *cell = row_get_cell (row, x); 2429 mapcell *cell = row_get_cell (row, x);
2098 tileid tile[3] = { 0, 0, 0 }; 2430 tileid tile[3] = { 0, 0, 0 };
… …
2101 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2433 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2102 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2434 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2103 2435
2104 if (cell->darkness == 0) 2436 if (cell->darkness == 0)
2105 { 2437 {
2106 cell->darkness = 0; 2438 /*cell->darkness = 0;*/
2439 EXTEND (SP, 3);
2107 2440
2108 for (z = 0; z <= 2; z++) 2441 for (z = 0; z <= 2; z++)
2109 { 2442 {
2110 tileid t = tile [z]; 2443 tileid t = tile [z];
2111 2444
2112 if (t >= self->texs || (t && !self->tex [t].name)) 2445 if (t >= self->texs || (t && !self->tex [t].name))
2113 { 2446 {
2114 XPUSHs (sv_2mortal (newSViv (t))); 2447 PUSHs (sv_2mortal (newSViv (t)));
2115 need_texid (self, t); 2448 need_texid (self, t);
2116 } 2449 }
2117 2450
2118 cell->tile [z] = t; 2451 cell->tile [z] = t;
2119 } 2452 }
… …
2121 } 2454 }
2122 } 2455 }
2123 } 2456 }
2124} 2457}
2125 2458
2126MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2459MODULE = Deliantra::Client PACKAGE = DC::RW
2127 2460
2128CFPlus::MixChunk 2461DC::RW
2129new_from_file (SV *class, char *path) 2462new (SV *class, SV *data_sv)
2130 CODE: 2463 CODE:
2131 RETVAL = Mix_LoadWAV (path); 2464{
2465 STRLEN datalen;
2466 char *data = SvPVbyte (data_sv, datalen);
2467
2468 RETVAL = SDL_RWFromConstMem (data, datalen);
2469}
2132 OUTPUT: 2470 OUTPUT:
2133 RETVAL 2471 RETVAL
2134 2472
2473DC::RW
2474new_from_file (SV *class, const char *path, const char *mode = "rb")
2475 CODE:
2476 RETVAL = SDL_RWFromFile (path, mode);
2477 OUTPUT:
2478 RETVAL
2479
2480# fails on win32:
2481# dc.xs(2268) : error C2059: syntax error : '('
2135void 2482#void
2483#close (DC::RW self)
2484# CODE:
2485# (self->(close)) (self);
2486
2487MODULE = Deliantra::Client PACKAGE = DC::Channel
2488
2489PROTOTYPES: DISABLE
2490
2491DC::Channel
2492find ()
2493 CODE:
2494{
2495 RETVAL = Mix_GroupAvailable (-1);
2496
2497 if (RETVAL < 0)
2498 {
2499 RETVAL = Mix_GroupOldest (-1);
2500
2501 if (RETVAL < 0)
2502 XSRETURN_UNDEF;
2503
2504 Mix_HaltChannel (RETVAL);
2505 }
2506
2507 Mix_UnregisterAllEffects (RETVAL);
2508 Mix_Volume (RETVAL, 128);
2509}
2510 OUTPUT:
2511 RETVAL
2512
2513void
2514halt (DC::Channel self)
2515 CODE:
2516 Mix_HaltChannel (self);
2517
2518void
2519expire (DC::Channel self, int ticks = -1)
2520 CODE:
2521 Mix_ExpireChannel (self, ticks);
2522
2523void
2524fade_out (DC::Channel self, int ticks = -1)
2525 CODE:
2526 Mix_FadeOutChannel (self, ticks);
2527
2528int
2529volume (DC::Channel self, int volume)
2530 CODE:
2531 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2532 OUTPUT:
2533 RETVAL
2534
2535void
2536unregister_all_effects (DC::Channel self)
2537 CODE:
2538 Mix_UnregisterAllEffects (self);
2539
2540void
2541set_panning (DC::Channel self, int left, int right)
2542 CODE:
2543 left = CLAMP (left , 0, 255);
2544 right = CLAMP (right, 0, 255);
2545 Mix_SetPanning (self, left, right);
2546
2547void
2548set_distance (DC::Channel self, int distance)
2549 CODE:
2550 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2551
2552void
2553set_position (DC::Channel self, int angle, int distance)
2554 CODE:
2555
2556void
2557set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2558 CODE:
2559{
2560 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2561 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2562 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2563}
2564
2565void
2566set_reverse_stereo (DC::Channel self, int flip)
2567 CODE:
2568 Mix_SetReverseStereo (self, flip);
2569
2570MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2571
2572PROTOTYPES: DISABLE
2573
2574DC::MixChunk
2575new (SV *class, DC::RW rwops)
2576 CODE:
2577 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2578 OUTPUT:
2579 RETVAL
2580
2581void
2136DESTROY (CFPlus::MixChunk self) 2582DESTROY (DC::MixChunk self)
2137 CODE: 2583 CODE:
2138 Mix_FreeChunk (self); 2584 Mix_FreeChunk (self);
2139 2585
2140int 2586int
2141volume (CFPlus::MixChunk self, int volume = -1) 2587volume (DC::MixChunk self, int volume = -1)
2142 CODE: 2588 CODE:
2589 if (items > 1)
2590 volume = CLAMP (volume, 0, 128);
2143 RETVAL = Mix_VolumeChunk (self, volume); 2591 RETVAL = Mix_VolumeChunk (self, volume);
2144 OUTPUT: 2592 OUTPUT:
2145 RETVAL 2593 RETVAL
2146 2594
2147int 2595DC::Channel
2148play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2596play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2149 CODE: 2597 CODE:
2598{
2150 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2599 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2600
2601 if (RETVAL < 0)
2602 XSRETURN_UNDEF;
2603
2604 if (channel < 0)
2605 {
2606 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128);
2608 }
2609}
2151 OUTPUT: 2610 OUTPUT:
2152 RETVAL 2611 RETVAL
2153 2612
2154MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2613MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2155 2614
2156int 2615int
2157volume (int volume = -1) 2616volume (int volume = -1)
2617 PROTOTYPE: ;$
2158 CODE: 2618 CODE:
2619 if (items > 0)
2620 volume = CLAMP (volume, 0, 128);
2159 RETVAL = Mix_VolumeMusic (volume); 2621 RETVAL = Mix_VolumeMusic (volume);
2160 OUTPUT: 2622 OUTPUT:
2161 RETVAL 2623 RETVAL
2162 2624
2625void
2626fade_out (int ms)
2627 CODE:
2628 Mix_FadeOutMusic (ms);
2629
2630void
2631halt ()
2632 CODE:
2633 Mix_HaltMusic ();
2634
2635DC::MixMusic
2636new (SV *class, DC::RW rwops)
2637 CODE:
2638 RETVAL = Mix_LoadMUS_RW (rwops);
2639 OUTPUT:
2640 RETVAL
2641
2642void
2643DESTROY (DC::MixMusic self)
2644 CODE:
2645 Mix_FreeMusic (self);
2646
2163int 2647int
2164fade_out (int ms)
2165 CODE:
2166 RETVAL = Mix_FadeOutMusic (ms);
2167 OUTPUT:
2168 RETVAL
2169
2170CFPlus::MixMusic
2171new_from_file (SV *class, char *path)
2172 CODE:
2173 RETVAL = Mix_LoadMUS (path);
2174 OUTPUT:
2175 RETVAL
2176
2177void
2178DESTROY (CFPlus::MixMusic self)
2179 CODE:
2180 Mix_FreeMusic (self);
2181
2182int
2183play (CFPlus::MixMusic self, int loops = -1) 2648play (DC::MixMusic self, int loops = -1)
2184 CODE: 2649 CODE:
2185 RETVAL = Mix_PlayMusic (self, loops); 2650 RETVAL = Mix_PlayMusic (self, loops);
2186 OUTPUT: 2651 OUTPUT:
2187 RETVAL 2652 RETVAL
2188 2653
2189int 2654void
2190fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2655fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2191 CODE: 2656 CODE:
2192 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2657 Mix_FadeInMusicPos (self, loops, ms, position);
2193 OUTPUT:
2194 RETVAL
2195 2658
2196MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2659MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2660
2661PROTOTYPES: ENABLE
2197 2662
2198BOOT: 2663BOOT:
2199{ 2664{
2200 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2665 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2201 static const struct { 2666 static const struct {
2202 const char *name; 2667 const char *name;
2203 IV iv; 2668 IV iv;
2204 } *civ, const_iv[] = { 2669 } *civ, const_iv[] = {
2205# define const_iv(name) { # name, (IV)name } 2670# define const_iv(name) { # name, (IV)name }
2671 const_iv (GL_VENDOR),
2672 const_iv (GL_VERSION),
2673 const_iv (GL_EXTENSIONS),
2206 const_iv (GL_COLOR_MATERIAL), 2674 const_iv (GL_COLOR_MATERIAL),
2207 const_iv (GL_SMOOTH), 2675 const_iv (GL_SMOOTH),
2208 const_iv (GL_FLAT), 2676 const_iv (GL_FLAT),
2209 const_iv (GL_DITHER), 2677 const_iv (GL_DITHER),
2210 const_iv (GL_BLEND), 2678 const_iv (GL_BLEND),
… …
2214 const_iv (GL_ALPHA_TEST), 2682 const_iv (GL_ALPHA_TEST),
2215 const_iv (GL_NORMALIZE), 2683 const_iv (GL_NORMALIZE),
2216 const_iv (GL_RESCALE_NORMAL), 2684 const_iv (GL_RESCALE_NORMAL),
2217 const_iv (GL_FRONT), 2685 const_iv (GL_FRONT),
2218 const_iv (GL_BACK), 2686 const_iv (GL_BACK),
2687 const_iv (GL_AUX0),
2219 const_iv (GL_AND), 2688 const_iv (GL_AND),
2220 const_iv (GL_ONE), 2689 const_iv (GL_ONE),
2221 const_iv (GL_ZERO), 2690 const_iv (GL_ZERO),
2222 const_iv (GL_SRC_ALPHA), 2691 const_iv (GL_SRC_ALPHA),
2223 const_iv (GL_DST_ALPHA), 2692 const_iv (GL_DST_ALPHA),
… …
2236 const_iv (GL_INTENSITY), 2705 const_iv (GL_INTENSITY),
2237 const_iv (GL_LUMINANCE), 2706 const_iv (GL_LUMINANCE),
2238 const_iv (GL_LUMINANCE_ALPHA), 2707 const_iv (GL_LUMINANCE_ALPHA),
2239 const_iv (GL_FLOAT), 2708 const_iv (GL_FLOAT),
2240 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2709 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2710 const_iv (GL_COMPRESSED_ALPHA_ARB),
2711 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2712 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2713 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2714 const_iv (GL_COMPRESSED_RGB_ARB),
2715 const_iv (GL_COMPRESSED_RGBA_ARB),
2241 const_iv (GL_COMPILE), 2716 const_iv (GL_COMPILE),
2717 const_iv (GL_PROXY_TEXTURE_1D),
2718 const_iv (GL_PROXY_TEXTURE_2D),
2242 const_iv (GL_TEXTURE_1D), 2719 const_iv (GL_TEXTURE_1D),
2243 const_iv (GL_TEXTURE_2D), 2720 const_iv (GL_TEXTURE_2D),
2244 const_iv (GL_TEXTURE_ENV), 2721 const_iv (GL_TEXTURE_ENV),
2245 const_iv (GL_TEXTURE_MAG_FILTER), 2722 const_iv (GL_TEXTURE_MAG_FILTER),
2246 const_iv (GL_TEXTURE_MIN_FILTER), 2723 const_iv (GL_TEXTURE_MIN_FILTER),
… …
2267 const_iv (GL_COLOR_LOGIC_OP), 2744 const_iv (GL_COLOR_LOGIC_OP),
2268 const_iv (GL_SEPARABLE_2D), 2745 const_iv (GL_SEPARABLE_2D),
2269 const_iv (GL_CONVOLUTION_2D), 2746 const_iv (GL_CONVOLUTION_2D),
2270 const_iv (GL_CONVOLUTION_BORDER_MODE), 2747 const_iv (GL_CONVOLUTION_BORDER_MODE),
2271 const_iv (GL_CONSTANT_BORDER), 2748 const_iv (GL_CONSTANT_BORDER),
2749 const_iv (GL_POINTS),
2272 const_iv (GL_LINES), 2750 const_iv (GL_LINES),
2273 const_iv (GL_LINE_STRIP), 2751 const_iv (GL_LINE_STRIP),
2274 const_iv (GL_LINE_LOOP), 2752 const_iv (GL_LINE_LOOP),
2275 const_iv (GL_QUADS), 2753 const_iv (GL_QUADS),
2276 const_iv (GL_QUAD_STRIP), 2754 const_iv (GL_QUAD_STRIP),
2277 const_iv (GL_TRIANGLES), 2755 const_iv (GL_TRIANGLES),
2278 const_iv (GL_TRIANGLE_STRIP), 2756 const_iv (GL_TRIANGLE_STRIP),
2279 const_iv (GL_TRIANGLE_FAN), 2757 const_iv (GL_TRIANGLE_FAN),
2758 const_iv (GL_POLYGON),
2280 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2759 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2760 const_iv (GL_POINT_SMOOTH_HINT),
2761 const_iv (GL_LINE_SMOOTH_HINT),
2762 const_iv (GL_POLYGON_SMOOTH_HINT),
2763 const_iv (GL_GENERATE_MIPMAP_HINT),
2764 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2281 const_iv (GL_FASTEST), 2765 const_iv (GL_FASTEST),
2766 const_iv (GL_DONT_CARE),
2767 const_iv (GL_NICEST),
2282 const_iv (GL_V2F), 2768 const_iv (GL_V2F),
2283 const_iv (GL_V3F), 2769 const_iv (GL_V3F),
2284 const_iv (GL_T2F_V3F), 2770 const_iv (GL_T2F_V3F),
2285 const_iv (GL_T2F_N3F_V3F), 2771 const_iv (GL_T2F_N3F_V3F),
2286# undef const_iv 2772# undef const_iv
… …
2291 2777
2292 texture_av = newAV (); 2778 texture_av = newAV ();
2293 AvREAL_off (texture_av); 2779 AvREAL_off (texture_av);
2294} 2780}
2295 2781
2782void
2783disable_GL_EXT_blend_func_separate ()
2784 CODE:
2785 gl.BlendFuncSeparate = 0;
2786 gl.BlendFuncSeparateEXT = 0;
2787
2296char * 2788char *
2297gl_vendor () 2789gl_vendor ()
2298 CODE: 2790 CODE:
2299 RETVAL = (char *)glGetString (GL_VENDOR); 2791 RETVAL = (char *)glGetString (GL_VENDOR);
2300 OUTPUT: 2792 OUTPUT:
… …
2312 CODE: 2804 CODE:
2313 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2805 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2314 OUTPUT: 2806 OUTPUT:
2315 RETVAL 2807 RETVAL
2316 2808
2809const char *glGetString (GLenum pname)
2810
2811GLint glGetInteger (GLenum pname)
2812 CODE:
2813 glGetIntegerv (pname, &RETVAL);
2814 OUTPUT:
2815 RETVAL
2816
2817GLdouble glGetDouble (GLenum pname)
2818 CODE:
2819 glGetDoublev (pname, &RETVAL);
2820 OUTPUT:
2821 RETVAL
2822
2317int glGetError () 2823int glGetError ()
2318 2824
2319void glFinish () 2825void glFinish ()
2320 2826
2321void glClear (int mask) 2827void glClear (int mask)
… …
2358# near_ and far_ are due to microsofts buggy "c" compiler 2864# near_ and far_ are due to microsofts buggy "c" compiler
2359void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2865void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2360 2866
2361# near_ and far_ are due to microsofts buggy "c" compiler 2867# near_ and far_ are due to microsofts buggy "c" compiler
2362void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2868void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2869
2870PROTOTYPES: DISABLE
2363 2871
2364void glViewport (int x, int y, int width, int height) 2872void glViewport (int x, int y, int width, int height)
2365 2873
2366void glScissor (int x, int y, int width, int height) 2874void glScissor (int x, int y, int width, int height)
2367 2875
… …
2375 2883
2376void glRotate (float angle, float x, float y, float z) 2884void glRotate (float angle, float x, float y, float z)
2377 CODE: 2885 CODE:
2378 glRotatef (angle, x, y, z); 2886 glRotatef (angle, x, y, z);
2379 2887
2380void glBegin (int mode)
2381
2382void glEnd ()
2383
2384void glColor (float r, float g, float b, float a = 1.0) 2888void glColor (float r, float g, float b, float a = 1.0)
2385 PROTOTYPE: @
2386 ALIAS: 2889 ALIAS:
2387 glColor_premultiply = 1 2890 glColor_premultiply = 1
2388 CODE: 2891 CODE:
2389 if (ix) 2892 if (ix)
2390 { 2893 {
… …
2393 b *= a; 2896 b *= a;
2394 } 2897 }
2395 // microsoft visual "c" rounds instead of truncating... 2898 // microsoft visual "c" rounds instead of truncating...
2396 glColor4f (r, g, b, a); 2899 glColor4f (r, g, b, a);
2397 2900
2398void glInterleavedArrays (int format, int stride, char *data)
2399
2400void glDrawElements (int mode, int count, int type, char *indices)
2401
2402# 1.2 void glDrawRangeElements (int mode, int start, int end
2403
2404void glRasterPos (float x, float y, float z = 0.) 2901void glRasterPos (float x, float y, float z = 0.)
2405 CODE: 2902 CODE:
2406 glRasterPos3f (0, 0, z); 2903 glRasterPos3f (0, 0, z);
2407 glBitmap (0, 0, 0, 0, x, y, 0); 2904 glBitmap (0, 0, 0, 0, x, y, 0);
2408 2905
… …
2412 2909
2413void glTexCoord (float s, float t) 2910void glTexCoord (float s, float t)
2414 CODE: 2911 CODE:
2415 glTexCoord2f (s, t); 2912 glTexCoord2f (s, t);
2416 2913
2914void glRect (float x1, float y1, float x2, float y2)
2915 CODE:
2916 glRectf (x1, y1, x2, y2);
2917
2918void glRect_lineloop (float x1, float y1, float x2, float y2)
2919 CODE:
2920 glBegin (GL_LINE_LOOP);
2921 glVertex2f (x1, y1);
2922 glVertex2f (x2, y1);
2923 glVertex2f (x2, y2);
2924 glVertex2f (x1, y2);
2925 glEnd ();
2926
2927PROTOTYPES: ENABLE
2928
2929void glBegin (int mode)
2930
2931void glEnd ()
2932
2933void glPointSize (GLfloat size)
2934
2935void glLineWidth (GLfloat width)
2936
2937void glInterleavedArrays (int format, int stride, char *data)
2938
2939void glDrawElements (int mode, int count, int type, char *indices)
2940
2941# 1.2 void glDrawRangeElements (int mode, int start, int end
2942
2417void glTexEnv (int target, int pname, float param) 2943void glTexEnv (int target, int pname, float param)
2418 CODE: 2944 CODE:
2419 glTexEnvf (target, pname, param); 2945 glTexEnvf (target, pname, param);
2420 2946
2421void glTexParameter (int target, int pname, float param) 2947void glTexParameter (int target, int pname, float param)
… …
2437void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2963void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2438 CODE: 2964 CODE:
2439 if (gl.SeparableFilter2D) 2965 if (gl.SeparableFilter2D)
2440 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2966 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2441 2967
2442void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2968void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2443 2969
2444void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2970void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2445 2971
2446void glDrawPixels (int width, int height, int format, int type, char *pixels) 2972void glDrawPixels (int width, int height, int format, int type, char *pixels)
2973
2974void glPixelZoom (float x, float y)
2447 2975
2448void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2976void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2449 2977
2450int glGenTexture () 2978int glGenTexture ()
2451 CODE: 2979 CODE:
… …
2471 2999
2472void glEndList () 3000void glEndList ()
2473 3001
2474void glCallList (int list) 3002void glCallList (int list)
2475 3003
3004MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3005
3006PROTOTYPES: DISABLE
3007
3008void
3009find_widget (SV *self, NV x, NV y)
3010 PPCODE:
3011{
3012 if (within_widget (self, x, y))
3013 XPUSHs (self);
3014}
3015
3016BOOT:
3017{
3018 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3019
3020 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3021 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3022 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3023 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3024}
3025
3026void
3027draw (SV *self)
3028 CODE:
3029{
3030 HV *hv;
3031 SV **svp;
3032 NV x, y, w, h;
3033 SV *draw_x_sv = GvSV (draw_x_gv);
3034 SV *draw_y_sv = GvSV (draw_y_gv);
3035 SV *draw_w_sv = GvSV (draw_w_gv);
3036 SV *draw_h_sv = GvSV (draw_h_gv);
3037 double draw_x, draw_y;
3038
3039 if (!SvROK (self))
3040 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3041
3042 hv = (HV *)SvRV (self);
3043
3044 if (SvTYPE (hv) != SVt_PVHV)
3045 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3046
3047 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3048 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3049
3050 if (!h || !w)
3051 XSRETURN_EMPTY;
3052
3053 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3054 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3055
3056 draw_x = SvNV (draw_x_sv) + x;
3057 draw_y = SvNV (draw_y_sv) + y;
3058
3059 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3060 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3061 XSRETURN_EMPTY;
3062
3063 sv_setnv (draw_x_sv, draw_x);
3064 sv_setnv (draw_y_sv, draw_y);
3065
3066 glPushMatrix ();
3067 glTranslated (x, y, 0);
3068
3069 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3070 {
3071 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3072
3073 if (svp && SvTRUE (*svp))
3074 {
3075 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3076 glEnable (GL_BLEND);
3077 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3078 glBegin (GL_QUADS);
3079 glVertex2f (0, 0);
3080 glVertex2f (w, 0);
3081 glVertex2f (w, h);
3082 glVertex2f (0, h);
3083 glEnd ();
3084 glDisable (GL_BLEND);
3085 }
3086 }
3087#if 0
3088 // draw borders, for debugging
3089 glPushMatrix ();
3090 glColor4f (1., 1., 0., 1.);
3091 glTranslatef (.5, .5, 0.);
3092 glBegin (GL_LINE_LOOP);
3093 glVertex2f (0 , 0);
3094 glVertex2f (w - 1, 0);
3095 glVertex2f (w - 1, h - 1);
3096 glVertex2f (0 , h - 1);
3097 glEnd ();
3098 glPopMatrix ();
3099#endif
3100 PUSHMARK (SP);
3101 XPUSHs (self);
3102 PUTBACK;
3103 call_method ("_draw", G_VOID | G_DISCARD);
3104 SPAGAIN;
3105
3106 glPopMatrix ();
3107
3108 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3109 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3110}
3111

Diff Legend

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