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.225 by root, Sat Aug 11 12:07:54 2007 UTC vs.
Revision 1.321 by root, Sun Nov 18 01:15:04 2018 UTC

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

Diff Legend

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