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

Diff Legend

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