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.224 by root, Sat Aug 11 11:21:46 2007 UTC vs.
Revision 1.317 by root, Fri Nov 23 12:39:05 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_)
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;
1588 2063
1589 //TODO: don't trust server data to be in-range(!) 2064 //TODO: don't trust server data to be in-range(!)
1590 2065
1591 if (flags & 8) 2066 if (flags & 8)
1592 { 2067 {
2068 uint8_t ext, cmd;
2069
1593 if (extmap) 2070 do
1594 { 2071 {
1595 uint8_t ext, cmd; 2072 ext = *data++;
2073 cmd = ext & 0x7f;
1596 2074
1597 do 2075 if (cmd < 4)
2076 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2077 else if (cmd == 5) // health
1598 { 2078 {
1599 ext = *data++;
1600 cmd = ext & 0x3f;
1601
1602 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1;
1604 else if (cmd == 5) // health
1605 {
1606 cell->stat_width = 1; 2079 cell->stat_width = 1;
1607 cell->stat_hp = *data++; 2080 cell->stat_hp = *data++;
1608 }
1609 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47)
1612 {
1613 if (*data == 4)
1614 ; // decode player count
1615
1616 data += *data + 1;
1617 }
1618 else if (cmd == 8) // cell flags
1619 cell->flags = *data++;
1620 else if (ext & 0x40) // unknown, multibyte => skip
1621 data += *data + 1;
1622 else
1623 data++;
1624 } 2081 }
1625 while (ext & 0x80); 2082 else if (cmd == 6) // monster width
2083 cell->stat_width = *data++ + 1;
2084 else if (cmd == 0x47)
2085 {
2086 if (*data == 1) cell->player = data [1];
2087 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2088 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2089 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2090
2091 data += *data + 1;
2092 }
2093 else if (cmd == 8) // cell flags
2094 cell->flags = *data++;
2095 else if (ext & 0x40) // unknown, multibyte => skip
2096 data += *data + 1;
2097 else
2098 data++;
1626 } 2099 }
1627 else 2100 while (ext & 0x80);
1628 cell->darkness = *data++ + 1;
1629 } 2101 }
1630 2102
1631 for (z = 0; z <= 2; ++z) 2103 for (z = 0; z <= 2; ++z)
1632 if (flags & (4 >> z)) 2104 if (flags & (4 >> z))
1633 { 2105 {
1636 cell->tile [z] = self->face2tile [face]; 2108 cell->tile [z] = self->face2tile [face];
1637 2109
1638 if (cell->tile [z]) 2110 if (cell->tile [z])
1639 { 2111 {
1640 maptex *tex = self->tex + cell->tile [z]; 2112 maptex *tex = self->tex + cell->tile [z];
2113 tex->unused = 0;
1641 if (!tex->name) 2114 if (!tex->name)
1642 av_push (missing, newSViv (cell->tile [z])); 2115 av_push (missing, newSViv (cell->tile [z]));
1643 2116
1644 if (tex->smoothtile) 2117 if (tex->smoothtile)
1645 { 2118 {
1646 maptex *smooth = self->tex + tex->smoothtile; 2119 maptex *smooth = self->tex + tex->smoothtile;
2120 smooth->unused = 0;
1647 if (!smooth->name) 2121 if (!smooth->name)
1648 av_push (missing, newSViv (tex->smoothtile)); 2122 av_push (missing, newSViv (tex->smoothtile));
1649 } 2123 }
1650 } 2124 }
1651 } 2125 }
1652 } 2126 }
1653 else 2127 else
1654 cell->darkness = 0; 2128 CELL_CLEAR (cell);
1655 } 2129 }
1656} 2130}
1657 OUTPUT: 2131 OUTPUT:
1658 RETVAL 2132 RETVAL
1659 2133
1660SV * 2134SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2135mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 2136 CODE:
1663{ 2137{
1664 int x1, x; 2138 int x1, x;
1665 int y1, y; 2139 int y1, y;
1666 int z; 2140 int z;
1679 ? self->row + y 2153 ? self->row + y
1680 : 0; 2154 : 0;
1681 2155
1682 for (x = x0; x < x1; x++) 2156 for (x = x0; x < x1; x++)
1683 { 2157 {
1684 int r = 32, g = 32, b = 32, a = 192; 2158 unsigned int r = 32, g = 32, b = 32, a = 192;
1685 2159
1686 if (row && row->c0 <= x && x < row->c1) 2160 if (row && row->c0 <= x && x < row->c1)
1687 { 2161 {
1688 mapcell *cell = row->col + (x - row->c0); 2162 mapcell *cell = row->col + (x - row->c0);
1689 2163
1691 { 2165 {
1692 maptex tex = self->tex [cell->tile [z]]; 2166 maptex tex = self->tex [cell->tile [z]];
1693 int a0 = 255 - tex.a; 2167 int a0 = 255 - tex.a;
1694 int a1 = tex.a; 2168 int a1 = tex.a;
1695 2169
1696 r = (r * a0 + tex.r * a1) / 255; 2170 r = div255 (r * a0 + tex.r * a1);
1697 g = (g * a0 + tex.g * a1) / 255; 2171 g = div255 (g * a0 + tex.g * a1);
1698 b = (b * a0 + tex.b * a1) / 255; 2172 b = div255 (b * a0 + tex.b * a1);
1699 a = (a * a0 + tex.a * a1) / 255; 2173 a = div255 (a * a0 + tex.a * a1);
1700 } 2174 }
1701 } 2175 }
1702 2176
1703 *map++ = (r ) 2177 *map++ = (r )
1704 | (g << 8) 2178 | (g << 8)
1711} 2185}
1712 OUTPUT: 2186 OUTPUT:
1713 RETVAL 2187 RETVAL
1714 2188
1715void 2189void
1716draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2190draw (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: 2191 CODE:
1718{ 2192{
1719 int x, y, z; 2193 int x, y, z;
1720 2194
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2195 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2196 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) 2197 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 2198 smooth_key skey;
1725 2199 int pl_x, pl_y;
2200 maptex pl_tex;
1726 rc_t *rc = rc_alloc (); 2201 rc_t *rc = rc_alloc ();
2202 rc_t *rc_ov = rc_alloc ();
1727 rc_key_t key; 2203 rc_key_t key;
1728 rc_array_t *arr; 2204 rc_array_t *arr;
1729 2205
2206 pl_tex.name = 0;
2207
1730 // thats current max. sorry. 2208 // that's current max. sorry.
1731 if (sw > 255) sw = 255; 2209 if (sw > 255) sw = 255;
1732 if (sh > 255) sh = 255; 2210 if (sh > 255) sh = 255;
1733 2211
1734 // clear key, in case of extra padding 2212 // clear key, in case of extra padding
1735 memset (&skey, 0, sizeof (skey)); 2213 memset (&skey, 0, sizeof (skey));
1739 key.g = 255; 2217 key.g = 255;
1740 key.b = 255; 2218 key.b = 255;
1741 key.a = 255; 2219 key.a = 255;
1742 key.mode = GL_QUADS; 2220 key.mode = GL_QUADS;
1743 key.format = GL_T2F_V3F; 2221 key.format = GL_T2F_V3F;
1744 key.texname = -1;
1745 2222
1746 mx += self->x; 2223 mx += self->x;
1747 my += self->y; 2224 my += self->y;
1748 2225
1749 // first pass: determine smooth_max 2226 // first pass: determine smooth_max
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2250 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774 2251
1775 for (z = 0; z <= 2; z++) 2252 for (z = 0; z <= 2; z++)
1776 { 2253 {
1777 memset (smooth_level, 0, sizeof (smooth_level)); 2254 memset (smooth_level, 0, sizeof (smooth_level));
2255 key.texname = -1;
1778 2256
1779 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
1780 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
1781 { 2259 {
1782 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
1790 if (tile) 2268 if (tile)
1791 { 2269 {
1792 maptex tex = self->tex [tile]; 2270 maptex tex = self->tex [tile];
1793 int px, py; 2271 int px, py;
1794 2272
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 2273 if (key.texname != tex.name)
1798 { 2274 {
2275 self->tex [tile].unused = 0;
2276
1799 if (!tex.name) 2277 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 2278 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1801 2279
1802 key.texname = tex.name; 2280 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 2281 arr = rc_array (rc, &key);
1804 } 2282 }
1805 2283
1806 px = (x + 1) * T - tex.w; 2284 px = (x + 1) * Th - tex.w;
1807 py = (y + 1) * T - tex.h; 2285 py = (y + 1) * Tw - tex.h;
2286
2287 if (expect_false (cell->player == player) && expect_false (z == 2))
2288 {
2289 pl_x = px;
2290 pl_y = py;
2291 pl_tex = tex;
2292 continue;
2293 }
1808 2294
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2295 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2296 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); 2297 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); 2298 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 2299
1839 // update smooth hash 2300 // update smooth hash
1840 if (tex.smoothtile) 2301 if (tex.smoothtile)
1841 { 2302 {
1842 skey.tile = tex.smoothtile; 2303 skey.tile = tex.smoothtile;
1873 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2334 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); 2335 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); 2336 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1876 } 2337 }
1877 } 2338 }
2339
2340 if (expect_false (z == 2) && expect_false (cell->flags))
2341 {
2342 // overlays such as the speech bubble, probably more to come
2343 if (cell->flags & 1)
2344 {
2345 rc_key_t key_ov = key;
2346 maptex tex = self->tex [TEXID_SPEECH];
2347 rc_array_t *arr;
2348 int px = x * Tw + Tw * 2 / 32;
2349 int py = y * Th - Th * 6 / 32;
2350
2351 key_ov.texname = tex.name;
2352 arr = rc_array (rc_ov, &key_ov);
2353
2354 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2355 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2356 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2357 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2358 }
2359 }
1878 } 2360 }
1879 } 2361 }
1880 2362
1881 rc_draw (rc); 2363 rc_draw (rc);
1882 rc_clear (rc); 2364 rc_clear (rc);
1884 // go through all smoothlevels, lowest to highest, then draw. 2366 // go through all smoothlevels, lowest to highest, then draw.
1885 // this is basically counting sort 2367 // this is basically counting sort
1886 { 2368 {
1887 int w, b; 2369 int w, b;
1888 2370
2371 glEnable (GL_TEXTURE_2D);
2372 glBegin (GL_QUADS);
1889 for (w = 0; w < 256 / 32; ++w) 2373 for (w = 0; w < 256 / 32; ++w)
1890 { 2374 {
1891 uint32_t smask = smooth_level [w]; 2375 uint32_t smask = smooth_level [w];
1892 if (smask) 2376 if (smask)
1893 for (b = 0; b < 32; ++b) 2377 for (b = 0; b < 32; ++b)
1905 if (!(bits & 0x1000) 2389 if (!(bits & 0x1000)
1906 && skey->level == level 2390 && skey->level == level
1907 && level > smooth_max [skey->x][skey->y]) 2391 && level > smooth_max [skey->x][skey->y])
1908 { 2392 {
1909 maptex tex = self->tex [skey->tile]; 2393 maptex tex = self->tex [skey->tile];
1910 int px = (((int)skey->x) - 1) * T; 2394 int px = (((int)skey->x) - 1) * Tw;
1911 int py = (((int)skey->y) - 1) * T; 2395 int py = (((int)skey->y) - 1) * Th;
1912 int border = bits & 15; 2396 int border = bits & 15;
1913 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2397 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1914 float dx = tex.s * .0625f; // 16 images/row 2398 float dx = tex.s * .0625f; // 16 images/row
1915 float dy = tex.t * .5f ; // 2 images/column 2399 float dy = tex.t * .5f ; // 2 images/column
1916 2400
1918 { 2402 {
1919 // this time avoiding texture state changes 2403 // this time avoiding texture state changes
1920 // save gobs of state changes. 2404 // save gobs of state changes.
1921 if (key.texname != tex.name) 2405 if (key.texname != tex.name)
1922 { 2406 {
2407 self->tex [skey->tile].unused = 0;
2408
2409 glEnd ();
1923 key.texname = tex.name; 2410 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1924 arr = rc_array (rc, &key); 2411 glBegin (GL_QUADS);
1925 } 2412 }
1926 2413
1927 if (border) 2414 if (border)
1928 { 2415 {
1929 float ox = border * dx; 2416 float ox = border * dx;
1930 2417
1931 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2418 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1932 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2419 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1933 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2420 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1934 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2421 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1935 } 2422 }
1936 2423
1937 if (corner) 2424 if (corner)
1938 { 2425 {
1939 float ox = corner * dx; 2426 float ox = corner * dx;
1940 2427
1941 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1942 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2429 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1943 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2430 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1944 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2431 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1945 } 2432 }
1946 } 2433 }
1947 } 2434 }
1948 } 2435 }
1949 } 2436 }
1950 } 2437 }
2438
2439 glEnd ();
2440 glDisable (GL_TEXTURE_2D);
2441 key.texname = -1;
1951 } 2442 }
1952 2443
1953 hv_clear (smooth); 2444 hv_clear (smooth);
2445 }
2446
2447 if (pl_tex.name)
2448 {
2449 maptex tex = pl_tex;
2450 int px = pl_x + sdx;
2451 int py = pl_y + sdy;
2452
2453 key.texname = tex.name;
2454 arr = rc_array (rc, &key);
2455
2456 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2457 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2458 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2459 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2460
1954 rc_draw (rc); 2461 rc_draw (rc);
1955 rc_clear (rc);
1956 } 2462 }
2463
2464 rc_draw (rc_ov);
2465 rc_clear (rc_ov);
1957 2466
1958 glDisable (GL_BLEND); 2467 glDisable (GL_BLEND);
1959 rc_free (rc); 2468 rc_free (rc);
2469 rc_free (rc_ov);
1960 2470
1961 // top layer: overlays such as the health bar 2471 // top layer: overlays such as the health bar
1962 for (y = 0; y < sh; y++) 2472 for (y = 0; y < sh; y++)
1963 if (0 <= y + my && y + my < self->rows) 2473 if (0 <= y + my && y + my < self->rows)
1964 { 2474 {
1967 for (x = 0; x < sw; x++) 2477 for (x = 0; x < sw; x++)
1968 if (row->c0 <= x + mx && x + mx < row->c1) 2478 if (row->c0 <= x + mx && x + mx < row->c1)
1969 { 2479 {
1970 mapcell *cell = row->col + (x + mx - row->c0); 2480 mapcell *cell = row->col + (x + mx - row->c0);
1971 2481
1972 int px = x * T; 2482 int px = x * Tw;
1973 int py = y * T; 2483 int py = y * Th;
2484
2485 if (expect_false (cell->player == player))
2486 {
2487 px += sdx;
2488 py += sdy;
2489 }
1974 2490
1975 if (cell->stat_hp) 2491 if (cell->stat_hp)
1976 { 2492 {
1977 int width = cell->stat_width * T; 2493 int width = cell->stat_width * Tw;
1978 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2494 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1979 2495
1980 glColor3ub (0, 0, 0); 2496 glColor3ub (0, 0, 0);
1981 glRectf (px + 1, py - thick - 2, 2497 glRectf (px + 1, py - thick - 2,
1982 px + width - 1, py); 2498 px + width - 1, py);
1983 2499
1989 } 2505 }
1990 } 2506 }
1991} 2507}
1992 2508
1993void 2509void
1994draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2510draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1995 CODE: 2511 CODE:
1996{ 2512{
1997 static float color[16][3] = { 2513 static float color[16][3] = {
1998 { 0.00F, 0.00F, 0.00F }, 2514 { 0.00f, 0.00f, 0.00f },
1999 { 1.00F, 1.00F, 1.00F }, 2515 { 1.00f, 1.00f, 1.00f },
2000 { 0.00F, 0.00F, 0.55F }, 2516 { 0.00f, 0.00f, 0.55f },
2001 { 1.00F, 0.00F, 0.00F }, 2517 { 1.00f, 0.00f, 0.00f },
2002 2518
2003 { 1.00F, 0.54F, 0.00F }, 2519 { 1.00f, 0.54f, 0.00f },
2004 { 0.11F, 0.56F, 1.00F }, 2520 { 0.11f, 0.56f, 1.00f },
2005 { 0.93F, 0.46F, 0.00F }, 2521 { 0.93f, 0.46f, 0.00f },
2006 { 0.18F, 0.54F, 0.34F }, 2522 { 0.18f, 0.54f, 0.34f },
2007 2523
2008 { 0.56F, 0.73F, 0.56F }, 2524 { 0.56f, 0.73f, 0.56f },
2009 { 0.80F, 0.80F, 0.80F }, 2525 { 0.80f, 0.80f, 0.80f },
2010 { 0.55F, 0.41F, 0.13F }, 2526 { 0.55f, 0.41f, 0.13f },
2011 { 0.99F, 0.77F, 0.26F }, 2527 { 0.99f, 0.77f, 0.26f },
2012 2528
2013 { 0.74F, 0.65F, 0.41F }, 2529 { 0.74f, 0.65f, 0.41f },
2014 2530
2015 { 0.00F, 1.00F, 1.00F }, 2531 { 0.00f, 1.00f, 1.00f },
2016 { 1.00F, 0.00F, 1.00F }, 2532 { 1.00f, 0.00f, 1.00f },
2017 { 1.00F, 1.00F, 0.00F }, 2533 { 1.00f, 1.00f, 0.00f },
2018 }; 2534 };
2019 2535
2020 int x, y; 2536 int x, y;
2021 2537
2022 glEnable (GL_TEXTURE_2D); 2538 glEnable (GL_TEXTURE_2D);
2539 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2540 * but the nvidia driver (185.18.14) mishandles alpha textures
2541 * and takes the colour from god knows where instead of using
2542 * Cp. MODULATE results in the same colour, but slightly different
2543 * alpha, but atcually gives us the correct colour with nvidia.
2544 */
2023 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2545 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2024 glEnable (GL_BLEND); 2546 glEnable (GL_BLEND);
2025 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2547 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2026 glBegin (GL_QUADS); 2548 glBegin (GL_QUADS);
2027 2549
2028 for (y = 0; y < h; y++) 2550 for (y = 0; y < h; y++)
2032 2554
2033 if (m) 2555 if (m)
2034 { 2556 {
2035 float *c = color [m & 15]; 2557 float *c = color [m & 15];
2036 2558
2037 float tx1 = m & 0x40 ? 0.5 : 0.; 2559 float tx1 = m & 0x40 ? 0.5f : 0.f;
2038 float tx2 = tx1 + 0.5; 2560 float tx2 = tx1 + 0.5f;
2039 2561
2040 glColor4f (c[0], c[1], c[2], 0.75); 2562 glColor4f (c[0], c[1], c[2], 1);
2041 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2563 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2042 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2564 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2043 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2565 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2044 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2566 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2045 } 2567 }
2049 glDisable (GL_BLEND); 2571 glDisable (GL_BLEND);
2050 glDisable (GL_TEXTURE_2D); 2572 glDisable (GL_TEXTURE_2D);
2051} 2573}
2052 2574
2053void 2575void
2054fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2576fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2055 PPCODE: 2577 PPCODE:
2056{ 2578{
2057 int x, y; 2579 int x, y;
2058 int sw1 = sw + 2; 2580 int sw1 = sw + 2;
2059 int sh1 = sh + 2; 2581 int sh1 = sh + 2;
2060 int sh3 = sh * 3; 2582 int sh3 = sh * 3;
2061 int sw34 = (sw * 3 + 3) & ~3; 2583 int sw3 = sw * 3;
2584 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2585 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2062 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2586 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2063 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2587 memset (darkness1, 0, sw1*sh1);
2064 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2065 2588
2066 SvPOK_only (darkness3_sv); 2589 SvPOK_only (darkness3_sv);
2067 SvCUR_set (darkness3_sv, sw34 * sh3); 2590 SvCUR_set (darkness3_sv, sw3 * sh3);
2068 2591
2069 mx += self->x - 1; 2592 mx += self->x - 1;
2070 my += self->y - 1; 2593 my += self->y - 1;
2071
2072 memset (darkness1, 255, sw1 * sh1);
2073 2594
2074 for (y = 0; y < sh1; y++) 2595 for (y = 0; y < sh1; y++)
2075 if (0 <= y + my && y + my < self->rows) 2596 if (0 <= y + my && y + my < self->rows)
2076 { 2597 {
2077 maprow *row = self->row + (y + my); 2598 maprow *row = self->row + (y + my);
2080 if (row->c0 <= x + mx && x + mx < row->c1) 2601 if (row->c0 <= x + mx && x + mx < row->c1)
2081 { 2602 {
2082 mapcell *cell = row->col + (x + mx - row->c0); 2603 mapcell *cell = row->col + (x + mx - row->c0);
2083 2604
2084 darkness1 [y * sw1 + x] = cell->darkness 2605 darkness1 [y * sw1 + x] = cell->darkness
2085 ? 255 - (cell->darkness - 1) 2606 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2086 : 255 - FOW_DARKNESS; 2607 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2087 } 2608 }
2088 } 2609 }
2089 2610
2090 for (y = 0; y < sh; ++y) 2611 for (y = 0; y < sh; ++y)
2091 for (x = 0; x < sw; ++x) 2612 for (x = 0; x < sw; ++x)
2110 2631
2111 uint8_t r13 = (d13 + d23 + d12) / 3; 2632 uint8_t r13 = (d13 + d23 + d12) / 3;
2112 uint8_t r23 = d23; 2633 uint8_t r23 = d23;
2113 uint8_t r33 = (d23 + d33 + d32) / 3; 2634 uint8_t r33 = (d23 + d33 + d32) / 3;
2114 2635
2115 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2636 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2116 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2637 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2117 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2118 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2639 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2119 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2640 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2120 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2121 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2642 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2122 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2643 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2123 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2124 } 2645 }
2125 2646
2126 free (darkness1); 2647 free (darkness1);
2127 2648
2128 EXTEND (SP, 3); 2649 EXTEND (SP, 3);
2129 PUSHs (sv_2mortal (newSViv (sw34))); 2650 PUSHs (sv_2mortal (newSViv (sw3)));
2130 PUSHs (sv_2mortal (newSViv (sh3))); 2651 PUSHs (sv_2mortal (newSViv (sh3)));
2131 PUSHs (darkness3_sv); 2652 PUSHs (darkness3_sv);
2132} 2653}
2133 2654
2134SV * 2655SV *
2135get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2656get_rect (DC::Map self, int x0, int y0, int w, int h)
2136 CODE: 2657 CODE:
2137{ 2658{
2138 int x, y, x1, y1; 2659 int x, y, x1, y1;
2139 SV *data_sv = newSV (w * h * 7 + 5); 2660 SV *data_sv = newSV (w * h * 7 + 5);
2140 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2661 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2197 else 2718 else
2198 *data++ = 0; 2719 *data++ = 0;
2199 } 2720 }
2200 } 2721 }
2201 2722
2723 /* if size is w*h + 5 then no data has been found */
2724 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2725 {
2202 SvPOK_only (data_sv); 2726 SvPOK_only (data_sv);
2203 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2727 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2728 }
2729
2204 RETVAL = data_sv; 2730 RETVAL = data_sv;
2205} 2731}
2206 OUTPUT: 2732 OUTPUT:
2207 RETVAL 2733 RETVAL
2208 2734
2209void 2735void
2210set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2736set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2211 PPCODE: 2737 PPCODE:
2212{ 2738{
2213 int x, y, z; 2739 int x, y, z;
2214 int w, h; 2740 int w, h;
2215 int x1, y1; 2741 int x1, y1;
2742 STRLEN len;
2743 uint8_t *data, *end;
2744
2745 len = SvLEN (data_sv);
2746 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2747 data = SvPVbyte_nolen (data_sv);
2748 end = data + len + 8;
2749
2750 if (len < 5)
2751 XSRETURN_EMPTY;
2216 2752
2217 if (*data++ != 0) 2753 if (*data++ != 0)
2218 return; /* version mismatch */ 2754 XSRETURN_EMPTY; /* version mismatch */
2219 2755
2220 w = *data++ << 8; w |= *data++; 2756 w = *data++ << 8; w |= *data++;
2221 h = *data++ << 8; h |= *data++; 2757 h = *data++ << 8; h |= *data++;
2222 2758
2223 // we need to do this 'cause we don't keep an absolute coord system for rows 2759 // we need to do this 'cause we don't keep an absolute coord system for rows
2235 { 2771 {
2236 maprow *row = map_get_row (self, y); 2772 maprow *row = map_get_row (self, y);
2237 2773
2238 for (x = x0; x < x1; x++) 2774 for (x = x0; x < x1; x++)
2239 { 2775 {
2776 uint8_t flags;
2777
2778 if (data + 7 >= end)
2779 XSRETURN_EMPTY;
2780
2240 uint8_t flags = *data++; 2781 flags = *data++;
2241 2782
2242 if (flags) 2783 if (flags)
2243 { 2784 {
2244 mapcell *cell = row_get_cell (row, x); 2785 mapcell *cell = row_get_cell (row, x);
2245 tileid tile[3] = { 0, 0, 0 }; 2786 tileid tile[3] = { 0, 0, 0 };
2248 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2789 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2249 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2790 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2250 2791
2251 if (cell->darkness == 0) 2792 if (cell->darkness == 0)
2252 { 2793 {
2253 cell->darkness = 0; 2794 /*cell->darkness = 0;*/
2795 EXTEND (SP, 3);
2254 2796
2255 for (z = 0; z <= 2; z++) 2797 for (z = 0; z <= 2; z++)
2256 { 2798 {
2257 tileid t = tile [z]; 2799 tileid t = tile [z];
2258 2800
2259 if (t >= self->texs || (t && !self->tex [t].name)) 2801 if (t >= self->texs || (t && !self->tex [t].name))
2260 { 2802 {
2261 XPUSHs (sv_2mortal (newSViv (t))); 2803 PUSHs (sv_2mortal (newSViv (t)));
2262 need_texid (self, t); 2804 need_texid (self, t);
2263 } 2805 }
2264 2806
2265 cell->tile [z] = t; 2807 cell->tile [z] = t;
2266 } 2808 }
2268 } 2810 }
2269 } 2811 }
2270 } 2812 }
2271} 2813}
2272 2814
2273MODULE = CFPlus PACKAGE = CFPlus::RW 2815MODULE = Deliantra::Client PACKAGE = DC::RW
2274 2816
2275CFPlus::RW 2817DC::RW
2276new (SV *class, SV *data_sv) 2818new (SV *class, SV *data_sv)
2277 CODE: 2819 CODE:
2278{ 2820{
2279 STRLEN datalen; 2821 STRLEN datalen;
2280 char *data = SvPVbyte (data_sv, datalen); 2822 char *data = SvPVbyte (data_sv, datalen);
2282 RETVAL = SDL_RWFromConstMem (data, datalen); 2824 RETVAL = SDL_RWFromConstMem (data, datalen);
2283} 2825}
2284 OUTPUT: 2826 OUTPUT:
2285 RETVAL 2827 RETVAL
2286 2828
2287CFPlus::RW 2829DC::RW
2288new_from_file (SV *class, const char *path, const char *mode = "rb") 2830new_from_file (SV *class, const char *path, const char *mode = "rb")
2289 CODE: 2831 CODE:
2290 RETVAL = SDL_RWFromFile (path, mode); 2832 RETVAL = SDL_RWFromFile (path, mode);
2291 OUTPUT: 2833 OUTPUT:
2292 RETVAL 2834 RETVAL
2293 2835
2294# fails on win32: 2836# fails on win32:
2295# CFPlus.xs(2268) : error C2059: syntax error : '(' 2837# dc.xs(2268) : error C2059: syntax error : '('
2296#void 2838#void
2297#close (CFPlus::RW self) 2839#close (DC::RW self)
2298# CODE: 2840# CODE:
2299# (self->(close)) (self); 2841# (self->(close)) (self);
2300 2842
2301MODULE = CFPlus PACKAGE = CFPlus::Channel 2843MODULE = Deliantra::Client PACKAGE = DC::Channel
2302 2844
2303PROTOTYPES: DISABLE 2845PROTOTYPES: DISABLE
2304 2846
2305CFPlus::Channel 2847DC::Channel
2306find () 2848find ()
2307 CODE: 2849 CODE:
2308{ 2850{
2309 RETVAL = Mix_GroupAvailable (-1); 2851 RETVAL = Mix_GroupAvailable (-1);
2310 2852
2311 if (RETVAL < 0) 2853 if (RETVAL < 0)
2312 { 2854 {
2313 RETVAL = Mix_GroupOldest (-1); 2855 RETVAL = Mix_GroupOldest (-1);
2314 2856
2315 if (RETVAL < 0) 2857 if (RETVAL < 0)
2858 {
2859 // happens sometimes, maybe it just stopped playing(?)
2860 RETVAL = Mix_GroupAvailable (-1);
2861
2862 if (RETVAL < 0)
2316 XSRETURN_UNDEF; 2863 XSRETURN_UNDEF;
2317 2864 }
2865 else
2318 Mix_HaltChannel (RETVAL); 2866 Mix_HaltChannel (RETVAL);
2319 } 2867 }
2320 2868
2321 Mix_UnregisterAllEffects (RETVAL); 2869 Mix_UnregisterAllEffects (RETVAL);
2322 Mix_Volume (RETVAL, 128); 2870 Mix_Volume (RETVAL, 128);
2323} 2871}
2324 OUTPUT: 2872 OUTPUT:
2325 RETVAL 2873 RETVAL
2326 2874
2327void 2875void
2328halt (CFPlus::Channel self) 2876halt (DC::Channel self)
2329 CODE: 2877 CODE:
2330 Mix_HaltChannel (self); 2878 Mix_HaltChannel (self);
2331 2879
2332void 2880void
2333expire (CFPlus::Channel self, int ticks = -1) 2881expire (DC::Channel self, int ticks = -1)
2334 CODE: 2882 CODE:
2335 Mix_ExpireChannel (self, ticks); 2883 Mix_ExpireChannel (self, ticks);
2336 2884
2337void 2885void
2338fade_out (CFPlus::Channel self, int ticks = -1) 2886fade_out (DC::Channel self, int ticks = -1)
2339 CODE: 2887 CODE:
2340 Mix_FadeOutChannel (self, ticks); 2888 Mix_FadeOutChannel (self, ticks);
2341 2889
2342int 2890int
2343volume (CFPlus::Channel self, int volume) 2891volume (DC::Channel self, int volume)
2344 CODE: 2892 CODE:
2345 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2893 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2346 OUTPUT: 2894 OUTPUT:
2347 RETVAL 2895 RETVAL
2348 2896
2349void 2897void
2350unregister_all_effects (CFPlus::Channel self) 2898unregister_all_effects (DC::Channel self)
2351 CODE: 2899 CODE:
2352 Mix_UnregisterAllEffects (self); 2900 Mix_UnregisterAllEffects (self);
2353 2901
2354void 2902void
2355set_panning (CFPlus::Channel self, int left, int right) 2903set_panning (DC::Channel self, int left, int right)
2356 CODE: 2904 CODE:
2357 left = CLAMP (left , 0, 255); 2905 left = CLAMP (left , 0, 255);
2358 right = CLAMP (right, 0, 255); 2906 right = CLAMP (right, 0, 255);
2359 Mix_SetPanning (self, left, right); 2907 Mix_SetPanning (self, left, right);
2360 2908
2361void 2909void
2362set_distance (CFPlus::Channel self, int distance) 2910set_distance (DC::Channel self, int distance)
2363 CODE: 2911 CODE:
2364 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2912 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2365 2913
2366void 2914void
2367set_position (CFPlus::Channel self, int angle, int distance) 2915set_position (DC::Channel self, int angle, int distance)
2368 CODE: 2916 CODE:
2369 2917
2370void 2918void
2371set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2919set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2372 CODE: 2920 CODE:
2373{ 2921{
2374 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2922 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2375 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2923 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2376 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2924 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377} 2925}
2378 2926
2379void 2927void
2380set_reverse_stereo (CFPlus::Channel self, int flip) 2928set_reverse_stereo (DC::Channel self, int flip)
2381 CODE: 2929 CODE:
2382 Mix_SetReverseStereo (self, flip); 2930 Mix_SetReverseStereo (self, flip);
2383 2931
2384MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2932MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2385 2933
2386PROTOTYPES: DISABLE 2934PROTOTYPES: DISABLE
2387 2935
2936void
2937decoders ()
2938 PPCODE:
2939#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2940 int i, num = Mix_GetNumChunkDecoders ();
2941 EXTEND (SP, num);
2942 for (i = 0; i < num; ++i)
2943 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2944#else
2945 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2946#endif
2947
2388CFPlus::MixChunk 2948DC::MixChunk
2389new (SV *class, CFPlus::RW rwops) 2949new (SV *class, DC::RW rwops)
2390 CODE: 2950 CODE:
2391 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2951 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2392 OUTPUT: 2952 OUTPUT:
2393 RETVAL 2953 RETVAL
2394 2954
2395void 2955void
2396DESTROY (CFPlus::MixChunk self) 2956DESTROY (DC::MixChunk self)
2397 CODE: 2957 CODE:
2398 Mix_FreeChunk (self); 2958 Mix_FreeChunk (self);
2399 2959
2400int 2960int
2401volume (CFPlus::MixChunk self, int volume = -1) 2961volume (DC::MixChunk self, int volume = -1)
2402 CODE: 2962 CODE:
2403 if (items > 1) 2963 if (items > 1)
2404 volume = CLAMP (volume, 0, 128); 2964 volume = CLAMP (volume, 0, 128);
2405 RETVAL = Mix_VolumeChunk (self, volume); 2965 RETVAL = Mix_VolumeChunk (self, volume);
2406 OUTPUT: 2966 OUTPUT:
2407 RETVAL 2967 RETVAL
2408 2968
2409CFPlus::Channel 2969DC::Channel
2410play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2970play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2411 CODE: 2971 CODE:
2412{ 2972{
2413 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2973 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2414 2974
2415 if (RETVAL < 0) 2975 if (RETVAL < 0)
2422 } 2982 }
2423} 2983}
2424 OUTPUT: 2984 OUTPUT:
2425 RETVAL 2985 RETVAL
2426 2986
2427MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2987MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2988
2989void
2990decoders ()
2991 PPCODE:
2992#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2993 int i, num = Mix_GetNumMusicDecoders ();
2994 EXTEND (SP, num);
2995 for (i = 0; i < num; ++i)
2996 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2997#else
2998 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2999#endif
2428 3000
2429int 3001int
2430volume (int volume = -1) 3002volume (int volume = -1)
2431 PROTOTYPE: ;$ 3003 PROTOTYPE: ;$
2432 CODE: 3004 CODE:
2444void 3016void
2445halt () 3017halt ()
2446 CODE: 3018 CODE:
2447 Mix_HaltMusic (); 3019 Mix_HaltMusic ();
2448 3020
3021int
3022playing ()
3023 CODE:
3024 RETVAL = Mix_PlayingMusic ();
3025 OUTPUT:
3026 RETVAL
3027
2449CFPlus::MixMusic 3028DC::MixMusic
2450new (SV *class, CFPlus::RW rwops) 3029new (SV *class, DC::RW rwops)
2451 CODE: 3030 CODE:
2452 RETVAL = Mix_LoadMUS_RW (rwops); 3031 RETVAL = Mix_LoadMUS_RW (rwops);
2453 OUTPUT: 3032 OUTPUT:
2454 RETVAL 3033 RETVAL
2455 3034
2456void 3035void
2457DESTROY (CFPlus::MixMusic self) 3036DESTROY (DC::MixMusic self)
2458 CODE: 3037 CODE:
2459 Mix_FreeMusic (self); 3038 Mix_FreeMusic (self);
2460 3039
2461int 3040int
2462play (CFPlus::MixMusic self, int loops = -1) 3041play (DC::MixMusic self, int loops = -1)
2463 CODE: 3042 CODE:
2464 RETVAL = Mix_PlayMusic (self, loops); 3043 RETVAL = Mix_PlayMusic (self, loops);
2465 OUTPUT: 3044 OUTPUT:
2466 RETVAL 3045 RETVAL
2467 3046
2468void 3047void
2469fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3048fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2470 CODE: 3049 CODE:
2471 Mix_FadeInMusicPos (self, loops, ms, position); 3050 Mix_FadeInMusicPos (self, loops, ms, position);
2472 3051
2473MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3052MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2474 3053
2475PROTOTYPES: ENABLE 3054PROTOTYPES: ENABLE
2476 3055
2477BOOT: 3056BOOT:
2478{ 3057{
2479 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3058 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2480 static const struct { 3059 static const struct {
2481 const char *name; 3060 const char *name;
2482 IV iv; 3061 IV iv;
2483 } *civ, const_iv[] = { 3062 } *civ, const_iv[] = {
2484# define const_iv(name) { # name, (IV)name } 3063# define const_iv(name) { # name, (IV)name }
2485 const_iv (GL_VENDOR), 3064 const_iv (GL_VENDOR),
2486 const_iv (GL_VERSION), 3065 const_iv (GL_VERSION),
2487 const_iv (GL_EXTENSIONS), 3066 const_iv (GL_EXTENSIONS),
3067 const_iv (GL_MAX_TEXTURE_UNITS),
2488 const_iv (GL_COLOR_MATERIAL), 3068 const_iv (GL_COLOR_MATERIAL),
2489 const_iv (GL_SMOOTH), 3069 const_iv (GL_SMOOTH),
2490 const_iv (GL_FLAT), 3070 const_iv (GL_FLAT),
2491 const_iv (GL_DITHER), 3071 const_iv (GL_DITHER),
2492 const_iv (GL_BLEND), 3072 const_iv (GL_BLEND),
2504 const_iv (GL_ZERO), 3084 const_iv (GL_ZERO),
2505 const_iv (GL_SRC_ALPHA), 3085 const_iv (GL_SRC_ALPHA),
2506 const_iv (GL_DST_ALPHA), 3086 const_iv (GL_DST_ALPHA),
2507 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3087 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2508 const_iv (GL_ONE_MINUS_DST_ALPHA), 3088 const_iv (GL_ONE_MINUS_DST_ALPHA),
3089 const_iv (GL_SRC_COLOR),
3090 const_iv (GL_DST_COLOR),
3091 const_iv (GL_ONE_MINUS_SRC_COLOR),
3092 const_iv (GL_ONE_MINUS_DST_COLOR),
2509 const_iv (GL_SRC_ALPHA_SATURATE), 3093 const_iv (GL_SRC_ALPHA_SATURATE),
2510 const_iv (GL_RGB), 3094 const_iv (GL_RGB),
2511 const_iv (GL_RGBA), 3095 const_iv (GL_RGBA),
2512 const_iv (GL_RGBA4), 3096 const_iv (GL_RGBA4),
2513 const_iv (GL_RGBA8), 3097 const_iv (GL_RGBA8),
2519 const_iv (GL_INTENSITY), 3103 const_iv (GL_INTENSITY),
2520 const_iv (GL_LUMINANCE), 3104 const_iv (GL_LUMINANCE),
2521 const_iv (GL_LUMINANCE_ALPHA), 3105 const_iv (GL_LUMINANCE_ALPHA),
2522 const_iv (GL_FLOAT), 3106 const_iv (GL_FLOAT),
2523 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3107 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3108 const_iv (GL_COMPRESSED_ALPHA_ARB),
3109 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3110 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3111 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3112 const_iv (GL_COMPRESSED_RGB_ARB),
3113 const_iv (GL_COMPRESSED_RGBA_ARB),
2524 const_iv (GL_COMPILE), 3114 const_iv (GL_COMPILE),
2525 const_iv (GL_PROXY_TEXTURE_1D), 3115 const_iv (GL_PROXY_TEXTURE_1D),
2526 const_iv (GL_PROXY_TEXTURE_2D), 3116 const_iv (GL_PROXY_TEXTURE_2D),
2527 const_iv (GL_TEXTURE_1D), 3117 const_iv (GL_TEXTURE_1D),
2528 const_iv (GL_TEXTURE_2D), 3118 const_iv (GL_TEXTURE_2D),
2567 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3157 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2568 const_iv (GL_POINT_SMOOTH_HINT), 3158 const_iv (GL_POINT_SMOOTH_HINT),
2569 const_iv (GL_LINE_SMOOTH_HINT), 3159 const_iv (GL_LINE_SMOOTH_HINT),
2570 const_iv (GL_POLYGON_SMOOTH_HINT), 3160 const_iv (GL_POLYGON_SMOOTH_HINT),
2571 const_iv (GL_GENERATE_MIPMAP_HINT), 3161 const_iv (GL_GENERATE_MIPMAP_HINT),
3162 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2572 const_iv (GL_FASTEST), 3163 const_iv (GL_FASTEST),
2573 const_iv (GL_DONT_CARE), 3164 const_iv (GL_DONT_CARE),
2574 const_iv (GL_NICEST), 3165 const_iv (GL_NICEST),
2575 const_iv (GL_V2F), 3166 const_iv (GL_V2F),
2576 const_iv (GL_V3F), 3167 const_iv (GL_V3F),
2577 const_iv (GL_T2F_V3F), 3168 const_iv (GL_T2F_V3F),
2578 const_iv (GL_T2F_N3F_V3F), 3169 const_iv (GL_T2F_N3F_V3F),
3170 const_iv (GL_FUNC_ADD),
3171 const_iv (GL_FUNC_SUBTRACT),
3172 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2579# undef const_iv 3173# undef const_iv
2580 }; 3174 };
2581 3175
2582 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3176 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2583 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3177 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2584 3178
2585 texture_av = newAV (); 3179 texture_av = newAV ();
2586 AvREAL_off (texture_av); 3180 AvREAL_off (texture_av);
2587} 3181}
3182
3183void
3184disable_GL_EXT_blend_func_separate ()
3185 CODE:
3186 gl.BlendFuncSeparate = 0;
3187 gl.BlendFuncSeparateEXT = 0;
3188
3189void
3190apple_nvidia_bug (int enable)
2588 3191
2589char * 3192char *
2590gl_vendor () 3193gl_vendor ()
2591 CODE: 3194 CODE:
2592 RETVAL = (char *)glGetString (GL_VENDOR); 3195 RETVAL = (char *)glGetString (GL_VENDOR);
2623 3226
2624int glGetError () 3227int glGetError ()
2625 3228
2626void glFinish () 3229void glFinish ()
2627 3230
3231void glFlush ()
3232
2628void glClear (int mask) 3233void glClear (int mask)
2629 3234
2630void glClearColor (float r, float g, float b, float a = 1.0) 3235void glClearColor (float r, float g, float b, float a = 1.0)
2631 PROTOTYPE: @ 3236 PROTOTYPE: @
2632 3237
2641void glBlendFunc (int sfactor, int dfactor) 3246void glBlendFunc (int sfactor, int dfactor)
2642 3247
2643void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3248void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2644 CODE: 3249 CODE:
2645 gl_BlendFuncSeparate (sa, da, saa, daa); 3250 gl_BlendFuncSeparate (sa, da, saa, daa);
3251
3252# void glBlendEquation (int se)
2646 3253
2647void glDepthMask (int flag) 3254void glDepthMask (int flag)
2648 3255
2649void glLogicOp (int opcode) 3256void glLogicOp (int opcode)
2650 3257
2685void glRotate (float angle, float x, float y, float z) 3292void glRotate (float angle, float x, float y, float z)
2686 CODE: 3293 CODE:
2687 glRotatef (angle, x, y, z); 3294 glRotatef (angle, x, y, z);
2688 3295
2689void glColor (float r, float g, float b, float a = 1.0) 3296void glColor (float r, float g, float b, float a = 1.0)
3297 PROTOTYPE: @
2690 ALIAS: 3298 ALIAS:
2691 glColor_premultiply = 1 3299 glColor_premultiply = 1
2692 CODE: 3300 CODE:
2693 if (ix) 3301 if (ix)
2694 { 3302 {
2714 3322
2715void glRect (float x1, float y1, float x2, float y2) 3323void glRect (float x1, float y1, float x2, float y2)
2716 CODE: 3324 CODE:
2717 glRectf (x1, y1, x2, y2); 3325 glRectf (x1, y1, x2, y2);
2718 3326
3327void glRect_lineloop (float x1, float y1, float x2, float y2)
3328 CODE:
3329 glBegin (GL_LINE_LOOP);
3330 glVertex2f (x1, y1);
3331 glVertex2f (x2, y1);
3332 glVertex2f (x2, y2);
3333 glVertex2f (x1, y2);
3334 glEnd ();
3335
2719PROTOTYPES: ENABLE 3336PROTOTYPES: ENABLE
2720 3337
2721void glBegin (int mode) 3338void glBegin (int mode)
2722 3339
2723void glEnd () 3340void glEnd ()
2755void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3372void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2756 CODE: 3373 CODE:
2757 if (gl.SeparableFilter2D) 3374 if (gl.SeparableFilter2D)
2758 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3375 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2759 3376
2760void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3377void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2761 3378
2762void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3379void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2763 3380
2764void glDrawPixels (int width, int height, int format, int type, char *pixels) 3381void glDrawPixels (int width, int height, int format, int type, char *pixels)
2765 3382
2791 3408
2792void glEndList () 3409void glEndList ()
2793 3410
2794void glCallList (int list) 3411void glCallList (int list)
2795 3412
2796MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3413void c_init ()
3414 CODE:
3415 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3416 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3417
3418MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2797 3419
2798PROTOTYPES: DISABLE 3420PROTOTYPES: DISABLE
2799 3421
2800void 3422void
2801find_widget (SV *self, NV x, NV y) 3423find_widget (SV *self, NV x, NV y)
2805 XPUSHs (self); 3427 XPUSHs (self);
2806} 3428}
2807 3429
2808BOOT: 3430BOOT:
2809{ 3431{
2810 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3432 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2811 3433
2812 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3434 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2813 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3435 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2814 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3436 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2815 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3437 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2816} 3438}
2817 3439
2818void 3440void
2819draw (SV *self) 3441draw (SV *self)
2820 CODE: 3442 CODE:
2824 NV x, y, w, h; 3446 NV x, y, w, h;
2825 SV *draw_x_sv = GvSV (draw_x_gv); 3447 SV *draw_x_sv = GvSV (draw_x_gv);
2826 SV *draw_y_sv = GvSV (draw_y_gv); 3448 SV *draw_y_sv = GvSV (draw_y_gv);
2827 SV *draw_w_sv = GvSV (draw_w_gv); 3449 SV *draw_w_sv = GvSV (draw_w_gv);
2828 SV *draw_h_sv = GvSV (draw_h_gv); 3450 SV *draw_h_sv = GvSV (draw_h_gv);
2829 SV *hover;
2830 double draw_x, draw_y, draw_w, draw_h; 3451 double draw_x, draw_y;
2831 3452
2832 if (!SvROK (self)) 3453 if (!SvROK (self))
2833 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3454 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2834 3455
2835 hv = (HV *)SvRV (self); 3456 hv = (HV *)SvRV (self);
2836 3457
2837 if (SvTYPE (hv) != SVt_PVHV) 3458 if (SvTYPE (hv) != SVt_PVHV)
2838 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3459 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2839 3460
2840 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3461 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2841 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3462 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2842 3463
2843 if (!h || !w) 3464 if (!h || !w)
2863 { 3484 {
2864 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3485 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2865 3486
2866 if (svp && SvTRUE (*svp)) 3487 if (svp && SvTRUE (*svp))
2867 { 3488 {
2868 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3489 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2869 glEnable (GL_BLEND); 3490 glEnable (GL_BLEND);
2870 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3491 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2871 glBegin (GL_QUADS); 3492 glBegin (GL_QUADS);
2872 glVertex2f (0, 0); 3493 glVertex2f (0, 0);
2873 glVertex2f (w, 0); 3494 glVertex2f (w, 0);
2876 glEnd (); 3497 glEnd ();
2877 glDisable (GL_BLEND); 3498 glDisable (GL_BLEND);
2878 } 3499 }
2879 } 3500 }
2880#if 0 3501#if 0
2881 if ($ENV{CFPLUS_DEBUG} & 1) { 3502 // draw borders, for debugging
2882 glPushMatrix; 3503 glPushMatrix ();
2883 glColor 1, 1, 0, 1; 3504 glColor4f (1., 1., 0., 1.);
2884 glTranslate 0.375, 0.375; 3505 glTranslatef (.5, .5, 0.);
2885 glBegin GL_LINE_LOOP; 3506 glBegin (GL_LINE_LOOP);
2886 glVertex 0 , 0; 3507 glVertex2f (0 , 0);
2887 glVertex $self->{w} - 1, 0; 3508 glVertex2f (w - 1, 0);
2888 glVertex $self->{w} - 1, $self->{h} - 1; 3509 glVertex2f (w - 1, h - 1);
2889 glVertex 0 , $self->{h} - 1; 3510 glVertex2f (0 , h - 1);
2890 glEnd; 3511 glEnd ();
2891 glPopMatrix; 3512 glPopMatrix ();
2892 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2893 }
2894#endif 3513#endif
2895 PUSHMARK (SP); 3514 PUSHMARK (SP);
2896 XPUSHs (self); 3515 XPUSHs (self);
2897 PUTBACK; 3516 PUTBACK;
2898 call_method ("_draw", G_VOID | G_DISCARD); 3517 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines