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.218 by root, Mon Aug 6 02:11:45 2007 UTC vs.
Revision 1.322 by root, Sun Nov 18 01:43:12 2018 UTC

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