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

Diff Legend

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