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.217 by root, Wed Aug 1 12:43:31 2007 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC

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

Diff Legend

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