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.225 by root, Sat Aug 11 12:07:54 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);
… …
203 257
204typedef uint16_t tileid; 258typedef uint16_t tileid;
205typedef uint16_t faceid; 259typedef uint16_t faceid;
206 260
207typedef struct { 261typedef struct {
208 int name; 262 GLuint name;
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{
… …
440 n |= n >> 16; 528 n |= n >> 16;
441 529
442 return n + 1; 530 return n + 1;
443} 531}
444 532
533static unsigned int
534popcount (unsigned int n)
535{
536 n -= (n >> 1) & 0x55555555U;
537 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
538 n = ((n >> 4) + n) & 0x0f0f0f0fU;
539 n *= 0x01010101U;
540
541 return n >> 24;
542}
543
445/* SDL should provide this, really. */ 544/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 545#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 546#define SDLK_MODIFIER_MAX 314
448 547
449/******************************************************************************/ 548/******************************************************************************/
… …
487 return 0; 586 return 0;
488 587
489 return 1; 588 return 1;
490} 589}
491 590
492MODULE = 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
493 650
494PROTOTYPES: ENABLE 651PROTOTYPES: ENABLE
495 652
496BOOT: 653BOOT:
497{ 654{
498 HV *stash = gv_stashpv ("CFPlus", 1); 655 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 656 static const struct {
500 const char *name; 657 const char *name;
501 IV iv; 658 IV iv;
502 } *civ, const_iv[] = { 659 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 660# define const_iv(name) { # name, (IV)name }
… …
525 682
526 const_iv (SDL_APPINPUTFOCUS), 683 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 684 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 685 const_iv (SDL_APPACTIVE),
529 686
687
688 const_iv (SDLK_UNKNOWN),
689 const_iv (SDLK_FIRST),
690 const_iv (SDLK_BACKSPACE),
691 const_iv (SDLK_TAB),
692 const_iv (SDLK_CLEAR),
693 const_iv (SDLK_RETURN),
694 const_iv (SDLK_PAUSE),
695 const_iv (SDLK_ESCAPE),
696 const_iv (SDLK_SPACE),
697 const_iv (SDLK_EXCLAIM),
698 const_iv (SDLK_QUOTEDBL),
699 const_iv (SDLK_HASH),
700 const_iv (SDLK_DOLLAR),
701 const_iv (SDLK_AMPERSAND),
702 const_iv (SDLK_QUOTE),
703 const_iv (SDLK_LEFTPAREN),
704 const_iv (SDLK_RIGHTPAREN),
705 const_iv (SDLK_ASTERISK),
706 const_iv (SDLK_PLUS),
707 const_iv (SDLK_COMMA),
708 const_iv (SDLK_MINUS),
709 const_iv (SDLK_PERIOD),
710 const_iv (SDLK_SLASH),
711 const_iv (SDLK_0),
712 const_iv (SDLK_1),
713 const_iv (SDLK_2),
714 const_iv (SDLK_3),
715 const_iv (SDLK_4),
716 const_iv (SDLK_5),
717 const_iv (SDLK_6),
718 const_iv (SDLK_7),
719 const_iv (SDLK_8),
720 const_iv (SDLK_9),
721 const_iv (SDLK_COLON),
722 const_iv (SDLK_SEMICOLON),
723 const_iv (SDLK_LESS),
724 const_iv (SDLK_EQUALS),
725 const_iv (SDLK_GREATER),
726 const_iv (SDLK_QUESTION),
727 const_iv (SDLK_AT),
728
729 const_iv (SDLK_LEFTBRACKET),
730 const_iv (SDLK_BACKSLASH),
731 const_iv (SDLK_RIGHTBRACKET),
732 const_iv (SDLK_CARET),
733 const_iv (SDLK_UNDERSCORE),
734 const_iv (SDLK_BACKQUOTE),
735 const_iv (SDLK_DELETE),
736
737 const_iv (SDLK_FIRST),
738 const_iv (SDLK_LAST),
530 const_iv (SDLK_KP0), 739 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 740 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 741 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 742 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 743 const_iv (SDLK_KP4),
… …
606 const_iv (KMOD_LMETA), 815 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 816 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 817 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 818 const_iv (KMOD_CAPS),
610 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)
611# undef const_iv 853# undef const_iv
612 }; 854 };
613 855
614 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--)
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
616 858
617 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
618 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
619} 861}
620 862
… …
632 RETVAL 874 RETVAL
633 875
634NV floor (NV x) 876NV floor (NV x)
635 877
636NV ceil (NV x) 878NV ceil (NV x)
879
880IV minpot (UV n)
881
882IV popcount (UV n)
883
884NV distance (NV dx, NV dy)
885 CODE:
886 RETVAL = pow (dx * dx + dy * dy, 0.5);
887 OUTPUT:
888 RETVAL
637 889
638void 890void
639pango_init () 891pango_init ()
640 CODE: 892 CODE:
641{ 893{
642 opengl_fontmap = pango_opengl_font_map_new (); 894 opengl_fontmap = pango_opengl_font_map_new ();
643 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);
644 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
645} 902}
646 903
647char *
648SDL_GetError () 904char *SDL_GetError ()
649 905
650int 906void SDL_main_hack (SV *real_main)
651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 907 PROTOTYPE: &
652 908
653void 909int SDL_Init (U32 flags)
910
911int SDL_InitSubSystem (U32 flags)
912
913void SDL_QuitSubSystem (U32 flags)
914
654SDL_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
655 926
656void 927void
657SDL_ListModes (int rgb, int alpha) 928SDL_ListModes (int rgb, int alpha)
658 PPCODE: 929 PPCODE:
659{ 930{
… …
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 942 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 943 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 944 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674 945
675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 946 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
676#if SDL_VERSION_ATLEAST(1,2,10)
677 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
678 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 947 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679#endif
680 948
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 949 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 950
683 if (m && m != (SDL_Rect **)-1) 951 if (m && m != (SDL_Rect **)-1)
684 while (*m) 952 while (*m)
685 { 953 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 954 if ((*m)->w >= 400 && (*m)->h >= 300)
687 { 955 {
688 AV *av = newAV (); 956 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 957 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 958 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 959 av_push (av, newSViv (rgb));
… …
714 ); 982 );
715 983
716 if (RETVAL) 984 if (RETVAL)
717 { 985 {
718 av_clear (texture_av); 986 av_clear (texture_av);
719
720 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
721#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);
722#include "glfunc.h" 988#include "glfunc.h"
723#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
724 } 992 }
725} 993}
726 OUTPUT: 994 OUTPUT:
727 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
728 999
729void 1000void
730SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
731 1002
732char * 1003char *
733SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
734 1006
735int 1007int
736SDL_GetAppState () 1008SDL_GetAppState ()
737 1009
1010int
1011SDL_GetModState ()
1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
738void 1017void
1018SDL_PumpEvents ()
1019
1020void
739poll_events () 1021peep_events ()
740 PPCODE: 1022 PPCODE:
741{ 1023{
742 SDL_Event ev; 1024 SDL_Event ev;
743 1025
744 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
… …
751 { 1033 {
752 case SDL_KEYDOWN: 1034 case SDL_KEYDOWN:
753 case SDL_KEYUP: 1035 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1036 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1037 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 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);
757 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 */
758 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1040 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 1041 break;
760 1042
761 case SDL_ACTIVEEVENT: 1043 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1044 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
780 x = ev.motion.x; 1062 x = ev.motion.x;
781 y = ev.motion.y; 1063 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1064 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 1065 }
784 1066
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1067 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 1068 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 1069 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 1070 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1071 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1072 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 1073 }
792 break; 1074 break;
793 1075
794 case SDL_MOUSEBUTTONDOWN: 1076 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 1077 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1078 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 1079
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1080 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1081 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1082 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1083 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1088 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1089 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 1090 break;
809 } 1091 }
810 1092
811 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))));
812 } 1094 }
813} 1095}
814 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
815int 1110int
816Mix_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)
817 POSTCALL: 1112 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
819 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}
820 1131
821void 1132void
822Mix_CloseAudio () 1133Mix_CloseAudio ()
823 1134
824int 1135int
… …
859 } 1170 }
860 } 1171 }
861#endif 1172#endif
862} 1173}
863 1174
864void 1175int
865add_font (char *file) 1176add_font (char *file)
866 CODE: 1177 CODE:
867 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)
868 1188
869void 1189void
870load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
871 ALIAS: 1191 ALIAS:
872 load_image_file = 1 1192 load_image_file = 1
… …
918 1238
919 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
920 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
921 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
922 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
923 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
924 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)));
925 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
926 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
927 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
928 1248
… …
958void 1278void
959error (char *message) 1279error (char *message)
960 CODE: 1280 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1281 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1282#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1283 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1284#endif
965 1285
966void 1286void
967fatal (char *message) 1287fatal (char *message)
968 CODE: 1288 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1289 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1290#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1291 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1292#endif
973 _exit (1); 1293 _exit (1);
974 1294
975void 1295void
976_exit (int retval = 0) 1296_exit (int retval = 0)
… …
988#if DEBUG 1308#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1309 VALGRIND_DO_LEAK_CHECK;
990#endif 1310#endif
991} 1311}
992 1312
993MODULE = 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
994 1321
995PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
996 1323
997CFPlus::Font 1324DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
999 CODE: 1326 CODE:
1000{ 1327{
1001 int count; 1328 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1003 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
1005} 1332}
1006 OUTPUT: 1333 OUTPUT:
1007 RETVAL 1334 RETVAL
1008 1335
1009void 1336void
1010DESTROY (CFPlus::Font self) 1337DESTROY (DC::Font self)
1011 CODE: 1338 CODE:
1012 pango_font_description_free (self); 1339 pango_font_description_free (self);
1013 1340
1014void 1341void
1015make_default (CFPlus::Font self) 1342make_default (DC::Font self)
1016 PROTOTYPE: $ 1343 PROTOTYPE: $
1017 CODE: 1344 CODE:
1018 default_font = self; 1345 default_font = self;
1019 1346
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1347MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1348
1022PROTOTYPES: DISABLE 1349PROTOTYPES: DISABLE
1023 1350
1024void 1351void
1025reset_glyph_cache () 1352glyph_cache_backup ()
1026 PROTOTYPE: 1353 PROTOTYPE:
1027 CODE: 1354 CODE:
1355 tc_backup ();
1356
1357void
1358glyph_cache_restore ()
1359 PROTOTYPE:
1360 CODE:
1028 tc_clear (); 1361 tc_restore ();
1029 1362
1030CFPlus::Layout 1363DC::Layout
1031new (SV *class) 1364new (SV *klass)
1032 CODE: 1365 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1034 1367
1035 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
… …
1045 layout_update_font (RETVAL); 1378 layout_update_font (RETVAL);
1046 OUTPUT: 1379 OUTPUT:
1047 RETVAL 1380 RETVAL
1048 1381
1049void 1382void
1050DESTROY (CFPlus::Layout self) 1383DESTROY (DC::Layout self)
1051 CODE: 1384 CODE:
1052 g_object_unref (self->pl); 1385 g_object_unref (self->pl);
1053 rc_free (self->rc); 1386 rc_free (self->rc);
1054 Safefree (self); 1387 Safefree (self);
1055 1388
1056void 1389void
1057set_text (CFPlus::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1058 CODE: 1391 CODE:
1059{ 1392{
1060 STRLEN textlen; 1393 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1394 char *text = SvPVutf8 (text_, textlen);
1062 1395
1063 pango_layout_set_text (self->pl, text, textlen); 1396 pango_layout_set_text (self->pl, text, textlen);
1064} 1397}
1065 1398
1066void 1399void
1067set_markup (CFPlus::Layout self, SV *text_) 1400set_markup (DC::Layout self, SV *text_)
1068 CODE: 1401 CODE:
1069{ 1402{
1070 STRLEN textlen; 1403 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1404 char *text = SvPVutf8 (text_, textlen);
1072 1405
1073 pango_layout_set_markup (self->pl, text, textlen); 1406 pango_layout_set_markup (self->pl, text, textlen);
1074} 1407}
1075 1408
1076void 1409void
1077set_shapes (CFPlus::Layout self, ...) 1410set_shapes (DC::Layout self, ...)
1078 CODE: 1411 CODE:
1079{ 1412{
1080 PangoAttrList *attrs = 0; 1413 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1414 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1415 const char *pos = text;
… …
1117 if (attrs) 1450 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1451 pango_layout_set_attributes (self->pl, attrs);
1119} 1452}
1120 1453
1121void 1454void
1122get_shapes (CFPlus::Layout self) 1455get_shapes (DC::Layout self)
1123 PPCODE: 1456 PPCODE:
1124{ 1457{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1458 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1459
1127 do 1460 do
1128 { 1461 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1462 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1463
1131 if (run && shape_attr_p (run)) 1464 if (run && shape_attr_p (run))
1132 { 1465 {
1133 PangoRectangle extents; 1466 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1467 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1142 1475
1143 pango_layout_iter_free (iter); 1476 pango_layout_iter_free (iter);
1144} 1477}
1145 1478
1146int 1479int
1147has_wrapped (CFPlus::Layout self) 1480has_wrapped (DC::Layout self)
1148 CODE: 1481 CODE:
1149{ 1482{
1150 int lines = 1; 1483 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1484 const char *text = pango_layout_get_text (self->pl);
1152 1485
… …
1157} 1490}
1158 OUTPUT: 1491 OUTPUT:
1159 RETVAL 1492 RETVAL
1160 1493
1161SV * 1494SV *
1162get_text (CFPlus::Layout self) 1495get_text (DC::Layout self)
1163 CODE: 1496 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1497 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1498 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1499 OUTPUT:
1167 RETVAL 1500 RETVAL
1168 1501
1169void 1502void
1170set_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.)
1171 CODE: 1504 CODE:
1172 self->r = r; 1505 self->r = r;
1173 self->g = g; 1506 self->g = g;
1174 self->b = b; 1507 self->b = b;
1175 self->a = a; 1508 self->a = a;
1176 1509
1177void 1510void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1511set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1512 CODE:
1180 if (self->font != font) 1513 if (self->font != font)
1181 { 1514 {
1182 self->font = font; 1515 self->font = font;
1183 layout_update_font (self); 1516 layout_update_font (self);
1184 } 1517 }
1185 1518
1186void 1519void
1187set_height (CFPlus::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1188 CODE: 1521 CODE:
1189 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1190 { 1523 {
1191 self->base_height = base_height; 1524 self->base_height = base_height;
1192 layout_update_font (self); 1525 layout_update_font (self);
1193 } 1526 }
1194 1527
1195void 1528void
1196set_width (CFPlus::Layout self, int max_width = -1) 1529set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1530 CODE:
1198 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);
1199 1532
1200void 1533void
1201set_indent (CFPlus::Layout self, int indent) 1534set_indent (DC::Layout self, int indent)
1202 CODE: 1535 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1536 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1537
1205void 1538void
1206set_spacing (CFPlus::Layout self, int spacing) 1539set_spacing (DC::Layout self, int spacing)
1207 CODE: 1540 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1541 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1542
1210void 1543void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1544set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1545 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1546 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1547 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1548 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1549 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1550 : PANGO_ELLIPSIZE_NONE
1218 ); 1551 );
1219 1552
1220void 1553void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1554set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1555 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1556 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1557
1225void 1558void
1226size (CFPlus::Layout self) 1559size (DC::Layout self)
1227 PPCODE: 1560 PPCODE:
1228{ 1561{
1229 int w, h; 1562 int w, h;
1230 1563
1231 layout_get_pixel_size (self, &w, &h); 1564 layout_get_pixel_size (self, &w, &h);
… …
1234 PUSHs (sv_2mortal (newSViv (w))); 1567 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1568 PUSHs (sv_2mortal (newSViv (h)));
1236} 1569}
1237 1570
1238int 1571int
1239descent (CFPlus::Layout self) 1572descent (DC::Layout self)
1240 CODE: 1573 CODE:
1241{ 1574{
1242 PangoRectangle rect; 1575 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1576 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1577 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1578 RETVAL = PANGO_DESCENT (rect);
1246} 1579}
1247 OUTPUT: 1580 OUTPUT:
1248 RETVAL 1581 RETVAL
1249 1582
1250int 1583int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1584xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1585 CODE:
1253{ 1586{
1254 int index, trailing; 1587 int index, trailing;
1255 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);
1256 RETVAL = index + trailing; 1589 RETVAL = index + trailing;
1257} 1590}
1258 OUTPUT: 1591 OUTPUT:
1259 RETVAL 1592 RETVAL
1260 1593
1261void 1594void
1262cursor_pos (CFPlus::Layout self, int index) 1595cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1596 PPCODE:
1264{ 1597{
1265 PangoRectangle strong_pos; 1598 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1599 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1600
1268 EXTEND (SP, 3); 1601 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1602 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1603 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1604 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1605}
1273 1606
1274void 1607void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1608index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1609 PPCODE:
1277{ 1610{
1278 int line, x; 1611 int line, x;
1279 1612
1280 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)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1615 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1616 --line;
1617#endif
1283 EXTEND (SP, 2); 1618 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1619 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1620 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1621}
1287 1622
1288void 1623void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1624line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1625 PPCODE:
1291{ 1626{
1292 PangoLayoutLine *lp; 1627 PangoLayoutLine *lp;
1293 int index, trailing; 1628 int index, trailing;
1294 1629
1295 if (line < 0) 1630 if (line < 0)
1296 XSRETURN_EMPTY; 1631 XSRETURN_EMPTY;
1297 1632
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1633 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1634 XSRETURN_EMPTY; /* do better */
1300 1635
1301 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);
1302 1637
1303 EXTEND (SP, 2); 1638 EXTEND (SP, 2);
… …
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1644 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1645 }
1311} 1646}
1312 1647
1313void 1648void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1650 CODE:
1316 rc_clear (self->rc); 1651 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1318 self->pl, 1653 self->pl,
1319 self->rc, 1654 self->rc,
… …
1324 // we assume that context_change actually clears/frees stuff 1659 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1660 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1661 pango_layout_context_changed (self->pl);
1327 1662
1328void 1663void
1329draw (CFPlus::Layout self) 1664draw (DC::Layout self)
1330 CODE: 1665 CODE:
1331{ 1666{
1332 glEnable (GL_TEXTURE_2D); 1667 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1668 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1669 glEnable (GL_BLEND);
… …
1342 glDisable (GL_ALPHA_TEST); 1677 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1345} 1680}
1346 1681
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1682MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1683
1349PROTOTYPES: ENABLE 1684PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1685
1353void 1686void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1687pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1688 CODE:
1356{ 1689{
… …
1422 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1423 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1424 } 1757 }
1425} 1758}
1426 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
1427IV 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)
1428 CODE: 1882 CODE:
1429{ 1883{
1430 GLint width; 1884 GLint width;
1431 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);
… …
1433 RETVAL = width > 0; 1887 RETVAL = width > 0;
1434} 1888}
1435 OUTPUT: 1889 OUTPUT:
1436 RETVAL 1890 RETVAL
1437 1891
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1893
1440PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1441 1895
1442CFPlus::Map 1896DC::Map
1443new (SV *class) 1897new (SV *klass)
1444 CODE: 1898 CODE:
1445 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1900 RETVAL->x = 0;
1447 RETVAL->y = 0; 1901 RETVAL->y = 0;
1448 RETVAL->w = 0; 1902 RETVAL->w = 0;
… …
1455 RETVAL->row = 0; 1909 RETVAL->row = 0;
1456 OUTPUT: 1910 OUTPUT:
1457 RETVAL 1911 RETVAL
1458 1912
1459void 1913void
1460DESTROY (CFPlus::Map self) 1914DESTROY (DC::Map self)
1461 CODE: 1915 CODE:
1462{ 1916{
1463 map_clear (self); 1917 map_clear (self);
1464 Safefree (self->face2tile); 1918 Safefree (self->face2tile);
1465 Safefree (self->tex); 1919 Safefree (self->tex);
1466 Safefree (self); 1920 Safefree (self);
1467} 1921}
1468 1922
1469void 1923void
1470resize (CFPlus::Map self, int map_width, int map_height) 1924resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1925 CODE:
1472 self->w = map_width; 1926 self->w = map_width;
1473 self->h = map_height; 1927 self->h = map_height;
1474 1928
1475void 1929void
1476clear (CFPlus::Map self) 1930clear (DC::Map self)
1477 CODE: 1931 CODE:
1478 map_clear (self); 1932 map_clear (self);
1479 1933
1480void 1934void
1481set_tileid (CFPlus::Map self, int face, int tile) 1935set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1936 CODE:
1483{ 1937{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1938 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1939 need_texid (self, tile);
1486} 1940}
1487 1941
1488void 1942void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1944 CODE:
1491{ 1945{
1492 tileid texid; 1946 tileid texid;
1493 maptex *tex; 1947 maptex *tex;
1494 1948
1495 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1496 return; 1950 return;
1497 1951
1498 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1499 return; 1953 return;
1500 1954
1501 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1502 1956
1503 if (!texid) 1957 if (!texid)
1504 return; 1958 return;
1505 1959
1506 tex = self->tex + texid; 1960 tex = self->tex + texid;
1507 tex->smoothtile = self->face2tile [smooth]; 1961 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1962 tex->smoothlevel = level;
1509} 1963}
1510 1964
1511void 1965void
1512set_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)
1513 CODE: 1967 CODE:
1514{ 1968{
1515 need_texid (self, texid); 1969 need_texid (self, texid);
1516 1970
1517 { 1971 {
… …
1536 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1537 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1993}
1540 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
1541int 2015int
1542ox (CFPlus::Map self) 2016ox (DC::Map self)
1543 ALIAS: 2017 ALIAS:
1544 oy = 1 2018 oy = 1
1545 x = 2 2019 x = 2
1546 y = 3 2020 y = 3
1547 w = 4 2021 w = 4
… …
1558 } 2032 }
1559 OUTPUT: 2033 OUTPUT:
1560 RETVAL 2034 RETVAL
1561 2035
1562void 2036void
1563scroll (CFPlus::Map self, int dx, int dy) 2037scroll (DC::Map self, int dx, int dy)
1564 CODE: 2038 CODE:
1565{ 2039{
1566 if (dx > 0) 2040 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 2041 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 2042 else if (dx < 0)
… …
1584 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1585 } 2059 }
1586} 2060}
1587 2061
1588SV * 2062SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1590 CODE: 2064 CODE:
1591{ 2065{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 2068 mapcell *cell;
… …
1615 2089
1616 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1617 2091
1618 if (flags & 8) 2092 if (flags & 8)
1619 { 2093 {
2094 uint8_t ext, cmd;
2095
1620 if (extmap) 2096 do
1621 { 2097 {
1622 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1623 2100
1624 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
1625 { 2104 {
1626 ext = *data++;
1627 cmd = ext & 0x3f;
1628
1629 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1;
1631 else if (cmd == 5) // health
1632 {
1633 cell->stat_width = 1; 2105 cell->stat_width = 1;
1634 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1635 }
1636 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47)
1639 {
1640 if (*data == 4)
1641 ; // decode player count
1642
1643 data += *data + 1;
1644 }
1645 else if (cmd == 8) // cell flags
1646 cell->flags = *data++;
1647 else if (ext & 0x40) // unknown, multibyte => skip
1648 data += *data + 1;
1649 else
1650 data++;
1651 } 2107 }
1652 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++;
1653 } 2125 }
1654 else 2126 while (ext & 0x80);
1655 cell->darkness = *data++ + 1;
1656 } 2127 }
1657 2128
1658 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1659 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1660 { 2131 {
… …
1663 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1664 2135
1665 if (cell->tile [z]) 2136 if (cell->tile [z])
1666 { 2137 {
1667 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1668 if (!tex->name) 2140 if (!tex->name)
1669 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1670 2142
1671 if (tex->smoothtile) 2143 if (tex->smoothtile)
1672 { 2144 {
1673 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1674 if (!smooth->name) 2147 if (!smooth->name)
1675 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1676 } 2149 }
1677 } 2150 }
1678 } 2151 }
1679 } 2152 }
1680 else 2153 else
1681 cell->darkness = 0; 2154 CELL_CLEAR (cell);
1682 } 2155 }
1683} 2156}
1684 OUTPUT: 2157 OUTPUT:
1685 RETVAL 2158 RETVAL
1686 2159
1687SV * 2160SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2161mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 2162 CODE:
1690{ 2163{
1691 int x1, x; 2164 int x1, x;
1692 int y1, y; 2165 int y1, y;
1693 int z; 2166 int z;
… …
1706 ? self->row + y 2179 ? self->row + y
1707 : 0; 2180 : 0;
1708 2181
1709 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1710 { 2183 {
1711 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1712 2185
1713 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1714 { 2187 {
1715 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1716 2189
… …
1718 { 2191 {
1719 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1720 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1721 int a1 = tex.a; 2194 int a1 = tex.a;
1722 2195
1723 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1724 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1725 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1726 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1727 } 2200 }
1728 } 2201 }
1729 2202
1730 *map++ = (r ) 2203 *map++ = (r )
1731 | (g << 8) 2204 | (g << 8)
1732 | (b << 16) 2205 | (b << 16)
1733 | (a << 24); 2206 | (a << 24);
1734 } 2207 }
1735 } 2208 }
1736 2209
1737 RETVAL = map_sv; 2210 RETVAL = map_sv;
1738} 2211}
1739 OUTPUT: 2212 OUTPUT:
1740 RETVAL 2213 RETVAL
1741 2214
1742void 2215void
1743draw (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)
1744 CODE: 2217 CODE:
1745{ 2218{
1746 int x, y, z; 2219 int x, y, z;
1747 2220
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 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
1750 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2222 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751 smooth_key skey; 2223 smooth_key skey;
1752 2224 int pl_x, pl_y;
2225 maptex pl_tex;
1753 rc_t *rc = rc_alloc (); 2226 rc_t *rc = rc_alloc ();
2227 rc_t *rc_ov = rc_alloc ();
1754 rc_key_t key; 2228 rc_key_t key;
1755 rc_array_t *arr; 2229 rc_array_t *arr;
1756 2230
2231 pl_tex.name = 0;
2232
1757 // thats current max. sorry. 2233 // that's current max. sorry.
1758 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1759 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1760 2236
1761 // clear key, in case of extra padding 2237 // clear key, in case of extra padding
1762 memset (&skey, 0, sizeof (skey)); 2238 memset (&skey, 0, sizeof (skey));
… …
1766 key.g = 255; 2242 key.g = 255;
1767 key.b = 255; 2243 key.b = 255;
1768 key.a = 255; 2244 key.a = 255;
1769 key.mode = GL_QUADS; 2245 key.mode = GL_QUADS;
1770 key.format = GL_T2F_V3F; 2246 key.format = GL_T2F_V3F;
1771 key.texname = -1;
1772 2247
1773 mx += self->x; 2248 mx += self->x;
1774 my += self->y; 2249 my += self->y;
1775 2250
1776 // first pass: determine smooth_max 2251 // first pass: determine smooth_max
… …
1799 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1801 2276
1802 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
1803 { 2278 {
2279 smooth_hash smooth;
1804 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2281 key.texname = -1;
1805 2282
1806 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
1807 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
1808 { 2285 {
1809 maprow *row = self->row + (y + my); 2286 maprow *row = self->row + (y + my);
… …
1817 if (tile) 2294 if (tile)
1818 { 2295 {
1819 maptex tex = self->tex [tile]; 2296 maptex tex = self->tex [tile];
1820 int px, py; 2297 int px, py;
1821 2298
1822 // suppressing texture state switches here
1823 // is only moderately effective, but worth the extra effort
1824 if (key.texname != tex.name) 2299 if (key.texname != tex.name)
1825 { 2300 {
2301 self->tex [tile].unused = 0;
2302
1826 if (!tex.name) 2303 if (!tex.name)
1827 tex = self->tex [2]; /* missing, replace by noface */ 2304 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1828 2305
1829 key.texname = tex.name; 2306 key.texname = tex.name;
1830 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
1831 } 2308 }
1832 2309
1833 px = (x + 1) * T - tex.w; 2310 px = (x + 1) * Th - tex.w;
1834 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 }
1835 2320
1836 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2321 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1837 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);
1838 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);
1839 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);
1840
1841 if (cell->flags && z == 2)
1842 {
1843 // overlays such as the speech bubble, probably more to come
1844 if (cell->flags & 1)
1845 {
1846 maptex tex = self->tex [1];
1847 int px = x * T + T * 2 / 32;
1848 int py = y * T - T * 6 / 32;
1849
1850 if (tex.name)
1851 {
1852 if (key.texname != tex.name)
1853 {
1854 key.texname = tex.name;
1855 arr = rc_array (rc, &key);
1856 }
1857
1858 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1859 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1860 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1861 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1862 }
1863 }
1864 }
1865 2325
1866 // update smooth hash 2326 // update smooth hash
1867 if (tex.smoothtile) 2327 if (tex.smoothtile)
1868 { 2328 {
1869 skey.tile = tex.smoothtile; 2329 skey.tile = tex.smoothtile;
… …
1885 2345
1886 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1887 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
1888 2348
1889 // full tile 2349 // full tile
1890 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);
1891 2351
1892 // borders 2352 // borders
1893 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);
1894 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);
1895 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);
1896 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);
1897 2357
1898 // corners 2358 // corners
1899 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);
1900 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);
1901 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);
1902 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);
1903 } 2384 }
1904 } 2385 }
1905 } 2386 }
1906 } 2387 }
1907 2388
… …
1911 // go through all smoothlevels, lowest to highest, then draw. 2392 // go through all smoothlevels, lowest to highest, then draw.
1912 // this is basically counting sort 2393 // this is basically counting sort
1913 { 2394 {
1914 int w, b; 2395 int w, b;
1915 2396
2397 glEnable (GL_TEXTURE_2D);
2398 glBegin (GL_QUADS);
1916 for (w = 0; w < 256 / 32; ++w) 2399 for (w = 0; w < 256 / 32; ++w)
1917 { 2400 {
1918 uint32_t smask = smooth_level [w]; 2401 uint32_t smask = smooth_level [w];
1919 if (smask) 2402 if (smask)
1920 for (b = 0; b < 32; ++b) 2403 for (b = 0; b < 32; ++b)
1921 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
1922 { 2405 {
1923 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
1924 HE *he; 2407 HE *he;
1925 2408
1926 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1927 while ((he = hv_iternext (smooth)))
1928 { 2410 {
1929 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
1930 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
1931 2413
1932 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
1933 && skey->level == level 2415 && skey.level == level
1934 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
1935 { 2417 {
1936 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
1937 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
1938 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
1939 int border = bits & 15; 2421 int border = bits & 15;
1940 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1941 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
1942 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
1943 2425
… …
1945 { 2427 {
1946 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
1947 // save gobs of state changes. 2429 // save gobs of state changes.
1948 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
1949 { 2431 {
2432 self->tex [skey.tile].unused = 0;
2433
2434 glEnd ();
1950 key.texname = tex.name; 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1951 arr = rc_array (rc, &key); 2436 glBegin (GL_QUADS);
1952 } 2437 }
1953 2438
1954 if (border) 2439 if (border)
1955 { 2440 {
1956 float ox = border * dx; 2441 float ox = border * dx;
1957 2442
1958 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1959 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1960 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1961 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1962 } 2447 }
1963 2448
1964 if (corner) 2449 if (corner)
1965 { 2450 {
1966 float ox = corner * dx; 2451 float ox = corner * dx;
1967 2452
1968 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1969 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1970 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1971 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1972 } 2457 }
1973 } 2458 }
1974 } 2459 }
1975 } 2460 }
1976 } 2461 }
1977 } 2462 }
2463
2464 glEnd ();
2465 glDisable (GL_TEXTURE_2D);
2466 key.texname = -1;
1978 } 2467 }
2468 }
1979 2469
1980 hv_clear (smooth); 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
1981 rc_draw (rc); 2484 rc_draw (rc);
1982 rc_clear (rc);
1983 } 2485 }
2486
2487 rc_draw (rc_ov);
2488 rc_clear (rc_ov);
1984 2489
1985 glDisable (GL_BLEND); 2490 glDisable (GL_BLEND);
1986 rc_free (rc); 2491 rc_free (rc);
2492 rc_free (rc_ov);
1987 2493
1988 // top layer: overlays such as the health bar 2494 // top layer: overlays such as the health bar
1989 for (y = 0; y < sh; y++) 2495 for (y = 0; y < sh; y++)
1990 if (0 <= y + my && y + my < self->rows) 2496 if (0 <= y + my && y + my < self->rows)
1991 { 2497 {
… …
1994 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
1995 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
1996 { 2502 {
1997 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
1998 2504
1999 int px = x * T; 2505 int px = x * Tw;
2000 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 }
2001 2513
2002 if (cell->stat_hp) 2514 if (cell->stat_hp)
2003 { 2515 {
2004 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2005 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2006 2518
2007 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2008 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2009 px + width - 1, py); 2521 px + width - 1, py);
2010 2522
… …
2016 } 2528 }
2017 } 2529 }
2018} 2530}
2019 2531
2020void 2532void
2021draw_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)
2022 CODE: 2534 CODE:
2023{ 2535{
2024 static float color[16][3] = { 2536 static float color[16][3] = {
2025 { 0.00F, 0.00F, 0.00F }, 2537 { 0.00f, 0.00f, 0.00f },
2026 { 1.00F, 1.00F, 1.00F }, 2538 { 1.00f, 1.00f, 1.00f },
2027 { 0.00F, 0.00F, 0.55F }, 2539 { 0.00f, 0.00f, 0.55f },
2028 { 1.00F, 0.00F, 0.00F }, 2540 { 1.00f, 0.00f, 0.00f },
2029 2541
2030 { 1.00F, 0.54F, 0.00F }, 2542 { 1.00f, 0.54f, 0.00f },
2031 { 0.11F, 0.56F, 1.00F }, 2543 { 0.11f, 0.56f, 1.00f },
2032 { 0.93F, 0.46F, 0.00F }, 2544 { 0.93f, 0.46f, 0.00f },
2033 { 0.18F, 0.54F, 0.34F }, 2545 { 0.18f, 0.54f, 0.34f },
2034 2546
2035 { 0.56F, 0.73F, 0.56F }, 2547 { 0.56f, 0.73f, 0.56f },
2036 { 0.80F, 0.80F, 0.80F }, 2548 { 0.80f, 0.80f, 0.80f },
2037 { 0.55F, 0.41F, 0.13F }, 2549 { 0.55f, 0.41f, 0.13f },
2038 { 0.99F, 0.77F, 0.26F }, 2550 { 0.99f, 0.77f, 0.26f },
2039 2551
2040 { 0.74F, 0.65F, 0.41F }, 2552 { 0.74f, 0.65f, 0.41f },
2041 2553
2042 { 0.00F, 1.00F, 1.00F }, 2554 { 0.00f, 1.00f, 1.00f },
2043 { 1.00F, 0.00F, 1.00F }, 2555 { 1.00f, 0.00f, 1.00f },
2044 { 1.00F, 1.00F, 0.00F }, 2556 { 1.00f, 1.00f, 0.00f },
2045 }; 2557 };
2046 2558
2047 int x, y; 2559 int x, y;
2048 2560
2049 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 */
2050 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2568 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2051 glEnable (GL_BLEND); 2569 glEnable (GL_BLEND);
2052 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2570 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2053 glBegin (GL_QUADS); 2571 glBegin (GL_QUADS);
2054 2572
2055 for (y = 0; y < h; y++) 2573 for (y = 0; y < h; y++)
… …
2059 2577
2060 if (m) 2578 if (m)
2061 { 2579 {
2062 float *c = color [m & 15]; 2580 float *c = color [m & 15];
2063 2581
2064 float tx1 = m & 0x40 ? 0.5 : 0.; 2582 float tx1 = m & 0x40 ? 0.5f : 0.f;
2065 float tx2 = tx1 + 0.5; 2583 float tx2 = tx1 + 0.5f;
2066 2584
2067 glColor4f (c[0], c[1], c[2], 0.75); 2585 glColor4f (c[0], c[1], c[2], 1);
2068 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2586 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2069 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2587 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2070 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2588 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2071 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2589 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2072 } 2590 }
… …
2076 glDisable (GL_BLEND); 2594 glDisable (GL_BLEND);
2077 glDisable (GL_TEXTURE_2D); 2595 glDisable (GL_TEXTURE_2D);
2078} 2596}
2079 2597
2080void 2598void
2081fow_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)
2082 PPCODE: 2600 PPCODE:
2083{ 2601{
2084 int x, y; 2602 int x, y;
2085 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2086 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2087 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2088 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);
2089 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2090 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2610 memset (darkness1, 0, sw1*sh1);
2091 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2092 2611
2093 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2094 SvCUR_set (darkness3_sv, sw34 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2095 2614
2096 mx += self->x - 1; 2615 mx += self->x - 1;
2097 my += self->y - 1; 2616 my += self->y - 1;
2098
2099 memset (darkness1, 255, sw1 * sh1);
2100 2617
2101 for (y = 0; y < sh1; y++) 2618 for (y = 0; y < sh1; y++)
2102 if (0 <= y + my && y + my < self->rows) 2619 if (0 <= y + my && y + my < self->rows)
2103 { 2620 {
2104 maprow *row = self->row + (y + my); 2621 maprow *row = self->row + (y + my);
… …
2107 if (row->c0 <= x + mx && x + mx < row->c1) 2624 if (row->c0 <= x + mx && x + mx < row->c1)
2108 { 2625 {
2109 mapcell *cell = row->col + (x + mx - row->c0); 2626 mapcell *cell = row->col + (x + mx - row->c0);
2110 2627
2111 darkness1 [y * sw1 + x] = cell->darkness 2628 darkness1 [y * sw1 + x] = cell->darkness
2112 ? 255 - (cell->darkness - 1) 2629 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2113 : 255 - FOW_DARKNESS; 2630 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2114 } 2631 }
2115 } 2632 }
2116 2633
2117 for (y = 0; y < sh; ++y) 2634 for (y = 0; y < sh; ++y)
2118 for (x = 0; x < sw; ++x) 2635 for (x = 0; x < sw; ++x)
… …
2137 2654
2138 uint8_t r13 = (d13 + d23 + d12) / 3; 2655 uint8_t r13 = (d13 + d23 + d12) / 3;
2139 uint8_t r23 = d23; 2656 uint8_t r23 = d23;
2140 uint8_t r33 = (d23 + d33 + d32) / 3; 2657 uint8_t r33 = (d23 + d33 + d32) / 3;
2141 2658
2142 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2659 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2143 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2660 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2144 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2661 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2145 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2662 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2146 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 */
2147 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2664 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2148 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2665 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2149 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2666 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2150 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2667 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2151 } 2668 }
2152 2669
2153 free (darkness1); 2670 free (darkness1);
2154 2671
2155 EXTEND (SP, 3); 2672 EXTEND (SP, 3);
2156 PUSHs (sv_2mortal (newSViv (sw34))); 2673 PUSHs (sv_2mortal (newSViv (sw3)));
2157 PUSHs (sv_2mortal (newSViv (sh3))); 2674 PUSHs (sv_2mortal (newSViv (sh3)));
2158 PUSHs (darkness3_sv); 2675 PUSHs (darkness3_sv);
2159} 2676}
2160 2677
2161SV * 2678SV *
2162get_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)
2163 CODE: 2680 CODE:
2164{ 2681{
2165 int x, y, x1, y1; 2682 int x, y, x1, y1;
2166 SV *data_sv = newSV (w * h * 7 + 5); 2683 SV *data_sv = newSV (w * h * 7 + 5);
2167 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2684 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2224 else 2741 else
2225 *data++ = 0; 2742 *data++ = 0;
2226 } 2743 }
2227 } 2744 }
2228 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 {
2229 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2230 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2751 }
2752
2231 RETVAL = data_sv; 2753 RETVAL = data_sv;
2232} 2754}
2233 OUTPUT: 2755 OUTPUT:
2234 RETVAL 2756 RETVAL
2235 2757
2236void 2758void
2237set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2759set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2238 PPCODE: 2760 PPCODE:
2239{ 2761{
2240 int x, y, z; 2762 int x, y, z;
2241 int w, h; 2763 int w, h;
2242 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;
2243 2775
2244 if (*data++ != 0) 2776 if (*data++ != 0)
2245 return; /* version mismatch */ 2777 XSRETURN_EMPTY; /* version mismatch */
2246 2778
2247 w = *data++ << 8; w |= *data++; 2779 w = *data++ << 8; w |= *data++;
2248 h = *data++ << 8; h |= *data++; 2780 h = *data++ << 8; h |= *data++;
2249 2781
2250 // we need to do this 'cause we don't keep an absolute coord system for rows 2782 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2262 { 2794 {
2263 maprow *row = map_get_row (self, y); 2795 maprow *row = map_get_row (self, y);
2264 2796
2265 for (x = x0; x < x1; x++) 2797 for (x = x0; x < x1; x++)
2266 { 2798 {
2799 uint8_t flags;
2800
2801 if (data + 7 >= end)
2802 XSRETURN_EMPTY;
2803
2267 uint8_t flags = *data++; 2804 flags = *data++;
2268 2805
2269 if (flags) 2806 if (flags)
2270 { 2807 {
2271 mapcell *cell = row_get_cell (row, x); 2808 mapcell *cell = row_get_cell (row, x);
2272 tileid tile[3] = { 0, 0, 0 }; 2809 tileid tile[3] = { 0, 0, 0 };
… …
2275 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2812 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2276 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2813 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2277 2814
2278 if (cell->darkness == 0) 2815 if (cell->darkness == 0)
2279 { 2816 {
2280 cell->darkness = 0; 2817 /*cell->darkness = 0;*/
2818 EXTEND (SP, 3);
2281 2819
2282 for (z = 0; z <= 2; z++) 2820 for (z = 0; z <= 2; z++)
2283 { 2821 {
2284 tileid t = tile [z]; 2822 tileid t = tile [z];
2285 2823
2286 if (t >= self->texs || (t && !self->tex [t].name)) 2824 if (t >= self->texs || (t && !self->tex [t].name))
2287 { 2825 {
2288 XPUSHs (sv_2mortal (newSViv (t))); 2826 PUSHs (sv_2mortal (newSViv (t)));
2289 need_texid (self, t); 2827 need_texid (self, t);
2290 } 2828 }
2291 2829
2292 cell->tile [z] = t; 2830 cell->tile [z] = t;
2293 } 2831 }
… …
2295 } 2833 }
2296 } 2834 }
2297 } 2835 }
2298} 2836}
2299 2837
2300MODULE = CFPlus PACKAGE = CFPlus::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2301 2839
2302CFPlus::RW 2840DC::RW
2303new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2304 CODE: 2842 CODE:
2305{ 2843{
2306 STRLEN datalen; 2844 STRLEN datalen;
2307 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2308 2846
2309 RETVAL = SDL_RWFromConstMem (data, datalen); 2847 RETVAL = SDL_RWFromConstMem (data, datalen);
2310} 2848}
2311 OUTPUT: 2849 OUTPUT:
2312 RETVAL 2850 RETVAL
2313 2851
2314CFPlus::RW 2852DC::RW
2315new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2316 CODE: 2854 CODE:
2317 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2318 OUTPUT: 2856 OUTPUT:
2319 RETVAL 2857 RETVAL
2320 2858
2321# fails on win32: 2859# fails on win32:
2322# CFPlus.xs(2268) : error C2059: syntax error : '(' 2860# dc.xs(2268) : error C2059: syntax error : '('
2323#void 2861#void
2324#close (CFPlus::RW self) 2862#close (DC::RW self)
2325# CODE: 2863# CODE:
2326# (self->(close)) (self); 2864# (self->(close)) (self);
2327 2865
2328MODULE = CFPlus PACKAGE = CFPlus::Channel 2866MODULE = Deliantra::Client PACKAGE = DC::Channel
2329 2867
2330PROTOTYPES: DISABLE 2868PROTOTYPES: DISABLE
2331 2869
2332CFPlus::Channel 2870DC::Channel
2333find () 2871find ()
2334 CODE: 2872 CODE:
2335{ 2873{
2336 RETVAL = Mix_GroupAvailable (-1); 2874 RETVAL = Mix_GroupAvailable (-1);
2337 2875
2338 if (RETVAL < 0) 2876 if (RETVAL < 0)
2339 { 2877 {
2340 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2341 2879
2342 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)
2343 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2344 2887 }
2888 else
2345 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2346 } 2890 }
2347 2891
2348 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2349 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2350} 2894}
2351 OUTPUT: 2895 OUTPUT:
2352 RETVAL 2896 RETVAL
2353 2897
2354void 2898void
2355halt (CFPlus::Channel self) 2899halt (DC::Channel self)
2356 CODE: 2900 CODE:
2357 Mix_HaltChannel (self); 2901 Mix_HaltChannel (self);
2358 2902
2359void 2903void
2360expire (CFPlus::Channel self, int ticks = -1) 2904expire (DC::Channel self, int ticks = -1)
2361 CODE: 2905 CODE:
2362 Mix_ExpireChannel (self, ticks); 2906 Mix_ExpireChannel (self, ticks);
2363 2907
2364void 2908void
2365fade_out (CFPlus::Channel self, int ticks = -1) 2909fade_out (DC::Channel self, int ticks = -1)
2366 CODE: 2910 CODE:
2367 Mix_FadeOutChannel (self, ticks); 2911 Mix_FadeOutChannel (self, ticks);
2368 2912
2369int 2913int
2370volume (CFPlus::Channel self, int volume) 2914volume (DC::Channel self, int volume)
2371 CODE: 2915 CODE:
2372 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2916 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2373 OUTPUT: 2917 OUTPUT:
2374 RETVAL 2918 RETVAL
2375 2919
2376void 2920void
2377unregister_all_effects (CFPlus::Channel self) 2921unregister_all_effects (DC::Channel self)
2378 CODE: 2922 CODE:
2379 Mix_UnregisterAllEffects (self); 2923 Mix_UnregisterAllEffects (self);
2380 2924
2381void 2925void
2382set_panning (CFPlus::Channel self, int left, int right) 2926set_panning (DC::Channel self, int left, int right)
2383 CODE: 2927 CODE:
2384 left = CLAMP (left , 0, 255); 2928 left = CLAMP (left , 0, 255);
2385 right = CLAMP (right, 0, 255); 2929 right = CLAMP (right, 0, 255);
2386 Mix_SetPanning (self, left, right); 2930 Mix_SetPanning (self, left, right);
2387 2931
2388void 2932void
2389set_distance (CFPlus::Channel self, int distance) 2933set_distance (DC::Channel self, int distance)
2390 CODE: 2934 CODE:
2391 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2935 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2392 2936
2393void 2937void
2394set_position (CFPlus::Channel self, int angle, int distance) 2938set_position (DC::Channel self, int angle, int distance)
2395 CODE: 2939 CODE:
2396 2940
2397void 2941void
2398set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2942set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2399 CODE: 2943 CODE:
2400{ 2944{
2401 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));
2402 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;
2403 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2947 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2404} 2948}
2405 2949
2406void 2950void
2407set_reverse_stereo (CFPlus::Channel self, int flip) 2951set_reverse_stereo (DC::Channel self, int flip)
2408 CODE: 2952 CODE:
2409 Mix_SetReverseStereo (self, flip); 2953 Mix_SetReverseStereo (self, flip);
2410 2954
2411MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2412 2956
2413PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2414 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
2415CFPlus::MixChunk 2971DC::MixChunk
2416new (SV *class, CFPlus::RW rwops) 2972new (SV *klass, DC::RW rwops)
2417 CODE: 2973 CODE:
2418 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2419 OUTPUT: 2975 OUTPUT:
2420 RETVAL 2976 RETVAL
2421 2977
2422void 2978void
2423DESTROY (CFPlus::MixChunk self) 2979DESTROY (DC::MixChunk self)
2424 CODE: 2980 CODE:
2425 Mix_FreeChunk (self); 2981 Mix_FreeChunk (self);
2426 2982
2427int 2983int
2428volume (CFPlus::MixChunk self, int volume = -1) 2984volume (DC::MixChunk self, int volume = -1)
2429 CODE: 2985 CODE:
2430 if (items > 1) 2986 if (items > 1)
2431 volume = CLAMP (volume, 0, 128); 2987 volume = CLAMP (volume, 0, 128);
2432 RETVAL = Mix_VolumeChunk (self, volume); 2988 RETVAL = Mix_VolumeChunk (self, volume);
2433 OUTPUT: 2989 OUTPUT:
2434 RETVAL 2990 RETVAL
2435 2991
2436CFPlus::Channel 2992DC::Channel
2437play (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)
2438 CODE: 2994 CODE:
2439{ 2995{
2440 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2996 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2441 2997
2442 if (RETVAL < 0) 2998 if (RETVAL < 0)
… …
2449 } 3005 }
2450} 3006}
2451 OUTPUT: 3007 OUTPUT:
2452 RETVAL 3008 RETVAL
2453 3009
2454MODULE = 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
2455 3023
2456int 3024int
2457volume (int volume = -1) 3025volume (int volume = -1)
2458 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2459 CODE: 3027 CODE:
… …
2471void 3039void
2472halt () 3040halt ()
2473 CODE: 3041 CODE:
2474 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2475 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2476CFPlus::MixMusic 3051DC::MixMusic
2477new (SV *class, CFPlus::RW rwops) 3052new (SV *klass, DC::RW rwops)
2478 CODE: 3053 CODE:
2479 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2480 OUTPUT: 3055 OUTPUT:
2481 RETVAL 3056 RETVAL
2482 3057
2483void 3058void
2484DESTROY (CFPlus::MixMusic self) 3059DESTROY (DC::MixMusic self)
2485 CODE: 3060 CODE:
2486 Mix_FreeMusic (self); 3061 Mix_FreeMusic (self);
2487 3062
2488int 3063int
2489play (CFPlus::MixMusic self, int loops = -1) 3064play (DC::MixMusic self, int loops = -1)
2490 CODE: 3065 CODE:
2491 RETVAL = Mix_PlayMusic (self, loops); 3066 RETVAL = Mix_PlayMusic (self, loops);
2492 OUTPUT: 3067 OUTPUT:
2493 RETVAL 3068 RETVAL
2494 3069
2495void 3070void
2496fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3071fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2497 CODE: 3072 CODE:
2498 Mix_FadeInMusicPos (self, loops, ms, position); 3073 Mix_FadeInMusicPos (self, loops, ms, position);
2499 3074
2500MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3075MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2501 3076
2502PROTOTYPES: ENABLE 3077PROTOTYPES: ENABLE
2503 3078
2504BOOT: 3079BOOT:
2505{ 3080{
2506 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3081 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2507 static const struct { 3082 static const struct {
2508 const char *name; 3083 const char *name;
2509 IV iv; 3084 IV iv;
2510 } *civ, const_iv[] = { 3085 } *civ, const_iv[] = {
2511# define const_iv(name) { # name, (IV)name } 3086# define const_iv(name) { # name, (IV)name }
2512 const_iv (GL_VENDOR), 3087 const_iv (GL_VENDOR),
2513 const_iv (GL_VERSION), 3088 const_iv (GL_VERSION),
2514 const_iv (GL_EXTENSIONS), 3089 const_iv (GL_EXTENSIONS),
3090 const_iv (GL_MAX_TEXTURE_UNITS),
2515 const_iv (GL_COLOR_MATERIAL), 3091 const_iv (GL_COLOR_MATERIAL),
2516 const_iv (GL_SMOOTH), 3092 const_iv (GL_SMOOTH),
2517 const_iv (GL_FLAT), 3093 const_iv (GL_FLAT),
2518 const_iv (GL_DITHER), 3094 const_iv (GL_DITHER),
2519 const_iv (GL_BLEND), 3095 const_iv (GL_BLEND),
… …
2531 const_iv (GL_ZERO), 3107 const_iv (GL_ZERO),
2532 const_iv (GL_SRC_ALPHA), 3108 const_iv (GL_SRC_ALPHA),
2533 const_iv (GL_DST_ALPHA), 3109 const_iv (GL_DST_ALPHA),
2534 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3110 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2535 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),
2536 const_iv (GL_SRC_ALPHA_SATURATE), 3116 const_iv (GL_SRC_ALPHA_SATURATE),
2537 const_iv (GL_RGB), 3117 const_iv (GL_RGB),
2538 const_iv (GL_RGBA), 3118 const_iv (GL_RGBA),
2539 const_iv (GL_RGBA4), 3119 const_iv (GL_RGBA4),
2540 const_iv (GL_RGBA8), 3120 const_iv (GL_RGBA8),
… …
2546 const_iv (GL_INTENSITY), 3126 const_iv (GL_INTENSITY),
2547 const_iv (GL_LUMINANCE), 3127 const_iv (GL_LUMINANCE),
2548 const_iv (GL_LUMINANCE_ALPHA), 3128 const_iv (GL_LUMINANCE_ALPHA),
2549 const_iv (GL_FLOAT), 3129 const_iv (GL_FLOAT),
2550 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3130 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3131 const_iv (GL_COMPRESSED_ALPHA_ARB),
3132 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3133 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3134 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3135 const_iv (GL_COMPRESSED_RGB_ARB),
3136 const_iv (GL_COMPRESSED_RGBA_ARB),
2551 const_iv (GL_COMPILE), 3137 const_iv (GL_COMPILE),
2552 const_iv (GL_PROXY_TEXTURE_1D), 3138 const_iv (GL_PROXY_TEXTURE_1D),
2553 const_iv (GL_PROXY_TEXTURE_2D), 3139 const_iv (GL_PROXY_TEXTURE_2D),
2554 const_iv (GL_TEXTURE_1D), 3140 const_iv (GL_TEXTURE_1D),
2555 const_iv (GL_TEXTURE_2D), 3141 const_iv (GL_TEXTURE_2D),
… …
2594 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3180 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2595 const_iv (GL_POINT_SMOOTH_HINT), 3181 const_iv (GL_POINT_SMOOTH_HINT),
2596 const_iv (GL_LINE_SMOOTH_HINT), 3182 const_iv (GL_LINE_SMOOTH_HINT),
2597 const_iv (GL_POLYGON_SMOOTH_HINT), 3183 const_iv (GL_POLYGON_SMOOTH_HINT),
2598 const_iv (GL_GENERATE_MIPMAP_HINT), 3184 const_iv (GL_GENERATE_MIPMAP_HINT),
3185 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2599 const_iv (GL_FASTEST), 3186 const_iv (GL_FASTEST),
2600 const_iv (GL_DONT_CARE), 3187 const_iv (GL_DONT_CARE),
2601 const_iv (GL_NICEST), 3188 const_iv (GL_NICEST),
2602 const_iv (GL_V2F), 3189 const_iv (GL_V2F),
2603 const_iv (GL_V3F), 3190 const_iv (GL_V3F),
2604 const_iv (GL_T2F_V3F), 3191 const_iv (GL_T2F_V3F),
2605 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),
2606# undef const_iv 3196# undef const_iv
2607 }; 3197 };
2608 3198
2609 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--)
2610 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2611 3201
2612 texture_av = newAV (); 3202 texture_av = newAV ();
2613 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
2614} 3204}
2615 3205
2616char * 3206void
3207disable_GL_EXT_blend_func_separate ()
3208 CODE:
3209 gl.BlendFuncSeparate = 0;
3210 gl.BlendFuncSeparateEXT = 0;
3211
3212void
3213apple_nvidia_bug (int enable)
3214
3215const char *
2617gl_vendor () 3216gl_vendor ()
2618 CODE: 3217 CODE:
2619 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
2620 OUTPUT: 3219 OUTPUT:
2621 RETVAL 3220 RETVAL
2622 3221
2623char * 3222const char *
2624gl_version () 3223gl_version ()
2625 CODE: 3224 CODE:
2626 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
2627 OUTPUT: 3226 OUTPUT:
2628 RETVAL 3227 RETVAL
2629 3228
2630char * 3229const char *
2631gl_extensions () 3230gl_extensions ()
2632 CODE: 3231 CODE:
2633 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2634 OUTPUT: 3233 OUTPUT:
2635 RETVAL 3234 RETVAL
2636 3235
2637const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
2638 3241
2639GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
2640 CODE: 3243 CODE:
2641 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
2642 OUTPUT: 3245 OUTPUT:
… …
2650 3253
2651int glGetError () 3254int glGetError ()
2652 3255
2653void glFinish () 3256void glFinish ()
2654 3257
3258void glFlush ()
3259
2655void glClear (int mask) 3260void glClear (int mask)
2656 3261
2657void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
2658 PROTOTYPE: @ 3263 PROTOTYPE: @
2659 3264
… …
2668void glBlendFunc (int sfactor, int dfactor) 3273void glBlendFunc (int sfactor, int dfactor)
2669 3274
2670void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3275void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2671 CODE: 3276 CODE:
2672 gl_BlendFuncSeparate (sa, da, saa, daa); 3277 gl_BlendFuncSeparate (sa, da, saa, daa);
3278
3279# void glBlendEquation (int se)
2673 3280
2674void glDepthMask (int flag) 3281void glDepthMask (int flag)
2675 3282
2676void glLogicOp (int opcode) 3283void glLogicOp (int opcode)
2677 3284
… …
2712void glRotate (float angle, float x, float y, float z) 3319void glRotate (float angle, float x, float y, float z)
2713 CODE: 3320 CODE:
2714 glRotatef (angle, x, y, z); 3321 glRotatef (angle, x, y, z);
2715 3322
2716void 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: @
2717 ALIAS: 3325 ALIAS:
2718 glColor_premultiply = 1 3326 glColor_premultiply = 1
2719 CODE: 3327 CODE:
2720 if (ix) 3328 if (ix)
2721 { 3329 {
… …
2741 3349
2742void glRect (float x1, float y1, float x2, float y2) 3350void glRect (float x1, float y1, float x2, float y2)
2743 CODE: 3351 CODE:
2744 glRectf (x1, y1, x2, y2); 3352 glRectf (x1, y1, x2, y2);
2745 3353
3354void glRect_lineloop (float x1, float y1, float x2, float y2)
3355 CODE:
3356 glBegin (GL_LINE_LOOP);
3357 glVertex2f (x1, y1);
3358 glVertex2f (x2, y1);
3359 glVertex2f (x2, y2);
3360 glVertex2f (x1, y2);
3361 glEnd ();
3362
2746PROTOTYPES: ENABLE 3363PROTOTYPES: ENABLE
2747 3364
2748void glBegin (int mode) 3365void glBegin (int mode)
2749 3366
2750void glEnd () 3367void glEnd ()
… …
2782void 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)
2783 CODE: 3400 CODE:
2784 if (gl.SeparableFilter2D) 3401 if (gl.SeparableFilter2D)
2785 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3402 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2786 3403
2787void 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)
2788 3405
2789void 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)
2790 3407
2791void glDrawPixels (int width, int height, int format, int type, char *pixels) 3408void glDrawPixels (int width, int height, int format, int type, char *pixels)
2792 3409
… …
2818 3435
2819void glEndList () 3436void glEndList ()
2820 3437
2821void glCallList (int list) 3438void glCallList (int list)
2822 3439
2823MODULE = 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
2824 3446
2825PROTOTYPES: DISABLE 3447PROTOTYPES: DISABLE
2826 3448
2827void 3449void
2828find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
2829 PPCODE: 3451 PPCODE:
2830{ 3452{
2831 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
2832 XPUSHs (self); 3454 XPUSHs (self);
2833} 3455}
2834 3456
2835BOOT: 3457BOOT:
2836{ 3458{
2837 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3459 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2838 3460
2839 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);
2840 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);
2841 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);
2842 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);
2843} 3465}
2844 3466
2845void 3467void
2846draw (SV *self) 3468draw (SV *self)
2847 CODE: 3469 CODE:
2848{ 3470{
2849 HV *hv; 3471 HV *hv;
2850 SV **svp; 3472 SV **svp;
2851 NV x, y, w, h; 3473 NV x, y, w, h;
2852 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
2853 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
2854 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
2855 SV *draw_h_sv = GvSV (draw_h_gv); 3477 SV *draw_h_sv = GvSV (draw_h_gv);
2856 SV *hover;
2857 double draw_x, draw_y, draw_w, draw_h; 3478 double draw_x, draw_y;
2858 3479
2859 if (!SvROK (self)) 3480 if (!SvROK (self))
2860 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3481 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2861 3482
2862 hv = (HV *)SvRV (self); 3483 hv = (HV *)SvRV (self);
2863 3484
2864 if (SvTYPE (hv) != SVt_PVHV) 3485 if (SvTYPE (hv) != SVt_PVHV)
2865 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3486 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2866 3487
2867 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.;
2868 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.;
2869 3490
2870 if (!h || !w) 3491 if (!h || !w)
… …
2890 { 3511 {
2891 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3512 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2892 3513
2893 if (svp && SvTRUE (*svp)) 3514 if (svp && SvTRUE (*svp))
2894 { 3515 {
2895 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3516 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2896 glEnable (GL_BLEND); 3517 glEnable (GL_BLEND);
2897 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3518 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2898 glBegin (GL_QUADS); 3519 glBegin (GL_QUADS);
2899 glVertex2f (0, 0); 3520 glVertex2f (0, 0);
2900 glVertex2f (w, 0); 3521 glVertex2f (w, 0);
… …
2903 glEnd (); 3524 glEnd ();
2904 glDisable (GL_BLEND); 3525 glDisable (GL_BLEND);
2905 } 3526 }
2906 } 3527 }
2907#if 0 3528#if 0
2908 if ($ENV{CFPLUS_DEBUG} & 1) { 3529 // draw borders, for debugging
2909 glPushMatrix; 3530 glPushMatrix ();
2910 glColor 1, 1, 0, 1; 3531 glColor4f (1., 1., 0., 1.);
2911 glTranslate 0.375, 0.375; 3532 glTranslatef (.5, .5, 0.);
2912 glBegin GL_LINE_LOOP; 3533 glBegin (GL_LINE_LOOP);
2913 glVertex 0 , 0; 3534 glVertex2f (0 , 0);
2914 glVertex $self->{w} - 1, 0; 3535 glVertex2f (w - 1, 0);
2915 glVertex $self->{w} - 1, $self->{h} - 1; 3536 glVertex2f (w - 1, h - 1);
2916 glVertex 0 , $self->{h} - 1; 3537 glVertex2f (0 , h - 1);
2917 glEnd; 3538 glEnd ();
2918 glPopMatrix; 3539 glPopMatrix ();
2919 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2920 }
2921#endif 3540#endif
2922 PUSHMARK (SP); 3541 PUSHMARK (SP);
2923 XPUSHs (self); 3542 XPUSHs (self);
2924 PUTBACK; 3543 PUTBACK;
2925 call_method ("_draw", G_VOID | G_DISCARD); 3544 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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