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.198 by root, Sun Jul 15 21:42:02 2007 UTC vs.
Revision 1.284 by elmex, Thu Dec 11 00:17:47 2008 UTC

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

Diff Legend

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