ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.199 by root, Tue Jul 17 13:53:02 2007 UTC vs.
Revision 1.289 by root, Wed Dec 24 04:09:26 2008 UTC

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

Diff Legend

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