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.210 by root, Tue Jul 24 18:24:03 2007 UTC vs.
Revision 1.322 by root, Sun Nov 18 01:43:12 2018 UTC

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

Diff Legend

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