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.239 by root, Tue Dec 25 18:58:32 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),
… …
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),
624 797
798 const_iv (KMOD_LRAM),
799
625 const_iv (MIX_DEFAULT_FORMAT), 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)
626# undef const_iv 830# undef const_iv
627 }; 831 };
628 832
629 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--)
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 834 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
631 835
632 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 836 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
633 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 837 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
634} 838}
635 839
… …
651NV ceil (NV x) 855NV ceil (NV x)
652 856
653IV minpot (UV n) 857IV minpot (UV n)
654 858
655IV 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
656 866
657void 867void
658pango_init () 868pango_init ()
659 CODE: 869 CODE:
660{ 870{
661 opengl_fontmap = pango_opengl_font_map_new (); 871 opengl_fontmap = pango_opengl_font_map_new ();
662 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);
663 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
664} 879}
665 880
666char *
667SDL_GetError () 881char *SDL_GetError ()
668 882
669int 883void SDL_main_hack (SV *real_main)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 884 PROTOTYPE: &
671 885
672void 886int SDL_Init (U32 flags)
887
888int SDL_InitSubSystem (U32 flags)
889
890void SDL_QuitSubSystem (U32 flags)
891
673SDL_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
674 903
675void 904void
676SDL_ListModes (int rgb, int alpha) 905SDL_ListModes (int rgb, int alpha)
677 PPCODE: 906 PPCODE:
678{ 907{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 919 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 920 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 921 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 922
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 923 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 924 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 925
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 926 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 927
702 if (m && m != (SDL_Rect **)-1) 928 if (m && m != (SDL_Rect **)-1)
703 while (*m) 929 while (*m)
704 { 930 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 931 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 932 {
707 AV *av = newAV (); 933 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 934 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 935 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 936 av_push (av, newSViv (rgb));
… …
733 ); 959 );
734 960
735 if (RETVAL) 961 if (RETVAL)
736 { 962 {
737 av_clear (texture_av); 963 av_clear (texture_av);
738
739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#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);
741#include "glfunc.h" 965#include "glfunc.h"
742#undef GL_FUNC 966#undef GL_FUNC
967 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
968 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 969 }
744} 970}
745 OUTPUT: 971 OUTPUT:
746 RETVAL 972 RETVAL
973
974void
975SDL_WM_SetCaption (const char *title, const char *icon)
747 976
748void 977void
749SDL_GL_SwapBuffers () 978SDL_GL_SwapBuffers ()
750 979
751char * 980char *
752SDL_GetKeyName (int sym) 981SDL_GetKeyName (int sym)
982 C_ARGS: (SDLKey)sym
753 983
754int 984int
755SDL_GetAppState () 985SDL_GetAppState ()
756 986
987int
988SDL_GetModState ()
989
990int
991SDL_WaitEvent ()
992 C_ARGS: 0
993
757void 994void
995SDL_PumpEvents ()
996
997void
758poll_events () 998peep_events ()
759 PPCODE: 999 PPCODE:
760{ 1000{
761 SDL_Event ev; 1001 SDL_Event ev;
762 1002
763 SDL_PumpEvents (); 1003 SDL_PumpEvents ();
… …
770 { 1010 {
771 case SDL_KEYDOWN: 1011 case SDL_KEYDOWN:
772 case SDL_KEYUP: 1012 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1013 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1014 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 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);
776 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 */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1017 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 1018 break;
779 1019
780 case SDL_ACTIVEEVENT: 1020 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1021 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 1039 x = ev.motion.x;
800 y = ev.motion.y; 1040 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1041 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1042 }
803 1043
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1044 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1045 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1046 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1047 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1048 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1049 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1050 }
811 break; 1051 break;
812 1052
813 case SDL_MOUSEBUTTONDOWN: 1053 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1054 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1055 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1056
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1057 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1058 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1059 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1060 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1065 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1066 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 1067 break;
828 } 1068 }
829 1069
830 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))));
831 } 1071 }
832} 1072}
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
833 1086
834int 1087int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1088Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
836 POSTCALL: 1089 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1090 Mix_HookMusicFinished (music_finished);
838 Mix_ChannelFinished (channel_finished); 1091 Mix_ChannelFinished (channel_finished);
839 1092
840void 1093void
841Mix_QuerySpec () 1094Mix_QuerySpec ()
… …
894 } 1147 }
895 } 1148 }
896#endif 1149#endif
897} 1150}
898 1151
899void 1152int
900add_font (char *file) 1153add_font (char *file)
901 CODE: 1154 CODE:
902 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)
903 1165
904void 1166void
905load_image_inline (SV *image_) 1167load_image_inline (SV *image_)
906 ALIAS: 1168 ALIAS:
907 load_image_file = 1 1169 load_image_file = 1
… …
953 1215
954 SDL_LockSurface (surface2); 1216 SDL_LockSurface (surface2);
955 EXTEND (SP, 6); 1217 EXTEND (SP, 6);
956 PUSHs (sv_2mortal (newSViv (surface2->w))); 1218 PUSHs (sv_2mortal (newSViv (surface2->w)));
957 PUSHs (sv_2mortal (newSViv (surface2->h))); 1219 PUSHs (sv_2mortal (newSViv (surface2->h)));
958 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1220 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
959 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)));
960 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1222 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
961 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1223 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
962 SDL_UnlockSurface (surface2); 1224 SDL_UnlockSurface (surface2);
963 1225
… …
993void 1255void
994error (char *message) 1256error (char *message)
995 CODE: 1257 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1258 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1259#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1260 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1261#endif
1000 1262
1001void 1263void
1002fatal (char *message) 1264fatal (char *message)
1003 CODE: 1265 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1266 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1267#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1268 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1269#endif
1008 _exit (1); 1270 _exit (1);
1009 1271
1010void 1272void
1011_exit (int retval = 0) 1273_exit (int retval = 0)
… …
1023#if DEBUG 1285#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1286 VALGRIND_DO_LEAK_CHECK;
1025#endif 1287#endif
1026} 1288}
1027 1289
1028MODULE = 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
1029 1298
1030PROTOTYPES: DISABLE 1299PROTOTYPES: DISABLE
1031 1300
1032CFPlus::Font 1301DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1302new_from_file (SV *klass, char *path, int id = 0)
1034 CODE: 1303 CODE:
1035{ 1304{
1036 int count; 1305 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1306 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1038 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1307 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
1040} 1309}
1041 OUTPUT: 1310 OUTPUT:
1042 RETVAL 1311 RETVAL
1043 1312
1044void 1313void
1045DESTROY (CFPlus::Font self) 1314DESTROY (DC::Font self)
1046 CODE: 1315 CODE:
1047 pango_font_description_free (self); 1316 pango_font_description_free (self);
1048 1317
1049void 1318void
1050make_default (CFPlus::Font self) 1319make_default (DC::Font self)
1051 PROTOTYPE: $ 1320 PROTOTYPE: $
1052 CODE: 1321 CODE:
1053 default_font = self; 1322 default_font = self;
1054 1323
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1324MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1325
1057PROTOTYPES: DISABLE 1326PROTOTYPES: DISABLE
1058 1327
1059void 1328void
1060glyph_cache_backup () 1329glyph_cache_backup ()
… …
1066glyph_cache_restore () 1335glyph_cache_restore ()
1067 PROTOTYPE: 1336 PROTOTYPE:
1068 CODE: 1337 CODE:
1069 tc_restore (); 1338 tc_restore ();
1070 1339
1071CFPlus::Layout 1340DC::Layout
1072new (SV *class) 1341new (SV *klass)
1073 CODE: 1342 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1343 New (0, RETVAL, 1, struct cf_layout);
1075 1344
1076 RETVAL->pl = pango_layout_new (opengl_context); 1345 RETVAL->pl = pango_layout_new (opengl_context);
1077 RETVAL->r = 1.; 1346 RETVAL->r = 1.;
… …
1086 layout_update_font (RETVAL); 1355 layout_update_font (RETVAL);
1087 OUTPUT: 1356 OUTPUT:
1088 RETVAL 1357 RETVAL
1089 1358
1090void 1359void
1091DESTROY (CFPlus::Layout self) 1360DESTROY (DC::Layout self)
1092 CODE: 1361 CODE:
1093 g_object_unref (self->pl); 1362 g_object_unref (self->pl);
1094 rc_free (self->rc); 1363 rc_free (self->rc);
1095 Safefree (self); 1364 Safefree (self);
1096 1365
1097void 1366void
1098set_text (CFPlus::Layout self, SV *text_) 1367set_text (DC::Layout self, SV *text_)
1099 CODE: 1368 CODE:
1100{ 1369{
1101 STRLEN textlen; 1370 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1371 char *text = SvPVutf8 (text_, textlen);
1103 1372
1104 pango_layout_set_text (self->pl, text, textlen); 1373 pango_layout_set_text (self->pl, text, textlen);
1105} 1374}
1106 1375
1107void 1376void
1108set_markup (CFPlus::Layout self, SV *text_) 1377set_markup (DC::Layout self, SV *text_)
1109 CODE: 1378 CODE:
1110{ 1379{
1111 STRLEN textlen; 1380 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1381 char *text = SvPVutf8 (text_, textlen);
1113 1382
1114 pango_layout_set_markup (self->pl, text, textlen); 1383 pango_layout_set_markup (self->pl, text, textlen);
1115} 1384}
1116 1385
1117void 1386void
1118set_shapes (CFPlus::Layout self, ...) 1387set_shapes (DC::Layout self, ...)
1119 CODE: 1388 CODE:
1120{ 1389{
1121 PangoAttrList *attrs = 0; 1390 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1391 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1392 const char *pos = text;
… …
1158 if (attrs) 1427 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1428 pango_layout_set_attributes (self->pl, attrs);
1160} 1429}
1161 1430
1162void 1431void
1163get_shapes (CFPlus::Layout self) 1432get_shapes (DC::Layout self)
1164 PPCODE: 1433 PPCODE:
1165{ 1434{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1435 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1436
1168 do 1437 do
1169 { 1438 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1439 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1440
1172 if (run && shape_attr_p (run)) 1441 if (run && shape_attr_p (run))
1173 { 1442 {
1174 PangoRectangle extents; 1443 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1444 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1183 1452
1184 pango_layout_iter_free (iter); 1453 pango_layout_iter_free (iter);
1185} 1454}
1186 1455
1187int 1456int
1188has_wrapped (CFPlus::Layout self) 1457has_wrapped (DC::Layout self)
1189 CODE: 1458 CODE:
1190{ 1459{
1191 int lines = 1; 1460 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1461 const char *text = pango_layout_get_text (self->pl);
1193 1462
… …
1198} 1467}
1199 OUTPUT: 1468 OUTPUT:
1200 RETVAL 1469 RETVAL
1201 1470
1202SV * 1471SV *
1203get_text (CFPlus::Layout self) 1472get_text (DC::Layout self)
1204 CODE: 1473 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1474 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1475 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1476 OUTPUT:
1208 RETVAL 1477 RETVAL
1209 1478
1210void 1479void
1211set_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.)
1212 CODE: 1481 CODE:
1213 self->r = r; 1482 self->r = r;
1214 self->g = g; 1483 self->g = g;
1215 self->b = b; 1484 self->b = b;
1216 self->a = a; 1485 self->a = a;
1217 1486
1218void 1487void
1219set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1488set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1489 CODE:
1221 if (self->font != font) 1490 if (self->font != font)
1222 { 1491 {
1223 self->font = font; 1492 self->font = font;
1224 layout_update_font (self); 1493 layout_update_font (self);
1225 } 1494 }
1226 1495
1227void 1496void
1228set_height (CFPlus::Layout self, int base_height) 1497set_height (DC::Layout self, int base_height)
1229 CODE: 1498 CODE:
1230 if (self->base_height != base_height) 1499 if (self->base_height != base_height)
1231 { 1500 {
1232 self->base_height = base_height; 1501 self->base_height = base_height;
1233 layout_update_font (self); 1502 layout_update_font (self);
1234 } 1503 }
1235 1504
1236void 1505void
1237set_width (CFPlus::Layout self, int max_width = -1) 1506set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1507 CODE:
1239 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);
1240 1509
1241void 1510void
1242set_indent (CFPlus::Layout self, int indent) 1511set_indent (DC::Layout self, int indent)
1243 CODE: 1512 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1513 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1514
1246void 1515void
1247set_spacing (CFPlus::Layout self, int spacing) 1516set_spacing (DC::Layout self, int spacing)
1248 CODE: 1517 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1518 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1519
1251void 1520void
1252set_ellipsise (CFPlus::Layout self, int ellipsise) 1521set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1522 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1523 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1524 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1525 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1526 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1527 : PANGO_ELLIPSIZE_NONE
1259 ); 1528 );
1260 1529
1261void 1530void
1262set_single_paragraph_mode (CFPlus::Layout self, int spm) 1531set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1532 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1533 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1534
1266void 1535void
1267size (CFPlus::Layout self) 1536size (DC::Layout self)
1268 PPCODE: 1537 PPCODE:
1269{ 1538{
1270 int w, h; 1539 int w, h;
1271 1540
1272 layout_get_pixel_size (self, &w, &h); 1541 layout_get_pixel_size (self, &w, &h);
… …
1275 PUSHs (sv_2mortal (newSViv (w))); 1544 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1545 PUSHs (sv_2mortal (newSViv (h)));
1277} 1546}
1278 1547
1279int 1548int
1280descent (CFPlus::Layout self) 1549descent (DC::Layout self)
1281 CODE: 1550 CODE:
1282{ 1551{
1283 PangoRectangle rect; 1552 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1553 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1554 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1555 RETVAL = PANGO_DESCENT (rect);
1287} 1556}
1288 OUTPUT: 1557 OUTPUT:
1289 RETVAL 1558 RETVAL
1290 1559
1291int 1560int
1292xy_to_index (CFPlus::Layout self, int x, int y) 1561xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1562 CODE:
1294{ 1563{
1295 int index, trailing; 1564 int index, trailing;
1296 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);
1297 RETVAL = index + trailing; 1566 RETVAL = index + trailing;
1298} 1567}
1299 OUTPUT: 1568 OUTPUT:
1300 RETVAL 1569 RETVAL
1301 1570
1302void 1571void
1303cursor_pos (CFPlus::Layout self, int index) 1572cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1573 PPCODE:
1305{ 1574{
1306 PangoRectangle strong_pos; 1575 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1576 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1577
1309 EXTEND (SP, 3); 1578 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1579 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1580 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1581 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1582}
1314 1583
1315void 1584void
1316index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1585index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1586 PPCODE:
1318{ 1587{
1319 int line, x; 1588 int line, x;
1320 1589
1321 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)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1592 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1593 --line;
1594#endif
1324 EXTEND (SP, 2); 1595 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1596 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1597 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1598}
1328 1599
1329void 1600void
1330line_x_to_index (CFPlus::Layout self, int line, int x) 1601line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1602 PPCODE:
1332{ 1603{
1333 PangoLayoutLine *lp; 1604 PangoLayoutLine *lp;
1334 int index, trailing; 1605 int index, trailing;
1335 1606
1336 if (line < 0) 1607 if (line < 0)
1337 XSRETURN_EMPTY; 1608 XSRETURN_EMPTY;
1338 1609
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1610 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1611 XSRETURN_EMPTY; /* do better */
1341 1612
1342 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);
1343 1614
1344 EXTEND (SP, 2); 1615 EXTEND (SP, 2);
… …
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1621 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1622 }
1352} 1623}
1353 1624
1354void 1625void
1355render (CFPlus::Layout self, float x, float y, int flags = 0) 1626render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1627 CODE:
1357 rc_clear (self->rc); 1628 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1629 pango_opengl_render_layout_subpixel (
1359 self->pl, 1630 self->pl,
1360 self->rc, 1631 self->rc,
… …
1365 // we assume that context_change actually clears/frees stuff 1636 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1637 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1638 pango_layout_context_changed (self->pl);
1368 1639
1369void 1640void
1370draw (CFPlus::Layout self) 1641draw (DC::Layout self)
1371 CODE: 1642 CODE:
1372{ 1643{
1373 glEnable (GL_TEXTURE_2D); 1644 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1645 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1646 glEnable (GL_BLEND);
… …
1383 glDisable (GL_ALPHA_TEST); 1654 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1655 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1656 glDisable (GL_TEXTURE_2D);
1386} 1657}
1387 1658
1388MODULE = CFPlus PACKAGE = CFPlus::Texture 1659MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1660
1390PROTOTYPES: ENABLE 1661PROTOTYPES: ENABLE
1391 1662
1392void 1663void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1664pad (SV *data_, int ow, int oh, int nw, int nh)
… …
1461 glDisable (GL_ALPHA_TEST); 1732 glDisable (GL_ALPHA_TEST);
1462 glDisable (GL_BLEND); 1733 glDisable (GL_BLEND);
1463 } 1734 }
1464} 1735}
1465 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
1466IV 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)
1467 CODE: 1859 CODE:
1468{ 1860{
1469 GLint width; 1861 GLint width;
1470 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);
… …
1472 RETVAL = width > 0; 1864 RETVAL = width > 0;
1473} 1865}
1474 OUTPUT: 1866 OUTPUT:
1475 RETVAL 1867 RETVAL
1476 1868
1477MODULE = CFPlus PACKAGE = CFPlus::Map 1869MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1870
1479PROTOTYPES: DISABLE 1871PROTOTYPES: DISABLE
1480 1872
1481CFPlus::Map 1873DC::Map
1482new (SV *class) 1874new (SV *klass)
1483 CODE: 1875 CODE:
1484 New (0, RETVAL, 1, struct map); 1876 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1877 RETVAL->x = 0;
1486 RETVAL->y = 0; 1878 RETVAL->y = 0;
1487 RETVAL->w = 0; 1879 RETVAL->w = 0;
… …
1494 RETVAL->row = 0; 1886 RETVAL->row = 0;
1495 OUTPUT: 1887 OUTPUT:
1496 RETVAL 1888 RETVAL
1497 1889
1498void 1890void
1499DESTROY (CFPlus::Map self) 1891DESTROY (DC::Map self)
1500 CODE: 1892 CODE:
1501{ 1893{
1502 map_clear (self); 1894 map_clear (self);
1503 Safefree (self->face2tile); 1895 Safefree (self->face2tile);
1504 Safefree (self->tex); 1896 Safefree (self->tex);
1505 Safefree (self); 1897 Safefree (self);
1506} 1898}
1507 1899
1508void 1900void
1509resize (CFPlus::Map self, int map_width, int map_height) 1901resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1902 CODE:
1511 self->w = map_width; 1903 self->w = map_width;
1512 self->h = map_height; 1904 self->h = map_height;
1513 1905
1514void 1906void
1515clear (CFPlus::Map self) 1907clear (DC::Map self)
1516 CODE: 1908 CODE:
1517 map_clear (self); 1909 map_clear (self);
1518 1910
1519void 1911void
1520set_tileid (CFPlus::Map self, int face, int tile) 1912set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1913 CODE:
1522{ 1914{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1915 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1916 need_texid (self, tile);
1525} 1917}
1526 1918
1527void 1919void
1528set_smooth (CFPlus::Map self, int face, int smooth, int level) 1920set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1921 CODE:
1530{ 1922{
1531 tileid texid; 1923 tileid texid;
1532 maptex *tex; 1924 maptex *tex;
1533 1925
1534 if (face < 0 || face >= self->faces) 1926 if (face < 0 || face >= self->faces)
1535 return; 1927 return;
1536 1928
1537 if (smooth < 0 || smooth >= self->faces) 1929 if (smooth < 0 || smooth >= self->faces)
1538 return; 1930 return;
1539 1931
1540 texid = self->face2tile [face]; 1932 texid = self->face2tile [face];
1541 1933
1542 if (!texid) 1934 if (!texid)
1543 return; 1935 return;
1544 1936
1545 tex = self->tex + texid; 1937 tex = self->tex + texid;
1546 tex->smoothtile = self->face2tile [smooth]; 1938 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1939 tex->smoothlevel = level;
1548} 1940}
1549 1941
1550void 1942void
1551set_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)
1552 CODE: 1944 CODE:
1553{ 1945{
1554 need_texid (self, texid); 1946 need_texid (self, texid);
1555 1947
1556 { 1948 {
… …
1575 // use uglier nearest interpolation because linear suffers 1967 // use uglier nearest interpolation because linear suffers
1576 // from transparent color bleeding and ugly wrapping effects. 1968 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1969 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1970}
1579 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
1580int 1992int
1581ox (CFPlus::Map self) 1993ox (DC::Map self)
1582 ALIAS: 1994 ALIAS:
1583 oy = 1 1995 oy = 1
1584 x = 2 1996 x = 2
1585 y = 3 1997 y = 3
1586 w = 4 1998 w = 4
… …
1597 } 2009 }
1598 OUTPUT: 2010 OUTPUT:
1599 RETVAL 2011 RETVAL
1600 2012
1601void 2013void
1602scroll (CFPlus::Map self, int dx, int dy) 2014scroll (DC::Map self, int dx, int dy)
1603 CODE: 2015 CODE:
1604{ 2016{
1605 if (dx > 0) 2017 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 2018 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 2019 else if (dx < 0)
… …
1623 self->y += MAP_EXTEND_Y; 2035 self->y += MAP_EXTEND_Y;
1624 } 2036 }
1625} 2037}
1626 2038
1627SV * 2039SV *
1628map1a_update (CFPlus::Map self, SV *data_, int extmap) 2040map1a_update (DC::Map self, SV *data_)
1629 CODE: 2041 CODE:
1630{ 2042{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2043 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 2044 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 2045 mapcell *cell;
… …
1654 2066
1655 //TODO: don't trust server data to be in-range(!) 2067 //TODO: don't trust server data to be in-range(!)
1656 2068
1657 if (flags & 8) 2069 if (flags & 8)
1658 { 2070 {
2071 uint8_t ext, cmd;
2072
1659 if (extmap) 2073 do
1660 { 2074 {
1661 uint8_t ext, cmd; 2075 ext = *data++;
2076 cmd = ext & 0x7f;
1662 2077
1663 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
1664 { 2081 {
1665 ext = *data++;
1666 cmd = ext & 0x3f;
1667
1668 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health
1671 {
1672 cell->stat_width = 1; 2082 cell->stat_width = 1;
1673 cell->stat_hp = *data++; 2083 cell->stat_hp = *data++;
1674 }
1675 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47)
1678 {
1679 if (*data == 4)
1680 ; // decode player count
1681
1682 data += *data + 1;
1683 }
1684 else if (cmd == 8) // cell flags
1685 cell->flags = *data++;
1686 else if (ext & 0x40) // unknown, multibyte => skip
1687 data += *data + 1;
1688 else
1689 data++;
1690 } 2084 }
1691 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++;
1692 } 2102 }
1693 else 2103 while (ext & 0x80);
1694 cell->darkness = *data++ + 1;
1695 } 2104 }
1696 2105
1697 for (z = 0; z <= 2; ++z) 2106 for (z = 0; z <= 2; ++z)
1698 if (flags & (4 >> z)) 2107 if (flags & (4 >> z))
1699 { 2108 {
… …
1702 cell->tile [z] = self->face2tile [face]; 2111 cell->tile [z] = self->face2tile [face];
1703 2112
1704 if (cell->tile [z]) 2113 if (cell->tile [z])
1705 { 2114 {
1706 maptex *tex = self->tex + cell->tile [z]; 2115 maptex *tex = self->tex + cell->tile [z];
2116 tex->unused = 0;
1707 if (!tex->name) 2117 if (!tex->name)
1708 av_push (missing, newSViv (cell->tile [z])); 2118 av_push (missing, newSViv (cell->tile [z]));
1709 2119
1710 if (tex->smoothtile) 2120 if (tex->smoothtile)
1711 { 2121 {
1712 maptex *smooth = self->tex + tex->smoothtile; 2122 maptex *smooth = self->tex + tex->smoothtile;
2123 smooth->unused = 0;
1713 if (!smooth->name) 2124 if (!smooth->name)
1714 av_push (missing, newSViv (tex->smoothtile)); 2125 av_push (missing, newSViv (tex->smoothtile));
1715 } 2126 }
1716 } 2127 }
1717 } 2128 }
1718 } 2129 }
1719 else 2130 else
1720 cell->darkness = 0; 2131 CELL_CLEAR (cell);
1721 } 2132 }
1722} 2133}
1723 OUTPUT: 2134 OUTPUT:
1724 RETVAL 2135 RETVAL
1725 2136
1726SV * 2137SV *
1727mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2138mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 2139 CODE:
1729{ 2140{
1730 int x1, x; 2141 int x1, x;
1731 int y1, y; 2142 int y1, y;
1732 int z; 2143 int z;
… …
1745 ? self->row + y 2156 ? self->row + y
1746 : 0; 2157 : 0;
1747 2158
1748 for (x = x0; x < x1; x++) 2159 for (x = x0; x < x1; x++)
1749 { 2160 {
1750 int r = 32, g = 32, b = 32, a = 192; 2161 unsigned int r = 32, g = 32, b = 32, a = 192;
1751 2162
1752 if (row && row->c0 <= x && x < row->c1) 2163 if (row && row->c0 <= x && x < row->c1)
1753 { 2164 {
1754 mapcell *cell = row->col + (x - row->c0); 2165 mapcell *cell = row->col + (x - row->c0);
1755 2166
… …
1757 { 2168 {
1758 maptex tex = self->tex [cell->tile [z]]; 2169 maptex tex = self->tex [cell->tile [z]];
1759 int a0 = 255 - tex.a; 2170 int a0 = 255 - tex.a;
1760 int a1 = tex.a; 2171 int a1 = tex.a;
1761 2172
1762 r = (r * a0 + tex.r * a1) / 255; 2173 r = div255 (r * a0 + tex.r * a1);
1763 g = (g * a0 + tex.g * a1) / 255; 2174 g = div255 (g * a0 + tex.g * a1);
1764 b = (b * a0 + tex.b * a1) / 255; 2175 b = div255 (b * a0 + tex.b * a1);
1765 a = (a * a0 + tex.a * a1) / 255; 2176 a = div255 (a * a0 + tex.a * a1);
1766 } 2177 }
1767 } 2178 }
1768 2179
1769 *map++ = (r ) 2180 *map++ = (r )
1770 | (g << 8) 2181 | (g << 8)
1771 | (b << 16) 2182 | (b << 16)
1772 | (a << 24); 2183 | (a << 24);
1773 } 2184 }
1774 } 2185 }
1775 2186
1776 RETVAL = map_sv; 2187 RETVAL = map_sv;
1777} 2188}
1778 OUTPUT: 2189 OUTPUT:
1779 RETVAL 2190 RETVAL
1780 2191
1781void 2192void
1782draw (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)
1783 CODE: 2194 CODE:
1784{ 2195{
1785 int x, y, z; 2196 int x, y, z;
1786 2197
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2198 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 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
1789 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)
1790 smooth_key skey; 2201 smooth_key skey;
1791 2202 int pl_x, pl_y;
2203 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 2204 rc_t *rc = rc_alloc ();
2205 rc_t *rc_ov = rc_alloc ();
1793 rc_key_t key; 2206 rc_key_t key;
1794 rc_array_t *arr; 2207 rc_array_t *arr;
1795 2208
2209 pl_tex.name = 0;
2210
1796 // thats current max. sorry. 2211 // that's current max. sorry.
1797 if (sw > 255) sw = 255; 2212 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 2213 if (sh > 255) sh = 255;
1799 2214
1800 // clear key, in case of extra padding 2215 // clear key, in case of extra padding
1801 memset (&skey, 0, sizeof (skey)); 2216 memset (&skey, 0, sizeof (skey));
… …
1805 key.g = 255; 2220 key.g = 255;
1806 key.b = 255; 2221 key.b = 255;
1807 key.a = 255; 2222 key.a = 255;
1808 key.mode = GL_QUADS; 2223 key.mode = GL_QUADS;
1809 key.format = GL_T2F_V3F; 2224 key.format = GL_T2F_V3F;
1810 key.texname = -1;
1811 2225
1812 mx += self->x; 2226 mx += self->x;
1813 my += self->y; 2227 my += self->y;
1814 2228
1815 // first pass: determine smooth_max 2229 // first pass: determine smooth_max
… …
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2253 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1840 2254
1841 for (z = 0; z <= 2; z++) 2255 for (z = 0; z <= 2; z++)
1842 { 2256 {
1843 memset (smooth_level, 0, sizeof (smooth_level)); 2257 memset (smooth_level, 0, sizeof (smooth_level));
2258 key.texname = -1;
1844 2259
1845 for (y = 0; y < sh; y++) 2260 for (y = 0; y < sh; y++)
1846 if (0 <= y + my && y + my < self->rows) 2261 if (0 <= y + my && y + my < self->rows)
1847 { 2262 {
1848 maprow *row = self->row + (y + my); 2263 maprow *row = self->row + (y + my);
… …
1858 maptex tex = self->tex [tile]; 2273 maptex tex = self->tex [tile];
1859 int px, py; 2274 int px, py;
1860 2275
1861 if (key.texname != tex.name) 2276 if (key.texname != tex.name)
1862 { 2277 {
2278 self->tex [tile].unused = 0;
2279
1863 if (!tex.name) 2280 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2281 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1865 2282
1866 key.texname = tex.name; 2283 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2284 arr = rc_array (rc, &key);
1868 } 2285 }
1869 2286
1870 px = (x + 1) * T - tex.w; 2287 px = (x + 1) * Th - tex.w;
1871 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 }
1872 2297
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2298 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 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);
1875 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);
1876 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);
1877
1878 if (cell->flags && z == 2)
1879 {
1880 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1)
1882 {
1883 maptex tex = self->tex [1];
1884 int px = x * T + T * 2 / 32;
1885 int py = y * T - T * 6 / 32;
1886
1887 if (tex.name)
1888 {
1889 if (key.texname != tex.name)
1890 {
1891 key.texname = tex.name;
1892 arr = rc_array (rc, &key);
1893 }
1894
1895 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1896 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1897 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1898 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1899 }
1900 }
1901 }
1902 2302
1903 // update smooth hash 2303 // update smooth hash
1904 if (tex.smoothtile) 2304 if (tex.smoothtile)
1905 { 2305 {
1906 skey.tile = tex.smoothtile; 2306 skey.tile = tex.smoothtile;
… …
1935 // corners 2335 // corners
1936 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);
1937 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);
1938 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);
1939 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);
1940 } 2361 }
1941 } 2362 }
1942 } 2363 }
1943 } 2364 }
1944 2365
… …
1971 if (!(bits & 0x1000) 2392 if (!(bits & 0x1000)
1972 && skey->level == level 2393 && skey->level == level
1973 && level > smooth_max [skey->x][skey->y]) 2394 && level > smooth_max [skey->x][skey->y])
1974 { 2395 {
1975 maptex tex = self->tex [skey->tile]; 2396 maptex tex = self->tex [skey->tile];
1976 int px = (((int)skey->x) - 1) * T; 2397 int px = (((int)skey->x) - 1) * Tw;
1977 int py = (((int)skey->y) - 1) * T; 2398 int py = (((int)skey->y) - 1) * Th;
1978 int border = bits & 15; 2399 int border = bits & 15;
1979 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1980 float dx = tex.s * .0625f; // 16 images/row 2401 float dx = tex.s * .0625f; // 16 images/row
1981 float dy = tex.t * .5f ; // 2 images/column 2402 float dy = tex.t * .5f ; // 2 images/column
1982 2403
… …
1984 { 2405 {
1985 // this time avoiding texture state changes 2406 // this time avoiding texture state changes
1986 // save gobs of state changes. 2407 // save gobs of state changes.
1987 if (key.texname != tex.name) 2408 if (key.texname != tex.name)
1988 { 2409 {
2410 self->tex [skey->tile].unused = 0;
2411
1989 glEnd (); 2412 glEnd ();
1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1991 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
1992 } 2415 }
1993 2416
1994 if (border) 2417 if (border)
1995 { 2418 {
1996 float ox = border * dx; 2419 float ox = border * dx;
1997 2420
1998 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1999 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2000 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2001 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2002 } 2425 }
2003 2426
2004 if (corner) 2427 if (corner)
2005 { 2428 {
2006 float ox = corner * dx; 2429 float ox = corner * dx;
2007 2430
2008 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2009 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2010 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2011 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2012 } 2435 }
2013 } 2436 }
2014 } 2437 }
2015 } 2438 }
2016 } 2439 }
… …
2022 } 2445 }
2023 2446
2024 hv_clear (smooth); 2447 hv_clear (smooth);
2025 } 2448 }
2026 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
2027 glDisable (GL_BLEND); 2470 glDisable (GL_BLEND);
2028 rc_free (rc); 2471 rc_free (rc);
2472 rc_free (rc_ov);
2029 2473
2030 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2032 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2033 { 2477 {
… …
2036 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2037 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2038 { 2482 {
2039 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2040 2484
2041 int px = x * T; 2485 int px = x * Tw;
2042 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 }
2043 2493
2044 if (cell->stat_hp) 2494 if (cell->stat_hp)
2045 { 2495 {
2046 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2047 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2048 2498
2049 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2050 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2051 px + width - 1, py); 2501 px + width - 1, py);
2052 2502
… …
2058 } 2508 }
2059 } 2509 }
2060} 2510}
2061 2511
2062void 2512void
2063draw_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)
2064 CODE: 2514 CODE:
2065{ 2515{
2066 static float color[16][3] = { 2516 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2068 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2069 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2070 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2071 2521
2072 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2073 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2074 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2075 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2076 2526
2077 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2078 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2079 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2080 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2081 2531
2082 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2083 2533
2084 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2085 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2086 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2087 }; 2537 };
2088 2538
2089 int x, y; 2539 int x, y;
2090 2540
2091 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 */
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2093 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2094 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2095 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2096 2552
2097 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
… …
2101 2557
2102 if (m) 2558 if (m)
2103 { 2559 {
2104 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2105 2561
2106 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2107 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2108 2564
2109 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2110 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2111 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2112 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2113 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2114 } 2570 }
… …
2118 glDisable (GL_BLEND); 2574 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2575 glDisable (GL_TEXTURE_2D);
2120} 2576}
2121 2577
2122void 2578void
2123fow_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)
2124 PPCODE: 2580 PPCODE:
2125{ 2581{
2126 int x, y; 2582 int x, y;
2127 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2129 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2130 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);
2131 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2132 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2133 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2134 2591
2135 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2137 2594
2138 mx += self->x - 1; 2595 mx += self->x - 1;
2139 my += self->y - 1; 2596 my += self->y - 1;
2140
2141 memset (darkness1, 255, sw1 * sh1);
2142 2597
2143 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2145 { 2600 {
2146 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
… …
2149 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2150 { 2605 {
2151 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2152 2607
2153 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2154 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2155 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2156 } 2611 }
2157 } 2612 }
2158 2613
2159 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2160 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
… …
2179 2634
2180 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2181 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2182 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2183 2638
2184 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2185 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2186 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2187 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2188 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 */
2189 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2190 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2191 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2192 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2193 } 2648 }
2194 2649
2195 free (darkness1); 2650 free (darkness1);
2196 2651
2197 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2198 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2201} 2656}
2202 2657
2203SV * 2658SV *
2204get_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)
2205 CODE: 2660 CODE:
2206{ 2661{
2207 int x, y, x1, y1; 2662 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2663 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2664 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2266 else 2721 else
2267 *data++ = 0; 2722 *data++ = 0;
2268 } 2723 }
2269 } 2724 }
2270 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 {
2271 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2731 }
2732
2273 RETVAL = data_sv; 2733 RETVAL = data_sv;
2274} 2734}
2275 OUTPUT: 2735 OUTPUT:
2276 RETVAL 2736 RETVAL
2277 2737
2278void 2738void
2279set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2739set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2740 PPCODE:
2281{ 2741{
2282 int x, y, z; 2742 int x, y, z;
2283 int w, h; 2743 int w, h;
2284 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;
2285 2755
2286 if (*data++ != 0) 2756 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2757 XSRETURN_EMPTY; /* version mismatch */
2288 2758
2289 w = *data++ << 8; w |= *data++; 2759 w = *data++ << 8; w |= *data++;
… …
2304 { 2774 {
2305 maprow *row = map_get_row (self, y); 2775 maprow *row = map_get_row (self, y);
2306 2776
2307 for (x = x0; x < x1; x++) 2777 for (x = x0; x < x1; x++)
2308 { 2778 {
2779 uint8_t flags;
2780
2781 if (data + 7 >= end)
2782 XSRETURN_EMPTY;
2783
2309 uint8_t flags = *data++; 2784 flags = *data++;
2310 2785
2311 if (flags) 2786 if (flags)
2312 { 2787 {
2313 mapcell *cell = row_get_cell (row, x); 2788 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2789 tileid tile[3] = { 0, 0, 0 };
… …
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2792 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2793 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2794
2320 if (cell->darkness == 0) 2795 if (cell->darkness == 0)
2321 { 2796 {
2322 cell->darkness = 0; 2797 /*cell->darkness = 0;*/
2798 EXTEND (SP, 3);
2323 2799
2324 for (z = 0; z <= 2; z++) 2800 for (z = 0; z <= 2; z++)
2325 { 2801 {
2326 tileid t = tile [z]; 2802 tileid t = tile [z];
2327 2803
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2804 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2805 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2806 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2807 need_texid (self, t);
2332 } 2808 }
2333 2809
2334 cell->tile [z] = t; 2810 cell->tile [z] = t;
2335 } 2811 }
… …
2337 } 2813 }
2338 } 2814 }
2339 } 2815 }
2340} 2816}
2341 2817
2342MODULE = CFPlus PACKAGE = CFPlus::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2819
2344CFPlus::RW 2820DC::RW
2345new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2346 CODE: 2822 CODE:
2347{ 2823{
2348 STRLEN datalen; 2824 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2350 2826
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2827 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2828}
2353 OUTPUT: 2829 OUTPUT:
2354 RETVAL 2830 RETVAL
2355 2831
2356CFPlus::RW 2832DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2358 CODE: 2834 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2836 OUTPUT:
2361 RETVAL 2837 RETVAL
2362 2838
2363# fails on win32: 2839# fails on win32:
2364# CFPlus.xs(2268) : error C2059: syntax error : '(' 2840# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2841#void
2366#close (CFPlus::RW self) 2842#close (DC::RW self)
2367# CODE: 2843# CODE:
2368# (self->(close)) (self); 2844# (self->(close)) (self);
2369 2845
2370MODULE = CFPlus PACKAGE = CFPlus::Channel 2846MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2847
2372PROTOTYPES: DISABLE 2848PROTOTYPES: DISABLE
2373 2849
2374CFPlus::Channel 2850DC::Channel
2375find () 2851find ()
2376 CODE: 2852 CODE:
2377{ 2853{
2378 RETVAL = Mix_GroupAvailable (-1); 2854 RETVAL = Mix_GroupAvailable (-1);
2379 2855
2380 if (RETVAL < 0) 2856 if (RETVAL < 0)
2381 { 2857 {
2382 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2383 2859
2384 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)
2385 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2386 2867 }
2868 else
2387 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2388 } 2870 }
2389 2871
2390 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2391 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2392} 2874}
2393 OUTPUT: 2875 OUTPUT:
2394 RETVAL 2876 RETVAL
2395 2877
2396void 2878void
2397halt (CFPlus::Channel self) 2879halt (DC::Channel self)
2398 CODE: 2880 CODE:
2399 Mix_HaltChannel (self); 2881 Mix_HaltChannel (self);
2400 2882
2401void 2883void
2402expire (CFPlus::Channel self, int ticks = -1) 2884expire (DC::Channel self, int ticks = -1)
2403 CODE: 2885 CODE:
2404 Mix_ExpireChannel (self, ticks); 2886 Mix_ExpireChannel (self, ticks);
2405 2887
2406void 2888void
2407fade_out (CFPlus::Channel self, int ticks = -1) 2889fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2890 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2891 Mix_FadeOutChannel (self, ticks);
2410 2892
2411int 2893int
2412volume (CFPlus::Channel self, int volume) 2894volume (DC::Channel self, int volume)
2413 CODE: 2895 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2896 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2897 OUTPUT:
2416 RETVAL 2898 RETVAL
2417 2899
2418void 2900void
2419unregister_all_effects (CFPlus::Channel self) 2901unregister_all_effects (DC::Channel self)
2420 CODE: 2902 CODE:
2421 Mix_UnregisterAllEffects (self); 2903 Mix_UnregisterAllEffects (self);
2422 2904
2423void 2905void
2424set_panning (CFPlus::Channel self, int left, int right) 2906set_panning (DC::Channel self, int left, int right)
2425 CODE: 2907 CODE:
2426 left = CLAMP (left , 0, 255); 2908 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2909 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2910 Mix_SetPanning (self, left, right);
2429 2911
2430void 2912void
2431set_distance (CFPlus::Channel self, int distance) 2913set_distance (DC::Channel self, int distance)
2432 CODE: 2914 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2915 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2916
2435void 2917void
2436set_position (CFPlus::Channel self, int angle, int distance) 2918set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2919 CODE:
2438 2920
2439void 2921void
2440set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2923 CODE:
2442{ 2924{
2443 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));
2444 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;
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2928}
2447 2929
2448void 2930void
2449set_reverse_stereo (CFPlus::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2932 CODE:
2451 Mix_SetReverseStereo (self, flip); 2933 Mix_SetReverseStereo (self, flip);
2452 2934
2453MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2936
2455PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2456 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
2457CFPlus::MixChunk 2951DC::MixChunk
2458new (SV *class, CFPlus::RW rwops) 2952new (SV *klass, DC::RW rwops)
2459 CODE: 2953 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2955 OUTPUT:
2462 RETVAL 2956 RETVAL
2463 2957
2464void 2958void
2465DESTROY (CFPlus::MixChunk self) 2959DESTROY (DC::MixChunk self)
2466 CODE: 2960 CODE:
2467 Mix_FreeChunk (self); 2961 Mix_FreeChunk (self);
2468 2962
2469int 2963int
2470volume (CFPlus::MixChunk self, int volume = -1) 2964volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2965 CODE:
2472 if (items > 1) 2966 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2967 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2968 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2969 OUTPUT:
2476 RETVAL 2970 RETVAL
2477 2971
2478CFPlus::Channel 2972DC::Channel
2479play (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)
2480 CODE: 2974 CODE:
2481{ 2975{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2976 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2977
2484 if (RETVAL < 0) 2978 if (RETVAL < 0)
… …
2491 } 2985 }
2492} 2986}
2493 OUTPUT: 2987 OUTPUT:
2494 RETVAL 2988 RETVAL
2495 2989
2496MODULE = 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
2497 3003
2498int 3004int
2499volume (int volume = -1) 3005volume (int volume = -1)
2500 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2501 CODE: 3007 CODE:
… …
2513void 3019void
2514halt () 3020halt ()
2515 CODE: 3021 CODE:
2516 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2517 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2518CFPlus::MixMusic 3031DC::MixMusic
2519new (SV *class, CFPlus::RW rwops) 3032new (SV *klass, DC::RW rwops)
2520 CODE: 3033 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 3035 OUTPUT:
2523 RETVAL 3036 RETVAL
2524 3037
2525void 3038void
2526DESTROY (CFPlus::MixMusic self) 3039DESTROY (DC::MixMusic self)
2527 CODE: 3040 CODE:
2528 Mix_FreeMusic (self); 3041 Mix_FreeMusic (self);
2529 3042
2530int 3043int
2531play (CFPlus::MixMusic self, int loops = -1) 3044play (DC::MixMusic self, int loops = -1)
2532 CODE: 3045 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 3046 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 3047 OUTPUT:
2535 RETVAL 3048 RETVAL
2536 3049
2537void 3050void
2538fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3051fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 3052 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 3053 Mix_FadeInMusicPos (self, loops, ms, position);
2541 3054
2542MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3055MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 3056
2544PROTOTYPES: ENABLE 3057PROTOTYPES: ENABLE
2545 3058
2546BOOT: 3059BOOT:
2547{ 3060{
2548 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3061 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 3062 static const struct {
2550 const char *name; 3063 const char *name;
2551 IV iv; 3064 IV iv;
2552 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2554 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2555 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2556 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2557 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2558 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2559 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2560 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2561 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
… …
2573 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2574 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2575 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2576 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2577 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),
2578 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2579 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2580 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2581 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2582 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
… …
2650 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2651 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2652 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2653 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2654 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),
2655# undef const_iv 3176# undef const_iv
2656 }; 3177 };
2657 3178
2658 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--)
2659 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2660 3181
2661 texture_av = newAV (); 3182 texture_av = newAV ();
2662 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2663} 3184}
2664 3185
… …
2666disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2667 CODE: 3188 CODE:
2668 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2669 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2670 3191
2671char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2672gl_vendor () 3196gl_vendor ()
2673 CODE: 3197 CODE:
2674 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2675 OUTPUT: 3199 OUTPUT:
2676 RETVAL 3200 RETVAL
2677 3201
2678char * 3202const char *
2679gl_version () 3203gl_version ()
2680 CODE: 3204 CODE:
2681 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2682 OUTPUT: 3206 OUTPUT:
2683 RETVAL 3207 RETVAL
2684 3208
2685char * 3209const char *
2686gl_extensions () 3210gl_extensions ()
2687 CODE: 3211 CODE:
2688 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2689 OUTPUT: 3213 OUTPUT:
2690 RETVAL 3214 RETVAL
2691 3215
2692const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2693 3221
2694GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2695 CODE: 3223 CODE:
2696 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2697 OUTPUT: 3225 OUTPUT:
… …
2705 3233
2706int glGetError () 3234int glGetError ()
2707 3235
2708void glFinish () 3236void glFinish ()
2709 3237
3238void glFlush ()
3239
2710void glClear (int mask) 3240void glClear (int mask)
2711 3241
2712void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2713 PROTOTYPE: @ 3243 PROTOTYPE: @
2714 3244
… …
2723void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2724 3254
2725void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2726 CODE: 3256 CODE:
2727 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2728 3260
2729void glDepthMask (int flag) 3261void glDepthMask (int flag)
2730 3262
2731void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2732 3264
… …
2767void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2768 CODE: 3300 CODE:
2769 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2770 3302
2771void 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: @
2772 ALIAS: 3305 ALIAS:
2773 glColor_premultiply = 1 3306 glColor_premultiply = 1
2774 CODE: 3307 CODE:
2775 if (ix) 3308 if (ix)
2776 { 3309 {
… …
2846void 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)
2847 CODE: 3380 CODE:
2848 if (gl.SeparableFilter2D) 3381 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3382 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3383
2851void 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)
2852 3385
2853void 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)
2854 3387
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3388void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3389
… …
2882 3415
2883void glEndList () 3416void glEndList ()
2884 3417
2885void glCallList (int list) 3418void glCallList (int list)
2886 3419
2887MODULE = 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
2888 3426
2889PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
2890 3428
2891void 3429void
2892find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
2893 PPCODE: 3431 PPCODE:
2894{ 3432{
2895 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
2896 XPUSHs (self); 3434 XPUSHs (self);
2897} 3435}
2898 3436
2899BOOT: 3437BOOT:
2900{ 3438{
2901 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3439 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 3440
2903 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);
2904 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);
2905 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);
2906 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);
2907} 3445}
2908 3446
2909void 3447void
2910draw (SV *self) 3448draw (SV *self)
2911 CODE: 3449 CODE:
2912{ 3450{
2913 HV *hv; 3451 HV *hv;
2914 SV **svp; 3452 SV **svp;
2915 NV x, y, w, h; 3453 NV x, y, w, h;
2916 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
2917 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
2918 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 3458 double draw_x, draw_y;
2921 3459
2922 if (!SvROK (self)) 3460 if (!SvROK (self))
2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3461 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 3462
2925 hv = (HV *)SvRV (self); 3463 hv = (HV *)SvRV (self);
2926 3464
2927 if (SvTYPE (hv) != SVt_PVHV) 3465 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3466 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 3467
2930 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.;
2931 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.;
2932 3470
2933 if (!h || !w) 3471 if (!h || !w)

Diff Legend

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