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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.235 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.319 by root, Sun Nov 18 00:52:22 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines