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.317 by root, Fri Nov 23 12:39:05 2012 UTC

… …
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
… …
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib/gmacros.h>
48 54
49#include <pango/pango.h> 55#include <pango/pango.h>
56
57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
62# define pango_layout_get_line_readonly pango_layout_get_line
63# define pango_layout_get_lines_readonly pango_layout_get_lines
64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
66#endif
50 67
51#ifndef _WIN32 68#ifndef _WIN32
52# include <sys/types.h> 69# include <sys/types.h>
53# include <sys/socket.h> 70# include <sys/socket.h>
54# include <netinet/in.h> 71# include <netinet/in.h>
55# include <netinet/tcp.h> 72# include <netinet/tcp.h>
56# include <inttypes.h> 73# include <inttypes.h>
57#endif 74#endif
58 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
62 91
63#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
65 94
66#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
67 96
68#if 0 97/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 99
71# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
72#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
73 123
74static AV *texture_av; 124static AV *texture_av;
75 125
76static struct 126static struct
77{ 127{
… …
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;
… …
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
… …
650 855
651IV minpot (UV n) 856IV minpot (UV n)
652 857
653IV popcount (UV n) 858IV popcount (UV n)
654 859
860NV distance (NV dx, NV dy)
861 CODE:
862 RETVAL = pow (dx * dx + dy * dy, 0.5);
863 OUTPUT:
864 RETVAL
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
895int SDL_GL_GetAttribute (int attr)
896 CODE:
897 if (SDL_GL_GetAttribute (attr, &RETVAL))
898 XSRETURN_UNDEF;
899 OUTPUT:
900 RETVAL
672 901
673void 902void
674SDL_ListModes (int rgb, int alpha) 903SDL_ListModes (int rgb, int alpha)
675 PPCODE: 904 PPCODE:
676{ 905{
… …
688 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 917 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
689 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 918 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 919 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
691 920
692 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 921 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); 922 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
696#endif
697 923
698 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 924 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
699 925
700 if (m && m != (SDL_Rect **)-1) 926 if (m && m != (SDL_Rect **)-1)
701 while (*m) 927 while (*m)
702 { 928 {
703 if ((*m)->w >= 640 && (*m)->h >= 480) 929 if ((*m)->w >= 400 && (*m)->h >= 300)
704 { 930 {
705 AV *av = newAV (); 931 AV *av = newAV ();
706 av_push (av, newSViv ((*m)->w)); 932 av_push (av, newSViv ((*m)->w));
707 av_push (av, newSViv ((*m)->h)); 933 av_push (av, newSViv ((*m)->h));
708 av_push (av, newSViv (rgb)); 934 av_push (av, newSViv (rgb));
… …
731 ); 957 );
732 958
733 if (RETVAL) 959 if (RETVAL)
734 { 960 {
735 av_clear (texture_av); 961 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); 962#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
739#include "glfunc.h" 963#include "glfunc.h"
740#undef GL_FUNC 964#undef GL_FUNC
965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
741 } 967 }
742} 968}
743 OUTPUT: 969 OUTPUT:
744 RETVAL 970 RETVAL
745 971
746void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
747SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
748 977
749char * 978char *
750SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
751 980
752int 981int
753SDL_GetAppState () 982SDL_GetAppState ()
754 983
984int
985SDL_GetModState ()
986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
755void 991void
992SDL_PumpEvents ()
993
994void
756poll_events () 995peep_events ()
757 PPCODE: 996 PPCODE:
758{ 997{
759 SDL_Event ev; 998 SDL_Event ev;
760 999
761 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
… …
768 { 1007 {
769 case SDL_KEYDOWN: 1008 case SDL_KEYDOWN:
770 case SDL_KEYUP: 1009 case SDL_KEYUP:
771 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1011 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1012 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 */ 1013 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); 1014 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776 break; 1015 break;
777 1016
778 case SDL_ACTIVEEVENT: 1017 case SDL_ACTIVEEVENT:
779 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1018 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
797 x = ev.motion.x; 1036 x = ev.motion.x;
798 y = ev.motion.y; 1037 y = ev.motion.y;
799 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1038 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800 } 1039 }
801 1040
802 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1041 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
803 hv_store (hv, "state", 5, newSViv (state), 0); 1042 hv_store (hv, "state", 5, newSViv (state), 0);
804 hv_store (hv, "x", 1, newSViv (x), 0); 1043 hv_store (hv, "x", 1, newSViv (x), 0);
805 hv_store (hv, "y", 1, newSViv (y), 0); 1044 hv_store (hv, "y", 1, newSViv (y), 0);
806 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1045 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1046 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808 } 1047 }
809 break; 1048 break;
810 1049
811 case SDL_MOUSEBUTTONDOWN: 1050 case SDL_MOUSEBUTTONDOWN:
812 case SDL_MOUSEBUTTONUP: 1051 case SDL_MOUSEBUTTONUP:
813 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1052 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814 1053
815 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1054 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1055 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1056 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1057 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
823 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1062 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1063 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825 break; 1064 break;
826 } 1065 }
827 1066
828 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1067 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
829 } 1068 }
830} 1069}
831 1070
1071char *
1072SDL_AudioDriverName ()
1073 CODE:
1074{
1075 char buf [256];
1076 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1077 XSRETURN_UNDEF;
1078
1079 RETVAL = buf;
1080}
1081 OUTPUT:
1082 RETVAL
1083
832int 1084int
833Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1085Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
834 POSTCALL: 1086 POSTCALL:
835 Mix_HookMusicFinished (music_finished); 1087 Mix_HookMusicFinished (music_finished);
836 Mix_ChannelFinished (channel_finished); 1088 Mix_ChannelFinished (channel_finished);
1089
1090void
1091Mix_QuerySpec ()
1092 PPCODE:
1093{
1094 int freq, channels;
1095 Uint16 format;
1096
1097 if (Mix_QuerySpec (&freq, &format, &channels))
1098 {
1099 EXTEND (SP, 3);
1100 PUSHs (sv_2mortal (newSViv (freq)));
1101 PUSHs (sv_2mortal (newSViv (format)));
1102 PUSHs (sv_2mortal (newSViv (channels)));
1103 }
1104}
837 1105
838void 1106void
839Mix_CloseAudio () 1107Mix_CloseAudio ()
840 1108
841int 1109int
… …
876 } 1144 }
877 } 1145 }
878#endif 1146#endif
879} 1147}
880 1148
881void 1149int
882add_font (char *file) 1150add_font (char *file)
883 CODE: 1151 CODE:
884 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1152 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1153 OUTPUT:
1154 RETVAL
1155
1156void
1157IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1158
1159# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1160void
1161Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
885 1162
886void 1163void
887load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
888 ALIAS: 1165 ALIAS:
889 load_image_file = 1 1166 load_image_file = 1
… …
975void 1252void
976error (char *message) 1253error (char *message)
977 CODE: 1254 CODE:
978 fprintf (stderr, "ERROR: %s\n", message); 1255 fprintf (stderr, "ERROR: %s\n", message);
979#ifdef _WIN32 1256#ifdef _WIN32
980 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1257 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
981#endif 1258#endif
982 1259
983void 1260void
984fatal (char *message) 1261fatal (char *message)
985 CODE: 1262 CODE:
986 fprintf (stderr, "FATAL: %s\n", message); 1263 fprintf (stderr, "FATAL: %s\n", message);
987#ifdef _WIN32 1264#ifdef _WIN32
988 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1265 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
989#endif 1266#endif
990 _exit (1); 1267 _exit (1);
991 1268
992void 1269void
993_exit (int retval = 0) 1270_exit (int retval = 0)
… …
1005#if DEBUG 1282#if DEBUG
1006 VALGRIND_DO_LEAK_CHECK; 1283 VALGRIND_DO_LEAK_CHECK;
1007#endif 1284#endif
1008} 1285}
1009 1286
1010MODULE = CFPlus PACKAGE = CFPlus::Font 1287int
1288SvREFCNT (SV *sv)
1289 CODE:
1290 RETVAL = SvREFCNT (sv);
1291 OUTPUT:
1292 RETVAL
1293
1294MODULE = Deliantra::Client PACKAGE = DC::Font
1011 1295
1012PROTOTYPES: DISABLE 1296PROTOTYPES: DISABLE
1013 1297
1014CFPlus::Font 1298DC::Font
1015new_from_file (SV *class, char *path, int id = 0) 1299new_from_file (SV *class, char *path, int id = 0)
1016 CODE: 1300 CODE:
1017{ 1301{
1018 int count; 1302 int count;
1019 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1303 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
1022} 1306}
1023 OUTPUT: 1307 OUTPUT:
1024 RETVAL 1308 RETVAL
1025 1309
1026void 1310void
1027DESTROY (CFPlus::Font self) 1311DESTROY (DC::Font self)
1028 CODE: 1312 CODE:
1029 pango_font_description_free (self); 1313 pango_font_description_free (self);
1030 1314
1031void 1315void
1032make_default (CFPlus::Font self) 1316make_default (DC::Font self)
1033 PROTOTYPE: $ 1317 PROTOTYPE: $
1034 CODE: 1318 CODE:
1035 default_font = self; 1319 default_font = self;
1036 1320
1037MODULE = CFPlus PACKAGE = CFPlus::Layout 1321MODULE = Deliantra::Client PACKAGE = DC::Layout
1038 1322
1039PROTOTYPES: DISABLE 1323PROTOTYPES: DISABLE
1040 1324
1041void 1325void
1042reset_glyph_cache () 1326glyph_cache_backup ()
1043 PROTOTYPE: 1327 PROTOTYPE:
1044 CODE: 1328 CODE:
1329 tc_backup ();
1330
1331void
1332glyph_cache_restore ()
1333 PROTOTYPE:
1334 CODE:
1045 tc_clear (); 1335 tc_restore ();
1046 1336
1047CFPlus::Layout 1337DC::Layout
1048new (SV *class) 1338new (SV *class)
1049 CODE: 1339 CODE:
1050 New (0, RETVAL, 1, struct cf_layout); 1340 New (0, RETVAL, 1, struct cf_layout);
1051 1341
1052 RETVAL->pl = pango_layout_new (opengl_context); 1342 RETVAL->pl = pango_layout_new (opengl_context);
… …
1062 layout_update_font (RETVAL); 1352 layout_update_font (RETVAL);
1063 OUTPUT: 1353 OUTPUT:
1064 RETVAL 1354 RETVAL
1065 1355
1066void 1356void
1067DESTROY (CFPlus::Layout self) 1357DESTROY (DC::Layout self)
1068 CODE: 1358 CODE:
1069 g_object_unref (self->pl); 1359 g_object_unref (self->pl);
1070 rc_free (self->rc); 1360 rc_free (self->rc);
1071 Safefree (self); 1361 Safefree (self);
1072 1362
1073void 1363void
1074set_text (CFPlus::Layout self, SV *text_) 1364set_text (DC::Layout self, SV *text_)
1075 CODE: 1365 CODE:
1076{ 1366{
1077 STRLEN textlen; 1367 STRLEN textlen;
1078 char *text = SvPVutf8 (text_, textlen); 1368 char *text = SvPVutf8 (text_, textlen);
1079 1369
1080 pango_layout_set_text (self->pl, text, textlen); 1370 pango_layout_set_text (self->pl, text, textlen);
1081} 1371}
1082 1372
1083void 1373void
1084set_markup (CFPlus::Layout self, SV *text_) 1374set_markup (DC::Layout self, SV *text_)
1085 CODE: 1375 CODE:
1086{ 1376{
1087 STRLEN textlen; 1377 STRLEN textlen;
1088 char *text = SvPVutf8 (text_, textlen); 1378 char *text = SvPVutf8 (text_, textlen);
1089 1379
1090 pango_layout_set_markup (self->pl, text, textlen); 1380 pango_layout_set_markup (self->pl, text, textlen);
1091} 1381}
1092 1382
1093void 1383void
1094set_shapes (CFPlus::Layout self, ...) 1384set_shapes (DC::Layout self, ...)
1095 CODE: 1385 CODE:
1096{ 1386{
1097 PangoAttrList *attrs = 0; 1387 PangoAttrList *attrs = 0;
1098 const char *text = pango_layout_get_text (self->pl); 1388 const char *text = pango_layout_get_text (self->pl);
1099 const char *pos = text; 1389 const char *pos = text;
… …
1134 if (attrs) 1424 if (attrs)
1135 pango_layout_set_attributes (self->pl, attrs); 1425 pango_layout_set_attributes (self->pl, attrs);
1136} 1426}
1137 1427
1138void 1428void
1139get_shapes (CFPlus::Layout self) 1429get_shapes (DC::Layout self)
1140 PPCODE: 1430 PPCODE:
1141{ 1431{
1142 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1432 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143 1433
1144 do 1434 do
1145 { 1435 {
1146 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1436 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147 1437
1148 if (run && shape_attr_p (run)) 1438 if (run && shape_attr_p (run))
1149 { 1439 {
1150 PangoRectangle extents; 1440 PangoRectangle extents;
1151 pango_layout_iter_get_run_extents (iter, 0, &extents); 1441 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1159 1449
1160 pango_layout_iter_free (iter); 1450 pango_layout_iter_free (iter);
1161} 1451}
1162 1452
1163int 1453int
1164has_wrapped (CFPlus::Layout self) 1454has_wrapped (DC::Layout self)
1165 CODE: 1455 CODE:
1166{ 1456{
1167 int lines = 1; 1457 int lines = 1;
1168 const char *text = pango_layout_get_text (self->pl); 1458 const char *text = pango_layout_get_text (self->pl);
1169 1459
… …
1174} 1464}
1175 OUTPUT: 1465 OUTPUT:
1176 RETVAL 1466 RETVAL
1177 1467
1178SV * 1468SV *
1179get_text (CFPlus::Layout self) 1469get_text (DC::Layout self)
1180 CODE: 1470 CODE:
1181 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1471 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182 sv_utf8_decode (RETVAL); 1472 sv_utf8_decode (RETVAL);
1183 OUTPUT: 1473 OUTPUT:
1184 RETVAL 1474 RETVAL
1185 1475
1186void 1476void
1187set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1477set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1188 CODE: 1478 CODE:
1189 self->r = r; 1479 self->r = r;
1190 self->g = g; 1480 self->g = g;
1191 self->b = b; 1481 self->b = b;
1192 self->a = a; 1482 self->a = a;
1193 1483
1194void 1484void
1195set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1485set_font (DC::Layout self, DC::Font font = 0)
1196 CODE: 1486 CODE:
1197 if (self->font != font) 1487 if (self->font != font)
1198 { 1488 {
1199 self->font = font; 1489 self->font = font;
1200 layout_update_font (self); 1490 layout_update_font (self);
1201 } 1491 }
1202 1492
1203void 1493void
1204set_height (CFPlus::Layout self, int base_height) 1494set_height (DC::Layout self, int base_height)
1205 CODE: 1495 CODE:
1206 if (self->base_height != base_height) 1496 if (self->base_height != base_height)
1207 { 1497 {
1208 self->base_height = base_height; 1498 self->base_height = base_height;
1209 layout_update_font (self); 1499 layout_update_font (self);
1210 } 1500 }
1211 1501
1212void 1502void
1213set_width (CFPlus::Layout self, int max_width = -1) 1503set_width (DC::Layout self, int max_width = -1)
1214 CODE: 1504 CODE:
1215 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1505 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1216 1506
1217void 1507void
1218set_indent (CFPlus::Layout self, int indent) 1508set_indent (DC::Layout self, int indent)
1219 CODE: 1509 CODE:
1220 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1510 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221 1511
1222void 1512void
1223set_spacing (CFPlus::Layout self, int spacing) 1513set_spacing (DC::Layout self, int spacing)
1224 CODE: 1514 CODE:
1225 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1515 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226 1516
1227void 1517void
1228set_ellipsise (CFPlus::Layout self, int ellipsise) 1518set_ellipsise (DC::Layout self, int ellipsise)
1229 CODE: 1519 CODE:
1230 pango_layout_set_ellipsize (self->pl, 1520 pango_layout_set_ellipsize (self->pl,
1231 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1521 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1522 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1523 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234 : PANGO_ELLIPSIZE_NONE 1524 : PANGO_ELLIPSIZE_NONE
1235 ); 1525 );
1236 1526
1237void 1527void
1238set_single_paragraph_mode (CFPlus::Layout self, int spm) 1528set_single_paragraph_mode (DC::Layout self, int spm)
1239 CODE: 1529 CODE:
1240 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1530 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241 1531
1242void 1532void
1243size (CFPlus::Layout self) 1533size (DC::Layout self)
1244 PPCODE: 1534 PPCODE:
1245{ 1535{
1246 int w, h; 1536 int w, h;
1247 1537
1248 layout_get_pixel_size (self, &w, &h); 1538 layout_get_pixel_size (self, &w, &h);
… …
1251 PUSHs (sv_2mortal (newSViv (w))); 1541 PUSHs (sv_2mortal (newSViv (w)));
1252 PUSHs (sv_2mortal (newSViv (h))); 1542 PUSHs (sv_2mortal (newSViv (h)));
1253} 1543}
1254 1544
1255int 1545int
1256descent (CFPlus::Layout self) 1546descent (DC::Layout self)
1257 CODE: 1547 CODE:
1258{ 1548{
1259 PangoRectangle rect; 1549 PangoRectangle rect;
1260 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1550 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261 pango_layout_line_get_pixel_extents (line, 0, &rect); 1551 pango_layout_line_get_pixel_extents (line, 0, &rect);
1262 RETVAL = PANGO_DESCENT (rect); 1552 RETVAL = PANGO_DESCENT (rect);
1263} 1553}
1264 OUTPUT: 1554 OUTPUT:
1265 RETVAL 1555 RETVAL
1266 1556
1267int 1557int
1268xy_to_index (CFPlus::Layout self, int x, int y) 1558xy_to_index (DC::Layout self, int x, int y)
1269 CODE: 1559 CODE:
1270{ 1560{
1271 int index, trailing; 1561 int index, trailing;
1272 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1562 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1273 RETVAL = index + trailing; 1563 RETVAL = index + trailing;
1274} 1564}
1275 OUTPUT: 1565 OUTPUT:
1276 RETVAL 1566 RETVAL
1277 1567
1278void 1568void
1279cursor_pos (CFPlus::Layout self, int index) 1569cursor_pos (DC::Layout self, int index)
1280 PPCODE: 1570 PPCODE:
1281{ 1571{
1282 PangoRectangle strong_pos; 1572 PangoRectangle pos;
1283 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1573 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284 1574
1285 EXTEND (SP, 3); 1575 EXTEND (SP, 3);
1286 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1576 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1577 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1578 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289} 1579}
1290 1580
1291void 1581void
1292index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1582index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293 PPCODE: 1583 PPCODE:
1294{ 1584{
1295 int line, x; 1585 int line, x;
1296 1586
1297 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1587 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1588#if !PANGO_VERSION_CHECK (1, 17, 3)
1298 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1589 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299 1590 --line;
1591#endif
1300 EXTEND (SP, 2); 1592 EXTEND (SP, 2);
1301 PUSHs (sv_2mortal (newSViv (line - 1))); 1593 PUSHs (sv_2mortal (newSViv (line)));
1302 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1594 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303} 1595}
1304 1596
1305void 1597void
1306line_x_to_index (CFPlus::Layout self, int line, int x) 1598line_x_to_index (DC::Layout self, int line, int x)
1307 PPCODE: 1599 PPCODE:
1308{ 1600{
1309 PangoLayoutLine *lp; 1601 PangoLayoutLine *lp;
1310 int index, trailing; 1602 int index, trailing;
1311 1603
1312 if (line < 0) 1604 if (line < 0)
1313 XSRETURN_EMPTY; 1605 XSRETURN_EMPTY;
1314 1606
1315 if (!(lp = pango_layout_get_line (self->pl, line))) 1607 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316 XSRETURN_EMPTY; /* do better */ 1608 XSRETURN_EMPTY; /* do better */
1317 1609
1318 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1610 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1319 1611
1320 EXTEND (SP, 2); 1612 EXTEND (SP, 2);
… …
1326 PUSHs (sv_2mortal (newSViv (trailing))); 1618 PUSHs (sv_2mortal (newSViv (trailing)));
1327 } 1619 }
1328} 1620}
1329 1621
1330void 1622void
1331render (CFPlus::Layout self, float x, float y, int flags = 0) 1623render (DC::Layout self, float x, float y, int flags = 0)
1332 CODE: 1624 CODE:
1333 rc_clear (self->rc); 1625 rc_clear (self->rc);
1334 pango_opengl_render_layout_subpixel ( 1626 pango_opengl_render_layout_subpixel (
1335 self->pl, 1627 self->pl,
1336 self->rc, 1628 self->rc,
… …
1341 // we assume that context_change actually clears/frees stuff 1633 // we assume that context_change actually clears/frees stuff
1342 // and does not do any recomputation... 1634 // and does not do any recomputation...
1343 pango_layout_context_changed (self->pl); 1635 pango_layout_context_changed (self->pl);
1344 1636
1345void 1637void
1346draw (CFPlus::Layout self) 1638draw (DC::Layout self)
1347 CODE: 1639 CODE:
1348{ 1640{
1349 glEnable (GL_TEXTURE_2D); 1641 glEnable (GL_TEXTURE_2D);
1350 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1642 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351 glEnable (GL_BLEND); 1643 glEnable (GL_BLEND);
… …
1359 glDisable (GL_ALPHA_TEST); 1651 glDisable (GL_ALPHA_TEST);
1360 glDisable (GL_BLEND); 1652 glDisable (GL_BLEND);
1361 glDisable (GL_TEXTURE_2D); 1653 glDisable (GL_TEXTURE_2D);
1362} 1654}
1363 1655
1364MODULE = CFPlus PACKAGE = CFPlus::Texture 1656MODULE = Deliantra::Client PACKAGE = DC::Texture
1365 1657
1366PROTOTYPES: ENABLE 1658PROTOTYPES: ENABLE
1367 1659
1368void 1660void
1369pad (SV *data_, int ow, int oh, int nw, int nh) 1661pad (SV *data_, int ow, int oh, int nw, int nh)
… …
1437 glDisable (GL_ALPHA_TEST); 1729 glDisable (GL_ALPHA_TEST);
1438 glDisable (GL_BLEND); 1730 glDisable (GL_BLEND);
1439 } 1731 }
1440} 1732}
1441 1733
1734void
1735draw_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)
1736 PROTOTYPE: @
1737 CODE:
1738{
1739 glEnable (GL_BLEND);
1740 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1741 glEnable (GL_TEXTURE_2D);
1742 glBindTexture (GL_TEXTURE_2D, name1);
1743
1744 glColor3f (intensity, intensity, intensity);
1745 glPushMatrix ();
1746 glScalef (1./3, 1./3, 1.);
1747
1748 if (blend > 0.f)
1749 {
1750 float dx3 = dx * -3.f / w;
1751 float dy3 = dy * -3.f / h;
1752 GLfloat env_color[4] = { 0., 0., 0., blend };
1753
1754 /* interpolate the two shadow textures */
1755 /* stage 0 == rgb(glcolor) + alpha(t0) */
1756 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1757
1758 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1759 gl.ActiveTexture (GL_TEXTURE1);
1760 glEnable (GL_TEXTURE_2D);
1761 glBindTexture (GL_TEXTURE_2D, name2);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1763
1764 /* rgb == rgb(glcolor) */
1765 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1766 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1767 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1768
1769 /* alpha = interpolate t0, t1 by env_alpha */
1770 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1771
1772 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1773 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1774 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1775
1776 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1777 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1778
1779 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1780 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1781
1782 glBegin (GL_QUADS);
1783 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1784 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1785 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1787 glEnd ();
1788
1789 glDisable (GL_TEXTURE_2D);
1790 gl.ActiveTexture (GL_TEXTURE0);
1791 }
1792 else
1793 {
1794 /* simple blending of one texture, also opengl <1.3 path */
1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1796
1797 glBegin (GL_QUADS);
1798 glTexCoord2f (0, 0); glVertex2f (0, 0);
1799 glTexCoord2f (0, t); glVertex2f (0, h);
1800 glTexCoord2f (s, t); glVertex2f (w, h);
1801 glTexCoord2f (s, 0); glVertex2f (w, 0);
1802 glEnd ();
1803 }
1804
1805 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1806 {
1807 int x, y;
1808 int dx3 = dx * 3;
1809 int dy3 = dy * 3;
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1812 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1813 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1814 glTranslatef (-1., -1., 0);
1815 glBegin (GL_QUADS);
1816
1817 for (y = 1; y < h; y += 3)
1818 {
1819 int y1 = y - dy3;
1820 int y1valid = y1 >= 0 && y1 < h;
1821
1822 for (x = 1; x < w; x += 3)
1823 {
1824 int x1 = x - dx3;
1825 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1826 uint8_t h2;
1827
1828 if (y1valid && x1 >= 0 && x1 < w)
1829 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1830 else
1831 h2 = 1; /* out of range == invisible */
1832
1833 if (h1 || h2)
1834 {
1835 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1836 glColor4f (1., 1., 1., alpha);
1837
1838 glTexCoord2f (0, 0.); glVertex2i (x , y );
1839 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1840 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1841 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1842 }
1843 }
1844 }
1845 }
1846
1847 glEnd ();
1848
1849 glPopMatrix ();
1850
1851 glDisable (GL_TEXTURE_2D);
1852 glDisable (GL_BLEND);
1853}
1854
1442IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1855IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1443 CODE: 1856 CODE:
1444{ 1857{
1445 GLint width; 1858 GLint width;
1446 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1859 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1448 RETVAL = width > 0; 1861 RETVAL = width > 0;
1449} 1862}
1450 OUTPUT: 1863 OUTPUT:
1451 RETVAL 1864 RETVAL
1452 1865
1453MODULE = CFPlus PACKAGE = CFPlus::Map 1866MODULE = Deliantra::Client PACKAGE = DC::Map
1454 1867
1455PROTOTYPES: DISABLE 1868PROTOTYPES: DISABLE
1456 1869
1457CFPlus::Map 1870DC::Map
1458new (SV *class) 1871new (SV *class)
1459 CODE: 1872 CODE:
1460 New (0, RETVAL, 1, struct map); 1873 New (0, RETVAL, 1, struct map);
1461 RETVAL->x = 0; 1874 RETVAL->x = 0;
1462 RETVAL->y = 0; 1875 RETVAL->y = 0;
… …
1470 RETVAL->row = 0; 1883 RETVAL->row = 0;
1471 OUTPUT: 1884 OUTPUT:
1472 RETVAL 1885 RETVAL
1473 1886
1474void 1887void
1475DESTROY (CFPlus::Map self) 1888DESTROY (DC::Map self)
1476 CODE: 1889 CODE:
1477{ 1890{
1478 map_clear (self); 1891 map_clear (self);
1479 Safefree (self->face2tile); 1892 Safefree (self->face2tile);
1480 Safefree (self->tex); 1893 Safefree (self->tex);
1481 Safefree (self); 1894 Safefree (self);
1482} 1895}
1483 1896
1484void 1897void
1485resize (CFPlus::Map self, int map_width, int map_height) 1898resize (DC::Map self, int map_width, int map_height)
1486 CODE: 1899 CODE:
1487 self->w = map_width; 1900 self->w = map_width;
1488 self->h = map_height; 1901 self->h = map_height;
1489 1902
1490void 1903void
1491clear (CFPlus::Map self) 1904clear (DC::Map self)
1492 CODE: 1905 CODE:
1493 map_clear (self); 1906 map_clear (self);
1494 1907
1495void 1908void
1496set_tileid (CFPlus::Map self, int face, int tile) 1909set_tileid (DC::Map self, int face, int tile)
1497 CODE: 1910 CODE:
1498{ 1911{
1499 need_facenum (self, face); self->face2tile [face] = tile; 1912 need_facenum (self, face); self->face2tile [face] = tile;
1500 need_texid (self, tile); 1913 need_texid (self, tile);
1501} 1914}
1502 1915
1503void 1916void
1504set_smooth (CFPlus::Map self, int face, int smooth, int level) 1917set_smooth (DC::Map self, int face, int smooth, int level)
1505 CODE: 1918 CODE:
1506{ 1919{
1507 tileid texid; 1920 tileid texid;
1508 maptex *tex; 1921 maptex *tex;
1509 1922
… …
1522 tex->smoothtile = self->face2tile [smooth]; 1935 tex->smoothtile = self->face2tile [smooth];
1523 tex->smoothlevel = level; 1936 tex->smoothlevel = level;
1524} 1937}
1525 1938
1526void 1939void
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) 1940set_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: 1941 CODE:
1529{ 1942{
1530 need_texid (self, texid); 1943 need_texid (self, texid);
1531 1944
1532 { 1945 {
… …
1551 // use uglier nearest interpolation because linear suffers 1964 // use uglier nearest interpolation because linear suffers
1552 // from transparent color bleeding and ugly wrapping effects. 1965 // from transparent color bleeding and ugly wrapping effects.
1553 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1966 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554} 1967}
1555 1968
1969void
1970expire_textures (DC::Map self, int texid, int count)
1971 PPCODE:
1972 for (; texid < self->texs && count; ++texid, --count)
1973 {
1974 maptex *tex = self->tex + texid;
1975
1976 if (tex->name)
1977 {
1978 if (tex->unused)
1979 {
1980 tex->name = 0;
1981 tex->unused = 0;
1982 XPUSHs (sv_2mortal (newSViv (texid)));
1983 }
1984 else
1985 tex->unused = 1;
1986 }
1987 }
1988
1556int 1989int
1557ox (CFPlus::Map self) 1990ox (DC::Map self)
1558 ALIAS: 1991 ALIAS:
1559 oy = 1 1992 oy = 1
1560 x = 2 1993 x = 2
1561 y = 3 1994 y = 3
1562 w = 4 1995 w = 4
… …
1573 } 2006 }
1574 OUTPUT: 2007 OUTPUT:
1575 RETVAL 2008 RETVAL
1576 2009
1577void 2010void
1578scroll (CFPlus::Map self, int dx, int dy) 2011scroll (DC::Map self, int dx, int dy)
1579 CODE: 2012 CODE:
1580{ 2013{
1581 if (dx > 0) 2014 if (dx > 0)
1582 map_blank (self, self->x, self->y, dx, self->h); 2015 map_blank (self, self->x, self->y, dx, self->h);
1583 else if (dx < 0) 2016 else if (dx < 0)
… …
1599 self->y += MAP_EXTEND_Y; 2032 self->y += MAP_EXTEND_Y;
1600 } 2033 }
1601} 2034}
1602 2035
1603SV * 2036SV *
1604map1a_update (CFPlus::Map self, SV *data_, int extmap) 2037map1a_update (DC::Map self, SV *data_)
1605 CODE: 2038 CODE:
1606{ 2039{
1607 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2040 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1608 uint8_t *data_end = (uint8_t *)SvEND (data_); 2041 uint8_t *data_end = (uint8_t *)SvEND (data_);
1609 mapcell *cell; 2042 mapcell *cell;
… …
1630 2063
1631 //TODO: don't trust server data to be in-range(!) 2064 //TODO: don't trust server data to be in-range(!)
1632 2065
1633 if (flags & 8) 2066 if (flags & 8)
1634 { 2067 {
2068 uint8_t ext, cmd;
2069
1635 if (extmap) 2070 do
1636 { 2071 {
1637 uint8_t ext, cmd; 2072 ext = *data++;
2073 cmd = ext & 0x7f;
1638 2074
1639 do 2075 if (cmd < 4)
2076 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2077 else if (cmd == 5) // health
1640 { 2078 {
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; 2079 cell->stat_width = 1;
1649 cell->stat_hp = *data++; 2080 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 } 2081 }
1667 while (ext & 0x80); 2082 else if (cmd == 6) // monster width
2083 cell->stat_width = *data++ + 1;
2084 else if (cmd == 0x47)
2085 {
2086 if (*data == 1) cell->player = data [1];
2087 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2088 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2089 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2090
2091 data += *data + 1;
2092 }
2093 else if (cmd == 8) // cell flags
2094 cell->flags = *data++;
2095 else if (ext & 0x40) // unknown, multibyte => skip
2096 data += *data + 1;
2097 else
2098 data++;
1668 } 2099 }
1669 else 2100 while (ext & 0x80);
1670 cell->darkness = *data++ + 1;
1671 } 2101 }
1672 2102
1673 for (z = 0; z <= 2; ++z) 2103 for (z = 0; z <= 2; ++z)
1674 if (flags & (4 >> z)) 2104 if (flags & (4 >> z))
1675 { 2105 {
… …
1678 cell->tile [z] = self->face2tile [face]; 2108 cell->tile [z] = self->face2tile [face];
1679 2109
1680 if (cell->tile [z]) 2110 if (cell->tile [z])
1681 { 2111 {
1682 maptex *tex = self->tex + cell->tile [z]; 2112 maptex *tex = self->tex + cell->tile [z];
2113 tex->unused = 0;
1683 if (!tex->name) 2114 if (!tex->name)
1684 av_push (missing, newSViv (cell->tile [z])); 2115 av_push (missing, newSViv (cell->tile [z]));
1685 2116
1686 if (tex->smoothtile) 2117 if (tex->smoothtile)
1687 { 2118 {
1688 maptex *smooth = self->tex + tex->smoothtile; 2119 maptex *smooth = self->tex + tex->smoothtile;
2120 smooth->unused = 0;
1689 if (!smooth->name) 2121 if (!smooth->name)
1690 av_push (missing, newSViv (tex->smoothtile)); 2122 av_push (missing, newSViv (tex->smoothtile));
1691 } 2123 }
1692 } 2124 }
1693 } 2125 }
1694 } 2126 }
1695 else 2127 else
1696 cell->darkness = 0; 2128 CELL_CLEAR (cell);
1697 } 2129 }
1698} 2130}
1699 OUTPUT: 2131 OUTPUT:
1700 RETVAL 2132 RETVAL
1701 2133
1702SV * 2134SV *
1703mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2135mapmap (DC::Map self, int x0, int y0, int w, int h)
1704 CODE: 2136 CODE:
1705{ 2137{
1706 int x1, x; 2138 int x1, x;
1707 int y1, y; 2139 int y1, y;
1708 int z; 2140 int z;
… …
1721 ? self->row + y 2153 ? self->row + y
1722 : 0; 2154 : 0;
1723 2155
1724 for (x = x0; x < x1; x++) 2156 for (x = x0; x < x1; x++)
1725 { 2157 {
1726 int r = 32, g = 32, b = 32, a = 192; 2158 unsigned int r = 32, g = 32, b = 32, a = 192;
1727 2159
1728 if (row && row->c0 <= x && x < row->c1) 2160 if (row && row->c0 <= x && x < row->c1)
1729 { 2161 {
1730 mapcell *cell = row->col + (x - row->c0); 2162 mapcell *cell = row->col + (x - row->c0);
1731 2163
… …
1733 { 2165 {
1734 maptex tex = self->tex [cell->tile [z]]; 2166 maptex tex = self->tex [cell->tile [z]];
1735 int a0 = 255 - tex.a; 2167 int a0 = 255 - tex.a;
1736 int a1 = tex.a; 2168 int a1 = tex.a;
1737 2169
1738 r = (r * a0 + tex.r * a1) / 255; 2170 r = div255 (r * a0 + tex.r * a1);
1739 g = (g * a0 + tex.g * a1) / 255; 2171 g = div255 (g * a0 + tex.g * a1);
1740 b = (b * a0 + tex.b * a1) / 255; 2172 b = div255 (b * a0 + tex.b * a1);
1741 a = (a * a0 + tex.a * a1) / 255; 2173 a = div255 (a * a0 + tex.a * a1);
1742 } 2174 }
1743 } 2175 }
1744 2176
1745 *map++ = (r ) 2177 *map++ = (r )
1746 | (g << 8) 2178 | (g << 8)
… …
1753} 2185}
1754 OUTPUT: 2186 OUTPUT:
1755 RETVAL 2187 RETVAL
1756 2188
1757void 2189void
1758draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2190draw (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: 2191 CODE:
1760{ 2192{
1761 int x, y, z; 2193 int x, y, z;
1762 2194
1763 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2195 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1764 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2196 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) 2197 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1766 smooth_key skey; 2198 smooth_key skey;
1767 2199 int pl_x, pl_y;
2200 maptex pl_tex;
1768 rc_t *rc = rc_alloc (); 2201 rc_t *rc = rc_alloc ();
2202 rc_t *rc_ov = rc_alloc ();
1769 rc_key_t key; 2203 rc_key_t key;
1770 rc_array_t *arr; 2204 rc_array_t *arr;
1771 2205
2206 pl_tex.name = 0;
2207
1772 // thats current max. sorry. 2208 // that's current max. sorry.
1773 if (sw > 255) sw = 255; 2209 if (sw > 255) sw = 255;
1774 if (sh > 255) sh = 255; 2210 if (sh > 255) sh = 255;
1775 2211
1776 // clear key, in case of extra padding 2212 // clear key, in case of extra padding
1777 memset (&skey, 0, sizeof (skey)); 2213 memset (&skey, 0, sizeof (skey));
… …
1781 key.g = 255; 2217 key.g = 255;
1782 key.b = 255; 2218 key.b = 255;
1783 key.a = 255; 2219 key.a = 255;
1784 key.mode = GL_QUADS; 2220 key.mode = GL_QUADS;
1785 key.format = GL_T2F_V3F; 2221 key.format = GL_T2F_V3F;
1786 key.texname = -1;
1787 2222
1788 mx += self->x; 2223 mx += self->x;
1789 my += self->y; 2224 my += self->y;
1790 2225
1791 // first pass: determine smooth_max 2226 // first pass: determine smooth_max
… …
1815 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2250 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1816 2251
1817 for (z = 0; z <= 2; z++) 2252 for (z = 0; z <= 2; z++)
1818 { 2253 {
1819 memset (smooth_level, 0, sizeof (smooth_level)); 2254 memset (smooth_level, 0, sizeof (smooth_level));
2255 key.texname = -1;
1820 2256
1821 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
1822 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
1823 { 2259 {
1824 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
… …
1834 maptex tex = self->tex [tile]; 2270 maptex tex = self->tex [tile];
1835 int px, py; 2271 int px, py;
1836 2272
1837 if (key.texname != tex.name) 2273 if (key.texname != tex.name)
1838 { 2274 {
2275 self->tex [tile].unused = 0;
2276
1839 if (!tex.name) 2277 if (!tex.name)
1840 tex = self->tex [2]; /* missing, replace by noface */ 2278 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1841 2279
1842 key.texname = tex.name; 2280 key.texname = tex.name;
1843 arr = rc_array (rc, &key); 2281 arr = rc_array (rc, &key);
1844 } 2282 }
1845 2283
1846 px = (x + 1) * T - tex.w; 2284 px = (x + 1) * Th - tex.w;
1847 py = (y + 1) * T - tex.h; 2285 py = (y + 1) * Tw - tex.h;
2286
2287 if (expect_false (cell->player == player) && expect_false (z == 2))
2288 {
2289 pl_x = px;
2290 pl_y = py;
2291 pl_tex = tex;
2292 continue;
2293 }
1848 2294
1849 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2295 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1850 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2296 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); 2297 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); 2298 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 2299
1879 // update smooth hash 2300 // update smooth hash
1880 if (tex.smoothtile) 2301 if (tex.smoothtile)
1881 { 2302 {
1882 skey.tile = tex.smoothtile; 2303 skey.tile = tex.smoothtile;
… …
1911 // corners 2332 // corners
1912 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2333 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); 2334 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); 2335 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); 2336 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2337 }
2338 }
2339
2340 if (expect_false (z == 2) && expect_false (cell->flags))
2341 {
2342 // overlays such as the speech bubble, probably more to come
2343 if (cell->flags & 1)
2344 {
2345 rc_key_t key_ov = key;
2346 maptex tex = self->tex [TEXID_SPEECH];
2347 rc_array_t *arr;
2348 int px = x * Tw + Tw * 2 / 32;
2349 int py = y * Th - Th * 6 / 32;
2350
2351 key_ov.texname = tex.name;
2352 arr = rc_array (rc_ov, &key_ov);
2353
2354 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2355 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2356 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2357 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1916 } 2358 }
1917 } 2359 }
1918 } 2360 }
1919 } 2361 }
1920 2362
… …
1947 if (!(bits & 0x1000) 2389 if (!(bits & 0x1000)
1948 && skey->level == level 2390 && skey->level == level
1949 && level > smooth_max [skey->x][skey->y]) 2391 && level > smooth_max [skey->x][skey->y])
1950 { 2392 {
1951 maptex tex = self->tex [skey->tile]; 2393 maptex tex = self->tex [skey->tile];
1952 int px = (((int)skey->x) - 1) * T; 2394 int px = (((int)skey->x) - 1) * Tw;
1953 int py = (((int)skey->y) - 1) * T; 2395 int py = (((int)skey->y) - 1) * Th;
1954 int border = bits & 15; 2396 int border = bits & 15;
1955 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2397 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1956 float dx = tex.s * .0625f; // 16 images/row 2398 float dx = tex.s * .0625f; // 16 images/row
1957 float dy = tex.t * .5f ; // 2 images/column 2399 float dy = tex.t * .5f ; // 2 images/column
1958 2400
… …
1960 { 2402 {
1961 // this time avoiding texture state changes 2403 // this time avoiding texture state changes
1962 // save gobs of state changes. 2404 // save gobs of state changes.
1963 if (key.texname != tex.name) 2405 if (key.texname != tex.name)
1964 { 2406 {
2407 self->tex [skey->tile].unused = 0;
2408
1965 glEnd (); 2409 glEnd ();
1966 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2410 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1967 glBegin (GL_QUADS); 2411 glBegin (GL_QUADS);
1968 } 2412 }
1969 2413
1970 if (border) 2414 if (border)
1971 { 2415 {
1972 float ox = border * dx; 2416 float ox = border * dx;
1973 2417
1974 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2418 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1975 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2419 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1976 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2420 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1977 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2421 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1978 } 2422 }
1979 2423
1980 if (corner) 2424 if (corner)
1981 { 2425 {
1982 float ox = corner * dx; 2426 float ox = corner * dx;
1983 2427
1984 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1985 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2429 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1986 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2430 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1987 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2431 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1988 } 2432 }
1989 } 2433 }
1990 } 2434 }
1991 } 2435 }
1992 } 2436 }
… …
1998 } 2442 }
1999 2443
2000 hv_clear (smooth); 2444 hv_clear (smooth);
2001 } 2445 }
2002 2446
2447 if (pl_tex.name)
2448 {
2449 maptex tex = pl_tex;
2450 int px = pl_x + sdx;
2451 int py = pl_y + sdy;
2452
2453 key.texname = tex.name;
2454 arr = rc_array (rc, &key);
2455
2456 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2457 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2458 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2459 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2460
2461 rc_draw (rc);
2462 }
2463
2464 rc_draw (rc_ov);
2465 rc_clear (rc_ov);
2466
2003 glDisable (GL_BLEND); 2467 glDisable (GL_BLEND);
2004 rc_free (rc); 2468 rc_free (rc);
2469 rc_free (rc_ov);
2005 2470
2006 // top layer: overlays such as the health bar 2471 // top layer: overlays such as the health bar
2007 for (y = 0; y < sh; y++) 2472 for (y = 0; y < sh; y++)
2008 if (0 <= y + my && y + my < self->rows) 2473 if (0 <= y + my && y + my < self->rows)
2009 { 2474 {
… …
2012 for (x = 0; x < sw; x++) 2477 for (x = 0; x < sw; x++)
2013 if (row->c0 <= x + mx && x + mx < row->c1) 2478 if (row->c0 <= x + mx && x + mx < row->c1)
2014 { 2479 {
2015 mapcell *cell = row->col + (x + mx - row->c0); 2480 mapcell *cell = row->col + (x + mx - row->c0);
2016 2481
2017 int px = x * T; 2482 int px = x * Tw;
2018 int py = y * T; 2483 int py = y * Th;
2484
2485 if (expect_false (cell->player == player))
2486 {
2487 px += sdx;
2488 py += sdy;
2489 }
2019 2490
2020 if (cell->stat_hp) 2491 if (cell->stat_hp)
2021 { 2492 {
2022 int width = cell->stat_width * T; 2493 int width = cell->stat_width * Tw;
2023 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2494 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2024 2495
2025 glColor3ub (0, 0, 0); 2496 glColor3ub (0, 0, 0);
2026 glRectf (px + 1, py - thick - 2, 2497 glRectf (px + 1, py - thick - 2,
2027 px + width - 1, py); 2498 px + width - 1, py);
2028 2499
… …
2034 } 2505 }
2035 } 2506 }
2036} 2507}
2037 2508
2038void 2509void
2039draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2510draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2040 CODE: 2511 CODE:
2041{ 2512{
2042 static float color[16][3] = { 2513 static float color[16][3] = {
2043 { 0.00F, 0.00F, 0.00F }, 2514 { 0.00f, 0.00f, 0.00f },
2044 { 1.00F, 1.00F, 1.00F }, 2515 { 1.00f, 1.00f, 1.00f },
2045 { 0.00F, 0.00F, 0.55F }, 2516 { 0.00f, 0.00f, 0.55f },
2046 { 1.00F, 0.00F, 0.00F }, 2517 { 1.00f, 0.00f, 0.00f },
2047 2518
2048 { 1.00F, 0.54F, 0.00F }, 2519 { 1.00f, 0.54f, 0.00f },
2049 { 0.11F, 0.56F, 1.00F }, 2520 { 0.11f, 0.56f, 1.00f },
2050 { 0.93F, 0.46F, 0.00F }, 2521 { 0.93f, 0.46f, 0.00f },
2051 { 0.18F, 0.54F, 0.34F }, 2522 { 0.18f, 0.54f, 0.34f },
2052 2523
2053 { 0.56F, 0.73F, 0.56F }, 2524 { 0.56f, 0.73f, 0.56f },
2054 { 0.80F, 0.80F, 0.80F }, 2525 { 0.80f, 0.80f, 0.80f },
2055 { 0.55F, 0.41F, 0.13F }, 2526 { 0.55f, 0.41f, 0.13f },
2056 { 0.99F, 0.77F, 0.26F }, 2527 { 0.99f, 0.77f, 0.26f },
2057 2528
2058 { 0.74F, 0.65F, 0.41F }, 2529 { 0.74f, 0.65f, 0.41f },
2059 2530
2060 { 0.00F, 1.00F, 1.00F }, 2531 { 0.00f, 1.00f, 1.00f },
2061 { 1.00F, 0.00F, 1.00F }, 2532 { 1.00f, 0.00f, 1.00f },
2062 { 1.00F, 1.00F, 0.00F }, 2533 { 1.00f, 1.00f, 0.00f },
2063 }; 2534 };
2064 2535
2065 int x, y; 2536 int x, y;
2066 2537
2067 glEnable (GL_TEXTURE_2D); 2538 glEnable (GL_TEXTURE_2D);
2539 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2540 * but the nvidia driver (185.18.14) mishandles alpha textures
2541 * and takes the colour from god knows where instead of using
2542 * Cp. MODULATE results in the same colour, but slightly different
2543 * alpha, but atcually gives us the correct colour with nvidia.
2544 */
2068 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2545 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2069 glEnable (GL_BLEND); 2546 glEnable (GL_BLEND);
2070 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2547 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2071 glBegin (GL_QUADS); 2548 glBegin (GL_QUADS);
2072 2549
2073 for (y = 0; y < h; y++) 2550 for (y = 0; y < h; y++)
… …
2077 2554
2078 if (m) 2555 if (m)
2079 { 2556 {
2080 float *c = color [m & 15]; 2557 float *c = color [m & 15];
2081 2558
2082 float tx1 = m & 0x40 ? 0.5 : 0.; 2559 float tx1 = m & 0x40 ? 0.5f : 0.f;
2083 float tx2 = tx1 + 0.5; 2560 float tx2 = tx1 + 0.5f;
2084 2561
2085 glColor4f (c[0], c[1], c[2], 0.75); 2562 glColor4f (c[0], c[1], c[2], 1);
2086 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2563 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2087 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2564 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2088 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2565 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2089 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2566 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2090 } 2567 }
… …
2094 glDisable (GL_BLEND); 2571 glDisable (GL_BLEND);
2095 glDisable (GL_TEXTURE_2D); 2572 glDisable (GL_TEXTURE_2D);
2096} 2573}
2097 2574
2098void 2575void
2099fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2576fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2100 PPCODE: 2577 PPCODE:
2101{ 2578{
2102 int x, y; 2579 int x, y;
2103 int sw1 = sw + 2; 2580 int sw1 = sw + 2;
2104 int sh1 = sh + 2; 2581 int sh1 = sh + 2;
2105 int sh3 = sh * 3; 2582 int sh3 = sh * 3;
2106 int sw34 = (sw * 3 + 3) & ~3; 2583 int sw3 = sw * 3;
2584 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2585 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2107 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2586 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2108 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2587 memset (darkness1, 0, sw1*sh1);
2109 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2110 2588
2111 SvPOK_only (darkness3_sv); 2589 SvPOK_only (darkness3_sv);
2112 SvCUR_set (darkness3_sv, sw34 * sh3); 2590 SvCUR_set (darkness3_sv, sw3 * sh3);
2113 2591
2114 mx += self->x - 1; 2592 mx += self->x - 1;
2115 my += self->y - 1; 2593 my += self->y - 1;
2116
2117 memset (darkness1, 255, sw1 * sh1);
2118 2594
2119 for (y = 0; y < sh1; y++) 2595 for (y = 0; y < sh1; y++)
2120 if (0 <= y + my && y + my < self->rows) 2596 if (0 <= y + my && y + my < self->rows)
2121 { 2597 {
2122 maprow *row = self->row + (y + my); 2598 maprow *row = self->row + (y + my);
… …
2125 if (row->c0 <= x + mx && x + mx < row->c1) 2601 if (row->c0 <= x + mx && x + mx < row->c1)
2126 { 2602 {
2127 mapcell *cell = row->col + (x + mx - row->c0); 2603 mapcell *cell = row->col + (x + mx - row->c0);
2128 2604
2129 darkness1 [y * sw1 + x] = cell->darkness 2605 darkness1 [y * sw1 + x] = cell->darkness
2130 ? 255 - (cell->darkness - 1) 2606 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2131 : 255 - FOW_DARKNESS; 2607 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2132 } 2608 }
2133 } 2609 }
2134 2610
2135 for (y = 0; y < sh; ++y) 2611 for (y = 0; y < sh; ++y)
2136 for (x = 0; x < sw; ++x) 2612 for (x = 0; x < sw; ++x)
… …
2155 2631
2156 uint8_t r13 = (d13 + d23 + d12) / 3; 2632 uint8_t r13 = (d13 + d23 + d12) / 3;
2157 uint8_t r23 = d23; 2633 uint8_t r23 = d23;
2158 uint8_t r33 = (d23 + d33 + d32) / 3; 2634 uint8_t r33 = (d23 + d33 + d32) / 3;
2159 2635
2160 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2636 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2161 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2637 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2162 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2163 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2639 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2164 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2640 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); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2166 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2642 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2167 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2643 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2168 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2169 } 2645 }
2170 2646
2171 free (darkness1); 2647 free (darkness1);
2172 2648
2173 EXTEND (SP, 3); 2649 EXTEND (SP, 3);
2174 PUSHs (sv_2mortal (newSViv (sw34))); 2650 PUSHs (sv_2mortal (newSViv (sw3)));
2175 PUSHs (sv_2mortal (newSViv (sh3))); 2651 PUSHs (sv_2mortal (newSViv (sh3)));
2176 PUSHs (darkness3_sv); 2652 PUSHs (darkness3_sv);
2177} 2653}
2178 2654
2179SV * 2655SV *
2180get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2656get_rect (DC::Map self, int x0, int y0, int w, int h)
2181 CODE: 2657 CODE:
2182{ 2658{
2183 int x, y, x1, y1; 2659 int x, y, x1, y1;
2184 SV *data_sv = newSV (w * h * 7 + 5); 2660 SV *data_sv = newSV (w * h * 7 + 5);
2185 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2661 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2242 else 2718 else
2243 *data++ = 0; 2719 *data++ = 0;
2244 } 2720 }
2245 } 2721 }
2246 2722
2723 /* if size is w*h + 5 then no data has been found */
2724 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2725 {
2247 SvPOK_only (data_sv); 2726 SvPOK_only (data_sv);
2248 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2727 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2728 }
2729
2249 RETVAL = data_sv; 2730 RETVAL = data_sv;
2250} 2731}
2251 OUTPUT: 2732 OUTPUT:
2252 RETVAL 2733 RETVAL
2253 2734
2254void 2735void
2255set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2736set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2256 PPCODE: 2737 PPCODE:
2257{ 2738{
2258 int x, y, z; 2739 int x, y, z;
2259 int w, h; 2740 int w, h;
2260 int x1, y1; 2741 int x1, y1;
2742 STRLEN len;
2743 uint8_t *data, *end;
2744
2745 len = SvLEN (data_sv);
2746 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2747 data = SvPVbyte_nolen (data_sv);
2748 end = data + len + 8;
2749
2750 if (len < 5)
2751 XSRETURN_EMPTY;
2261 2752
2262 if (*data++ != 0) 2753 if (*data++ != 0)
2263 XSRETURN_EMPTY; /* version mismatch */ 2754 XSRETURN_EMPTY; /* version mismatch */
2264 2755
2265 w = *data++ << 8; w |= *data++; 2756 w = *data++ << 8; w |= *data++;
… …
2280 { 2771 {
2281 maprow *row = map_get_row (self, y); 2772 maprow *row = map_get_row (self, y);
2282 2773
2283 for (x = x0; x < x1; x++) 2774 for (x = x0; x < x1; x++)
2284 { 2775 {
2776 uint8_t flags;
2777
2778 if (data + 7 >= end)
2779 XSRETURN_EMPTY;
2780
2285 uint8_t flags = *data++; 2781 flags = *data++;
2286 2782
2287 if (flags) 2783 if (flags)
2288 { 2784 {
2289 mapcell *cell = row_get_cell (row, x); 2785 mapcell *cell = row_get_cell (row, x);
2290 tileid tile[3] = { 0, 0, 0 }; 2786 tileid tile[3] = { 0, 0, 0 };
… …
2293 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2789 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2294 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2790 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2295 2791
2296 if (cell->darkness == 0) 2792 if (cell->darkness == 0)
2297 { 2793 {
2298 cell->darkness = 0; 2794 /*cell->darkness = 0;*/
2795 EXTEND (SP, 3);
2299 2796
2300 for (z = 0; z <= 2; z++) 2797 for (z = 0; z <= 2; z++)
2301 { 2798 {
2302 tileid t = tile [z]; 2799 tileid t = tile [z];
2303 2800
2304 if (t >= self->texs || (t && !self->tex [t].name)) 2801 if (t >= self->texs || (t && !self->tex [t].name))
2305 { 2802 {
2306 XPUSHs (sv_2mortal (newSViv (t))); 2803 PUSHs (sv_2mortal (newSViv (t)));
2307 need_texid (self, t); 2804 need_texid (self, t);
2308 } 2805 }
2309 2806
2310 cell->tile [z] = t; 2807 cell->tile [z] = t;
2311 } 2808 }
… …
2313 } 2810 }
2314 } 2811 }
2315 } 2812 }
2316} 2813}
2317 2814
2318MODULE = CFPlus PACKAGE = CFPlus::RW 2815MODULE = Deliantra::Client PACKAGE = DC::RW
2319 2816
2320CFPlus::RW 2817DC::RW
2321new (SV *class, SV *data_sv) 2818new (SV *class, SV *data_sv)
2322 CODE: 2819 CODE:
2323{ 2820{
2324 STRLEN datalen; 2821 STRLEN datalen;
2325 char *data = SvPVbyte (data_sv, datalen); 2822 char *data = SvPVbyte (data_sv, datalen);
… …
2327 RETVAL = SDL_RWFromConstMem (data, datalen); 2824 RETVAL = SDL_RWFromConstMem (data, datalen);
2328} 2825}
2329 OUTPUT: 2826 OUTPUT:
2330 RETVAL 2827 RETVAL
2331 2828
2332CFPlus::RW 2829DC::RW
2333new_from_file (SV *class, const char *path, const char *mode = "rb") 2830new_from_file (SV *class, const char *path, const char *mode = "rb")
2334 CODE: 2831 CODE:
2335 RETVAL = SDL_RWFromFile (path, mode); 2832 RETVAL = SDL_RWFromFile (path, mode);
2336 OUTPUT: 2833 OUTPUT:
2337 RETVAL 2834 RETVAL
2338 2835
2339# fails on win32: 2836# fails on win32:
2340# CFPlus.xs(2268) : error C2059: syntax error : '(' 2837# dc.xs(2268) : error C2059: syntax error : '('
2341#void 2838#void
2342#close (CFPlus::RW self) 2839#close (DC::RW self)
2343# CODE: 2840# CODE:
2344# (self->(close)) (self); 2841# (self->(close)) (self);
2345 2842
2346MODULE = CFPlus PACKAGE = CFPlus::Channel 2843MODULE = Deliantra::Client PACKAGE = DC::Channel
2347 2844
2348PROTOTYPES: DISABLE 2845PROTOTYPES: DISABLE
2349 2846
2350CFPlus::Channel 2847DC::Channel
2351find () 2848find ()
2352 CODE: 2849 CODE:
2353{ 2850{
2354 RETVAL = Mix_GroupAvailable (-1); 2851 RETVAL = Mix_GroupAvailable (-1);
2355 2852
2356 if (RETVAL < 0) 2853 if (RETVAL < 0)
2357 { 2854 {
2358 RETVAL = Mix_GroupOldest (-1); 2855 RETVAL = Mix_GroupOldest (-1);
2359 2856
2360 if (RETVAL < 0) 2857 if (RETVAL < 0)
2858 {
2859 // happens sometimes, maybe it just stopped playing(?)
2860 RETVAL = Mix_GroupAvailable (-1);
2861
2862 if (RETVAL < 0)
2361 XSRETURN_UNDEF; 2863 XSRETURN_UNDEF;
2362 2864 }
2865 else
2363 Mix_HaltChannel (RETVAL); 2866 Mix_HaltChannel (RETVAL);
2364 } 2867 }
2365 2868
2366 Mix_UnregisterAllEffects (RETVAL); 2869 Mix_UnregisterAllEffects (RETVAL);
2367 Mix_Volume (RETVAL, 128); 2870 Mix_Volume (RETVAL, 128);
2368} 2871}
2369 OUTPUT: 2872 OUTPUT:
2370 RETVAL 2873 RETVAL
2371 2874
2372void 2875void
2373halt (CFPlus::Channel self) 2876halt (DC::Channel self)
2374 CODE: 2877 CODE:
2375 Mix_HaltChannel (self); 2878 Mix_HaltChannel (self);
2376 2879
2377void 2880void
2378expire (CFPlus::Channel self, int ticks = -1) 2881expire (DC::Channel self, int ticks = -1)
2379 CODE: 2882 CODE:
2380 Mix_ExpireChannel (self, ticks); 2883 Mix_ExpireChannel (self, ticks);
2381 2884
2382void 2885void
2383fade_out (CFPlus::Channel self, int ticks = -1) 2886fade_out (DC::Channel self, int ticks = -1)
2384 CODE: 2887 CODE:
2385 Mix_FadeOutChannel (self, ticks); 2888 Mix_FadeOutChannel (self, ticks);
2386 2889
2387int 2890int
2388volume (CFPlus::Channel self, int volume) 2891volume (DC::Channel self, int volume)
2389 CODE: 2892 CODE:
2390 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2893 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391 OUTPUT: 2894 OUTPUT:
2392 RETVAL 2895 RETVAL
2393 2896
2394void 2897void
2395unregister_all_effects (CFPlus::Channel self) 2898unregister_all_effects (DC::Channel self)
2396 CODE: 2899 CODE:
2397 Mix_UnregisterAllEffects (self); 2900 Mix_UnregisterAllEffects (self);
2398 2901
2399void 2902void
2400set_panning (CFPlus::Channel self, int left, int right) 2903set_panning (DC::Channel self, int left, int right)
2401 CODE: 2904 CODE:
2402 left = CLAMP (left , 0, 255); 2905 left = CLAMP (left , 0, 255);
2403 right = CLAMP (right, 0, 255); 2906 right = CLAMP (right, 0, 255);
2404 Mix_SetPanning (self, left, right); 2907 Mix_SetPanning (self, left, right);
2405 2908
2406void 2909void
2407set_distance (CFPlus::Channel self, int distance) 2910set_distance (DC::Channel self, int distance)
2408 CODE: 2911 CODE:
2409 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2912 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410 2913
2411void 2914void
2412set_position (CFPlus::Channel self, int angle, int distance) 2915set_position (DC::Channel self, int angle, int distance)
2413 CODE: 2916 CODE:
2414 2917
2415void 2918void
2416set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2919set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417 CODE: 2920 CODE:
2418{ 2921{
2419 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2922 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); 2923 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2421 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2924 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422} 2925}
2423 2926
2424void 2927void
2425set_reverse_stereo (CFPlus::Channel self, int flip) 2928set_reverse_stereo (DC::Channel self, int flip)
2426 CODE: 2929 CODE:
2427 Mix_SetReverseStereo (self, flip); 2930 Mix_SetReverseStereo (self, flip);
2428 2931
2429MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2932MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430 2933
2431PROTOTYPES: DISABLE 2934PROTOTYPES: DISABLE
2432 2935
2936void
2937decoders ()
2938 PPCODE:
2939#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2940 int i, num = Mix_GetNumChunkDecoders ();
2941 EXTEND (SP, num);
2942 for (i = 0; i < num; ++i)
2943 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2944#else
2945 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2946#endif
2947
2433CFPlus::MixChunk 2948DC::MixChunk
2434new (SV *class, CFPlus::RW rwops) 2949new (SV *class, DC::RW rwops)
2435 CODE: 2950 CODE:
2436 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2951 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437 OUTPUT: 2952 OUTPUT:
2438 RETVAL 2953 RETVAL
2439 2954
2440void 2955void
2441DESTROY (CFPlus::MixChunk self) 2956DESTROY (DC::MixChunk self)
2442 CODE: 2957 CODE:
2443 Mix_FreeChunk (self); 2958 Mix_FreeChunk (self);
2444 2959
2445int 2960int
2446volume (CFPlus::MixChunk self, int volume = -1) 2961volume (DC::MixChunk self, int volume = -1)
2447 CODE: 2962 CODE:
2448 if (items > 1) 2963 if (items > 1)
2449 volume = CLAMP (volume, 0, 128); 2964 volume = CLAMP (volume, 0, 128);
2450 RETVAL = Mix_VolumeChunk (self, volume); 2965 RETVAL = Mix_VolumeChunk (self, volume);
2451 OUTPUT: 2966 OUTPUT:
2452 RETVAL 2967 RETVAL
2453 2968
2454CFPlus::Channel 2969DC::Channel
2455play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2970play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2456 CODE: 2971 CODE:
2457{ 2972{
2458 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2973 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459 2974
2460 if (RETVAL < 0) 2975 if (RETVAL < 0)
… …
2467 } 2982 }
2468} 2983}
2469 OUTPUT: 2984 OUTPUT:
2470 RETVAL 2985 RETVAL
2471 2986
2472MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2987MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2988
2989void
2990decoders ()
2991 PPCODE:
2992#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2993 int i, num = Mix_GetNumMusicDecoders ();
2994 EXTEND (SP, num);
2995 for (i = 0; i < num; ++i)
2996 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2997#else
2998 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2999#endif
2473 3000
2474int 3001int
2475volume (int volume = -1) 3002volume (int volume = -1)
2476 PROTOTYPE: ;$ 3003 PROTOTYPE: ;$
2477 CODE: 3004 CODE:
… …
2489void 3016void
2490halt () 3017halt ()
2491 CODE: 3018 CODE:
2492 Mix_HaltMusic (); 3019 Mix_HaltMusic ();
2493 3020
3021int
3022playing ()
3023 CODE:
3024 RETVAL = Mix_PlayingMusic ();
3025 OUTPUT:
3026 RETVAL
3027
2494CFPlus::MixMusic 3028DC::MixMusic
2495new (SV *class, CFPlus::RW rwops) 3029new (SV *class, DC::RW rwops)
2496 CODE: 3030 CODE:
2497 RETVAL = Mix_LoadMUS_RW (rwops); 3031 RETVAL = Mix_LoadMUS_RW (rwops);
2498 OUTPUT: 3032 OUTPUT:
2499 RETVAL 3033 RETVAL
2500 3034
2501void 3035void
2502DESTROY (CFPlus::MixMusic self) 3036DESTROY (DC::MixMusic self)
2503 CODE: 3037 CODE:
2504 Mix_FreeMusic (self); 3038 Mix_FreeMusic (self);
2505 3039
2506int 3040int
2507play (CFPlus::MixMusic self, int loops = -1) 3041play (DC::MixMusic self, int loops = -1)
2508 CODE: 3042 CODE:
2509 RETVAL = Mix_PlayMusic (self, loops); 3043 RETVAL = Mix_PlayMusic (self, loops);
2510 OUTPUT: 3044 OUTPUT:
2511 RETVAL 3045 RETVAL
2512 3046
2513void 3047void
2514fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3048fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515 CODE: 3049 CODE:
2516 Mix_FadeInMusicPos (self, loops, ms, position); 3050 Mix_FadeInMusicPos (self, loops, ms, position);
2517 3051
2518MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3052MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519 3053
2520PROTOTYPES: ENABLE 3054PROTOTYPES: ENABLE
2521 3055
2522BOOT: 3056BOOT:
2523{ 3057{
2524 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3058 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525 static const struct { 3059 static const struct {
2526 const char *name; 3060 const char *name;
2527 IV iv; 3061 IV iv;
2528 } *civ, const_iv[] = { 3062 } *civ, const_iv[] = {
2529# define const_iv(name) { # name, (IV)name } 3063# define const_iv(name) { # name, (IV)name }
2530 const_iv (GL_VENDOR), 3064 const_iv (GL_VENDOR),
2531 const_iv (GL_VERSION), 3065 const_iv (GL_VERSION),
2532 const_iv (GL_EXTENSIONS), 3066 const_iv (GL_EXTENSIONS),
3067 const_iv (GL_MAX_TEXTURE_UNITS),
2533 const_iv (GL_COLOR_MATERIAL), 3068 const_iv (GL_COLOR_MATERIAL),
2534 const_iv (GL_SMOOTH), 3069 const_iv (GL_SMOOTH),
2535 const_iv (GL_FLAT), 3070 const_iv (GL_FLAT),
2536 const_iv (GL_DITHER), 3071 const_iv (GL_DITHER),
2537 const_iv (GL_BLEND), 3072 const_iv (GL_BLEND),
… …
2549 const_iv (GL_ZERO), 3084 const_iv (GL_ZERO),
2550 const_iv (GL_SRC_ALPHA), 3085 const_iv (GL_SRC_ALPHA),
2551 const_iv (GL_DST_ALPHA), 3086 const_iv (GL_DST_ALPHA),
2552 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3087 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2553 const_iv (GL_ONE_MINUS_DST_ALPHA), 3088 const_iv (GL_ONE_MINUS_DST_ALPHA),
3089 const_iv (GL_SRC_COLOR),
3090 const_iv (GL_DST_COLOR),
3091 const_iv (GL_ONE_MINUS_SRC_COLOR),
3092 const_iv (GL_ONE_MINUS_DST_COLOR),
2554 const_iv (GL_SRC_ALPHA_SATURATE), 3093 const_iv (GL_SRC_ALPHA_SATURATE),
2555 const_iv (GL_RGB), 3094 const_iv (GL_RGB),
2556 const_iv (GL_RGBA), 3095 const_iv (GL_RGBA),
2557 const_iv (GL_RGBA4), 3096 const_iv (GL_RGBA4),
2558 const_iv (GL_RGBA8), 3097 const_iv (GL_RGBA8),
… …
2626 const_iv (GL_NICEST), 3165 const_iv (GL_NICEST),
2627 const_iv (GL_V2F), 3166 const_iv (GL_V2F),
2628 const_iv (GL_V3F), 3167 const_iv (GL_V3F),
2629 const_iv (GL_T2F_V3F), 3168 const_iv (GL_T2F_V3F),
2630 const_iv (GL_T2F_N3F_V3F), 3169 const_iv (GL_T2F_N3F_V3F),
3170 const_iv (GL_FUNC_ADD),
3171 const_iv (GL_FUNC_SUBTRACT),
3172 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2631# undef const_iv 3173# undef const_iv
2632 }; 3174 };
2633 3175
2634 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3176 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2635 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3177 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2636 3178
2637 texture_av = newAV (); 3179 texture_av = newAV ();
2638 AvREAL_off (texture_av); 3180 AvREAL_off (texture_av);
2639} 3181}
2640 3182
2641void 3183void
2642disable_GL_EXT_blend_func_separate () 3184disable_GL_EXT_blend_func_separate ()
2643 CODE: 3185 CODE:
2644 gl.BlendFuncSeparate = 0; 3186 gl.BlendFuncSeparate = 0;
2645 gl.BlendFuncSeparateEXT = 0; 3187 gl.BlendFuncSeparateEXT = 0;
3188
3189void
3190apple_nvidia_bug (int enable)
2646 3191
2647char * 3192char *
2648gl_vendor () 3193gl_vendor ()
2649 CODE: 3194 CODE:
2650 RETVAL = (char *)glGetString (GL_VENDOR); 3195 RETVAL = (char *)glGetString (GL_VENDOR);
… …
2681 3226
2682int glGetError () 3227int glGetError ()
2683 3228
2684void glFinish () 3229void glFinish ()
2685 3230
3231void glFlush ()
3232
2686void glClear (int mask) 3233void glClear (int mask)
2687 3234
2688void glClearColor (float r, float g, float b, float a = 1.0) 3235void glClearColor (float r, float g, float b, float a = 1.0)
2689 PROTOTYPE: @ 3236 PROTOTYPE: @
2690 3237
… …
2699void glBlendFunc (int sfactor, int dfactor) 3246void glBlendFunc (int sfactor, int dfactor)
2700 3247
2701void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3248void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2702 CODE: 3249 CODE:
2703 gl_BlendFuncSeparate (sa, da, saa, daa); 3250 gl_BlendFuncSeparate (sa, da, saa, daa);
3251
3252# void glBlendEquation (int se)
2704 3253
2705void glDepthMask (int flag) 3254void glDepthMask (int flag)
2706 3255
2707void glLogicOp (int opcode) 3256void glLogicOp (int opcode)
2708 3257
… …
2743void glRotate (float angle, float x, float y, float z) 3292void glRotate (float angle, float x, float y, float z)
2744 CODE: 3293 CODE:
2745 glRotatef (angle, x, y, z); 3294 glRotatef (angle, x, y, z);
2746 3295
2747void glColor (float r, float g, float b, float a = 1.0) 3296void glColor (float r, float g, float b, float a = 1.0)
3297 PROTOTYPE: @
2748 ALIAS: 3298 ALIAS:
2749 glColor_premultiply = 1 3299 glColor_premultiply = 1
2750 CODE: 3300 CODE:
2751 if (ix) 3301 if (ix)
2752 { 3302 {
… …
2822void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3372void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2823 CODE: 3373 CODE:
2824 if (gl.SeparableFilter2D) 3374 if (gl.SeparableFilter2D)
2825 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3375 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826 3376
2827void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3377void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2828 3378
2829void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3379void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2830 3380
2831void glDrawPixels (int width, int height, int format, int type, char *pixels) 3381void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832 3382
… …
2858 3408
2859void glEndList () 3409void glEndList ()
2860 3410
2861void glCallList (int list) 3411void glCallList (int list)
2862 3412
2863MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3413void c_init ()
3414 CODE:
3415 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3416 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3417
3418MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864 3419
2865PROTOTYPES: DISABLE 3420PROTOTYPES: DISABLE
2866 3421
2867void 3422void
2868find_widget (SV *self, NV x, NV y) 3423find_widget (SV *self, NV x, NV y)
… …
2872 XPUSHs (self); 3427 XPUSHs (self);
2873} 3428}
2874 3429
2875BOOT: 3430BOOT:
2876{ 3431{
2877 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3432 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878 3433
2879 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3434 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); 3435 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); 3436 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); 3437 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2883} 3438}
2884 3439
2885void 3440void
2886draw (SV *self) 3441draw (SV *self)
2887 CODE: 3442 CODE:
… …
2894 SV *draw_w_sv = GvSV (draw_w_gv); 3449 SV *draw_w_sv = GvSV (draw_w_gv);
2895 SV *draw_h_sv = GvSV (draw_h_gv); 3450 SV *draw_h_sv = GvSV (draw_h_gv);
2896 double draw_x, draw_y; 3451 double draw_x, draw_y;
2897 3452
2898 if (!SvROK (self)) 3453 if (!SvROK (self))
2899 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3454 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900 3455
2901 hv = (HV *)SvRV (self); 3456 hv = (HV *)SvRV (self);
2902 3457
2903 if (SvTYPE (hv) != SVt_PVHV) 3458 if (SvTYPE (hv) != SVt_PVHV)
2904 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3459 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905 3460
2906 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3461 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.; 3462 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2908 3463
2909 if (!h || !w) 3464 if (!h || !w)

Diff Legend

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