ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.311 by root, Tue Dec 27 09:17:27 2011 UTC

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