ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines