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

Diff Legend

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