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.199 by root, Tue Jul 17 13:53:02 2007 UTC vs.
Revision 1.294 by root, Sat Dec 19 05:06:56 2009 UTC

… …
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
27#include <stdio.h> 32#include <stdio.h>
28#include <stdlib.h> 33#include <stdlib.h>
29 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
30#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
31#include <SDL_endian.h> 39#include <SDL_endian.h>
32#include <SDL_image.h> 40#include <SDL_image.h>
33#include <SDL_mixer.h> 41#include <SDL_mixer.h>
34#include <SDL_opengl.h> 42#include <SDL_opengl.h>
35 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
36#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
37#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
38 51
39#include <glib/gmacros.h> 52#include <glib/gmacros.h>
40 53
41#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
42 66
43#ifndef _WIN32 67#ifndef _WIN32
44# include <sys/types.h> 68# include <sys/types.h>
45# include <sys/socket.h> 69# include <sys/socket.h>
46# include <netinet/in.h> 70# include <netinet/in.h>
47# include <netinet/tcp.h> 71# include <netinet/tcp.h>
48# include <inttypes.h> 72# include <inttypes.h>
49#endif 73#endif
50 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 85
53#define FOW_DARKNESS 32 86#define FOW_DARKNESS 64
87#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */
54 88
55#define MAP_EXTEND_X 32 89#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 90#define MAP_EXTEND_Y 512
57 91
58#define MIN_FONT_HEIGHT 10 92#define MIN_FONT_HEIGHT 10
59 93
60#if 0 94/* mask out modifiers we are not interested in */
61# define PARACHUTE SDL_INIT_NOPARACHUTE 95#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
62#else 96
63# define PARACHUTE 0 97#define KMOD_LRAM 0x10000 // our extension
64#endif 98
99#define TEXID_SPEECH 1
100#define TEXID_NOFACE 2
101#define TEXID_HIDDEN 3
65 102
66static AV *texture_av; 103static AV *texture_av;
67 104
68static struct 105static struct
69{ 106{
… …
106 av_push (texture_av, (SV *)(size_t)name); 143 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name); 144 glDeleteTextures (1, &name);
108} 145}
109 146
110#include "texcache.c" 147#include "texcache.c"
148#include "rendercache.c"
111 149
112#include "pango-font.c" 150#include "pango-font.c"
113#include "pango-fontmap.c" 151#include "pango-fontmap.c"
114#include "pango-render.c" 152#include "pango-render.c"
115 153
154typedef IV DC__Channel;
155typedef SDL_RWops *DC__RW;
116typedef Mix_Chunk *CFPlus__MixChunk; 156typedef Mix_Chunk *DC__MixChunk;
117typedef Mix_Music *CFPlus__MixMusic; 157typedef Mix_Music *DC__MixMusic;
118 158
119typedef PangoFontDescription *CFPlus__Font; 159typedef PangoFontDescription *DC__Font;
120 160
121static int 161static int
122shape_attr_p (PangoLayoutRun *run) 162shape_attr_p (PangoLayoutRun *run)
123{ 163{
124 GSList *attrs = run->item->analysis.extra_attrs; 164 GSList *attrs = run->item->analysis.extra_attrs;
… …
138 178
139typedef struct cf_layout { 179typedef struct cf_layout {
140 PangoLayout *pl; 180 PangoLayout *pl;
141 float r, g, b, a; // default color for rgba mode 181 float r, g, b, a; // default color for rgba mode
142 int base_height; 182 int base_height;
143 CFPlus__Font font; 183 DC__Font font;
184 rc_t *rc;
144} *CFPlus__Layout; 185} *DC__Layout;
145 186
146static CFPlus__Font default_font; 187static DC__Font default_font;
147static PangoContext *opengl_context; 188static PangoContext *opengl_context;
148static PangoFontMap *opengl_fontmap; 189static PangoFontMap *opengl_fontmap;
149 190
150static void 191static void
151substitute_func (FcPattern *pattern, gpointer data) 192substitute_func (FcPattern *pattern, gpointer data)
… …
156#endif 197#endif
157 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 198 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
158} 199}
159 200
160static void 201static void
161layout_update_font (CFPlus__Layout self) 202layout_update_font (DC__Layout self)
162{ 203{
163 /* use a random scale factor to account for unknown descenders, 0.8 works 204 /* use a random scale factor to account for unknown descenders, 0.8 works
164 * reasonably well with bitstream vera 205 * reasonably well with dejavu/bistream fonts
165 */ 206 */
166 PangoFontDescription *font = self->font ? self->font : default_font; 207 PangoFontDescription *font = self->font ? self->font : default_font;
167 208
168 pango_font_description_set_absolute_size (font, 209 pango_font_description_set_absolute_size (font,
169 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 210 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
170 211
171 pango_layout_set_font_description (self->pl, font); 212 pango_layout_set_font_description (self->pl, font);
172} 213}
173 214
174static void 215static void
175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 216layout_get_pixel_size (DC__Layout self, int *w, int *h)
176{ 217{
177 PangoRectangle rect; 218 PangoRectangle rect;
178 219
179 // get_pixel_* wrongly rounds down 220 // get_pixel_* wrongly rounds down
180 pango_layout_get_extents (self->pl, 0, &rect); 221 pango_layout_get_extents (self->pl, 0, &rect);
… …
191 232
192typedef uint16_t tileid; 233typedef uint16_t tileid;
193typedef uint16_t faceid; 234typedef uint16_t faceid;
194 235
195typedef struct { 236typedef struct {
196 int name; 237 GLuint name;
197 int w, h; 238 int w, h;
198 float s, t; 239 float s, t;
199 uint8_t r, g, b, a; 240 uint8_t r, g, b, a;
200 tileid smoothtile; 241 tileid smoothtile;
201 uint8_t smoothlevel; 242 uint8_t smoothlevel;
243 uint8_t unused; /* set to zero on use */
202} maptex; 244} maptex;
203 245
204typedef struct { 246typedef struct {
205 uint32_t player; 247 uint32_t player;
206 tileid tile[3]; 248 tileid tile[3];
… …
219 int faces; tileid *face2tile; // [faceid] 261 int faces; tileid *face2tile; // [faceid]
220 int texs; maptex *tex; // [tileid] 262 int texs; maptex *tex; // [tileid]
221 263
222 int32_t rows; 264 int32_t rows;
223 maprow *row; 265 maprow *row;
224} *CFPlus__Map; 266} *DC__Map;
225 267
226static char * 268static char *
227prepend (char *ptr, int sze, int inc) 269prepend (char *ptr, int sze, int inc)
228{ 270{
229 char *p; 271 char *p;
… …
267 self->texs *= 2; 309 self->texs *= 2;
268 } 310 }
269} 311}
270 312
271static maprow * 313static maprow *
272map_get_row (CFPlus__Map self, int y) 314map_get_row (DC__Map self, int y)
273{ 315{
274 if (0 > y) 316 if (0 > y)
275 { 317 {
276 int extend = - y + MAP_EXTEND_Y; 318 int extend = - y + MAP_EXTEND_Y;
277 Prepend (maprow, self->row, self->rows, extend); 319 Prepend (maprow, self->row, self->rows, extend);
… …
315 357
316 return row->col + (x - row->c0); 358 return row->col + (x - row->c0);
317} 359}
318 360
319static mapcell * 361static mapcell *
320map_get_cell (CFPlus__Map self, int x, int y) 362map_get_cell (DC__Map self, int x, int y)
321{ 363{
322 return row_get_cell (map_get_row (self, y), x); 364 return row_get_cell (map_get_row (self, y), x);
323} 365}
324 366
325static void 367static void
326map_clear (CFPlus__Map self) 368map_clear (DC__Map self)
327{ 369{
328 int r; 370 int r;
329 371
330 for (r = 0; r < self->rows; r++) 372 for (r = 0; r < self->rows; r++)
331 Safefree (self->row[r].col); 373 Safefree (self->row[r].col);
… …
338 self->oy = 0; 380 self->oy = 0;
339 self->row = 0; 381 self->row = 0;
340 self->rows = 0; 382 self->rows = 0;
341} 383}
342 384
385#define CELL_CLEAR(cell) \
386 do { \
387 if ((cell)->player) \
388 (cell)->tile [2] = 0; \
389 (cell)->darkness = 0; \
390 (cell)->stat_hp = 0; \
391 (cell)->flags = 0; \
392 (cell)->player = 0; \
393 } while (0)
394
343static void 395static void
344map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 396map_blank (DC__Map self, int x0, int y0, int w, int h)
345{ 397{
346 int x, y; 398 int x, y;
347 maprow *row; 399 maprow *row;
348 mapcell *cell; 400 mapcell *cell;
349 401
… …
361 if (x >= row->c1) 413 if (x >= row->c1)
362 break; 414 break;
363 415
364 cell = row->col + x - row->c0; 416 cell = row->col + x - row->c0;
365 417
366 cell->darkness = 0; 418 CELL_CLEAR (cell);
367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
370 } 419 }
371 } 420 }
372} 421}
373 422
374typedef struct { 423typedef struct {
… …
428 n |= n >> 16; 477 n |= n >> 16;
429 478
430 return n + 1; 479 return n + 1;
431} 480}
432 481
482static unsigned int
483popcount (unsigned int n)
484{
485 n -= (n >> 1) & 0x55555555U;
486 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
487 n = ((n >> 4) + n) & 0x0f0f0f0fU;
488 n *= 0x01010101U;
489
490 return n >> 24;
491}
492
433/* SDL should provide this, really. */ 493/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300 494#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314 495#define SDLK_MODIFIER_MAX 314
436 496
437MODULE = CFPlus PACKAGE = CFPlus 497/******************************************************************************/
498
499static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
500static GV *hover_gv;
501
502static int
503within_widget (SV *widget, NV x, NV y)
504{
505 HV *self;
506 SV **svp;
507 NV wx, ww, wy, wh;
508
509 if (!SvROK (widget))
510 return 0;
511
512 self = (HV *)SvRV (widget);
513
514 if (SvTYPE (self) != SVt_PVHV)
515 return 0;
516
517 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
518 if (y < wy)
519 return 0;
520
521 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
522 if (y >= wy + wh)
523 return 0;
524
525 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
526 if (x < wx)
527 return 0;
528
529 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
530 if (x >= wx + ww)
531 return 0;
532
533 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
534 if (!svp || !SvTRUE (*svp))
535 return 0;
536
537 return 1;
538}
539
540/******************************************************************************/
541
542/* process keyboard modifiers */
543static int
544mod_munge (int mod)
545{
546 mod &= MOD_MASK;
547
548 if (mod & (KMOD_META | KMOD_ALT))
549 mod |= KMOD_LRAM;
550
551 return mod;
552}
553
554static void
555deliantra_main ()
556{
557 char *argv[] = { 0 };
558 call_argv ("::main", G_DISCARD | G_VOID, argv);
559}
560
561#ifdef __MACOSX__
562 /* to due surprising braindamage on the side of SDL design, we
563 * do some mind-boggling hack here: SDL requires a custom main()
564 * on OS X, so... we provide one and call the original main(), which,
565 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
566 * and which calls our main (== SDL_main) back.
567 */
568 extern C_LINKAGE int
569 main (int argc, char *argv[])
570 {
571 deliantra_main ();
572 }
573
574 #undef main
575
576 extern C_LINKAGE int main (int argc, char *argv[]);
577
578 static void
579 SDL_braino (void)
580 {
581 char *argv[] = { "deliantra client", 0 };
582 (main) (1, argv);
583 }
584#else
585 static void
586 SDL_braino (void)
587 {
588 deliantra_main ();
589 }
590#endif
591
592MODULE = Deliantra::Client PACKAGE = DC
438 593
439PROTOTYPES: ENABLE 594PROTOTYPES: ENABLE
440 595
441BOOT: 596BOOT:
442{ 597{
443 HV *stash = gv_stashpv ("CFPlus", 1); 598 HV *stash = gv_stashpv ("DC", 1);
444 static const struct { 599 static const struct {
445 const char *name; 600 const char *name;
446 IV iv; 601 IV iv;
447 } *civ, const_iv[] = { 602 } *civ, const_iv[] = {
448# define const_iv(name) { # name, (IV)name } 603# define const_iv(name) { # name, (IV)name }
… …
470 625
471 const_iv (SDL_APPINPUTFOCUS), 626 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS), 627 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE), 628 const_iv (SDL_APPACTIVE),
474 629
630
631 const_iv (SDLK_UNKNOWN),
632 const_iv (SDLK_FIRST),
633 const_iv (SDLK_BACKSPACE),
634 const_iv (SDLK_TAB),
635 const_iv (SDLK_CLEAR),
636 const_iv (SDLK_RETURN),
637 const_iv (SDLK_PAUSE),
638 const_iv (SDLK_ESCAPE),
639 const_iv (SDLK_SPACE),
640 const_iv (SDLK_EXCLAIM),
641 const_iv (SDLK_QUOTEDBL),
642 const_iv (SDLK_HASH),
643 const_iv (SDLK_DOLLAR),
644 const_iv (SDLK_AMPERSAND),
645 const_iv (SDLK_QUOTE),
646 const_iv (SDLK_LEFTPAREN),
647 const_iv (SDLK_RIGHTPAREN),
648 const_iv (SDLK_ASTERISK),
649 const_iv (SDLK_PLUS),
650 const_iv (SDLK_COMMA),
651 const_iv (SDLK_MINUS),
652 const_iv (SDLK_PERIOD),
653 const_iv (SDLK_SLASH),
654 const_iv (SDLK_0),
655 const_iv (SDLK_1),
656 const_iv (SDLK_2),
657 const_iv (SDLK_3),
658 const_iv (SDLK_4),
659 const_iv (SDLK_5),
660 const_iv (SDLK_6),
661 const_iv (SDLK_7),
662 const_iv (SDLK_8),
663 const_iv (SDLK_9),
664 const_iv (SDLK_COLON),
665 const_iv (SDLK_SEMICOLON),
666 const_iv (SDLK_LESS),
667 const_iv (SDLK_EQUALS),
668 const_iv (SDLK_GREATER),
669 const_iv (SDLK_QUESTION),
670 const_iv (SDLK_AT),
671
672 const_iv (SDLK_LEFTBRACKET),
673 const_iv (SDLK_BACKSLASH),
674 const_iv (SDLK_RIGHTBRACKET),
675 const_iv (SDLK_CARET),
676 const_iv (SDLK_UNDERSCORE),
677 const_iv (SDLK_BACKQUOTE),
678 const_iv (SDLK_DELETE),
679
680 const_iv (SDLK_FIRST),
681 const_iv (SDLK_LAST),
475 const_iv (SDLK_KP0), 682 const_iv (SDLK_KP0),
476 const_iv (SDLK_KP1), 683 const_iv (SDLK_KP1),
477 const_iv (SDLK_KP2), 684 const_iv (SDLK_KP2),
478 const_iv (SDLK_KP3), 685 const_iv (SDLK_KP3),
479 const_iv (SDLK_KP4), 686 const_iv (SDLK_KP4),
… …
551 const_iv (KMOD_LMETA), 758 const_iv (KMOD_LMETA),
552 const_iv (KMOD_RMETA), 759 const_iv (KMOD_RMETA),
553 const_iv (KMOD_NUM), 760 const_iv (KMOD_NUM),
554 const_iv (KMOD_CAPS), 761 const_iv (KMOD_CAPS),
555 const_iv (KMOD_MODE), 762 const_iv (KMOD_MODE),
763
764 const_iv (KMOD_LRAM),
765
766 const_iv (MIX_DEFAULT_FORMAT),
767
768 const_iv (SDL_INIT_TIMER),
769 const_iv (SDL_INIT_AUDIO),
770 const_iv (SDL_INIT_VIDEO),
771 const_iv (SDL_INIT_CDROM),
772 const_iv (SDL_INIT_JOYSTICK),
773 const_iv (SDL_INIT_EVERYTHING),
774 const_iv (SDL_INIT_NOPARACHUTE),
775 const_iv (SDL_INIT_EVENTTHREAD),
776
777 const_iv (SDL_GL_RED_SIZE),
778 const_iv (SDL_GL_GREEN_SIZE),
779 const_iv (SDL_GL_BLUE_SIZE),
780 const_iv (SDL_GL_ALPHA_SIZE),
781 const_iv (SDL_GL_DOUBLEBUFFER),
782 const_iv (SDL_GL_BUFFER_SIZE),
783 const_iv (SDL_GL_DEPTH_SIZE),
784 const_iv (SDL_GL_STENCIL_SIZE),
785 const_iv (SDL_GL_ACCUM_RED_SIZE),
786 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
787 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
788 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
789 const_iv (SDL_GL_STEREO),
790 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
791 const_iv (SDL_GL_MULTISAMPLESAMPLES),
792 const_iv (SDL_GL_ACCELERATED_VISUAL),
793 const_iv (SDL_GL_SWAP_CONTROL),
794
795 const_iv (FOW_DARKNESS)
556# undef const_iv 796# undef const_iv
557 }; 797 };
558 798
559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 799 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
578 818
579NV floor (NV x) 819NV floor (NV x)
580 820
581NV ceil (NV x) 821NV ceil (NV x)
582 822
823IV minpot (UV n)
824
825IV popcount (UV n)
826
583void 827void
584pango_init () 828pango_init ()
585 CODE: 829 CODE:
586{ 830{
587 opengl_fontmap = pango_opengl_font_map_new (); 831 opengl_fontmap = pango_opengl_font_map_new ();
588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 832 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 833 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
834 /*pango_context_set_font_description (opengl_context, default_font);*/
835#if PANGO_VERSION_CHECK (1, 15, 2)
836 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
837 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
838#endif
590} 839}
591 840
592int 841char *SDL_GetError ()
593SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
594 842
595void 843void SDL_braino ()
844
845int SDL_Init (U32 flags)
846
847int SDL_InitSubSystem (U32 flags)
848
849void SDL_QuitSubSystem (U32 flags)
850
596SDL_Quit () 851void SDL_Quit ()
597 852
853int SDL_GL_SetAttribute (int attr, int value)
854
855int SDL_GL_GetAttribute (int attr)
856 CODE:
857 if (SDL_GL_GetAttribute (attr, &RETVAL))
858 XSRETURN_UNDEF;
859 OUTPUT:
860 RETVAL
861
598void 862void
599SDL_ListModes () 863SDL_ListModes (int rgb, int alpha)
600 PPCODE: 864 PPCODE:
601{ 865{
602 SDL_Rect **m; 866 SDL_Rect **m;
603 867
604 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 868 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
605 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 869 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
606 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 870 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
607 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 871 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
608 872
609 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 873 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
610 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 874 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
611 875
612 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 876 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 879 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
616 880
617 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 881 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
618#if SDL_VERSION_ATLEAST(1,2,10)
619 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
620 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 882 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
621#endif
622
623 SDL_EnableUNICODE (1);
624 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
625 883
626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 884 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
627 885
628 if (m && m != (SDL_Rect **)-1) 886 if (m && m != (SDL_Rect **)-1)
629 while (*m) 887 while (*m)
630 { 888 {
889 if ((*m)->w >= 400 && (*m)->h >= 300)
890 {
631 AV *av = newAV (); 891 AV *av = newAV ();
632 av_push (av, newSViv ((*m)->w)); 892 av_push (av, newSViv ((*m)->w));
633 av_push (av, newSViv ((*m)->h)); 893 av_push (av, newSViv ((*m)->h));
894 av_push (av, newSViv (rgb));
895 av_push (av, newSViv (alpha));
634 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 896 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
897 }
635 898
636 ++m; 899 ++m;
637 } 900 }
638} 901}
639 902
640char *
641SDL_GetError ()
642
643int 903int
644SDL_SetVideoMode (int w, int h, int fullscreen) 904SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
645 CODE: 905 CODE:
906{
907 SDL_EnableUNICODE (1);
908 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
909
910 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
911 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
912 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
913 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
914
646 RETVAL = !!SDL_SetVideoMode ( 915 RETVAL = !!SDL_SetVideoMode (
647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 916 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
648 ); 917 );
918
649 if (RETVAL) 919 if (RETVAL)
650 { 920 {
651 av_clear (texture_av); 921 av_clear (texture_av);
652 922
653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 923 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 924#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
655# include "glfunc.h" 925#include "glfunc.h"
656# undef GL_FUNC 926#undef GL_FUNC
657
658 } 927 }
928}
659 OUTPUT: 929 OUTPUT:
660 RETVAL 930 RETVAL
661 931
662void 932void
663SDL_GL_SwapBuffers () 933SDL_GL_SwapBuffers ()
… …
665char * 935char *
666SDL_GetKeyName (int sym) 936SDL_GetKeyName (int sym)
667 937
668int 938int
669SDL_GetAppState () 939SDL_GetAppState ()
940
941int
942SDL_GetModState ()
670 943
671void 944void
672poll_events () 945poll_events ()
673 PPCODE: 946 PPCODE:
674{ 947{
… …
684 { 957 {
685 case SDL_KEYDOWN: 958 case SDL_KEYDOWN:
686 case SDL_KEYUP: 959 case SDL_KEYUP:
687 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 960 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
688 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 961 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
689 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 962 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
690 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 963 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
691 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 964 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
692 break; 965 break;
693 966
694 case SDL_ACTIVEEVENT: 967 case SDL_ACTIVEEVENT:
695 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 968 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
713 x = ev.motion.x; 986 x = ev.motion.x;
714 y = ev.motion.y; 987 y = ev.motion.y;
715 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 988 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
716 } 989 }
717 990
718 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 991 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
719 hv_store (hv, "state", 5, newSViv (state), 0); 992 hv_store (hv, "state", 5, newSViv (state), 0);
720 hv_store (hv, "x", 1, newSViv (x), 0); 993 hv_store (hv, "x", 1, newSViv (x), 0);
721 hv_store (hv, "y", 1, newSViv (y), 0); 994 hv_store (hv, "y", 1, newSViv (y), 0);
722 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 995 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
723 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 996 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
724 } 997 }
725 break; 998 break;
726 999
727 case SDL_MOUSEBUTTONDOWN: 1000 case SDL_MOUSEBUTTONDOWN:
728 case SDL_MOUSEBUTTONUP: 1001 case SDL_MOUSEBUTTONUP:
729 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
730 1003
731 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1004 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
732 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1005 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
733 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1006 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
734 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1007 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
739 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1012 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
740 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1013 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
741 break; 1014 break;
742 } 1015 }
743 1016
744 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1017 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
745 } 1018 }
746} 1019}
747 1020
748int 1021int
749Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1022Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
750 POSTCALL: 1023 POSTCALL:
751 Mix_HookMusicFinished (music_finished); 1024 Mix_HookMusicFinished (music_finished);
752 Mix_ChannelFinished (channel_finished); 1025 Mix_ChannelFinished (channel_finished);
753 1026
754void 1027void
1028Mix_QuerySpec ()
1029 PPCODE:
1030{
1031 int freq, channels;
1032 Uint16 format;
1033
1034 if (Mix_QuerySpec (&freq, &format, &channels))
1035 {
1036 EXTEND (SP, 3);
1037 PUSHs (sv_2mortal (newSViv (freq)));
1038 PUSHs (sv_2mortal (newSViv (format)));
1039 PUSHs (sv_2mortal (newSViv (channels)));
1040 }
1041}
1042
1043void
755Mix_CloseAudio () 1044Mix_CloseAudio ()
756 1045
757int 1046int
758Mix_AllocateChannels (int numchans = -1) 1047Mix_AllocateChannels (int numchans = -1)
1048
1049const char *
1050Mix_GetError ()
759 1051
760void 1052void
761lowdelay (int fd, int val = 1) 1053lowdelay (int fd, int val = 1)
762 CODE: 1054 CODE:
763 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1055 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
789 } 1081 }
790 } 1082 }
791#endif 1083#endif
792} 1084}
793 1085
794void 1086int
795add_font (char *file) 1087add_font (char *file)
796 CODE: 1088 CODE:
797 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1089 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1090 OUTPUT:
1091 RETVAL
798 1092
799void 1093void
800load_image_inline (SV *image_) 1094load_image_inline (SV *image_)
801 ALIAS: 1095 ALIAS:
802 load_image_file = 1 1096 load_image_file = 1
… …
805 STRLEN image_len; 1099 STRLEN image_len;
806 char *image = (char *)SvPVbyte (image_, image_len); 1100 char *image = (char *)SvPVbyte (image_, image_len);
807 SDL_Surface *surface, *surface2; 1101 SDL_Surface *surface, *surface2;
808 SDL_PixelFormat fmt; 1102 SDL_PixelFormat fmt;
809 SDL_RWops *rw = ix 1103 SDL_RWops *rw = ix
810 ? SDL_RWFromFile (image, "r") 1104 ? SDL_RWFromFile (image, "rb")
811 : SDL_RWFromConstMem (image, image_len); 1105 : SDL_RWFromConstMem (image, image_len);
812 1106
813 if (!rw) 1107 if (!rw)
814 croak ("load_image: %s", SDL_GetError ()); 1108 croak ("load_image: %s", SDL_GetError ());
815 1109
… …
888void 1182void
889error (char *message) 1183error (char *message)
890 CODE: 1184 CODE:
891 fprintf (stderr, "ERROR: %s\n", message); 1185 fprintf (stderr, "ERROR: %s\n", message);
892#ifdef _WIN32 1186#ifdef _WIN32
893 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1187 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
894#endif 1188#endif
895 1189
896void 1190void
897fatal (char *message) 1191fatal (char *message)
898 CODE: 1192 CODE:
899 fprintf (stderr, "FATAL: %s\n", message); 1193 fprintf (stderr, "FATAL: %s\n", message);
900#ifdef _WIN32 1194#ifdef _WIN32
901 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1195 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
902#endif 1196#endif
903 _exit (1); 1197 _exit (1);
904 1198
905void 1199void
906_exit (int retval = 0) 1200_exit (int retval = 0)
… …
918#if DEBUG 1212#if DEBUG
919 VALGRIND_DO_LEAK_CHECK; 1213 VALGRIND_DO_LEAK_CHECK;
920#endif 1214#endif
921} 1215}
922 1216
923MODULE = CFPlus PACKAGE = CFPlus::Font 1217int
1218SvREFCNT (SV *sv)
1219 CODE:
1220 RETVAL = SvREFCNT (sv);
1221 OUTPUT:
1222 RETVAL
924 1223
925CFPlus::Font 1224MODULE = Deliantra::Client PACKAGE = DC::Font
1225
1226PROTOTYPES: DISABLE
1227
1228DC::Font
926new_from_file (SV *class, char *path, int id = 0) 1229new_from_file (SV *class, char *path, int id = 0)
927 CODE: 1230 CODE:
928{ 1231{
929 int count; 1232 int count;
930 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1233 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
933} 1236}
934 OUTPUT: 1237 OUTPUT:
935 RETVAL 1238 RETVAL
936 1239
937void 1240void
938DESTROY (CFPlus::Font self) 1241DESTROY (DC::Font self)
939 CODE: 1242 CODE:
940 pango_font_description_free (self); 1243 pango_font_description_free (self);
941 1244
942void 1245void
943make_default (CFPlus::Font self) 1246make_default (DC::Font self)
1247 PROTOTYPE: $
944 CODE: 1248 CODE:
945 default_font = self; 1249 default_font = self;
946 1250
947MODULE = CFPlus PACKAGE = CFPlus::Layout 1251MODULE = Deliantra::Client PACKAGE = DC::Layout
948 1252
1253PROTOTYPES: DISABLE
1254
949void 1255void
950reset_glyph_cache () 1256glyph_cache_backup ()
1257 PROTOTYPE:
951 CODE: 1258 CODE:
1259 tc_backup ();
1260
1261void
1262glyph_cache_restore ()
1263 PROTOTYPE:
1264 CODE:
952 tc_clear (); 1265 tc_restore ();
953 1266
954CFPlus::Layout 1267DC::Layout
955new (SV *class) 1268new (SV *class)
956 CODE: 1269 CODE:
957 New (0, RETVAL, 1, struct cf_layout); 1270 New (0, RETVAL, 1, struct cf_layout);
958 1271
959 RETVAL->pl = pango_layout_new (opengl_context); 1272 RETVAL->pl = pango_layout_new (opengl_context);
… …
961 RETVAL->g = 1.; 1274 RETVAL->g = 1.;
962 RETVAL->b = 1.; 1275 RETVAL->b = 1.;
963 RETVAL->a = 1.; 1276 RETVAL->a = 1.;
964 RETVAL->base_height = MIN_FONT_HEIGHT; 1277 RETVAL->base_height = MIN_FONT_HEIGHT;
965 RETVAL->font = 0; 1278 RETVAL->font = 0;
1279 RETVAL->rc = rc_alloc ();
966 1280
967 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1281 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
968 layout_update_font (RETVAL); 1282 layout_update_font (RETVAL);
969 OUTPUT: 1283 OUTPUT:
970 RETVAL 1284 RETVAL
971 1285
972void 1286void
973DESTROY (CFPlus::Layout self) 1287DESTROY (DC::Layout self)
974 CODE: 1288 CODE:
975 g_object_unref (self->pl); 1289 g_object_unref (self->pl);
1290 rc_free (self->rc);
976 Safefree (self); 1291 Safefree (self);
977 1292
978void 1293void
979set_text (CFPlus::Layout self, SV *text_) 1294set_text (DC::Layout self, SV *text_)
980 CODE: 1295 CODE:
981{ 1296{
982 STRLEN textlen; 1297 STRLEN textlen;
983 char *text = SvPVutf8 (text_, textlen); 1298 char *text = SvPVutf8 (text_, textlen);
984 1299
985 pango_layout_set_text (self->pl, text, textlen); 1300 pango_layout_set_text (self->pl, text, textlen);
986} 1301}
987 1302
988void 1303void
989set_markup (CFPlus::Layout self, SV *text_) 1304set_markup (DC::Layout self, SV *text_)
990 CODE: 1305 CODE:
991{ 1306{
992 STRLEN textlen; 1307 STRLEN textlen;
993 char *text = SvPVutf8 (text_, textlen); 1308 char *text = SvPVutf8 (text_, textlen);
994 1309
995 pango_layout_set_markup (self->pl, text, textlen); 1310 pango_layout_set_markup (self->pl, text, textlen);
996} 1311}
997 1312
998void 1313void
999set_shapes (CFPlus::Layout self, ...) 1314set_shapes (DC::Layout self, ...)
1000 CODE: 1315 CODE:
1001{ 1316{
1002 PangoAttrList *attrs = 0; 1317 PangoAttrList *attrs = 0;
1003 const char *text = pango_layout_get_text (self->pl); 1318 const char *text = pango_layout_get_text (self->pl);
1004 const char *pos = text; 1319 const char *pos = text;
… …
1039 if (attrs) 1354 if (attrs)
1040 pango_layout_set_attributes (self->pl, attrs); 1355 pango_layout_set_attributes (self->pl, attrs);
1041} 1356}
1042 1357
1043void 1358void
1044get_shapes (CFPlus::Layout self) 1359get_shapes (DC::Layout self)
1045 PPCODE: 1360 PPCODE:
1046{ 1361{
1047 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1362 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1048 1363
1049 do 1364 do
1050 { 1365 {
1051 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1366 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1052 1367
1053 if (run && shape_attr_p (run)) 1368 if (run && shape_attr_p (run))
1054 { 1369 {
1055 PangoRectangle extents; 1370 PangoRectangle extents;
1056 pango_layout_iter_get_run_extents (iter, 0, &extents); 1371 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1064 1379
1065 pango_layout_iter_free (iter); 1380 pango_layout_iter_free (iter);
1066} 1381}
1067 1382
1068int 1383int
1069has_wrapped (CFPlus::Layout self) 1384has_wrapped (DC::Layout self)
1070 CODE: 1385 CODE:
1071{ 1386{
1072 int lines = 1; 1387 int lines = 1;
1073 const char *text = pango_layout_get_text (self->pl); 1388 const char *text = pango_layout_get_text (self->pl);
1074 1389
… …
1079} 1394}
1080 OUTPUT: 1395 OUTPUT:
1081 RETVAL 1396 RETVAL
1082 1397
1083SV * 1398SV *
1084get_text (CFPlus::Layout self) 1399get_text (DC::Layout self)
1085 CODE: 1400 CODE:
1086 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1401 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1087 sv_utf8_decode (RETVAL); 1402 sv_utf8_decode (RETVAL);
1088 OUTPUT: 1403 OUTPUT:
1089 RETVAL 1404 RETVAL
1090 1405
1091void 1406void
1092set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1407set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1093 CODE: 1408 CODE:
1094 self->r = r; 1409 self->r = r;
1095 self->g = g; 1410 self->g = g;
1096 self->b = b; 1411 self->b = b;
1097 self->a = a; 1412 self->a = a;
1098 1413
1099void 1414void
1100set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1415set_font (DC::Layout self, DC::Font font = 0)
1101 CODE: 1416 CODE:
1102 if (self->font != font) 1417 if (self->font != font)
1103 { 1418 {
1104 self->font = font; 1419 self->font = font;
1105 layout_update_font (self); 1420 layout_update_font (self);
1106 } 1421 }
1107 1422
1108void 1423void
1109set_height (CFPlus::Layout self, int base_height) 1424set_height (DC::Layout self, int base_height)
1110 CODE: 1425 CODE:
1111 if (self->base_height != base_height) 1426 if (self->base_height != base_height)
1112 { 1427 {
1113 self->base_height = base_height; 1428 self->base_height = base_height;
1114 layout_update_font (self); 1429 layout_update_font (self);
1115 } 1430 }
1116 1431
1117void 1432void
1118set_width (CFPlus::Layout self, int max_width = -1) 1433set_width (DC::Layout self, int max_width = -1)
1119 CODE: 1434 CODE:
1120 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1435 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1121 1436
1122void 1437void
1123set_indent (CFPlus::Layout self, int indent) 1438set_indent (DC::Layout self, int indent)
1124 CODE: 1439 CODE:
1125 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1440 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1126 1441
1127void 1442void
1128set_spacing (CFPlus::Layout self, int spacing) 1443set_spacing (DC::Layout self, int spacing)
1129 CODE: 1444 CODE:
1130 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1445 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1131 1446
1132void 1447void
1133set_ellipsise (CFPlus::Layout self, int ellipsise) 1448set_ellipsise (DC::Layout self, int ellipsise)
1134 CODE: 1449 CODE:
1135 pango_layout_set_ellipsize (self->pl, 1450 pango_layout_set_ellipsize (self->pl,
1136 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1451 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1137 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1452 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1138 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1453 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1139 : PANGO_ELLIPSIZE_NONE 1454 : PANGO_ELLIPSIZE_NONE
1140 ); 1455 );
1141 1456
1142void 1457void
1143set_single_paragraph_mode (CFPlus::Layout self, int spm) 1458set_single_paragraph_mode (DC::Layout self, int spm)
1144 CODE: 1459 CODE:
1145 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1460 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1146 1461
1147void 1462void
1148size (CFPlus::Layout self) 1463size (DC::Layout self)
1149 PPCODE: 1464 PPCODE:
1150{ 1465{
1151 int w, h; 1466 int w, h;
1152 1467
1153 layout_get_pixel_size (self, &w, &h); 1468 layout_get_pixel_size (self, &w, &h);
… …
1156 PUSHs (sv_2mortal (newSViv (w))); 1471 PUSHs (sv_2mortal (newSViv (w)));
1157 PUSHs (sv_2mortal (newSViv (h))); 1472 PUSHs (sv_2mortal (newSViv (h)));
1158} 1473}
1159 1474
1160int 1475int
1161descent (CFPlus::Layout self) 1476descent (DC::Layout self)
1162 CODE: 1477 CODE:
1163{ 1478{
1164 PangoRectangle rect; 1479 PangoRectangle rect;
1165 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1480 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1166 pango_layout_line_get_pixel_extents (line, 0, &rect); 1481 pango_layout_line_get_pixel_extents (line, 0, &rect);
1167 RETVAL = PANGO_DESCENT (rect); 1482 RETVAL = PANGO_DESCENT (rect);
1168} 1483}
1169 OUTPUT: 1484 OUTPUT:
1170 RETVAL 1485 RETVAL
1171 1486
1172int 1487int
1173xy_to_index (CFPlus::Layout self, int x, int y) 1488xy_to_index (DC::Layout self, int x, int y)
1174 CODE: 1489 CODE:
1175{ 1490{
1176 int index, trailing; 1491 int index, trailing;
1177 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1492 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1178 RETVAL = index + trailing; 1493 RETVAL = index + trailing;
1179} 1494}
1180 OUTPUT: 1495 OUTPUT:
1181 RETVAL 1496 RETVAL
1182 1497
1183void 1498void
1184cursor_pos (CFPlus::Layout self, int index) 1499cursor_pos (DC::Layout self, int index)
1185 PPCODE: 1500 PPCODE:
1186{ 1501{
1187 PangoRectangle strong_pos; 1502 PangoRectangle pos;
1188 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1503 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1189 1504
1190 EXTEND (SP, 3); 1505 EXTEND (SP, 3);
1191 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1506 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1192 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1507 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1193 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1508 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1194} 1509}
1195 1510
1196void 1511void
1197index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1512index_to_line_x (DC::Layout self, int index, int trailing = 0)
1198 PPCODE: 1513 PPCODE:
1199{ 1514{
1200 int line, x; 1515 int line, x;
1201 1516
1202 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1517 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1518#if !PANGO_VERSION_CHECK (1, 17, 3)
1203 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1519 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1204 1520 --line;
1521#endif
1205 EXTEND (SP, 2); 1522 EXTEND (SP, 2);
1206 PUSHs (sv_2mortal (newSViv (line - 1))); 1523 PUSHs (sv_2mortal (newSViv (line)));
1207 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1524 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1208} 1525}
1209 1526
1210void 1527void
1211line_x_to_index (CFPlus::Layout self, int line, int x) 1528line_x_to_index (DC::Layout self, int line, int x)
1212 PPCODE: 1529 PPCODE:
1213{ 1530{
1214 PangoLayoutLine *lp; 1531 PangoLayoutLine *lp;
1215 int index, trailing; 1532 int index, trailing;
1216 1533
1217 if (line < 0) 1534 if (line < 0)
1218 XSRETURN_EMPTY; 1535 XSRETURN_EMPTY;
1219 1536
1220 if (!(lp = pango_layout_get_line (self->pl, line))) 1537 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1221 XSRETURN_EMPTY; /* do better */ 1538 XSRETURN_EMPTY; /* do better */
1222 1539
1223 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1540 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1224 1541
1225 EXTEND (SP, 2); 1542 EXTEND (SP, 2);
… …
1231 PUSHs (sv_2mortal (newSViv (trailing))); 1548 PUSHs (sv_2mortal (newSViv (trailing)));
1232 } 1549 }
1233} 1550}
1234 1551
1235void 1552void
1236render (CFPlus::Layout self, float x, float y, int flags = 0) 1553render (DC::Layout self, float x, float y, int flags = 0)
1237 PPCODE: 1554 CODE:
1555 rc_clear (self->rc);
1238 pango_opengl_render_layout_subpixel ( 1556 pango_opengl_render_layout_subpixel (
1239 self->pl, 1557 self->pl,
1558 self->rc,
1240 x * PANGO_SCALE, y * PANGO_SCALE, 1559 x * PANGO_SCALE, y * PANGO_SCALE,
1241 self->r, self->g, self->b, self->a, 1560 self->r, self->g, self->b, self->a,
1242 flags 1561 flags
1243 ); 1562 );
1563 // we assume that context_change actually clears/frees stuff
1564 // and does not do any recomputation...
1565 pango_layout_context_changed (self->pl);
1244 1566
1245MODULE = CFPlus PACKAGE = CFPlus::Texture
1246
1247int minpot (int n)
1248
1249void 1567void
1250pad2pot (SV *data_, SV *w_, SV *h_) 1568draw (DC::Layout self)
1251 CODE: 1569 CODE:
1252{ 1570{
1253 int ow = SvIV (w_); 1571 glEnable (GL_TEXTURE_2D);
1254 int oh = SvIV (h_); 1572 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1573 glEnable (GL_BLEND);
1574 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1575 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1576 glEnable (GL_ALPHA_TEST);
1577 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1255 1578
1256 if (ow && oh) 1579 rc_draw (self->rc);
1580
1581 glDisable (GL_ALPHA_TEST);
1582 glDisable (GL_BLEND);
1583 glDisable (GL_TEXTURE_2D);
1584}
1585
1586MODULE = Deliantra::Client PACKAGE = DC::Texture
1587
1588PROTOTYPES: ENABLE
1589
1590void
1591pad (SV *data_, int ow, int oh, int nw, int nh)
1592 CODE:
1593{
1594 if ((nw != ow || nh != oh) && SvOK (data_))
1257 { 1595 {
1258 int nw = minpot (ow);
1259 int nh = minpot (oh);
1260
1261 if (nw != ow || nh != oh)
1262 {
1263 if (SvOK (data_))
1264 {
1265 STRLEN datalen; 1596 STRLEN datalen;
1266 char *data = SvPVbyte (data_, datalen); 1597 char *data = SvPVbyte (data_, datalen);
1267 int bpp = datalen / (ow * oh); 1598 int bpp = datalen / (ow * oh);
1268 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1599 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1269 1600
1270 SvPOK_only (result_); 1601 SvPOK_only (result_);
1271 SvCUR_set (result_, nw * nh * bpp); 1602 SvCUR_set (result_, nw * nh * bpp);
1272 1603
1273 memset (SvPVX (result_), 0, nw * nh * bpp); 1604 memset (SvPVX (result_), 0, nw * nh * bpp);
1274 while (oh--) 1605 while (oh--)
1275 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1606 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1276 1607
1277 sv_setsv (data_, result_); 1608 sv_setsv (data_, result_);
1278 }
1279
1280 sv_setiv (w_, nw);
1281 sv_setiv (h_, nh);
1282 }
1283 } 1609 }
1284} 1610}
1285 1611
1286void 1612void
1287draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1613draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1293{ 1619{
1294 HV *hv = (HV *)SvRV (self); 1620 HV *hv = (HV *)SvRV (self);
1295 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1621 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1296 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1622 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1297 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1623 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1624
1625 if (name <= 0)
1626 XSRETURN_EMPTY;
1298 1627
1299 if (items < 5) 1628 if (items < 5)
1300 { 1629 {
1301 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1630 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1302 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1631 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1330 glDisable (GL_ALPHA_TEST); 1659 glDisable (GL_ALPHA_TEST);
1331 glDisable (GL_BLEND); 1660 glDisable (GL_BLEND);
1332 } 1661 }
1333} 1662}
1334 1663
1664void
1665draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)
1666 PROTOTYPE: @
1667 CODE:
1668{
1669 glEnable (GL_TEXTURE_2D);
1670 glEnable (GL_BLEND);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 glBindTexture (GL_TEXTURE_2D, name1);
1673
1674 glColor3f (intensity, intensity, intensity);
1675 glPushMatrix ();
1676 glScalef (1./3, 1./3, 1.);
1677
1678 if (blend > 0.f)
1679 {
1680 float S2, T2; /* 0. 0. for texture 2 */
1681 float w = w1 > w2 ? w1 : w2;
1682 float h = h1 > h2 ? h1 : h2;
1683 GLfloat env_color[4] = { 0., 0., 0., blend };
1684
1685 /* interpolate the two shadow textures */
1686 /* stage 0 == rgb(glcolor) + alpha(t0) */
1687 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1688
1689 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1690 gl.ActiveTexture (GL_TEXTURE1);
1691 glEnable (GL_TEXTURE_2D);
1692 glBindTexture (GL_TEXTURE_2D, name2);
1693 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1694
1695 /* rgb == rgb(glcolor) */
1696 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1697 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1699
1700 /* alpha = interpolate t0, t1 by env_alpha */
1701 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1702
1703 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1705 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1706
1707 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1708 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1709
1710 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1712
1713 s1 *= w / w1;
1714 t1 *= h / h1;
1715
1716 dx *= -3.f / w2;
1717 dy *= -3.f / h2;
1718 dx *= w / w2;
1719 dy *= h / h2;
1720
1721 s2 *= w / w2;
1722 t2 *= h / h2;
1723
1724 glBegin (GL_QUADS);
1725 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);
1726 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);
1727 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);
1728 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);
1729 glEnd ();
1730
1731 glDisable (GL_TEXTURE_2D);
1732 gl.ActiveTexture (GL_TEXTURE0);
1733 }
1734 else
1735 {
1736 /* simple blending of one texture, also opengl <1.3 path */
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1738
1739 glBegin (GL_QUADS);
1740 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1741 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1742 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1743 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1744 glEnd ();
1745 }
1746
1747 glPopMatrix ();
1748
1749 glDisable (GL_TEXTURE_2D);
1750 glDisable (GL_BLEND);
1751}
1752
1335IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1753IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1336 CODE: 1754 CODE:
1337{ 1755{
1338 GLint width; 1756 GLint width;
1339 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1757 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1341 RETVAL = width > 0; 1759 RETVAL = width > 0;
1342} 1760}
1343 OUTPUT: 1761 OUTPUT:
1344 RETVAL 1762 RETVAL
1345 1763
1346MODULE = CFPlus PACKAGE = CFPlus::Map 1764MODULE = Deliantra::Client PACKAGE = DC::Map
1347 1765
1348CFPlus::Map 1766PROTOTYPES: DISABLE
1767
1768DC::Map
1349new (SV *class) 1769new (SV *class)
1350 CODE: 1770 CODE:
1351 New (0, RETVAL, 1, struct map); 1771 New (0, RETVAL, 1, struct map);
1352 RETVAL->x = 0; 1772 RETVAL->x = 0;
1353 RETVAL->y = 0; 1773 RETVAL->y = 0;
… …
1361 RETVAL->row = 0; 1781 RETVAL->row = 0;
1362 OUTPUT: 1782 OUTPUT:
1363 RETVAL 1783 RETVAL
1364 1784
1365void 1785void
1366DESTROY (CFPlus::Map self) 1786DESTROY (DC::Map self)
1367 CODE: 1787 CODE:
1368{ 1788{
1369 map_clear (self); 1789 map_clear (self);
1370 Safefree (self->face2tile); 1790 Safefree (self->face2tile);
1371 Safefree (self->tex); 1791 Safefree (self->tex);
1372 Safefree (self); 1792 Safefree (self);
1373} 1793}
1374 1794
1375void 1795void
1376resize (CFPlus::Map self, int map_width, int map_height) 1796resize (DC::Map self, int map_width, int map_height)
1377 CODE: 1797 CODE:
1378 self->w = map_width; 1798 self->w = map_width;
1379 self->h = map_height; 1799 self->h = map_height;
1380 1800
1381void 1801void
1382clear (CFPlus::Map self) 1802clear (DC::Map self)
1383 CODE: 1803 CODE:
1384 map_clear (self); 1804 map_clear (self);
1385 1805
1386void 1806void
1387set_tileid (CFPlus::Map self, int face, int tile) 1807set_tileid (DC::Map self, int face, int tile)
1388 CODE: 1808 CODE:
1389{ 1809{
1390 need_facenum (self, face); self->face2tile [face] = tile; 1810 need_facenum (self, face); self->face2tile [face] = tile;
1391 need_texid (self, tile); 1811 need_texid (self, tile);
1392} 1812}
1393 1813
1394void 1814void
1395set_smooth (CFPlus::Map self, int face, int smooth, int level) 1815set_smooth (DC::Map self, int face, int smooth, int level)
1396 CODE: 1816 CODE:
1397{ 1817{
1398 tileid texid; 1818 tileid texid;
1399 maptex *tex; 1819 maptex *tex;
1400 1820
… …
1413 tex->smoothtile = self->face2tile [smooth]; 1833 tex->smoothtile = self->face2tile [smooth];
1414 tex->smoothlevel = level; 1834 tex->smoothlevel = level;
1415} 1835}
1416 1836
1417void 1837void
1418set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1838set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1419 CODE: 1839 CODE:
1420{ 1840{
1421 need_texid (self, texid); 1841 need_texid (self, texid);
1422 1842
1423 { 1843 {
… …
1442 // use uglier nearest interpolation because linear suffers 1862 // use uglier nearest interpolation because linear suffers
1443 // from transparent color bleeding and ugly wrapping effects. 1863 // from transparent color bleeding and ugly wrapping effects.
1444 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1864 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1445} 1865}
1446 1866
1867void
1868expire_textures (DC::Map self, int texid, int count)
1869 PPCODE:
1870 for (; texid < self->texs && count; ++texid, --count)
1871 {
1872 maptex *tex = self->tex + texid;
1873
1874 if (tex->name)
1875 {
1876 if (tex->unused)
1877 {
1878 tex->name = 0;
1879 tex->unused = 0;
1880 XPUSHs (sv_2mortal (newSViv (texid)));
1881 }
1882 else
1883 tex->unused = 1;
1884 }
1885 }
1886
1447int 1887int
1448ox (CFPlus::Map self) 1888ox (DC::Map self)
1449 ALIAS: 1889 ALIAS:
1450 oy = 1 1890 oy = 1
1451 x = 2 1891 x = 2
1452 y = 3 1892 y = 3
1453 w = 4 1893 w = 4
… …
1464 } 1904 }
1465 OUTPUT: 1905 OUTPUT:
1466 RETVAL 1906 RETVAL
1467 1907
1468void 1908void
1469scroll (CFPlus::Map self, int dx, int dy) 1909scroll (DC::Map self, int dx, int dy)
1470 CODE: 1910 CODE:
1471{ 1911{
1472 if (dx > 0) 1912 if (dx > 0)
1473 map_blank (self, self->x, self->y, dx, self->h); 1913 map_blank (self, self->x, self->y, dx, self->h);
1474 else if (dx < 0) 1914 else if (dx < 0)
… …
1489 self->rows += MAP_EXTEND_Y; 1929 self->rows += MAP_EXTEND_Y;
1490 self->y += MAP_EXTEND_Y; 1930 self->y += MAP_EXTEND_Y;
1491 } 1931 }
1492} 1932}
1493 1933
1494void 1934SV *
1495map1a_update (CFPlus::Map self, SV *data_, int extmap) 1935map1a_update (DC::Map self, SV *data_, int extmap)
1496 CODE: 1936 CODE:
1497{ 1937{
1498 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1938 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1499 uint8_t *data_end = (uint8_t *)SvEND (data_); 1939 uint8_t *data_end = (uint8_t *)SvEND (data_);
1500 mapcell *cell; 1940 mapcell *cell;
1501 int x, y, flags; 1941 int x, y, z, flags;
1942 AV *missing = newAV ();
1943 RETVAL = newRV_noinc ((SV *)missing);
1502 1944
1503 while (data < data_end - 1) 1945 while (data < data_end - 1)
1504 { 1946 {
1505 flags = (data [0] << 8) + data [1]; data += 2; 1947 flags = (data [0] << 8) + data [1]; data += 2;
1506 1948
… …
1526 uint8_t ext, cmd; 1968 uint8_t ext, cmd;
1527 1969
1528 do 1970 do
1529 { 1971 {
1530 ext = *data++; 1972 ext = *data++;
1531 cmd = ext & 0x3f; 1973 cmd = ext & 0x7f;
1532 1974
1533 if (cmd < 4) 1975 if (cmd < 4)
1534 cell->darkness = 255 - ext * 64 + 1; 1976 cell->darkness = 255 - ext * 64 + 1;
1535 else if (cmd == 5) // health 1977 else if (cmd == 5) // health
1536 { 1978 {
… …
1539 } 1981 }
1540 else if (cmd == 6) // monster width 1982 else if (cmd == 6) // monster width
1541 cell->stat_width = *data++ + 1; 1983 cell->stat_width = *data++ + 1;
1542 else if (cmd == 0x47) 1984 else if (cmd == 0x47)
1543 { 1985 {
1544 if (*data == 4) 1986 if (*data == 1) cell->player = data [1];
1545 ; // decode player count 1987 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1988 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1989 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1546 1990
1547 data += *data + 1; 1991 data += *data + 1;
1548 } 1992 }
1549 else if (cmd == 8) // cell flags 1993 else if (cmd == 8) // cell flags
1550 cell->flags = *data++; 1994 cell->flags = *data++;
… …
1557 } 2001 }
1558 else 2002 else
1559 cell->darkness = *data++ + 1; 2003 cell->darkness = *data++ + 1;
1560 } 2004 }
1561 2005
2006 for (z = 0; z <= 2; ++z)
1562 if (flags & 4) 2007 if (flags & (4 >> z))
1563 { 2008 {
1564 faceid face = (data [0] << 8) + data [1]; data += 2; 2009 faceid face = (data [0] << 8) + data [1]; data += 2;
1565 need_facenum (self, face); 2010 need_facenum (self, face);
1566 cell->tile [0] = self->face2tile [face]; 2011 cell->tile [z] = self->face2tile [face];
2012
2013 if (cell->tile [z])
2014 {
2015 maptex *tex = self->tex + cell->tile [z];
2016 tex->unused = 0;
2017 if (!tex->name)
2018 av_push (missing, newSViv (cell->tile [z]));
2019
2020 if (tex->smoothtile)
2021 {
2022 maptex *smooth = self->tex + tex->smoothtile;
2023 smooth->unused = 0;
2024 if (!smooth->name)
2025 av_push (missing, newSViv (tex->smoothtile));
2026 }
2027 }
1567 } 2028 }
1568
1569 if (flags & 2)
1570 {
1571 faceid face = (data [0] << 8) + data [1]; data += 2;
1572 need_facenum (self, face);
1573 cell->tile [1] = self->face2tile [face];
1574 }
1575
1576 if (flags & 1)
1577 {
1578 faceid face = (data [0] << 8) + data [1]; data += 2;
1579 need_facenum (self, face);
1580 cell->tile [2] = self->face2tile [face];
1581 }
1582 } 2029 }
1583 else 2030 else
1584 cell->darkness = 0; 2031 CELL_CLEAR (cell);
1585 } 2032 }
1586} 2033}
2034 OUTPUT:
2035 RETVAL
1587 2036
1588SV * 2037SV *
1589mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2038mapmap (DC::Map self, int x0, int y0, int w, int h)
1590 CODE: 2039 CODE:
1591{ 2040{
1592 int x1, x; 2041 int x1, x;
1593 int y1, y; 2042 int y1, y;
1594 int z; 2043 int z;
… …
1639} 2088}
1640 OUTPUT: 2089 OUTPUT:
1641 RETVAL 2090 RETVAL
1642 2091
1643void 2092void
1644draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2093draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1645 CODE: 2094 CODE:
1646{ 2095{
2096 int x, y, z;
2097
1647 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2098 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1648 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2099 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1649 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2100 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1650 smooth_key skey; 2101 smooth_key skey;
1651 int x, y, z; 2102 int pl_x, pl_y;
1652 int last_name; 2103 maptex pl_tex;
2104 rc_t *rc = rc_alloc ();
2105 rc_t *rc_ov = rc_alloc ();
2106 rc_key_t key;
2107 rc_array_t *arr, *arr_hidden;
1653 2108
2109 pl_tex.name = 0;
2110
1654 // thats current max. sorry. 2111 // that's current max. sorry.
1655 if (sw > 255) sw = 255; 2112 if (sw > 255) sw = 255;
1656 if (sh > 255) sh = 255; 2113 if (sh > 255) sh = 255;
1657 2114
1658 // clear key, in case of extra padding 2115 // clear key, in case of extra padding
1659 memset (&skey, 0, sizeof (skey)); 2116 memset (&skey, 0, sizeof (skey));
1660 2117
1661 glColor4ub (255, 255, 255, 255); 2118 memset (&key, 0, sizeof (key));
1662 2119 key.r = 255;
1663 glEnable (GL_BLEND); 2120 key.g = 255;
1664 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2121 key.b = 255;
1665 glEnable (GL_TEXTURE_2D); 2122 key.a = 255;
1666 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2123 key.mode = GL_QUADS;
1667 2124 key.format = GL_T2F_V3F;
1668 glBegin (GL_QUADS);
1669
1670 last_name = 0;
1671 2125
1672 mx += self->x; 2126 mx += self->x;
1673 my += self->y; 2127 my += self->y;
1674 2128
1675 // first pass: determine smooth_max 2129 // first pass: determine smooth_max
… …
1692 MAX (self->tex [cell->tile [1]].smoothlevel, 2146 MAX (self->tex [cell->tile [1]].smoothlevel,
1693 self->tex [cell->tile [2]].smoothlevel)); 2147 self->tex [cell->tile [2]].smoothlevel));
1694 } 2148 }
1695 } 2149 }
1696 2150
2151 glEnable (GL_BLEND);
2152 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2153 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2154
2155 key.texname = self->tex [TEXID_HIDDEN].name;
2156 arr_hidden = rc_array (rc_ov, &key);
2157
1697 for (z = 0; z <= 2; z++) 2158 for (z = 0; z <= 2; z++)
1698 { 2159 {
1699 memset (smooth_level, 0, sizeof (smooth_level)); 2160 memset (smooth_level, 0, sizeof (smooth_level));
2161 key.texname = -1;
1700 2162
1701 for (y = 0; y < sh; y++) 2163 for (y = 0; y < sh; y++)
1702 if (0 <= y + my && y + my < self->rows) 2164 if (0 <= y + my && y + my < self->rows)
1703 { 2165 {
1704 maprow *row = self->row + (y + my); 2166 maprow *row = self->row + (y + my);
… …
1710 tileid tile = cell->tile [z]; 2172 tileid tile = cell->tile [z];
1711 2173
1712 if (tile) 2174 if (tile)
1713 { 2175 {
1714 maptex tex = self->tex [tile]; 2176 maptex tex = self->tex [tile];
1715 int px = (x + 1) * T - tex.w; 2177 int px, py;
1716 int py = (y + 1) * T - tex.h;
1717 2178
1718 // suppressing texture state switches here
1719 // is only moderately effective, but worth the extra effort
1720 if (last_name != tex.name) 2179 if (key.texname != tex.name)
1721 { 2180 {
2181 self->tex [tile].unused = 0;
2182
1722 if (!tex.name) 2183 if (!tex.name)
1723 tex = self->tex [2]; /* missing, replace by noface */ 2184 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1724 2185
1725 glEnd (); 2186 key.texname = tex.name;
1726 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2187 arr = rc_array (rc, &key);
1727 glBegin (GL_QUADS);
1728 } 2188 }
1729 2189
1730 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2190 px = (x + 1) * T - tex.w;
1731 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2191 py = (y + 1) * T - tex.h;
1732 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1733 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1734 2192
1735 if (cell->flags && z == 2) 2193 if (expect_false (cell->player == player) && expect_false (z == 2))
1736 { 2194 {
1737 if (cell->flags & 1) 2195 pl_x = px;
2196 pl_y = py;
2197 pl_tex = tex;
1738 { 2198 continue;
1739 maptex tex = self->tex [1];
1740 int px = x * T + T * 2 / 32;
1741 int py = y * T - T * 6 / 32;
1742
1743 glEnd ();
1744 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1745 glBegin (GL_QUADS);
1746
1747 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1748 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1749 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1750 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1751 }
1752 } 2199 }
2200
2201 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2202 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2203 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2204 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1753 2205
1754 // update smooth hash 2206 // update smooth hash
1755 if (tex.smoothtile) 2207 if (tex.smoothtile)
1756 { 2208 {
1757 skey.tile = tex.smoothtile; 2209 skey.tile = tex.smoothtile;
… …
1788 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2240 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1789 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2241 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1790 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2242 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1791 } 2243 }
1792 } 2244 }
2245
2246 if (expect_false (z == 2))
2247 {
2248 /* draw question marks on top of hidden spaces */
2249 if (!cell->darkness)
2250 {
2251 maptex tex = self->tex [TEXID_HIDDEN];
2252 int px = (x + 1) * T - tex.w;
2253 int py = (y + 1) * T - tex.h;
2254
2255 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2256 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2257 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2258 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2259 }
2260
2261 if (expect_false (cell->flags))
2262 {
2263 // overlays such as the speech bubble, probably more to come
2264 if (cell->flags & 1)
2265 {
2266 rc_key_t key_ov = key;
2267 maptex tex = self->tex [TEXID_SPEECH];
2268 rc_array_t *arr;
2269 int px = x * T + T * 2 / 32;
2270 int py = y * T - T * 6 / 32;
2271
2272 key_ov.texname = tex.name;
2273 arr = rc_array (rc_ov, &key_ov);
2274
2275 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2276 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2277 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2278 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2279 }
2280 }
2281 }
1793 } 2282 }
1794 } 2283 }
2284
2285 rc_draw (rc);
2286 rc_clear (rc);
1795 2287
1796 // go through all smoothlevels, lowest to highest, then draw. 2288 // go through all smoothlevels, lowest to highest, then draw.
1797 // this is basically counting sort 2289 // this is basically counting sort
1798 { 2290 {
1799 int w, b; 2291 int w, b;
1800 2292
2293 glEnable (GL_TEXTURE_2D);
2294 glBegin (GL_QUADS);
1801 for (w = 0; w < 256 / 32; ++w) 2295 for (w = 0; w < 256 / 32; ++w)
1802 { 2296 {
1803 uint32_t smask = smooth_level [w]; 2297 uint32_t smask = smooth_level [w];
1804 if (smask) 2298 if (smask)
1805 for (b = 0; b < 32; ++b) 2299 for (b = 0; b < 32; ++b)
… …
1824 int border = bits & 15; 2318 int border = bits & 15;
1825 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2319 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1826 float dx = tex.s * .0625f; // 16 images/row 2320 float dx = tex.s * .0625f; // 16 images/row
1827 float dy = tex.t * .5f ; // 2 images/column 2321 float dy = tex.t * .5f ; // 2 images/column
1828 2322
1829 // this time naively avoiding texture state changes
1830 // save gobs of state changes.
1831 if (last_name != tex.name) 2323 if (tex.name)
1832 { 2324 {
2325 // this time avoiding texture state changes
2326 // save gobs of state changes.
1833 if (!tex.name) 2327 if (key.texname != tex.name)
1834 continue; // smoothing not yet available 2328 {
2329 self->tex [skey->tile].unused = 0;
1835 2330
1836 glEnd (); 2331 glEnd ();
1837 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2332 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1838 glBegin (GL_QUADS); 2333 glBegin (GL_QUADS);
1839 } 2334 }
1840 2335
1841 if (border) 2336 if (border)
1842 { 2337 {
1843 float ox = border * dx; 2338 float ox = border * dx;
1844 2339
1845 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2340 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1846 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2341 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1847 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2342 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1848 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2343 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1849 } 2344 }
1850 2345
1851 if (corner) 2346 if (corner)
1852 { 2347 {
1853 float ox = corner * dx; 2348 float ox = corner * dx;
1854 2349
1855 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2350 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1856 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2351 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1857 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2352 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1858 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2353 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2354 }
1859 } 2355 }
1860 } 2356 }
1861 } 2357 }
1862 } 2358 }
1863 } 2359 }
2360
2361 glEnd ();
2362 glDisable (GL_TEXTURE_2D);
2363 key.texname = -1;
1864 } 2364 }
1865 2365
1866 hv_clear (smooth); 2366 hv_clear (smooth);
1867 } 2367 }
1868 2368
1869 glEnd (); 2369 if (pl_tex.name)
2370 {
2371 maptex tex = pl_tex;
2372 int px = pl_x + sdx;
2373 int py = pl_y + sdy;
1870 2374
1871 glDisable (GL_TEXTURE_2D); 2375 key.texname = tex.name;
2376 arr = rc_array (rc, &key);
2377
2378 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2379 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2380 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2381 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2382
2383 rc_draw (rc);
2384 }
2385
2386 rc_draw (rc_ov);
2387 rc_clear (rc_ov);
2388
1872 glDisable (GL_BLEND); 2389 glDisable (GL_BLEND);
2390 rc_free (rc);
2391 rc_free (rc_ov);
1873 2392
1874 // top layer: overlays such as the health bar 2393 // top layer: overlays such as the health bar
1875 for (y = 0; y < sh; y++) 2394 for (y = 0; y < sh; y++)
1876 if (0 <= y + my && y + my < self->rows) 2395 if (0 <= y + my && y + my < self->rows)
1877 { 2396 {
… …
1882 { 2401 {
1883 mapcell *cell = row->col + (x + mx - row->c0); 2402 mapcell *cell = row->col + (x + mx - row->c0);
1884 2403
1885 int px = x * T; 2404 int px = x * T;
1886 int py = y * T; 2405 int py = y * T;
2406
2407 if (expect_false (cell->player == player))
2408 {
2409 px += sdx;
2410 py += sdy;
2411 }
1887 2412
1888 if (cell->stat_hp) 2413 if (cell->stat_hp)
1889 { 2414 {
1890 int width = cell->stat_width * T; 2415 int width = cell->stat_width * T;
1891 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2416 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
1902 } 2427 }
1903 } 2428 }
1904} 2429}
1905 2430
1906void 2431void
1907draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2432draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1908 CODE: 2433 CODE:
1909{ 2434{
1910 static float color[16][3] = { 2435 static float color[16][3] = {
1911 { 0.00F, 0.00F, 0.00F }, 2436 { 0.00F, 0.00F, 0.00F },
1912 { 1.00F, 1.00F, 1.00F }, 2437 { 1.00F, 1.00F, 1.00F },
… …
1931 }; 2456 };
1932 2457
1933 int x, y; 2458 int x, y;
1934 2459
1935 glEnable (GL_TEXTURE_2D); 2460 glEnable (GL_TEXTURE_2D);
2461 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2462 * but the nvidia driver (185.18.14) mishandles alpha textures
2463 * ansd takes the colour from god knows where instead of using
2464 * Cp. MODULATE results in the same colour, but slightly different
2465 * alpha, but atcually gives us the correct colour with nvidia.
2466 */
1936 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1937 glEnable (GL_BLEND); 2468 glEnable (GL_BLEND);
1938 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2469 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1939 glBegin (GL_QUADS); 2470 glBegin (GL_QUADS);
1940 2471
1941 for (y = 0; y < h; y++) 2472 for (y = 0; y < h; y++)
… …
1948 float *c = color [m & 15]; 2479 float *c = color [m & 15];
1949 2480
1950 float tx1 = m & 0x40 ? 0.5 : 0.; 2481 float tx1 = m & 0x40 ? 0.5 : 0.;
1951 float tx2 = tx1 + 0.5; 2482 float tx2 = tx1 + 0.5;
1952 2483
1953 glColor4f (c[0], c[1], c[2], 0.75); 2484 glColor4f (c[0], c[1], c[2], 1);
1954 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2485 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1955 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2486 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1956 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2487 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1957 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2488 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1958 } 2489 }
… …
1962 glDisable (GL_BLEND); 2493 glDisable (GL_BLEND);
1963 glDisable (GL_TEXTURE_2D); 2494 glDisable (GL_TEXTURE_2D);
1964} 2495}
1965 2496
1966void 2497void
1967fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2498fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1968 PPCODE: 2499 PPCODE:
1969{ 2500{
1970 int x, y; 2501 int x, y;
2502 int sw1 = sw + 2;
2503 int sh1 = sh + 2;
2504 int sh3 = sh * 3;
1971 int sw4 = (sw + 3) & ~3; 2505 int sw34 = (sw * 3 + 3) & ~3;
2506 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1972 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2507 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1973 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2508 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1974 2509
1975 memset (darkness, 255, sw4 * sh);
1976 SvPOK_only (darkness_sv); 2510 SvPOK_only (darkness3_sv);
1977 SvCUR_set (darkness_sv, sw4 * sh); 2511 SvCUR_set (darkness3_sv, sw34 * sh3);
1978 2512
1979 mx += self->x; 2513 mx += self->x - 1;
1980 my += self->y; 2514 my += self->y - 1;
1981 2515
2516 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2517
1982 for (y = 0; y < sh; y++) 2518 for (y = 0; y < sh1; y++)
1983 if (0 <= y + my && y + my < self->rows) 2519 if (0 <= y + my && y + my < self->rows)
1984 { 2520 {
1985 maprow *row = self->row + (y + my); 2521 maprow *row = self->row + (y + my);
1986 2522
1987 for (x = 0; x < sw; x++) 2523 for (x = 0; x < sw1; x++)
1988 if (row->c0 <= x + mx && x + mx < row->c1) 2524 if (row->c0 <= x + mx && x + mx < row->c1)
1989 { 2525 {
1990 mapcell *cell = row->col + (x + mx - row->c0); 2526 mapcell *cell = row->col + (x + mx - row->c0);
1991 2527
1992 darkness[y * sw4 + x] = cell->darkness 2528 darkness1 [y * sw1 + x] = cell->darkness
1993 ? 255 - (cell->darkness - 1) 2529 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
1994 : 255 - FOW_DARKNESS; 2530 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
1995 } 2531 }
1996 } 2532 }
1997 2533
2534 for (y = 0; y < sh; ++y)
2535 for (x = 0; x < sw; ++x)
2536 {
2537 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2538 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2539 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2540 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2541 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2542 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2543 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2544 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2545 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2546
2547 uint8_t r11 = (d11 + d21 + d12) / 3;
2548 uint8_t r21 = d21;
2549 uint8_t r31 = (d21 + d31 + d32) / 3;
2550
2551 uint8_t r12 = d12;
2552 uint8_t r22 = d22;
2553 uint8_t r32 = d32;
2554
2555 uint8_t r13 = (d13 + d23 + d12) / 3;
2556 uint8_t r23 = d23;
2557 uint8_t r33 = (d23 + d33 + d32) / 3;
2558
2559 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2560 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2561 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2562 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2563 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2564 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2565 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2566 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2567 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2568 }
2569
2570 free (darkness1);
2571
1998 EXTEND (SP, 3); 2572 EXTEND (SP, 3);
1999 PUSHs (sv_2mortal (newSViv (sw4))); 2573 PUSHs (sv_2mortal (newSViv (sw34)));
2000 PUSHs (sv_2mortal (newSViv (sh))); 2574 PUSHs (sv_2mortal (newSViv (sh3)));
2001 PUSHs (darkness_sv); 2575 PUSHs (darkness3_sv);
2002} 2576}
2003 2577
2004SV * 2578SV *
2005get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2579get_rect (DC::Map self, int x0, int y0, int w, int h)
2006 CODE: 2580 CODE:
2007{ 2581{
2008 int x, y, x1, y1; 2582 int x, y, x1, y1;
2009 SV *data_sv = newSV (w * h * 7 + 5); 2583 SV *data_sv = newSV (w * h * 7 + 5);
2010 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2584 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2067 else 2641 else
2068 *data++ = 0; 2642 *data++ = 0;
2069 } 2643 }
2070 } 2644 }
2071 2645
2646 /* if size is w*h + 5 then no data has been found */
2647 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2648 {
2072 SvPOK_only (data_sv); 2649 SvPOK_only (data_sv);
2073 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2650 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2651 }
2652
2074 RETVAL = data_sv; 2653 RETVAL = data_sv;
2075} 2654}
2076 OUTPUT: 2655 OUTPUT:
2077 RETVAL 2656 RETVAL
2078 2657
2079void 2658void
2080set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2659set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2081 PPCODE: 2660 PPCODE:
2082{ 2661{
2083 int x, y, z; 2662 int x, y, z;
2084 int w, h; 2663 int w, h;
2085 int x1, y1; 2664 int x1, y1;
2665 STRLEN len;
2666 uint8_t *data, *end;
2667
2668 len = SvLEN (data_sv);
2669 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2670 data = SvPVbyte_nolen (data_sv);
2671 end = data + len + 8;
2672
2673 if (len < 5)
2674 XSRETURN_EMPTY;
2086 2675
2087 if (*data++ != 0) 2676 if (*data++ != 0)
2088 return; /* version mismatch */ 2677 XSRETURN_EMPTY; /* version mismatch */
2089 2678
2090 w = *data++ << 8; w |= *data++; 2679 w = *data++ << 8; w |= *data++;
2091 h = *data++ << 8; h |= *data++; 2680 h = *data++ << 8; h |= *data++;
2092 2681
2093 // we need to do this 'cause we don't keep an absolute coord system for rows 2682 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2105 { 2694 {
2106 maprow *row = map_get_row (self, y); 2695 maprow *row = map_get_row (self, y);
2107 2696
2108 for (x = x0; x < x1; x++) 2697 for (x = x0; x < x1; x++)
2109 { 2698 {
2699 uint8_t flags;
2700
2701 if (data + 7 >= end)
2702 XSRETURN_EMPTY;
2703
2110 uint8_t flags = *data++; 2704 flags = *data++;
2111 2705
2112 if (flags) 2706 if (flags)
2113 { 2707 {
2114 mapcell *cell = row_get_cell (row, x); 2708 mapcell *cell = row_get_cell (row, x);
2115 tileid tile[3] = { 0, 0, 0 }; 2709 tileid tile[3] = { 0, 0, 0 };
… …
2118 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2712 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2119 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2713 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2120 2714
2121 if (cell->darkness == 0) 2715 if (cell->darkness == 0)
2122 { 2716 {
2123 cell->darkness = 0; 2717 /*cell->darkness = 0;*/
2718 EXTEND (SP, 3);
2124 2719
2125 for (z = 0; z <= 2; z++) 2720 for (z = 0; z <= 2; z++)
2126 { 2721 {
2127 tileid t = tile [z]; 2722 tileid t = tile [z];
2128 2723
2129 if (t >= self->texs || (t && !self->tex [t].name)) 2724 if (t >= self->texs || (t && !self->tex [t].name))
2130 { 2725 {
2131 XPUSHs (sv_2mortal (newSViv (t))); 2726 PUSHs (sv_2mortal (newSViv (t)));
2132 need_texid (self, t); 2727 need_texid (self, t);
2133 } 2728 }
2134 2729
2135 cell->tile [z] = t; 2730 cell->tile [z] = t;
2136 } 2731 }
… …
2138 } 2733 }
2139 } 2734 }
2140 } 2735 }
2141} 2736}
2142 2737
2143MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2738MODULE = Deliantra::Client PACKAGE = DC::RW
2144 2739
2145CFPlus::MixChunk 2740DC::RW
2146new_from_file (SV *class, char *path) 2741new (SV *class, SV *data_sv)
2147 CODE: 2742 CODE:
2148 RETVAL = Mix_LoadWAV (path); 2743{
2744 STRLEN datalen;
2745 char *data = SvPVbyte (data_sv, datalen);
2746
2747 RETVAL = SDL_RWFromConstMem (data, datalen);
2748}
2149 OUTPUT: 2749 OUTPUT:
2150 RETVAL 2750 RETVAL
2151 2751
2752DC::RW
2753new_from_file (SV *class, const char *path, const char *mode = "rb")
2754 CODE:
2755 RETVAL = SDL_RWFromFile (path, mode);
2756 OUTPUT:
2757 RETVAL
2758
2759# fails on win32:
2760# dc.xs(2268) : error C2059: syntax error : '('
2152void 2761#void
2762#close (DC::RW self)
2763# CODE:
2764# (self->(close)) (self);
2765
2766MODULE = Deliantra::Client PACKAGE = DC::Channel
2767
2768PROTOTYPES: DISABLE
2769
2770DC::Channel
2771find ()
2772 CODE:
2773{
2774 RETVAL = Mix_GroupAvailable (-1);
2775
2776 if (RETVAL < 0)
2777 {
2778 RETVAL = Mix_GroupOldest (-1);
2779
2780 if (RETVAL < 0)
2781 XSRETURN_UNDEF;
2782
2783 Mix_HaltChannel (RETVAL);
2784 }
2785
2786 Mix_UnregisterAllEffects (RETVAL);
2787 Mix_Volume (RETVAL, 128);
2788}
2789 OUTPUT:
2790 RETVAL
2791
2792void
2793halt (DC::Channel self)
2794 CODE:
2795 Mix_HaltChannel (self);
2796
2797void
2798expire (DC::Channel self, int ticks = -1)
2799 CODE:
2800 Mix_ExpireChannel (self, ticks);
2801
2802void
2803fade_out (DC::Channel self, int ticks = -1)
2804 CODE:
2805 Mix_FadeOutChannel (self, ticks);
2806
2807int
2808volume (DC::Channel self, int volume)
2809 CODE:
2810 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2811 OUTPUT:
2812 RETVAL
2813
2814void
2815unregister_all_effects (DC::Channel self)
2816 CODE:
2817 Mix_UnregisterAllEffects (self);
2818
2819void
2820set_panning (DC::Channel self, int left, int right)
2821 CODE:
2822 left = CLAMP (left , 0, 255);
2823 right = CLAMP (right, 0, 255);
2824 Mix_SetPanning (self, left, right);
2825
2826void
2827set_distance (DC::Channel self, int distance)
2828 CODE:
2829 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2830
2831void
2832set_position (DC::Channel self, int angle, int distance)
2833 CODE:
2834
2835void
2836set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2837 CODE:
2838{
2839 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2840 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2841 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2842}
2843
2844void
2845set_reverse_stereo (DC::Channel self, int flip)
2846 CODE:
2847 Mix_SetReverseStereo (self, flip);
2848
2849MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2850
2851PROTOTYPES: DISABLE
2852
2853DC::MixChunk
2854new (SV *class, DC::RW rwops)
2855 CODE:
2856 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2857 OUTPUT:
2858 RETVAL
2859
2860void
2153DESTROY (CFPlus::MixChunk self) 2861DESTROY (DC::MixChunk self)
2154 CODE: 2862 CODE:
2155 Mix_FreeChunk (self); 2863 Mix_FreeChunk (self);
2156 2864
2157int 2865int
2158volume (CFPlus::MixChunk self, int volume = -1) 2866volume (DC::MixChunk self, int volume = -1)
2159 CODE: 2867 CODE:
2868 if (items > 1)
2869 volume = CLAMP (volume, 0, 128);
2160 RETVAL = Mix_VolumeChunk (self, volume); 2870 RETVAL = Mix_VolumeChunk (self, volume);
2161 OUTPUT: 2871 OUTPUT:
2162 RETVAL 2872 RETVAL
2163 2873
2164int 2874DC::Channel
2165play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2875play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2166 CODE: 2876 CODE:
2877{
2167 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2878 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2879
2880 if (RETVAL < 0)
2881 XSRETURN_UNDEF;
2882
2883 if (channel < 0)
2884 {
2885 Mix_UnregisterAllEffects (RETVAL);
2886 Mix_Volume (RETVAL, 128);
2887 }
2888}
2168 OUTPUT: 2889 OUTPUT:
2169 RETVAL 2890 RETVAL
2170 2891
2171MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2892MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2172 2893
2173int 2894int
2174volume (int volume = -1) 2895volume (int volume = -1)
2896 PROTOTYPE: ;$
2175 CODE: 2897 CODE:
2898 if (items > 0)
2899 volume = CLAMP (volume, 0, 128);
2176 RETVAL = Mix_VolumeMusic (volume); 2900 RETVAL = Mix_VolumeMusic (volume);
2177 OUTPUT: 2901 OUTPUT:
2178 RETVAL 2902 RETVAL
2179 2903
2180int 2904void
2181fade_out (int ms) 2905fade_out (int ms)
2182 CODE: 2906 CODE:
2183 RETVAL = Mix_FadeOutMusic (ms); 2907 Mix_FadeOutMusic (ms);
2908
2909void
2910halt ()
2911 CODE:
2912 Mix_HaltMusic ();
2913
2914DC::MixMusic
2915new (SV *class, DC::RW rwops)
2916 CODE:
2917 RETVAL = Mix_LoadMUS_RW (rwops);
2184 OUTPUT: 2918 OUTPUT:
2185 RETVAL 2919 RETVAL
2186 2920
2187CFPlus::MixMusic
2188new_from_file (SV *class, char *path)
2189 CODE:
2190 RETVAL = Mix_LoadMUS (path);
2191 OUTPUT:
2192 RETVAL
2193
2194void 2921void
2195DESTROY (CFPlus::MixMusic self) 2922DESTROY (DC::MixMusic self)
2196 CODE: 2923 CODE:
2197 Mix_FreeMusic (self); 2924 Mix_FreeMusic (self);
2198 2925
2199int 2926int
2200play (CFPlus::MixMusic self, int loops = -1) 2927play (DC::MixMusic self, int loops = -1)
2201 CODE: 2928 CODE:
2202 RETVAL = Mix_PlayMusic (self, loops); 2929 RETVAL = Mix_PlayMusic (self, loops);
2203 OUTPUT: 2930 OUTPUT:
2204 RETVAL 2931 RETVAL
2205 2932
2206int 2933void
2207fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2934fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2208 CODE: 2935 CODE:
2209 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2936 Mix_FadeInMusicPos (self, loops, ms, position);
2210 OUTPUT:
2211 RETVAL
2212 2937
2213MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2938MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2939
2940PROTOTYPES: ENABLE
2214 2941
2215BOOT: 2942BOOT:
2216{ 2943{
2217 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2944 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2218 static const struct { 2945 static const struct {
2219 const char *name; 2946 const char *name;
2220 IV iv; 2947 IV iv;
2221 } *civ, const_iv[] = { 2948 } *civ, const_iv[] = {
2222# define const_iv(name) { # name, (IV)name } 2949# define const_iv(name) { # name, (IV)name }
2223 const_iv (GL_VENDOR), 2950 const_iv (GL_VENDOR),
2224 const_iv (GL_VERSION), 2951 const_iv (GL_VERSION),
2225 const_iv (GL_EXTENSIONS), 2952 const_iv (GL_EXTENSIONS),
2953 const_iv (GL_MAX_TEXTURE_UNITS),
2226 const_iv (GL_COLOR_MATERIAL), 2954 const_iv (GL_COLOR_MATERIAL),
2227 const_iv (GL_SMOOTH), 2955 const_iv (GL_SMOOTH),
2228 const_iv (GL_FLAT), 2956 const_iv (GL_FLAT),
2229 const_iv (GL_DITHER), 2957 const_iv (GL_DITHER),
2230 const_iv (GL_BLEND), 2958 const_iv (GL_BLEND),
… …
2234 const_iv (GL_ALPHA_TEST), 2962 const_iv (GL_ALPHA_TEST),
2235 const_iv (GL_NORMALIZE), 2963 const_iv (GL_NORMALIZE),
2236 const_iv (GL_RESCALE_NORMAL), 2964 const_iv (GL_RESCALE_NORMAL),
2237 const_iv (GL_FRONT), 2965 const_iv (GL_FRONT),
2238 const_iv (GL_BACK), 2966 const_iv (GL_BACK),
2967 const_iv (GL_AUX0),
2239 const_iv (GL_AND), 2968 const_iv (GL_AND),
2240 const_iv (GL_ONE), 2969 const_iv (GL_ONE),
2241 const_iv (GL_ZERO), 2970 const_iv (GL_ZERO),
2242 const_iv (GL_SRC_ALPHA), 2971 const_iv (GL_SRC_ALPHA),
2243 const_iv (GL_DST_ALPHA), 2972 const_iv (GL_DST_ALPHA),
2244 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2973 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2245 const_iv (GL_ONE_MINUS_DST_ALPHA), 2974 const_iv (GL_ONE_MINUS_DST_ALPHA),
2975 const_iv (GL_SRC_COLOR),
2976 const_iv (GL_DST_COLOR),
2977 const_iv (GL_ONE_MINUS_SRC_COLOR),
2978 const_iv (GL_ONE_MINUS_DST_COLOR),
2246 const_iv (GL_SRC_ALPHA_SATURATE), 2979 const_iv (GL_SRC_ALPHA_SATURATE),
2247 const_iv (GL_RGB), 2980 const_iv (GL_RGB),
2248 const_iv (GL_RGBA), 2981 const_iv (GL_RGBA),
2249 const_iv (GL_RGBA4), 2982 const_iv (GL_RGBA4),
2250 const_iv (GL_RGBA8), 2983 const_iv (GL_RGBA8),
… …
2256 const_iv (GL_INTENSITY), 2989 const_iv (GL_INTENSITY),
2257 const_iv (GL_LUMINANCE), 2990 const_iv (GL_LUMINANCE),
2258 const_iv (GL_LUMINANCE_ALPHA), 2991 const_iv (GL_LUMINANCE_ALPHA),
2259 const_iv (GL_FLOAT), 2992 const_iv (GL_FLOAT),
2260 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2993 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2994 const_iv (GL_COMPRESSED_ALPHA_ARB),
2995 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2996 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2997 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2998 const_iv (GL_COMPRESSED_RGB_ARB),
2999 const_iv (GL_COMPRESSED_RGBA_ARB),
2261 const_iv (GL_COMPILE), 3000 const_iv (GL_COMPILE),
2262 const_iv (GL_PROXY_TEXTURE_1D), 3001 const_iv (GL_PROXY_TEXTURE_1D),
2263 const_iv (GL_PROXY_TEXTURE_2D), 3002 const_iv (GL_PROXY_TEXTURE_2D),
2264 const_iv (GL_TEXTURE_1D), 3003 const_iv (GL_TEXTURE_1D),
2265 const_iv (GL_TEXTURE_2D), 3004 const_iv (GL_TEXTURE_2D),
… …
2289 const_iv (GL_COLOR_LOGIC_OP), 3028 const_iv (GL_COLOR_LOGIC_OP),
2290 const_iv (GL_SEPARABLE_2D), 3029 const_iv (GL_SEPARABLE_2D),
2291 const_iv (GL_CONVOLUTION_2D), 3030 const_iv (GL_CONVOLUTION_2D),
2292 const_iv (GL_CONVOLUTION_BORDER_MODE), 3031 const_iv (GL_CONVOLUTION_BORDER_MODE),
2293 const_iv (GL_CONSTANT_BORDER), 3032 const_iv (GL_CONSTANT_BORDER),
3033 const_iv (GL_POINTS),
2294 const_iv (GL_LINES), 3034 const_iv (GL_LINES),
2295 const_iv (GL_LINE_STRIP), 3035 const_iv (GL_LINE_STRIP),
2296 const_iv (GL_LINE_LOOP), 3036 const_iv (GL_LINE_LOOP),
2297 const_iv (GL_QUADS), 3037 const_iv (GL_QUADS),
2298 const_iv (GL_QUAD_STRIP), 3038 const_iv (GL_QUAD_STRIP),
2299 const_iv (GL_TRIANGLES), 3039 const_iv (GL_TRIANGLES),
2300 const_iv (GL_TRIANGLE_STRIP), 3040 const_iv (GL_TRIANGLE_STRIP),
2301 const_iv (GL_TRIANGLE_FAN), 3041 const_iv (GL_TRIANGLE_FAN),
3042 const_iv (GL_POLYGON),
2302 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3043 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
3044 const_iv (GL_POINT_SMOOTH_HINT),
3045 const_iv (GL_LINE_SMOOTH_HINT),
3046 const_iv (GL_POLYGON_SMOOTH_HINT),
3047 const_iv (GL_GENERATE_MIPMAP_HINT),
3048 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2303 const_iv (GL_FASTEST), 3049 const_iv (GL_FASTEST),
3050 const_iv (GL_DONT_CARE),
3051 const_iv (GL_NICEST),
2304 const_iv (GL_V2F), 3052 const_iv (GL_V2F),
2305 const_iv (GL_V3F), 3053 const_iv (GL_V3F),
2306 const_iv (GL_T2F_V3F), 3054 const_iv (GL_T2F_V3F),
2307 const_iv (GL_T2F_N3F_V3F), 3055 const_iv (GL_T2F_N3F_V3F),
3056 const_iv (GL_FUNC_ADD),
3057 const_iv (GL_FUNC_SUBTRACT),
3058 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2308# undef const_iv 3059# undef const_iv
2309 }; 3060 };
2310 3061
2311 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3062 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2312 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3063 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2313 3064
2314 texture_av = newAV (); 3065 texture_av = newAV ();
2315 AvREAL_off (texture_av); 3066 AvREAL_off (texture_av);
2316} 3067}
2317 3068
3069void
3070disable_GL_EXT_blend_func_separate ()
3071 CODE:
3072 gl.BlendFuncSeparate = 0;
3073 gl.BlendFuncSeparateEXT = 0;
3074
3075void
3076apple_nvidia_bug (int enable)
3077
2318char * 3078char *
2319gl_vendor () 3079gl_vendor ()
2320 CODE: 3080 CODE:
2321 RETVAL = (char *)glGetString (GL_VENDOR); 3081 RETVAL = (char *)glGetString (GL_VENDOR);
2322 OUTPUT: 3082 OUTPUT:
… …
2334 CODE: 3094 CODE:
2335 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3095 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2336 OUTPUT: 3096 OUTPUT:
2337 RETVAL 3097 RETVAL
2338 3098
2339char *glGetString (GLenum pname) 3099const char *glGetString (GLenum pname)
2340 3100
2341GLint glGetInteger (GLenum pname) 3101GLint glGetInteger (GLenum pname)
2342 CODE: 3102 CODE:
2343 glGetIntegerv (pname, &RETVAL); 3103 glGetIntegerv (pname, &RETVAL);
2344 OUTPUT: 3104 OUTPUT:
… …
2371 3131
2372void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3132void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2373 CODE: 3133 CODE:
2374 gl_BlendFuncSeparate (sa, da, saa, daa); 3134 gl_BlendFuncSeparate (sa, da, saa, daa);
2375 3135
3136# void glBlendEquation (int se)
3137
2376void glDepthMask (int flag) 3138void glDepthMask (int flag)
2377 3139
2378void glLogicOp (int opcode) 3140void glLogicOp (int opcode)
2379 3141
2380void glColorMask (int red, int green, int blue, int alpha) 3142void glColorMask (int red, int green, int blue, int alpha)
… …
2394# near_ and far_ are due to microsofts buggy "c" compiler 3156# near_ and far_ are due to microsofts buggy "c" compiler
2395void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 3157void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2396 3158
2397# near_ and far_ are due to microsofts buggy "c" compiler 3159# near_ and far_ are due to microsofts buggy "c" compiler
2398void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 3160void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
3161
3162PROTOTYPES: DISABLE
2399 3163
2400void glViewport (int x, int y, int width, int height) 3164void glViewport (int x, int y, int width, int height)
2401 3165
2402void glScissor (int x, int y, int width, int height) 3166void glScissor (int x, int y, int width, int height)
2403 3167
… …
2411 3175
2412void glRotate (float angle, float x, float y, float z) 3176void glRotate (float angle, float x, float y, float z)
2413 CODE: 3177 CODE:
2414 glRotatef (angle, x, y, z); 3178 glRotatef (angle, x, y, z);
2415 3179
2416void glBegin (int mode)
2417
2418void glEnd ()
2419
2420void glColor (float r, float g, float b, float a = 1.0) 3180void glColor (float r, float g, float b, float a = 1.0)
2421 PROTOTYPE: @ 3181 PROTOTYPE: @
2422 ALIAS: 3182 ALIAS:
2423 glColor_premultiply = 1 3183 glColor_premultiply = 1
2424 CODE: 3184 CODE:
2425 if (ix) 3185 if (ix)
2426 { 3186 {
… …
2429 b *= a; 3189 b *= a;
2430 } 3190 }
2431 // microsoft visual "c" rounds instead of truncating... 3191 // microsoft visual "c" rounds instead of truncating...
2432 glColor4f (r, g, b, a); 3192 glColor4f (r, g, b, a);
2433 3193
2434void glInterleavedArrays (int format, int stride, char *data)
2435
2436void glDrawElements (int mode, int count, int type, char *indices)
2437
2438# 1.2 void glDrawRangeElements (int mode, int start, int end
2439
2440void glRasterPos (float x, float y, float z = 0.) 3194void glRasterPos (float x, float y, float z = 0.)
2441 CODE: 3195 CODE:
2442 glRasterPos3f (0, 0, z); 3196 glRasterPos3f (0, 0, z);
2443 glBitmap (0, 0, 0, 0, x, y, 0); 3197 glBitmap (0, 0, 0, 0, x, y, 0);
2444 3198
… …
2448 3202
2449void glTexCoord (float s, float t) 3203void glTexCoord (float s, float t)
2450 CODE: 3204 CODE:
2451 glTexCoord2f (s, t); 3205 glTexCoord2f (s, t);
2452 3206
3207void glRect (float x1, float y1, float x2, float y2)
3208 CODE:
3209 glRectf (x1, y1, x2, y2);
3210
3211void glRect_lineloop (float x1, float y1, float x2, float y2)
3212 CODE:
3213 glBegin (GL_LINE_LOOP);
3214 glVertex2f (x1, y1);
3215 glVertex2f (x2, y1);
3216 glVertex2f (x2, y2);
3217 glVertex2f (x1, y2);
3218 glEnd ();
3219
3220PROTOTYPES: ENABLE
3221
3222void glBegin (int mode)
3223
3224void glEnd ()
3225
3226void glPointSize (GLfloat size)
3227
3228void glLineWidth (GLfloat width)
3229
3230void glInterleavedArrays (int format, int stride, char *data)
3231
3232void glDrawElements (int mode, int count, int type, char *indices)
3233
3234# 1.2 void glDrawRangeElements (int mode, int start, int end
3235
2453void glTexEnv (int target, int pname, float param) 3236void glTexEnv (int target, int pname, float param)
2454 CODE: 3237 CODE:
2455 glTexEnvf (target, pname, param); 3238 glTexEnvf (target, pname, param);
2456 3239
2457void glTexParameter (int target, int pname, float param) 3240void glTexParameter (int target, int pname, float param)
… …
2473void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3256void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2474 CODE: 3257 CODE:
2475 if (gl.SeparableFilter2D) 3258 if (gl.SeparableFilter2D)
2476 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3259 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2477 3260
2478void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3261void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2479 3262
2480void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3263void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2481 3264
2482void glDrawPixels (int width, int height, int format, int type, char *pixels) 3265void glDrawPixels (int width, int height, int format, int type, char *pixels)
2483 3266
… …
2509 3292
2510void glEndList () 3293void glEndList ()
2511 3294
2512void glCallList (int list) 3295void glCallList (int list)
2513 3296
3297MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3298
3299PROTOTYPES: DISABLE
3300
3301void
3302find_widget (SV *self, NV x, NV y)
3303 PPCODE:
3304{
3305 if (within_widget (self, x, y))
3306 XPUSHs (self);
3307}
3308
3309BOOT:
3310{
3311 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3312
3313 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3314 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3315 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3316 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3317}
3318
3319void
3320draw (SV *self)
3321 CODE:
3322{
3323 HV *hv;
3324 SV **svp;
3325 NV x, y, w, h;
3326 SV *draw_x_sv = GvSV (draw_x_gv);
3327 SV *draw_y_sv = GvSV (draw_y_gv);
3328 SV *draw_w_sv = GvSV (draw_w_gv);
3329 SV *draw_h_sv = GvSV (draw_h_gv);
3330 double draw_x, draw_y;
3331
3332 if (!SvROK (self))
3333 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3334
3335 hv = (HV *)SvRV (self);
3336
3337 if (SvTYPE (hv) != SVt_PVHV)
3338 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3339
3340 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3341 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3342
3343 if (!h || !w)
3344 XSRETURN_EMPTY;
3345
3346 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3347 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3348
3349 draw_x = SvNV (draw_x_sv) + x;
3350 draw_y = SvNV (draw_y_sv) + y;
3351
3352 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3353 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3354 XSRETURN_EMPTY;
3355
3356 sv_setnv (draw_x_sv, draw_x);
3357 sv_setnv (draw_y_sv, draw_y);
3358
3359 glPushMatrix ();
3360 glTranslated (x, y, 0);
3361
3362 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3363 {
3364 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3365
3366 if (svp && SvTRUE (*svp))
3367 {
3368 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3369 glEnable (GL_BLEND);
3370 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3371 glBegin (GL_QUADS);
3372 glVertex2f (0, 0);
3373 glVertex2f (w, 0);
3374 glVertex2f (w, h);
3375 glVertex2f (0, h);
3376 glEnd ();
3377 glDisable (GL_BLEND);
3378 }
3379 }
3380#if 0
3381 // draw borders, for debugging
3382 glPushMatrix ();
3383 glColor4f (1., 1., 0., 1.);
3384 glTranslatef (.5, .5, 0.);
3385 glBegin (GL_LINE_LOOP);
3386 glVertex2f (0 , 0);
3387 glVertex2f (w - 1, 0);
3388 glVertex2f (w - 1, h - 1);
3389 glVertex2f (0 , h - 1);
3390 glEnd ();
3391 glPopMatrix ();
3392#endif
3393 PUSHMARK (SP);
3394 XPUSHs (self);
3395 PUTBACK;
3396 call_method ("_draw", G_VOID | G_DISCARD);
3397 SPAGAIN;
3398
3399 glPopMatrix ();
3400
3401 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3402 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3403}
3404

Diff Legend

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