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.268 by root, Sun Jul 20 02:57:43 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);
… …
339 self->oy = 0; 367 self->oy = 0;
340 self->row = 0; 368 self->row = 0;
341 self->rows = 0; 369 self->rows = 0;
342} 370}
343 371
372#define CELL_CLEAR(cell) \
373 do { \
374 if ((cell)->player) \
375 (cell)->tile [2] = 0; \
376 (cell)->darkness = 0; \
377 (cell)->stat_hp = 0; \
378 (cell)->flags = 0; \
379 (cell)->player = 0; \
380 } while (0)
381
344static void 382static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 383map_blank (DC__Map self, int x0, int y0, int w, int h)
346{ 384{
347 int x, y; 385 int x, y;
348 maprow *row; 386 maprow *row;
349 mapcell *cell; 387 mapcell *cell;
350 388
… …
362 if (x >= row->c1) 400 if (x >= row->c1)
363 break; 401 break;
364 402
365 cell = row->col + x - row->c0; 403 cell = row->col + x - row->c0;
366 404
367 cell->darkness = 0; 405 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 406 }
372 } 407 }
373} 408}
374 409
375typedef struct { 410typedef struct {
… …
429 n |= n >> 16; 464 n |= n >> 16;
430 465
431 return n + 1; 466 return n + 1;
432} 467}
433 468
469static unsigned int
470popcount (unsigned int n)
471{
472 n -= (n >> 1) & 0x55555555U;
473 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
474 n = ((n >> 4) + n) & 0x0f0f0f0fU;
475 n *= 0x01010101U;
476
477 return n >> 24;
478}
479
434/* SDL should provide this, really. */ 480/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 481#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 482#define SDLK_MODIFIER_MAX 314
437 483
438MODULE = CFPlus PACKAGE = CFPlus 484/******************************************************************************/
485
486static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
487static GV *hover_gv;
488
489static int
490within_widget (SV *widget, NV x, NV y)
491{
492 HV *self;
493 SV **svp;
494 NV wx, ww, wy, wh;
495
496 if (!SvROK (widget))
497 return 0;
498
499 self = (HV *)SvRV (widget);
500
501 if (SvTYPE (self) != SVt_PVHV)
502 return 0;
503
504 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
505 if (y < wy)
506 return 0;
507
508 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
509 if (y >= wy + wh)
510 return 0;
511
512 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
513 if (x < wx)
514 return 0;
515
516 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
517 if (x >= wx + ww)
518 return 0;
519
520 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
521 if (!svp || !SvTRUE (*svp))
522 return 0;
523
524 return 1;
525}
526
527MODULE = Deliantra::Client PACKAGE = DC
439 528
440PROTOTYPES: ENABLE 529PROTOTYPES: ENABLE
441 530
442BOOT: 531BOOT:
443{ 532{
444 HV *stash = gv_stashpv ("CFPlus", 1); 533 HV *stash = gv_stashpv ("DC", 1);
445 static const struct { 534 static const struct {
446 const char *name; 535 const char *name;
447 IV iv; 536 IV iv;
448 } *civ, const_iv[] = { 537 } *civ, const_iv[] = {
449# define const_iv(name) { # name, (IV)name } 538# define const_iv(name) { # name, (IV)name }
… …
471 560
472 const_iv (SDL_APPINPUTFOCUS), 561 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS), 562 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE), 563 const_iv (SDL_APPACTIVE),
475 564
565 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST),
476 const_iv (SDLK_KP0), 567 const_iv (SDLK_KP0),
477 const_iv (SDLK_KP1), 568 const_iv (SDLK_KP1),
478 const_iv (SDLK_KP2), 569 const_iv (SDLK_KP2),
479 const_iv (SDLK_KP3), 570 const_iv (SDLK_KP3),
480 const_iv (SDLK_KP4), 571 const_iv (SDLK_KP4),
… …
552 const_iv (KMOD_LMETA), 643 const_iv (KMOD_LMETA),
553 const_iv (KMOD_RMETA), 644 const_iv (KMOD_RMETA),
554 const_iv (KMOD_NUM), 645 const_iv (KMOD_NUM),
555 const_iv (KMOD_CAPS), 646 const_iv (KMOD_CAPS),
556 const_iv (KMOD_MODE), 647 const_iv (KMOD_MODE),
648
649 const_iv (MIX_DEFAULT_FORMAT),
650
651 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO),
654 const_iv (SDL_INIT_CDROM),
655 const_iv (SDL_INIT_JOYSTICK),
656 const_iv (SDL_INIT_EVERYTHING),
657 const_iv (SDL_INIT_NOPARACHUTE),
658 const_iv (SDL_INIT_EVENTTHREAD),
659
660 const_iv (SDL_GL_RED_SIZE),
661 const_iv (SDL_GL_GREEN_SIZE),
662 const_iv (SDL_GL_BLUE_SIZE),
663 const_iv (SDL_GL_ALPHA_SIZE),
664 const_iv (SDL_GL_DOUBLEBUFFER),
665 const_iv (SDL_GL_BUFFER_SIZE),
666 const_iv (SDL_GL_DEPTH_SIZE),
667 const_iv (SDL_GL_STENCIL_SIZE),
668 const_iv (SDL_GL_ACCUM_RED_SIZE),
669 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
670 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
671 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
672 const_iv (SDL_GL_STEREO),
673 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
674 const_iv (SDL_GL_MULTISAMPLESAMPLES),
675 const_iv (SDL_GL_ACCELERATED_VISUAL),
676 const_iv (SDL_GL_SWAP_CONTROL)
557# undef const_iv 677# undef const_iv
558 }; 678 };
559 679
560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 680 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 681 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
579 699
580NV floor (NV x) 700NV floor (NV x)
581 701
582NV ceil (NV x) 702NV ceil (NV x)
583 703
704IV minpot (UV n)
705
706IV popcount (UV n)
707
584void 708void
585pango_init () 709pango_init ()
586 CODE: 710 CODE:
587{ 711{
588 opengl_fontmap = pango_opengl_font_map_new (); 712 opengl_fontmap = pango_opengl_font_map_new ();
589 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 713 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); 714 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
715 /*pango_context_set_font_description (opengl_context, default_font);*/
716#if PANGO_VERSION_CHECK (1, 15, 2)
717 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
718 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
719#endif
591} 720}
592 721
593char *
594SDL_GetError () 722char *SDL_GetError ()
595 723
596int 724int SDL_Init (U32 flags)
597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
598 725
599void 726int SDL_InitSubSystem (U32 flags)
727
728void SDL_QuitSubSystem (U32 flags)
729
600SDL_Quit () 730void SDL_Quit ()
731
732int SDL_GL_SetAttribute (int attr, int value)
733
734int SDL_GL_GetAttribute (int attr)
735 CODE:
736 if (SDL_GL_GetAttribute (attr, &RETVAL))
737 XSRETURN_UNDEF;
738 OUTPUT:
739 RETVAL
601 740
602void 741void
603SDL_ListModes (int rgb, int alpha) 742SDL_ListModes (int rgb, int alpha)
604 PPCODE: 743 PPCODE:
605{ 744{
… …
617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 756 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 757 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 758 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
620 759
621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 760 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); 761 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
625#endif
626 762
627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 763 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
628 764
629 if (m && m != (SDL_Rect **)-1) 765 if (m && m != (SDL_Rect **)-1)
630 while (*m) 766 while (*m)
631 { 767 {
632 if ((*m)->w >= 640 && (*m)->h >= 480) 768 if ((*m)->w >= 400 && (*m)->h >= 300)
633 { 769 {
634 AV *av = newAV (); 770 AV *av = newAV ();
635 av_push (av, newSViv ((*m)->w)); 771 av_push (av, newSViv ((*m)->w));
636 av_push (av, newSViv ((*m)->h)); 772 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb)); 773 av_push (av, newSViv (rgb));
… …
661 797
662 if (RETVAL) 798 if (RETVAL)
663 { 799 {
664 av_clear (texture_av); 800 av_clear (texture_av);
665 801
666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 802 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
667#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 803#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
668#include "glfunc.h" 804#include "glfunc.h"
669#undef GL_FUNC 805#undef GL_FUNC
670 } 806 }
671} 807}
… …
678char * 814char *
679SDL_GetKeyName (int sym) 815SDL_GetKeyName (int sym)
680 816
681int 817int
682SDL_GetAppState () 818SDL_GetAppState ()
819
820int
821SDL_GetModState ()
683 822
684void 823void
685poll_events () 824poll_events ()
686 PPCODE: 825 PPCODE:
687{ 826{
… …
697 { 836 {
698 case SDL_KEYDOWN: 837 case SDL_KEYDOWN:
699 case SDL_KEYUP: 838 case SDL_KEYUP:
700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 839 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 840 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
702 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 841 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 */ 842 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); 843 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
705 break; 844 break;
706 845
707 case SDL_ACTIVEEVENT: 846 case SDL_ACTIVEEVENT:
708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 847 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
726 x = ev.motion.x; 865 x = ev.motion.x;
727 y = ev.motion.y; 866 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 867 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 } 868 }
730 869
731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 870 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
732 hv_store (hv, "state", 5, newSViv (state), 0); 871 hv_store (hv, "state", 5, newSViv (state), 0);
733 hv_store (hv, "x", 1, newSViv (x), 0); 872 hv_store (hv, "x", 1, newSViv (x), 0);
734 hv_store (hv, "y", 1, newSViv (y), 0); 873 hv_store (hv, "y", 1, newSViv (y), 0);
735 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 874 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
736 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 875 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 } 876 }
738 break; 877 break;
739 878
740 case SDL_MOUSEBUTTONDOWN: 879 case SDL_MOUSEBUTTONDOWN:
741 case SDL_MOUSEBUTTONUP: 880 case SDL_MOUSEBUTTONUP:
742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 881 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
743 882
744 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 883 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
745 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 884 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
746 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 885 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
747 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 886 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
752 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 891 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
753 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 892 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
754 break; 893 break;
755 } 894 }
756 895
757 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 896 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
758 } 897 }
759} 898}
760 899
761int 900int
762Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 901Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
763 POSTCALL: 902 POSTCALL:
764 Mix_HookMusicFinished (music_finished); 903 Mix_HookMusicFinished (music_finished);
765 Mix_ChannelFinished (channel_finished); 904 Mix_ChannelFinished (channel_finished);
766 905
767void 906void
907Mix_QuerySpec ()
908 PPCODE:
909{
910 int freq, channels;
911 Uint16 format;
912
913 if (Mix_QuerySpec (&freq, &format, &channels))
914 {
915 EXTEND (SP, 3);
916 PUSHs (sv_2mortal (newSViv (freq)));
917 PUSHs (sv_2mortal (newSViv (format)));
918 PUSHs (sv_2mortal (newSViv (channels)));
919 }
920}
921
922void
768Mix_CloseAudio () 923Mix_CloseAudio ()
769 924
770int 925int
771Mix_AllocateChannels (int numchans = -1) 926Mix_AllocateChannels (int numchans = -1)
927
928const char *
929Mix_GetError ()
772 930
773void 931void
774lowdelay (int fd, int val = 1) 932lowdelay (int fd, int val = 1)
775 CODE: 933 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 934 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
802 } 960 }
803 } 961 }
804#endif 962#endif
805} 963}
806 964
807void 965int
808add_font (char *file) 966add_font (char *file)
809 CODE: 967 CODE:
810 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 968 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
969 OUTPUT:
970 RETVAL
811 971
812void 972void
813load_image_inline (SV *image_) 973load_image_inline (SV *image_)
814 ALIAS: 974 ALIAS:
815 load_image_file = 1 975 load_image_file = 1
… …
818 STRLEN image_len; 978 STRLEN image_len;
819 char *image = (char *)SvPVbyte (image_, image_len); 979 char *image = (char *)SvPVbyte (image_, image_len);
820 SDL_Surface *surface, *surface2; 980 SDL_Surface *surface, *surface2;
821 SDL_PixelFormat fmt; 981 SDL_PixelFormat fmt;
822 SDL_RWops *rw = ix 982 SDL_RWops *rw = ix
823 ? SDL_RWFromFile (image, "r") 983 ? SDL_RWFromFile (image, "rb")
824 : SDL_RWFromConstMem (image, image_len); 984 : SDL_RWFromConstMem (image, image_len);
825 985
826 if (!rw) 986 if (!rw)
827 croak ("load_image: %s", SDL_GetError ()); 987 croak ("load_image: %s", SDL_GetError ());
828 988
… …
901void 1061void
902error (char *message) 1062error (char *message)
903 CODE: 1063 CODE:
904 fprintf (stderr, "ERROR: %s\n", message); 1064 fprintf (stderr, "ERROR: %s\n", message);
905#ifdef _WIN32 1065#ifdef _WIN32
906 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1066 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
907#endif 1067#endif
908 1068
909void 1069void
910fatal (char *message) 1070fatal (char *message)
911 CODE: 1071 CODE:
912 fprintf (stderr, "FATAL: %s\n", message); 1072 fprintf (stderr, "FATAL: %s\n", message);
913#ifdef _WIN32 1073#ifdef _WIN32
914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1074 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
915#endif 1075#endif
916 _exit (1); 1076 _exit (1);
917 1077
918void 1078void
919_exit (int retval = 0) 1079_exit (int retval = 0)
… …
931#if DEBUG 1091#if DEBUG
932 VALGRIND_DO_LEAK_CHECK; 1092 VALGRIND_DO_LEAK_CHECK;
933#endif 1093#endif
934} 1094}
935 1095
936MODULE = CFPlus PACKAGE = CFPlus::Font 1096MODULE = Deliantra::Client PACKAGE = DC::Font
937 1097
938CFPlus::Font 1098PROTOTYPES: DISABLE
1099
1100DC::Font
939new_from_file (SV *class, char *path, int id = 0) 1101new_from_file (SV *class, char *path, int id = 0)
940 CODE: 1102 CODE:
941{ 1103{
942 int count; 1104 int count;
943 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1105 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
946} 1108}
947 OUTPUT: 1109 OUTPUT:
948 RETVAL 1110 RETVAL
949 1111
950void 1112void
951DESTROY (CFPlus::Font self) 1113DESTROY (DC::Font self)
952 CODE: 1114 CODE:
953 pango_font_description_free (self); 1115 pango_font_description_free (self);
954 1116
955void 1117void
956make_default (CFPlus::Font self) 1118make_default (DC::Font self)
1119 PROTOTYPE: $
957 CODE: 1120 CODE:
958 default_font = self; 1121 default_font = self;
959 1122
960MODULE = CFPlus PACKAGE = CFPlus::Layout 1123MODULE = Deliantra::Client PACKAGE = DC::Layout
961 1124
1125PROTOTYPES: DISABLE
1126
962void 1127void
963reset_glyph_cache () 1128glyph_cache_backup ()
1129 PROTOTYPE:
964 CODE: 1130 CODE:
1131 tc_backup ();
1132
1133void
1134glyph_cache_restore ()
1135 PROTOTYPE:
1136 CODE:
965 tc_clear (); 1137 tc_restore ();
966 1138
967CFPlus::Layout 1139DC::Layout
968new (SV *class) 1140new (SV *class)
969 CODE: 1141 CODE:
970 New (0, RETVAL, 1, struct cf_layout); 1142 New (0, RETVAL, 1, struct cf_layout);
971 1143
972 RETVAL->pl = pango_layout_new (opengl_context); 1144 RETVAL->pl = pango_layout_new (opengl_context);
… …
974 RETVAL->g = 1.; 1146 RETVAL->g = 1.;
975 RETVAL->b = 1.; 1147 RETVAL->b = 1.;
976 RETVAL->a = 1.; 1148 RETVAL->a = 1.;
977 RETVAL->base_height = MIN_FONT_HEIGHT; 1149 RETVAL->base_height = MIN_FONT_HEIGHT;
978 RETVAL->font = 0; 1150 RETVAL->font = 0;
1151 RETVAL->rc = rc_alloc ();
979 1152
980 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1153 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
981 layout_update_font (RETVAL); 1154 layout_update_font (RETVAL);
982 OUTPUT: 1155 OUTPUT:
983 RETVAL 1156 RETVAL
984 1157
985void 1158void
986DESTROY (CFPlus::Layout self) 1159DESTROY (DC::Layout self)
987 CODE: 1160 CODE:
988 g_object_unref (self->pl); 1161 g_object_unref (self->pl);
1162 rc_free (self->rc);
989 Safefree (self); 1163 Safefree (self);
990 1164
991void 1165void
992set_text (CFPlus::Layout self, SV *text_) 1166set_text (DC::Layout self, SV *text_)
993 CODE: 1167 CODE:
994{ 1168{
995 STRLEN textlen; 1169 STRLEN textlen;
996 char *text = SvPVutf8 (text_, textlen); 1170 char *text = SvPVutf8 (text_, textlen);
997 1171
998 pango_layout_set_text (self->pl, text, textlen); 1172 pango_layout_set_text (self->pl, text, textlen);
999} 1173}
1000 1174
1001void 1175void
1002set_markup (CFPlus::Layout self, SV *text_) 1176set_markup (DC::Layout self, SV *text_)
1003 CODE: 1177 CODE:
1004{ 1178{
1005 STRLEN textlen; 1179 STRLEN textlen;
1006 char *text = SvPVutf8 (text_, textlen); 1180 char *text = SvPVutf8 (text_, textlen);
1007 1181
1008 pango_layout_set_markup (self->pl, text, textlen); 1182 pango_layout_set_markup (self->pl, text, textlen);
1009} 1183}
1010 1184
1011void 1185void
1012set_shapes (CFPlus::Layout self, ...) 1186set_shapes (DC::Layout self, ...)
1013 CODE: 1187 CODE:
1014{ 1188{
1015 PangoAttrList *attrs = 0; 1189 PangoAttrList *attrs = 0;
1016 const char *text = pango_layout_get_text (self->pl); 1190 const char *text = pango_layout_get_text (self->pl);
1017 const char *pos = text; 1191 const char *pos = text;
… …
1052 if (attrs) 1226 if (attrs)
1053 pango_layout_set_attributes (self->pl, attrs); 1227 pango_layout_set_attributes (self->pl, attrs);
1054} 1228}
1055 1229
1056void 1230void
1057get_shapes (CFPlus::Layout self) 1231get_shapes (DC::Layout self)
1058 PPCODE: 1232 PPCODE:
1059{ 1233{
1060 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1234 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1061 1235
1062 do 1236 do
1063 { 1237 {
1064 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1238 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1065 1239
1066 if (run && shape_attr_p (run)) 1240 if (run && shape_attr_p (run))
1067 { 1241 {
1068 PangoRectangle extents; 1242 PangoRectangle extents;
1069 pango_layout_iter_get_run_extents (iter, 0, &extents); 1243 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1077 1251
1078 pango_layout_iter_free (iter); 1252 pango_layout_iter_free (iter);
1079} 1253}
1080 1254
1081int 1255int
1082has_wrapped (CFPlus::Layout self) 1256has_wrapped (DC::Layout self)
1083 CODE: 1257 CODE:
1084{ 1258{
1085 int lines = 1; 1259 int lines = 1;
1086 const char *text = pango_layout_get_text (self->pl); 1260 const char *text = pango_layout_get_text (self->pl);
1087 1261
… …
1092} 1266}
1093 OUTPUT: 1267 OUTPUT:
1094 RETVAL 1268 RETVAL
1095 1269
1096SV * 1270SV *
1097get_text (CFPlus::Layout self) 1271get_text (DC::Layout self)
1098 CODE: 1272 CODE:
1099 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1273 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1100 sv_utf8_decode (RETVAL); 1274 sv_utf8_decode (RETVAL);
1101 OUTPUT: 1275 OUTPUT:
1102 RETVAL 1276 RETVAL
1103 1277
1104void 1278void
1105set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1279set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1106 CODE: 1280 CODE:
1107 self->r = r; 1281 self->r = r;
1108 self->g = g; 1282 self->g = g;
1109 self->b = b; 1283 self->b = b;
1110 self->a = a; 1284 self->a = a;
1111 1285
1112void 1286void
1113set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1287set_font (DC::Layout self, DC::Font font = 0)
1114 CODE: 1288 CODE:
1115 if (self->font != font) 1289 if (self->font != font)
1116 { 1290 {
1117 self->font = font; 1291 self->font = font;
1118 layout_update_font (self); 1292 layout_update_font (self);
1119 } 1293 }
1120 1294
1121void 1295void
1122set_height (CFPlus::Layout self, int base_height) 1296set_height (DC::Layout self, int base_height)
1123 CODE: 1297 CODE:
1124 if (self->base_height != base_height) 1298 if (self->base_height != base_height)
1125 { 1299 {
1126 self->base_height = base_height; 1300 self->base_height = base_height;
1127 layout_update_font (self); 1301 layout_update_font (self);
1128 } 1302 }
1129 1303
1130void 1304void
1131set_width (CFPlus::Layout self, int max_width = -1) 1305set_width (DC::Layout self, int max_width = -1)
1132 CODE: 1306 CODE:
1133 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1307 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1134 1308
1135void 1309void
1136set_indent (CFPlus::Layout self, int indent) 1310set_indent (DC::Layout self, int indent)
1137 CODE: 1311 CODE:
1138 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1312 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1139 1313
1140void 1314void
1141set_spacing (CFPlus::Layout self, int spacing) 1315set_spacing (DC::Layout self, int spacing)
1142 CODE: 1316 CODE:
1143 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1317 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1144 1318
1145void 1319void
1146set_ellipsise (CFPlus::Layout self, int ellipsise) 1320set_ellipsise (DC::Layout self, int ellipsise)
1147 CODE: 1321 CODE:
1148 pango_layout_set_ellipsize (self->pl, 1322 pango_layout_set_ellipsize (self->pl,
1149 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1323 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1150 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1324 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1151 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1325 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1152 : PANGO_ELLIPSIZE_NONE 1326 : PANGO_ELLIPSIZE_NONE
1153 ); 1327 );
1154 1328
1155void 1329void
1156set_single_paragraph_mode (CFPlus::Layout self, int spm) 1330set_single_paragraph_mode (DC::Layout self, int spm)
1157 CODE: 1331 CODE:
1158 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1332 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1159 1333
1160void 1334void
1161size (CFPlus::Layout self) 1335size (DC::Layout self)
1162 PPCODE: 1336 PPCODE:
1163{ 1337{
1164 int w, h; 1338 int w, h;
1165 1339
1166 layout_get_pixel_size (self, &w, &h); 1340 layout_get_pixel_size (self, &w, &h);
… …
1169 PUSHs (sv_2mortal (newSViv (w))); 1343 PUSHs (sv_2mortal (newSViv (w)));
1170 PUSHs (sv_2mortal (newSViv (h))); 1344 PUSHs (sv_2mortal (newSViv (h)));
1171} 1345}
1172 1346
1173int 1347int
1174descent (CFPlus::Layout self) 1348descent (DC::Layout self)
1175 CODE: 1349 CODE:
1176{ 1350{
1177 PangoRectangle rect; 1351 PangoRectangle rect;
1178 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1352 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1179 pango_layout_line_get_pixel_extents (line, 0, &rect); 1353 pango_layout_line_get_pixel_extents (line, 0, &rect);
1180 RETVAL = PANGO_DESCENT (rect); 1354 RETVAL = PANGO_DESCENT (rect);
1181} 1355}
1182 OUTPUT: 1356 OUTPUT:
1183 RETVAL 1357 RETVAL
1184 1358
1185int 1359int
1186xy_to_index (CFPlus::Layout self, int x, int y) 1360xy_to_index (DC::Layout self, int x, int y)
1187 CODE: 1361 CODE:
1188{ 1362{
1189 int index, trailing; 1363 int index, trailing;
1190 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1364 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1191 RETVAL = index + trailing; 1365 RETVAL = index + trailing;
1192} 1366}
1193 OUTPUT: 1367 OUTPUT:
1194 RETVAL 1368 RETVAL
1195 1369
1196void 1370void
1197cursor_pos (CFPlus::Layout self, int index) 1371cursor_pos (DC::Layout self, int index)
1198 PPCODE: 1372 PPCODE:
1199{ 1373{
1200 PangoRectangle strong_pos; 1374 PangoRectangle pos;
1201 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1375 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1202 1376
1203 EXTEND (SP, 3); 1377 EXTEND (SP, 3);
1204 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1378 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1379 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1380 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1207} 1381}
1208 1382
1209void 1383void
1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1384index_to_line_x (DC::Layout self, int index, int trailing = 0)
1211 PPCODE: 1385 PPCODE:
1212{ 1386{
1213 int line, x; 1387 int line, x;
1214 1388
1215 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1389 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1390#if !PANGO_VERSION_CHECK (1, 17, 3)
1216 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1391 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1217 1392 --line;
1393#endif
1218 EXTEND (SP, 2); 1394 EXTEND (SP, 2);
1219 PUSHs (sv_2mortal (newSViv (line - 1))); 1395 PUSHs (sv_2mortal (newSViv (line)));
1220 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1396 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1221} 1397}
1222 1398
1223void 1399void
1224line_x_to_index (CFPlus::Layout self, int line, int x) 1400line_x_to_index (DC::Layout self, int line, int x)
1225 PPCODE: 1401 PPCODE:
1226{ 1402{
1227 PangoLayoutLine *lp; 1403 PangoLayoutLine *lp;
1228 int index, trailing; 1404 int index, trailing;
1229 1405
1230 if (line < 0) 1406 if (line < 0)
1231 XSRETURN_EMPTY; 1407 XSRETURN_EMPTY;
1232 1408
1233 if (!(lp = pango_layout_get_line (self->pl, line))) 1409 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1234 XSRETURN_EMPTY; /* do better */ 1410 XSRETURN_EMPTY; /* do better */
1235 1411
1236 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1412 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1237 1413
1238 EXTEND (SP, 2); 1414 EXTEND (SP, 2);
… …
1244 PUSHs (sv_2mortal (newSViv (trailing))); 1420 PUSHs (sv_2mortal (newSViv (trailing)));
1245 } 1421 }
1246} 1422}
1247 1423
1248void 1424void
1249render (CFPlus::Layout self, float x, float y, int flags = 0) 1425render (DC::Layout self, float x, float y, int flags = 0)
1250 PPCODE: 1426 CODE:
1427 rc_clear (self->rc);
1251 pango_opengl_render_layout_subpixel ( 1428 pango_opengl_render_layout_subpixel (
1252 self->pl, 1429 self->pl,
1430 self->rc,
1253 x * PANGO_SCALE, y * PANGO_SCALE, 1431 x * PANGO_SCALE, y * PANGO_SCALE,
1254 self->r, self->g, self->b, self->a, 1432 self->r, self->g, self->b, self->a,
1255 flags 1433 flags
1256 ); 1434 );
1435 // we assume that context_change actually clears/frees stuff
1436 // and does not do any recomputation...
1437 pango_layout_context_changed (self->pl);
1257 1438
1258MODULE = CFPlus PACKAGE = CFPlus::Texture 1439void
1440draw (DC::Layout self)
1441 CODE:
1442{
1443 glEnable (GL_TEXTURE_2D);
1444 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1445 glEnable (GL_BLEND);
1446 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1447 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1448 glEnable (GL_ALPHA_TEST);
1449 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1259 1450
1260int minpot (int n) 1451 rc_draw (self->rc);
1452
1453 glDisable (GL_ALPHA_TEST);
1454 glDisable (GL_BLEND);
1455 glDisable (GL_TEXTURE_2D);
1456}
1457
1458MODULE = Deliantra::Client PACKAGE = DC::Texture
1459
1460PROTOTYPES: ENABLE
1261 1461
1262void 1462void
1263pad (SV *data_, int ow, int oh, int nw, int nh) 1463pad (SV *data_, int ow, int oh, int nw, int nh)
1264 CODE: 1464 CODE:
1265{ 1465{
… …
1292 HV *hv = (HV *)SvRV (self); 1492 HV *hv = (HV *)SvRV (self);
1293 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1493 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1294 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1494 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1295 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1495 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1296 1496
1497 if (name <= 0)
1498 XSRETURN_EMPTY;
1499
1297 if (items < 5) 1500 if (items < 5)
1298 { 1501 {
1299 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1502 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1300 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1503 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1301 } 1504 }
… …
1339 RETVAL = width > 0; 1542 RETVAL = width > 0;
1340} 1543}
1341 OUTPUT: 1544 OUTPUT:
1342 RETVAL 1545 RETVAL
1343 1546
1344MODULE = CFPlus PACKAGE = CFPlus::Map 1547MODULE = Deliantra::Client PACKAGE = DC::Map
1345 1548
1346CFPlus::Map 1549PROTOTYPES: DISABLE
1550
1551DC::Map
1347new (SV *class) 1552new (SV *class)
1348 CODE: 1553 CODE:
1349 New (0, RETVAL, 1, struct map); 1554 New (0, RETVAL, 1, struct map);
1350 RETVAL->x = 0; 1555 RETVAL->x = 0;
1351 RETVAL->y = 0; 1556 RETVAL->y = 0;
… …
1359 RETVAL->row = 0; 1564 RETVAL->row = 0;
1360 OUTPUT: 1565 OUTPUT:
1361 RETVAL 1566 RETVAL
1362 1567
1363void 1568void
1364DESTROY (CFPlus::Map self) 1569DESTROY (DC::Map self)
1365 CODE: 1570 CODE:
1366{ 1571{
1367 map_clear (self); 1572 map_clear (self);
1368 Safefree (self->face2tile); 1573 Safefree (self->face2tile);
1369 Safefree (self->tex); 1574 Safefree (self->tex);
1370 Safefree (self); 1575 Safefree (self);
1371} 1576}
1372 1577
1373void 1578void
1374resize (CFPlus::Map self, int map_width, int map_height) 1579resize (DC::Map self, int map_width, int map_height)
1375 CODE: 1580 CODE:
1376 self->w = map_width; 1581 self->w = map_width;
1377 self->h = map_height; 1582 self->h = map_height;
1378 1583
1379void 1584void
1380clear (CFPlus::Map self) 1585clear (DC::Map self)
1381 CODE: 1586 CODE:
1382 map_clear (self); 1587 map_clear (self);
1383 1588
1384void 1589void
1385set_tileid (CFPlus::Map self, int face, int tile) 1590set_tileid (DC::Map self, int face, int tile)
1386 CODE: 1591 CODE:
1387{ 1592{
1388 need_facenum (self, face); self->face2tile [face] = tile; 1593 need_facenum (self, face); self->face2tile [face] = tile;
1389 need_texid (self, tile); 1594 need_texid (self, tile);
1390} 1595}
1391 1596
1392void 1597void
1393set_smooth (CFPlus::Map self, int face, int smooth, int level) 1598set_smooth (DC::Map self, int face, int smooth, int level)
1394 CODE: 1599 CODE:
1395{ 1600{
1396 tileid texid; 1601 tileid texid;
1397 maptex *tex; 1602 maptex *tex;
1398 1603
… …
1411 tex->smoothtile = self->face2tile [smooth]; 1616 tex->smoothtile = self->face2tile [smooth];
1412 tex->smoothlevel = level; 1617 tex->smoothlevel = level;
1413} 1618}
1414 1619
1415void 1620void
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) 1621set_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: 1622 CODE:
1418{ 1623{
1419 need_texid (self, texid); 1624 need_texid (self, texid);
1420 1625
1421 { 1626 {
… …
1441 // from transparent color bleeding and ugly wrapping effects. 1646 // from transparent color bleeding and ugly wrapping effects.
1442 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1647 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1443} 1648}
1444 1649
1445int 1650int
1446ox (CFPlus::Map self) 1651ox (DC::Map self)
1447 ALIAS: 1652 ALIAS:
1448 oy = 1 1653 oy = 1
1449 x = 2 1654 x = 2
1450 y = 3 1655 y = 3
1451 w = 4 1656 w = 4
… …
1462 } 1667 }
1463 OUTPUT: 1668 OUTPUT:
1464 RETVAL 1669 RETVAL
1465 1670
1466void 1671void
1467scroll (CFPlus::Map self, int dx, int dy) 1672scroll (DC::Map self, int dx, int dy)
1468 CODE: 1673 CODE:
1469{ 1674{
1470 if (dx > 0) 1675 if (dx > 0)
1471 map_blank (self, self->x, self->y, dx, self->h); 1676 map_blank (self, self->x, self->y, dx, self->h);
1472 else if (dx < 0) 1677 else if (dx < 0)
… …
1487 self->rows += MAP_EXTEND_Y; 1692 self->rows += MAP_EXTEND_Y;
1488 self->y += MAP_EXTEND_Y; 1693 self->y += MAP_EXTEND_Y;
1489 } 1694 }
1490} 1695}
1491 1696
1492void 1697SV *
1493map1a_update (CFPlus::Map self, SV *data_, int extmap) 1698map1a_update (DC::Map self, SV *data_, int extmap)
1494 CODE: 1699 CODE:
1495{ 1700{
1496 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1701 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1497 uint8_t *data_end = (uint8_t *)SvEND (data_); 1702 uint8_t *data_end = (uint8_t *)SvEND (data_);
1498 mapcell *cell; 1703 mapcell *cell;
1499 int x, y, flags; 1704 int x, y, z, flags;
1705 AV *missing = newAV ();
1706 RETVAL = newRV_noinc ((SV *)missing);
1500 1707
1501 while (data < data_end - 1) 1708 while (data < data_end - 1)
1502 { 1709 {
1503 flags = (data [0] << 8) + data [1]; data += 2; 1710 flags = (data [0] << 8) + data [1]; data += 2;
1504 1711
… …
1524 uint8_t ext, cmd; 1731 uint8_t ext, cmd;
1525 1732
1526 do 1733 do
1527 { 1734 {
1528 ext = *data++; 1735 ext = *data++;
1529 cmd = ext & 0x3f; 1736 cmd = ext & 0x7f;
1530 1737
1531 if (cmd < 4) 1738 if (cmd < 4)
1532 cell->darkness = 255 - ext * 64 + 1; 1739 cell->darkness = 255 - ext * 64 + 1;
1533 else if (cmd == 5) // health 1740 else if (cmd == 5) // health
1534 { 1741 {
… …
1537 } 1744 }
1538 else if (cmd == 6) // monster width 1745 else if (cmd == 6) // monster width
1539 cell->stat_width = *data++ + 1; 1746 cell->stat_width = *data++ + 1;
1540 else if (cmd == 0x47) 1747 else if (cmd == 0x47)
1541 { 1748 {
1542 if (*data == 4) 1749 if (*data == 1) cell->player = data [1];
1543 ; // decode player count 1750 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1751 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1752 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1544 1753
1545 data += *data + 1; 1754 data += *data + 1;
1546 } 1755 }
1547 else if (cmd == 8) // cell flags 1756 else if (cmd == 8) // cell flags
1548 cell->flags = *data++; 1757 cell->flags = *data++;
… …
1555 } 1764 }
1556 else 1765 else
1557 cell->darkness = *data++ + 1; 1766 cell->darkness = *data++ + 1;
1558 } 1767 }
1559 1768
1769 for (z = 0; z <= 2; ++z)
1560 if (flags & 4) 1770 if (flags & (4 >> z))
1561 { 1771 {
1562 faceid face = (data [0] << 8) + data [1]; data += 2; 1772 faceid face = (data [0] << 8) + data [1]; data += 2;
1563 need_facenum (self, face); 1773 need_facenum (self, face);
1564 cell->tile [0] = self->face2tile [face]; 1774 cell->tile [z] = self->face2tile [face];
1775
1776 if (cell->tile [z])
1777 {
1778 maptex *tex = self->tex + cell->tile [z];
1779 if (!tex->name)
1780 av_push (missing, newSViv (cell->tile [z]));
1781
1782 if (tex->smoothtile)
1783 {
1784 maptex *smooth = self->tex + tex->smoothtile;
1785 if (!smooth->name)
1786 av_push (missing, newSViv (tex->smoothtile));
1787 }
1788 }
1565 } 1789 }
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 } 1790 }
1581 else 1791 else
1582 cell->darkness = 0; 1792 CELL_CLEAR (cell);
1583 } 1793 }
1584} 1794}
1795 OUTPUT:
1796 RETVAL
1585 1797
1586SV * 1798SV *
1587mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1799mapmap (DC::Map self, int x0, int y0, int w, int h)
1588 CODE: 1800 CODE:
1589{ 1801{
1590 int x1, x; 1802 int x1, x;
1591 int y1, y; 1803 int y1, y;
1592 int z; 1804 int z;
… …
1637} 1849}
1638 OUTPUT: 1850 OUTPUT:
1639 RETVAL 1851 RETVAL
1640 1852
1641void 1853void
1642draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1854draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1643 CODE: 1855 CODE:
1644{ 1856{
1857 int x, y, z;
1858
1645 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1859 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1646 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1860 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) 1861 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1648 smooth_key skey; 1862 smooth_key skey;
1649 int x, y, z; 1863 int pl_x, pl_y;
1650 int last_name; 1864 maptex pl_tex;
1865 rc_t *rc = rc_alloc ();
1866 rc_key_t key;
1867 rc_array_t *arr;
1868
1869 pl_tex.name = 0;
1651 1870
1652 // thats current max. sorry. 1871 // thats current max. sorry.
1653 if (sw > 255) sw = 255; 1872 if (sw > 255) sw = 255;
1654 if (sh > 255) sh = 255; 1873 if (sh > 255) sh = 255;
1655 1874
1656 // clear key, in case of extra padding 1875 // clear key, in case of extra padding
1657 memset (&skey, 0, sizeof (skey)); 1876 memset (&skey, 0, sizeof (skey));
1658 1877
1659 glColor4ub (255, 255, 255, 255); 1878 memset (&key, 0, sizeof (key));
1660 1879 key.r = 255;
1661 glEnable (GL_BLEND); 1880 key.g = 255;
1662 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1881 key.b = 255;
1663 glEnable (GL_TEXTURE_2D); 1882 key.a = 255;
1664 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1883 key.mode = GL_QUADS;
1665 1884 key.format = GL_T2F_V3F;
1666 glBegin (GL_QUADS); 1885 key.texname = -1;
1667
1668 last_name = 0;
1669 1886
1670 mx += self->x; 1887 mx += self->x;
1671 my += self->y; 1888 my += self->y;
1672 1889
1673 // first pass: determine smooth_max 1890 // first pass: determine smooth_max
… …
1689 MAX (self->tex [cell->tile [0]].smoothlevel, 1906 MAX (self->tex [cell->tile [0]].smoothlevel,
1690 MAX (self->tex [cell->tile [1]].smoothlevel, 1907 MAX (self->tex [cell->tile [1]].smoothlevel,
1691 self->tex [cell->tile [2]].smoothlevel)); 1908 self->tex [cell->tile [2]].smoothlevel));
1692 } 1909 }
1693 } 1910 }
1911
1912 glEnable (GL_BLEND);
1913 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1914 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1694 1915
1695 for (z = 0; z <= 2; z++) 1916 for (z = 0; z <= 2; z++)
1696 { 1917 {
1697 memset (smooth_level, 0, sizeof (smooth_level)); 1918 memset (smooth_level, 0, sizeof (smooth_level));
1698 1919
… …
1711 { 1932 {
1712 maptex tex = self->tex [tile]; 1933 maptex tex = self->tex [tile];
1713 int px = (x + 1) * T - tex.w; 1934 int px = (x + 1) * T - tex.w;
1714 int py = (y + 1) * T - tex.h; 1935 int py = (y + 1) * T - tex.h;
1715 1936
1716 // suppressing texture state switches here
1717 // is only moderately effective, but worth the extra effort
1718 if (last_name != tex.name) 1937 if (key.texname != tex.name)
1719 { 1938 {
1720 if (!tex.name) 1939 if (!tex.name)
1721 tex = self->tex [2]; /* missing, replace by noface */ 1940 tex = self->tex [2]; /* missing, replace by noface */
1722 1941
1723 glEnd (); 1942 key.texname = tex.name;
1724 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1943 arr = rc_array (rc, &key);
1725 glBegin (GL_QUADS);
1726 } 1944 }
1727 1945
1728 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1946 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 { 1947 {
1948 pl_x = px;
1949 pl_y = py;
1950 pl_tex = tex;
1951 continue;
1952 }
1953
1954 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1955 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1956 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1957 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1958
1959 if (expect_false (cell->flags) && expect_false (z == 2))
1960 {
1961 // overlays such as the speech bubble, probably more to come
1735 if (cell->flags & 1) 1962 if (cell->flags & 1)
1736 { 1963 {
1737 maptex tex = self->tex [1]; 1964 maptex tex = self->tex [1];
1738 int px = x * T + T * 2 / 32; 1965 int px = x * T + T * 2 / 32;
1739 int py = y * T - T * 6 / 32; 1966 int py = y * T - T * 6 / 32;
1740 1967
1968 if (tex.name)
1741 glEnd (); 1969 {
1742 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1970 if (key.texname != tex.name)
1971 {
1972 key.texname = tex.name;
1973 arr = rc_array (rc, &key);
1974 }
1975
1976 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1977 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1978 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1979 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1743 glBegin (GL_QUADS); 1980 }
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 } 1981 }
1750 } 1982 }
1751 1983
1752 // update smooth hash 1984 // update smooth hash
1753 if (tex.smoothtile) 1985 if (tex.smoothtile)
… …
1789 } 2021 }
1790 } 2022 }
1791 } 2023 }
1792 } 2024 }
1793 2025
2026 rc_draw (rc);
2027 rc_clear (rc);
2028
1794 // go through all smoothlevels, lowest to highest, then draw. 2029 // go through all smoothlevels, lowest to highest, then draw.
1795 // this is basically counting sort 2030 // this is basically counting sort
1796 { 2031 {
1797 int w, b; 2032 int w, b;
1798 2033
2034 glEnable (GL_TEXTURE_2D);
2035 glBegin (GL_QUADS);
1799 for (w = 0; w < 256 / 32; ++w) 2036 for (w = 0; w < 256 / 32; ++w)
1800 { 2037 {
1801 uint32_t smask = smooth_level [w]; 2038 uint32_t smask = smooth_level [w];
1802 if (smask) 2039 if (smask)
1803 for (b = 0; b < 32; ++b) 2040 for (b = 0; b < 32; ++b)
… …
1822 int border = bits & 15; 2059 int border = bits & 15;
1823 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2060 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1824 float dx = tex.s * .0625f; // 16 images/row 2061 float dx = tex.s * .0625f; // 16 images/row
1825 float dy = tex.t * .5f ; // 2 images/column 2062 float dy = tex.t * .5f ; // 2 images/column
1826 2063
1827 // this time naively avoiding texture state changes
1828 // save gobs of state changes.
1829 if (last_name != tex.name) 2064 if (tex.name)
1830 { 2065 {
2066 // this time avoiding texture state changes
2067 // save gobs of state changes.
1831 if (!tex.name) 2068 if (key.texname != tex.name)
1832 continue; // smoothing not yet available 2069 {
1833
1834 glEnd (); 2070 glEnd ();
1835 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2071 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1836 glBegin (GL_QUADS); 2072 glBegin (GL_QUADS);
1837 } 2073 }
1838 2074
1839 if (border) 2075 if (border)
1840 { 2076 {
1841 float ox = border * dx; 2077 float ox = border * dx;
1842 2078
1843 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2079 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1844 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2080 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1845 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2081 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1846 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2082 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1847 } 2083 }
1848 2084
1849 if (corner) 2085 if (corner)
1850 { 2086 {
1851 float ox = corner * dx; 2087 float ox = corner * dx;
1852 2088
1853 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2089 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1854 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2090 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1855 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2091 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1856 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2092 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2093 }
1857 } 2094 }
1858 } 2095 }
1859 } 2096 }
1860 } 2097 }
1861 } 2098 }
2099
2100 glEnd ();
2101 glDisable (GL_TEXTURE_2D);
2102 key.texname = -1;
1862 } 2103 }
1863 2104
1864 hv_clear (smooth); 2105 hv_clear (smooth);
1865 } 2106 }
1866 2107
1867 glEnd (); 2108 if (pl_tex.name)
2109 {
2110 maptex tex = pl_tex;
2111 int px = pl_x + sdx;
2112 int py = pl_y + sdy;
1868 2113
1869 glDisable (GL_TEXTURE_2D); 2114 key.texname = tex.name;
2115 arr = rc_array (rc, &key);
2116
2117 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2118 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2119 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2120 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2121
2122 rc_draw (rc);
2123 }
2124
1870 glDisable (GL_BLEND); 2125 glDisable (GL_BLEND);
2126 rc_free (rc);
1871 2127
1872 // top layer: overlays such as the health bar 2128 // top layer: overlays such as the health bar
1873 for (y = 0; y < sh; y++) 2129 for (y = 0; y < sh; y++)
1874 if (0 <= y + my && y + my < self->rows) 2130 if (0 <= y + my && y + my < self->rows)
1875 { 2131 {
… …
1900 } 2156 }
1901 } 2157 }
1902} 2158}
1903 2159
1904void 2160void
1905draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2161draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1906 CODE: 2162 CODE:
1907{ 2163{
1908 static float color[16][3] = { 2164 static float color[16][3] = {
1909 { 0.00F, 0.00F, 0.00F }, 2165 { 0.00F, 0.00F, 0.00F },
1910 { 1.00F, 1.00F, 1.00F }, 2166 { 1.00F, 1.00F, 1.00F },
… …
1960 glDisable (GL_BLEND); 2216 glDisable (GL_BLEND);
1961 glDisable (GL_TEXTURE_2D); 2217 glDisable (GL_TEXTURE_2D);
1962} 2218}
1963 2219
1964void 2220void
1965fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix) 2221fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1966 PPCODE: 2222 PPCODE:
1967{ 2223{
1968 int x, y; 2224 int x, y;
2225 int sw1 = sw + 2;
2226 int sh1 = sh + 2;
2227 int sh3 = sh * 3;
1969 int sw4 = (sw + 3) & ~3; 2228 int sw34 = (sw * 3 + 3) & ~3;
2229 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1970 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2230 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1971 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2231 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1972 2232
1973 memset (darkness, 255, sw4 * sh);
1974 SvPOK_only (darkness_sv); 2233 SvPOK_only (darkness3_sv);
1975 SvCUR_set (darkness_sv, sw4 * sh); 2234 SvCUR_set (darkness3_sv, sw34 * sh3);
1976 2235
1977 mx += self->x; 2236 mx += self->x - 1;
1978 my += self->y; 2237 my += self->y - 1;
1979 2238
2239 memset (darkness1, 255, sw1 * sh1);
2240
1980 for (y = 0; y < sh; y++) 2241 for (y = 0; y < sh1; y++)
1981 if (0 <= y + my && y + my < self->rows) 2242 if (0 <= y + my && y + my < self->rows)
1982 { 2243 {
1983 maprow *row = self->row + (y + my); 2244 maprow *row = self->row + (y + my);
1984 2245
1985 for (x = 0; x < sw; x++) 2246 for (x = 0; x < sw1; x++)
1986 if (row->c0 <= x + mx && x + mx < row->c1) 2247 if (row->c0 <= x + mx && x + mx < row->c1)
1987 { 2248 {
1988 mapcell *cell = row->col + (x + mx - row->c0); 2249 mapcell *cell = row->col + (x + mx - row->c0);
1989 2250
1990 darkness[y * sw4 + x] = cell->darkness 2251 darkness1 [y * sw1 + x] = cell->darkness
1991 ? 255 - (cell->darkness - 1) 2252 ? 255 - (cell->darkness - 1)
1992 : 255 - FOW_DARKNESS; 2253 : 255 - FOW_DARKNESS;
1993 } 2254 }
1994 } 2255 }
1995 2256
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) 2257 for (y = 0; y < sh; ++y)
2005 for (x = 0; x < sw4; ++x) 2258 for (x = 0; x < sw; ++x)
2006 { 2259 {
2007 float *f = (float *)matrix; 2260 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2008 int dx, dy; 2261 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2009 float sum = 0.f; 2262 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2263 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2264 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2265 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2266 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2267 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2268 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2010 2269
2011 for (dy = -1; dy <= 1; ++dy) 2270 uint8_t r11 = (d11 + d21 + d12) / 3;
2012 for (dx = -1; dx <= 1; ++dx) 2271 uint8_t r21 = d21;
2013 { 2272 uint8_t r31 = (d21 + d31 + d32) / 3;
2014 unsigned int x2 = x + dx;
2015 unsigned int y2 = y + dy;
2016 2273
2017 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++; 2274 uint8_t r12 = d12;
2018 } 2275 uint8_t r22 = d22;
2276 uint8_t r32 = d32;
2019 2277
2020 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum; 2278 uint8_t r13 = (d13 + d23 + d12) / 3;
2021 } 2279 uint8_t r23 = d23;
2280 uint8_t r33 = (d23 + d33 + d32) / 3;
2022 2281
2023 darkness_sv = darkness2_sv; 2282 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2283 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2284 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2286 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2287 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2289 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2290 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2024 } 2291 }
2292
2293 free (darkness1);
2025 2294
2026 EXTEND (SP, 3); 2295 EXTEND (SP, 3);
2027 PUSHs (sv_2mortal (newSViv (sw4))); 2296 PUSHs (sv_2mortal (newSViv (sw34)));
2028 PUSHs (sv_2mortal (newSViv (sh))); 2297 PUSHs (sv_2mortal (newSViv (sh3)));
2029 PUSHs (darkness_sv); 2298 PUSHs (darkness3_sv);
2030} 2299}
2031 2300
2032SV * 2301SV *
2033get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2302get_rect (DC::Map self, int x0, int y0, int w, int h)
2034 CODE: 2303 CODE:
2035{ 2304{
2036 int x, y, x1, y1; 2305 int x, y, x1, y1;
2037 SV *data_sv = newSV (w * h * 7 + 5); 2306 SV *data_sv = newSV (w * h * 7 + 5);
2038 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2307 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2095 else 2364 else
2096 *data++ = 0; 2365 *data++ = 0;
2097 } 2366 }
2098 } 2367 }
2099 2368
2369 /* if size is w*h + 5 then no data has been found */
2370 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2371 {
2100 SvPOK_only (data_sv); 2372 SvPOK_only (data_sv);
2101 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2373 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2374 }
2375
2102 RETVAL = data_sv; 2376 RETVAL = data_sv;
2103} 2377}
2104 OUTPUT: 2378 OUTPUT:
2105 RETVAL 2379 RETVAL
2106 2380
2107void 2381void
2108set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2382set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2109 PPCODE: 2383 PPCODE:
2110{ 2384{
2111 int x, y, z; 2385 int x, y, z;
2112 int w, h; 2386 int w, h;
2113 int x1, y1; 2387 int x1, y1;
2388 STRLEN len;
2389 uint8_t *data, *end;
2390
2391 len = SvLEN (data_sv);
2392 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2393 data = SvPVbyte_nolen (data_sv);
2394 end = data + len + 8;
2395
2396 if (len < 5)
2397 XSRETURN_EMPTY;
2114 2398
2115 if (*data++ != 0) 2399 if (*data++ != 0)
2116 return; /* version mismatch */ 2400 XSRETURN_EMPTY; /* version mismatch */
2117 2401
2118 w = *data++ << 8; w |= *data++; 2402 w = *data++ << 8; w |= *data++;
2119 h = *data++ << 8; h |= *data++; 2403 h = *data++ << 8; h |= *data++;
2120 2404
2121 // we need to do this 'cause we don't keep an absolute coord system for rows 2405 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2133 { 2417 {
2134 maprow *row = map_get_row (self, y); 2418 maprow *row = map_get_row (self, y);
2135 2419
2136 for (x = x0; x < x1; x++) 2420 for (x = x0; x < x1; x++)
2137 { 2421 {
2422 uint8_t flags;
2423
2424 if (data + 7 >= end)
2425 XSRETURN_EMPTY;
2426
2138 uint8_t flags = *data++; 2427 flags = *data++;
2139 2428
2140 if (flags) 2429 if (flags)
2141 { 2430 {
2142 mapcell *cell = row_get_cell (row, x); 2431 mapcell *cell = row_get_cell (row, x);
2143 tileid tile[3] = { 0, 0, 0 }; 2432 tileid tile[3] = { 0, 0, 0 };
… …
2146 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2435 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2147 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2436 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2148 2437
2149 if (cell->darkness == 0) 2438 if (cell->darkness == 0)
2150 { 2439 {
2151 cell->darkness = 0; 2440 /*cell->darkness = 0;*/
2441 EXTEND (SP, 3);
2152 2442
2153 for (z = 0; z <= 2; z++) 2443 for (z = 0; z <= 2; z++)
2154 { 2444 {
2155 tileid t = tile [z]; 2445 tileid t = tile [z];
2156 2446
2157 if (t >= self->texs || (t && !self->tex [t].name)) 2447 if (t >= self->texs || (t && !self->tex [t].name))
2158 { 2448 {
2159 XPUSHs (sv_2mortal (newSViv (t))); 2449 PUSHs (sv_2mortal (newSViv (t)));
2160 need_texid (self, t); 2450 need_texid (self, t);
2161 } 2451 }
2162 2452
2163 cell->tile [z] = t; 2453 cell->tile [z] = t;
2164 } 2454 }
… …
2166 } 2456 }
2167 } 2457 }
2168 } 2458 }
2169} 2459}
2170 2460
2171MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2461MODULE = Deliantra::Client PACKAGE = DC::RW
2172 2462
2173CFPlus::MixChunk 2463DC::RW
2174new_from_file (SV *class, char *path) 2464new (SV *class, SV *data_sv)
2175 CODE: 2465 CODE:
2176 RETVAL = Mix_LoadWAV (path); 2466{
2467 STRLEN datalen;
2468 char *data = SvPVbyte (data_sv, datalen);
2469
2470 RETVAL = SDL_RWFromConstMem (data, datalen);
2471}
2177 OUTPUT: 2472 OUTPUT:
2178 RETVAL 2473 RETVAL
2179 2474
2475DC::RW
2476new_from_file (SV *class, const char *path, const char *mode = "rb")
2477 CODE:
2478 RETVAL = SDL_RWFromFile (path, mode);
2479 OUTPUT:
2480 RETVAL
2481
2482# fails on win32:
2483# dc.xs(2268) : error C2059: syntax error : '('
2180void 2484#void
2485#close (DC::RW self)
2486# CODE:
2487# (self->(close)) (self);
2488
2489MODULE = Deliantra::Client PACKAGE = DC::Channel
2490
2491PROTOTYPES: DISABLE
2492
2493DC::Channel
2494find ()
2495 CODE:
2496{
2497 RETVAL = Mix_GroupAvailable (-1);
2498
2499 if (RETVAL < 0)
2500 {
2501 RETVAL = Mix_GroupOldest (-1);
2502
2503 if (RETVAL < 0)
2504 XSRETURN_UNDEF;
2505
2506 Mix_HaltChannel (RETVAL);
2507 }
2508
2509 Mix_UnregisterAllEffects (RETVAL);
2510 Mix_Volume (RETVAL, 128);
2511}
2512 OUTPUT:
2513 RETVAL
2514
2515void
2516halt (DC::Channel self)
2517 CODE:
2518 Mix_HaltChannel (self);
2519
2520void
2521expire (DC::Channel self, int ticks = -1)
2522 CODE:
2523 Mix_ExpireChannel (self, ticks);
2524
2525void
2526fade_out (DC::Channel self, int ticks = -1)
2527 CODE:
2528 Mix_FadeOutChannel (self, ticks);
2529
2530int
2531volume (DC::Channel self, int volume)
2532 CODE:
2533 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2534 OUTPUT:
2535 RETVAL
2536
2537void
2538unregister_all_effects (DC::Channel self)
2539 CODE:
2540 Mix_UnregisterAllEffects (self);
2541
2542void
2543set_panning (DC::Channel self, int left, int right)
2544 CODE:
2545 left = CLAMP (left , 0, 255);
2546 right = CLAMP (right, 0, 255);
2547 Mix_SetPanning (self, left, right);
2548
2549void
2550set_distance (DC::Channel self, int distance)
2551 CODE:
2552 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2553
2554void
2555set_position (DC::Channel self, int angle, int distance)
2556 CODE:
2557
2558void
2559set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2560 CODE:
2561{
2562 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2563 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2564 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2565}
2566
2567void
2568set_reverse_stereo (DC::Channel self, int flip)
2569 CODE:
2570 Mix_SetReverseStereo (self, flip);
2571
2572MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2573
2574PROTOTYPES: DISABLE
2575
2576DC::MixChunk
2577new (SV *class, DC::RW rwops)
2578 CODE:
2579 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2580 OUTPUT:
2581 RETVAL
2582
2583void
2181DESTROY (CFPlus::MixChunk self) 2584DESTROY (DC::MixChunk self)
2182 CODE: 2585 CODE:
2183 Mix_FreeChunk (self); 2586 Mix_FreeChunk (self);
2184 2587
2185int 2588int
2186volume (CFPlus::MixChunk self, int volume = -1) 2589volume (DC::MixChunk self, int volume = -1)
2187 CODE: 2590 CODE:
2591 if (items > 1)
2592 volume = CLAMP (volume, 0, 128);
2188 RETVAL = Mix_VolumeChunk (self, volume); 2593 RETVAL = Mix_VolumeChunk (self, volume);
2189 OUTPUT: 2594 OUTPUT:
2190 RETVAL 2595 RETVAL
2191 2596
2192int 2597DC::Channel
2193play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2598play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2194 CODE: 2599 CODE:
2600{
2195 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2601 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2602
2603 if (RETVAL < 0)
2604 XSRETURN_UNDEF;
2605
2606 if (channel < 0)
2607 {
2608 Mix_UnregisterAllEffects (RETVAL);
2609 Mix_Volume (RETVAL, 128);
2610 }
2611}
2196 OUTPUT: 2612 OUTPUT:
2197 RETVAL 2613 RETVAL
2198 2614
2199MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2615MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2200 2616
2201int 2617int
2202volume (int volume = -1) 2618volume (int volume = -1)
2619 PROTOTYPE: ;$
2203 CODE: 2620 CODE:
2621 if (items > 0)
2622 volume = CLAMP (volume, 0, 128);
2204 RETVAL = Mix_VolumeMusic (volume); 2623 RETVAL = Mix_VolumeMusic (volume);
2205 OUTPUT: 2624 OUTPUT:
2206 RETVAL 2625 RETVAL
2207 2626
2627void
2628fade_out (int ms)
2629 CODE:
2630 Mix_FadeOutMusic (ms);
2631
2632void
2633halt ()
2634 CODE:
2635 Mix_HaltMusic ();
2636
2637DC::MixMusic
2638new (SV *class, DC::RW rwops)
2639 CODE:
2640 RETVAL = Mix_LoadMUS_RW (rwops);
2641 OUTPUT:
2642 RETVAL
2643
2644void
2645DESTROY (DC::MixMusic self)
2646 CODE:
2647 Mix_FreeMusic (self);
2648
2208int 2649int
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) 2650play (DC::MixMusic self, int loops = -1)
2229 CODE: 2651 CODE:
2230 RETVAL = Mix_PlayMusic (self, loops); 2652 RETVAL = Mix_PlayMusic (self, loops);
2231 OUTPUT: 2653 OUTPUT:
2232 RETVAL 2654 RETVAL
2233 2655
2234int 2656void
2235fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2657fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2236 CODE: 2658 CODE:
2237 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2659 Mix_FadeInMusicPos (self, loops, ms, position);
2238 OUTPUT:
2239 RETVAL
2240 2660
2241MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2661MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2662
2663PROTOTYPES: ENABLE
2242 2664
2243BOOT: 2665BOOT:
2244{ 2666{
2245 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2667 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2246 static const struct { 2668 static const struct {
2247 const char *name; 2669 const char *name;
2248 IV iv; 2670 IV iv;
2249 } *civ, const_iv[] = { 2671 } *civ, const_iv[] = {
2250# define const_iv(name) { # name, (IV)name } 2672# define const_iv(name) { # name, (IV)name }
… …
2262 const_iv (GL_ALPHA_TEST), 2684 const_iv (GL_ALPHA_TEST),
2263 const_iv (GL_NORMALIZE), 2685 const_iv (GL_NORMALIZE),
2264 const_iv (GL_RESCALE_NORMAL), 2686 const_iv (GL_RESCALE_NORMAL),
2265 const_iv (GL_FRONT), 2687 const_iv (GL_FRONT),
2266 const_iv (GL_BACK), 2688 const_iv (GL_BACK),
2689 const_iv (GL_AUX0),
2267 const_iv (GL_AND), 2690 const_iv (GL_AND),
2268 const_iv (GL_ONE), 2691 const_iv (GL_ONE),
2269 const_iv (GL_ZERO), 2692 const_iv (GL_ZERO),
2270 const_iv (GL_SRC_ALPHA), 2693 const_iv (GL_SRC_ALPHA),
2271 const_iv (GL_DST_ALPHA), 2694 const_iv (GL_DST_ALPHA),
… …
2284 const_iv (GL_INTENSITY), 2707 const_iv (GL_INTENSITY),
2285 const_iv (GL_LUMINANCE), 2708 const_iv (GL_LUMINANCE),
2286 const_iv (GL_LUMINANCE_ALPHA), 2709 const_iv (GL_LUMINANCE_ALPHA),
2287 const_iv (GL_FLOAT), 2710 const_iv (GL_FLOAT),
2288 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2711 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2712 const_iv (GL_COMPRESSED_ALPHA_ARB),
2713 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2714 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2715 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2716 const_iv (GL_COMPRESSED_RGB_ARB),
2717 const_iv (GL_COMPRESSED_RGBA_ARB),
2289 const_iv (GL_COMPILE), 2718 const_iv (GL_COMPILE),
2290 const_iv (GL_PROXY_TEXTURE_1D), 2719 const_iv (GL_PROXY_TEXTURE_1D),
2291 const_iv (GL_PROXY_TEXTURE_2D), 2720 const_iv (GL_PROXY_TEXTURE_2D),
2292 const_iv (GL_TEXTURE_1D), 2721 const_iv (GL_TEXTURE_1D),
2293 const_iv (GL_TEXTURE_2D), 2722 const_iv (GL_TEXTURE_2D),
… …
2317 const_iv (GL_COLOR_LOGIC_OP), 2746 const_iv (GL_COLOR_LOGIC_OP),
2318 const_iv (GL_SEPARABLE_2D), 2747 const_iv (GL_SEPARABLE_2D),
2319 const_iv (GL_CONVOLUTION_2D), 2748 const_iv (GL_CONVOLUTION_2D),
2320 const_iv (GL_CONVOLUTION_BORDER_MODE), 2749 const_iv (GL_CONVOLUTION_BORDER_MODE),
2321 const_iv (GL_CONSTANT_BORDER), 2750 const_iv (GL_CONSTANT_BORDER),
2751 const_iv (GL_POINTS),
2322 const_iv (GL_LINES), 2752 const_iv (GL_LINES),
2323 const_iv (GL_LINE_STRIP), 2753 const_iv (GL_LINE_STRIP),
2324 const_iv (GL_LINE_LOOP), 2754 const_iv (GL_LINE_LOOP),
2325 const_iv (GL_QUADS), 2755 const_iv (GL_QUADS),
2326 const_iv (GL_QUAD_STRIP), 2756 const_iv (GL_QUAD_STRIP),
2327 const_iv (GL_TRIANGLES), 2757 const_iv (GL_TRIANGLES),
2328 const_iv (GL_TRIANGLE_STRIP), 2758 const_iv (GL_TRIANGLE_STRIP),
2329 const_iv (GL_TRIANGLE_FAN), 2759 const_iv (GL_TRIANGLE_FAN),
2760 const_iv (GL_POLYGON),
2330 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2761 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2762 const_iv (GL_POINT_SMOOTH_HINT),
2763 const_iv (GL_LINE_SMOOTH_HINT),
2764 const_iv (GL_POLYGON_SMOOTH_HINT),
2765 const_iv (GL_GENERATE_MIPMAP_HINT),
2766 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2331 const_iv (GL_FASTEST), 2767 const_iv (GL_FASTEST),
2768 const_iv (GL_DONT_CARE),
2769 const_iv (GL_NICEST),
2332 const_iv (GL_V2F), 2770 const_iv (GL_V2F),
2333 const_iv (GL_V3F), 2771 const_iv (GL_V3F),
2334 const_iv (GL_T2F_V3F), 2772 const_iv (GL_T2F_V3F),
2335 const_iv (GL_T2F_N3F_V3F), 2773 const_iv (GL_T2F_N3F_V3F),
2336# undef const_iv 2774# undef const_iv
… …
2341 2779
2342 texture_av = newAV (); 2780 texture_av = newAV ();
2343 AvREAL_off (texture_av); 2781 AvREAL_off (texture_av);
2344} 2782}
2345 2783
2784void
2785disable_GL_EXT_blend_func_separate ()
2786 CODE:
2787 gl.BlendFuncSeparate = 0;
2788 gl.BlendFuncSeparateEXT = 0;
2789
2346char * 2790char *
2347gl_vendor () 2791gl_vendor ()
2348 CODE: 2792 CODE:
2349 RETVAL = (char *)glGetString (GL_VENDOR); 2793 RETVAL = (char *)glGetString (GL_VENDOR);
2350 OUTPUT: 2794 OUTPUT:
… …
2422# near_ and far_ are due to microsofts buggy "c" compiler 2866# near_ and far_ are due to microsofts buggy "c" compiler
2423void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2867void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2424 2868
2425# near_ and far_ are due to microsofts buggy "c" compiler 2869# near_ and far_ are due to microsofts buggy "c" compiler
2426void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2870void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2871
2872PROTOTYPES: DISABLE
2427 2873
2428void glViewport (int x, int y, int width, int height) 2874void glViewport (int x, int y, int width, int height)
2429 2875
2430void glScissor (int x, int y, int width, int height) 2876void glScissor (int x, int y, int width, int height)
2431 2877
… …
2439 2885
2440void glRotate (float angle, float x, float y, float z) 2886void glRotate (float angle, float x, float y, float z)
2441 CODE: 2887 CODE:
2442 glRotatef (angle, x, y, z); 2888 glRotatef (angle, x, y, z);
2443 2889
2444void glBegin (int mode)
2445
2446void glEnd ()
2447
2448void glColor (float r, float g, float b, float a = 1.0) 2890void glColor (float r, float g, float b, float a = 1.0)
2449 PROTOTYPE: @
2450 ALIAS: 2891 ALIAS:
2451 glColor_premultiply = 1 2892 glColor_premultiply = 1
2452 CODE: 2893 CODE:
2453 if (ix) 2894 if (ix)
2454 { 2895 {
… …
2457 b *= a; 2898 b *= a;
2458 } 2899 }
2459 // microsoft visual "c" rounds instead of truncating... 2900 // microsoft visual "c" rounds instead of truncating...
2460 glColor4f (r, g, b, a); 2901 glColor4f (r, g, b, a);
2461 2902
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.) 2903void glRasterPos (float x, float y, float z = 0.)
2469 CODE: 2904 CODE:
2470 glRasterPos3f (0, 0, z); 2905 glRasterPos3f (0, 0, z);
2471 glBitmap (0, 0, 0, 0, x, y, 0); 2906 glBitmap (0, 0, 0, 0, x, y, 0);
2472 2907
… …
2476 2911
2477void glTexCoord (float s, float t) 2912void glTexCoord (float s, float t)
2478 CODE: 2913 CODE:
2479 glTexCoord2f (s, t); 2914 glTexCoord2f (s, t);
2480 2915
2916void glRect (float x1, float y1, float x2, float y2)
2917 CODE:
2918 glRectf (x1, y1, x2, y2);
2919
2920void glRect_lineloop (float x1, float y1, float x2, float y2)
2921 CODE:
2922 glBegin (GL_LINE_LOOP);
2923 glVertex2f (x1, y1);
2924 glVertex2f (x2, y1);
2925 glVertex2f (x2, y2);
2926 glVertex2f (x1, y2);
2927 glEnd ();
2928
2929PROTOTYPES: ENABLE
2930
2931void glBegin (int mode)
2932
2933void glEnd ()
2934
2935void glPointSize (GLfloat size)
2936
2937void glLineWidth (GLfloat width)
2938
2939void glInterleavedArrays (int format, int stride, char *data)
2940
2941void glDrawElements (int mode, int count, int type, char *indices)
2942
2943# 1.2 void glDrawRangeElements (int mode, int start, int end
2944
2481void glTexEnv (int target, int pname, float param) 2945void glTexEnv (int target, int pname, float param)
2482 CODE: 2946 CODE:
2483 glTexEnvf (target, pname, param); 2947 glTexEnvf (target, pname, param);
2484 2948
2485void glTexParameter (int target, int pname, float param) 2949void 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) 2965void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2502 CODE: 2966 CODE:
2503 if (gl.SeparableFilter2D) 2967 if (gl.SeparableFilter2D)
2504 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2968 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2505 2969
2506void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2970void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2507 2971
2508void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2972void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2509 2973
2510void glDrawPixels (int width, int height, int format, int type, char *pixels) 2974void glDrawPixels (int width, int height, int format, int type, char *pixels)
2511 2975
… …
2537 3001
2538void glEndList () 3002void glEndList ()
2539 3003
2540void glCallList (int list) 3004void glCallList (int list)
2541 3005
3006MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3007
3008PROTOTYPES: DISABLE
3009
3010void
3011find_widget (SV *self, NV x, NV y)
3012 PPCODE:
3013{
3014 if (within_widget (self, x, y))
3015 XPUSHs (self);
3016}
3017
3018BOOT:
3019{
3020 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3021
3022 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3023 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3024 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3025 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3026}
3027
3028void
3029draw (SV *self)
3030 CODE:
3031{
3032 HV *hv;
3033 SV **svp;
3034 NV x, y, w, h;
3035 SV *draw_x_sv = GvSV (draw_x_gv);
3036 SV *draw_y_sv = GvSV (draw_y_gv);
3037 SV *draw_w_sv = GvSV (draw_w_gv);
3038 SV *draw_h_sv = GvSV (draw_h_gv);
3039 double draw_x, draw_y;
3040
3041 if (!SvROK (self))
3042 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3043
3044 hv = (HV *)SvRV (self);
3045
3046 if (SvTYPE (hv) != SVt_PVHV)
3047 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3048
3049 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3050 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3051
3052 if (!h || !w)
3053 XSRETURN_EMPTY;
3054
3055 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3056 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3057
3058 draw_x = SvNV (draw_x_sv) + x;
3059 draw_y = SvNV (draw_y_sv) + y;
3060
3061 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3062 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3063 XSRETURN_EMPTY;
3064
3065 sv_setnv (draw_x_sv, draw_x);
3066 sv_setnv (draw_y_sv, draw_y);
3067
3068 glPushMatrix ();
3069 glTranslated (x, y, 0);
3070
3071 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3072 {
3073 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3074
3075 if (svp && SvTRUE (*svp))
3076 {
3077 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3078 glEnable (GL_BLEND);
3079 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3080 glBegin (GL_QUADS);
3081 glVertex2f (0, 0);
3082 glVertex2f (w, 0);
3083 glVertex2f (w, h);
3084 glVertex2f (0, h);
3085 glEnd ();
3086 glDisable (GL_BLEND);
3087 }
3088 }
3089#if 0
3090 // draw borders, for debugging
3091 glPushMatrix ();
3092 glColor4f (1., 1., 0., 1.);
3093 glTranslatef (.5, .5, 0.);
3094 glBegin (GL_LINE_LOOP);
3095 glVertex2f (0 , 0);
3096 glVertex2f (w - 1, 0);
3097 glVertex2f (w - 1, h - 1);
3098 glVertex2f (0 , h - 1);
3099 glEnd ();
3100 glPopMatrix ();
3101#endif
3102 PUSHMARK (SP);
3103 XPUSHs (self);
3104 PUTBACK;
3105 call_method ("_draw", G_VOID | G_DISCARD);
3106 SPAGAIN;
3107
3108 glPopMatrix ();
3109
3110 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3111 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3112}
3113

Diff Legend

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