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.223 by root, Sat Aug 11 11:07:08 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;
205 rc_t *rc;
155} *CFPlus__Layout; 206} *DC__Layout;
156 207
157static CFPlus__Font default_font; 208static DC__Font default_font;
158static PangoContext *opengl_context; 209static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
160 211
161static void 212static void
162substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
… …
167#endif 218#endif
168 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169} 220}
170 221
171static void 222static void
172layout_update_font (CFPlus__Layout self) 223layout_update_font (DC__Layout self)
173{ 224{
174 /* 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
175 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
176 */ 227 */
177 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
178 229
179 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
180 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
181 232
182 pango_layout_set_font_description (self->pl, font); 233 pango_layout_set_font_description (self->pl, font);
183} 234}
184 235
185static void 236static void
186layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 237layout_get_pixel_size (DC__Layout self, int *w, int *h)
187{ 238{
188 PangoRectangle rect; 239 PangoRectangle rect;
189 240
190 // get_pixel_* wrongly rounds down 241 // get_pixel_* wrongly rounds down
191 pango_layout_get_extents (self->pl, 0, &rect); 242 pango_layout_get_extents (self->pl, 0, &rect);
… …
202 253
203typedef uint16_t tileid; 254typedef uint16_t tileid;
204typedef uint16_t faceid; 255typedef uint16_t faceid;
205 256
206typedef struct { 257typedef struct {
207 int name; 258 GLuint name;
208 int w, h; 259 int w, h;
209 float s, t; 260 float s, t;
210 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
211 tileid smoothtile; 262 tileid smoothtile;
212 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
213} maptex; 265} maptex;
214 266
215typedef struct { 267typedef struct {
216 uint32_t player; 268 uint32_t player;
217 tileid tile[3]; 269 tileid tile[3];
… …
230 int faces; tileid *face2tile; // [faceid] 282 int faces; tileid *face2tile; // [faceid]
231 int texs; maptex *tex; // [tileid] 283 int texs; maptex *tex; // [tileid]
232 284
233 int32_t rows; 285 int32_t rows;
234 maprow *row; 286 maprow *row;
235} *CFPlus__Map; 287} *DC__Map;
236 288
237static char * 289static char *
238prepend (char *ptr, int sze, int inc) 290prepend (char *ptr, int sze, int inc)
239{ 291{
240 char *p; 292 char *p;
… …
278 self->texs *= 2; 330 self->texs *= 2;
279 } 331 }
280} 332}
281 333
282static maprow * 334static maprow *
283map_get_row (CFPlus__Map self, int y) 335map_get_row (DC__Map self, int y)
284{ 336{
285 if (0 > y) 337 if (0 > y)
286 { 338 {
287 int extend = - y + MAP_EXTEND_Y; 339 int extend = - y + MAP_EXTEND_Y;
288 Prepend (maprow, self->row, self->rows, extend); 340 Prepend (maprow, self->row, self->rows, extend);
… …
326 378
327 return row->col + (x - row->c0); 379 return row->col + (x - row->c0);
328} 380}
329 381
330static mapcell * 382static mapcell *
331map_get_cell (CFPlus__Map self, int x, int y) 383map_get_cell (DC__Map self, int x, int y)
332{ 384{
333 return row_get_cell (map_get_row (self, y), x); 385 return row_get_cell (map_get_row (self, y), x);
334} 386}
335 387
336static void 388static void
337map_clear (CFPlus__Map self) 389map_clear (DC__Map self)
338{ 390{
339 int r; 391 int r;
340 392
341 for (r = 0; r < self->rows; r++) 393 for (r = 0; r < self->rows; r++)
342 Safefree (self->row[r].col); 394 Safefree (self->row[r].col);
… …
349 self->oy = 0; 401 self->oy = 0;
350 self->row = 0; 402 self->row = 0;
351 self->rows = 0; 403 self->rows = 0;
352} 404}
353 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
354static void 416static void
355map_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)
356{ 418{
357 int x, y; 419 int x, y;
358 maprow *row; 420 maprow *row;
359 mapcell *cell; 421 mapcell *cell;
360 422
… …
372 if (x >= row->c1) 434 if (x >= row->c1)
373 break; 435 break;
374 436
375 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
376 438
377 cell->darkness = 0; 439 CELL_CLEAR (cell);
378 cell->stat_hp = 0;
379 cell->flags = 0;
380 cell->player = 0;
381 } 440 }
382 } 441 }
383} 442}
384 443
385typedef struct { 444typedef struct {
… …
420 ev.code = 1; 479 ev.code = 1;
421 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
422 ev.data2 = 0; 481 ev.data2 = 0;
423 482
424 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;
425} 490}
426 491
427static unsigned int 492static unsigned int
428minpot (unsigned int n) 493minpot (unsigned int n)
429{ 494{
… …
439 n |= n >> 16; 504 n |= n >> 16;
440 505
441 return n + 1; 506 return n + 1;
442} 507}
443 508
509static unsigned int
510popcount (unsigned int n)
511{
512 n -= (n >> 1) & 0x55555555U;
513 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
514 n = ((n >> 4) + n) & 0x0f0f0f0fU;
515 n *= 0x01010101U;
516
517 return n >> 24;
518}
519
444/* SDL should provide this, really. */ 520/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 521#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 522#define SDLK_MODIFIER_MAX 314
447 523
448/******************************************************************************/ 524/******************************************************************************/
… …
486 return 0; 562 return 0;
487 563
488 return 1; 564 return 1;
489} 565}
490 566
491MODULE = 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
492 626
493PROTOTYPES: ENABLE 627PROTOTYPES: ENABLE
494 628
495BOOT: 629BOOT:
496{ 630{
497 HV *stash = gv_stashpv ("CFPlus", 1); 631 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 632 static const struct {
499 const char *name; 633 const char *name;
500 IV iv; 634 IV iv;
501 } *civ, const_iv[] = { 635 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 636# define const_iv(name) { # name, (IV)name }
… …
524 658
525 const_iv (SDL_APPINPUTFOCUS), 659 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 660 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 661 const_iv (SDL_APPACTIVE),
528 662
663
664 const_iv (SDLK_UNKNOWN),
665 const_iv (SDLK_FIRST),
666 const_iv (SDLK_BACKSPACE),
667 const_iv (SDLK_TAB),
668 const_iv (SDLK_CLEAR),
669 const_iv (SDLK_RETURN),
670 const_iv (SDLK_PAUSE),
671 const_iv (SDLK_ESCAPE),
672 const_iv (SDLK_SPACE),
673 const_iv (SDLK_EXCLAIM),
674 const_iv (SDLK_QUOTEDBL),
675 const_iv (SDLK_HASH),
676 const_iv (SDLK_DOLLAR),
677 const_iv (SDLK_AMPERSAND),
678 const_iv (SDLK_QUOTE),
679 const_iv (SDLK_LEFTPAREN),
680 const_iv (SDLK_RIGHTPAREN),
681 const_iv (SDLK_ASTERISK),
682 const_iv (SDLK_PLUS),
683 const_iv (SDLK_COMMA),
684 const_iv (SDLK_MINUS),
685 const_iv (SDLK_PERIOD),
686 const_iv (SDLK_SLASH),
687 const_iv (SDLK_0),
688 const_iv (SDLK_1),
689 const_iv (SDLK_2),
690 const_iv (SDLK_3),
691 const_iv (SDLK_4),
692 const_iv (SDLK_5),
693 const_iv (SDLK_6),
694 const_iv (SDLK_7),
695 const_iv (SDLK_8),
696 const_iv (SDLK_9),
697 const_iv (SDLK_COLON),
698 const_iv (SDLK_SEMICOLON),
699 const_iv (SDLK_LESS),
700 const_iv (SDLK_EQUALS),
701 const_iv (SDLK_GREATER),
702 const_iv (SDLK_QUESTION),
703 const_iv (SDLK_AT),
704
705 const_iv (SDLK_LEFTBRACKET),
706 const_iv (SDLK_BACKSLASH),
707 const_iv (SDLK_RIGHTBRACKET),
708 const_iv (SDLK_CARET),
709 const_iv (SDLK_UNDERSCORE),
710 const_iv (SDLK_BACKQUOTE),
711 const_iv (SDLK_DELETE),
712
713 const_iv (SDLK_FIRST),
714 const_iv (SDLK_LAST),
529 const_iv (SDLK_KP0), 715 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 716 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 717 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 718 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 719 const_iv (SDLK_KP4),
… …
605 const_iv (KMOD_LMETA), 791 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 792 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 793 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 794 const_iv (KMOD_CAPS),
609 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)
610# undef const_iv 829# undef const_iv
611 }; 830 };
612 831
613 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--)
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
615 834
616 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
617 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
618} 837}
619 838
… …
631 RETVAL 850 RETVAL
632 851
633NV floor (NV x) 852NV floor (NV x)
634 853
635NV ceil (NV x) 854NV ceil (NV x)
855
856IV minpot (UV n)
857
858IV popcount (UV n)
859
860NV distance (NV dx, NV dy)
861 CODE:
862 RETVAL = pow (dx * dx + dy * dy, 0.5);
863 OUTPUT:
864 RETVAL
636 865
637void 866void
638pango_init () 867pango_init ()
639 CODE: 868 CODE:
640{ 869{
641 opengl_fontmap = pango_opengl_font_map_new (); 870 opengl_fontmap = pango_opengl_font_map_new ();
642 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);
643 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
644} 878}
645 879
646char *
647SDL_GetError () 880char *SDL_GetError ()
648 881
649int 882void SDL_main_hack (SV *real_main)
650SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 883 PROTOTYPE: &
651 884
652void 885int SDL_Init (U32 flags)
886
887int SDL_InitSubSystem (U32 flags)
888
889void SDL_QuitSubSystem (U32 flags)
890
653SDL_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
654 902
655void 903void
656SDL_ListModes (int rgb, int alpha) 904SDL_ListModes (int rgb, int alpha)
657 PPCODE: 905 PPCODE:
658{ 906{
… …
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 918 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 919 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 920 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
673 921
674 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 922 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
675#if SDL_VERSION_ATLEAST(1,2,10)
676 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
677 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 923 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
678#endif
679 924
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 925 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 926
682 if (m && m != (SDL_Rect **)-1) 927 if (m && m != (SDL_Rect **)-1)
683 while (*m) 928 while (*m)
684 { 929 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 930 if ((*m)->w >= 400 && (*m)->h >= 300)
686 { 931 {
687 AV *av = newAV (); 932 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 933 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 934 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 935 av_push (av, newSViv (rgb));
… …
713 ); 958 );
714 959
715 if (RETVAL) 960 if (RETVAL)
716 { 961 {
717 av_clear (texture_av); 962 av_clear (texture_av);
718
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
720#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);
721#include "glfunc.h" 964#include "glfunc.h"
722#undef GL_FUNC 965#undef GL_FUNC
966 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
967 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
723 } 968 }
724} 969}
725 OUTPUT: 970 OUTPUT:
726 RETVAL 971 RETVAL
972
973void
974SDL_WM_SetCaption (const char *title, const char *icon)
727 975
728void 976void
729SDL_GL_SwapBuffers () 977SDL_GL_SwapBuffers ()
730 978
731char * 979char *
732SDL_GetKeyName (int sym) 980SDL_GetKeyName (int sym)
981 C_ARGS: (SDLKey)sym
733 982
734int 983int
735SDL_GetAppState () 984SDL_GetAppState ()
736 985
986int
987SDL_GetModState ()
988
989int
990SDL_WaitEvent ()
991 C_ARGS: 0
992
737void 993void
994SDL_PumpEvents ()
995
996void
738poll_events () 997peep_events ()
739 PPCODE: 998 PPCODE:
740{ 999{
741 SDL_Event ev; 1000 SDL_Event ev;
742 1001
743 SDL_PumpEvents (); 1002 SDL_PumpEvents ();
… …
750 { 1009 {
751 case SDL_KEYDOWN: 1010 case SDL_KEYDOWN:
752 case SDL_KEYUP: 1011 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1012 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1013 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 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);
756 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 */
757 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1016 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 1017 break;
759 1018
760 case SDL_ACTIVEEVENT: 1019 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1020 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
779 x = ev.motion.x; 1038 x = ev.motion.x;
780 y = ev.motion.y; 1039 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1040 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 1041 }
783 1042
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1043 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 1044 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 1045 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 1046 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1047 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1048 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 1049 }
791 break; 1050 break;
792 1051
793 case SDL_MOUSEBUTTONDOWN: 1052 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 1053 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1054 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 1055
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1056 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1057 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1058 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1059 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1064 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1065 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 1066 break;
808 } 1067 }
809 1068
810 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))));
811 } 1070 }
812} 1071}
813 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
814int 1086int
815Mix_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)
816 POSTCALL: 1088 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 1089 Mix_HookMusicFinished (music_finished);
818 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}
819 1107
820void 1108void
821Mix_CloseAudio () 1109Mix_CloseAudio ()
822 1110
823int 1111int
… …
858 } 1146 }
859 } 1147 }
860#endif 1148#endif
861} 1149}
862 1150
863void 1151int
864add_font (char *file) 1152add_font (char *file)
865 CODE: 1153 CODE:
866 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)
867 1164
868void 1165void
869load_image_inline (SV *image_) 1166load_image_inline (SV *image_)
870 ALIAS: 1167 ALIAS:
871 load_image_file = 1 1168 load_image_file = 1
… …
917 1214
918 SDL_LockSurface (surface2); 1215 SDL_LockSurface (surface2);
919 EXTEND (SP, 6); 1216 EXTEND (SP, 6);
920 PUSHs (sv_2mortal (newSViv (surface2->w))); 1217 PUSHs (sv_2mortal (newSViv (surface2->w)));
921 PUSHs (sv_2mortal (newSViv (surface2->h))); 1218 PUSHs (sv_2mortal (newSViv (surface2->h)));
922 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1219 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
923 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)));
924 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1221 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
925 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1222 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
926 SDL_UnlockSurface (surface2); 1223 SDL_UnlockSurface (surface2);
927 1224
… …
957void 1254void
958error (char *message) 1255error (char *message)
959 CODE: 1256 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1257 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1258#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1259 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1260#endif
964 1261
965void 1262void
966fatal (char *message) 1263fatal (char *message)
967 CODE: 1264 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1265 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1266#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1267 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1268#endif
972 _exit (1); 1269 _exit (1);
973 1270
974void 1271void
975_exit (int retval = 0) 1272_exit (int retval = 0)
… …
987#if DEBUG 1284#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1285 VALGRIND_DO_LEAK_CHECK;
989#endif 1286#endif
990} 1287}
991 1288
992MODULE = 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
993 1297
994PROTOTYPES: DISABLE 1298PROTOTYPES: DISABLE
995 1299
996CFPlus::Font 1300DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1301new_from_file (SV *klass, char *path, int id = 0)
998 CODE: 1302 CODE:
999{ 1303{
1000 int count; 1304 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1305 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1002 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1306 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
1004} 1308}
1005 OUTPUT: 1309 OUTPUT:
1006 RETVAL 1310 RETVAL
1007 1311
1008void 1312void
1009DESTROY (CFPlus::Font self) 1313DESTROY (DC::Font self)
1010 CODE: 1314 CODE:
1011 pango_font_description_free (self); 1315 pango_font_description_free (self);
1012 1316
1013void 1317void
1014make_default (CFPlus::Font self) 1318make_default (DC::Font self)
1015 PROTOTYPE: $ 1319 PROTOTYPE: $
1016 CODE: 1320 CODE:
1017 default_font = self; 1321 default_font = self;
1018 1322
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1323MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1324
1021PROTOTYPES: DISABLE 1325PROTOTYPES: DISABLE
1022 1326
1023void 1327void
1024reset_glyph_cache () 1328glyph_cache_backup ()
1025 PROTOTYPE: 1329 PROTOTYPE:
1026 CODE: 1330 CODE:
1331 tc_backup ();
1332
1333void
1334glyph_cache_restore ()
1335 PROTOTYPE:
1336 CODE:
1027 tc_clear (); 1337 tc_restore ();
1028 1338
1029CFPlus::Layout 1339DC::Layout
1030new (SV *class) 1340new (SV *klass)
1031 CODE: 1341 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1342 New (0, RETVAL, 1, struct cf_layout);
1033 1343
1034 RETVAL->pl = pango_layout_new (opengl_context); 1344 RETVAL->pl = pango_layout_new (opengl_context);
1035 RETVAL->r = 1.; 1345 RETVAL->r = 1.;
1036 RETVAL->g = 1.; 1346 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1347 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1348 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1349 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1350 RETVAL->font = 0;
1351 RETVAL->rc = rc_alloc ();
1041 1352
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1353 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1354 layout_update_font (RETVAL);
1044 OUTPUT: 1355 OUTPUT:
1045 RETVAL 1356 RETVAL
1046 1357
1047void 1358void
1048DESTROY (CFPlus::Layout self) 1359DESTROY (DC::Layout self)
1049 CODE: 1360 CODE:
1050 g_object_unref (self->pl); 1361 g_object_unref (self->pl);
1362 rc_free (self->rc);
1051 Safefree (self); 1363 Safefree (self);
1052 1364
1053void 1365void
1054set_text (CFPlus::Layout self, SV *text_) 1366set_text (DC::Layout self, SV *text_)
1055 CODE: 1367 CODE:
1056{ 1368{
1057 STRLEN textlen; 1369 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1370 char *text = SvPVutf8 (text_, textlen);
1059 1371
1060 pango_layout_set_text (self->pl, text, textlen); 1372 pango_layout_set_text (self->pl, text, textlen);
1061} 1373}
1062 1374
1063void 1375void
1064set_markup (CFPlus::Layout self, SV *text_) 1376set_markup (DC::Layout self, SV *text_)
1065 CODE: 1377 CODE:
1066{ 1378{
1067 STRLEN textlen; 1379 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1380 char *text = SvPVutf8 (text_, textlen);
1069 1381
1070 pango_layout_set_markup (self->pl, text, textlen); 1382 pango_layout_set_markup (self->pl, text, textlen);
1071} 1383}
1072 1384
1073void 1385void
1074set_shapes (CFPlus::Layout self, ...) 1386set_shapes (DC::Layout self, ...)
1075 CODE: 1387 CODE:
1076{ 1388{
1077 PangoAttrList *attrs = 0; 1389 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1390 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1391 const char *pos = text;
… …
1114 if (attrs) 1426 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1427 pango_layout_set_attributes (self->pl, attrs);
1116} 1428}
1117 1429
1118void 1430void
1119get_shapes (CFPlus::Layout self) 1431get_shapes (DC::Layout self)
1120 PPCODE: 1432 PPCODE:
1121{ 1433{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1434 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1435
1124 do 1436 do
1125 { 1437 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1438 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1439
1128 if (run && shape_attr_p (run)) 1440 if (run && shape_attr_p (run))
1129 { 1441 {
1130 PangoRectangle extents; 1442 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1443 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1139 1451
1140 pango_layout_iter_free (iter); 1452 pango_layout_iter_free (iter);
1141} 1453}
1142 1454
1143int 1455int
1144has_wrapped (CFPlus::Layout self) 1456has_wrapped (DC::Layout self)
1145 CODE: 1457 CODE:
1146{ 1458{
1147 int lines = 1; 1459 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1460 const char *text = pango_layout_get_text (self->pl);
1149 1461
… …
1154} 1466}
1155 OUTPUT: 1467 OUTPUT:
1156 RETVAL 1468 RETVAL
1157 1469
1158SV * 1470SV *
1159get_text (CFPlus::Layout self) 1471get_text (DC::Layout self)
1160 CODE: 1472 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1473 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1474 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1475 OUTPUT:
1164 RETVAL 1476 RETVAL
1165 1477
1166void 1478void
1167set_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.)
1168 CODE: 1480 CODE:
1169 self->r = r; 1481 self->r = r;
1170 self->g = g; 1482 self->g = g;
1171 self->b = b; 1483 self->b = b;
1172 self->a = a; 1484 self->a = a;
1173 1485
1174void 1486void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1487set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1488 CODE:
1177 if (self->font != font) 1489 if (self->font != font)
1178 { 1490 {
1179 self->font = font; 1491 self->font = font;
1180 layout_update_font (self); 1492 layout_update_font (self);
1181 } 1493 }
1182 1494
1183void 1495void
1184set_height (CFPlus::Layout self, int base_height) 1496set_height (DC::Layout self, int base_height)
1185 CODE: 1497 CODE:
1186 if (self->base_height != base_height) 1498 if (self->base_height != base_height)
1187 { 1499 {
1188 self->base_height = base_height; 1500 self->base_height = base_height;
1189 layout_update_font (self); 1501 layout_update_font (self);
1190 } 1502 }
1191 1503
1192void 1504void
1193set_width (CFPlus::Layout self, int max_width = -1) 1505set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1506 CODE:
1195 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);
1196 1508
1197void 1509void
1198set_indent (CFPlus::Layout self, int indent) 1510set_indent (DC::Layout self, int indent)
1199 CODE: 1511 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1512 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1513
1202void 1514void
1203set_spacing (CFPlus::Layout self, int spacing) 1515set_spacing (DC::Layout self, int spacing)
1204 CODE: 1516 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1517 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1518
1207void 1519void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1520set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1521 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1522 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1523 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1524 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1525 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1526 : PANGO_ELLIPSIZE_NONE
1215 ); 1527 );
1216 1528
1217void 1529void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1530set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1531 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1532 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1533
1222void 1534void
1223size (CFPlus::Layout self) 1535size (DC::Layout self)
1224 PPCODE: 1536 PPCODE:
1225{ 1537{
1226 int w, h; 1538 int w, h;
1227 1539
1228 layout_get_pixel_size (self, &w, &h); 1540 layout_get_pixel_size (self, &w, &h);
… …
1231 PUSHs (sv_2mortal (newSViv (w))); 1543 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1544 PUSHs (sv_2mortal (newSViv (h)));
1233} 1545}
1234 1546
1235int 1547int
1236descent (CFPlus::Layout self) 1548descent (DC::Layout self)
1237 CODE: 1549 CODE:
1238{ 1550{
1239 PangoRectangle rect; 1551 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1552 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1553 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1554 RETVAL = PANGO_DESCENT (rect);
1243} 1555}
1244 OUTPUT: 1556 OUTPUT:
1245 RETVAL 1557 RETVAL
1246 1558
1247int 1559int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1560xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1561 CODE:
1250{ 1562{
1251 int index, trailing; 1563 int index, trailing;
1252 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);
1253 RETVAL = index + trailing; 1565 RETVAL = index + trailing;
1254} 1566}
1255 OUTPUT: 1567 OUTPUT:
1256 RETVAL 1568 RETVAL
1257 1569
1258void 1570void
1259cursor_pos (CFPlus::Layout self, int index) 1571cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1572 PPCODE:
1261{ 1573{
1262 PangoRectangle strong_pos; 1574 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1575 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1576
1265 EXTEND (SP, 3); 1577 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1578 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1579 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1580 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1581}
1270 1582
1271void 1583void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1584index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1585 PPCODE:
1274{ 1586{
1275 int line, x; 1587 int line, x;
1276 1588
1277 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)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1591 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1592 --line;
1593#endif
1280 EXTEND (SP, 2); 1594 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1595 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1596 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1597}
1284 1598
1285void 1599void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1600line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1601 PPCODE:
1288{ 1602{
1289 PangoLayoutLine *lp; 1603 PangoLayoutLine *lp;
1290 int index, trailing; 1604 int index, trailing;
1291 1605
1292 if (line < 0) 1606 if (line < 0)
1293 XSRETURN_EMPTY; 1607 XSRETURN_EMPTY;
1294 1608
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1609 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1610 XSRETURN_EMPTY; /* do better */
1297 1611
1298 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);
1299 1613
1300 EXTEND (SP, 2); 1614 EXTEND (SP, 2);
… …
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1620 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1621 }
1308} 1622}
1309 1623
1310void 1624void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1625render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1626 CODE:
1627 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1628 pango_opengl_render_layout_subpixel (
1314 self->pl, 1629 self->pl,
1630 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1631 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1632 self->r, self->g, self->b, self->a,
1317 flags 1633 flags
1318 ); 1634 );
1635 // we assume that context_change actually clears/frees stuff
1636 // and does not do any recomputation...
1637 pango_layout_context_changed (self->pl);
1319 1638
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1639void
1640draw (DC::Layout self)
1641 CODE:
1642{
1643 glEnable (GL_TEXTURE_2D);
1644 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1645 glEnable (GL_BLEND);
1646 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1647 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1648 glEnable (GL_ALPHA_TEST);
1649 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1650
1651 rc_draw (self->rc);
1652
1653 glDisable (GL_ALPHA_TEST);
1654 glDisable (GL_BLEND);
1655 glDisable (GL_TEXTURE_2D);
1656}
1657
1658MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1659
1322PROTOTYPES: ENABLE 1660PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1661
1326void 1662void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1663pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1664 CODE:
1329{ 1665{
… …
1395 glDisable (GL_ALPHA_TEST); 1731 glDisable (GL_ALPHA_TEST);
1396 glDisable (GL_BLEND); 1732 glDisable (GL_BLEND);
1397 } 1733 }
1398} 1734}
1399 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
1400IV 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)
1401 CODE: 1858 CODE:
1402{ 1859{
1403 GLint width; 1860 GLint width;
1404 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);
… …
1406 RETVAL = width > 0; 1863 RETVAL = width > 0;
1407} 1864}
1408 OUTPUT: 1865 OUTPUT:
1409 RETVAL 1866 RETVAL
1410 1867
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1868MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1869
1413PROTOTYPES: DISABLE 1870PROTOTYPES: DISABLE
1414 1871
1415CFPlus::Map 1872DC::Map
1416new (SV *class) 1873new (SV *klass)
1417 CODE: 1874 CODE:
1418 New (0, RETVAL, 1, struct map); 1875 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1876 RETVAL->x = 0;
1420 RETVAL->y = 0; 1877 RETVAL->y = 0;
1421 RETVAL->w = 0; 1878 RETVAL->w = 0;
… …
1428 RETVAL->row = 0; 1885 RETVAL->row = 0;
1429 OUTPUT: 1886 OUTPUT:
1430 RETVAL 1887 RETVAL
1431 1888
1432void 1889void
1433DESTROY (CFPlus::Map self) 1890DESTROY (DC::Map self)
1434 CODE: 1891 CODE:
1435{ 1892{
1436 map_clear (self); 1893 map_clear (self);
1437 Safefree (self->face2tile); 1894 Safefree (self->face2tile);
1438 Safefree (self->tex); 1895 Safefree (self->tex);
1439 Safefree (self); 1896 Safefree (self);
1440} 1897}
1441 1898
1442void 1899void
1443resize (CFPlus::Map self, int map_width, int map_height) 1900resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1901 CODE:
1445 self->w = map_width; 1902 self->w = map_width;
1446 self->h = map_height; 1903 self->h = map_height;
1447 1904
1448void 1905void
1449clear (CFPlus::Map self) 1906clear (DC::Map self)
1450 CODE: 1907 CODE:
1451 map_clear (self); 1908 map_clear (self);
1452 1909
1453void 1910void
1454set_tileid (CFPlus::Map self, int face, int tile) 1911set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1912 CODE:
1456{ 1913{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1914 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1915 need_texid (self, tile);
1459} 1916}
1460 1917
1461void 1918void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1919set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1920 CODE:
1464{ 1921{
1465 tileid texid; 1922 tileid texid;
1466 maptex *tex; 1923 maptex *tex;
1467 1924
… …
1480 tex->smoothtile = self->face2tile [smooth]; 1937 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1938 tex->smoothlevel = level;
1482} 1939}
1483 1940
1484void 1941void
1485set_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)
1486 CODE: 1943 CODE:
1487{ 1944{
1488 need_texid (self, texid); 1945 need_texid (self, texid);
1489 1946
1490 { 1947 {
… …
1509 // use uglier nearest interpolation because linear suffers 1966 // use uglier nearest interpolation because linear suffers
1510 // from transparent color bleeding and ugly wrapping effects. 1967 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1968 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1969}
1513 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
1514int 1991int
1515ox (CFPlus::Map self) 1992ox (DC::Map self)
1516 ALIAS: 1993 ALIAS:
1517 oy = 1 1994 oy = 1
1518 x = 2 1995 x = 2
1519 y = 3 1996 y = 3
1520 w = 4 1997 w = 4
… …
1531 } 2008 }
1532 OUTPUT: 2009 OUTPUT:
1533 RETVAL 2010 RETVAL
1534 2011
1535void 2012void
1536scroll (CFPlus::Map self, int dx, int dy) 2013scroll (DC::Map self, int dx, int dy)
1537 CODE: 2014 CODE:
1538{ 2015{
1539 if (dx > 0) 2016 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 2017 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 2018 else if (dx < 0)
… …
1557 self->y += MAP_EXTEND_Y; 2034 self->y += MAP_EXTEND_Y;
1558 } 2035 }
1559} 2036}
1560 2037
1561SV * 2038SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 2039map1a_update (DC::Map self, SV *data_)
1563 CODE: 2040 CODE:
1564{ 2041{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2042 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 2043 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 2044 mapcell *cell;
… …
1588 2065
1589 //TODO: don't trust server data to be in-range(!) 2066 //TODO: don't trust server data to be in-range(!)
1590 2067
1591 if (flags & 8) 2068 if (flags & 8)
1592 { 2069 {
2070 uint8_t ext, cmd;
2071
1593 if (extmap) 2072 do
1594 { 2073 {
1595 uint8_t ext, cmd; 2074 ext = *data++;
2075 cmd = ext & 0x7f;
1596 2076
1597 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
1598 { 2080 {
1599 ext = *data++;
1600 cmd = ext & 0x3f;
1601
1602 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1;
1604 else if (cmd == 5) // health
1605 {
1606 cell->stat_width = 1; 2081 cell->stat_width = 1;
1607 cell->stat_hp = *data++; 2082 cell->stat_hp = *data++;
1608 }
1609 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47)
1612 {
1613 if (*data == 4)
1614 ; // decode player count
1615
1616 data += *data + 1;
1617 }
1618 else if (cmd == 8) // cell flags
1619 cell->flags = *data++;
1620 else if (ext & 0x40) // unknown, multibyte => skip
1621 data += *data + 1;
1622 else
1623 data++;
1624 } 2083 }
1625 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++;
1626 } 2101 }
1627 else 2102 while (ext & 0x80);
1628 cell->darkness = *data++ + 1;
1629 } 2103 }
1630 2104
1631 for (z = 0; z <= 2; ++z) 2105 for (z = 0; z <= 2; ++z)
1632 if (flags & (4 >> z)) 2106 if (flags & (4 >> z))
1633 { 2107 {
… …
1636 cell->tile [z] = self->face2tile [face]; 2110 cell->tile [z] = self->face2tile [face];
1637 2111
1638 if (cell->tile [z]) 2112 if (cell->tile [z])
1639 { 2113 {
1640 maptex *tex = self->tex + cell->tile [z]; 2114 maptex *tex = self->tex + cell->tile [z];
2115 tex->unused = 0;
1641 if (!tex->name) 2116 if (!tex->name)
1642 av_push (missing, newSViv (cell->tile [z])); 2117 av_push (missing, newSViv (cell->tile [z]));
1643 2118
1644 if (tex->smoothtile) 2119 if (tex->smoothtile)
1645 { 2120 {
1646 maptex *smooth = self->tex + tex->smoothtile; 2121 maptex *smooth = self->tex + tex->smoothtile;
2122 smooth->unused = 0;
1647 if (!smooth->name) 2123 if (!smooth->name)
1648 av_push (missing, newSViv (tex->smoothtile)); 2124 av_push (missing, newSViv (tex->smoothtile));
1649 } 2125 }
1650 } 2126 }
1651 } 2127 }
1652 } 2128 }
1653 else 2129 else
1654 cell->darkness = 0; 2130 CELL_CLEAR (cell);
1655 } 2131 }
1656} 2132}
1657 OUTPUT: 2133 OUTPUT:
1658 RETVAL 2134 RETVAL
1659 2135
1660SV * 2136SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2137mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 2138 CODE:
1663{ 2139{
1664 int x1, x; 2140 int x1, x;
1665 int y1, y; 2141 int y1, y;
1666 int z; 2142 int z;
… …
1679 ? self->row + y 2155 ? self->row + y
1680 : 0; 2156 : 0;
1681 2157
1682 for (x = x0; x < x1; x++) 2158 for (x = x0; x < x1; x++)
1683 { 2159 {
1684 int r = 32, g = 32, b = 32, a = 192; 2160 unsigned int r = 32, g = 32, b = 32, a = 192;
1685 2161
1686 if (row && row->c0 <= x && x < row->c1) 2162 if (row && row->c0 <= x && x < row->c1)
1687 { 2163 {
1688 mapcell *cell = row->col + (x - row->c0); 2164 mapcell *cell = row->col + (x - row->c0);
1689 2165
… …
1691 { 2167 {
1692 maptex tex = self->tex [cell->tile [z]]; 2168 maptex tex = self->tex [cell->tile [z]];
1693 int a0 = 255 - tex.a; 2169 int a0 = 255 - tex.a;
1694 int a1 = tex.a; 2170 int a1 = tex.a;
1695 2171
1696 r = (r * a0 + tex.r * a1) / 255; 2172 r = div255 (r * a0 + tex.r * a1);
1697 g = (g * a0 + tex.g * a1) / 255; 2173 g = div255 (g * a0 + tex.g * a1);
1698 b = (b * a0 + tex.b * a1) / 255; 2174 b = div255 (b * a0 + tex.b * a1);
1699 a = (a * a0 + tex.a * a1) / 255; 2175 a = div255 (a * a0 + tex.a * a1);
1700 } 2176 }
1701 } 2177 }
1702 2178
1703 *map++ = (r ) 2179 *map++ = (r )
1704 | (g << 8) 2180 | (g << 8)
… …
1711} 2187}
1712 OUTPUT: 2188 OUTPUT:
1713 RETVAL 2189 RETVAL
1714 2190
1715void 2191void
1716draw (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)
1717 CODE: 2193 CODE:
1718{ 2194{
1719 int x, y, z; 2195 int x, y, z;
1720 2196
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2197 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 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
1723 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2199 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 2200 smooth_key skey;
1725 2201 int pl_x, pl_y;
2202 maptex pl_tex;
1726 rc_t *rc = rc_alloc (); 2203 rc_t *rc = rc_alloc ();
2204 rc_t *rc_ov = rc_alloc ();
1727 rc_key_t key; 2205 rc_key_t key;
1728 rc_array_t *arr; 2206 rc_array_t *arr;
1729 2207
2208 pl_tex.name = 0;
2209
1730 // thats current max. sorry. 2210 // that's current max. sorry.
1731 if (sw > 255) sw = 255; 2211 if (sw > 255) sw = 255;
1732 if (sh > 255) sh = 255; 2212 if (sh > 255) sh = 255;
1733 2213
1734 // clear key, in case of extra padding 2214 // clear key, in case of extra padding
1735 memset (&skey, 0, sizeof (skey)); 2215 memset (&skey, 0, sizeof (skey));
… …
1739 key.g = 255; 2219 key.g = 255;
1740 key.b = 255; 2220 key.b = 255;
1741 key.a = 255; 2221 key.a = 255;
1742 key.mode = GL_QUADS; 2222 key.mode = GL_QUADS;
1743 key.format = GL_T2F_V3F; 2223 key.format = GL_T2F_V3F;
1744 key.texname = -1;
1745 2224
1746 mx += self->x; 2225 mx += self->x;
1747 my += self->y; 2226 my += self->y;
1748 2227
1749 // first pass: determine smooth_max 2228 // first pass: determine smooth_max
… …
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2252 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774 2253
1775 for (z = 0; z <= 2; z++) 2254 for (z = 0; z <= 2; z++)
1776 { 2255 {
1777 memset (smooth_level, 0, sizeof (smooth_level)); 2256 memset (smooth_level, 0, sizeof (smooth_level));
2257 key.texname = -1;
1778 2258
1779 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1780 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1781 { 2261 {
1782 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
… …
1790 if (tile) 2270 if (tile)
1791 { 2271 {
1792 maptex tex = self->tex [tile]; 2272 maptex tex = self->tex [tile];
1793 int px, py; 2273 int px, py;
1794 2274
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 2275 if (key.texname != tex.name)
1798 { 2276 {
2277 self->tex [tile].unused = 0;
2278
1799 if (!tex.name) 2279 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 2280 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1801 2281
1802 key.texname = tex.name; 2282 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 2283 arr = rc_array (rc, &key);
1804 } 2284 }
1805 2285
1806 px = (x + 1) * T - tex.w; 2286 px = (x + 1) * Th - tex.w;
1807 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 }
1808 2296
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810 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);
1811 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);
1812 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);
1813
1814 if (cell->flags && z == 2)
1815 {
1816 // overlays such as the speech bubble, probably more to come
1817 if (cell->flags & 1)
1818 {
1819 maptex tex = self->tex [1];
1820 int px = x * T + T * 2 / 32;
1821 int py = y * T - T * 6 / 32;
1822
1823 if (tex.name)
1824 {
1825 if (key.texname != tex.name)
1826 {
1827 key.texname = tex.name;
1828 arr = rc_array (rc, &key);
1829 }
1830
1831 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1832 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1833 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1834 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1835 }
1836 }
1837 }
1838 2301
1839 // update smooth hash 2302 // update smooth hash
1840 if (tex.smoothtile) 2303 if (tex.smoothtile)
1841 { 2304 {
1842 skey.tile = tex.smoothtile; 2305 skey.tile = tex.smoothtile;
… …
1873 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);
1874 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);
1875 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);
1876 } 2339 }
1877 } 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);
2360 }
2361 }
1878 } 2362 }
1879 } 2363 }
2364
2365 rc_draw (rc);
2366 rc_clear (rc);
1880 2367
1881 // go through all smoothlevels, lowest to highest, then draw. 2368 // go through all smoothlevels, lowest to highest, then draw.
1882 // this is basically counting sort 2369 // this is basically counting sort
1883 { 2370 {
1884 int w, b; 2371 int w, b;
1885 2372
2373 glEnable (GL_TEXTURE_2D);
2374 glBegin (GL_QUADS);
1886 for (w = 0; w < 256 / 32; ++w) 2375 for (w = 0; w < 256 / 32; ++w)
1887 { 2376 {
1888 uint32_t smask = smooth_level [w]; 2377 uint32_t smask = smooth_level [w];
1889 if (smask) 2378 if (smask)
1890 for (b = 0; b < 32; ++b) 2379 for (b = 0; b < 32; ++b)
… …
1902 if (!(bits & 0x1000) 2391 if (!(bits & 0x1000)
1903 && skey->level == level 2392 && skey->level == level
1904 && level > smooth_max [skey->x][skey->y]) 2393 && level > smooth_max [skey->x][skey->y])
1905 { 2394 {
1906 maptex tex = self->tex [skey->tile]; 2395 maptex tex = self->tex [skey->tile];
1907 int px = (((int)skey->x) - 1) * T; 2396 int px = (((int)skey->x) - 1) * Tw;
1908 int py = (((int)skey->y) - 1) * T; 2397 int py = (((int)skey->y) - 1) * Th;
1909 int border = bits & 15; 2398 int border = bits & 15;
1910 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2399 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1911 float dx = tex.s * .0625f; // 16 images/row 2400 float dx = tex.s * .0625f; // 16 images/row
1912 float dy = tex.t * .5f ; // 2 images/column 2401 float dy = tex.t * .5f ; // 2 images/column
1913 2402
… …
1915 { 2404 {
1916 // this time avoiding texture state changes 2405 // this time avoiding texture state changes
1917 // save gobs of state changes. 2406 // save gobs of state changes.
1918 if (key.texname != tex.name) 2407 if (key.texname != tex.name)
1919 { 2408 {
2409 self->tex [skey->tile].unused = 0;
2410
2411 glEnd ();
1920 key.texname = tex.name; 2412 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1921 arr = rc_array (rc, &key); 2413 glBegin (GL_QUADS);
1922 } 2414 }
1923 2415
1924 if (border) 2416 if (border)
1925 { 2417 {
1926 float ox = border * dx; 2418 float ox = border * dx;
1927 2419
1928 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2420 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1929 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2421 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1930 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2422 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1931 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2423 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1932 } 2424 }
1933 2425
1934 if (corner) 2426 if (corner)
1935 { 2427 {
1936 float ox = corner * dx; 2428 float ox = corner * dx;
1937 2429
1938 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2430 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1939 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2431 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1940 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2432 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1941 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2433 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1942 } 2434 }
1943 } 2435 }
1944 } 2436 }
1945 } 2437 }
1946 } 2438 }
1947 } 2439 }
2440
2441 glEnd ();
2442 glDisable (GL_TEXTURE_2D);
2443 key.texname = -1;
1948 } 2444 }
1949 2445
1950 hv_clear (smooth); 2446 hv_clear (smooth);
2447 }
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
1951 rc_draw (rc); 2463 rc_draw (rc);
1952 rc_clear (rc);
1953 } 2464 }
2465
2466 rc_draw (rc_ov);
2467 rc_clear (rc_ov);
1954 2468
1955 glDisable (GL_BLEND); 2469 glDisable (GL_BLEND);
1956 rc_free (rc); 2470 rc_free (rc);
2471 rc_free (rc_ov);
1957 2472
1958 // top layer: overlays such as the health bar 2473 // top layer: overlays such as the health bar
1959 for (y = 0; y < sh; y++) 2474 for (y = 0; y < sh; y++)
1960 if (0 <= y + my && y + my < self->rows) 2475 if (0 <= y + my && y + my < self->rows)
1961 { 2476 {
… …
1964 for (x = 0; x < sw; x++) 2479 for (x = 0; x < sw; x++)
1965 if (row->c0 <= x + mx && x + mx < row->c1) 2480 if (row->c0 <= x + mx && x + mx < row->c1)
1966 { 2481 {
1967 mapcell *cell = row->col + (x + mx - row->c0); 2482 mapcell *cell = row->col + (x + mx - row->c0);
1968 2483
1969 int px = x * T; 2484 int px = x * Tw;
1970 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 }
1971 2492
1972 if (cell->stat_hp) 2493 if (cell->stat_hp)
1973 { 2494 {
1974 int width = cell->stat_width * T; 2495 int width = cell->stat_width * Tw;
1975 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2496 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1976 2497
1977 glColor3ub (0, 0, 0); 2498 glColor3ub (0, 0, 0);
1978 glRectf (px + 1, py - thick - 2, 2499 glRectf (px + 1, py - thick - 2,
1979 px + width - 1, py); 2500 px + width - 1, py);
1980 2501
… …
1986 } 2507 }
1987 } 2508 }
1988} 2509}
1989 2510
1990void 2511void
1991draw_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)
1992 CODE: 2513 CODE:
1993{ 2514{
1994 static float color[16][3] = { 2515 static float color[16][3] = {
1995 { 0.00F, 0.00F, 0.00F }, 2516 { 0.00f, 0.00f, 0.00f },
1996 { 1.00F, 1.00F, 1.00F }, 2517 { 1.00f, 1.00f, 1.00f },
1997 { 0.00F, 0.00F, 0.55F }, 2518 { 0.00f, 0.00f, 0.55f },
1998 { 1.00F, 0.00F, 0.00F }, 2519 { 1.00f, 0.00f, 0.00f },
1999 2520
2000 { 1.00F, 0.54F, 0.00F }, 2521 { 1.00f, 0.54f, 0.00f },
2001 { 0.11F, 0.56F, 1.00F }, 2522 { 0.11f, 0.56f, 1.00f },
2002 { 0.93F, 0.46F, 0.00F }, 2523 { 0.93f, 0.46f, 0.00f },
2003 { 0.18F, 0.54F, 0.34F }, 2524 { 0.18f, 0.54f, 0.34f },
2004 2525
2005 { 0.56F, 0.73F, 0.56F }, 2526 { 0.56f, 0.73f, 0.56f },
2006 { 0.80F, 0.80F, 0.80F }, 2527 { 0.80f, 0.80f, 0.80f },
2007 { 0.55F, 0.41F, 0.13F }, 2528 { 0.55f, 0.41f, 0.13f },
2008 { 0.99F, 0.77F, 0.26F }, 2529 { 0.99f, 0.77f, 0.26f },
2009 2530
2010 { 0.74F, 0.65F, 0.41F }, 2531 { 0.74f, 0.65f, 0.41f },
2011 2532
2012 { 0.00F, 1.00F, 1.00F }, 2533 { 0.00f, 1.00f, 1.00f },
2013 { 1.00F, 0.00F, 1.00F }, 2534 { 1.00f, 0.00f, 1.00f },
2014 { 1.00F, 1.00F, 0.00F }, 2535 { 1.00f, 1.00f, 0.00f },
2015 }; 2536 };
2016 2537
2017 int x, y; 2538 int x, y;
2018 2539
2019 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 */
2020 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2547 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2021 glEnable (GL_BLEND); 2548 glEnable (GL_BLEND);
2022 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2549 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2023 glBegin (GL_QUADS); 2550 glBegin (GL_QUADS);
2024 2551
2025 for (y = 0; y < h; y++) 2552 for (y = 0; y < h; y++)
… …
2029 2556
2030 if (m) 2557 if (m)
2031 { 2558 {
2032 float *c = color [m & 15]; 2559 float *c = color [m & 15];
2033 2560
2034 float tx1 = m & 0x40 ? 0.5 : 0.; 2561 float tx1 = m & 0x40 ? 0.5f : 0.f;
2035 float tx2 = tx1 + 0.5; 2562 float tx2 = tx1 + 0.5f;
2036 2563
2037 glColor4f (c[0], c[1], c[2], 0.75); 2564 glColor4f (c[0], c[1], c[2], 1);
2038 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2565 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2039 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2566 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2040 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2567 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2041 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2568 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2042 } 2569 }
… …
2046 glDisable (GL_BLEND); 2573 glDisable (GL_BLEND);
2047 glDisable (GL_TEXTURE_2D); 2574 glDisable (GL_TEXTURE_2D);
2048} 2575}
2049 2576
2050void 2577void
2051fow_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)
2052 PPCODE: 2579 PPCODE:
2053{ 2580{
2054 int x, y; 2581 int x, y;
2055 int sw1 = sw + 2; 2582 int sw1 = sw + 2;
2056 int sh1 = sh + 2; 2583 int sh1 = sh + 2;
2057 int sh3 = sh * 3; 2584 int sh3 = sh * 3;
2058 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);
2059 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2588 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2060 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2589 memset (darkness1, 0, sw1*sh1);
2061 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2062 2590
2063 SvPOK_only (darkness3_sv); 2591 SvPOK_only (darkness3_sv);
2064 SvCUR_set (darkness3_sv, sw34 * sh3); 2592 SvCUR_set (darkness3_sv, sw3 * sh3);
2065 2593
2066 mx += self->x - 1; 2594 mx += self->x - 1;
2067 my += self->y - 1; 2595 my += self->y - 1;
2068
2069 memset (darkness1, 255, sw1 * sh1);
2070 2596
2071 for (y = 0; y < sh1; y++) 2597 for (y = 0; y < sh1; y++)
2072 if (0 <= y + my && y + my < self->rows) 2598 if (0 <= y + my && y + my < self->rows)
2073 { 2599 {
2074 maprow *row = self->row + (y + my); 2600 maprow *row = self->row + (y + my);
… …
2077 if (row->c0 <= x + mx && x + mx < row->c1) 2603 if (row->c0 <= x + mx && x + mx < row->c1)
2078 { 2604 {
2079 mapcell *cell = row->col + (x + mx - row->c0); 2605 mapcell *cell = row->col + (x + mx - row->c0);
2080 2606
2081 darkness1 [y * sw1 + x] = cell->darkness 2607 darkness1 [y * sw1 + x] = cell->darkness
2082 ? 255 - (cell->darkness - 1) 2608 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2083 : 255 - FOW_DARKNESS; 2609 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2084 } 2610 }
2085 } 2611 }
2086 2612
2087 for (y = 0; y < sh; ++y) 2613 for (y = 0; y < sh; ++y)
2088 for (x = 0; x < sw; ++x) 2614 for (x = 0; x < sw; ++x)
… …
2107 2633
2108 uint8_t r13 = (d13 + d23 + d12) / 3; 2634 uint8_t r13 = (d13 + d23 + d12) / 3;
2109 uint8_t r23 = d23; 2635 uint8_t r23 = d23;
2110 uint8_t r33 = (d23 + d33 + d32) / 3; 2636 uint8_t r33 = (d23 + d33 + d32) / 3;
2111 2637
2112 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2113 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2114 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2115 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2116 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 */
2117 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2118 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2119 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2120 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2121 } 2647 }
2122 2648
2123 free (darkness1); 2649 free (darkness1);
2124 2650
2125 EXTEND (SP, 3); 2651 EXTEND (SP, 3);
2126 PUSHs (sv_2mortal (newSViv (sw34))); 2652 PUSHs (sv_2mortal (newSViv (sw3)));
2127 PUSHs (sv_2mortal (newSViv (sh3))); 2653 PUSHs (sv_2mortal (newSViv (sh3)));
2128 PUSHs (darkness3_sv); 2654 PUSHs (darkness3_sv);
2129} 2655}
2130 2656
2131SV * 2657SV *
2132get_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)
2133 CODE: 2659 CODE:
2134{ 2660{
2135 int x, y, x1, y1; 2661 int x, y, x1, y1;
2136 SV *data_sv = newSV (w * h * 7 + 5); 2662 SV *data_sv = newSV (w * h * 7 + 5);
2137 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2663 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2194 else 2720 else
2195 *data++ = 0; 2721 *data++ = 0;
2196 } 2722 }
2197 } 2723 }
2198 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 {
2199 SvPOK_only (data_sv); 2728 SvPOK_only (data_sv);
2200 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2729 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2730 }
2731
2201 RETVAL = data_sv; 2732 RETVAL = data_sv;
2202} 2733}
2203 OUTPUT: 2734 OUTPUT:
2204 RETVAL 2735 RETVAL
2205 2736
2206void 2737void
2207set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2738set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2208 PPCODE: 2739 PPCODE:
2209{ 2740{
2210 int x, y, z; 2741 int x, y, z;
2211 int w, h; 2742 int w, h;
2212 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;
2213 2754
2214 if (*data++ != 0) 2755 if (*data++ != 0)
2215 return; /* version mismatch */ 2756 XSRETURN_EMPTY; /* version mismatch */
2216 2757
2217 w = *data++ << 8; w |= *data++; 2758 w = *data++ << 8; w |= *data++;
2218 h = *data++ << 8; h |= *data++; 2759 h = *data++ << 8; h |= *data++;
2219 2760
2220 // we need to do this 'cause we don't keep an absolute coord system for rows 2761 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2232 { 2773 {
2233 maprow *row = map_get_row (self, y); 2774 maprow *row = map_get_row (self, y);
2234 2775
2235 for (x = x0; x < x1; x++) 2776 for (x = x0; x < x1; x++)
2236 { 2777 {
2778 uint8_t flags;
2779
2780 if (data + 7 >= end)
2781 XSRETURN_EMPTY;
2782
2237 uint8_t flags = *data++; 2783 flags = *data++;
2238 2784
2239 if (flags) 2785 if (flags)
2240 { 2786 {
2241 mapcell *cell = row_get_cell (row, x); 2787 mapcell *cell = row_get_cell (row, x);
2242 tileid tile[3] = { 0, 0, 0 }; 2788 tileid tile[3] = { 0, 0, 0 };
… …
2245 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2791 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2246 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2792 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2247 2793
2248 if (cell->darkness == 0) 2794 if (cell->darkness == 0)
2249 { 2795 {
2250 cell->darkness = 0; 2796 /*cell->darkness = 0;*/
2797 EXTEND (SP, 3);
2251 2798
2252 for (z = 0; z <= 2; z++) 2799 for (z = 0; z <= 2; z++)
2253 { 2800 {
2254 tileid t = tile [z]; 2801 tileid t = tile [z];
2255 2802
2256 if (t >= self->texs || (t && !self->tex [t].name)) 2803 if (t >= self->texs || (t && !self->tex [t].name))
2257 { 2804 {
2258 XPUSHs (sv_2mortal (newSViv (t))); 2805 PUSHs (sv_2mortal (newSViv (t)));
2259 need_texid (self, t); 2806 need_texid (self, t);
2260 } 2807 }
2261 2808
2262 cell->tile [z] = t; 2809 cell->tile [z] = t;
2263 } 2810 }
… …
2265 } 2812 }
2266 } 2813 }
2267 } 2814 }
2268} 2815}
2269 2816
2270MODULE = CFPlus PACKAGE = CFPlus::RW 2817MODULE = Deliantra::Client PACKAGE = DC::RW
2271 2818
2272CFPlus::RW 2819DC::RW
2273new (SV *class, SV *data_sv) 2820new (SV *klass, SV *data_sv)
2274 CODE: 2821 CODE:
2275{ 2822{
2276 STRLEN datalen; 2823 STRLEN datalen;
2277 char *data = SvPVbyte (data_sv, datalen); 2824 char *data = SvPVbyte (data_sv, datalen);
2278 2825
2279 RETVAL = SDL_RWFromConstMem (data, datalen); 2826 RETVAL = SDL_RWFromConstMem (data, datalen);
2280} 2827}
2281 OUTPUT: 2828 OUTPUT:
2282 RETVAL 2829 RETVAL
2283 2830
2284CFPlus::RW 2831DC::RW
2285new_from_file (SV *class, const char *path, const char *mode = "rb") 2832new_from_file (SV *klass, const char *path, const char *mode = "rb")
2286 CODE: 2833 CODE:
2287 RETVAL = SDL_RWFromFile (path, mode); 2834 RETVAL = SDL_RWFromFile (path, mode);
2288 OUTPUT: 2835 OUTPUT:
2289 RETVAL 2836 RETVAL
2290 2837
2291# fails on win32: 2838# fails on win32:
2292# CFPlus.xs(2268) : error C2059: syntax error : '(' 2839# dc.xs(2268) : error C2059: syntax error : '('
2293#void 2840#void
2294#close (CFPlus::RW self) 2841#close (DC::RW self)
2295# CODE: 2842# CODE:
2296# (self->(close)) (self); 2843# (self->(close)) (self);
2297 2844
2298MODULE = CFPlus PACKAGE = CFPlus::Channel 2845MODULE = Deliantra::Client PACKAGE = DC::Channel
2299 2846
2300PROTOTYPES: DISABLE 2847PROTOTYPES: DISABLE
2301 2848
2302CFPlus::Channel 2849DC::Channel
2303find () 2850find ()
2304 CODE: 2851 CODE:
2305{ 2852{
2306 RETVAL = Mix_GroupAvailable (-1); 2853 RETVAL = Mix_GroupAvailable (-1);
2307 2854
2308 if (RETVAL < 0) 2855 if (RETVAL < 0)
2309 { 2856 {
2310 RETVAL = Mix_GroupOldest (-1); 2857 RETVAL = Mix_GroupOldest (-1);
2311 2858
2312 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)
2313 XSRETURN_UNDEF; 2865 XSRETURN_UNDEF;
2314 2866 }
2867 else
2315 Mix_HaltChannel (RETVAL); 2868 Mix_HaltChannel (RETVAL);
2316 } 2869 }
2317 2870
2318 Mix_UnregisterAllEffects (RETVAL); 2871 Mix_UnregisterAllEffects (RETVAL);
2319 Mix_Volume (RETVAL, 128); 2872 Mix_Volume (RETVAL, 128);
2320} 2873}
2321 OUTPUT: 2874 OUTPUT:
2322 RETVAL 2875 RETVAL
2323 2876
2324void 2877void
2325halt (CFPlus::Channel self) 2878halt (DC::Channel self)
2326 CODE: 2879 CODE:
2327 Mix_HaltChannel (self); 2880 Mix_HaltChannel (self);
2328 2881
2329void 2882void
2330expire (CFPlus::Channel self, int ticks = -1) 2883expire (DC::Channel self, int ticks = -1)
2331 CODE: 2884 CODE:
2332 Mix_ExpireChannel (self, ticks); 2885 Mix_ExpireChannel (self, ticks);
2333 2886
2334void 2887void
2335fade_out (CFPlus::Channel self, int ticks = -1) 2888fade_out (DC::Channel self, int ticks = -1)
2336 CODE: 2889 CODE:
2337 Mix_FadeOutChannel (self, ticks); 2890 Mix_FadeOutChannel (self, ticks);
2338 2891
2339int 2892int
2340volume (CFPlus::Channel self, int volume) 2893volume (DC::Channel self, int volume)
2341 CODE: 2894 CODE:
2342 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2895 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2343 OUTPUT: 2896 OUTPUT:
2344 RETVAL 2897 RETVAL
2345 2898
2346void 2899void
2347unregister_all_effects (CFPlus::Channel self) 2900unregister_all_effects (DC::Channel self)
2348 CODE: 2901 CODE:
2349 Mix_UnregisterAllEffects (self); 2902 Mix_UnregisterAllEffects (self);
2350 2903
2351void 2904void
2352set_panning (CFPlus::Channel self, int left, int right) 2905set_panning (DC::Channel self, int left, int right)
2353 CODE: 2906 CODE:
2354 left = CLAMP (left , 0, 255); 2907 left = CLAMP (left , 0, 255);
2355 right = CLAMP (right, 0, 255); 2908 right = CLAMP (right, 0, 255);
2356 Mix_SetPanning (self, left, right); 2909 Mix_SetPanning (self, left, right);
2357 2910
2358void 2911void
2359set_distance (CFPlus::Channel self, int distance) 2912set_distance (DC::Channel self, int distance)
2360 CODE: 2913 CODE:
2361 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2914 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2362 2915
2363void 2916void
2364set_position (CFPlus::Channel self, int angle, int distance) 2917set_position (DC::Channel self, int angle, int distance)
2365 CODE: 2918 CODE:
2366 2919
2367void 2920void
2368set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2921set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2369 CODE: 2922 CODE:
2370{ 2923{
2371 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));
2372 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;
2373 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2926 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2374} 2927}
2375 2928
2376void 2929void
2377set_reverse_stereo (CFPlus::Channel self, int flip) 2930set_reverse_stereo (DC::Channel self, int flip)
2378 CODE: 2931 CODE:
2379 Mix_SetReverseStereo (self, flip); 2932 Mix_SetReverseStereo (self, flip);
2380 2933
2381MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2934MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2382 2935
2383PROTOTYPES: DISABLE 2936PROTOTYPES: DISABLE
2384 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
2385CFPlus::MixChunk 2950DC::MixChunk
2386new (SV *class, CFPlus::RW rwops) 2951new (SV *klass, DC::RW rwops)
2387 CODE: 2952 CODE:
2388 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2953 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2389 OUTPUT: 2954 OUTPUT:
2390 RETVAL 2955 RETVAL
2391 2956
2392void 2957void
2393DESTROY (CFPlus::MixChunk self) 2958DESTROY (DC::MixChunk self)
2394 CODE: 2959 CODE:
2395 Mix_FreeChunk (self); 2960 Mix_FreeChunk (self);
2396 2961
2397int 2962int
2398volume (CFPlus::MixChunk self, int volume = -1) 2963volume (DC::MixChunk self, int volume = -1)
2399 CODE: 2964 CODE:
2400 if (items > 1) 2965 if (items > 1)
2401 volume = CLAMP (volume, 0, 128); 2966 volume = CLAMP (volume, 0, 128);
2402 RETVAL = Mix_VolumeChunk (self, volume); 2967 RETVAL = Mix_VolumeChunk (self, volume);
2403 OUTPUT: 2968 OUTPUT:
2404 RETVAL 2969 RETVAL
2405 2970
2406CFPlus::Channel 2971DC::Channel
2407play (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)
2408 CODE: 2973 CODE:
2409{ 2974{
2410 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2975 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2411 2976
2412 if (RETVAL < 0) 2977 if (RETVAL < 0)
… …
2419 } 2984 }
2420} 2985}
2421 OUTPUT: 2986 OUTPUT:
2422 RETVAL 2987 RETVAL
2423 2988
2424MODULE = 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
2425 3002
2426int 3003int
2427volume (int volume = -1) 3004volume (int volume = -1)
2428 PROTOTYPE: ;$ 3005 PROTOTYPE: ;$
2429 CODE: 3006 CODE:
… …
2441void 3018void
2442halt () 3019halt ()
2443 CODE: 3020 CODE:
2444 Mix_HaltMusic (); 3021 Mix_HaltMusic ();
2445 3022
3023int
3024playing ()
3025 CODE:
3026 RETVAL = Mix_PlayingMusic ();
3027 OUTPUT:
3028 RETVAL
3029
2446CFPlus::MixMusic 3030DC::MixMusic
2447new (SV *class, CFPlus::RW rwops) 3031new (SV *klass, DC::RW rwops)
2448 CODE: 3032 CODE:
2449 RETVAL = Mix_LoadMUS_RW (rwops); 3033 RETVAL = Mix_LoadMUS_RW (rwops);
2450 OUTPUT: 3034 OUTPUT:
2451 RETVAL 3035 RETVAL
2452 3036
2453void 3037void
2454DESTROY (CFPlus::MixMusic self) 3038DESTROY (DC::MixMusic self)
2455 CODE: 3039 CODE:
2456 Mix_FreeMusic (self); 3040 Mix_FreeMusic (self);
2457 3041
2458int 3042int
2459play (CFPlus::MixMusic self, int loops = -1) 3043play (DC::MixMusic self, int loops = -1)
2460 CODE: 3044 CODE:
2461 RETVAL = Mix_PlayMusic (self, loops); 3045 RETVAL = Mix_PlayMusic (self, loops);
2462 OUTPUT: 3046 OUTPUT:
2463 RETVAL 3047 RETVAL
2464 3048
2465void 3049void
2466fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3050fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2467 CODE: 3051 CODE:
2468 Mix_FadeInMusicPos (self, loops, ms, position); 3052 Mix_FadeInMusicPos (self, loops, ms, position);
2469 3053
2470MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3054MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2471 3055
2472PROTOTYPES: ENABLE 3056PROTOTYPES: ENABLE
2473 3057
2474BOOT: 3058BOOT:
2475{ 3059{
2476 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3060 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2477 static const struct { 3061 static const struct {
2478 const char *name; 3062 const char *name;
2479 IV iv; 3063 IV iv;
2480 } *civ, const_iv[] = { 3064 } *civ, const_iv[] = {
2481# define const_iv(name) { # name, (IV)name } 3065# define const_iv(name) { # name, (IV)name }
2482 const_iv (GL_VENDOR), 3066 const_iv (GL_VENDOR),
2483 const_iv (GL_VERSION), 3067 const_iv (GL_VERSION),
2484 const_iv (GL_EXTENSIONS), 3068 const_iv (GL_EXTENSIONS),
3069 const_iv (GL_MAX_TEXTURE_UNITS),
2485 const_iv (GL_COLOR_MATERIAL), 3070 const_iv (GL_COLOR_MATERIAL),
2486 const_iv (GL_SMOOTH), 3071 const_iv (GL_SMOOTH),
2487 const_iv (GL_FLAT), 3072 const_iv (GL_FLAT),
2488 const_iv (GL_DITHER), 3073 const_iv (GL_DITHER),
2489 const_iv (GL_BLEND), 3074 const_iv (GL_BLEND),
… …
2501 const_iv (GL_ZERO), 3086 const_iv (GL_ZERO),
2502 const_iv (GL_SRC_ALPHA), 3087 const_iv (GL_SRC_ALPHA),
2503 const_iv (GL_DST_ALPHA), 3088 const_iv (GL_DST_ALPHA),
2504 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3089 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2505 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),
2506 const_iv (GL_SRC_ALPHA_SATURATE), 3095 const_iv (GL_SRC_ALPHA_SATURATE),
2507 const_iv (GL_RGB), 3096 const_iv (GL_RGB),
2508 const_iv (GL_RGBA), 3097 const_iv (GL_RGBA),
2509 const_iv (GL_RGBA4), 3098 const_iv (GL_RGBA4),
2510 const_iv (GL_RGBA8), 3099 const_iv (GL_RGBA8),
… …
2516 const_iv (GL_INTENSITY), 3105 const_iv (GL_INTENSITY),
2517 const_iv (GL_LUMINANCE), 3106 const_iv (GL_LUMINANCE),
2518 const_iv (GL_LUMINANCE_ALPHA), 3107 const_iv (GL_LUMINANCE_ALPHA),
2519 const_iv (GL_FLOAT), 3108 const_iv (GL_FLOAT),
2520 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3109 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3110 const_iv (GL_COMPRESSED_ALPHA_ARB),
3111 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3112 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3113 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3114 const_iv (GL_COMPRESSED_RGB_ARB),
3115 const_iv (GL_COMPRESSED_RGBA_ARB),
2521 const_iv (GL_COMPILE), 3116 const_iv (GL_COMPILE),
2522 const_iv (GL_PROXY_TEXTURE_1D), 3117 const_iv (GL_PROXY_TEXTURE_1D),
2523 const_iv (GL_PROXY_TEXTURE_2D), 3118 const_iv (GL_PROXY_TEXTURE_2D),
2524 const_iv (GL_TEXTURE_1D), 3119 const_iv (GL_TEXTURE_1D),
2525 const_iv (GL_TEXTURE_2D), 3120 const_iv (GL_TEXTURE_2D),
… …
2564 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3159 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2565 const_iv (GL_POINT_SMOOTH_HINT), 3160 const_iv (GL_POINT_SMOOTH_HINT),
2566 const_iv (GL_LINE_SMOOTH_HINT), 3161 const_iv (GL_LINE_SMOOTH_HINT),
2567 const_iv (GL_POLYGON_SMOOTH_HINT), 3162 const_iv (GL_POLYGON_SMOOTH_HINT),
2568 const_iv (GL_GENERATE_MIPMAP_HINT), 3163 const_iv (GL_GENERATE_MIPMAP_HINT),
3164 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2569 const_iv (GL_FASTEST), 3165 const_iv (GL_FASTEST),
2570 const_iv (GL_DONT_CARE), 3166 const_iv (GL_DONT_CARE),
2571 const_iv (GL_NICEST), 3167 const_iv (GL_NICEST),
2572 const_iv (GL_V2F), 3168 const_iv (GL_V2F),
2573 const_iv (GL_V3F), 3169 const_iv (GL_V3F),
2574 const_iv (GL_T2F_V3F), 3170 const_iv (GL_T2F_V3F),
2575 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),
2576# undef const_iv 3175# undef const_iv
2577 }; 3176 };
2578 3177
2579 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--)
2580 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3179 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2581 3180
2582 texture_av = newAV (); 3181 texture_av = newAV ();
2583 AvREAL_off (texture_av); 3182 AvREAL_off (texture_av);
2584} 3183}
2585 3184
2586char * 3185void
3186disable_GL_EXT_blend_func_separate ()
3187 CODE:
3188 gl.BlendFuncSeparate = 0;
3189 gl.BlendFuncSeparateEXT = 0;
3190
3191void
3192apple_nvidia_bug (int enable)
3193
3194const char *
2587gl_vendor () 3195gl_vendor ()
2588 CODE: 3196 CODE:
2589 RETVAL = (char *)glGetString (GL_VENDOR); 3197 RETVAL = (const char *)glGetString (GL_VENDOR);
2590 OUTPUT: 3198 OUTPUT:
2591 RETVAL 3199 RETVAL
2592 3200
2593char * 3201const char *
2594gl_version () 3202gl_version ()
2595 CODE: 3203 CODE:
2596 RETVAL = (char *)glGetString (GL_VERSION); 3204 RETVAL = (const char *)glGetString (GL_VERSION);
2597 OUTPUT: 3205 OUTPUT:
2598 RETVAL 3206 RETVAL
2599 3207
2600char * 3208const char *
2601gl_extensions () 3209gl_extensions ()
2602 CODE: 3210 CODE:
2603 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3211 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2604 OUTPUT: 3212 OUTPUT:
2605 RETVAL 3213 RETVAL
2606 3214
2607const char *glGetString (GLenum pname) 3215const char *glGetString (GLenum pname)
3216 CODE:
3217 RETVAL = (const char *)glGetString (pname);
3218 OUTPUT:
3219 RETVAL
2608 3220
2609GLint glGetInteger (GLenum pname) 3221GLint glGetInteger (GLenum pname)
2610 CODE: 3222 CODE:
2611 glGetIntegerv (pname, &RETVAL); 3223 glGetIntegerv (pname, &RETVAL);
2612 OUTPUT: 3224 OUTPUT:
… …
2620 3232
2621int glGetError () 3233int glGetError ()
2622 3234
2623void glFinish () 3235void glFinish ()
2624 3236
3237void glFlush ()
3238
2625void glClear (int mask) 3239void glClear (int mask)
2626 3240
2627void glClearColor (float r, float g, float b, float a = 1.0) 3241void glClearColor (float r, float g, float b, float a = 1.0)
2628 PROTOTYPE: @ 3242 PROTOTYPE: @
2629 3243
… …
2638void glBlendFunc (int sfactor, int dfactor) 3252void glBlendFunc (int sfactor, int dfactor)
2639 3253
2640void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3254void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2641 CODE: 3255 CODE:
2642 gl_BlendFuncSeparate (sa, da, saa, daa); 3256 gl_BlendFuncSeparate (sa, da, saa, daa);
3257
3258# void glBlendEquation (int se)
2643 3259
2644void glDepthMask (int flag) 3260void glDepthMask (int flag)
2645 3261
2646void glLogicOp (int opcode) 3262void glLogicOp (int opcode)
2647 3263
… …
2682void glRotate (float angle, float x, float y, float z) 3298void glRotate (float angle, float x, float y, float z)
2683 CODE: 3299 CODE:
2684 glRotatef (angle, x, y, z); 3300 glRotatef (angle, x, y, z);
2685 3301
2686void 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: @
2687 ALIAS: 3304 ALIAS:
2688 glColor_premultiply = 1 3305 glColor_premultiply = 1
2689 CODE: 3306 CODE:
2690 if (ix) 3307 if (ix)
2691 { 3308 {
… …
2711 3328
2712void glRect (float x1, float y1, float x2, float y2) 3329void glRect (float x1, float y1, float x2, float y2)
2713 CODE: 3330 CODE:
2714 glRectf (x1, y1, x2, y2); 3331 glRectf (x1, y1, x2, y2);
2715 3332
3333void glRect_lineloop (float x1, float y1, float x2, float y2)
3334 CODE:
3335 glBegin (GL_LINE_LOOP);
3336 glVertex2f (x1, y1);
3337 glVertex2f (x2, y1);
3338 glVertex2f (x2, y2);
3339 glVertex2f (x1, y2);
3340 glEnd ();
3341
2716PROTOTYPES: ENABLE 3342PROTOTYPES: ENABLE
2717 3343
2718void glBegin (int mode) 3344void glBegin (int mode)
2719 3345
2720void glEnd () 3346void glEnd ()
… …
2752void 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)
2753 CODE: 3379 CODE:
2754 if (gl.SeparableFilter2D) 3380 if (gl.SeparableFilter2D)
2755 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3381 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2756 3382
2757void 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)
2758 3384
2759void 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)
2760 3386
2761void glDrawPixels (int width, int height, int format, int type, char *pixels) 3387void glDrawPixels (int width, int height, int format, int type, char *pixels)
2762 3388
… …
2788 3414
2789void glEndList () 3415void glEndList ()
2790 3416
2791void glCallList (int list) 3417void glCallList (int list)
2792 3418
2793MODULE = 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
2794 3425
2795PROTOTYPES: DISABLE 3426PROTOTYPES: DISABLE
2796 3427
2797void 3428void
2798find_widget (SV *self, NV x, NV y) 3429find_widget (SV *self, NV x, NV y)
… …
2802 XPUSHs (self); 3433 XPUSHs (self);
2803} 3434}
2804 3435
2805BOOT: 3436BOOT:
2806{ 3437{
2807 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3438 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2808 3439
2809 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);
2810 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);
2811 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);
2812 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);
2813} 3444}
2814 3445
2815void 3446void
2816draw (SV *self) 3447draw (SV *self)
2817 CODE: 3448 CODE:
… …
2821 NV x, y, w, h; 3452 NV x, y, w, h;
2822 SV *draw_x_sv = GvSV (draw_x_gv); 3453 SV *draw_x_sv = GvSV (draw_x_gv);
2823 SV *draw_y_sv = GvSV (draw_y_gv); 3454 SV *draw_y_sv = GvSV (draw_y_gv);
2824 SV *draw_w_sv = GvSV (draw_w_gv); 3455 SV *draw_w_sv = GvSV (draw_w_gv);
2825 SV *draw_h_sv = GvSV (draw_h_gv); 3456 SV *draw_h_sv = GvSV (draw_h_gv);
2826 SV *hover;
2827 double draw_x, draw_y, draw_w, draw_h; 3457 double draw_x, draw_y;
2828 3458
2829 if (!SvROK (self)) 3459 if (!SvROK (self))
2830 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3460 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2831 3461
2832 hv = (HV *)SvRV (self); 3462 hv = (HV *)SvRV (self);
2833 3463
2834 if (SvTYPE (hv) != SVt_PVHV) 3464 if (SvTYPE (hv) != SVt_PVHV)
2835 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3465 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2836 3466
2837 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.;
2838 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.;
2839 3469
2840 if (!h || !w) 3470 if (!h || !w)
… …
2860 { 3490 {
2861 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3491 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2862 3492
2863 if (svp && SvTRUE (*svp)) 3493 if (svp && SvTRUE (*svp))
2864 { 3494 {
2865 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3495 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2866 glEnable (GL_BLEND); 3496 glEnable (GL_BLEND);
2867 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3497 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2868 glBegin (GL_QUADS); 3498 glBegin (GL_QUADS);
2869 glVertex2f (0, 0); 3499 glVertex2f (0, 0);
2870 glVertex2f (w, 0); 3500 glVertex2f (w, 0);
… …
2873 glEnd (); 3503 glEnd ();
2874 glDisable (GL_BLEND); 3504 glDisable (GL_BLEND);
2875 } 3505 }
2876 } 3506 }
2877#if 0 3507#if 0
2878 if ($ENV{CFPLUS_DEBUG} & 1) { 3508 // draw borders, for debugging
2879 glPushMatrix; 3509 glPushMatrix ();
2880 glColor 1, 1, 0, 1; 3510 glColor4f (1., 1., 0., 1.);
2881 glTranslate 0.375, 0.375; 3511 glTranslatef (.5, .5, 0.);
2882 glBegin GL_LINE_LOOP; 3512 glBegin (GL_LINE_LOOP);
2883 glVertex 0 , 0; 3513 glVertex2f (0 , 0);
2884 glVertex $self->{w} - 1, 0; 3514 glVertex2f (w - 1, 0);
2885 glVertex $self->{w} - 1, $self->{h} - 1; 3515 glVertex2f (w - 1, h - 1);
2886 glVertex 0 , $self->{h} - 1; 3516 glVertex2f (0 , h - 1);
2887 glEnd; 3517 glEnd ();
2888 glPopMatrix; 3518 glPopMatrix ();
2889 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2890 }
2891#endif 3519#endif
2892 PUSHMARK (SP); 3520 PUSHMARK (SP);
2893 XPUSHs (self); 3521 XPUSHs (self);
2894 PUTBACK; 3522 PUTBACK;
2895 call_method ("_draw", G_VOID | G_DISCARD); 3523 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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