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

Diff Legend

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