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.198 by root, Sun Jul 15 21:42:02 2007 UTC vs.
Revision 1.274 by root, Wed Aug 20 17:50:47 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
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
36#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
37#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
38 51
39#include <glib/gmacros.h> 52#include <glib/gmacros.h>
40 53
41#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
42 66
43#ifndef _WIN32 67#ifndef _WIN32
44# include <sys/types.h> 68# include <sys/types.h>
45# include <sys/socket.h> 69# include <sys/socket.h>
46# include <netinet/in.h> 70# include <netinet/in.h>
47# include <netinet/tcp.h> 71# include <netinet/tcp.h>
48# include <inttypes.h> 72# include <inttypes.h>
49#endif 73#endif
50 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 85
53#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
54 87
55#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
57 90
58#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
59 92
60#if 0 93/* mask out modifiers we are not interested in */
61# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
62#else
63# define PARACHUTE 0
64#endif
65 95
66static AV *texture_av; 96static AV *texture_av;
67 97
68static struct 98static struct
69{ 99{
… …
106 av_push (texture_av, (SV *)(size_t)name); 136 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name); 137 glDeleteTextures (1, &name);
108} 138}
109 139
110#include "texcache.c" 140#include "texcache.c"
141#include "rendercache.c"
111 142
112#include "pango-font.c" 143#include "pango-font.c"
113#include "pango-fontmap.c" 144#include "pango-fontmap.c"
114#include "pango-render.c" 145#include "pango-render.c"
115 146
147typedef IV DC__Channel;
148typedef SDL_RWops *DC__RW;
116typedef Mix_Chunk *CFPlus__MixChunk; 149typedef Mix_Chunk *DC__MixChunk;
117typedef Mix_Music *CFPlus__MixMusic; 150typedef Mix_Music *DC__MixMusic;
118 151
119typedef PangoFontDescription *CFPlus__Font; 152typedef PangoFontDescription *DC__Font;
120 153
121static int 154static int
122shape_attr_p (PangoLayoutRun *run) 155shape_attr_p (PangoLayoutRun *run)
123{ 156{
124 GSList *attrs = run->item->analysis.extra_attrs; 157 GSList *attrs = run->item->analysis.extra_attrs;
… …
138 171
139typedef struct cf_layout { 172typedef struct cf_layout {
140 PangoLayout *pl; 173 PangoLayout *pl;
141 float r, g, b, a; // default color for rgba mode 174 float r, g, b, a; // default color for rgba mode
142 int base_height; 175 int base_height;
143 CFPlus__Font font; 176 DC__Font font;
177 rc_t *rc;
144} *CFPlus__Layout; 178} *DC__Layout;
145 179
146static CFPlus__Font default_font; 180static DC__Font default_font;
147static PangoContext *opengl_context; 181static PangoContext *opengl_context;
148static PangoFontMap *opengl_fontmap; 182static PangoFontMap *opengl_fontmap;
149 183
150static void 184static void
151substitute_func (FcPattern *pattern, gpointer data) 185substitute_func (FcPattern *pattern, gpointer data)
… …
156#endif 190#endif
157 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 191 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
158} 192}
159 193
160static void 194static void
161layout_update_font (CFPlus__Layout self) 195layout_update_font (DC__Layout self)
162{ 196{
163 /* use a random scale factor to account for unknown descenders, 0.8 works 197 /* use a random scale factor to account for unknown descenders, 0.8 works
164 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
165 */ 199 */
166 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
167 201
168 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
169 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
170 204
171 pango_layout_set_font_description (self->pl, font); 205 pango_layout_set_font_description (self->pl, font);
172} 206}
173 207
174static void 208static void
175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 209layout_get_pixel_size (DC__Layout self, int *w, int *h)
176{ 210{
177 PangoRectangle rect; 211 PangoRectangle rect;
178 212
179 // get_pixel_* wrongly rounds down 213 // get_pixel_* wrongly rounds down
180 pango_layout_get_extents (self->pl, 0, &rect); 214 pango_layout_get_extents (self->pl, 0, &rect);
… …
191 225
192typedef uint16_t tileid; 226typedef uint16_t tileid;
193typedef uint16_t faceid; 227typedef uint16_t faceid;
194 228
195typedef struct { 229typedef struct {
196 int name; 230 GLuint name;
197 int w, h; 231 int w, h;
198 float s, t; 232 float s, t;
199 uint8_t r, g, b, a; 233 uint8_t r, g, b, a;
200 tileid smoothtile; 234 tileid smoothtile;
201 uint8_t smoothlevel; 235 uint8_t smoothlevel;
… …
219 int faces; tileid *face2tile; // [faceid] 253 int faces; tileid *face2tile; // [faceid]
220 int texs; maptex *tex; // [tileid] 254 int texs; maptex *tex; // [tileid]
221 255
222 int32_t rows; 256 int32_t rows;
223 maprow *row; 257 maprow *row;
224} *CFPlus__Map; 258} *DC__Map;
225 259
226static char * 260static char *
227prepend (char *ptr, int sze, int inc) 261prepend (char *ptr, int sze, int inc)
228{ 262{
229 char *p; 263 char *p;
… …
267 self->texs *= 2; 301 self->texs *= 2;
268 } 302 }
269} 303}
270 304
271static maprow * 305static maprow *
272map_get_row (CFPlus__Map self, int y) 306map_get_row (DC__Map self, int y)
273{ 307{
274 if (0 > y) 308 if (0 > y)
275 { 309 {
276 int extend = - y + MAP_EXTEND_Y; 310 int extend = - y + MAP_EXTEND_Y;
277 Prepend (maprow, self->row, self->rows, extend); 311 Prepend (maprow, self->row, self->rows, extend);
… …
315 349
316 return row->col + (x - row->c0); 350 return row->col + (x - row->c0);
317} 351}
318 352
319static mapcell * 353static mapcell *
320map_get_cell (CFPlus__Map self, int x, int y) 354map_get_cell (DC__Map self, int x, int y)
321{ 355{
322 return row_get_cell (map_get_row (self, y), x); 356 return row_get_cell (map_get_row (self, y), x);
323} 357}
324 358
325static void 359static void
326map_clear (CFPlus__Map self) 360map_clear (DC__Map self)
327{ 361{
328 int r; 362 int r;
329 363
330 for (r = 0; r < self->rows; r++) 364 for (r = 0; r < self->rows; r++)
331 Safefree (self->row[r].col); 365 Safefree (self->row[r].col);
… …
338 self->oy = 0; 372 self->oy = 0;
339 self->row = 0; 373 self->row = 0;
340 self->rows = 0; 374 self->rows = 0;
341} 375}
342 376
377#define CELL_CLEAR(cell) \
378 do { \
379 if ((cell)->player) \
380 (cell)->tile [2] = 0; \
381 (cell)->darkness = 0; \
382 (cell)->stat_hp = 0; \
383 (cell)->flags = 0; \
384 (cell)->player = 0; \
385 } while (0)
386
343static void 387static void
344map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 388map_blank (DC__Map self, int x0, int y0, int w, int h)
345{ 389{
346 int x, y; 390 int x, y;
347 maprow *row; 391 maprow *row;
348 mapcell *cell; 392 mapcell *cell;
349 393
… …
361 if (x >= row->c1) 405 if (x >= row->c1)
362 break; 406 break;
363 407
364 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
365 409
366 cell->darkness = 0; 410 CELL_CLEAR (cell);
367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
370 } 411 }
371 } 412 }
372} 413}
373 414
374typedef struct { 415typedef struct {
… …
428 n |= n >> 16; 469 n |= n >> 16;
429 470
430 return n + 1; 471 return n + 1;
431} 472}
432 473
474static unsigned int
475popcount (unsigned int n)
476{
477 n -= (n >> 1) & 0x55555555U;
478 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
479 n = ((n >> 4) + n) & 0x0f0f0f0fU;
480 n *= 0x01010101U;
481
482 return n >> 24;
483}
484
433/* SDL should provide this, really. */ 485/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300 486#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314 487#define SDLK_MODIFIER_MAX 314
436 488
437MODULE = CFPlus PACKAGE = CFPlus 489/******************************************************************************/
490
491static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
492static GV *hover_gv;
493
494static int
495within_widget (SV *widget, NV x, NV y)
496{
497 HV *self;
498 SV **svp;
499 NV wx, ww, wy, wh;
500
501 if (!SvROK (widget))
502 return 0;
503
504 self = (HV *)SvRV (widget);
505
506 if (SvTYPE (self) != SVt_PVHV)
507 return 0;
508
509 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
510 if (y < wy)
511 return 0;
512
513 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
514 if (y >= wy + wh)
515 return 0;
516
517 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
518 if (x < wx)
519 return 0;
520
521 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
522 if (x >= wx + ww)
523 return 0;
524
525 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
526 if (!svp || !SvTRUE (*svp))
527 return 0;
528
529 return 1;
530}
531
532static void
533deliantra_main ()
534{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537}
538
539#ifdef __MACOSX__
540 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back.
545 */
546 extern C_LINKAGE int
547 main (int argc, char *argv[])
548 {
549 deliantra_main ();
550 }
551
552 #undef main
553
554 extern C_LINKAGE int main (int argc, char *argv[]);
555
556 static void
557 SDL_braino (void)
558 {
559 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv);
561 }
562#else
563 static void
564 SDL_braino (void)
565 {
566 deliantra_main ();
567 }
568#endif
569
570MODULE = Deliantra::Client PACKAGE = DC
438 571
439PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
440 573
441BOOT: 574BOOT:
442{ 575{
443 HV *stash = gv_stashpv ("CFPlus", 1); 576 HV *stash = gv_stashpv ("DC", 1);
444 static const struct { 577 static const struct {
445 const char *name; 578 const char *name;
446 IV iv; 579 IV iv;
447 } *civ, const_iv[] = { 580 } *civ, const_iv[] = {
448# define const_iv(name) { # name, (IV)name } 581# define const_iv(name) { # name, (IV)name }
… …
470 603
471 const_iv (SDL_APPINPUTFOCUS), 604 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS), 605 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE), 606 const_iv (SDL_APPACTIVE),
474 607
608 const_iv (SDLK_FIRST),
609 const_iv (SDLK_LAST),
475 const_iv (SDLK_KP0), 610 const_iv (SDLK_KP0),
476 const_iv (SDLK_KP1), 611 const_iv (SDLK_KP1),
477 const_iv (SDLK_KP2), 612 const_iv (SDLK_KP2),
478 const_iv (SDLK_KP3), 613 const_iv (SDLK_KP3),
479 const_iv (SDLK_KP4), 614 const_iv (SDLK_KP4),
… …
551 const_iv (KMOD_LMETA), 686 const_iv (KMOD_LMETA),
552 const_iv (KMOD_RMETA), 687 const_iv (KMOD_RMETA),
553 const_iv (KMOD_NUM), 688 const_iv (KMOD_NUM),
554 const_iv (KMOD_CAPS), 689 const_iv (KMOD_CAPS),
555 const_iv (KMOD_MODE), 690 const_iv (KMOD_MODE),
691
692 const_iv (MIX_DEFAULT_FORMAT),
693
694 const_iv (SDL_INIT_TIMER),
695 const_iv (SDL_INIT_AUDIO),
696 const_iv (SDL_INIT_VIDEO),
697 const_iv (SDL_INIT_CDROM),
698 const_iv (SDL_INIT_JOYSTICK),
699 const_iv (SDL_INIT_EVERYTHING),
700 const_iv (SDL_INIT_NOPARACHUTE),
701 const_iv (SDL_INIT_EVENTTHREAD),
702
703 const_iv (SDL_GL_RED_SIZE),
704 const_iv (SDL_GL_GREEN_SIZE),
705 const_iv (SDL_GL_BLUE_SIZE),
706 const_iv (SDL_GL_ALPHA_SIZE),
707 const_iv (SDL_GL_DOUBLEBUFFER),
708 const_iv (SDL_GL_BUFFER_SIZE),
709 const_iv (SDL_GL_DEPTH_SIZE),
710 const_iv (SDL_GL_STENCIL_SIZE),
711 const_iv (SDL_GL_ACCUM_RED_SIZE),
712 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
713 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
714 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
715 const_iv (SDL_GL_STEREO),
716 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
717 const_iv (SDL_GL_MULTISAMPLESAMPLES),
718 const_iv (SDL_GL_ACCELERATED_VISUAL),
719 const_iv (SDL_GL_SWAP_CONTROL),
720
721 const_iv (FOW_DARKNESS)
556# undef const_iv 722# undef const_iv
557 }; 723 };
558 724
559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 725 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 726 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
578 744
579NV floor (NV x) 745NV floor (NV x)
580 746
581NV ceil (NV x) 747NV ceil (NV x)
582 748
749IV minpot (UV n)
750
751IV popcount (UV n)
752
583void 753void
584pango_init () 754pango_init ()
585 CODE: 755 CODE:
586{ 756{
587 opengl_fontmap = pango_opengl_font_map_new (); 757 opengl_fontmap = pango_opengl_font_map_new ();
588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 758 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); 759 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
760 /*pango_context_set_font_description (opengl_context, default_font);*/
761#if PANGO_VERSION_CHECK (1, 15, 2)
762 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
763 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
764#endif
590} 765}
591 766
592int 767char *SDL_GetError ()
593SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
594 768
595void 769void SDL_braino ()
770
771int SDL_Init (U32 flags)
772
773int SDL_InitSubSystem (U32 flags)
774
775void SDL_QuitSubSystem (U32 flags)
776
596SDL_Quit () 777void SDL_Quit ()
597 778
779int SDL_GL_SetAttribute (int attr, int value)
780
781int SDL_GL_GetAttribute (int attr)
782 CODE:
783 if (SDL_GL_GetAttribute (attr, &RETVAL))
784 XSRETURN_UNDEF;
785 OUTPUT:
786 RETVAL
787
598void 788void
599SDL_ListModes () 789SDL_ListModes (int rgb, int alpha)
600 PPCODE: 790 PPCODE:
601{ 791{
602 SDL_Rect **m; 792 SDL_Rect **m;
603 793
604 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 794 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
605 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 795 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
606 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 796 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
607 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 797 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
608 798
609 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 799 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
610 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 800 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
611 801
612 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 802 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 803 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 804 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 805 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
616 806
617 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 807 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); 808 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 809
626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 810 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
627 811
628 if (m && m != (SDL_Rect **)-1) 812 if (m && m != (SDL_Rect **)-1)
629 while (*m) 813 while (*m)
630 { 814 {
815 if ((*m)->w >= 400 && (*m)->h >= 300)
816 {
631 AV *av = newAV (); 817 AV *av = newAV ();
632 av_push (av, newSViv ((*m)->w)); 818 av_push (av, newSViv ((*m)->w));
633 av_push (av, newSViv ((*m)->h)); 819 av_push (av, newSViv ((*m)->h));
820 av_push (av, newSViv (rgb));
821 av_push (av, newSViv (alpha));
634 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 822 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
823 }
635 824
636 ++m; 825 ++m;
637 } 826 }
638} 827}
639 828
640char *
641SDL_GetError ()
642
643int 829int
644SDL_SetVideoMode (int w, int h, int fullscreen) 830SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
645 CODE: 831 CODE:
832{
833 SDL_EnableUNICODE (1);
834 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
835
836 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
837 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
838 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
839 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
840
646 RETVAL = !!SDL_SetVideoMode ( 841 RETVAL = !!SDL_SetVideoMode (
647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 842 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
648 ); 843 );
844
649 if (RETVAL) 845 if (RETVAL)
650 { 846 {
651 av_clear (texture_av); 847 av_clear (texture_av);
652 848
653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 849 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 850#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
655# include "glfunc.h" 851#include "glfunc.h"
656# undef GL_FUNC 852#undef GL_FUNC
657
658 } 853 }
854}
659 OUTPUT: 855 OUTPUT:
660 RETVAL 856 RETVAL
661 857
662void 858void
663SDL_GL_SwapBuffers () 859SDL_GL_SwapBuffers ()
… …
665char * 861char *
666SDL_GetKeyName (int sym) 862SDL_GetKeyName (int sym)
667 863
668int 864int
669SDL_GetAppState () 865SDL_GetAppState ()
866
867int
868SDL_GetModState ()
670 869
671void 870void
672poll_events () 871poll_events ()
673 PPCODE: 872 PPCODE:
674{ 873{
… …
684 { 883 {
685 case SDL_KEYDOWN: 884 case SDL_KEYDOWN:
686 case SDL_KEYUP: 885 case SDL_KEYUP:
687 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
688 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
689 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 888 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 */ 889 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); 890 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
692 break; 891 break;
693 892
694 case SDL_ACTIVEEVENT: 893 case SDL_ACTIVEEVENT:
695 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
713 x = ev.motion.x; 912 x = ev.motion.x;
714 y = ev.motion.y; 913 y = ev.motion.y;
715 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
716 } 915 }
717 916
718 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
719 hv_store (hv, "state", 5, newSViv (state), 0); 918 hv_store (hv, "state", 5, newSViv (state), 0);
720 hv_store (hv, "x", 1, newSViv (x), 0); 919 hv_store (hv, "x", 1, newSViv (x), 0);
721 hv_store (hv, "y", 1, newSViv (y), 0); 920 hv_store (hv, "y", 1, newSViv (y), 0);
722 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 921 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
723 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 922 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
724 } 923 }
725 break; 924 break;
726 925
727 case SDL_MOUSEBUTTONDOWN: 926 case SDL_MOUSEBUTTONDOWN:
728 case SDL_MOUSEBUTTONUP: 927 case SDL_MOUSEBUTTONUP:
729 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 928 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
730 929
731 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 930 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
732 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 931 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
733 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 932 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
734 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 933 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
739 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 938 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
740 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 939 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
741 break; 940 break;
742 } 941 }
743 942
744 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 943 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
745 } 944 }
746} 945}
747 946
748int 947int
749Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 948Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
750 POSTCALL: 949 POSTCALL:
751 Mix_HookMusicFinished (music_finished); 950 Mix_HookMusicFinished (music_finished);
752 Mix_ChannelFinished (channel_finished); 951 Mix_ChannelFinished (channel_finished);
753 952
754void 953void
954Mix_QuerySpec ()
955 PPCODE:
956{
957 int freq, channels;
958 Uint16 format;
959
960 if (Mix_QuerySpec (&freq, &format, &channels))
961 {
962 EXTEND (SP, 3);
963 PUSHs (sv_2mortal (newSViv (freq)));
964 PUSHs (sv_2mortal (newSViv (format)));
965 PUSHs (sv_2mortal (newSViv (channels)));
966 }
967}
968
969void
755Mix_CloseAudio () 970Mix_CloseAudio ()
756 971
757int 972int
758Mix_AllocateChannels (int numchans = -1) 973Mix_AllocateChannels (int numchans = -1)
974
975const char *
976Mix_GetError ()
759 977
760void 978void
761lowdelay (int fd, int val = 1) 979lowdelay (int fd, int val = 1)
762 CODE: 980 CODE:
763 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 981 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
789 } 1007 }
790 } 1008 }
791#endif 1009#endif
792} 1010}
793 1011
794void 1012int
795add_font (char *file) 1013add_font (char *file)
796 CODE: 1014 CODE:
797 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1015 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1016 OUTPUT:
1017 RETVAL
798 1018
799void 1019void
800load_image_inline (SV *image_) 1020load_image_inline (SV *image_)
801 ALIAS: 1021 ALIAS:
802 load_image_file = 1 1022 load_image_file = 1
… …
805 STRLEN image_len; 1025 STRLEN image_len;
806 char *image = (char *)SvPVbyte (image_, image_len); 1026 char *image = (char *)SvPVbyte (image_, image_len);
807 SDL_Surface *surface, *surface2; 1027 SDL_Surface *surface, *surface2;
808 SDL_PixelFormat fmt; 1028 SDL_PixelFormat fmt;
809 SDL_RWops *rw = ix 1029 SDL_RWops *rw = ix
810 ? SDL_RWFromFile (image, "r") 1030 ? SDL_RWFromFile (image, "rb")
811 : SDL_RWFromConstMem (image, image_len); 1031 : SDL_RWFromConstMem (image, image_len);
812 1032
813 if (!rw) 1033 if (!rw)
814 croak ("load_image: %s", SDL_GetError ()); 1034 croak ("load_image: %s", SDL_GetError ());
815 1035
… …
888void 1108void
889error (char *message) 1109error (char *message)
890 CODE: 1110 CODE:
891 fprintf (stderr, "ERROR: %s\n", message); 1111 fprintf (stderr, "ERROR: %s\n", message);
892#ifdef _WIN32 1112#ifdef _WIN32
893 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1113 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
894#endif 1114#endif
895 1115
896void 1116void
897fatal (char *message) 1117fatal (char *message)
898 CODE: 1118 CODE:
899 fprintf (stderr, "FATAL: %s\n", message); 1119 fprintf (stderr, "FATAL: %s\n", message);
900#ifdef _WIN32 1120#ifdef _WIN32
901 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1121 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
902#endif 1122#endif
903 _exit (1); 1123 _exit (1);
904 1124
905void 1125void
906_exit (int retval = 0) 1126_exit (int retval = 0)
… …
918#if DEBUG 1138#if DEBUG
919 VALGRIND_DO_LEAK_CHECK; 1139 VALGRIND_DO_LEAK_CHECK;
920#endif 1140#endif
921} 1141}
922 1142
923MODULE = CFPlus PACKAGE = CFPlus::Font 1143MODULE = Deliantra::Client PACKAGE = DC::Font
924 1144
925CFPlus::Font 1145PROTOTYPES: DISABLE
1146
1147DC::Font
926new_from_file (SV *class, char *path, int id = 0) 1148new_from_file (SV *class, char *path, int id = 0)
927 CODE: 1149 CODE:
928{ 1150{
929 int count; 1151 int count;
930 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1152 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
933} 1155}
934 OUTPUT: 1156 OUTPUT:
935 RETVAL 1157 RETVAL
936 1158
937void 1159void
938DESTROY (CFPlus::Font self) 1160DESTROY (DC::Font self)
939 CODE: 1161 CODE:
940 pango_font_description_free (self); 1162 pango_font_description_free (self);
941 1163
942void 1164void
943make_default (CFPlus::Font self) 1165make_default (DC::Font self)
1166 PROTOTYPE: $
944 CODE: 1167 CODE:
945 default_font = self; 1168 default_font = self;
946 1169
947MODULE = CFPlus PACKAGE = CFPlus::Layout 1170MODULE = Deliantra::Client PACKAGE = DC::Layout
948 1171
1172PROTOTYPES: DISABLE
1173
949void 1174void
950reset_glyph_cache () 1175glyph_cache_backup ()
1176 PROTOTYPE:
951 CODE: 1177 CODE:
1178 tc_backup ();
1179
1180void
1181glyph_cache_restore ()
1182 PROTOTYPE:
1183 CODE:
952 tc_clear (); 1184 tc_restore ();
953 1185
954CFPlus::Layout 1186DC::Layout
955new (SV *class) 1187new (SV *class)
956 CODE: 1188 CODE:
957 New (0, RETVAL, 1, struct cf_layout); 1189 New (0, RETVAL, 1, struct cf_layout);
958 1190
959 RETVAL->pl = pango_layout_new (opengl_context); 1191 RETVAL->pl = pango_layout_new (opengl_context);
… …
961 RETVAL->g = 1.; 1193 RETVAL->g = 1.;
962 RETVAL->b = 1.; 1194 RETVAL->b = 1.;
963 RETVAL->a = 1.; 1195 RETVAL->a = 1.;
964 RETVAL->base_height = MIN_FONT_HEIGHT; 1196 RETVAL->base_height = MIN_FONT_HEIGHT;
965 RETVAL->font = 0; 1197 RETVAL->font = 0;
1198 RETVAL->rc = rc_alloc ();
966 1199
967 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1200 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
968 layout_update_font (RETVAL); 1201 layout_update_font (RETVAL);
969 OUTPUT: 1202 OUTPUT:
970 RETVAL 1203 RETVAL
971 1204
972void 1205void
973DESTROY (CFPlus::Layout self) 1206DESTROY (DC::Layout self)
974 CODE: 1207 CODE:
975 g_object_unref (self->pl); 1208 g_object_unref (self->pl);
1209 rc_free (self->rc);
976 Safefree (self); 1210 Safefree (self);
977 1211
978void 1212void
979set_text (CFPlus::Layout self, SV *text_) 1213set_text (DC::Layout self, SV *text_)
980 CODE: 1214 CODE:
981{ 1215{
982 STRLEN textlen; 1216 STRLEN textlen;
983 char *text = SvPVutf8 (text_, textlen); 1217 char *text = SvPVutf8 (text_, textlen);
984 1218
985 pango_layout_set_text (self->pl, text, textlen); 1219 pango_layout_set_text (self->pl, text, textlen);
986} 1220}
987 1221
988void 1222void
989set_markup (CFPlus::Layout self, SV *text_) 1223set_markup (DC::Layout self, SV *text_)
990 CODE: 1224 CODE:
991{ 1225{
992 STRLEN textlen; 1226 STRLEN textlen;
993 char *text = SvPVutf8 (text_, textlen); 1227 char *text = SvPVutf8 (text_, textlen);
994 1228
995 pango_layout_set_markup (self->pl, text, textlen); 1229 pango_layout_set_markup (self->pl, text, textlen);
996} 1230}
997 1231
998void 1232void
999set_shapes (CFPlus::Layout self, ...) 1233set_shapes (DC::Layout self, ...)
1000 CODE: 1234 CODE:
1001{ 1235{
1002 PangoAttrList *attrs = 0; 1236 PangoAttrList *attrs = 0;
1003 const char *text = pango_layout_get_text (self->pl); 1237 const char *text = pango_layout_get_text (self->pl);
1004 const char *pos = text; 1238 const char *pos = text;
… …
1039 if (attrs) 1273 if (attrs)
1040 pango_layout_set_attributes (self->pl, attrs); 1274 pango_layout_set_attributes (self->pl, attrs);
1041} 1275}
1042 1276
1043void 1277void
1044get_shapes (CFPlus::Layout self) 1278get_shapes (DC::Layout self)
1045 PPCODE: 1279 PPCODE:
1046{ 1280{
1047 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1281 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1048 1282
1049 do 1283 do
1050 { 1284 {
1051 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1285 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1052 1286
1053 if (run && shape_attr_p (run)) 1287 if (run && shape_attr_p (run))
1054 { 1288 {
1055 PangoRectangle extents; 1289 PangoRectangle extents;
1056 pango_layout_iter_get_run_extents (iter, 0, &extents); 1290 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1064 1298
1065 pango_layout_iter_free (iter); 1299 pango_layout_iter_free (iter);
1066} 1300}
1067 1301
1068int 1302int
1069has_wrapped (CFPlus::Layout self) 1303has_wrapped (DC::Layout self)
1070 CODE: 1304 CODE:
1071{ 1305{
1072 int lines = 1; 1306 int lines = 1;
1073 const char *text = pango_layout_get_text (self->pl); 1307 const char *text = pango_layout_get_text (self->pl);
1074 1308
… …
1079} 1313}
1080 OUTPUT: 1314 OUTPUT:
1081 RETVAL 1315 RETVAL
1082 1316
1083SV * 1317SV *
1084get_text (CFPlus::Layout self) 1318get_text (DC::Layout self)
1085 CODE: 1319 CODE:
1086 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1320 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1087 sv_utf8_decode (RETVAL); 1321 sv_utf8_decode (RETVAL);
1088 OUTPUT: 1322 OUTPUT:
1089 RETVAL 1323 RETVAL
1090 1324
1091void 1325void
1092set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1326set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1093 CODE: 1327 CODE:
1094 self->r = r; 1328 self->r = r;
1095 self->g = g; 1329 self->g = g;
1096 self->b = b; 1330 self->b = b;
1097 self->a = a; 1331 self->a = a;
1098 1332
1099void 1333void
1100set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1334set_font (DC::Layout self, DC::Font font = 0)
1101 CODE: 1335 CODE:
1102 if (self->font != font) 1336 if (self->font != font)
1103 { 1337 {
1104 self->font = font; 1338 self->font = font;
1105 layout_update_font (self); 1339 layout_update_font (self);
1106 } 1340 }
1107 1341
1108void 1342void
1109set_height (CFPlus::Layout self, int base_height) 1343set_height (DC::Layout self, int base_height)
1110 CODE: 1344 CODE:
1111 if (self->base_height != base_height) 1345 if (self->base_height != base_height)
1112 { 1346 {
1113 self->base_height = base_height; 1347 self->base_height = base_height;
1114 layout_update_font (self); 1348 layout_update_font (self);
1115 } 1349 }
1116 1350
1117void 1351void
1118set_width (CFPlus::Layout self, int max_width = -1) 1352set_width (DC::Layout self, int max_width = -1)
1119 CODE: 1353 CODE:
1120 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1354 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1121 1355
1122void 1356void
1123set_indent (CFPlus::Layout self, int indent) 1357set_indent (DC::Layout self, int indent)
1124 CODE: 1358 CODE:
1125 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1359 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1126 1360
1127void 1361void
1128set_spacing (CFPlus::Layout self, int spacing) 1362set_spacing (DC::Layout self, int spacing)
1129 CODE: 1363 CODE:
1130 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1364 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1131 1365
1132void 1366void
1133set_ellipsise (CFPlus::Layout self, int ellipsise) 1367set_ellipsise (DC::Layout self, int ellipsise)
1134 CODE: 1368 CODE:
1135 pango_layout_set_ellipsize (self->pl, 1369 pango_layout_set_ellipsize (self->pl,
1136 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1370 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1137 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1371 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1138 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1372 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1139 : PANGO_ELLIPSIZE_NONE 1373 : PANGO_ELLIPSIZE_NONE
1140 ); 1374 );
1141 1375
1142void 1376void
1143set_single_paragraph_mode (CFPlus::Layout self, int spm) 1377set_single_paragraph_mode (DC::Layout self, int spm)
1144 CODE: 1378 CODE:
1145 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1379 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1146 1380
1147void 1381void
1148size (CFPlus::Layout self) 1382size (DC::Layout self)
1149 PPCODE: 1383 PPCODE:
1150{ 1384{
1151 int w, h; 1385 int w, h;
1152 1386
1153 layout_get_pixel_size (self, &w, &h); 1387 layout_get_pixel_size (self, &w, &h);
… …
1156 PUSHs (sv_2mortal (newSViv (w))); 1390 PUSHs (sv_2mortal (newSViv (w)));
1157 PUSHs (sv_2mortal (newSViv (h))); 1391 PUSHs (sv_2mortal (newSViv (h)));
1158} 1392}
1159 1393
1160int 1394int
1161descent (CFPlus::Layout self) 1395descent (DC::Layout self)
1162 CODE: 1396 CODE:
1163{ 1397{
1164 PangoRectangle rect; 1398 PangoRectangle rect;
1165 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1399 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1166 pango_layout_line_get_pixel_extents (line, 0, &rect); 1400 pango_layout_line_get_pixel_extents (line, 0, &rect);
1167 RETVAL = PANGO_DESCENT (rect); 1401 RETVAL = PANGO_DESCENT (rect);
1168} 1402}
1169 OUTPUT: 1403 OUTPUT:
1170 RETVAL 1404 RETVAL
1171 1405
1172int 1406int
1173xy_to_index (CFPlus::Layout self, int x, int y) 1407xy_to_index (DC::Layout self, int x, int y)
1174 CODE: 1408 CODE:
1175{ 1409{
1176 int index, trailing; 1410 int index, trailing;
1177 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1411 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1178 RETVAL = index + trailing; 1412 RETVAL = index + trailing;
1179} 1413}
1180 OUTPUT: 1414 OUTPUT:
1181 RETVAL 1415 RETVAL
1182 1416
1183void 1417void
1184cursor_pos (CFPlus::Layout self, int index) 1418cursor_pos (DC::Layout self, int index)
1185 PPCODE: 1419 PPCODE:
1186{ 1420{
1187 PangoRectangle strong_pos; 1421 PangoRectangle pos;
1188 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1422 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1189 1423
1190 EXTEND (SP, 3); 1424 EXTEND (SP, 3);
1191 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1425 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1192 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1426 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1193 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1427 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1194} 1428}
1195 1429
1196void 1430void
1197index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1431index_to_line_x (DC::Layout self, int index, int trailing = 0)
1198 PPCODE: 1432 PPCODE:
1199{ 1433{
1200 int line, x; 1434 int line, x;
1201 1435
1202 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1436 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1437#if !PANGO_VERSION_CHECK (1, 17, 3)
1203 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1438 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1204 1439 --line;
1440#endif
1205 EXTEND (SP, 2); 1441 EXTEND (SP, 2);
1206 PUSHs (sv_2mortal (newSViv (line - 1))); 1442 PUSHs (sv_2mortal (newSViv (line)));
1207 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1443 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1208} 1444}
1209 1445
1210void 1446void
1211line_x_to_index (CFPlus::Layout self, int line, int x) 1447line_x_to_index (DC::Layout self, int line, int x)
1212 PPCODE: 1448 PPCODE:
1213{ 1449{
1214 PangoLayoutLine *lp; 1450 PangoLayoutLine *lp;
1215 int index, trailing; 1451 int index, trailing;
1216 1452
1217 if (line < 0) 1453 if (line < 0)
1218 XSRETURN_EMPTY; 1454 XSRETURN_EMPTY;
1219 1455
1220 if (!(lp = pango_layout_get_line (self->pl, line))) 1456 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1221 XSRETURN_EMPTY; /* do better */ 1457 XSRETURN_EMPTY; /* do better */
1222 1458
1223 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1459 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1224 1460
1225 EXTEND (SP, 2); 1461 EXTEND (SP, 2);
… …
1231 PUSHs (sv_2mortal (newSViv (trailing))); 1467 PUSHs (sv_2mortal (newSViv (trailing)));
1232 } 1468 }
1233} 1469}
1234 1470
1235void 1471void
1236render (CFPlus::Layout self, float x, float y, int flags = 0) 1472render (DC::Layout self, float x, float y, int flags = 0)
1237 PPCODE: 1473 CODE:
1474 rc_clear (self->rc);
1238 pango_opengl_render_layout_subpixel ( 1475 pango_opengl_render_layout_subpixel (
1239 self->pl, 1476 self->pl,
1477 self->rc,
1240 x * PANGO_SCALE, y * PANGO_SCALE, 1478 x * PANGO_SCALE, y * PANGO_SCALE,
1241 self->r, self->g, self->b, self->a, 1479 self->r, self->g, self->b, self->a,
1242 flags 1480 flags
1243 ); 1481 );
1482 // we assume that context_change actually clears/frees stuff
1483 // and does not do any recomputation...
1484 pango_layout_context_changed (self->pl);
1244 1485
1245MODULE = CFPlus PACKAGE = CFPlus::Texture
1246
1247void 1486void
1248pad2pot (SV *data_, SV *w_, SV *h_) 1487draw (DC::Layout self)
1249 CODE: 1488 CODE:
1250{ 1489{
1251 int ow = SvIV (w_); 1490 glEnable (GL_TEXTURE_2D);
1252 int oh = SvIV (h_); 1491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1492 glEnable (GL_BLEND);
1493 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1494 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1495 glEnable (GL_ALPHA_TEST);
1496 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1253 1497
1254 if (ow && oh) 1498 rc_draw (self->rc);
1499
1500 glDisable (GL_ALPHA_TEST);
1501 glDisable (GL_BLEND);
1502 glDisable (GL_TEXTURE_2D);
1503}
1504
1505MODULE = Deliantra::Client PACKAGE = DC::Texture
1506
1507PROTOTYPES: ENABLE
1508
1509void
1510pad (SV *data_, int ow, int oh, int nw, int nh)
1511 CODE:
1512{
1513 if ((nw != ow || nh != oh) && SvOK (data_))
1255 { 1514 {
1256 int nw = minpot (ow);
1257 int nh = minpot (oh);
1258
1259 if (nw != ow || nh != oh)
1260 {
1261 if (SvOK (data_))
1262 {
1263 STRLEN datalen; 1515 STRLEN datalen;
1264 char *data = SvPVbyte (data_, datalen); 1516 char *data = SvPVbyte (data_, datalen);
1265 int bpp = datalen / (ow * oh); 1517 int bpp = datalen / (ow * oh);
1266 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1518 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1267 1519
1268 SvPOK_only (result_); 1520 SvPOK_only (result_);
1269 SvCUR_set (result_, nw * nh * bpp); 1521 SvCUR_set (result_, nw * nh * bpp);
1270 1522
1271 memset (SvPVX (result_), 0, nw * nh * bpp); 1523 memset (SvPVX (result_), 0, nw * nh * bpp);
1272 while (oh--) 1524 while (oh--)
1273 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1525 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1274 1526
1275 sv_setsv (data_, result_); 1527 sv_setsv (data_, result_);
1276 }
1277
1278 sv_setiv (w_, nw);
1279 sv_setiv (h_, nh);
1280 }
1281 } 1528 }
1282} 1529}
1283 1530
1284void 1531void
1285draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1532draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1291{ 1538{
1292 HV *hv = (HV *)SvRV (self); 1539 HV *hv = (HV *)SvRV (self);
1293 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1540 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1294 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1541 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1295 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1542 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1543
1544 if (name <= 0)
1545 XSRETURN_EMPTY;
1296 1546
1297 if (items < 5) 1547 if (items < 5)
1298 { 1548 {
1299 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1549 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1300 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1550 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1328 glDisable (GL_ALPHA_TEST); 1578 glDisable (GL_ALPHA_TEST);
1329 glDisable (GL_BLEND); 1579 glDisable (GL_BLEND);
1330 } 1580 }
1331} 1581}
1332 1582
1333MODULE = CFPlus PACKAGE = CFPlus::Map 1583IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1584 CODE:
1585{
1586 GLint width;
1587 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1588 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1589 RETVAL = width > 0;
1590}
1591 OUTPUT:
1592 RETVAL
1334 1593
1335CFPlus::Map 1594MODULE = Deliantra::Client PACKAGE = DC::Map
1595
1596PROTOTYPES: DISABLE
1597
1598DC::Map
1336new (SV *class) 1599new (SV *class)
1337 CODE: 1600 CODE:
1338 New (0, RETVAL, 1, struct map); 1601 New (0, RETVAL, 1, struct map);
1339 RETVAL->x = 0; 1602 RETVAL->x = 0;
1340 RETVAL->y = 0; 1603 RETVAL->y = 0;
… …
1348 RETVAL->row = 0; 1611 RETVAL->row = 0;
1349 OUTPUT: 1612 OUTPUT:
1350 RETVAL 1613 RETVAL
1351 1614
1352void 1615void
1353DESTROY (CFPlus::Map self) 1616DESTROY (DC::Map self)
1354 CODE: 1617 CODE:
1355{ 1618{
1356 map_clear (self); 1619 map_clear (self);
1357 Safefree (self->face2tile); 1620 Safefree (self->face2tile);
1358 Safefree (self->tex); 1621 Safefree (self->tex);
1359 Safefree (self); 1622 Safefree (self);
1360} 1623}
1361 1624
1362void 1625void
1363resize (CFPlus::Map self, int map_width, int map_height) 1626resize (DC::Map self, int map_width, int map_height)
1364 CODE: 1627 CODE:
1365 self->w = map_width; 1628 self->w = map_width;
1366 self->h = map_height; 1629 self->h = map_height;
1367 1630
1368void 1631void
1369clear (CFPlus::Map self) 1632clear (DC::Map self)
1370 CODE: 1633 CODE:
1371 map_clear (self); 1634 map_clear (self);
1372 1635
1373void 1636void
1374set_tileid (CFPlus::Map self, int face, int tile) 1637set_tileid (DC::Map self, int face, int tile)
1375 CODE: 1638 CODE:
1376{ 1639{
1377 need_facenum (self, face); self->face2tile [face] = tile; 1640 need_facenum (self, face); self->face2tile [face] = tile;
1378 need_texid (self, tile); 1641 need_texid (self, tile);
1379} 1642}
1380 1643
1381void 1644void
1382set_smooth (CFPlus::Map self, int face, int smooth, int level) 1645set_smooth (DC::Map self, int face, int smooth, int level)
1383 CODE: 1646 CODE:
1384{ 1647{
1385 tileid texid; 1648 tileid texid;
1386 maptex *tex; 1649 maptex *tex;
1387 1650
… …
1400 tex->smoothtile = self->face2tile [smooth]; 1663 tex->smoothtile = self->face2tile [smooth];
1401 tex->smoothlevel = level; 1664 tex->smoothlevel = level;
1402} 1665}
1403 1666
1404void 1667void
1405set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1668set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1406 CODE: 1669 CODE:
1407{ 1670{
1408 need_texid (self, texid); 1671 need_texid (self, texid);
1409 1672
1410 { 1673 {
… …
1430 // from transparent color bleeding and ugly wrapping effects. 1693 // from transparent color bleeding and ugly wrapping effects.
1431 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1432} 1695}
1433 1696
1434int 1697int
1435ox (CFPlus::Map self) 1698ox (DC::Map self)
1436 ALIAS: 1699 ALIAS:
1437 oy = 1 1700 oy = 1
1438 x = 2 1701 x = 2
1439 y = 3 1702 y = 3
1440 w = 4 1703 w = 4
… …
1451 } 1714 }
1452 OUTPUT: 1715 OUTPUT:
1453 RETVAL 1716 RETVAL
1454 1717
1455void 1718void
1456scroll (CFPlus::Map self, int dx, int dy) 1719scroll (DC::Map self, int dx, int dy)
1457 CODE: 1720 CODE:
1458{ 1721{
1459 if (dx > 0) 1722 if (dx > 0)
1460 map_blank (self, self->x, self->y, dx, self->h); 1723 map_blank (self, self->x, self->y, dx, self->h);
1461 else if (dx < 0) 1724 else if (dx < 0)
… …
1476 self->rows += MAP_EXTEND_Y; 1739 self->rows += MAP_EXTEND_Y;
1477 self->y += MAP_EXTEND_Y; 1740 self->y += MAP_EXTEND_Y;
1478 } 1741 }
1479} 1742}
1480 1743
1481void 1744SV *
1482map1a_update (CFPlus::Map self, SV *data_, int extmap) 1745map1a_update (DC::Map self, SV *data_, int extmap)
1483 CODE: 1746 CODE:
1484{ 1747{
1485 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1748 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1486 uint8_t *data_end = (uint8_t *)SvEND (data_); 1749 uint8_t *data_end = (uint8_t *)SvEND (data_);
1487 mapcell *cell; 1750 mapcell *cell;
1488 int x, y, flags; 1751 int x, y, z, flags;
1752 AV *missing = newAV ();
1753 RETVAL = newRV_noinc ((SV *)missing);
1489 1754
1490 while (data < data_end - 1) 1755 while (data < data_end - 1)
1491 { 1756 {
1492 flags = (data [0] << 8) + data [1]; data += 2; 1757 flags = (data [0] << 8) + data [1]; data += 2;
1493 1758
… …
1513 uint8_t ext, cmd; 1778 uint8_t ext, cmd;
1514 1779
1515 do 1780 do
1516 { 1781 {
1517 ext = *data++; 1782 ext = *data++;
1518 cmd = ext & 0x3f; 1783 cmd = ext & 0x7f;
1519 1784
1520 if (cmd < 4) 1785 if (cmd < 4)
1521 cell->darkness = 255 - ext * 64 + 1; 1786 cell->darkness = 255 - ext * 64 + 1;
1522 else if (cmd == 5) // health 1787 else if (cmd == 5) // health
1523 { 1788 {
… …
1526 } 1791 }
1527 else if (cmd == 6) // monster width 1792 else if (cmd == 6) // monster width
1528 cell->stat_width = *data++ + 1; 1793 cell->stat_width = *data++ + 1;
1529 else if (cmd == 0x47) 1794 else if (cmd == 0x47)
1530 { 1795 {
1531 if (*data == 4) 1796 if (*data == 1) cell->player = data [1];
1532 ; // decode player count 1797 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1798 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1799 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1533 1800
1534 data += *data + 1; 1801 data += *data + 1;
1535 } 1802 }
1536 else if (cmd == 8) // cell flags 1803 else if (cmd == 8) // cell flags
1537 cell->flags = *data++; 1804 cell->flags = *data++;
… …
1544 } 1811 }
1545 else 1812 else
1546 cell->darkness = *data++ + 1; 1813 cell->darkness = *data++ + 1;
1547 } 1814 }
1548 1815
1816 for (z = 0; z <= 2; ++z)
1549 if (flags & 4) 1817 if (flags & (4 >> z))
1550 { 1818 {
1551 faceid face = (data [0] << 8) + data [1]; data += 2; 1819 faceid face = (data [0] << 8) + data [1]; data += 2;
1552 need_facenum (self, face); 1820 need_facenum (self, face);
1553 cell->tile [0] = self->face2tile [face]; 1821 cell->tile [z] = self->face2tile [face];
1822
1823 if (cell->tile [z])
1824 {
1825 maptex *tex = self->tex + cell->tile [z];
1826 if (!tex->name)
1827 av_push (missing, newSViv (cell->tile [z]));
1828
1829 if (tex->smoothtile)
1830 {
1831 maptex *smooth = self->tex + tex->smoothtile;
1832 if (!smooth->name)
1833 av_push (missing, newSViv (tex->smoothtile));
1834 }
1835 }
1554 } 1836 }
1555
1556 if (flags & 2)
1557 {
1558 faceid face = (data [0] << 8) + data [1]; data += 2;
1559 need_facenum (self, face);
1560 cell->tile [1] = self->face2tile [face];
1561 }
1562
1563 if (flags & 1)
1564 {
1565 faceid face = (data [0] << 8) + data [1]; data += 2;
1566 need_facenum (self, face);
1567 cell->tile [2] = self->face2tile [face];
1568 }
1569 } 1837 }
1570 else 1838 else
1571 cell->darkness = 0; 1839 CELL_CLEAR (cell);
1572 } 1840 }
1573} 1841}
1842 OUTPUT:
1843 RETVAL
1574 1844
1575SV * 1845SV *
1576mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1846mapmap (DC::Map self, int x0, int y0, int w, int h)
1577 CODE: 1847 CODE:
1578{ 1848{
1579 int x1, x; 1849 int x1, x;
1580 int y1, y; 1850 int y1, y;
1581 int z; 1851 int z;
… …
1626} 1896}
1627 OUTPUT: 1897 OUTPUT:
1628 RETVAL 1898 RETVAL
1629 1899
1630void 1900void
1631draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1901draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1632 CODE: 1902 CODE:
1633{ 1903{
1904 int x, y, z;
1905
1634 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1906 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1635 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1907 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1636 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1908 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1637 smooth_key skey; 1909 smooth_key skey;
1638 int x, y, z; 1910 int pl_x, pl_y;
1639 int last_name; 1911 maptex pl_tex;
1912 rc_t *rc = rc_alloc ();
1913 rc_key_t key;
1914 rc_array_t *arr;
1915
1916 pl_tex.name = 0;
1640 1917
1641 // thats current max. sorry. 1918 // thats current max. sorry.
1642 if (sw > 255) sw = 255; 1919 if (sw > 255) sw = 255;
1643 if (sh > 255) sh = 255; 1920 if (sh > 255) sh = 255;
1644 1921
1645 // clear key, in case of extra padding 1922 // clear key, in case of extra padding
1646 memset (&skey, 0, sizeof (skey)); 1923 memset (&skey, 0, sizeof (skey));
1647 1924
1648 glColor4ub (255, 255, 255, 255); 1925 memset (&key, 0, sizeof (key));
1649 1926 key.r = 255;
1650 glEnable (GL_BLEND); 1927 key.g = 255;
1651 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1928 key.b = 255;
1652 glEnable (GL_TEXTURE_2D); 1929 key.a = 255;
1653 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1930 key.mode = GL_QUADS;
1654 1931 key.format = GL_T2F_V3F;
1655 glBegin (GL_QUADS); 1932 key.texname = -1;
1656
1657 last_name = 0;
1658 1933
1659 mx += self->x; 1934 mx += self->x;
1660 my += self->y; 1935 my += self->y;
1661 1936
1662 // first pass: determine smooth_max 1937 // first pass: determine smooth_max
… …
1678 MAX (self->tex [cell->tile [0]].smoothlevel, 1953 MAX (self->tex [cell->tile [0]].smoothlevel,
1679 MAX (self->tex [cell->tile [1]].smoothlevel, 1954 MAX (self->tex [cell->tile [1]].smoothlevel,
1680 self->tex [cell->tile [2]].smoothlevel)); 1955 self->tex [cell->tile [2]].smoothlevel));
1681 } 1956 }
1682 } 1957 }
1958
1959 glEnable (GL_BLEND);
1960 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1961 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1683 1962
1684 for (z = 0; z <= 2; z++) 1963 for (z = 0; z <= 2; z++)
1685 { 1964 {
1686 memset (smooth_level, 0, sizeof (smooth_level)); 1965 memset (smooth_level, 0, sizeof (smooth_level));
1687 1966
… …
1700 { 1979 {
1701 maptex tex = self->tex [tile]; 1980 maptex tex = self->tex [tile];
1702 int px = (x + 1) * T - tex.w; 1981 int px = (x + 1) * T - tex.w;
1703 int py = (y + 1) * T - tex.h; 1982 int py = (y + 1) * T - tex.h;
1704 1983
1705 // suppressing texture state switches here
1706 // is only moderately effective, but worth the extra effort
1707 if (last_name != tex.name) 1984 if (key.texname != tex.name)
1708 { 1985 {
1709 if (!tex.name) 1986 if (!tex.name)
1710 tex = self->tex [2]; /* missing, replace by noface */ 1987 tex = self->tex [2]; /* missing, replace by noface */
1711 1988
1712 glEnd (); 1989 key.texname = tex.name;
1713 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1990 arr = rc_array (rc, &key);
1714 glBegin (GL_QUADS);
1715 } 1991 }
1716 1992
1717 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1993 if (expect_false (cell->player == player) && expect_false (z == 2))
1718 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1719 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1720 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1721
1722 if (cell->flags && z == 2)
1723 { 1994 {
1995 pl_x = px;
1996 pl_y = py;
1997 pl_tex = tex;
1998 continue;
1999 }
2000
2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2002 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2003 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2004 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2005
2006 if (expect_false (cell->flags) && expect_false (z == 2))
2007 {
2008 // overlays such as the speech bubble, probably more to come
1724 if (cell->flags & 1) 2009 if (cell->flags & 1)
1725 { 2010 {
1726 maptex tex = self->tex [1]; 2011 maptex tex = self->tex [1];
1727 int px = x * T + T * 2 / 32; 2012 int px = x * T + T * 2 / 32;
1728 int py = y * T - T * 6 / 32; 2013 int py = y * T - T * 6 / 32;
1729 2014
2015 if (tex.name)
1730 glEnd (); 2016 {
1731 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2017 if (key.texname != tex.name)
2018 {
2019 key.texname = tex.name;
2020 arr = rc_array (rc, &key);
2021 }
2022
2023 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2024 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2025 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1732 glBegin (GL_QUADS); 2027 }
1733
1734 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1735 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1736 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1737 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1738 } 2028 }
1739 } 2029 }
1740 2030
1741 // update smooth hash 2031 // update smooth hash
1742 if (tex.smoothtile) 2032 if (tex.smoothtile)
… …
1778 } 2068 }
1779 } 2069 }
1780 } 2070 }
1781 } 2071 }
1782 2072
2073 rc_draw (rc);
2074 rc_clear (rc);
2075
1783 // go through all smoothlevels, lowest to highest, then draw. 2076 // go through all smoothlevels, lowest to highest, then draw.
1784 // this is basically counting sort 2077 // this is basically counting sort
1785 { 2078 {
1786 int w, b; 2079 int w, b;
1787 2080
2081 glEnable (GL_TEXTURE_2D);
2082 glBegin (GL_QUADS);
1788 for (w = 0; w < 256 / 32; ++w) 2083 for (w = 0; w < 256 / 32; ++w)
1789 { 2084 {
1790 uint32_t smask = smooth_level [w]; 2085 uint32_t smask = smooth_level [w];
1791 if (smask) 2086 if (smask)
1792 for (b = 0; b < 32; ++b) 2087 for (b = 0; b < 32; ++b)
… …
1811 int border = bits & 15; 2106 int border = bits & 15;
1812 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2107 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1813 float dx = tex.s * .0625f; // 16 images/row 2108 float dx = tex.s * .0625f; // 16 images/row
1814 float dy = tex.t * .5f ; // 2 images/column 2109 float dy = tex.t * .5f ; // 2 images/column
1815 2110
1816 // this time naively avoiding texture state changes
1817 // save gobs of state changes.
1818 if (last_name != tex.name) 2111 if (tex.name)
1819 { 2112 {
2113 // this time avoiding texture state changes
2114 // save gobs of state changes.
1820 if (!tex.name) 2115 if (key.texname != tex.name)
1821 continue; // smoothing not yet available 2116 {
1822
1823 glEnd (); 2117 glEnd ();
1824 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2118 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1825 glBegin (GL_QUADS); 2119 glBegin (GL_QUADS);
1826 } 2120 }
1827 2121
1828 if (border) 2122 if (border)
1829 { 2123 {
1830 float ox = border * dx; 2124 float ox = border * dx;
1831 2125
1832 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2126 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1833 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2127 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1834 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2128 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1835 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2129 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1836 } 2130 }
1837 2131
1838 if (corner) 2132 if (corner)
1839 { 2133 {
1840 float ox = corner * dx; 2134 float ox = corner * dx;
1841 2135
1842 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2136 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1843 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2137 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1844 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2138 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1845 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2139 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2140 }
1846 } 2141 }
1847 } 2142 }
1848 } 2143 }
1849 } 2144 }
1850 } 2145 }
2146
2147 glEnd ();
2148 glDisable (GL_TEXTURE_2D);
2149 key.texname = -1;
1851 } 2150 }
1852 2151
1853 hv_clear (smooth); 2152 hv_clear (smooth);
1854 } 2153 }
1855 2154
1856 glEnd (); 2155 if (pl_tex.name)
2156 {
2157 maptex tex = pl_tex;
2158 int px = pl_x + sdx;
2159 int py = pl_y + sdy;
1857 2160
1858 glDisable (GL_TEXTURE_2D); 2161 key.texname = tex.name;
2162 arr = rc_array (rc, &key);
2163
2164 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2165 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2166 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2167 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2168
2169 rc_draw (rc);
2170 }
2171
1859 glDisable (GL_BLEND); 2172 glDisable (GL_BLEND);
2173 rc_free (rc);
1860 2174
1861 // top layer: overlays such as the health bar 2175 // top layer: overlays such as the health bar
1862 for (y = 0; y < sh; y++) 2176 for (y = 0; y < sh; y++)
1863 if (0 <= y + my && y + my < self->rows) 2177 if (0 <= y + my && y + my < self->rows)
1864 { 2178 {
… …
1889 } 2203 }
1890 } 2204 }
1891} 2205}
1892 2206
1893void 2207void
1894draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2208draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1895 CODE: 2209 CODE:
1896{ 2210{
1897 static float color[16][3] = { 2211 static float color[16][3] = {
1898 { 0.00F, 0.00F, 0.00F }, 2212 { 0.00F, 0.00F, 0.00F },
1899 { 1.00F, 1.00F, 1.00F }, 2213 { 1.00F, 1.00F, 1.00F },
… …
1949 glDisable (GL_BLEND); 2263 glDisable (GL_BLEND);
1950 glDisable (GL_TEXTURE_2D); 2264 glDisable (GL_TEXTURE_2D);
1951} 2265}
1952 2266
1953void 2267void
1954fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2268fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1955 PPCODE: 2269 PPCODE:
1956{ 2270{
1957 int x, y; 2271 int x, y;
2272 int sw1 = sw + 2;
2273 int sh1 = sh + 2;
2274 int sh3 = sh * 3;
1958 int sw4 = (sw + 3) & ~3; 2275 int sw34 = (sw * 3 + 3) & ~3;
2276 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1959 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2277 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1960 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2278 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1961 2279
1962 memset (darkness, 255, sw4 * sh);
1963 SvPOK_only (darkness_sv); 2280 SvPOK_only (darkness3_sv);
1964 SvCUR_set (darkness_sv, sw4 * sh); 2281 SvCUR_set (darkness3_sv, sw34 * sh3);
1965 2282
1966 mx += self->x; 2283 mx += self->x - 1;
1967 my += self->y; 2284 my += self->y - 1;
1968 2285
2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2287
1969 for (y = 0; y < sh; y++) 2288 for (y = 0; y < sh1; y++)
1970 if (0 <= y + my && y + my < self->rows) 2289 if (0 <= y + my && y + my < self->rows)
1971 { 2290 {
1972 maprow *row = self->row + (y + my); 2291 maprow *row = self->row + (y + my);
1973 2292
1974 for (x = 0; x < sw; x++) 2293 for (x = 0; x < sw1; x++)
1975 if (row->c0 <= x + mx && x + mx < row->c1) 2294 if (row->c0 <= x + mx && x + mx < row->c1)
1976 { 2295 {
1977 mapcell *cell = row->col + (x + mx - row->c0); 2296 mapcell *cell = row->col + (x + mx - row->c0);
1978 2297
1979 darkness[y * sw4 + x] = cell->darkness 2298 darkness1 [y * sw1 + x] = cell->darkness
1980 ? 255 - (cell->darkness - 1) 2299 ? 255 - (cell->darkness - 1)
1981 : 255 - FOW_DARKNESS; 2300 : 255 - FOW_DARKNESS;
1982 } 2301 }
1983 } 2302 }
1984 2303
2304 for (y = 0; y < sh; ++y)
2305 for (x = 0; x < sw; ++x)
2306 {
2307 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2308 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2309 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2310 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2311 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2312 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2313 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2314 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2315 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2316
2317 uint8_t r11 = (d11 + d21 + d12) / 3;
2318 uint8_t r21 = d21;
2319 uint8_t r31 = (d21 + d31 + d32) / 3;
2320
2321 uint8_t r12 = d12;
2322 uint8_t r22 = d22;
2323 uint8_t r32 = d32;
2324
2325 uint8_t r13 = (d13 + d23 + d12) / 3;
2326 uint8_t r23 = d23;
2327 uint8_t r33 = (d23 + d33 + d32) / 3;
2328
2329 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2330 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2331 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2332 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2333 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2334 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2335 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2336 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2337 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2338 }
2339
2340 free (darkness1);
2341
1985 EXTEND (SP, 3); 2342 EXTEND (SP, 3);
1986 PUSHs (sv_2mortal (newSViv (sw4))); 2343 PUSHs (sv_2mortal (newSViv (sw34)));
1987 PUSHs (sv_2mortal (newSViv (sh))); 2344 PUSHs (sv_2mortal (newSViv (sh3)));
1988 PUSHs (darkness_sv); 2345 PUSHs (darkness3_sv);
1989} 2346}
1990 2347
1991SV * 2348SV *
1992get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2349get_rect (DC::Map self, int x0, int y0, int w, int h)
1993 CODE: 2350 CODE:
1994{ 2351{
1995 int x, y, x1, y1; 2352 int x, y, x1, y1;
1996 SV *data_sv = newSV (w * h * 7 + 5); 2353 SV *data_sv = newSV (w * h * 7 + 5);
1997 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2354 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2054 else 2411 else
2055 *data++ = 0; 2412 *data++ = 0;
2056 } 2413 }
2057 } 2414 }
2058 2415
2416 /* if size is w*h + 5 then no data has been found */
2417 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2418 {
2059 SvPOK_only (data_sv); 2419 SvPOK_only (data_sv);
2060 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2420 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2421 }
2422
2061 RETVAL = data_sv; 2423 RETVAL = data_sv;
2062} 2424}
2063 OUTPUT: 2425 OUTPUT:
2064 RETVAL 2426 RETVAL
2065 2427
2066void 2428void
2067set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2429set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2068 PPCODE: 2430 PPCODE:
2069{ 2431{
2070 int x, y, z; 2432 int x, y, z;
2071 int w, h; 2433 int w, h;
2072 int x1, y1; 2434 int x1, y1;
2435 STRLEN len;
2436 uint8_t *data, *end;
2437
2438 len = SvLEN (data_sv);
2439 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2440 data = SvPVbyte_nolen (data_sv);
2441 end = data + len + 8;
2442
2443 if (len < 5)
2444 XSRETURN_EMPTY;
2073 2445
2074 if (*data++ != 0) 2446 if (*data++ != 0)
2075 return; /* version mismatch */ 2447 XSRETURN_EMPTY; /* version mismatch */
2076 2448
2077 w = *data++ << 8; w |= *data++; 2449 w = *data++ << 8; w |= *data++;
2078 h = *data++ << 8; h |= *data++; 2450 h = *data++ << 8; h |= *data++;
2079 2451
2080 // we need to do this 'cause we don't keep an absolute coord system for rows 2452 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2092 { 2464 {
2093 maprow *row = map_get_row (self, y); 2465 maprow *row = map_get_row (self, y);
2094 2466
2095 for (x = x0; x < x1; x++) 2467 for (x = x0; x < x1; x++)
2096 { 2468 {
2469 uint8_t flags;
2470
2471 if (data + 7 >= end)
2472 XSRETURN_EMPTY;
2473
2097 uint8_t flags = *data++; 2474 flags = *data++;
2098 2475
2099 if (flags) 2476 if (flags)
2100 { 2477 {
2101 mapcell *cell = row_get_cell (row, x); 2478 mapcell *cell = row_get_cell (row, x);
2102 tileid tile[3] = { 0, 0, 0 }; 2479 tileid tile[3] = { 0, 0, 0 };
… …
2105 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2482 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2106 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2483 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2107 2484
2108 if (cell->darkness == 0) 2485 if (cell->darkness == 0)
2109 { 2486 {
2110 cell->darkness = 0; 2487 /*cell->darkness = 0;*/
2488 EXTEND (SP, 3);
2111 2489
2112 for (z = 0; z <= 2; z++) 2490 for (z = 0; z <= 2; z++)
2113 { 2491 {
2114 tileid t = tile [z]; 2492 tileid t = tile [z];
2115 2493
2116 if (t >= self->texs || (t && !self->tex [t].name)) 2494 if (t >= self->texs || (t && !self->tex [t].name))
2117 { 2495 {
2118 XPUSHs (sv_2mortal (newSViv (t))); 2496 PUSHs (sv_2mortal (newSViv (t)));
2119 need_texid (self, t); 2497 need_texid (self, t);
2120 } 2498 }
2121 2499
2122 cell->tile [z] = t; 2500 cell->tile [z] = t;
2123 } 2501 }
… …
2125 } 2503 }
2126 } 2504 }
2127 } 2505 }
2128} 2506}
2129 2507
2130MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2508MODULE = Deliantra::Client PACKAGE = DC::RW
2131 2509
2132CFPlus::MixChunk 2510DC::RW
2133new_from_file (SV *class, char *path) 2511new (SV *class, SV *data_sv)
2134 CODE: 2512 CODE:
2135 RETVAL = Mix_LoadWAV (path); 2513{
2514 STRLEN datalen;
2515 char *data = SvPVbyte (data_sv, datalen);
2516
2517 RETVAL = SDL_RWFromConstMem (data, datalen);
2518}
2136 OUTPUT: 2519 OUTPUT:
2137 RETVAL 2520 RETVAL
2138 2521
2522DC::RW
2523new_from_file (SV *class, const char *path, const char *mode = "rb")
2524 CODE:
2525 RETVAL = SDL_RWFromFile (path, mode);
2526 OUTPUT:
2527 RETVAL
2528
2529# fails on win32:
2530# dc.xs(2268) : error C2059: syntax error : '('
2139void 2531#void
2532#close (DC::RW self)
2533# CODE:
2534# (self->(close)) (self);
2535
2536MODULE = Deliantra::Client PACKAGE = DC::Channel
2537
2538PROTOTYPES: DISABLE
2539
2540DC::Channel
2541find ()
2542 CODE:
2543{
2544 RETVAL = Mix_GroupAvailable (-1);
2545
2546 if (RETVAL < 0)
2547 {
2548 RETVAL = Mix_GroupOldest (-1);
2549
2550 if (RETVAL < 0)
2551 XSRETURN_UNDEF;
2552
2553 Mix_HaltChannel (RETVAL);
2554 }
2555
2556 Mix_UnregisterAllEffects (RETVAL);
2557 Mix_Volume (RETVAL, 128);
2558}
2559 OUTPUT:
2560 RETVAL
2561
2562void
2563halt (DC::Channel self)
2564 CODE:
2565 Mix_HaltChannel (self);
2566
2567void
2568expire (DC::Channel self, int ticks = -1)
2569 CODE:
2570 Mix_ExpireChannel (self, ticks);
2571
2572void
2573fade_out (DC::Channel self, int ticks = -1)
2574 CODE:
2575 Mix_FadeOutChannel (self, ticks);
2576
2577int
2578volume (DC::Channel self, int volume)
2579 CODE:
2580 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2581 OUTPUT:
2582 RETVAL
2583
2584void
2585unregister_all_effects (DC::Channel self)
2586 CODE:
2587 Mix_UnregisterAllEffects (self);
2588
2589void
2590set_panning (DC::Channel self, int left, int right)
2591 CODE:
2592 left = CLAMP (left , 0, 255);
2593 right = CLAMP (right, 0, 255);
2594 Mix_SetPanning (self, left, right);
2595
2596void
2597set_distance (DC::Channel self, int distance)
2598 CODE:
2599 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2600
2601void
2602set_position (DC::Channel self, int angle, int distance)
2603 CODE:
2604
2605void
2606set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2607 CODE:
2608{
2609 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2610 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2611 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2612}
2613
2614void
2615set_reverse_stereo (DC::Channel self, int flip)
2616 CODE:
2617 Mix_SetReverseStereo (self, flip);
2618
2619MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2620
2621PROTOTYPES: DISABLE
2622
2623DC::MixChunk
2624new (SV *class, DC::RW rwops)
2625 CODE:
2626 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2627 OUTPUT:
2628 RETVAL
2629
2630void
2140DESTROY (CFPlus::MixChunk self) 2631DESTROY (DC::MixChunk self)
2141 CODE: 2632 CODE:
2142 Mix_FreeChunk (self); 2633 Mix_FreeChunk (self);
2143 2634
2144int 2635int
2145volume (CFPlus::MixChunk self, int volume = -1) 2636volume (DC::MixChunk self, int volume = -1)
2146 CODE: 2637 CODE:
2638 if (items > 1)
2639 volume = CLAMP (volume, 0, 128);
2147 RETVAL = Mix_VolumeChunk (self, volume); 2640 RETVAL = Mix_VolumeChunk (self, volume);
2148 OUTPUT: 2641 OUTPUT:
2149 RETVAL 2642 RETVAL
2150 2643
2151int 2644DC::Channel
2152play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2645play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2153 CODE: 2646 CODE:
2647{
2154 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2648 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2649
2650 if (RETVAL < 0)
2651 XSRETURN_UNDEF;
2652
2653 if (channel < 0)
2654 {
2655 Mix_UnregisterAllEffects (RETVAL);
2656 Mix_Volume (RETVAL, 128);
2657 }
2658}
2155 OUTPUT: 2659 OUTPUT:
2156 RETVAL 2660 RETVAL
2157 2661
2158MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2662MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2159 2663
2160int 2664int
2161volume (int volume = -1) 2665volume (int volume = -1)
2666 PROTOTYPE: ;$
2162 CODE: 2667 CODE:
2668 if (items > 0)
2669 volume = CLAMP (volume, 0, 128);
2163 RETVAL = Mix_VolumeMusic (volume); 2670 RETVAL = Mix_VolumeMusic (volume);
2164 OUTPUT: 2671 OUTPUT:
2165 RETVAL 2672 RETVAL
2166 2673
2674void
2675fade_out (int ms)
2676 CODE:
2677 Mix_FadeOutMusic (ms);
2678
2679void
2680halt ()
2681 CODE:
2682 Mix_HaltMusic ();
2683
2684DC::MixMusic
2685new (SV *class, DC::RW rwops)
2686 CODE:
2687 RETVAL = Mix_LoadMUS_RW (rwops);
2688 OUTPUT:
2689 RETVAL
2690
2691void
2692DESTROY (DC::MixMusic self)
2693 CODE:
2694 Mix_FreeMusic (self);
2695
2167int 2696int
2168fade_out (int ms)
2169 CODE:
2170 RETVAL = Mix_FadeOutMusic (ms);
2171 OUTPUT:
2172 RETVAL
2173
2174CFPlus::MixMusic
2175new_from_file (SV *class, char *path)
2176 CODE:
2177 RETVAL = Mix_LoadMUS (path);
2178 OUTPUT:
2179 RETVAL
2180
2181void
2182DESTROY (CFPlus::MixMusic self)
2183 CODE:
2184 Mix_FreeMusic (self);
2185
2186int
2187play (CFPlus::MixMusic self, int loops = -1) 2697play (DC::MixMusic self, int loops = -1)
2188 CODE: 2698 CODE:
2189 RETVAL = Mix_PlayMusic (self, loops); 2699 RETVAL = Mix_PlayMusic (self, loops);
2190 OUTPUT: 2700 OUTPUT:
2191 RETVAL 2701 RETVAL
2192 2702
2193int 2703void
2194fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2704fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2195 CODE: 2705 CODE:
2196 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2706 Mix_FadeInMusicPos (self, loops, ms, position);
2197 OUTPUT:
2198 RETVAL
2199 2707
2200MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2708MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2709
2710PROTOTYPES: ENABLE
2201 2711
2202BOOT: 2712BOOT:
2203{ 2713{
2204 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2714 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2205 static const struct { 2715 static const struct {
2206 const char *name; 2716 const char *name;
2207 IV iv; 2717 IV iv;
2208 } *civ, const_iv[] = { 2718 } *civ, const_iv[] = {
2209# define const_iv(name) { # name, (IV)name } 2719# define const_iv(name) { # name, (IV)name }
2720 const_iv (GL_VENDOR),
2721 const_iv (GL_VERSION),
2722 const_iv (GL_EXTENSIONS),
2210 const_iv (GL_COLOR_MATERIAL), 2723 const_iv (GL_COLOR_MATERIAL),
2211 const_iv (GL_SMOOTH), 2724 const_iv (GL_SMOOTH),
2212 const_iv (GL_FLAT), 2725 const_iv (GL_FLAT),
2213 const_iv (GL_DITHER), 2726 const_iv (GL_DITHER),
2214 const_iv (GL_BLEND), 2727 const_iv (GL_BLEND),
… …
2218 const_iv (GL_ALPHA_TEST), 2731 const_iv (GL_ALPHA_TEST),
2219 const_iv (GL_NORMALIZE), 2732 const_iv (GL_NORMALIZE),
2220 const_iv (GL_RESCALE_NORMAL), 2733 const_iv (GL_RESCALE_NORMAL),
2221 const_iv (GL_FRONT), 2734 const_iv (GL_FRONT),
2222 const_iv (GL_BACK), 2735 const_iv (GL_BACK),
2736 const_iv (GL_AUX0),
2223 const_iv (GL_AND), 2737 const_iv (GL_AND),
2224 const_iv (GL_ONE), 2738 const_iv (GL_ONE),
2225 const_iv (GL_ZERO), 2739 const_iv (GL_ZERO),
2226 const_iv (GL_SRC_ALPHA), 2740 const_iv (GL_SRC_ALPHA),
2227 const_iv (GL_DST_ALPHA), 2741 const_iv (GL_DST_ALPHA),
… …
2240 const_iv (GL_INTENSITY), 2754 const_iv (GL_INTENSITY),
2241 const_iv (GL_LUMINANCE), 2755 const_iv (GL_LUMINANCE),
2242 const_iv (GL_LUMINANCE_ALPHA), 2756 const_iv (GL_LUMINANCE_ALPHA),
2243 const_iv (GL_FLOAT), 2757 const_iv (GL_FLOAT),
2244 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2758 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2759 const_iv (GL_COMPRESSED_ALPHA_ARB),
2760 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2761 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2762 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2763 const_iv (GL_COMPRESSED_RGB_ARB),
2764 const_iv (GL_COMPRESSED_RGBA_ARB),
2245 const_iv (GL_COMPILE), 2765 const_iv (GL_COMPILE),
2766 const_iv (GL_PROXY_TEXTURE_1D),
2767 const_iv (GL_PROXY_TEXTURE_2D),
2246 const_iv (GL_TEXTURE_1D), 2768 const_iv (GL_TEXTURE_1D),
2247 const_iv (GL_TEXTURE_2D), 2769 const_iv (GL_TEXTURE_2D),
2248 const_iv (GL_TEXTURE_ENV), 2770 const_iv (GL_TEXTURE_ENV),
2249 const_iv (GL_TEXTURE_MAG_FILTER), 2771 const_iv (GL_TEXTURE_MAG_FILTER),
2250 const_iv (GL_TEXTURE_MIN_FILTER), 2772 const_iv (GL_TEXTURE_MIN_FILTER),
… …
2271 const_iv (GL_COLOR_LOGIC_OP), 2793 const_iv (GL_COLOR_LOGIC_OP),
2272 const_iv (GL_SEPARABLE_2D), 2794 const_iv (GL_SEPARABLE_2D),
2273 const_iv (GL_CONVOLUTION_2D), 2795 const_iv (GL_CONVOLUTION_2D),
2274 const_iv (GL_CONVOLUTION_BORDER_MODE), 2796 const_iv (GL_CONVOLUTION_BORDER_MODE),
2275 const_iv (GL_CONSTANT_BORDER), 2797 const_iv (GL_CONSTANT_BORDER),
2798 const_iv (GL_POINTS),
2276 const_iv (GL_LINES), 2799 const_iv (GL_LINES),
2277 const_iv (GL_LINE_STRIP), 2800 const_iv (GL_LINE_STRIP),
2278 const_iv (GL_LINE_LOOP), 2801 const_iv (GL_LINE_LOOP),
2279 const_iv (GL_QUADS), 2802 const_iv (GL_QUADS),
2280 const_iv (GL_QUAD_STRIP), 2803 const_iv (GL_QUAD_STRIP),
2281 const_iv (GL_TRIANGLES), 2804 const_iv (GL_TRIANGLES),
2282 const_iv (GL_TRIANGLE_STRIP), 2805 const_iv (GL_TRIANGLE_STRIP),
2283 const_iv (GL_TRIANGLE_FAN), 2806 const_iv (GL_TRIANGLE_FAN),
2807 const_iv (GL_POLYGON),
2284 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2808 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2809 const_iv (GL_POINT_SMOOTH_HINT),
2810 const_iv (GL_LINE_SMOOTH_HINT),
2811 const_iv (GL_POLYGON_SMOOTH_HINT),
2812 const_iv (GL_GENERATE_MIPMAP_HINT),
2813 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2285 const_iv (GL_FASTEST), 2814 const_iv (GL_FASTEST),
2815 const_iv (GL_DONT_CARE),
2816 const_iv (GL_NICEST),
2286 const_iv (GL_V2F), 2817 const_iv (GL_V2F),
2287 const_iv (GL_V3F), 2818 const_iv (GL_V3F),
2288 const_iv (GL_T2F_V3F), 2819 const_iv (GL_T2F_V3F),
2289 const_iv (GL_T2F_N3F_V3F), 2820 const_iv (GL_T2F_N3F_V3F),
2290# undef const_iv 2821# undef const_iv
… …
2295 2826
2296 texture_av = newAV (); 2827 texture_av = newAV ();
2297 AvREAL_off (texture_av); 2828 AvREAL_off (texture_av);
2298} 2829}
2299 2830
2831void
2832disable_GL_EXT_blend_func_separate ()
2833 CODE:
2834 gl.BlendFuncSeparate = 0;
2835 gl.BlendFuncSeparateEXT = 0;
2836
2300char * 2837char *
2301gl_vendor () 2838gl_vendor ()
2302 CODE: 2839 CODE:
2303 RETVAL = (char *)glGetString (GL_VENDOR); 2840 RETVAL = (char *)glGetString (GL_VENDOR);
2304 OUTPUT: 2841 OUTPUT:
… …
2316 CODE: 2853 CODE:
2317 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2854 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2318 OUTPUT: 2855 OUTPUT:
2319 RETVAL 2856 RETVAL
2320 2857
2858const char *glGetString (GLenum pname)
2859
2860GLint glGetInteger (GLenum pname)
2861 CODE:
2862 glGetIntegerv (pname, &RETVAL);
2863 OUTPUT:
2864 RETVAL
2865
2866GLdouble glGetDouble (GLenum pname)
2867 CODE:
2868 glGetDoublev (pname, &RETVAL);
2869 OUTPUT:
2870 RETVAL
2871
2321int glGetError () 2872int glGetError ()
2322 2873
2323void glFinish () 2874void glFinish ()
2324 2875
2325void glClear (int mask) 2876void glClear (int mask)
… …
2362# near_ and far_ are due to microsofts buggy "c" compiler 2913# near_ and far_ are due to microsofts buggy "c" compiler
2363void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2914void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2364 2915
2365# near_ and far_ are due to microsofts buggy "c" compiler 2916# near_ and far_ are due to microsofts buggy "c" compiler
2366void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2917void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2918
2919PROTOTYPES: DISABLE
2367 2920
2368void glViewport (int x, int y, int width, int height) 2921void glViewport (int x, int y, int width, int height)
2369 2922
2370void glScissor (int x, int y, int width, int height) 2923void glScissor (int x, int y, int width, int height)
2371 2924
… …
2379 2932
2380void glRotate (float angle, float x, float y, float z) 2933void glRotate (float angle, float x, float y, float z)
2381 CODE: 2934 CODE:
2382 glRotatef (angle, x, y, z); 2935 glRotatef (angle, x, y, z);
2383 2936
2384void glBegin (int mode)
2385
2386void glEnd ()
2387
2388void glColor (float r, float g, float b, float a = 1.0) 2937void glColor (float r, float g, float b, float a = 1.0)
2389 PROTOTYPE: @
2390 ALIAS: 2938 ALIAS:
2391 glColor_premultiply = 1 2939 glColor_premultiply = 1
2392 CODE: 2940 CODE:
2393 if (ix) 2941 if (ix)
2394 { 2942 {
… …
2397 b *= a; 2945 b *= a;
2398 } 2946 }
2399 // microsoft visual "c" rounds instead of truncating... 2947 // microsoft visual "c" rounds instead of truncating...
2400 glColor4f (r, g, b, a); 2948 glColor4f (r, g, b, a);
2401 2949
2402void glInterleavedArrays (int format, int stride, char *data)
2403
2404void glDrawElements (int mode, int count, int type, char *indices)
2405
2406# 1.2 void glDrawRangeElements (int mode, int start, int end
2407
2408void glRasterPos (float x, float y, float z = 0.) 2950void glRasterPos (float x, float y, float z = 0.)
2409 CODE: 2951 CODE:
2410 glRasterPos3f (0, 0, z); 2952 glRasterPos3f (0, 0, z);
2411 glBitmap (0, 0, 0, 0, x, y, 0); 2953 glBitmap (0, 0, 0, 0, x, y, 0);
2412 2954
… …
2416 2958
2417void glTexCoord (float s, float t) 2959void glTexCoord (float s, float t)
2418 CODE: 2960 CODE:
2419 glTexCoord2f (s, t); 2961 glTexCoord2f (s, t);
2420 2962
2963void glRect (float x1, float y1, float x2, float y2)
2964 CODE:
2965 glRectf (x1, y1, x2, y2);
2966
2967void glRect_lineloop (float x1, float y1, float x2, float y2)
2968 CODE:
2969 glBegin (GL_LINE_LOOP);
2970 glVertex2f (x1, y1);
2971 glVertex2f (x2, y1);
2972 glVertex2f (x2, y2);
2973 glVertex2f (x1, y2);
2974 glEnd ();
2975
2976PROTOTYPES: ENABLE
2977
2978void glBegin (int mode)
2979
2980void glEnd ()
2981
2982void glPointSize (GLfloat size)
2983
2984void glLineWidth (GLfloat width)
2985
2986void glInterleavedArrays (int format, int stride, char *data)
2987
2988void glDrawElements (int mode, int count, int type, char *indices)
2989
2990# 1.2 void glDrawRangeElements (int mode, int start, int end
2991
2421void glTexEnv (int target, int pname, float param) 2992void glTexEnv (int target, int pname, float param)
2422 CODE: 2993 CODE:
2423 glTexEnvf (target, pname, param); 2994 glTexEnvf (target, pname, param);
2424 2995
2425void glTexParameter (int target, int pname, float param) 2996void glTexParameter (int target, int pname, float param)
… …
2441void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3012void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2442 CODE: 3013 CODE:
2443 if (gl.SeparableFilter2D) 3014 if (gl.SeparableFilter2D)
2444 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3015 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2445 3016
2446void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3017void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2447 3018
2448void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3019void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2449 3020
2450void glDrawPixels (int width, int height, int format, int type, char *pixels) 3021void glDrawPixels (int width, int height, int format, int type, char *pixels)
3022
3023void glPixelZoom (float x, float y)
2451 3024
2452void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 3025void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2453 3026
2454int glGenTexture () 3027int glGenTexture ()
2455 CODE: 3028 CODE:
… …
2475 3048
2476void glEndList () 3049void glEndList ()
2477 3050
2478void glCallList (int list) 3051void glCallList (int list)
2479 3052
3053MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3054
3055PROTOTYPES: DISABLE
3056
3057void
3058find_widget (SV *self, NV x, NV y)
3059 PPCODE:
3060{
3061 if (within_widget (self, x, y))
3062 XPUSHs (self);
3063}
3064
3065BOOT:
3066{
3067 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3068
3069 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3070 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3071 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3072 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3073}
3074
3075void
3076draw (SV *self)
3077 CODE:
3078{
3079 HV *hv;
3080 SV **svp;
3081 NV x, y, w, h;
3082 SV *draw_x_sv = GvSV (draw_x_gv);
3083 SV *draw_y_sv = GvSV (draw_y_gv);
3084 SV *draw_w_sv = GvSV (draw_w_gv);
3085 SV *draw_h_sv = GvSV (draw_h_gv);
3086 double draw_x, draw_y;
3087
3088 if (!SvROK (self))
3089 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3090
3091 hv = (HV *)SvRV (self);
3092
3093 if (SvTYPE (hv) != SVt_PVHV)
3094 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3095
3096 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3097 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3098
3099 if (!h || !w)
3100 XSRETURN_EMPTY;
3101
3102 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3103 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3104
3105 draw_x = SvNV (draw_x_sv) + x;
3106 draw_y = SvNV (draw_y_sv) + y;
3107
3108 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3109 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3110 XSRETURN_EMPTY;
3111
3112 sv_setnv (draw_x_sv, draw_x);
3113 sv_setnv (draw_y_sv, draw_y);
3114
3115 glPushMatrix ();
3116 glTranslated (x, y, 0);
3117
3118 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3119 {
3120 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3121
3122 if (svp && SvTRUE (*svp))
3123 {
3124 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3125 glEnable (GL_BLEND);
3126 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3127 glBegin (GL_QUADS);
3128 glVertex2f (0, 0);
3129 glVertex2f (w, 0);
3130 glVertex2f (w, h);
3131 glVertex2f (0, h);
3132 glEnd ();
3133 glDisable (GL_BLEND);
3134 }
3135 }
3136#if 0
3137 // draw borders, for debugging
3138 glPushMatrix ();
3139 glColor4f (1., 1., 0., 1.);
3140 glTranslatef (.5, .5, 0.);
3141 glBegin (GL_LINE_LOOP);
3142 glVertex2f (0 , 0);
3143 glVertex2f (w - 1, 0);
3144 glVertex2f (w - 1, h - 1);
3145 glVertex2f (0 , h - 1);
3146 glEnd ();
3147 glPopMatrix ();
3148#endif
3149 PUSHMARK (SP);
3150 XPUSHs (self);
3151 PUTBACK;
3152 call_method ("_draw", G_VOID | G_DISCARD);
3153 SPAGAIN;
3154
3155 glPopMatrix ();
3156
3157 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3158 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3159}
3160

Diff Legend

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