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.232 by root, Sun Aug 19 15:57:40 2007 UTC vs.
Revision 1.319 by root, Sun Nov 18 00:52:22 2018 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.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{
120 170
121#include "pango-font.c" 171#include "pango-font.c"
122#include "pango-fontmap.c" 172#include "pango-fontmap.c"
123#include "pango-render.c" 173#include "pango-render.c"
124 174
125typedef IV CFPlus__Channel; 175typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 176typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 177typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 178typedef Mix_Music *DC__MixMusic;
129 179
130typedef PangoFontDescription *CFPlus__Font; 180typedef PangoFontDescription *DC__Font;
131 181
132static int 182static int
133shape_attr_p (PangoLayoutRun *run) 183shape_attr_p (PangoLayoutRun *run)
134{ 184{
135 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
136 186
137 while (attrs) 187 while (attrs)
138 { 188 {
139 PangoAttribute *attr = attrs->data; 189 PangoAttribute *attr = (PangoAttribute *)attrs->data;
140 190
141 if (attr->klass->type == PANGO_ATTR_SHAPE) 191 if (attr->klass->type == PANGO_ATTR_SHAPE)
142 return 1; 192 return 1;
143 193
144 attrs = attrs->next; 194 attrs = attrs->next;
149 199
150typedef struct cf_layout { 200typedef struct cf_layout {
151 PangoLayout *pl; 201 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 202 float r, g, b, a; // default color for rgba mode
153 int base_height; 203 int base_height;
154 CFPlus__Font font; 204 DC__Font font;
155 rc_t *rc; 205 rc_t *rc;
156} *CFPlus__Layout; 206} *DC__Layout;
157 207
158static CFPlus__Font default_font; 208static DC__Font default_font;
159static PangoContext *opengl_context; 209static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
161 211
162static void 212static void
163substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
168#endif 218#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 220}
171 221
172static void 222static void
173layout_update_font (CFPlus__Layout self) 223layout_update_font (DC__Layout self)
174{ 224{
175 /* 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
176 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
177 */ 227 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
179 229
180 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 232
183 pango_layout_set_font_description (self->pl, font); 233 pango_layout_set_font_description (self->pl, font);
184} 234}
185 235
186static void 236static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 237layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 238{
189 PangoRectangle rect; 239 PangoRectangle rect;
190 240
191 // get_pixel_* wrongly rounds down 241 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 242 pango_layout_get_extents (self->pl, 0, &rect);
209 int w, h; 259 int w, h;
210 float s, t; 260 float s, t;
211 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
212 tileid smoothtile; 262 tileid smoothtile;
213 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
214} maptex; 265} maptex;
215 266
216typedef struct { 267typedef struct {
217 uint32_t player; 268 uint32_t player;
218 tileid tile[3]; 269 tileid tile[3];
231 int faces; tileid *face2tile; // [faceid] 282 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 283 int texs; maptex *tex; // [tileid]
233 284
234 int32_t rows; 285 int32_t rows;
235 maprow *row; 286 maprow *row;
236} *CFPlus__Map; 287} *DC__Map;
237 288
238static char * 289static char *
239prepend (char *ptr, int sze, int inc) 290prepend (char *ptr, int sze, int inc)
240{ 291{
241 char *p; 292 char *p;
279 self->texs *= 2; 330 self->texs *= 2;
280 } 331 }
281} 332}
282 333
283static maprow * 334static maprow *
284map_get_row (CFPlus__Map self, int y) 335map_get_row (DC__Map self, int y)
285{ 336{
286 if (0 > y) 337 if (0 > y)
287 { 338 {
288 int extend = - y + MAP_EXTEND_Y; 339 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 340 Prepend (maprow, self->row, self->rows, extend);
327 378
328 return row->col + (x - row->c0); 379 return row->col + (x - row->c0);
329} 380}
330 381
331static mapcell * 382static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 383map_get_cell (DC__Map self, int x, int y)
333{ 384{
334 return row_get_cell (map_get_row (self, y), x); 385 return row_get_cell (map_get_row (self, y), x);
335} 386}
336 387
337static void 388static void
338map_clear (CFPlus__Map self) 389map_clear (DC__Map self)
339{ 390{
340 int r; 391 int r;
341 392
342 for (r = 0; r < self->rows; r++) 393 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 394 Safefree (self->row[r].col);
350 self->oy = 0; 401 self->oy = 0;
351 self->row = 0; 402 self->row = 0;
352 self->rows = 0; 403 self->rows = 0;
353} 404}
354 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
355static void 416static void
356map_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)
357{ 418{
358 int x, y; 419 int x, y;
359 maprow *row; 420 maprow *row;
360 mapcell *cell; 421 mapcell *cell;
361 422
373 if (x >= row->c1) 434 if (x >= row->c1)
374 break; 435 break;
375 436
376 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
377 438
378 cell->darkness = 0; 439 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 440 }
383 } 441 }
384} 442}
385 443
386typedef struct { 444typedef struct {
421 ev.code = 1; 479 ev.code = 1;
422 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
423 ev.data2 = 0; 481 ev.data2 = 0;
424 482
425 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;
426} 490}
427 491
428static unsigned int 492static unsigned int
429minpot (unsigned int n) 493minpot (unsigned int n)
430{ 494{
440 n |= n >> 16; 504 n |= n >> 16;
441 505
442 return n + 1; 506 return n + 1;
443} 507}
444 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
445/* SDL should provide this, really. */ 520/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 521#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 522#define SDLK_MODIFIER_MAX 314
448 523
449/******************************************************************************/ 524/******************************************************************************/
487 return 0; 562 return 0;
488 563
489 return 1; 564 return 1;
490} 565}
491 566
492MODULE = CFPlus PACKAGE = CFPlus 567/******************************************************************************/
568
569/* process keyboard modifiers */
570static int
571mod_munge (int mod)
572{
573 mod &= MOD_MASK;
574
575 if (mod & (KMOD_META | KMOD_ALT))
576 mod |= KMOD_LRAM;
577
578 return mod;
579}
580
581static void
582deliantra_main (SV *real_main)
583{
584 dSP;
585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
588}
589
590#ifdef __MACOSX__
591 static SV *real_main;
592
593 /* to due surprising braindamage on the side of SDL design, we
594 * do some mind-boggling hack here: SDL requires a custom main()
595 * on OS X, so... we provide one and call the original main(), which,
596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
597 * and which calls our main (== SDL_main) back.
598 */
599 extern C_LINKAGE int
600 main (int argc, char *argv[])
601 {
602 deliantra_main (real_main);
603 }
604
605 #undef main
606
607 extern C_LINKAGE int main (int argc, char *argv[]);
608
609 static void
610 SDL_main_hack (SV *real_main_)
611 {
612 real_main = real_main_;
613
614 char *argv[] = { "deliantra client", 0 };
615 (main) (1, argv);
616 }
617#else
618 static void
619 SDL_main_hack (SV *real_main)
620 {
621 deliantra_main (real_main);
622 }
623#endif
624
625MODULE = Deliantra::Client PACKAGE = DC
493 626
494PROTOTYPES: ENABLE 627PROTOTYPES: ENABLE
495 628
496BOOT: 629BOOT:
497{ 630{
498 HV *stash = gv_stashpv ("CFPlus", 1); 631 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 632 static const struct {
500 const char *name; 633 const char *name;
501 IV iv; 634 IV iv;
502 } *civ, const_iv[] = { 635 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 636# define const_iv(name) { # name, (IV)name }
525 658
526 const_iv (SDL_APPINPUTFOCUS), 659 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 660 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 661 const_iv (SDL_APPACTIVE),
529 662
663
664 const_iv (SDLK_UNKNOWN),
665 const_iv (SDLK_FIRST),
666 const_iv (SDLK_BACKSPACE),
667 const_iv (SDLK_TAB),
668 const_iv (SDLK_CLEAR),
669 const_iv (SDLK_RETURN),
670 const_iv (SDLK_PAUSE),
671 const_iv (SDLK_ESCAPE),
672 const_iv (SDLK_SPACE),
673 const_iv (SDLK_EXCLAIM),
674 const_iv (SDLK_QUOTEDBL),
675 const_iv (SDLK_HASH),
676 const_iv (SDLK_DOLLAR),
677 const_iv (SDLK_AMPERSAND),
678 const_iv (SDLK_QUOTE),
679 const_iv (SDLK_LEFTPAREN),
680 const_iv (SDLK_RIGHTPAREN),
681 const_iv (SDLK_ASTERISK),
682 const_iv (SDLK_PLUS),
683 const_iv (SDLK_COMMA),
684 const_iv (SDLK_MINUS),
685 const_iv (SDLK_PERIOD),
686 const_iv (SDLK_SLASH),
687 const_iv (SDLK_0),
688 const_iv (SDLK_1),
689 const_iv (SDLK_2),
690 const_iv (SDLK_3),
691 const_iv (SDLK_4),
692 const_iv (SDLK_5),
693 const_iv (SDLK_6),
694 const_iv (SDLK_7),
695 const_iv (SDLK_8),
696 const_iv (SDLK_9),
697 const_iv (SDLK_COLON),
698 const_iv (SDLK_SEMICOLON),
699 const_iv (SDLK_LESS),
700 const_iv (SDLK_EQUALS),
701 const_iv (SDLK_GREATER),
702 const_iv (SDLK_QUESTION),
703 const_iv (SDLK_AT),
704
705 const_iv (SDLK_LEFTBRACKET),
706 const_iv (SDLK_BACKSLASH),
707 const_iv (SDLK_RIGHTBRACKET),
708 const_iv (SDLK_CARET),
709 const_iv (SDLK_UNDERSCORE),
710 const_iv (SDLK_BACKQUOTE),
711 const_iv (SDLK_DELETE),
712
713 const_iv (SDLK_FIRST),
714 const_iv (SDLK_LAST),
530 const_iv (SDLK_KP0), 715 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 716 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 717 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 718 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 719 const_iv (SDLK_KP4),
606 const_iv (KMOD_LMETA), 791 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 792 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 793 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 794 const_iv (KMOD_CAPS),
610 const_iv (KMOD_MODE), 795 const_iv (KMOD_MODE),
796
797 const_iv (KMOD_LRAM),
798
799 const_iv (MIX_DEFAULT_FORMAT),
800
801 const_iv (SDL_INIT_TIMER),
802 const_iv (SDL_INIT_AUDIO),
803 const_iv (SDL_INIT_VIDEO),
804 const_iv (SDL_INIT_CDROM),
805 const_iv (SDL_INIT_JOYSTICK),
806 const_iv (SDL_INIT_EVERYTHING),
807 const_iv (SDL_INIT_NOPARACHUTE),
808 const_iv (SDL_INIT_EVENTTHREAD),
809
810 const_iv (SDL_GL_RED_SIZE),
811 const_iv (SDL_GL_GREEN_SIZE),
812 const_iv (SDL_GL_BLUE_SIZE),
813 const_iv (SDL_GL_ALPHA_SIZE),
814 const_iv (SDL_GL_DOUBLEBUFFER),
815 const_iv (SDL_GL_BUFFER_SIZE),
816 const_iv (SDL_GL_DEPTH_SIZE),
817 const_iv (SDL_GL_STENCIL_SIZE),
818 const_iv (SDL_GL_ACCUM_RED_SIZE),
819 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
820 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
821 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
822 const_iv (SDL_GL_STEREO),
823 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
824 const_iv (SDL_GL_MULTISAMPLESAMPLES),
825 const_iv (SDL_GL_ACCELERATED_VISUAL),
826 const_iv (SDL_GL_SWAP_CONTROL),
827
828 const_iv (FOW_DARKNESS)
611# undef const_iv 829# undef const_iv
612 }; 830 };
613 831
614 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 832 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
616 834
617 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
618 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
619} 837}
620 838
632 RETVAL 850 RETVAL
633 851
634NV floor (NV x) 852NV floor (NV x)
635 853
636NV ceil (NV x) 854NV ceil (NV x)
855
856IV minpot (UV n)
857
858IV popcount (UV n)
859
860NV distance (NV dx, NV dy)
861 CODE:
862 RETVAL = pow (dx * dx + dy * dy, 0.5);
863 OUTPUT:
864 RETVAL
637 865
638void 866void
639pango_init () 867pango_init ()
640 CODE: 868 CODE:
641{ 869{
642 opengl_fontmap = pango_opengl_font_map_new (); 870 opengl_fontmap = pango_opengl_font_map_new ();
643 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 871 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
644 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 872 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
873 /*pango_context_set_font_description (opengl_context, default_font);*/
874#if PANGO_VERSION_CHECK (1, 15, 2)
875 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
876 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
877#endif
645} 878}
646 879
647char *
648SDL_GetError () 880char *SDL_GetError ()
649 881
650int 882void SDL_main_hack (SV *real_main)
651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 883 PROTOTYPE: &
652 884
653void 885int SDL_Init (U32 flags)
886
887int SDL_InitSubSystem (U32 flags)
888
889void SDL_QuitSubSystem (U32 flags)
890
654SDL_Quit () 891void SDL_Quit ()
892
893int SDL_GL_SetAttribute (int attr, int value)
894 C_ARGS: (SDL_GLattr)attr, value
895
896int SDL_GL_GetAttribute (int attr)
897 CODE:
898 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
899 XSRETURN_UNDEF;
900 OUTPUT:
901 RETVAL
655 902
656void 903void
657SDL_ListModes (int rgb, int alpha) 904SDL_ListModes (int rgb, int alpha)
658 PPCODE: 905 PPCODE:
659{ 906{
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 918 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 919 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 920 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674 921
675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 922 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
676#if SDL_VERSION_ATLEAST(1,2,10)
677 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
678 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 923 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679#endif
680 924
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 925 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 926
683 if (m && m != (SDL_Rect **)-1) 927 if (m && m != (SDL_Rect **)-1)
684 while (*m) 928 while (*m)
685 { 929 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 930 if ((*m)->w >= 400 && (*m)->h >= 300)
687 { 931 {
688 AV *av = newAV (); 932 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 933 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 934 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 935 av_push (av, newSViv (rgb));
714 ); 958 );
715 959
716 if (RETVAL) 960 if (RETVAL)
717 { 961 {
718 av_clear (texture_av); 962 av_clear (texture_av);
719
720 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT");
721#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 963#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722#include "glfunc.h" 964#include "glfunc.h"
723#undef GL_FUNC 965#undef GL_FUNC
966 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
967 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
724 } 968 }
725} 969}
726 OUTPUT: 970 OUTPUT:
727 RETVAL 971 RETVAL
972
973void
974SDL_WM_SetCaption (const char *title, const char *icon)
728 975
729void 976void
730SDL_GL_SwapBuffers () 977SDL_GL_SwapBuffers ()
731 978
732char * 979char *
733SDL_GetKeyName (int sym) 980SDL_GetKeyName (int sym)
981 C_ARGS: (SDLKey)sym
734 982
735int 983int
736SDL_GetAppState () 984SDL_GetAppState ()
737 985
986int
987SDL_GetModState ()
988
989int
990SDL_WaitEvent ()
991 C_ARGS: 0
992
738void 993void
994SDL_PumpEvents ()
995
996void
739poll_events () 997peep_events ()
740 PPCODE: 998 PPCODE:
741{ 999{
742 SDL_Event ev; 1000 SDL_Event ev;
743 1001
744 SDL_PumpEvents (); 1002 SDL_PumpEvents ();
751 { 1009 {
752 case SDL_KEYDOWN: 1010 case SDL_KEYDOWN:
753 case SDL_KEYUP: 1011 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1012 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1013 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1014 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
757 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1015 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
758 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1016 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 1017 break;
760 1018
761 case SDL_ACTIVEEVENT: 1019 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1020 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
780 x = ev.motion.x; 1038 x = ev.motion.x;
781 y = ev.motion.y; 1039 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1040 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 1041 }
784 1042
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1043 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 1044 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 1045 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 1046 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1047 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1048 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 1049 }
792 break; 1050 break;
793 1051
794 case SDL_MOUSEBUTTONDOWN: 1052 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 1053 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1054 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 1055
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1056 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1057 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1058 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1059 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1064 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1065 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 1066 break;
809 } 1067 }
810 1068
811 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1069 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812 } 1070 }
813} 1071}
814 1072
1073char *
1074SDL_AudioDriverName ()
1075 CODE:
1076{
1077 char buf [256];
1078 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1079 XSRETURN_UNDEF;
1080
1081 RETVAL = buf;
1082}
1083 OUTPUT:
1084 RETVAL
1085
815int 1086int
816Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1087Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817 POSTCALL: 1088 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 1089 Mix_HookMusicFinished (music_finished);
819 Mix_ChannelFinished (channel_finished); 1090 Mix_ChannelFinished (channel_finished);
1091
1092void
1093Mix_QuerySpec ()
1094 PPCODE:
1095{
1096 int freq, channels;
1097 Uint16 format;
1098
1099 if (Mix_QuerySpec (&freq, &format, &channels))
1100 {
1101 EXTEND (SP, 3);
1102 PUSHs (sv_2mortal (newSViv (freq)));
1103 PUSHs (sv_2mortal (newSViv (format)));
1104 PUSHs (sv_2mortal (newSViv (channels)));
1105 }
1106}
820 1107
821void 1108void
822Mix_CloseAudio () 1109Mix_CloseAudio ()
823 1110
824int 1111int
859 } 1146 }
860 } 1147 }
861#endif 1148#endif
862} 1149}
863 1150
864void 1151int
865add_font (char *file) 1152add_font (char *file)
866 CODE: 1153 CODE:
867 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1154 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1155 OUTPUT:
1156 RETVAL
1157
1158void
1159IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1160
1161# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1162void
1163Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
868 1164
869void 1165void
870load_image_inline (SV *image_) 1166load_image_inline (SV *image_)
871 ALIAS: 1167 ALIAS:
872 load_image_file = 1 1168 load_image_file = 1
918 1214
919 SDL_LockSurface (surface2); 1215 SDL_LockSurface (surface2);
920 EXTEND (SP, 6); 1216 EXTEND (SP, 6);
921 PUSHs (sv_2mortal (newSViv (surface2->w))); 1217 PUSHs (sv_2mortal (newSViv (surface2->w)));
922 PUSHs (sv_2mortal (newSViv (surface2->h))); 1218 PUSHs (sv_2mortal (newSViv (surface2->h)));
923 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1219 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
924 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1220 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
925 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1221 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
926 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1222 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
927 SDL_UnlockSurface (surface2); 1223 SDL_UnlockSurface (surface2);
928 1224
958void 1254void
959error (char *message) 1255error (char *message)
960 CODE: 1256 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1257 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1258#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1259 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1260#endif
965 1261
966void 1262void
967fatal (char *message) 1263fatal (char *message)
968 CODE: 1264 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1265 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1266#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1267 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1268#endif
973 _exit (1); 1269 _exit (1);
974 1270
975void 1271void
976_exit (int retval = 0) 1272_exit (int retval = 0)
988#if DEBUG 1284#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1285 VALGRIND_DO_LEAK_CHECK;
990#endif 1286#endif
991} 1287}
992 1288
993MODULE = CFPlus PACKAGE = CFPlus::Font 1289int
1290SvREFCNT (SV *sv)
1291 CODE:
1292 RETVAL = SvREFCNT (sv);
1293 OUTPUT:
1294 RETVAL
1295
1296MODULE = Deliantra::Client PACKAGE = DC::Font
994 1297
995PROTOTYPES: DISABLE 1298PROTOTYPES: DISABLE
996 1299
997CFPlus::Font 1300DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1301new_from_file (SV *klass, char *path, int id = 0)
999 CODE: 1302 CODE:
1000{ 1303{
1001 int count; 1304 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1305 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1003 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1306 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1005} 1308}
1006 OUTPUT: 1309 OUTPUT:
1007 RETVAL 1310 RETVAL
1008 1311
1009void 1312void
1010DESTROY (CFPlus::Font self) 1313DESTROY (DC::Font self)
1011 CODE: 1314 CODE:
1012 pango_font_description_free (self); 1315 pango_font_description_free (self);
1013 1316
1014void 1317void
1015make_default (CFPlus::Font self) 1318make_default (DC::Font self)
1016 PROTOTYPE: $ 1319 PROTOTYPE: $
1017 CODE: 1320 CODE:
1018 default_font = self; 1321 default_font = self;
1019 1322
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1323MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1324
1022PROTOTYPES: DISABLE 1325PROTOTYPES: DISABLE
1023 1326
1024void 1327void
1025reset_glyph_cache () 1328glyph_cache_backup ()
1026 PROTOTYPE: 1329 PROTOTYPE:
1027 CODE: 1330 CODE:
1331 tc_backup ();
1332
1333void
1334glyph_cache_restore ()
1335 PROTOTYPE:
1336 CODE:
1028 tc_clear (); 1337 tc_restore ();
1029 1338
1030CFPlus::Layout 1339DC::Layout
1031new (SV *class) 1340new (SV *klass)
1032 CODE: 1341 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1342 New (0, RETVAL, 1, struct cf_layout);
1034 1343
1035 RETVAL->pl = pango_layout_new (opengl_context); 1344 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->r = 1.; 1345 RETVAL->r = 1.;
1045 layout_update_font (RETVAL); 1354 layout_update_font (RETVAL);
1046 OUTPUT: 1355 OUTPUT:
1047 RETVAL 1356 RETVAL
1048 1357
1049void 1358void
1050DESTROY (CFPlus::Layout self) 1359DESTROY (DC::Layout self)
1051 CODE: 1360 CODE:
1052 g_object_unref (self->pl); 1361 g_object_unref (self->pl);
1053 rc_free (self->rc); 1362 rc_free (self->rc);
1054 Safefree (self); 1363 Safefree (self);
1055 1364
1056void 1365void
1057set_text (CFPlus::Layout self, SV *text_) 1366set_text (DC::Layout self, SV *text_)
1058 CODE: 1367 CODE:
1059{ 1368{
1060 STRLEN textlen; 1369 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1370 char *text = SvPVutf8 (text_, textlen);
1062 1371
1063 pango_layout_set_text (self->pl, text, textlen); 1372 pango_layout_set_text (self->pl, text, textlen);
1064} 1373}
1065 1374
1066void 1375void
1067set_markup (CFPlus::Layout self, SV *text_) 1376set_markup (DC::Layout self, SV *text_)
1068 CODE: 1377 CODE:
1069{ 1378{
1070 STRLEN textlen; 1379 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1380 char *text = SvPVutf8 (text_, textlen);
1072 1381
1073 pango_layout_set_markup (self->pl, text, textlen); 1382 pango_layout_set_markup (self->pl, text, textlen);
1074} 1383}
1075 1384
1076void 1385void
1077set_shapes (CFPlus::Layout self, ...) 1386set_shapes (DC::Layout self, ...)
1078 CODE: 1387 CODE:
1079{ 1388{
1080 PangoAttrList *attrs = 0; 1389 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1390 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1391 const char *pos = text;
1117 if (attrs) 1426 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1427 pango_layout_set_attributes (self->pl, attrs);
1119} 1428}
1120 1429
1121void 1430void
1122get_shapes (CFPlus::Layout self) 1431get_shapes (DC::Layout self)
1123 PPCODE: 1432 PPCODE:
1124{ 1433{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1434 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1435
1127 do 1436 do
1128 { 1437 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1438 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1439
1131 if (run && shape_attr_p (run)) 1440 if (run && shape_attr_p (run))
1132 { 1441 {
1133 PangoRectangle extents; 1442 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1443 pango_layout_iter_get_run_extents (iter, 0, &extents);
1142 1451
1143 pango_layout_iter_free (iter); 1452 pango_layout_iter_free (iter);
1144} 1453}
1145 1454
1146int 1455int
1147has_wrapped (CFPlus::Layout self) 1456has_wrapped (DC::Layout self)
1148 CODE: 1457 CODE:
1149{ 1458{
1150 int lines = 1; 1459 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1460 const char *text = pango_layout_get_text (self->pl);
1152 1461
1157} 1466}
1158 OUTPUT: 1467 OUTPUT:
1159 RETVAL 1468 RETVAL
1160 1469
1161SV * 1470SV *
1162get_text (CFPlus::Layout self) 1471get_text (DC::Layout self)
1163 CODE: 1472 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1473 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1474 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1475 OUTPUT:
1167 RETVAL 1476 RETVAL
1168 1477
1169void 1478void
1170set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1479set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171 CODE: 1480 CODE:
1172 self->r = r; 1481 self->r = r;
1173 self->g = g; 1482 self->g = g;
1174 self->b = b; 1483 self->b = b;
1175 self->a = a; 1484 self->a = a;
1176 1485
1177void 1486void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1487set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1488 CODE:
1180 if (self->font != font) 1489 if (self->font != font)
1181 { 1490 {
1182 self->font = font; 1491 self->font = font;
1183 layout_update_font (self); 1492 layout_update_font (self);
1184 } 1493 }
1185 1494
1186void 1495void
1187set_height (CFPlus::Layout self, int base_height) 1496set_height (DC::Layout self, int base_height)
1188 CODE: 1497 CODE:
1189 if (self->base_height != base_height) 1498 if (self->base_height != base_height)
1190 { 1499 {
1191 self->base_height = base_height; 1500 self->base_height = base_height;
1192 layout_update_font (self); 1501 layout_update_font (self);
1193 } 1502 }
1194 1503
1195void 1504void
1196set_width (CFPlus::Layout self, int max_width = -1) 1505set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1506 CODE:
1198 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1507 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199 1508
1200void 1509void
1201set_indent (CFPlus::Layout self, int indent) 1510set_indent (DC::Layout self, int indent)
1202 CODE: 1511 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1512 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1513
1205void 1514void
1206set_spacing (CFPlus::Layout self, int spacing) 1515set_spacing (DC::Layout self, int spacing)
1207 CODE: 1516 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1517 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1518
1210void 1519void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1520set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1521 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1522 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1523 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1524 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1525 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1526 : PANGO_ELLIPSIZE_NONE
1218 ); 1527 );
1219 1528
1220void 1529void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1530set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1531 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1532 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1533
1225void 1534void
1226size (CFPlus::Layout self) 1535size (DC::Layout self)
1227 PPCODE: 1536 PPCODE:
1228{ 1537{
1229 int w, h; 1538 int w, h;
1230 1539
1231 layout_get_pixel_size (self, &w, &h); 1540 layout_get_pixel_size (self, &w, &h);
1234 PUSHs (sv_2mortal (newSViv (w))); 1543 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1544 PUSHs (sv_2mortal (newSViv (h)));
1236} 1545}
1237 1546
1238int 1547int
1239descent (CFPlus::Layout self) 1548descent (DC::Layout self)
1240 CODE: 1549 CODE:
1241{ 1550{
1242 PangoRectangle rect; 1551 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1552 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1553 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1554 RETVAL = PANGO_DESCENT (rect);
1246} 1555}
1247 OUTPUT: 1556 OUTPUT:
1248 RETVAL 1557 RETVAL
1249 1558
1250int 1559int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1560xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1561 CODE:
1253{ 1562{
1254 int index, trailing; 1563 int index, trailing;
1255 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1564 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256 RETVAL = index + trailing; 1565 RETVAL = index + trailing;
1257} 1566}
1258 OUTPUT: 1567 OUTPUT:
1259 RETVAL 1568 RETVAL
1260 1569
1261void 1570void
1262cursor_pos (CFPlus::Layout self, int index) 1571cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1572 PPCODE:
1264{ 1573{
1265 PangoRectangle strong_pos; 1574 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1575 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1576
1268 EXTEND (SP, 3); 1577 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1578 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1579 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1580 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1581}
1273 1582
1274void 1583void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1584index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1585 PPCODE:
1277{ 1586{
1278 int line, x; 1587 int line, x;
1279 1588
1280 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1589 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1590#if !PANGO_VERSION_CHECK (1, 17, 3)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1591 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1592 --line;
1593#endif
1283 EXTEND (SP, 2); 1594 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1595 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1596 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1597}
1287 1598
1288void 1599void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1600line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1601 PPCODE:
1291{ 1602{
1292 PangoLayoutLine *lp; 1603 PangoLayoutLine *lp;
1293 int index, trailing; 1604 int index, trailing;
1294 1605
1295 if (line < 0) 1606 if (line < 0)
1296 XSRETURN_EMPTY; 1607 XSRETURN_EMPTY;
1297 1608
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1609 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1610 XSRETURN_EMPTY; /* do better */
1300 1611
1301 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1612 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302 1613
1303 EXTEND (SP, 2); 1614 EXTEND (SP, 2);
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1620 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1621 }
1311} 1622}
1312 1623
1313void 1624void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1625render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1626 CODE:
1316 rc_clear (self->rc); 1627 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1628 pango_opengl_render_layout_subpixel (
1318 self->pl, 1629 self->pl,
1319 self->rc, 1630 self->rc,
1324 // we assume that context_change actually clears/frees stuff 1635 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1636 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1637 pango_layout_context_changed (self->pl);
1327 1638
1328void 1639void
1329draw (CFPlus::Layout self) 1640draw (DC::Layout self)
1330 CODE: 1641 CODE:
1331{ 1642{
1332 glEnable (GL_TEXTURE_2D); 1643 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1644 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1645 glEnable (GL_BLEND);
1342 glDisable (GL_ALPHA_TEST); 1653 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1654 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1655 glDisable (GL_TEXTURE_2D);
1345} 1656}
1346 1657
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1658MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1659
1349PROTOTYPES: ENABLE 1660PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1661
1353void 1662void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1663pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1664 CODE:
1356{ 1665{
1422 glDisable (GL_ALPHA_TEST); 1731 glDisable (GL_ALPHA_TEST);
1423 glDisable (GL_BLEND); 1732 glDisable (GL_BLEND);
1424 } 1733 }
1425} 1734}
1426 1735
1736void
1737draw_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)
1738 PROTOTYPE: @
1739 CODE:
1740{
1741 glEnable (GL_BLEND);
1742 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1743 glEnable (GL_TEXTURE_2D);
1744 glBindTexture (GL_TEXTURE_2D, name1);
1745
1746 glColor3f (intensity, intensity, intensity);
1747 glPushMatrix ();
1748 glScalef (1./3, 1./3, 1.);
1749
1750 if (blend > 0.f)
1751 {
1752 float dx3 = dx * -3.f / w;
1753 float dy3 = dy * -3.f / h;
1754 GLfloat env_color[4] = { 0., 0., 0., blend };
1755
1756 /* interpolate the two shadow textures */
1757 /* stage 0 == rgb(glcolor) + alpha(t0) */
1758 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1759
1760 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1761 gl.ActiveTexture (GL_TEXTURE1);
1762 glEnable (GL_TEXTURE_2D);
1763 glBindTexture (GL_TEXTURE_2D, name2);
1764 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1765
1766 /* rgb == rgb(glcolor) */
1767 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1768 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1769 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1770
1771 /* alpha = interpolate t0, t1 by env_alpha */
1772 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1773
1774 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1775 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1776 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1777
1778 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1779 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1780
1781 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1782 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1783
1784 glBegin (GL_QUADS);
1785 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1787 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1788 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1789 glEnd ();
1790
1791 glDisable (GL_TEXTURE_2D);
1792 gl.ActiveTexture (GL_TEXTURE0);
1793 }
1794 else
1795 {
1796 /* simple blending of one texture, also opengl <1.3 path */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1798
1799 glBegin (GL_QUADS);
1800 glTexCoord2f (0, 0); glVertex2f (0, 0);
1801 glTexCoord2f (0, t); glVertex2f (0, h);
1802 glTexCoord2f (s, t); glVertex2f (w, h);
1803 glTexCoord2f (s, 0); glVertex2f (w, 0);
1804 glEnd ();
1805 }
1806
1807 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1808 {
1809 int x, y;
1810 int dx3 = dx * 3;
1811 int dy3 = dy * 3;
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1814 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1815 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1816 glTranslatef (-1., -1., 0);
1817 glBegin (GL_QUADS);
1818
1819 for (y = 1; y < h; y += 3)
1820 {
1821 int y1 = y - dy3;
1822 int y1valid = y1 >= 0 && y1 < h;
1823
1824 for (x = 1; x < w; x += 3)
1825 {
1826 int x1 = x - dx3;
1827 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1828 uint8_t h2;
1829
1830 if (y1valid && x1 >= 0 && x1 < w)
1831 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1832 else
1833 h2 = 1; /* out of range == invisible */
1834
1835 if (h1 || h2)
1836 {
1837 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1838 glColor4f (1., 1., 1., alpha);
1839
1840 glTexCoord2f (0, 0.); glVertex2i (x , y );
1841 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1842 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1843 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1844 }
1845 }
1846 }
1847 }
1848
1849 glEnd ();
1850
1851 glPopMatrix ();
1852
1853 glDisable (GL_TEXTURE_2D);
1854 glDisable (GL_BLEND);
1855}
1856
1427IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1857IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1428 CODE: 1858 CODE:
1429{ 1859{
1430 GLint width; 1860 GLint width;
1431 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1861 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1433 RETVAL = width > 0; 1863 RETVAL = width > 0;
1434} 1864}
1435 OUTPUT: 1865 OUTPUT:
1436 RETVAL 1866 RETVAL
1437 1867
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1868MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1869
1440PROTOTYPES: DISABLE 1870PROTOTYPES: DISABLE
1441 1871
1442CFPlus::Map 1872DC::Map
1443new (SV *class) 1873new (SV *klass)
1444 CODE: 1874 CODE:
1445 New (0, RETVAL, 1, struct map); 1875 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1876 RETVAL->x = 0;
1447 RETVAL->y = 0; 1877 RETVAL->y = 0;
1448 RETVAL->w = 0; 1878 RETVAL->w = 0;
1455 RETVAL->row = 0; 1885 RETVAL->row = 0;
1456 OUTPUT: 1886 OUTPUT:
1457 RETVAL 1887 RETVAL
1458 1888
1459void 1889void
1460DESTROY (CFPlus::Map self) 1890DESTROY (DC::Map self)
1461 CODE: 1891 CODE:
1462{ 1892{
1463 map_clear (self); 1893 map_clear (self);
1464 Safefree (self->face2tile); 1894 Safefree (self->face2tile);
1465 Safefree (self->tex); 1895 Safefree (self->tex);
1466 Safefree (self); 1896 Safefree (self);
1467} 1897}
1468 1898
1469void 1899void
1470resize (CFPlus::Map self, int map_width, int map_height) 1900resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1901 CODE:
1472 self->w = map_width; 1902 self->w = map_width;
1473 self->h = map_height; 1903 self->h = map_height;
1474 1904
1475void 1905void
1476clear (CFPlus::Map self) 1906clear (DC::Map self)
1477 CODE: 1907 CODE:
1478 map_clear (self); 1908 map_clear (self);
1479 1909
1480void 1910void
1481set_tileid (CFPlus::Map self, int face, int tile) 1911set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1912 CODE:
1483{ 1913{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1914 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1915 need_texid (self, tile);
1486} 1916}
1487 1917
1488void 1918void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1919set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1920 CODE:
1491{ 1921{
1492 tileid texid; 1922 tileid texid;
1493 maptex *tex; 1923 maptex *tex;
1494 1924
1507 tex->smoothtile = self->face2tile [smooth]; 1937 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1938 tex->smoothlevel = level;
1509} 1939}
1510 1940
1511void 1941void
1512set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1942set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1513 CODE: 1943 CODE:
1514{ 1944{
1515 need_texid (self, texid); 1945 need_texid (self, texid);
1516 1946
1517 { 1947 {
1536 // use uglier nearest interpolation because linear suffers 1966 // use uglier nearest interpolation because linear suffers
1537 // from transparent color bleeding and ugly wrapping effects. 1967 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1968 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1969}
1540 1970
1971void
1972expire_textures (DC::Map self, int texid, int count)
1973 PPCODE:
1974 for (; texid < self->texs && count; ++texid, --count)
1975 {
1976 maptex *tex = self->tex + texid;
1977
1978 if (tex->name)
1979 {
1980 if (tex->unused)
1981 {
1982 tex->name = 0;
1983 tex->unused = 0;
1984 XPUSHs (sv_2mortal (newSViv (texid)));
1985 }
1986 else
1987 tex->unused = 1;
1988 }
1989 }
1990
1541int 1991int
1542ox (CFPlus::Map self) 1992ox (DC::Map self)
1543 ALIAS: 1993 ALIAS:
1544 oy = 1 1994 oy = 1
1545 x = 2 1995 x = 2
1546 y = 3 1996 y = 3
1547 w = 4 1997 w = 4
1558 } 2008 }
1559 OUTPUT: 2009 OUTPUT:
1560 RETVAL 2010 RETVAL
1561 2011
1562void 2012void
1563scroll (CFPlus::Map self, int dx, int dy) 2013scroll (DC::Map self, int dx, int dy)
1564 CODE: 2014 CODE:
1565{ 2015{
1566 if (dx > 0) 2016 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 2017 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 2018 else if (dx < 0)
1584 self->y += MAP_EXTEND_Y; 2034 self->y += MAP_EXTEND_Y;
1585 } 2035 }
1586} 2036}
1587 2037
1588SV * 2038SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 2039map1a_update (DC::Map self, SV *data_)
1590 CODE: 2040 CODE:
1591{ 2041{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2042 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 2043 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 2044 mapcell *cell;
1615 2065
1616 //TODO: don't trust server data to be in-range(!) 2066 //TODO: don't trust server data to be in-range(!)
1617 2067
1618 if (flags & 8) 2068 if (flags & 8)
1619 { 2069 {
2070 uint8_t ext, cmd;
2071
1620 if (extmap) 2072 do
1621 { 2073 {
1622 uint8_t ext, cmd; 2074 ext = *data++;
2075 cmd = ext & 0x7f;
1623 2076
1624 do 2077 if (cmd < 4)
2078 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2079 else if (cmd == 5) // health
1625 { 2080 {
1626 ext = *data++;
1627 cmd = ext & 0x3f;
1628
1629 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1;
1631 else if (cmd == 5) // health
1632 {
1633 cell->stat_width = 1; 2081 cell->stat_width = 1;
1634 cell->stat_hp = *data++; 2082 cell->stat_hp = *data++;
1635 }
1636 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47)
1639 {
1640 if (*data == 4)
1641 ; // decode player count
1642
1643 data += *data + 1;
1644 }
1645 else if (cmd == 8) // cell flags
1646 cell->flags = *data++;
1647 else if (ext & 0x40) // unknown, multibyte => skip
1648 data += *data + 1;
1649 else
1650 data++;
1651 } 2083 }
1652 while (ext & 0x80); 2084 else if (cmd == 6) // monster width
2085 cell->stat_width = *data++ + 1;
2086 else if (cmd == 0x47)
2087 {
2088 if (*data == 1) cell->player = data [1];
2089 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2090 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2091 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2092
2093 data += *data + 1;
2094 }
2095 else if (cmd == 8) // cell flags
2096 cell->flags = *data++;
2097 else if (ext & 0x40) // unknown, multibyte => skip
2098 data += *data + 1;
2099 else
2100 data++;
1653 } 2101 }
1654 else 2102 while (ext & 0x80);
1655 cell->darkness = *data++ + 1;
1656 } 2103 }
1657 2104
1658 for (z = 0; z <= 2; ++z) 2105 for (z = 0; z <= 2; ++z)
1659 if (flags & (4 >> z)) 2106 if (flags & (4 >> z))
1660 { 2107 {
1663 cell->tile [z] = self->face2tile [face]; 2110 cell->tile [z] = self->face2tile [face];
1664 2111
1665 if (cell->tile [z]) 2112 if (cell->tile [z])
1666 { 2113 {
1667 maptex *tex = self->tex + cell->tile [z]; 2114 maptex *tex = self->tex + cell->tile [z];
2115 tex->unused = 0;
1668 if (!tex->name) 2116 if (!tex->name)
1669 av_push (missing, newSViv (cell->tile [z])); 2117 av_push (missing, newSViv (cell->tile [z]));
1670 2118
1671 if (tex->smoothtile) 2119 if (tex->smoothtile)
1672 { 2120 {
1673 maptex *smooth = self->tex + tex->smoothtile; 2121 maptex *smooth = self->tex + tex->smoothtile;
2122 smooth->unused = 0;
1674 if (!smooth->name) 2123 if (!smooth->name)
1675 av_push (missing, newSViv (tex->smoothtile)); 2124 av_push (missing, newSViv (tex->smoothtile));
1676 } 2125 }
1677 } 2126 }
1678 } 2127 }
1679 } 2128 }
1680 else 2129 else
1681 cell->darkness = 0; 2130 CELL_CLEAR (cell);
1682 } 2131 }
1683} 2132}
1684 OUTPUT: 2133 OUTPUT:
1685 RETVAL 2134 RETVAL
1686 2135
1687SV * 2136SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2137mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 2138 CODE:
1690{ 2139{
1691 int x1, x; 2140 int x1, x;
1692 int y1, y; 2141 int y1, y;
1693 int z; 2142 int z;
1706 ? self->row + y 2155 ? self->row + y
1707 : 0; 2156 : 0;
1708 2157
1709 for (x = x0; x < x1; x++) 2158 for (x = x0; x < x1; x++)
1710 { 2159 {
1711 int r = 32, g = 32, b = 32, a = 192; 2160 unsigned int r = 32, g = 32, b = 32, a = 192;
1712 2161
1713 if (row && row->c0 <= x && x < row->c1) 2162 if (row && row->c0 <= x && x < row->c1)
1714 { 2163 {
1715 mapcell *cell = row->col + (x - row->c0); 2164 mapcell *cell = row->col + (x - row->c0);
1716 2165
1718 { 2167 {
1719 maptex tex = self->tex [cell->tile [z]]; 2168 maptex tex = self->tex [cell->tile [z]];
1720 int a0 = 255 - tex.a; 2169 int a0 = 255 - tex.a;
1721 int a1 = tex.a; 2170 int a1 = tex.a;
1722 2171
1723 r = (r * a0 + tex.r * a1) / 255; 2172 r = div255 (r * a0 + tex.r * a1);
1724 g = (g * a0 + tex.g * a1) / 255; 2173 g = div255 (g * a0 + tex.g * a1);
1725 b = (b * a0 + tex.b * a1) / 255; 2174 b = div255 (b * a0 + tex.b * a1);
1726 a = (a * a0 + tex.a * a1) / 255; 2175 a = div255 (a * a0 + tex.a * a1);
1727 } 2176 }
1728 } 2177 }
1729 2178
1730 *map++ = (r ) 2179 *map++ = (r )
1731 | (g << 8) 2180 | (g << 8)
1738} 2187}
1739 OUTPUT: 2188 OUTPUT:
1740 RETVAL 2189 RETVAL
1741 2190
1742void 2191void
1743draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2192draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1744 CODE: 2193 CODE:
1745{ 2194{
1746 int x, y, z; 2195 int x, y, z;
1747 2196
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2197 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2198 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1750 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2199 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751 smooth_key skey; 2200 smooth_key skey;
1752 2201 int pl_x, pl_y;
2202 maptex pl_tex;
1753 rc_t *rc = rc_alloc (); 2203 rc_t *rc = rc_alloc ();
2204 rc_t *rc_ov = rc_alloc ();
1754 rc_key_t key; 2205 rc_key_t key;
1755 rc_array_t *arr; 2206 rc_array_t *arr;
1756 2207
2208 pl_tex.name = 0;
2209
1757 // thats current max. sorry. 2210 // that's current max. sorry.
1758 if (sw > 255) sw = 255; 2211 if (sw > 255) sw = 255;
1759 if (sh > 255) sh = 255; 2212 if (sh > 255) sh = 255;
1760 2213
1761 // clear key, in case of extra padding 2214 // clear key, in case of extra padding
1762 memset (&skey, 0, sizeof (skey)); 2215 memset (&skey, 0, sizeof (skey));
1766 key.g = 255; 2219 key.g = 255;
1767 key.b = 255; 2220 key.b = 255;
1768 key.a = 255; 2221 key.a = 255;
1769 key.mode = GL_QUADS; 2222 key.mode = GL_QUADS;
1770 key.format = GL_T2F_V3F; 2223 key.format = GL_T2F_V3F;
1771 key.texname = -1;
1772 2224
1773 mx += self->x; 2225 mx += self->x;
1774 my += self->y; 2226 my += self->y;
1775 2227
1776 // first pass: determine smooth_max 2228 // first pass: determine smooth_max
1800 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2252 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1801 2253
1802 for (z = 0; z <= 2; z++) 2254 for (z = 0; z <= 2; z++)
1803 { 2255 {
1804 memset (smooth_level, 0, sizeof (smooth_level)); 2256 memset (smooth_level, 0, sizeof (smooth_level));
2257 key.texname = -1;
1805 2258
1806 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1807 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1808 { 2261 {
1809 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
1819 maptex tex = self->tex [tile]; 2272 maptex tex = self->tex [tile];
1820 int px, py; 2273 int px, py;
1821 2274
1822 if (key.texname != tex.name) 2275 if (key.texname != tex.name)
1823 { 2276 {
2277 self->tex [tile].unused = 0;
2278
1824 if (!tex.name) 2279 if (!tex.name)
1825 tex = self->tex [2]; /* missing, replace by noface */ 2280 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1826 2281
1827 key.texname = tex.name; 2282 key.texname = tex.name;
1828 arr = rc_array (rc, &key); 2283 arr = rc_array (rc, &key);
1829 } 2284 }
1830 2285
1831 px = (x + 1) * T - tex.w; 2286 px = (x + 1) * Th - tex.w;
1832 py = (y + 1) * T - tex.h; 2287 py = (y + 1) * Tw - tex.h;
2288
2289 if (expect_false (cell->player == player) && expect_false (z == 2))
2290 {
2291 pl_x = px;
2292 pl_y = py;
2293 pl_tex = tex;
2294 continue;
2295 }
1833 2296
1834 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1835 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2298 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1836 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2299 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1837 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2300 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1838
1839 if (cell->flags && z == 2)
1840 {
1841 // overlays such as the speech bubble, probably more to come
1842 if (cell->flags & 1)
1843 {
1844 maptex tex = self->tex [1];
1845 int px = x * T + T * 2 / 32;
1846 int py = y * T - T * 6 / 32;
1847
1848 if (tex.name)
1849 {
1850 if (key.texname != tex.name)
1851 {
1852 key.texname = tex.name;
1853 arr = rc_array (rc, &key);
1854 }
1855
1856 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1857 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1858 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1859 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1860 }
1861 }
1862 }
1863 2301
1864 // update smooth hash 2302 // update smooth hash
1865 if (tex.smoothtile) 2303 if (tex.smoothtile)
1866 { 2304 {
1867 skey.tile = tex.smoothtile; 2305 skey.tile = tex.smoothtile;
1896 // corners 2334 // corners
1897 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2335 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1898 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2336 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1899 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2337 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1900 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2338 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2339 }
2340 }
2341
2342 if (expect_false (z == 2) && expect_false (cell->flags))
2343 {
2344 // overlays such as the speech bubble, probably more to come
2345 if (cell->flags & 1)
2346 {
2347 rc_key_t key_ov = key;
2348 maptex tex = self->tex [TEXID_SPEECH];
2349 rc_array_t *arr;
2350 int px = x * Tw + Tw * 2 / 32;
2351 int py = y * Th - Th * 6 / 32;
2352
2353 key_ov.texname = tex.name;
2354 arr = rc_array (rc_ov, &key_ov);
2355
2356 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2357 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2358 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2359 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1901 } 2360 }
1902 } 2361 }
1903 } 2362 }
1904 } 2363 }
1905 2364
1932 if (!(bits & 0x1000) 2391 if (!(bits & 0x1000)
1933 && skey->level == level 2392 && skey->level == level
1934 && level > smooth_max [skey->x][skey->y]) 2393 && level > smooth_max [skey->x][skey->y])
1935 { 2394 {
1936 maptex tex = self->tex [skey->tile]; 2395 maptex tex = self->tex [skey->tile];
1937 int px = (((int)skey->x) - 1) * T; 2396 int px = (((int)skey->x) - 1) * Tw;
1938 int py = (((int)skey->y) - 1) * T; 2397 int py = (((int)skey->y) - 1) * Th;
1939 int border = bits & 15; 2398 int border = bits & 15;
1940 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2399 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1941 float dx = tex.s * .0625f; // 16 images/row 2400 float dx = tex.s * .0625f; // 16 images/row
1942 float dy = tex.t * .5f ; // 2 images/column 2401 float dy = tex.t * .5f ; // 2 images/column
1943 2402
1945 { 2404 {
1946 // this time avoiding texture state changes 2405 // this time avoiding texture state changes
1947 // save gobs of state changes. 2406 // save gobs of state changes.
1948 if (key.texname != tex.name) 2407 if (key.texname != tex.name)
1949 { 2408 {
2409 self->tex [skey->tile].unused = 0;
2410
1950 glEnd (); 2411 glEnd ();
1951 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2412 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1952 glBegin (GL_QUADS); 2413 glBegin (GL_QUADS);
1953 } 2414 }
1954 2415
1955 if (border) 2416 if (border)
1956 { 2417 {
1957 float ox = border * dx; 2418 float ox = border * dx;
1958 2419
1959 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2420 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1960 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2421 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1961 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2422 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1962 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2423 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1963 } 2424 }
1964 2425
1965 if (corner) 2426 if (corner)
1966 { 2427 {
1967 float ox = corner * dx; 2428 float ox = corner * dx;
1968 2429
1969 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1970 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1971 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1972 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1973 } 2434 }
1974 } 2435 }
1975 } 2436 }
1976 } 2437 }
1977 } 2438 }
1983 } 2444 }
1984 2445
1985 hv_clear (smooth); 2446 hv_clear (smooth);
1986 } 2447 }
1987 2448
2449 if (pl_tex.name)
2450 {
2451 maptex tex = pl_tex;
2452 int px = pl_x + sdx;
2453 int py = pl_y + sdy;
2454
2455 key.texname = tex.name;
2456 arr = rc_array (rc, &key);
2457
2458 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2459 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2460 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2461 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2462
2463 rc_draw (rc);
2464 }
2465
2466 rc_draw (rc_ov);
2467 rc_clear (rc_ov);
2468
1988 glDisable (GL_BLEND); 2469 glDisable (GL_BLEND);
1989 rc_free (rc); 2470 rc_free (rc);
2471 rc_free (rc_ov);
1990 2472
1991 // top layer: overlays such as the health bar 2473 // top layer: overlays such as the health bar
1992 for (y = 0; y < sh; y++) 2474 for (y = 0; y < sh; y++)
1993 if (0 <= y + my && y + my < self->rows) 2475 if (0 <= y + my && y + my < self->rows)
1994 { 2476 {
1997 for (x = 0; x < sw; x++) 2479 for (x = 0; x < sw; x++)
1998 if (row->c0 <= x + mx && x + mx < row->c1) 2480 if (row->c0 <= x + mx && x + mx < row->c1)
1999 { 2481 {
2000 mapcell *cell = row->col + (x + mx - row->c0); 2482 mapcell *cell = row->col + (x + mx - row->c0);
2001 2483
2002 int px = x * T; 2484 int px = x * Tw;
2003 int py = y * T; 2485 int py = y * Th;
2486
2487 if (expect_false (cell->player == player))
2488 {
2489 px += sdx;
2490 py += sdy;
2491 }
2004 2492
2005 if (cell->stat_hp) 2493 if (cell->stat_hp)
2006 { 2494 {
2007 int width = cell->stat_width * T; 2495 int width = cell->stat_width * Tw;
2008 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2496 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2009 2497
2010 glColor3ub (0, 0, 0); 2498 glColor3ub (0, 0, 0);
2011 glRectf (px + 1, py - thick - 2, 2499 glRectf (px + 1, py - thick - 2,
2012 px + width - 1, py); 2500 px + width - 1, py);
2013 2501
2019 } 2507 }
2020 } 2508 }
2021} 2509}
2022 2510
2023void 2511void
2024draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2512draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2025 CODE: 2513 CODE:
2026{ 2514{
2027 static float color[16][3] = { 2515 static float color[16][3] = {
2028 { 0.00F, 0.00F, 0.00F }, 2516 { 0.00f, 0.00f, 0.00f },
2029 { 1.00F, 1.00F, 1.00F }, 2517 { 1.00f, 1.00f, 1.00f },
2030 { 0.00F, 0.00F, 0.55F }, 2518 { 0.00f, 0.00f, 0.55f },
2031 { 1.00F, 0.00F, 0.00F }, 2519 { 1.00f, 0.00f, 0.00f },
2032 2520
2033 { 1.00F, 0.54F, 0.00F }, 2521 { 1.00f, 0.54f, 0.00f },
2034 { 0.11F, 0.56F, 1.00F }, 2522 { 0.11f, 0.56f, 1.00f },
2035 { 0.93F, 0.46F, 0.00F }, 2523 { 0.93f, 0.46f, 0.00f },
2036 { 0.18F, 0.54F, 0.34F }, 2524 { 0.18f, 0.54f, 0.34f },
2037 2525
2038 { 0.56F, 0.73F, 0.56F }, 2526 { 0.56f, 0.73f, 0.56f },
2039 { 0.80F, 0.80F, 0.80F }, 2527 { 0.80f, 0.80f, 0.80f },
2040 { 0.55F, 0.41F, 0.13F }, 2528 { 0.55f, 0.41f, 0.13f },
2041 { 0.99F, 0.77F, 0.26F }, 2529 { 0.99f, 0.77f, 0.26f },
2042 2530
2043 { 0.74F, 0.65F, 0.41F }, 2531 { 0.74f, 0.65f, 0.41f },
2044 2532
2045 { 0.00F, 1.00F, 1.00F }, 2533 { 0.00f, 1.00f, 1.00f },
2046 { 1.00F, 0.00F, 1.00F }, 2534 { 1.00f, 0.00f, 1.00f },
2047 { 1.00F, 1.00F, 0.00F }, 2535 { 1.00f, 1.00f, 0.00f },
2048 }; 2536 };
2049 2537
2050 int x, y; 2538 int x, y;
2051 2539
2052 glEnable (GL_TEXTURE_2D); 2540 glEnable (GL_TEXTURE_2D);
2541 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2542 * but the nvidia driver (185.18.14) mishandles alpha textures
2543 * and takes the colour from god knows where instead of using
2544 * Cp. MODULATE results in the same colour, but slightly different
2545 * alpha, but atcually gives us the correct colour with nvidia.
2546 */
2053 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2547 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2054 glEnable (GL_BLEND); 2548 glEnable (GL_BLEND);
2055 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2549 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2056 glBegin (GL_QUADS); 2550 glBegin (GL_QUADS);
2057 2551
2058 for (y = 0; y < h; y++) 2552 for (y = 0; y < h; y++)
2062 2556
2063 if (m) 2557 if (m)
2064 { 2558 {
2065 float *c = color [m & 15]; 2559 float *c = color [m & 15];
2066 2560
2067 float tx1 = m & 0x40 ? 0.5 : 0.; 2561 float tx1 = m & 0x40 ? 0.5f : 0.f;
2068 float tx2 = tx1 + 0.5; 2562 float tx2 = tx1 + 0.5f;
2069 2563
2070 glColor4f (c[0], c[1], c[2], 0.75); 2564 glColor4f (c[0], c[1], c[2], 1);
2071 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2565 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2072 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2566 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2073 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2567 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2074 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2568 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2075 } 2569 }
2079 glDisable (GL_BLEND); 2573 glDisable (GL_BLEND);
2080 glDisable (GL_TEXTURE_2D); 2574 glDisable (GL_TEXTURE_2D);
2081} 2575}
2082 2576
2083void 2577void
2084fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2578fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2085 PPCODE: 2579 PPCODE:
2086{ 2580{
2087 int x, y; 2581 int x, y;
2088 int sw1 = sw + 2; 2582 int sw1 = sw + 2;
2089 int sh1 = sh + 2; 2583 int sh1 = sh + 2;
2090 int sh3 = sh * 3; 2584 int sh3 = sh * 3;
2091 int sw34 = (sw * 3 + 3) & ~3; 2585 int sw3 = sw * 3;
2586 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2587 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2092 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2588 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2093 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2589 memset (darkness1, 0, sw1*sh1);
2094 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2095 2590
2096 SvPOK_only (darkness3_sv); 2591 SvPOK_only (darkness3_sv);
2097 SvCUR_set (darkness3_sv, sw34 * sh3); 2592 SvCUR_set (darkness3_sv, sw3 * sh3);
2098 2593
2099 mx += self->x - 1; 2594 mx += self->x - 1;
2100 my += self->y - 1; 2595 my += self->y - 1;
2101
2102 memset (darkness1, 255, sw1 * sh1);
2103 2596
2104 for (y = 0; y < sh1; y++) 2597 for (y = 0; y < sh1; y++)
2105 if (0 <= y + my && y + my < self->rows) 2598 if (0 <= y + my && y + my < self->rows)
2106 { 2599 {
2107 maprow *row = self->row + (y + my); 2600 maprow *row = self->row + (y + my);
2110 if (row->c0 <= x + mx && x + mx < row->c1) 2603 if (row->c0 <= x + mx && x + mx < row->c1)
2111 { 2604 {
2112 mapcell *cell = row->col + (x + mx - row->c0); 2605 mapcell *cell = row->col + (x + mx - row->c0);
2113 2606
2114 darkness1 [y * sw1 + x] = cell->darkness 2607 darkness1 [y * sw1 + x] = cell->darkness
2115 ? 255 - (cell->darkness - 1) 2608 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2116 : 255 - FOW_DARKNESS; 2609 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2117 } 2610 }
2118 } 2611 }
2119 2612
2120 for (y = 0; y < sh; ++y) 2613 for (y = 0; y < sh; ++y)
2121 for (x = 0; x < sw; ++x) 2614 for (x = 0; x < sw; ++x)
2140 2633
2141 uint8_t r13 = (d13 + d23 + d12) / 3; 2634 uint8_t r13 = (d13 + d23 + d12) / 3;
2142 uint8_t r23 = d23; 2635 uint8_t r23 = d23;
2143 uint8_t r33 = (d23 + d33 + d32) / 3; 2636 uint8_t r33 = (d23 + d33 + d32) / 3;
2144 2637
2145 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2146 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2147 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2148 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2149 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2150 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2151 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2152 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2153 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2154 } 2647 }
2155 2648
2156 free (darkness1); 2649 free (darkness1);
2157 2650
2158 EXTEND (SP, 3); 2651 EXTEND (SP, 3);
2159 PUSHs (sv_2mortal (newSViv (sw34))); 2652 PUSHs (sv_2mortal (newSViv (sw3)));
2160 PUSHs (sv_2mortal (newSViv (sh3))); 2653 PUSHs (sv_2mortal (newSViv (sh3)));
2161 PUSHs (darkness3_sv); 2654 PUSHs (darkness3_sv);
2162} 2655}
2163 2656
2164SV * 2657SV *
2165get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2658get_rect (DC::Map self, int x0, int y0, int w, int h)
2166 CODE: 2659 CODE:
2167{ 2660{
2168 int x, y, x1, y1; 2661 int x, y, x1, y1;
2169 SV *data_sv = newSV (w * h * 7 + 5); 2662 SV *data_sv = newSV (w * h * 7 + 5);
2170 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2663 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2227 else 2720 else
2228 *data++ = 0; 2721 *data++ = 0;
2229 } 2722 }
2230 } 2723 }
2231 2724
2725 /* if size is w*h + 5 then no data has been found */
2726 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2727 {
2232 SvPOK_only (data_sv); 2728 SvPOK_only (data_sv);
2233 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2729 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2730 }
2731
2234 RETVAL = data_sv; 2732 RETVAL = data_sv;
2235} 2733}
2236 OUTPUT: 2734 OUTPUT:
2237 RETVAL 2735 RETVAL
2238 2736
2239void 2737void
2240set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2738set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2241 PPCODE: 2739 PPCODE:
2242{ 2740{
2243 int x, y, z; 2741 int x, y, z;
2244 int w, h; 2742 int w, h;
2245 int x1, y1; 2743 int x1, y1;
2744 STRLEN len;
2745 uint8_t *data, *end;
2746
2747 len = SvLEN (data_sv);
2748 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2749 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2750 end = data + len + 8;
2751
2752 if (len < 5)
2753 XSRETURN_EMPTY;
2246 2754
2247 if (*data++ != 0) 2755 if (*data++ != 0)
2248 XSRETURN_EMPTY; /* version mismatch */ 2756 XSRETURN_EMPTY; /* version mismatch */
2249 2757
2250 w = *data++ << 8; w |= *data++; 2758 w = *data++ << 8; w |= *data++;
2265 { 2773 {
2266 maprow *row = map_get_row (self, y); 2774 maprow *row = map_get_row (self, y);
2267 2775
2268 for (x = x0; x < x1; x++) 2776 for (x = x0; x < x1; x++)
2269 { 2777 {
2778 uint8_t flags;
2779
2780 if (data + 7 >= end)
2781 XSRETURN_EMPTY;
2782
2270 uint8_t flags = *data++; 2783 flags = *data++;
2271 2784
2272 if (flags) 2785 if (flags)
2273 { 2786 {
2274 mapcell *cell = row_get_cell (row, x); 2787 mapcell *cell = row_get_cell (row, x);
2275 tileid tile[3] = { 0, 0, 0 }; 2788 tileid tile[3] = { 0, 0, 0 };
2278 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2791 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2279 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2792 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2280 2793
2281 if (cell->darkness == 0) 2794 if (cell->darkness == 0)
2282 { 2795 {
2283 cell->darkness = 0; 2796 /*cell->darkness = 0;*/
2797 EXTEND (SP, 3);
2284 2798
2285 for (z = 0; z <= 2; z++) 2799 for (z = 0; z <= 2; z++)
2286 { 2800 {
2287 tileid t = tile [z]; 2801 tileid t = tile [z];
2288 2802
2289 if (t >= self->texs || (t && !self->tex [t].name)) 2803 if (t >= self->texs || (t && !self->tex [t].name))
2290 { 2804 {
2291 XPUSHs (sv_2mortal (newSViv (t))); 2805 PUSHs (sv_2mortal (newSViv (t)));
2292 need_texid (self, t); 2806 need_texid (self, t);
2293 } 2807 }
2294 2808
2295 cell->tile [z] = t; 2809 cell->tile [z] = t;
2296 } 2810 }
2298 } 2812 }
2299 } 2813 }
2300 } 2814 }
2301} 2815}
2302 2816
2303MODULE = CFPlus PACKAGE = CFPlus::RW 2817MODULE = Deliantra::Client PACKAGE = DC::RW
2304 2818
2305CFPlus::RW 2819DC::RW
2306new (SV *class, SV *data_sv) 2820new (SV *klass, SV *data_sv)
2307 CODE: 2821 CODE:
2308{ 2822{
2309 STRLEN datalen; 2823 STRLEN datalen;
2310 char *data = SvPVbyte (data_sv, datalen); 2824 char *data = SvPVbyte (data_sv, datalen);
2311 2825
2312 RETVAL = SDL_RWFromConstMem (data, datalen); 2826 RETVAL = SDL_RWFromConstMem (data, datalen);
2313} 2827}
2314 OUTPUT: 2828 OUTPUT:
2315 RETVAL 2829 RETVAL
2316 2830
2317CFPlus::RW 2831DC::RW
2318new_from_file (SV *class, const char *path, const char *mode = "rb") 2832new_from_file (SV *klass, const char *path, const char *mode = "rb")
2319 CODE: 2833 CODE:
2320 RETVAL = SDL_RWFromFile (path, mode); 2834 RETVAL = SDL_RWFromFile (path, mode);
2321 OUTPUT: 2835 OUTPUT:
2322 RETVAL 2836 RETVAL
2323 2837
2324# fails on win32: 2838# fails on win32:
2325# CFPlus.xs(2268) : error C2059: syntax error : '(' 2839# dc.xs(2268) : error C2059: syntax error : '('
2326#void 2840#void
2327#close (CFPlus::RW self) 2841#close (DC::RW self)
2328# CODE: 2842# CODE:
2329# (self->(close)) (self); 2843# (self->(close)) (self);
2330 2844
2331MODULE = CFPlus PACKAGE = CFPlus::Channel 2845MODULE = Deliantra::Client PACKAGE = DC::Channel
2332 2846
2333PROTOTYPES: DISABLE 2847PROTOTYPES: DISABLE
2334 2848
2335CFPlus::Channel 2849DC::Channel
2336find () 2850find ()
2337 CODE: 2851 CODE:
2338{ 2852{
2339 RETVAL = Mix_GroupAvailable (-1); 2853 RETVAL = Mix_GroupAvailable (-1);
2340 2854
2341 if (RETVAL < 0) 2855 if (RETVAL < 0)
2342 { 2856 {
2343 RETVAL = Mix_GroupOldest (-1); 2857 RETVAL = Mix_GroupOldest (-1);
2344 2858
2345 if (RETVAL < 0) 2859 if (RETVAL < 0)
2860 {
2861 // happens sometimes, maybe it just stopped playing(?)
2862 RETVAL = Mix_GroupAvailable (-1);
2863
2864 if (RETVAL < 0)
2346 XSRETURN_UNDEF; 2865 XSRETURN_UNDEF;
2347 2866 }
2867 else
2348 Mix_HaltChannel (RETVAL); 2868 Mix_HaltChannel (RETVAL);
2349 } 2869 }
2350 2870
2351 Mix_UnregisterAllEffects (RETVAL); 2871 Mix_UnregisterAllEffects (RETVAL);
2352 Mix_Volume (RETVAL, 128); 2872 Mix_Volume (RETVAL, 128);
2353} 2873}
2354 OUTPUT: 2874 OUTPUT:
2355 RETVAL 2875 RETVAL
2356 2876
2357void 2877void
2358halt (CFPlus::Channel self) 2878halt (DC::Channel self)
2359 CODE: 2879 CODE:
2360 Mix_HaltChannel (self); 2880 Mix_HaltChannel (self);
2361 2881
2362void 2882void
2363expire (CFPlus::Channel self, int ticks = -1) 2883expire (DC::Channel self, int ticks = -1)
2364 CODE: 2884 CODE:
2365 Mix_ExpireChannel (self, ticks); 2885 Mix_ExpireChannel (self, ticks);
2366 2886
2367void 2887void
2368fade_out (CFPlus::Channel self, int ticks = -1) 2888fade_out (DC::Channel self, int ticks = -1)
2369 CODE: 2889 CODE:
2370 Mix_FadeOutChannel (self, ticks); 2890 Mix_FadeOutChannel (self, ticks);
2371 2891
2372int 2892int
2373volume (CFPlus::Channel self, int volume) 2893volume (DC::Channel self, int volume)
2374 CODE: 2894 CODE:
2375 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2895 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376 OUTPUT: 2896 OUTPUT:
2377 RETVAL 2897 RETVAL
2378 2898
2379void 2899void
2380unregister_all_effects (CFPlus::Channel self) 2900unregister_all_effects (DC::Channel self)
2381 CODE: 2901 CODE:
2382 Mix_UnregisterAllEffects (self); 2902 Mix_UnregisterAllEffects (self);
2383 2903
2384void 2904void
2385set_panning (CFPlus::Channel self, int left, int right) 2905set_panning (DC::Channel self, int left, int right)
2386 CODE: 2906 CODE:
2387 left = CLAMP (left , 0, 255); 2907 left = CLAMP (left , 0, 255);
2388 right = CLAMP (right, 0, 255); 2908 right = CLAMP (right, 0, 255);
2389 Mix_SetPanning (self, left, right); 2909 Mix_SetPanning (self, left, right);
2390 2910
2391void 2911void
2392set_distance (CFPlus::Channel self, int distance) 2912set_distance (DC::Channel self, int distance)
2393 CODE: 2913 CODE:
2394 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2914 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395 2915
2396void 2916void
2397set_position (CFPlus::Channel self, int angle, int distance) 2917set_position (DC::Channel self, int angle, int distance)
2398 CODE: 2918 CODE:
2399 2919
2400void 2920void
2401set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2921set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2402 CODE: 2922 CODE:
2403{ 2923{
2404 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2924 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2405 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2925 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2406 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2926 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407} 2927}
2408 2928
2409void 2929void
2410set_reverse_stereo (CFPlus::Channel self, int flip) 2930set_reverse_stereo (DC::Channel self, int flip)
2411 CODE: 2931 CODE:
2412 Mix_SetReverseStereo (self, flip); 2932 Mix_SetReverseStereo (self, flip);
2413 2933
2414MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2934MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415 2935
2416PROTOTYPES: DISABLE 2936PROTOTYPES: DISABLE
2417 2937
2938void
2939decoders ()
2940 PPCODE:
2941#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2942 int i, num = Mix_GetNumChunkDecoders ();
2943 EXTEND (SP, num);
2944 for (i = 0; i < num; ++i)
2945 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2946#else
2947 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2948#endif
2949
2418CFPlus::MixChunk 2950DC::MixChunk
2419new (SV *class, CFPlus::RW rwops) 2951new (SV *klass, DC::RW rwops)
2420 CODE: 2952 CODE:
2421 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2953 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422 OUTPUT: 2954 OUTPUT:
2423 RETVAL 2955 RETVAL
2424 2956
2425void 2957void
2426DESTROY (CFPlus::MixChunk self) 2958DESTROY (DC::MixChunk self)
2427 CODE: 2959 CODE:
2428 Mix_FreeChunk (self); 2960 Mix_FreeChunk (self);
2429 2961
2430int 2962int
2431volume (CFPlus::MixChunk self, int volume = -1) 2963volume (DC::MixChunk self, int volume = -1)
2432 CODE: 2964 CODE:
2433 if (items > 1) 2965 if (items > 1)
2434 volume = CLAMP (volume, 0, 128); 2966 volume = CLAMP (volume, 0, 128);
2435 RETVAL = Mix_VolumeChunk (self, volume); 2967 RETVAL = Mix_VolumeChunk (self, volume);
2436 OUTPUT: 2968 OUTPUT:
2437 RETVAL 2969 RETVAL
2438 2970
2439CFPlus::Channel 2971DC::Channel
2440play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2972play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2441 CODE: 2973 CODE:
2442{ 2974{
2443 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2975 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444 2976
2445 if (RETVAL < 0) 2977 if (RETVAL < 0)
2452 } 2984 }
2453} 2985}
2454 OUTPUT: 2986 OUTPUT:
2455 RETVAL 2987 RETVAL
2456 2988
2457MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2989MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2990
2991void
2992decoders ()
2993 PPCODE:
2994#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2995 int i, num = Mix_GetNumMusicDecoders ();
2996 EXTEND (SP, num);
2997 for (i = 0; i < num; ++i)
2998 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2999#else
3000 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3001#endif
2458 3002
2459int 3003int
2460volume (int volume = -1) 3004volume (int volume = -1)
2461 PROTOTYPE: ;$ 3005 PROTOTYPE: ;$
2462 CODE: 3006 CODE:
2474void 3018void
2475halt () 3019halt ()
2476 CODE: 3020 CODE:
2477 Mix_HaltMusic (); 3021 Mix_HaltMusic ();
2478 3022
3023int
3024playing ()
3025 CODE:
3026 RETVAL = Mix_PlayingMusic ();
3027 OUTPUT:
3028 RETVAL
3029
2479CFPlus::MixMusic 3030DC::MixMusic
2480new (SV *class, CFPlus::RW rwops) 3031new (SV *klass, DC::RW rwops)
2481 CODE: 3032 CODE:
2482 RETVAL = Mix_LoadMUS_RW (rwops); 3033 RETVAL = Mix_LoadMUS_RW (rwops);
2483 OUTPUT: 3034 OUTPUT:
2484 RETVAL 3035 RETVAL
2485 3036
2486void 3037void
2487DESTROY (CFPlus::MixMusic self) 3038DESTROY (DC::MixMusic self)
2488 CODE: 3039 CODE:
2489 Mix_FreeMusic (self); 3040 Mix_FreeMusic (self);
2490 3041
2491int 3042int
2492play (CFPlus::MixMusic self, int loops = -1) 3043play (DC::MixMusic self, int loops = -1)
2493 CODE: 3044 CODE:
2494 RETVAL = Mix_PlayMusic (self, loops); 3045 RETVAL = Mix_PlayMusic (self, loops);
2495 OUTPUT: 3046 OUTPUT:
2496 RETVAL 3047 RETVAL
2497 3048
2498void 3049void
2499fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3050fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2500 CODE: 3051 CODE:
2501 Mix_FadeInMusicPos (self, loops, ms, position); 3052 Mix_FadeInMusicPos (self, loops, ms, position);
2502 3053
2503MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3054MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504 3055
2505PROTOTYPES: ENABLE 3056PROTOTYPES: ENABLE
2506 3057
2507BOOT: 3058BOOT:
2508{ 3059{
2509 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3060 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510 static const struct { 3061 static const struct {
2511 const char *name; 3062 const char *name;
2512 IV iv; 3063 IV iv;
2513 } *civ, const_iv[] = { 3064 } *civ, const_iv[] = {
2514# define const_iv(name) { # name, (IV)name } 3065# define const_iv(name) { # name, (IV)name }
2515 const_iv (GL_VENDOR), 3066 const_iv (GL_VENDOR),
2516 const_iv (GL_VERSION), 3067 const_iv (GL_VERSION),
2517 const_iv (GL_EXTENSIONS), 3068 const_iv (GL_EXTENSIONS),
3069 const_iv (GL_MAX_TEXTURE_UNITS),
2518 const_iv (GL_COLOR_MATERIAL), 3070 const_iv (GL_COLOR_MATERIAL),
2519 const_iv (GL_SMOOTH), 3071 const_iv (GL_SMOOTH),
2520 const_iv (GL_FLAT), 3072 const_iv (GL_FLAT),
2521 const_iv (GL_DITHER), 3073 const_iv (GL_DITHER),
2522 const_iv (GL_BLEND), 3074 const_iv (GL_BLEND),
2534 const_iv (GL_ZERO), 3086 const_iv (GL_ZERO),
2535 const_iv (GL_SRC_ALPHA), 3087 const_iv (GL_SRC_ALPHA),
2536 const_iv (GL_DST_ALPHA), 3088 const_iv (GL_DST_ALPHA),
2537 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3089 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2538 const_iv (GL_ONE_MINUS_DST_ALPHA), 3090 const_iv (GL_ONE_MINUS_DST_ALPHA),
3091 const_iv (GL_SRC_COLOR),
3092 const_iv (GL_DST_COLOR),
3093 const_iv (GL_ONE_MINUS_SRC_COLOR),
3094 const_iv (GL_ONE_MINUS_DST_COLOR),
2539 const_iv (GL_SRC_ALPHA_SATURATE), 3095 const_iv (GL_SRC_ALPHA_SATURATE),
2540 const_iv (GL_RGB), 3096 const_iv (GL_RGB),
2541 const_iv (GL_RGBA), 3097 const_iv (GL_RGBA),
2542 const_iv (GL_RGBA4), 3098 const_iv (GL_RGBA4),
2543 const_iv (GL_RGBA8), 3099 const_iv (GL_RGBA8),
2611 const_iv (GL_NICEST), 3167 const_iv (GL_NICEST),
2612 const_iv (GL_V2F), 3168 const_iv (GL_V2F),
2613 const_iv (GL_V3F), 3169 const_iv (GL_V3F),
2614 const_iv (GL_T2F_V3F), 3170 const_iv (GL_T2F_V3F),
2615 const_iv (GL_T2F_N3F_V3F), 3171 const_iv (GL_T2F_N3F_V3F),
3172 const_iv (GL_FUNC_ADD),
3173 const_iv (GL_FUNC_SUBTRACT),
3174 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2616# undef const_iv 3175# undef const_iv
2617 }; 3176 };
2618 3177
2619 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3178 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2620 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3179 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2621 3180
2622 texture_av = newAV (); 3181 texture_av = newAV ();
2623 AvREAL_off (texture_av); 3182 AvREAL_off (texture_av);
2624} 3183}
2625 3184
2627disable_GL_EXT_blend_func_separate () 3186disable_GL_EXT_blend_func_separate ()
2628 CODE: 3187 CODE:
2629 gl.BlendFuncSeparate = 0; 3188 gl.BlendFuncSeparate = 0;
2630 gl.BlendFuncSeparateEXT = 0; 3189 gl.BlendFuncSeparateEXT = 0;
2631 3190
2632char * 3191void
3192apple_nvidia_bug (int enable)
3193
3194const char *
2633gl_vendor () 3195gl_vendor ()
2634 CODE: 3196 CODE:
2635 RETVAL = (char *)glGetString (GL_VENDOR); 3197 RETVAL = (const char *)glGetString (GL_VENDOR);
2636 OUTPUT: 3198 OUTPUT:
2637 RETVAL 3199 RETVAL
2638 3200
2639char * 3201const char *
2640gl_version () 3202gl_version ()
2641 CODE: 3203 CODE:
2642 RETVAL = (char *)glGetString (GL_VERSION); 3204 RETVAL = (const char *)glGetString (GL_VERSION);
2643 OUTPUT: 3205 OUTPUT:
2644 RETVAL 3206 RETVAL
2645 3207
2646char * 3208const char *
2647gl_extensions () 3209gl_extensions ()
2648 CODE: 3210 CODE:
2649 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3211 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2650 OUTPUT: 3212 OUTPUT:
2651 RETVAL 3213 RETVAL
2652 3214
2653const char *glGetString (GLenum pname) 3215const char *glGetString (GLenum pname)
3216 CODE:
3217 RETVAL = (const char *)glGetString (pname);
3218 OUTPUT:
3219 RETVAL
2654 3220
2655GLint glGetInteger (GLenum pname) 3221GLint glGetInteger (GLenum pname)
2656 CODE: 3222 CODE:
2657 glGetIntegerv (pname, &RETVAL); 3223 glGetIntegerv (pname, &RETVAL);
2658 OUTPUT: 3224 OUTPUT:
2666 3232
2667int glGetError () 3233int glGetError ()
2668 3234
2669void glFinish () 3235void glFinish ()
2670 3236
3237void glFlush ()
3238
2671void glClear (int mask) 3239void glClear (int mask)
2672 3240
2673void glClearColor (float r, float g, float b, float a = 1.0) 3241void glClearColor (float r, float g, float b, float a = 1.0)
2674 PROTOTYPE: @ 3242 PROTOTYPE: @
2675 3243
2684void glBlendFunc (int sfactor, int dfactor) 3252void glBlendFunc (int sfactor, int dfactor)
2685 3253
2686void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3254void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2687 CODE: 3255 CODE:
2688 gl_BlendFuncSeparate (sa, da, saa, daa); 3256 gl_BlendFuncSeparate (sa, da, saa, daa);
3257
3258# void glBlendEquation (int se)
2689 3259
2690void glDepthMask (int flag) 3260void glDepthMask (int flag)
2691 3261
2692void glLogicOp (int opcode) 3262void glLogicOp (int opcode)
2693 3263
2728void glRotate (float angle, float x, float y, float z) 3298void glRotate (float angle, float x, float y, float z)
2729 CODE: 3299 CODE:
2730 glRotatef (angle, x, y, z); 3300 glRotatef (angle, x, y, z);
2731 3301
2732void glColor (float r, float g, float b, float a = 1.0) 3302void glColor (float r, float g, float b, float a = 1.0)
3303 PROTOTYPE: @
2733 ALIAS: 3304 ALIAS:
2734 glColor_premultiply = 1 3305 glColor_premultiply = 1
2735 CODE: 3306 CODE:
2736 if (ix) 3307 if (ix)
2737 { 3308 {
2757 3328
2758void glRect (float x1, float y1, float x2, float y2) 3329void glRect (float x1, float y1, float x2, float y2)
2759 CODE: 3330 CODE:
2760 glRectf (x1, y1, x2, y2); 3331 glRectf (x1, y1, x2, y2);
2761 3332
3333void glRect_lineloop (float x1, float y1, float x2, float y2)
3334 CODE:
3335 glBegin (GL_LINE_LOOP);
3336 glVertex2f (x1, y1);
3337 glVertex2f (x2, y1);
3338 glVertex2f (x2, y2);
3339 glVertex2f (x1, y2);
3340 glEnd ();
3341
2762PROTOTYPES: ENABLE 3342PROTOTYPES: ENABLE
2763 3343
2764void glBegin (int mode) 3344void glBegin (int mode)
2765 3345
2766void glEnd () 3346void glEnd ()
2798void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3378void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2799 CODE: 3379 CODE:
2800 if (gl.SeparableFilter2D) 3380 if (gl.SeparableFilter2D)
2801 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3381 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2802 3382
2803void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3383void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2804 3384
2805void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3385void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2806 3386
2807void glDrawPixels (int width, int height, int format, int type, char *pixels) 3387void glDrawPixels (int width, int height, int format, int type, char *pixels)
2808 3388
2834 3414
2835void glEndList () 3415void glEndList ()
2836 3416
2837void glCallList (int list) 3417void glCallList (int list)
2838 3418
2839MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3419void c_init ()
3420 CODE:
3421 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3422 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3423
3424MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2840 3425
2841PROTOTYPES: DISABLE 3426PROTOTYPES: DISABLE
2842 3427
2843void 3428void
2844find_widget (SV *self, NV x, NV y) 3429find_widget (SV *self, NV x, NV y)
2848 XPUSHs (self); 3433 XPUSHs (self);
2849} 3434}
2850 3435
2851BOOT: 3436BOOT:
2852{ 3437{
2853 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3438 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2854 3439
2855 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3440 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2856 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3441 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2857 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3442 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2858 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3443 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2859} 3444}
2860 3445
2861void 3446void
2862draw (SV *self) 3447draw (SV *self)
2863 CODE: 3448 CODE:
2870 SV *draw_w_sv = GvSV (draw_w_gv); 3455 SV *draw_w_sv = GvSV (draw_w_gv);
2871 SV *draw_h_sv = GvSV (draw_h_gv); 3456 SV *draw_h_sv = GvSV (draw_h_gv);
2872 double draw_x, draw_y; 3457 double draw_x, draw_y;
2873 3458
2874 if (!SvROK (self)) 3459 if (!SvROK (self))
2875 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3460 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2876 3461
2877 hv = (HV *)SvRV (self); 3462 hv = (HV *)SvRV (self);
2878 3463
2879 if (SvTYPE (hv) != SVt_PVHV) 3464 if (SvTYPE (hv) != SVt_PVHV)
2880 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3465 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2881 3466
2882 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3467 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2883 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3468 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2884 3469
2885 if (!h || !w) 3470 if (!h || !w)
2918 glEnd (); 3503 glEnd ();
2919 glDisable (GL_BLEND); 3504 glDisable (GL_BLEND);
2920 } 3505 }
2921 } 3506 }
2922#if 0 3507#if 0
2923 if ($ENV{CFPLUS_DEBUG} & 1) { 3508 // draw borders, for debugging
2924 glPushMatrix; 3509 glPushMatrix ();
2925 glColor 1, 1, 0, 1; 3510 glColor4f (1., 1., 0., 1.);
2926 glTranslate 0.375, 0.375; 3511 glTranslatef (.5, .5, 0.);
2927 glBegin GL_LINE_LOOP; 3512 glBegin (GL_LINE_LOOP);
2928 glVertex 0 , 0; 3513 glVertex2f (0 , 0);
2929 glVertex $self->{w} - 1, 0; 3514 glVertex2f (w - 1, 0);
2930 glVertex $self->{w} - 1, $self->{h} - 1; 3515 glVertex2f (w - 1, h - 1);
2931 glVertex 0 , $self->{h} - 1; 3516 glVertex2f (0 , h - 1);
2932 glEnd; 3517 glEnd ();
2933 glPopMatrix; 3518 glPopMatrix ();
2934 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2935 }
2936#endif 3519#endif
2937 PUSHMARK (SP); 3520 PUSHMARK (SP);
2938 XPUSHs (self); 3521 XPUSHs (self);
2939 PUTBACK; 3522 PUTBACK;
2940 call_method ("_draw", G_VOID | G_DISCARD); 3523 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines