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.197 by root, Sun Jul 15 21:08:40 2007 UTC vs.
Revision 1.275 by root, Thu Aug 28 00:53:53 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
609 const_iv (SDLK_UNKNOWN),
610 const_iv (SDLK_FIRST),
611 const_iv (SDLK_BACKSPACE),
612 const_iv (SDLK_TAB),
613 const_iv (SDLK_CLEAR),
614 const_iv (SDLK_RETURN),
615 const_iv (SDLK_PAUSE),
616 const_iv (SDLK_ESCAPE),
617 const_iv (SDLK_SPACE),
618 const_iv (SDLK_EXCLAIM),
619 const_iv (SDLK_QUOTEDBL),
620 const_iv (SDLK_HASH),
621 const_iv (SDLK_DOLLAR),
622 const_iv (SDLK_AMPERSAND),
623 const_iv (SDLK_QUOTE),
624 const_iv (SDLK_LEFTPAREN),
625 const_iv (SDLK_RIGHTPAREN),
626 const_iv (SDLK_ASTERISK),
627 const_iv (SDLK_PLUS),
628 const_iv (SDLK_COMMA),
629 const_iv (SDLK_MINUS),
630 const_iv (SDLK_PERIOD),
631 const_iv (SDLK_SLASH),
632 const_iv (SDLK_0),
633 const_iv (SDLK_1),
634 const_iv (SDLK_2),
635 const_iv (SDLK_3),
636 const_iv (SDLK_4),
637 const_iv (SDLK_5),
638 const_iv (SDLK_6),
639 const_iv (SDLK_7),
640 const_iv (SDLK_8),
641 const_iv (SDLK_9),
642 const_iv (SDLK_COLON),
643 const_iv (SDLK_SEMICOLON),
644 const_iv (SDLK_LESS),
645 const_iv (SDLK_EQUALS),
646 const_iv (SDLK_GREATER),
647 const_iv (SDLK_QUESTION),
648 const_iv (SDLK_AT),
649
650 const_iv (SDLK_LEFTBRACKET),
651 const_iv (SDLK_BACKSLASH),
652 const_iv (SDLK_RIGHTBRACKET),
653 const_iv (SDLK_CARET),
654 const_iv (SDLK_UNDERSCORE),
655 const_iv (SDLK_BACKQUOTE),
656 const_iv (SDLK_DELETE),
657
658 const_iv (SDLK_FIRST),
659 const_iv (SDLK_LAST),
475 const_iv (SDLK_KP0), 660 const_iv (SDLK_KP0),
476 const_iv (SDLK_KP1), 661 const_iv (SDLK_KP1),
477 const_iv (SDLK_KP2), 662 const_iv (SDLK_KP2),
478 const_iv (SDLK_KP3), 663 const_iv (SDLK_KP3),
479 const_iv (SDLK_KP4), 664 const_iv (SDLK_KP4),
… …
551 const_iv (KMOD_LMETA), 736 const_iv (KMOD_LMETA),
552 const_iv (KMOD_RMETA), 737 const_iv (KMOD_RMETA),
553 const_iv (KMOD_NUM), 738 const_iv (KMOD_NUM),
554 const_iv (KMOD_CAPS), 739 const_iv (KMOD_CAPS),
555 const_iv (KMOD_MODE), 740 const_iv (KMOD_MODE),
741
742 const_iv (MIX_DEFAULT_FORMAT),
743
744 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO),
747 const_iv (SDL_INIT_CDROM),
748 const_iv (SDL_INIT_JOYSTICK),
749 const_iv (SDL_INIT_EVERYTHING),
750 const_iv (SDL_INIT_NOPARACHUTE),
751 const_iv (SDL_INIT_EVENTTHREAD),
752
753 const_iv (SDL_GL_RED_SIZE),
754 const_iv (SDL_GL_GREEN_SIZE),
755 const_iv (SDL_GL_BLUE_SIZE),
756 const_iv (SDL_GL_ALPHA_SIZE),
757 const_iv (SDL_GL_DOUBLEBUFFER),
758 const_iv (SDL_GL_BUFFER_SIZE),
759 const_iv (SDL_GL_DEPTH_SIZE),
760 const_iv (SDL_GL_STENCIL_SIZE),
761 const_iv (SDL_GL_ACCUM_RED_SIZE),
762 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
763 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
764 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
765 const_iv (SDL_GL_STEREO),
766 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
767 const_iv (SDL_GL_MULTISAMPLESAMPLES),
768 const_iv (SDL_GL_ACCELERATED_VISUAL),
769 const_iv (SDL_GL_SWAP_CONTROL),
770
771 const_iv (FOW_DARKNESS)
556# undef const_iv 772# undef const_iv
557 }; 773 };
558 774
559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 775 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
578 794
579NV floor (NV x) 795NV floor (NV x)
580 796
581NV ceil (NV x) 797NV ceil (NV x)
582 798
799IV minpot (UV n)
800
801IV popcount (UV n)
802
583void 803void
584pango_init () 804pango_init ()
585 CODE: 805 CODE:
586{ 806{
587 opengl_fontmap = pango_opengl_font_map_new (); 807 opengl_fontmap = pango_opengl_font_map_new ();
588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 808 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); 809 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
810 /*pango_context_set_font_description (opengl_context, default_font);*/
811#if PANGO_VERSION_CHECK (1, 15, 2)
812 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
813 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
814#endif
590} 815}
591 816
592int 817char *SDL_GetError ()
593SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
594 818
595void 819void SDL_braino ()
820
821int SDL_Init (U32 flags)
822
823int SDL_InitSubSystem (U32 flags)
824
825void SDL_QuitSubSystem (U32 flags)
826
596SDL_Quit () 827void SDL_Quit ()
597 828
829int SDL_GL_SetAttribute (int attr, int value)
830
831int SDL_GL_GetAttribute (int attr)
832 CODE:
833 if (SDL_GL_GetAttribute (attr, &RETVAL))
834 XSRETURN_UNDEF;
835 OUTPUT:
836 RETVAL
837
598void 838void
599SDL_ListModes () 839SDL_ListModes (int rgb, int alpha)
600 PPCODE: 840 PPCODE:
601{ 841{
602 SDL_Rect **m; 842 SDL_Rect **m;
603 843
604 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 844 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
605 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 845 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
606 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 846 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
607 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 847 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
608 848
609 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 849 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
610 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 850 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
611 851
612 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 852 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 853 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 854 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 855 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
616 856
617 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 857 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); 858 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 859
626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 860 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
627 861
628 if (m && m != (SDL_Rect **)-1) 862 if (m && m != (SDL_Rect **)-1)
629 while (*m) 863 while (*m)
630 { 864 {
865 if ((*m)->w >= 400 && (*m)->h >= 300)
866 {
631 AV *av = newAV (); 867 AV *av = newAV ();
632 av_push (av, newSViv ((*m)->w)); 868 av_push (av, newSViv ((*m)->w));
633 av_push (av, newSViv ((*m)->h)); 869 av_push (av, newSViv ((*m)->h));
870 av_push (av, newSViv (rgb));
871 av_push (av, newSViv (alpha));
634 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 872 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
873 }
635 874
636 ++m; 875 ++m;
637 } 876 }
638} 877}
639 878
640char *
641SDL_GetError ()
642
643int 879int
644SDL_SetVideoMode (int w, int h, int fullscreen) 880SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
645 CODE: 881 CODE:
882{
883 SDL_EnableUNICODE (1);
884 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
885
886 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
887 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
888 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
889 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
890
646 RETVAL = !!SDL_SetVideoMode ( 891 RETVAL = !!SDL_SetVideoMode (
647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 892 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
648 ); 893 );
894
649 if (RETVAL) 895 if (RETVAL)
650 { 896 {
651 av_clear (texture_av); 897 av_clear (texture_av);
652 898
653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 899 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 900#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
655# include "glfunc.h" 901#include "glfunc.h"
656# undef GL_FUNC 902#undef GL_FUNC
657
658 } 903 }
904}
659 OUTPUT: 905 OUTPUT:
660 RETVAL 906 RETVAL
661 907
662void 908void
663SDL_GL_SwapBuffers () 909SDL_GL_SwapBuffers ()
664 910
665char * 911char *
666SDL_GetKeyName (int sym) 912SDL_GetKeyName (int sym)
913
914int
915SDL_GetAppState ()
916
917int
918SDL_GetModState ()
667 919
668void 920void
669poll_events () 921poll_events ()
670 PPCODE: 922 PPCODE:
671{ 923{
… …
681 { 933 {
682 case SDL_KEYDOWN: 934 case SDL_KEYDOWN:
683 case SDL_KEYUP: 935 case SDL_KEYUP:
684 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
685 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
686 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 938 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
687 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 939 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
688 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 940 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
689 break; 941 break;
690 942
691 case SDL_ACTIVEEVENT: 943 case SDL_ACTIVEEVENT:
692 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
710 x = ev.motion.x; 962 x = ev.motion.x;
711 y = ev.motion.y; 963 y = ev.motion.y;
712 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
713 } 965 }
714 966
715 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
716 hv_store (hv, "state", 5, newSViv (state), 0); 968 hv_store (hv, "state", 5, newSViv (state), 0);
717 hv_store (hv, "x", 1, newSViv (x), 0); 969 hv_store (hv, "x", 1, newSViv (x), 0);
718 hv_store (hv, "y", 1, newSViv (y), 0); 970 hv_store (hv, "y", 1, newSViv (y), 0);
719 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 971 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
720 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 972 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
721 } 973 }
722 break; 974 break;
723 975
724 case SDL_MOUSEBUTTONDOWN: 976 case SDL_MOUSEBUTTONDOWN:
725 case SDL_MOUSEBUTTONUP: 977 case SDL_MOUSEBUTTONUP:
726 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 978 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
727 979
728 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 980 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
729 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 981 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
730 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 982 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
731 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 983 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
736 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 988 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
737 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 989 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
738 break; 990 break;
739 } 991 }
740 992
741 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 993 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
742 } 994 }
743} 995}
744 996
745int 997int
746Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 998Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
747 POSTCALL: 999 POSTCALL:
748 Mix_HookMusicFinished (music_finished); 1000 Mix_HookMusicFinished (music_finished);
749 Mix_ChannelFinished (channel_finished); 1001 Mix_ChannelFinished (channel_finished);
750 1002
751void 1003void
1004Mix_QuerySpec ()
1005 PPCODE:
1006{
1007 int freq, channels;
1008 Uint16 format;
1009
1010 if (Mix_QuerySpec (&freq, &format, &channels))
1011 {
1012 EXTEND (SP, 3);
1013 PUSHs (sv_2mortal (newSViv (freq)));
1014 PUSHs (sv_2mortal (newSViv (format)));
1015 PUSHs (sv_2mortal (newSViv (channels)));
1016 }
1017}
1018
1019void
752Mix_CloseAudio () 1020Mix_CloseAudio ()
753 1021
754int 1022int
755Mix_AllocateChannels (int numchans = -1) 1023Mix_AllocateChannels (int numchans = -1)
1024
1025const char *
1026Mix_GetError ()
756 1027
757void 1028void
758lowdelay (int fd, int val = 1) 1029lowdelay (int fd, int val = 1)
759 CODE: 1030 CODE:
760 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1031 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
786 } 1057 }
787 } 1058 }
788#endif 1059#endif
789} 1060}
790 1061
791void 1062int
792add_font (char *file) 1063add_font (char *file)
793 CODE: 1064 CODE:
794 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT:
1067 RETVAL
795 1068
796void 1069void
797load_image_inline (SV *image_) 1070load_image_inline (SV *image_)
798 ALIAS: 1071 ALIAS:
799 load_image_file = 1 1072 load_image_file = 1
… …
802 STRLEN image_len; 1075 STRLEN image_len;
803 char *image = (char *)SvPVbyte (image_, image_len); 1076 char *image = (char *)SvPVbyte (image_, image_len);
804 SDL_Surface *surface, *surface2; 1077 SDL_Surface *surface, *surface2;
805 SDL_PixelFormat fmt; 1078 SDL_PixelFormat fmt;
806 SDL_RWops *rw = ix 1079 SDL_RWops *rw = ix
807 ? SDL_RWFromFile (image, "r") 1080 ? SDL_RWFromFile (image, "rb")
808 : SDL_RWFromConstMem (image, image_len); 1081 : SDL_RWFromConstMem (image, image_len);
809 1082
810 if (!rw) 1083 if (!rw)
811 croak ("load_image: %s", SDL_GetError ()); 1084 croak ("load_image: %s", SDL_GetError ());
812 1085
… …
885void 1158void
886error (char *message) 1159error (char *message)
887 CODE: 1160 CODE:
888 fprintf (stderr, "ERROR: %s\n", message); 1161 fprintf (stderr, "ERROR: %s\n", message);
889#ifdef _WIN32 1162#ifdef _WIN32
890 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1163 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
891#endif 1164#endif
892 1165
893void 1166void
894fatal (char *message) 1167fatal (char *message)
895 CODE: 1168 CODE:
896 fprintf (stderr, "FATAL: %s\n", message); 1169 fprintf (stderr, "FATAL: %s\n", message);
897#ifdef _WIN32 1170#ifdef _WIN32
898 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1171 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
899#endif 1172#endif
900 _exit (1); 1173 _exit (1);
901 1174
902void 1175void
903_exit (int retval = 0) 1176_exit (int retval = 0)
… …
915#if DEBUG 1188#if DEBUG
916 VALGRIND_DO_LEAK_CHECK; 1189 VALGRIND_DO_LEAK_CHECK;
917#endif 1190#endif
918} 1191}
919 1192
920MODULE = CFPlus PACKAGE = CFPlus::Font 1193MODULE = Deliantra::Client PACKAGE = DC::Font
921 1194
922CFPlus::Font 1195PROTOTYPES: DISABLE
1196
1197DC::Font
923new_from_file (SV *class, char *path, int id = 0) 1198new_from_file (SV *class, char *path, int id = 0)
924 CODE: 1199 CODE:
925{ 1200{
926 int count; 1201 int count;
927 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1202 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
930} 1205}
931 OUTPUT: 1206 OUTPUT:
932 RETVAL 1207 RETVAL
933 1208
934void 1209void
935DESTROY (CFPlus::Font self) 1210DESTROY (DC::Font self)
936 CODE: 1211 CODE:
937 pango_font_description_free (self); 1212 pango_font_description_free (self);
938 1213
939void 1214void
940make_default (CFPlus::Font self) 1215make_default (DC::Font self)
1216 PROTOTYPE: $
941 CODE: 1217 CODE:
942 default_font = self; 1218 default_font = self;
943 1219
944MODULE = CFPlus PACKAGE = CFPlus::Layout 1220MODULE = Deliantra::Client PACKAGE = DC::Layout
945 1221
1222PROTOTYPES: DISABLE
1223
946void 1224void
947reset_glyph_cache () 1225glyph_cache_backup ()
1226 PROTOTYPE:
948 CODE: 1227 CODE:
1228 tc_backup ();
1229
1230void
1231glyph_cache_restore ()
1232 PROTOTYPE:
1233 CODE:
949 tc_clear (); 1234 tc_restore ();
950 1235
951CFPlus::Layout 1236DC::Layout
952new (SV *class) 1237new (SV *class)
953 CODE: 1238 CODE:
954 New (0, RETVAL, 1, struct cf_layout); 1239 New (0, RETVAL, 1, struct cf_layout);
955 1240
956 RETVAL->pl = pango_layout_new (opengl_context); 1241 RETVAL->pl = pango_layout_new (opengl_context);
… …
958 RETVAL->g = 1.; 1243 RETVAL->g = 1.;
959 RETVAL->b = 1.; 1244 RETVAL->b = 1.;
960 RETVAL->a = 1.; 1245 RETVAL->a = 1.;
961 RETVAL->base_height = MIN_FONT_HEIGHT; 1246 RETVAL->base_height = MIN_FONT_HEIGHT;
962 RETVAL->font = 0; 1247 RETVAL->font = 0;
1248 RETVAL->rc = rc_alloc ();
963 1249
964 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1250 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
965 layout_update_font (RETVAL); 1251 layout_update_font (RETVAL);
966 OUTPUT: 1252 OUTPUT:
967 RETVAL 1253 RETVAL
968 1254
969void 1255void
970DESTROY (CFPlus::Layout self) 1256DESTROY (DC::Layout self)
971 CODE: 1257 CODE:
972 g_object_unref (self->pl); 1258 g_object_unref (self->pl);
1259 rc_free (self->rc);
973 Safefree (self); 1260 Safefree (self);
974 1261
975void 1262void
976set_text (CFPlus::Layout self, SV *text_) 1263set_text (DC::Layout self, SV *text_)
977 CODE: 1264 CODE:
978{ 1265{
979 STRLEN textlen; 1266 STRLEN textlen;
980 char *text = SvPVutf8 (text_, textlen); 1267 char *text = SvPVutf8 (text_, textlen);
981 1268
982 pango_layout_set_text (self->pl, text, textlen); 1269 pango_layout_set_text (self->pl, text, textlen);
983} 1270}
984 1271
985void 1272void
986set_markup (CFPlus::Layout self, SV *text_) 1273set_markup (DC::Layout self, SV *text_)
987 CODE: 1274 CODE:
988{ 1275{
989 STRLEN textlen; 1276 STRLEN textlen;
990 char *text = SvPVutf8 (text_, textlen); 1277 char *text = SvPVutf8 (text_, textlen);
991 1278
992 pango_layout_set_markup (self->pl, text, textlen); 1279 pango_layout_set_markup (self->pl, text, textlen);
993} 1280}
994 1281
995void 1282void
996set_shapes (CFPlus::Layout self, ...) 1283set_shapes (DC::Layout self, ...)
997 CODE: 1284 CODE:
998{ 1285{
999 PangoAttrList *attrs = 0; 1286 PangoAttrList *attrs = 0;
1000 const char *text = pango_layout_get_text (self->pl); 1287 const char *text = pango_layout_get_text (self->pl);
1001 const char *pos = text; 1288 const char *pos = text;
… …
1036 if (attrs) 1323 if (attrs)
1037 pango_layout_set_attributes (self->pl, attrs); 1324 pango_layout_set_attributes (self->pl, attrs);
1038} 1325}
1039 1326
1040void 1327void
1041get_shapes (CFPlus::Layout self) 1328get_shapes (DC::Layout self)
1042 PPCODE: 1329 PPCODE:
1043{ 1330{
1044 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1331 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1045 1332
1046 do 1333 do
1047 { 1334 {
1048 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1335 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1049 1336
1050 if (run && shape_attr_p (run)) 1337 if (run && shape_attr_p (run))
1051 { 1338 {
1052 PangoRectangle extents; 1339 PangoRectangle extents;
1053 pango_layout_iter_get_run_extents (iter, 0, &extents); 1340 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1061 1348
1062 pango_layout_iter_free (iter); 1349 pango_layout_iter_free (iter);
1063} 1350}
1064 1351
1065int 1352int
1066has_wrapped (CFPlus::Layout self) 1353has_wrapped (DC::Layout self)
1067 CODE: 1354 CODE:
1068{ 1355{
1069 int lines = 1; 1356 int lines = 1;
1070 const char *text = pango_layout_get_text (self->pl); 1357 const char *text = pango_layout_get_text (self->pl);
1071 1358
… …
1076} 1363}
1077 OUTPUT: 1364 OUTPUT:
1078 RETVAL 1365 RETVAL
1079 1366
1080SV * 1367SV *
1081get_text (CFPlus::Layout self) 1368get_text (DC::Layout self)
1082 CODE: 1369 CODE:
1083 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1370 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1084 sv_utf8_decode (RETVAL); 1371 sv_utf8_decode (RETVAL);
1085 OUTPUT: 1372 OUTPUT:
1086 RETVAL 1373 RETVAL
1087 1374
1088void 1375void
1089set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1376set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1090 CODE: 1377 CODE:
1091 self->r = r; 1378 self->r = r;
1092 self->g = g; 1379 self->g = g;
1093 self->b = b; 1380 self->b = b;
1094 self->a = a; 1381 self->a = a;
1095 1382
1096void 1383void
1097set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1384set_font (DC::Layout self, DC::Font font = 0)
1098 CODE: 1385 CODE:
1099 if (self->font != font) 1386 if (self->font != font)
1100 { 1387 {
1101 self->font = font; 1388 self->font = font;
1102 layout_update_font (self); 1389 layout_update_font (self);
1103 } 1390 }
1104 1391
1105void 1392void
1106set_height (CFPlus::Layout self, int base_height) 1393set_height (DC::Layout self, int base_height)
1107 CODE: 1394 CODE:
1108 if (self->base_height != base_height) 1395 if (self->base_height != base_height)
1109 { 1396 {
1110 self->base_height = base_height; 1397 self->base_height = base_height;
1111 layout_update_font (self); 1398 layout_update_font (self);
1112 } 1399 }
1113 1400
1114void 1401void
1115set_width (CFPlus::Layout self, int max_width = -1) 1402set_width (DC::Layout self, int max_width = -1)
1116 CODE: 1403 CODE:
1117 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1404 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1118 1405
1119void 1406void
1120set_indent (CFPlus::Layout self, int indent) 1407set_indent (DC::Layout self, int indent)
1121 CODE: 1408 CODE:
1122 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1409 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1123 1410
1124void 1411void
1125set_spacing (CFPlus::Layout self, int spacing) 1412set_spacing (DC::Layout self, int spacing)
1126 CODE: 1413 CODE:
1127 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1414 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1128 1415
1129void 1416void
1130set_ellipsise (CFPlus::Layout self, int ellipsise) 1417set_ellipsise (DC::Layout self, int ellipsise)
1131 CODE: 1418 CODE:
1132 pango_layout_set_ellipsize (self->pl, 1419 pango_layout_set_ellipsize (self->pl,
1133 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1420 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1134 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1421 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1135 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1422 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1136 : PANGO_ELLIPSIZE_NONE 1423 : PANGO_ELLIPSIZE_NONE
1137 ); 1424 );
1138 1425
1139void 1426void
1140set_single_paragraph_mode (CFPlus::Layout self, int spm) 1427set_single_paragraph_mode (DC::Layout self, int spm)
1141 CODE: 1428 CODE:
1142 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1429 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1143 1430
1144void 1431void
1145size (CFPlus::Layout self) 1432size (DC::Layout self)
1146 PPCODE: 1433 PPCODE:
1147{ 1434{
1148 int w, h; 1435 int w, h;
1149 1436
1150 layout_get_pixel_size (self, &w, &h); 1437 layout_get_pixel_size (self, &w, &h);
… …
1153 PUSHs (sv_2mortal (newSViv (w))); 1440 PUSHs (sv_2mortal (newSViv (w)));
1154 PUSHs (sv_2mortal (newSViv (h))); 1441 PUSHs (sv_2mortal (newSViv (h)));
1155} 1442}
1156 1443
1157int 1444int
1158descent (CFPlus::Layout self) 1445descent (DC::Layout self)
1159 CODE: 1446 CODE:
1160{ 1447{
1161 PangoRectangle rect; 1448 PangoRectangle rect;
1162 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1449 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1163 pango_layout_line_get_pixel_extents (line, 0, &rect); 1450 pango_layout_line_get_pixel_extents (line, 0, &rect);
1164 RETVAL = PANGO_DESCENT (rect); 1451 RETVAL = PANGO_DESCENT (rect);
1165} 1452}
1166 OUTPUT: 1453 OUTPUT:
1167 RETVAL 1454 RETVAL
1168 1455
1169int 1456int
1170xy_to_index (CFPlus::Layout self, int x, int y) 1457xy_to_index (DC::Layout self, int x, int y)
1171 CODE: 1458 CODE:
1172{ 1459{
1173 int index, trailing; 1460 int index, trailing;
1174 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1461 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1175 RETVAL = index + trailing; 1462 RETVAL = index + trailing;
1176} 1463}
1177 OUTPUT: 1464 OUTPUT:
1178 RETVAL 1465 RETVAL
1179 1466
1180void 1467void
1181cursor_pos (CFPlus::Layout self, int index) 1468cursor_pos (DC::Layout self, int index)
1182 PPCODE: 1469 PPCODE:
1183{ 1470{
1184 PangoRectangle strong_pos; 1471 PangoRectangle pos;
1185 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1472 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1186 1473
1187 EXTEND (SP, 3); 1474 EXTEND (SP, 3);
1188 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1475 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1189 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1476 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1190 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1477 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1191} 1478}
1192 1479
1193void 1480void
1194index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1481index_to_line_x (DC::Layout self, int index, int trailing = 0)
1195 PPCODE: 1482 PPCODE:
1196{ 1483{
1197 int line, x; 1484 int line, x;
1198 1485
1199 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1486 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1487#if !PANGO_VERSION_CHECK (1, 17, 3)
1200 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1488 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1201 1489 --line;
1490#endif
1202 EXTEND (SP, 2); 1491 EXTEND (SP, 2);
1203 PUSHs (sv_2mortal (newSViv (line - 1))); 1492 PUSHs (sv_2mortal (newSViv (line)));
1204 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1205} 1494}
1206 1495
1207void 1496void
1208line_x_to_index (CFPlus::Layout self, int line, int x) 1497line_x_to_index (DC::Layout self, int line, int x)
1209 PPCODE: 1498 PPCODE:
1210{ 1499{
1211 PangoLayoutLine *lp; 1500 PangoLayoutLine *lp;
1212 int index, trailing; 1501 int index, trailing;
1213 1502
1214 if (line < 0) 1503 if (line < 0)
1215 XSRETURN_EMPTY; 1504 XSRETURN_EMPTY;
1216 1505
1217 if (!(lp = pango_layout_get_line (self->pl, line))) 1506 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1218 XSRETURN_EMPTY; /* do better */ 1507 XSRETURN_EMPTY; /* do better */
1219 1508
1220 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1509 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1221 1510
1222 EXTEND (SP, 2); 1511 EXTEND (SP, 2);
… …
1228 PUSHs (sv_2mortal (newSViv (trailing))); 1517 PUSHs (sv_2mortal (newSViv (trailing)));
1229 } 1518 }
1230} 1519}
1231 1520
1232void 1521void
1233render (CFPlus::Layout self, float x, float y, int flags = 0) 1522render (DC::Layout self, float x, float y, int flags = 0)
1234 PPCODE: 1523 CODE:
1524 rc_clear (self->rc);
1235 pango_opengl_render_layout_subpixel ( 1525 pango_opengl_render_layout_subpixel (
1236 self->pl, 1526 self->pl,
1527 self->rc,
1237 x * PANGO_SCALE, y * PANGO_SCALE, 1528 x * PANGO_SCALE, y * PANGO_SCALE,
1238 self->r, self->g, self->b, self->a, 1529 self->r, self->g, self->b, self->a,
1239 flags 1530 flags
1240 ); 1531 );
1532 // we assume that context_change actually clears/frees stuff
1533 // and does not do any recomputation...
1534 pango_layout_context_changed (self->pl);
1241 1535
1242MODULE = CFPlus PACKAGE = CFPlus::Texture
1243
1244void 1536void
1245pad2pot (SV *data_, SV *w_, SV *h_) 1537draw (DC::Layout self)
1246 CODE: 1538 CODE:
1247{ 1539{
1248 int ow = SvIV (w_); 1540 glEnable (GL_TEXTURE_2D);
1249 int oh = SvIV (h_); 1541 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1542 glEnable (GL_BLEND);
1543 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1544 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1545 glEnable (GL_ALPHA_TEST);
1546 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1250 1547
1251 if (ow && oh) 1548 rc_draw (self->rc);
1549
1550 glDisable (GL_ALPHA_TEST);
1551 glDisable (GL_BLEND);
1552 glDisable (GL_TEXTURE_2D);
1553}
1554
1555MODULE = Deliantra::Client PACKAGE = DC::Texture
1556
1557PROTOTYPES: ENABLE
1558
1559void
1560pad (SV *data_, int ow, int oh, int nw, int nh)
1561 CODE:
1562{
1563 if ((nw != ow || nh != oh) && SvOK (data_))
1252 { 1564 {
1253 int nw = minpot (ow);
1254 int nh = minpot (oh);
1255
1256 if (nw != ow || nh != oh)
1257 {
1258 if (SvOK (data_))
1259 {
1260 STRLEN datalen; 1565 STRLEN datalen;
1261 char *data = SvPVbyte (data_, datalen); 1566 char *data = SvPVbyte (data_, datalen);
1262 int bpp = datalen / (ow * oh); 1567 int bpp = datalen / (ow * oh);
1263 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1568 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1264 1569
1265 SvPOK_only (result_); 1570 SvPOK_only (result_);
1266 SvCUR_set (result_, nw * nh * bpp); 1571 SvCUR_set (result_, nw * nh * bpp);
1267 1572
1268 memset (SvPVX (result_), 0, nw * nh * bpp); 1573 memset (SvPVX (result_), 0, nw * nh * bpp);
1269 while (oh--) 1574 while (oh--)
1270 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1575 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1271 1576
1272 sv_setsv (data_, result_); 1577 sv_setsv (data_, result_);
1273 }
1274
1275 sv_setiv (w_, nw);
1276 sv_setiv (h_, nh);
1277 }
1278 } 1578 }
1279} 1579}
1280 1580
1281void 1581void
1282draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1582draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1288{ 1588{
1289 HV *hv = (HV *)SvRV (self); 1589 HV *hv = (HV *)SvRV (self);
1290 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1590 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1291 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1591 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1292 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1592 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1593
1594 if (name <= 0)
1595 XSRETURN_EMPTY;
1293 1596
1294 if (items < 5) 1597 if (items < 5)
1295 { 1598 {
1296 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1599 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1297 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1600 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1325 glDisable (GL_ALPHA_TEST); 1628 glDisable (GL_ALPHA_TEST);
1326 glDisable (GL_BLEND); 1629 glDisable (GL_BLEND);
1327 } 1630 }
1328} 1631}
1329 1632
1330MODULE = CFPlus PACKAGE = CFPlus::Map 1633IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1634 CODE:
1635{
1636 GLint width;
1637 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1638 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1639 RETVAL = width > 0;
1640}
1641 OUTPUT:
1642 RETVAL
1331 1643
1332CFPlus::Map 1644MODULE = Deliantra::Client PACKAGE = DC::Map
1645
1646PROTOTYPES: DISABLE
1647
1648DC::Map
1333new (SV *class) 1649new (SV *class)
1334 CODE: 1650 CODE:
1335 New (0, RETVAL, 1, struct map); 1651 New (0, RETVAL, 1, struct map);
1336 RETVAL->x = 0; 1652 RETVAL->x = 0;
1337 RETVAL->y = 0; 1653 RETVAL->y = 0;
… …
1345 RETVAL->row = 0; 1661 RETVAL->row = 0;
1346 OUTPUT: 1662 OUTPUT:
1347 RETVAL 1663 RETVAL
1348 1664
1349void 1665void
1350DESTROY (CFPlus::Map self) 1666DESTROY (DC::Map self)
1351 CODE: 1667 CODE:
1352{ 1668{
1353 map_clear (self); 1669 map_clear (self);
1354 Safefree (self->face2tile); 1670 Safefree (self->face2tile);
1355 Safefree (self->tex); 1671 Safefree (self->tex);
1356 Safefree (self); 1672 Safefree (self);
1357} 1673}
1358 1674
1359void 1675void
1360resize (CFPlus::Map self, int map_width, int map_height) 1676resize (DC::Map self, int map_width, int map_height)
1361 CODE: 1677 CODE:
1362 self->w = map_width; 1678 self->w = map_width;
1363 self->h = map_height; 1679 self->h = map_height;
1364 1680
1365void 1681void
1366clear (CFPlus::Map self) 1682clear (DC::Map self)
1367 CODE: 1683 CODE:
1368 map_clear (self); 1684 map_clear (self);
1369 1685
1370void 1686void
1371set_tileid (CFPlus::Map self, int face, int tile) 1687set_tileid (DC::Map self, int face, int tile)
1372 CODE: 1688 CODE:
1373{ 1689{
1374 need_facenum (self, face); self->face2tile [face] = tile; 1690 need_facenum (self, face); self->face2tile [face] = tile;
1375 need_texid (self, tile); 1691 need_texid (self, tile);
1376} 1692}
1377 1693
1378void 1694void
1379set_smooth (CFPlus::Map self, int face, int smooth, int level) 1695set_smooth (DC::Map self, int face, int smooth, int level)
1380 CODE: 1696 CODE:
1381{ 1697{
1382 tileid texid; 1698 tileid texid;
1383 maptex *tex; 1699 maptex *tex;
1384 1700
… …
1397 tex->smoothtile = self->face2tile [smooth]; 1713 tex->smoothtile = self->face2tile [smooth];
1398 tex->smoothlevel = level; 1714 tex->smoothlevel = level;
1399} 1715}
1400 1716
1401void 1717void
1402set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1718set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1403 CODE: 1719 CODE:
1404{ 1720{
1405 need_texid (self, texid); 1721 need_texid (self, texid);
1406 1722
1407 { 1723 {
… …
1427 // from transparent color bleeding and ugly wrapping effects. 1743 // from transparent color bleeding and ugly wrapping effects.
1428 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1429} 1745}
1430 1746
1431int 1747int
1432ox (CFPlus::Map self) 1748ox (DC::Map self)
1433 ALIAS: 1749 ALIAS:
1434 oy = 1 1750 oy = 1
1435 x = 2 1751 x = 2
1436 y = 3 1752 y = 3
1437 w = 4 1753 w = 4
… …
1448 } 1764 }
1449 OUTPUT: 1765 OUTPUT:
1450 RETVAL 1766 RETVAL
1451 1767
1452void 1768void
1453scroll (CFPlus::Map self, int dx, int dy) 1769scroll (DC::Map self, int dx, int dy)
1454 CODE: 1770 CODE:
1455{ 1771{
1456 if (dx > 0) 1772 if (dx > 0)
1457 map_blank (self, self->x, self->y, dx, self->h); 1773 map_blank (self, self->x, self->y, dx, self->h);
1458 else if (dx < 0) 1774 else if (dx < 0)
… …
1473 self->rows += MAP_EXTEND_Y; 1789 self->rows += MAP_EXTEND_Y;
1474 self->y += MAP_EXTEND_Y; 1790 self->y += MAP_EXTEND_Y;
1475 } 1791 }
1476} 1792}
1477 1793
1478void 1794SV *
1479map1a_update (CFPlus::Map self, SV *data_, int extmap) 1795map1a_update (DC::Map self, SV *data_, int extmap)
1480 CODE: 1796 CODE:
1481{ 1797{
1482 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1483 uint8_t *data_end = (uint8_t *)SvEND (data_); 1799 uint8_t *data_end = (uint8_t *)SvEND (data_);
1484 mapcell *cell; 1800 mapcell *cell;
1485 int x, y, flags; 1801 int x, y, z, flags;
1802 AV *missing = newAV ();
1803 RETVAL = newRV_noinc ((SV *)missing);
1486 1804
1487 while (data < data_end - 1) 1805 while (data < data_end - 1)
1488 { 1806 {
1489 flags = (data [0] << 8) + data [1]; data += 2; 1807 flags = (data [0] << 8) + data [1]; data += 2;
1490 1808
… …
1510 uint8_t ext, cmd; 1828 uint8_t ext, cmd;
1511 1829
1512 do 1830 do
1513 { 1831 {
1514 ext = *data++; 1832 ext = *data++;
1515 cmd = ext & 0x3f; 1833 cmd = ext & 0x7f;
1516 1834
1517 if (cmd < 4) 1835 if (cmd < 4)
1518 cell->darkness = 255 - ext * 64 + 1; 1836 cell->darkness = 255 - ext * 64 + 1;
1519 else if (cmd == 5) // health 1837 else if (cmd == 5) // health
1520 { 1838 {
… …
1523 } 1841 }
1524 else if (cmd == 6) // monster width 1842 else if (cmd == 6) // monster width
1525 cell->stat_width = *data++ + 1; 1843 cell->stat_width = *data++ + 1;
1526 else if (cmd == 0x47) 1844 else if (cmd == 0x47)
1527 { 1845 {
1528 if (*data == 4) 1846 if (*data == 1) cell->player = data [1];
1529 ; // decode player count 1847 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1848 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1849 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1530 1850
1531 data += *data + 1; 1851 data += *data + 1;
1532 } 1852 }
1533 else if (cmd == 8) // cell flags 1853 else if (cmd == 8) // cell flags
1534 cell->flags = *data++; 1854 cell->flags = *data++;
… …
1541 } 1861 }
1542 else 1862 else
1543 cell->darkness = *data++ + 1; 1863 cell->darkness = *data++ + 1;
1544 } 1864 }
1545 1865
1866 for (z = 0; z <= 2; ++z)
1546 if (flags & 4) 1867 if (flags & (4 >> z))
1547 { 1868 {
1548 faceid face = (data [0] << 8) + data [1]; data += 2; 1869 faceid face = (data [0] << 8) + data [1]; data += 2;
1549 need_facenum (self, face); 1870 need_facenum (self, face);
1550 cell->tile [0] = self->face2tile [face]; 1871 cell->tile [z] = self->face2tile [face];
1872
1873 if (cell->tile [z])
1874 {
1875 maptex *tex = self->tex + cell->tile [z];
1876 if (!tex->name)
1877 av_push (missing, newSViv (cell->tile [z]));
1878
1879 if (tex->smoothtile)
1880 {
1881 maptex *smooth = self->tex + tex->smoothtile;
1882 if (!smooth->name)
1883 av_push (missing, newSViv (tex->smoothtile));
1884 }
1885 }
1551 } 1886 }
1552
1553 if (flags & 2)
1554 {
1555 faceid face = (data [0] << 8) + data [1]; data += 2;
1556 need_facenum (self, face);
1557 cell->tile [1] = self->face2tile [face];
1558 }
1559
1560 if (flags & 1)
1561 {
1562 faceid face = (data [0] << 8) + data [1]; data += 2;
1563 need_facenum (self, face);
1564 cell->tile [2] = self->face2tile [face];
1565 }
1566 } 1887 }
1567 else 1888 else
1568 cell->darkness = 0; 1889 CELL_CLEAR (cell);
1569 } 1890 }
1570} 1891}
1892 OUTPUT:
1893 RETVAL
1571 1894
1572SV * 1895SV *
1573mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1896mapmap (DC::Map self, int x0, int y0, int w, int h)
1574 CODE: 1897 CODE:
1575{ 1898{
1576 int x1, x; 1899 int x1, x;
1577 int y1, y; 1900 int y1, y;
1578 int z; 1901 int z;
… …
1623} 1946}
1624 OUTPUT: 1947 OUTPUT:
1625 RETVAL 1948 RETVAL
1626 1949
1627void 1950void
1628draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1951draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1629 CODE: 1952 CODE:
1630{ 1953{
1954 int x, y, z;
1955
1631 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1632 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1957 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1633 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1958 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1634 smooth_key skey; 1959 smooth_key skey;
1635 int x, y, z; 1960 int pl_x, pl_y;
1636 int last_name; 1961 maptex pl_tex;
1962 rc_t *rc = rc_alloc ();
1963 rc_key_t key;
1964 rc_array_t *arr;
1965
1966 pl_tex.name = 0;
1637 1967
1638 // thats current max. sorry. 1968 // thats current max. sorry.
1639 if (sw > 255) sw = 255; 1969 if (sw > 255) sw = 255;
1640 if (sh > 255) sh = 255; 1970 if (sh > 255) sh = 255;
1641 1971
1642 // clear key, in case of extra padding 1972 // clear key, in case of extra padding
1643 memset (&skey, 0, sizeof (skey)); 1973 memset (&skey, 0, sizeof (skey));
1644 1974
1645 glColor4ub (255, 255, 255, 255); 1975 memset (&key, 0, sizeof (key));
1646 1976 key.r = 255;
1647 glEnable (GL_BLEND); 1977 key.g = 255;
1648 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1978 key.b = 255;
1649 glEnable (GL_TEXTURE_2D); 1979 key.a = 255;
1650 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1980 key.mode = GL_QUADS;
1651 1981 key.format = GL_T2F_V3F;
1652 glBegin (GL_QUADS); 1982 key.texname = -1;
1653
1654 last_name = 0;
1655 1983
1656 mx += self->x; 1984 mx += self->x;
1657 my += self->y; 1985 my += self->y;
1658 1986
1659 // first pass: determine smooth_max 1987 // first pass: determine smooth_max
… …
1675 MAX (self->tex [cell->tile [0]].smoothlevel, 2003 MAX (self->tex [cell->tile [0]].smoothlevel,
1676 MAX (self->tex [cell->tile [1]].smoothlevel, 2004 MAX (self->tex [cell->tile [1]].smoothlevel,
1677 self->tex [cell->tile [2]].smoothlevel)); 2005 self->tex [cell->tile [2]].smoothlevel));
1678 } 2006 }
1679 } 2007 }
2008
2009 glEnable (GL_BLEND);
2010 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2011 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1680 2012
1681 for (z = 0; z <= 2; z++) 2013 for (z = 0; z <= 2; z++)
1682 { 2014 {
1683 memset (smooth_level, 0, sizeof (smooth_level)); 2015 memset (smooth_level, 0, sizeof (smooth_level));
1684 2016
… …
1697 { 2029 {
1698 maptex tex = self->tex [tile]; 2030 maptex tex = self->tex [tile];
1699 int px = (x + 1) * T - tex.w; 2031 int px = (x + 1) * T - tex.w;
1700 int py = (y + 1) * T - tex.h; 2032 int py = (y + 1) * T - tex.h;
1701 2033
1702 // suppressing texture state switches here
1703 // is only moderately effective, but worth the extra effort
1704 if (last_name != tex.name) 2034 if (key.texname != tex.name)
1705 { 2035 {
1706 if (!tex.name) 2036 if (!tex.name)
1707 tex = self->tex [2]; /* missing, replace by noface */ 2037 tex = self->tex [2]; /* missing, replace by noface */
1708 2038
1709 glEnd (); 2039 key.texname = tex.name;
1710 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2040 arr = rc_array (rc, &key);
1711 glBegin (GL_QUADS);
1712 } 2041 }
1713 2042
1714 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2043 if (expect_false (cell->player == player) && expect_false (z == 2))
1715 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1716 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1717 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1718
1719 if (cell->flags && z == 2)
1720 { 2044 {
2045 pl_x = px;
2046 pl_y = py;
2047 pl_tex = tex;
2048 continue;
2049 }
2050
2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2052 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2053 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2054 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2055
2056 if (expect_false (cell->flags) && expect_false (z == 2))
2057 {
2058 // overlays such as the speech bubble, probably more to come
1721 if (cell->flags & 1) 2059 if (cell->flags & 1)
1722 { 2060 {
1723 maptex tex = self->tex [1]; 2061 maptex tex = self->tex [1];
1724 int px = x * T + T * 2 / 32; 2062 int px = x * T + T * 2 / 32;
1725 int py = y * T - T * 6 / 32; 2063 int py = y * T - T * 6 / 32;
1726 2064
2065 if (tex.name)
1727 glEnd (); 2066 {
1728 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2067 if (key.texname != tex.name)
2068 {
2069 key.texname = tex.name;
2070 arr = rc_array (rc, &key);
2071 }
2072
2073 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2074 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2075 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2076 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1729 glBegin (GL_QUADS); 2077 }
1730
1731 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1732 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1733 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1734 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1735 } 2078 }
1736 } 2079 }
1737 2080
1738 // update smooth hash 2081 // update smooth hash
1739 if (tex.smoothtile) 2082 if (tex.smoothtile)
… …
1775 } 2118 }
1776 } 2119 }
1777 } 2120 }
1778 } 2121 }
1779 2122
2123 rc_draw (rc);
2124 rc_clear (rc);
2125
1780 // go through all smoothlevels, lowest to highest, then draw. 2126 // go through all smoothlevels, lowest to highest, then draw.
1781 // this is basically counting sort 2127 // this is basically counting sort
1782 { 2128 {
1783 int w, b; 2129 int w, b;
1784 2130
2131 glEnable (GL_TEXTURE_2D);
2132 glBegin (GL_QUADS);
1785 for (w = 0; w < 256 / 32; ++w) 2133 for (w = 0; w < 256 / 32; ++w)
1786 { 2134 {
1787 uint32_t smask = smooth_level [w]; 2135 uint32_t smask = smooth_level [w];
1788 if (smask) 2136 if (smask)
1789 for (b = 0; b < 32; ++b) 2137 for (b = 0; b < 32; ++b)
… …
1808 int border = bits & 15; 2156 int border = bits & 15;
1809 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2157 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1810 float dx = tex.s * .0625f; // 16 images/row 2158 float dx = tex.s * .0625f; // 16 images/row
1811 float dy = tex.t * .5f ; // 2 images/column 2159 float dy = tex.t * .5f ; // 2 images/column
1812 2160
1813 // this time naively avoiding texture state changes
1814 // save gobs of state changes.
1815 if (last_name != tex.name) 2161 if (tex.name)
1816 { 2162 {
2163 // this time avoiding texture state changes
2164 // save gobs of state changes.
1817 if (!tex.name) 2165 if (key.texname != tex.name)
1818 continue; // smoothing not yet available 2166 {
1819
1820 glEnd (); 2167 glEnd ();
1821 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1822 glBegin (GL_QUADS); 2169 glBegin (GL_QUADS);
1823 } 2170 }
1824 2171
1825 if (border) 2172 if (border)
1826 { 2173 {
1827 float ox = border * dx; 2174 float ox = border * dx;
1828 2175
1829 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2176 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1830 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2177 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1831 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2178 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1832 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2179 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1833 } 2180 }
1834 2181
1835 if (corner) 2182 if (corner)
1836 { 2183 {
1837 float ox = corner * dx; 2184 float ox = corner * dx;
1838 2185
1839 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2186 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1840 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2187 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1841 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2188 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1842 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2189 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2190 }
1843 } 2191 }
1844 } 2192 }
1845 } 2193 }
1846 } 2194 }
1847 } 2195 }
2196
2197 glEnd ();
2198 glDisable (GL_TEXTURE_2D);
2199 key.texname = -1;
1848 } 2200 }
1849 2201
1850 hv_clear (smooth); 2202 hv_clear (smooth);
1851 } 2203 }
1852 2204
1853 glEnd (); 2205 if (pl_tex.name)
2206 {
2207 maptex tex = pl_tex;
2208 int px = pl_x + sdx;
2209 int py = pl_y + sdy;
1854 2210
1855 glDisable (GL_TEXTURE_2D); 2211 key.texname = tex.name;
2212 arr = rc_array (rc, &key);
2213
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2218
2219 rc_draw (rc);
2220 }
2221
1856 glDisable (GL_BLEND); 2222 glDisable (GL_BLEND);
2223 rc_free (rc);
1857 2224
1858 // top layer: overlays such as the health bar 2225 // top layer: overlays such as the health bar
1859 for (y = 0; y < sh; y++) 2226 for (y = 0; y < sh; y++)
1860 if (0 <= y + my && y + my < self->rows) 2227 if (0 <= y + my && y + my < self->rows)
1861 { 2228 {
… …
1886 } 2253 }
1887 } 2254 }
1888} 2255}
1889 2256
1890void 2257void
1891draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2258draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1892 CODE: 2259 CODE:
1893{ 2260{
1894 static float color[16][3] = { 2261 static float color[16][3] = {
1895 { 0.00F, 0.00F, 0.00F }, 2262 { 0.00F, 0.00F, 0.00F },
1896 { 1.00F, 1.00F, 1.00F }, 2263 { 1.00F, 1.00F, 1.00F },
… …
1946 glDisable (GL_BLEND); 2313 glDisable (GL_BLEND);
1947 glDisable (GL_TEXTURE_2D); 2314 glDisable (GL_TEXTURE_2D);
1948} 2315}
1949 2316
1950void 2317void
1951fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2318fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1952 PPCODE: 2319 PPCODE:
1953{ 2320{
1954 int x, y; 2321 int x, y;
2322 int sw1 = sw + 2;
2323 int sh1 = sh + 2;
2324 int sh3 = sh * 3;
1955 int sw4 = (sw + 3) & ~3; 2325 int sw34 = (sw * 3 + 3) & ~3;
2326 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1956 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2327 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1957 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2328 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1958 2329
1959 memset (darkness, 255, sw4 * sh);
1960 SvPOK_only (darkness_sv); 2330 SvPOK_only (darkness3_sv);
1961 SvCUR_set (darkness_sv, sw4 * sh); 2331 SvCUR_set (darkness3_sv, sw34 * sh3);
1962 2332
1963 mx += self->x; 2333 mx += self->x - 1;
1964 my += self->y; 2334 my += self->y - 1;
1965 2335
2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2337
1966 for (y = 0; y < sh; y++) 2338 for (y = 0; y < sh1; y++)
1967 if (0 <= y + my && y + my < self->rows) 2339 if (0 <= y + my && y + my < self->rows)
1968 { 2340 {
1969 maprow *row = self->row + (y + my); 2341 maprow *row = self->row + (y + my);
1970 2342
1971 for (x = 0; x < sw; x++) 2343 for (x = 0; x < sw1; x++)
1972 if (row->c0 <= x + mx && x + mx < row->c1) 2344 if (row->c0 <= x + mx && x + mx < row->c1)
1973 { 2345 {
1974 mapcell *cell = row->col + (x + mx - row->c0); 2346 mapcell *cell = row->col + (x + mx - row->c0);
1975 2347
1976 darkness[y * sw4 + x] = cell->darkness 2348 darkness1 [y * sw1 + x] = cell->darkness
1977 ? 255 - (cell->darkness - 1) 2349 ? 255 - (cell->darkness - 1)
1978 : 255 - FOW_DARKNESS; 2350 : 255 - FOW_DARKNESS;
1979 } 2351 }
1980 } 2352 }
1981 2353
2354 for (y = 0; y < sh; ++y)
2355 for (x = 0; x < sw; ++x)
2356 {
2357 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2358 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2359 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2360 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2361 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2362 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2363 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2364 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2365 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2366
2367 uint8_t r11 = (d11 + d21 + d12) / 3;
2368 uint8_t r21 = d21;
2369 uint8_t r31 = (d21 + d31 + d32) / 3;
2370
2371 uint8_t r12 = d12;
2372 uint8_t r22 = d22;
2373 uint8_t r32 = d32;
2374
2375 uint8_t r13 = (d13 + d23 + d12) / 3;
2376 uint8_t r23 = d23;
2377 uint8_t r33 = (d23 + d33 + d32) / 3;
2378
2379 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2380 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2381 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2382 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2383 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2384 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2385 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2386 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2387 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2388 }
2389
2390 free (darkness1);
2391
1982 EXTEND (SP, 3); 2392 EXTEND (SP, 3);
1983 PUSHs (sv_2mortal (newSViv (sw4))); 2393 PUSHs (sv_2mortal (newSViv (sw34)));
1984 PUSHs (sv_2mortal (newSViv (sh))); 2394 PUSHs (sv_2mortal (newSViv (sh3)));
1985 PUSHs (darkness_sv); 2395 PUSHs (darkness3_sv);
1986} 2396}
1987 2397
1988SV * 2398SV *
1989get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2399get_rect (DC::Map self, int x0, int y0, int w, int h)
1990 CODE: 2400 CODE:
1991{ 2401{
1992 int x, y, x1, y1; 2402 int x, y, x1, y1;
1993 SV *data_sv = newSV (w * h * 7 + 5); 2403 SV *data_sv = newSV (w * h * 7 + 5);
1994 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2404 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2051 else 2461 else
2052 *data++ = 0; 2462 *data++ = 0;
2053 } 2463 }
2054 } 2464 }
2055 2465
2466 /* if size is w*h + 5 then no data has been found */
2467 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2468 {
2056 SvPOK_only (data_sv); 2469 SvPOK_only (data_sv);
2057 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471 }
2472
2058 RETVAL = data_sv; 2473 RETVAL = data_sv;
2059} 2474}
2060 OUTPUT: 2475 OUTPUT:
2061 RETVAL 2476 RETVAL
2062 2477
2063void 2478void
2064set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2479set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2065 PPCODE: 2480 PPCODE:
2066{ 2481{
2067 int x, y, z; 2482 int x, y, z;
2068 int w, h; 2483 int w, h;
2069 int x1, y1; 2484 int x1, y1;
2485 STRLEN len;
2486 uint8_t *data, *end;
2487
2488 len = SvLEN (data_sv);
2489 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2490 data = SvPVbyte_nolen (data_sv);
2491 end = data + len + 8;
2492
2493 if (len < 5)
2494 XSRETURN_EMPTY;
2070 2495
2071 if (*data++ != 0) 2496 if (*data++ != 0)
2072 return; /* version mismatch */ 2497 XSRETURN_EMPTY; /* version mismatch */
2073 2498
2074 w = *data++ << 8; w |= *data++; 2499 w = *data++ << 8; w |= *data++;
2075 h = *data++ << 8; h |= *data++; 2500 h = *data++ << 8; h |= *data++;
2076 2501
2077 // we need to do this 'cause we don't keep an absolute coord system for rows 2502 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2089 { 2514 {
2090 maprow *row = map_get_row (self, y); 2515 maprow *row = map_get_row (self, y);
2091 2516
2092 for (x = x0; x < x1; x++) 2517 for (x = x0; x < x1; x++)
2093 { 2518 {
2519 uint8_t flags;
2520
2521 if (data + 7 >= end)
2522 XSRETURN_EMPTY;
2523
2094 uint8_t flags = *data++; 2524 flags = *data++;
2095 2525
2096 if (flags) 2526 if (flags)
2097 { 2527 {
2098 mapcell *cell = row_get_cell (row, x); 2528 mapcell *cell = row_get_cell (row, x);
2099 tileid tile[3] = { 0, 0, 0 }; 2529 tileid tile[3] = { 0, 0, 0 };
… …
2102 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2532 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2103 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2533 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2104 2534
2105 if (cell->darkness == 0) 2535 if (cell->darkness == 0)
2106 { 2536 {
2107 cell->darkness = 0; 2537 /*cell->darkness = 0;*/
2538 EXTEND (SP, 3);
2108 2539
2109 for (z = 0; z <= 2; z++) 2540 for (z = 0; z <= 2; z++)
2110 { 2541 {
2111 tileid t = tile [z]; 2542 tileid t = tile [z];
2112 2543
2113 if (t >= self->texs || (t && !self->tex [t].name)) 2544 if (t >= self->texs || (t && !self->tex [t].name))
2114 { 2545 {
2115 XPUSHs (sv_2mortal (newSViv (t))); 2546 PUSHs (sv_2mortal (newSViv (t)));
2116 need_texid (self, t); 2547 need_texid (self, t);
2117 } 2548 }
2118 2549
2119 cell->tile [z] = t; 2550 cell->tile [z] = t;
2120 } 2551 }
… …
2122 } 2553 }
2123 } 2554 }
2124 } 2555 }
2125} 2556}
2126 2557
2127MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2558MODULE = Deliantra::Client PACKAGE = DC::RW
2128 2559
2129CFPlus::MixChunk 2560DC::RW
2130new_from_file (SV *class, char *path) 2561new (SV *class, SV *data_sv)
2131 CODE: 2562 CODE:
2132 RETVAL = Mix_LoadWAV (path); 2563{
2564 STRLEN datalen;
2565 char *data = SvPVbyte (data_sv, datalen);
2566
2567 RETVAL = SDL_RWFromConstMem (data, datalen);
2568}
2133 OUTPUT: 2569 OUTPUT:
2134 RETVAL 2570 RETVAL
2135 2571
2572DC::RW
2573new_from_file (SV *class, const char *path, const char *mode = "rb")
2574 CODE:
2575 RETVAL = SDL_RWFromFile (path, mode);
2576 OUTPUT:
2577 RETVAL
2578
2579# fails on win32:
2580# dc.xs(2268) : error C2059: syntax error : '('
2136void 2581#void
2582#close (DC::RW self)
2583# CODE:
2584# (self->(close)) (self);
2585
2586MODULE = Deliantra::Client PACKAGE = DC::Channel
2587
2588PROTOTYPES: DISABLE
2589
2590DC::Channel
2591find ()
2592 CODE:
2593{
2594 RETVAL = Mix_GroupAvailable (-1);
2595
2596 if (RETVAL < 0)
2597 {
2598 RETVAL = Mix_GroupOldest (-1);
2599
2600 if (RETVAL < 0)
2601 XSRETURN_UNDEF;
2602
2603 Mix_HaltChannel (RETVAL);
2604 }
2605
2606 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128);
2608}
2609 OUTPUT:
2610 RETVAL
2611
2612void
2613halt (DC::Channel self)
2614 CODE:
2615 Mix_HaltChannel (self);
2616
2617void
2618expire (DC::Channel self, int ticks = -1)
2619 CODE:
2620 Mix_ExpireChannel (self, ticks);
2621
2622void
2623fade_out (DC::Channel self, int ticks = -1)
2624 CODE:
2625 Mix_FadeOutChannel (self, ticks);
2626
2627int
2628volume (DC::Channel self, int volume)
2629 CODE:
2630 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2631 OUTPUT:
2632 RETVAL
2633
2634void
2635unregister_all_effects (DC::Channel self)
2636 CODE:
2637 Mix_UnregisterAllEffects (self);
2638
2639void
2640set_panning (DC::Channel self, int left, int right)
2641 CODE:
2642 left = CLAMP (left , 0, 255);
2643 right = CLAMP (right, 0, 255);
2644 Mix_SetPanning (self, left, right);
2645
2646void
2647set_distance (DC::Channel self, int distance)
2648 CODE:
2649 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2650
2651void
2652set_position (DC::Channel self, int angle, int distance)
2653 CODE:
2654
2655void
2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2657 CODE:
2658{
2659 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2660 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2662}
2663
2664void
2665set_reverse_stereo (DC::Channel self, int flip)
2666 CODE:
2667 Mix_SetReverseStereo (self, flip);
2668
2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2670
2671PROTOTYPES: DISABLE
2672
2673DC::MixChunk
2674new (SV *class, DC::RW rwops)
2675 CODE:
2676 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2677 OUTPUT:
2678 RETVAL
2679
2680void
2137DESTROY (CFPlus::MixChunk self) 2681DESTROY (DC::MixChunk self)
2138 CODE: 2682 CODE:
2139 Mix_FreeChunk (self); 2683 Mix_FreeChunk (self);
2140 2684
2141int 2685int
2142volume (CFPlus::MixChunk self, int volume = -1) 2686volume (DC::MixChunk self, int volume = -1)
2143 CODE: 2687 CODE:
2688 if (items > 1)
2689 volume = CLAMP (volume, 0, 128);
2144 RETVAL = Mix_VolumeChunk (self, volume); 2690 RETVAL = Mix_VolumeChunk (self, volume);
2145 OUTPUT: 2691 OUTPUT:
2146 RETVAL 2692 RETVAL
2147 2693
2148int 2694DC::Channel
2149play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2695play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2150 CODE: 2696 CODE:
2697{
2151 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2698 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2699
2700 if (RETVAL < 0)
2701 XSRETURN_UNDEF;
2702
2703 if (channel < 0)
2704 {
2705 Mix_UnregisterAllEffects (RETVAL);
2706 Mix_Volume (RETVAL, 128);
2707 }
2708}
2152 OUTPUT: 2709 OUTPUT:
2153 RETVAL 2710 RETVAL
2154 2711
2155MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2156 2713
2157int 2714int
2158volume (int volume = -1) 2715volume (int volume = -1)
2716 PROTOTYPE: ;$
2159 CODE: 2717 CODE:
2718 if (items > 0)
2719 volume = CLAMP (volume, 0, 128);
2160 RETVAL = Mix_VolumeMusic (volume); 2720 RETVAL = Mix_VolumeMusic (volume);
2161 OUTPUT: 2721 OUTPUT:
2162 RETVAL 2722 RETVAL
2163 2723
2164int 2724void
2165fade_out (int ms) 2725fade_out (int ms)
2166 CODE: 2726 CODE:
2167 RETVAL = Mix_FadeOutMusic (ms); 2727 Mix_FadeOutMusic (ms);
2728
2729void
2730halt ()
2731 CODE:
2732 Mix_HaltMusic ();
2733
2734DC::MixMusic
2735new (SV *class, DC::RW rwops)
2736 CODE:
2737 RETVAL = Mix_LoadMUS_RW (rwops);
2168 OUTPUT: 2738 OUTPUT:
2169 RETVAL 2739 RETVAL
2170 2740
2171CFPlus::MixMusic
2172new_from_file (SV *class, char *path)
2173 CODE:
2174 RETVAL = Mix_LoadMUS (path);
2175 OUTPUT:
2176 RETVAL
2177
2178void 2741void
2179DESTROY (CFPlus::MixMusic self) 2742DESTROY (DC::MixMusic self)
2180 CODE: 2743 CODE:
2181 Mix_FreeMusic (self); 2744 Mix_FreeMusic (self);
2182 2745
2183int 2746int
2184play (CFPlus::MixMusic self, int loops = -1) 2747play (DC::MixMusic self, int loops = -1)
2185 CODE: 2748 CODE:
2186 RETVAL = Mix_PlayMusic (self, loops); 2749 RETVAL = Mix_PlayMusic (self, loops);
2187 OUTPUT: 2750 OUTPUT:
2188 RETVAL 2751 RETVAL
2189 2752
2190int 2753void
2191fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2754fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2192 CODE: 2755 CODE:
2193 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2756 Mix_FadeInMusicPos (self, loops, ms, position);
2194 OUTPUT:
2195 RETVAL
2196 2757
2197MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2758MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2759
2760PROTOTYPES: ENABLE
2198 2761
2199BOOT: 2762BOOT:
2200{ 2763{
2201 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2764 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2202 static const struct { 2765 static const struct {
2203 const char *name; 2766 const char *name;
2204 IV iv; 2767 IV iv;
2205 } *civ, const_iv[] = { 2768 } *civ, const_iv[] = {
2206# define const_iv(name) { # name, (IV)name } 2769# define const_iv(name) { # name, (IV)name }
2770 const_iv (GL_VENDOR),
2771 const_iv (GL_VERSION),
2772 const_iv (GL_EXTENSIONS),
2207 const_iv (GL_COLOR_MATERIAL), 2773 const_iv (GL_COLOR_MATERIAL),
2208 const_iv (GL_SMOOTH), 2774 const_iv (GL_SMOOTH),
2209 const_iv (GL_FLAT), 2775 const_iv (GL_FLAT),
2210 const_iv (GL_DITHER), 2776 const_iv (GL_DITHER),
2211 const_iv (GL_BLEND), 2777 const_iv (GL_BLEND),
… …
2215 const_iv (GL_ALPHA_TEST), 2781 const_iv (GL_ALPHA_TEST),
2216 const_iv (GL_NORMALIZE), 2782 const_iv (GL_NORMALIZE),
2217 const_iv (GL_RESCALE_NORMAL), 2783 const_iv (GL_RESCALE_NORMAL),
2218 const_iv (GL_FRONT), 2784 const_iv (GL_FRONT),
2219 const_iv (GL_BACK), 2785 const_iv (GL_BACK),
2786 const_iv (GL_AUX0),
2220 const_iv (GL_AND), 2787 const_iv (GL_AND),
2221 const_iv (GL_ONE), 2788 const_iv (GL_ONE),
2222 const_iv (GL_ZERO), 2789 const_iv (GL_ZERO),
2223 const_iv (GL_SRC_ALPHA), 2790 const_iv (GL_SRC_ALPHA),
2224 const_iv (GL_DST_ALPHA), 2791 const_iv (GL_DST_ALPHA),
… …
2237 const_iv (GL_INTENSITY), 2804 const_iv (GL_INTENSITY),
2238 const_iv (GL_LUMINANCE), 2805 const_iv (GL_LUMINANCE),
2239 const_iv (GL_LUMINANCE_ALPHA), 2806 const_iv (GL_LUMINANCE_ALPHA),
2240 const_iv (GL_FLOAT), 2807 const_iv (GL_FLOAT),
2241 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2808 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2809 const_iv (GL_COMPRESSED_ALPHA_ARB),
2810 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2811 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2812 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2813 const_iv (GL_COMPRESSED_RGB_ARB),
2814 const_iv (GL_COMPRESSED_RGBA_ARB),
2242 const_iv (GL_COMPILE), 2815 const_iv (GL_COMPILE),
2816 const_iv (GL_PROXY_TEXTURE_1D),
2817 const_iv (GL_PROXY_TEXTURE_2D),
2243 const_iv (GL_TEXTURE_1D), 2818 const_iv (GL_TEXTURE_1D),
2244 const_iv (GL_TEXTURE_2D), 2819 const_iv (GL_TEXTURE_2D),
2245 const_iv (GL_TEXTURE_ENV), 2820 const_iv (GL_TEXTURE_ENV),
2246 const_iv (GL_TEXTURE_MAG_FILTER), 2821 const_iv (GL_TEXTURE_MAG_FILTER),
2247 const_iv (GL_TEXTURE_MIN_FILTER), 2822 const_iv (GL_TEXTURE_MIN_FILTER),
… …
2268 const_iv (GL_COLOR_LOGIC_OP), 2843 const_iv (GL_COLOR_LOGIC_OP),
2269 const_iv (GL_SEPARABLE_2D), 2844 const_iv (GL_SEPARABLE_2D),
2270 const_iv (GL_CONVOLUTION_2D), 2845 const_iv (GL_CONVOLUTION_2D),
2271 const_iv (GL_CONVOLUTION_BORDER_MODE), 2846 const_iv (GL_CONVOLUTION_BORDER_MODE),
2272 const_iv (GL_CONSTANT_BORDER), 2847 const_iv (GL_CONSTANT_BORDER),
2848 const_iv (GL_POINTS),
2273 const_iv (GL_LINES), 2849 const_iv (GL_LINES),
2274 const_iv (GL_LINE_STRIP), 2850 const_iv (GL_LINE_STRIP),
2275 const_iv (GL_LINE_LOOP), 2851 const_iv (GL_LINE_LOOP),
2276 const_iv (GL_QUADS), 2852 const_iv (GL_QUADS),
2277 const_iv (GL_QUAD_STRIP), 2853 const_iv (GL_QUAD_STRIP),
2278 const_iv (GL_TRIANGLES), 2854 const_iv (GL_TRIANGLES),
2279 const_iv (GL_TRIANGLE_STRIP), 2855 const_iv (GL_TRIANGLE_STRIP),
2280 const_iv (GL_TRIANGLE_FAN), 2856 const_iv (GL_TRIANGLE_FAN),
2857 const_iv (GL_POLYGON),
2281 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2858 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2859 const_iv (GL_POINT_SMOOTH_HINT),
2860 const_iv (GL_LINE_SMOOTH_HINT),
2861 const_iv (GL_POLYGON_SMOOTH_HINT),
2862 const_iv (GL_GENERATE_MIPMAP_HINT),
2863 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2282 const_iv (GL_FASTEST), 2864 const_iv (GL_FASTEST),
2865 const_iv (GL_DONT_CARE),
2866 const_iv (GL_NICEST),
2283 const_iv (GL_V2F), 2867 const_iv (GL_V2F),
2284 const_iv (GL_V3F), 2868 const_iv (GL_V3F),
2285 const_iv (GL_T2F_V3F), 2869 const_iv (GL_T2F_V3F),
2286 const_iv (GL_T2F_N3F_V3F), 2870 const_iv (GL_T2F_N3F_V3F),
2287# undef const_iv 2871# undef const_iv
… …
2292 2876
2293 texture_av = newAV (); 2877 texture_av = newAV ();
2294 AvREAL_off (texture_av); 2878 AvREAL_off (texture_av);
2295} 2879}
2296 2880
2881void
2882disable_GL_EXT_blend_func_separate ()
2883 CODE:
2884 gl.BlendFuncSeparate = 0;
2885 gl.BlendFuncSeparateEXT = 0;
2886
2297char * 2887char *
2298gl_vendor () 2888gl_vendor ()
2299 CODE: 2889 CODE:
2300 RETVAL = (char *)glGetString (GL_VENDOR); 2890 RETVAL = (char *)glGetString (GL_VENDOR);
2301 OUTPUT: 2891 OUTPUT:
… …
2313 CODE: 2903 CODE:
2314 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2904 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2315 OUTPUT: 2905 OUTPUT:
2316 RETVAL 2906 RETVAL
2317 2907
2908const char *glGetString (GLenum pname)
2909
2910GLint glGetInteger (GLenum pname)
2911 CODE:
2912 glGetIntegerv (pname, &RETVAL);
2913 OUTPUT:
2914 RETVAL
2915
2916GLdouble glGetDouble (GLenum pname)
2917 CODE:
2918 glGetDoublev (pname, &RETVAL);
2919 OUTPUT:
2920 RETVAL
2921
2318int glGetError () 2922int glGetError ()
2319 2923
2320void glFinish () 2924void glFinish ()
2321 2925
2322void glClear (int mask) 2926void glClear (int mask)
… …
2359# near_ and far_ are due to microsofts buggy "c" compiler 2963# near_ and far_ are due to microsofts buggy "c" compiler
2360void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2964void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2361 2965
2362# near_ and far_ are due to microsofts buggy "c" compiler 2966# near_ and far_ are due to microsofts buggy "c" compiler
2363void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2967void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2968
2969PROTOTYPES: DISABLE
2364 2970
2365void glViewport (int x, int y, int width, int height) 2971void glViewport (int x, int y, int width, int height)
2366 2972
2367void glScissor (int x, int y, int width, int height) 2973void glScissor (int x, int y, int width, int height)
2368 2974
… …
2376 2982
2377void glRotate (float angle, float x, float y, float z) 2983void glRotate (float angle, float x, float y, float z)
2378 CODE: 2984 CODE:
2379 glRotatef (angle, x, y, z); 2985 glRotatef (angle, x, y, z);
2380 2986
2381void glBegin (int mode)
2382
2383void glEnd ()
2384
2385void glColor (float r, float g, float b, float a = 1.0) 2987void glColor (float r, float g, float b, float a = 1.0)
2386 PROTOTYPE: @
2387 ALIAS: 2988 ALIAS:
2388 glColor_premultiply = 1 2989 glColor_premultiply = 1
2389 CODE: 2990 CODE:
2390 if (ix) 2991 if (ix)
2391 { 2992 {
… …
2394 b *= a; 2995 b *= a;
2395 } 2996 }
2396 // microsoft visual "c" rounds instead of truncating... 2997 // microsoft visual "c" rounds instead of truncating...
2397 glColor4f (r, g, b, a); 2998 glColor4f (r, g, b, a);
2398 2999
2399void glInterleavedArrays (int format, int stride, char *data)
2400
2401void glDrawElements (int mode, int count, int type, char *indices)
2402
2403# 1.2 void glDrawRangeElements (int mode, int start, int end
2404
2405void glRasterPos (float x, float y, float z = 0.) 3000void glRasterPos (float x, float y, float z = 0.)
2406 CODE: 3001 CODE:
2407 glRasterPos3f (0, 0, z); 3002 glRasterPos3f (0, 0, z);
2408 glBitmap (0, 0, 0, 0, x, y, 0); 3003 glBitmap (0, 0, 0, 0, x, y, 0);
2409 3004
… …
2413 3008
2414void glTexCoord (float s, float t) 3009void glTexCoord (float s, float t)
2415 CODE: 3010 CODE:
2416 glTexCoord2f (s, t); 3011 glTexCoord2f (s, t);
2417 3012
3013void glRect (float x1, float y1, float x2, float y2)
3014 CODE:
3015 glRectf (x1, y1, x2, y2);
3016
3017void glRect_lineloop (float x1, float y1, float x2, float y2)
3018 CODE:
3019 glBegin (GL_LINE_LOOP);
3020 glVertex2f (x1, y1);
3021 glVertex2f (x2, y1);
3022 glVertex2f (x2, y2);
3023 glVertex2f (x1, y2);
3024 glEnd ();
3025
3026PROTOTYPES: ENABLE
3027
3028void glBegin (int mode)
3029
3030void glEnd ()
3031
3032void glPointSize (GLfloat size)
3033
3034void glLineWidth (GLfloat width)
3035
3036void glInterleavedArrays (int format, int stride, char *data)
3037
3038void glDrawElements (int mode, int count, int type, char *indices)
3039
3040# 1.2 void glDrawRangeElements (int mode, int start, int end
3041
2418void glTexEnv (int target, int pname, float param) 3042void glTexEnv (int target, int pname, float param)
2419 CODE: 3043 CODE:
2420 glTexEnvf (target, pname, param); 3044 glTexEnvf (target, pname, param);
2421 3045
2422void glTexParameter (int target, int pname, float param) 3046void glTexParameter (int target, int pname, float param)
… …
2438void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3062void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2439 CODE: 3063 CODE:
2440 if (gl.SeparableFilter2D) 3064 if (gl.SeparableFilter2D)
2441 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3065 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2442 3066
2443void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3067void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2444 3068
2445void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3069void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2446 3070
2447void glDrawPixels (int width, int height, int format, int type, char *pixels) 3071void glDrawPixels (int width, int height, int format, int type, char *pixels)
3072
3073void glPixelZoom (float x, float y)
2448 3074
2449void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 3075void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2450 3076
2451int glGenTexture () 3077int glGenTexture ()
2452 CODE: 3078 CODE:
… …
2472 3098
2473void glEndList () 3099void glEndList ()
2474 3100
2475void glCallList (int list) 3101void glCallList (int list)
2476 3102
3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3104
3105PROTOTYPES: DISABLE
3106
3107void
3108find_widget (SV *self, NV x, NV y)
3109 PPCODE:
3110{
3111 if (within_widget (self, x, y))
3112 XPUSHs (self);
3113}
3114
3115BOOT:
3116{
3117 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3118
3119 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3120 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3121 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3122 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3123}
3124
3125void
3126draw (SV *self)
3127 CODE:
3128{
3129 HV *hv;
3130 SV **svp;
3131 NV x, y, w, h;
3132 SV *draw_x_sv = GvSV (draw_x_gv);
3133 SV *draw_y_sv = GvSV (draw_y_gv);
3134 SV *draw_w_sv = GvSV (draw_w_gv);
3135 SV *draw_h_sv = GvSV (draw_h_gv);
3136 double draw_x, draw_y;
3137
3138 if (!SvROK (self))
3139 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3140
3141 hv = (HV *)SvRV (self);
3142
3143 if (SvTYPE (hv) != SVt_PVHV)
3144 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3145
3146 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3147 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3148
3149 if (!h || !w)
3150 XSRETURN_EMPTY;
3151
3152 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3153 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3154
3155 draw_x = SvNV (draw_x_sv) + x;
3156 draw_y = SvNV (draw_y_sv) + y;
3157
3158 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3159 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3160 XSRETURN_EMPTY;
3161
3162 sv_setnv (draw_x_sv, draw_x);
3163 sv_setnv (draw_y_sv, draw_y);
3164
3165 glPushMatrix ();
3166 glTranslated (x, y, 0);
3167
3168 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3169 {
3170 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3171
3172 if (svp && SvTRUE (*svp))
3173 {
3174 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3175 glEnable (GL_BLEND);
3176 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3177 glBegin (GL_QUADS);
3178 glVertex2f (0, 0);
3179 glVertex2f (w, 0);
3180 glVertex2f (w, h);
3181 glVertex2f (0, h);
3182 glEnd ();
3183 glDisable (GL_BLEND);
3184 }
3185 }
3186#if 0
3187 // draw borders, for debugging
3188 glPushMatrix ();
3189 glColor4f (1., 1., 0., 1.);
3190 glTranslatef (.5, .5, 0.);
3191 glBegin (GL_LINE_LOOP);
3192 glVertex2f (0 , 0);
3193 glVertex2f (w - 1, 0);
3194 glVertex2f (w - 1, h - 1);
3195 glVertex2f (0 , h - 1);
3196 glEnd ();
3197 glPopMatrix ();
3198#endif
3199 PUSHMARK (SP);
3200 XPUSHs (self);
3201 PUTBACK;
3202 call_method ("_draw", G_VOID | G_DISCARD);
3203 SPAGAIN;
3204
3205 glPopMatrix ();
3206
3207 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3208 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3209}
3210

Diff Legend

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