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.213 by root, Sun Jul 29 04:14:45 2007 UTC vs.
Revision 1.311 by root, Tue Dec 27 09:17:27 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
726SDL_GetKeyName (int sym) 972SDL_GetKeyName (int sym)
727 973
728int 974int
729SDL_GetAppState () 975SDL_GetAppState ()
730 976
977int
978SDL_GetModState ()
979
980int
981SDL_WaitEvent ()
982 C_ARGS: 0
983
731void 984void
985SDL_PumpEvents ()
986
987void
732poll_events () 988peep_events ()
733 PPCODE: 989 PPCODE:
734{ 990{
735 SDL_Event ev; 991 SDL_Event ev;
736 992
737 SDL_PumpEvents (); 993 SDL_PumpEvents ();
744 { 1000 {
745 case SDL_KEYDOWN: 1001 case SDL_KEYDOWN:
746 case SDL_KEYUP: 1002 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1003 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1004 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1005 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
750 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1006 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1007 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 1008 break;
753 1009
754 case SDL_ACTIVEEVENT: 1010 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1011 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 1029 x = ev.motion.x;
774 y = ev.motion.y; 1030 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1031 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 1032 }
777 1033
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1034 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 1035 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 1036 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 1037 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1038 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1039 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 1040 }
785 break; 1041 break;
786 1042
787 case SDL_MOUSEBUTTONDOWN: 1043 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 1044 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1045 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 1046
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1047 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1048 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1049 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1050 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1055 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1056 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 1057 break;
802 } 1058 }
803 1059
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1060 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 1061 }
806} 1062}
1063
1064char *
1065SDL_AudioDriverName ()
1066 CODE:
1067{
1068 char buf [256];
1069 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1070 XSRETURN_UNDEF;
1071
1072 RETVAL = buf;
1073}
1074 OUTPUT:
1075 RETVAL
807 1076
808int 1077int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1078Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 1079 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 1080 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 1081 Mix_ChannelFinished (channel_finished);
813 1082
814void 1083void
1084Mix_QuerySpec ()
1085 PPCODE:
1086{
1087 int freq, channels;
1088 Uint16 format;
1089
1090 if (Mix_QuerySpec (&freq, &format, &channels))
1091 {
1092 EXTEND (SP, 3);
1093 PUSHs (sv_2mortal (newSViv (freq)));
1094 PUSHs (sv_2mortal (newSViv (format)));
1095 PUSHs (sv_2mortal (newSViv (channels)));
1096 }
1097}
1098
1099void
815Mix_CloseAudio () 1100Mix_CloseAudio ()
816 1101
817int 1102int
818Mix_AllocateChannels (int numchans = -1) 1103Mix_AllocateChannels (int numchans = -1)
1104
1105const char *
1106Mix_GetError ()
819 1107
820void 1108void
821lowdelay (int fd, int val = 1) 1109lowdelay (int fd, int val = 1)
822 CODE: 1110 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1111 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
849 } 1137 }
850 } 1138 }
851#endif 1139#endif
852} 1140}
853 1141
854void 1142int
855add_font (char *file) 1143add_font (char *file)
856 CODE: 1144 CODE:
857 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1145 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1146 OUTPUT:
1147 RETVAL
1148
1149void
1150IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1151
1152void
1153Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_MP3 | MIX_INIT_OGG)
858 1154
859void 1155void
860load_image_inline (SV *image_) 1156load_image_inline (SV *image_)
861 ALIAS: 1157 ALIAS:
862 load_image_file = 1 1158 load_image_file = 1
948void 1244void
949error (char *message) 1245error (char *message)
950 CODE: 1246 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1247 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1248#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1249 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1250#endif
955 1251
956void 1252void
957fatal (char *message) 1253fatal (char *message)
958 CODE: 1254 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1255 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1256#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1257 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1258#endif
963 _exit (1); 1259 _exit (1);
964 1260
965void 1261void
966_exit (int retval = 0) 1262_exit (int retval = 0)
978#if DEBUG 1274#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1275 VALGRIND_DO_LEAK_CHECK;
980#endif 1276#endif
981} 1277}
982 1278
983MODULE = CFPlus PACKAGE = CFPlus::Font 1279int
1280SvREFCNT (SV *sv)
1281 CODE:
1282 RETVAL = SvREFCNT (sv);
1283 OUTPUT:
1284 RETVAL
1285
1286MODULE = Deliantra::Client PACKAGE = DC::Font
984 1287
985PROTOTYPES: DISABLE 1288PROTOTYPES: DISABLE
986 1289
987CFPlus::Font 1290DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1291new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1292 CODE:
990{ 1293{
991 int count; 1294 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1295 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
995} 1298}
996 OUTPUT: 1299 OUTPUT:
997 RETVAL 1300 RETVAL
998 1301
999void 1302void
1000DESTROY (CFPlus::Font self) 1303DESTROY (DC::Font self)
1001 CODE: 1304 CODE:
1002 pango_font_description_free (self); 1305 pango_font_description_free (self);
1003 1306
1004void 1307void
1005make_default (CFPlus::Font self) 1308make_default (DC::Font self)
1006 PROTOTYPE: $ 1309 PROTOTYPE: $
1007 CODE: 1310 CODE:
1008 default_font = self; 1311 default_font = self;
1009 1312
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1313MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1314
1012PROTOTYPES: DISABLE 1315PROTOTYPES: DISABLE
1013 1316
1014void 1317void
1015reset_glyph_cache () 1318glyph_cache_backup ()
1016 PROTOTYPE: 1319 PROTOTYPE:
1017 CODE: 1320 CODE:
1321 tc_backup ();
1322
1323void
1324glyph_cache_restore ()
1325 PROTOTYPE:
1326 CODE:
1018 tc_clear (); 1327 tc_restore ();
1019 1328
1020CFPlus::Layout 1329DC::Layout
1021new (SV *class) 1330new (SV *class)
1022 CODE: 1331 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1332 New (0, RETVAL, 1, struct cf_layout);
1024 1333
1025 RETVAL->pl = pango_layout_new (opengl_context); 1334 RETVAL->pl = pango_layout_new (opengl_context);
1027 RETVAL->g = 1.; 1336 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1337 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1338 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1339 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1340 RETVAL->font = 0;
1341 RETVAL->rc = rc_alloc ();
1032 1342
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1343 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1344 layout_update_font (RETVAL);
1035 OUTPUT: 1345 OUTPUT:
1036 RETVAL 1346 RETVAL
1037 1347
1038void 1348void
1039DESTROY (CFPlus::Layout self) 1349DESTROY (DC::Layout self)
1040 CODE: 1350 CODE:
1041 g_object_unref (self->pl); 1351 g_object_unref (self->pl);
1352 rc_free (self->rc);
1042 Safefree (self); 1353 Safefree (self);
1043 1354
1044void 1355void
1045set_text (CFPlus::Layout self, SV *text_) 1356set_text (DC::Layout self, SV *text_)
1046 CODE: 1357 CODE:
1047{ 1358{
1048 STRLEN textlen; 1359 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1360 char *text = SvPVutf8 (text_, textlen);
1050 1361
1051 pango_layout_set_text (self->pl, text, textlen); 1362 pango_layout_set_text (self->pl, text, textlen);
1052} 1363}
1053 1364
1054void 1365void
1055set_markup (CFPlus::Layout self, SV *text_) 1366set_markup (DC::Layout self, SV *text_)
1056 CODE: 1367 CODE:
1057{ 1368{
1058 STRLEN textlen; 1369 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1370 char *text = SvPVutf8 (text_, textlen);
1060 1371
1061 pango_layout_set_markup (self->pl, text, textlen); 1372 pango_layout_set_markup (self->pl, text, textlen);
1062} 1373}
1063 1374
1064void 1375void
1065set_shapes (CFPlus::Layout self, ...) 1376set_shapes (DC::Layout self, ...)
1066 CODE: 1377 CODE:
1067{ 1378{
1068 PangoAttrList *attrs = 0; 1379 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1380 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1381 const char *pos = text;
1105 if (attrs) 1416 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1417 pango_layout_set_attributes (self->pl, attrs);
1107} 1418}
1108 1419
1109void 1420void
1110get_shapes (CFPlus::Layout self) 1421get_shapes (DC::Layout self)
1111 PPCODE: 1422 PPCODE:
1112{ 1423{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1424 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1425
1115 do 1426 do
1116 { 1427 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1428 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1429
1119 if (run && shape_attr_p (run)) 1430 if (run && shape_attr_p (run))
1120 { 1431 {
1121 PangoRectangle extents; 1432 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1433 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1441
1131 pango_layout_iter_free (iter); 1442 pango_layout_iter_free (iter);
1132} 1443}
1133 1444
1134int 1445int
1135has_wrapped (CFPlus::Layout self) 1446has_wrapped (DC::Layout self)
1136 CODE: 1447 CODE:
1137{ 1448{
1138 int lines = 1; 1449 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1450 const char *text = pango_layout_get_text (self->pl);
1140 1451
1145} 1456}
1146 OUTPUT: 1457 OUTPUT:
1147 RETVAL 1458 RETVAL
1148 1459
1149SV * 1460SV *
1150get_text (CFPlus::Layout self) 1461get_text (DC::Layout self)
1151 CODE: 1462 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1463 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1464 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1465 OUTPUT:
1155 RETVAL 1466 RETVAL
1156 1467
1157void 1468void
1158set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1469set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1159 CODE: 1470 CODE:
1160 self->r = r; 1471 self->r = r;
1161 self->g = g; 1472 self->g = g;
1162 self->b = b; 1473 self->b = b;
1163 self->a = a; 1474 self->a = a;
1164 1475
1165void 1476void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1477set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1478 CODE:
1168 if (self->font != font) 1479 if (self->font != font)
1169 { 1480 {
1170 self->font = font; 1481 self->font = font;
1171 layout_update_font (self); 1482 layout_update_font (self);
1172 } 1483 }
1173 1484
1174void 1485void
1175set_height (CFPlus::Layout self, int base_height) 1486set_height (DC::Layout self, int base_height)
1176 CODE: 1487 CODE:
1177 if (self->base_height != base_height) 1488 if (self->base_height != base_height)
1178 { 1489 {
1179 self->base_height = base_height; 1490 self->base_height = base_height;
1180 layout_update_font (self); 1491 layout_update_font (self);
1181 } 1492 }
1182 1493
1183void 1494void
1184set_width (CFPlus::Layout self, int max_width = -1) 1495set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1496 CODE:
1186 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1497 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1187 1498
1188void 1499void
1189set_indent (CFPlus::Layout self, int indent) 1500set_indent (DC::Layout self, int indent)
1190 CODE: 1501 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1502 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1503
1193void 1504void
1194set_spacing (CFPlus::Layout self, int spacing) 1505set_spacing (DC::Layout self, int spacing)
1195 CODE: 1506 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1507 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1508
1198void 1509void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1510set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1511 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1512 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1513 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1514 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1515 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1516 : PANGO_ELLIPSIZE_NONE
1206 ); 1517 );
1207 1518
1208void 1519void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1520set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1521 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1522 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1523
1213void 1524void
1214size (CFPlus::Layout self) 1525size (DC::Layout self)
1215 PPCODE: 1526 PPCODE:
1216{ 1527{
1217 int w, h; 1528 int w, h;
1218 1529
1219 layout_get_pixel_size (self, &w, &h); 1530 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1533 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1534 PUSHs (sv_2mortal (newSViv (h)));
1224} 1535}
1225 1536
1226int 1537int
1227descent (CFPlus::Layout self) 1538descent (DC::Layout self)
1228 CODE: 1539 CODE:
1229{ 1540{
1230 PangoRectangle rect; 1541 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1542 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1543 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1544 RETVAL = PANGO_DESCENT (rect);
1234} 1545}
1235 OUTPUT: 1546 OUTPUT:
1236 RETVAL 1547 RETVAL
1237 1548
1238int 1549int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1550xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1551 CODE:
1241{ 1552{
1242 int index, trailing; 1553 int index, trailing;
1243 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1554 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1244 RETVAL = index + trailing; 1555 RETVAL = index + trailing;
1245} 1556}
1246 OUTPUT: 1557 OUTPUT:
1247 RETVAL 1558 RETVAL
1248 1559
1249void 1560void
1250cursor_pos (CFPlus::Layout self, int index) 1561cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1562 PPCODE:
1252{ 1563{
1253 PangoRectangle strong_pos; 1564 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1565 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1566
1256 EXTEND (SP, 3); 1567 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1568 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1569 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1570 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1571}
1261 1572
1262void 1573void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1574index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1575 PPCODE:
1265{ 1576{
1266 int line, x; 1577 int line, x;
1267 1578
1268 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1579 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1580#if !PANGO_VERSION_CHECK (1, 17, 3)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1581 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1582 --line;
1583#endif
1271 EXTEND (SP, 2); 1584 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1585 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1586 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1587}
1275 1588
1276void 1589void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1590line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1591 PPCODE:
1279{ 1592{
1280 PangoLayoutLine *lp; 1593 PangoLayoutLine *lp;
1281 int index, trailing; 1594 int index, trailing;
1282 1595
1283 if (line < 0) 1596 if (line < 0)
1284 XSRETURN_EMPTY; 1597 XSRETURN_EMPTY;
1285 1598
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1599 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1600 XSRETURN_EMPTY; /* do better */
1288 1601
1289 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1602 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290 1603
1291 EXTEND (SP, 2); 1604 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1610 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1611 }
1299} 1612}
1300 1613
1301void 1614void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1615render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1616 CODE:
1617 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1618 pango_opengl_render_layout_subpixel (
1305 self->pl, 1619 self->pl,
1620 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1621 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1622 self->r, self->g, self->b, self->a,
1308 flags 1623 flags
1309 ); 1624 );
1625 // we assume that context_change actually clears/frees stuff
1626 // and does not do any recomputation...
1627 pango_layout_context_changed (self->pl);
1310 1628
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1629void
1630draw (DC::Layout self)
1631 CODE:
1632{
1633 glEnable (GL_TEXTURE_2D);
1634 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1635 glEnable (GL_BLEND);
1636 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1637 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1638 glEnable (GL_ALPHA_TEST);
1639 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1640
1641 rc_draw (self->rc);
1642
1643 glDisable (GL_ALPHA_TEST);
1644 glDisable (GL_BLEND);
1645 glDisable (GL_TEXTURE_2D);
1646}
1647
1648MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1649
1313PROTOTYPES: ENABLE 1650PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1651
1317void 1652void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1653pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1654 CODE:
1320{ 1655{
1347 HV *hv = (HV *)SvRV (self); 1682 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1683 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1684 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1685 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1686
1687 if (name <= 0)
1688 XSRETURN_EMPTY;
1689
1352 if (items < 5) 1690 if (items < 5)
1353 { 1691 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1692 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1693 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1694 }
1383 glDisable (GL_ALPHA_TEST); 1721 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1722 glDisable (GL_BLEND);
1385 } 1723 }
1386} 1724}
1387 1725
1726void
1727draw_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)
1728 PROTOTYPE: @
1729 CODE:
1730{
1731 glEnable (GL_BLEND);
1732 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1733 glEnable (GL_TEXTURE_2D);
1734 glBindTexture (GL_TEXTURE_2D, name1);
1735
1736 glColor3f (intensity, intensity, intensity);
1737 glPushMatrix ();
1738 glScalef (1./3, 1./3, 1.);
1739
1740 if (blend > 0.f)
1741 {
1742 float dx3 = dx * -3.f / w;
1743 float dy3 = dy * -3.f / h;
1744 GLfloat env_color[4] = { 0., 0., 0., blend };
1745
1746 /* interpolate the two shadow textures */
1747 /* stage 0 == rgb(glcolor) + alpha(t0) */
1748 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1749
1750 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1751 gl.ActiveTexture (GL_TEXTURE1);
1752 glEnable (GL_TEXTURE_2D);
1753 glBindTexture (GL_TEXTURE_2D, name2);
1754 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1755
1756 /* rgb == rgb(glcolor) */
1757 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1758 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1760
1761 /* alpha = interpolate t0, t1 by env_alpha */
1762 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1763
1764 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1765 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1766 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1767
1768 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1769 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1770
1771 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1772 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1773
1774 glBegin (GL_QUADS);
1775 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1776 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1777 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1778 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1779 glEnd ();
1780
1781 glDisable (GL_TEXTURE_2D);
1782 gl.ActiveTexture (GL_TEXTURE0);
1783 }
1784 else
1785 {
1786 /* simple blending of one texture, also opengl <1.3 path */
1787 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1788
1789 glBegin (GL_QUADS);
1790 glTexCoord2f (0, 0); glVertex2f (0, 0);
1791 glTexCoord2f (0, t); glVertex2f (0, h);
1792 glTexCoord2f (s, t); glVertex2f (w, h);
1793 glTexCoord2f (s, 0); glVertex2f (w, 0);
1794 glEnd ();
1795 }
1796
1797 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1798 {
1799 int x, y;
1800 int dx3 = dx * 3;
1801 int dy3 = dy * 3;
1802
1803 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1804 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1805 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1806 glTranslatef (-1., -1., 0);
1807 glBegin (GL_QUADS);
1808
1809 for (y = 1; y < h; y += 3)
1810 {
1811 int y1 = y - dy3;
1812 int y1valid = y1 >= 0 && y1 < h;
1813
1814 for (x = 1; x < w; x += 3)
1815 {
1816 int x1 = x - dx3;
1817 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1818 uint8_t h2;
1819
1820 if (y1valid && x1 >= 0 && x1 < w)
1821 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1822 else
1823 h2 = 1; /* out of range == invisible */
1824
1825 if (h1 || h2)
1826 {
1827 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1828 glColor4f (1., 1., 1., alpha);
1829
1830 glTexCoord2f (0, 0.); glVertex2i (x , y );
1831 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1832 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1833 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1834 }
1835 }
1836 }
1837 }
1838
1839 glEnd ();
1840
1841 glPopMatrix ();
1842
1843 glDisable (GL_TEXTURE_2D);
1844 glDisable (GL_BLEND);
1845}
1846
1388IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1847IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1389 CODE: 1848 CODE:
1390{ 1849{
1391 GLint width; 1850 GLint width;
1392 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1851 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1394 RETVAL = width > 0; 1853 RETVAL = width > 0;
1395} 1854}
1396 OUTPUT: 1855 OUTPUT:
1397 RETVAL 1856 RETVAL
1398 1857
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1858MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1859
1401PROTOTYPES: DISABLE 1860PROTOTYPES: DISABLE
1402 1861
1403CFPlus::Map 1862DC::Map
1404new (SV *class) 1863new (SV *class)
1405 CODE: 1864 CODE:
1406 New (0, RETVAL, 1, struct map); 1865 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1866 RETVAL->x = 0;
1408 RETVAL->y = 0; 1867 RETVAL->y = 0;
1416 RETVAL->row = 0; 1875 RETVAL->row = 0;
1417 OUTPUT: 1876 OUTPUT:
1418 RETVAL 1877 RETVAL
1419 1878
1420void 1879void
1421DESTROY (CFPlus::Map self) 1880DESTROY (DC::Map self)
1422 CODE: 1881 CODE:
1423{ 1882{
1424 map_clear (self); 1883 map_clear (self);
1425 Safefree (self->face2tile); 1884 Safefree (self->face2tile);
1426 Safefree (self->tex); 1885 Safefree (self->tex);
1427 Safefree (self); 1886 Safefree (self);
1428} 1887}
1429 1888
1430void 1889void
1431resize (CFPlus::Map self, int map_width, int map_height) 1890resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1891 CODE:
1433 self->w = map_width; 1892 self->w = map_width;
1434 self->h = map_height; 1893 self->h = map_height;
1435 1894
1436void 1895void
1437clear (CFPlus::Map self) 1896clear (DC::Map self)
1438 CODE: 1897 CODE:
1439 map_clear (self); 1898 map_clear (self);
1440 1899
1441void 1900void
1442set_tileid (CFPlus::Map self, int face, int tile) 1901set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1902 CODE:
1444{ 1903{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1904 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1905 need_texid (self, tile);
1447} 1906}
1448 1907
1449void 1908void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1909set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1910 CODE:
1452{ 1911{
1453 tileid texid; 1912 tileid texid;
1454 maptex *tex; 1913 maptex *tex;
1455 1914
1468 tex->smoothtile = self->face2tile [smooth]; 1927 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1928 tex->smoothlevel = level;
1470} 1929}
1471 1930
1472void 1931void
1473set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1932set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1474 CODE: 1933 CODE:
1475{ 1934{
1476 need_texid (self, texid); 1935 need_texid (self, texid);
1477 1936
1478 { 1937 {
1497 // use uglier nearest interpolation because linear suffers 1956 // use uglier nearest interpolation because linear suffers
1498 // from transparent color bleeding and ugly wrapping effects. 1957 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1958 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1959}
1501 1960
1961void
1962expire_textures (DC::Map self, int texid, int count)
1963 PPCODE:
1964 for (; texid < self->texs && count; ++texid, --count)
1965 {
1966 maptex *tex = self->tex + texid;
1967
1968 if (tex->name)
1969 {
1970 if (tex->unused)
1971 {
1972 tex->name = 0;
1973 tex->unused = 0;
1974 XPUSHs (sv_2mortal (newSViv (texid)));
1975 }
1976 else
1977 tex->unused = 1;
1978 }
1979 }
1980
1502int 1981int
1503ox (CFPlus::Map self) 1982ox (DC::Map self)
1504 ALIAS: 1983 ALIAS:
1505 oy = 1 1984 oy = 1
1506 x = 2 1985 x = 2
1507 y = 3 1986 y = 3
1508 w = 4 1987 w = 4
1519 } 1998 }
1520 OUTPUT: 1999 OUTPUT:
1521 RETVAL 2000 RETVAL
1522 2001
1523void 2002void
1524scroll (CFPlus::Map self, int dx, int dy) 2003scroll (DC::Map self, int dx, int dy)
1525 CODE: 2004 CODE:
1526{ 2005{
1527 if (dx > 0) 2006 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 2007 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 2008 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 2023 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 2024 self->y += MAP_EXTEND_Y;
1546 } 2025 }
1547} 2026}
1548 2027
1549void 2028SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 2029map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 2030 CODE:
1552{ 2031{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2032 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 2033 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 2034 mapcell *cell;
1556 int x, y, flags; 2035 int x, y, z, flags;
2036 AV *missing = newAV ();
2037 RETVAL = newRV_noinc ((SV *)missing);
1557 2038
1558 while (data < data_end - 1) 2039 while (data < data_end - 1)
1559 { 2040 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 2041 flags = (data [0] << 8) + data [1]; data += 2;
1561 2042
1581 uint8_t ext, cmd; 2062 uint8_t ext, cmd;
1582 2063
1583 do 2064 do
1584 { 2065 {
1585 ext = *data++; 2066 ext = *data++;
1586 cmd = ext & 0x3f; 2067 cmd = ext & 0x7f;
1587 2068
1588 if (cmd < 4) 2069 if (cmd < 4)
1589 cell->darkness = 255 - ext * 64 + 1; 2070 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1590 else if (cmd == 5) // health 2071 else if (cmd == 5) // health
1591 { 2072 {
1592 cell->stat_width = 1; 2073 cell->stat_width = 1;
1593 cell->stat_hp = *data++; 2074 cell->stat_hp = *data++;
1594 } 2075 }
1595 else if (cmd == 6) // monster width 2076 else if (cmd == 6) // monster width
1596 cell->stat_width = *data++ + 1; 2077 cell->stat_width = *data++ + 1;
1597 else if (cmd == 0x47) 2078 else if (cmd == 0x47)
1598 { 2079 {
1599 if (*data == 4) 2080 if (*data == 1) cell->player = data [1];
1600 ; // decode player count 2081 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2082 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2083 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1601 2084
1602 data += *data + 1; 2085 data += *data + 1;
1603 } 2086 }
1604 else if (cmd == 8) // cell flags 2087 else if (cmd == 8) // cell flags
1605 cell->flags = *data++; 2088 cell->flags = *data++;
1612 } 2095 }
1613 else 2096 else
1614 cell->darkness = *data++ + 1; 2097 cell->darkness = *data++ + 1;
1615 } 2098 }
1616 2099
2100 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 2101 if (flags & (4 >> z))
1618 { 2102 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 2103 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 2104 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 2105 cell->tile [z] = self->face2tile [face];
2106
2107 if (cell->tile [z])
2108 {
2109 maptex *tex = self->tex + cell->tile [z];
2110 tex->unused = 0;
2111 if (!tex->name)
2112 av_push (missing, newSViv (cell->tile [z]));
2113
2114 if (tex->smoothtile)
2115 {
2116 maptex *smooth = self->tex + tex->smoothtile;
2117 smooth->unused = 0;
2118 if (!smooth->name)
2119 av_push (missing, newSViv (tex->smoothtile));
2120 }
2121 }
1622 } 2122 }
1623
1624 if (flags & 2)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [1] = self->face2tile [face];
1629 }
1630
1631 if (flags & 1)
1632 {
1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1634 need_facenum (self, face);
1635 cell->tile [2] = self->face2tile [face];
1636 }
1637 } 2123 }
1638 else 2124 else
1639 cell->darkness = 0; 2125 CELL_CLEAR (cell);
1640 } 2126 }
1641} 2127}
2128 OUTPUT:
2129 RETVAL
1642 2130
1643SV * 2131SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2132mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 2133 CODE:
1646{ 2134{
1647 int x1, x; 2135 int x1, x;
1648 int y1, y; 2136 int y1, y;
1649 int z; 2137 int z;
1662 ? self->row + y 2150 ? self->row + y
1663 : 0; 2151 : 0;
1664 2152
1665 for (x = x0; x < x1; x++) 2153 for (x = x0; x < x1; x++)
1666 { 2154 {
1667 int r = 32, g = 32, b = 32, a = 192; 2155 unsigned int r = 32, g = 32, b = 32, a = 192;
1668 2156
1669 if (row && row->c0 <= x && x < row->c1) 2157 if (row && row->c0 <= x && x < row->c1)
1670 { 2158 {
1671 mapcell *cell = row->col + (x - row->c0); 2159 mapcell *cell = row->col + (x - row->c0);
1672 2160
1674 { 2162 {
1675 maptex tex = self->tex [cell->tile [z]]; 2163 maptex tex = self->tex [cell->tile [z]];
1676 int a0 = 255 - tex.a; 2164 int a0 = 255 - tex.a;
1677 int a1 = tex.a; 2165 int a1 = tex.a;
1678 2166
1679 r = (r * a0 + tex.r * a1) / 255; 2167 r = div255 (r * a0 + tex.r * a1);
1680 g = (g * a0 + tex.g * a1) / 255; 2168 g = div255 (g * a0 + tex.g * a1);
1681 b = (b * a0 + tex.b * a1) / 255; 2169 b = div255 (b * a0 + tex.b * a1);
1682 a = (a * a0 + tex.a * a1) / 255; 2170 a = div255 (a * a0 + tex.a * a1);
1683 } 2171 }
1684 } 2172 }
1685 2173
1686 *map++ = (r ) 2174 *map++ = (r )
1687 | (g << 8) 2175 | (g << 8)
1694} 2182}
1695 OUTPUT: 2183 OUTPUT:
1696 RETVAL 2184 RETVAL
1697 2185
1698void 2186void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2187draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1700 CODE: 2188 CODE:
1701{ 2189{
2190 int x, y, z;
2191
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2192 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2193 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2194 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 2195 smooth_key skey;
1706 int x, y, z; 2196 int pl_x, pl_y;
1707 int last_name; 2197 maptex pl_tex;
2198 rc_t *rc = rc_alloc ();
2199 rc_t *rc_ov = rc_alloc ();
2200 rc_key_t key;
2201 rc_array_t *arr;
1708 2202
2203 pl_tex.name = 0;
2204
1709 // thats current max. sorry. 2205 // that's current max. sorry.
1710 if (sw > 255) sw = 255; 2206 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 2207 if (sh > 255) sh = 255;
1712 2208
1713 // clear key, in case of extra padding 2209 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 2210 memset (&skey, 0, sizeof (skey));
1715 2211
1716 glColor4ub (255, 255, 255, 255); 2212 memset (&key, 0, sizeof (key));
1717 2213 key.r = 255;
1718 glEnable (GL_BLEND); 2214 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2215 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 2216 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2217 key.mode = GL_QUADS;
1722 2218 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS);
1724
1725 last_name = 0;
1726 2219
1727 mx += self->x; 2220 mx += self->x;
1728 my += self->y; 2221 my += self->y;
1729 2222
1730 // first pass: determine smooth_max 2223 // first pass: determine smooth_max
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 2240 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 2241 self->tex [cell->tile [2]].smoothlevel));
1749 } 2242 }
1750 } 2243 }
1751 2244
2245 glEnable (GL_BLEND);
2246 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2247 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2248
1752 for (z = 0; z <= 2; z++) 2249 for (z = 0; z <= 2; z++)
1753 { 2250 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 2251 memset (smooth_level, 0, sizeof (smooth_level));
2252 key.texname = -1;
1755 2253
1756 for (y = 0; y < sh; y++) 2254 for (y = 0; y < sh; y++)
1757 if (0 <= y + my && y + my < self->rows) 2255 if (0 <= y + my && y + my < self->rows)
1758 { 2256 {
1759 maprow *row = self->row + (y + my); 2257 maprow *row = self->row + (y + my);
1765 tileid tile = cell->tile [z]; 2263 tileid tile = cell->tile [z];
1766 2264
1767 if (tile) 2265 if (tile)
1768 { 2266 {
1769 maptex tex = self->tex [tile]; 2267 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 2268 int px, py;
1771 int py = (y + 1) * T - tex.h;
1772 2269
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 2270 if (key.texname != tex.name)
1776 { 2271 {
2272 self->tex [tile].unused = 0;
2273
1777 if (!tex.name) 2274 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 2275 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1779 2276
1780 glEnd (); 2277 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2278 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 2279 }
1784 2280
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2281 px = (x + 1) * Th - tex.w;
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2282 py = (y + 1) * Tw - tex.h;
1787 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1789 2283
1790 if (cell->flags && z == 2) 2284 if (expect_false (cell->player == player) && expect_false (z == 2))
1791 { 2285 {
1792 if (cell->flags & 1) 2286 pl_x = px;
2287 pl_y = py;
2288 pl_tex = tex;
1793 { 2289 continue;
1794 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32;
1797
1798 glEnd ();
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1800 glBegin (GL_QUADS);
1801
1802 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806 }
1807 } 2290 }
2291
2292 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2293 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2294 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2295 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1808 2296
1809 // update smooth hash 2297 // update smooth hash
1810 if (tex.smoothtile) 2298 if (tex.smoothtile)
1811 { 2299 {
1812 skey.tile = tex.smoothtile; 2300 skey.tile = tex.smoothtile;
1843 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2331 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1844 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2332 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1845 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2333 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1846 } 2334 }
1847 } 2335 }
2336
2337 if (expect_false (z == 2) && expect_false (cell->flags))
2338 {
2339 // overlays such as the speech bubble, probably more to come
2340 if (cell->flags & 1)
2341 {
2342 rc_key_t key_ov = key;
2343 maptex tex = self->tex [TEXID_SPEECH];
2344 rc_array_t *arr;
2345 int px = x * Tw + Tw * 2 / 32;
2346 int py = y * Th - Th * 6 / 32;
2347
2348 key_ov.texname = tex.name;
2349 arr = rc_array (rc_ov, &key_ov);
2350
2351 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2352 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2353 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2354 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2355 }
2356 }
1848 } 2357 }
1849 } 2358 }
2359
2360 rc_draw (rc);
2361 rc_clear (rc);
1850 2362
1851 // go through all smoothlevels, lowest to highest, then draw. 2363 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 2364 // this is basically counting sort
1853 { 2365 {
1854 int w, b; 2366 int w, b;
1855 2367
2368 glEnable (GL_TEXTURE_2D);
2369 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 2370 for (w = 0; w < 256 / 32; ++w)
1857 { 2371 {
1858 uint32_t smask = smooth_level [w]; 2372 uint32_t smask = smooth_level [w];
1859 if (smask) 2373 if (smask)
1860 for (b = 0; b < 32; ++b) 2374 for (b = 0; b < 32; ++b)
1872 if (!(bits & 0x1000) 2386 if (!(bits & 0x1000)
1873 && skey->level == level 2387 && skey->level == level
1874 && level > smooth_max [skey->x][skey->y]) 2388 && level > smooth_max [skey->x][skey->y])
1875 { 2389 {
1876 maptex tex = self->tex [skey->tile]; 2390 maptex tex = self->tex [skey->tile];
1877 int px = (((int)skey->x) - 1) * T; 2391 int px = (((int)skey->x) - 1) * Tw;
1878 int py = (((int)skey->y) - 1) * T; 2392 int py = (((int)skey->y) - 1) * Th;
1879 int border = bits & 15; 2393 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2394 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 2395 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 2396 float dy = tex.t * .5f ; // 2 images/column
1883 2397
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 2398 if (tex.name)
1887 { 2399 {
2400 // this time avoiding texture state changes
2401 // save gobs of state changes.
1888 if (!tex.name) 2402 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2403 {
2404 self->tex [skey->tile].unused = 0;
1890 2405
1891 glEnd (); 2406 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2408 glBegin (GL_QUADS);
1894 } 2409 }
1895 2410
1896 if (border) 2411 if (border)
1897 { 2412 {
1898 float ox = border * dx; 2413 float ox = border * dx;
1899 2414
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1904 } 2419 }
1905 2420
1906 if (corner) 2421 if (corner)
1907 { 2422 {
1908 float ox = corner * dx; 2423 float ox = corner * dx;
1909 2424
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2425 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2429 }
1914 } 2430 }
1915 } 2431 }
1916 } 2432 }
1917 } 2433 }
1918 } 2434 }
2435
2436 glEnd ();
2437 glDisable (GL_TEXTURE_2D);
2438 key.texname = -1;
1919 } 2439 }
1920 2440
1921 hv_clear (smooth); 2441 hv_clear (smooth);
1922 } 2442 }
1923 2443
1924 glEnd (); 2444 if (pl_tex.name)
2445 {
2446 maptex tex = pl_tex;
2447 int px = pl_x + sdx;
2448 int py = pl_y + sdy;
1925 2449
1926 glDisable (GL_TEXTURE_2D); 2450 key.texname = tex.name;
2451 arr = rc_array (rc, &key);
2452
2453 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2454 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2455 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2456 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2457
2458 rc_draw (rc);
2459 }
2460
2461 rc_draw (rc_ov);
2462 rc_clear (rc_ov);
2463
1927 glDisable (GL_BLEND); 2464 glDisable (GL_BLEND);
2465 rc_free (rc);
2466 rc_free (rc_ov);
1928 2467
1929 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
1932 { 2471 {
1935 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
1936 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
1937 { 2476 {
1938 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
1939 2478
1940 int px = x * T; 2479 int px = x * Tw;
1941 int py = y * T; 2480 int py = y * Th;
2481
2482 if (expect_false (cell->player == player))
2483 {
2484 px += sdx;
2485 py += sdy;
2486 }
1942 2487
1943 if (cell->stat_hp) 2488 if (cell->stat_hp)
1944 { 2489 {
1945 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
1946 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1947 2492
1948 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
1949 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
1950 px + width - 1, py); 2495 px + width - 1, py);
1951 2496
1957 } 2502 }
1958 } 2503 }
1959} 2504}
1960 2505
1961void 2506void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2507draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1963 CODE: 2508 CODE:
1964{ 2509{
1965 static float color[16][3] = { 2510 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2511 { 0.00f, 0.00f, 0.00f },
1967 { 1.00F, 1.00F, 1.00F }, 2512 { 1.00f, 1.00f, 1.00f },
1968 { 0.00F, 0.00F, 0.55F }, 2513 { 0.00f, 0.00f, 0.55f },
1969 { 1.00F, 0.00F, 0.00F }, 2514 { 1.00f, 0.00f, 0.00f },
1970 2515
1971 { 1.00F, 0.54F, 0.00F }, 2516 { 1.00f, 0.54f, 0.00f },
1972 { 0.11F, 0.56F, 1.00F }, 2517 { 0.11f, 0.56f, 1.00f },
1973 { 0.93F, 0.46F, 0.00F }, 2518 { 0.93f, 0.46f, 0.00f },
1974 { 0.18F, 0.54F, 0.34F }, 2519 { 0.18f, 0.54f, 0.34f },
1975 2520
1976 { 0.56F, 0.73F, 0.56F }, 2521 { 0.56f, 0.73f, 0.56f },
1977 { 0.80F, 0.80F, 0.80F }, 2522 { 0.80f, 0.80f, 0.80f },
1978 { 0.55F, 0.41F, 0.13F }, 2523 { 0.55f, 0.41f, 0.13f },
1979 { 0.99F, 0.77F, 0.26F }, 2524 { 0.99f, 0.77f, 0.26f },
1980 2525
1981 { 0.74F, 0.65F, 0.41F }, 2526 { 0.74f, 0.65f, 0.41f },
1982 2527
1983 { 0.00F, 1.00F, 1.00F }, 2528 { 0.00f, 1.00f, 1.00f },
1984 { 1.00F, 0.00F, 1.00F }, 2529 { 1.00f, 0.00f, 1.00f },
1985 { 1.00F, 1.00F, 0.00F }, 2530 { 1.00f, 1.00f, 0.00f },
1986 }; 2531 };
1987 2532
1988 int x, y; 2533 int x, y;
1989 2534
1990 glEnable (GL_TEXTURE_2D); 2535 glEnable (GL_TEXTURE_2D);
2536 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2537 * but the nvidia driver (185.18.14) mishandles alpha textures
2538 * and takes the colour from god knows where instead of using
2539 * Cp. MODULATE results in the same colour, but slightly different
2540 * alpha, but atcually gives us the correct colour with nvidia.
2541 */
1991 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2542 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1992 glEnable (GL_BLEND); 2543 glEnable (GL_BLEND);
1993 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2544 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1994 glBegin (GL_QUADS); 2545 glBegin (GL_QUADS);
1995 2546
1996 for (y = 0; y < h; y++) 2547 for (y = 0; y < h; y++)
2000 2551
2001 if (m) 2552 if (m)
2002 { 2553 {
2003 float *c = color [m & 15]; 2554 float *c = color [m & 15];
2004 2555
2005 float tx1 = m & 0x40 ? 0.5 : 0.; 2556 float tx1 = m & 0x40 ? 0.5f : 0.f;
2006 float tx2 = tx1 + 0.5; 2557 float tx2 = tx1 + 0.5f;
2007 2558
2008 glColor4f (c[0], c[1], c[2], 0.75); 2559 glColor4f (c[0], c[1], c[2], 1);
2009 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2560 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2010 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2561 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2011 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2562 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2012 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2563 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2013 } 2564 }
2017 glDisable (GL_BLEND); 2568 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2569 glDisable (GL_TEXTURE_2D);
2019} 2570}
2020 2571
2021void 2572void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2573fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2574 PPCODE:
2024{ 2575{
2025 int x, y; 2576 int x, y;
2026 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2028 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2029 int sw34 = (sw * 3 + 3) & ~3; 2580 int sw3 = sw * 3;
2581 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2582 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2030 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2031 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2584 memset (darkness1, 0, sw1*sh1);
2032 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2033 2585
2034 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2035 SvCUR_set (darkness3_sv, sw34 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2036 2588
2037 mx += self->x - 1; 2589 mx += self->x - 1;
2038 my += self->y - 1; 2590 my += self->y - 1;
2039
2040 memset (darkness1, 255, sw1 * sh1);
2041 2591
2042 for (y = 0; y < sh1; y++) 2592 for (y = 0; y < sh1; y++)
2043 if (0 <= y + my && y + my < self->rows) 2593 if (0 <= y + my && y + my < self->rows)
2044 { 2594 {
2045 maprow *row = self->row + (y + my); 2595 maprow *row = self->row + (y + my);
2048 if (row->c0 <= x + mx && x + mx < row->c1) 2598 if (row->c0 <= x + mx && x + mx < row->c1)
2049 { 2599 {
2050 mapcell *cell = row->col + (x + mx - row->c0); 2600 mapcell *cell = row->col + (x + mx - row->c0);
2051 2601
2052 darkness1 [y * sw1 + x] = cell->darkness 2602 darkness1 [y * sw1 + x] = cell->darkness
2053 ? 255 - (cell->darkness - 1) 2603 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2054 : 255 - FOW_DARKNESS; 2604 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2055 } 2605 }
2056 } 2606 }
2057 2607
2058 for (y = 0; y < sh; ++y) 2608 for (y = 0; y < sh; ++y)
2059 for (x = 0; x < sw; ++x) 2609 for (x = 0; x < sw; ++x)
2078 2628
2079 uint8_t r13 = (d13 + d23 + d12) / 3; 2629 uint8_t r13 = (d13 + d23 + d12) / 3;
2080 uint8_t r23 = d23; 2630 uint8_t r23 = d23;
2081 uint8_t r33 = (d23 + d33 + d32) / 3; 2631 uint8_t r33 = (d23 + d33 + d32) / 3;
2082 2632
2083 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2633 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2084 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2085 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2086 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2636 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2087 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2637 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2088 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2089 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2639 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2090 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2091 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2092 } 2642 }
2093 2643
2094 free (darkness1); 2644 free (darkness1);
2095 2645
2096 EXTEND (SP, 3); 2646 EXTEND (SP, 3);
2097 PUSHs (sv_2mortal (newSViv (sw34))); 2647 PUSHs (sv_2mortal (newSViv (sw3)));
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2648 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2649 PUSHs (darkness3_sv);
2100} 2650}
2101 2651
2102SV * 2652SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2653get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2654 CODE:
2105{ 2655{
2106 int x, y, x1, y1; 2656 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2657 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2658 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2165 else 2715 else
2166 *data++ = 0; 2716 *data++ = 0;
2167 } 2717 }
2168 } 2718 }
2169 2719
2720 /* if size is w*h + 5 then no data has been found */
2721 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2722 {
2170 SvPOK_only (data_sv); 2723 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2725 }
2726
2172 RETVAL = data_sv; 2727 RETVAL = data_sv;
2173} 2728}
2174 OUTPUT: 2729 OUTPUT:
2175 RETVAL 2730 RETVAL
2176 2731
2177void 2732void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2733set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2734 PPCODE:
2180{ 2735{
2181 int x, y, z; 2736 int x, y, z;
2182 int w, h; 2737 int w, h;
2183 int x1, y1; 2738 int x1, y1;
2739 STRLEN len;
2740 uint8_t *data, *end;
2741
2742 len = SvLEN (data_sv);
2743 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2744 data = SvPVbyte_nolen (data_sv);
2745 end = data + len + 8;
2746
2747 if (len < 5)
2748 XSRETURN_EMPTY;
2184 2749
2185 if (*data++ != 0) 2750 if (*data++ != 0)
2186 return; /* version mismatch */ 2751 XSRETURN_EMPTY; /* version mismatch */
2187 2752
2188 w = *data++ << 8; w |= *data++; 2753 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2754 h = *data++ << 8; h |= *data++;
2190 2755
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2756 // we need to do this 'cause we don't keep an absolute coord system for rows
2203 { 2768 {
2204 maprow *row = map_get_row (self, y); 2769 maprow *row = map_get_row (self, y);
2205 2770
2206 for (x = x0; x < x1; x++) 2771 for (x = x0; x < x1; x++)
2207 { 2772 {
2773 uint8_t flags;
2774
2775 if (data + 7 >= end)
2776 XSRETURN_EMPTY;
2777
2208 uint8_t flags = *data++; 2778 flags = *data++;
2209 2779
2210 if (flags) 2780 if (flags)
2211 { 2781 {
2212 mapcell *cell = row_get_cell (row, x); 2782 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2783 tileid tile[3] = { 0, 0, 0 };
2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2786 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2787 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2218 2788
2219 if (cell->darkness == 0) 2789 if (cell->darkness == 0)
2220 { 2790 {
2221 cell->darkness = 0; 2791 /*cell->darkness = 0;*/
2792 EXTEND (SP, 3);
2222 2793
2223 for (z = 0; z <= 2; z++) 2794 for (z = 0; z <= 2; z++)
2224 { 2795 {
2225 tileid t = tile [z]; 2796 tileid t = tile [z];
2226 2797
2227 if (t >= self->texs || (t && !self->tex [t].name)) 2798 if (t >= self->texs || (t && !self->tex [t].name))
2228 { 2799 {
2229 XPUSHs (sv_2mortal (newSViv (t))); 2800 PUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t); 2801 need_texid (self, t);
2231 } 2802 }
2232 2803
2233 cell->tile [z] = t; 2804 cell->tile [z] = t;
2234 } 2805 }
2236 } 2807 }
2237 } 2808 }
2238 } 2809 }
2239} 2810}
2240 2811
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2812MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2813
2243CFPlus::RW 2814DC::RW
2244new (SV *class, SV *data_sv) 2815new (SV *class, SV *data_sv)
2245 CODE: 2816 CODE:
2246{ 2817{
2247 STRLEN datalen; 2818 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2819 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2821 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2822}
2252 OUTPUT: 2823 OUTPUT:
2253 RETVAL 2824 RETVAL
2254 2825
2255CFPlus::RW 2826DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2827new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2828 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2829 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2830 OUTPUT:
2260 RETVAL 2831 RETVAL
2261 2832
2833# fails on win32:
2834# dc.xs(2268) : error C2059: syntax error : '('
2262void 2835#void
2263close (CFPlus::RW self) 2836#close (DC::RW self)
2264 CODE: 2837# CODE:
2265 SDL_RWclose (self); 2838# (self->(close)) (self);
2266 2839
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2840MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2841
2269PROTOTYPES: DISABLE 2842PROTOTYPES: DISABLE
2270 2843
2271void 2844DC::Channel
2272halt (CFPlus::Channel self) 2845find ()
2273 CODE: 2846 CODE:
2847{
2848 RETVAL = Mix_GroupAvailable (-1);
2849
2850 if (RETVAL < 0)
2851 {
2852 RETVAL = Mix_GroupOldest (-1);
2853
2854 if (RETVAL < 0)
2855 {
2856 // happens sometimes, maybe it just stopped playing(?)
2857 RETVAL = Mix_GroupAvailable (-1);
2858
2859 if (RETVAL < 0)
2860 XSRETURN_UNDEF;
2861 }
2862 else
2274 Mix_HaltChannel (self); 2863 Mix_HaltChannel (RETVAL);
2864 }
2275 2865
2276void 2866 Mix_UnregisterAllEffects (RETVAL);
2277expire (CFPlus::Channel self, int ticks = -1) 2867 Mix_Volume (RETVAL, 128);
2278 CODE: 2868}
2279 Mix_ExpireChannel (self, ticks);
2280
2281void
2282fade_out (CFPlus::Channel self, int ticks = -1)
2283 CODE:
2284 Mix_FadeOutChannel (self, ticks);
2285
2286int
2287volume (CFPlus::Channel self, int volume)
2288 CODE:
2289 RETVAL = Mix_Volume (self, volume);
2290 OUTPUT: 2869 OUTPUT:
2291 RETVAL 2870 RETVAL
2292 2871
2293void 2872void
2873halt (DC::Channel self)
2874 CODE:
2875 Mix_HaltChannel (self);
2876
2877void
2878expire (DC::Channel self, int ticks = -1)
2879 CODE:
2880 Mix_ExpireChannel (self, ticks);
2881
2882void
2883fade_out (DC::Channel self, int ticks = -1)
2884 CODE:
2885 Mix_FadeOutChannel (self, ticks);
2886
2887int
2888volume (DC::Channel self, int volume)
2889 CODE:
2890 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2891 OUTPUT:
2892 RETVAL
2893
2894void
2294unregister_all_effects (CFPlus::Channel self) 2895unregister_all_effects (DC::Channel self)
2295 CODE: 2896 CODE:
2296 Mix_UnregisterAllEffects (self); 2897 Mix_UnregisterAllEffects (self);
2297 2898
2298void 2899void
2299set_panning (CFPlus::Channel self, int left, int right) 2900set_panning (DC::Channel self, int left, int right)
2300 CODE: 2901 CODE:
2902 left = CLAMP (left , 0, 255);
2903 right = CLAMP (right, 0, 255);
2301 Mix_SetPanning (self, left, right); 2904 Mix_SetPanning (self, left, right);
2302 2905
2303void 2906void
2304set_distance (CFPlus::Channel self, int distance) 2907set_distance (DC::Channel self, int distance)
2305 CODE: 2908 CODE:
2306 Mix_SetDistance (self, distance); 2909 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2307 2910
2308void 2911void
2309set_position (CFPlus::Channel self, int angle, int distance) 2912set_position (DC::Channel self, int angle, int distance)
2310 CODE: 2913 CODE:
2914
2915void
2916set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2917 CODE:
2918{
2919 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2920 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2311 Mix_SetPosition (self, angle, distance); 2921 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2922}
2312 2923
2313void 2924void
2314set_reverse_stereo (CFPlus::Channel self, int flip) 2925set_reverse_stereo (DC::Channel self, int flip)
2315 CODE: 2926 CODE:
2316 Mix_SetReverseStereo (self, flip); 2927 Mix_SetReverseStereo (self, flip);
2317 2928
2318MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2319 2930
2320PROTOTYPES: DISABLE 2931PROTOTYPES: DISABLE
2321 2932
2933void
2934decoders ()
2935 PPCODE:
2936#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2937 int i, num = Mix_GetNumChunkDecoders ();
2938 EXTEND (SP, num);
2939 for (i = 0; i < num; ++i)
2940 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2941#else
2942 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2943#endif
2944
2322CFPlus::MixChunk 2945DC::MixChunk
2323new (SV *class, CFPlus::RW rwops) 2946new (SV *class, DC::RW rwops)
2324 CODE: 2947 CODE:
2325 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2326 OUTPUT: 2949 OUTPUT:
2327 RETVAL 2950 RETVAL
2328 2951
2329void 2952void
2330DESTROY (CFPlus::MixChunk self) 2953DESTROY (DC::MixChunk self)
2331 CODE: 2954 CODE:
2332 Mix_FreeChunk (self); 2955 Mix_FreeChunk (self);
2333 2956
2334int 2957int
2335volume (CFPlus::MixChunk self, int volume = -1) 2958volume (DC::MixChunk self, int volume = -1)
2336 CODE: 2959 CODE:
2960 if (items > 1)
2961 volume = CLAMP (volume, 0, 128);
2337 RETVAL = Mix_VolumeChunk (self, volume); 2962 RETVAL = Mix_VolumeChunk (self, volume);
2338 OUTPUT: 2963 OUTPUT:
2339 RETVAL 2964 RETVAL
2340 2965
2341CFPlus::Channel 2966DC::Channel
2342play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2967play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2343 CODE: 2968 CODE:
2969{
2344 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2970 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2971
2972 if (RETVAL < 0)
2973 XSRETURN_UNDEF;
2974
2975 if (channel < 0)
2976 {
2345 Mix_UnregisterAllEffects (RETVAL); 2977 Mix_UnregisterAllEffects (RETVAL);
2978 Mix_Volume (RETVAL, 128);
2979 }
2980}
2346 OUTPUT: 2981 OUTPUT:
2347 RETVAL 2982 RETVAL
2348 2983
2349MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2984MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2985
2986void
2987decoders ()
2988 PPCODE:
2989#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2990 int i, num = Mix_GetNumMusicDecoders ();
2991 EXTEND (SP, num);
2992 for (i = 0; i < num; ++i)
2993 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2994#else
2995 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2996#endif
2350 2997
2351int 2998int
2352volume (int volume = -1) 2999volume (int volume = -1)
2353 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2354 CODE: 3001 CODE:
3002 if (items > 0)
3003 volume = CLAMP (volume, 0, 128);
2355 RETVAL = Mix_VolumeMusic (volume); 3004 RETVAL = Mix_VolumeMusic (volume);
2356 OUTPUT: 3005 OUTPUT:
2357 RETVAL 3006 RETVAL
2358 3007
2359void 3008void
2364void 3013void
2365halt () 3014halt ()
2366 CODE: 3015 CODE:
2367 Mix_HaltMusic (); 3016 Mix_HaltMusic ();
2368 3017
3018int
3019playing ()
3020 CODE:
3021 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT:
3023 RETVAL
3024
2369CFPlus::MixMusic 3025DC::MixMusic
2370new (SV *class, CFPlus::RW rwops) 3026new (SV *class, DC::RW rwops)
2371 CODE: 3027 CODE:
2372 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
2373 OUTPUT: 3029 OUTPUT:
2374 RETVAL 3030 RETVAL
2375 3031
2376void 3032void
2377DESTROY (CFPlus::MixMusic self) 3033DESTROY (DC::MixMusic self)
2378 CODE: 3034 CODE:
2379 Mix_FreeMusic (self); 3035 Mix_FreeMusic (self);
2380 3036
2381int 3037int
2382play (CFPlus::MixMusic self, int loops = -1) 3038play (DC::MixMusic self, int loops = -1)
2383 CODE: 3039 CODE:
2384 RETVAL = Mix_PlayMusic (self, loops); 3040 RETVAL = Mix_PlayMusic (self, loops);
2385 OUTPUT: 3041 OUTPUT:
2386 RETVAL 3042 RETVAL
2387 3043
2388void 3044void
2389fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3045fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2390 CODE: 3046 CODE:
2391 Mix_FadeInMusicPos (self, loops, ms, position); 3047 Mix_FadeInMusicPos (self, loops, ms, position);
2392 3048
2393MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3049MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2394 3050
2395PROTOTYPES: ENABLE 3051PROTOTYPES: ENABLE
2396 3052
2397BOOT: 3053BOOT:
2398{ 3054{
2399 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3055 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2400 static const struct { 3056 static const struct {
2401 const char *name; 3057 const char *name;
2402 IV iv; 3058 IV iv;
2403 } *civ, const_iv[] = { 3059 } *civ, const_iv[] = {
2404# define const_iv(name) { # name, (IV)name } 3060# define const_iv(name) { # name, (IV)name }
2405 const_iv (GL_VENDOR), 3061 const_iv (GL_VENDOR),
2406 const_iv (GL_VERSION), 3062 const_iv (GL_VERSION),
2407 const_iv (GL_EXTENSIONS), 3063 const_iv (GL_EXTENSIONS),
3064 const_iv (GL_MAX_TEXTURE_UNITS),
2408 const_iv (GL_COLOR_MATERIAL), 3065 const_iv (GL_COLOR_MATERIAL),
2409 const_iv (GL_SMOOTH), 3066 const_iv (GL_SMOOTH),
2410 const_iv (GL_FLAT), 3067 const_iv (GL_FLAT),
2411 const_iv (GL_DITHER), 3068 const_iv (GL_DITHER),
2412 const_iv (GL_BLEND), 3069 const_iv (GL_BLEND),
2424 const_iv (GL_ZERO), 3081 const_iv (GL_ZERO),
2425 const_iv (GL_SRC_ALPHA), 3082 const_iv (GL_SRC_ALPHA),
2426 const_iv (GL_DST_ALPHA), 3083 const_iv (GL_DST_ALPHA),
2427 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3084 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2428 const_iv (GL_ONE_MINUS_DST_ALPHA), 3085 const_iv (GL_ONE_MINUS_DST_ALPHA),
3086 const_iv (GL_SRC_COLOR),
3087 const_iv (GL_DST_COLOR),
3088 const_iv (GL_ONE_MINUS_SRC_COLOR),
3089 const_iv (GL_ONE_MINUS_DST_COLOR),
2429 const_iv (GL_SRC_ALPHA_SATURATE), 3090 const_iv (GL_SRC_ALPHA_SATURATE),
2430 const_iv (GL_RGB), 3091 const_iv (GL_RGB),
2431 const_iv (GL_RGBA), 3092 const_iv (GL_RGBA),
2432 const_iv (GL_RGBA4), 3093 const_iv (GL_RGBA4),
2433 const_iv (GL_RGBA8), 3094 const_iv (GL_RGBA8),
2439 const_iv (GL_INTENSITY), 3100 const_iv (GL_INTENSITY),
2440 const_iv (GL_LUMINANCE), 3101 const_iv (GL_LUMINANCE),
2441 const_iv (GL_LUMINANCE_ALPHA), 3102 const_iv (GL_LUMINANCE_ALPHA),
2442 const_iv (GL_FLOAT), 3103 const_iv (GL_FLOAT),
2443 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3104 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3105 const_iv (GL_COMPRESSED_ALPHA_ARB),
3106 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3107 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3108 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3109 const_iv (GL_COMPRESSED_RGB_ARB),
3110 const_iv (GL_COMPRESSED_RGBA_ARB),
2444 const_iv (GL_COMPILE), 3111 const_iv (GL_COMPILE),
2445 const_iv (GL_PROXY_TEXTURE_1D), 3112 const_iv (GL_PROXY_TEXTURE_1D),
2446 const_iv (GL_PROXY_TEXTURE_2D), 3113 const_iv (GL_PROXY_TEXTURE_2D),
2447 const_iv (GL_TEXTURE_1D), 3114 const_iv (GL_TEXTURE_1D),
2448 const_iv (GL_TEXTURE_2D), 3115 const_iv (GL_TEXTURE_2D),
2487 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3154 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2488 const_iv (GL_POINT_SMOOTH_HINT), 3155 const_iv (GL_POINT_SMOOTH_HINT),
2489 const_iv (GL_LINE_SMOOTH_HINT), 3156 const_iv (GL_LINE_SMOOTH_HINT),
2490 const_iv (GL_POLYGON_SMOOTH_HINT), 3157 const_iv (GL_POLYGON_SMOOTH_HINT),
2491 const_iv (GL_GENERATE_MIPMAP_HINT), 3158 const_iv (GL_GENERATE_MIPMAP_HINT),
3159 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2492 const_iv (GL_FASTEST), 3160 const_iv (GL_FASTEST),
2493 const_iv (GL_DONT_CARE), 3161 const_iv (GL_DONT_CARE),
2494 const_iv (GL_NICEST), 3162 const_iv (GL_NICEST),
2495 const_iv (GL_V2F), 3163 const_iv (GL_V2F),
2496 const_iv (GL_V3F), 3164 const_iv (GL_V3F),
2497 const_iv (GL_T2F_V3F), 3165 const_iv (GL_T2F_V3F),
2498 const_iv (GL_T2F_N3F_V3F), 3166 const_iv (GL_T2F_N3F_V3F),
3167 const_iv (GL_FUNC_ADD),
3168 const_iv (GL_FUNC_SUBTRACT),
3169 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2499# undef const_iv 3170# undef const_iv
2500 }; 3171 };
2501 3172
2502 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3173 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2503 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2504 3175
2505 texture_av = newAV (); 3176 texture_av = newAV ();
2506 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
2507} 3178}
3179
3180void
3181disable_GL_EXT_blend_func_separate ()
3182 CODE:
3183 gl.BlendFuncSeparate = 0;
3184 gl.BlendFuncSeparateEXT = 0;
3185
3186void
3187apple_nvidia_bug (int enable)
2508 3188
2509char * 3189char *
2510gl_vendor () 3190gl_vendor ()
2511 CODE: 3191 CODE:
2512 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (char *)glGetString (GL_VENDOR);
2543 3223
2544int glGetError () 3224int glGetError ()
2545 3225
2546void glFinish () 3226void glFinish ()
2547 3227
3228void glFlush ()
3229
2548void glClear (int mask) 3230void glClear (int mask)
2549 3231
2550void glClearColor (float r, float g, float b, float a = 1.0) 3232void glClearColor (float r, float g, float b, float a = 1.0)
2551 PROTOTYPE: @ 3233 PROTOTYPE: @
2552 3234
2561void glBlendFunc (int sfactor, int dfactor) 3243void glBlendFunc (int sfactor, int dfactor)
2562 3244
2563void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3245void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2564 CODE: 3246 CODE:
2565 gl_BlendFuncSeparate (sa, da, saa, daa); 3247 gl_BlendFuncSeparate (sa, da, saa, daa);
3248
3249# void glBlendEquation (int se)
2566 3250
2567void glDepthMask (int flag) 3251void glDepthMask (int flag)
2568 3252
2569void glLogicOp (int opcode) 3253void glLogicOp (int opcode)
2570 3254
2605void glRotate (float angle, float x, float y, float z) 3289void glRotate (float angle, float x, float y, float z)
2606 CODE: 3290 CODE:
2607 glRotatef (angle, x, y, z); 3291 glRotatef (angle, x, y, z);
2608 3292
2609void glColor (float r, float g, float b, float a = 1.0) 3293void glColor (float r, float g, float b, float a = 1.0)
3294 PROTOTYPE: @
2610 ALIAS: 3295 ALIAS:
2611 glColor_premultiply = 1 3296 glColor_premultiply = 1
2612 CODE: 3297 CODE:
2613 if (ix) 3298 if (ix)
2614 { 3299 {
2634 3319
2635void glRect (float x1, float y1, float x2, float y2) 3320void glRect (float x1, float y1, float x2, float y2)
2636 CODE: 3321 CODE:
2637 glRectf (x1, y1, x2, y2); 3322 glRectf (x1, y1, x2, y2);
2638 3323
3324void glRect_lineloop (float x1, float y1, float x2, float y2)
3325 CODE:
3326 glBegin (GL_LINE_LOOP);
3327 glVertex2f (x1, y1);
3328 glVertex2f (x2, y1);
3329 glVertex2f (x2, y2);
3330 glVertex2f (x1, y2);
3331 glEnd ();
3332
2639PROTOTYPES: ENABLE 3333PROTOTYPES: ENABLE
2640 3334
2641void glBegin (int mode) 3335void glBegin (int mode)
2642 3336
2643void glEnd () 3337void glEnd ()
2675void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3369void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2676 CODE: 3370 CODE:
2677 if (gl.SeparableFilter2D) 3371 if (gl.SeparableFilter2D)
2678 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3372 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2679 3373
2680void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3374void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2681 3375
2682void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3376void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2683 3377
2684void glDrawPixels (int width, int height, int format, int type, char *pixels) 3378void glDrawPixels (int width, int height, int format, int type, char *pixels)
2685 3379
2711 3405
2712void glEndList () 3406void glEndList ()
2713 3407
2714void glCallList (int list) 3408void glCallList (int list)
2715 3409
2716MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3410void c_init ()
3411 CODE:
3412 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3413 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3414
3415MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2717 3416
2718PROTOTYPES: DISABLE 3417PROTOTYPES: DISABLE
2719 3418
2720void 3419void
2721find_widget (SV *self, NV x, NV y) 3420find_widget (SV *self, NV x, NV y)
2725 XPUSHs (self); 3424 XPUSHs (self);
2726} 3425}
2727 3426
2728BOOT: 3427BOOT:
2729{ 3428{
2730 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3429 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2731 3430
2732 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3431 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2733 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3432 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2734 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3433 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2735 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3434 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2736} 3435}
2737 3436
2738void 3437void
2739draw (SV *self) 3438draw (SV *self)
2740 CODE: 3439 CODE:
2744 NV x, y, w, h; 3443 NV x, y, w, h;
2745 SV *draw_x_sv = GvSV (draw_x_gv); 3444 SV *draw_x_sv = GvSV (draw_x_gv);
2746 SV *draw_y_sv = GvSV (draw_y_gv); 3445 SV *draw_y_sv = GvSV (draw_y_gv);
2747 SV *draw_w_sv = GvSV (draw_w_gv); 3446 SV *draw_w_sv = GvSV (draw_w_gv);
2748 SV *draw_h_sv = GvSV (draw_h_gv); 3447 SV *draw_h_sv = GvSV (draw_h_gv);
2749 SV *hover;
2750 double draw_x, draw_y, draw_w, draw_h; 3448 double draw_x, draw_y;
2751 3449
2752 if (!SvROK (self)) 3450 if (!SvROK (self))
2753 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3451 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2754 3452
2755 hv = (HV *)SvRV (self); 3453 hv = (HV *)SvRV (self);
2756 3454
2757 if (SvTYPE (hv) != SVt_PVHV) 3455 if (SvTYPE (hv) != SVt_PVHV)
2758 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3456 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2759 3457
2760 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3458 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2761 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3459 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2762 3460
2763 if (!h || !w) 3461 if (!h || !w)
2783 { 3481 {
2784 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3482 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2785 3483
2786 if (svp && SvTRUE (*svp)) 3484 if (svp && SvTRUE (*svp))
2787 { 3485 {
2788 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3486 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2789 glEnable (GL_BLEND); 3487 glEnable (GL_BLEND);
2790 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3488 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2791 glBegin (GL_QUADS); 3489 glBegin (GL_QUADS);
2792 glVertex2f (0, 0); 3490 glVertex2f (0, 0);
2793 glVertex2f (w, 0); 3491 glVertex2f (w, 0);
2796 glEnd (); 3494 glEnd ();
2797 glDisable (GL_BLEND); 3495 glDisable (GL_BLEND);
2798 } 3496 }
2799 } 3497 }
2800#if 0 3498#if 0
2801 if ($ENV{CFPLUS_DEBUG} & 1) { 3499 // draw borders, for debugging
2802 glPushMatrix; 3500 glPushMatrix ();
2803 glColor 1, 1, 0, 1; 3501 glColor4f (1., 1., 0., 1.);
2804 glTranslate 0.375, 0.375; 3502 glTranslatef (.5, .5, 0.);
2805 glBegin GL_LINE_LOOP; 3503 glBegin (GL_LINE_LOOP);
2806 glVertex 0 , 0; 3504 glVertex2f (0 , 0);
2807 glVertex $self->{w} - 1, 0; 3505 glVertex2f (w - 1, 0);
2808 glVertex $self->{w} - 1, $self->{h} - 1; 3506 glVertex2f (w - 1, h - 1);
2809 glVertex 0 , $self->{h} - 1; 3507 glVertex2f (0 , h - 1);
2810 glEnd; 3508 glEnd ();
2811 glPopMatrix; 3509 glPopMatrix ();
2812 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2813 }
2814#endif 3510#endif
2815 PUSHMARK (SP); 3511 PUSHMARK (SP);
2816 XPUSHs (self); 3512 XPUSHs (self);
2817 PUTBACK; 3513 PUTBACK;
2818 call_method ("_draw", G_VOID | G_DISCARD); 3514 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines