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.223 by root, Sat Aug 11 11:07:08 2007 UTC vs.
Revision 1.314 by root, Wed Jan 18 15:31:51 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines