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.217 by root, Wed Aug 1 12:43:31 2007 UTC vs.
Revision 1.315 by root, Wed Jan 18 23:34:44 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines