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.209 by root, Sat Jul 21 22:54:52 2007 UTC vs.
Revision 1.284 by elmex, Thu Dec 11 00:17:47 2008 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
27#include <stdio.h> 32#include <stdio.h>
28#include <stdlib.h> 33#include <stdlib.h>
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>
34#include <SDL_mixer.h> 41#include <SDL_mixer.h>
35#include <SDL_opengl.h> 42#include <SDL_opengl.h>
36 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
37#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
39 51
40#include <glib/gmacros.h> 52#include <glib/gmacros.h>
41 53
42#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
43 66
44#ifndef _WIN32 67#ifndef _WIN32
45# include <sys/types.h> 68# include <sys/types.h>
46# include <sys/socket.h> 69# include <sys/socket.h>
47# include <netinet/in.h> 70# include <netinet/in.h>
48# include <netinet/tcp.h> 71# include <netinet/tcp.h>
49# include <inttypes.h> 72# include <inttypes.h>
50#endif 73#endif
51 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 85
54#define FOW_DARKNESS 32 86#define FOW_DARKNESS 16
55 87
56#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
58 90
59#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
60 92
61#if 0 93/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else 95
64# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
65#endif
66 97
67static AV *texture_av; 98static AV *texture_av;
68 99
69static struct 100static struct
70{ 101{
107 av_push (texture_av, (SV *)(size_t)name); 138 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 139 glDeleteTextures (1, &name);
109} 140}
110 141
111#include "texcache.c" 142#include "texcache.c"
143#include "rendercache.c"
112 144
113#include "pango-font.c" 145#include "pango-font.c"
114#include "pango-fontmap.c" 146#include "pango-fontmap.c"
115#include "pango-render.c" 147#include "pango-render.c"
116 148
149typedef IV DC__Channel;
150typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 151typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 152typedef Mix_Music *DC__MixMusic;
119 153
120typedef PangoFontDescription *CFPlus__Font; 154typedef PangoFontDescription *DC__Font;
121 155
122static int 156static int
123shape_attr_p (PangoLayoutRun *run) 157shape_attr_p (PangoLayoutRun *run)
124{ 158{
125 GSList *attrs = run->item->analysis.extra_attrs; 159 GSList *attrs = run->item->analysis.extra_attrs;
139 173
140typedef struct cf_layout { 174typedef struct cf_layout {
141 PangoLayout *pl; 175 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 176 float r, g, b, a; // default color for rgba mode
143 int base_height; 177 int base_height;
144 CFPlus__Font font; 178 DC__Font font;
179 rc_t *rc;
145} *CFPlus__Layout; 180} *DC__Layout;
146 181
147static CFPlus__Font default_font; 182static DC__Font default_font;
148static PangoContext *opengl_context; 183static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 184static PangoFontMap *opengl_fontmap;
150 185
151static void 186static void
152substitute_func (FcPattern *pattern, gpointer data) 187substitute_func (FcPattern *pattern, gpointer data)
157#endif 192#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 193 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 194}
160 195
161static void 196static void
162layout_update_font (CFPlus__Layout self) 197layout_update_font (DC__Layout self)
163{ 198{
164 /* use a random scale factor to account for unknown descenders, 0.8 works 199 /* use a random scale factor to account for unknown descenders, 0.8 works
165 * reasonably well with bitstream vera 200 * reasonably well with dejavu/bistream fonts
166 */ 201 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 202 PangoFontDescription *font = self->font ? self->font : default_font;
168 203
169 pango_font_description_set_absolute_size (font, 204 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 205 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 206
172 pango_layout_set_font_description (self->pl, font); 207 pango_layout_set_font_description (self->pl, font);
173} 208}
174 209
175static void 210static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 211layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 212{
178 PangoRectangle rect; 213 PangoRectangle rect;
179 214
180 // get_pixel_* wrongly rounds down 215 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 216 pango_layout_get_extents (self->pl, 0, &rect);
192 227
193typedef uint16_t tileid; 228typedef uint16_t tileid;
194typedef uint16_t faceid; 229typedef uint16_t faceid;
195 230
196typedef struct { 231typedef struct {
197 int name; 232 GLuint name;
198 int w, h; 233 int w, h;
199 float s, t; 234 float s, t;
200 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
201 tileid smoothtile; 236 tileid smoothtile;
202 uint8_t smoothlevel; 237 uint8_t smoothlevel;
238 uint8_t unused; /* set to zero on use */
203} maptex; 239} maptex;
204 240
205typedef struct { 241typedef struct {
206 uint32_t player; 242 uint32_t player;
207 tileid tile[3]; 243 tileid tile[3];
220 int faces; tileid *face2tile; // [faceid] 256 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 257 int texs; maptex *tex; // [tileid]
222 258
223 int32_t rows; 259 int32_t rows;
224 maprow *row; 260 maprow *row;
225} *CFPlus__Map; 261} *DC__Map;
226 262
227static char * 263static char *
228prepend (char *ptr, int sze, int inc) 264prepend (char *ptr, int sze, int inc)
229{ 265{
230 char *p; 266 char *p;
268 self->texs *= 2; 304 self->texs *= 2;
269 } 305 }
270} 306}
271 307
272static maprow * 308static maprow *
273map_get_row (CFPlus__Map self, int y) 309map_get_row (DC__Map self, int y)
274{ 310{
275 if (0 > y) 311 if (0 > y)
276 { 312 {
277 int extend = - y + MAP_EXTEND_Y; 313 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 314 Prepend (maprow, self->row, self->rows, extend);
316 352
317 return row->col + (x - row->c0); 353 return row->col + (x - row->c0);
318} 354}
319 355
320static mapcell * 356static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 357map_get_cell (DC__Map self, int x, int y)
322{ 358{
323 return row_get_cell (map_get_row (self, y), x); 359 return row_get_cell (map_get_row (self, y), x);
324} 360}
325 361
326static void 362static void
327map_clear (CFPlus__Map self) 363map_clear (DC__Map self)
328{ 364{
329 int r; 365 int r;
330 366
331 for (r = 0; r < self->rows; r++) 367 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 368 Safefree (self->row[r].col);
339 self->oy = 0; 375 self->oy = 0;
340 self->row = 0; 376 self->row = 0;
341 self->rows = 0; 377 self->rows = 0;
342} 378}
343 379
380#define CELL_CLEAR(cell) \
381 do { \
382 if ((cell)->player) \
383 (cell)->tile [2] = 0; \
384 (cell)->darkness = 0; \
385 (cell)->stat_hp = 0; \
386 (cell)->flags = 0; \
387 (cell)->player = 0; \
388 } while (0)
389
344static void 390static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 391map_blank (DC__Map self, int x0, int y0, int w, int h)
346{ 392{
347 int x, y; 393 int x, y;
348 maprow *row; 394 maprow *row;
349 mapcell *cell; 395 mapcell *cell;
350 396
362 if (x >= row->c1) 408 if (x >= row->c1)
363 break; 409 break;
364 410
365 cell = row->col + x - row->c0; 411 cell = row->col + x - row->c0;
366 412
367 cell->darkness = 0; 413 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 414 }
372 } 415 }
373} 416}
374 417
375typedef struct { 418typedef struct {
429 n |= n >> 16; 472 n |= n >> 16;
430 473
431 return n + 1; 474 return n + 1;
432} 475}
433 476
477static unsigned int
478popcount (unsigned int n)
479{
480 n -= (n >> 1) & 0x55555555U;
481 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
482 n = ((n >> 4) + n) & 0x0f0f0f0fU;
483 n *= 0x01010101U;
484
485 return n >> 24;
486}
487
434/* SDL should provide this, really. */ 488/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 489#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 490#define SDLK_MODIFIER_MAX 314
437 491
438/******************************************************************************/ 492/******************************************************************************/
476 return 0; 530 return 0;
477 531
478 return 1; 532 return 1;
479} 533}
480 534
481MODULE = CFPlus PACKAGE = CFPlus 535/******************************************************************************/
536
537/* process keyboard modifiers */
538static int
539mod_munge (int mod)
540{
541 mod &= MOD_MASK;
542
543 if (mod & (KMOD_META | KMOD_ALT))
544 mod |= KMOD_LRAM;
545
546 return mod;
547}
548
549static void
550deliantra_main ()
551{
552 char *argv[] = { 0 };
553 call_argv ("::main", G_DISCARD | G_VOID, argv);
554}
555
556#ifdef __MACOSX__
557 /* to due surprising braindamage on the side of SDL design, we
558 * do some mind-boggling hack here: SDL requires a custom main()
559 * on OS X, so... we provide one and call the original main(), which,
560 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
561 * and which calls our main (== SDL_main) back.
562 */
563 extern C_LINKAGE int
564 main (int argc, char *argv[])
565 {
566 deliantra_main ();
567 }
568
569 #undef main
570
571 extern C_LINKAGE int main (int argc, char *argv[]);
572
573 static void
574 SDL_braino (void)
575 {
576 char *argv[] = { "deliantra client", 0 };
577 (main) (1, argv);
578 }
579#else
580 static void
581 SDL_braino (void)
582 {
583 deliantra_main ();
584 }
585#endif
586
587MODULE = Deliantra::Client PACKAGE = DC
482 588
483PROTOTYPES: ENABLE 589PROTOTYPES: ENABLE
484 590
485BOOT: 591BOOT:
486{ 592{
487 HV *stash = gv_stashpv ("CFPlus", 1); 593 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 594 static const struct {
489 const char *name; 595 const char *name;
490 IV iv; 596 IV iv;
491 } *civ, const_iv[] = { 597 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 598# define const_iv(name) { # name, (IV)name }
514 620
515 const_iv (SDL_APPINPUTFOCUS), 621 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 622 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 623 const_iv (SDL_APPACTIVE),
518 624
625
626 const_iv (SDLK_UNKNOWN),
627 const_iv (SDLK_FIRST),
628 const_iv (SDLK_BACKSPACE),
629 const_iv (SDLK_TAB),
630 const_iv (SDLK_CLEAR),
631 const_iv (SDLK_RETURN),
632 const_iv (SDLK_PAUSE),
633 const_iv (SDLK_ESCAPE),
634 const_iv (SDLK_SPACE),
635 const_iv (SDLK_EXCLAIM),
636 const_iv (SDLK_QUOTEDBL),
637 const_iv (SDLK_HASH),
638 const_iv (SDLK_DOLLAR),
639 const_iv (SDLK_AMPERSAND),
640 const_iv (SDLK_QUOTE),
641 const_iv (SDLK_LEFTPAREN),
642 const_iv (SDLK_RIGHTPAREN),
643 const_iv (SDLK_ASTERISK),
644 const_iv (SDLK_PLUS),
645 const_iv (SDLK_COMMA),
646 const_iv (SDLK_MINUS),
647 const_iv (SDLK_PERIOD),
648 const_iv (SDLK_SLASH),
649 const_iv (SDLK_0),
650 const_iv (SDLK_1),
651 const_iv (SDLK_2),
652 const_iv (SDLK_3),
653 const_iv (SDLK_4),
654 const_iv (SDLK_5),
655 const_iv (SDLK_6),
656 const_iv (SDLK_7),
657 const_iv (SDLK_8),
658 const_iv (SDLK_9),
659 const_iv (SDLK_COLON),
660 const_iv (SDLK_SEMICOLON),
661 const_iv (SDLK_LESS),
662 const_iv (SDLK_EQUALS),
663 const_iv (SDLK_GREATER),
664 const_iv (SDLK_QUESTION),
665 const_iv (SDLK_AT),
666
667 const_iv (SDLK_LEFTBRACKET),
668 const_iv (SDLK_BACKSLASH),
669 const_iv (SDLK_RIGHTBRACKET),
670 const_iv (SDLK_CARET),
671 const_iv (SDLK_UNDERSCORE),
672 const_iv (SDLK_BACKQUOTE),
673 const_iv (SDLK_DELETE),
674
675 const_iv (SDLK_FIRST),
676 const_iv (SDLK_LAST),
519 const_iv (SDLK_KP0), 677 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 678 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 679 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 680 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 681 const_iv (SDLK_KP4),
595 const_iv (KMOD_LMETA), 753 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 754 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 755 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 756 const_iv (KMOD_CAPS),
599 const_iv (KMOD_MODE), 757 const_iv (KMOD_MODE),
758
759 const_iv (KMOD_LRAM),
760
761 const_iv (MIX_DEFAULT_FORMAT),
762
763 const_iv (SDL_INIT_TIMER),
764 const_iv (SDL_INIT_AUDIO),
765 const_iv (SDL_INIT_VIDEO),
766 const_iv (SDL_INIT_CDROM),
767 const_iv (SDL_INIT_JOYSTICK),
768 const_iv (SDL_INIT_EVERYTHING),
769 const_iv (SDL_INIT_NOPARACHUTE),
770 const_iv (SDL_INIT_EVENTTHREAD),
771
772 const_iv (SDL_GL_RED_SIZE),
773 const_iv (SDL_GL_GREEN_SIZE),
774 const_iv (SDL_GL_BLUE_SIZE),
775 const_iv (SDL_GL_ALPHA_SIZE),
776 const_iv (SDL_GL_DOUBLEBUFFER),
777 const_iv (SDL_GL_BUFFER_SIZE),
778 const_iv (SDL_GL_DEPTH_SIZE),
779 const_iv (SDL_GL_STENCIL_SIZE),
780 const_iv (SDL_GL_ACCUM_RED_SIZE),
781 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
782 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
783 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
784 const_iv (SDL_GL_STEREO),
785 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
786 const_iv (SDL_GL_MULTISAMPLESAMPLES),
787 const_iv (SDL_GL_ACCELERATED_VISUAL),
788 const_iv (SDL_GL_SWAP_CONTROL),
789
790 const_iv (FOW_DARKNESS)
600# undef const_iv 791# undef const_iv
601 }; 792 };
602 793
603 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 794 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 795 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
622 813
623NV floor (NV x) 814NV floor (NV x)
624 815
625NV ceil (NV x) 816NV ceil (NV x)
626 817
818IV minpot (UV n)
819
820IV popcount (UV n)
821
627void 822void
628pango_init () 823pango_init ()
629 CODE: 824 CODE:
630{ 825{
631 opengl_fontmap = pango_opengl_font_map_new (); 826 opengl_fontmap = pango_opengl_font_map_new ();
632 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 827 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
633 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 828 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
829 /*pango_context_set_font_description (opengl_context, default_font);*/
830#if PANGO_VERSION_CHECK (1, 15, 2)
831 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
832 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
833#endif
634} 834}
635 835
636char *
637SDL_GetError () 836char *SDL_GetError ()
638 837
639int 838void SDL_braino ()
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
641 839
642void 840int SDL_Init (U32 flags)
841
842int SDL_InitSubSystem (U32 flags)
843
844void SDL_QuitSubSystem (U32 flags)
845
643SDL_Quit () 846void SDL_Quit ()
847
848int SDL_GL_SetAttribute (int attr, int value)
849
850int SDL_GL_GetAttribute (int attr)
851 CODE:
852 if (SDL_GL_GetAttribute (attr, &RETVAL))
853 XSRETURN_UNDEF;
854 OUTPUT:
855 RETVAL
644 856
645void 857void
646SDL_ListModes (int rgb, int alpha) 858SDL_ListModes (int rgb, int alpha)
647 PPCODE: 859 PPCODE:
648{ 860{
660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 874 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
663 875
664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 876 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
665#if SDL_VERSION_ATLEAST(1,2,10)
666 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
667 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 877 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
669 878
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 879 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 880
672 if (m && m != (SDL_Rect **)-1) 881 if (m && m != (SDL_Rect **)-1)
673 while (*m) 882 while (*m)
674 { 883 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 884 if ((*m)->w >= 400 && (*m)->h >= 300)
676 { 885 {
677 AV *av = newAV (); 886 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 887 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 888 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 889 av_push (av, newSViv (rgb));
704 913
705 if (RETVAL) 914 if (RETVAL)
706 { 915 {
707 av_clear (texture_av); 916 av_clear (texture_av);
708 917
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 918 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 919#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
711#include "glfunc.h" 920#include "glfunc.h"
712#undef GL_FUNC 921#undef GL_FUNC
713 } 922 }
714} 923}
721char * 930char *
722SDL_GetKeyName (int sym) 931SDL_GetKeyName (int sym)
723 932
724int 933int
725SDL_GetAppState () 934SDL_GetAppState ()
935
936int
937SDL_GetModState ()
726 938
727void 939void
728poll_events () 940poll_events ()
729 PPCODE: 941 PPCODE:
730{ 942{
740 { 952 {
741 case SDL_KEYDOWN: 953 case SDL_KEYDOWN:
742 case SDL_KEYUP: 954 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 955 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 956 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 957 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
746 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 958 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 959 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 960 break;
749 961
750 case SDL_ACTIVEEVENT: 962 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 963 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
769 x = ev.motion.x; 981 x = ev.motion.x;
770 y = ev.motion.y; 982 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 983 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 984 }
773 985
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 986 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 987 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 988 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 989 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 990 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 991 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 992 }
781 break; 993 break;
782 994
783 case SDL_MOUSEBUTTONDOWN: 995 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 996 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 997 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 998
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 999 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1000 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1001 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1002 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1007 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1008 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 1009 break;
798 } 1010 }
799 1011
800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1012 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
801 } 1013 }
802} 1014}
803 1015
804int 1016int
805Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1017Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 1018 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 1019 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 1020 Mix_ChannelFinished (channel_finished);
809 1021
810void 1022void
1023Mix_QuerySpec ()
1024 PPCODE:
1025{
1026 int freq, channels;
1027 Uint16 format;
1028
1029 if (Mix_QuerySpec (&freq, &format, &channels))
1030 {
1031 EXTEND (SP, 3);
1032 PUSHs (sv_2mortal (newSViv (freq)));
1033 PUSHs (sv_2mortal (newSViv (format)));
1034 PUSHs (sv_2mortal (newSViv (channels)));
1035 }
1036}
1037
1038void
811Mix_CloseAudio () 1039Mix_CloseAudio ()
812 1040
813int 1041int
814Mix_AllocateChannels (int numchans = -1) 1042Mix_AllocateChannels (int numchans = -1)
1043
1044const char *
1045Mix_GetError ()
815 1046
816void 1047void
817lowdelay (int fd, int val = 1) 1048lowdelay (int fd, int val = 1)
818 CODE: 1049 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1050 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
845 } 1076 }
846 } 1077 }
847#endif 1078#endif
848} 1079}
849 1080
850void 1081int
851add_font (char *file) 1082add_font (char *file)
852 CODE: 1083 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1084 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085 OUTPUT:
1086 RETVAL
854 1087
855void 1088void
856load_image_inline (SV *image_) 1089load_image_inline (SV *image_)
857 ALIAS: 1090 ALIAS:
858 load_image_file = 1 1091 load_image_file = 1
861 STRLEN image_len; 1094 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 1095 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 1096 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 1097 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 1098 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 1099 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 1100 : SDL_RWFromConstMem (image, image_len);
868 1101
869 if (!rw) 1102 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 1103 croak ("load_image: %s", SDL_GetError ());
871 1104
944void 1177void
945error (char *message) 1178error (char *message)
946 CODE: 1179 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1180 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1181#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1182 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1183#endif
951 1184
952void 1185void
953fatal (char *message) 1186fatal (char *message)
954 CODE: 1187 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1188 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1189#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1190 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1191#endif
959 _exit (1); 1192 _exit (1);
960 1193
961void 1194void
962_exit (int retval = 0) 1195_exit (int retval = 0)
974#if DEBUG 1207#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1208 VALGRIND_DO_LEAK_CHECK;
976#endif 1209#endif
977} 1210}
978 1211
979MODULE = CFPlus PACKAGE = CFPlus::Font 1212int
1213SvREFCNT (SV *sv)
1214 CODE:
1215 RETVAL = SvREFCNT (sv);
1216 OUTPUT:
1217 RETVAL
1218
1219MODULE = Deliantra::Client PACKAGE = DC::Font
980 1220
981PROTOTYPES: DISABLE 1221PROTOTYPES: DISABLE
982 1222
983CFPlus::Font 1223DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1224new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1225 CODE:
986{ 1226{
987 int count; 1227 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1228 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1231}
992 OUTPUT: 1232 OUTPUT:
993 RETVAL 1233 RETVAL
994 1234
995void 1235void
996DESTROY (CFPlus::Font self) 1236DESTROY (DC::Font self)
997 CODE: 1237 CODE:
998 pango_font_description_free (self); 1238 pango_font_description_free (self);
999 1239
1000void 1240void
1001make_default (CFPlus::Font self) 1241make_default (DC::Font self)
1002 PROTOTYPE: $ 1242 PROTOTYPE: $
1003 CODE: 1243 CODE:
1004 default_font = self; 1244 default_font = self;
1005 1245
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1246MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1247
1008PROTOTYPES: DISABLE 1248PROTOTYPES: DISABLE
1009 1249
1010void 1250void
1011reset_glyph_cache () 1251glyph_cache_backup ()
1012 PROTOTYPE: 1252 PROTOTYPE:
1013 CODE: 1253 CODE:
1254 tc_backup ();
1255
1256void
1257glyph_cache_restore ()
1258 PROTOTYPE:
1259 CODE:
1014 tc_clear (); 1260 tc_restore ();
1015 1261
1016CFPlus::Layout 1262DC::Layout
1017new (SV *class) 1263new (SV *class)
1018 CODE: 1264 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1265 New (0, RETVAL, 1, struct cf_layout);
1020 1266
1021 RETVAL->pl = pango_layout_new (opengl_context); 1267 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1269 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1270 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1271 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1272 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1273 RETVAL->font = 0;
1274 RETVAL->rc = rc_alloc ();
1028 1275
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1276 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1277 layout_update_font (RETVAL);
1031 OUTPUT: 1278 OUTPUT:
1032 RETVAL 1279 RETVAL
1033 1280
1034void 1281void
1035DESTROY (CFPlus::Layout self) 1282DESTROY (DC::Layout self)
1036 CODE: 1283 CODE:
1037 g_object_unref (self->pl); 1284 g_object_unref (self->pl);
1285 rc_free (self->rc);
1038 Safefree (self); 1286 Safefree (self);
1039 1287
1040void 1288void
1041set_text (CFPlus::Layout self, SV *text_) 1289set_text (DC::Layout self, SV *text_)
1042 CODE: 1290 CODE:
1043{ 1291{
1044 STRLEN textlen; 1292 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1293 char *text = SvPVutf8 (text_, textlen);
1046 1294
1047 pango_layout_set_text (self->pl, text, textlen); 1295 pango_layout_set_text (self->pl, text, textlen);
1048} 1296}
1049 1297
1050void 1298void
1051set_markup (CFPlus::Layout self, SV *text_) 1299set_markup (DC::Layout self, SV *text_)
1052 CODE: 1300 CODE:
1053{ 1301{
1054 STRLEN textlen; 1302 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1303 char *text = SvPVutf8 (text_, textlen);
1056 1304
1057 pango_layout_set_markup (self->pl, text, textlen); 1305 pango_layout_set_markup (self->pl, text, textlen);
1058} 1306}
1059 1307
1060void 1308void
1061set_shapes (CFPlus::Layout self, ...) 1309set_shapes (DC::Layout self, ...)
1062 CODE: 1310 CODE:
1063{ 1311{
1064 PangoAttrList *attrs = 0; 1312 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1313 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1314 const char *pos = text;
1101 if (attrs) 1349 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1350 pango_layout_set_attributes (self->pl, attrs);
1103} 1351}
1104 1352
1105void 1353void
1106get_shapes (CFPlus::Layout self) 1354get_shapes (DC::Layout self)
1107 PPCODE: 1355 PPCODE:
1108{ 1356{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1357 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1358
1111 do 1359 do
1112 { 1360 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1361 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1362
1115 if (run && shape_attr_p (run)) 1363 if (run && shape_attr_p (run))
1116 { 1364 {
1117 PangoRectangle extents; 1365 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1366 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1374
1127 pango_layout_iter_free (iter); 1375 pango_layout_iter_free (iter);
1128} 1376}
1129 1377
1130int 1378int
1131has_wrapped (CFPlus::Layout self) 1379has_wrapped (DC::Layout self)
1132 CODE: 1380 CODE:
1133{ 1381{
1134 int lines = 1; 1382 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1383 const char *text = pango_layout_get_text (self->pl);
1136 1384
1141} 1389}
1142 OUTPUT: 1390 OUTPUT:
1143 RETVAL 1391 RETVAL
1144 1392
1145SV * 1393SV *
1146get_text (CFPlus::Layout self) 1394get_text (DC::Layout self)
1147 CODE: 1395 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1396 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1397 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1398 OUTPUT:
1151 RETVAL 1399 RETVAL
1152 1400
1153void 1401void
1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1402set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1155 CODE: 1403 CODE:
1156 self->r = r; 1404 self->r = r;
1157 self->g = g; 1405 self->g = g;
1158 self->b = b; 1406 self->b = b;
1159 self->a = a; 1407 self->a = a;
1160 1408
1161void 1409void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1410set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1411 CODE:
1164 if (self->font != font) 1412 if (self->font != font)
1165 { 1413 {
1166 self->font = font; 1414 self->font = font;
1167 layout_update_font (self); 1415 layout_update_font (self);
1168 } 1416 }
1169 1417
1170void 1418void
1171set_height (CFPlus::Layout self, int base_height) 1419set_height (DC::Layout self, int base_height)
1172 CODE: 1420 CODE:
1173 if (self->base_height != base_height) 1421 if (self->base_height != base_height)
1174 { 1422 {
1175 self->base_height = base_height; 1423 self->base_height = base_height;
1176 layout_update_font (self); 1424 layout_update_font (self);
1177 } 1425 }
1178 1426
1179void 1427void
1180set_width (CFPlus::Layout self, int max_width = -1) 1428set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1429 CODE:
1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1430 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1183 1431
1184void 1432void
1185set_indent (CFPlus::Layout self, int indent) 1433set_indent (DC::Layout self, int indent)
1186 CODE: 1434 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1435 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1436
1189void 1437void
1190set_spacing (CFPlus::Layout self, int spacing) 1438set_spacing (DC::Layout self, int spacing)
1191 CODE: 1439 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1440 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1441
1194void 1442void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1443set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1444 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1445 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1446 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1447 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1448 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1449 : PANGO_ELLIPSIZE_NONE
1202 ); 1450 );
1203 1451
1204void 1452void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1453set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1454 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1455 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1456
1209void 1457void
1210size (CFPlus::Layout self) 1458size (DC::Layout self)
1211 PPCODE: 1459 PPCODE:
1212{ 1460{
1213 int w, h; 1461 int w, h;
1214 1462
1215 layout_get_pixel_size (self, &w, &h); 1463 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1466 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1467 PUSHs (sv_2mortal (newSViv (h)));
1220} 1468}
1221 1469
1222int 1470int
1223descent (CFPlus::Layout self) 1471descent (DC::Layout self)
1224 CODE: 1472 CODE:
1225{ 1473{
1226 PangoRectangle rect; 1474 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1475 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1476 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1477 RETVAL = PANGO_DESCENT (rect);
1230} 1478}
1231 OUTPUT: 1479 OUTPUT:
1232 RETVAL 1480 RETVAL
1233 1481
1234int 1482int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1483xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1484 CODE:
1237{ 1485{
1238 int index, trailing; 1486 int index, trailing;
1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1487 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1240 RETVAL = index + trailing; 1488 RETVAL = index + trailing;
1241} 1489}
1242 OUTPUT: 1490 OUTPUT:
1243 RETVAL 1491 RETVAL
1244 1492
1245void 1493void
1246cursor_pos (CFPlus::Layout self, int index) 1494cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1495 PPCODE:
1248{ 1496{
1249 PangoRectangle strong_pos; 1497 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1498 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1499
1252 EXTEND (SP, 3); 1500 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1501 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1502 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1503 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1504}
1257 1505
1258void 1506void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1507index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1508 PPCODE:
1261{ 1509{
1262 int line, x; 1510 int line, x;
1263 1511
1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1512 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1513#if !PANGO_VERSION_CHECK (1, 17, 3)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1514 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1515 --line;
1516#endif
1267 EXTEND (SP, 2); 1517 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1518 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1519 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1520}
1271 1521
1272void 1522void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1523line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1524 PPCODE:
1275{ 1525{
1276 PangoLayoutLine *lp; 1526 PangoLayoutLine *lp;
1277 int index, trailing; 1527 int index, trailing;
1278 1528
1279 if (line < 0) 1529 if (line < 0)
1280 XSRETURN_EMPTY; 1530 XSRETURN_EMPTY;
1281 1531
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1532 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1533 XSRETURN_EMPTY; /* do better */
1284 1534
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1535 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286 1536
1287 EXTEND (SP, 2); 1537 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1543 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1544 }
1295} 1545}
1296 1546
1297void 1547void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1548render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1549 CODE:
1550 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1551 pango_opengl_render_layout_subpixel (
1301 self->pl, 1552 self->pl,
1553 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1554 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1555 self->r, self->g, self->b, self->a,
1304 flags 1556 flags
1305 ); 1557 );
1558 // we assume that context_change actually clears/frees stuff
1559 // and does not do any recomputation...
1560 pango_layout_context_changed (self->pl);
1306 1561
1307MODULE = CFPlus PACKAGE = CFPlus::Texture 1562void
1563draw (DC::Layout self)
1564 CODE:
1565{
1566 glEnable (GL_TEXTURE_2D);
1567 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1568 glEnable (GL_BLEND);
1569 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1570 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1571 glEnable (GL_ALPHA_TEST);
1572 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1573
1574 rc_draw (self->rc);
1575
1576 glDisable (GL_ALPHA_TEST);
1577 glDisable (GL_BLEND);
1578 glDisable (GL_TEXTURE_2D);
1579}
1580
1581MODULE = Deliantra::Client PACKAGE = DC::Texture
1308 1582
1309PROTOTYPES: ENABLE 1583PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1584
1313void 1585void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1586pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1587 CODE:
1316{ 1588{
1343 HV *hv = (HV *)SvRV (self); 1615 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1616 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1617 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1618 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1619
1620 if (name <= 0)
1621 XSRETURN_EMPTY;
1622
1348 if (items < 5) 1623 if (items < 5)
1349 { 1624 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1625 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1626 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1627 }
1390 RETVAL = width > 0; 1665 RETVAL = width > 0;
1391} 1666}
1392 OUTPUT: 1667 OUTPUT:
1393 RETVAL 1668 RETVAL
1394 1669
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1670MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1671
1397PROTOTYPES: DISABLE 1672PROTOTYPES: DISABLE
1398 1673
1399CFPlus::Map 1674DC::Map
1400new (SV *class) 1675new (SV *class)
1401 CODE: 1676 CODE:
1402 New (0, RETVAL, 1, struct map); 1677 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1678 RETVAL->x = 0;
1404 RETVAL->y = 0; 1679 RETVAL->y = 0;
1412 RETVAL->row = 0; 1687 RETVAL->row = 0;
1413 OUTPUT: 1688 OUTPUT:
1414 RETVAL 1689 RETVAL
1415 1690
1416void 1691void
1417DESTROY (CFPlus::Map self) 1692DESTROY (DC::Map self)
1418 CODE: 1693 CODE:
1419{ 1694{
1420 map_clear (self); 1695 map_clear (self);
1421 Safefree (self->face2tile); 1696 Safefree (self->face2tile);
1422 Safefree (self->tex); 1697 Safefree (self->tex);
1423 Safefree (self); 1698 Safefree (self);
1424} 1699}
1425 1700
1426void 1701void
1427resize (CFPlus::Map self, int map_width, int map_height) 1702resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1703 CODE:
1429 self->w = map_width; 1704 self->w = map_width;
1430 self->h = map_height; 1705 self->h = map_height;
1431 1706
1432void 1707void
1433clear (CFPlus::Map self) 1708clear (DC::Map self)
1434 CODE: 1709 CODE:
1435 map_clear (self); 1710 map_clear (self);
1436 1711
1437void 1712void
1438set_tileid (CFPlus::Map self, int face, int tile) 1713set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1714 CODE:
1440{ 1715{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1716 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1717 need_texid (self, tile);
1443} 1718}
1444 1719
1445void 1720void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1721set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1722 CODE:
1448{ 1723{
1449 tileid texid; 1724 tileid texid;
1450 maptex *tex; 1725 maptex *tex;
1451 1726
1464 tex->smoothtile = self->face2tile [smooth]; 1739 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1740 tex->smoothlevel = level;
1466} 1741}
1467 1742
1468void 1743void
1469set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1744set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1470 CODE: 1745 CODE:
1471{ 1746{
1472 need_texid (self, texid); 1747 need_texid (self, texid);
1473 1748
1474 { 1749 {
1493 // use uglier nearest interpolation because linear suffers 1768 // use uglier nearest interpolation because linear suffers
1494 // from transparent color bleeding and ugly wrapping effects. 1769 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1770 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1771}
1497 1772
1773void
1774expire_textures (DC::Map self, int texid, int count)
1775 PPCODE:
1776 for (; texid < self->texs && count; ++texid, --count)
1777 {
1778 maptex *tex = self->tex + texid;
1779
1780 if (tex->name)
1781 {
1782 if (tex->unused)
1783 {
1784 tex->name = 0;
1785 tex->unused = 0;
1786 XPUSHs (sv_2mortal (newSViv (texid)));
1787 }
1788 else
1789 tex->unused = 1;
1790 }
1791 }
1792
1498int 1793int
1499ox (CFPlus::Map self) 1794ox (DC::Map self)
1500 ALIAS: 1795 ALIAS:
1501 oy = 1 1796 oy = 1
1502 x = 2 1797 x = 2
1503 y = 3 1798 y = 3
1504 w = 4 1799 w = 4
1515 } 1810 }
1516 OUTPUT: 1811 OUTPUT:
1517 RETVAL 1812 RETVAL
1518 1813
1519void 1814void
1520scroll (CFPlus::Map self, int dx, int dy) 1815scroll (DC::Map self, int dx, int dy)
1521 CODE: 1816 CODE:
1522{ 1817{
1523 if (dx > 0) 1818 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1819 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1820 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 1835 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 1836 self->y += MAP_EXTEND_Y;
1542 } 1837 }
1543} 1838}
1544 1839
1545void 1840SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 1841map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 1842 CODE:
1548{ 1843{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1844 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 1845 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 1846 mapcell *cell;
1552 int x, y, flags; 1847 int x, y, z, flags;
1848 AV *missing = newAV ();
1849 RETVAL = newRV_noinc ((SV *)missing);
1553 1850
1554 while (data < data_end - 1) 1851 while (data < data_end - 1)
1555 { 1852 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 1853 flags = (data [0] << 8) + data [1]; data += 2;
1557 1854
1577 uint8_t ext, cmd; 1874 uint8_t ext, cmd;
1578 1875
1579 do 1876 do
1580 { 1877 {
1581 ext = *data++; 1878 ext = *data++;
1582 cmd = ext & 0x3f; 1879 cmd = ext & 0x7f;
1583 1880
1584 if (cmd < 4) 1881 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1; 1882 cell->darkness = 255 - ext * 64 + 1;
1586 else if (cmd == 5) // health 1883 else if (cmd == 5) // health
1587 { 1884 {
1590 } 1887 }
1591 else if (cmd == 6) // monster width 1888 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1; 1889 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47) 1890 else if (cmd == 0x47)
1594 { 1891 {
1595 if (*data == 4) 1892 if (*data == 1) cell->player = data [1];
1596 ; // decode player count 1893 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1894 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1895 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1597 1896
1598 data += *data + 1; 1897 data += *data + 1;
1599 } 1898 }
1600 else if (cmd == 8) // cell flags 1899 else if (cmd == 8) // cell flags
1601 cell->flags = *data++; 1900 cell->flags = *data++;
1608 } 1907 }
1609 else 1908 else
1610 cell->darkness = *data++ + 1; 1909 cell->darkness = *data++ + 1;
1611 } 1910 }
1612 1911
1912 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 1913 if (flags & (4 >> z))
1614 { 1914 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 1915 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 1916 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 1917 cell->tile [z] = self->face2tile [face];
1918
1919 if (cell->tile [z])
1920 {
1921 maptex *tex = self->tex + cell->tile [z];
1922 tex->unused = 0;
1923 if (!tex->name)
1924 av_push (missing, newSViv (cell->tile [z]));
1925
1926 if (tex->smoothtile)
1927 {
1928 maptex *smooth = self->tex + tex->smoothtile;
1929 smooth->unused = 0;
1930 if (!smooth->name)
1931 av_push (missing, newSViv (tex->smoothtile));
1932 }
1933 }
1618 } 1934 }
1619
1620 if (flags & 2)
1621 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1625 }
1626
1627 if (flags & 1)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1632 }
1633 } 1935 }
1634 else 1936 else
1635 cell->darkness = 0; 1937 CELL_CLEAR (cell);
1636 } 1938 }
1637} 1939}
1940 OUTPUT:
1941 RETVAL
1638 1942
1639SV * 1943SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1944mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 1945 CODE:
1642{ 1946{
1643 int x1, x; 1947 int x1, x;
1644 int y1, y; 1948 int y1, y;
1645 int z; 1949 int z;
1690} 1994}
1691 OUTPUT: 1995 OUTPUT:
1692 RETVAL 1996 RETVAL
1693 1997
1694void 1998void
1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1999draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1696 CODE: 2000 CODE:
1697{ 2001{
2002 int x, y, z;
2003
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2004 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2005 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1700 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2006 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1701 smooth_key skey; 2007 smooth_key skey;
1702 int x, y, z; 2008 int pl_x, pl_y;
1703 int last_name; 2009 maptex pl_tex;
2010 rc_t *rc = rc_alloc ();
2011 rc_key_t key;
2012 rc_array_t *arr;
2013
2014 pl_tex.name = 0;
1704 2015
1705 // thats current max. sorry. 2016 // thats current max. sorry.
1706 if (sw > 255) sw = 255; 2017 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 2018 if (sh > 255) sh = 255;
1708 2019
1709 // clear key, in case of extra padding 2020 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 2021 memset (&skey, 0, sizeof (skey));
1711 2022
1712 glColor4ub (255, 255, 255, 255); 2023 memset (&key, 0, sizeof (key));
1713 2024 key.r = 255;
1714 glEnable (GL_BLEND); 2025 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2026 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 2027 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2028 key.mode = GL_QUADS;
1718 2029 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS);
1720
1721 last_name = 0;
1722 2030
1723 mx += self->x; 2031 mx += self->x;
1724 my += self->y; 2032 my += self->y;
1725 2033
1726 // first pass: determine smooth_max 2034 // first pass: determine smooth_max
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 2051 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 2052 self->tex [cell->tile [2]].smoothlevel));
1745 } 2053 }
1746 } 2054 }
1747 2055
2056 glEnable (GL_BLEND);
2057 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2058 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2059
1748 for (z = 0; z <= 2; z++) 2060 for (z = 0; z <= 2; z++)
1749 { 2061 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 2062 memset (smooth_level, 0, sizeof (smooth_level));
2063 key.texname = -1;
1751 2064
1752 for (y = 0; y < sh; y++) 2065 for (y = 0; y < sh; y++)
1753 if (0 <= y + my && y + my < self->rows) 2066 if (0 <= y + my && y + my < self->rows)
1754 { 2067 {
1755 maprow *row = self->row + (y + my); 2068 maprow *row = self->row + (y + my);
1764 { 2077 {
1765 maptex tex = self->tex [tile]; 2078 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 2079 int px = (x + 1) * T - tex.w;
1767 int py = (y + 1) * T - tex.h; 2080 int py = (y + 1) * T - tex.h;
1768 2081
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 2082 if (key.texname != tex.name)
1772 { 2083 {
2084 self->tex [tile].unused = 0;
2085
1773 if (!tex.name) 2086 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 2087 tex = self->tex [2]; /* missing, replace by noface */
1775 2088
1776 glEnd (); 2089 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2090 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 2091 }
1780 2092
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2093 if (expect_false (cell->player == player) && expect_false (z == 2))
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1783 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1785
1786 if (cell->flags && z == 2)
1787 { 2094 {
2095 pl_x = px;
2096 pl_y = py;
2097 pl_tex = tex;
2098 continue;
2099 }
2100
2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2102 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2103 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2104 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2105
2106 if (expect_false (cell->flags) && expect_false (z == 2))
2107 {
2108 /* this is a workaround to make speech bubbles drawn
2109 * for example above walls, work. */
2110 rc_draw (rc);
2111 rc_clear (rc);
2112 key.texname = -1;
2113
2114 // overlays such as the speech bubble, probably more to come
1788 if (cell->flags & 1) 2115 if (cell->flags & 1)
1789 { 2116 {
1790 maptex tex = self->tex [1]; 2117 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32; 2118 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32; 2119 int py = y * T - T * 6 / 32;
1793 2120
2121 if (tex.name)
1794 glEnd (); 2122 {
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2123 if (key.texname != tex.name)
2124 {
2125 key.texname = tex.name;
2126 arr = rc_array (rc, &key);
2127 }
2128
2129 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2130 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2131 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2132 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1796 glBegin (GL_QUADS); 2133 }
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 } 2134 }
1803 } 2135 }
1804 2136
1805 // update smooth hash 2137 // update smooth hash
1806 if (tex.smoothtile) 2138 if (tex.smoothtile)
1842 } 2174 }
1843 } 2175 }
1844 } 2176 }
1845 } 2177 }
1846 2178
2179 rc_draw (rc);
2180 rc_clear (rc);
2181
1847 // go through all smoothlevels, lowest to highest, then draw. 2182 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2183 // this is basically counting sort
1849 { 2184 {
1850 int w, b; 2185 int w, b;
1851 2186
2187 glEnable (GL_TEXTURE_2D);
2188 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 2189 for (w = 0; w < 256 / 32; ++w)
1853 { 2190 {
1854 uint32_t smask = smooth_level [w]; 2191 uint32_t smask = smooth_level [w];
1855 if (smask) 2192 if (smask)
1856 for (b = 0; b < 32; ++b) 2193 for (b = 0; b < 32; ++b)
1875 int border = bits & 15; 2212 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2213 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 2214 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 2215 float dy = tex.t * .5f ; // 2 images/column
1879 2216
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 2217 if (tex.name)
1883 { 2218 {
2219 // this time avoiding texture state changes
2220 // save gobs of state changes.
1884 if (!tex.name) 2221 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2222 {
2223 self->tex [skey->tile].unused = 0;
1886 2224
1887 glEnd (); 2225 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2226 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2227 glBegin (GL_QUADS);
1890 } 2228 }
1891 2229
1892 if (border) 2230 if (border)
1893 { 2231 {
1894 float ox = border * dx; 2232 float ox = border * dx;
1895 2233
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2234 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2235 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2236 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2237 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900 } 2238 }
1901 2239
1902 if (corner) 2240 if (corner)
1903 { 2241 {
1904 float ox = corner * dx; 2242 float ox = corner * dx;
1905 2243
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2244 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2245 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2246 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2247 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2248 }
1910 } 2249 }
1911 } 2250 }
1912 } 2251 }
1913 } 2252 }
1914 } 2253 }
2254
2255 glEnd ();
2256 glDisable (GL_TEXTURE_2D);
2257 key.texname = -1;
1915 } 2258 }
1916 2259
1917 hv_clear (smooth); 2260 hv_clear (smooth);
1918 } 2261 }
1919 2262
1920 glEnd (); 2263 if (pl_tex.name)
2264 {
2265 maptex tex = pl_tex;
2266 int px = pl_x + sdx;
2267 int py = pl_y + sdy;
1921 2268
1922 glDisable (GL_TEXTURE_2D); 2269 key.texname = tex.name;
2270 arr = rc_array (rc, &key);
2271
2272 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2273 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2274 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2275 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2276
2277 rc_draw (rc);
2278 }
2279
1923 glDisable (GL_BLEND); 2280 glDisable (GL_BLEND);
2281 rc_free (rc);
1924 2282
1925 // top layer: overlays such as the health bar 2283 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2284 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2285 if (0 <= y + my && y + my < self->rows)
1928 { 2286 {
1933 { 2291 {
1934 mapcell *cell = row->col + (x + mx - row->c0); 2292 mapcell *cell = row->col + (x + mx - row->c0);
1935 2293
1936 int px = x * T; 2294 int px = x * T;
1937 int py = y * T; 2295 int py = y * T;
2296
2297 if (expect_false (cell->player == player))
2298 {
2299 px += sdx;
2300 py += sdy;
2301 }
1938 2302
1939 if (cell->stat_hp) 2303 if (cell->stat_hp)
1940 { 2304 {
1941 int width = cell->stat_width * T; 2305 int width = cell->stat_width * T;
1942 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2306 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1953 } 2317 }
1954 } 2318 }
1955} 2319}
1956 2320
1957void 2321void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2322draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1959 CODE: 2323 CODE:
1960{ 2324{
1961 static float color[16][3] = { 2325 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2326 { 0.00F, 0.00F, 0.00F },
1963 { 1.00F, 1.00F, 1.00F }, 2327 { 1.00F, 1.00F, 1.00F },
2013 glDisable (GL_BLEND); 2377 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2378 glDisable (GL_TEXTURE_2D);
2015} 2379}
2016 2380
2017void 2381void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2382fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2019 PPCODE: 2383 PPCODE:
2020{ 2384{
2021 int x, y; 2385 int x, y;
2022 int sw1 = sw + 2; 2386 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2387 int sh1 = sh + 2;
2031 SvCUR_set (darkness3_sv, sw34 * sh3); 2395 SvCUR_set (darkness3_sv, sw34 * sh3);
2032 2396
2033 mx += self->x - 1; 2397 mx += self->x - 1;
2034 my += self->y - 1; 2398 my += self->y - 1;
2035 2399
2036 memset (darkness1, 255, sw1 * sh1); 2400 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2037 2401
2038 for (y = 0; y < sh1; y++) 2402 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows) 2403 if (0 <= y + my && y + my < self->rows)
2040 { 2404 {
2041 maprow *row = self->row + (y + my); 2405 maprow *row = self->row + (y + my);
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2458 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2459 PUSHs (darkness3_sv);
2096} 2460}
2097 2461
2098SV * 2462SV *
2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2463get_rect (DC::Map self, int x0, int y0, int w, int h)
2100 CODE: 2464 CODE:
2101{ 2465{
2102 int x, y, x1, y1; 2466 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2467 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2468 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2161 else 2525 else
2162 *data++ = 0; 2526 *data++ = 0;
2163 } 2527 }
2164 } 2528 }
2165 2529
2530 /* if size is w*h + 5 then no data has been found */
2531 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2532 {
2166 SvPOK_only (data_sv); 2533 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2534 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2535 }
2536
2168 RETVAL = data_sv; 2537 RETVAL = data_sv;
2169} 2538}
2170 OUTPUT: 2539 OUTPUT:
2171 RETVAL 2540 RETVAL
2172 2541
2173void 2542void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2543set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2544 PPCODE:
2176{ 2545{
2177 int x, y, z; 2546 int x, y, z;
2178 int w, h; 2547 int w, h;
2179 int x1, y1; 2548 int x1, y1;
2549 STRLEN len;
2550 uint8_t *data, *end;
2551
2552 len = SvLEN (data_sv);
2553 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2554 data = SvPVbyte_nolen (data_sv);
2555 end = data + len + 8;
2556
2557 if (len < 5)
2558 XSRETURN_EMPTY;
2180 2559
2181 if (*data++ != 0) 2560 if (*data++ != 0)
2182 return; /* version mismatch */ 2561 XSRETURN_EMPTY; /* version mismatch */
2183 2562
2184 w = *data++ << 8; w |= *data++; 2563 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2564 h = *data++ << 8; h |= *data++;
2186 2565
2187 // we need to do this 'cause we don't keep an absolute coord system for rows 2566 // we need to do this 'cause we don't keep an absolute coord system for rows
2199 { 2578 {
2200 maprow *row = map_get_row (self, y); 2579 maprow *row = map_get_row (self, y);
2201 2580
2202 for (x = x0; x < x1; x++) 2581 for (x = x0; x < x1; x++)
2203 { 2582 {
2583 uint8_t flags;
2584
2585 if (data + 7 >= end)
2586 XSRETURN_EMPTY;
2587
2204 uint8_t flags = *data++; 2588 flags = *data++;
2205 2589
2206 if (flags) 2590 if (flags)
2207 { 2591 {
2208 mapcell *cell = row_get_cell (row, x); 2592 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2593 tileid tile[3] = { 0, 0, 0 };
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2596 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2597 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2598
2215 if (cell->darkness == 0) 2599 if (cell->darkness == 0)
2216 { 2600 {
2217 cell->darkness = 0; 2601 /*cell->darkness = 0;*/
2602 EXTEND (SP, 3);
2218 2603
2219 for (z = 0; z <= 2; z++) 2604 for (z = 0; z <= 2; z++)
2220 { 2605 {
2221 tileid t = tile [z]; 2606 tileid t = tile [z];
2222 2607
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2608 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2609 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2610 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2611 need_texid (self, t);
2227 } 2612 }
2228 2613
2229 cell->tile [z] = t; 2614 cell->tile [z] = t;
2230 } 2615 }
2232 } 2617 }
2233 } 2618 }
2234 } 2619 }
2235} 2620}
2236 2621
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2622MODULE = Deliantra::Client PACKAGE = DC::RW
2238 2623
2239PROTOTYPES: DISABLE 2624DC::RW
2240 2625new (SV *class, SV *data_sv)
2241CFPlus::MixChunk
2242new_from_file (SV *class, char *path)
2243 CODE: 2626 CODE:
2244 RETVAL = Mix_LoadWAV (path); 2627{
2628 STRLEN datalen;
2629 char *data = SvPVbyte (data_sv, datalen);
2630
2631 RETVAL = SDL_RWFromConstMem (data, datalen);
2632}
2245 OUTPUT: 2633 OUTPUT:
2246 RETVAL 2634 RETVAL
2247 2635
2636DC::RW
2637new_from_file (SV *class, const char *path, const char *mode = "rb")
2638 CODE:
2639 RETVAL = SDL_RWFromFile (path, mode);
2640 OUTPUT:
2641 RETVAL
2642
2643# fails on win32:
2644# dc.xs(2268) : error C2059: syntax error : '('
2248void 2645#void
2646#close (DC::RW self)
2647# CODE:
2648# (self->(close)) (self);
2649
2650MODULE = Deliantra::Client PACKAGE = DC::Channel
2651
2652PROTOTYPES: DISABLE
2653
2654DC::Channel
2655find ()
2656 CODE:
2657{
2658 RETVAL = Mix_GroupAvailable (-1);
2659
2660 if (RETVAL < 0)
2661 {
2662 RETVAL = Mix_GroupOldest (-1);
2663
2664 if (RETVAL < 0)
2665 XSRETURN_UNDEF;
2666
2667 Mix_HaltChannel (RETVAL);
2668 }
2669
2670 Mix_UnregisterAllEffects (RETVAL);
2671 Mix_Volume (RETVAL, 128);
2672}
2673 OUTPUT:
2674 RETVAL
2675
2676void
2677halt (DC::Channel self)
2678 CODE:
2679 Mix_HaltChannel (self);
2680
2681void
2682expire (DC::Channel self, int ticks = -1)
2683 CODE:
2684 Mix_ExpireChannel (self, ticks);
2685
2686void
2687fade_out (DC::Channel self, int ticks = -1)
2688 CODE:
2689 Mix_FadeOutChannel (self, ticks);
2690
2691int
2692volume (DC::Channel self, int volume)
2693 CODE:
2694 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2695 OUTPUT:
2696 RETVAL
2697
2698void
2699unregister_all_effects (DC::Channel self)
2700 CODE:
2701 Mix_UnregisterAllEffects (self);
2702
2703void
2704set_panning (DC::Channel self, int left, int right)
2705 CODE:
2706 left = CLAMP (left , 0, 255);
2707 right = CLAMP (right, 0, 255);
2708 Mix_SetPanning (self, left, right);
2709
2710void
2711set_distance (DC::Channel self, int distance)
2712 CODE:
2713 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2714
2715void
2716set_position (DC::Channel self, int angle, int distance)
2717 CODE:
2718
2719void
2720set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2721 CODE:
2722{
2723 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2724 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2725 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2726}
2727
2728void
2729set_reverse_stereo (DC::Channel self, int flip)
2730 CODE:
2731 Mix_SetReverseStereo (self, flip);
2732
2733MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2734
2735PROTOTYPES: DISABLE
2736
2737DC::MixChunk
2738new (SV *class, DC::RW rwops)
2739 CODE:
2740 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2741 OUTPUT:
2742 RETVAL
2743
2744void
2249DESTROY (CFPlus::MixChunk self) 2745DESTROY (DC::MixChunk self)
2250 CODE: 2746 CODE:
2251 Mix_FreeChunk (self); 2747 Mix_FreeChunk (self);
2252 2748
2253int 2749int
2254volume (CFPlus::MixChunk self, int volume = -1) 2750volume (DC::MixChunk self, int volume = -1)
2255 CODE: 2751 CODE:
2752 if (items > 1)
2753 volume = CLAMP (volume, 0, 128);
2256 RETVAL = Mix_VolumeChunk (self, volume); 2754 RETVAL = Mix_VolumeChunk (self, volume);
2257 OUTPUT: 2755 OUTPUT:
2258 RETVAL 2756 RETVAL
2259 2757
2260int 2758DC::Channel
2261play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2759play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2262 CODE: 2760 CODE:
2761{
2263 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2762 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2763
2764 if (RETVAL < 0)
2765 XSRETURN_UNDEF;
2766
2767 if (channel < 0)
2768 {
2769 Mix_UnregisterAllEffects (RETVAL);
2770 Mix_Volume (RETVAL, 128);
2771 }
2772}
2264 OUTPUT: 2773 OUTPUT:
2265 RETVAL 2774 RETVAL
2266 2775
2267MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2776MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2268 2777
2269int 2778int
2270volume (int volume = -1) 2779volume (int volume = -1)
2271 PROTOTYPE: ;$ 2780 PROTOTYPE: ;$
2272 CODE: 2781 CODE:
2782 if (items > 0)
2783 volume = CLAMP (volume, 0, 128);
2273 RETVAL = Mix_VolumeMusic (volume); 2784 RETVAL = Mix_VolumeMusic (volume);
2274 OUTPUT: 2785 OUTPUT:
2275 RETVAL 2786 RETVAL
2276 2787
2277int 2788void
2278fade_out (int ms) 2789fade_out (int ms)
2279 CODE: 2790 CODE:
2280 RETVAL = Mix_FadeOutMusic (ms); 2791 Mix_FadeOutMusic (ms);
2792
2793void
2794halt ()
2795 CODE:
2796 Mix_HaltMusic ();
2797
2798DC::MixMusic
2799new (SV *class, DC::RW rwops)
2800 CODE:
2801 RETVAL = Mix_LoadMUS_RW (rwops);
2281 OUTPUT: 2802 OUTPUT:
2282 RETVAL 2803 RETVAL
2283 2804
2284CFPlus::MixMusic
2285new_from_file (SV *class, char *path)
2286 CODE:
2287 RETVAL = Mix_LoadMUS (path);
2288 OUTPUT:
2289 RETVAL
2290
2291void 2805void
2292DESTROY (CFPlus::MixMusic self) 2806DESTROY (DC::MixMusic self)
2293 CODE: 2807 CODE:
2294 Mix_FreeMusic (self); 2808 Mix_FreeMusic (self);
2295 2809
2296int 2810int
2297play (CFPlus::MixMusic self, int loops = -1) 2811play (DC::MixMusic self, int loops = -1)
2298 CODE: 2812 CODE:
2299 RETVAL = Mix_PlayMusic (self, loops); 2813 RETVAL = Mix_PlayMusic (self, loops);
2300 OUTPUT: 2814 OUTPUT:
2301 RETVAL 2815 RETVAL
2302 2816
2303int 2817void
2304fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2818fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2305 CODE: 2819 CODE:
2306 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2820 Mix_FadeInMusicPos (self, loops, ms, position);
2307 OUTPUT:
2308 RETVAL
2309 2821
2310MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2822MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2311 2823
2312PROTOTYPES: ENABLE 2824PROTOTYPES: ENABLE
2313 2825
2314BOOT: 2826BOOT:
2315{ 2827{
2316 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2828 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2317 static const struct { 2829 static const struct {
2318 const char *name; 2830 const char *name;
2319 IV iv; 2831 IV iv;
2320 } *civ, const_iv[] = { 2832 } *civ, const_iv[] = {
2321# define const_iv(name) { # name, (IV)name } 2833# define const_iv(name) { # name, (IV)name }
2356 const_iv (GL_INTENSITY), 2868 const_iv (GL_INTENSITY),
2357 const_iv (GL_LUMINANCE), 2869 const_iv (GL_LUMINANCE),
2358 const_iv (GL_LUMINANCE_ALPHA), 2870 const_iv (GL_LUMINANCE_ALPHA),
2359 const_iv (GL_FLOAT), 2871 const_iv (GL_FLOAT),
2360 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2872 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2873 const_iv (GL_COMPRESSED_ALPHA_ARB),
2874 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2875 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2876 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2877 const_iv (GL_COMPRESSED_RGB_ARB),
2878 const_iv (GL_COMPRESSED_RGBA_ARB),
2361 const_iv (GL_COMPILE), 2879 const_iv (GL_COMPILE),
2362 const_iv (GL_PROXY_TEXTURE_1D), 2880 const_iv (GL_PROXY_TEXTURE_1D),
2363 const_iv (GL_PROXY_TEXTURE_2D), 2881 const_iv (GL_PROXY_TEXTURE_2D),
2364 const_iv (GL_TEXTURE_1D), 2882 const_iv (GL_TEXTURE_1D),
2365 const_iv (GL_TEXTURE_2D), 2883 const_iv (GL_TEXTURE_2D),
2404 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2922 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405 const_iv (GL_POINT_SMOOTH_HINT), 2923 const_iv (GL_POINT_SMOOTH_HINT),
2406 const_iv (GL_LINE_SMOOTH_HINT), 2924 const_iv (GL_LINE_SMOOTH_HINT),
2407 const_iv (GL_POLYGON_SMOOTH_HINT), 2925 const_iv (GL_POLYGON_SMOOTH_HINT),
2408 const_iv (GL_GENERATE_MIPMAP_HINT), 2926 const_iv (GL_GENERATE_MIPMAP_HINT),
2927 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409 const_iv (GL_FASTEST), 2928 const_iv (GL_FASTEST),
2410 const_iv (GL_DONT_CARE), 2929 const_iv (GL_DONT_CARE),
2411 const_iv (GL_NICEST), 2930 const_iv (GL_NICEST),
2412 const_iv (GL_V2F), 2931 const_iv (GL_V2F),
2413 const_iv (GL_V3F), 2932 const_iv (GL_V3F),
2421 2940
2422 texture_av = newAV (); 2941 texture_av = newAV ();
2423 AvREAL_off (texture_av); 2942 AvREAL_off (texture_av);
2424} 2943}
2425 2944
2945void
2946disable_GL_EXT_blend_func_separate ()
2947 CODE:
2948 gl.BlendFuncSeparate = 0;
2949 gl.BlendFuncSeparateEXT = 0;
2950
2426char * 2951char *
2427gl_vendor () 2952gl_vendor ()
2428 CODE: 2953 CODE:
2429 RETVAL = (char *)glGetString (GL_VENDOR); 2954 RETVAL = (char *)glGetString (GL_VENDOR);
2430 OUTPUT: 2955 OUTPUT:
2522void glRotate (float angle, float x, float y, float z) 3047void glRotate (float angle, float x, float y, float z)
2523 CODE: 3048 CODE:
2524 glRotatef (angle, x, y, z); 3049 glRotatef (angle, x, y, z);
2525 3050
2526void glColor (float r, float g, float b, float a = 1.0) 3051void glColor (float r, float g, float b, float a = 1.0)
3052 PROTOTYPE: @
2527 ALIAS: 3053 ALIAS:
2528 glColor_premultiply = 1 3054 glColor_premultiply = 1
2529 CODE: 3055 CODE:
2530 if (ix) 3056 if (ix)
2531 { 3057 {
2547 3073
2548void glTexCoord (float s, float t) 3074void glTexCoord (float s, float t)
2549 CODE: 3075 CODE:
2550 glTexCoord2f (s, t); 3076 glTexCoord2f (s, t);
2551 3077
3078void glRect (float x1, float y1, float x2, float y2)
3079 CODE:
3080 glRectf (x1, y1, x2, y2);
3081
3082void glRect_lineloop (float x1, float y1, float x2, float y2)
3083 CODE:
3084 glBegin (GL_LINE_LOOP);
3085 glVertex2f (x1, y1);
3086 glVertex2f (x2, y1);
3087 glVertex2f (x2, y2);
3088 glVertex2f (x1, y2);
3089 glEnd ();
3090
2552PROTOTYPES: ENABLE 3091PROTOTYPES: ENABLE
2553 3092
2554void glBegin (int mode) 3093void glBegin (int mode)
2555 3094
2556void glEnd () 3095void glEnd ()
2588void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3127void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2589 CODE: 3128 CODE:
2590 if (gl.SeparableFilter2D) 3129 if (gl.SeparableFilter2D)
2591 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3130 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2592 3131
2593void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3132void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2594 3133
2595void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3134void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2596 3135
2597void glDrawPixels (int width, int height, int format, int type, char *pixels) 3136void glDrawPixels (int width, int height, int format, int type, char *pixels)
2598 3137
2624 3163
2625void glEndList () 3164void glEndList ()
2626 3165
2627void glCallList (int list) 3166void glCallList (int list)
2628 3167
2629MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3168MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2630 3169
2631PROTOTYPES: DISABLE 3170PROTOTYPES: DISABLE
2632 3171
2633void 3172void
2634find_widget (SV *self, NV x, NV y) 3173find_widget (SV *self, NV x, NV y)
2638 XPUSHs (self); 3177 XPUSHs (self);
2639} 3178}
2640 3179
2641BOOT: 3180BOOT:
2642{ 3181{
2643 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3182 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2644 3183
2645 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3184 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2646 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3185 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2647 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3186 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2648 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3187 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2649} 3188}
2650 3189
2651void 3190void
2652draw (SV *self) 3191draw (SV *self)
2653 CODE: 3192 CODE:
2657 NV x, y, w, h; 3196 NV x, y, w, h;
2658 SV *draw_x_sv = GvSV (draw_x_gv); 3197 SV *draw_x_sv = GvSV (draw_x_gv);
2659 SV *draw_y_sv = GvSV (draw_y_gv); 3198 SV *draw_y_sv = GvSV (draw_y_gv);
2660 SV *draw_w_sv = GvSV (draw_w_gv); 3199 SV *draw_w_sv = GvSV (draw_w_gv);
2661 SV *draw_h_sv = GvSV (draw_h_gv); 3200 SV *draw_h_sv = GvSV (draw_h_gv);
2662 SV *hover;
2663 double draw_x, draw_y, draw_w, draw_h; 3201 double draw_x, draw_y;
2664 3202
2665 if (!SvROK (self)) 3203 if (!SvROK (self))
2666 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3204 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2667 3205
2668 hv = (HV *)SvRV (self); 3206 hv = (HV *)SvRV (self);
2669 3207
2670 if (SvTYPE (hv) != SVt_PVHV) 3208 if (SvTYPE (hv) != SVt_PVHV)
2671 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3209 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2672 3210
2673 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3211 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2674 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3212 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2675 3213
2676 if (!h || !w) 3214 if (!h || !w)
2696 { 3234 {
2697 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3235 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2698 3236
2699 if (svp && SvTRUE (*svp)) 3237 if (svp && SvTRUE (*svp))
2700 { 3238 {
2701 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3239 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2702 glEnable (GL_BLEND); 3240 glEnable (GL_BLEND);
2703 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3241 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2704 glBegin (GL_QUADS); 3242 glBegin (GL_QUADS);
2705 glVertex2f (0, 0); 3243 glVertex2f (0, 0);
2706 glVertex2f (w, 0); 3244 glVertex2f (w, 0);
2709 glEnd (); 3247 glEnd ();
2710 glDisable (GL_BLEND); 3248 glDisable (GL_BLEND);
2711 } 3249 }
2712 } 3250 }
2713#if 0 3251#if 0
2714 if ($ENV{CFPLUS_DEBUG} & 1) { 3252 // draw borders, for debugging
2715 glPushMatrix; 3253 glPushMatrix ();
2716 glColor 1, 1, 0, 1; 3254 glColor4f (1., 1., 0., 1.);
2717 glTranslate 0.375, 0.375; 3255 glTranslatef (.5, .5, 0.);
2718 glBegin GL_LINE_LOOP; 3256 glBegin (GL_LINE_LOOP);
2719 glVertex 0 , 0; 3257 glVertex2f (0 , 0);
2720 glVertex $self->{w} - 1, 0; 3258 glVertex2f (w - 1, 0);
2721 glVertex $self->{w} - 1, $self->{h} - 1; 3259 glVertex2f (w - 1, h - 1);
2722 glVertex 0 , $self->{h} - 1; 3260 glVertex2f (0 , h - 1);
2723 glEnd; 3261 glEnd ();
2724 glPopMatrix; 3262 glPopMatrix ();
2725 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2726 }
2727#endif 3263#endif
2728 PUSHMARK (SP); 3264 PUSHMARK (SP);
2729 XPUSHs (self); 3265 XPUSHs (self);
2730 PUTBACK; 3266 PUTBACK;
2731 call_method ("_draw", G_VOID | G_DISCARD); 3267 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines