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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines