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.310 by root, Tue Dec 27 07:23:33 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
731char * 971char *
732SDL_GetKeyName (int sym) 972SDL_GetKeyName (int sym)
733 973
734int 974int
735SDL_GetAppState () 975SDL_GetAppState ()
976
977int
978SDL_GetModState ()
736 979
737void 980void
738poll_events () 981poll_events ()
739 PPCODE: 982 PPCODE:
740{ 983{
750 { 993 {
751 case SDL_KEYDOWN: 994 case SDL_KEYDOWN:
752 case SDL_KEYUP: 995 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 996 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 997 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 998 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 */ 999 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); 1000 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 1001 break;
759 1002
760 case SDL_ACTIVEEVENT: 1003 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1004 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 1022 x = ev.motion.x;
780 y = ev.motion.y; 1023 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1024 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 1025 }
783 1026
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1027 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 1028 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 1029 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 1030 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1031 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1032 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 1033 }
791 break; 1034 break;
792 1035
793 case SDL_MOUSEBUTTONDOWN: 1036 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 1037 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1038 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 1039
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1040 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1041 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1042 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1043 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1048 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1049 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 1050 break;
808 } 1051 }
809 1052
810 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1053 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
811 } 1054 }
812} 1055}
813 1056
1057char *
1058SDL_AudioDriverName ()
1059 CODE:
1060{
1061 char buf [256];
1062 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1063 XSRETURN_UNDEF;
1064
1065 RETVAL = buf;
1066}
1067 OUTPUT:
1068 RETVAL
1069
814int 1070int
815Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1071Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816 POSTCALL: 1072 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 1073 Mix_HookMusicFinished (music_finished);
818 Mix_ChannelFinished (channel_finished); 1074 Mix_ChannelFinished (channel_finished);
1075
1076void
1077Mix_QuerySpec ()
1078 PPCODE:
1079{
1080 int freq, channels;
1081 Uint16 format;
1082
1083 if (Mix_QuerySpec (&freq, &format, &channels))
1084 {
1085 EXTEND (SP, 3);
1086 PUSHs (sv_2mortal (newSViv (freq)));
1087 PUSHs (sv_2mortal (newSViv (format)));
1088 PUSHs (sv_2mortal (newSViv (channels)));
1089 }
1090}
819 1091
820void 1092void
821Mix_CloseAudio () 1093Mix_CloseAudio ()
822 1094
823int 1095int
858 } 1130 }
859 } 1131 }
860#endif 1132#endif
861} 1133}
862 1134
863void 1135int
864add_font (char *file) 1136add_font (char *file)
865 CODE: 1137 CODE:
866 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1138 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1139 OUTPUT:
1140 RETVAL
1141
1142void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1144
1145void
1146Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_MP3 | MIX_INIT_OGG)
867 1147
868void 1148void
869load_image_inline (SV *image_) 1149load_image_inline (SV *image_)
870 ALIAS: 1150 ALIAS:
871 load_image_file = 1 1151 load_image_file = 1
957void 1237void
958error (char *message) 1238error (char *message)
959 CODE: 1239 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1240 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1241#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1242 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1243#endif
964 1244
965void 1245void
966fatal (char *message) 1246fatal (char *message)
967 CODE: 1247 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1248 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1249#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1250 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1251#endif
972 _exit (1); 1252 _exit (1);
973 1253
974void 1254void
975_exit (int retval = 0) 1255_exit (int retval = 0)
987#if DEBUG 1267#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1268 VALGRIND_DO_LEAK_CHECK;
989#endif 1269#endif
990} 1270}
991 1271
992MODULE = CFPlus PACKAGE = CFPlus::Font 1272int
1273SvREFCNT (SV *sv)
1274 CODE:
1275 RETVAL = SvREFCNT (sv);
1276 OUTPUT:
1277 RETVAL
1278
1279MODULE = Deliantra::Client PACKAGE = DC::Font
993 1280
994PROTOTYPES: DISABLE 1281PROTOTYPES: DISABLE
995 1282
996CFPlus::Font 1283DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1284new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1285 CODE:
999{ 1286{
1000 int count; 1287 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1288 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1291}
1005 OUTPUT: 1292 OUTPUT:
1006 RETVAL 1293 RETVAL
1007 1294
1008void 1295void
1009DESTROY (CFPlus::Font self) 1296DESTROY (DC::Font self)
1010 CODE: 1297 CODE:
1011 pango_font_description_free (self); 1298 pango_font_description_free (self);
1012 1299
1013void 1300void
1014make_default (CFPlus::Font self) 1301make_default (DC::Font self)
1015 PROTOTYPE: $ 1302 PROTOTYPE: $
1016 CODE: 1303 CODE:
1017 default_font = self; 1304 default_font = self;
1018 1305
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1306MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1307
1021PROTOTYPES: DISABLE 1308PROTOTYPES: DISABLE
1022 1309
1023void 1310void
1024reset_glyph_cache () 1311glyph_cache_backup ()
1025 PROTOTYPE: 1312 PROTOTYPE:
1026 CODE: 1313 CODE:
1314 tc_backup ();
1315
1316void
1317glyph_cache_restore ()
1318 PROTOTYPE:
1319 CODE:
1027 tc_clear (); 1320 tc_restore ();
1028 1321
1029CFPlus::Layout 1322DC::Layout
1030new (SV *class) 1323new (SV *class)
1031 CODE: 1324 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1325 New (0, RETVAL, 1, struct cf_layout);
1033 1326
1034 RETVAL->pl = pango_layout_new (opengl_context); 1327 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1329 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1330 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1331 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1332 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1333 RETVAL->font = 0;
1334 RETVAL->rc = rc_alloc ();
1041 1335
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1336 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1337 layout_update_font (RETVAL);
1044 OUTPUT: 1338 OUTPUT:
1045 RETVAL 1339 RETVAL
1046 1340
1047void 1341void
1048DESTROY (CFPlus::Layout self) 1342DESTROY (DC::Layout self)
1049 CODE: 1343 CODE:
1050 g_object_unref (self->pl); 1344 g_object_unref (self->pl);
1345 rc_free (self->rc);
1051 Safefree (self); 1346 Safefree (self);
1052 1347
1053void 1348void
1054set_text (CFPlus::Layout self, SV *text_) 1349set_text (DC::Layout self, SV *text_)
1055 CODE: 1350 CODE:
1056{ 1351{
1057 STRLEN textlen; 1352 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1353 char *text = SvPVutf8 (text_, textlen);
1059 1354
1060 pango_layout_set_text (self->pl, text, textlen); 1355 pango_layout_set_text (self->pl, text, textlen);
1061} 1356}
1062 1357
1063void 1358void
1064set_markup (CFPlus::Layout self, SV *text_) 1359set_markup (DC::Layout self, SV *text_)
1065 CODE: 1360 CODE:
1066{ 1361{
1067 STRLEN textlen; 1362 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1363 char *text = SvPVutf8 (text_, textlen);
1069 1364
1070 pango_layout_set_markup (self->pl, text, textlen); 1365 pango_layout_set_markup (self->pl, text, textlen);
1071} 1366}
1072 1367
1073void 1368void
1074set_shapes (CFPlus::Layout self, ...) 1369set_shapes (DC::Layout self, ...)
1075 CODE: 1370 CODE:
1076{ 1371{
1077 PangoAttrList *attrs = 0; 1372 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1373 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1374 const char *pos = text;
1114 if (attrs) 1409 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1410 pango_layout_set_attributes (self->pl, attrs);
1116} 1411}
1117 1412
1118void 1413void
1119get_shapes (CFPlus::Layout self) 1414get_shapes (DC::Layout self)
1120 PPCODE: 1415 PPCODE:
1121{ 1416{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1417 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1418
1124 do 1419 do
1125 { 1420 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1421 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1422
1128 if (run && shape_attr_p (run)) 1423 if (run && shape_attr_p (run))
1129 { 1424 {
1130 PangoRectangle extents; 1425 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1426 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1434
1140 pango_layout_iter_free (iter); 1435 pango_layout_iter_free (iter);
1141} 1436}
1142 1437
1143int 1438int
1144has_wrapped (CFPlus::Layout self) 1439has_wrapped (DC::Layout self)
1145 CODE: 1440 CODE:
1146{ 1441{
1147 int lines = 1; 1442 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1443 const char *text = pango_layout_get_text (self->pl);
1149 1444
1154} 1449}
1155 OUTPUT: 1450 OUTPUT:
1156 RETVAL 1451 RETVAL
1157 1452
1158SV * 1453SV *
1159get_text (CFPlus::Layout self) 1454get_text (DC::Layout self)
1160 CODE: 1455 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1456 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1457 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1458 OUTPUT:
1164 RETVAL 1459 RETVAL
1165 1460
1166void 1461void
1167set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1462set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168 CODE: 1463 CODE:
1169 self->r = r; 1464 self->r = r;
1170 self->g = g; 1465 self->g = g;
1171 self->b = b; 1466 self->b = b;
1172 self->a = a; 1467 self->a = a;
1173 1468
1174void 1469void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1470set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1471 CODE:
1177 if (self->font != font) 1472 if (self->font != font)
1178 { 1473 {
1179 self->font = font; 1474 self->font = font;
1180 layout_update_font (self); 1475 layout_update_font (self);
1181 } 1476 }
1182 1477
1183void 1478void
1184set_height (CFPlus::Layout self, int base_height) 1479set_height (DC::Layout self, int base_height)
1185 CODE: 1480 CODE:
1186 if (self->base_height != base_height) 1481 if (self->base_height != base_height)
1187 { 1482 {
1188 self->base_height = base_height; 1483 self->base_height = base_height;
1189 layout_update_font (self); 1484 layout_update_font (self);
1190 } 1485 }
1191 1486
1192void 1487void
1193set_width (CFPlus::Layout self, int max_width = -1) 1488set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1489 CODE:
1195 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1490 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196 1491
1197void 1492void
1198set_indent (CFPlus::Layout self, int indent) 1493set_indent (DC::Layout self, int indent)
1199 CODE: 1494 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1495 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1496
1202void 1497void
1203set_spacing (CFPlus::Layout self, int spacing) 1498set_spacing (DC::Layout self, int spacing)
1204 CODE: 1499 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1500 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1501
1207void 1502void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1503set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1504 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1505 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1506 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1507 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1508 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1509 : PANGO_ELLIPSIZE_NONE
1215 ); 1510 );
1216 1511
1217void 1512void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1513set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1514 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1515 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1516
1222void 1517void
1223size (CFPlus::Layout self) 1518size (DC::Layout self)
1224 PPCODE: 1519 PPCODE:
1225{ 1520{
1226 int w, h; 1521 int w, h;
1227 1522
1228 layout_get_pixel_size (self, &w, &h); 1523 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1526 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1527 PUSHs (sv_2mortal (newSViv (h)));
1233} 1528}
1234 1529
1235int 1530int
1236descent (CFPlus::Layout self) 1531descent (DC::Layout self)
1237 CODE: 1532 CODE:
1238{ 1533{
1239 PangoRectangle rect; 1534 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1535 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1536 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1537 RETVAL = PANGO_DESCENT (rect);
1243} 1538}
1244 OUTPUT: 1539 OUTPUT:
1245 RETVAL 1540 RETVAL
1246 1541
1247int 1542int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1543xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1544 CODE:
1250{ 1545{
1251 int index, trailing; 1546 int index, trailing;
1252 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1547 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253 RETVAL = index + trailing; 1548 RETVAL = index + trailing;
1254} 1549}
1255 OUTPUT: 1550 OUTPUT:
1256 RETVAL 1551 RETVAL
1257 1552
1258void 1553void
1259cursor_pos (CFPlus::Layout self, int index) 1554cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1555 PPCODE:
1261{ 1556{
1262 PangoRectangle strong_pos; 1557 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1558 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1559
1265 EXTEND (SP, 3); 1560 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1561 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1562 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1563 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1564}
1270 1565
1271void 1566void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1567index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1568 PPCODE:
1274{ 1569{
1275 int line, x; 1570 int line, x;
1276 1571
1277 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1572 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1573#if !PANGO_VERSION_CHECK (1, 17, 3)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1574 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1575 --line;
1576#endif
1280 EXTEND (SP, 2); 1577 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1578 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1579 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1580}
1284 1581
1285void 1582void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1583line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1584 PPCODE:
1288{ 1585{
1289 PangoLayoutLine *lp; 1586 PangoLayoutLine *lp;
1290 int index, trailing; 1587 int index, trailing;
1291 1588
1292 if (line < 0) 1589 if (line < 0)
1293 XSRETURN_EMPTY; 1590 XSRETURN_EMPTY;
1294 1591
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1592 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1593 XSRETURN_EMPTY; /* do better */
1297 1594
1298 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1595 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1299 1596
1300 EXTEND (SP, 2); 1597 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1603 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1604 }
1308} 1605}
1309 1606
1310void 1607void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1608render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1609 CODE:
1610 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1611 pango_opengl_render_layout_subpixel (
1314 self->pl, 1612 self->pl,
1613 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1614 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1615 self->r, self->g, self->b, self->a,
1317 flags 1616 flags
1318 ); 1617 );
1618 // we assume that context_change actually clears/frees stuff
1619 // and does not do any recomputation...
1620 pango_layout_context_changed (self->pl);
1319 1621
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1622void
1623draw (DC::Layout self)
1624 CODE:
1625{
1626 glEnable (GL_TEXTURE_2D);
1627 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1628 glEnable (GL_BLEND);
1629 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1630 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1631 glEnable (GL_ALPHA_TEST);
1632 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1633
1634 rc_draw (self->rc);
1635
1636 glDisable (GL_ALPHA_TEST);
1637 glDisable (GL_BLEND);
1638 glDisable (GL_TEXTURE_2D);
1639}
1640
1641MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1642
1322PROTOTYPES: ENABLE 1643PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1644
1326void 1645void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1646pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1647 CODE:
1329{ 1648{
1395 glDisable (GL_ALPHA_TEST); 1714 glDisable (GL_ALPHA_TEST);
1396 glDisable (GL_BLEND); 1715 glDisable (GL_BLEND);
1397 } 1716 }
1398} 1717}
1399 1718
1719void
1720draw_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)
1721 PROTOTYPE: @
1722 CODE:
1723{
1724 glEnable (GL_BLEND);
1725 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1726 glEnable (GL_TEXTURE_2D);
1727 glBindTexture (GL_TEXTURE_2D, name1);
1728
1729 glColor3f (intensity, intensity, intensity);
1730 glPushMatrix ();
1731 glScalef (1./3, 1./3, 1.);
1732
1733 if (blend > 0.f)
1734 {
1735 float dx3 = dx * -3.f / w;
1736 float dy3 = dy * -3.f / h;
1737 GLfloat env_color[4] = { 0., 0., 0., blend };
1738
1739 /* interpolate the two shadow textures */
1740 /* stage 0 == rgb(glcolor) + alpha(t0) */
1741 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1742
1743 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1744 gl.ActiveTexture (GL_TEXTURE1);
1745 glEnable (GL_TEXTURE_2D);
1746 glBindTexture (GL_TEXTURE_2D, name2);
1747 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1748
1749 /* rgb == rgb(glcolor) */
1750 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1751 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1752 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1753
1754 /* alpha = interpolate t0, t1 by env_alpha */
1755 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1756
1757 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1758 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1760
1761 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1763
1764 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1765 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1766
1767 glBegin (GL_QUADS);
1768 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1769 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1770 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1771 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1772 glEnd ();
1773
1774 glDisable (GL_TEXTURE_2D);
1775 gl.ActiveTexture (GL_TEXTURE0);
1776 }
1777 else
1778 {
1779 /* simple blending of one texture, also opengl <1.3 path */
1780 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1781
1782 glBegin (GL_QUADS);
1783 glTexCoord2f (0, 0); glVertex2f (0, 0);
1784 glTexCoord2f (0, t); glVertex2f (0, h);
1785 glTexCoord2f (s, t); glVertex2f (w, h);
1786 glTexCoord2f (s, 0); glVertex2f (w, 0);
1787 glEnd ();
1788 }
1789
1790 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1791 {
1792 int x, y;
1793 int dx3 = dx * 3;
1794 int dy3 = dy * 3;
1795
1796 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1797 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1798 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1799 glTranslatef (-1., -1., 0);
1800 glBegin (GL_QUADS);
1801
1802 for (y = 1; y < h; y += 3)
1803 {
1804 int y1 = y - dy3;
1805 int y1valid = y1 >= 0 && y1 < h;
1806
1807 for (x = 1; x < w; x += 3)
1808 {
1809 int x1 = x - dx3;
1810 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1811 uint8_t h2;
1812
1813 if (y1valid && x1 >= 0 && x1 < w)
1814 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1815 else
1816 h2 = 1; /* out of range == invisible */
1817
1818 if (h1 || h2)
1819 {
1820 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1821 glColor4f (1., 1., 1., alpha);
1822
1823 glTexCoord2f (0, 0.); glVertex2i (x , y );
1824 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1825 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1826 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1827 }
1828 }
1829 }
1830 }
1831
1832 glEnd ();
1833
1834 glPopMatrix ();
1835
1836 glDisable (GL_TEXTURE_2D);
1837 glDisable (GL_BLEND);
1838}
1839
1400IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1840IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1401 CODE: 1841 CODE:
1402{ 1842{
1403 GLint width; 1843 GLint width;
1404 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1844 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1406 RETVAL = width > 0; 1846 RETVAL = width > 0;
1407} 1847}
1408 OUTPUT: 1848 OUTPUT:
1409 RETVAL 1849 RETVAL
1410 1850
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1851MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1852
1413PROTOTYPES: DISABLE 1853PROTOTYPES: DISABLE
1414 1854
1415CFPlus::Map 1855DC::Map
1416new (SV *class) 1856new (SV *class)
1417 CODE: 1857 CODE:
1418 New (0, RETVAL, 1, struct map); 1858 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1859 RETVAL->x = 0;
1420 RETVAL->y = 0; 1860 RETVAL->y = 0;
1428 RETVAL->row = 0; 1868 RETVAL->row = 0;
1429 OUTPUT: 1869 OUTPUT:
1430 RETVAL 1870 RETVAL
1431 1871
1432void 1872void
1433DESTROY (CFPlus::Map self) 1873DESTROY (DC::Map self)
1434 CODE: 1874 CODE:
1435{ 1875{
1436 map_clear (self); 1876 map_clear (self);
1437 Safefree (self->face2tile); 1877 Safefree (self->face2tile);
1438 Safefree (self->tex); 1878 Safefree (self->tex);
1439 Safefree (self); 1879 Safefree (self);
1440} 1880}
1441 1881
1442void 1882void
1443resize (CFPlus::Map self, int map_width, int map_height) 1883resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1884 CODE:
1445 self->w = map_width; 1885 self->w = map_width;
1446 self->h = map_height; 1886 self->h = map_height;
1447 1887
1448void 1888void
1449clear (CFPlus::Map self) 1889clear (DC::Map self)
1450 CODE: 1890 CODE:
1451 map_clear (self); 1891 map_clear (self);
1452 1892
1453void 1893void
1454set_tileid (CFPlus::Map self, int face, int tile) 1894set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1895 CODE:
1456{ 1896{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1897 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1898 need_texid (self, tile);
1459} 1899}
1460 1900
1461void 1901void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1902set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1903 CODE:
1464{ 1904{
1465 tileid texid; 1905 tileid texid;
1466 maptex *tex; 1906 maptex *tex;
1467 1907
1480 tex->smoothtile = self->face2tile [smooth]; 1920 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1921 tex->smoothlevel = level;
1482} 1922}
1483 1923
1484void 1924void
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) 1925set_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: 1926 CODE:
1487{ 1927{
1488 need_texid (self, texid); 1928 need_texid (self, texid);
1489 1929
1490 { 1930 {
1509 // use uglier nearest interpolation because linear suffers 1949 // use uglier nearest interpolation because linear suffers
1510 // from transparent color bleeding and ugly wrapping effects. 1950 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1951 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1952}
1513 1953
1954void
1955expire_textures (DC::Map self, int texid, int count)
1956 PPCODE:
1957 for (; texid < self->texs && count; ++texid, --count)
1958 {
1959 maptex *tex = self->tex + texid;
1960
1961 if (tex->name)
1962 {
1963 if (tex->unused)
1964 {
1965 tex->name = 0;
1966 tex->unused = 0;
1967 XPUSHs (sv_2mortal (newSViv (texid)));
1968 }
1969 else
1970 tex->unused = 1;
1971 }
1972 }
1973
1514int 1974int
1515ox (CFPlus::Map self) 1975ox (DC::Map self)
1516 ALIAS: 1976 ALIAS:
1517 oy = 1 1977 oy = 1
1518 x = 2 1978 x = 2
1519 y = 3 1979 y = 3
1520 w = 4 1980 w = 4
1531 } 1991 }
1532 OUTPUT: 1992 OUTPUT:
1533 RETVAL 1993 RETVAL
1534 1994
1535void 1995void
1536scroll (CFPlus::Map self, int dx, int dy) 1996scroll (DC::Map self, int dx, int dy)
1537 CODE: 1997 CODE:
1538{ 1998{
1539 if (dx > 0) 1999 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 2000 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 2001 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 2017 self->y += MAP_EXTEND_Y;
1558 } 2018 }
1559} 2019}
1560 2020
1561SV * 2021SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 2022map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 2023 CODE:
1564{ 2024{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2025 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 2026 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 2027 mapcell *cell;
1595 uint8_t ext, cmd; 2055 uint8_t ext, cmd;
1596 2056
1597 do 2057 do
1598 { 2058 {
1599 ext = *data++; 2059 ext = *data++;
1600 cmd = ext & 0x3f; 2060 cmd = ext & 0x7f;
1601 2061
1602 if (cmd < 4) 2062 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1; 2063 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1604 else if (cmd == 5) // health 2064 else if (cmd == 5) // health
1605 { 2065 {
1606 cell->stat_width = 1; 2066 cell->stat_width = 1;
1607 cell->stat_hp = *data++; 2067 cell->stat_hp = *data++;
1608 } 2068 }
1609 else if (cmd == 6) // monster width 2069 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1; 2070 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47) 2071 else if (cmd == 0x47)
1612 { 2072 {
1613 if (*data == 4) 2073 if (*data == 1) cell->player = data [1];
1614 ; // decode player count 2074 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2075 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2076 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1615 2077
1616 data += *data + 1; 2078 data += *data + 1;
1617 } 2079 }
1618 else if (cmd == 8) // cell flags 2080 else if (cmd == 8) // cell flags
1619 cell->flags = *data++; 2081 cell->flags = *data++;
1636 cell->tile [z] = self->face2tile [face]; 2098 cell->tile [z] = self->face2tile [face];
1637 2099
1638 if (cell->tile [z]) 2100 if (cell->tile [z])
1639 { 2101 {
1640 maptex *tex = self->tex + cell->tile [z]; 2102 maptex *tex = self->tex + cell->tile [z];
2103 tex->unused = 0;
1641 if (!tex->name) 2104 if (!tex->name)
1642 av_push (missing, newSViv (cell->tile [z])); 2105 av_push (missing, newSViv (cell->tile [z]));
1643 2106
1644 if (tex->smoothtile) 2107 if (tex->smoothtile)
1645 { 2108 {
1646 maptex *smooth = self->tex + tex->smoothtile; 2109 maptex *smooth = self->tex + tex->smoothtile;
2110 smooth->unused = 0;
1647 if (!smooth->name) 2111 if (!smooth->name)
1648 av_push (missing, newSViv (tex->smoothtile)); 2112 av_push (missing, newSViv (tex->smoothtile));
1649 } 2113 }
1650 } 2114 }
1651 } 2115 }
1652 } 2116 }
1653 else 2117 else
1654 cell->darkness = 0; 2118 CELL_CLEAR (cell);
1655 } 2119 }
1656} 2120}
1657 OUTPUT: 2121 OUTPUT:
1658 RETVAL 2122 RETVAL
1659 2123
1660SV * 2124SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2125mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 2126 CODE:
1663{ 2127{
1664 int x1, x; 2128 int x1, x;
1665 int y1, y; 2129 int y1, y;
1666 int z; 2130 int z;
1679 ? self->row + y 2143 ? self->row + y
1680 : 0; 2144 : 0;
1681 2145
1682 for (x = x0; x < x1; x++) 2146 for (x = x0; x < x1; x++)
1683 { 2147 {
1684 int r = 32, g = 32, b = 32, a = 192; 2148 unsigned int r = 32, g = 32, b = 32, a = 192;
1685 2149
1686 if (row && row->c0 <= x && x < row->c1) 2150 if (row && row->c0 <= x && x < row->c1)
1687 { 2151 {
1688 mapcell *cell = row->col + (x - row->c0); 2152 mapcell *cell = row->col + (x - row->c0);
1689 2153
1691 { 2155 {
1692 maptex tex = self->tex [cell->tile [z]]; 2156 maptex tex = self->tex [cell->tile [z]];
1693 int a0 = 255 - tex.a; 2157 int a0 = 255 - tex.a;
1694 int a1 = tex.a; 2158 int a1 = tex.a;
1695 2159
1696 r = (r * a0 + tex.r * a1) / 255; 2160 r = div255 (r * a0 + tex.r * a1);
1697 g = (g * a0 + tex.g * a1) / 255; 2161 g = div255 (g * a0 + tex.g * a1);
1698 b = (b * a0 + tex.b * a1) / 255; 2162 b = div255 (b * a0 + tex.b * a1);
1699 a = (a * a0 + tex.a * a1) / 255; 2163 a = div255 (a * a0 + tex.a * a1);
1700 } 2164 }
1701 } 2165 }
1702 2166
1703 *map++ = (r ) 2167 *map++ = (r )
1704 | (g << 8) 2168 | (g << 8)
1711} 2175}
1712 OUTPUT: 2176 OUTPUT:
1713 RETVAL 2177 RETVAL
1714 2178
1715void 2179void
1716draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2180draw (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: 2181 CODE:
1718{ 2182{
1719 int x, y, z; 2183 int x, y, z;
1720 2184
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2185 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2186 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) 2187 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 2188 smooth_key skey;
1725 2189 int pl_x, pl_y;
2190 maptex pl_tex;
1726 rc_t *rc = rc_alloc (); 2191 rc_t *rc = rc_alloc ();
2192 rc_t *rc_ov = rc_alloc ();
1727 rc_key_t key; 2193 rc_key_t key;
1728 rc_array_t *arr; 2194 rc_array_t *arr;
1729 2195
2196 pl_tex.name = 0;
2197
1730 // thats current max. sorry. 2198 // that's current max. sorry.
1731 if (sw > 255) sw = 255; 2199 if (sw > 255) sw = 255;
1732 if (sh > 255) sh = 255; 2200 if (sh > 255) sh = 255;
1733 2201
1734 // clear key, in case of extra padding 2202 // clear key, in case of extra padding
1735 memset (&skey, 0, sizeof (skey)); 2203 memset (&skey, 0, sizeof (skey));
1739 key.g = 255; 2207 key.g = 255;
1740 key.b = 255; 2208 key.b = 255;
1741 key.a = 255; 2209 key.a = 255;
1742 key.mode = GL_QUADS; 2210 key.mode = GL_QUADS;
1743 key.format = GL_T2F_V3F; 2211 key.format = GL_T2F_V3F;
1744 key.texname = -1;
1745 2212
1746 mx += self->x; 2213 mx += self->x;
1747 my += self->y; 2214 my += self->y;
1748 2215
1749 // first pass: determine smooth_max 2216 // first pass: determine smooth_max
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2240 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774 2241
1775 for (z = 0; z <= 2; z++) 2242 for (z = 0; z <= 2; z++)
1776 { 2243 {
1777 memset (smooth_level, 0, sizeof (smooth_level)); 2244 memset (smooth_level, 0, sizeof (smooth_level));
2245 key.texname = -1;
1778 2246
1779 for (y = 0; y < sh; y++) 2247 for (y = 0; y < sh; y++)
1780 if (0 <= y + my && y + my < self->rows) 2248 if (0 <= y + my && y + my < self->rows)
1781 { 2249 {
1782 maprow *row = self->row + (y + my); 2250 maprow *row = self->row + (y + my);
1790 if (tile) 2258 if (tile)
1791 { 2259 {
1792 maptex tex = self->tex [tile]; 2260 maptex tex = self->tex [tile];
1793 int px, py; 2261 int px, py;
1794 2262
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 2263 if (key.texname != tex.name)
1798 { 2264 {
2265 self->tex [tile].unused = 0;
2266
1799 if (!tex.name) 2267 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 2268 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1801 2269
1802 key.texname = tex.name; 2270 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 2271 arr = rc_array (rc, &key);
1804 } 2272 }
1805 2273
1806 px = (x + 1) * T - tex.w; 2274 px = (x + 1) * Th - tex.w;
1807 py = (y + 1) * T - tex.h; 2275 py = (y + 1) * Tw - tex.h;
2276
2277 if (expect_false (cell->player == player) && expect_false (z == 2))
2278 {
2279 pl_x = px;
2280 pl_y = py;
2281 pl_tex = tex;
2282 continue;
2283 }
1808 2284
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2285 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2286 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); 2287 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); 2288 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 2289
1839 // update smooth hash 2290 // update smooth hash
1840 if (tex.smoothtile) 2291 if (tex.smoothtile)
1841 { 2292 {
1842 skey.tile = tex.smoothtile; 2293 skey.tile = tex.smoothtile;
1873 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2324 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); 2325 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); 2326 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1876 } 2327 }
1877 } 2328 }
2329
2330 if (expect_false (z == 2) && expect_false (cell->flags))
2331 {
2332 // overlays such as the speech bubble, probably more to come
2333 if (cell->flags & 1)
2334 {
2335 rc_key_t key_ov = key;
2336 maptex tex = self->tex [TEXID_SPEECH];
2337 rc_array_t *arr;
2338 int px = x * Tw + Tw * 2 / 32;
2339 int py = y * Th - Th * 6 / 32;
2340
2341 key_ov.texname = tex.name;
2342 arr = rc_array (rc_ov, &key_ov);
2343
2344 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2345 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2346 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2347 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2348 }
2349 }
1878 } 2350 }
1879 } 2351 }
2352
2353 rc_draw (rc);
2354 rc_clear (rc);
1880 2355
1881 // go through all smoothlevels, lowest to highest, then draw. 2356 // go through all smoothlevels, lowest to highest, then draw.
1882 // this is basically counting sort 2357 // this is basically counting sort
1883 { 2358 {
1884 int w, b; 2359 int w, b;
1885 2360
2361 glEnable (GL_TEXTURE_2D);
2362 glBegin (GL_QUADS);
1886 for (w = 0; w < 256 / 32; ++w) 2363 for (w = 0; w < 256 / 32; ++w)
1887 { 2364 {
1888 uint32_t smask = smooth_level [w]; 2365 uint32_t smask = smooth_level [w];
1889 if (smask) 2366 if (smask)
1890 for (b = 0; b < 32; ++b) 2367 for (b = 0; b < 32; ++b)
1902 if (!(bits & 0x1000) 2379 if (!(bits & 0x1000)
1903 && skey->level == level 2380 && skey->level == level
1904 && level > smooth_max [skey->x][skey->y]) 2381 && level > smooth_max [skey->x][skey->y])
1905 { 2382 {
1906 maptex tex = self->tex [skey->tile]; 2383 maptex tex = self->tex [skey->tile];
1907 int px = (((int)skey->x) - 1) * T; 2384 int px = (((int)skey->x) - 1) * Tw;
1908 int py = (((int)skey->y) - 1) * T; 2385 int py = (((int)skey->y) - 1) * Th;
1909 int border = bits & 15; 2386 int border = bits & 15;
1910 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2387 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1911 float dx = tex.s * .0625f; // 16 images/row 2388 float dx = tex.s * .0625f; // 16 images/row
1912 float dy = tex.t * .5f ; // 2 images/column 2389 float dy = tex.t * .5f ; // 2 images/column
1913 2390
1915 { 2392 {
1916 // this time avoiding texture state changes 2393 // this time avoiding texture state changes
1917 // save gobs of state changes. 2394 // save gobs of state changes.
1918 if (key.texname != tex.name) 2395 if (key.texname != tex.name)
1919 { 2396 {
2397 self->tex [skey->tile].unused = 0;
2398
2399 glEnd ();
1920 key.texname = tex.name; 2400 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1921 arr = rc_array (rc, &key); 2401 glBegin (GL_QUADS);
1922 } 2402 }
1923 2403
1924 if (border) 2404 if (border)
1925 { 2405 {
1926 float ox = border * dx; 2406 float ox = border * dx;
1927 2407
1928 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2408 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1929 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2409 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1930 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2410 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1931 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2411 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1932 } 2412 }
1933 2413
1934 if (corner) 2414 if (corner)
1935 { 2415 {
1936 float ox = corner * dx; 2416 float ox = corner * dx;
1937 2417
1938 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2418 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1939 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2419 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1940 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2420 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1941 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2421 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1942 } 2422 }
1943 } 2423 }
1944 } 2424 }
1945 } 2425 }
1946 } 2426 }
1947 } 2427 }
2428
2429 glEnd ();
2430 glDisable (GL_TEXTURE_2D);
2431 key.texname = -1;
1948 } 2432 }
1949 2433
1950 hv_clear (smooth); 2434 hv_clear (smooth);
2435 }
2436
2437 if (pl_tex.name)
2438 {
2439 maptex tex = pl_tex;
2440 int px = pl_x + sdx;
2441 int py = pl_y + sdy;
2442
2443 key.texname = tex.name;
2444 arr = rc_array (rc, &key);
2445
2446 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2447 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2448 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2449 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2450
1951 rc_draw (rc); 2451 rc_draw (rc);
1952 rc_clear (rc);
1953 } 2452 }
2453
2454 rc_draw (rc_ov);
2455 rc_clear (rc_ov);
1954 2456
1955 glDisable (GL_BLEND); 2457 glDisable (GL_BLEND);
1956 rc_free (rc); 2458 rc_free (rc);
2459 rc_free (rc_ov);
1957 2460
1958 // top layer: overlays such as the health bar 2461 // top layer: overlays such as the health bar
1959 for (y = 0; y < sh; y++) 2462 for (y = 0; y < sh; y++)
1960 if (0 <= y + my && y + my < self->rows) 2463 if (0 <= y + my && y + my < self->rows)
1961 { 2464 {
1964 for (x = 0; x < sw; x++) 2467 for (x = 0; x < sw; x++)
1965 if (row->c0 <= x + mx && x + mx < row->c1) 2468 if (row->c0 <= x + mx && x + mx < row->c1)
1966 { 2469 {
1967 mapcell *cell = row->col + (x + mx - row->c0); 2470 mapcell *cell = row->col + (x + mx - row->c0);
1968 2471
1969 int px = x * T; 2472 int px = x * Tw;
1970 int py = y * T; 2473 int py = y * Th;
2474
2475 if (expect_false (cell->player == player))
2476 {
2477 px += sdx;
2478 py += sdy;
2479 }
1971 2480
1972 if (cell->stat_hp) 2481 if (cell->stat_hp)
1973 { 2482 {
1974 int width = cell->stat_width * T; 2483 int width = cell->stat_width * Tw;
1975 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2484 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1976 2485
1977 glColor3ub (0, 0, 0); 2486 glColor3ub (0, 0, 0);
1978 glRectf (px + 1, py - thick - 2, 2487 glRectf (px + 1, py - thick - 2,
1979 px + width - 1, py); 2488 px + width - 1, py);
1980 2489
1986 } 2495 }
1987 } 2496 }
1988} 2497}
1989 2498
1990void 2499void
1991draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2500draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1992 CODE: 2501 CODE:
1993{ 2502{
1994 static float color[16][3] = { 2503 static float color[16][3] = {
1995 { 0.00F, 0.00F, 0.00F }, 2504 { 0.00f, 0.00f, 0.00f },
1996 { 1.00F, 1.00F, 1.00F }, 2505 { 1.00f, 1.00f, 1.00f },
1997 { 0.00F, 0.00F, 0.55F }, 2506 { 0.00f, 0.00f, 0.55f },
1998 { 1.00F, 0.00F, 0.00F }, 2507 { 1.00f, 0.00f, 0.00f },
1999 2508
2000 { 1.00F, 0.54F, 0.00F }, 2509 { 1.00f, 0.54f, 0.00f },
2001 { 0.11F, 0.56F, 1.00F }, 2510 { 0.11f, 0.56f, 1.00f },
2002 { 0.93F, 0.46F, 0.00F }, 2511 { 0.93f, 0.46f, 0.00f },
2003 { 0.18F, 0.54F, 0.34F }, 2512 { 0.18f, 0.54f, 0.34f },
2004 2513
2005 { 0.56F, 0.73F, 0.56F }, 2514 { 0.56f, 0.73f, 0.56f },
2006 { 0.80F, 0.80F, 0.80F }, 2515 { 0.80f, 0.80f, 0.80f },
2007 { 0.55F, 0.41F, 0.13F }, 2516 { 0.55f, 0.41f, 0.13f },
2008 { 0.99F, 0.77F, 0.26F }, 2517 { 0.99f, 0.77f, 0.26f },
2009 2518
2010 { 0.74F, 0.65F, 0.41F }, 2519 { 0.74f, 0.65f, 0.41f },
2011 2520
2012 { 0.00F, 1.00F, 1.00F }, 2521 { 0.00f, 1.00f, 1.00f },
2013 { 1.00F, 0.00F, 1.00F }, 2522 { 1.00f, 0.00f, 1.00f },
2014 { 1.00F, 1.00F, 0.00F }, 2523 { 1.00f, 1.00f, 0.00f },
2015 }; 2524 };
2016 2525
2017 int x, y; 2526 int x, y;
2018 2527
2019 glEnable (GL_TEXTURE_2D); 2528 glEnable (GL_TEXTURE_2D);
2529 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2530 * but the nvidia driver (185.18.14) mishandles alpha textures
2531 * and takes the colour from god knows where instead of using
2532 * Cp. MODULATE results in the same colour, but slightly different
2533 * alpha, but atcually gives us the correct colour with nvidia.
2534 */
2020 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2535 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2021 glEnable (GL_BLEND); 2536 glEnable (GL_BLEND);
2022 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2537 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2023 glBegin (GL_QUADS); 2538 glBegin (GL_QUADS);
2024 2539
2025 for (y = 0; y < h; y++) 2540 for (y = 0; y < h; y++)
2029 2544
2030 if (m) 2545 if (m)
2031 { 2546 {
2032 float *c = color [m & 15]; 2547 float *c = color [m & 15];
2033 2548
2034 float tx1 = m & 0x40 ? 0.5 : 0.; 2549 float tx1 = m & 0x40 ? 0.5f : 0.f;
2035 float tx2 = tx1 + 0.5; 2550 float tx2 = tx1 + 0.5f;
2036 2551
2037 glColor4f (c[0], c[1], c[2], 0.75); 2552 glColor4f (c[0], c[1], c[2], 1);
2038 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2553 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2039 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2554 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2040 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2555 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2041 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2556 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2042 } 2557 }
2046 glDisable (GL_BLEND); 2561 glDisable (GL_BLEND);
2047 glDisable (GL_TEXTURE_2D); 2562 glDisable (GL_TEXTURE_2D);
2048} 2563}
2049 2564
2050void 2565void
2051fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2566fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2052 PPCODE: 2567 PPCODE:
2053{ 2568{
2054 int x, y; 2569 int x, y;
2055 int sw1 = sw + 2; 2570 int sw1 = sw + 2;
2056 int sh1 = sh + 2; 2571 int sh1 = sh + 2;
2057 int sh3 = sh * 3; 2572 int sh3 = sh * 3;
2058 int sw34 = (sw * 3 + 3) & ~3; 2573 int sw3 = sw * 3;
2574 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2575 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2059 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2576 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2060 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2577 memset (darkness1, 0, sw1*sh1);
2061 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2062 2578
2063 SvPOK_only (darkness3_sv); 2579 SvPOK_only (darkness3_sv);
2064 SvCUR_set (darkness3_sv, sw34 * sh3); 2580 SvCUR_set (darkness3_sv, sw3 * sh3);
2065 2581
2066 mx += self->x - 1; 2582 mx += self->x - 1;
2067 my += self->y - 1; 2583 my += self->y - 1;
2068
2069 memset (darkness1, 255, sw1 * sh1);
2070 2584
2071 for (y = 0; y < sh1; y++) 2585 for (y = 0; y < sh1; y++)
2072 if (0 <= y + my && y + my < self->rows) 2586 if (0 <= y + my && y + my < self->rows)
2073 { 2587 {
2074 maprow *row = self->row + (y + my); 2588 maprow *row = self->row + (y + my);
2077 if (row->c0 <= x + mx && x + mx < row->c1) 2591 if (row->c0 <= x + mx && x + mx < row->c1)
2078 { 2592 {
2079 mapcell *cell = row->col + (x + mx - row->c0); 2593 mapcell *cell = row->col + (x + mx - row->c0);
2080 2594
2081 darkness1 [y * sw1 + x] = cell->darkness 2595 darkness1 [y * sw1 + x] = cell->darkness
2082 ? 255 - (cell->darkness - 1) 2596 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2083 : 255 - FOW_DARKNESS; 2597 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2084 } 2598 }
2085 } 2599 }
2086 2600
2087 for (y = 0; y < sh; ++y) 2601 for (y = 0; y < sh; ++y)
2088 for (x = 0; x < sw; ++x) 2602 for (x = 0; x < sw; ++x)
2107 2621
2108 uint8_t r13 = (d13 + d23 + d12) / 3; 2622 uint8_t r13 = (d13 + d23 + d12) / 3;
2109 uint8_t r23 = d23; 2623 uint8_t r23 = d23;
2110 uint8_t r33 = (d23 + d33 + d32) / 3; 2624 uint8_t r33 = (d23 + d33 + d32) / 3;
2111 2625
2112 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2626 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2113 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2627 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2114 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2628 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2115 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2629 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2116 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2630 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); 2631 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2118 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2632 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2119 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2633 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2120 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2634 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2121 } 2635 }
2122 2636
2123 free (darkness1); 2637 free (darkness1);
2124 2638
2125 EXTEND (SP, 3); 2639 EXTEND (SP, 3);
2126 PUSHs (sv_2mortal (newSViv (sw34))); 2640 PUSHs (sv_2mortal (newSViv (sw3)));
2127 PUSHs (sv_2mortal (newSViv (sh3))); 2641 PUSHs (sv_2mortal (newSViv (sh3)));
2128 PUSHs (darkness3_sv); 2642 PUSHs (darkness3_sv);
2129} 2643}
2130 2644
2131SV * 2645SV *
2132get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2646get_rect (DC::Map self, int x0, int y0, int w, int h)
2133 CODE: 2647 CODE:
2134{ 2648{
2135 int x, y, x1, y1; 2649 int x, y, x1, y1;
2136 SV *data_sv = newSV (w * h * 7 + 5); 2650 SV *data_sv = newSV (w * h * 7 + 5);
2137 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2651 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2194 else 2708 else
2195 *data++ = 0; 2709 *data++ = 0;
2196 } 2710 }
2197 } 2711 }
2198 2712
2713 /* if size is w*h + 5 then no data has been found */
2714 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2715 {
2199 SvPOK_only (data_sv); 2716 SvPOK_only (data_sv);
2200 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2717 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2718 }
2719
2201 RETVAL = data_sv; 2720 RETVAL = data_sv;
2202} 2721}
2203 OUTPUT: 2722 OUTPUT:
2204 RETVAL 2723 RETVAL
2205 2724
2206void 2725void
2207set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2726set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2208 PPCODE: 2727 PPCODE:
2209{ 2728{
2210 int x, y, z; 2729 int x, y, z;
2211 int w, h; 2730 int w, h;
2212 int x1, y1; 2731 int x1, y1;
2732 STRLEN len;
2733 uint8_t *data, *end;
2734
2735 len = SvLEN (data_sv);
2736 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2737 data = SvPVbyte_nolen (data_sv);
2738 end = data + len + 8;
2739
2740 if (len < 5)
2741 XSRETURN_EMPTY;
2213 2742
2214 if (*data++ != 0) 2743 if (*data++ != 0)
2215 return; /* version mismatch */ 2744 XSRETURN_EMPTY; /* version mismatch */
2216 2745
2217 w = *data++ << 8; w |= *data++; 2746 w = *data++ << 8; w |= *data++;
2218 h = *data++ << 8; h |= *data++; 2747 h = *data++ << 8; h |= *data++;
2219 2748
2220 // we need to do this 'cause we don't keep an absolute coord system for rows 2749 // we need to do this 'cause we don't keep an absolute coord system for rows
2232 { 2761 {
2233 maprow *row = map_get_row (self, y); 2762 maprow *row = map_get_row (self, y);
2234 2763
2235 for (x = x0; x < x1; x++) 2764 for (x = x0; x < x1; x++)
2236 { 2765 {
2766 uint8_t flags;
2767
2768 if (data + 7 >= end)
2769 XSRETURN_EMPTY;
2770
2237 uint8_t flags = *data++; 2771 flags = *data++;
2238 2772
2239 if (flags) 2773 if (flags)
2240 { 2774 {
2241 mapcell *cell = row_get_cell (row, x); 2775 mapcell *cell = row_get_cell (row, x);
2242 tileid tile[3] = { 0, 0, 0 }; 2776 tileid tile[3] = { 0, 0, 0 };
2245 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2779 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2246 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2780 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2247 2781
2248 if (cell->darkness == 0) 2782 if (cell->darkness == 0)
2249 { 2783 {
2250 cell->darkness = 0; 2784 /*cell->darkness = 0;*/
2785 EXTEND (SP, 3);
2251 2786
2252 for (z = 0; z <= 2; z++) 2787 for (z = 0; z <= 2; z++)
2253 { 2788 {
2254 tileid t = tile [z]; 2789 tileid t = tile [z];
2255 2790
2256 if (t >= self->texs || (t && !self->tex [t].name)) 2791 if (t >= self->texs || (t && !self->tex [t].name))
2257 { 2792 {
2258 XPUSHs (sv_2mortal (newSViv (t))); 2793 PUSHs (sv_2mortal (newSViv (t)));
2259 need_texid (self, t); 2794 need_texid (self, t);
2260 } 2795 }
2261 2796
2262 cell->tile [z] = t; 2797 cell->tile [z] = t;
2263 } 2798 }
2265 } 2800 }
2266 } 2801 }
2267 } 2802 }
2268} 2803}
2269 2804
2270MODULE = CFPlus PACKAGE = CFPlus::RW 2805MODULE = Deliantra::Client PACKAGE = DC::RW
2271 2806
2272CFPlus::RW 2807DC::RW
2273new (SV *class, SV *data_sv) 2808new (SV *class, SV *data_sv)
2274 CODE: 2809 CODE:
2275{ 2810{
2276 STRLEN datalen; 2811 STRLEN datalen;
2277 char *data = SvPVbyte (data_sv, datalen); 2812 char *data = SvPVbyte (data_sv, datalen);
2279 RETVAL = SDL_RWFromConstMem (data, datalen); 2814 RETVAL = SDL_RWFromConstMem (data, datalen);
2280} 2815}
2281 OUTPUT: 2816 OUTPUT:
2282 RETVAL 2817 RETVAL
2283 2818
2284CFPlus::RW 2819DC::RW
2285new_from_file (SV *class, const char *path, const char *mode = "rb") 2820new_from_file (SV *class, const char *path, const char *mode = "rb")
2286 CODE: 2821 CODE:
2287 RETVAL = SDL_RWFromFile (path, mode); 2822 RETVAL = SDL_RWFromFile (path, mode);
2288 OUTPUT: 2823 OUTPUT:
2289 RETVAL 2824 RETVAL
2290 2825
2291# fails on win32: 2826# fails on win32:
2292# CFPlus.xs(2268) : error C2059: syntax error : '(' 2827# dc.xs(2268) : error C2059: syntax error : '('
2293#void 2828#void
2294#close (CFPlus::RW self) 2829#close (DC::RW self)
2295# CODE: 2830# CODE:
2296# (self->(close)) (self); 2831# (self->(close)) (self);
2297 2832
2298MODULE = CFPlus PACKAGE = CFPlus::Channel 2833MODULE = Deliantra::Client PACKAGE = DC::Channel
2299 2834
2300PROTOTYPES: DISABLE 2835PROTOTYPES: DISABLE
2301 2836
2302CFPlus::Channel 2837DC::Channel
2303find () 2838find ()
2304 CODE: 2839 CODE:
2305{ 2840{
2306 RETVAL = Mix_GroupAvailable (-1); 2841 RETVAL = Mix_GroupAvailable (-1);
2307 2842
2308 if (RETVAL < 0) 2843 if (RETVAL < 0)
2309 { 2844 {
2310 RETVAL = Mix_GroupOldest (-1); 2845 RETVAL = Mix_GroupOldest (-1);
2311 2846
2312 if (RETVAL < 0) 2847 if (RETVAL < 0)
2848 {
2849 // happens sometimes, maybe it just stopped playing(?)
2850 RETVAL = Mix_GroupAvailable (-1);
2851
2852 if (RETVAL < 0)
2313 XSRETURN_UNDEF; 2853 XSRETURN_UNDEF;
2314 2854 }
2855 else
2315 Mix_HaltChannel (RETVAL); 2856 Mix_HaltChannel (RETVAL);
2316 } 2857 }
2317 2858
2318 Mix_UnregisterAllEffects (RETVAL); 2859 Mix_UnregisterAllEffects (RETVAL);
2319 Mix_Volume (RETVAL, 128); 2860 Mix_Volume (RETVAL, 128);
2320} 2861}
2321 OUTPUT: 2862 OUTPUT:
2322 RETVAL 2863 RETVAL
2323 2864
2324void 2865void
2325halt (CFPlus::Channel self) 2866halt (DC::Channel self)
2326 CODE: 2867 CODE:
2327 Mix_HaltChannel (self); 2868 Mix_HaltChannel (self);
2328 2869
2329void 2870void
2330expire (CFPlus::Channel self, int ticks = -1) 2871expire (DC::Channel self, int ticks = -1)
2331 CODE: 2872 CODE:
2332 Mix_ExpireChannel (self, ticks); 2873 Mix_ExpireChannel (self, ticks);
2333 2874
2334void 2875void
2335fade_out (CFPlus::Channel self, int ticks = -1) 2876fade_out (DC::Channel self, int ticks = -1)
2336 CODE: 2877 CODE:
2337 Mix_FadeOutChannel (self, ticks); 2878 Mix_FadeOutChannel (self, ticks);
2338 2879
2339int 2880int
2340volume (CFPlus::Channel self, int volume) 2881volume (DC::Channel self, int volume)
2341 CODE: 2882 CODE:
2342 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2883 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2343 OUTPUT: 2884 OUTPUT:
2344 RETVAL 2885 RETVAL
2345 2886
2346void 2887void
2347unregister_all_effects (CFPlus::Channel self) 2888unregister_all_effects (DC::Channel self)
2348 CODE: 2889 CODE:
2349 Mix_UnregisterAllEffects (self); 2890 Mix_UnregisterAllEffects (self);
2350 2891
2351void 2892void
2352set_panning (CFPlus::Channel self, int left, int right) 2893set_panning (DC::Channel self, int left, int right)
2353 CODE: 2894 CODE:
2354 left = CLAMP (left , 0, 255); 2895 left = CLAMP (left , 0, 255);
2355 right = CLAMP (right, 0, 255); 2896 right = CLAMP (right, 0, 255);
2356 Mix_SetPanning (self, left, right); 2897 Mix_SetPanning (self, left, right);
2357 2898
2358void 2899void
2359set_distance (CFPlus::Channel self, int distance) 2900set_distance (DC::Channel self, int distance)
2360 CODE: 2901 CODE:
2361 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2902 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2362 2903
2363void 2904void
2364set_position (CFPlus::Channel self, int angle, int distance) 2905set_position (DC::Channel self, int angle, int distance)
2365 CODE: 2906 CODE:
2366 2907
2367void 2908void
2368set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2909set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2369 CODE: 2910 CODE:
2370{ 2911{
2371 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2912 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); 2913 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2373 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2914 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2374} 2915}
2375 2916
2376void 2917void
2377set_reverse_stereo (CFPlus::Channel self, int flip) 2918set_reverse_stereo (DC::Channel self, int flip)
2378 CODE: 2919 CODE:
2379 Mix_SetReverseStereo (self, flip); 2920 Mix_SetReverseStereo (self, flip);
2380 2921
2381MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2922MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2382 2923
2383PROTOTYPES: DISABLE 2924PROTOTYPES: DISABLE
2384 2925
2926void
2927decoders ()
2928 PPCODE:
2929#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2930 int i, num = Mix_GetNumChunkDecoders ();
2931 EXTEND (SP, num);
2932 for (i = 0; i < num; ++i)
2933 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2934#else
2935 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2936#endif
2937
2385CFPlus::MixChunk 2938DC::MixChunk
2386new (SV *class, CFPlus::RW rwops) 2939new (SV *class, DC::RW rwops)
2387 CODE: 2940 CODE:
2388 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2941 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2389 OUTPUT: 2942 OUTPUT:
2390 RETVAL 2943 RETVAL
2391 2944
2392void 2945void
2393DESTROY (CFPlus::MixChunk self) 2946DESTROY (DC::MixChunk self)
2394 CODE: 2947 CODE:
2395 Mix_FreeChunk (self); 2948 Mix_FreeChunk (self);
2396 2949
2397int 2950int
2398volume (CFPlus::MixChunk self, int volume = -1) 2951volume (DC::MixChunk self, int volume = -1)
2399 CODE: 2952 CODE:
2400 if (items > 1) 2953 if (items > 1)
2401 volume = CLAMP (volume, 0, 128); 2954 volume = CLAMP (volume, 0, 128);
2402 RETVAL = Mix_VolumeChunk (self, volume); 2955 RETVAL = Mix_VolumeChunk (self, volume);
2403 OUTPUT: 2956 OUTPUT:
2404 RETVAL 2957 RETVAL
2405 2958
2406CFPlus::Channel 2959DC::Channel
2407play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2960play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2408 CODE: 2961 CODE:
2409{ 2962{
2410 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2963 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2411 2964
2412 if (RETVAL < 0) 2965 if (RETVAL < 0)
2419 } 2972 }
2420} 2973}
2421 OUTPUT: 2974 OUTPUT:
2422 RETVAL 2975 RETVAL
2423 2976
2424MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2977MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2978
2979void
2980decoders ()
2981 PPCODE:
2982#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2983 int i, num = Mix_GetNumMusicDecoders ();
2984 EXTEND (SP, num);
2985 for (i = 0; i < num; ++i)
2986 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2987#else
2988 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2989#endif
2425 2990
2426int 2991int
2427volume (int volume = -1) 2992volume (int volume = -1)
2428 PROTOTYPE: ;$ 2993 PROTOTYPE: ;$
2429 CODE: 2994 CODE:
2441void 3006void
2442halt () 3007halt ()
2443 CODE: 3008 CODE:
2444 Mix_HaltMusic (); 3009 Mix_HaltMusic ();
2445 3010
3011int
3012playing ()
3013 CODE:
3014 RETVAL = Mix_PlayingMusic ();
3015 OUTPUT:
3016 RETVAL
3017
2446CFPlus::MixMusic 3018DC::MixMusic
2447new (SV *class, CFPlus::RW rwops) 3019new (SV *class, DC::RW rwops)
2448 CODE: 3020 CODE:
2449 RETVAL = Mix_LoadMUS_RW (rwops); 3021 RETVAL = Mix_LoadMUS_RW (rwops);
2450 OUTPUT: 3022 OUTPUT:
2451 RETVAL 3023 RETVAL
2452 3024
2453void 3025void
2454DESTROY (CFPlus::MixMusic self) 3026DESTROY (DC::MixMusic self)
2455 CODE: 3027 CODE:
2456 Mix_FreeMusic (self); 3028 Mix_FreeMusic (self);
2457 3029
2458int 3030int
2459play (CFPlus::MixMusic self, int loops = -1) 3031play (DC::MixMusic self, int loops = -1)
2460 CODE: 3032 CODE:
2461 RETVAL = Mix_PlayMusic (self, loops); 3033 RETVAL = Mix_PlayMusic (self, loops);
2462 OUTPUT: 3034 OUTPUT:
2463 RETVAL 3035 RETVAL
2464 3036
2465void 3037void
2466fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3038fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2467 CODE: 3039 CODE:
2468 Mix_FadeInMusicPos (self, loops, ms, position); 3040 Mix_FadeInMusicPos (self, loops, ms, position);
2469 3041
2470MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3042MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2471 3043
2472PROTOTYPES: ENABLE 3044PROTOTYPES: ENABLE
2473 3045
2474BOOT: 3046BOOT:
2475{ 3047{
2476 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3048 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2477 static const struct { 3049 static const struct {
2478 const char *name; 3050 const char *name;
2479 IV iv; 3051 IV iv;
2480 } *civ, const_iv[] = { 3052 } *civ, const_iv[] = {
2481# define const_iv(name) { # name, (IV)name } 3053# define const_iv(name) { # name, (IV)name }
2482 const_iv (GL_VENDOR), 3054 const_iv (GL_VENDOR),
2483 const_iv (GL_VERSION), 3055 const_iv (GL_VERSION),
2484 const_iv (GL_EXTENSIONS), 3056 const_iv (GL_EXTENSIONS),
3057 const_iv (GL_MAX_TEXTURE_UNITS),
2485 const_iv (GL_COLOR_MATERIAL), 3058 const_iv (GL_COLOR_MATERIAL),
2486 const_iv (GL_SMOOTH), 3059 const_iv (GL_SMOOTH),
2487 const_iv (GL_FLAT), 3060 const_iv (GL_FLAT),
2488 const_iv (GL_DITHER), 3061 const_iv (GL_DITHER),
2489 const_iv (GL_BLEND), 3062 const_iv (GL_BLEND),
2501 const_iv (GL_ZERO), 3074 const_iv (GL_ZERO),
2502 const_iv (GL_SRC_ALPHA), 3075 const_iv (GL_SRC_ALPHA),
2503 const_iv (GL_DST_ALPHA), 3076 const_iv (GL_DST_ALPHA),
2504 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3077 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2505 const_iv (GL_ONE_MINUS_DST_ALPHA), 3078 const_iv (GL_ONE_MINUS_DST_ALPHA),
3079 const_iv (GL_SRC_COLOR),
3080 const_iv (GL_DST_COLOR),
3081 const_iv (GL_ONE_MINUS_SRC_COLOR),
3082 const_iv (GL_ONE_MINUS_DST_COLOR),
2506 const_iv (GL_SRC_ALPHA_SATURATE), 3083 const_iv (GL_SRC_ALPHA_SATURATE),
2507 const_iv (GL_RGB), 3084 const_iv (GL_RGB),
2508 const_iv (GL_RGBA), 3085 const_iv (GL_RGBA),
2509 const_iv (GL_RGBA4), 3086 const_iv (GL_RGBA4),
2510 const_iv (GL_RGBA8), 3087 const_iv (GL_RGBA8),
2516 const_iv (GL_INTENSITY), 3093 const_iv (GL_INTENSITY),
2517 const_iv (GL_LUMINANCE), 3094 const_iv (GL_LUMINANCE),
2518 const_iv (GL_LUMINANCE_ALPHA), 3095 const_iv (GL_LUMINANCE_ALPHA),
2519 const_iv (GL_FLOAT), 3096 const_iv (GL_FLOAT),
2520 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3097 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3098 const_iv (GL_COMPRESSED_ALPHA_ARB),
3099 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3100 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3101 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3102 const_iv (GL_COMPRESSED_RGB_ARB),
3103 const_iv (GL_COMPRESSED_RGBA_ARB),
2521 const_iv (GL_COMPILE), 3104 const_iv (GL_COMPILE),
2522 const_iv (GL_PROXY_TEXTURE_1D), 3105 const_iv (GL_PROXY_TEXTURE_1D),
2523 const_iv (GL_PROXY_TEXTURE_2D), 3106 const_iv (GL_PROXY_TEXTURE_2D),
2524 const_iv (GL_TEXTURE_1D), 3107 const_iv (GL_TEXTURE_1D),
2525 const_iv (GL_TEXTURE_2D), 3108 const_iv (GL_TEXTURE_2D),
2564 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3147 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2565 const_iv (GL_POINT_SMOOTH_HINT), 3148 const_iv (GL_POINT_SMOOTH_HINT),
2566 const_iv (GL_LINE_SMOOTH_HINT), 3149 const_iv (GL_LINE_SMOOTH_HINT),
2567 const_iv (GL_POLYGON_SMOOTH_HINT), 3150 const_iv (GL_POLYGON_SMOOTH_HINT),
2568 const_iv (GL_GENERATE_MIPMAP_HINT), 3151 const_iv (GL_GENERATE_MIPMAP_HINT),
3152 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2569 const_iv (GL_FASTEST), 3153 const_iv (GL_FASTEST),
2570 const_iv (GL_DONT_CARE), 3154 const_iv (GL_DONT_CARE),
2571 const_iv (GL_NICEST), 3155 const_iv (GL_NICEST),
2572 const_iv (GL_V2F), 3156 const_iv (GL_V2F),
2573 const_iv (GL_V3F), 3157 const_iv (GL_V3F),
2574 const_iv (GL_T2F_V3F), 3158 const_iv (GL_T2F_V3F),
2575 const_iv (GL_T2F_N3F_V3F), 3159 const_iv (GL_T2F_N3F_V3F),
3160 const_iv (GL_FUNC_ADD),
3161 const_iv (GL_FUNC_SUBTRACT),
3162 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2576# undef const_iv 3163# undef const_iv
2577 }; 3164 };
2578 3165
2579 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3166 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2580 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3167 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2581 3168
2582 texture_av = newAV (); 3169 texture_av = newAV ();
2583 AvREAL_off (texture_av); 3170 AvREAL_off (texture_av);
2584} 3171}
3172
3173void
3174disable_GL_EXT_blend_func_separate ()
3175 CODE:
3176 gl.BlendFuncSeparate = 0;
3177 gl.BlendFuncSeparateEXT = 0;
3178
3179void
3180apple_nvidia_bug (int enable)
2585 3181
2586char * 3182char *
2587gl_vendor () 3183gl_vendor ()
2588 CODE: 3184 CODE:
2589 RETVAL = (char *)glGetString (GL_VENDOR); 3185 RETVAL = (char *)glGetString (GL_VENDOR);
2620 3216
2621int glGetError () 3217int glGetError ()
2622 3218
2623void glFinish () 3219void glFinish ()
2624 3220
3221void glFlush ()
3222
2625void glClear (int mask) 3223void glClear (int mask)
2626 3224
2627void glClearColor (float r, float g, float b, float a = 1.0) 3225void glClearColor (float r, float g, float b, float a = 1.0)
2628 PROTOTYPE: @ 3226 PROTOTYPE: @
2629 3227
2638void glBlendFunc (int sfactor, int dfactor) 3236void glBlendFunc (int sfactor, int dfactor)
2639 3237
2640void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3238void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2641 CODE: 3239 CODE:
2642 gl_BlendFuncSeparate (sa, da, saa, daa); 3240 gl_BlendFuncSeparate (sa, da, saa, daa);
3241
3242# void glBlendEquation (int se)
2643 3243
2644void glDepthMask (int flag) 3244void glDepthMask (int flag)
2645 3245
2646void glLogicOp (int opcode) 3246void glLogicOp (int opcode)
2647 3247
2682void glRotate (float angle, float x, float y, float z) 3282void glRotate (float angle, float x, float y, float z)
2683 CODE: 3283 CODE:
2684 glRotatef (angle, x, y, z); 3284 glRotatef (angle, x, y, z);
2685 3285
2686void glColor (float r, float g, float b, float a = 1.0) 3286void glColor (float r, float g, float b, float a = 1.0)
3287 PROTOTYPE: @
2687 ALIAS: 3288 ALIAS:
2688 glColor_premultiply = 1 3289 glColor_premultiply = 1
2689 CODE: 3290 CODE:
2690 if (ix) 3291 if (ix)
2691 { 3292 {
2711 3312
2712void glRect (float x1, float y1, float x2, float y2) 3313void glRect (float x1, float y1, float x2, float y2)
2713 CODE: 3314 CODE:
2714 glRectf (x1, y1, x2, y2); 3315 glRectf (x1, y1, x2, y2);
2715 3316
3317void glRect_lineloop (float x1, float y1, float x2, float y2)
3318 CODE:
3319 glBegin (GL_LINE_LOOP);
3320 glVertex2f (x1, y1);
3321 glVertex2f (x2, y1);
3322 glVertex2f (x2, y2);
3323 glVertex2f (x1, y2);
3324 glEnd ();
3325
2716PROTOTYPES: ENABLE 3326PROTOTYPES: ENABLE
2717 3327
2718void glBegin (int mode) 3328void glBegin (int mode)
2719 3329
2720void glEnd () 3330void glEnd ()
2752void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3362void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2753 CODE: 3363 CODE:
2754 if (gl.SeparableFilter2D) 3364 if (gl.SeparableFilter2D)
2755 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3365 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2756 3366
2757void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3367void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2758 3368
2759void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3369void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2760 3370
2761void glDrawPixels (int width, int height, int format, int type, char *pixels) 3371void glDrawPixels (int width, int height, int format, int type, char *pixels)
2762 3372
2788 3398
2789void glEndList () 3399void glEndList ()
2790 3400
2791void glCallList (int list) 3401void glCallList (int list)
2792 3402
2793MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3403void c_init ()
3404 CODE:
3405 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3406 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3407
3408MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2794 3409
2795PROTOTYPES: DISABLE 3410PROTOTYPES: DISABLE
2796 3411
2797void 3412void
2798find_widget (SV *self, NV x, NV y) 3413find_widget (SV *self, NV x, NV y)
2802 XPUSHs (self); 3417 XPUSHs (self);
2803} 3418}
2804 3419
2805BOOT: 3420BOOT:
2806{ 3421{
2807 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3422 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2808 3423
2809 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3424 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); 3425 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); 3426 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); 3427 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2813} 3428}
2814 3429
2815void 3430void
2816draw (SV *self) 3431draw (SV *self)
2817 CODE: 3432 CODE:
2821 NV x, y, w, h; 3436 NV x, y, w, h;
2822 SV *draw_x_sv = GvSV (draw_x_gv); 3437 SV *draw_x_sv = GvSV (draw_x_gv);
2823 SV *draw_y_sv = GvSV (draw_y_gv); 3438 SV *draw_y_sv = GvSV (draw_y_gv);
2824 SV *draw_w_sv = GvSV (draw_w_gv); 3439 SV *draw_w_sv = GvSV (draw_w_gv);
2825 SV *draw_h_sv = GvSV (draw_h_gv); 3440 SV *draw_h_sv = GvSV (draw_h_gv);
2826 SV *hover;
2827 double draw_x, draw_y, draw_w, draw_h; 3441 double draw_x, draw_y;
2828 3442
2829 if (!SvROK (self)) 3443 if (!SvROK (self))
2830 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3444 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2831 3445
2832 hv = (HV *)SvRV (self); 3446 hv = (HV *)SvRV (self);
2833 3447
2834 if (SvTYPE (hv) != SVt_PVHV) 3448 if (SvTYPE (hv) != SVt_PVHV)
2835 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3449 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2836 3450
2837 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3451 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.; 3452 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2839 3453
2840 if (!h || !w) 3454 if (!h || !w)
2860 { 3474 {
2861 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3475 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2862 3476
2863 if (svp && SvTRUE (*svp)) 3477 if (svp && SvTRUE (*svp))
2864 { 3478 {
2865 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3479 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2866 glEnable (GL_BLEND); 3480 glEnable (GL_BLEND);
2867 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3481 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2868 glBegin (GL_QUADS); 3482 glBegin (GL_QUADS);
2869 glVertex2f (0, 0); 3483 glVertex2f (0, 0);
2870 glVertex2f (w, 0); 3484 glVertex2f (w, 0);
2873 glEnd (); 3487 glEnd ();
2874 glDisable (GL_BLEND); 3488 glDisable (GL_BLEND);
2875 } 3489 }
2876 } 3490 }
2877#if 0 3491#if 0
2878 if ($ENV{CFPLUS_DEBUG} & 1) { 3492 // draw borders, for debugging
2879 glPushMatrix; 3493 glPushMatrix ();
2880 glColor 1, 1, 0, 1; 3494 glColor4f (1., 1., 0., 1.);
2881 glTranslate 0.375, 0.375; 3495 glTranslatef (.5, .5, 0.);
2882 glBegin GL_LINE_LOOP; 3496 glBegin (GL_LINE_LOOP);
2883 glVertex 0 , 0; 3497 glVertex2f (0 , 0);
2884 glVertex $self->{w} - 1, 0; 3498 glVertex2f (w - 1, 0);
2885 glVertex $self->{w} - 1, $self->{h} - 1; 3499 glVertex2f (w - 1, h - 1);
2886 glVertex 0 , $self->{h} - 1; 3500 glVertex2f (0 , h - 1);
2887 glEnd; 3501 glEnd ();
2888 glPopMatrix; 3502 glPopMatrix ();
2889 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2890 }
2891#endif 3503#endif
2892 PUSHMARK (SP); 3504 PUSHMARK (SP);
2893 XPUSHs (self); 3505 XPUSHs (self);
2894 PUTBACK; 3506 PUTBACK;
2895 call_method ("_draw", G_VOID | G_DISCARD); 3507 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines