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.219 by root, Mon Aug 6 05:06:32 2007 UTC vs.
Revision 1.310 by root, Tue Dec 27 07:23:33 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines