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.222 by root, Sat Aug 11 06:34:26 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
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
34 37
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 39
37#include <SDL.h> 40#include <SDL.h>
38#include <SDL_thread.h> 41#include <SDL_thread.h>
39#include <SDL_endian.h> 42#include <SDL_endian.h>
40#include <SDL_image.h> 43#include <SDL_image.h>
41#include <SDL_mixer.h> 44#include <SDL_mixer.h>
42#include <SDL_opengl.h> 45#include <SDL_opengl.h>
43 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
44#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
46 56
47#include <glib/gmacros.h> 57#include <glib.h>
48 58
49#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
50 71
51#ifndef _WIN32 72#ifndef _WIN32
52# include <sys/types.h> 73# include <sys/types.h>
53# include <sys/socket.h> 74# include <sys/socket.h>
54# include <netinet/in.h> 75# include <netinet/in.h>
55# include <netinet/tcp.h> 76# include <netinet/tcp.h>
56# include <inttypes.h> 77# include <inttypes.h>
57#endif 78#endif
58 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
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 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 */
61#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
62 95
63#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
65 98
66#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
67 100
68#if 0 101/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 103
71# define PARACHUTE 0 104#define KMOD_LRAM 0x10000 // our extension
72#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}
73 127
74static AV *texture_av; 128static AV *texture_av;
75 129
76static struct 130static struct
77{ 131{
… …
114 av_push (texture_av, (SV *)(size_t)name); 168 av_push (texture_av, (SV *)(size_t)name);
115 glDeleteTextures (1, &name); 169 glDeleteTextures (1, &name);
116} 170}
117 171
118#include "texcache.c" 172#include "texcache.c"
173#include "rendercache.c"
119 174
120#include "pango-font.c" 175#include "pango-font.c"
121#include "pango-fontmap.c" 176#include "pango-fontmap.c"
122#include "pango-render.c" 177#include "pango-render.c"
123 178
124typedef IV CFPlus__Channel; 179typedef IV DC__Channel;
125typedef SDL_RWops *CFPlus__RW; 180typedef SDL_RWops *DC__RW;
126typedef Mix_Chunk *CFPlus__MixChunk; 181typedef Mix_Chunk *DC__MixChunk;
127typedef Mix_Music *CFPlus__MixMusic; 182typedef Mix_Music *DC__MixMusic;
128 183
129typedef PangoFontDescription *CFPlus__Font; 184typedef PangoFontDescription *DC__Font;
130 185
131static int 186static int
132shape_attr_p (PangoLayoutRun *run) 187shape_attr_p (PangoLayoutRun *run)
133{ 188{
134 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
135 190
136 while (attrs) 191 while (attrs)
137 { 192 {
138 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
139 194
140 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
141 return 1; 196 return 1;
142 197
143 attrs = attrs->next; 198 attrs = attrs->next;
… …
148 203
149typedef struct cf_layout { 204typedef struct cf_layout {
150 PangoLayout *pl; 205 PangoLayout *pl;
151 float r, g, b, a; // default color for rgba mode 206 float r, g, b, a; // default color for rgba mode
152 int base_height; 207 int base_height;
153 CFPlus__Font font; 208 DC__Font font;
209 rc_t *rc;
154} *CFPlus__Layout; 210} *DC__Layout;
155 211
156static CFPlus__Font default_font; 212static DC__Font default_font;
157static PangoContext *opengl_context; 213static PangoContext *opengl_context;
158static PangoFontMap *opengl_fontmap; 214static PangoFontMap *opengl_fontmap;
159 215
160static void 216static void
161substitute_func (FcPattern *pattern, gpointer data) 217substitute_func (FcPattern *pattern, gpointer data)
162{ 218{
163 FcPatternAddBool (pattern, FC_HINTING, 1); 219 FcPatternAddBool (pattern, FC_HINTING, 1);
164#ifdef FC_HINT_STYLE 220#ifdef FC_HINT_STYLE
165 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 221 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
166#endif 222#endif
167 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 223 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
168} 224}
169 225
170static void 226static void
171layout_update_font (CFPlus__Layout self) 227layout_update_font (DC__Layout self)
172{ 228{
173 /* 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
174 * reasonably well with bitstream vera 230 * reasonably well with dejavu/bistream fonts
175 */ 231 */
176 PangoFontDescription *font = self->font ? self->font : default_font; 232 PangoFontDescription *font = self->font ? self->font : default_font;
177 233
178 pango_font_description_set_absolute_size (font, 234 pango_font_description_set_absolute_size (font,
179 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 235 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
180 236
181 pango_layout_set_font_description (self->pl, font); 237 pango_layout_set_font_description (self->pl, font);
182} 238}
183 239
184static void 240static void
185layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 241layout_get_pixel_size (DC__Layout self, int *w, int *h)
186{ 242{
187 PangoRectangle rect; 243 PangoRectangle rect;
188 244
189 // get_pixel_* wrongly rounds down 245 // get_pixel_* wrongly rounds down
190 pango_layout_get_extents (self->pl, 0, &rect); 246 pango_layout_get_extents (self->pl, 0, &rect);
… …
201 257
202typedef uint16_t tileid; 258typedef uint16_t tileid;
203typedef uint16_t faceid; 259typedef uint16_t faceid;
204 260
205typedef struct { 261typedef struct {
206 int name; 262 GLuint name;
207 int w, h; 263 int w, h;
208 float s, t; 264 float s, t;
209 uint8_t r, g, b, a; 265 uint8_t r, g, b, a;
210 tileid smoothtile; 266 tileid smoothtile;
211 uint8_t smoothlevel; 267 uint8_t smoothlevel;
268 uint8_t unused; /* set to zero on use */
212} maptex; 269} maptex;
213 270
214typedef struct { 271typedef struct {
215 uint32_t player; 272 uint32_t player;
216 tileid tile[3]; 273 tileid tile[3];
… …
229 int faces; tileid *face2tile; // [faceid] 286 int faces; tileid *face2tile; // [faceid]
230 int texs; maptex *tex; // [tileid] 287 int texs; maptex *tex; // [tileid]
231 288
232 int32_t rows; 289 int32_t rows;
233 maprow *row; 290 maprow *row;
234} *CFPlus__Map; 291} *DC__Map;
235 292
236static char * 293static char *
237prepend (char *ptr, int sze, int inc) 294prepend (char *ptr, int sze, int inc)
238{ 295{
239 char *p; 296 char *p;
… …
277 self->texs *= 2; 334 self->texs *= 2;
278 } 335 }
279} 336}
280 337
281static maprow * 338static maprow *
282map_get_row (CFPlus__Map self, int y) 339map_get_row (DC__Map self, int y)
283{ 340{
284 if (0 > y) 341 if (0 > y)
285 { 342 {
286 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
287 Prepend (maprow, self->row, self->rows, extend); 344 Prepend (maprow, self->row, self->rows, extend);
… …
325 382
326 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
327} 384}
328 385
329static mapcell * 386static mapcell *
330map_get_cell (CFPlus__Map self, int x, int y) 387map_get_cell (DC__Map self, int x, int y)
331{ 388{
332 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
333} 390}
334 391
335static void 392static void
336map_clear (CFPlus__Map self) 393map_clear (DC__Map self)
337{ 394{
338 int r; 395 int r;
339 396
340 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
341 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
… …
348 self->oy = 0; 405 self->oy = 0;
349 self->row = 0; 406 self->row = 0;
350 self->rows = 0; 407 self->rows = 0;
351} 408}
352 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
353static void 420static void
354map_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)
355{ 422{
356 int x, y; 423 int x, y;
357 maprow *row; 424 maprow *row;
358 mapcell *cell; 425 mapcell *cell;
359 426
… …
371 if (x >= row->c1) 438 if (x >= row->c1)
372 break; 439 break;
373 440
374 cell = row->col + x - row->c0; 441 cell = row->col + x - row->c0;
375 442
376 cell->darkness = 0; 443 CELL_CLEAR (cell);
377 cell->stat_hp = 0;
378 cell->flags = 0;
379 cell->player = 0;
380 } 444 }
381 } 445 }
382} 446}
383 447
384typedef struct { 448struct smooth_key
449{
385 tileid tile; 450 tileid tile;
386 uint8_t x, y, level; 451 uint8_t x, y, level;
387} 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}
388 471
389static void 472static void
390smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
391{ 474{
392 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
393 476
394 if (SvIOK (*sv)) 477 if (it == h.end ())
395 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
396 else 479 else
397 sv_setiv (*sv, bits); 480 it->second |= bits;
398} 481}
399 482
400static void 483static void
401music_finished (void) 484music_finished (void)
402{ 485{
… …
419 ev.code = 1; 502 ev.code = 1;
420 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
421 ev.data2 = 0; 504 ev.data2 = 0;
422 505
423 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;
424} 514}
425 515
426static unsigned int 516static unsigned int
427minpot (unsigned int n) 517minpot (unsigned int n)
428{ 518{
… …
438 n |= n >> 16; 528 n |= n >> 16;
439 529
440 return n + 1; 530 return n + 1;
441} 531}
442 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
443/* SDL should provide this, really. */ 544/* SDL should provide this, really. */
444#define SDLK_MODIFIER_MIN 300 545#define SDLK_MODIFIER_MIN 300
445#define SDLK_MODIFIER_MAX 314 546#define SDLK_MODIFIER_MAX 314
446 547
447/******************************************************************************/ 548/******************************************************************************/
… …
485 return 0; 586 return 0;
486 587
487 return 1; 588 return 1;
488} 589}
489 590
490MODULE = 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
491 650
492PROTOTYPES: ENABLE 651PROTOTYPES: ENABLE
493 652
494BOOT: 653BOOT:
495{ 654{
496 HV *stash = gv_stashpv ("CFPlus", 1); 655 HV *stash = gv_stashpv ("DC", 1);
497 static const struct { 656 static const struct {
498 const char *name; 657 const char *name;
499 IV iv; 658 IV iv;
500 } *civ, const_iv[] = { 659 } *civ, const_iv[] = {
501# define const_iv(name) { # name, (IV)name } 660# define const_iv(name) { # name, (IV)name }
… …
523 682
524 const_iv (SDL_APPINPUTFOCUS), 683 const_iv (SDL_APPINPUTFOCUS),
525 const_iv (SDL_APPMOUSEFOCUS), 684 const_iv (SDL_APPMOUSEFOCUS),
526 const_iv (SDL_APPACTIVE), 685 const_iv (SDL_APPACTIVE),
527 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),
528 const_iv (SDLK_KP0), 739 const_iv (SDLK_KP0),
529 const_iv (SDLK_KP1), 740 const_iv (SDLK_KP1),
530 const_iv (SDLK_KP2), 741 const_iv (SDLK_KP2),
531 const_iv (SDLK_KP3), 742 const_iv (SDLK_KP3),
532 const_iv (SDLK_KP4), 743 const_iv (SDLK_KP4),
… …
604 const_iv (KMOD_LMETA), 815 const_iv (KMOD_LMETA),
605 const_iv (KMOD_RMETA), 816 const_iv (KMOD_RMETA),
606 const_iv (KMOD_NUM), 817 const_iv (KMOD_NUM),
607 const_iv (KMOD_CAPS), 818 const_iv (KMOD_CAPS),
608 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)
609# undef const_iv 853# undef const_iv
610 }; 854 };
611 855
612 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--)
613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
614 858
615 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
616 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
617} 861}
618 862
… …
630 RETVAL 874 RETVAL
631 875
632NV floor (NV x) 876NV floor (NV x)
633 877
634NV 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
635 889
636void 890void
637pango_init () 891pango_init ()
638 CODE: 892 CODE:
639{ 893{
640 opengl_fontmap = pango_opengl_font_map_new (); 894 opengl_fontmap = pango_opengl_font_map_new ();
641 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);
642 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
643} 902}
644 903
645char *
646SDL_GetError () 904char *SDL_GetError ()
647 905
648int 906void SDL_main_hack (SV *real_main)
649SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 907 PROTOTYPE: &
650 908
651void 909int SDL_Init (U32 flags)
910
911int SDL_InitSubSystem (U32 flags)
912
913void SDL_QuitSubSystem (U32 flags)
914
652SDL_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
653 926
654void 927void
655SDL_ListModes (int rgb, int alpha) 928SDL_ListModes (int rgb, int alpha)
656 PPCODE: 929 PPCODE:
657{ 930{
… …
669 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 942 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 943 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 944 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
672 945
673 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 946 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
674#if SDL_VERSION_ATLEAST(1,2,10)
675 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
676 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 947 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
677#endif
678 948
679 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 949 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
680 950
681 if (m && m != (SDL_Rect **)-1) 951 if (m && m != (SDL_Rect **)-1)
682 while (*m) 952 while (*m)
683 { 953 {
684 if ((*m)->w >= 640 && (*m)->h >= 480) 954 if ((*m)->w >= 400 && (*m)->h >= 300)
685 { 955 {
686 AV *av = newAV (); 956 AV *av = newAV ();
687 av_push (av, newSViv ((*m)->w)); 957 av_push (av, newSViv ((*m)->w));
688 av_push (av, newSViv ((*m)->h)); 958 av_push (av, newSViv ((*m)->h));
689 av_push (av, newSViv (rgb)); 959 av_push (av, newSViv (rgb));
… …
712 ); 982 );
713 983
714 if (RETVAL) 984 if (RETVAL)
715 { 985 {
716 av_clear (texture_av); 986 av_clear (texture_av);
717
718 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
719#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);
720#include "glfunc.h" 988#include "glfunc.h"
721#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
722 } 992 }
723} 993}
724 OUTPUT: 994 OUTPUT:
725 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
726 999
727void 1000void
728SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
729 1002
730char * 1003char *
731SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
732 1006
733int 1007int
734SDL_GetAppState () 1008SDL_GetAppState ()
735 1009
1010int
1011SDL_GetModState ()
1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
736void 1017void
1018SDL_PumpEvents ()
1019
1020void
737poll_events () 1021peep_events ()
738 PPCODE: 1022 PPCODE:
739{ 1023{
740 SDL_Event ev; 1024 SDL_Event ev;
741 1025
742 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
… …
749 { 1033 {
750 case SDL_KEYDOWN: 1034 case SDL_KEYDOWN:
751 case SDL_KEYUP: 1035 case SDL_KEYUP:
752 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1036 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
753 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1037 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
754 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);
755 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 */
756 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1040 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
757 break; 1041 break;
758 1042
759 case SDL_ACTIVEEVENT: 1043 case SDL_ACTIVEEVENT:
760 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1044 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
778 x = ev.motion.x; 1062 x = ev.motion.x;
779 y = ev.motion.y; 1063 y = ev.motion.y;
780 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1064 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
781 } 1065 }
782 1066
783 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1067 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
784 hv_store (hv, "state", 5, newSViv (state), 0); 1068 hv_store (hv, "state", 5, newSViv (state), 0);
785 hv_store (hv, "x", 1, newSViv (x), 0); 1069 hv_store (hv, "x", 1, newSViv (x), 0);
786 hv_store (hv, "y", 1, newSViv (y), 0); 1070 hv_store (hv, "y", 1, newSViv (y), 0);
787 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1071 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
788 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1072 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
789 } 1073 }
790 break; 1074 break;
791 1075
792 case SDL_MOUSEBUTTONDOWN: 1076 case SDL_MOUSEBUTTONDOWN:
793 case SDL_MOUSEBUTTONUP: 1077 case SDL_MOUSEBUTTONUP:
794 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1078 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
795 1079
796 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1080 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
797 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1081 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
798 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1082 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
799 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1083 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
804 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1088 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
805 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1089 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
806 break; 1090 break;
807 } 1091 }
808 1092
809 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))));
810 } 1094 }
811} 1095}
812 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
813int 1110int
814Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1111Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
815 POSTCALL: 1112 POSTCALL:
816 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
817 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
1115
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}
818 1131
819void 1132void
820Mix_CloseAudio () 1133Mix_CloseAudio ()
821 1134
822int 1135int
… …
857 } 1170 }
858 } 1171 }
859#endif 1172#endif
860} 1173}
861 1174
862void 1175int
863add_font (char *file) 1176add_font (char *file)
864 CODE: 1177 CODE:
865 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)
866 1188
867void 1189void
868load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
869 ALIAS: 1191 ALIAS:
870 load_image_file = 1 1192 load_image_file = 1
… …
916 1238
917 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
918 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
919 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
920 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
921 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
922 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)));
923 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
924 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
925 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
926 1248
… …
956void 1278void
957error (char *message) 1279error (char *message)
958 CODE: 1280 CODE:
959 fprintf (stderr, "ERROR: %s\n", message); 1281 fprintf (stderr, "ERROR: %s\n", message);
960#ifdef _WIN32 1282#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1283 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
962#endif 1284#endif
963 1285
964void 1286void
965fatal (char *message) 1287fatal (char *message)
966 CODE: 1288 CODE:
967 fprintf (stderr, "FATAL: %s\n", message); 1289 fprintf (stderr, "FATAL: %s\n", message);
968#ifdef _WIN32 1290#ifdef _WIN32
969 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1291 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
970#endif 1292#endif
971 _exit (1); 1293 _exit (1);
972 1294
973void 1295void
974_exit (int retval = 0) 1296_exit (int retval = 0)
… …
986#if DEBUG 1308#if DEBUG
987 VALGRIND_DO_LEAK_CHECK; 1309 VALGRIND_DO_LEAK_CHECK;
988#endif 1310#endif
989} 1311}
990 1312
991MODULE = 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
992 1321
993PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
994 1323
995CFPlus::Font 1324DC::Font
996new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
997 CODE: 1326 CODE:
998{ 1327{
999 int count; 1328 int count;
1000 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1001 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
1003} 1332}
1004 OUTPUT: 1333 OUTPUT:
1005 RETVAL 1334 RETVAL
1006 1335
1007void 1336void
1008DESTROY (CFPlus::Font self) 1337DESTROY (DC::Font self)
1009 CODE: 1338 CODE:
1010 pango_font_description_free (self); 1339 pango_font_description_free (self);
1011 1340
1012void 1341void
1013make_default (CFPlus::Font self) 1342make_default (DC::Font self)
1014 PROTOTYPE: $ 1343 PROTOTYPE: $
1015 CODE: 1344 CODE:
1016 default_font = self; 1345 default_font = self;
1017 1346
1018MODULE = CFPlus PACKAGE = CFPlus::Layout 1347MODULE = Deliantra::Client PACKAGE = DC::Layout
1019 1348
1020PROTOTYPES: DISABLE 1349PROTOTYPES: DISABLE
1021 1350
1022void 1351void
1023reset_glyph_cache () 1352glyph_cache_backup ()
1024 PROTOTYPE: 1353 PROTOTYPE:
1025 CODE: 1354 CODE:
1355 tc_backup ();
1356
1357void
1358glyph_cache_restore ()
1359 PROTOTYPE:
1360 CODE:
1026 tc_clear (); 1361 tc_restore ();
1027 1362
1028CFPlus::Layout 1363DC::Layout
1029new (SV *class) 1364new (SV *klass)
1030 CODE: 1365 CODE:
1031 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1032 1367
1033 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1034 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1035 RETVAL->g = 1.; 1370 RETVAL->g = 1.;
1036 RETVAL->b = 1.; 1371 RETVAL->b = 1.;
1037 RETVAL->a = 1.; 1372 RETVAL->a = 1.;
1038 RETVAL->base_height = MIN_FONT_HEIGHT; 1373 RETVAL->base_height = MIN_FONT_HEIGHT;
1039 RETVAL->font = 0; 1374 RETVAL->font = 0;
1375 RETVAL->rc = rc_alloc ();
1040 1376
1041 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1377 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042 layout_update_font (RETVAL); 1378 layout_update_font (RETVAL);
1043 OUTPUT: 1379 OUTPUT:
1044 RETVAL 1380 RETVAL
1045 1381
1046void 1382void
1047DESTROY (CFPlus::Layout self) 1383DESTROY (DC::Layout self)
1048 CODE: 1384 CODE:
1049 g_object_unref (self->pl); 1385 g_object_unref (self->pl);
1386 rc_free (self->rc);
1050 Safefree (self); 1387 Safefree (self);
1051 1388
1052void 1389void
1053set_text (CFPlus::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1054 CODE: 1391 CODE:
1055{ 1392{
1056 STRLEN textlen; 1393 STRLEN textlen;
1057 char *text = SvPVutf8 (text_, textlen); 1394 char *text = SvPVutf8 (text_, textlen);
1058 1395
1059 pango_layout_set_text (self->pl, text, textlen); 1396 pango_layout_set_text (self->pl, text, textlen);
1060} 1397}
1061 1398
1062void 1399void
1063set_markup (CFPlus::Layout self, SV *text_) 1400set_markup (DC::Layout self, SV *text_)
1064 CODE: 1401 CODE:
1065{ 1402{
1066 STRLEN textlen; 1403 STRLEN textlen;
1067 char *text = SvPVutf8 (text_, textlen); 1404 char *text = SvPVutf8 (text_, textlen);
1068 1405
1069 pango_layout_set_markup (self->pl, text, textlen); 1406 pango_layout_set_markup (self->pl, text, textlen);
1070} 1407}
1071 1408
1072void 1409void
1073set_shapes (CFPlus::Layout self, ...) 1410set_shapes (DC::Layout self, ...)
1074 CODE: 1411 CODE:
1075{ 1412{
1076 PangoAttrList *attrs = 0; 1413 PangoAttrList *attrs = 0;
1077 const char *text = pango_layout_get_text (self->pl); 1414 const char *text = pango_layout_get_text (self->pl);
1078 const char *pos = text; 1415 const char *pos = text;
… …
1113 if (attrs) 1450 if (attrs)
1114 pango_layout_set_attributes (self->pl, attrs); 1451 pango_layout_set_attributes (self->pl, attrs);
1115} 1452}
1116 1453
1117void 1454void
1118get_shapes (CFPlus::Layout self) 1455get_shapes (DC::Layout self)
1119 PPCODE: 1456 PPCODE:
1120{ 1457{
1121 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1458 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1122 1459
1123 do 1460 do
1124 { 1461 {
1125 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1462 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1126 1463
1127 if (run && shape_attr_p (run)) 1464 if (run && shape_attr_p (run))
1128 { 1465 {
1129 PangoRectangle extents; 1466 PangoRectangle extents;
1130 pango_layout_iter_get_run_extents (iter, 0, &extents); 1467 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1138 1475
1139 pango_layout_iter_free (iter); 1476 pango_layout_iter_free (iter);
1140} 1477}
1141 1478
1142int 1479int
1143has_wrapped (CFPlus::Layout self) 1480has_wrapped (DC::Layout self)
1144 CODE: 1481 CODE:
1145{ 1482{
1146 int lines = 1; 1483 int lines = 1;
1147 const char *text = pango_layout_get_text (self->pl); 1484 const char *text = pango_layout_get_text (self->pl);
1148 1485
… …
1153} 1490}
1154 OUTPUT: 1491 OUTPUT:
1155 RETVAL 1492 RETVAL
1156 1493
1157SV * 1494SV *
1158get_text (CFPlus::Layout self) 1495get_text (DC::Layout self)
1159 CODE: 1496 CODE:
1160 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1497 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1161 sv_utf8_decode (RETVAL); 1498 sv_utf8_decode (RETVAL);
1162 OUTPUT: 1499 OUTPUT:
1163 RETVAL 1500 RETVAL
1164 1501
1165void 1502void
1166set_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.)
1167 CODE: 1504 CODE:
1168 self->r = r; 1505 self->r = r;
1169 self->g = g; 1506 self->g = g;
1170 self->b = b; 1507 self->b = b;
1171 self->a = a; 1508 self->a = a;
1172 1509
1173void 1510void
1174set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1511set_font (DC::Layout self, DC::Font font = 0)
1175 CODE: 1512 CODE:
1176 if (self->font != font) 1513 if (self->font != font)
1177 { 1514 {
1178 self->font = font; 1515 self->font = font;
1179 layout_update_font (self); 1516 layout_update_font (self);
1180 } 1517 }
1181 1518
1182void 1519void
1183set_height (CFPlus::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1184 CODE: 1521 CODE:
1185 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1186 { 1523 {
1187 self->base_height = base_height; 1524 self->base_height = base_height;
1188 layout_update_font (self); 1525 layout_update_font (self);
1189 } 1526 }
1190 1527
1191void 1528void
1192set_width (CFPlus::Layout self, int max_width = -1) 1529set_width (DC::Layout self, int max_width = -1)
1193 CODE: 1530 CODE:
1194 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);
1195 1532
1196void 1533void
1197set_indent (CFPlus::Layout self, int indent) 1534set_indent (DC::Layout self, int indent)
1198 CODE: 1535 CODE:
1199 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1536 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1200 1537
1201void 1538void
1202set_spacing (CFPlus::Layout self, int spacing) 1539set_spacing (DC::Layout self, int spacing)
1203 CODE: 1540 CODE:
1204 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1541 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1205 1542
1206void 1543void
1207set_ellipsise (CFPlus::Layout self, int ellipsise) 1544set_ellipsise (DC::Layout self, int ellipsise)
1208 CODE: 1545 CODE:
1209 pango_layout_set_ellipsize (self->pl, 1546 pango_layout_set_ellipsize (self->pl,
1210 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1547 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1211 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1548 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1212 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1549 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1213 : PANGO_ELLIPSIZE_NONE 1550 : PANGO_ELLIPSIZE_NONE
1214 ); 1551 );
1215 1552
1216void 1553void
1217set_single_paragraph_mode (CFPlus::Layout self, int spm) 1554set_single_paragraph_mode (DC::Layout self, int spm)
1218 CODE: 1555 CODE:
1219 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1556 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1220 1557
1221void 1558void
1222size (CFPlus::Layout self) 1559size (DC::Layout self)
1223 PPCODE: 1560 PPCODE:
1224{ 1561{
1225 int w, h; 1562 int w, h;
1226 1563
1227 layout_get_pixel_size (self, &w, &h); 1564 layout_get_pixel_size (self, &w, &h);
… …
1230 PUSHs (sv_2mortal (newSViv (w))); 1567 PUSHs (sv_2mortal (newSViv (w)));
1231 PUSHs (sv_2mortal (newSViv (h))); 1568 PUSHs (sv_2mortal (newSViv (h)));
1232} 1569}
1233 1570
1234int 1571int
1235descent (CFPlus::Layout self) 1572descent (DC::Layout self)
1236 CODE: 1573 CODE:
1237{ 1574{
1238 PangoRectangle rect; 1575 PangoRectangle rect;
1239 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1576 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1240 pango_layout_line_get_pixel_extents (line, 0, &rect); 1577 pango_layout_line_get_pixel_extents (line, 0, &rect);
1241 RETVAL = PANGO_DESCENT (rect); 1578 RETVAL = PANGO_DESCENT (rect);
1242} 1579}
1243 OUTPUT: 1580 OUTPUT:
1244 RETVAL 1581 RETVAL
1245 1582
1246int 1583int
1247xy_to_index (CFPlus::Layout self, int x, int y) 1584xy_to_index (DC::Layout self, int x, int y)
1248 CODE: 1585 CODE:
1249{ 1586{
1250 int index, trailing; 1587 int index, trailing;
1251 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);
1252 RETVAL = index + trailing; 1589 RETVAL = index + trailing;
1253} 1590}
1254 OUTPUT: 1591 OUTPUT:
1255 RETVAL 1592 RETVAL
1256 1593
1257void 1594void
1258cursor_pos (CFPlus::Layout self, int index) 1595cursor_pos (DC::Layout self, int index)
1259 PPCODE: 1596 PPCODE:
1260{ 1597{
1261 PangoRectangle strong_pos; 1598 PangoRectangle pos;
1262 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1599 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1263 1600
1264 EXTEND (SP, 3); 1601 EXTEND (SP, 3);
1265 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1602 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1266 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1603 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1604 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1268} 1605}
1269 1606
1270void 1607void
1271index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1608index_to_line_x (DC::Layout self, int index, int trailing = 0)
1272 PPCODE: 1609 PPCODE:
1273{ 1610{
1274 int line, x; 1611 int line, x;
1275 1612
1276 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)
1277 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1615 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1278 1616 --line;
1617#endif
1279 EXTEND (SP, 2); 1618 EXTEND (SP, 2);
1280 PUSHs (sv_2mortal (newSViv (line - 1))); 1619 PUSHs (sv_2mortal (newSViv (line)));
1281 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1620 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1282} 1621}
1283 1622
1284void 1623void
1285line_x_to_index (CFPlus::Layout self, int line, int x) 1624line_x_to_index (DC::Layout self, int line, int x)
1286 PPCODE: 1625 PPCODE:
1287{ 1626{
1288 PangoLayoutLine *lp; 1627 PangoLayoutLine *lp;
1289 int index, trailing; 1628 int index, trailing;
1290 1629
1291 if (line < 0) 1630 if (line < 0)
1292 XSRETURN_EMPTY; 1631 XSRETURN_EMPTY;
1293 1632
1294 if (!(lp = pango_layout_get_line (self->pl, line))) 1633 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1295 XSRETURN_EMPTY; /* do better */ 1634 XSRETURN_EMPTY; /* do better */
1296 1635
1297 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);
1298 1637
1299 EXTEND (SP, 2); 1638 EXTEND (SP, 2);
… …
1305 PUSHs (sv_2mortal (newSViv (trailing))); 1644 PUSHs (sv_2mortal (newSViv (trailing)));
1306 } 1645 }
1307} 1646}
1308 1647
1309void 1648void
1310render (CFPlus::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1311 PPCODE: 1650 CODE:
1651 rc_clear (self->rc);
1312 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1313 self->pl, 1653 self->pl,
1654 self->rc,
1314 x * PANGO_SCALE, y * PANGO_SCALE, 1655 x * PANGO_SCALE, y * PANGO_SCALE,
1315 self->r, self->g, self->b, self->a, 1656 self->r, self->g, self->b, self->a,
1316 flags 1657 flags
1317 ); 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);
1318 1662
1319MODULE = 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
1320 1683
1321PROTOTYPES: ENABLE 1684PROTOTYPES: ENABLE
1322
1323int minpot (int n)
1324 1685
1325void 1686void
1326pad (SV *data_, int ow, int oh, int nw, int nh) 1687pad (SV *data_, int ow, int oh, int nw, int nh)
1327 CODE: 1688 CODE:
1328{ 1689{
… …
1394 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1395 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1396 } 1757 }
1397} 1758}
1398 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
1399IV 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)
1400 CODE: 1882 CODE:
1401{ 1883{
1402 GLint width; 1884 GLint width;
1403 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);
… …
1405 RETVAL = width > 0; 1887 RETVAL = width > 0;
1406} 1888}
1407 OUTPUT: 1889 OUTPUT:
1408 RETVAL 1890 RETVAL
1409 1891
1410MODULE = CFPlus PACKAGE = CFPlus::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1411 1893
1412PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1413 1895
1414CFPlus::Map 1896DC::Map
1415new (SV *class) 1897new (SV *klass)
1416 CODE: 1898 CODE:
1417 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1418 RETVAL->x = 0; 1900 RETVAL->x = 0;
1419 RETVAL->y = 0; 1901 RETVAL->y = 0;
1420 RETVAL->w = 0; 1902 RETVAL->w = 0;
… …
1427 RETVAL->row = 0; 1909 RETVAL->row = 0;
1428 OUTPUT: 1910 OUTPUT:
1429 RETVAL 1911 RETVAL
1430 1912
1431void 1913void
1432DESTROY (CFPlus::Map self) 1914DESTROY (DC::Map self)
1433 CODE: 1915 CODE:
1434{ 1916{
1435 map_clear (self); 1917 map_clear (self);
1436 Safefree (self->face2tile); 1918 Safefree (self->face2tile);
1437 Safefree (self->tex); 1919 Safefree (self->tex);
1438 Safefree (self); 1920 Safefree (self);
1439} 1921}
1440 1922
1441void 1923void
1442resize (CFPlus::Map self, int map_width, int map_height) 1924resize (DC::Map self, int map_width, int map_height)
1443 CODE: 1925 CODE:
1444 self->w = map_width; 1926 self->w = map_width;
1445 self->h = map_height; 1927 self->h = map_height;
1446 1928
1447void 1929void
1448clear (CFPlus::Map self) 1930clear (DC::Map self)
1449 CODE: 1931 CODE:
1450 map_clear (self); 1932 map_clear (self);
1451 1933
1452void 1934void
1453set_tileid (CFPlus::Map self, int face, int tile) 1935set_tileid (DC::Map self, int face, int tile)
1454 CODE: 1936 CODE:
1455{ 1937{
1456 need_facenum (self, face); self->face2tile [face] = tile; 1938 need_facenum (self, face); self->face2tile [face] = tile;
1457 need_texid (self, tile); 1939 need_texid (self, tile);
1458} 1940}
1459 1941
1460void 1942void
1461set_smooth (CFPlus::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1462 CODE: 1944 CODE:
1463{ 1945{
1464 tileid texid; 1946 tileid texid;
1465 maptex *tex; 1947 maptex *tex;
1466 1948
1467 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1468 return; 1950 return;
1469 1951
1470 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1471 return; 1953 return;
1472 1954
1473 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1474 1956
1475 if (!texid) 1957 if (!texid)
1476 return; 1958 return;
1477 1959
1478 tex = self->tex + texid; 1960 tex = self->tex + texid;
1479 tex->smoothtile = self->face2tile [smooth]; 1961 tex->smoothtile = self->face2tile [smooth];
1480 tex->smoothlevel = level; 1962 tex->smoothlevel = level;
1481} 1963}
1482 1964
1483void 1965void
1484set_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)
1485 CODE: 1967 CODE:
1486{ 1968{
1487 need_texid (self, texid); 1969 need_texid (self, texid);
1488 1970
1489 { 1971 {
… …
1508 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1509 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1510 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1511} 1993}
1512 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
1513int 2015int
1514ox (CFPlus::Map self) 2016ox (DC::Map self)
1515 ALIAS: 2017 ALIAS:
1516 oy = 1 2018 oy = 1
1517 x = 2 2019 x = 2
1518 y = 3 2020 y = 3
1519 w = 4 2021 w = 4
… …
1530 } 2032 }
1531 OUTPUT: 2033 OUTPUT:
1532 RETVAL 2034 RETVAL
1533 2035
1534void 2036void
1535scroll (CFPlus::Map self, int dx, int dy) 2037scroll (DC::Map self, int dx, int dy)
1536 CODE: 2038 CODE:
1537{ 2039{
1538 if (dx > 0) 2040 if (dx > 0)
1539 map_blank (self, self->x, self->y, dx, self->h); 2041 map_blank (self, self->x, self->y, dx, self->h);
1540 else if (dx < 0) 2042 else if (dx < 0)
… …
1556 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1557 } 2059 }
1558} 2060}
1559 2061
1560SV * 2062SV *
1561map1a_update (CFPlus::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1562 CODE: 2064 CODE:
1563{ 2065{
1564 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1565 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1566 mapcell *cell; 2068 mapcell *cell;
… …
1587 2089
1588 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1589 2091
1590 if (flags & 8) 2092 if (flags & 8)
1591 { 2093 {
2094 uint8_t ext, cmd;
2095
1592 if (extmap) 2096 do
1593 { 2097 {
1594 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1595 2100
1596 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
1597 { 2104 {
1598 ext = *data++;
1599 cmd = ext & 0x3f;
1600
1601 if (cmd < 4)
1602 cell->darkness = 255 - ext * 64 + 1;
1603 else if (cmd == 5) // health
1604 {
1605 cell->stat_width = 1; 2105 cell->stat_width = 1;
1606 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1607 }
1608 else if (cmd == 6) // monster width
1609 cell->stat_width = *data++ + 1;
1610 else if (cmd == 0x47)
1611 {
1612 if (*data == 4)
1613 ; // decode player count
1614
1615 data += *data + 1;
1616 }
1617 else if (cmd == 8) // cell flags
1618 cell->flags = *data++;
1619 else if (ext & 0x40) // unknown, multibyte => skip
1620 data += *data + 1;
1621 else
1622 data++;
1623 } 2107 }
1624 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++;
1625 } 2125 }
1626 else 2126 while (ext & 0x80);
1627 cell->darkness = *data++ + 1;
1628 } 2127 }
1629 2128
1630 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1631 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1632 { 2131 {
… …
1635 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1636 2135
1637 if (cell->tile [z]) 2136 if (cell->tile [z])
1638 { 2137 {
1639 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1640 if (!tex->name) 2140 if (!tex->name)
1641 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1642 2142
1643 if (tex->smoothtile) 2143 if (tex->smoothtile)
1644 { 2144 {
1645 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1646 if (!smooth->name) 2147 if (!smooth->name)
1647 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1648 } 2149 }
1649 } 2150 }
1650 } 2151 }
1651 } 2152 }
1652 else 2153 else
1653 cell->darkness = 0; 2154 CELL_CLEAR (cell);
1654 } 2155 }
1655} 2156}
1656 OUTPUT: 2157 OUTPUT:
1657 RETVAL 2158 RETVAL
1658 2159
1659SV * 2160SV *
1660mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2161mapmap (DC::Map self, int x0, int y0, int w, int h)
1661 CODE: 2162 CODE:
1662{ 2163{
1663 int x1, x; 2164 int x1, x;
1664 int y1, y; 2165 int y1, y;
1665 int z; 2166 int z;
… …
1678 ? self->row + y 2179 ? self->row + y
1679 : 0; 2180 : 0;
1680 2181
1681 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1682 { 2183 {
1683 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1684 2185
1685 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1686 { 2187 {
1687 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1688 2189
… …
1690 { 2191 {
1691 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1692 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1693 int a1 = tex.a; 2194 int a1 = tex.a;
1694 2195
1695 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1696 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1697 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1698 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1699 } 2200 }
1700 } 2201 }
1701 2202
1702 *map++ = (r ) 2203 *map++ = (r )
1703 | (g << 8) 2204 | (g << 8)
1704 | (b << 16) 2205 | (b << 16)
1705 | (a << 24); 2206 | (a << 24);
1706 } 2207 }
1707 } 2208 }
1708 2209
1709 RETVAL = map_sv; 2210 RETVAL = map_sv;
1710} 2211}
1711 OUTPUT: 2212 OUTPUT:
1712 RETVAL 2213 RETVAL
1713 2214
1714void 2215void
1715draw (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)
1716 CODE: 2217 CODE:
1717{ 2218{
1718 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2219 int x, y, z;
2220
1719 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
1720 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)
1721 smooth_key skey; 2223 smooth_key skey;
1722 int x, y, z; 2224 int pl_x, pl_y;
1723 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;
1724 2230
2231 pl_tex.name = 0;
2232
1725 // thats current max. sorry. 2233 // that's current max. sorry.
1726 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1727 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1728 2236
1729 // clear key, in case of extra padding 2237 // clear key, in case of extra padding
1730 memset (&skey, 0, sizeof (skey)); 2238 memset (&skey, 0, sizeof (skey));
1731 2239
1732 glColor4ub (255, 255, 255, 255); 2240 memset (&key, 0, sizeof (key));
1733 2241 key.r = 255;
1734 glEnable (GL_BLEND); 2242 key.g = 255;
1735 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2243 key.b = 255;
1736 glEnable (GL_TEXTURE_2D); 2244 key.a = 255;
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2245 key.mode = GL_QUADS;
1738 2246 key.format = GL_T2F_V3F;
1739 glBegin (GL_QUADS);
1740
1741 last_name = -1;
1742 2247
1743 mx += self->x; 2248 mx += self->x;
1744 my += self->y; 2249 my += self->y;
1745 2250
1746 // first pass: determine smooth_max 2251 // first pass: determine smooth_max
… …
1763 MAX (self->tex [cell->tile [1]].smoothlevel, 2268 MAX (self->tex [cell->tile [1]].smoothlevel,
1764 self->tex [cell->tile [2]].smoothlevel)); 2269 self->tex [cell->tile [2]].smoothlevel));
1765 } 2270 }
1766 } 2271 }
1767 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
1768 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
1769 { 2278 {
2279 smooth_hash smooth;
1770 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2281 key.texname = -1;
1771 2282
1772 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
1773 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
1774 { 2285 {
1775 maprow *row = self->row + (y + my); 2286 maprow *row = self->row + (y + my);
… …
1783 if (tile) 2294 if (tile)
1784 { 2295 {
1785 maptex tex = self->tex [tile]; 2296 maptex tex = self->tex [tile];
1786 int px, py; 2297 int px, py;
1787 2298
1788 // suppressing texture state switches here
1789 // is only moderately effective, but worth the extra effort
1790 if (last_name != tex.name) 2299 if (key.texname != tex.name)
1791 { 2300 {
2301 self->tex [tile].unused = 0;
2302
1792 if (!tex.name) 2303 if (!tex.name)
1793 tex = self->tex [2]; /* missing, replace by noface */ 2304 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1794 2305
1795 glEnd (); 2306 key.texname = tex.name;
1796 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2307 arr = rc_array (rc, &key);
1797 glBegin (GL_QUADS);
1798 } 2308 }
1799 2309
1800 px = (x + 1) * T - tex.w; 2310 px = (x + 1) * Th - tex.w;
1801 py = (y + 1) * T - tex.h; 2311 py = (y + 1) * Tw - tex.h;
1802 2312
1803 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2313 if (expect_false (cell->player == player) && expect_false (z == 2))
1804 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1805 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1806 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1807
1808 if (cell->flags && z == 2)
1809 { 2314 {
1810 if (cell->flags & 1) 2315 pl_x = px;
2316 pl_y = py;
2317 pl_tex = tex;
1811 { 2318 continue;
1812 maptex tex = self->tex [1];
1813 int px = x * T + T * 2 / 32;
1814 int py = y * T - T * 6 / 32;
1815
1816 glEnd ();
1817 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1818 glBegin (GL_QUADS);
1819
1820 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1821 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1822 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1823 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1824 }
1825 } 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);
1826 2325
1827 // update smooth hash 2326 // update smooth hash
1828 if (tex.smoothtile) 2327 if (tex.smoothtile)
1829 { 2328 {
1830 skey.tile = tex.smoothtile; 2329 skey.tile = tex.smoothtile;
… …
1846 2345
1847 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1848 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
1849 2348
1850 // full tile 2349 // full tile
1851 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);
1852 2351
1853 // borders 2352 // borders
1854 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);
1855 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);
1856 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);
1857 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);
1858 2357
1859 // corners 2358 // corners
1860 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);
1861 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);
1862 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);
1863 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);
1864 } 2384 }
1865 } 2385 }
1866 } 2386 }
1867 } 2387 }
1868 2388
2389 rc_draw (rc);
2390 rc_clear (rc);
2391
1869 // go through all smoothlevels, lowest to highest, then draw. 2392 // go through all smoothlevels, lowest to highest, then draw.
1870 // this is basically counting sort 2393 // this is basically counting sort
1871 { 2394 {
1872 int w, b; 2395 int w, b;
1873 2396
2397 glEnable (GL_TEXTURE_2D);
2398 glBegin (GL_QUADS);
1874 for (w = 0; w < 256 / 32; ++w) 2399 for (w = 0; w < 256 / 32; ++w)
1875 { 2400 {
1876 uint32_t smask = smooth_level [w]; 2401 uint32_t smask = smooth_level [w];
1877 if (smask) 2402 if (smask)
1878 for (b = 0; b < 32; ++b) 2403 for (b = 0; b < 32; ++b)
1879 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
1880 { 2405 {
1881 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
1882 HE *he; 2407 HE *he;
1883 2408
1884 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1885 while ((he = hv_iternext (smooth)))
1886 { 2410 {
1887 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
1888 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
1889 2413
1890 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
1891 && skey->level == level 2415 && skey.level == level
1892 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
1893 { 2417 {
1894 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
1895 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
1896 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
1897 int border = bits & 15; 2421 int border = bits & 15;
1898 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
1900 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
1901 2425
1902 // this time naively avoiding texture state changes
1903 // save gobs of state changes.
1904 if (last_name != tex.name) 2426 if (tex.name)
1905 { 2427 {
2428 // this time avoiding texture state changes
2429 // save gobs of state changes.
1906 if (!tex.name) 2430 if (key.texname != tex.name)
1907 continue; // smoothing not yet available 2431 {
2432 self->tex [skey.tile].unused = 0;
1908 2433
1909 glEnd (); 2434 glEnd ();
1910 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
1912 } 2437 }
1913 2438
1914 if (border) 2439 if (border)
1915 { 2440 {
1916 float ox = border * dx; 2441 float ox = border * dx;
1917 2442
1918 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1920 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1921 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1922 } 2447 }
1923 2448
1924 if (corner) 2449 if (corner)
1925 { 2450 {
1926 float ox = corner * dx; 2451 float ox = corner * dx;
1927 2452
1928 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1930 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1931 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2457 }
1932 } 2458 }
1933 } 2459 }
1934 } 2460 }
1935 } 2461 }
1936 } 2462 }
2463
2464 glEnd ();
2465 glDisable (GL_TEXTURE_2D);
2466 key.texname = -1;
1937 } 2467 }
1938
1939 hv_clear (smooth);
1940 } 2468 }
1941 2469
1942 glEnd (); 2470 if (pl_tex.name)
2471 {
2472 maptex tex = pl_tex;
2473 int px = pl_x + sdx;
2474 int py = pl_y + sdy;
1943 2475
1944 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
1945 glDisable (GL_BLEND); 2490 glDisable (GL_BLEND);
2491 rc_free (rc);
2492 rc_free (rc_ov);
1946 2493
1947 // top layer: overlays such as the health bar 2494 // top layer: overlays such as the health bar
1948 for (y = 0; y < sh; y++) 2495 for (y = 0; y < sh; y++)
1949 if (0 <= y + my && y + my < self->rows) 2496 if (0 <= y + my && y + my < self->rows)
1950 { 2497 {
… …
1953 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
1954 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
1955 { 2502 {
1956 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
1957 2504
1958 int px = x * T; 2505 int px = x * Tw;
1959 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 }
1960 2513
1961 if (cell->stat_hp) 2514 if (cell->stat_hp)
1962 { 2515 {
1963 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
1964 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1965 2518
1966 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
1967 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
1968 px + width - 1, py); 2521 px + width - 1, py);
1969 2522
… …
1975 } 2528 }
1976 } 2529 }
1977} 2530}
1978 2531
1979void 2532void
1980draw_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)
1981 CODE: 2534 CODE:
1982{ 2535{
1983 static float color[16][3] = { 2536 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2537 { 0.00f, 0.00f, 0.00f },
1985 { 1.00F, 1.00F, 1.00F }, 2538 { 1.00f, 1.00f, 1.00f },
1986 { 0.00F, 0.00F, 0.55F }, 2539 { 0.00f, 0.00f, 0.55f },
1987 { 1.00F, 0.00F, 0.00F }, 2540 { 1.00f, 0.00f, 0.00f },
1988 2541
1989 { 1.00F, 0.54F, 0.00F }, 2542 { 1.00f, 0.54f, 0.00f },
1990 { 0.11F, 0.56F, 1.00F }, 2543 { 0.11f, 0.56f, 1.00f },
1991 { 0.93F, 0.46F, 0.00F }, 2544 { 0.93f, 0.46f, 0.00f },
1992 { 0.18F, 0.54F, 0.34F }, 2545 { 0.18f, 0.54f, 0.34f },
1993 2546
1994 { 0.56F, 0.73F, 0.56F }, 2547 { 0.56f, 0.73f, 0.56f },
1995 { 0.80F, 0.80F, 0.80F }, 2548 { 0.80f, 0.80f, 0.80f },
1996 { 0.55F, 0.41F, 0.13F }, 2549 { 0.55f, 0.41f, 0.13f },
1997 { 0.99F, 0.77F, 0.26F }, 2550 { 0.99f, 0.77f, 0.26f },
1998 2551
1999 { 0.74F, 0.65F, 0.41F }, 2552 { 0.74f, 0.65f, 0.41f },
2000 2553
2001 { 0.00F, 1.00F, 1.00F }, 2554 { 0.00f, 1.00f, 1.00f },
2002 { 1.00F, 0.00F, 1.00F }, 2555 { 1.00f, 0.00f, 1.00f },
2003 { 1.00F, 1.00F, 0.00F }, 2556 { 1.00f, 1.00f, 0.00f },
2004 }; 2557 };
2005 2558
2006 int x, y; 2559 int x, y;
2007 2560
2008 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 */
2009 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2568 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2010 glEnable (GL_BLEND); 2569 glEnable (GL_BLEND);
2011 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2570 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2012 glBegin (GL_QUADS); 2571 glBegin (GL_QUADS);
2013 2572
2014 for (y = 0; y < h; y++) 2573 for (y = 0; y < h; y++)
… …
2018 2577
2019 if (m) 2578 if (m)
2020 { 2579 {
2021 float *c = color [m & 15]; 2580 float *c = color [m & 15];
2022 2581
2023 float tx1 = m & 0x40 ? 0.5 : 0.; 2582 float tx1 = m & 0x40 ? 0.5f : 0.f;
2024 float tx2 = tx1 + 0.5; 2583 float tx2 = tx1 + 0.5f;
2025 2584
2026 glColor4f (c[0], c[1], c[2], 0.75); 2585 glColor4f (c[0], c[1], c[2], 1);
2027 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2586 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2028 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2587 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2029 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2588 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2030 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2589 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2031 } 2590 }
… …
2035 glDisable (GL_BLEND); 2594 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2595 glDisable (GL_TEXTURE_2D);
2037} 2596}
2038 2597
2039void 2598void
2040fow_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)
2041 PPCODE: 2600 PPCODE:
2042{ 2601{
2043 int x, y; 2602 int x, y;
2044 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2046 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2047 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);
2048 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2049 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2610 memset (darkness1, 0, sw1*sh1);
2050 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2051 2611
2052 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2053 SvCUR_set (darkness3_sv, sw34 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2054 2614
2055 mx += self->x - 1; 2615 mx += self->x - 1;
2056 my += self->y - 1; 2616 my += self->y - 1;
2057
2058 memset (darkness1, 255, sw1 * sh1);
2059 2617
2060 for (y = 0; y < sh1; y++) 2618 for (y = 0; y < sh1; y++)
2061 if (0 <= y + my && y + my < self->rows) 2619 if (0 <= y + my && y + my < self->rows)
2062 { 2620 {
2063 maprow *row = self->row + (y + my); 2621 maprow *row = self->row + (y + my);
… …
2066 if (row->c0 <= x + mx && x + mx < row->c1) 2624 if (row->c0 <= x + mx && x + mx < row->c1)
2067 { 2625 {
2068 mapcell *cell = row->col + (x + mx - row->c0); 2626 mapcell *cell = row->col + (x + mx - row->c0);
2069 2627
2070 darkness1 [y * sw1 + x] = cell->darkness 2628 darkness1 [y * sw1 + x] = cell->darkness
2071 ? 255 - (cell->darkness - 1) 2629 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2072 : 255 - FOW_DARKNESS; 2630 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2073 } 2631 }
2074 } 2632 }
2075 2633
2076 for (y = 0; y < sh; ++y) 2634 for (y = 0; y < sh; ++y)
2077 for (x = 0; x < sw; ++x) 2635 for (x = 0; x < sw; ++x)
… …
2096 2654
2097 uint8_t r13 = (d13 + d23 + d12) / 3; 2655 uint8_t r13 = (d13 + d23 + d12) / 3;
2098 uint8_t r23 = d23; 2656 uint8_t r23 = d23;
2099 uint8_t r33 = (d23 + d33 + d32) / 3; 2657 uint8_t r33 = (d23 + d33 + d32) / 3;
2100 2658
2101 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2659 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2102 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2660 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2103 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2661 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2104 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2662 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2105 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 */
2106 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2664 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2107 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2665 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2108 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2666 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2109 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2667 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2110 } 2668 }
2111 2669
2112 free (darkness1); 2670 free (darkness1);
2113 2671
2114 EXTEND (SP, 3); 2672 EXTEND (SP, 3);
2115 PUSHs (sv_2mortal (newSViv (sw34))); 2673 PUSHs (sv_2mortal (newSViv (sw3)));
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2674 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2675 PUSHs (darkness3_sv);
2118} 2676}
2119 2677
2120SV * 2678SV *
2121get_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)
2122 CODE: 2680 CODE:
2123{ 2681{
2124 int x, y, x1, y1; 2682 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2683 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2684 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2183 else 2741 else
2184 *data++ = 0; 2742 *data++ = 0;
2185 } 2743 }
2186 } 2744 }
2187 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 {
2188 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2189 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2751 }
2752
2190 RETVAL = data_sv; 2753 RETVAL = data_sv;
2191} 2754}
2192 OUTPUT: 2755 OUTPUT:
2193 RETVAL 2756 RETVAL
2194 2757
2195void 2758void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2759set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197 PPCODE: 2760 PPCODE:
2198{ 2761{
2199 int x, y, z; 2762 int x, y, z;
2200 int w, h; 2763 int w, h;
2201 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;
2202 2775
2203 if (*data++ != 0) 2776 if (*data++ != 0)
2204 return; /* version mismatch */ 2777 XSRETURN_EMPTY; /* version mismatch */
2205 2778
2206 w = *data++ << 8; w |= *data++; 2779 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2780 h = *data++ << 8; h |= *data++;
2208 2781
2209 // 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
… …
2221 { 2794 {
2222 maprow *row = map_get_row (self, y); 2795 maprow *row = map_get_row (self, y);
2223 2796
2224 for (x = x0; x < x1; x++) 2797 for (x = x0; x < x1; x++)
2225 { 2798 {
2799 uint8_t flags;
2800
2801 if (data + 7 >= end)
2802 XSRETURN_EMPTY;
2803
2226 uint8_t flags = *data++; 2804 flags = *data++;
2227 2805
2228 if (flags) 2806 if (flags)
2229 { 2807 {
2230 mapcell *cell = row_get_cell (row, x); 2808 mapcell *cell = row_get_cell (row, x);
2231 tileid tile[3] = { 0, 0, 0 }; 2809 tileid tile[3] = { 0, 0, 0 };
… …
2234 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2812 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2235 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2813 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2236 2814
2237 if (cell->darkness == 0) 2815 if (cell->darkness == 0)
2238 { 2816 {
2239 cell->darkness = 0; 2817 /*cell->darkness = 0;*/
2818 EXTEND (SP, 3);
2240 2819
2241 for (z = 0; z <= 2; z++) 2820 for (z = 0; z <= 2; z++)
2242 { 2821 {
2243 tileid t = tile [z]; 2822 tileid t = tile [z];
2244 2823
2245 if (t >= self->texs || (t && !self->tex [t].name)) 2824 if (t >= self->texs || (t && !self->tex [t].name))
2246 { 2825 {
2247 XPUSHs (sv_2mortal (newSViv (t))); 2826 PUSHs (sv_2mortal (newSViv (t)));
2248 need_texid (self, t); 2827 need_texid (self, t);
2249 } 2828 }
2250 2829
2251 cell->tile [z] = t; 2830 cell->tile [z] = t;
2252 } 2831 }
… …
2254 } 2833 }
2255 } 2834 }
2256 } 2835 }
2257} 2836}
2258 2837
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2260 2839
2261CFPlus::RW 2840DC::RW
2262new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2263 CODE: 2842 CODE:
2264{ 2843{
2265 STRLEN datalen; 2844 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2267 2846
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2847 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2848}
2270 OUTPUT: 2849 OUTPUT:
2271 RETVAL 2850 RETVAL
2272 2851
2273CFPlus::RW 2852DC::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2275 CODE: 2854 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2856 OUTPUT:
2278 RETVAL 2857 RETVAL
2279 2858
2280# fails on win32: 2859# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2860# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2861#void
2283#close (CFPlus::RW self) 2862#close (DC::RW self)
2284# CODE: 2863# CODE:
2285# (self->(close)) (self); 2864# (self->(close)) (self);
2286 2865
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2866MODULE = Deliantra::Client PACKAGE = DC::Channel
2288 2867
2289PROTOTYPES: DISABLE 2868PROTOTYPES: DISABLE
2290 2869
2291CFPlus::Channel 2870DC::Channel
2292find () 2871find ()
2293 CODE: 2872 CODE:
2294{ 2873{
2295 RETVAL = Mix_GroupAvailable (-1); 2874 RETVAL = Mix_GroupAvailable (-1);
2296 2875
2297 if (RETVAL < 0) 2876 if (RETVAL < 0)
2298 { 2877 {
2299 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2300 2879
2301 if (RETVAL < 0) 2880 if (RETVAL < 0)
2881 {
2882 // happens sometimes, maybe it just stopped playing(?)
2883 RETVAL = Mix_GroupAvailable (-1);
2884
2885 if (RETVAL < 0)
2302 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2303 2887 }
2888 else
2304 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2305 } 2890 }
2306 2891
2307 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2308 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2309} 2894}
2310 OUTPUT: 2895 OUTPUT:
2311 RETVAL 2896 RETVAL
2312 2897
2313void 2898void
2314halt (CFPlus::Channel self) 2899halt (DC::Channel self)
2315 CODE: 2900 CODE:
2316 Mix_HaltChannel (self); 2901 Mix_HaltChannel (self);
2317 2902
2318void 2903void
2319expire (CFPlus::Channel self, int ticks = -1) 2904expire (DC::Channel self, int ticks = -1)
2320 CODE: 2905 CODE:
2321 Mix_ExpireChannel (self, ticks); 2906 Mix_ExpireChannel (self, ticks);
2322 2907
2323void 2908void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2909fade_out (DC::Channel self, int ticks = -1)
2325 CODE: 2910 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2911 Mix_FadeOutChannel (self, ticks);
2327 2912
2328int 2913int
2329volume (CFPlus::Channel self, int volume) 2914volume (DC::Channel self, int volume)
2330 CODE: 2915 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2916 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2917 OUTPUT:
2333 RETVAL 2918 RETVAL
2334 2919
2335void 2920void
2336unregister_all_effects (CFPlus::Channel self) 2921unregister_all_effects (DC::Channel self)
2337 CODE: 2922 CODE:
2338 Mix_UnregisterAllEffects (self); 2923 Mix_UnregisterAllEffects (self);
2339 2924
2340void 2925void
2341set_panning (CFPlus::Channel self, int left, int right) 2926set_panning (DC::Channel self, int left, int right)
2342 CODE: 2927 CODE:
2343 left = CLAMP (left , 0, 255); 2928 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2929 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2930 Mix_SetPanning (self, left, right);
2346 2931
2347void 2932void
2348set_distance (CFPlus::Channel self, int distance) 2933set_distance (DC::Channel self, int distance)
2349 CODE: 2934 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2935 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2936
2352void 2937void
2353set_position (CFPlus::Channel self, int angle, int distance) 2938set_position (DC::Channel self, int angle, int distance)
2354 CODE: 2939 CODE:
2355 2940
2356void 2941void
2357set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2942set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358 CODE: 2943 CODE:
2359{ 2944{
2360 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2945 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2946 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2362 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2947 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363} 2948}
2364 2949
2365void 2950void
2366set_reverse_stereo (CFPlus::Channel self, int flip) 2951set_reverse_stereo (DC::Channel self, int flip)
2367 CODE: 2952 CODE:
2368 Mix_SetReverseStereo (self, flip); 2953 Mix_SetReverseStereo (self, flip);
2369 2954
2370MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371 2956
2372PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2373 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
2374CFPlus::MixChunk 2971DC::MixChunk
2375new (SV *class, CFPlus::RW rwops) 2972new (SV *klass, DC::RW rwops)
2376 CODE: 2973 CODE:
2377 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378 OUTPUT: 2975 OUTPUT:
2379 RETVAL 2976 RETVAL
2380 2977
2381void 2978void
2382DESTROY (CFPlus::MixChunk self) 2979DESTROY (DC::MixChunk self)
2383 CODE: 2980 CODE:
2384 Mix_FreeChunk (self); 2981 Mix_FreeChunk (self);
2385 2982
2386int 2983int
2387volume (CFPlus::MixChunk self, int volume = -1) 2984volume (DC::MixChunk self, int volume = -1)
2388 CODE: 2985 CODE:
2389 if (items > 1) 2986 if (items > 1)
2390 volume = CLAMP (volume, 0, 128); 2987 volume = CLAMP (volume, 0, 128);
2391 RETVAL = Mix_VolumeChunk (self, volume); 2988 RETVAL = Mix_VolumeChunk (self, volume);
2392 OUTPUT: 2989 OUTPUT:
2393 RETVAL 2990 RETVAL
2394 2991
2395CFPlus::Channel 2992DC::Channel
2396play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2993play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2397 CODE: 2994 CODE:
2398{ 2995{
2399 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2996 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400 2997
2401 if (RETVAL < 0) 2998 if (RETVAL < 0)
… …
2408 } 3005 }
2409} 3006}
2410 OUTPUT: 3007 OUTPUT:
2411 RETVAL 3008 RETVAL
2412 3009
2413MODULE = 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
2414 3023
2415int 3024int
2416volume (int volume = -1) 3025volume (int volume = -1)
2417 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2418 CODE: 3027 CODE:
… …
2430void 3039void
2431halt () 3040halt ()
2432 CODE: 3041 CODE:
2433 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2434 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2435CFPlus::MixMusic 3051DC::MixMusic
2436new (SV *class, CFPlus::RW rwops) 3052new (SV *klass, DC::RW rwops)
2437 CODE: 3053 CODE:
2438 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2439 OUTPUT: 3055 OUTPUT:
2440 RETVAL 3056 RETVAL
2441 3057
2442void 3058void
2443DESTROY (CFPlus::MixMusic self) 3059DESTROY (DC::MixMusic self)
2444 CODE: 3060 CODE:
2445 Mix_FreeMusic (self); 3061 Mix_FreeMusic (self);
2446 3062
2447int 3063int
2448play (CFPlus::MixMusic self, int loops = -1) 3064play (DC::MixMusic self, int loops = -1)
2449 CODE: 3065 CODE:
2450 RETVAL = Mix_PlayMusic (self, loops); 3066 RETVAL = Mix_PlayMusic (self, loops);
2451 OUTPUT: 3067 OUTPUT:
2452 RETVAL 3068 RETVAL
2453 3069
2454void 3070void
2455fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3071fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456 CODE: 3072 CODE:
2457 Mix_FadeInMusicPos (self, loops, ms, position); 3073 Mix_FadeInMusicPos (self, loops, ms, position);
2458 3074
2459MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3075MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460 3076
2461PROTOTYPES: ENABLE 3077PROTOTYPES: ENABLE
2462 3078
2463BOOT: 3079BOOT:
2464{ 3080{
2465 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3081 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466 static const struct { 3082 static const struct {
2467 const char *name; 3083 const char *name;
2468 IV iv; 3084 IV iv;
2469 } *civ, const_iv[] = { 3085 } *civ, const_iv[] = {
2470# define const_iv(name) { # name, (IV)name } 3086# define const_iv(name) { # name, (IV)name }
2471 const_iv (GL_VENDOR), 3087 const_iv (GL_VENDOR),
2472 const_iv (GL_VERSION), 3088 const_iv (GL_VERSION),
2473 const_iv (GL_EXTENSIONS), 3089 const_iv (GL_EXTENSIONS),
3090 const_iv (GL_MAX_TEXTURE_UNITS),
2474 const_iv (GL_COLOR_MATERIAL), 3091 const_iv (GL_COLOR_MATERIAL),
2475 const_iv (GL_SMOOTH), 3092 const_iv (GL_SMOOTH),
2476 const_iv (GL_FLAT), 3093 const_iv (GL_FLAT),
2477 const_iv (GL_DITHER), 3094 const_iv (GL_DITHER),
2478 const_iv (GL_BLEND), 3095 const_iv (GL_BLEND),
… …
2490 const_iv (GL_ZERO), 3107 const_iv (GL_ZERO),
2491 const_iv (GL_SRC_ALPHA), 3108 const_iv (GL_SRC_ALPHA),
2492 const_iv (GL_DST_ALPHA), 3109 const_iv (GL_DST_ALPHA),
2493 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3110 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2494 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),
2495 const_iv (GL_SRC_ALPHA_SATURATE), 3116 const_iv (GL_SRC_ALPHA_SATURATE),
2496 const_iv (GL_RGB), 3117 const_iv (GL_RGB),
2497 const_iv (GL_RGBA), 3118 const_iv (GL_RGBA),
2498 const_iv (GL_RGBA4), 3119 const_iv (GL_RGBA4),
2499 const_iv (GL_RGBA8), 3120 const_iv (GL_RGBA8),
… …
2505 const_iv (GL_INTENSITY), 3126 const_iv (GL_INTENSITY),
2506 const_iv (GL_LUMINANCE), 3127 const_iv (GL_LUMINANCE),
2507 const_iv (GL_LUMINANCE_ALPHA), 3128 const_iv (GL_LUMINANCE_ALPHA),
2508 const_iv (GL_FLOAT), 3129 const_iv (GL_FLOAT),
2509 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),
2510 const_iv (GL_COMPILE), 3137 const_iv (GL_COMPILE),
2511 const_iv (GL_PROXY_TEXTURE_1D), 3138 const_iv (GL_PROXY_TEXTURE_1D),
2512 const_iv (GL_PROXY_TEXTURE_2D), 3139 const_iv (GL_PROXY_TEXTURE_2D),
2513 const_iv (GL_TEXTURE_1D), 3140 const_iv (GL_TEXTURE_1D),
2514 const_iv (GL_TEXTURE_2D), 3141 const_iv (GL_TEXTURE_2D),
… …
2553 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3180 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554 const_iv (GL_POINT_SMOOTH_HINT), 3181 const_iv (GL_POINT_SMOOTH_HINT),
2555 const_iv (GL_LINE_SMOOTH_HINT), 3182 const_iv (GL_LINE_SMOOTH_HINT),
2556 const_iv (GL_POLYGON_SMOOTH_HINT), 3183 const_iv (GL_POLYGON_SMOOTH_HINT),
2557 const_iv (GL_GENERATE_MIPMAP_HINT), 3184 const_iv (GL_GENERATE_MIPMAP_HINT),
3185 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558 const_iv (GL_FASTEST), 3186 const_iv (GL_FASTEST),
2559 const_iv (GL_DONT_CARE), 3187 const_iv (GL_DONT_CARE),
2560 const_iv (GL_NICEST), 3188 const_iv (GL_NICEST),
2561 const_iv (GL_V2F), 3189 const_iv (GL_V2F),
2562 const_iv (GL_V3F), 3190 const_iv (GL_V3F),
2563 const_iv (GL_T2F_V3F), 3191 const_iv (GL_T2F_V3F),
2564 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),
2565# undef const_iv 3196# undef const_iv
2566 }; 3197 };
2567 3198
2568 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--)
2569 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2570 3201
2571 texture_av = newAV (); 3202 texture_av = newAV ();
2572 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
2573} 3204}
2574 3205
2575char * 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 *
2576gl_vendor () 3216gl_vendor ()
2577 CODE: 3217 CODE:
2578 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
2579 OUTPUT: 3219 OUTPUT:
2580 RETVAL 3220 RETVAL
2581 3221
2582char * 3222const char *
2583gl_version () 3223gl_version ()
2584 CODE: 3224 CODE:
2585 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
2586 OUTPUT: 3226 OUTPUT:
2587 RETVAL 3227 RETVAL
2588 3228
2589char * 3229const char *
2590gl_extensions () 3230gl_extensions ()
2591 CODE: 3231 CODE:
2592 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2593 OUTPUT: 3233 OUTPUT:
2594 RETVAL 3234 RETVAL
2595 3235
2596const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
2597 3241
2598GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
2599 CODE: 3243 CODE:
2600 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
2601 OUTPUT: 3245 OUTPUT:
… …
2609 3253
2610int glGetError () 3254int glGetError ()
2611 3255
2612void glFinish () 3256void glFinish ()
2613 3257
3258void glFlush ()
3259
2614void glClear (int mask) 3260void glClear (int mask)
2615 3261
2616void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
2617 PROTOTYPE: @ 3263 PROTOTYPE: @
2618 3264
… …
2627void glBlendFunc (int sfactor, int dfactor) 3273void glBlendFunc (int sfactor, int dfactor)
2628 3274
2629void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3275void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2630 CODE: 3276 CODE:
2631 gl_BlendFuncSeparate (sa, da, saa, daa); 3277 gl_BlendFuncSeparate (sa, da, saa, daa);
3278
3279# void glBlendEquation (int se)
2632 3280
2633void glDepthMask (int flag) 3281void glDepthMask (int flag)
2634 3282
2635void glLogicOp (int opcode) 3283void glLogicOp (int opcode)
2636 3284
… …
2671void glRotate (float angle, float x, float y, float z) 3319void glRotate (float angle, float x, float y, float z)
2672 CODE: 3320 CODE:
2673 glRotatef (angle, x, y, z); 3321 glRotatef (angle, x, y, z);
2674 3322
2675void 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: @
2676 ALIAS: 3325 ALIAS:
2677 glColor_premultiply = 1 3326 glColor_premultiply = 1
2678 CODE: 3327 CODE:
2679 if (ix) 3328 if (ix)
2680 { 3329 {
… …
2700 3349
2701void glRect (float x1, float y1, float x2, float y2) 3350void glRect (float x1, float y1, float x2, float y2)
2702 CODE: 3351 CODE:
2703 glRectf (x1, y1, x2, y2); 3352 glRectf (x1, y1, x2, y2);
2704 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
2705PROTOTYPES: ENABLE 3363PROTOTYPES: ENABLE
2706 3364
2707void glBegin (int mode) 3365void glBegin (int mode)
2708 3366
2709void glEnd () 3367void glEnd ()
… …
2741void 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)
2742 CODE: 3400 CODE:
2743 if (gl.SeparableFilter2D) 3401 if (gl.SeparableFilter2D)
2744 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3402 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745 3403
2746void 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)
2747 3405
2748void 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)
2749 3407
2750void glDrawPixels (int width, int height, int format, int type, char *pixels) 3408void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751 3409
… …
2777 3435
2778void glEndList () 3436void glEndList ()
2779 3437
2780void glCallList (int list) 3438void glCallList (int list)
2781 3439
2782MODULE = 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
2783 3446
2784PROTOTYPES: DISABLE 3447PROTOTYPES: DISABLE
2785 3448
2786void 3449void
2787find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
2788 PPCODE: 3451 PPCODE:
2789{ 3452{
2790 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
2791 XPUSHs (self); 3454 XPUSHs (self);
2792} 3455}
2793 3456
2794BOOT: 3457BOOT:
2795{ 3458{
2796 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3459 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797 3460
2798 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);
2799 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);
2800 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);
2801 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);
2802} 3465}
2803 3466
2804void 3467void
2805draw (SV *self) 3468draw (SV *self)
2806 CODE: 3469 CODE:
2807{ 3470{
2808 HV *hv; 3471 HV *hv;
2809 SV **svp; 3472 SV **svp;
2810 NV x, y, w, h; 3473 NV x, y, w, h;
2811 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
2812 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
2813 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
2814 SV *draw_h_sv = GvSV (draw_h_gv); 3477 SV *draw_h_sv = GvSV (draw_h_gv);
2815 SV *hover;
2816 double draw_x, draw_y, draw_w, draw_h; 3478 double draw_x, draw_y;
2817 3479
2818 if (!SvROK (self)) 3480 if (!SvROK (self))
2819 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3481 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820 3482
2821 hv = (HV *)SvRV (self); 3483 hv = (HV *)SvRV (self);
2822 3484
2823 if (SvTYPE (hv) != SVt_PVHV) 3485 if (SvTYPE (hv) != SVt_PVHV)
2824 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3486 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825 3487
2826 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.;
2827 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.;
2828 3490
2829 if (!h || !w) 3491 if (!h || !w)
… …
2849 { 3511 {
2850 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3512 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851 3513
2852 if (svp && SvTRUE (*svp)) 3514 if (svp && SvTRUE (*svp))
2853 { 3515 {
2854 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);
2855 glEnable (GL_BLEND); 3517 glEnable (GL_BLEND);
2856 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3518 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857 glBegin (GL_QUADS); 3519 glBegin (GL_QUADS);
2858 glVertex2f (0, 0); 3520 glVertex2f (0, 0);
2859 glVertex2f (w, 0); 3521 glVertex2f (w, 0);
… …
2862 glEnd (); 3524 glEnd ();
2863 glDisable (GL_BLEND); 3525 glDisable (GL_BLEND);
2864 } 3526 }
2865 } 3527 }
2866#if 0 3528#if 0
2867 if ($ENV{CFPLUS_DEBUG} & 1) { 3529 // draw borders, for debugging
2868 glPushMatrix; 3530 glPushMatrix ();
2869 glColor 1, 1, 0, 1; 3531 glColor4f (1., 1., 0., 1.);
2870 glTranslate 0.375, 0.375; 3532 glTranslatef (.5, .5, 0.);
2871 glBegin GL_LINE_LOOP; 3533 glBegin (GL_LINE_LOOP);
2872 glVertex 0 , 0; 3534 glVertex2f (0 , 0);
2873 glVertex $self->{w} - 1, 0; 3535 glVertex2f (w - 1, 0);
2874 glVertex $self->{w} - 1, $self->{h} - 1; 3536 glVertex2f (w - 1, h - 1);
2875 glVertex 0 , $self->{h} - 1; 3537 glVertex2f (0 , h - 1);
2876 glEnd; 3538 glEnd ();
2877 glPopMatrix; 3539 glPopMatrix ();
2878 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879 }
2880#endif 3540#endif
2881 PUSHMARK (SP); 3541 PUSHMARK (SP);
2882 XPUSHs (self); 3542 XPUSHs (self);
2883 PUTBACK; 3543 PUTBACK;
2884 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