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.313 by root, Sat Jan 7 15:24:41 2012 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines