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.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.315 by root, Wed Jan 18 23:34:44 2012 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib/gmacros.h>
48 54
49#include <pango/pango.h> 55#include <pango/pango.h>
56
57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
62# define pango_layout_get_line_readonly pango_layout_get_line
63# define pango_layout_get_lines_readonly pango_layout_get_lines
64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
66#endif
50 67
51#ifndef _WIN32 68#ifndef _WIN32
52# include <sys/types.h> 69# include <sys/types.h>
53# include <sys/socket.h> 70# include <sys/socket.h>
54# include <netinet/in.h> 71# include <netinet/in.h>
55# include <netinet/tcp.h> 72# include <netinet/tcp.h>
56# include <inttypes.h> 73# include <inttypes.h>
57#endif 74#endif
58 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
62 91
63#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
65 94
66#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
67 96
68#if 0 97/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 99
71# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
72#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
73 123
74static AV *texture_av; 124static AV *texture_av;
75 125
76static struct 126static struct
77{ 127{
114 av_push (texture_av, (SV *)(size_t)name); 164 av_push (texture_av, (SV *)(size_t)name);
115 glDeleteTextures (1, &name); 165 glDeleteTextures (1, &name);
116} 166}
117 167
118#include "texcache.c" 168#include "texcache.c"
169#include "rendercache.c"
119 170
120#include "pango-font.c" 171#include "pango-font.c"
121#include "pango-fontmap.c" 172#include "pango-fontmap.c"
122#include "pango-render.c" 173#include "pango-render.c"
123 174
124typedef IV CFPlus__Channel; 175typedef IV DC__Channel;
125typedef SDL_RWops *CFPlus__RW; 176typedef SDL_RWops *DC__RW;
126typedef Mix_Chunk *CFPlus__MixChunk; 177typedef Mix_Chunk *DC__MixChunk;
127typedef Mix_Music *CFPlus__MixMusic; 178typedef Mix_Music *DC__MixMusic;
128 179
129typedef PangoFontDescription *CFPlus__Font; 180typedef PangoFontDescription *DC__Font;
130 181
131static int 182static int
132shape_attr_p (PangoLayoutRun *run) 183shape_attr_p (PangoLayoutRun *run)
133{ 184{
134 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
148 199
149typedef struct cf_layout { 200typedef struct cf_layout {
150 PangoLayout *pl; 201 PangoLayout *pl;
151 float r, g, b, a; // default color for rgba mode 202 float r, g, b, a; // default color for rgba mode
152 int base_height; 203 int base_height;
153 CFPlus__Font font; 204 DC__Font font;
205 rc_t *rc;
154} *CFPlus__Layout; 206} *DC__Layout;
155 207
156static CFPlus__Font default_font; 208static DC__Font default_font;
157static PangoContext *opengl_context; 209static PangoContext *opengl_context;
158static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
159 211
160static void 212static void
161substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
166#endif 218#endif
167 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
168} 220}
169 221
170static void 222static void
171layout_update_font (CFPlus__Layout self) 223layout_update_font (DC__Layout self)
172{ 224{
173 /* 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
174 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
175 */ 227 */
176 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
177 229
178 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
179 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
180 232
181 pango_layout_set_font_description (self->pl, font); 233 pango_layout_set_font_description (self->pl, font);
182} 234}
183 235
184static void 236static void
185layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 237layout_get_pixel_size (DC__Layout self, int *w, int *h)
186{ 238{
187 PangoRectangle rect; 239 PangoRectangle rect;
188 240
189 // get_pixel_* wrongly rounds down 241 // get_pixel_* wrongly rounds down
190 pango_layout_get_extents (self->pl, 0, &rect); 242 pango_layout_get_extents (self->pl, 0, &rect);
201 253
202typedef uint16_t tileid; 254typedef uint16_t tileid;
203typedef uint16_t faceid; 255typedef uint16_t faceid;
204 256
205typedef struct { 257typedef struct {
206 int name; 258 GLuint name;
207 int w, h; 259 int w, h;
208 float s, t; 260 float s, t;
209 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
210 tileid smoothtile; 262 tileid smoothtile;
211 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
212} maptex; 265} maptex;
213 266
214typedef struct { 267typedef struct {
215 uint32_t player; 268 uint32_t player;
216 tileid tile[3]; 269 tileid tile[3];
229 int faces; tileid *face2tile; // [faceid] 282 int faces; tileid *face2tile; // [faceid]
230 int texs; maptex *tex; // [tileid] 283 int texs; maptex *tex; // [tileid]
231 284
232 int32_t rows; 285 int32_t rows;
233 maprow *row; 286 maprow *row;
234} *CFPlus__Map; 287} *DC__Map;
235 288
236static char * 289static char *
237prepend (char *ptr, int sze, int inc) 290prepend (char *ptr, int sze, int inc)
238{ 291{
239 char *p; 292 char *p;
277 self->texs *= 2; 330 self->texs *= 2;
278 } 331 }
279} 332}
280 333
281static maprow * 334static maprow *
282map_get_row (CFPlus__Map self, int y) 335map_get_row (DC__Map self, int y)
283{ 336{
284 if (0 > y) 337 if (0 > y)
285 { 338 {
286 int extend = - y + MAP_EXTEND_Y; 339 int extend = - y + MAP_EXTEND_Y;
287 Prepend (maprow, self->row, self->rows, extend); 340 Prepend (maprow, self->row, self->rows, extend);
325 378
326 return row->col + (x - row->c0); 379 return row->col + (x - row->c0);
327} 380}
328 381
329static mapcell * 382static mapcell *
330map_get_cell (CFPlus__Map self, int x, int y) 383map_get_cell (DC__Map self, int x, int y)
331{ 384{
332 return row_get_cell (map_get_row (self, y), x); 385 return row_get_cell (map_get_row (self, y), x);
333} 386}
334 387
335static void 388static void
336map_clear (CFPlus__Map self) 389map_clear (DC__Map self)
337{ 390{
338 int r; 391 int r;
339 392
340 for (r = 0; r < self->rows; r++) 393 for (r = 0; r < self->rows; r++)
341 Safefree (self->row[r].col); 394 Safefree (self->row[r].col);
348 self->oy = 0; 401 self->oy = 0;
349 self->row = 0; 402 self->row = 0;
350 self->rows = 0; 403 self->rows = 0;
351} 404}
352 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
353static void 416static void
354map_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)
355{ 418{
356 int x, y; 419 int x, y;
357 maprow *row; 420 maprow *row;
358 mapcell *cell; 421 mapcell *cell;
359 422
371 if (x >= row->c1) 434 if (x >= row->c1)
372 break; 435 break;
373 436
374 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
375 438
376 cell->darkness = 0; 439 CELL_CLEAR (cell);
377 cell->stat_hp = 0;
378 cell->flags = 0;
379 cell->player = 0;
380 } 440 }
381 } 441 }
382} 442}
383 443
384typedef struct { 444typedef struct {
419 ev.code = 1; 479 ev.code = 1;
420 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
421 ev.data2 = 0; 481 ev.data2 = 0;
422 482
423 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;
424} 490}
425 491
426static unsigned int 492static unsigned int
427minpot (unsigned int n) 493minpot (unsigned int n)
428{ 494{
438 n |= n >> 16; 504 n |= n >> 16;
439 505
440 return n + 1; 506 return n + 1;
441} 507}
442 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
443/* SDL should provide this, really. */ 520/* SDL should provide this, really. */
444#define SDLK_MODIFIER_MIN 300 521#define SDLK_MODIFIER_MIN 300
445#define SDLK_MODIFIER_MAX 314 522#define SDLK_MODIFIER_MAX 314
446 523
447/******************************************************************************/ 524/******************************************************************************/
485 return 0; 562 return 0;
486 563
487 return 1; 564 return 1;
488} 565}
489 566
490MODULE = 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
491 626
492PROTOTYPES: ENABLE 627PROTOTYPES: ENABLE
493 628
494BOOT: 629BOOT:
495{ 630{
496 HV *stash = gv_stashpv ("CFPlus", 1); 631 HV *stash = gv_stashpv ("DC", 1);
497 static const struct { 632 static const struct {
498 const char *name; 633 const char *name;
499 IV iv; 634 IV iv;
500 } *civ, const_iv[] = { 635 } *civ, const_iv[] = {
501# define const_iv(name) { # name, (IV)name } 636# define const_iv(name) { # name, (IV)name }
523 658
524 const_iv (SDL_APPINPUTFOCUS), 659 const_iv (SDL_APPINPUTFOCUS),
525 const_iv (SDL_APPMOUSEFOCUS), 660 const_iv (SDL_APPMOUSEFOCUS),
526 const_iv (SDL_APPACTIVE), 661 const_iv (SDL_APPACTIVE),
527 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),
528 const_iv (SDLK_KP0), 715 const_iv (SDLK_KP0),
529 const_iv (SDLK_KP1), 716 const_iv (SDLK_KP1),
530 const_iv (SDLK_KP2), 717 const_iv (SDLK_KP2),
531 const_iv (SDLK_KP3), 718 const_iv (SDLK_KP3),
532 const_iv (SDLK_KP4), 719 const_iv (SDLK_KP4),
604 const_iv (KMOD_LMETA), 791 const_iv (KMOD_LMETA),
605 const_iv (KMOD_RMETA), 792 const_iv (KMOD_RMETA),
606 const_iv (KMOD_NUM), 793 const_iv (KMOD_NUM),
607 const_iv (KMOD_CAPS), 794 const_iv (KMOD_CAPS),
608 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)
609# undef const_iv 829# undef const_iv
610 }; 830 };
611 831
612 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--)
613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
614 834
615 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
616 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
617} 837}
618 838
631 851
632NV floor (NV x) 852NV floor (NV x)
633 853
634NV ceil (NV x) 854NV ceil (NV x)
635 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
636void 866void
637pango_init () 867pango_init ()
638 CODE: 868 CODE:
639{ 869{
640 opengl_fontmap = pango_opengl_font_map_new (); 870 opengl_fontmap = pango_opengl_font_map_new ();
641 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);
642 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
643} 878}
644 879
645char *
646SDL_GetError () 880char *SDL_GetError ()
647 881
648int 882void SDL_main_hack (SV *real_main)
649SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 883 PROTOTYPE: &
650 884
651void 885int SDL_Init (U32 flags)
886
887int SDL_InitSubSystem (U32 flags)
888
889void SDL_QuitSubSystem (U32 flags)
890
652SDL_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
653 901
654void 902void
655SDL_ListModes (int rgb, int alpha) 903SDL_ListModes (int rgb, int alpha)
656 PPCODE: 904 PPCODE:
657{ 905{
669 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 917 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 918 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 919 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
672 920
673 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 921 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
674#if SDL_VERSION_ATLEAST(1,2,10)
675 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
676 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 922 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
677#endif
678 923
679 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 924 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
680 925
681 if (m && m != (SDL_Rect **)-1) 926 if (m && m != (SDL_Rect **)-1)
682 while (*m) 927 while (*m)
683 { 928 {
684 if ((*m)->w >= 640 && (*m)->h >= 480) 929 if ((*m)->w >= 400 && (*m)->h >= 300)
685 { 930 {
686 AV *av = newAV (); 931 AV *av = newAV ();
687 av_push (av, newSViv ((*m)->w)); 932 av_push (av, newSViv ((*m)->w));
688 av_push (av, newSViv ((*m)->h)); 933 av_push (av, newSViv ((*m)->h));
689 av_push (av, newSViv (rgb)); 934 av_push (av, newSViv (rgb));
712 ); 957 );
713 958
714 if (RETVAL) 959 if (RETVAL)
715 { 960 {
716 av_clear (texture_av); 961 av_clear (texture_av);
717
718 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
719#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);
720#include "glfunc.h" 963#include "glfunc.h"
721#undef GL_FUNC 964#undef GL_FUNC
965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
722 } 967 }
723} 968}
724 OUTPUT: 969 OUTPUT:
725 RETVAL 970 RETVAL
726 971
727void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
728SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
729 977
730char * 978char *
731SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
732 980
733int 981int
734SDL_GetAppState () 982SDL_GetAppState ()
735 983
984int
985SDL_GetModState ()
986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
736void 991void
992SDL_PumpEvents ()
993
994void
737poll_events () 995peep_events ()
738 PPCODE: 996 PPCODE:
739{ 997{
740 SDL_Event ev; 998 SDL_Event ev;
741 999
742 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
749 { 1007 {
750 case SDL_KEYDOWN: 1008 case SDL_KEYDOWN:
751 case SDL_KEYUP: 1009 case SDL_KEYUP:
752 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
753 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1011 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
754 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);
755 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 */
756 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1014 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
757 break; 1015 break;
758 1016
759 case SDL_ACTIVEEVENT: 1017 case SDL_ACTIVEEVENT:
760 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1018 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
778 x = ev.motion.x; 1036 x = ev.motion.x;
779 y = ev.motion.y; 1037 y = ev.motion.y;
780 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1038 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
781 } 1039 }
782 1040
783 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1041 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
784 hv_store (hv, "state", 5, newSViv (state), 0); 1042 hv_store (hv, "state", 5, newSViv (state), 0);
785 hv_store (hv, "x", 1, newSViv (x), 0); 1043 hv_store (hv, "x", 1, newSViv (x), 0);
786 hv_store (hv, "y", 1, newSViv (y), 0); 1044 hv_store (hv, "y", 1, newSViv (y), 0);
787 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1045 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
788 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1046 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
789 } 1047 }
790 break; 1048 break;
791 1049
792 case SDL_MOUSEBUTTONDOWN: 1050 case SDL_MOUSEBUTTONDOWN:
793 case SDL_MOUSEBUTTONUP: 1051 case SDL_MOUSEBUTTONUP:
794 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1052 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
795 1053
796 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1054 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
797 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1055 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
798 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1056 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
799 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1057 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
804 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1062 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
805 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1063 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
806 break; 1064 break;
807 } 1065 }
808 1066
809 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))));
810 } 1068 }
811} 1069}
812 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
813int 1084int
814Mix_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)
815 POSTCALL: 1086 POSTCALL:
816 Mix_HookMusicFinished (music_finished); 1087 Mix_HookMusicFinished (music_finished);
817 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}
818 1105
819void 1106void
820Mix_CloseAudio () 1107Mix_CloseAudio ()
821 1108
822int 1109int
857 } 1144 }
858 } 1145 }
859#endif 1146#endif
860} 1147}
861 1148
862void 1149int
863add_font (char *file) 1150add_font (char *file)
864 CODE: 1151 CODE:
865 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)
866 1162
867void 1163void
868load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
869 ALIAS: 1165 ALIAS:
870 load_image_file = 1 1166 load_image_file = 1
956void 1252void
957error (char *message) 1253error (char *message)
958 CODE: 1254 CODE:
959 fprintf (stderr, "ERROR: %s\n", message); 1255 fprintf (stderr, "ERROR: %s\n", message);
960#ifdef _WIN32 1256#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1257 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
962#endif 1258#endif
963 1259
964void 1260void
965fatal (char *message) 1261fatal (char *message)
966 CODE: 1262 CODE:
967 fprintf (stderr, "FATAL: %s\n", message); 1263 fprintf (stderr, "FATAL: %s\n", message);
968#ifdef _WIN32 1264#ifdef _WIN32
969 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1265 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
970#endif 1266#endif
971 _exit (1); 1267 _exit (1);
972 1268
973void 1269void
974_exit (int retval = 0) 1270_exit (int retval = 0)
986#if DEBUG 1282#if DEBUG
987 VALGRIND_DO_LEAK_CHECK; 1283 VALGRIND_DO_LEAK_CHECK;
988#endif 1284#endif
989} 1285}
990 1286
991MODULE = 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
992 1295
993PROTOTYPES: DISABLE 1296PROTOTYPES: DISABLE
994 1297
995CFPlus::Font 1298DC::Font
996new_from_file (SV *class, char *path, int id = 0) 1299new_from_file (SV *class, char *path, int id = 0)
997 CODE: 1300 CODE:
998{ 1301{
999 int count; 1302 int count;
1000 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1303 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1003} 1306}
1004 OUTPUT: 1307 OUTPUT:
1005 RETVAL 1308 RETVAL
1006 1309
1007void 1310void
1008DESTROY (CFPlus::Font self) 1311DESTROY (DC::Font self)
1009 CODE: 1312 CODE:
1010 pango_font_description_free (self); 1313 pango_font_description_free (self);
1011 1314
1012void 1315void
1013make_default (CFPlus::Font self) 1316make_default (DC::Font self)
1014 PROTOTYPE: $ 1317 PROTOTYPE: $
1015 CODE: 1318 CODE:
1016 default_font = self; 1319 default_font = self;
1017 1320
1018MODULE = CFPlus PACKAGE = CFPlus::Layout 1321MODULE = Deliantra::Client PACKAGE = DC::Layout
1019 1322
1020PROTOTYPES: DISABLE 1323PROTOTYPES: DISABLE
1021 1324
1022void 1325void
1023reset_glyph_cache () 1326glyph_cache_backup ()
1024 PROTOTYPE: 1327 PROTOTYPE:
1025 CODE: 1328 CODE:
1329 tc_backup ();
1330
1331void
1332glyph_cache_restore ()
1333 PROTOTYPE:
1334 CODE:
1026 tc_clear (); 1335 tc_restore ();
1027 1336
1028CFPlus::Layout 1337DC::Layout
1029new (SV *class) 1338new (SV *class)
1030 CODE: 1339 CODE:
1031 New (0, RETVAL, 1, struct cf_layout); 1340 New (0, RETVAL, 1, struct cf_layout);
1032 1341
1033 RETVAL->pl = pango_layout_new (opengl_context); 1342 RETVAL->pl = pango_layout_new (opengl_context);
1035 RETVAL->g = 1.; 1344 RETVAL->g = 1.;
1036 RETVAL->b = 1.; 1345 RETVAL->b = 1.;
1037 RETVAL->a = 1.; 1346 RETVAL->a = 1.;
1038 RETVAL->base_height = MIN_FONT_HEIGHT; 1347 RETVAL->base_height = MIN_FONT_HEIGHT;
1039 RETVAL->font = 0; 1348 RETVAL->font = 0;
1349 RETVAL->rc = rc_alloc ();
1040 1350
1041 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1351 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042 layout_update_font (RETVAL); 1352 layout_update_font (RETVAL);
1043 OUTPUT: 1353 OUTPUT:
1044 RETVAL 1354 RETVAL
1045 1355
1046void 1356void
1047DESTROY (CFPlus::Layout self) 1357DESTROY (DC::Layout self)
1048 CODE: 1358 CODE:
1049 g_object_unref (self->pl); 1359 g_object_unref (self->pl);
1360 rc_free (self->rc);
1050 Safefree (self); 1361 Safefree (self);
1051 1362
1052void 1363void
1053set_text (CFPlus::Layout self, SV *text_) 1364set_text (DC::Layout self, SV *text_)
1054 CODE: 1365 CODE:
1055{ 1366{
1056 STRLEN textlen; 1367 STRLEN textlen;
1057 char *text = SvPVutf8 (text_, textlen); 1368 char *text = SvPVutf8 (text_, textlen);
1058 1369
1059 pango_layout_set_text (self->pl, text, textlen); 1370 pango_layout_set_text (self->pl, text, textlen);
1060} 1371}
1061 1372
1062void 1373void
1063set_markup (CFPlus::Layout self, SV *text_) 1374set_markup (DC::Layout self, SV *text_)
1064 CODE: 1375 CODE:
1065{ 1376{
1066 STRLEN textlen; 1377 STRLEN textlen;
1067 char *text = SvPVutf8 (text_, textlen); 1378 char *text = SvPVutf8 (text_, textlen);
1068 1379
1069 pango_layout_set_markup (self->pl, text, textlen); 1380 pango_layout_set_markup (self->pl, text, textlen);
1070} 1381}
1071 1382
1072void 1383void
1073set_shapes (CFPlus::Layout self, ...) 1384set_shapes (DC::Layout self, ...)
1074 CODE: 1385 CODE:
1075{ 1386{
1076 PangoAttrList *attrs = 0; 1387 PangoAttrList *attrs = 0;
1077 const char *text = pango_layout_get_text (self->pl); 1388 const char *text = pango_layout_get_text (self->pl);
1078 const char *pos = text; 1389 const char *pos = text;
1113 if (attrs) 1424 if (attrs)
1114 pango_layout_set_attributes (self->pl, attrs); 1425 pango_layout_set_attributes (self->pl, attrs);
1115} 1426}
1116 1427
1117void 1428void
1118get_shapes (CFPlus::Layout self) 1429get_shapes (DC::Layout self)
1119 PPCODE: 1430 PPCODE:
1120{ 1431{
1121 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1432 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1122 1433
1123 do 1434 do
1124 { 1435 {
1125 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1436 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1126 1437
1127 if (run && shape_attr_p (run)) 1438 if (run && shape_attr_p (run))
1128 { 1439 {
1129 PangoRectangle extents; 1440 PangoRectangle extents;
1130 pango_layout_iter_get_run_extents (iter, 0, &extents); 1441 pango_layout_iter_get_run_extents (iter, 0, &extents);
1138 1449
1139 pango_layout_iter_free (iter); 1450 pango_layout_iter_free (iter);
1140} 1451}
1141 1452
1142int 1453int
1143has_wrapped (CFPlus::Layout self) 1454has_wrapped (DC::Layout self)
1144 CODE: 1455 CODE:
1145{ 1456{
1146 int lines = 1; 1457 int lines = 1;
1147 const char *text = pango_layout_get_text (self->pl); 1458 const char *text = pango_layout_get_text (self->pl);
1148 1459
1153} 1464}
1154 OUTPUT: 1465 OUTPUT:
1155 RETVAL 1466 RETVAL
1156 1467
1157SV * 1468SV *
1158get_text (CFPlus::Layout self) 1469get_text (DC::Layout self)
1159 CODE: 1470 CODE:
1160 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1471 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1161 sv_utf8_decode (RETVAL); 1472 sv_utf8_decode (RETVAL);
1162 OUTPUT: 1473 OUTPUT:
1163 RETVAL 1474 RETVAL
1164 1475
1165void 1476void
1166set_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.)
1167 CODE: 1478 CODE:
1168 self->r = r; 1479 self->r = r;
1169 self->g = g; 1480 self->g = g;
1170 self->b = b; 1481 self->b = b;
1171 self->a = a; 1482 self->a = a;
1172 1483
1173void 1484void
1174set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1485set_font (DC::Layout self, DC::Font font = 0)
1175 CODE: 1486 CODE:
1176 if (self->font != font) 1487 if (self->font != font)
1177 { 1488 {
1178 self->font = font; 1489 self->font = font;
1179 layout_update_font (self); 1490 layout_update_font (self);
1180 } 1491 }
1181 1492
1182void 1493void
1183set_height (CFPlus::Layout self, int base_height) 1494set_height (DC::Layout self, int base_height)
1184 CODE: 1495 CODE:
1185 if (self->base_height != base_height) 1496 if (self->base_height != base_height)
1186 { 1497 {
1187 self->base_height = base_height; 1498 self->base_height = base_height;
1188 layout_update_font (self); 1499 layout_update_font (self);
1189 } 1500 }
1190 1501
1191void 1502void
1192set_width (CFPlus::Layout self, int max_width = -1) 1503set_width (DC::Layout self, int max_width = -1)
1193 CODE: 1504 CODE:
1194 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);
1195 1506
1196void 1507void
1197set_indent (CFPlus::Layout self, int indent) 1508set_indent (DC::Layout self, int indent)
1198 CODE: 1509 CODE:
1199 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1510 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1200 1511
1201void 1512void
1202set_spacing (CFPlus::Layout self, int spacing) 1513set_spacing (DC::Layout self, int spacing)
1203 CODE: 1514 CODE:
1204 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1515 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1205 1516
1206void 1517void
1207set_ellipsise (CFPlus::Layout self, int ellipsise) 1518set_ellipsise (DC::Layout self, int ellipsise)
1208 CODE: 1519 CODE:
1209 pango_layout_set_ellipsize (self->pl, 1520 pango_layout_set_ellipsize (self->pl,
1210 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1521 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1211 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1522 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1212 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1523 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1213 : PANGO_ELLIPSIZE_NONE 1524 : PANGO_ELLIPSIZE_NONE
1214 ); 1525 );
1215 1526
1216void 1527void
1217set_single_paragraph_mode (CFPlus::Layout self, int spm) 1528set_single_paragraph_mode (DC::Layout self, int spm)
1218 CODE: 1529 CODE:
1219 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1530 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1220 1531
1221void 1532void
1222size (CFPlus::Layout self) 1533size (DC::Layout self)
1223 PPCODE: 1534 PPCODE:
1224{ 1535{
1225 int w, h; 1536 int w, h;
1226 1537
1227 layout_get_pixel_size (self, &w, &h); 1538 layout_get_pixel_size (self, &w, &h);
1230 PUSHs (sv_2mortal (newSViv (w))); 1541 PUSHs (sv_2mortal (newSViv (w)));
1231 PUSHs (sv_2mortal (newSViv (h))); 1542 PUSHs (sv_2mortal (newSViv (h)));
1232} 1543}
1233 1544
1234int 1545int
1235descent (CFPlus::Layout self) 1546descent (DC::Layout self)
1236 CODE: 1547 CODE:
1237{ 1548{
1238 PangoRectangle rect; 1549 PangoRectangle rect;
1239 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1550 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1240 pango_layout_line_get_pixel_extents (line, 0, &rect); 1551 pango_layout_line_get_pixel_extents (line, 0, &rect);
1241 RETVAL = PANGO_DESCENT (rect); 1552 RETVAL = PANGO_DESCENT (rect);
1242} 1553}
1243 OUTPUT: 1554 OUTPUT:
1244 RETVAL 1555 RETVAL
1245 1556
1246int 1557int
1247xy_to_index (CFPlus::Layout self, int x, int y) 1558xy_to_index (DC::Layout self, int x, int y)
1248 CODE: 1559 CODE:
1249{ 1560{
1250 int index, trailing; 1561 int index, trailing;
1251 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);
1252 RETVAL = index + trailing; 1563 RETVAL = index + trailing;
1253} 1564}
1254 OUTPUT: 1565 OUTPUT:
1255 RETVAL 1566 RETVAL
1256 1567
1257void 1568void
1258cursor_pos (CFPlus::Layout self, int index) 1569cursor_pos (DC::Layout self, int index)
1259 PPCODE: 1570 PPCODE:
1260{ 1571{
1261 PangoRectangle strong_pos; 1572 PangoRectangle pos;
1262 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1573 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1263 1574
1264 EXTEND (SP, 3); 1575 EXTEND (SP, 3);
1265 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1576 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1266 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1577 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1578 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1268} 1579}
1269 1580
1270void 1581void
1271index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1582index_to_line_x (DC::Layout self, int index, int trailing = 0)
1272 PPCODE: 1583 PPCODE:
1273{ 1584{
1274 int line, x; 1585 int line, x;
1275 1586
1276 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)
1277 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1589 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1278 1590 --line;
1591#endif
1279 EXTEND (SP, 2); 1592 EXTEND (SP, 2);
1280 PUSHs (sv_2mortal (newSViv (line - 1))); 1593 PUSHs (sv_2mortal (newSViv (line)));
1281 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1594 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1282} 1595}
1283 1596
1284void 1597void
1285line_x_to_index (CFPlus::Layout self, int line, int x) 1598line_x_to_index (DC::Layout self, int line, int x)
1286 PPCODE: 1599 PPCODE:
1287{ 1600{
1288 PangoLayoutLine *lp; 1601 PangoLayoutLine *lp;
1289 int index, trailing; 1602 int index, trailing;
1290 1603
1291 if (line < 0) 1604 if (line < 0)
1292 XSRETURN_EMPTY; 1605 XSRETURN_EMPTY;
1293 1606
1294 if (!(lp = pango_layout_get_line (self->pl, line))) 1607 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1295 XSRETURN_EMPTY; /* do better */ 1608 XSRETURN_EMPTY; /* do better */
1296 1609
1297 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);
1298 1611
1299 EXTEND (SP, 2); 1612 EXTEND (SP, 2);
1305 PUSHs (sv_2mortal (newSViv (trailing))); 1618 PUSHs (sv_2mortal (newSViv (trailing)));
1306 } 1619 }
1307} 1620}
1308 1621
1309void 1622void
1310render (CFPlus::Layout self, float x, float y, int flags = 0) 1623render (DC::Layout self, float x, float y, int flags = 0)
1311 PPCODE: 1624 CODE:
1625 rc_clear (self->rc);
1312 pango_opengl_render_layout_subpixel ( 1626 pango_opengl_render_layout_subpixel (
1313 self->pl, 1627 self->pl,
1628 self->rc,
1314 x * PANGO_SCALE, y * PANGO_SCALE, 1629 x * PANGO_SCALE, y * PANGO_SCALE,
1315 self->r, self->g, self->b, self->a, 1630 self->r, self->g, self->b, self->a,
1316 flags 1631 flags
1317 ); 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);
1318 1636
1319MODULE = 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
1320 1657
1321PROTOTYPES: ENABLE 1658PROTOTYPES: ENABLE
1322
1323int minpot (int n)
1324 1659
1325void 1660void
1326pad (SV *data_, int ow, int oh, int nw, int nh) 1661pad (SV *data_, int ow, int oh, int nw, int nh)
1327 CODE: 1662 CODE:
1328{ 1663{
1394 glDisable (GL_ALPHA_TEST); 1729 glDisable (GL_ALPHA_TEST);
1395 glDisable (GL_BLEND); 1730 glDisable (GL_BLEND);
1396 } 1731 }
1397} 1732}
1398 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
1399IV 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)
1400 CODE: 1856 CODE:
1401{ 1857{
1402 GLint width; 1858 GLint width;
1403 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);
1405 RETVAL = width > 0; 1861 RETVAL = width > 0;
1406} 1862}
1407 OUTPUT: 1863 OUTPUT:
1408 RETVAL 1864 RETVAL
1409 1865
1410MODULE = CFPlus PACKAGE = CFPlus::Map 1866MODULE = Deliantra::Client PACKAGE = DC::Map
1411 1867
1412PROTOTYPES: DISABLE 1868PROTOTYPES: DISABLE
1413 1869
1414CFPlus::Map 1870DC::Map
1415new (SV *class) 1871new (SV *class)
1416 CODE: 1872 CODE:
1417 New (0, RETVAL, 1, struct map); 1873 New (0, RETVAL, 1, struct map);
1418 RETVAL->x = 0; 1874 RETVAL->x = 0;
1419 RETVAL->y = 0; 1875 RETVAL->y = 0;
1427 RETVAL->row = 0; 1883 RETVAL->row = 0;
1428 OUTPUT: 1884 OUTPUT:
1429 RETVAL 1885 RETVAL
1430 1886
1431void 1887void
1432DESTROY (CFPlus::Map self) 1888DESTROY (DC::Map self)
1433 CODE: 1889 CODE:
1434{ 1890{
1435 map_clear (self); 1891 map_clear (self);
1436 Safefree (self->face2tile); 1892 Safefree (self->face2tile);
1437 Safefree (self->tex); 1893 Safefree (self->tex);
1438 Safefree (self); 1894 Safefree (self);
1439} 1895}
1440 1896
1441void 1897void
1442resize (CFPlus::Map self, int map_width, int map_height) 1898resize (DC::Map self, int map_width, int map_height)
1443 CODE: 1899 CODE:
1444 self->w = map_width; 1900 self->w = map_width;
1445 self->h = map_height; 1901 self->h = map_height;
1446 1902
1447void 1903void
1448clear (CFPlus::Map self) 1904clear (DC::Map self)
1449 CODE: 1905 CODE:
1450 map_clear (self); 1906 map_clear (self);
1451 1907
1452void 1908void
1453set_tileid (CFPlus::Map self, int face, int tile) 1909set_tileid (DC::Map self, int face, int tile)
1454 CODE: 1910 CODE:
1455{ 1911{
1456 need_facenum (self, face); self->face2tile [face] = tile; 1912 need_facenum (self, face); self->face2tile [face] = tile;
1457 need_texid (self, tile); 1913 need_texid (self, tile);
1458} 1914}
1459 1915
1460void 1916void
1461set_smooth (CFPlus::Map self, int face, int smooth, int level) 1917set_smooth (DC::Map self, int face, int smooth, int level)
1462 CODE: 1918 CODE:
1463{ 1919{
1464 tileid texid; 1920 tileid texid;
1465 maptex *tex; 1921 maptex *tex;
1466 1922
1479 tex->smoothtile = self->face2tile [smooth]; 1935 tex->smoothtile = self->face2tile [smooth];
1480 tex->smoothlevel = level; 1936 tex->smoothlevel = level;
1481} 1937}
1482 1938
1483void 1939void
1484set_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)
1485 CODE: 1941 CODE:
1486{ 1942{
1487 need_texid (self, texid); 1943 need_texid (self, texid);
1488 1944
1489 { 1945 {
1508 // use uglier nearest interpolation because linear suffers 1964 // use uglier nearest interpolation because linear suffers
1509 // from transparent color bleeding and ugly wrapping effects. 1965 // from transparent color bleeding and ugly wrapping effects.
1510 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1966 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1511} 1967}
1512 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
1513int 1989int
1514ox (CFPlus::Map self) 1990ox (DC::Map self)
1515 ALIAS: 1991 ALIAS:
1516 oy = 1 1992 oy = 1
1517 x = 2 1993 x = 2
1518 y = 3 1994 y = 3
1519 w = 4 1995 w = 4
1530 } 2006 }
1531 OUTPUT: 2007 OUTPUT:
1532 RETVAL 2008 RETVAL
1533 2009
1534void 2010void
1535scroll (CFPlus::Map self, int dx, int dy) 2011scroll (DC::Map self, int dx, int dy)
1536 CODE: 2012 CODE:
1537{ 2013{
1538 if (dx > 0) 2014 if (dx > 0)
1539 map_blank (self, self->x, self->y, dx, self->h); 2015 map_blank (self, self->x, self->y, dx, self->h);
1540 else if (dx < 0) 2016 else if (dx < 0)
1556 self->y += MAP_EXTEND_Y; 2032 self->y += MAP_EXTEND_Y;
1557 } 2033 }
1558} 2034}
1559 2035
1560SV * 2036SV *
1561map1a_update (CFPlus::Map self, SV *data_, int extmap) 2037map1a_update (DC::Map self, SV *data_, int extmap)
1562 CODE: 2038 CODE:
1563{ 2039{
1564 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2040 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1565 uint8_t *data_end = (uint8_t *)SvEND (data_); 2041 uint8_t *data_end = (uint8_t *)SvEND (data_);
1566 mapcell *cell; 2042 mapcell *cell;
1594 uint8_t ext, cmd; 2070 uint8_t ext, cmd;
1595 2071
1596 do 2072 do
1597 { 2073 {
1598 ext = *data++; 2074 ext = *data++;
1599 cmd = ext & 0x3f; 2075 cmd = ext & 0x7f;
1600 2076
1601 if (cmd < 4) 2077 if (cmd < 4)
1602 cell->darkness = 255 - ext * 64 + 1; 2078 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1603 else if (cmd == 5) // health 2079 else if (cmd == 5) // health
1604 { 2080 {
1605 cell->stat_width = 1; 2081 cell->stat_width = 1;
1606 cell->stat_hp = *data++; 2082 cell->stat_hp = *data++;
1607 } 2083 }
1608 else if (cmd == 6) // monster width 2084 else if (cmd == 6) // monster width
1609 cell->stat_width = *data++ + 1; 2085 cell->stat_width = *data++ + 1;
1610 else if (cmd == 0x47) 2086 else if (cmd == 0x47)
1611 { 2087 {
1612 if (*data == 4) 2088 if (*data == 1) cell->player = data [1];
1613 ; // 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);
1614 2092
1615 data += *data + 1; 2093 data += *data + 1;
1616 } 2094 }
1617 else if (cmd == 8) // cell flags 2095 else if (cmd == 8) // cell flags
1618 cell->flags = *data++; 2096 cell->flags = *data++;
1635 cell->tile [z] = self->face2tile [face]; 2113 cell->tile [z] = self->face2tile [face];
1636 2114
1637 if (cell->tile [z]) 2115 if (cell->tile [z])
1638 { 2116 {
1639 maptex *tex = self->tex + cell->tile [z]; 2117 maptex *tex = self->tex + cell->tile [z];
2118 tex->unused = 0;
1640 if (!tex->name) 2119 if (!tex->name)
1641 av_push (missing, newSViv (cell->tile [z])); 2120 av_push (missing, newSViv (cell->tile [z]));
1642 2121
1643 if (tex->smoothtile) 2122 if (tex->smoothtile)
1644 { 2123 {
1645 maptex *smooth = self->tex + tex->smoothtile; 2124 maptex *smooth = self->tex + tex->smoothtile;
2125 smooth->unused = 0;
1646 if (!smooth->name) 2126 if (!smooth->name)
1647 av_push (missing, newSViv (tex->smoothtile)); 2127 av_push (missing, newSViv (tex->smoothtile));
1648 } 2128 }
1649 } 2129 }
1650 } 2130 }
1651 } 2131 }
1652 else 2132 else
1653 cell->darkness = 0; 2133 CELL_CLEAR (cell);
1654 } 2134 }
1655} 2135}
1656 OUTPUT: 2136 OUTPUT:
1657 RETVAL 2137 RETVAL
1658 2138
1659SV * 2139SV *
1660mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2140mapmap (DC::Map self, int x0, int y0, int w, int h)
1661 CODE: 2141 CODE:
1662{ 2142{
1663 int x1, x; 2143 int x1, x;
1664 int y1, y; 2144 int y1, y;
1665 int z; 2145 int z;
1678 ? self->row + y 2158 ? self->row + y
1679 : 0; 2159 : 0;
1680 2160
1681 for (x = x0; x < x1; x++) 2161 for (x = x0; x < x1; x++)
1682 { 2162 {
1683 int r = 32, g = 32, b = 32, a = 192; 2163 unsigned int r = 32, g = 32, b = 32, a = 192;
1684 2164
1685 if (row && row->c0 <= x && x < row->c1) 2165 if (row && row->c0 <= x && x < row->c1)
1686 { 2166 {
1687 mapcell *cell = row->col + (x - row->c0); 2167 mapcell *cell = row->col + (x - row->c0);
1688 2168
1690 { 2170 {
1691 maptex tex = self->tex [cell->tile [z]]; 2171 maptex tex = self->tex [cell->tile [z]];
1692 int a0 = 255 - tex.a; 2172 int a0 = 255 - tex.a;
1693 int a1 = tex.a; 2173 int a1 = tex.a;
1694 2174
1695 r = (r * a0 + tex.r * a1) / 255; 2175 r = div255 (r * a0 + tex.r * a1);
1696 g = (g * a0 + tex.g * a1) / 255; 2176 g = div255 (g * a0 + tex.g * a1);
1697 b = (b * a0 + tex.b * a1) / 255; 2177 b = div255 (b * a0 + tex.b * a1);
1698 a = (a * a0 + tex.a * a1) / 255; 2178 a = div255 (a * a0 + tex.a * a1);
1699 } 2179 }
1700 } 2180 }
1701 2181
1702 *map++ = (r ) 2182 *map++ = (r )
1703 | (g << 8) 2183 | (g << 8)
1710} 2190}
1711 OUTPUT: 2191 OUTPUT:
1712 RETVAL 2192 RETVAL
1713 2193
1714void 2194void
1715draw (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)
1716 CODE: 2196 CODE:
1717{ 2197{
2198 int x, y, z;
2199
1718 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2200 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1719 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
1720 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)
1721 smooth_key skey; 2203 smooth_key skey;
1722 int x, y, z; 2204 int pl_x, pl_y;
1723 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;
1724 2210
2211 pl_tex.name = 0;
2212
1725 // thats current max. sorry. 2213 // that's current max. sorry.
1726 if (sw > 255) sw = 255; 2214 if (sw > 255) sw = 255;
1727 if (sh > 255) sh = 255; 2215 if (sh > 255) sh = 255;
1728 2216
1729 // clear key, in case of extra padding 2217 // clear key, in case of extra padding
1730 memset (&skey, 0, sizeof (skey)); 2218 memset (&skey, 0, sizeof (skey));
1731 2219
1732 glColor4ub (255, 255, 255, 255); 2220 memset (&key, 0, sizeof (key));
1733 2221 key.r = 255;
1734 glEnable (GL_BLEND); 2222 key.g = 255;
1735 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2223 key.b = 255;
1736 glEnable (GL_TEXTURE_2D); 2224 key.a = 255;
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2225 key.mode = GL_QUADS;
1738 2226 key.format = GL_T2F_V3F;
1739 glBegin (GL_QUADS);
1740
1741 last_name = -1;
1742 2227
1743 mx += self->x; 2228 mx += self->x;
1744 my += self->y; 2229 my += self->y;
1745 2230
1746 // first pass: determine smooth_max 2231 // first pass: determine smooth_max
1763 MAX (self->tex [cell->tile [1]].smoothlevel, 2248 MAX (self->tex [cell->tile [1]].smoothlevel,
1764 self->tex [cell->tile [2]].smoothlevel)); 2249 self->tex [cell->tile [2]].smoothlevel));
1765 } 2250 }
1766 } 2251 }
1767 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
1768 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
1769 { 2258 {
1770 memset (smooth_level, 0, sizeof (smooth_level)); 2259 memset (smooth_level, 0, sizeof (smooth_level));
2260 key.texname = -1;
1771 2261
1772 for (y = 0; y < sh; y++) 2262 for (y = 0; y < sh; y++)
1773 if (0 <= y + my && y + my < self->rows) 2263 if (0 <= y + my && y + my < self->rows)
1774 { 2264 {
1775 maprow *row = self->row + (y + my); 2265 maprow *row = self->row + (y + my);
1783 if (tile) 2273 if (tile)
1784 { 2274 {
1785 maptex tex = self->tex [tile]; 2275 maptex tex = self->tex [tile];
1786 int px, py; 2276 int px, py;
1787 2277
1788 // suppressing texture state switches here
1789 // is only moderately effective, but worth the extra effort
1790 if (last_name != tex.name) 2278 if (key.texname != tex.name)
1791 { 2279 {
2280 self->tex [tile].unused = 0;
2281
1792 if (!tex.name) 2282 if (!tex.name)
1793 tex = self->tex [2]; /* missing, replace by noface */ 2283 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1794 2284
1795 glEnd (); 2285 key.texname = tex.name;
1796 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2286 arr = rc_array (rc, &key);
1797 glBegin (GL_QUADS);
1798 } 2287 }
1799 2288
1800 px = (x + 1) * T - tex.w; 2289 px = (x + 1) * Th - tex.w;
1801 py = (y + 1) * T - tex.h; 2290 py = (y + 1) * Tw - tex.h;
1802 2291
1803 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2292 if (expect_false (cell->player == player) && expect_false (z == 2))
1804 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1805 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1806 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1807
1808 if (cell->flags && z == 2)
1809 { 2293 {
1810 if (cell->flags & 1) 2294 pl_x = px;
2295 pl_y = py;
2296 pl_tex = tex;
1811 { 2297 continue;
1812 maptex tex = self->tex [1];
1813 int px = x * T + T * 2 / 32;
1814 int py = y * T - T * 6 / 32;
1815
1816 glEnd ();
1817 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1818 glBegin (GL_QUADS);
1819
1820 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1821 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1822 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1823 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1824 }
1825 } 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);
1826 2304
1827 // update smooth hash 2305 // update smooth hash
1828 if (tex.smoothtile) 2306 if (tex.smoothtile)
1829 { 2307 {
1830 skey.tile = tex.smoothtile; 2308 skey.tile = tex.smoothtile;
1861 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);
1862 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);
1863 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);
1864 } 2342 }
1865 } 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 }
1866 } 2365 }
1867 } 2366 }
2367
2368 rc_draw (rc);
2369 rc_clear (rc);
1868 2370
1869 // go through all smoothlevels, lowest to highest, then draw. 2371 // go through all smoothlevels, lowest to highest, then draw.
1870 // this is basically counting sort 2372 // this is basically counting sort
1871 { 2373 {
1872 int w, b; 2374 int w, b;
1873 2375
2376 glEnable (GL_TEXTURE_2D);
2377 glBegin (GL_QUADS);
1874 for (w = 0; w < 256 / 32; ++w) 2378 for (w = 0; w < 256 / 32; ++w)
1875 { 2379 {
1876 uint32_t smask = smooth_level [w]; 2380 uint32_t smask = smooth_level [w];
1877 if (smask) 2381 if (smask)
1878 for (b = 0; b < 32; ++b) 2382 for (b = 0; b < 32; ++b)
1890 if (!(bits & 0x1000) 2394 if (!(bits & 0x1000)
1891 && skey->level == level 2395 && skey->level == level
1892 && level > smooth_max [skey->x][skey->y]) 2396 && level > smooth_max [skey->x][skey->y])
1893 { 2397 {
1894 maptex tex = self->tex [skey->tile]; 2398 maptex tex = self->tex [skey->tile];
1895 int px = (((int)skey->x) - 1) * T; 2399 int px = (((int)skey->x) - 1) * Tw;
1896 int py = (((int)skey->y) - 1) * T; 2400 int py = (((int)skey->y) - 1) * Th;
1897 int border = bits & 15; 2401 int border = bits & 15;
1898 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2402 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899 float dx = tex.s * .0625f; // 16 images/row 2403 float dx = tex.s * .0625f; // 16 images/row
1900 float dy = tex.t * .5f ; // 2 images/column 2404 float dy = tex.t * .5f ; // 2 images/column
1901 2405
1902 // this time naively avoiding texture state changes
1903 // save gobs of state changes.
1904 if (last_name != tex.name) 2406 if (tex.name)
1905 { 2407 {
2408 // this time avoiding texture state changes
2409 // save gobs of state changes.
1906 if (!tex.name) 2410 if (key.texname != tex.name)
1907 continue; // smoothing not yet available 2411 {
2412 self->tex [skey->tile].unused = 0;
1908 2413
1909 glEnd (); 2414 glEnd ();
1910 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2415 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911 glBegin (GL_QUADS); 2416 glBegin (GL_QUADS);
1912 } 2417 }
1913 2418
1914 if (border) 2419 if (border)
1915 { 2420 {
1916 float ox = border * dx; 2421 float ox = border * dx;
1917 2422
1918 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2423 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2424 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1920 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2425 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1921 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2426 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1922 } 2427 }
1923 2428
1924 if (corner) 2429 if (corner)
1925 { 2430 {
1926 float ox = corner * dx; 2431 float ox = corner * dx;
1927 2432
1928 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2434 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1930 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2435 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1931 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2436 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2437 }
1932 } 2438 }
1933 } 2439 }
1934 } 2440 }
1935 } 2441 }
1936 } 2442 }
2443
2444 glEnd ();
2445 glDisable (GL_TEXTURE_2D);
2446 key.texname = -1;
1937 } 2447 }
1938 2448
1939 hv_clear (smooth); 2449 hv_clear (smooth);
1940 } 2450 }
1941 2451
1942 glEnd (); 2452 if (pl_tex.name)
2453 {
2454 maptex tex = pl_tex;
2455 int px = pl_x + sdx;
2456 int py = pl_y + sdy;
1943 2457
1944 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
1945 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
2473 rc_free (rc);
2474 rc_free (rc_ov);
1946 2475
1947 // top layer: overlays such as the health bar 2476 // top layer: overlays such as the health bar
1948 for (y = 0; y < sh; y++) 2477 for (y = 0; y < sh; y++)
1949 if (0 <= y + my && y + my < self->rows) 2478 if (0 <= y + my && y + my < self->rows)
1950 { 2479 {
1953 for (x = 0; x < sw; x++) 2482 for (x = 0; x < sw; x++)
1954 if (row->c0 <= x + mx && x + mx < row->c1) 2483 if (row->c0 <= x + mx && x + mx < row->c1)
1955 { 2484 {
1956 mapcell *cell = row->col + (x + mx - row->c0); 2485 mapcell *cell = row->col + (x + mx - row->c0);
1957 2486
1958 int px = x * T; 2487 int px = x * Tw;
1959 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 }
1960 2495
1961 if (cell->stat_hp) 2496 if (cell->stat_hp)
1962 { 2497 {
1963 int width = cell->stat_width * T; 2498 int width = cell->stat_width * Tw;
1964 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2499 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1965 2500
1966 glColor3ub (0, 0, 0); 2501 glColor3ub (0, 0, 0);
1967 glRectf (px + 1, py - thick - 2, 2502 glRectf (px + 1, py - thick - 2,
1968 px + width - 1, py); 2503 px + width - 1, py);
1969 2504
1975 } 2510 }
1976 } 2511 }
1977} 2512}
1978 2513
1979void 2514void
1980draw_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)
1981 CODE: 2516 CODE:
1982{ 2517{
1983 static float color[16][3] = { 2518 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2519 { 0.00f, 0.00f, 0.00f },
1985 { 1.00F, 1.00F, 1.00F }, 2520 { 1.00f, 1.00f, 1.00f },
1986 { 0.00F, 0.00F, 0.55F }, 2521 { 0.00f, 0.00f, 0.55f },
1987 { 1.00F, 0.00F, 0.00F }, 2522 { 1.00f, 0.00f, 0.00f },
1988 2523
1989 { 1.00F, 0.54F, 0.00F }, 2524 { 1.00f, 0.54f, 0.00f },
1990 { 0.11F, 0.56F, 1.00F }, 2525 { 0.11f, 0.56f, 1.00f },
1991 { 0.93F, 0.46F, 0.00F }, 2526 { 0.93f, 0.46f, 0.00f },
1992 { 0.18F, 0.54F, 0.34F }, 2527 { 0.18f, 0.54f, 0.34f },
1993 2528
1994 { 0.56F, 0.73F, 0.56F }, 2529 { 0.56f, 0.73f, 0.56f },
1995 { 0.80F, 0.80F, 0.80F }, 2530 { 0.80f, 0.80f, 0.80f },
1996 { 0.55F, 0.41F, 0.13F }, 2531 { 0.55f, 0.41f, 0.13f },
1997 { 0.99F, 0.77F, 0.26F }, 2532 { 0.99f, 0.77f, 0.26f },
1998 2533
1999 { 0.74F, 0.65F, 0.41F }, 2534 { 0.74f, 0.65f, 0.41f },
2000 2535
2001 { 0.00F, 1.00F, 1.00F }, 2536 { 0.00f, 1.00f, 1.00f },
2002 { 1.00F, 0.00F, 1.00F }, 2537 { 1.00f, 0.00f, 1.00f },
2003 { 1.00F, 1.00F, 0.00F }, 2538 { 1.00f, 1.00f, 0.00f },
2004 }; 2539 };
2005 2540
2006 int x, y; 2541 int x, y;
2007 2542
2008 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 */
2009 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2550 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2010 glEnable (GL_BLEND); 2551 glEnable (GL_BLEND);
2011 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2552 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2012 glBegin (GL_QUADS); 2553 glBegin (GL_QUADS);
2013 2554
2014 for (y = 0; y < h; y++) 2555 for (y = 0; y < h; y++)
2018 2559
2019 if (m) 2560 if (m)
2020 { 2561 {
2021 float *c = color [m & 15]; 2562 float *c = color [m & 15];
2022 2563
2023 float tx1 = m & 0x40 ? 0.5 : 0.; 2564 float tx1 = m & 0x40 ? 0.5f : 0.f;
2024 float tx2 = tx1 + 0.5; 2565 float tx2 = tx1 + 0.5f;
2025 2566
2026 glColor4f (c[0], c[1], c[2], 0.75); 2567 glColor4f (c[0], c[1], c[2], 1);
2027 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2568 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2028 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2569 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2029 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2570 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2030 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2571 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2031 } 2572 }
2035 glDisable (GL_BLEND); 2576 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2577 glDisable (GL_TEXTURE_2D);
2037} 2578}
2038 2579
2039void 2580void
2040fow_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)
2041 PPCODE: 2582 PPCODE:
2042{ 2583{
2043 int x, y; 2584 int x, y;
2044 int sw1 = sw + 2; 2585 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2586 int sh1 = sh + 2;
2046 int sh3 = sh * 3; 2587 int sh3 = sh * 3;
2047 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);
2048 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2591 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2049 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2592 memset (darkness1, 0, sw1*sh1);
2050 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2051 2593
2052 SvPOK_only (darkness3_sv); 2594 SvPOK_only (darkness3_sv);
2053 SvCUR_set (darkness3_sv, sw34 * sh3); 2595 SvCUR_set (darkness3_sv, sw3 * sh3);
2054 2596
2055 mx += self->x - 1; 2597 mx += self->x - 1;
2056 my += self->y - 1; 2598 my += self->y - 1;
2057
2058 memset (darkness1, 255, sw1 * sh1);
2059 2599
2060 for (y = 0; y < sh1; y++) 2600 for (y = 0; y < sh1; y++)
2061 if (0 <= y + my && y + my < self->rows) 2601 if (0 <= y + my && y + my < self->rows)
2062 { 2602 {
2063 maprow *row = self->row + (y + my); 2603 maprow *row = self->row + (y + my);
2066 if (row->c0 <= x + mx && x + mx < row->c1) 2606 if (row->c0 <= x + mx && x + mx < row->c1)
2067 { 2607 {
2068 mapcell *cell = row->col + (x + mx - row->c0); 2608 mapcell *cell = row->col + (x + mx - row->c0);
2069 2609
2070 darkness1 [y * sw1 + x] = cell->darkness 2610 darkness1 [y * sw1 + x] = cell->darkness
2071 ? 255 - (cell->darkness - 1) 2611 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2072 : 255 - FOW_DARKNESS; 2612 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2073 } 2613 }
2074 } 2614 }
2075 2615
2076 for (y = 0; y < sh; ++y) 2616 for (y = 0; y < sh; ++y)
2077 for (x = 0; x < sw; ++x) 2617 for (x = 0; x < sw; ++x)
2096 2636
2097 uint8_t r13 = (d13 + d23 + d12) / 3; 2637 uint8_t r13 = (d13 + d23 + d12) / 3;
2098 uint8_t r23 = d23; 2638 uint8_t r23 = d23;
2099 uint8_t r33 = (d23 + d33 + d32) / 3; 2639 uint8_t r33 = (d23 + d33 + d32) / 3;
2100 2640
2101 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2102 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2103 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2104 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2105 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 */
2106 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2646 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2107 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2108 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2109 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2110 } 2650 }
2111 2651
2112 free (darkness1); 2652 free (darkness1);
2113 2653
2114 EXTEND (SP, 3); 2654 EXTEND (SP, 3);
2115 PUSHs (sv_2mortal (newSViv (sw34))); 2655 PUSHs (sv_2mortal (newSViv (sw3)));
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2656 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2657 PUSHs (darkness3_sv);
2118} 2658}
2119 2659
2120SV * 2660SV *
2121get_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)
2122 CODE: 2662 CODE:
2123{ 2663{
2124 int x, y, x1, y1; 2664 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2665 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2666 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2183 else 2723 else
2184 *data++ = 0; 2724 *data++ = 0;
2185 } 2725 }
2186 } 2726 }
2187 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 {
2188 SvPOK_only (data_sv); 2731 SvPOK_only (data_sv);
2189 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2732 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2733 }
2734
2190 RETVAL = data_sv; 2735 RETVAL = data_sv;
2191} 2736}
2192 OUTPUT: 2737 OUTPUT:
2193 RETVAL 2738 RETVAL
2194 2739
2195void 2740void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2741set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197 PPCODE: 2742 PPCODE:
2198{ 2743{
2199 int x, y, z; 2744 int x, y, z;
2200 int w, h; 2745 int w, h;
2201 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;
2202 2757
2203 if (*data++ != 0) 2758 if (*data++ != 0)
2204 return; /* version mismatch */ 2759 XSRETURN_EMPTY; /* version mismatch */
2205 2760
2206 w = *data++ << 8; w |= *data++; 2761 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2762 h = *data++ << 8; h |= *data++;
2208 2763
2209 // 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
2221 { 2776 {
2222 maprow *row = map_get_row (self, y); 2777 maprow *row = map_get_row (self, y);
2223 2778
2224 for (x = x0; x < x1; x++) 2779 for (x = x0; x < x1; x++)
2225 { 2780 {
2781 uint8_t flags;
2782
2783 if (data + 7 >= end)
2784 XSRETURN_EMPTY;
2785
2226 uint8_t flags = *data++; 2786 flags = *data++;
2227 2787
2228 if (flags) 2788 if (flags)
2229 { 2789 {
2230 mapcell *cell = row_get_cell (row, x); 2790 mapcell *cell = row_get_cell (row, x);
2231 tileid tile[3] = { 0, 0, 0 }; 2791 tileid tile[3] = { 0, 0, 0 };
2234 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2794 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2235 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2795 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2236 2796
2237 if (cell->darkness == 0) 2797 if (cell->darkness == 0)
2238 { 2798 {
2239 cell->darkness = 0; 2799 /*cell->darkness = 0;*/
2800 EXTEND (SP, 3);
2240 2801
2241 for (z = 0; z <= 2; z++) 2802 for (z = 0; z <= 2; z++)
2242 { 2803 {
2243 tileid t = tile [z]; 2804 tileid t = tile [z];
2244 2805
2245 if (t >= self->texs || (t && !self->tex [t].name)) 2806 if (t >= self->texs || (t && !self->tex [t].name))
2246 { 2807 {
2247 XPUSHs (sv_2mortal (newSViv (t))); 2808 PUSHs (sv_2mortal (newSViv (t)));
2248 need_texid (self, t); 2809 need_texid (self, t);
2249 } 2810 }
2250 2811
2251 cell->tile [z] = t; 2812 cell->tile [z] = t;
2252 } 2813 }
2254 } 2815 }
2255 } 2816 }
2256 } 2817 }
2257} 2818}
2258 2819
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2820MODULE = Deliantra::Client PACKAGE = DC::RW
2260 2821
2261CFPlus::RW 2822DC::RW
2262new (SV *class, SV *data_sv) 2823new (SV *class, SV *data_sv)
2263 CODE: 2824 CODE:
2264{ 2825{
2265 STRLEN datalen; 2826 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2827 char *data = SvPVbyte (data_sv, datalen);
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2829 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2830}
2270 OUTPUT: 2831 OUTPUT:
2271 RETVAL 2832 RETVAL
2272 2833
2273CFPlus::RW 2834DC::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2835new_from_file (SV *class, const char *path, const char *mode = "rb")
2275 CODE: 2836 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2837 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2838 OUTPUT:
2278 RETVAL 2839 RETVAL
2279 2840
2280# fails on win32: 2841# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2842# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2843#void
2283#close (CFPlus::RW self) 2844#close (DC::RW self)
2284# CODE: 2845# CODE:
2285# (self->(close)) (self); 2846# (self->(close)) (self);
2286 2847
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2848MODULE = Deliantra::Client PACKAGE = DC::Channel
2288 2849
2289PROTOTYPES: DISABLE 2850PROTOTYPES: DISABLE
2290 2851
2291CFPlus::Channel 2852DC::Channel
2292find () 2853find ()
2293 CODE: 2854 CODE:
2294{ 2855{
2295 RETVAL = Mix_GroupAvailable (-1); 2856 RETVAL = Mix_GroupAvailable (-1);
2296 2857
2297 if (RETVAL < 0) 2858 if (RETVAL < 0)
2298 { 2859 {
2299 RETVAL = Mix_GroupOldest (-1); 2860 RETVAL = Mix_GroupOldest (-1);
2300 2861
2301 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)
2302 XSRETURN_UNDEF; 2868 XSRETURN_UNDEF;
2303 2869 }
2870 else
2304 Mix_HaltChannel (RETVAL); 2871 Mix_HaltChannel (RETVAL);
2305 } 2872 }
2306 2873
2307 Mix_UnregisterAllEffects (RETVAL); 2874 Mix_UnregisterAllEffects (RETVAL);
2308 Mix_Volume (RETVAL, 128); 2875 Mix_Volume (RETVAL, 128);
2309} 2876}
2310 OUTPUT: 2877 OUTPUT:
2311 RETVAL 2878 RETVAL
2312 2879
2313void 2880void
2314halt (CFPlus::Channel self) 2881halt (DC::Channel self)
2315 CODE: 2882 CODE:
2316 Mix_HaltChannel (self); 2883 Mix_HaltChannel (self);
2317 2884
2318void 2885void
2319expire (CFPlus::Channel self, int ticks = -1) 2886expire (DC::Channel self, int ticks = -1)
2320 CODE: 2887 CODE:
2321 Mix_ExpireChannel (self, ticks); 2888 Mix_ExpireChannel (self, ticks);
2322 2889
2323void 2890void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2891fade_out (DC::Channel self, int ticks = -1)
2325 CODE: 2892 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2893 Mix_FadeOutChannel (self, ticks);
2327 2894
2328int 2895int
2329volume (CFPlus::Channel self, int volume) 2896volume (DC::Channel self, int volume)
2330 CODE: 2897 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2898 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2899 OUTPUT:
2333 RETVAL 2900 RETVAL
2334 2901
2335void 2902void
2336unregister_all_effects (CFPlus::Channel self) 2903unregister_all_effects (DC::Channel self)
2337 CODE: 2904 CODE:
2338 Mix_UnregisterAllEffects (self); 2905 Mix_UnregisterAllEffects (self);
2339 2906
2340void 2907void
2341set_panning (CFPlus::Channel self, int left, int right) 2908set_panning (DC::Channel self, int left, int right)
2342 CODE: 2909 CODE:
2343 left = CLAMP (left , 0, 255); 2910 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2911 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2912 Mix_SetPanning (self, left, right);
2346 2913
2347void 2914void
2348set_distance (CFPlus::Channel self, int distance) 2915set_distance (DC::Channel self, int distance)
2349 CODE: 2916 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2917 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2918
2352void 2919void
2353set_position (CFPlus::Channel self, int angle, int distance) 2920set_position (DC::Channel self, int angle, int distance)
2354 CODE: 2921 CODE:
2355 2922
2356void 2923void
2357set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2924set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358 CODE: 2925 CODE:
2359{ 2926{
2360 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2927 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2928 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2362 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2929 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363} 2930}
2364 2931
2365void 2932void
2366set_reverse_stereo (CFPlus::Channel self, int flip) 2933set_reverse_stereo (DC::Channel self, int flip)
2367 CODE: 2934 CODE:
2368 Mix_SetReverseStereo (self, flip); 2935 Mix_SetReverseStereo (self, flip);
2369 2936
2370MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2937MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371 2938
2372PROTOTYPES: DISABLE 2939PROTOTYPES: DISABLE
2373 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
2374CFPlus::MixChunk 2953DC::MixChunk
2375new (SV *class, CFPlus::RW rwops) 2954new (SV *class, DC::RW rwops)
2376 CODE: 2955 CODE:
2377 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2956 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378 OUTPUT: 2957 OUTPUT:
2379 RETVAL 2958 RETVAL
2380 2959
2381void 2960void
2382DESTROY (CFPlus::MixChunk self) 2961DESTROY (DC::MixChunk self)
2383 CODE: 2962 CODE:
2384 Mix_FreeChunk (self); 2963 Mix_FreeChunk (self);
2385 2964
2386int 2965int
2387volume (CFPlus::MixChunk self, int volume = -1) 2966volume (DC::MixChunk self, int volume = -1)
2388 CODE: 2967 CODE:
2389 if (items > 1) 2968 if (items > 1)
2390 volume = CLAMP (volume, 0, 128); 2969 volume = CLAMP (volume, 0, 128);
2391 RETVAL = Mix_VolumeChunk (self, volume); 2970 RETVAL = Mix_VolumeChunk (self, volume);
2392 OUTPUT: 2971 OUTPUT:
2393 RETVAL 2972 RETVAL
2394 2973
2395CFPlus::Channel 2974DC::Channel
2396play (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)
2397 CODE: 2976 CODE:
2398{ 2977{
2399 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2978 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400 2979
2401 if (RETVAL < 0) 2980 if (RETVAL < 0)
2408 } 2987 }
2409} 2988}
2410 OUTPUT: 2989 OUTPUT:
2411 RETVAL 2990 RETVAL
2412 2991
2413MODULE = 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
2414 3005
2415int 3006int
2416volume (int volume = -1) 3007volume (int volume = -1)
2417 PROTOTYPE: ;$ 3008 PROTOTYPE: ;$
2418 CODE: 3009 CODE:
2430void 3021void
2431halt () 3022halt ()
2432 CODE: 3023 CODE:
2433 Mix_HaltMusic (); 3024 Mix_HaltMusic ();
2434 3025
3026int
3027playing ()
3028 CODE:
3029 RETVAL = Mix_PlayingMusic ();
3030 OUTPUT:
3031 RETVAL
3032
2435CFPlus::MixMusic 3033DC::MixMusic
2436new (SV *class, CFPlus::RW rwops) 3034new (SV *class, DC::RW rwops)
2437 CODE: 3035 CODE:
2438 RETVAL = Mix_LoadMUS_RW (rwops); 3036 RETVAL = Mix_LoadMUS_RW (rwops);
2439 OUTPUT: 3037 OUTPUT:
2440 RETVAL 3038 RETVAL
2441 3039
2442void 3040void
2443DESTROY (CFPlus::MixMusic self) 3041DESTROY (DC::MixMusic self)
2444 CODE: 3042 CODE:
2445 Mix_FreeMusic (self); 3043 Mix_FreeMusic (self);
2446 3044
2447int 3045int
2448play (CFPlus::MixMusic self, int loops = -1) 3046play (DC::MixMusic self, int loops = -1)
2449 CODE: 3047 CODE:
2450 RETVAL = Mix_PlayMusic (self, loops); 3048 RETVAL = Mix_PlayMusic (self, loops);
2451 OUTPUT: 3049 OUTPUT:
2452 RETVAL 3050 RETVAL
2453 3051
2454void 3052void
2455fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3053fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456 CODE: 3054 CODE:
2457 Mix_FadeInMusicPos (self, loops, ms, position); 3055 Mix_FadeInMusicPos (self, loops, ms, position);
2458 3056
2459MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3057MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460 3058
2461PROTOTYPES: ENABLE 3059PROTOTYPES: ENABLE
2462 3060
2463BOOT: 3061BOOT:
2464{ 3062{
2465 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3063 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466 static const struct { 3064 static const struct {
2467 const char *name; 3065 const char *name;
2468 IV iv; 3066 IV iv;
2469 } *civ, const_iv[] = { 3067 } *civ, const_iv[] = {
2470# define const_iv(name) { # name, (IV)name } 3068# define const_iv(name) { # name, (IV)name }
2471 const_iv (GL_VENDOR), 3069 const_iv (GL_VENDOR),
2472 const_iv (GL_VERSION), 3070 const_iv (GL_VERSION),
2473 const_iv (GL_EXTENSIONS), 3071 const_iv (GL_EXTENSIONS),
3072 const_iv (GL_MAX_TEXTURE_UNITS),
2474 const_iv (GL_COLOR_MATERIAL), 3073 const_iv (GL_COLOR_MATERIAL),
2475 const_iv (GL_SMOOTH), 3074 const_iv (GL_SMOOTH),
2476 const_iv (GL_FLAT), 3075 const_iv (GL_FLAT),
2477 const_iv (GL_DITHER), 3076 const_iv (GL_DITHER),
2478 const_iv (GL_BLEND), 3077 const_iv (GL_BLEND),
2490 const_iv (GL_ZERO), 3089 const_iv (GL_ZERO),
2491 const_iv (GL_SRC_ALPHA), 3090 const_iv (GL_SRC_ALPHA),
2492 const_iv (GL_DST_ALPHA), 3091 const_iv (GL_DST_ALPHA),
2493 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3092 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2494 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),
2495 const_iv (GL_SRC_ALPHA_SATURATE), 3098 const_iv (GL_SRC_ALPHA_SATURATE),
2496 const_iv (GL_RGB), 3099 const_iv (GL_RGB),
2497 const_iv (GL_RGBA), 3100 const_iv (GL_RGBA),
2498 const_iv (GL_RGBA4), 3101 const_iv (GL_RGBA4),
2499 const_iv (GL_RGBA8), 3102 const_iv (GL_RGBA8),
2505 const_iv (GL_INTENSITY), 3108 const_iv (GL_INTENSITY),
2506 const_iv (GL_LUMINANCE), 3109 const_iv (GL_LUMINANCE),
2507 const_iv (GL_LUMINANCE_ALPHA), 3110 const_iv (GL_LUMINANCE_ALPHA),
2508 const_iv (GL_FLOAT), 3111 const_iv (GL_FLOAT),
2509 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),
2510 const_iv (GL_COMPILE), 3119 const_iv (GL_COMPILE),
2511 const_iv (GL_PROXY_TEXTURE_1D), 3120 const_iv (GL_PROXY_TEXTURE_1D),
2512 const_iv (GL_PROXY_TEXTURE_2D), 3121 const_iv (GL_PROXY_TEXTURE_2D),
2513 const_iv (GL_TEXTURE_1D), 3122 const_iv (GL_TEXTURE_1D),
2514 const_iv (GL_TEXTURE_2D), 3123 const_iv (GL_TEXTURE_2D),
2553 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3162 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554 const_iv (GL_POINT_SMOOTH_HINT), 3163 const_iv (GL_POINT_SMOOTH_HINT),
2555 const_iv (GL_LINE_SMOOTH_HINT), 3164 const_iv (GL_LINE_SMOOTH_HINT),
2556 const_iv (GL_POLYGON_SMOOTH_HINT), 3165 const_iv (GL_POLYGON_SMOOTH_HINT),
2557 const_iv (GL_GENERATE_MIPMAP_HINT), 3166 const_iv (GL_GENERATE_MIPMAP_HINT),
3167 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558 const_iv (GL_FASTEST), 3168 const_iv (GL_FASTEST),
2559 const_iv (GL_DONT_CARE), 3169 const_iv (GL_DONT_CARE),
2560 const_iv (GL_NICEST), 3170 const_iv (GL_NICEST),
2561 const_iv (GL_V2F), 3171 const_iv (GL_V2F),
2562 const_iv (GL_V3F), 3172 const_iv (GL_V3F),
2563 const_iv (GL_T2F_V3F), 3173 const_iv (GL_T2F_V3F),
2564 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),
2565# undef const_iv 3178# undef const_iv
2566 }; 3179 };
2567 3180
2568 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--)
2569 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3182 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2570 3183
2571 texture_av = newAV (); 3184 texture_av = newAV ();
2572 AvREAL_off (texture_av); 3185 AvREAL_off (texture_av);
2573} 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)
2574 3196
2575char * 3197char *
2576gl_vendor () 3198gl_vendor ()
2577 CODE: 3199 CODE:
2578 RETVAL = (char *)glGetString (GL_VENDOR); 3200 RETVAL = (char *)glGetString (GL_VENDOR);
2609 3231
2610int glGetError () 3232int glGetError ()
2611 3233
2612void glFinish () 3234void glFinish ()
2613 3235
3236void glFlush ()
3237
2614void glClear (int mask) 3238void glClear (int mask)
2615 3239
2616void glClearColor (float r, float g, float b, float a = 1.0) 3240void glClearColor (float r, float g, float b, float a = 1.0)
2617 PROTOTYPE: @ 3241 PROTOTYPE: @
2618 3242
2627void glBlendFunc (int sfactor, int dfactor) 3251void glBlendFunc (int sfactor, int dfactor)
2628 3252
2629void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3253void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2630 CODE: 3254 CODE:
2631 gl_BlendFuncSeparate (sa, da, saa, daa); 3255 gl_BlendFuncSeparate (sa, da, saa, daa);
3256
3257# void glBlendEquation (int se)
2632 3258
2633void glDepthMask (int flag) 3259void glDepthMask (int flag)
2634 3260
2635void glLogicOp (int opcode) 3261void glLogicOp (int opcode)
2636 3262
2671void glRotate (float angle, float x, float y, float z) 3297void glRotate (float angle, float x, float y, float z)
2672 CODE: 3298 CODE:
2673 glRotatef (angle, x, y, z); 3299 glRotatef (angle, x, y, z);
2674 3300
2675void 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: @
2676 ALIAS: 3303 ALIAS:
2677 glColor_premultiply = 1 3304 glColor_premultiply = 1
2678 CODE: 3305 CODE:
2679 if (ix) 3306 if (ix)
2680 { 3307 {
2700 3327
2701void glRect (float x1, float y1, float x2, float y2) 3328void glRect (float x1, float y1, float x2, float y2)
2702 CODE: 3329 CODE:
2703 glRectf (x1, y1, x2, y2); 3330 glRectf (x1, y1, x2, y2);
2704 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
2705PROTOTYPES: ENABLE 3341PROTOTYPES: ENABLE
2706 3342
2707void glBegin (int mode) 3343void glBegin (int mode)
2708 3344
2709void glEnd () 3345void glEnd ()
2741void 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)
2742 CODE: 3378 CODE:
2743 if (gl.SeparableFilter2D) 3379 if (gl.SeparableFilter2D)
2744 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3380 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745 3381
2746void 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)
2747 3383
2748void 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)
2749 3385
2750void glDrawPixels (int width, int height, int format, int type, char *pixels) 3386void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751 3387
2777 3413
2778void glEndList () 3414void glEndList ()
2779 3415
2780void glCallList (int list) 3416void glCallList (int list)
2781 3417
2782MODULE = 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
2783 3424
2784PROTOTYPES: DISABLE 3425PROTOTYPES: DISABLE
2785 3426
2786void 3427void
2787find_widget (SV *self, NV x, NV y) 3428find_widget (SV *self, NV x, NV y)
2791 XPUSHs (self); 3432 XPUSHs (self);
2792} 3433}
2793 3434
2794BOOT: 3435BOOT:
2795{ 3436{
2796 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3437 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797 3438
2798 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);
2799 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);
2800 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);
2801 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);
2802} 3443}
2803 3444
2804void 3445void
2805draw (SV *self) 3446draw (SV *self)
2806 CODE: 3447 CODE:
2810 NV x, y, w, h; 3451 NV x, y, w, h;
2811 SV *draw_x_sv = GvSV (draw_x_gv); 3452 SV *draw_x_sv = GvSV (draw_x_gv);
2812 SV *draw_y_sv = GvSV (draw_y_gv); 3453 SV *draw_y_sv = GvSV (draw_y_gv);
2813 SV *draw_w_sv = GvSV (draw_w_gv); 3454 SV *draw_w_sv = GvSV (draw_w_gv);
2814 SV *draw_h_sv = GvSV (draw_h_gv); 3455 SV *draw_h_sv = GvSV (draw_h_gv);
2815 SV *hover;
2816 double draw_x, draw_y, draw_w, draw_h; 3456 double draw_x, draw_y;
2817 3457
2818 if (!SvROK (self)) 3458 if (!SvROK (self))
2819 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3459 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820 3460
2821 hv = (HV *)SvRV (self); 3461 hv = (HV *)SvRV (self);
2822 3462
2823 if (SvTYPE (hv) != SVt_PVHV) 3463 if (SvTYPE (hv) != SVt_PVHV)
2824 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3464 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825 3465
2826 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.;
2827 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.;
2828 3468
2829 if (!h || !w) 3469 if (!h || !w)
2849 { 3489 {
2850 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3490 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851 3491
2852 if (svp && SvTRUE (*svp)) 3492 if (svp && SvTRUE (*svp))
2853 { 3493 {
2854 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);
2855 glEnable (GL_BLEND); 3495 glEnable (GL_BLEND);
2856 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3496 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857 glBegin (GL_QUADS); 3497 glBegin (GL_QUADS);
2858 glVertex2f (0, 0); 3498 glVertex2f (0, 0);
2859 glVertex2f (w, 0); 3499 glVertex2f (w, 0);
2862 glEnd (); 3502 glEnd ();
2863 glDisable (GL_BLEND); 3503 glDisable (GL_BLEND);
2864 } 3504 }
2865 } 3505 }
2866#if 0 3506#if 0
2867 if ($ENV{CFPLUS_DEBUG} & 1) { 3507 // draw borders, for debugging
2868 glPushMatrix; 3508 glPushMatrix ();
2869 glColor 1, 1, 0, 1; 3509 glColor4f (1., 1., 0., 1.);
2870 glTranslate 0.375, 0.375; 3510 glTranslatef (.5, .5, 0.);
2871 glBegin GL_LINE_LOOP; 3511 glBegin (GL_LINE_LOOP);
2872 glVertex 0 , 0; 3512 glVertex2f (0 , 0);
2873 glVertex $self->{w} - 1, 0; 3513 glVertex2f (w - 1, 0);
2874 glVertex $self->{w} - 1, $self->{h} - 1; 3514 glVertex2f (w - 1, h - 1);
2875 glVertex 0 , $self->{h} - 1; 3515 glVertex2f (0 , h - 1);
2876 glEnd; 3516 glEnd ();
2877 glPopMatrix; 3517 glPopMatrix ();
2878 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879 }
2880#endif 3518#endif
2881 PUSHMARK (SP); 3519 PUSHMARK (SP);
2882 XPUSHs (self); 3520 XPUSHs (self);
2883 PUTBACK; 3521 PUTBACK;
2884 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