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.203 by root, Thu Jul 19 13:45:16 2007 UTC vs.
Revision 1.265 by root, Fri Jul 18 22:56:11 2008 UTC

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

Diff Legend

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