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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines