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.275 by root, Thu Aug 28 00:53:53 2008 UTC

… …
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
27#include <stdio.h> 32#include <stdio.h>
28#include <stdlib.h> 33#include <stdlib.h>
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 32
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
64# define PARACHUTE 0
65#endif
66 95
67static AV *texture_av; 96static AV *texture_av;
68 97
69static struct 98static struct
70{ 99{
… …
107 av_push (texture_av, (SV *)(size_t)name); 136 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 137 glDeleteTextures (1, &name);
109} 138}
110 139
111#include "texcache.c" 140#include "texcache.c"
141#include "rendercache.c"
112 142
113#include "pango-font.c" 143#include "pango-font.c"
114#include "pango-fontmap.c" 144#include "pango-fontmap.c"
115#include "pango-render.c" 145#include "pango-render.c"
116 146
147typedef IV DC__Channel;
148typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 149typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 150typedef Mix_Music *DC__MixMusic;
119 151
120typedef PangoFontDescription *CFPlus__Font; 152typedef PangoFontDescription *DC__Font;
121 153
122static int 154static int
123shape_attr_p (PangoLayoutRun *run) 155shape_attr_p (PangoLayoutRun *run)
124{ 156{
125 GSList *attrs = run->item->analysis.extra_attrs; 157 GSList *attrs = run->item->analysis.extra_attrs;
… …
139 171
140typedef struct cf_layout { 172typedef struct cf_layout {
141 PangoLayout *pl; 173 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 174 float r, g, b, a; // default color for rgba mode
143 int base_height; 175 int base_height;
144 CFPlus__Font font; 176 DC__Font font;
177 rc_t *rc;
145} *CFPlus__Layout; 178} *DC__Layout;
146 179
147static CFPlus__Font default_font; 180static DC__Font default_font;
148static PangoContext *opengl_context; 181static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 182static PangoFontMap *opengl_fontmap;
150 183
151static void 184static void
152substitute_func (FcPattern *pattern, gpointer data) 185substitute_func (FcPattern *pattern, gpointer data)
… …
157#endif 190#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 191 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 192}
160 193
161static void 194static void
162layout_update_font (CFPlus__Layout self) 195layout_update_font (DC__Layout self)
163{ 196{
164 /* use a random scale factor to account for unknown descenders, 0.8 works 197 /* use a random scale factor to account for unknown descenders, 0.8 works
165 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
166 */ 199 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
168 201
169 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 204
172 pango_layout_set_font_description (self->pl, font); 205 pango_layout_set_font_description (self->pl, font);
173} 206}
174 207
175static void 208static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 209layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 210{
178 PangoRectangle rect; 211 PangoRectangle rect;
179 212
180 // get_pixel_* wrongly rounds down 213 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 214 pango_layout_get_extents (self->pl, 0, &rect);
… …
192 225
193typedef uint16_t tileid; 226typedef uint16_t tileid;
194typedef uint16_t faceid; 227typedef uint16_t faceid;
195 228
196typedef struct { 229typedef struct {
197 int name; 230 GLuint name;
198 int w, h; 231 int w, h;
199 float s, t; 232 float s, t;
200 uint8_t r, g, b, a; 233 uint8_t r, g, b, a;
201 tileid smoothtile; 234 tileid smoothtile;
202 uint8_t smoothlevel; 235 uint8_t smoothlevel;
… …
220 int faces; tileid *face2tile; // [faceid] 253 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 254 int texs; maptex *tex; // [tileid]
222 255
223 int32_t rows; 256 int32_t rows;
224 maprow *row; 257 maprow *row;
225} *CFPlus__Map; 258} *DC__Map;
226 259
227static char * 260static char *
228prepend (char *ptr, int sze, int inc) 261prepend (char *ptr, int sze, int inc)
229{ 262{
230 char *p; 263 char *p;
… …
268 self->texs *= 2; 301 self->texs *= 2;
269 } 302 }
270} 303}
271 304
272static maprow * 305static maprow *
273map_get_row (CFPlus__Map self, int y) 306map_get_row (DC__Map self, int y)
274{ 307{
275 if (0 > y) 308 if (0 > y)
276 { 309 {
277 int extend = - y + MAP_EXTEND_Y; 310 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 311 Prepend (maprow, self->row, self->rows, extend);
… …
316 349
317 return row->col + (x - row->c0); 350 return row->col + (x - row->c0);
318} 351}
319 352
320static mapcell * 353static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 354map_get_cell (DC__Map self, int x, int y)
322{ 355{
323 return row_get_cell (map_get_row (self, y), x); 356 return row_get_cell (map_get_row (self, y), x);
324} 357}
325 358
326static void 359static void
327map_clear (CFPlus__Map self) 360map_clear (DC__Map self)
328{ 361{
329 int r; 362 int r;
330 363
331 for (r = 0; r < self->rows; r++) 364 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 365 Safefree (self->row[r].col);
… …
339 self->oy = 0; 372 self->oy = 0;
340 self->row = 0; 373 self->row = 0;
341 self->rows = 0; 374 self->rows = 0;
342} 375}
343 376
377#define CELL_CLEAR(cell) \
378 do { \
379 if ((cell)->player) \
380 (cell)->tile [2] = 0; \
381 (cell)->darkness = 0; \
382 (cell)->stat_hp = 0; \
383 (cell)->flags = 0; \
384 (cell)->player = 0; \
385 } while (0)
386
344static void 387static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 388map_blank (DC__Map self, int x0, int y0, int w, int h)
346{ 389{
347 int x, y; 390 int x, y;
348 maprow *row; 391 maprow *row;
349 mapcell *cell; 392 mapcell *cell;
350 393
… …
362 if (x >= row->c1) 405 if (x >= row->c1)
363 break; 406 break;
364 407
365 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
366 409
367 cell->darkness = 0; 410 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 411 }
372 } 412 }
373} 413}
374 414
375typedef struct { 415typedef struct {
… …
429 n |= n >> 16; 469 n |= n >> 16;
430 470
431 return n + 1; 471 return n + 1;
432} 472}
433 473
474static unsigned int
475popcount (unsigned int n)
476{
477 n -= (n >> 1) & 0x55555555U;
478 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
479 n = ((n >> 4) + n) & 0x0f0f0f0fU;
480 n *= 0x01010101U;
481
482 return n >> 24;
483}
484
434/* SDL should provide this, really. */ 485/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 486#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 487#define SDLK_MODIFIER_MAX 314
437 488
438MODULE = CFPlus PACKAGE = CFPlus 489/******************************************************************************/
490
491static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
492static GV *hover_gv;
493
494static int
495within_widget (SV *widget, NV x, NV y)
496{
497 HV *self;
498 SV **svp;
499 NV wx, ww, wy, wh;
500
501 if (!SvROK (widget))
502 return 0;
503
504 self = (HV *)SvRV (widget);
505
506 if (SvTYPE (self) != SVt_PVHV)
507 return 0;
508
509 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
510 if (y < wy)
511 return 0;
512
513 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
514 if (y >= wy + wh)
515 return 0;
516
517 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
518 if (x < wx)
519 return 0;
520
521 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
522 if (x >= wx + ww)
523 return 0;
524
525 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
526 if (!svp || !SvTRUE (*svp))
527 return 0;
528
529 return 1;
530}
531
532static void
533deliantra_main ()
534{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537}
538
539#ifdef __MACOSX__
540 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back.
545 */
546 extern C_LINKAGE int
547 main (int argc, char *argv[])
548 {
549 deliantra_main ();
550 }
551
552 #undef main
553
554 extern C_LINKAGE int main (int argc, char *argv[]);
555
556 static void
557 SDL_braino (void)
558 {
559 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv);
561 }
562#else
563 static void
564 SDL_braino (void)
565 {
566 deliantra_main ();
567 }
568#endif
569
570MODULE = Deliantra::Client PACKAGE = DC
439 571
440PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
441 573
442BOOT: 574BOOT:
443{ 575{
444 HV *stash = gv_stashpv ("CFPlus", 1); 576 HV *stash = gv_stashpv ("DC", 1);
445 static const struct { 577 static const struct {
446 const char *name; 578 const char *name;
447 IV iv; 579 IV iv;
448 } *civ, const_iv[] = { 580 } *civ, const_iv[] = {
449# define const_iv(name) { # name, (IV)name } 581# define const_iv(name) { # name, (IV)name }
… …
471 603
472 const_iv (SDL_APPINPUTFOCUS), 604 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS), 605 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE), 606 const_iv (SDL_APPACTIVE),
475 607
608
609 const_iv (SDLK_UNKNOWN),
610 const_iv (SDLK_FIRST),
611 const_iv (SDLK_BACKSPACE),
612 const_iv (SDLK_TAB),
613 const_iv (SDLK_CLEAR),
614 const_iv (SDLK_RETURN),
615 const_iv (SDLK_PAUSE),
616 const_iv (SDLK_ESCAPE),
617 const_iv (SDLK_SPACE),
618 const_iv (SDLK_EXCLAIM),
619 const_iv (SDLK_QUOTEDBL),
620 const_iv (SDLK_HASH),
621 const_iv (SDLK_DOLLAR),
622 const_iv (SDLK_AMPERSAND),
623 const_iv (SDLK_QUOTE),
624 const_iv (SDLK_LEFTPAREN),
625 const_iv (SDLK_RIGHTPAREN),
626 const_iv (SDLK_ASTERISK),
627 const_iv (SDLK_PLUS),
628 const_iv (SDLK_COMMA),
629 const_iv (SDLK_MINUS),
630 const_iv (SDLK_PERIOD),
631 const_iv (SDLK_SLASH),
632 const_iv (SDLK_0),
633 const_iv (SDLK_1),
634 const_iv (SDLK_2),
635 const_iv (SDLK_3),
636 const_iv (SDLK_4),
637 const_iv (SDLK_5),
638 const_iv (SDLK_6),
639 const_iv (SDLK_7),
640 const_iv (SDLK_8),
641 const_iv (SDLK_9),
642 const_iv (SDLK_COLON),
643 const_iv (SDLK_SEMICOLON),
644 const_iv (SDLK_LESS),
645 const_iv (SDLK_EQUALS),
646 const_iv (SDLK_GREATER),
647 const_iv (SDLK_QUESTION),
648 const_iv (SDLK_AT),
649
650 const_iv (SDLK_LEFTBRACKET),
651 const_iv (SDLK_BACKSLASH),
652 const_iv (SDLK_RIGHTBRACKET),
653 const_iv (SDLK_CARET),
654 const_iv (SDLK_UNDERSCORE),
655 const_iv (SDLK_BACKQUOTE),
656 const_iv (SDLK_DELETE),
657
658 const_iv (SDLK_FIRST),
659 const_iv (SDLK_LAST),
476 const_iv (SDLK_KP0), 660 const_iv (SDLK_KP0),
477 const_iv (SDLK_KP1), 661 const_iv (SDLK_KP1),
478 const_iv (SDLK_KP2), 662 const_iv (SDLK_KP2),
479 const_iv (SDLK_KP3), 663 const_iv (SDLK_KP3),
480 const_iv (SDLK_KP4), 664 const_iv (SDLK_KP4),
… …
552 const_iv (KMOD_LMETA), 736 const_iv (KMOD_LMETA),
553 const_iv (KMOD_RMETA), 737 const_iv (KMOD_RMETA),
554 const_iv (KMOD_NUM), 738 const_iv (KMOD_NUM),
555 const_iv (KMOD_CAPS), 739 const_iv (KMOD_CAPS),
556 const_iv (KMOD_MODE), 740 const_iv (KMOD_MODE),
741
742 const_iv (MIX_DEFAULT_FORMAT),
743
744 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO),
747 const_iv (SDL_INIT_CDROM),
748 const_iv (SDL_INIT_JOYSTICK),
749 const_iv (SDL_INIT_EVERYTHING),
750 const_iv (SDL_INIT_NOPARACHUTE),
751 const_iv (SDL_INIT_EVENTTHREAD),
752
753 const_iv (SDL_GL_RED_SIZE),
754 const_iv (SDL_GL_GREEN_SIZE),
755 const_iv (SDL_GL_BLUE_SIZE),
756 const_iv (SDL_GL_ALPHA_SIZE),
757 const_iv (SDL_GL_DOUBLEBUFFER),
758 const_iv (SDL_GL_BUFFER_SIZE),
759 const_iv (SDL_GL_DEPTH_SIZE),
760 const_iv (SDL_GL_STENCIL_SIZE),
761 const_iv (SDL_GL_ACCUM_RED_SIZE),
762 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
763 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
764 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
765 const_iv (SDL_GL_STEREO),
766 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
767 const_iv (SDL_GL_MULTISAMPLESAMPLES),
768 const_iv (SDL_GL_ACCELERATED_VISUAL),
769 const_iv (SDL_GL_SWAP_CONTROL),
770
771 const_iv (FOW_DARKNESS)
557# undef const_iv 772# undef const_iv
558 }; 773 };
559 774
560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 775 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
579 794
580NV floor (NV x) 795NV floor (NV x)
581 796
582NV ceil (NV x) 797NV ceil (NV x)
583 798
799IV minpot (UV n)
800
801IV popcount (UV n)
802
584void 803void
585pango_init () 804pango_init ()
586 CODE: 805 CODE:
587{ 806{
588 opengl_fontmap = pango_opengl_font_map_new (); 807 opengl_fontmap = pango_opengl_font_map_new ();
589 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 808 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 809 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
810 /*pango_context_set_font_description (opengl_context, default_font);*/
811#if PANGO_VERSION_CHECK (1, 15, 2)
812 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
813 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
814#endif
591} 815}
592 816
593char *
594SDL_GetError () 817char *SDL_GetError ()
595 818
596int 819void SDL_braino ()
597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
598 820
599void 821int SDL_Init (U32 flags)
822
823int SDL_InitSubSystem (U32 flags)
824
825void SDL_QuitSubSystem (U32 flags)
826
600SDL_Quit () 827void SDL_Quit ()
828
829int SDL_GL_SetAttribute (int attr, int value)
830
831int SDL_GL_GetAttribute (int attr)
832 CODE:
833 if (SDL_GL_GetAttribute (attr, &RETVAL))
834 XSRETURN_UNDEF;
835 OUTPUT:
836 RETVAL
601 837
602void 838void
603SDL_ListModes (int rgb, int alpha) 839SDL_ListModes (int rgb, int alpha)
604 PPCODE: 840 PPCODE:
605{ 841{
… …
617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 853 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 854 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 855 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
620 856
621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 857 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); 858 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
625#endif
626 859
627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 860 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
628 861
629 if (m && m != (SDL_Rect **)-1) 862 if (m && m != (SDL_Rect **)-1)
630 while (*m) 863 while (*m)
631 { 864 {
632 if ((*m)->w >= 640 && (*m)->h >= 480) 865 if ((*m)->w >= 400 && (*m)->h >= 300)
633 { 866 {
634 AV *av = newAV (); 867 AV *av = newAV ();
635 av_push (av, newSViv ((*m)->w)); 868 av_push (av, newSViv ((*m)->w));
636 av_push (av, newSViv ((*m)->h)); 869 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb)); 870 av_push (av, newSViv (rgb));
… …
661 894
662 if (RETVAL) 895 if (RETVAL)
663 { 896 {
664 av_clear (texture_av); 897 av_clear (texture_av);
665 898
666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 899 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
667#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 900#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
668#include "glfunc.h" 901#include "glfunc.h"
669#undef GL_FUNC 902#undef GL_FUNC
670 } 903 }
671} 904}
… …
678char * 911char *
679SDL_GetKeyName (int sym) 912SDL_GetKeyName (int sym)
680 913
681int 914int
682SDL_GetAppState () 915SDL_GetAppState ()
916
917int
918SDL_GetModState ()
683 919
684void 920void
685poll_events () 921poll_events ()
686 PPCODE: 922 PPCODE:
687{ 923{
… …
697 { 933 {
698 case SDL_KEYDOWN: 934 case SDL_KEYDOWN:
699 case SDL_KEYUP: 935 case SDL_KEYUP:
700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
702 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 938 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
703 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 939 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 940 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
705 break; 941 break;
706 942
707 case SDL_ACTIVEEVENT: 943 case SDL_ACTIVEEVENT:
708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
726 x = ev.motion.x; 962 x = ev.motion.x;
727 y = ev.motion.y; 963 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 } 965 }
730 966
731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
732 hv_store (hv, "state", 5, newSViv (state), 0); 968 hv_store (hv, "state", 5, newSViv (state), 0);
733 hv_store (hv, "x", 1, newSViv (x), 0); 969 hv_store (hv, "x", 1, newSViv (x), 0);
734 hv_store (hv, "y", 1, newSViv (y), 0); 970 hv_store (hv, "y", 1, newSViv (y), 0);
735 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 971 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
736 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 972 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 } 973 }
738 break; 974 break;
739 975
740 case SDL_MOUSEBUTTONDOWN: 976 case SDL_MOUSEBUTTONDOWN:
741 case SDL_MOUSEBUTTONUP: 977 case SDL_MOUSEBUTTONUP:
742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 978 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
743 979
744 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 980 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
745 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 981 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
746 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 982 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
747 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 983 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
752 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 988 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
753 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 989 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
754 break; 990 break;
755 } 991 }
756 992
757 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 993 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
758 } 994 }
759} 995}
760 996
761int 997int
762Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 998Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
763 POSTCALL: 999 POSTCALL:
764 Mix_HookMusicFinished (music_finished); 1000 Mix_HookMusicFinished (music_finished);
765 Mix_ChannelFinished (channel_finished); 1001 Mix_ChannelFinished (channel_finished);
766 1002
767void 1003void
1004Mix_QuerySpec ()
1005 PPCODE:
1006{
1007 int freq, channels;
1008 Uint16 format;
1009
1010 if (Mix_QuerySpec (&freq, &format, &channels))
1011 {
1012 EXTEND (SP, 3);
1013 PUSHs (sv_2mortal (newSViv (freq)));
1014 PUSHs (sv_2mortal (newSViv (format)));
1015 PUSHs (sv_2mortal (newSViv (channels)));
1016 }
1017}
1018
1019void
768Mix_CloseAudio () 1020Mix_CloseAudio ()
769 1021
770int 1022int
771Mix_AllocateChannels (int numchans = -1) 1023Mix_AllocateChannels (int numchans = -1)
1024
1025const char *
1026Mix_GetError ()
772 1027
773void 1028void
774lowdelay (int fd, int val = 1) 1029lowdelay (int fd, int val = 1)
775 CODE: 1030 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1031 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
802 } 1057 }
803 } 1058 }
804#endif 1059#endif
805} 1060}
806 1061
807void 1062int
808add_font (char *file) 1063add_font (char *file)
809 CODE: 1064 CODE:
810 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT:
1067 RETVAL
811 1068
812void 1069void
813load_image_inline (SV *image_) 1070load_image_inline (SV *image_)
814 ALIAS: 1071 ALIAS:
815 load_image_file = 1 1072 load_image_file = 1
… …
818 STRLEN image_len; 1075 STRLEN image_len;
819 char *image = (char *)SvPVbyte (image_, image_len); 1076 char *image = (char *)SvPVbyte (image_, image_len);
820 SDL_Surface *surface, *surface2; 1077 SDL_Surface *surface, *surface2;
821 SDL_PixelFormat fmt; 1078 SDL_PixelFormat fmt;
822 SDL_RWops *rw = ix 1079 SDL_RWops *rw = ix
823 ? SDL_RWFromFile (image, "r") 1080 ? SDL_RWFromFile (image, "rb")
824 : SDL_RWFromConstMem (image, image_len); 1081 : SDL_RWFromConstMem (image, image_len);
825 1082
826 if (!rw) 1083 if (!rw)
827 croak ("load_image: %s", SDL_GetError ()); 1084 croak ("load_image: %s", SDL_GetError ());
828 1085
… …
901void 1158void
902error (char *message) 1159error (char *message)
903 CODE: 1160 CODE:
904 fprintf (stderr, "ERROR: %s\n", message); 1161 fprintf (stderr, "ERROR: %s\n", message);
905#ifdef _WIN32 1162#ifdef _WIN32
906 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1163 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
907#endif 1164#endif
908 1165
909void 1166void
910fatal (char *message) 1167fatal (char *message)
911 CODE: 1168 CODE:
912 fprintf (stderr, "FATAL: %s\n", message); 1169 fprintf (stderr, "FATAL: %s\n", message);
913#ifdef _WIN32 1170#ifdef _WIN32
914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1171 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
915#endif 1172#endif
916 _exit (1); 1173 _exit (1);
917 1174
918void 1175void
919_exit (int retval = 0) 1176_exit (int retval = 0)
… …
931#if DEBUG 1188#if DEBUG
932 VALGRIND_DO_LEAK_CHECK; 1189 VALGRIND_DO_LEAK_CHECK;
933#endif 1190#endif
934} 1191}
935 1192
936MODULE = CFPlus PACKAGE = CFPlus::Font 1193MODULE = Deliantra::Client PACKAGE = DC::Font
937 1194
938CFPlus::Font 1195PROTOTYPES: DISABLE
1196
1197DC::Font
939new_from_file (SV *class, char *path, int id = 0) 1198new_from_file (SV *class, char *path, int id = 0)
940 CODE: 1199 CODE:
941{ 1200{
942 int count; 1201 int count;
943 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1202 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
946} 1205}
947 OUTPUT: 1206 OUTPUT:
948 RETVAL 1207 RETVAL
949 1208
950void 1209void
951DESTROY (CFPlus::Font self) 1210DESTROY (DC::Font self)
952 CODE: 1211 CODE:
953 pango_font_description_free (self); 1212 pango_font_description_free (self);
954 1213
955void 1214void
956make_default (CFPlus::Font self) 1215make_default (DC::Font self)
1216 PROTOTYPE: $
957 CODE: 1217 CODE:
958 default_font = self; 1218 default_font = self;
959 1219
960MODULE = CFPlus PACKAGE = CFPlus::Layout 1220MODULE = Deliantra::Client PACKAGE = DC::Layout
961 1221
1222PROTOTYPES: DISABLE
1223
962void 1224void
963reset_glyph_cache () 1225glyph_cache_backup ()
1226 PROTOTYPE:
964 CODE: 1227 CODE:
1228 tc_backup ();
1229
1230void
1231glyph_cache_restore ()
1232 PROTOTYPE:
1233 CODE:
965 tc_clear (); 1234 tc_restore ();
966 1235
967CFPlus::Layout 1236DC::Layout
968new (SV *class) 1237new (SV *class)
969 CODE: 1238 CODE:
970 New (0, RETVAL, 1, struct cf_layout); 1239 New (0, RETVAL, 1, struct cf_layout);
971 1240
972 RETVAL->pl = pango_layout_new (opengl_context); 1241 RETVAL->pl = pango_layout_new (opengl_context);
… …
974 RETVAL->g = 1.; 1243 RETVAL->g = 1.;
975 RETVAL->b = 1.; 1244 RETVAL->b = 1.;
976 RETVAL->a = 1.; 1245 RETVAL->a = 1.;
977 RETVAL->base_height = MIN_FONT_HEIGHT; 1246 RETVAL->base_height = MIN_FONT_HEIGHT;
978 RETVAL->font = 0; 1247 RETVAL->font = 0;
1248 RETVAL->rc = rc_alloc ();
979 1249
980 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1250 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
981 layout_update_font (RETVAL); 1251 layout_update_font (RETVAL);
982 OUTPUT: 1252 OUTPUT:
983 RETVAL 1253 RETVAL
984 1254
985void 1255void
986DESTROY (CFPlus::Layout self) 1256DESTROY (DC::Layout self)
987 CODE: 1257 CODE:
988 g_object_unref (self->pl); 1258 g_object_unref (self->pl);
1259 rc_free (self->rc);
989 Safefree (self); 1260 Safefree (self);
990 1261
991void 1262void
992set_text (CFPlus::Layout self, SV *text_) 1263set_text (DC::Layout self, SV *text_)
993 CODE: 1264 CODE:
994{ 1265{
995 STRLEN textlen; 1266 STRLEN textlen;
996 char *text = SvPVutf8 (text_, textlen); 1267 char *text = SvPVutf8 (text_, textlen);
997 1268
998 pango_layout_set_text (self->pl, text, textlen); 1269 pango_layout_set_text (self->pl, text, textlen);
999} 1270}
1000 1271
1001void 1272void
1002set_markup (CFPlus::Layout self, SV *text_) 1273set_markup (DC::Layout self, SV *text_)
1003 CODE: 1274 CODE:
1004{ 1275{
1005 STRLEN textlen; 1276 STRLEN textlen;
1006 char *text = SvPVutf8 (text_, textlen); 1277 char *text = SvPVutf8 (text_, textlen);
1007 1278
1008 pango_layout_set_markup (self->pl, text, textlen); 1279 pango_layout_set_markup (self->pl, text, textlen);
1009} 1280}
1010 1281
1011void 1282void
1012set_shapes (CFPlus::Layout self, ...) 1283set_shapes (DC::Layout self, ...)
1013 CODE: 1284 CODE:
1014{ 1285{
1015 PangoAttrList *attrs = 0; 1286 PangoAttrList *attrs = 0;
1016 const char *text = pango_layout_get_text (self->pl); 1287 const char *text = pango_layout_get_text (self->pl);
1017 const char *pos = text; 1288 const char *pos = text;
… …
1052 if (attrs) 1323 if (attrs)
1053 pango_layout_set_attributes (self->pl, attrs); 1324 pango_layout_set_attributes (self->pl, attrs);
1054} 1325}
1055 1326
1056void 1327void
1057get_shapes (CFPlus::Layout self) 1328get_shapes (DC::Layout self)
1058 PPCODE: 1329 PPCODE:
1059{ 1330{
1060 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1331 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1061 1332
1062 do 1333 do
1063 { 1334 {
1064 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1335 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1065 1336
1066 if (run && shape_attr_p (run)) 1337 if (run && shape_attr_p (run))
1067 { 1338 {
1068 PangoRectangle extents; 1339 PangoRectangle extents;
1069 pango_layout_iter_get_run_extents (iter, 0, &extents); 1340 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1077 1348
1078 pango_layout_iter_free (iter); 1349 pango_layout_iter_free (iter);
1079} 1350}
1080 1351
1081int 1352int
1082has_wrapped (CFPlus::Layout self) 1353has_wrapped (DC::Layout self)
1083 CODE: 1354 CODE:
1084{ 1355{
1085 int lines = 1; 1356 int lines = 1;
1086 const char *text = pango_layout_get_text (self->pl); 1357 const char *text = pango_layout_get_text (self->pl);
1087 1358
… …
1092} 1363}
1093 OUTPUT: 1364 OUTPUT:
1094 RETVAL 1365 RETVAL
1095 1366
1096SV * 1367SV *
1097get_text (CFPlus::Layout self) 1368get_text (DC::Layout self)
1098 CODE: 1369 CODE:
1099 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1370 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1100 sv_utf8_decode (RETVAL); 1371 sv_utf8_decode (RETVAL);
1101 OUTPUT: 1372 OUTPUT:
1102 RETVAL 1373 RETVAL
1103 1374
1104void 1375void
1105set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1376set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1106 CODE: 1377 CODE:
1107 self->r = r; 1378 self->r = r;
1108 self->g = g; 1379 self->g = g;
1109 self->b = b; 1380 self->b = b;
1110 self->a = a; 1381 self->a = a;
1111 1382
1112void 1383void
1113set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1384set_font (DC::Layout self, DC::Font font = 0)
1114 CODE: 1385 CODE:
1115 if (self->font != font) 1386 if (self->font != font)
1116 { 1387 {
1117 self->font = font; 1388 self->font = font;
1118 layout_update_font (self); 1389 layout_update_font (self);
1119 } 1390 }
1120 1391
1121void 1392void
1122set_height (CFPlus::Layout self, int base_height) 1393set_height (DC::Layout self, int base_height)
1123 CODE: 1394 CODE:
1124 if (self->base_height != base_height) 1395 if (self->base_height != base_height)
1125 { 1396 {
1126 self->base_height = base_height; 1397 self->base_height = base_height;
1127 layout_update_font (self); 1398 layout_update_font (self);
1128 } 1399 }
1129 1400
1130void 1401void
1131set_width (CFPlus::Layout self, int max_width = -1) 1402set_width (DC::Layout self, int max_width = -1)
1132 CODE: 1403 CODE:
1133 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1404 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1134 1405
1135void 1406void
1136set_indent (CFPlus::Layout self, int indent) 1407set_indent (DC::Layout self, int indent)
1137 CODE: 1408 CODE:
1138 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1409 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1139 1410
1140void 1411void
1141set_spacing (CFPlus::Layout self, int spacing) 1412set_spacing (DC::Layout self, int spacing)
1142 CODE: 1413 CODE:
1143 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1414 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1144 1415
1145void 1416void
1146set_ellipsise (CFPlus::Layout self, int ellipsise) 1417set_ellipsise (DC::Layout self, int ellipsise)
1147 CODE: 1418 CODE:
1148 pango_layout_set_ellipsize (self->pl, 1419 pango_layout_set_ellipsize (self->pl,
1149 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1420 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1150 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1421 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1151 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1422 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1152 : PANGO_ELLIPSIZE_NONE 1423 : PANGO_ELLIPSIZE_NONE
1153 ); 1424 );
1154 1425
1155void 1426void
1156set_single_paragraph_mode (CFPlus::Layout self, int spm) 1427set_single_paragraph_mode (DC::Layout self, int spm)
1157 CODE: 1428 CODE:
1158 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1429 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1159 1430
1160void 1431void
1161size (CFPlus::Layout self) 1432size (DC::Layout self)
1162 PPCODE: 1433 PPCODE:
1163{ 1434{
1164 int w, h; 1435 int w, h;
1165 1436
1166 layout_get_pixel_size (self, &w, &h); 1437 layout_get_pixel_size (self, &w, &h);
… …
1169 PUSHs (sv_2mortal (newSViv (w))); 1440 PUSHs (sv_2mortal (newSViv (w)));
1170 PUSHs (sv_2mortal (newSViv (h))); 1441 PUSHs (sv_2mortal (newSViv (h)));
1171} 1442}
1172 1443
1173int 1444int
1174descent (CFPlus::Layout self) 1445descent (DC::Layout self)
1175 CODE: 1446 CODE:
1176{ 1447{
1177 PangoRectangle rect; 1448 PangoRectangle rect;
1178 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1449 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1179 pango_layout_line_get_pixel_extents (line, 0, &rect); 1450 pango_layout_line_get_pixel_extents (line, 0, &rect);
1180 RETVAL = PANGO_DESCENT (rect); 1451 RETVAL = PANGO_DESCENT (rect);
1181} 1452}
1182 OUTPUT: 1453 OUTPUT:
1183 RETVAL 1454 RETVAL
1184 1455
1185int 1456int
1186xy_to_index (CFPlus::Layout self, int x, int y) 1457xy_to_index (DC::Layout self, int x, int y)
1187 CODE: 1458 CODE:
1188{ 1459{
1189 int index, trailing; 1460 int index, trailing;
1190 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1461 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1191 RETVAL = index + trailing; 1462 RETVAL = index + trailing;
1192} 1463}
1193 OUTPUT: 1464 OUTPUT:
1194 RETVAL 1465 RETVAL
1195 1466
1196void 1467void
1197cursor_pos (CFPlus::Layout self, int index) 1468cursor_pos (DC::Layout self, int index)
1198 PPCODE: 1469 PPCODE:
1199{ 1470{
1200 PangoRectangle strong_pos; 1471 PangoRectangle pos;
1201 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1472 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1202 1473
1203 EXTEND (SP, 3); 1474 EXTEND (SP, 3);
1204 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1475 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1476 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1477 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1207} 1478}
1208 1479
1209void 1480void
1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1481index_to_line_x (DC::Layout self, int index, int trailing = 0)
1211 PPCODE: 1482 PPCODE:
1212{ 1483{
1213 int line, x; 1484 int line, x;
1214 1485
1215 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1486 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1487#if !PANGO_VERSION_CHECK (1, 17, 3)
1216 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1488 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1217 1489 --line;
1490#endif
1218 EXTEND (SP, 2); 1491 EXTEND (SP, 2);
1219 PUSHs (sv_2mortal (newSViv (line - 1))); 1492 PUSHs (sv_2mortal (newSViv (line)));
1220 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1221} 1494}
1222 1495
1223void 1496void
1224line_x_to_index (CFPlus::Layout self, int line, int x) 1497line_x_to_index (DC::Layout self, int line, int x)
1225 PPCODE: 1498 PPCODE:
1226{ 1499{
1227 PangoLayoutLine *lp; 1500 PangoLayoutLine *lp;
1228 int index, trailing; 1501 int index, trailing;
1229 1502
1230 if (line < 0) 1503 if (line < 0)
1231 XSRETURN_EMPTY; 1504 XSRETURN_EMPTY;
1232 1505
1233 if (!(lp = pango_layout_get_line (self->pl, line))) 1506 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1234 XSRETURN_EMPTY; /* do better */ 1507 XSRETURN_EMPTY; /* do better */
1235 1508
1236 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1509 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1237 1510
1238 EXTEND (SP, 2); 1511 EXTEND (SP, 2);
… …
1244 PUSHs (sv_2mortal (newSViv (trailing))); 1517 PUSHs (sv_2mortal (newSViv (trailing)));
1245 } 1518 }
1246} 1519}
1247 1520
1248void 1521void
1249render (CFPlus::Layout self, float x, float y, int flags = 0) 1522render (DC::Layout self, float x, float y, int flags = 0)
1250 PPCODE: 1523 CODE:
1524 rc_clear (self->rc);
1251 pango_opengl_render_layout_subpixel ( 1525 pango_opengl_render_layout_subpixel (
1252 self->pl, 1526 self->pl,
1527 self->rc,
1253 x * PANGO_SCALE, y * PANGO_SCALE, 1528 x * PANGO_SCALE, y * PANGO_SCALE,
1254 self->r, self->g, self->b, self->a, 1529 self->r, self->g, self->b, self->a,
1255 flags 1530 flags
1256 ); 1531 );
1532 // we assume that context_change actually clears/frees stuff
1533 // and does not do any recomputation...
1534 pango_layout_context_changed (self->pl);
1257 1535
1258MODULE = CFPlus PACKAGE = CFPlus::Texture 1536void
1537draw (DC::Layout self)
1538 CODE:
1539{
1540 glEnable (GL_TEXTURE_2D);
1541 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1542 glEnable (GL_BLEND);
1543 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1544 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1545 glEnable (GL_ALPHA_TEST);
1546 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1259 1547
1260int minpot (int n) 1548 rc_draw (self->rc);
1549
1550 glDisable (GL_ALPHA_TEST);
1551 glDisable (GL_BLEND);
1552 glDisable (GL_TEXTURE_2D);
1553}
1554
1555MODULE = Deliantra::Client PACKAGE = DC::Texture
1556
1557PROTOTYPES: ENABLE
1261 1558
1262void 1559void
1263pad (SV *data_, int ow, int oh, int nw, int nh) 1560pad (SV *data_, int ow, int oh, int nw, int nh)
1264 CODE: 1561 CODE:
1265{ 1562{
… …
1292 HV *hv = (HV *)SvRV (self); 1589 HV *hv = (HV *)SvRV (self);
1293 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1590 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1294 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1591 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1295 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1592 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1296 1593
1594 if (name <= 0)
1595 XSRETURN_EMPTY;
1596
1297 if (items < 5) 1597 if (items < 5)
1298 { 1598 {
1299 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1599 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1300 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1600 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1301 } 1601 }
… …
1339 RETVAL = width > 0; 1639 RETVAL = width > 0;
1340} 1640}
1341 OUTPUT: 1641 OUTPUT:
1342 RETVAL 1642 RETVAL
1343 1643
1344MODULE = CFPlus PACKAGE = CFPlus::Map 1644MODULE = Deliantra::Client PACKAGE = DC::Map
1345 1645
1346CFPlus::Map 1646PROTOTYPES: DISABLE
1647
1648DC::Map
1347new (SV *class) 1649new (SV *class)
1348 CODE: 1650 CODE:
1349 New (0, RETVAL, 1, struct map); 1651 New (0, RETVAL, 1, struct map);
1350 RETVAL->x = 0; 1652 RETVAL->x = 0;
1351 RETVAL->y = 0; 1653 RETVAL->y = 0;
… …
1359 RETVAL->row = 0; 1661 RETVAL->row = 0;
1360 OUTPUT: 1662 OUTPUT:
1361 RETVAL 1663 RETVAL
1362 1664
1363void 1665void
1364DESTROY (CFPlus::Map self) 1666DESTROY (DC::Map self)
1365 CODE: 1667 CODE:
1366{ 1668{
1367 map_clear (self); 1669 map_clear (self);
1368 Safefree (self->face2tile); 1670 Safefree (self->face2tile);
1369 Safefree (self->tex); 1671 Safefree (self->tex);
1370 Safefree (self); 1672 Safefree (self);
1371} 1673}
1372 1674
1373void 1675void
1374resize (CFPlus::Map self, int map_width, int map_height) 1676resize (DC::Map self, int map_width, int map_height)
1375 CODE: 1677 CODE:
1376 self->w = map_width; 1678 self->w = map_width;
1377 self->h = map_height; 1679 self->h = map_height;
1378 1680
1379void 1681void
1380clear (CFPlus::Map self) 1682clear (DC::Map self)
1381 CODE: 1683 CODE:
1382 map_clear (self); 1684 map_clear (self);
1383 1685
1384void 1686void
1385set_tileid (CFPlus::Map self, int face, int tile) 1687set_tileid (DC::Map self, int face, int tile)
1386 CODE: 1688 CODE:
1387{ 1689{
1388 need_facenum (self, face); self->face2tile [face] = tile; 1690 need_facenum (self, face); self->face2tile [face] = tile;
1389 need_texid (self, tile); 1691 need_texid (self, tile);
1390} 1692}
1391 1693
1392void 1694void
1393set_smooth (CFPlus::Map self, int face, int smooth, int level) 1695set_smooth (DC::Map self, int face, int smooth, int level)
1394 CODE: 1696 CODE:
1395{ 1697{
1396 tileid texid; 1698 tileid texid;
1397 maptex *tex; 1699 maptex *tex;
1398 1700
… …
1411 tex->smoothtile = self->face2tile [smooth]; 1713 tex->smoothtile = self->face2tile [smooth];
1412 tex->smoothlevel = level; 1714 tex->smoothlevel = level;
1413} 1715}
1414 1716
1415void 1717void
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) 1718set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1417 CODE: 1719 CODE:
1418{ 1720{
1419 need_texid (self, texid); 1721 need_texid (self, texid);
1420 1722
1421 { 1723 {
… …
1441 // from transparent color bleeding and ugly wrapping effects. 1743 // from transparent color bleeding and ugly wrapping effects.
1442 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1443} 1745}
1444 1746
1445int 1747int
1446ox (CFPlus::Map self) 1748ox (DC::Map self)
1447 ALIAS: 1749 ALIAS:
1448 oy = 1 1750 oy = 1
1449 x = 2 1751 x = 2
1450 y = 3 1752 y = 3
1451 w = 4 1753 w = 4
… …
1462 } 1764 }
1463 OUTPUT: 1765 OUTPUT:
1464 RETVAL 1766 RETVAL
1465 1767
1466void 1768void
1467scroll (CFPlus::Map self, int dx, int dy) 1769scroll (DC::Map self, int dx, int dy)
1468 CODE: 1770 CODE:
1469{ 1771{
1470 if (dx > 0) 1772 if (dx > 0)
1471 map_blank (self, self->x, self->y, dx, self->h); 1773 map_blank (self, self->x, self->y, dx, self->h);
1472 else if (dx < 0) 1774 else if (dx < 0)
… …
1487 self->rows += MAP_EXTEND_Y; 1789 self->rows += MAP_EXTEND_Y;
1488 self->y += MAP_EXTEND_Y; 1790 self->y += MAP_EXTEND_Y;
1489 } 1791 }
1490} 1792}
1491 1793
1492void 1794SV *
1493map1a_update (CFPlus::Map self, SV *data_, int extmap) 1795map1a_update (DC::Map self, SV *data_, int extmap)
1494 CODE: 1796 CODE:
1495{ 1797{
1496 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1497 uint8_t *data_end = (uint8_t *)SvEND (data_); 1799 uint8_t *data_end = (uint8_t *)SvEND (data_);
1498 mapcell *cell; 1800 mapcell *cell;
1499 int x, y, flags; 1801 int x, y, z, flags;
1802 AV *missing = newAV ();
1803 RETVAL = newRV_noinc ((SV *)missing);
1500 1804
1501 while (data < data_end - 1) 1805 while (data < data_end - 1)
1502 { 1806 {
1503 flags = (data [0] << 8) + data [1]; data += 2; 1807 flags = (data [0] << 8) + data [1]; data += 2;
1504 1808
… …
1524 uint8_t ext, cmd; 1828 uint8_t ext, cmd;
1525 1829
1526 do 1830 do
1527 { 1831 {
1528 ext = *data++; 1832 ext = *data++;
1529 cmd = ext & 0x3f; 1833 cmd = ext & 0x7f;
1530 1834
1531 if (cmd < 4) 1835 if (cmd < 4)
1532 cell->darkness = 255 - ext * 64 + 1; 1836 cell->darkness = 255 - ext * 64 + 1;
1533 else if (cmd == 5) // health 1837 else if (cmd == 5) // health
1534 { 1838 {
… …
1537 } 1841 }
1538 else if (cmd == 6) // monster width 1842 else if (cmd == 6) // monster width
1539 cell->stat_width = *data++ + 1; 1843 cell->stat_width = *data++ + 1;
1540 else if (cmd == 0x47) 1844 else if (cmd == 0x47)
1541 { 1845 {
1542 if (*data == 4) 1846 if (*data == 1) cell->player = data [1];
1543 ; // decode player count 1847 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1848 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1849 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1544 1850
1545 data += *data + 1; 1851 data += *data + 1;
1546 } 1852 }
1547 else if (cmd == 8) // cell flags 1853 else if (cmd == 8) // cell flags
1548 cell->flags = *data++; 1854 cell->flags = *data++;
… …
1555 } 1861 }
1556 else 1862 else
1557 cell->darkness = *data++ + 1; 1863 cell->darkness = *data++ + 1;
1558 } 1864 }
1559 1865
1866 for (z = 0; z <= 2; ++z)
1560 if (flags & 4) 1867 if (flags & (4 >> z))
1561 { 1868 {
1562 faceid face = (data [0] << 8) + data [1]; data += 2; 1869 faceid face = (data [0] << 8) + data [1]; data += 2;
1563 need_facenum (self, face); 1870 need_facenum (self, face);
1564 cell->tile [0] = self->face2tile [face]; 1871 cell->tile [z] = self->face2tile [face];
1872
1873 if (cell->tile [z])
1874 {
1875 maptex *tex = self->tex + cell->tile [z];
1876 if (!tex->name)
1877 av_push (missing, newSViv (cell->tile [z]));
1878
1879 if (tex->smoothtile)
1880 {
1881 maptex *smooth = self->tex + tex->smoothtile;
1882 if (!smooth->name)
1883 av_push (missing, newSViv (tex->smoothtile));
1884 }
1885 }
1565 } 1886 }
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 } 1887 }
1581 else 1888 else
1582 cell->darkness = 0; 1889 CELL_CLEAR (cell);
1583 } 1890 }
1584} 1891}
1892 OUTPUT:
1893 RETVAL
1585 1894
1586SV * 1895SV *
1587mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1896mapmap (DC::Map self, int x0, int y0, int w, int h)
1588 CODE: 1897 CODE:
1589{ 1898{
1590 int x1, x; 1899 int x1, x;
1591 int y1, y; 1900 int y1, y;
1592 int z; 1901 int z;
… …
1637} 1946}
1638 OUTPUT: 1947 OUTPUT:
1639 RETVAL 1948 RETVAL
1640 1949
1641void 1950void
1642draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1951draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1643 CODE: 1952 CODE:
1644{ 1953{
1954 int x, y, z;
1955
1645 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1646 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1957 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1647 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1958 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1648 smooth_key skey; 1959 smooth_key skey;
1649 int x, y, z; 1960 int pl_x, pl_y;
1650 int last_name; 1961 maptex pl_tex;
1962 rc_t *rc = rc_alloc ();
1963 rc_key_t key;
1964 rc_array_t *arr;
1965
1966 pl_tex.name = 0;
1651 1967
1652 // thats current max. sorry. 1968 // thats current max. sorry.
1653 if (sw > 255) sw = 255; 1969 if (sw > 255) sw = 255;
1654 if (sh > 255) sh = 255; 1970 if (sh > 255) sh = 255;
1655 1971
1656 // clear key, in case of extra padding 1972 // clear key, in case of extra padding
1657 memset (&skey, 0, sizeof (skey)); 1973 memset (&skey, 0, sizeof (skey));
1658 1974
1659 glColor4ub (255, 255, 255, 255); 1975 memset (&key, 0, sizeof (key));
1660 1976 key.r = 255;
1661 glEnable (GL_BLEND); 1977 key.g = 255;
1662 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1978 key.b = 255;
1663 glEnable (GL_TEXTURE_2D); 1979 key.a = 255;
1664 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1980 key.mode = GL_QUADS;
1665 1981 key.format = GL_T2F_V3F;
1666 glBegin (GL_QUADS); 1982 key.texname = -1;
1667
1668 last_name = 0;
1669 1983
1670 mx += self->x; 1984 mx += self->x;
1671 my += self->y; 1985 my += self->y;
1672 1986
1673 // first pass: determine smooth_max 1987 // first pass: determine smooth_max
… …
1689 MAX (self->tex [cell->tile [0]].smoothlevel, 2003 MAX (self->tex [cell->tile [0]].smoothlevel,
1690 MAX (self->tex [cell->tile [1]].smoothlevel, 2004 MAX (self->tex [cell->tile [1]].smoothlevel,
1691 self->tex [cell->tile [2]].smoothlevel)); 2005 self->tex [cell->tile [2]].smoothlevel));
1692 } 2006 }
1693 } 2007 }
2008
2009 glEnable (GL_BLEND);
2010 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2011 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1694 2012
1695 for (z = 0; z <= 2; z++) 2013 for (z = 0; z <= 2; z++)
1696 { 2014 {
1697 memset (smooth_level, 0, sizeof (smooth_level)); 2015 memset (smooth_level, 0, sizeof (smooth_level));
1698 2016
… …
1711 { 2029 {
1712 maptex tex = self->tex [tile]; 2030 maptex tex = self->tex [tile];
1713 int px = (x + 1) * T - tex.w; 2031 int px = (x + 1) * T - tex.w;
1714 int py = (y + 1) * T - tex.h; 2032 int py = (y + 1) * T - tex.h;
1715 2033
1716 // suppressing texture state switches here
1717 // is only moderately effective, but worth the extra effort
1718 if (last_name != tex.name) 2034 if (key.texname != tex.name)
1719 { 2035 {
1720 if (!tex.name) 2036 if (!tex.name)
1721 tex = self->tex [2]; /* missing, replace by noface */ 2037 tex = self->tex [2]; /* missing, replace by noface */
1722 2038
1723 glEnd (); 2039 key.texname = tex.name;
1724 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2040 arr = rc_array (rc, &key);
1725 glBegin (GL_QUADS);
1726 } 2041 }
1727 2042
1728 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2043 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 { 2044 {
2045 pl_x = px;
2046 pl_y = py;
2047 pl_tex = tex;
2048 continue;
2049 }
2050
2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2052 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2053 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2054 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2055
2056 if (expect_false (cell->flags) && expect_false (z == 2))
2057 {
2058 // overlays such as the speech bubble, probably more to come
1735 if (cell->flags & 1) 2059 if (cell->flags & 1)
1736 { 2060 {
1737 maptex tex = self->tex [1]; 2061 maptex tex = self->tex [1];
1738 int px = x * T + T * 2 / 32; 2062 int px = x * T + T * 2 / 32;
1739 int py = y * T - T * 6 / 32; 2063 int py = y * T - T * 6 / 32;
1740 2064
2065 if (tex.name)
1741 glEnd (); 2066 {
1742 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2067 if (key.texname != tex.name)
2068 {
2069 key.texname = tex.name;
2070 arr = rc_array (rc, &key);
2071 }
2072
2073 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2074 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2075 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2076 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1743 glBegin (GL_QUADS); 2077 }
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 } 2078 }
1750 } 2079 }
1751 2080
1752 // update smooth hash 2081 // update smooth hash
1753 if (tex.smoothtile) 2082 if (tex.smoothtile)
… …
1789 } 2118 }
1790 } 2119 }
1791 } 2120 }
1792 } 2121 }
1793 2122
2123 rc_draw (rc);
2124 rc_clear (rc);
2125
1794 // go through all smoothlevels, lowest to highest, then draw. 2126 // go through all smoothlevels, lowest to highest, then draw.
1795 // this is basically counting sort 2127 // this is basically counting sort
1796 { 2128 {
1797 int w, b; 2129 int w, b;
1798 2130
2131 glEnable (GL_TEXTURE_2D);
2132 glBegin (GL_QUADS);
1799 for (w = 0; w < 256 / 32; ++w) 2133 for (w = 0; w < 256 / 32; ++w)
1800 { 2134 {
1801 uint32_t smask = smooth_level [w]; 2135 uint32_t smask = smooth_level [w];
1802 if (smask) 2136 if (smask)
1803 for (b = 0; b < 32; ++b) 2137 for (b = 0; b < 32; ++b)
… …
1822 int border = bits & 15; 2156 int border = bits & 15;
1823 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2157 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1824 float dx = tex.s * .0625f; // 16 images/row 2158 float dx = tex.s * .0625f; // 16 images/row
1825 float dy = tex.t * .5f ; // 2 images/column 2159 float dy = tex.t * .5f ; // 2 images/column
1826 2160
1827 // this time naively avoiding texture state changes
1828 // save gobs of state changes.
1829 if (last_name != tex.name) 2161 if (tex.name)
1830 { 2162 {
2163 // this time avoiding texture state changes
2164 // save gobs of state changes.
1831 if (!tex.name) 2165 if (key.texname != tex.name)
1832 continue; // smoothing not yet available 2166 {
1833
1834 glEnd (); 2167 glEnd ();
1835 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1836 glBegin (GL_QUADS); 2169 glBegin (GL_QUADS);
1837 } 2170 }
1838 2171
1839 if (border) 2172 if (border)
1840 { 2173 {
1841 float ox = border * dx; 2174 float ox = border * dx;
1842 2175
1843 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2176 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1844 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2177 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1845 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2178 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1846 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2179 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1847 } 2180 }
1848 2181
1849 if (corner) 2182 if (corner)
1850 { 2183 {
1851 float ox = corner * dx; 2184 float ox = corner * dx;
1852 2185
1853 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2186 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1854 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2187 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1855 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2188 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1856 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2189 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2190 }
1857 } 2191 }
1858 } 2192 }
1859 } 2193 }
1860 } 2194 }
1861 } 2195 }
2196
2197 glEnd ();
2198 glDisable (GL_TEXTURE_2D);
2199 key.texname = -1;
1862 } 2200 }
1863 2201
1864 hv_clear (smooth); 2202 hv_clear (smooth);
1865 } 2203 }
1866 2204
1867 glEnd (); 2205 if (pl_tex.name)
2206 {
2207 maptex tex = pl_tex;
2208 int px = pl_x + sdx;
2209 int py = pl_y + sdy;
1868 2210
1869 glDisable (GL_TEXTURE_2D); 2211 key.texname = tex.name;
2212 arr = rc_array (rc, &key);
2213
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2218
2219 rc_draw (rc);
2220 }
2221
1870 glDisable (GL_BLEND); 2222 glDisable (GL_BLEND);
2223 rc_free (rc);
1871 2224
1872 // top layer: overlays such as the health bar 2225 // top layer: overlays such as the health bar
1873 for (y = 0; y < sh; y++) 2226 for (y = 0; y < sh; y++)
1874 if (0 <= y + my && y + my < self->rows) 2227 if (0 <= y + my && y + my < self->rows)
1875 { 2228 {
… …
1900 } 2253 }
1901 } 2254 }
1902} 2255}
1903 2256
1904void 2257void
1905draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2258draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1906 CODE: 2259 CODE:
1907{ 2260{
1908 static float color[16][3] = { 2261 static float color[16][3] = {
1909 { 0.00F, 0.00F, 0.00F }, 2262 { 0.00F, 0.00F, 0.00F },
1910 { 1.00F, 1.00F, 1.00F }, 2263 { 1.00F, 1.00F, 1.00F },
… …
1960 glDisable (GL_BLEND); 2313 glDisable (GL_BLEND);
1961 glDisable (GL_TEXTURE_2D); 2314 glDisable (GL_TEXTURE_2D);
1962} 2315}
1963 2316
1964void 2317void
1965fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix) 2318fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1966 PPCODE: 2319 PPCODE:
1967{ 2320{
1968 int x, y; 2321 int x, y;
2322 int sw1 = sw + 2;
2323 int sh1 = sh + 2;
2324 int sh3 = sh * 3;
1969 int sw4 = (sw + 3) & ~3; 2325 int sw34 = (sw * 3 + 3) & ~3;
2326 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1970 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2327 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1971 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2328 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1972 2329
1973 memset (darkness, 255, sw4 * sh);
1974 SvPOK_only (darkness_sv); 2330 SvPOK_only (darkness3_sv);
1975 SvCUR_set (darkness_sv, sw4 * sh); 2331 SvCUR_set (darkness3_sv, sw34 * sh3);
1976 2332
1977 mx += self->x; 2333 mx += self->x - 1;
1978 my += self->y; 2334 my += self->y - 1;
1979 2335
2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2337
1980 for (y = 0; y < sh; y++) 2338 for (y = 0; y < sh1; y++)
1981 if (0 <= y + my && y + my < self->rows) 2339 if (0 <= y + my && y + my < self->rows)
1982 { 2340 {
1983 maprow *row = self->row + (y + my); 2341 maprow *row = self->row + (y + my);
1984 2342
1985 for (x = 0; x < sw; x++) 2343 for (x = 0; x < sw1; x++)
1986 if (row->c0 <= x + mx && x + mx < row->c1) 2344 if (row->c0 <= x + mx && x + mx < row->c1)
1987 { 2345 {
1988 mapcell *cell = row->col + (x + mx - row->c0); 2346 mapcell *cell = row->col + (x + mx - row->c0);
1989 2347
1990 darkness[y * sw4 + x] = cell->darkness 2348 darkness1 [y * sw1 + x] = cell->darkness
1991 ? 255 - (cell->darkness - 1) 2349 ? 255 - (cell->darkness - 1)
1992 : 255 - FOW_DARKNESS; 2350 : 255 - FOW_DARKNESS;
1993 } 2351 }
1994 } 2352 }
1995 2353
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) 2354 for (y = 0; y < sh; ++y)
2005 for (x = 0; x < sw4; ++x) 2355 for (x = 0; x < sw; ++x)
2006 { 2356 {
2007 float *f = (float *)matrix; 2357 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2008 int dx, dy; 2358 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2009 float sum = 0.f; 2359 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2360 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2361 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2362 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2363 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2364 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2365 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2010 2366
2011 for (dy = -1; dy <= 1; ++dy) 2367 uint8_t r11 = (d11 + d21 + d12) / 3;
2012 for (dx = -1; dx <= 1; ++dx) 2368 uint8_t r21 = d21;
2013 { 2369 uint8_t r31 = (d21 + d31 + d32) / 3;
2014 unsigned int x2 = x + dx;
2015 unsigned int y2 = y + dy;
2016 2370
2017 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++; 2371 uint8_t r12 = d12;
2018 } 2372 uint8_t r22 = d22;
2373 uint8_t r32 = d32;
2019 2374
2020 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum; 2375 uint8_t r13 = (d13 + d23 + d12) / 3;
2021 } 2376 uint8_t r23 = d23;
2377 uint8_t r33 = (d23 + d33 + d32) / 3;
2022 2378
2023 darkness_sv = darkness2_sv; 2379 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2380 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2381 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2382 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2383 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2384 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2385 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2386 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2387 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2024 } 2388 }
2389
2390 free (darkness1);
2025 2391
2026 EXTEND (SP, 3); 2392 EXTEND (SP, 3);
2027 PUSHs (sv_2mortal (newSViv (sw4))); 2393 PUSHs (sv_2mortal (newSViv (sw34)));
2028 PUSHs (sv_2mortal (newSViv (sh))); 2394 PUSHs (sv_2mortal (newSViv (sh3)));
2029 PUSHs (darkness_sv); 2395 PUSHs (darkness3_sv);
2030} 2396}
2031 2397
2032SV * 2398SV *
2033get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2399get_rect (DC::Map self, int x0, int y0, int w, int h)
2034 CODE: 2400 CODE:
2035{ 2401{
2036 int x, y, x1, y1; 2402 int x, y, x1, y1;
2037 SV *data_sv = newSV (w * h * 7 + 5); 2403 SV *data_sv = newSV (w * h * 7 + 5);
2038 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2404 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2095 else 2461 else
2096 *data++ = 0; 2462 *data++ = 0;
2097 } 2463 }
2098 } 2464 }
2099 2465
2466 /* if size is w*h + 5 then no data has been found */
2467 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2468 {
2100 SvPOK_only (data_sv); 2469 SvPOK_only (data_sv);
2101 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471 }
2472
2102 RETVAL = data_sv; 2473 RETVAL = data_sv;
2103} 2474}
2104 OUTPUT: 2475 OUTPUT:
2105 RETVAL 2476 RETVAL
2106 2477
2107void 2478void
2108set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2479set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2109 PPCODE: 2480 PPCODE:
2110{ 2481{
2111 int x, y, z; 2482 int x, y, z;
2112 int w, h; 2483 int w, h;
2113 int x1, y1; 2484 int x1, y1;
2485 STRLEN len;
2486 uint8_t *data, *end;
2487
2488 len = SvLEN (data_sv);
2489 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2490 data = SvPVbyte_nolen (data_sv);
2491 end = data + len + 8;
2492
2493 if (len < 5)
2494 XSRETURN_EMPTY;
2114 2495
2115 if (*data++ != 0) 2496 if (*data++ != 0)
2116 return; /* version mismatch */ 2497 XSRETURN_EMPTY; /* version mismatch */
2117 2498
2118 w = *data++ << 8; w |= *data++; 2499 w = *data++ << 8; w |= *data++;
2119 h = *data++ << 8; h |= *data++; 2500 h = *data++ << 8; h |= *data++;
2120 2501
2121 // we need to do this 'cause we don't keep an absolute coord system for rows 2502 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2133 { 2514 {
2134 maprow *row = map_get_row (self, y); 2515 maprow *row = map_get_row (self, y);
2135 2516
2136 for (x = x0; x < x1; x++) 2517 for (x = x0; x < x1; x++)
2137 { 2518 {
2519 uint8_t flags;
2520
2521 if (data + 7 >= end)
2522 XSRETURN_EMPTY;
2523
2138 uint8_t flags = *data++; 2524 flags = *data++;
2139 2525
2140 if (flags) 2526 if (flags)
2141 { 2527 {
2142 mapcell *cell = row_get_cell (row, x); 2528 mapcell *cell = row_get_cell (row, x);
2143 tileid tile[3] = { 0, 0, 0 }; 2529 tileid tile[3] = { 0, 0, 0 };
… …
2146 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2532 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2147 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2533 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2148 2534
2149 if (cell->darkness == 0) 2535 if (cell->darkness == 0)
2150 { 2536 {
2151 cell->darkness = 0; 2537 /*cell->darkness = 0;*/
2538 EXTEND (SP, 3);
2152 2539
2153 for (z = 0; z <= 2; z++) 2540 for (z = 0; z <= 2; z++)
2154 { 2541 {
2155 tileid t = tile [z]; 2542 tileid t = tile [z];
2156 2543
2157 if (t >= self->texs || (t && !self->tex [t].name)) 2544 if (t >= self->texs || (t && !self->tex [t].name))
2158 { 2545 {
2159 XPUSHs (sv_2mortal (newSViv (t))); 2546 PUSHs (sv_2mortal (newSViv (t)));
2160 need_texid (self, t); 2547 need_texid (self, t);
2161 } 2548 }
2162 2549
2163 cell->tile [z] = t; 2550 cell->tile [z] = t;
2164 } 2551 }
… …
2166 } 2553 }
2167 } 2554 }
2168 } 2555 }
2169} 2556}
2170 2557
2171MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2558MODULE = Deliantra::Client PACKAGE = DC::RW
2172 2559
2173CFPlus::MixChunk 2560DC::RW
2174new_from_file (SV *class, char *path) 2561new (SV *class, SV *data_sv)
2175 CODE: 2562 CODE:
2176 RETVAL = Mix_LoadWAV (path); 2563{
2564 STRLEN datalen;
2565 char *data = SvPVbyte (data_sv, datalen);
2566
2567 RETVAL = SDL_RWFromConstMem (data, datalen);
2568}
2177 OUTPUT: 2569 OUTPUT:
2178 RETVAL 2570 RETVAL
2179 2571
2572DC::RW
2573new_from_file (SV *class, const char *path, const char *mode = "rb")
2574 CODE:
2575 RETVAL = SDL_RWFromFile (path, mode);
2576 OUTPUT:
2577 RETVAL
2578
2579# fails on win32:
2580# dc.xs(2268) : error C2059: syntax error : '('
2180void 2581#void
2582#close (DC::RW self)
2583# CODE:
2584# (self->(close)) (self);
2585
2586MODULE = Deliantra::Client PACKAGE = DC::Channel
2587
2588PROTOTYPES: DISABLE
2589
2590DC::Channel
2591find ()
2592 CODE:
2593{
2594 RETVAL = Mix_GroupAvailable (-1);
2595
2596 if (RETVAL < 0)
2597 {
2598 RETVAL = Mix_GroupOldest (-1);
2599
2600 if (RETVAL < 0)
2601 XSRETURN_UNDEF;
2602
2603 Mix_HaltChannel (RETVAL);
2604 }
2605
2606 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128);
2608}
2609 OUTPUT:
2610 RETVAL
2611
2612void
2613halt (DC::Channel self)
2614 CODE:
2615 Mix_HaltChannel (self);
2616
2617void
2618expire (DC::Channel self, int ticks = -1)
2619 CODE:
2620 Mix_ExpireChannel (self, ticks);
2621
2622void
2623fade_out (DC::Channel self, int ticks = -1)
2624 CODE:
2625 Mix_FadeOutChannel (self, ticks);
2626
2627int
2628volume (DC::Channel self, int volume)
2629 CODE:
2630 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2631 OUTPUT:
2632 RETVAL
2633
2634void
2635unregister_all_effects (DC::Channel self)
2636 CODE:
2637 Mix_UnregisterAllEffects (self);
2638
2639void
2640set_panning (DC::Channel self, int left, int right)
2641 CODE:
2642 left = CLAMP (left , 0, 255);
2643 right = CLAMP (right, 0, 255);
2644 Mix_SetPanning (self, left, right);
2645
2646void
2647set_distance (DC::Channel self, int distance)
2648 CODE:
2649 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2650
2651void
2652set_position (DC::Channel self, int angle, int distance)
2653 CODE:
2654
2655void
2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2657 CODE:
2658{
2659 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2660 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2662}
2663
2664void
2665set_reverse_stereo (DC::Channel self, int flip)
2666 CODE:
2667 Mix_SetReverseStereo (self, flip);
2668
2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2670
2671PROTOTYPES: DISABLE
2672
2673DC::MixChunk
2674new (SV *class, DC::RW rwops)
2675 CODE:
2676 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2677 OUTPUT:
2678 RETVAL
2679
2680void
2181DESTROY (CFPlus::MixChunk self) 2681DESTROY (DC::MixChunk self)
2182 CODE: 2682 CODE:
2183 Mix_FreeChunk (self); 2683 Mix_FreeChunk (self);
2184 2684
2185int 2685int
2186volume (CFPlus::MixChunk self, int volume = -1) 2686volume (DC::MixChunk self, int volume = -1)
2187 CODE: 2687 CODE:
2688 if (items > 1)
2689 volume = CLAMP (volume, 0, 128);
2188 RETVAL = Mix_VolumeChunk (self, volume); 2690 RETVAL = Mix_VolumeChunk (self, volume);
2189 OUTPUT: 2691 OUTPUT:
2190 RETVAL 2692 RETVAL
2191 2693
2192int 2694DC::Channel
2193play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2695play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2194 CODE: 2696 CODE:
2697{
2195 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2698 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2699
2700 if (RETVAL < 0)
2701 XSRETURN_UNDEF;
2702
2703 if (channel < 0)
2704 {
2705 Mix_UnregisterAllEffects (RETVAL);
2706 Mix_Volume (RETVAL, 128);
2707 }
2708}
2196 OUTPUT: 2709 OUTPUT:
2197 RETVAL 2710 RETVAL
2198 2711
2199MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2200 2713
2201int 2714int
2202volume (int volume = -1) 2715volume (int volume = -1)
2716 PROTOTYPE: ;$
2203 CODE: 2717 CODE:
2718 if (items > 0)
2719 volume = CLAMP (volume, 0, 128);
2204 RETVAL = Mix_VolumeMusic (volume); 2720 RETVAL = Mix_VolumeMusic (volume);
2205 OUTPUT: 2721 OUTPUT:
2206 RETVAL 2722 RETVAL
2207 2723
2208int 2724void
2209fade_out (int ms) 2725fade_out (int ms)
2210 CODE: 2726 CODE:
2211 RETVAL = Mix_FadeOutMusic (ms); 2727 Mix_FadeOutMusic (ms);
2728
2729void
2730halt ()
2731 CODE:
2732 Mix_HaltMusic ();
2733
2734DC::MixMusic
2735new (SV *class, DC::RW rwops)
2736 CODE:
2737 RETVAL = Mix_LoadMUS_RW (rwops);
2212 OUTPUT: 2738 OUTPUT:
2213 RETVAL 2739 RETVAL
2214 2740
2215CFPlus::MixMusic
2216new_from_file (SV *class, char *path)
2217 CODE:
2218 RETVAL = Mix_LoadMUS (path);
2219 OUTPUT:
2220 RETVAL
2221
2222void 2741void
2223DESTROY (CFPlus::MixMusic self) 2742DESTROY (DC::MixMusic self)
2224 CODE: 2743 CODE:
2225 Mix_FreeMusic (self); 2744 Mix_FreeMusic (self);
2226 2745
2227int 2746int
2228play (CFPlus::MixMusic self, int loops = -1) 2747play (DC::MixMusic self, int loops = -1)
2229 CODE: 2748 CODE:
2230 RETVAL = Mix_PlayMusic (self, loops); 2749 RETVAL = Mix_PlayMusic (self, loops);
2231 OUTPUT: 2750 OUTPUT:
2232 RETVAL 2751 RETVAL
2233 2752
2234int 2753void
2235fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2754fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2236 CODE: 2755 CODE:
2237 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2756 Mix_FadeInMusicPos (self, loops, ms, position);
2238 OUTPUT:
2239 RETVAL
2240 2757
2241MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2758MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2759
2760PROTOTYPES: ENABLE
2242 2761
2243BOOT: 2762BOOT:
2244{ 2763{
2245 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2764 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2246 static const struct { 2765 static const struct {
2247 const char *name; 2766 const char *name;
2248 IV iv; 2767 IV iv;
2249 } *civ, const_iv[] = { 2768 } *civ, const_iv[] = {
2250# define const_iv(name) { # name, (IV)name } 2769# define const_iv(name) { # name, (IV)name }
… …
2262 const_iv (GL_ALPHA_TEST), 2781 const_iv (GL_ALPHA_TEST),
2263 const_iv (GL_NORMALIZE), 2782 const_iv (GL_NORMALIZE),
2264 const_iv (GL_RESCALE_NORMAL), 2783 const_iv (GL_RESCALE_NORMAL),
2265 const_iv (GL_FRONT), 2784 const_iv (GL_FRONT),
2266 const_iv (GL_BACK), 2785 const_iv (GL_BACK),
2786 const_iv (GL_AUX0),
2267 const_iv (GL_AND), 2787 const_iv (GL_AND),
2268 const_iv (GL_ONE), 2788 const_iv (GL_ONE),
2269 const_iv (GL_ZERO), 2789 const_iv (GL_ZERO),
2270 const_iv (GL_SRC_ALPHA), 2790 const_iv (GL_SRC_ALPHA),
2271 const_iv (GL_DST_ALPHA), 2791 const_iv (GL_DST_ALPHA),
… …
2284 const_iv (GL_INTENSITY), 2804 const_iv (GL_INTENSITY),
2285 const_iv (GL_LUMINANCE), 2805 const_iv (GL_LUMINANCE),
2286 const_iv (GL_LUMINANCE_ALPHA), 2806 const_iv (GL_LUMINANCE_ALPHA),
2287 const_iv (GL_FLOAT), 2807 const_iv (GL_FLOAT),
2288 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2808 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2809 const_iv (GL_COMPRESSED_ALPHA_ARB),
2810 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2811 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2812 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2813 const_iv (GL_COMPRESSED_RGB_ARB),
2814 const_iv (GL_COMPRESSED_RGBA_ARB),
2289 const_iv (GL_COMPILE), 2815 const_iv (GL_COMPILE),
2290 const_iv (GL_PROXY_TEXTURE_1D), 2816 const_iv (GL_PROXY_TEXTURE_1D),
2291 const_iv (GL_PROXY_TEXTURE_2D), 2817 const_iv (GL_PROXY_TEXTURE_2D),
2292 const_iv (GL_TEXTURE_1D), 2818 const_iv (GL_TEXTURE_1D),
2293 const_iv (GL_TEXTURE_2D), 2819 const_iv (GL_TEXTURE_2D),
… …
2317 const_iv (GL_COLOR_LOGIC_OP), 2843 const_iv (GL_COLOR_LOGIC_OP),
2318 const_iv (GL_SEPARABLE_2D), 2844 const_iv (GL_SEPARABLE_2D),
2319 const_iv (GL_CONVOLUTION_2D), 2845 const_iv (GL_CONVOLUTION_2D),
2320 const_iv (GL_CONVOLUTION_BORDER_MODE), 2846 const_iv (GL_CONVOLUTION_BORDER_MODE),
2321 const_iv (GL_CONSTANT_BORDER), 2847 const_iv (GL_CONSTANT_BORDER),
2848 const_iv (GL_POINTS),
2322 const_iv (GL_LINES), 2849 const_iv (GL_LINES),
2323 const_iv (GL_LINE_STRIP), 2850 const_iv (GL_LINE_STRIP),
2324 const_iv (GL_LINE_LOOP), 2851 const_iv (GL_LINE_LOOP),
2325 const_iv (GL_QUADS), 2852 const_iv (GL_QUADS),
2326 const_iv (GL_QUAD_STRIP), 2853 const_iv (GL_QUAD_STRIP),
2327 const_iv (GL_TRIANGLES), 2854 const_iv (GL_TRIANGLES),
2328 const_iv (GL_TRIANGLE_STRIP), 2855 const_iv (GL_TRIANGLE_STRIP),
2329 const_iv (GL_TRIANGLE_FAN), 2856 const_iv (GL_TRIANGLE_FAN),
2857 const_iv (GL_POLYGON),
2330 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2858 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2859 const_iv (GL_POINT_SMOOTH_HINT),
2860 const_iv (GL_LINE_SMOOTH_HINT),
2861 const_iv (GL_POLYGON_SMOOTH_HINT),
2862 const_iv (GL_GENERATE_MIPMAP_HINT),
2863 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2331 const_iv (GL_FASTEST), 2864 const_iv (GL_FASTEST),
2865 const_iv (GL_DONT_CARE),
2866 const_iv (GL_NICEST),
2332 const_iv (GL_V2F), 2867 const_iv (GL_V2F),
2333 const_iv (GL_V3F), 2868 const_iv (GL_V3F),
2334 const_iv (GL_T2F_V3F), 2869 const_iv (GL_T2F_V3F),
2335 const_iv (GL_T2F_N3F_V3F), 2870 const_iv (GL_T2F_N3F_V3F),
2336# undef const_iv 2871# undef const_iv
… …
2341 2876
2342 texture_av = newAV (); 2877 texture_av = newAV ();
2343 AvREAL_off (texture_av); 2878 AvREAL_off (texture_av);
2344} 2879}
2345 2880
2881void
2882disable_GL_EXT_blend_func_separate ()
2883 CODE:
2884 gl.BlendFuncSeparate = 0;
2885 gl.BlendFuncSeparateEXT = 0;
2886
2346char * 2887char *
2347gl_vendor () 2888gl_vendor ()
2348 CODE: 2889 CODE:
2349 RETVAL = (char *)glGetString (GL_VENDOR); 2890 RETVAL = (char *)glGetString (GL_VENDOR);
2350 OUTPUT: 2891 OUTPUT:
… …
2423void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2964void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2424 2965
2425# near_ and far_ are due to microsofts buggy "c" compiler 2966# near_ and far_ are due to microsofts buggy "c" compiler
2426void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2967void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2427 2968
2969PROTOTYPES: DISABLE
2970
2428void glViewport (int x, int y, int width, int height) 2971void glViewport (int x, int y, int width, int height)
2429 2972
2430void glScissor (int x, int y, int width, int height) 2973void glScissor (int x, int y, int width, int height)
2431 2974
2432void glTranslate (float x, float y, float z = 0.) 2975void glTranslate (float x, float y, float z = 0.)
… …
2439 2982
2440void glRotate (float angle, float x, float y, float z) 2983void glRotate (float angle, float x, float y, float z)
2441 CODE: 2984 CODE:
2442 glRotatef (angle, x, y, z); 2985 glRotatef (angle, x, y, z);
2443 2986
2444void glBegin (int mode)
2445
2446void glEnd ()
2447
2448void glColor (float r, float g, float b, float a = 1.0) 2987void glColor (float r, float g, float b, float a = 1.0)
2449 PROTOTYPE: @
2450 ALIAS: 2988 ALIAS:
2451 glColor_premultiply = 1 2989 glColor_premultiply = 1
2452 CODE: 2990 CODE:
2453 if (ix) 2991 if (ix)
2454 { 2992 {
… …
2457 b *= a; 2995 b *= a;
2458 } 2996 }
2459 // microsoft visual "c" rounds instead of truncating... 2997 // microsoft visual "c" rounds instead of truncating...
2460 glColor4f (r, g, b, a); 2998 glColor4f (r, g, b, a);
2461 2999
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.) 3000void glRasterPos (float x, float y, float z = 0.)
2469 CODE: 3001 CODE:
2470 glRasterPos3f (0, 0, z); 3002 glRasterPos3f (0, 0, z);
2471 glBitmap (0, 0, 0, 0, x, y, 0); 3003 glBitmap (0, 0, 0, 0, x, y, 0);
2472 3004
… …
2476 3008
2477void glTexCoord (float s, float t) 3009void glTexCoord (float s, float t)
2478 CODE: 3010 CODE:
2479 glTexCoord2f (s, t); 3011 glTexCoord2f (s, t);
2480 3012
3013void glRect (float x1, float y1, float x2, float y2)
3014 CODE:
3015 glRectf (x1, y1, x2, y2);
3016
3017void glRect_lineloop (float x1, float y1, float x2, float y2)
3018 CODE:
3019 glBegin (GL_LINE_LOOP);
3020 glVertex2f (x1, y1);
3021 glVertex2f (x2, y1);
3022 glVertex2f (x2, y2);
3023 glVertex2f (x1, y2);
3024 glEnd ();
3025
3026PROTOTYPES: ENABLE
3027
3028void glBegin (int mode)
3029
3030void glEnd ()
3031
3032void glPointSize (GLfloat size)
3033
3034void glLineWidth (GLfloat width)
3035
3036void glInterleavedArrays (int format, int stride, char *data)
3037
3038void glDrawElements (int mode, int count, int type, char *indices)
3039
3040# 1.2 void glDrawRangeElements (int mode, int start, int end
3041
2481void glTexEnv (int target, int pname, float param) 3042void glTexEnv (int target, int pname, float param)
2482 CODE: 3043 CODE:
2483 glTexEnvf (target, pname, param); 3044 glTexEnvf (target, pname, param);
2484 3045
2485void glTexParameter (int target, int pname, float param) 3046void 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) 3062void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2502 CODE: 3063 CODE:
2503 if (gl.SeparableFilter2D) 3064 if (gl.SeparableFilter2D)
2504 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3065 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2505 3066
2506void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3067void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2507 3068
2508void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3069void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2509 3070
2510void glDrawPixels (int width, int height, int format, int type, char *pixels) 3071void glDrawPixels (int width, int height, int format, int type, char *pixels)
2511 3072
… …
2537 3098
2538void glEndList () 3099void glEndList ()
2539 3100
2540void glCallList (int list) 3101void glCallList (int list)
2541 3102
3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3104
3105PROTOTYPES: DISABLE
3106
3107void
3108find_widget (SV *self, NV x, NV y)
3109 PPCODE:
3110{
3111 if (within_widget (self, x, y))
3112 XPUSHs (self);
3113}
3114
3115BOOT:
3116{
3117 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3118
3119 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3120 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3121 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3122 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3123}
3124
3125void
3126draw (SV *self)
3127 CODE:
3128{
3129 HV *hv;
3130 SV **svp;
3131 NV x, y, w, h;
3132 SV *draw_x_sv = GvSV (draw_x_gv);
3133 SV *draw_y_sv = GvSV (draw_y_gv);
3134 SV *draw_w_sv = GvSV (draw_w_gv);
3135 SV *draw_h_sv = GvSV (draw_h_gv);
3136 double draw_x, draw_y;
3137
3138 if (!SvROK (self))
3139 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3140
3141 hv = (HV *)SvRV (self);
3142
3143 if (SvTYPE (hv) != SVt_PVHV)
3144 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3145
3146 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3147 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3148
3149 if (!h || !w)
3150 XSRETURN_EMPTY;
3151
3152 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3153 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3154
3155 draw_x = SvNV (draw_x_sv) + x;
3156 draw_y = SvNV (draw_y_sv) + y;
3157
3158 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3159 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3160 XSRETURN_EMPTY;
3161
3162 sv_setnv (draw_x_sv, draw_x);
3163 sv_setnv (draw_y_sv, draw_y);
3164
3165 glPushMatrix ();
3166 glTranslated (x, y, 0);
3167
3168 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3169 {
3170 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3171
3172 if (svp && SvTRUE (*svp))
3173 {
3174 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3175 glEnable (GL_BLEND);
3176 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3177 glBegin (GL_QUADS);
3178 glVertex2f (0, 0);
3179 glVertex2f (w, 0);
3180 glVertex2f (w, h);
3181 glVertex2f (0, h);
3182 glEnd ();
3183 glDisable (GL_BLEND);
3184 }
3185 }
3186#if 0
3187 // draw borders, for debugging
3188 glPushMatrix ();
3189 glColor4f (1., 1., 0., 1.);
3190 glTranslatef (.5, .5, 0.);
3191 glBegin (GL_LINE_LOOP);
3192 glVertex2f (0 , 0);
3193 glVertex2f (w - 1, 0);
3194 glVertex2f (w - 1, h - 1);
3195 glVertex2f (0 , h - 1);
3196 glEnd ();
3197 glPopMatrix ();
3198#endif
3199 PUSHMARK (SP);
3200 XPUSHs (self);
3201 PUTBACK;
3202 call_method ("_draw", G_VOID | G_DISCARD);
3203 SPAGAIN;
3204
3205 glPopMatrix ();
3206
3207 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3208 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3209}
3210

Diff Legend

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