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.235 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.322 by root, Sun Nov 18 01:43:12 2018 UTC

… …
15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
34 37
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 39
37#include <SDL.h> 40#include <SDL.h>
38#include <SDL_thread.h> 41#include <SDL_thread.h>
39#include <SDL_endian.h> 42#include <SDL_endian.h>
40#include <SDL_image.h> 43#include <SDL_image.h>
41#include <SDL_mixer.h> 44#include <SDL_mixer.h>
42#include <SDL_opengl.h> 45#include <SDL_opengl.h>
43 46
47/* work around os x broken headers */
48#ifdef __MACOSX__
49typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
50typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
51typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
52#endif
53
44#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
46 56
47#include <glib/gmacros.h> 57#include <glib.h>
48 58
49#include <pango/pango.h> 59#include <pango/pango.h>
60
61#ifndef PANGO_VERSION_CHECK
62# define PANGO_VERSION_CHECK(a,b,c) 0
63#endif
64
65#if !PANGO_VERSION_CHECK (1, 15, 2)
66# define pango_layout_get_line_readonly pango_layout_get_line
67# define pango_layout_get_lines_readonly pango_layout_get_lines
68# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
69# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
70#endif
50 71
51#ifndef _WIN32 72#ifndef _WIN32
52# include <sys/types.h> 73# include <sys/types.h>
53# include <sys/socket.h> 74# include <sys/socket.h>
54# include <netinet/in.h> 75# include <netinet/in.h>
55# include <netinet/tcp.h> 76# include <netinet/tcp.h>
56# include <inttypes.h> 77# include <inttypes.h>
57#endif 78#endif
58 79
80#if __GNUC__ >= 4
81# define expect(expr,value) __builtin_expect ((expr),(value))
82#else
83# define expect(expr,value) (expr)
84#endif
85
86#define expect_false(expr) expect ((expr) != 0, 0)
87#define expect_true(expr) expect ((expr) != 0, 1)
88
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 90
91/* this is used as fow flag as well, so has to have a different value */
92/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
62 95
63#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
65 98
66#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
67 100
68#if 0 101/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 103
71# define PARACHUTE 0 104#define KMOD_LRAM 0x10000 // our extension
72#endif 105
106#define TEXID_SPEECH 1
107#define TEXID_NOFACE 2
108
109static char *
110fast_sv_grow (SV *sv, STRLEN need)
111{
112 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need;
114
115 if (expect_false (len < want))
116 {
117 do
118 len *= 2;
119 while (len < want);
120
121 sv_grow (sv, len);
122 }
123
124 SvCUR_set (sv, want);
125 return SvEND (sv) - need;
126}
73 127
74static AV *texture_av; 128static AV *texture_av;
75 129
76static struct 130static struct
77{ 131{
… …
120 174
121#include "pango-font.c" 175#include "pango-font.c"
122#include "pango-fontmap.c" 176#include "pango-fontmap.c"
123#include "pango-render.c" 177#include "pango-render.c"
124 178
125typedef IV CFPlus__Channel; 179typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 180typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 181typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 182typedef Mix_Music *DC__MixMusic;
129 183
130typedef PangoFontDescription *CFPlus__Font; 184typedef PangoFontDescription *DC__Font;
131 185
132static int 186static int
133shape_attr_p (PangoLayoutRun *run) 187shape_attr_p (PangoLayoutRun *run)
134{ 188{
135 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
136 190
137 while (attrs) 191 while (attrs)
138 { 192 {
139 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
140 194
141 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
142 return 1; 196 return 1;
143 197
144 attrs = attrs->next; 198 attrs = attrs->next;
… …
149 203
150typedef struct cf_layout { 204typedef struct cf_layout {
151 PangoLayout *pl; 205 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 206 float r, g, b, a; // default color for rgba mode
153 int base_height; 207 int base_height;
154 CFPlus__Font font; 208 DC__Font font;
155 rc_t *rc; 209 rc_t *rc;
156} *CFPlus__Layout; 210} *DC__Layout;
157 211
158static CFPlus__Font default_font; 212static DC__Font default_font;
159static PangoContext *opengl_context; 213static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 214static PangoFontMap *opengl_fontmap;
161 215
162static void 216static void
163substitute_func (FcPattern *pattern, gpointer data) 217substitute_func (FcPattern *pattern, gpointer data)
164{ 218{
165 FcPatternAddBool (pattern, FC_HINTING, 1); 219 FcPatternAddBool (pattern, FC_HINTING, 1);
166#ifdef FC_HINT_STYLE 220#ifdef FC_HINT_STYLE
167 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 221 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
168#endif 222#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 223 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 224}
171 225
172static void 226static void
173layout_update_font (CFPlus__Layout self) 227layout_update_font (DC__Layout self)
174{ 228{
175 /* 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
176 * reasonably well with bitstream vera 230 * reasonably well with dejavu/bistream fonts
177 */ 231 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 232 PangoFontDescription *font = self->font ? self->font : default_font;
179 233
180 pango_font_description_set_absolute_size (font, 234 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 235 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 236
183 pango_layout_set_font_description (self->pl, font); 237 pango_layout_set_font_description (self->pl, font);
184} 238}
185 239
186static void 240static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 241layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 242{
189 PangoRectangle rect; 243 PangoRectangle rect;
190 244
191 // get_pixel_* wrongly rounds down 245 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 246 pango_layout_get_extents (self->pl, 0, &rect);
… …
209 int w, h; 263 int w, h;
210 float s, t; 264 float s, t;
211 uint8_t r, g, b, a; 265 uint8_t r, g, b, a;
212 tileid smoothtile; 266 tileid smoothtile;
213 uint8_t smoothlevel; 267 uint8_t smoothlevel;
268 uint8_t unused; /* set to zero on use */
214} maptex; 269} maptex;
215 270
216typedef struct { 271typedef struct {
217 uint32_t player; 272 uint32_t player;
218 tileid tile[3]; 273 tileid tile[3];
… …
231 int faces; tileid *face2tile; // [faceid] 286 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 287 int texs; maptex *tex; // [tileid]
233 288
234 int32_t rows; 289 int32_t rows;
235 maprow *row; 290 maprow *row;
236} *CFPlus__Map; 291} *DC__Map;
237 292
238static char * 293static char *
239prepend (char *ptr, int sze, int inc) 294prepend (char *ptr, int sze, int inc)
240{ 295{
241 char *p; 296 char *p;
… …
279 self->texs *= 2; 334 self->texs *= 2;
280 } 335 }
281} 336}
282 337
283static maprow * 338static maprow *
284map_get_row (CFPlus__Map self, int y) 339map_get_row (DC__Map self, int y)
285{ 340{
286 if (0 > y) 341 if (0 > y)
287 { 342 {
288 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 344 Prepend (maprow, self->row, self->rows, extend);
… …
327 382
328 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
329} 384}
330 385
331static mapcell * 386static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 387map_get_cell (DC__Map self, int x, int y)
333{ 388{
334 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
335} 390}
336 391
337static void 392static void
338map_clear (CFPlus__Map self) 393map_clear (DC__Map self)
339{ 394{
340 int r; 395 int r;
341 396
342 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
… …
350 self->oy = 0; 405 self->oy = 0;
351 self->row = 0; 406 self->row = 0;
352 self->rows = 0; 407 self->rows = 0;
353} 408}
354 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
355static void 420static void
356map_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)
357{ 422{
358 int x, y; 423 int x, y;
359 maprow *row; 424 maprow *row;
360 mapcell *cell; 425 mapcell *cell;
361 426
… …
373 if (x >= row->c1) 438 if (x >= row->c1)
374 break; 439 break;
375 440
376 cell = row->col + x - row->c0; 441 cell = row->col + x - row->c0;
377 442
378 cell->darkness = 0; 443 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 444 }
383 } 445 }
384} 446}
385 447
386typedef struct { 448struct smooth_key
449{
387 tileid tile; 450 tileid tile;
388 uint8_t x, y, level; 451 uint8_t x, y, level;
389} 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}
390 471
391static void 472static void
392smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
393{ 474{
394 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
395 476
396 if (SvIOK (*sv)) 477 if (it == h.end ())
397 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
398 else 479 else
399 sv_setiv (*sv, bits); 480 it->second |= bits;
400} 481}
401 482
402static void 483static void
403music_finished (void) 484music_finished (void)
404{ 485{
… …
421 ev.code = 1; 502 ev.code = 1;
422 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
423 ev.data2 = 0; 504 ev.data2 = 0;
424 505
425 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;
426} 514}
427 515
428static unsigned int 516static unsigned int
429minpot (unsigned int n) 517minpot (unsigned int n)
430{ 518{
… …
498 return 0; 586 return 0;
499 587
500 return 1; 588 return 1;
501} 589}
502 590
503MODULE = 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
504 650
505PROTOTYPES: ENABLE 651PROTOTYPES: ENABLE
506 652
507BOOT: 653BOOT:
508{ 654{
509 HV *stash = gv_stashpv ("CFPlus", 1); 655 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 656 static const struct {
511 const char *name; 657 const char *name;
512 IV iv; 658 IV iv;
513 } *civ, const_iv[] = { 659 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 660# define const_iv(name) { # name, (IV)name }
… …
535 const_iv (SDL_USEREVENT), 681 const_iv (SDL_USEREVENT),
536 682
537 const_iv (SDL_APPINPUTFOCUS), 683 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 684 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 685 const_iv (SDL_APPACTIVE),
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),
540 736
541 const_iv (SDLK_FIRST), 737 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 738 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 739 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 740 const_iv (SDLK_KP1),
… …
619 const_iv (KMOD_LMETA), 815 const_iv (KMOD_LMETA),
620 const_iv (KMOD_RMETA), 816 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 817 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 818 const_iv (KMOD_CAPS),
623 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)
624# undef const_iv 853# undef const_iv
625 }; 854 };
626 855
627 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--)
628 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
629 858
630 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
631 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
632} 861}
633 862
… …
649NV ceil (NV x) 878NV ceil (NV x)
650 879
651IV minpot (UV n) 880IV minpot (UV n)
652 881
653IV popcount (UV n) 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
654 889
655void 890void
656pango_init () 891pango_init ()
657 CODE: 892 CODE:
658{ 893{
659 opengl_fontmap = pango_opengl_font_map_new (); 894 opengl_fontmap = pango_opengl_font_map_new ();
660 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);
661 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
662} 902}
663 903
664char *
665SDL_GetError () 904char *SDL_GetError ()
666 905
667int 906void SDL_main_hack (SV *real_main)
668SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 907 PROTOTYPE: &
669 908
670void 909int SDL_Init (U32 flags)
910
911int SDL_InitSubSystem (U32 flags)
912
913void SDL_QuitSubSystem (U32 flags)
914
671SDL_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
672 926
673void 927void
674SDL_ListModes (int rgb, int alpha) 928SDL_ListModes (int rgb, int alpha)
675 PPCODE: 929 PPCODE:
676{ 930{
… …
688 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 942 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
689 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 943 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 944 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
691 945
692 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 946 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
693#if SDL_VERSION_ATLEAST(1,2,10)
694 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
695 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 947 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
696#endif
697 948
698 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 949 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
699 950
700 if (m && m != (SDL_Rect **)-1) 951 if (m && m != (SDL_Rect **)-1)
701 while (*m) 952 while (*m)
702 { 953 {
703 if ((*m)->w >= 640 && (*m)->h >= 480) 954 if ((*m)->w >= 400 && (*m)->h >= 300)
704 { 955 {
705 AV *av = newAV (); 956 AV *av = newAV ();
706 av_push (av, newSViv ((*m)->w)); 957 av_push (av, newSViv ((*m)->w));
707 av_push (av, newSViv ((*m)->h)); 958 av_push (av, newSViv ((*m)->h));
708 av_push (av, newSViv (rgb)); 959 av_push (av, newSViv (rgb));
… …
731 ); 982 );
732 983
733 if (RETVAL) 984 if (RETVAL)
734 { 985 {
735 av_clear (texture_av); 986 av_clear (texture_av);
736
737 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT");
738#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);
739#include "glfunc.h" 988#include "glfunc.h"
740#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
741 } 992 }
742} 993}
743 OUTPUT: 994 OUTPUT:
744 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
745 999
746void 1000void
747SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
748 1002
749char * 1003char *
750SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
751 1006
752int 1007int
753SDL_GetAppState () 1008SDL_GetAppState ()
754 1009
1010int
1011SDL_GetModState ()
1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
755void 1017void
1018SDL_PumpEvents ()
1019
1020void
756poll_events () 1021peep_events ()
757 PPCODE: 1022 PPCODE:
758{ 1023{
759 SDL_Event ev; 1024 SDL_Event ev;
760 1025
761 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
… …
768 { 1033 {
769 case SDL_KEYDOWN: 1034 case SDL_KEYDOWN:
770 case SDL_KEYUP: 1035 case SDL_KEYUP:
771 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1036 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1037 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773 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);
774 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 */
775 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1040 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776 break; 1041 break;
777 1042
778 case SDL_ACTIVEEVENT: 1043 case SDL_ACTIVEEVENT:
779 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1044 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
797 x = ev.motion.x; 1062 x = ev.motion.x;
798 y = ev.motion.y; 1063 y = ev.motion.y;
799 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1064 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800 } 1065 }
801 1066
802 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1067 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
803 hv_store (hv, "state", 5, newSViv (state), 0); 1068 hv_store (hv, "state", 5, newSViv (state), 0);
804 hv_store (hv, "x", 1, newSViv (x), 0); 1069 hv_store (hv, "x", 1, newSViv (x), 0);
805 hv_store (hv, "y", 1, newSViv (y), 0); 1070 hv_store (hv, "y", 1, newSViv (y), 0);
806 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1071 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1072 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808 } 1073 }
809 break; 1074 break;
810 1075
811 case SDL_MOUSEBUTTONDOWN: 1076 case SDL_MOUSEBUTTONDOWN:
812 case SDL_MOUSEBUTTONUP: 1077 case SDL_MOUSEBUTTONUP:
813 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1078 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814 1079
815 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1080 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1081 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1082 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1083 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
823 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1088 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1089 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825 break; 1090 break;
826 } 1091 }
827 1092
828 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))));
829 } 1094 }
830} 1095}
831 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
832int 1110int
833Mix_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)
834 POSTCALL: 1112 POSTCALL:
835 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
836 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}
837 1131
838void 1132void
839Mix_CloseAudio () 1133Mix_CloseAudio ()
840 1134
841int 1135int
… …
876 } 1170 }
877 } 1171 }
878#endif 1172#endif
879} 1173}
880 1174
881void 1175int
882add_font (char *file) 1176add_font (char *file)
883 CODE: 1177 CODE:
884 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)
885 1188
886void 1189void
887load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
888 ALIAS: 1191 ALIAS:
889 load_image_file = 1 1192 load_image_file = 1
… …
935 1238
936 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
937 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
938 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
939 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
940 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
941 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)));
942 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
943 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
944 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
945 1248
… …
975void 1278void
976error (char *message) 1279error (char *message)
977 CODE: 1280 CODE:
978 fprintf (stderr, "ERROR: %s\n", message); 1281 fprintf (stderr, "ERROR: %s\n", message);
979#ifdef _WIN32 1282#ifdef _WIN32
980 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1283 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
981#endif 1284#endif
982 1285
983void 1286void
984fatal (char *message) 1287fatal (char *message)
985 CODE: 1288 CODE:
986 fprintf (stderr, "FATAL: %s\n", message); 1289 fprintf (stderr, "FATAL: %s\n", message);
987#ifdef _WIN32 1290#ifdef _WIN32
988 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1291 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
989#endif 1292#endif
990 _exit (1); 1293 _exit (1);
991 1294
992void 1295void
993_exit (int retval = 0) 1296_exit (int retval = 0)
… …
1005#if DEBUG 1308#if DEBUG
1006 VALGRIND_DO_LEAK_CHECK; 1309 VALGRIND_DO_LEAK_CHECK;
1007#endif 1310#endif
1008} 1311}
1009 1312
1010MODULE = 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
1011 1321
1012PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1013 1323
1014CFPlus::Font 1324DC::Font
1015new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1016 CODE: 1326 CODE:
1017{ 1327{
1018 int count; 1328 int count;
1019 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1020 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
1022} 1332}
1023 OUTPUT: 1333 OUTPUT:
1024 RETVAL 1334 RETVAL
1025 1335
1026void 1336void
1027DESTROY (CFPlus::Font self) 1337DESTROY (DC::Font self)
1028 CODE: 1338 CODE:
1029 pango_font_description_free (self); 1339 pango_font_description_free (self);
1030 1340
1031void 1341void
1032make_default (CFPlus::Font self) 1342make_default (DC::Font self)
1033 PROTOTYPE: $ 1343 PROTOTYPE: $
1034 CODE: 1344 CODE:
1035 default_font = self; 1345 default_font = self;
1036 1346
1037MODULE = CFPlus PACKAGE = CFPlus::Layout 1347MODULE = Deliantra::Client PACKAGE = DC::Layout
1038 1348
1039PROTOTYPES: DISABLE 1349PROTOTYPES: DISABLE
1040 1350
1041void 1351void
1042reset_glyph_cache () 1352glyph_cache_backup ()
1043 PROTOTYPE: 1353 PROTOTYPE:
1044 CODE: 1354 CODE:
1355 tc_backup ();
1356
1357void
1358glyph_cache_restore ()
1359 PROTOTYPE:
1360 CODE:
1045 tc_clear (); 1361 tc_restore ();
1046 1362
1047CFPlus::Layout 1363DC::Layout
1048new (SV *class) 1364new (SV *klass)
1049 CODE: 1365 CODE:
1050 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1051 1367
1052 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1053 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
… …
1062 layout_update_font (RETVAL); 1378 layout_update_font (RETVAL);
1063 OUTPUT: 1379 OUTPUT:
1064 RETVAL 1380 RETVAL
1065 1381
1066void 1382void
1067DESTROY (CFPlus::Layout self) 1383DESTROY (DC::Layout self)
1068 CODE: 1384 CODE:
1069 g_object_unref (self->pl); 1385 g_object_unref (self->pl);
1070 rc_free (self->rc); 1386 rc_free (self->rc);
1071 Safefree (self); 1387 Safefree (self);
1072 1388
1073void 1389void
1074set_text (CFPlus::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1075 CODE: 1391 CODE:
1076{ 1392{
1077 STRLEN textlen; 1393 STRLEN textlen;
1078 char *text = SvPVutf8 (text_, textlen); 1394 char *text = SvPVutf8 (text_, textlen);
1079 1395
1080 pango_layout_set_text (self->pl, text, textlen); 1396 pango_layout_set_text (self->pl, text, textlen);
1081} 1397}
1082 1398
1083void 1399void
1084set_markup (CFPlus::Layout self, SV *text_) 1400set_markup (DC::Layout self, SV *text_)
1085 CODE: 1401 CODE:
1086{ 1402{
1087 STRLEN textlen; 1403 STRLEN textlen;
1088 char *text = SvPVutf8 (text_, textlen); 1404 char *text = SvPVutf8 (text_, textlen);
1089 1405
1090 pango_layout_set_markup (self->pl, text, textlen); 1406 pango_layout_set_markup (self->pl, text, textlen);
1091} 1407}
1092 1408
1093void 1409void
1094set_shapes (CFPlus::Layout self, ...) 1410set_shapes (DC::Layout self, ...)
1095 CODE: 1411 CODE:
1096{ 1412{
1097 PangoAttrList *attrs = 0; 1413 PangoAttrList *attrs = 0;
1098 const char *text = pango_layout_get_text (self->pl); 1414 const char *text = pango_layout_get_text (self->pl);
1099 const char *pos = text; 1415 const char *pos = text;
… …
1134 if (attrs) 1450 if (attrs)
1135 pango_layout_set_attributes (self->pl, attrs); 1451 pango_layout_set_attributes (self->pl, attrs);
1136} 1452}
1137 1453
1138void 1454void
1139get_shapes (CFPlus::Layout self) 1455get_shapes (DC::Layout self)
1140 PPCODE: 1456 PPCODE:
1141{ 1457{
1142 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1458 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143 1459
1144 do 1460 do
1145 { 1461 {
1146 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1462 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147 1463
1148 if (run && shape_attr_p (run)) 1464 if (run && shape_attr_p (run))
1149 { 1465 {
1150 PangoRectangle extents; 1466 PangoRectangle extents;
1151 pango_layout_iter_get_run_extents (iter, 0, &extents); 1467 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1159 1475
1160 pango_layout_iter_free (iter); 1476 pango_layout_iter_free (iter);
1161} 1477}
1162 1478
1163int 1479int
1164has_wrapped (CFPlus::Layout self) 1480has_wrapped (DC::Layout self)
1165 CODE: 1481 CODE:
1166{ 1482{
1167 int lines = 1; 1483 int lines = 1;
1168 const char *text = pango_layout_get_text (self->pl); 1484 const char *text = pango_layout_get_text (self->pl);
1169 1485
… …
1174} 1490}
1175 OUTPUT: 1491 OUTPUT:
1176 RETVAL 1492 RETVAL
1177 1493
1178SV * 1494SV *
1179get_text (CFPlus::Layout self) 1495get_text (DC::Layout self)
1180 CODE: 1496 CODE:
1181 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1497 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182 sv_utf8_decode (RETVAL); 1498 sv_utf8_decode (RETVAL);
1183 OUTPUT: 1499 OUTPUT:
1184 RETVAL 1500 RETVAL
1185 1501
1186void 1502void
1187set_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.)
1188 CODE: 1504 CODE:
1189 self->r = r; 1505 self->r = r;
1190 self->g = g; 1506 self->g = g;
1191 self->b = b; 1507 self->b = b;
1192 self->a = a; 1508 self->a = a;
1193 1509
1194void 1510void
1195set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1511set_font (DC::Layout self, DC::Font font = 0)
1196 CODE: 1512 CODE:
1197 if (self->font != font) 1513 if (self->font != font)
1198 { 1514 {
1199 self->font = font; 1515 self->font = font;
1200 layout_update_font (self); 1516 layout_update_font (self);
1201 } 1517 }
1202 1518
1203void 1519void
1204set_height (CFPlus::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1205 CODE: 1521 CODE:
1206 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1207 { 1523 {
1208 self->base_height = base_height; 1524 self->base_height = base_height;
1209 layout_update_font (self); 1525 layout_update_font (self);
1210 } 1526 }
1211 1527
1212void 1528void
1213set_width (CFPlus::Layout self, int max_width = -1) 1529set_width (DC::Layout self, int max_width = -1)
1214 CODE: 1530 CODE:
1215 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);
1216 1532
1217void 1533void
1218set_indent (CFPlus::Layout self, int indent) 1534set_indent (DC::Layout self, int indent)
1219 CODE: 1535 CODE:
1220 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1536 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221 1537
1222void 1538void
1223set_spacing (CFPlus::Layout self, int spacing) 1539set_spacing (DC::Layout self, int spacing)
1224 CODE: 1540 CODE:
1225 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1541 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226 1542
1227void 1543void
1228set_ellipsise (CFPlus::Layout self, int ellipsise) 1544set_ellipsise (DC::Layout self, int ellipsise)
1229 CODE: 1545 CODE:
1230 pango_layout_set_ellipsize (self->pl, 1546 pango_layout_set_ellipsize (self->pl,
1231 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1547 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1548 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1549 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234 : PANGO_ELLIPSIZE_NONE 1550 : PANGO_ELLIPSIZE_NONE
1235 ); 1551 );
1236 1552
1237void 1553void
1238set_single_paragraph_mode (CFPlus::Layout self, int spm) 1554set_single_paragraph_mode (DC::Layout self, int spm)
1239 CODE: 1555 CODE:
1240 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1556 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241 1557
1242void 1558void
1243size (CFPlus::Layout self) 1559size (DC::Layout self)
1244 PPCODE: 1560 PPCODE:
1245{ 1561{
1246 int w, h; 1562 int w, h;
1247 1563
1248 layout_get_pixel_size (self, &w, &h); 1564 layout_get_pixel_size (self, &w, &h);
… …
1251 PUSHs (sv_2mortal (newSViv (w))); 1567 PUSHs (sv_2mortal (newSViv (w)));
1252 PUSHs (sv_2mortal (newSViv (h))); 1568 PUSHs (sv_2mortal (newSViv (h)));
1253} 1569}
1254 1570
1255int 1571int
1256descent (CFPlus::Layout self) 1572descent (DC::Layout self)
1257 CODE: 1573 CODE:
1258{ 1574{
1259 PangoRectangle rect; 1575 PangoRectangle rect;
1260 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1576 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261 pango_layout_line_get_pixel_extents (line, 0, &rect); 1577 pango_layout_line_get_pixel_extents (line, 0, &rect);
1262 RETVAL = PANGO_DESCENT (rect); 1578 RETVAL = PANGO_DESCENT (rect);
1263} 1579}
1264 OUTPUT: 1580 OUTPUT:
1265 RETVAL 1581 RETVAL
1266 1582
1267int 1583int
1268xy_to_index (CFPlus::Layout self, int x, int y) 1584xy_to_index (DC::Layout self, int x, int y)
1269 CODE: 1585 CODE:
1270{ 1586{
1271 int index, trailing; 1587 int index, trailing;
1272 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);
1273 RETVAL = index + trailing; 1589 RETVAL = index + trailing;
1274} 1590}
1275 OUTPUT: 1591 OUTPUT:
1276 RETVAL 1592 RETVAL
1277 1593
1278void 1594void
1279cursor_pos (CFPlus::Layout self, int index) 1595cursor_pos (DC::Layout self, int index)
1280 PPCODE: 1596 PPCODE:
1281{ 1597{
1282 PangoRectangle strong_pos; 1598 PangoRectangle pos;
1283 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1599 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284 1600
1285 EXTEND (SP, 3); 1601 EXTEND (SP, 3);
1286 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1602 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1603 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1604 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289} 1605}
1290 1606
1291void 1607void
1292index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1608index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293 PPCODE: 1609 PPCODE:
1294{ 1610{
1295 int line, x; 1611 int line, x;
1296 1612
1297 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)
1298 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1615 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299 1616 --line;
1617#endif
1300 EXTEND (SP, 2); 1618 EXTEND (SP, 2);
1301 PUSHs (sv_2mortal (newSViv (line - 1))); 1619 PUSHs (sv_2mortal (newSViv (line)));
1302 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1620 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303} 1621}
1304 1622
1305void 1623void
1306line_x_to_index (CFPlus::Layout self, int line, int x) 1624line_x_to_index (DC::Layout self, int line, int x)
1307 PPCODE: 1625 PPCODE:
1308{ 1626{
1309 PangoLayoutLine *lp; 1627 PangoLayoutLine *lp;
1310 int index, trailing; 1628 int index, trailing;
1311 1629
1312 if (line < 0) 1630 if (line < 0)
1313 XSRETURN_EMPTY; 1631 XSRETURN_EMPTY;
1314 1632
1315 if (!(lp = pango_layout_get_line (self->pl, line))) 1633 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316 XSRETURN_EMPTY; /* do better */ 1634 XSRETURN_EMPTY; /* do better */
1317 1635
1318 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);
1319 1637
1320 EXTEND (SP, 2); 1638 EXTEND (SP, 2);
… …
1326 PUSHs (sv_2mortal (newSViv (trailing))); 1644 PUSHs (sv_2mortal (newSViv (trailing)));
1327 } 1645 }
1328} 1646}
1329 1647
1330void 1648void
1331render (CFPlus::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1332 CODE: 1650 CODE:
1333 rc_clear (self->rc); 1651 rc_clear (self->rc);
1334 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1335 self->pl, 1653 self->pl,
1336 self->rc, 1654 self->rc,
… …
1341 // we assume that context_change actually clears/frees stuff 1659 // we assume that context_change actually clears/frees stuff
1342 // and does not do any recomputation... 1660 // and does not do any recomputation...
1343 pango_layout_context_changed (self->pl); 1661 pango_layout_context_changed (self->pl);
1344 1662
1345void 1663void
1346draw (CFPlus::Layout self) 1664draw (DC::Layout self)
1347 CODE: 1665 CODE:
1348{ 1666{
1349 glEnable (GL_TEXTURE_2D); 1667 glEnable (GL_TEXTURE_2D);
1350 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1668 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351 glEnable (GL_BLEND); 1669 glEnable (GL_BLEND);
… …
1359 glDisable (GL_ALPHA_TEST); 1677 glDisable (GL_ALPHA_TEST);
1360 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1361 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1362} 1680}
1363 1681
1364MODULE = CFPlus PACKAGE = CFPlus::Texture 1682MODULE = Deliantra::Client PACKAGE = DC::Texture
1365 1683
1366PROTOTYPES: ENABLE 1684PROTOTYPES: ENABLE
1367 1685
1368void 1686void
1369pad (SV *data_, int ow, int oh, int nw, int nh) 1687pad (SV *data_, int ow, int oh, int nw, int nh)
… …
1437 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1438 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1439 } 1757 }
1440} 1758}
1441 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
1442IV 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)
1443 CODE: 1882 CODE:
1444{ 1883{
1445 GLint width; 1884 GLint width;
1446 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);
… …
1448 RETVAL = width > 0; 1887 RETVAL = width > 0;
1449} 1888}
1450 OUTPUT: 1889 OUTPUT:
1451 RETVAL 1890 RETVAL
1452 1891
1453MODULE = CFPlus PACKAGE = CFPlus::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1454 1893
1455PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1456 1895
1457CFPlus::Map 1896DC::Map
1458new (SV *class) 1897new (SV *klass)
1459 CODE: 1898 CODE:
1460 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1461 RETVAL->x = 0; 1900 RETVAL->x = 0;
1462 RETVAL->y = 0; 1901 RETVAL->y = 0;
1463 RETVAL->w = 0; 1902 RETVAL->w = 0;
… …
1470 RETVAL->row = 0; 1909 RETVAL->row = 0;
1471 OUTPUT: 1910 OUTPUT:
1472 RETVAL 1911 RETVAL
1473 1912
1474void 1913void
1475DESTROY (CFPlus::Map self) 1914DESTROY (DC::Map self)
1476 CODE: 1915 CODE:
1477{ 1916{
1478 map_clear (self); 1917 map_clear (self);
1479 Safefree (self->face2tile); 1918 Safefree (self->face2tile);
1480 Safefree (self->tex); 1919 Safefree (self->tex);
1481 Safefree (self); 1920 Safefree (self);
1482} 1921}
1483 1922
1484void 1923void
1485resize (CFPlus::Map self, int map_width, int map_height) 1924resize (DC::Map self, int map_width, int map_height)
1486 CODE: 1925 CODE:
1487 self->w = map_width; 1926 self->w = map_width;
1488 self->h = map_height; 1927 self->h = map_height;
1489 1928
1490void 1929void
1491clear (CFPlus::Map self) 1930clear (DC::Map self)
1492 CODE: 1931 CODE:
1493 map_clear (self); 1932 map_clear (self);
1494 1933
1495void 1934void
1496set_tileid (CFPlus::Map self, int face, int tile) 1935set_tileid (DC::Map self, int face, int tile)
1497 CODE: 1936 CODE:
1498{ 1937{
1499 need_facenum (self, face); self->face2tile [face] = tile; 1938 need_facenum (self, face); self->face2tile [face] = tile;
1500 need_texid (self, tile); 1939 need_texid (self, tile);
1501} 1940}
1502 1941
1503void 1942void
1504set_smooth (CFPlus::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1505 CODE: 1944 CODE:
1506{ 1945{
1507 tileid texid; 1946 tileid texid;
1508 maptex *tex; 1947 maptex *tex;
1509 1948
1510 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1511 return; 1950 return;
1512 1951
1513 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1514 return; 1953 return;
1515 1954
1516 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1517 1956
1518 if (!texid) 1957 if (!texid)
1519 return; 1958 return;
1520 1959
1521 tex = self->tex + texid; 1960 tex = self->tex + texid;
1522 tex->smoothtile = self->face2tile [smooth]; 1961 tex->smoothtile = self->face2tile [smooth];
1523 tex->smoothlevel = level; 1962 tex->smoothlevel = level;
1524} 1963}
1525 1964
1526void 1965void
1527set_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)
1528 CODE: 1967 CODE:
1529{ 1968{
1530 need_texid (self, texid); 1969 need_texid (self, texid);
1531 1970
1532 { 1971 {
… …
1551 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1552 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1553 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554} 1993}
1555 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
1556int 2015int
1557ox (CFPlus::Map self) 2016ox (DC::Map self)
1558 ALIAS: 2017 ALIAS:
1559 oy = 1 2018 oy = 1
1560 x = 2 2019 x = 2
1561 y = 3 2020 y = 3
1562 w = 4 2021 w = 4
… …
1573 } 2032 }
1574 OUTPUT: 2033 OUTPUT:
1575 RETVAL 2034 RETVAL
1576 2035
1577void 2036void
1578scroll (CFPlus::Map self, int dx, int dy) 2037scroll (DC::Map self, int dx, int dy)
1579 CODE: 2038 CODE:
1580{ 2039{
1581 if (dx > 0) 2040 if (dx > 0)
1582 map_blank (self, self->x, self->y, dx, self->h); 2041 map_blank (self, self->x, self->y, dx, self->h);
1583 else if (dx < 0) 2042 else if (dx < 0)
… …
1599 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1600 } 2059 }
1601} 2060}
1602 2061
1603SV * 2062SV *
1604map1a_update (CFPlus::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1605 CODE: 2064 CODE:
1606{ 2065{
1607 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1608 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1609 mapcell *cell; 2068 mapcell *cell;
… …
1630 2089
1631 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1632 2091
1633 if (flags & 8) 2092 if (flags & 8)
1634 { 2093 {
2094 uint8_t ext, cmd;
2095
1635 if (extmap) 2096 do
1636 { 2097 {
1637 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1638 2100
1639 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
1640 { 2104 {
1641 ext = *data++;
1642 cmd = ext & 0x3f;
1643
1644 if (cmd < 4)
1645 cell->darkness = 255 - ext * 64 + 1;
1646 else if (cmd == 5) // health
1647 {
1648 cell->stat_width = 1; 2105 cell->stat_width = 1;
1649 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1650 }
1651 else if (cmd == 6) // monster width
1652 cell->stat_width = *data++ + 1;
1653 else if (cmd == 0x47)
1654 {
1655 if (*data == 4)
1656 ; // decode player count
1657
1658 data += *data + 1;
1659 }
1660 else if (cmd == 8) // cell flags
1661 cell->flags = *data++;
1662 else if (ext & 0x40) // unknown, multibyte => skip
1663 data += *data + 1;
1664 else
1665 data++;
1666 } 2107 }
1667 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++;
1668 } 2125 }
1669 else 2126 while (ext & 0x80);
1670 cell->darkness = *data++ + 1;
1671 } 2127 }
1672 2128
1673 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1674 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1675 { 2131 {
… …
1678 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1679 2135
1680 if (cell->tile [z]) 2136 if (cell->tile [z])
1681 { 2137 {
1682 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1683 if (!tex->name) 2140 if (!tex->name)
1684 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1685 2142
1686 if (tex->smoothtile) 2143 if (tex->smoothtile)
1687 { 2144 {
1688 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1689 if (!smooth->name) 2147 if (!smooth->name)
1690 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1691 } 2149 }
1692 } 2150 }
1693 } 2151 }
1694 } 2152 }
1695 else 2153 else
1696 cell->darkness = 0; 2154 CELL_CLEAR (cell);
1697 } 2155 }
1698} 2156}
1699 OUTPUT: 2157 OUTPUT:
1700 RETVAL 2158 RETVAL
1701 2159
1702SV * 2160SV *
1703mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2161mapmap (DC::Map self, int x0, int y0, int w, int h)
1704 CODE: 2162 CODE:
1705{ 2163{
1706 int x1, x; 2164 int x1, x;
1707 int y1, y; 2165 int y1, y;
1708 int z; 2166 int z;
… …
1721 ? self->row + y 2179 ? self->row + y
1722 : 0; 2180 : 0;
1723 2181
1724 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1725 { 2183 {
1726 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1727 2185
1728 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1729 { 2187 {
1730 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1731 2189
… …
1733 { 2191 {
1734 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1735 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1736 int a1 = tex.a; 2194 int a1 = tex.a;
1737 2195
1738 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1739 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1740 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1741 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1742 } 2200 }
1743 } 2201 }
1744 2202
1745 *map++ = (r ) 2203 *map++ = (r )
1746 | (g << 8) 2204 | (g << 8)
1747 | (b << 16) 2205 | (b << 16)
1748 | (a << 24); 2206 | (a << 24);
1749 } 2207 }
1750 } 2208 }
1751 2209
1752 RETVAL = map_sv; 2210 RETVAL = map_sv;
1753} 2211}
1754 OUTPUT: 2212 OUTPUT:
1755 RETVAL 2213 RETVAL
1756 2214
1757void 2215void
1758draw (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)
1759 CODE: 2217 CODE:
1760{ 2218{
1761 int x, y, z; 2219 int x, y, z;
1762 2220
1763 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1764 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
1765 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2222 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1766 smooth_key skey; 2223 smooth_key skey;
1767 2224 int pl_x, pl_y;
2225 maptex pl_tex;
1768 rc_t *rc = rc_alloc (); 2226 rc_t *rc = rc_alloc ();
2227 rc_t *rc_ov = rc_alloc ();
1769 rc_key_t key; 2228 rc_key_t key;
1770 rc_array_t *arr; 2229 rc_array_t *arr;
1771 2230
2231 pl_tex.name = 0;
2232
1772 // thats current max. sorry. 2233 // that's current max. sorry.
1773 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1774 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1775 2236
1776 // clear key, in case of extra padding 2237 // clear key, in case of extra padding
1777 memset (&skey, 0, sizeof (skey)); 2238 memset (&skey, 0, sizeof (skey));
… …
1781 key.g = 255; 2242 key.g = 255;
1782 key.b = 255; 2243 key.b = 255;
1783 key.a = 255; 2244 key.a = 255;
1784 key.mode = GL_QUADS; 2245 key.mode = GL_QUADS;
1785 key.format = GL_T2F_V3F; 2246 key.format = GL_T2F_V3F;
1786 key.texname = -1;
1787 2247
1788 mx += self->x; 2248 mx += self->x;
1789 my += self->y; 2249 my += self->y;
1790 2250
1791 // first pass: determine smooth_max 2251 // first pass: determine smooth_max
… …
1814 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1815 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1816 2276
1817 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
1818 { 2278 {
2279 smooth_hash smooth;
1819 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2281 key.texname = -1;
1820 2282
1821 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
1822 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
1823 { 2285 {
1824 maprow *row = self->row + (y + my); 2286 maprow *row = self->row + (y + my);
… …
1834 maptex tex = self->tex [tile]; 2296 maptex tex = self->tex [tile];
1835 int px, py; 2297 int px, py;
1836 2298
1837 if (key.texname != tex.name) 2299 if (key.texname != tex.name)
1838 { 2300 {
2301 self->tex [tile].unused = 0;
2302
1839 if (!tex.name) 2303 if (!tex.name)
1840 tex = self->tex [2]; /* missing, replace by noface */ 2304 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1841 2305
1842 key.texname = tex.name; 2306 key.texname = tex.name;
1843 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
1844 } 2308 }
1845 2309
1846 px = (x + 1) * T - tex.w; 2310 px = (x + 1) * Th - tex.w;
1847 py = (y + 1) * T - tex.h; 2311 py = (y + 1) * Tw - tex.h;
2312
2313 if (expect_false (cell->player == player) && expect_false (z == 2))
2314 {
2315 pl_x = px;
2316 pl_y = py;
2317 pl_tex = tex;
2318 continue;
2319 }
1848 2320
1849 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2321 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1850 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2322 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1851 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2323 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1852 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2324 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1853
1854 if (cell->flags && z == 2)
1855 {
1856 // overlays such as the speech bubble, probably more to come
1857 if (cell->flags & 1)
1858 {
1859 maptex tex = self->tex [1];
1860 int px = x * T + T * 2 / 32;
1861 int py = y * T - T * 6 / 32;
1862
1863 if (tex.name)
1864 {
1865 if (key.texname != tex.name)
1866 {
1867 key.texname = tex.name;
1868 arr = rc_array (rc, &key);
1869 }
1870
1871 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1872 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1873 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1874 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1875 }
1876 }
1877 }
1878 2325
1879 // update smooth hash 2326 // update smooth hash
1880 if (tex.smoothtile) 2327 if (tex.smoothtile)
1881 { 2328 {
1882 skey.tile = tex.smoothtile; 2329 skey.tile = tex.smoothtile;
… …
1898 2345
1899 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1900 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
1901 2348
1902 // full tile 2349 // full tile
1903 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);
1904 2351
1905 // borders 2352 // borders
1906 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);
1907 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);
1908 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);
1909 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);
1910 2357
1911 // corners 2358 // corners
1912 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);
1913 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);
1914 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);
1915 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);
1916 } 2384 }
1917 } 2385 }
1918 } 2386 }
1919 } 2387 }
1920 2388
… …
1936 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
1937 { 2405 {
1938 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
1939 HE *he; 2407 HE *he;
1940 2408
1941 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1942 while ((he = hv_iternext (smooth)))
1943 { 2410 {
1944 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
1945 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
1946 2413
1947 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
1948 && skey->level == level 2415 && skey.level == level
1949 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
1950 { 2417 {
1951 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
1952 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
1953 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
1954 int border = bits & 15; 2421 int border = bits & 15;
1955 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1956 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
1957 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
1958 2425
… …
1960 { 2427 {
1961 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
1962 // save gobs of state changes. 2429 // save gobs of state changes.
1963 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
1964 { 2431 {
2432 self->tex [skey.tile].unused = 0;
2433
1965 glEnd (); 2434 glEnd ();
1966 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1967 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
1968 } 2437 }
1969 2438
1970 if (border) 2439 if (border)
1971 { 2440 {
1972 float ox = border * dx; 2441 float ox = border * dx;
1973 2442
1974 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1975 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1976 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1977 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1978 } 2447 }
1979 2448
1980 if (corner) 2449 if (corner)
1981 { 2450 {
1982 float ox = corner * dx; 2451 float ox = corner * dx;
1983 2452
1984 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1985 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1986 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1987 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1988 } 2457 }
1989 } 2458 }
1990 } 2459 }
1991 } 2460 }
1992 } 2461 }
… …
1994 2463
1995 glEnd (); 2464 glEnd ();
1996 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
1997 key.texname = -1; 2466 key.texname = -1;
1998 } 2467 }
1999
2000 hv_clear (smooth);
2001 } 2468 }
2469
2470 if (pl_tex.name)
2471 {
2472 maptex tex = pl_tex;
2473 int px = pl_x + sdx;
2474 int py = pl_y + sdy;
2475
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);
2002 2489
2003 glDisable (GL_BLEND); 2490 glDisable (GL_BLEND);
2004 rc_free (rc); 2491 rc_free (rc);
2492 rc_free (rc_ov);
2005 2493
2006 // top layer: overlays such as the health bar 2494 // top layer: overlays such as the health bar
2007 for (y = 0; y < sh; y++) 2495 for (y = 0; y < sh; y++)
2008 if (0 <= y + my && y + my < self->rows) 2496 if (0 <= y + my && y + my < self->rows)
2009 { 2497 {
… …
2012 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2013 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2014 { 2502 {
2015 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2016 2504
2017 int px = x * T; 2505 int px = x * Tw;
2018 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 }
2019 2513
2020 if (cell->stat_hp) 2514 if (cell->stat_hp)
2021 { 2515 {
2022 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2023 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2024 2518
2025 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2026 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2027 px + width - 1, py); 2521 px + width - 1, py);
2028 2522
… …
2034 } 2528 }
2035 } 2529 }
2036} 2530}
2037 2531
2038void 2532void
2039draw_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)
2040 CODE: 2534 CODE:
2041{ 2535{
2042 static float color[16][3] = { 2536 static float color[16][3] = {
2043 { 0.00F, 0.00F, 0.00F }, 2537 { 0.00f, 0.00f, 0.00f },
2044 { 1.00F, 1.00F, 1.00F }, 2538 { 1.00f, 1.00f, 1.00f },
2045 { 0.00F, 0.00F, 0.55F }, 2539 { 0.00f, 0.00f, 0.55f },
2046 { 1.00F, 0.00F, 0.00F }, 2540 { 1.00f, 0.00f, 0.00f },
2047 2541
2048 { 1.00F, 0.54F, 0.00F }, 2542 { 1.00f, 0.54f, 0.00f },
2049 { 0.11F, 0.56F, 1.00F }, 2543 { 0.11f, 0.56f, 1.00f },
2050 { 0.93F, 0.46F, 0.00F }, 2544 { 0.93f, 0.46f, 0.00f },
2051 { 0.18F, 0.54F, 0.34F }, 2545 { 0.18f, 0.54f, 0.34f },
2052 2546
2053 { 0.56F, 0.73F, 0.56F }, 2547 { 0.56f, 0.73f, 0.56f },
2054 { 0.80F, 0.80F, 0.80F }, 2548 { 0.80f, 0.80f, 0.80f },
2055 { 0.55F, 0.41F, 0.13F }, 2549 { 0.55f, 0.41f, 0.13f },
2056 { 0.99F, 0.77F, 0.26F }, 2550 { 0.99f, 0.77f, 0.26f },
2057 2551
2058 { 0.74F, 0.65F, 0.41F }, 2552 { 0.74f, 0.65f, 0.41f },
2059 2553
2060 { 0.00F, 1.00F, 1.00F }, 2554 { 0.00f, 1.00f, 1.00f },
2061 { 1.00F, 0.00F, 1.00F }, 2555 { 1.00f, 0.00f, 1.00f },
2062 { 1.00F, 1.00F, 0.00F }, 2556 { 1.00f, 1.00f, 0.00f },
2063 }; 2557 };
2064 2558
2065 int x, y; 2559 int x, y;
2066 2560
2067 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 */
2068 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2568 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2069 glEnable (GL_BLEND); 2569 glEnable (GL_BLEND);
2070 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2570 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2071 glBegin (GL_QUADS); 2571 glBegin (GL_QUADS);
2072 2572
2073 for (y = 0; y < h; y++) 2573 for (y = 0; y < h; y++)
… …
2077 2577
2078 if (m) 2578 if (m)
2079 { 2579 {
2080 float *c = color [m & 15]; 2580 float *c = color [m & 15];
2081 2581
2082 float tx1 = m & 0x40 ? 0.5 : 0.; 2582 float tx1 = m & 0x40 ? 0.5f : 0.f;
2083 float tx2 = tx1 + 0.5; 2583 float tx2 = tx1 + 0.5f;
2084 2584
2085 glColor4f (c[0], c[1], c[2], 0.75); 2585 glColor4f (c[0], c[1], c[2], 1);
2086 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2586 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2087 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2587 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2088 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2588 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2089 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2589 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2090 } 2590 }
… …
2094 glDisable (GL_BLEND); 2594 glDisable (GL_BLEND);
2095 glDisable (GL_TEXTURE_2D); 2595 glDisable (GL_TEXTURE_2D);
2096} 2596}
2097 2597
2098void 2598void
2099fow_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)
2100 PPCODE: 2600 PPCODE:
2101{ 2601{
2102 int x, y; 2602 int x, y;
2103 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2104 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2105 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2106 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);
2107 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2108 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2610 memset (darkness1, 0, sw1*sh1);
2109 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2110 2611
2111 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2112 SvCUR_set (darkness3_sv, sw34 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2113 2614
2114 mx += self->x - 1; 2615 mx += self->x - 1;
2115 my += self->y - 1; 2616 my += self->y - 1;
2116
2117 memset (darkness1, 255, sw1 * sh1);
2118 2617
2119 for (y = 0; y < sh1; y++) 2618 for (y = 0; y < sh1; y++)
2120 if (0 <= y + my && y + my < self->rows) 2619 if (0 <= y + my && y + my < self->rows)
2121 { 2620 {
2122 maprow *row = self->row + (y + my); 2621 maprow *row = self->row + (y + my);
… …
2125 if (row->c0 <= x + mx && x + mx < row->c1) 2624 if (row->c0 <= x + mx && x + mx < row->c1)
2126 { 2625 {
2127 mapcell *cell = row->col + (x + mx - row->c0); 2626 mapcell *cell = row->col + (x + mx - row->c0);
2128 2627
2129 darkness1 [y * sw1 + x] = cell->darkness 2628 darkness1 [y * sw1 + x] = cell->darkness
2130 ? 255 - (cell->darkness - 1) 2629 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2131 : 255 - FOW_DARKNESS; 2630 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2132 } 2631 }
2133 } 2632 }
2134 2633
2135 for (y = 0; y < sh; ++y) 2634 for (y = 0; y < sh; ++y)
2136 for (x = 0; x < sw; ++x) 2635 for (x = 0; x < sw; ++x)
… …
2155 2654
2156 uint8_t r13 = (d13 + d23 + d12) / 3; 2655 uint8_t r13 = (d13 + d23 + d12) / 3;
2157 uint8_t r23 = d23; 2656 uint8_t r23 = d23;
2158 uint8_t r33 = (d23 + d33 + d32) / 3; 2657 uint8_t r33 = (d23 + d33 + d32) / 3;
2159 2658
2160 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2659 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2161 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2660 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2162 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2661 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2163 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2662 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2164 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 */
2165 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2664 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2166 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2665 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2167 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2666 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2168 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2667 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2169 } 2668 }
2170 2669
2171 free (darkness1); 2670 free (darkness1);
2172 2671
2173 EXTEND (SP, 3); 2672 EXTEND (SP, 3);
2174 PUSHs (sv_2mortal (newSViv (sw34))); 2673 PUSHs (sv_2mortal (newSViv (sw3)));
2175 PUSHs (sv_2mortal (newSViv (sh3))); 2674 PUSHs (sv_2mortal (newSViv (sh3)));
2176 PUSHs (darkness3_sv); 2675 PUSHs (darkness3_sv);
2177} 2676}
2178 2677
2179SV * 2678SV *
2180get_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)
2181 CODE: 2680 CODE:
2182{ 2681{
2183 int x, y, x1, y1; 2682 int x, y, x1, y1;
2184 SV *data_sv = newSV (w * h * 7 + 5); 2683 SV *data_sv = newSV (w * h * 7 + 5);
2185 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2684 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2242 else 2741 else
2243 *data++ = 0; 2742 *data++ = 0;
2244 } 2743 }
2245 } 2744 }
2246 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 {
2247 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2248 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2751 }
2752
2249 RETVAL = data_sv; 2753 RETVAL = data_sv;
2250} 2754}
2251 OUTPUT: 2755 OUTPUT:
2252 RETVAL 2756 RETVAL
2253 2757
2254void 2758void
2255set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2759set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2256 PPCODE: 2760 PPCODE:
2257{ 2761{
2258 int x, y, z; 2762 int x, y, z;
2259 int w, h; 2763 int w, h;
2260 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;
2261 2775
2262 if (*data++ != 0) 2776 if (*data++ != 0)
2263 XSRETURN_EMPTY; /* version mismatch */ 2777 XSRETURN_EMPTY; /* version mismatch */
2264 2778
2265 w = *data++ << 8; w |= *data++; 2779 w = *data++ << 8; w |= *data++;
… …
2280 { 2794 {
2281 maprow *row = map_get_row (self, y); 2795 maprow *row = map_get_row (self, y);
2282 2796
2283 for (x = x0; x < x1; x++) 2797 for (x = x0; x < x1; x++)
2284 { 2798 {
2799 uint8_t flags;
2800
2801 if (data + 7 >= end)
2802 XSRETURN_EMPTY;
2803
2285 uint8_t flags = *data++; 2804 flags = *data++;
2286 2805
2287 if (flags) 2806 if (flags)
2288 { 2807 {
2289 mapcell *cell = row_get_cell (row, x); 2808 mapcell *cell = row_get_cell (row, x);
2290 tileid tile[3] = { 0, 0, 0 }; 2809 tileid tile[3] = { 0, 0, 0 };
… …
2293 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2812 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2294 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2813 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2295 2814
2296 if (cell->darkness == 0) 2815 if (cell->darkness == 0)
2297 { 2816 {
2298 cell->darkness = 0; 2817 /*cell->darkness = 0;*/
2818 EXTEND (SP, 3);
2299 2819
2300 for (z = 0; z <= 2; z++) 2820 for (z = 0; z <= 2; z++)
2301 { 2821 {
2302 tileid t = tile [z]; 2822 tileid t = tile [z];
2303 2823
2304 if (t >= self->texs || (t && !self->tex [t].name)) 2824 if (t >= self->texs || (t && !self->tex [t].name))
2305 { 2825 {
2306 XPUSHs (sv_2mortal (newSViv (t))); 2826 PUSHs (sv_2mortal (newSViv (t)));
2307 need_texid (self, t); 2827 need_texid (self, t);
2308 } 2828 }
2309 2829
2310 cell->tile [z] = t; 2830 cell->tile [z] = t;
2311 } 2831 }
… …
2313 } 2833 }
2314 } 2834 }
2315 } 2835 }
2316} 2836}
2317 2837
2318MODULE = CFPlus PACKAGE = CFPlus::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2319 2839
2320CFPlus::RW 2840DC::RW
2321new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2322 CODE: 2842 CODE:
2323{ 2843{
2324 STRLEN datalen; 2844 STRLEN datalen;
2325 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2326 2846
2327 RETVAL = SDL_RWFromConstMem (data, datalen); 2847 RETVAL = SDL_RWFromConstMem (data, datalen);
2328} 2848}
2329 OUTPUT: 2849 OUTPUT:
2330 RETVAL 2850 RETVAL
2331 2851
2332CFPlus::RW 2852DC::RW
2333new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2334 CODE: 2854 CODE:
2335 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2336 OUTPUT: 2856 OUTPUT:
2337 RETVAL 2857 RETVAL
2338 2858
2339# fails on win32: 2859# fails on win32:
2340# CFPlus.xs(2268) : error C2059: syntax error : '(' 2860# dc.xs(2268) : error C2059: syntax error : '('
2341#void 2861#void
2342#close (CFPlus::RW self) 2862#close (DC::RW self)
2343# CODE: 2863# CODE:
2344# (self->(close)) (self); 2864# (self->(close)) (self);
2345 2865
2346MODULE = CFPlus PACKAGE = CFPlus::Channel 2866MODULE = Deliantra::Client PACKAGE = DC::Channel
2347 2867
2348PROTOTYPES: DISABLE 2868PROTOTYPES: DISABLE
2349 2869
2350CFPlus::Channel 2870DC::Channel
2351find () 2871find ()
2352 CODE: 2872 CODE:
2353{ 2873{
2354 RETVAL = Mix_GroupAvailable (-1); 2874 RETVAL = Mix_GroupAvailable (-1);
2355 2875
2356 if (RETVAL < 0) 2876 if (RETVAL < 0)
2357 { 2877 {
2358 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2359 2879
2360 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)
2361 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2362 2887 }
2888 else
2363 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2364 } 2890 }
2365 2891
2366 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2367 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2368} 2894}
2369 OUTPUT: 2895 OUTPUT:
2370 RETVAL 2896 RETVAL
2371 2897
2372void 2898void
2373halt (CFPlus::Channel self) 2899halt (DC::Channel self)
2374 CODE: 2900 CODE:
2375 Mix_HaltChannel (self); 2901 Mix_HaltChannel (self);
2376 2902
2377void 2903void
2378expire (CFPlus::Channel self, int ticks = -1) 2904expire (DC::Channel self, int ticks = -1)
2379 CODE: 2905 CODE:
2380 Mix_ExpireChannel (self, ticks); 2906 Mix_ExpireChannel (self, ticks);
2381 2907
2382void 2908void
2383fade_out (CFPlus::Channel self, int ticks = -1) 2909fade_out (DC::Channel self, int ticks = -1)
2384 CODE: 2910 CODE:
2385 Mix_FadeOutChannel (self, ticks); 2911 Mix_FadeOutChannel (self, ticks);
2386 2912
2387int 2913int
2388volume (CFPlus::Channel self, int volume) 2914volume (DC::Channel self, int volume)
2389 CODE: 2915 CODE:
2390 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2916 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391 OUTPUT: 2917 OUTPUT:
2392 RETVAL 2918 RETVAL
2393 2919
2394void 2920void
2395unregister_all_effects (CFPlus::Channel self) 2921unregister_all_effects (DC::Channel self)
2396 CODE: 2922 CODE:
2397 Mix_UnregisterAllEffects (self); 2923 Mix_UnregisterAllEffects (self);
2398 2924
2399void 2925void
2400set_panning (CFPlus::Channel self, int left, int right) 2926set_panning (DC::Channel self, int left, int right)
2401 CODE: 2927 CODE:
2402 left = CLAMP (left , 0, 255); 2928 left = CLAMP (left , 0, 255);
2403 right = CLAMP (right, 0, 255); 2929 right = CLAMP (right, 0, 255);
2404 Mix_SetPanning (self, left, right); 2930 Mix_SetPanning (self, left, right);
2405 2931
2406void 2932void
2407set_distance (CFPlus::Channel self, int distance) 2933set_distance (DC::Channel self, int distance)
2408 CODE: 2934 CODE:
2409 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2935 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410 2936
2411void 2937void
2412set_position (CFPlus::Channel self, int angle, int distance) 2938set_position (DC::Channel self, int angle, int distance)
2413 CODE: 2939 CODE:
2414 2940
2415void 2941void
2416set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2942set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417 CODE: 2943 CODE:
2418{ 2944{
2419 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2945 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2420 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2946 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2421 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2947 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422} 2948}
2423 2949
2424void 2950void
2425set_reverse_stereo (CFPlus::Channel self, int flip) 2951set_reverse_stereo (DC::Channel self, int flip)
2426 CODE: 2952 CODE:
2427 Mix_SetReverseStereo (self, flip); 2953 Mix_SetReverseStereo (self, flip);
2428 2954
2429MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430 2956
2431PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2432 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
2433CFPlus::MixChunk 2971DC::MixChunk
2434new (SV *class, CFPlus::RW rwops) 2972new (SV *klass, DC::RW rwops)
2435 CODE: 2973 CODE:
2436 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437 OUTPUT: 2975 OUTPUT:
2438 RETVAL 2976 RETVAL
2439 2977
2440void 2978void
2441DESTROY (CFPlus::MixChunk self) 2979DESTROY (DC::MixChunk self)
2442 CODE: 2980 CODE:
2443 Mix_FreeChunk (self); 2981 Mix_FreeChunk (self);
2444 2982
2445int 2983int
2446volume (CFPlus::MixChunk self, int volume = -1) 2984volume (DC::MixChunk self, int volume = -1)
2447 CODE: 2985 CODE:
2448 if (items > 1) 2986 if (items > 1)
2449 volume = CLAMP (volume, 0, 128); 2987 volume = CLAMP (volume, 0, 128);
2450 RETVAL = Mix_VolumeChunk (self, volume); 2988 RETVAL = Mix_VolumeChunk (self, volume);
2451 OUTPUT: 2989 OUTPUT:
2452 RETVAL 2990 RETVAL
2453 2991
2454CFPlus::Channel 2992DC::Channel
2455play (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)
2456 CODE: 2994 CODE:
2457{ 2995{
2458 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2996 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459 2997
2460 if (RETVAL < 0) 2998 if (RETVAL < 0)
… …
2467 } 3005 }
2468} 3006}
2469 OUTPUT: 3007 OUTPUT:
2470 RETVAL 3008 RETVAL
2471 3009
2472MODULE = 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
2473 3023
2474int 3024int
2475volume (int volume = -1) 3025volume (int volume = -1)
2476 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2477 CODE: 3027 CODE:
… …
2489void 3039void
2490halt () 3040halt ()
2491 CODE: 3041 CODE:
2492 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2493 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2494CFPlus::MixMusic 3051DC::MixMusic
2495new (SV *class, CFPlus::RW rwops) 3052new (SV *klass, DC::RW rwops)
2496 CODE: 3053 CODE:
2497 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2498 OUTPUT: 3055 OUTPUT:
2499 RETVAL 3056 RETVAL
2500 3057
2501void 3058void
2502DESTROY (CFPlus::MixMusic self) 3059DESTROY (DC::MixMusic self)
2503 CODE: 3060 CODE:
2504 Mix_FreeMusic (self); 3061 Mix_FreeMusic (self);
2505 3062
2506int 3063int
2507play (CFPlus::MixMusic self, int loops = -1) 3064play (DC::MixMusic self, int loops = -1)
2508 CODE: 3065 CODE:
2509 RETVAL = Mix_PlayMusic (self, loops); 3066 RETVAL = Mix_PlayMusic (self, loops);
2510 OUTPUT: 3067 OUTPUT:
2511 RETVAL 3068 RETVAL
2512 3069
2513void 3070void
2514fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3071fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515 CODE: 3072 CODE:
2516 Mix_FadeInMusicPos (self, loops, ms, position); 3073 Mix_FadeInMusicPos (self, loops, ms, position);
2517 3074
2518MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3075MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519 3076
2520PROTOTYPES: ENABLE 3077PROTOTYPES: ENABLE
2521 3078
2522BOOT: 3079BOOT:
2523{ 3080{
2524 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3081 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525 static const struct { 3082 static const struct {
2526 const char *name; 3083 const char *name;
2527 IV iv; 3084 IV iv;
2528 } *civ, const_iv[] = { 3085 } *civ, const_iv[] = {
2529# define const_iv(name) { # name, (IV)name } 3086# define const_iv(name) { # name, (IV)name }
2530 const_iv (GL_VENDOR), 3087 const_iv (GL_VENDOR),
2531 const_iv (GL_VERSION), 3088 const_iv (GL_VERSION),
2532 const_iv (GL_EXTENSIONS), 3089 const_iv (GL_EXTENSIONS),
3090 const_iv (GL_MAX_TEXTURE_UNITS),
2533 const_iv (GL_COLOR_MATERIAL), 3091 const_iv (GL_COLOR_MATERIAL),
2534 const_iv (GL_SMOOTH), 3092 const_iv (GL_SMOOTH),
2535 const_iv (GL_FLAT), 3093 const_iv (GL_FLAT),
2536 const_iv (GL_DITHER), 3094 const_iv (GL_DITHER),
2537 const_iv (GL_BLEND), 3095 const_iv (GL_BLEND),
… …
2549 const_iv (GL_ZERO), 3107 const_iv (GL_ZERO),
2550 const_iv (GL_SRC_ALPHA), 3108 const_iv (GL_SRC_ALPHA),
2551 const_iv (GL_DST_ALPHA), 3109 const_iv (GL_DST_ALPHA),
2552 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3110 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2553 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),
2554 const_iv (GL_SRC_ALPHA_SATURATE), 3116 const_iv (GL_SRC_ALPHA_SATURATE),
2555 const_iv (GL_RGB), 3117 const_iv (GL_RGB),
2556 const_iv (GL_RGBA), 3118 const_iv (GL_RGBA),
2557 const_iv (GL_RGBA4), 3119 const_iv (GL_RGBA4),
2558 const_iv (GL_RGBA8), 3120 const_iv (GL_RGBA8),
… …
2626 const_iv (GL_NICEST), 3188 const_iv (GL_NICEST),
2627 const_iv (GL_V2F), 3189 const_iv (GL_V2F),
2628 const_iv (GL_V3F), 3190 const_iv (GL_V3F),
2629 const_iv (GL_T2F_V3F), 3191 const_iv (GL_T2F_V3F),
2630 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),
2631# undef const_iv 3196# undef const_iv
2632 }; 3197 };
2633 3198
2634 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--)
2635 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2636 3201
2637 texture_av = newAV (); 3202 texture_av = newAV ();
2638 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
2639} 3204}
2640 3205
… …
2642disable_GL_EXT_blend_func_separate () 3207disable_GL_EXT_blend_func_separate ()
2643 CODE: 3208 CODE:
2644 gl.BlendFuncSeparate = 0; 3209 gl.BlendFuncSeparate = 0;
2645 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
2646 3211
2647char * 3212void
3213apple_nvidia_bug (int enable)
3214
3215const char *
2648gl_vendor () 3216gl_vendor ()
2649 CODE: 3217 CODE:
2650 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
2651 OUTPUT: 3219 OUTPUT:
2652 RETVAL 3220 RETVAL
2653 3221
2654char * 3222const char *
2655gl_version () 3223gl_version ()
2656 CODE: 3224 CODE:
2657 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
2658 OUTPUT: 3226 OUTPUT:
2659 RETVAL 3227 RETVAL
2660 3228
2661char * 3229const char *
2662gl_extensions () 3230gl_extensions ()
2663 CODE: 3231 CODE:
2664 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2665 OUTPUT: 3233 OUTPUT:
2666 RETVAL 3234 RETVAL
2667 3235
2668const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
2669 3241
2670GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
2671 CODE: 3243 CODE:
2672 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
2673 OUTPUT: 3245 OUTPUT:
… …
2681 3253
2682int glGetError () 3254int glGetError ()
2683 3255
2684void glFinish () 3256void glFinish ()
2685 3257
3258void glFlush ()
3259
2686void glClear (int mask) 3260void glClear (int mask)
2687 3261
2688void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
2689 PROTOTYPE: @ 3263 PROTOTYPE: @
2690 3264
… …
2699void glBlendFunc (int sfactor, int dfactor) 3273void glBlendFunc (int sfactor, int dfactor)
2700 3274
2701void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3275void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2702 CODE: 3276 CODE:
2703 gl_BlendFuncSeparate (sa, da, saa, daa); 3277 gl_BlendFuncSeparate (sa, da, saa, daa);
3278
3279# void glBlendEquation (int se)
2704 3280
2705void glDepthMask (int flag) 3281void glDepthMask (int flag)
2706 3282
2707void glLogicOp (int opcode) 3283void glLogicOp (int opcode)
2708 3284
… …
2743void glRotate (float angle, float x, float y, float z) 3319void glRotate (float angle, float x, float y, float z)
2744 CODE: 3320 CODE:
2745 glRotatef (angle, x, y, z); 3321 glRotatef (angle, x, y, z);
2746 3322
2747void 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: @
2748 ALIAS: 3325 ALIAS:
2749 glColor_premultiply = 1 3326 glColor_premultiply = 1
2750 CODE: 3327 CODE:
2751 if (ix) 3328 if (ix)
2752 { 3329 {
… …
2822void 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)
2823 CODE: 3400 CODE:
2824 if (gl.SeparableFilter2D) 3401 if (gl.SeparableFilter2D)
2825 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3402 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826 3403
2827void 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)
2828 3405
2829void 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)
2830 3407
2831void glDrawPixels (int width, int height, int format, int type, char *pixels) 3408void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832 3409
… …
2858 3435
2859void glEndList () 3436void glEndList ()
2860 3437
2861void glCallList (int list) 3438void glCallList (int list)
2862 3439
2863MODULE = 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
2864 3446
2865PROTOTYPES: DISABLE 3447PROTOTYPES: DISABLE
2866 3448
2867void 3449void
2868find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
2869 PPCODE: 3451 PPCODE:
2870{ 3452{
2871 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
2872 XPUSHs (self); 3454 XPUSHs (self);
2873} 3455}
2874 3456
2875BOOT: 3457BOOT:
2876{ 3458{
2877 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3459 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878 3460
2879 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);
2880 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);
2881 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);
2882 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);
2883} 3465}
2884 3466
2885void 3467void
2886draw (SV *self) 3468draw (SV *self)
2887 CODE: 3469 CODE:
2888{ 3470{
2889 HV *hv; 3471 HV *hv;
2890 SV **svp; 3472 SV **svp;
2891 NV x, y, w, h; 3473 NV x, y, w, h;
2892 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
2893 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
2894 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
2895 SV *draw_h_sv = GvSV (draw_h_gv); 3477 SV *draw_h_sv = GvSV (draw_h_gv);
2896 double draw_x, draw_y; 3478 double draw_x, draw_y;
2897 3479
2898 if (!SvROK (self)) 3480 if (!SvROK (self))
2899 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3481 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900 3482
2901 hv = (HV *)SvRV (self); 3483 hv = (HV *)SvRV (self);
2902 3484
2903 if (SvTYPE (hv) != SVt_PVHV) 3485 if (SvTYPE (hv) != SVt_PVHV)
2904 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3486 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905 3487
2906 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.;
2907 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.;
2908 3490
2909 if (!h || !w) 3491 if (!h || !w)

Diff Legend

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