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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines