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.213 by root, Sun Jul 29 04:14:45 2007 UTC vs.
Revision 1.297 by root, Tue Dec 22 00:08:11 2009 UTC

… …
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f
22#endif 26#endif
23 27
24#include <assert.h> 28#include <assert.h>
25#include <math.h> 29#include <math.h>
26#include <string.h> 30#include <string.h>
… …
34#include <SDL_endian.h> 38#include <SDL_endian.h>
35#include <SDL_image.h> 39#include <SDL_image.h>
36#include <SDL_mixer.h> 40#include <SDL_mixer.h>
37#include <SDL_opengl.h> 41#include <SDL_opengl.h>
38 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46#endif
47
39#define PANGO_ENABLE_BACKEND 48#define PANGO_ENABLE_BACKEND
40#define G_DISABLE_CAST_CHECKS 49#define G_DISABLE_CAST_CHECKS
41 50
42#include <glib/gmacros.h> 51#include <glib/gmacros.h>
43 52
44#include <pango/pango.h> 53#include <pango/pango.h>
54
55#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0
57#endif
58
59#if !PANGO_VERSION_CHECK (1, 15, 2)
60# define pango_layout_get_line_readonly pango_layout_get_line
61# define pango_layout_get_lines_readonly pango_layout_get_lines
62# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
63# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
64#endif
45 65
46#ifndef _WIN32 66#ifndef _WIN32
47# include <sys/types.h> 67# include <sys/types.h>
48# include <sys/socket.h> 68# include <sys/socket.h>
49# include <netinet/in.h> 69# include <netinet/in.h>
50# include <netinet/tcp.h> 70# include <netinet/tcp.h>
51# include <inttypes.h> 71# include <inttypes.h>
52#endif 72#endif
53 73
74#if __GNUC__ >= 4
75# define expect(expr,value) __builtin_expect ((expr),(value))
76#else
77# define expect(expr,value) (expr)
78#endif
79
80#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1)
82
54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
55 84
85/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */
56#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
57 89
58#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
60 92
61#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
62 94
63#if 0 95/* mask out modifiers we are not interested in */
64# define PARACHUTE SDL_INIT_NOPARACHUTE 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
65#else 97
66# define PARACHUTE 0 98#define KMOD_LRAM 0x10000 // our extension
67#endif 99
100#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2
68 102
69static AV *texture_av; 103static AV *texture_av;
70 104
71static struct 105static struct
72{ 106{
… …
109 av_push (texture_av, (SV *)(size_t)name); 143 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 144 glDeleteTextures (1, &name);
111} 145}
112 146
113#include "texcache.c" 147#include "texcache.c"
148#include "rendercache.c"
114 149
115#include "pango-font.c" 150#include "pango-font.c"
116#include "pango-fontmap.c" 151#include "pango-fontmap.c"
117#include "pango-render.c" 152#include "pango-render.c"
118 153
119typedef IV CFPlus__Channel; 154typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 155typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 156typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 157typedef Mix_Music *DC__MixMusic;
123 158
124typedef PangoFontDescription *CFPlus__Font; 159typedef PangoFontDescription *DC__Font;
125 160
126static int 161static int
127shape_attr_p (PangoLayoutRun *run) 162shape_attr_p (PangoLayoutRun *run)
128{ 163{
129 GSList *attrs = run->item->analysis.extra_attrs; 164 GSList *attrs = run->item->analysis.extra_attrs;
… …
143 178
144typedef struct cf_layout { 179typedef struct cf_layout {
145 PangoLayout *pl; 180 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 181 float r, g, b, a; // default color for rgba mode
147 int base_height; 182 int base_height;
148 CFPlus__Font font; 183 DC__Font font;
184 rc_t *rc;
149} *CFPlus__Layout; 185} *DC__Layout;
150 186
151static CFPlus__Font default_font; 187static DC__Font default_font;
152static PangoContext *opengl_context; 188static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 189static PangoFontMap *opengl_fontmap;
154 190
155static void 191static void
156substitute_func (FcPattern *pattern, gpointer data) 192substitute_func (FcPattern *pattern, gpointer data)
… …
161#endif 197#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 198 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 199}
164 200
165static void 201static void
166layout_update_font (CFPlus__Layout self) 202layout_update_font (DC__Layout self)
167{ 203{
168 /* use a random scale factor to account for unknown descenders, 0.8 works 204 /* use a random scale factor to account for unknown descenders, 0.8 works
169 * reasonably well with bitstream vera 205 * reasonably well with dejavu/bistream fonts
170 */ 206 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 207 PangoFontDescription *font = self->font ? self->font : default_font;
172 208
173 pango_font_description_set_absolute_size (font, 209 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 210 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 211
176 pango_layout_set_font_description (self->pl, font); 212 pango_layout_set_font_description (self->pl, font);
177} 213}
178 214
179static void 215static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 216layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 217{
182 PangoRectangle rect; 218 PangoRectangle rect;
183 219
184 // get_pixel_* wrongly rounds down 220 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 221 pango_layout_get_extents (self->pl, 0, &rect);
… …
196 232
197typedef uint16_t tileid; 233typedef uint16_t tileid;
198typedef uint16_t faceid; 234typedef uint16_t faceid;
199 235
200typedef struct { 236typedef struct {
201 int name; 237 GLuint name;
202 int w, h; 238 int w, h;
203 float s, t; 239 float s, t;
204 uint8_t r, g, b, a; 240 uint8_t r, g, b, a;
205 tileid smoothtile; 241 tileid smoothtile;
206 uint8_t smoothlevel; 242 uint8_t smoothlevel;
243 uint8_t unused; /* set to zero on use */
207} maptex; 244} maptex;
208 245
209typedef struct { 246typedef struct {
210 uint32_t player; 247 uint32_t player;
211 tileid tile[3]; 248 tileid tile[3];
… …
224 int faces; tileid *face2tile; // [faceid] 261 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 262 int texs; maptex *tex; // [tileid]
226 263
227 int32_t rows; 264 int32_t rows;
228 maprow *row; 265 maprow *row;
229} *CFPlus__Map; 266} *DC__Map;
230 267
231static char * 268static char *
232prepend (char *ptr, int sze, int inc) 269prepend (char *ptr, int sze, int inc)
233{ 270{
234 char *p; 271 char *p;
… …
272 self->texs *= 2; 309 self->texs *= 2;
273 } 310 }
274} 311}
275 312
276static maprow * 313static maprow *
277map_get_row (CFPlus__Map self, int y) 314map_get_row (DC__Map self, int y)
278{ 315{
279 if (0 > y) 316 if (0 > y)
280 { 317 {
281 int extend = - y + MAP_EXTEND_Y; 318 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 319 Prepend (maprow, self->row, self->rows, extend);
… …
320 357
321 return row->col + (x - row->c0); 358 return row->col + (x - row->c0);
322} 359}
323 360
324static mapcell * 361static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 362map_get_cell (DC__Map self, int x, int y)
326{ 363{
327 return row_get_cell (map_get_row (self, y), x); 364 return row_get_cell (map_get_row (self, y), x);
328} 365}
329 366
330static void 367static void
331map_clear (CFPlus__Map self) 368map_clear (DC__Map self)
332{ 369{
333 int r; 370 int r;
334 371
335 for (r = 0; r < self->rows; r++) 372 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 373 Safefree (self->row[r].col);
… …
343 self->oy = 0; 380 self->oy = 0;
344 self->row = 0; 381 self->row = 0;
345 self->rows = 0; 382 self->rows = 0;
346} 383}
347 384
385#define CELL_CLEAR(cell) \
386 do { \
387 if ((cell)->player) \
388 (cell)->tile [2] = 0; \
389 (cell)->darkness = 0; \
390 (cell)->stat_hp = 0; \
391 (cell)->flags = 0; \
392 (cell)->player = 0; \
393 } while (0)
394
348static void 395static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 396map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 397{
351 int x, y; 398 int x, y;
352 maprow *row; 399 maprow *row;
353 mapcell *cell; 400 mapcell *cell;
354 401
… …
366 if (x >= row->c1) 413 if (x >= row->c1)
367 break; 414 break;
368 415
369 cell = row->col + x - row->c0; 416 cell = row->col + x - row->c0;
370 417
371 cell->darkness = 0; 418 CELL_CLEAR (cell);
372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
375 } 419 }
376 } 420 }
377} 421}
378 422
379typedef struct { 423typedef struct {
… …
433 n |= n >> 16; 477 n |= n >> 16;
434 478
435 return n + 1; 479 return n + 1;
436} 480}
437 481
482static unsigned int
483popcount (unsigned int n)
484{
485 n -= (n >> 1) & 0x55555555U;
486 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
487 n = ((n >> 4) + n) & 0x0f0f0f0fU;
488 n *= 0x01010101U;
489
490 return n >> 24;
491}
492
438/* SDL should provide this, really. */ 493/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 494#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 495#define SDLK_MODIFIER_MAX 314
441 496
442/******************************************************************************/ 497/******************************************************************************/
… …
480 return 0; 535 return 0;
481 536
482 return 1; 537 return 1;
483} 538}
484 539
485MODULE = CFPlus PACKAGE = CFPlus 540/******************************************************************************/
541
542/* process keyboard modifiers */
543static int
544mod_munge (int mod)
545{
546 mod &= MOD_MASK;
547
548 if (mod & (KMOD_META | KMOD_ALT))
549 mod |= KMOD_LRAM;
550
551 return mod;
552}
553
554static void
555deliantra_main ()
556{
557 char *argv[] = { 0 };
558 call_argv ("::main", G_DISCARD | G_VOID, argv);
559}
560
561#ifdef __MACOSX__
562 /* to due surprising braindamage on the side of SDL design, we
563 * do some mind-boggling hack here: SDL requires a custom main()
564 * on OS X, so... we provide one and call the original main(), which,
565 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
566 * and which calls our main (== SDL_main) back.
567 */
568 extern C_LINKAGE int
569 main (int argc, char *argv[])
570 {
571 deliantra_main ();
572 }
573
574 #undef main
575
576 extern C_LINKAGE int main (int argc, char *argv[]);
577
578 static void
579 SDL_braino (void)
580 {
581 char *argv[] = { "deliantra client", 0 };
582 (main) (1, argv);
583 }
584#else
585 static void
586 SDL_braino (void)
587 {
588 deliantra_main ();
589 }
590#endif
591
592MODULE = Deliantra::Client PACKAGE = DC
486 593
487PROTOTYPES: ENABLE 594PROTOTYPES: ENABLE
488 595
489BOOT: 596BOOT:
490{ 597{
491 HV *stash = gv_stashpv ("CFPlus", 1); 598 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 599 static const struct {
493 const char *name; 600 const char *name;
494 IV iv; 601 IV iv;
495 } *civ, const_iv[] = { 602 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 603# define const_iv(name) { # name, (IV)name }
… …
518 625
519 const_iv (SDL_APPINPUTFOCUS), 626 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 627 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 628 const_iv (SDL_APPACTIVE),
522 629
630
631 const_iv (SDLK_UNKNOWN),
632 const_iv (SDLK_FIRST),
633 const_iv (SDLK_BACKSPACE),
634 const_iv (SDLK_TAB),
635 const_iv (SDLK_CLEAR),
636 const_iv (SDLK_RETURN),
637 const_iv (SDLK_PAUSE),
638 const_iv (SDLK_ESCAPE),
639 const_iv (SDLK_SPACE),
640 const_iv (SDLK_EXCLAIM),
641 const_iv (SDLK_QUOTEDBL),
642 const_iv (SDLK_HASH),
643 const_iv (SDLK_DOLLAR),
644 const_iv (SDLK_AMPERSAND),
645 const_iv (SDLK_QUOTE),
646 const_iv (SDLK_LEFTPAREN),
647 const_iv (SDLK_RIGHTPAREN),
648 const_iv (SDLK_ASTERISK),
649 const_iv (SDLK_PLUS),
650 const_iv (SDLK_COMMA),
651 const_iv (SDLK_MINUS),
652 const_iv (SDLK_PERIOD),
653 const_iv (SDLK_SLASH),
654 const_iv (SDLK_0),
655 const_iv (SDLK_1),
656 const_iv (SDLK_2),
657 const_iv (SDLK_3),
658 const_iv (SDLK_4),
659 const_iv (SDLK_5),
660 const_iv (SDLK_6),
661 const_iv (SDLK_7),
662 const_iv (SDLK_8),
663 const_iv (SDLK_9),
664 const_iv (SDLK_COLON),
665 const_iv (SDLK_SEMICOLON),
666 const_iv (SDLK_LESS),
667 const_iv (SDLK_EQUALS),
668 const_iv (SDLK_GREATER),
669 const_iv (SDLK_QUESTION),
670 const_iv (SDLK_AT),
671
672 const_iv (SDLK_LEFTBRACKET),
673 const_iv (SDLK_BACKSLASH),
674 const_iv (SDLK_RIGHTBRACKET),
675 const_iv (SDLK_CARET),
676 const_iv (SDLK_UNDERSCORE),
677 const_iv (SDLK_BACKQUOTE),
678 const_iv (SDLK_DELETE),
679
680 const_iv (SDLK_FIRST),
681 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 682 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 683 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 684 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 685 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 686 const_iv (SDLK_KP4),
… …
599 const_iv (KMOD_LMETA), 758 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 759 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 760 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 761 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 762 const_iv (KMOD_MODE),
763
764 const_iv (KMOD_LRAM),
765
766 const_iv (MIX_DEFAULT_FORMAT),
767
768 const_iv (SDL_INIT_TIMER),
769 const_iv (SDL_INIT_AUDIO),
770 const_iv (SDL_INIT_VIDEO),
771 const_iv (SDL_INIT_CDROM),
772 const_iv (SDL_INIT_JOYSTICK),
773 const_iv (SDL_INIT_EVERYTHING),
774 const_iv (SDL_INIT_NOPARACHUTE),
775 const_iv (SDL_INIT_EVENTTHREAD),
776
777 const_iv (SDL_GL_RED_SIZE),
778 const_iv (SDL_GL_GREEN_SIZE),
779 const_iv (SDL_GL_BLUE_SIZE),
780 const_iv (SDL_GL_ALPHA_SIZE),
781 const_iv (SDL_GL_DOUBLEBUFFER),
782 const_iv (SDL_GL_BUFFER_SIZE),
783 const_iv (SDL_GL_DEPTH_SIZE),
784 const_iv (SDL_GL_STENCIL_SIZE),
785 const_iv (SDL_GL_ACCUM_RED_SIZE),
786 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
787 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
788 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
789 const_iv (SDL_GL_STEREO),
790 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
791 const_iv (SDL_GL_MULTISAMPLESAMPLES),
792 const_iv (SDL_GL_ACCELERATED_VISUAL),
793 const_iv (SDL_GL_SWAP_CONTROL),
794
795 const_iv (FOW_DARKNESS)
604# undef const_iv 796# undef const_iv
605 }; 797 };
606 798
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 799 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
626 818
627NV floor (NV x) 819NV floor (NV x)
628 820
629NV ceil (NV x) 821NV ceil (NV x)
630 822
823IV minpot (UV n)
824
825IV popcount (UV n)
826
827NV distance (NV dx, NV dy)
828 CODE:
829 RETVAL = pow (dx * dx + dy * dy, 0.5);
830 OUTPUT:
831 RETVAL
832
631void 833void
632pango_init () 834pango_init ()
633 CODE: 835 CODE:
634{ 836{
635 opengl_fontmap = pango_opengl_font_map_new (); 837 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 838 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
637 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 839 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
840 /*pango_context_set_font_description (opengl_context, default_font);*/
841#if PANGO_VERSION_CHECK (1, 15, 2)
842 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
843 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
844#endif
638} 845}
639 846
640char *
641SDL_GetError () 847char *SDL_GetError ()
642 848
643int 849void SDL_braino ()
644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645 850
646void 851int SDL_Init (U32 flags)
852
853int SDL_InitSubSystem (U32 flags)
854
855void SDL_QuitSubSystem (U32 flags)
856
647SDL_Quit () 857void SDL_Quit ()
858
859int SDL_GL_SetAttribute (int attr, int value)
860
861int SDL_GL_GetAttribute (int attr)
862 CODE:
863 if (SDL_GL_GetAttribute (attr, &RETVAL))
864 XSRETURN_UNDEF;
865 OUTPUT:
866 RETVAL
648 867
649void 868void
650SDL_ListModes (int rgb, int alpha) 869SDL_ListModes (int rgb, int alpha)
651 PPCODE: 870 PPCODE:
652{ 871{
… …
664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 883 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667 886
668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 887 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
669#if SDL_VERSION_ATLEAST(1,2,10)
670 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
671 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 888 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
673 889
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 890 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 891
676 if (m && m != (SDL_Rect **)-1) 892 if (m && m != (SDL_Rect **)-1)
677 while (*m) 893 while (*m)
678 { 894 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 895 if ((*m)->w >= 400 && (*m)->h >= 300)
680 { 896 {
681 AV *av = newAV (); 897 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 898 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 899 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 900 av_push (av, newSViv (rgb));
… …
708 924
709 if (RETVAL) 925 if (RETVAL)
710 { 926 {
711 av_clear (texture_av); 927 av_clear (texture_av);
712 928
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 929 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 930#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 931#include "glfunc.h"
716#undef GL_FUNC 932#undef GL_FUNC
717 } 933 }
718} 934}
… …
725char * 941char *
726SDL_GetKeyName (int sym) 942SDL_GetKeyName (int sym)
727 943
728int 944int
729SDL_GetAppState () 945SDL_GetAppState ()
946
947int
948SDL_GetModState ()
730 949
731void 950void
732poll_events () 951poll_events ()
733 PPCODE: 952 PPCODE:
734{ 953{
… …
744 { 963 {
745 case SDL_KEYDOWN: 964 case SDL_KEYDOWN:
746 case SDL_KEYUP: 965 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 966 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 967 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 968 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
750 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 969 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 970 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 971 break;
753 972
754 case SDL_ACTIVEEVENT: 973 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 974 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
773 x = ev.motion.x; 992 x = ev.motion.x;
774 y = ev.motion.y; 993 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 994 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 995 }
777 996
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 997 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 998 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 999 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 1000 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1001 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1002 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 1003 }
785 break; 1004 break;
786 1005
787 case SDL_MOUSEBUTTONDOWN: 1006 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 1007 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1008 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 1009
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1010 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1011 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1012 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1013 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1018 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1019 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 1020 break;
802 } 1021 }
803 1022
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1023 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 1024 }
806} 1025}
807 1026
808int 1027int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1028Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 1029 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 1030 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 1031 Mix_ChannelFinished (channel_finished);
813 1032
814void 1033void
1034Mix_QuerySpec ()
1035 PPCODE:
1036{
1037 int freq, channels;
1038 Uint16 format;
1039
1040 if (Mix_QuerySpec (&freq, &format, &channels))
1041 {
1042 EXTEND (SP, 3);
1043 PUSHs (sv_2mortal (newSViv (freq)));
1044 PUSHs (sv_2mortal (newSViv (format)));
1045 PUSHs (sv_2mortal (newSViv (channels)));
1046 }
1047}
1048
1049void
815Mix_CloseAudio () 1050Mix_CloseAudio ()
816 1051
817int 1052int
818Mix_AllocateChannels (int numchans = -1) 1053Mix_AllocateChannels (int numchans = -1)
1054
1055const char *
1056Mix_GetError ()
819 1057
820void 1058void
821lowdelay (int fd, int val = 1) 1059lowdelay (int fd, int val = 1)
822 CODE: 1060 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1061 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
849 } 1087 }
850 } 1088 }
851#endif 1089#endif
852} 1090}
853 1091
854void 1092int
855add_font (char *file) 1093add_font (char *file)
856 CODE: 1094 CODE:
857 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1095 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1096 OUTPUT:
1097 RETVAL
858 1098
859void 1099void
860load_image_inline (SV *image_) 1100load_image_inline (SV *image_)
861 ALIAS: 1101 ALIAS:
862 load_image_file = 1 1102 load_image_file = 1
… …
948void 1188void
949error (char *message) 1189error (char *message)
950 CODE: 1190 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1191 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1192#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1193 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1194#endif
955 1195
956void 1196void
957fatal (char *message) 1197fatal (char *message)
958 CODE: 1198 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1199 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1200#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1201 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1202#endif
963 _exit (1); 1203 _exit (1);
964 1204
965void 1205void
966_exit (int retval = 0) 1206_exit (int retval = 0)
… …
978#if DEBUG 1218#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1219 VALGRIND_DO_LEAK_CHECK;
980#endif 1220#endif
981} 1221}
982 1222
983MODULE = CFPlus PACKAGE = CFPlus::Font 1223int
1224SvREFCNT (SV *sv)
1225 CODE:
1226 RETVAL = SvREFCNT (sv);
1227 OUTPUT:
1228 RETVAL
1229
1230MODULE = Deliantra::Client PACKAGE = DC::Font
984 1231
985PROTOTYPES: DISABLE 1232PROTOTYPES: DISABLE
986 1233
987CFPlus::Font 1234DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1235new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1236 CODE:
990{ 1237{
991 int count; 1238 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1239 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
995} 1242}
996 OUTPUT: 1243 OUTPUT:
997 RETVAL 1244 RETVAL
998 1245
999void 1246void
1000DESTROY (CFPlus::Font self) 1247DESTROY (DC::Font self)
1001 CODE: 1248 CODE:
1002 pango_font_description_free (self); 1249 pango_font_description_free (self);
1003 1250
1004void 1251void
1005make_default (CFPlus::Font self) 1252make_default (DC::Font self)
1006 PROTOTYPE: $ 1253 PROTOTYPE: $
1007 CODE: 1254 CODE:
1008 default_font = self; 1255 default_font = self;
1009 1256
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1257MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1258
1012PROTOTYPES: DISABLE 1259PROTOTYPES: DISABLE
1013 1260
1014void 1261void
1015reset_glyph_cache () 1262glyph_cache_backup ()
1016 PROTOTYPE: 1263 PROTOTYPE:
1017 CODE: 1264 CODE:
1265 tc_backup ();
1266
1267void
1268glyph_cache_restore ()
1269 PROTOTYPE:
1270 CODE:
1018 tc_clear (); 1271 tc_restore ();
1019 1272
1020CFPlus::Layout 1273DC::Layout
1021new (SV *class) 1274new (SV *class)
1022 CODE: 1275 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1276 New (0, RETVAL, 1, struct cf_layout);
1024 1277
1025 RETVAL->pl = pango_layout_new (opengl_context); 1278 RETVAL->pl = pango_layout_new (opengl_context);
… …
1027 RETVAL->g = 1.; 1280 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1281 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1282 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1283 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1284 RETVAL->font = 0;
1285 RETVAL->rc = rc_alloc ();
1032 1286
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1287 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1288 layout_update_font (RETVAL);
1035 OUTPUT: 1289 OUTPUT:
1036 RETVAL 1290 RETVAL
1037 1291
1038void 1292void
1039DESTROY (CFPlus::Layout self) 1293DESTROY (DC::Layout self)
1040 CODE: 1294 CODE:
1041 g_object_unref (self->pl); 1295 g_object_unref (self->pl);
1296 rc_free (self->rc);
1042 Safefree (self); 1297 Safefree (self);
1043 1298
1044void 1299void
1045set_text (CFPlus::Layout self, SV *text_) 1300set_text (DC::Layout self, SV *text_)
1046 CODE: 1301 CODE:
1047{ 1302{
1048 STRLEN textlen; 1303 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1304 char *text = SvPVutf8 (text_, textlen);
1050 1305
1051 pango_layout_set_text (self->pl, text, textlen); 1306 pango_layout_set_text (self->pl, text, textlen);
1052} 1307}
1053 1308
1054void 1309void
1055set_markup (CFPlus::Layout self, SV *text_) 1310set_markup (DC::Layout self, SV *text_)
1056 CODE: 1311 CODE:
1057{ 1312{
1058 STRLEN textlen; 1313 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1314 char *text = SvPVutf8 (text_, textlen);
1060 1315
1061 pango_layout_set_markup (self->pl, text, textlen); 1316 pango_layout_set_markup (self->pl, text, textlen);
1062} 1317}
1063 1318
1064void 1319void
1065set_shapes (CFPlus::Layout self, ...) 1320set_shapes (DC::Layout self, ...)
1066 CODE: 1321 CODE:
1067{ 1322{
1068 PangoAttrList *attrs = 0; 1323 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1324 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1325 const char *pos = text;
… …
1105 if (attrs) 1360 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1361 pango_layout_set_attributes (self->pl, attrs);
1107} 1362}
1108 1363
1109void 1364void
1110get_shapes (CFPlus::Layout self) 1365get_shapes (DC::Layout self)
1111 PPCODE: 1366 PPCODE:
1112{ 1367{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1368 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1369
1115 do 1370 do
1116 { 1371 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1372 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1373
1119 if (run && shape_attr_p (run)) 1374 if (run && shape_attr_p (run))
1120 { 1375 {
1121 PangoRectangle extents; 1376 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1377 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1130 1385
1131 pango_layout_iter_free (iter); 1386 pango_layout_iter_free (iter);
1132} 1387}
1133 1388
1134int 1389int
1135has_wrapped (CFPlus::Layout self) 1390has_wrapped (DC::Layout self)
1136 CODE: 1391 CODE:
1137{ 1392{
1138 int lines = 1; 1393 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1394 const char *text = pango_layout_get_text (self->pl);
1140 1395
… …
1145} 1400}
1146 OUTPUT: 1401 OUTPUT:
1147 RETVAL 1402 RETVAL
1148 1403
1149SV * 1404SV *
1150get_text (CFPlus::Layout self) 1405get_text (DC::Layout self)
1151 CODE: 1406 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1407 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1408 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1409 OUTPUT:
1155 RETVAL 1410 RETVAL
1156 1411
1157void 1412void
1158set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1413set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1159 CODE: 1414 CODE:
1160 self->r = r; 1415 self->r = r;
1161 self->g = g; 1416 self->g = g;
1162 self->b = b; 1417 self->b = b;
1163 self->a = a; 1418 self->a = a;
1164 1419
1165void 1420void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1421set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1422 CODE:
1168 if (self->font != font) 1423 if (self->font != font)
1169 { 1424 {
1170 self->font = font; 1425 self->font = font;
1171 layout_update_font (self); 1426 layout_update_font (self);
1172 } 1427 }
1173 1428
1174void 1429void
1175set_height (CFPlus::Layout self, int base_height) 1430set_height (DC::Layout self, int base_height)
1176 CODE: 1431 CODE:
1177 if (self->base_height != base_height) 1432 if (self->base_height != base_height)
1178 { 1433 {
1179 self->base_height = base_height; 1434 self->base_height = base_height;
1180 layout_update_font (self); 1435 layout_update_font (self);
1181 } 1436 }
1182 1437
1183void 1438void
1184set_width (CFPlus::Layout self, int max_width = -1) 1439set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1440 CODE:
1186 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1441 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1187 1442
1188void 1443void
1189set_indent (CFPlus::Layout self, int indent) 1444set_indent (DC::Layout self, int indent)
1190 CODE: 1445 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1446 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1447
1193void 1448void
1194set_spacing (CFPlus::Layout self, int spacing) 1449set_spacing (DC::Layout self, int spacing)
1195 CODE: 1450 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1451 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1452
1198void 1453void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1454set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1455 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1456 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1457 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1458 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1459 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1460 : PANGO_ELLIPSIZE_NONE
1206 ); 1461 );
1207 1462
1208void 1463void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1464set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1465 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1466 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1467
1213void 1468void
1214size (CFPlus::Layout self) 1469size (DC::Layout self)
1215 PPCODE: 1470 PPCODE:
1216{ 1471{
1217 int w, h; 1472 int w, h;
1218 1473
1219 layout_get_pixel_size (self, &w, &h); 1474 layout_get_pixel_size (self, &w, &h);
… …
1222 PUSHs (sv_2mortal (newSViv (w))); 1477 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1478 PUSHs (sv_2mortal (newSViv (h)));
1224} 1479}
1225 1480
1226int 1481int
1227descent (CFPlus::Layout self) 1482descent (DC::Layout self)
1228 CODE: 1483 CODE:
1229{ 1484{
1230 PangoRectangle rect; 1485 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1486 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1487 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1488 RETVAL = PANGO_DESCENT (rect);
1234} 1489}
1235 OUTPUT: 1490 OUTPUT:
1236 RETVAL 1491 RETVAL
1237 1492
1238int 1493int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1494xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1495 CODE:
1241{ 1496{
1242 int index, trailing; 1497 int index, trailing;
1243 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1498 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1244 RETVAL = index + trailing; 1499 RETVAL = index + trailing;
1245} 1500}
1246 OUTPUT: 1501 OUTPUT:
1247 RETVAL 1502 RETVAL
1248 1503
1249void 1504void
1250cursor_pos (CFPlus::Layout self, int index) 1505cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1506 PPCODE:
1252{ 1507{
1253 PangoRectangle strong_pos; 1508 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1509 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1510
1256 EXTEND (SP, 3); 1511 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1512 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1514 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1515}
1261 1516
1262void 1517void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1518index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1519 PPCODE:
1265{ 1520{
1266 int line, x; 1521 int line, x;
1267 1522
1268 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1523 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1524#if !PANGO_VERSION_CHECK (1, 17, 3)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1525 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1526 --line;
1527#endif
1271 EXTEND (SP, 2); 1528 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1529 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1530 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1531}
1275 1532
1276void 1533void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1534line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1535 PPCODE:
1279{ 1536{
1280 PangoLayoutLine *lp; 1537 PangoLayoutLine *lp;
1281 int index, trailing; 1538 int index, trailing;
1282 1539
1283 if (line < 0) 1540 if (line < 0)
1284 XSRETURN_EMPTY; 1541 XSRETURN_EMPTY;
1285 1542
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1543 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1544 XSRETURN_EMPTY; /* do better */
1288 1545
1289 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1546 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290 1547
1291 EXTEND (SP, 2); 1548 EXTEND (SP, 2);
… …
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1554 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1555 }
1299} 1556}
1300 1557
1301void 1558void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1559render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1560 CODE:
1561 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1562 pango_opengl_render_layout_subpixel (
1305 self->pl, 1563 self->pl,
1564 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1565 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1566 self->r, self->g, self->b, self->a,
1308 flags 1567 flags
1309 ); 1568 );
1569 // we assume that context_change actually clears/frees stuff
1570 // and does not do any recomputation...
1571 pango_layout_context_changed (self->pl);
1310 1572
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1573void
1574draw (DC::Layout self)
1575 CODE:
1576{
1577 glEnable (GL_TEXTURE_2D);
1578 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1579 glEnable (GL_BLEND);
1580 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1581 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1582 glEnable (GL_ALPHA_TEST);
1583 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1584
1585 rc_draw (self->rc);
1586
1587 glDisable (GL_ALPHA_TEST);
1588 glDisable (GL_BLEND);
1589 glDisable (GL_TEXTURE_2D);
1590}
1591
1592MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1593
1313PROTOTYPES: ENABLE 1594PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1595
1317void 1596void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1597pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1598 CODE:
1320{ 1599{
… …
1347 HV *hv = (HV *)SvRV (self); 1626 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1627 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1628 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1629 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1630
1631 if (name <= 0)
1632 XSRETURN_EMPTY;
1633
1352 if (items < 5) 1634 if (items < 5)
1353 { 1635 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1636 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1637 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1638 }
… …
1383 glDisable (GL_ALPHA_TEST); 1665 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1666 glDisable (GL_BLEND);
1385 } 1667 }
1386} 1668}
1387 1669
1670void
1671draw_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)
1672 PROTOTYPE: @
1673 CODE:
1674{
1675 glEnable (GL_TEXTURE_2D);
1676 glEnable (GL_BLEND);
1677 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1678 glBindTexture (GL_TEXTURE_2D, name1);
1679
1680 glColor3f (intensity, intensity, intensity);
1681 glPushMatrix ();
1682 glScalef (1./3, 1./3, 1.);
1683
1684 if (blend > 0.f)
1685 {
1686 float dx3 = dx * -3.f / w;
1687 float dy3 = dy * -3.f / h;
1688 GLfloat env_color[4] = { 0., 0., 0., blend };
1689
1690 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1693
1694 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1695 gl.ActiveTexture (GL_TEXTURE1);
1696 glEnable (GL_TEXTURE_2D);
1697 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699
1700 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704
1705 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707
1708 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1709 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1710 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1711
1712 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717
1718 glBegin (GL_QUADS);
1719 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1720 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1721 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1722 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1723 glEnd ();
1724
1725 glDisable (GL_TEXTURE_2D);
1726 gl.ActiveTexture (GL_TEXTURE0);
1727 }
1728 else
1729 {
1730 /* simple blending of one texture, also opengl <1.3 path */
1731 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1732
1733 glBegin (GL_QUADS);
1734 glTexCoord2f (0, 0); glVertex2f (0, 0);
1735 glTexCoord2f (0, t); glVertex2f (0, h);
1736 glTexCoord2f (s, t); glVertex2f (w, h);
1737 glTexCoord2f (s, 0); glVertex2f (w, 0);
1738 glEnd ();
1739 }
1740
1741 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1742 {
1743 int x, y;
1744 int dx3 = dx * 3;
1745 int dy3 = dy * 3;
1746
1747 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1748 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1749 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1750 glTranslatef (-1., -1., 0);
1751 glBegin (GL_QUADS);
1752
1753 for (y = 1; y < h; y += 3)
1754 {
1755 int y1 = y - dy3;
1756 int y1valid = y1 >= 0 && y1 < h;
1757
1758 for (x = 1; x < w; x += 3)
1759 {
1760 int x1 = x - dx3;
1761 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1762 uint8_t h2;
1763
1764 if (y1valid && x1 >= 0 && x1 < w)
1765 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1766 else
1767 h2 = 1; /* out of range == invisible */
1768
1769 if (h1 || h2)
1770 {
1771 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1772 glColor4f (1., 1., 1., alpha);
1773
1774 glTexCoord2f (0, 0.); glVertex2i (x , y );
1775 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1776 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1777 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1778 }
1779 }
1780 }
1781 }
1782
1783 glEnd ();
1784
1785 glPopMatrix ();
1786
1787 glDisable (GL_TEXTURE_2D);
1788 glDisable (GL_BLEND);
1789}
1790
1388IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1791IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1389 CODE: 1792 CODE:
1390{ 1793{
1391 GLint width; 1794 GLint width;
1392 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1795 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1394 RETVAL = width > 0; 1797 RETVAL = width > 0;
1395} 1798}
1396 OUTPUT: 1799 OUTPUT:
1397 RETVAL 1800 RETVAL
1398 1801
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1802MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1803
1401PROTOTYPES: DISABLE 1804PROTOTYPES: DISABLE
1402 1805
1403CFPlus::Map 1806DC::Map
1404new (SV *class) 1807new (SV *class)
1405 CODE: 1808 CODE:
1406 New (0, RETVAL, 1, struct map); 1809 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1810 RETVAL->x = 0;
1408 RETVAL->y = 0; 1811 RETVAL->y = 0;
… …
1416 RETVAL->row = 0; 1819 RETVAL->row = 0;
1417 OUTPUT: 1820 OUTPUT:
1418 RETVAL 1821 RETVAL
1419 1822
1420void 1823void
1421DESTROY (CFPlus::Map self) 1824DESTROY (DC::Map self)
1422 CODE: 1825 CODE:
1423{ 1826{
1424 map_clear (self); 1827 map_clear (self);
1425 Safefree (self->face2tile); 1828 Safefree (self->face2tile);
1426 Safefree (self->tex); 1829 Safefree (self->tex);
1427 Safefree (self); 1830 Safefree (self);
1428} 1831}
1429 1832
1430void 1833void
1431resize (CFPlus::Map self, int map_width, int map_height) 1834resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1835 CODE:
1433 self->w = map_width; 1836 self->w = map_width;
1434 self->h = map_height; 1837 self->h = map_height;
1435 1838
1436void 1839void
1437clear (CFPlus::Map self) 1840clear (DC::Map self)
1438 CODE: 1841 CODE:
1439 map_clear (self); 1842 map_clear (self);
1440 1843
1441void 1844void
1442set_tileid (CFPlus::Map self, int face, int tile) 1845set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1846 CODE:
1444{ 1847{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1848 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1849 need_texid (self, tile);
1447} 1850}
1448 1851
1449void 1852void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1853set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1854 CODE:
1452{ 1855{
1453 tileid texid; 1856 tileid texid;
1454 maptex *tex; 1857 maptex *tex;
1455 1858
… …
1468 tex->smoothtile = self->face2tile [smooth]; 1871 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1872 tex->smoothlevel = level;
1470} 1873}
1471 1874
1472void 1875void
1473set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1876set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1474 CODE: 1877 CODE:
1475{ 1878{
1476 need_texid (self, texid); 1879 need_texid (self, texid);
1477 1880
1478 { 1881 {
… …
1497 // use uglier nearest interpolation because linear suffers 1900 // use uglier nearest interpolation because linear suffers
1498 // from transparent color bleeding and ugly wrapping effects. 1901 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1902 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1903}
1501 1904
1905void
1906expire_textures (DC::Map self, int texid, int count)
1907 PPCODE:
1908 for (; texid < self->texs && count; ++texid, --count)
1909 {
1910 maptex *tex = self->tex + texid;
1911
1912 if (tex->name)
1913 {
1914 if (tex->unused)
1915 {
1916 tex->name = 0;
1917 tex->unused = 0;
1918 XPUSHs (sv_2mortal (newSViv (texid)));
1919 }
1920 else
1921 tex->unused = 1;
1922 }
1923 }
1924
1502int 1925int
1503ox (CFPlus::Map self) 1926ox (DC::Map self)
1504 ALIAS: 1927 ALIAS:
1505 oy = 1 1928 oy = 1
1506 x = 2 1929 x = 2
1507 y = 3 1930 y = 3
1508 w = 4 1931 w = 4
… …
1519 } 1942 }
1520 OUTPUT: 1943 OUTPUT:
1521 RETVAL 1944 RETVAL
1522 1945
1523void 1946void
1524scroll (CFPlus::Map self, int dx, int dy) 1947scroll (DC::Map self, int dx, int dy)
1525 CODE: 1948 CODE:
1526{ 1949{
1527 if (dx > 0) 1950 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1951 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1952 else if (dx < 0)
… …
1544 self->rows += MAP_EXTEND_Y; 1967 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1968 self->y += MAP_EXTEND_Y;
1546 } 1969 }
1547} 1970}
1548 1971
1549void 1972SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1973map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1974 CODE:
1552{ 1975{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1976 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1977 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1978 mapcell *cell;
1556 int x, y, flags; 1979 int x, y, z, flags;
1980 AV *missing = newAV ();
1981 RETVAL = newRV_noinc ((SV *)missing);
1557 1982
1558 while (data < data_end - 1) 1983 while (data < data_end - 1)
1559 { 1984 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1985 flags = (data [0] << 8) + data [1]; data += 2;
1561 1986
… …
1581 uint8_t ext, cmd; 2006 uint8_t ext, cmd;
1582 2007
1583 do 2008 do
1584 { 2009 {
1585 ext = *data++; 2010 ext = *data++;
1586 cmd = ext & 0x3f; 2011 cmd = ext & 0x7f;
1587 2012
1588 if (cmd < 4) 2013 if (cmd < 4)
1589 cell->darkness = 255 - ext * 64 + 1; 2014 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1590 else if (cmd == 5) // health 2015 else if (cmd == 5) // health
1591 { 2016 {
1592 cell->stat_width = 1; 2017 cell->stat_width = 1;
1593 cell->stat_hp = *data++; 2018 cell->stat_hp = *data++;
1594 } 2019 }
1595 else if (cmd == 6) // monster width 2020 else if (cmd == 6) // monster width
1596 cell->stat_width = *data++ + 1; 2021 cell->stat_width = *data++ + 1;
1597 else if (cmd == 0x47) 2022 else if (cmd == 0x47)
1598 { 2023 {
1599 if (*data == 4) 2024 if (*data == 1) cell->player = data [1];
1600 ; // decode player count 2025 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2026 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2027 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1601 2028
1602 data += *data + 1; 2029 data += *data + 1;
1603 } 2030 }
1604 else if (cmd == 8) // cell flags 2031 else if (cmd == 8) // cell flags
1605 cell->flags = *data++; 2032 cell->flags = *data++;
… …
1612 } 2039 }
1613 else 2040 else
1614 cell->darkness = *data++ + 1; 2041 cell->darkness = *data++ + 1;
1615 } 2042 }
1616 2043
2044 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 2045 if (flags & (4 >> z))
1618 { 2046 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 2047 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 2048 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 2049 cell->tile [z] = self->face2tile [face];
2050
2051 if (cell->tile [z])
2052 {
2053 maptex *tex = self->tex + cell->tile [z];
2054 tex->unused = 0;
2055 if (!tex->name)
2056 av_push (missing, newSViv (cell->tile [z]));
2057
2058 if (tex->smoothtile)
2059 {
2060 maptex *smooth = self->tex + tex->smoothtile;
2061 smooth->unused = 0;
2062 if (!smooth->name)
2063 av_push (missing, newSViv (tex->smoothtile));
2064 }
2065 }
1622 } 2066 }
1623
1624 if (flags & 2)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [1] = self->face2tile [face];
1629 }
1630
1631 if (flags & 1)
1632 {
1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1634 need_facenum (self, face);
1635 cell->tile [2] = self->face2tile [face];
1636 }
1637 } 2067 }
1638 else 2068 else
1639 cell->darkness = 0; 2069 CELL_CLEAR (cell);
1640 } 2070 }
1641} 2071}
2072 OUTPUT:
2073 RETVAL
1642 2074
1643SV * 2075SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2076mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 2077 CODE:
1646{ 2078{
1647 int x1, x; 2079 int x1, x;
1648 int y1, y; 2080 int y1, y;
1649 int z; 2081 int z;
… …
1694} 2126}
1695 OUTPUT: 2127 OUTPUT:
1696 RETVAL 2128 RETVAL
1697 2129
1698void 2130void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2131draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1700 CODE: 2132 CODE:
1701{ 2133{
2134 int x, y, z;
2135
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2136 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2137 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2138 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 2139 smooth_key skey;
1706 int x, y, z; 2140 int pl_x, pl_y;
1707 int last_name; 2141 maptex pl_tex;
2142 rc_t *rc = rc_alloc ();
2143 rc_t *rc_ov = rc_alloc ();
2144 rc_key_t key;
2145 rc_array_t *arr;
1708 2146
2147 pl_tex.name = 0;
2148
1709 // thats current max. sorry. 2149 // that's current max. sorry.
1710 if (sw > 255) sw = 255; 2150 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 2151 if (sh > 255) sh = 255;
1712 2152
1713 // clear key, in case of extra padding 2153 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 2154 memset (&skey, 0, sizeof (skey));
1715 2155
1716 glColor4ub (255, 255, 255, 255); 2156 memset (&key, 0, sizeof (key));
1717 2157 key.r = 255;
1718 glEnable (GL_BLEND); 2158 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2159 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 2160 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2161 key.mode = GL_QUADS;
1722 2162 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS);
1724
1725 last_name = 0;
1726 2163
1727 mx += self->x; 2164 mx += self->x;
1728 my += self->y; 2165 my += self->y;
1729 2166
1730 // first pass: determine smooth_max 2167 // first pass: determine smooth_max
… …
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 2184 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 2185 self->tex [cell->tile [2]].smoothlevel));
1749 } 2186 }
1750 } 2187 }
1751 2188
2189 glEnable (GL_BLEND);
2190 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2191 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2192
1752 for (z = 0; z <= 2; z++) 2193 for (z = 0; z <= 2; z++)
1753 { 2194 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 2195 memset (smooth_level, 0, sizeof (smooth_level));
2196 key.texname = -1;
1755 2197
1756 for (y = 0; y < sh; y++) 2198 for (y = 0; y < sh; y++)
1757 if (0 <= y + my && y + my < self->rows) 2199 if (0 <= y + my && y + my < self->rows)
1758 { 2200 {
1759 maprow *row = self->row + (y + my); 2201 maprow *row = self->row + (y + my);
… …
1765 tileid tile = cell->tile [z]; 2207 tileid tile = cell->tile [z];
1766 2208
1767 if (tile) 2209 if (tile)
1768 { 2210 {
1769 maptex tex = self->tex [tile]; 2211 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 2212 int px, py;
1771 int py = (y + 1) * T - tex.h;
1772 2213
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 2214 if (key.texname != tex.name)
1776 { 2215 {
2216 self->tex [tile].unused = 0;
2217
1777 if (!tex.name) 2218 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 2219 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1779 2220
1780 glEnd (); 2221 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2222 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 2223 }
1784 2224
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2225 px = (x + 1) * T - tex.w;
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2226 py = (y + 1) * T - tex.h;
1787 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1789 2227
1790 if (cell->flags && z == 2) 2228 if (expect_false (cell->player == player) && expect_false (z == 2))
1791 { 2229 {
1792 if (cell->flags & 1) 2230 pl_x = px;
2231 pl_y = py;
2232 pl_tex = tex;
1793 { 2233 continue;
1794 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32;
1797
1798 glEnd ();
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1800 glBegin (GL_QUADS);
1801
1802 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806 }
1807 } 2234 }
2235
2236 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2237 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2238 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2239 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1808 2240
1809 // update smooth hash 2241 // update smooth hash
1810 if (tex.smoothtile) 2242 if (tex.smoothtile)
1811 { 2243 {
1812 skey.tile = tex.smoothtile; 2244 skey.tile = tex.smoothtile;
… …
1843 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2275 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1844 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2276 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1845 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2277 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1846 } 2278 }
1847 } 2279 }
2280
2281 if (expect_false (z == 2) && expect_false (cell->flags))
2282 {
2283 // overlays such as the speech bubble, probably more to come
2284 if (cell->flags & 1)
2285 {
2286 rc_key_t key_ov = key;
2287 maptex tex = self->tex [TEXID_SPEECH];
2288 rc_array_t *arr;
2289 int px = x * T + T * 2 / 32;
2290 int py = y * T - T * 6 / 32;
2291
2292 key_ov.texname = tex.name;
2293 arr = rc_array (rc_ov, &key_ov);
2294
2295 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2296 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2297 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2298 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2299 }
2300 }
1848 } 2301 }
1849 } 2302 }
2303
2304 rc_draw (rc);
2305 rc_clear (rc);
1850 2306
1851 // go through all smoothlevels, lowest to highest, then draw. 2307 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 2308 // this is basically counting sort
1853 { 2309 {
1854 int w, b; 2310 int w, b;
1855 2311
2312 glEnable (GL_TEXTURE_2D);
2313 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 2314 for (w = 0; w < 256 / 32; ++w)
1857 { 2315 {
1858 uint32_t smask = smooth_level [w]; 2316 uint32_t smask = smooth_level [w];
1859 if (smask) 2317 if (smask)
1860 for (b = 0; b < 32; ++b) 2318 for (b = 0; b < 32; ++b)
… …
1879 int border = bits & 15; 2337 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2338 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 2339 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 2340 float dy = tex.t * .5f ; // 2 images/column
1883 2341
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 2342 if (tex.name)
1887 { 2343 {
2344 // this time avoiding texture state changes
2345 // save gobs of state changes.
1888 if (!tex.name) 2346 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2347 {
2348 self->tex [skey->tile].unused = 0;
1890 2349
1891 glEnd (); 2350 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2351 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2352 glBegin (GL_QUADS);
1894 } 2353 }
1895 2354
1896 if (border) 2355 if (border)
1897 { 2356 {
1898 float ox = border * dx; 2357 float ox = border * dx;
1899 2358
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2359 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2360 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2361 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2362 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2363 }
1905 2364
1906 if (corner) 2365 if (corner)
1907 { 2366 {
1908 float ox = corner * dx; 2367 float ox = corner * dx;
1909 2368
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2369 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2370 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2371 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2372 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2373 }
1914 } 2374 }
1915 } 2375 }
1916 } 2376 }
1917 } 2377 }
1918 } 2378 }
2379
2380 glEnd ();
2381 glDisable (GL_TEXTURE_2D);
2382 key.texname = -1;
1919 } 2383 }
1920 2384
1921 hv_clear (smooth); 2385 hv_clear (smooth);
1922 } 2386 }
1923 2387
1924 glEnd (); 2388 if (pl_tex.name)
2389 {
2390 maptex tex = pl_tex;
2391 int px = pl_x + sdx;
2392 int py = pl_y + sdy;
1925 2393
1926 glDisable (GL_TEXTURE_2D); 2394 key.texname = tex.name;
2395 arr = rc_array (rc, &key);
2396
2397 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2398 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2399 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2400 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2401
2402 rc_draw (rc);
2403 }
2404
2405 rc_draw (rc_ov);
2406 rc_clear (rc_ov);
2407
1927 glDisable (GL_BLEND); 2408 glDisable (GL_BLEND);
2409 rc_free (rc);
2410 rc_free (rc_ov);
1928 2411
1929 // top layer: overlays such as the health bar 2412 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2413 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2414 if (0 <= y + my && y + my < self->rows)
1932 { 2415 {
… …
1937 { 2420 {
1938 mapcell *cell = row->col + (x + mx - row->c0); 2421 mapcell *cell = row->col + (x + mx - row->c0);
1939 2422
1940 int px = x * T; 2423 int px = x * T;
1941 int py = y * T; 2424 int py = y * T;
2425
2426 if (expect_false (cell->player == player))
2427 {
2428 px += sdx;
2429 py += sdy;
2430 }
1942 2431
1943 if (cell->stat_hp) 2432 if (cell->stat_hp)
1944 { 2433 {
1945 int width = cell->stat_width * T; 2434 int width = cell->stat_width * T;
1946 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2435 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
1957 } 2446 }
1958 } 2447 }
1959} 2448}
1960 2449
1961void 2450void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2451draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1963 CODE: 2452 CODE:
1964{ 2453{
1965 static float color[16][3] = { 2454 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2455 { 0.00f, 0.00f, 0.00f },
1967 { 1.00F, 1.00F, 1.00F }, 2456 { 1.00f, 1.00f, 1.00f },
1968 { 0.00F, 0.00F, 0.55F }, 2457 { 0.00f, 0.00f, 0.55f },
1969 { 1.00F, 0.00F, 0.00F }, 2458 { 1.00f, 0.00f, 0.00f },
1970 2459
1971 { 1.00F, 0.54F, 0.00F }, 2460 { 1.00f, 0.54f, 0.00f },
1972 { 0.11F, 0.56F, 1.00F }, 2461 { 0.11f, 0.56f, 1.00f },
1973 { 0.93F, 0.46F, 0.00F }, 2462 { 0.93f, 0.46f, 0.00f },
1974 { 0.18F, 0.54F, 0.34F }, 2463 { 0.18f, 0.54f, 0.34f },
1975 2464
1976 { 0.56F, 0.73F, 0.56F }, 2465 { 0.56f, 0.73f, 0.56f },
1977 { 0.80F, 0.80F, 0.80F }, 2466 { 0.80f, 0.80f, 0.80f },
1978 { 0.55F, 0.41F, 0.13F }, 2467 { 0.55f, 0.41f, 0.13f },
1979 { 0.99F, 0.77F, 0.26F }, 2468 { 0.99f, 0.77f, 0.26f },
1980 2469
1981 { 0.74F, 0.65F, 0.41F }, 2470 { 0.74f, 0.65f, 0.41f },
1982 2471
1983 { 0.00F, 1.00F, 1.00F }, 2472 { 0.00f, 1.00f, 1.00f },
1984 { 1.00F, 0.00F, 1.00F }, 2473 { 1.00f, 0.00f, 1.00f },
1985 { 1.00F, 1.00F, 0.00F }, 2474 { 1.00f, 1.00f, 0.00f },
1986 }; 2475 };
1987 2476
1988 int x, y; 2477 int x, y;
1989 2478
1990 glEnable (GL_TEXTURE_2D); 2479 glEnable (GL_TEXTURE_2D);
2480 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2481 * but the nvidia driver (185.18.14) mishandles alpha textures
2482 * and takes the colour from god knows where instead of using
2483 * Cp. MODULATE results in the same colour, but slightly different
2484 * alpha, but atcually gives us the correct colour with nvidia.
2485 */
1991 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2486 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1992 glEnable (GL_BLEND); 2487 glEnable (GL_BLEND);
1993 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2488 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1994 glBegin (GL_QUADS); 2489 glBegin (GL_QUADS);
1995 2490
1996 for (y = 0; y < h; y++) 2491 for (y = 0; y < h; y++)
… …
2000 2495
2001 if (m) 2496 if (m)
2002 { 2497 {
2003 float *c = color [m & 15]; 2498 float *c = color [m & 15];
2004 2499
2005 float tx1 = m & 0x40 ? 0.5 : 0.; 2500 float tx1 = m & 0x40 ? 0.5f : 0.f;
2006 float tx2 = tx1 + 0.5; 2501 float tx2 = tx1 + 0.5f;
2007 2502
2008 glColor4f (c[0], c[1], c[2], 0.75); 2503 glColor4f (c[0], c[1], c[2], 1);
2009 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2504 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2010 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2505 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2011 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2506 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2012 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2507 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2013 } 2508 }
… …
2017 glDisable (GL_BLEND); 2512 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2513 glDisable (GL_TEXTURE_2D);
2019} 2514}
2020 2515
2021void 2516void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2517fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2518 PPCODE:
2024{ 2519{
2025 int x, y; 2520 int x, y;
2026 int sw1 = sw + 2; 2521 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2522 int sh1 = sh + 2;
2028 int sh3 = sh * 3; 2523 int sh3 = sh * 3;
2029 int sw34 = (sw * 3 + 3) & ~3; 2524 int sw3 = sw * 3;
2030 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2525 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2031 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2526 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2032 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2527 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2033 2528
2034 SvPOK_only (darkness3_sv); 2529 SvPOK_only (darkness3_sv);
2035 SvCUR_set (darkness3_sv, sw34 * sh3); 2530 SvCUR_set (darkness3_sv, sw3 * sh3);
2036 2531
2037 mx += self->x - 1; 2532 mx += self->x - 1;
2038 my += self->y - 1; 2533 my += self->y - 1;
2039
2040 memset (darkness1, 255, sw1 * sh1);
2041 2534
2042 for (y = 0; y < sh1; y++) 2535 for (y = 0; y < sh1; y++)
2043 if (0 <= y + my && y + my < self->rows) 2536 if (0 <= y + my && y + my < self->rows)
2044 { 2537 {
2045 maprow *row = self->row + (y + my); 2538 maprow *row = self->row + (y + my);
… …
2048 if (row->c0 <= x + mx && x + mx < row->c1) 2541 if (row->c0 <= x + mx && x + mx < row->c1)
2049 { 2542 {
2050 mapcell *cell = row->col + (x + mx - row->c0); 2543 mapcell *cell = row->col + (x + mx - row->c0);
2051 2544
2052 darkness1 [y * sw1 + x] = cell->darkness 2545 darkness1 [y * sw1 + x] = cell->darkness
2053 ? 255 - (cell->darkness - 1) 2546 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2054 : 255 - FOW_DARKNESS; 2547 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2055 } 2548 }
2056 } 2549 }
2057 2550
2058 for (y = 0; y < sh; ++y) 2551 for (y = 0; y < sh; ++y)
2059 for (x = 0; x < sw; ++x) 2552 for (x = 0; x < sw; ++x)
… …
2078 2571
2079 uint8_t r13 = (d13 + d23 + d12) / 3; 2572 uint8_t r13 = (d13 + d23 + d12) / 3;
2080 uint8_t r23 = d23; 2573 uint8_t r23 = d23;
2081 uint8_t r33 = (d23 + d33 + d32) / 3; 2574 uint8_t r33 = (d23 + d33 + d32) / 3;
2082 2575
2083 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2576 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2084 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2577 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2085 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2578 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2086 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2579 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2087 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2580 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2088 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2581 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2089 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2582 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2090 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2583 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2091 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2584 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2092 } 2585 }
2093 2586
2094 free (darkness1); 2587 free (darkness1);
2095 2588
2096 EXTEND (SP, 3); 2589 EXTEND (SP, 3);
2097 PUSHs (sv_2mortal (newSViv (sw34))); 2590 PUSHs (sv_2mortal (newSViv (sw3)));
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2591 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2592 PUSHs (darkness3_sv);
2100} 2593}
2101 2594
2102SV * 2595SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2596get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2597 CODE:
2105{ 2598{
2106 int x, y, x1, y1; 2599 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2600 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2601 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2165 else 2658 else
2166 *data++ = 0; 2659 *data++ = 0;
2167 } 2660 }
2168 } 2661 }
2169 2662
2663 /* if size is w*h + 5 then no data has been found */
2664 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2665 {
2170 SvPOK_only (data_sv); 2666 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2667 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2668 }
2669
2172 RETVAL = data_sv; 2670 RETVAL = data_sv;
2173} 2671}
2174 OUTPUT: 2672 OUTPUT:
2175 RETVAL 2673 RETVAL
2176 2674
2177void 2675void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2676set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2677 PPCODE:
2180{ 2678{
2181 int x, y, z; 2679 int x, y, z;
2182 int w, h; 2680 int w, h;
2183 int x1, y1; 2681 int x1, y1;
2682 STRLEN len;
2683 uint8_t *data, *end;
2684
2685 len = SvLEN (data_sv);
2686 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2687 data = SvPVbyte_nolen (data_sv);
2688 end = data + len + 8;
2689
2690 if (len < 5)
2691 XSRETURN_EMPTY;
2184 2692
2185 if (*data++ != 0) 2693 if (*data++ != 0)
2186 return; /* version mismatch */ 2694 XSRETURN_EMPTY; /* version mismatch */
2187 2695
2188 w = *data++ << 8; w |= *data++; 2696 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2697 h = *data++ << 8; h |= *data++;
2190 2698
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2699 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2203 { 2711 {
2204 maprow *row = map_get_row (self, y); 2712 maprow *row = map_get_row (self, y);
2205 2713
2206 for (x = x0; x < x1; x++) 2714 for (x = x0; x < x1; x++)
2207 { 2715 {
2716 uint8_t flags;
2717
2718 if (data + 7 >= end)
2719 XSRETURN_EMPTY;
2720
2208 uint8_t flags = *data++; 2721 flags = *data++;
2209 2722
2210 if (flags) 2723 if (flags)
2211 { 2724 {
2212 mapcell *cell = row_get_cell (row, x); 2725 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2726 tileid tile[3] = { 0, 0, 0 };
… …
2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2729 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2730 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2218 2731
2219 if (cell->darkness == 0) 2732 if (cell->darkness == 0)
2220 { 2733 {
2221 cell->darkness = 0; 2734 /*cell->darkness = 0;*/
2735 EXTEND (SP, 3);
2222 2736
2223 for (z = 0; z <= 2; z++) 2737 for (z = 0; z <= 2; z++)
2224 { 2738 {
2225 tileid t = tile [z]; 2739 tileid t = tile [z];
2226 2740
2227 if (t >= self->texs || (t && !self->tex [t].name)) 2741 if (t >= self->texs || (t && !self->tex [t].name))
2228 { 2742 {
2229 XPUSHs (sv_2mortal (newSViv (t))); 2743 PUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t); 2744 need_texid (self, t);
2231 } 2745 }
2232 2746
2233 cell->tile [z] = t; 2747 cell->tile [z] = t;
2234 } 2748 }
… …
2236 } 2750 }
2237 } 2751 }
2238 } 2752 }
2239} 2753}
2240 2754
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2755MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2756
2243CFPlus::RW 2757DC::RW
2244new (SV *class, SV *data_sv) 2758new (SV *class, SV *data_sv)
2245 CODE: 2759 CODE:
2246{ 2760{
2247 STRLEN datalen; 2761 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2762 char *data = SvPVbyte (data_sv, datalen);
… …
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2764 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2765}
2252 OUTPUT: 2766 OUTPUT:
2253 RETVAL 2767 RETVAL
2254 2768
2255CFPlus::RW 2769DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2770new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2771 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2772 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2773 OUTPUT:
2260 RETVAL 2774 RETVAL
2261 2775
2776# fails on win32:
2777# dc.xs(2268) : error C2059: syntax error : '('
2262void 2778#void
2263close (CFPlus::RW self) 2779#close (DC::RW self)
2264 CODE: 2780# CODE:
2265 SDL_RWclose (self); 2781# (self->(close)) (self);
2266 2782
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2783MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2784
2269PROTOTYPES: DISABLE 2785PROTOTYPES: DISABLE
2270 2786
2271void 2787DC::Channel
2272halt (CFPlus::Channel self) 2788find ()
2273 CODE: 2789 CODE:
2790{
2791 RETVAL = Mix_GroupAvailable (-1);
2792
2793 if (RETVAL < 0)
2794 {
2795 RETVAL = Mix_GroupOldest (-1);
2796
2797 if (RETVAL < 0)
2798 XSRETURN_UNDEF;
2799
2274 Mix_HaltChannel (self); 2800 Mix_HaltChannel (RETVAL);
2801 }
2275 2802
2276void 2803 Mix_UnregisterAllEffects (RETVAL);
2277expire (CFPlus::Channel self, int ticks = -1) 2804 Mix_Volume (RETVAL, 128);
2278 CODE: 2805}
2279 Mix_ExpireChannel (self, ticks);
2280
2281void
2282fade_out (CFPlus::Channel self, int ticks = -1)
2283 CODE:
2284 Mix_FadeOutChannel (self, ticks);
2285
2286int
2287volume (CFPlus::Channel self, int volume)
2288 CODE:
2289 RETVAL = Mix_Volume (self, volume);
2290 OUTPUT: 2806 OUTPUT:
2291 RETVAL 2807 RETVAL
2292 2808
2293void 2809void
2810halt (DC::Channel self)
2811 CODE:
2812 Mix_HaltChannel (self);
2813
2814void
2815expire (DC::Channel self, int ticks = -1)
2816 CODE:
2817 Mix_ExpireChannel (self, ticks);
2818
2819void
2820fade_out (DC::Channel self, int ticks = -1)
2821 CODE:
2822 Mix_FadeOutChannel (self, ticks);
2823
2824int
2825volume (DC::Channel self, int volume)
2826 CODE:
2827 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2828 OUTPUT:
2829 RETVAL
2830
2831void
2294unregister_all_effects (CFPlus::Channel self) 2832unregister_all_effects (DC::Channel self)
2295 CODE: 2833 CODE:
2296 Mix_UnregisterAllEffects (self); 2834 Mix_UnregisterAllEffects (self);
2297 2835
2298void 2836void
2299set_panning (CFPlus::Channel self, int left, int right) 2837set_panning (DC::Channel self, int left, int right)
2300 CODE: 2838 CODE:
2839 left = CLAMP (left , 0, 255);
2840 right = CLAMP (right, 0, 255);
2301 Mix_SetPanning (self, left, right); 2841 Mix_SetPanning (self, left, right);
2302 2842
2303void 2843void
2304set_distance (CFPlus::Channel self, int distance) 2844set_distance (DC::Channel self, int distance)
2305 CODE: 2845 CODE:
2306 Mix_SetDistance (self, distance); 2846 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2307 2847
2308void 2848void
2309set_position (CFPlus::Channel self, int angle, int distance) 2849set_position (DC::Channel self, int angle, int distance)
2310 CODE: 2850 CODE:
2851
2852void
2853set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2854 CODE:
2855{
2856 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2857 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2311 Mix_SetPosition (self, angle, distance); 2858 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2859}
2312 2860
2313void 2861void
2314set_reverse_stereo (CFPlus::Channel self, int flip) 2862set_reverse_stereo (DC::Channel self, int flip)
2315 CODE: 2863 CODE:
2316 Mix_SetReverseStereo (self, flip); 2864 Mix_SetReverseStereo (self, flip);
2317 2865
2318MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2866MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2319 2867
2320PROTOTYPES: DISABLE 2868PROTOTYPES: DISABLE
2321 2869
2322CFPlus::MixChunk 2870DC::MixChunk
2323new (SV *class, CFPlus::RW rwops) 2871new (SV *class, DC::RW rwops)
2324 CODE: 2872 CODE:
2325 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2873 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2326 OUTPUT: 2874 OUTPUT:
2327 RETVAL 2875 RETVAL
2328 2876
2329void 2877void
2330DESTROY (CFPlus::MixChunk self) 2878DESTROY (DC::MixChunk self)
2331 CODE: 2879 CODE:
2332 Mix_FreeChunk (self); 2880 Mix_FreeChunk (self);
2333 2881
2334int 2882int
2335volume (CFPlus::MixChunk self, int volume = -1) 2883volume (DC::MixChunk self, int volume = -1)
2336 CODE: 2884 CODE:
2885 if (items > 1)
2886 volume = CLAMP (volume, 0, 128);
2337 RETVAL = Mix_VolumeChunk (self, volume); 2887 RETVAL = Mix_VolumeChunk (self, volume);
2338 OUTPUT: 2888 OUTPUT:
2339 RETVAL 2889 RETVAL
2340 2890
2341CFPlus::Channel 2891DC::Channel
2342play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2892play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2343 CODE: 2893 CODE:
2894{
2344 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2895 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2896
2897 if (RETVAL < 0)
2898 XSRETURN_UNDEF;
2899
2900 if (channel < 0)
2901 {
2345 Mix_UnregisterAllEffects (RETVAL); 2902 Mix_UnregisterAllEffects (RETVAL);
2903 Mix_Volume (RETVAL, 128);
2904 }
2905}
2346 OUTPUT: 2906 OUTPUT:
2347 RETVAL 2907 RETVAL
2348 2908
2349MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2909MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2350 2910
2351int 2911int
2352volume (int volume = -1) 2912volume (int volume = -1)
2353 PROTOTYPE: ;$ 2913 PROTOTYPE: ;$
2354 CODE: 2914 CODE:
2915 if (items > 0)
2916 volume = CLAMP (volume, 0, 128);
2355 RETVAL = Mix_VolumeMusic (volume); 2917 RETVAL = Mix_VolumeMusic (volume);
2356 OUTPUT: 2918 OUTPUT:
2357 RETVAL 2919 RETVAL
2358 2920
2359void 2921void
… …
2364void 2926void
2365halt () 2927halt ()
2366 CODE: 2928 CODE:
2367 Mix_HaltMusic (); 2929 Mix_HaltMusic ();
2368 2930
2369CFPlus::MixMusic 2931DC::MixMusic
2370new (SV *class, CFPlus::RW rwops) 2932new (SV *class, DC::RW rwops)
2371 CODE: 2933 CODE:
2372 RETVAL = Mix_LoadMUS_RW (rwops); 2934 RETVAL = Mix_LoadMUS_RW (rwops);
2373 OUTPUT: 2935 OUTPUT:
2374 RETVAL 2936 RETVAL
2375 2937
2376void 2938void
2377DESTROY (CFPlus::MixMusic self) 2939DESTROY (DC::MixMusic self)
2378 CODE: 2940 CODE:
2379 Mix_FreeMusic (self); 2941 Mix_FreeMusic (self);
2380 2942
2381int 2943int
2382play (CFPlus::MixMusic self, int loops = -1) 2944play (DC::MixMusic self, int loops = -1)
2383 CODE: 2945 CODE:
2384 RETVAL = Mix_PlayMusic (self, loops); 2946 RETVAL = Mix_PlayMusic (self, loops);
2385 OUTPUT: 2947 OUTPUT:
2386 RETVAL 2948 RETVAL
2387 2949
2388void 2950void
2389fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2951fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2390 CODE: 2952 CODE:
2391 Mix_FadeInMusicPos (self, loops, ms, position); 2953 Mix_FadeInMusicPos (self, loops, ms, position);
2392 2954
2393MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2955MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2394 2956
2395PROTOTYPES: ENABLE 2957PROTOTYPES: ENABLE
2396 2958
2397BOOT: 2959BOOT:
2398{ 2960{
2399 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2961 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2400 static const struct { 2962 static const struct {
2401 const char *name; 2963 const char *name;
2402 IV iv; 2964 IV iv;
2403 } *civ, const_iv[] = { 2965 } *civ, const_iv[] = {
2404# define const_iv(name) { # name, (IV)name } 2966# define const_iv(name) { # name, (IV)name }
2405 const_iv (GL_VENDOR), 2967 const_iv (GL_VENDOR),
2406 const_iv (GL_VERSION), 2968 const_iv (GL_VERSION),
2407 const_iv (GL_EXTENSIONS), 2969 const_iv (GL_EXTENSIONS),
2970 const_iv (GL_MAX_TEXTURE_UNITS),
2408 const_iv (GL_COLOR_MATERIAL), 2971 const_iv (GL_COLOR_MATERIAL),
2409 const_iv (GL_SMOOTH), 2972 const_iv (GL_SMOOTH),
2410 const_iv (GL_FLAT), 2973 const_iv (GL_FLAT),
2411 const_iv (GL_DITHER), 2974 const_iv (GL_DITHER),
2412 const_iv (GL_BLEND), 2975 const_iv (GL_BLEND),
… …
2424 const_iv (GL_ZERO), 2987 const_iv (GL_ZERO),
2425 const_iv (GL_SRC_ALPHA), 2988 const_iv (GL_SRC_ALPHA),
2426 const_iv (GL_DST_ALPHA), 2989 const_iv (GL_DST_ALPHA),
2427 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2990 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2428 const_iv (GL_ONE_MINUS_DST_ALPHA), 2991 const_iv (GL_ONE_MINUS_DST_ALPHA),
2992 const_iv (GL_SRC_COLOR),
2993 const_iv (GL_DST_COLOR),
2994 const_iv (GL_ONE_MINUS_SRC_COLOR),
2995 const_iv (GL_ONE_MINUS_DST_COLOR),
2429 const_iv (GL_SRC_ALPHA_SATURATE), 2996 const_iv (GL_SRC_ALPHA_SATURATE),
2430 const_iv (GL_RGB), 2997 const_iv (GL_RGB),
2431 const_iv (GL_RGBA), 2998 const_iv (GL_RGBA),
2432 const_iv (GL_RGBA4), 2999 const_iv (GL_RGBA4),
2433 const_iv (GL_RGBA8), 3000 const_iv (GL_RGBA8),
… …
2439 const_iv (GL_INTENSITY), 3006 const_iv (GL_INTENSITY),
2440 const_iv (GL_LUMINANCE), 3007 const_iv (GL_LUMINANCE),
2441 const_iv (GL_LUMINANCE_ALPHA), 3008 const_iv (GL_LUMINANCE_ALPHA),
2442 const_iv (GL_FLOAT), 3009 const_iv (GL_FLOAT),
2443 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3010 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3011 const_iv (GL_COMPRESSED_ALPHA_ARB),
3012 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3013 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3014 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3015 const_iv (GL_COMPRESSED_RGB_ARB),
3016 const_iv (GL_COMPRESSED_RGBA_ARB),
2444 const_iv (GL_COMPILE), 3017 const_iv (GL_COMPILE),
2445 const_iv (GL_PROXY_TEXTURE_1D), 3018 const_iv (GL_PROXY_TEXTURE_1D),
2446 const_iv (GL_PROXY_TEXTURE_2D), 3019 const_iv (GL_PROXY_TEXTURE_2D),
2447 const_iv (GL_TEXTURE_1D), 3020 const_iv (GL_TEXTURE_1D),
2448 const_iv (GL_TEXTURE_2D), 3021 const_iv (GL_TEXTURE_2D),
… …
2487 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3060 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2488 const_iv (GL_POINT_SMOOTH_HINT), 3061 const_iv (GL_POINT_SMOOTH_HINT),
2489 const_iv (GL_LINE_SMOOTH_HINT), 3062 const_iv (GL_LINE_SMOOTH_HINT),
2490 const_iv (GL_POLYGON_SMOOTH_HINT), 3063 const_iv (GL_POLYGON_SMOOTH_HINT),
2491 const_iv (GL_GENERATE_MIPMAP_HINT), 3064 const_iv (GL_GENERATE_MIPMAP_HINT),
3065 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2492 const_iv (GL_FASTEST), 3066 const_iv (GL_FASTEST),
2493 const_iv (GL_DONT_CARE), 3067 const_iv (GL_DONT_CARE),
2494 const_iv (GL_NICEST), 3068 const_iv (GL_NICEST),
2495 const_iv (GL_V2F), 3069 const_iv (GL_V2F),
2496 const_iv (GL_V3F), 3070 const_iv (GL_V3F),
2497 const_iv (GL_T2F_V3F), 3071 const_iv (GL_T2F_V3F),
2498 const_iv (GL_T2F_N3F_V3F), 3072 const_iv (GL_T2F_N3F_V3F),
3073 const_iv (GL_FUNC_ADD),
3074 const_iv (GL_FUNC_SUBTRACT),
3075 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2499# undef const_iv 3076# undef const_iv
2500 }; 3077 };
2501 3078
2502 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3079 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2503 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3080 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2504 3081
2505 texture_av = newAV (); 3082 texture_av = newAV ();
2506 AvREAL_off (texture_av); 3083 AvREAL_off (texture_av);
2507} 3084}
2508 3085
3086void
3087disable_GL_EXT_blend_func_separate ()
3088 CODE:
3089 gl.BlendFuncSeparate = 0;
3090 gl.BlendFuncSeparateEXT = 0;
3091
3092void
3093apple_nvidia_bug (int enable)
3094
2509char * 3095char *
2510gl_vendor () 3096gl_vendor ()
2511 CODE: 3097 CODE:
2512 RETVAL = (char *)glGetString (GL_VENDOR); 3098 RETVAL = (char *)glGetString (GL_VENDOR);
2513 OUTPUT: 3099 OUTPUT:
… …
2562 3148
2563void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3149void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2564 CODE: 3150 CODE:
2565 gl_BlendFuncSeparate (sa, da, saa, daa); 3151 gl_BlendFuncSeparate (sa, da, saa, daa);
2566 3152
3153# void glBlendEquation (int se)
3154
2567void glDepthMask (int flag) 3155void glDepthMask (int flag)
2568 3156
2569void glLogicOp (int opcode) 3157void glLogicOp (int opcode)
2570 3158
2571void glColorMask (int red, int green, int blue, int alpha) 3159void glColorMask (int red, int green, int blue, int alpha)
… …
2605void glRotate (float angle, float x, float y, float z) 3193void glRotate (float angle, float x, float y, float z)
2606 CODE: 3194 CODE:
2607 glRotatef (angle, x, y, z); 3195 glRotatef (angle, x, y, z);
2608 3196
2609void glColor (float r, float g, float b, float a = 1.0) 3197void glColor (float r, float g, float b, float a = 1.0)
3198 PROTOTYPE: @
2610 ALIAS: 3199 ALIAS:
2611 glColor_premultiply = 1 3200 glColor_premultiply = 1
2612 CODE: 3201 CODE:
2613 if (ix) 3202 if (ix)
2614 { 3203 {
… …
2634 3223
2635void glRect (float x1, float y1, float x2, float y2) 3224void glRect (float x1, float y1, float x2, float y2)
2636 CODE: 3225 CODE:
2637 glRectf (x1, y1, x2, y2); 3226 glRectf (x1, y1, x2, y2);
2638 3227
3228void glRect_lineloop (float x1, float y1, float x2, float y2)
3229 CODE:
3230 glBegin (GL_LINE_LOOP);
3231 glVertex2f (x1, y1);
3232 glVertex2f (x2, y1);
3233 glVertex2f (x2, y2);
3234 glVertex2f (x1, y2);
3235 glEnd ();
3236
2639PROTOTYPES: ENABLE 3237PROTOTYPES: ENABLE
2640 3238
2641void glBegin (int mode) 3239void glBegin (int mode)
2642 3240
2643void glEnd () 3241void glEnd ()
… …
2675void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3273void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2676 CODE: 3274 CODE:
2677 if (gl.SeparableFilter2D) 3275 if (gl.SeparableFilter2D)
2678 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3276 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2679 3277
2680void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3278void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2681 3279
2682void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3280void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2683 3281
2684void glDrawPixels (int width, int height, int format, int type, char *pixels) 3282void glDrawPixels (int width, int height, int format, int type, char *pixels)
2685 3283
… …
2711 3309
2712void glEndList () 3310void glEndList ()
2713 3311
2714void glCallList (int list) 3312void glCallList (int list)
2715 3313
2716MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3314void c_init ()
3315 CODE:
3316 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3317 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3318
3319MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2717 3320
2718PROTOTYPES: DISABLE 3321PROTOTYPES: DISABLE
2719 3322
2720void 3323void
2721find_widget (SV *self, NV x, NV y) 3324find_widget (SV *self, NV x, NV y)
… …
2725 XPUSHs (self); 3328 XPUSHs (self);
2726} 3329}
2727 3330
2728BOOT: 3331BOOT:
2729{ 3332{
2730 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3333 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2731 3334
2732 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3335 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2733 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3336 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2734 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3337 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2735 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3338 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2736} 3339}
2737 3340
2738void 3341void
2739draw (SV *self) 3342draw (SV *self)
2740 CODE: 3343 CODE:
… …
2744 NV x, y, w, h; 3347 NV x, y, w, h;
2745 SV *draw_x_sv = GvSV (draw_x_gv); 3348 SV *draw_x_sv = GvSV (draw_x_gv);
2746 SV *draw_y_sv = GvSV (draw_y_gv); 3349 SV *draw_y_sv = GvSV (draw_y_gv);
2747 SV *draw_w_sv = GvSV (draw_w_gv); 3350 SV *draw_w_sv = GvSV (draw_w_gv);
2748 SV *draw_h_sv = GvSV (draw_h_gv); 3351 SV *draw_h_sv = GvSV (draw_h_gv);
2749 SV *hover;
2750 double draw_x, draw_y, draw_w, draw_h; 3352 double draw_x, draw_y;
2751 3353
2752 if (!SvROK (self)) 3354 if (!SvROK (self))
2753 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3355 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2754 3356
2755 hv = (HV *)SvRV (self); 3357 hv = (HV *)SvRV (self);
2756 3358
2757 if (SvTYPE (hv) != SVt_PVHV) 3359 if (SvTYPE (hv) != SVt_PVHV)
2758 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3360 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2759 3361
2760 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3362 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2761 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3363 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2762 3364
2763 if (!h || !w) 3365 if (!h || !w)
… …
2783 { 3385 {
2784 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3386 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2785 3387
2786 if (svp && SvTRUE (*svp)) 3388 if (svp && SvTRUE (*svp))
2787 { 3389 {
2788 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3390 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2789 glEnable (GL_BLEND); 3391 glEnable (GL_BLEND);
2790 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3392 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2791 glBegin (GL_QUADS); 3393 glBegin (GL_QUADS);
2792 glVertex2f (0, 0); 3394 glVertex2f (0, 0);
2793 glVertex2f (w, 0); 3395 glVertex2f (w, 0);
… …
2796 glEnd (); 3398 glEnd ();
2797 glDisable (GL_BLEND); 3399 glDisable (GL_BLEND);
2798 } 3400 }
2799 } 3401 }
2800#if 0 3402#if 0
2801 if ($ENV{CFPLUS_DEBUG} & 1) { 3403 // draw borders, for debugging
2802 glPushMatrix; 3404 glPushMatrix ();
2803 glColor 1, 1, 0, 1; 3405 glColor4f (1., 1., 0., 1.);
2804 glTranslate 0.375, 0.375; 3406 glTranslatef (.5, .5, 0.);
2805 glBegin GL_LINE_LOOP; 3407 glBegin (GL_LINE_LOOP);
2806 glVertex 0 , 0; 3408 glVertex2f (0 , 0);
2807 glVertex $self->{w} - 1, 0; 3409 glVertex2f (w - 1, 0);
2808 glVertex $self->{w} - 1, $self->{h} - 1; 3410 glVertex2f (w - 1, h - 1);
2809 glVertex 0 , $self->{h} - 1; 3411 glVertex2f (0 , h - 1);
2810 glEnd; 3412 glEnd ();
2811 glPopMatrix; 3413 glPopMatrix ();
2812 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2813 }
2814#endif 3414#endif
2815 PUSHMARK (SP); 3415 PUSHMARK (SP);
2816 XPUSHs (self); 3416 XPUSHs (self);
2817 PUTBACK; 3417 PUTBACK;
2818 call_method ("_draw", G_VOID | G_DISCARD); 3418 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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