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.200 by root, Tue Jul 17 16:02:13 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
592char *
593SDL_GetError () 841char *SDL_GetError ()
594 842
595int 843void SDL_braino ()
596SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
597 844
598void 845int SDL_Init (U32 flags)
846
847int SDL_InitSubSystem (U32 flags)
848
849void SDL_QuitSubSystem (U32 flags)
850
599SDL_Quit () 851void SDL_Quit ()
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
600 861
601void 862void
602SDL_ListModes (int rgb, int alpha) 863SDL_ListModes (int rgb, int alpha)
603 PPCODE: 864 PPCODE:
604{ 865{
… …
616 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
617 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
618 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 879 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
619 880
620 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 881 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
621#if SDL_VERSION_ATLEAST(1,2,10)
622 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
623 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 882 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
624#endif
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 {
631 if ((*m)->w >= 640 && (*m)->h >= 480) 889 if ((*m)->w >= 400 && (*m)->h >= 300)
632 { 890 {
633 AV *av = newAV (); 891 AV *av = newAV ();
634 av_push (av, newSViv ((*m)->w)); 892 av_push (av, newSViv ((*m)->w));
635 av_push (av, newSViv ((*m)->h)); 893 av_push (av, newSViv ((*m)->h));
636 av_push (av, newSViv (rgb)); 894 av_push (av, newSViv (rgb));
… …
660 918
661 if (RETVAL) 919 if (RETVAL)
662 { 920 {
663 av_clear (texture_av); 921 av_clear (texture_av);
664 922
665 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 923 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
666#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);
667#include "glfunc.h" 925#include "glfunc.h"
668#undef GL_FUNC 926#undef GL_FUNC
669 } 927 }
670} 928}
… …
677char * 935char *
678SDL_GetKeyName (int sym) 936SDL_GetKeyName (int sym)
679 937
680int 938int
681SDL_GetAppState () 939SDL_GetAppState ()
940
941int
942SDL_GetModState ()
682 943
683void 944void
684poll_events () 945poll_events ()
685 PPCODE: 946 PPCODE:
686{ 947{
… …
696 { 957 {
697 case SDL_KEYDOWN: 958 case SDL_KEYDOWN:
698 case SDL_KEYUP: 959 case SDL_KEYUP:
699 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 960 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
700 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 961 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
701 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);
702 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 */
703 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 964 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
704 break; 965 break;
705 966
706 case SDL_ACTIVEEVENT: 967 case SDL_ACTIVEEVENT:
707 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 968 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
725 x = ev.motion.x; 986 x = ev.motion.x;
726 y = ev.motion.y; 987 y = ev.motion.y;
727 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 988 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
728 } 989 }
729 990
730 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 991 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
731 hv_store (hv, "state", 5, newSViv (state), 0); 992 hv_store (hv, "state", 5, newSViv (state), 0);
732 hv_store (hv, "x", 1, newSViv (x), 0); 993 hv_store (hv, "x", 1, newSViv (x), 0);
733 hv_store (hv, "y", 1, newSViv (y), 0); 994 hv_store (hv, "y", 1, newSViv (y), 0);
734 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 995 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
735 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 996 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
736 } 997 }
737 break; 998 break;
738 999
739 case SDL_MOUSEBUTTONDOWN: 1000 case SDL_MOUSEBUTTONDOWN:
740 case SDL_MOUSEBUTTONUP: 1001 case SDL_MOUSEBUTTONUP:
741 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
742 1003
743 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1004 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
744 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1005 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
745 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1006 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
746 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1007 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
751 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1012 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
752 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1013 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
753 break; 1014 break;
754 } 1015 }
755 1016
756 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))));
757 } 1018 }
758} 1019}
759 1020
760int 1021int
761Mix_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)
762 POSTCALL: 1023 POSTCALL:
763 Mix_HookMusicFinished (music_finished); 1024 Mix_HookMusicFinished (music_finished);
764 Mix_ChannelFinished (channel_finished); 1025 Mix_ChannelFinished (channel_finished);
765 1026
766void 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
767Mix_CloseAudio () 1044Mix_CloseAudio ()
768 1045
769int 1046int
770Mix_AllocateChannels (int numchans = -1) 1047Mix_AllocateChannels (int numchans = -1)
1048
1049const char *
1050Mix_GetError ()
771 1051
772void 1052void
773lowdelay (int fd, int val = 1) 1053lowdelay (int fd, int val = 1)
774 CODE: 1054 CODE:
775 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1055 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
801 } 1081 }
802 } 1082 }
803#endif 1083#endif
804} 1084}
805 1085
806void 1086int
807add_font (char *file) 1087add_font (char *file)
808 CODE: 1088 CODE:
809 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1089 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1090 OUTPUT:
1091 RETVAL
810 1092
811void 1093void
812load_image_inline (SV *image_) 1094load_image_inline (SV *image_)
813 ALIAS: 1095 ALIAS:
814 load_image_file = 1 1096 load_image_file = 1
… …
817 STRLEN image_len; 1099 STRLEN image_len;
818 char *image = (char *)SvPVbyte (image_, image_len); 1100 char *image = (char *)SvPVbyte (image_, image_len);
819 SDL_Surface *surface, *surface2; 1101 SDL_Surface *surface, *surface2;
820 SDL_PixelFormat fmt; 1102 SDL_PixelFormat fmt;
821 SDL_RWops *rw = ix 1103 SDL_RWops *rw = ix
822 ? SDL_RWFromFile (image, "r") 1104 ? SDL_RWFromFile (image, "rb")
823 : SDL_RWFromConstMem (image, image_len); 1105 : SDL_RWFromConstMem (image, image_len);
824 1106
825 if (!rw) 1107 if (!rw)
826 croak ("load_image: %s", SDL_GetError ()); 1108 croak ("load_image: %s", SDL_GetError ());
827 1109
… …
900void 1182void
901error (char *message) 1183error (char *message)
902 CODE: 1184 CODE:
903 fprintf (stderr, "ERROR: %s\n", message); 1185 fprintf (stderr, "ERROR: %s\n", message);
904#ifdef _WIN32 1186#ifdef _WIN32
905 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1187 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
906#endif 1188#endif
907 1189
908void 1190void
909fatal (char *message) 1191fatal (char *message)
910 CODE: 1192 CODE:
911 fprintf (stderr, "FATAL: %s\n", message); 1193 fprintf (stderr, "FATAL: %s\n", message);
912#ifdef _WIN32 1194#ifdef _WIN32
913 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1195 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
914#endif 1196#endif
915 _exit (1); 1197 _exit (1);
916 1198
917void 1199void
918_exit (int retval = 0) 1200_exit (int retval = 0)
… …
930#if DEBUG 1212#if DEBUG
931 VALGRIND_DO_LEAK_CHECK; 1213 VALGRIND_DO_LEAK_CHECK;
932#endif 1214#endif
933} 1215}
934 1216
935MODULE = CFPlus PACKAGE = CFPlus::Font 1217int
1218SvREFCNT (SV *sv)
1219 CODE:
1220 RETVAL = SvREFCNT (sv);
1221 OUTPUT:
1222 RETVAL
936 1223
937CFPlus::Font 1224MODULE = Deliantra::Client PACKAGE = DC::Font
1225
1226PROTOTYPES: DISABLE
1227
1228DC::Font
938new_from_file (SV *class, char *path, int id = 0) 1229new_from_file (SV *class, char *path, int id = 0)
939 CODE: 1230 CODE:
940{ 1231{
941 int count; 1232 int count;
942 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1233 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
945} 1236}
946 OUTPUT: 1237 OUTPUT:
947 RETVAL 1238 RETVAL
948 1239
949void 1240void
950DESTROY (CFPlus::Font self) 1241DESTROY (DC::Font self)
951 CODE: 1242 CODE:
952 pango_font_description_free (self); 1243 pango_font_description_free (self);
953 1244
954void 1245void
955make_default (CFPlus::Font self) 1246make_default (DC::Font self)
1247 PROTOTYPE: $
956 CODE: 1248 CODE:
957 default_font = self; 1249 default_font = self;
958 1250
959MODULE = CFPlus PACKAGE = CFPlus::Layout 1251MODULE = Deliantra::Client PACKAGE = DC::Layout
960 1252
1253PROTOTYPES: DISABLE
1254
961void 1255void
962reset_glyph_cache () 1256glyph_cache_backup ()
1257 PROTOTYPE:
963 CODE: 1258 CODE:
1259 tc_backup ();
1260
1261void
1262glyph_cache_restore ()
1263 PROTOTYPE:
1264 CODE:
964 tc_clear (); 1265 tc_restore ();
965 1266
966CFPlus::Layout 1267DC::Layout
967new (SV *class) 1268new (SV *class)
968 CODE: 1269 CODE:
969 New (0, RETVAL, 1, struct cf_layout); 1270 New (0, RETVAL, 1, struct cf_layout);
970 1271
971 RETVAL->pl = pango_layout_new (opengl_context); 1272 RETVAL->pl = pango_layout_new (opengl_context);
… …
973 RETVAL->g = 1.; 1274 RETVAL->g = 1.;
974 RETVAL->b = 1.; 1275 RETVAL->b = 1.;
975 RETVAL->a = 1.; 1276 RETVAL->a = 1.;
976 RETVAL->base_height = MIN_FONT_HEIGHT; 1277 RETVAL->base_height = MIN_FONT_HEIGHT;
977 RETVAL->font = 0; 1278 RETVAL->font = 0;
1279 RETVAL->rc = rc_alloc ();
978 1280
979 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1281 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
980 layout_update_font (RETVAL); 1282 layout_update_font (RETVAL);
981 OUTPUT: 1283 OUTPUT:
982 RETVAL 1284 RETVAL
983 1285
984void 1286void
985DESTROY (CFPlus::Layout self) 1287DESTROY (DC::Layout self)
986 CODE: 1288 CODE:
987 g_object_unref (self->pl); 1289 g_object_unref (self->pl);
1290 rc_free (self->rc);
988 Safefree (self); 1291 Safefree (self);
989 1292
990void 1293void
991set_text (CFPlus::Layout self, SV *text_) 1294set_text (DC::Layout self, SV *text_)
992 CODE: 1295 CODE:
993{ 1296{
994 STRLEN textlen; 1297 STRLEN textlen;
995 char *text = SvPVutf8 (text_, textlen); 1298 char *text = SvPVutf8 (text_, textlen);
996 1299
997 pango_layout_set_text (self->pl, text, textlen); 1300 pango_layout_set_text (self->pl, text, textlen);
998} 1301}
999 1302
1000void 1303void
1001set_markup (CFPlus::Layout self, SV *text_) 1304set_markup (DC::Layout self, SV *text_)
1002 CODE: 1305 CODE:
1003{ 1306{
1004 STRLEN textlen; 1307 STRLEN textlen;
1005 char *text = SvPVutf8 (text_, textlen); 1308 char *text = SvPVutf8 (text_, textlen);
1006 1309
1007 pango_layout_set_markup (self->pl, text, textlen); 1310 pango_layout_set_markup (self->pl, text, textlen);
1008} 1311}
1009 1312
1010void 1313void
1011set_shapes (CFPlus::Layout self, ...) 1314set_shapes (DC::Layout self, ...)
1012 CODE: 1315 CODE:
1013{ 1316{
1014 PangoAttrList *attrs = 0; 1317 PangoAttrList *attrs = 0;
1015 const char *text = pango_layout_get_text (self->pl); 1318 const char *text = pango_layout_get_text (self->pl);
1016 const char *pos = text; 1319 const char *pos = text;
… …
1051 if (attrs) 1354 if (attrs)
1052 pango_layout_set_attributes (self->pl, attrs); 1355 pango_layout_set_attributes (self->pl, attrs);
1053} 1356}
1054 1357
1055void 1358void
1056get_shapes (CFPlus::Layout self) 1359get_shapes (DC::Layout self)
1057 PPCODE: 1360 PPCODE:
1058{ 1361{
1059 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1362 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1060 1363
1061 do 1364 do
1062 { 1365 {
1063 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1366 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1064 1367
1065 if (run && shape_attr_p (run)) 1368 if (run && shape_attr_p (run))
1066 { 1369 {
1067 PangoRectangle extents; 1370 PangoRectangle extents;
1068 pango_layout_iter_get_run_extents (iter, 0, &extents); 1371 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1076 1379
1077 pango_layout_iter_free (iter); 1380 pango_layout_iter_free (iter);
1078} 1381}
1079 1382
1080int 1383int
1081has_wrapped (CFPlus::Layout self) 1384has_wrapped (DC::Layout self)
1082 CODE: 1385 CODE:
1083{ 1386{
1084 int lines = 1; 1387 int lines = 1;
1085 const char *text = pango_layout_get_text (self->pl); 1388 const char *text = pango_layout_get_text (self->pl);
1086 1389
… …
1091} 1394}
1092 OUTPUT: 1395 OUTPUT:
1093 RETVAL 1396 RETVAL
1094 1397
1095SV * 1398SV *
1096get_text (CFPlus::Layout self) 1399get_text (DC::Layout self)
1097 CODE: 1400 CODE:
1098 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1401 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1099 sv_utf8_decode (RETVAL); 1402 sv_utf8_decode (RETVAL);
1100 OUTPUT: 1403 OUTPUT:
1101 RETVAL 1404 RETVAL
1102 1405
1103void 1406void
1104set_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.)
1105 CODE: 1408 CODE:
1106 self->r = r; 1409 self->r = r;
1107 self->g = g; 1410 self->g = g;
1108 self->b = b; 1411 self->b = b;
1109 self->a = a; 1412 self->a = a;
1110 1413
1111void 1414void
1112set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1415set_font (DC::Layout self, DC::Font font = 0)
1113 CODE: 1416 CODE:
1114 if (self->font != font) 1417 if (self->font != font)
1115 { 1418 {
1116 self->font = font; 1419 self->font = font;
1117 layout_update_font (self); 1420 layout_update_font (self);
1118 } 1421 }
1119 1422
1120void 1423void
1121set_height (CFPlus::Layout self, int base_height) 1424set_height (DC::Layout self, int base_height)
1122 CODE: 1425 CODE:
1123 if (self->base_height != base_height) 1426 if (self->base_height != base_height)
1124 { 1427 {
1125 self->base_height = base_height; 1428 self->base_height = base_height;
1126 layout_update_font (self); 1429 layout_update_font (self);
1127 } 1430 }
1128 1431
1129void 1432void
1130set_width (CFPlus::Layout self, int max_width = -1) 1433set_width (DC::Layout self, int max_width = -1)
1131 CODE: 1434 CODE:
1132 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);
1133 1436
1134void 1437void
1135set_indent (CFPlus::Layout self, int indent) 1438set_indent (DC::Layout self, int indent)
1136 CODE: 1439 CODE:
1137 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1440 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1138 1441
1139void 1442void
1140set_spacing (CFPlus::Layout self, int spacing) 1443set_spacing (DC::Layout self, int spacing)
1141 CODE: 1444 CODE:
1142 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1445 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1143 1446
1144void 1447void
1145set_ellipsise (CFPlus::Layout self, int ellipsise) 1448set_ellipsise (DC::Layout self, int ellipsise)
1146 CODE: 1449 CODE:
1147 pango_layout_set_ellipsize (self->pl, 1450 pango_layout_set_ellipsize (self->pl,
1148 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1451 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1149 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1452 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1150 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1453 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1151 : PANGO_ELLIPSIZE_NONE 1454 : PANGO_ELLIPSIZE_NONE
1152 ); 1455 );
1153 1456
1154void 1457void
1155set_single_paragraph_mode (CFPlus::Layout self, int spm) 1458set_single_paragraph_mode (DC::Layout self, int spm)
1156 CODE: 1459 CODE:
1157 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1460 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1158 1461
1159void 1462void
1160size (CFPlus::Layout self) 1463size (DC::Layout self)
1161 PPCODE: 1464 PPCODE:
1162{ 1465{
1163 int w, h; 1466 int w, h;
1164 1467
1165 layout_get_pixel_size (self, &w, &h); 1468 layout_get_pixel_size (self, &w, &h);
… …
1168 PUSHs (sv_2mortal (newSViv (w))); 1471 PUSHs (sv_2mortal (newSViv (w)));
1169 PUSHs (sv_2mortal (newSViv (h))); 1472 PUSHs (sv_2mortal (newSViv (h)));
1170} 1473}
1171 1474
1172int 1475int
1173descent (CFPlus::Layout self) 1476descent (DC::Layout self)
1174 CODE: 1477 CODE:
1175{ 1478{
1176 PangoRectangle rect; 1479 PangoRectangle rect;
1177 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1480 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1178 pango_layout_line_get_pixel_extents (line, 0, &rect); 1481 pango_layout_line_get_pixel_extents (line, 0, &rect);
1179 RETVAL = PANGO_DESCENT (rect); 1482 RETVAL = PANGO_DESCENT (rect);
1180} 1483}
1181 OUTPUT: 1484 OUTPUT:
1182 RETVAL 1485 RETVAL
1183 1486
1184int 1487int
1185xy_to_index (CFPlus::Layout self, int x, int y) 1488xy_to_index (DC::Layout self, int x, int y)
1186 CODE: 1489 CODE:
1187{ 1490{
1188 int index, trailing; 1491 int index, trailing;
1189 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);
1190 RETVAL = index + trailing; 1493 RETVAL = index + trailing;
1191} 1494}
1192 OUTPUT: 1495 OUTPUT:
1193 RETVAL 1496 RETVAL
1194 1497
1195void 1498void
1196cursor_pos (CFPlus::Layout self, int index) 1499cursor_pos (DC::Layout self, int index)
1197 PPCODE: 1500 PPCODE:
1198{ 1501{
1199 PangoRectangle strong_pos; 1502 PangoRectangle pos;
1200 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1503 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1201 1504
1202 EXTEND (SP, 3); 1505 EXTEND (SP, 3);
1203 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1506 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1204 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1507 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1205 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1508 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1206} 1509}
1207 1510
1208void 1511void
1209index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1512index_to_line_x (DC::Layout self, int index, int trailing = 0)
1210 PPCODE: 1513 PPCODE:
1211{ 1514{
1212 int line, x; 1515 int line, x;
1213 1516
1214 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)
1215 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1519 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1216 1520 --line;
1521#endif
1217 EXTEND (SP, 2); 1522 EXTEND (SP, 2);
1218 PUSHs (sv_2mortal (newSViv (line - 1))); 1523 PUSHs (sv_2mortal (newSViv (line)));
1219 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1524 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1220} 1525}
1221 1526
1222void 1527void
1223line_x_to_index (CFPlus::Layout self, int line, int x) 1528line_x_to_index (DC::Layout self, int line, int x)
1224 PPCODE: 1529 PPCODE:
1225{ 1530{
1226 PangoLayoutLine *lp; 1531 PangoLayoutLine *lp;
1227 int index, trailing; 1532 int index, trailing;
1228 1533
1229 if (line < 0) 1534 if (line < 0)
1230 XSRETURN_EMPTY; 1535 XSRETURN_EMPTY;
1231 1536
1232 if (!(lp = pango_layout_get_line (self->pl, line))) 1537 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1233 XSRETURN_EMPTY; /* do better */ 1538 XSRETURN_EMPTY; /* do better */
1234 1539
1235 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);
1236 1541
1237 EXTEND (SP, 2); 1542 EXTEND (SP, 2);
… …
1243 PUSHs (sv_2mortal (newSViv (trailing))); 1548 PUSHs (sv_2mortal (newSViv (trailing)));
1244 } 1549 }
1245} 1550}
1246 1551
1247void 1552void
1248render (CFPlus::Layout self, float x, float y, int flags = 0) 1553render (DC::Layout self, float x, float y, int flags = 0)
1249 PPCODE: 1554 CODE:
1555 rc_clear (self->rc);
1250 pango_opengl_render_layout_subpixel ( 1556 pango_opengl_render_layout_subpixel (
1251 self->pl, 1557 self->pl,
1558 self->rc,
1252 x * PANGO_SCALE, y * PANGO_SCALE, 1559 x * PANGO_SCALE, y * PANGO_SCALE,
1253 self->r, self->g, self->b, self->a, 1560 self->r, self->g, self->b, self->a,
1254 flags 1561 flags
1255 ); 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);
1256 1566
1257MODULE = CFPlus PACKAGE = CFPlus::Texture
1258
1259int minpot (int n)
1260
1261void 1567void
1262pad2pot (SV *data_, SV *w_, SV *h_) 1568draw (DC::Layout self)
1263 CODE: 1569 CODE:
1264{ 1570{
1265 int ow = SvIV (w_); 1571 glEnable (GL_TEXTURE_2D);
1266 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);
1267 1578
1268 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_))
1269 { 1595 {
1270 int nw = minpot (ow);
1271 int nh = minpot (oh);
1272
1273 if (nw != ow || nh != oh)
1274 {
1275 if (SvOK (data_))
1276 {
1277 STRLEN datalen; 1596 STRLEN datalen;
1278 char *data = SvPVbyte (data_, datalen); 1597 char *data = SvPVbyte (data_, datalen);
1279 int bpp = datalen / (ow * oh); 1598 int bpp = datalen / (ow * oh);
1280 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1599 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1281 1600
1282 SvPOK_only (result_); 1601 SvPOK_only (result_);
1283 SvCUR_set (result_, nw * nh * bpp); 1602 SvCUR_set (result_, nw * nh * bpp);
1284 1603
1285 memset (SvPVX (result_), 0, nw * nh * bpp); 1604 memset (SvPVX (result_), 0, nw * nh * bpp);
1286 while (oh--) 1605 while (oh--)
1287 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);
1288 1607
1289 sv_setsv (data_, result_); 1608 sv_setsv (data_, result_);
1290 }
1291
1292 sv_setiv (w_, nw);
1293 sv_setiv (h_, nh);
1294 }
1295 } 1609 }
1296} 1610}
1297 1611
1298void 1612void
1299draw_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.)
… …
1305{ 1619{
1306 HV *hv = (HV *)SvRV (self); 1620 HV *hv = (HV *)SvRV (self);
1307 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1621 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1308 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1622 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1309 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;
1310 1627
1311 if (items < 5) 1628 if (items < 5)
1312 { 1629 {
1313 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1630 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1314 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1631 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1342 glDisable (GL_ALPHA_TEST); 1659 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1660 glDisable (GL_BLEND);
1344 } 1661 }
1345} 1662}
1346 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
1347IV 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)
1348 CODE: 1754 CODE:
1349{ 1755{
1350 GLint width; 1756 GLint width;
1351 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);
… …
1353 RETVAL = width > 0; 1759 RETVAL = width > 0;
1354} 1760}
1355 OUTPUT: 1761 OUTPUT:
1356 RETVAL 1762 RETVAL
1357 1763
1358MODULE = CFPlus PACKAGE = CFPlus::Map 1764MODULE = Deliantra::Client PACKAGE = DC::Map
1359 1765
1360CFPlus::Map 1766PROTOTYPES: DISABLE
1767
1768DC::Map
1361new (SV *class) 1769new (SV *class)
1362 CODE: 1770 CODE:
1363 New (0, RETVAL, 1, struct map); 1771 New (0, RETVAL, 1, struct map);
1364 RETVAL->x = 0; 1772 RETVAL->x = 0;
1365 RETVAL->y = 0; 1773 RETVAL->y = 0;
… …
1373 RETVAL->row = 0; 1781 RETVAL->row = 0;
1374 OUTPUT: 1782 OUTPUT:
1375 RETVAL 1783 RETVAL
1376 1784
1377void 1785void
1378DESTROY (CFPlus::Map self) 1786DESTROY (DC::Map self)
1379 CODE: 1787 CODE:
1380{ 1788{
1381 map_clear (self); 1789 map_clear (self);
1382 Safefree (self->face2tile); 1790 Safefree (self->face2tile);
1383 Safefree (self->tex); 1791 Safefree (self->tex);
1384 Safefree (self); 1792 Safefree (self);
1385} 1793}
1386 1794
1387void 1795void
1388resize (CFPlus::Map self, int map_width, int map_height) 1796resize (DC::Map self, int map_width, int map_height)
1389 CODE: 1797 CODE:
1390 self->w = map_width; 1798 self->w = map_width;
1391 self->h = map_height; 1799 self->h = map_height;
1392 1800
1393void 1801void
1394clear (CFPlus::Map self) 1802clear (DC::Map self)
1395 CODE: 1803 CODE:
1396 map_clear (self); 1804 map_clear (self);
1397 1805
1398void 1806void
1399set_tileid (CFPlus::Map self, int face, int tile) 1807set_tileid (DC::Map self, int face, int tile)
1400 CODE: 1808 CODE:
1401{ 1809{
1402 need_facenum (self, face); self->face2tile [face] = tile; 1810 need_facenum (self, face); self->face2tile [face] = tile;
1403 need_texid (self, tile); 1811 need_texid (self, tile);
1404} 1812}
1405 1813
1406void 1814void
1407set_smooth (CFPlus::Map self, int face, int smooth, int level) 1815set_smooth (DC::Map self, int face, int smooth, int level)
1408 CODE: 1816 CODE:
1409{ 1817{
1410 tileid texid; 1818 tileid texid;
1411 maptex *tex; 1819 maptex *tex;
1412 1820
… …
1425 tex->smoothtile = self->face2tile [smooth]; 1833 tex->smoothtile = self->face2tile [smooth];
1426 tex->smoothlevel = level; 1834 tex->smoothlevel = level;
1427} 1835}
1428 1836
1429void 1837void
1430set_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)
1431 CODE: 1839 CODE:
1432{ 1840{
1433 need_texid (self, texid); 1841 need_texid (self, texid);
1434 1842
1435 { 1843 {
… …
1454 // use uglier nearest interpolation because linear suffers 1862 // use uglier nearest interpolation because linear suffers
1455 // from transparent color bleeding and ugly wrapping effects. 1863 // from transparent color bleeding and ugly wrapping effects.
1456 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1864 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1457} 1865}
1458 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
1459int 1887int
1460ox (CFPlus::Map self) 1888ox (DC::Map self)
1461 ALIAS: 1889 ALIAS:
1462 oy = 1 1890 oy = 1
1463 x = 2 1891 x = 2
1464 y = 3 1892 y = 3
1465 w = 4 1893 w = 4
… …
1476 } 1904 }
1477 OUTPUT: 1905 OUTPUT:
1478 RETVAL 1906 RETVAL
1479 1907
1480void 1908void
1481scroll (CFPlus::Map self, int dx, int dy) 1909scroll (DC::Map self, int dx, int dy)
1482 CODE: 1910 CODE:
1483{ 1911{
1484 if (dx > 0) 1912 if (dx > 0)
1485 map_blank (self, self->x, self->y, dx, self->h); 1913 map_blank (self, self->x, self->y, dx, self->h);
1486 else if (dx < 0) 1914 else if (dx < 0)
… …
1501 self->rows += MAP_EXTEND_Y; 1929 self->rows += MAP_EXTEND_Y;
1502 self->y += MAP_EXTEND_Y; 1930 self->y += MAP_EXTEND_Y;
1503 } 1931 }
1504} 1932}
1505 1933
1506void 1934SV *
1507map1a_update (CFPlus::Map self, SV *data_, int extmap) 1935map1a_update (DC::Map self, SV *data_, int extmap)
1508 CODE: 1936 CODE:
1509{ 1937{
1510 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1938 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1511 uint8_t *data_end = (uint8_t *)SvEND (data_); 1939 uint8_t *data_end = (uint8_t *)SvEND (data_);
1512 mapcell *cell; 1940 mapcell *cell;
1513 int x, y, flags; 1941 int x, y, z, flags;
1942 AV *missing = newAV ();
1943 RETVAL = newRV_noinc ((SV *)missing);
1514 1944
1515 while (data < data_end - 1) 1945 while (data < data_end - 1)
1516 { 1946 {
1517 flags = (data [0] << 8) + data [1]; data += 2; 1947 flags = (data [0] << 8) + data [1]; data += 2;
1518 1948
… …
1538 uint8_t ext, cmd; 1968 uint8_t ext, cmd;
1539 1969
1540 do 1970 do
1541 { 1971 {
1542 ext = *data++; 1972 ext = *data++;
1543 cmd = ext & 0x3f; 1973 cmd = ext & 0x7f;
1544 1974
1545 if (cmd < 4) 1975 if (cmd < 4)
1546 cell->darkness = 255 - ext * 64 + 1; 1976 cell->darkness = 255 - ext * 64 + 1;
1547 else if (cmd == 5) // health 1977 else if (cmd == 5) // health
1548 { 1978 {
… …
1551 } 1981 }
1552 else if (cmd == 6) // monster width 1982 else if (cmd == 6) // monster width
1553 cell->stat_width = *data++ + 1; 1983 cell->stat_width = *data++ + 1;
1554 else if (cmd == 0x47) 1984 else if (cmd == 0x47)
1555 { 1985 {
1556 if (*data == 4) 1986 if (*data == 1) cell->player = data [1];
1557 ; // 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);
1558 1990
1559 data += *data + 1; 1991 data += *data + 1;
1560 } 1992 }
1561 else if (cmd == 8) // cell flags 1993 else if (cmd == 8) // cell flags
1562 cell->flags = *data++; 1994 cell->flags = *data++;
… …
1569 } 2001 }
1570 else 2002 else
1571 cell->darkness = *data++ + 1; 2003 cell->darkness = *data++ + 1;
1572 } 2004 }
1573 2005
2006 for (z = 0; z <= 2; ++z)
1574 if (flags & 4) 2007 if (flags & (4 >> z))
1575 { 2008 {
1576 faceid face = (data [0] << 8) + data [1]; data += 2; 2009 faceid face = (data [0] << 8) + data [1]; data += 2;
1577 need_facenum (self, face); 2010 need_facenum (self, face);
1578 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 }
1579 } 2028 }
1580
1581 if (flags & 2)
1582 {
1583 faceid face = (data [0] << 8) + data [1]; data += 2;
1584 need_facenum (self, face);
1585 cell->tile [1] = self->face2tile [face];
1586 }
1587
1588 if (flags & 1)
1589 {
1590 faceid face = (data [0] << 8) + data [1]; data += 2;
1591 need_facenum (self, face);
1592 cell->tile [2] = self->face2tile [face];
1593 }
1594 } 2029 }
1595 else 2030 else
1596 cell->darkness = 0; 2031 CELL_CLEAR (cell);
1597 } 2032 }
1598} 2033}
2034 OUTPUT:
2035 RETVAL
1599 2036
1600SV * 2037SV *
1601mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2038mapmap (DC::Map self, int x0, int y0, int w, int h)
1602 CODE: 2039 CODE:
1603{ 2040{
1604 int x1, x; 2041 int x1, x;
1605 int y1, y; 2042 int y1, y;
1606 int z; 2043 int z;
… …
1651} 2088}
1652 OUTPUT: 2089 OUTPUT:
1653 RETVAL 2090 RETVAL
1654 2091
1655void 2092void
1656draw (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)
1657 CODE: 2094 CODE:
1658{ 2095{
2096 int x, y, z;
2097
1659 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2098 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1660 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
1661 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)
1662 smooth_key skey; 2101 smooth_key skey;
1663 int x, y, z; 2102 int pl_x, pl_y;
1664 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;
1665 2108
2109 pl_tex.name = 0;
2110
1666 // thats current max. sorry. 2111 // that's current max. sorry.
1667 if (sw > 255) sw = 255; 2112 if (sw > 255) sw = 255;
1668 if (sh > 255) sh = 255; 2113 if (sh > 255) sh = 255;
1669 2114
1670 // clear key, in case of extra padding 2115 // clear key, in case of extra padding
1671 memset (&skey, 0, sizeof (skey)); 2116 memset (&skey, 0, sizeof (skey));
1672 2117
1673 glColor4ub (255, 255, 255, 255); 2118 memset (&key, 0, sizeof (key));
1674 2119 key.r = 255;
1675 glEnable (GL_BLEND); 2120 key.g = 255;
1676 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2121 key.b = 255;
1677 glEnable (GL_TEXTURE_2D); 2122 key.a = 255;
1678 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2123 key.mode = GL_QUADS;
1679 2124 key.format = GL_T2F_V3F;
1680 glBegin (GL_QUADS);
1681
1682 last_name = 0;
1683 2125
1684 mx += self->x; 2126 mx += self->x;
1685 my += self->y; 2127 my += self->y;
1686 2128
1687 // first pass: determine smooth_max 2129 // first pass: determine smooth_max
… …
1704 MAX (self->tex [cell->tile [1]].smoothlevel, 2146 MAX (self->tex [cell->tile [1]].smoothlevel,
1705 self->tex [cell->tile [2]].smoothlevel)); 2147 self->tex [cell->tile [2]].smoothlevel));
1706 } 2148 }
1707 } 2149 }
1708 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
1709 for (z = 0; z <= 2; z++) 2158 for (z = 0; z <= 2; z++)
1710 { 2159 {
1711 memset (smooth_level, 0, sizeof (smooth_level)); 2160 memset (smooth_level, 0, sizeof (smooth_level));
2161 key.texname = -1;
1712 2162
1713 for (y = 0; y < sh; y++) 2163 for (y = 0; y < sh; y++)
1714 if (0 <= y + my && y + my < self->rows) 2164 if (0 <= y + my && y + my < self->rows)
1715 { 2165 {
1716 maprow *row = self->row + (y + my); 2166 maprow *row = self->row + (y + my);
… …
1722 tileid tile = cell->tile [z]; 2172 tileid tile = cell->tile [z];
1723 2173
1724 if (tile) 2174 if (tile)
1725 { 2175 {
1726 maptex tex = self->tex [tile]; 2176 maptex tex = self->tex [tile];
1727 int px = (x + 1) * T - tex.w; 2177 int px, py;
1728 int py = (y + 1) * T - tex.h;
1729 2178
1730 // suppressing texture state switches here
1731 // is only moderately effective, but worth the extra effort
1732 if (last_name != tex.name) 2179 if (key.texname != tex.name)
1733 { 2180 {
2181 self->tex [tile].unused = 0;
2182
1734 if (!tex.name) 2183 if (!tex.name)
1735 tex = self->tex [2]; /* missing, replace by noface */ 2184 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1736 2185
1737 glEnd (); 2186 key.texname = tex.name;
1738 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2187 arr = rc_array (rc, &key);
1739 glBegin (GL_QUADS);
1740 } 2188 }
1741 2189
1742 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2190 px = (x + 1) * T - tex.w;
1743 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2191 py = (y + 1) * T - tex.h;
1744 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1745 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1746 2192
1747 if (cell->flags && z == 2) 2193 if (expect_false (cell->player == player) && expect_false (z == 2))
1748 { 2194 {
1749 if (cell->flags & 1) 2195 pl_x = px;
2196 pl_y = py;
2197 pl_tex = tex;
1750 { 2198 continue;
1751 maptex tex = self->tex [1];
1752 int px = x * T + T * 2 / 32;
1753 int py = y * T - T * 6 / 32;
1754
1755 glEnd ();
1756 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1757 glBegin (GL_QUADS);
1758
1759 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1760 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1761 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1762 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1763 }
1764 } 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);
1765 2205
1766 // update smooth hash 2206 // update smooth hash
1767 if (tex.smoothtile) 2207 if (tex.smoothtile)
1768 { 2208 {
1769 skey.tile = tex.smoothtile; 2209 skey.tile = tex.smoothtile;
… …
1800 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);
1801 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);
1802 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);
1803 } 2243 }
1804 } 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 }
1805 } 2282 }
1806 } 2283 }
2284
2285 rc_draw (rc);
2286 rc_clear (rc);
1807 2287
1808 // go through all smoothlevels, lowest to highest, then draw. 2288 // go through all smoothlevels, lowest to highest, then draw.
1809 // this is basically counting sort 2289 // this is basically counting sort
1810 { 2290 {
1811 int w, b; 2291 int w, b;
1812 2292
2293 glEnable (GL_TEXTURE_2D);
2294 glBegin (GL_QUADS);
1813 for (w = 0; w < 256 / 32; ++w) 2295 for (w = 0; w < 256 / 32; ++w)
1814 { 2296 {
1815 uint32_t smask = smooth_level [w]; 2297 uint32_t smask = smooth_level [w];
1816 if (smask) 2298 if (smask)
1817 for (b = 0; b < 32; ++b) 2299 for (b = 0; b < 32; ++b)
… …
1836 int border = bits & 15; 2318 int border = bits & 15;
1837 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2319 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1838 float dx = tex.s * .0625f; // 16 images/row 2320 float dx = tex.s * .0625f; // 16 images/row
1839 float dy = tex.t * .5f ; // 2 images/column 2321 float dy = tex.t * .5f ; // 2 images/column
1840 2322
1841 // this time naively avoiding texture state changes
1842 // save gobs of state changes.
1843 if (last_name != tex.name) 2323 if (tex.name)
1844 { 2324 {
2325 // this time avoiding texture state changes
2326 // save gobs of state changes.
1845 if (!tex.name) 2327 if (key.texname != tex.name)
1846 continue; // smoothing not yet available 2328 {
2329 self->tex [skey->tile].unused = 0;
1847 2330
1848 glEnd (); 2331 glEnd ();
1849 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2332 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1850 glBegin (GL_QUADS); 2333 glBegin (GL_QUADS);
1851 } 2334 }
1852 2335
1853 if (border) 2336 if (border)
1854 { 2337 {
1855 float ox = border * dx; 2338 float ox = border * dx;
1856 2339
1857 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2340 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1858 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2341 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1859 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2342 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1860 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2343 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1861 } 2344 }
1862 2345
1863 if (corner) 2346 if (corner)
1864 { 2347 {
1865 float ox = corner * dx; 2348 float ox = corner * dx;
1866 2349
1867 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2350 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1868 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2351 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1869 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2352 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1870 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2353 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2354 }
1871 } 2355 }
1872 } 2356 }
1873 } 2357 }
1874 } 2358 }
1875 } 2359 }
2360
2361 glEnd ();
2362 glDisable (GL_TEXTURE_2D);
2363 key.texname = -1;
1876 } 2364 }
1877 2365
1878 hv_clear (smooth); 2366 hv_clear (smooth);
1879 } 2367 }
1880 2368
1881 glEnd (); 2369 if (pl_tex.name)
2370 {
2371 maptex tex = pl_tex;
2372 int px = pl_x + sdx;
2373 int py = pl_y + sdy;
1882 2374
1883 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
1884 glDisable (GL_BLEND); 2389 glDisable (GL_BLEND);
2390 rc_free (rc);
2391 rc_free (rc_ov);
1885 2392
1886 // top layer: overlays such as the health bar 2393 // top layer: overlays such as the health bar
1887 for (y = 0; y < sh; y++) 2394 for (y = 0; y < sh; y++)
1888 if (0 <= y + my && y + my < self->rows) 2395 if (0 <= y + my && y + my < self->rows)
1889 { 2396 {
… …
1894 { 2401 {
1895 mapcell *cell = row->col + (x + mx - row->c0); 2402 mapcell *cell = row->col + (x + mx - row->c0);
1896 2403
1897 int px = x * T; 2404 int px = x * T;
1898 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 }
1899 2412
1900 if (cell->stat_hp) 2413 if (cell->stat_hp)
1901 { 2414 {
1902 int width = cell->stat_width * T; 2415 int width = cell->stat_width * T;
1903 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2416 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
1914 } 2427 }
1915 } 2428 }
1916} 2429}
1917 2430
1918void 2431void
1919draw_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)
1920 CODE: 2433 CODE:
1921{ 2434{
1922 static float color[16][3] = { 2435 static float color[16][3] = {
1923 { 0.00F, 0.00F, 0.00F }, 2436 { 0.00F, 0.00F, 0.00F },
1924 { 1.00F, 1.00F, 1.00F }, 2437 { 1.00F, 1.00F, 1.00F },
… …
1943 }; 2456 };
1944 2457
1945 int x, y; 2458 int x, y;
1946 2459
1947 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 */
1948 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1949 glEnable (GL_BLEND); 2468 glEnable (GL_BLEND);
1950 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2469 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1951 glBegin (GL_QUADS); 2470 glBegin (GL_QUADS);
1952 2471
1953 for (y = 0; y < h; y++) 2472 for (y = 0; y < h; y++)
… …
1960 float *c = color [m & 15]; 2479 float *c = color [m & 15];
1961 2480
1962 float tx1 = m & 0x40 ? 0.5 : 0.; 2481 float tx1 = m & 0x40 ? 0.5 : 0.;
1963 float tx2 = tx1 + 0.5; 2482 float tx2 = tx1 + 0.5;
1964 2483
1965 glColor4f (c[0], c[1], c[2], 0.75); 2484 glColor4f (c[0], c[1], c[2], 1);
1966 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2485 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1967 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2486 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1968 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2487 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1969 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2488 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1970 } 2489 }
… …
1974 glDisable (GL_BLEND); 2493 glDisable (GL_BLEND);
1975 glDisable (GL_TEXTURE_2D); 2494 glDisable (GL_TEXTURE_2D);
1976} 2495}
1977 2496
1978void 2497void
1979fow_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)
1980 PPCODE: 2499 PPCODE:
1981{ 2500{
1982 int x, y; 2501 int x, y;
2502 int sw1 = sw + 2;
2503 int sh1 = sh + 2;
2504 int sh3 = sh * 3;
1983 int sw4 = (sw + 3) & ~3; 2505 int sw34 = (sw * 3 + 3) & ~3;
2506 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1984 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2507 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1985 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2508 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1986 2509
1987 memset (darkness, 255, sw4 * sh);
1988 SvPOK_only (darkness_sv); 2510 SvPOK_only (darkness3_sv);
1989 SvCUR_set (darkness_sv, sw4 * sh); 2511 SvCUR_set (darkness3_sv, sw34 * sh3);
1990 2512
1991 mx += self->x; 2513 mx += self->x - 1;
1992 my += self->y; 2514 my += self->y - 1;
1993 2515
2516 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2517
1994 for (y = 0; y < sh; y++) 2518 for (y = 0; y < sh1; y++)
1995 if (0 <= y + my && y + my < self->rows) 2519 if (0 <= y + my && y + my < self->rows)
1996 { 2520 {
1997 maprow *row = self->row + (y + my); 2521 maprow *row = self->row + (y + my);
1998 2522
1999 for (x = 0; x < sw; x++) 2523 for (x = 0; x < sw1; x++)
2000 if (row->c0 <= x + mx && x + mx < row->c1) 2524 if (row->c0 <= x + mx && x + mx < row->c1)
2001 { 2525 {
2002 mapcell *cell = row->col + (x + mx - row->c0); 2526 mapcell *cell = row->col + (x + mx - row->c0);
2003 2527
2004 darkness[y * sw4 + x] = cell->darkness 2528 darkness1 [y * sw1 + x] = cell->darkness
2005 ? 255 - (cell->darkness - 1) 2529 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2006 : 255 - FOW_DARKNESS; 2530 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2007 } 2531 }
2008 } 2532 }
2009 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
2010 EXTEND (SP, 3); 2572 EXTEND (SP, 3);
2011 PUSHs (sv_2mortal (newSViv (sw4))); 2573 PUSHs (sv_2mortal (newSViv (sw34)));
2012 PUSHs (sv_2mortal (newSViv (sh))); 2574 PUSHs (sv_2mortal (newSViv (sh3)));
2013 PUSHs (darkness_sv); 2575 PUSHs (darkness3_sv);
2014} 2576}
2015 2577
2016SV * 2578SV *
2017get_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)
2018 CODE: 2580 CODE:
2019{ 2581{
2020 int x, y, x1, y1; 2582 int x, y, x1, y1;
2021 SV *data_sv = newSV (w * h * 7 + 5); 2583 SV *data_sv = newSV (w * h * 7 + 5);
2022 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2584 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2079 else 2641 else
2080 *data++ = 0; 2642 *data++ = 0;
2081 } 2643 }
2082 } 2644 }
2083 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 {
2084 SvPOK_only (data_sv); 2649 SvPOK_only (data_sv);
2085 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2650 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2651 }
2652
2086 RETVAL = data_sv; 2653 RETVAL = data_sv;
2087} 2654}
2088 OUTPUT: 2655 OUTPUT:
2089 RETVAL 2656 RETVAL
2090 2657
2091void 2658void
2092set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2659set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2093 PPCODE: 2660 PPCODE:
2094{ 2661{
2095 int x, y, z; 2662 int x, y, z;
2096 int w, h; 2663 int w, h;
2097 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;
2098 2675
2099 if (*data++ != 0) 2676 if (*data++ != 0)
2100 return; /* version mismatch */ 2677 XSRETURN_EMPTY; /* version mismatch */
2101 2678
2102 w = *data++ << 8; w |= *data++; 2679 w = *data++ << 8; w |= *data++;
2103 h = *data++ << 8; h |= *data++; 2680 h = *data++ << 8; h |= *data++;
2104 2681
2105 // 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
… …
2117 { 2694 {
2118 maprow *row = map_get_row (self, y); 2695 maprow *row = map_get_row (self, y);
2119 2696
2120 for (x = x0; x < x1; x++) 2697 for (x = x0; x < x1; x++)
2121 { 2698 {
2699 uint8_t flags;
2700
2701 if (data + 7 >= end)
2702 XSRETURN_EMPTY;
2703
2122 uint8_t flags = *data++; 2704 flags = *data++;
2123 2705
2124 if (flags) 2706 if (flags)
2125 { 2707 {
2126 mapcell *cell = row_get_cell (row, x); 2708 mapcell *cell = row_get_cell (row, x);
2127 tileid tile[3] = { 0, 0, 0 }; 2709 tileid tile[3] = { 0, 0, 0 };
… …
2130 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2712 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2131 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2713 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2132 2714
2133 if (cell->darkness == 0) 2715 if (cell->darkness == 0)
2134 { 2716 {
2135 cell->darkness = 0; 2717 /*cell->darkness = 0;*/
2718 EXTEND (SP, 3);
2136 2719
2137 for (z = 0; z <= 2; z++) 2720 for (z = 0; z <= 2; z++)
2138 { 2721 {
2139 tileid t = tile [z]; 2722 tileid t = tile [z];
2140 2723
2141 if (t >= self->texs || (t && !self->tex [t].name)) 2724 if (t >= self->texs || (t && !self->tex [t].name))
2142 { 2725 {
2143 XPUSHs (sv_2mortal (newSViv (t))); 2726 PUSHs (sv_2mortal (newSViv (t)));
2144 need_texid (self, t); 2727 need_texid (self, t);
2145 } 2728 }
2146 2729
2147 cell->tile [z] = t; 2730 cell->tile [z] = t;
2148 } 2731 }
… …
2150 } 2733 }
2151 } 2734 }
2152 } 2735 }
2153} 2736}
2154 2737
2155MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2738MODULE = Deliantra::Client PACKAGE = DC::RW
2156 2739
2157CFPlus::MixChunk 2740DC::RW
2158new_from_file (SV *class, char *path) 2741new (SV *class, SV *data_sv)
2159 CODE: 2742 CODE:
2160 RETVAL = Mix_LoadWAV (path); 2743{
2744 STRLEN datalen;
2745 char *data = SvPVbyte (data_sv, datalen);
2746
2747 RETVAL = SDL_RWFromConstMem (data, datalen);
2748}
2161 OUTPUT: 2749 OUTPUT:
2162 RETVAL 2750 RETVAL
2163 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 : '('
2164void 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
2165DESTROY (CFPlus::MixChunk self) 2861DESTROY (DC::MixChunk self)
2166 CODE: 2862 CODE:
2167 Mix_FreeChunk (self); 2863 Mix_FreeChunk (self);
2168 2864
2169int 2865int
2170volume (CFPlus::MixChunk self, int volume = -1) 2866volume (DC::MixChunk self, int volume = -1)
2171 CODE: 2867 CODE:
2868 if (items > 1)
2869 volume = CLAMP (volume, 0, 128);
2172 RETVAL = Mix_VolumeChunk (self, volume); 2870 RETVAL = Mix_VolumeChunk (self, volume);
2173 OUTPUT: 2871 OUTPUT:
2174 RETVAL 2872 RETVAL
2175 2873
2176int 2874DC::Channel
2177play (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)
2178 CODE: 2876 CODE:
2877{
2179 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}
2180 OUTPUT: 2889 OUTPUT:
2181 RETVAL 2890 RETVAL
2182 2891
2183MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2892MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2184 2893
2185int 2894int
2186volume (int volume = -1) 2895volume (int volume = -1)
2896 PROTOTYPE: ;$
2187 CODE: 2897 CODE:
2898 if (items > 0)
2899 volume = CLAMP (volume, 0, 128);
2188 RETVAL = Mix_VolumeMusic (volume); 2900 RETVAL = Mix_VolumeMusic (volume);
2189 OUTPUT: 2901 OUTPUT:
2190 RETVAL 2902 RETVAL
2191 2903
2192int 2904void
2193fade_out (int ms) 2905fade_out (int ms)
2194 CODE: 2906 CODE:
2195 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);
2196 OUTPUT: 2918 OUTPUT:
2197 RETVAL 2919 RETVAL
2198 2920
2199CFPlus::MixMusic
2200new_from_file (SV *class, char *path)
2201 CODE:
2202 RETVAL = Mix_LoadMUS (path);
2203 OUTPUT:
2204 RETVAL
2205
2206void 2921void
2207DESTROY (CFPlus::MixMusic self) 2922DESTROY (DC::MixMusic self)
2208 CODE: 2923 CODE:
2209 Mix_FreeMusic (self); 2924 Mix_FreeMusic (self);
2210 2925
2211int 2926int
2212play (CFPlus::MixMusic self, int loops = -1) 2927play (DC::MixMusic self, int loops = -1)
2213 CODE: 2928 CODE:
2214 RETVAL = Mix_PlayMusic (self, loops); 2929 RETVAL = Mix_PlayMusic (self, loops);
2215 OUTPUT: 2930 OUTPUT:
2216 RETVAL 2931 RETVAL
2217 2932
2218int 2933void
2219fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2934fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2220 CODE: 2935 CODE:
2221 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2936 Mix_FadeInMusicPos (self, loops, ms, position);
2222 OUTPUT:
2223 RETVAL
2224 2937
2225MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2938MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2939
2940PROTOTYPES: ENABLE
2226 2941
2227BOOT: 2942BOOT:
2228{ 2943{
2229 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2944 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2230 static const struct { 2945 static const struct {
2231 const char *name; 2946 const char *name;
2232 IV iv; 2947 IV iv;
2233 } *civ, const_iv[] = { 2948 } *civ, const_iv[] = {
2234# define const_iv(name) { # name, (IV)name } 2949# define const_iv(name) { # name, (IV)name }
2235 const_iv (GL_VENDOR), 2950 const_iv (GL_VENDOR),
2236 const_iv (GL_VERSION), 2951 const_iv (GL_VERSION),
2237 const_iv (GL_EXTENSIONS), 2952 const_iv (GL_EXTENSIONS),
2953 const_iv (GL_MAX_TEXTURE_UNITS),
2238 const_iv (GL_COLOR_MATERIAL), 2954 const_iv (GL_COLOR_MATERIAL),
2239 const_iv (GL_SMOOTH), 2955 const_iv (GL_SMOOTH),
2240 const_iv (GL_FLAT), 2956 const_iv (GL_FLAT),
2241 const_iv (GL_DITHER), 2957 const_iv (GL_DITHER),
2242 const_iv (GL_BLEND), 2958 const_iv (GL_BLEND),
… …
2246 const_iv (GL_ALPHA_TEST), 2962 const_iv (GL_ALPHA_TEST),
2247 const_iv (GL_NORMALIZE), 2963 const_iv (GL_NORMALIZE),
2248 const_iv (GL_RESCALE_NORMAL), 2964 const_iv (GL_RESCALE_NORMAL),
2249 const_iv (GL_FRONT), 2965 const_iv (GL_FRONT),
2250 const_iv (GL_BACK), 2966 const_iv (GL_BACK),
2967 const_iv (GL_AUX0),
2251 const_iv (GL_AND), 2968 const_iv (GL_AND),
2252 const_iv (GL_ONE), 2969 const_iv (GL_ONE),
2253 const_iv (GL_ZERO), 2970 const_iv (GL_ZERO),
2254 const_iv (GL_SRC_ALPHA), 2971 const_iv (GL_SRC_ALPHA),
2255 const_iv (GL_DST_ALPHA), 2972 const_iv (GL_DST_ALPHA),
2256 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2973 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2257 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),
2258 const_iv (GL_SRC_ALPHA_SATURATE), 2979 const_iv (GL_SRC_ALPHA_SATURATE),
2259 const_iv (GL_RGB), 2980 const_iv (GL_RGB),
2260 const_iv (GL_RGBA), 2981 const_iv (GL_RGBA),
2261 const_iv (GL_RGBA4), 2982 const_iv (GL_RGBA4),
2262 const_iv (GL_RGBA8), 2983 const_iv (GL_RGBA8),
… …
2268 const_iv (GL_INTENSITY), 2989 const_iv (GL_INTENSITY),
2269 const_iv (GL_LUMINANCE), 2990 const_iv (GL_LUMINANCE),
2270 const_iv (GL_LUMINANCE_ALPHA), 2991 const_iv (GL_LUMINANCE_ALPHA),
2271 const_iv (GL_FLOAT), 2992 const_iv (GL_FLOAT),
2272 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),
2273 const_iv (GL_COMPILE), 3000 const_iv (GL_COMPILE),
2274 const_iv (GL_PROXY_TEXTURE_1D), 3001 const_iv (GL_PROXY_TEXTURE_1D),
2275 const_iv (GL_PROXY_TEXTURE_2D), 3002 const_iv (GL_PROXY_TEXTURE_2D),
2276 const_iv (GL_TEXTURE_1D), 3003 const_iv (GL_TEXTURE_1D),
2277 const_iv (GL_TEXTURE_2D), 3004 const_iv (GL_TEXTURE_2D),
… …
2301 const_iv (GL_COLOR_LOGIC_OP), 3028 const_iv (GL_COLOR_LOGIC_OP),
2302 const_iv (GL_SEPARABLE_2D), 3029 const_iv (GL_SEPARABLE_2D),
2303 const_iv (GL_CONVOLUTION_2D), 3030 const_iv (GL_CONVOLUTION_2D),
2304 const_iv (GL_CONVOLUTION_BORDER_MODE), 3031 const_iv (GL_CONVOLUTION_BORDER_MODE),
2305 const_iv (GL_CONSTANT_BORDER), 3032 const_iv (GL_CONSTANT_BORDER),
3033 const_iv (GL_POINTS),
2306 const_iv (GL_LINES), 3034 const_iv (GL_LINES),
2307 const_iv (GL_LINE_STRIP), 3035 const_iv (GL_LINE_STRIP),
2308 const_iv (GL_LINE_LOOP), 3036 const_iv (GL_LINE_LOOP),
2309 const_iv (GL_QUADS), 3037 const_iv (GL_QUADS),
2310 const_iv (GL_QUAD_STRIP), 3038 const_iv (GL_QUAD_STRIP),
2311 const_iv (GL_TRIANGLES), 3039 const_iv (GL_TRIANGLES),
2312 const_iv (GL_TRIANGLE_STRIP), 3040 const_iv (GL_TRIANGLE_STRIP),
2313 const_iv (GL_TRIANGLE_FAN), 3041 const_iv (GL_TRIANGLE_FAN),
3042 const_iv (GL_POLYGON),
2314 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),
2315 const_iv (GL_FASTEST), 3049 const_iv (GL_FASTEST),
3050 const_iv (GL_DONT_CARE),
3051 const_iv (GL_NICEST),
2316 const_iv (GL_V2F), 3052 const_iv (GL_V2F),
2317 const_iv (GL_V3F), 3053 const_iv (GL_V3F),
2318 const_iv (GL_T2F_V3F), 3054 const_iv (GL_T2F_V3F),
2319 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),
2320# undef const_iv 3059# undef const_iv
2321 }; 3060 };
2322 3061
2323 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; )
2324 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3063 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2325 3064
2326 texture_av = newAV (); 3065 texture_av = newAV ();
2327 AvREAL_off (texture_av); 3066 AvREAL_off (texture_av);
2328} 3067}
2329 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
2330char * 3078char *
2331gl_vendor () 3079gl_vendor ()
2332 CODE: 3080 CODE:
2333 RETVAL = (char *)glGetString (GL_VENDOR); 3081 RETVAL = (char *)glGetString (GL_VENDOR);
2334 OUTPUT: 3082 OUTPUT:
… …
2346 CODE: 3094 CODE:
2347 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3095 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2348 OUTPUT: 3096 OUTPUT:
2349 RETVAL 3097 RETVAL
2350 3098
2351char *glGetString (GLenum pname) 3099const char *glGetString (GLenum pname)
2352 3100
2353GLint glGetInteger (GLenum pname) 3101GLint glGetInteger (GLenum pname)
2354 CODE: 3102 CODE:
2355 glGetIntegerv (pname, &RETVAL); 3103 glGetIntegerv (pname, &RETVAL);
2356 OUTPUT: 3104 OUTPUT:
… …
2383 3131
2384void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3132void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2385 CODE: 3133 CODE:
2386 gl_BlendFuncSeparate (sa, da, saa, daa); 3134 gl_BlendFuncSeparate (sa, da, saa, daa);
2387 3135
3136# void glBlendEquation (int se)
3137
2388void glDepthMask (int flag) 3138void glDepthMask (int flag)
2389 3139
2390void glLogicOp (int opcode) 3140void glLogicOp (int opcode)
2391 3141
2392void glColorMask (int red, int green, int blue, int alpha) 3142void glColorMask (int red, int green, int blue, int alpha)
… …
2406# near_ and far_ are due to microsofts buggy "c" compiler 3156# near_ and far_ are due to microsofts buggy "c" compiler
2407void 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_)
2408 3158
2409# near_ and far_ are due to microsofts buggy "c" compiler 3159# near_ and far_ are due to microsofts buggy "c" compiler
2410void 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
2411 3163
2412void glViewport (int x, int y, int width, int height) 3164void glViewport (int x, int y, int width, int height)
2413 3165
2414void glScissor (int x, int y, int width, int height) 3166void glScissor (int x, int y, int width, int height)
2415 3167
… …
2423 3175
2424void glRotate (float angle, float x, float y, float z) 3176void glRotate (float angle, float x, float y, float z)
2425 CODE: 3177 CODE:
2426 glRotatef (angle, x, y, z); 3178 glRotatef (angle, x, y, z);
2427 3179
2428void glBegin (int mode)
2429
2430void glEnd ()
2431
2432void glColor (float r, float g, float b, float a = 1.0) 3180void glColor (float r, float g, float b, float a = 1.0)
2433 PROTOTYPE: @ 3181 PROTOTYPE: @
2434 ALIAS: 3182 ALIAS:
2435 glColor_premultiply = 1 3183 glColor_premultiply = 1
2436 CODE: 3184 CODE:
2437 if (ix) 3185 if (ix)
2438 { 3186 {
… …
2441 b *= a; 3189 b *= a;
2442 } 3190 }
2443 // microsoft visual "c" rounds instead of truncating... 3191 // microsoft visual "c" rounds instead of truncating...
2444 glColor4f (r, g, b, a); 3192 glColor4f (r, g, b, a);
2445 3193
2446void glInterleavedArrays (int format, int stride, char *data)
2447
2448void glDrawElements (int mode, int count, int type, char *indices)
2449
2450# 1.2 void glDrawRangeElements (int mode, int start, int end
2451
2452void glRasterPos (float x, float y, float z = 0.) 3194void glRasterPos (float x, float y, float z = 0.)
2453 CODE: 3195 CODE:
2454 glRasterPos3f (0, 0, z); 3196 glRasterPos3f (0, 0, z);
2455 glBitmap (0, 0, 0, 0, x, y, 0); 3197 glBitmap (0, 0, 0, 0, x, y, 0);
2456 3198
… …
2460 3202
2461void glTexCoord (float s, float t) 3203void glTexCoord (float s, float t)
2462 CODE: 3204 CODE:
2463 glTexCoord2f (s, t); 3205 glTexCoord2f (s, t);
2464 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
2465void glTexEnv (int target, int pname, float param) 3236void glTexEnv (int target, int pname, float param)
2466 CODE: 3237 CODE:
2467 glTexEnvf (target, pname, param); 3238 glTexEnvf (target, pname, param);
2468 3239
2469void glTexParameter (int target, int pname, float param) 3240void glTexParameter (int target, int pname, float param)
… …
2485void 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)
2486 CODE: 3257 CODE:
2487 if (gl.SeparableFilter2D) 3258 if (gl.SeparableFilter2D)
2488 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3259 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2489 3260
2490void 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)
2491 3262
2492void 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)
2493 3264
2494void glDrawPixels (int width, int height, int format, int type, char *pixels) 3265void glDrawPixels (int width, int height, int format, int type, char *pixels)
2495 3266
… …
2521 3292
2522void glEndList () 3293void glEndList ()
2523 3294
2524void glCallList (int list) 3295void glCallList (int list)
2525 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