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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines