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.303 by root, Thu Apr 22 11:18:04 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
858 1116
859void 1117void
860load_image_inline (SV *image_) 1118load_image_inline (SV *image_)
861 ALIAS: 1119 ALIAS:
862 load_image_file = 1 1120 load_image_file = 1
… …
948void 1206void
949error (char *message) 1207error (char *message)
950 CODE: 1208 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1209 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1210#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1211 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1212#endif
955 1213
956void 1214void
957fatal (char *message) 1215fatal (char *message)
958 CODE: 1216 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1217 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1218#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1219 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1220#endif
963 _exit (1); 1221 _exit (1);
964 1222
965void 1223void
966_exit (int retval = 0) 1224_exit (int retval = 0)
… …
978#if DEBUG 1236#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1237 VALGRIND_DO_LEAK_CHECK;
980#endif 1238#endif
981} 1239}
982 1240
983MODULE = CFPlus PACKAGE = CFPlus::Font 1241int
1242SvREFCNT (SV *sv)
1243 CODE:
1244 RETVAL = SvREFCNT (sv);
1245 OUTPUT:
1246 RETVAL
1247
1248MODULE = Deliantra::Client PACKAGE = DC::Font
984 1249
985PROTOTYPES: DISABLE 1250PROTOTYPES: DISABLE
986 1251
987CFPlus::Font 1252DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1253new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1254 CODE:
990{ 1255{
991 int count; 1256 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1257 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
995} 1260}
996 OUTPUT: 1261 OUTPUT:
997 RETVAL 1262 RETVAL
998 1263
999void 1264void
1000DESTROY (CFPlus::Font self) 1265DESTROY (DC::Font self)
1001 CODE: 1266 CODE:
1002 pango_font_description_free (self); 1267 pango_font_description_free (self);
1003 1268
1004void 1269void
1005make_default (CFPlus::Font self) 1270make_default (DC::Font self)
1006 PROTOTYPE: $ 1271 PROTOTYPE: $
1007 CODE: 1272 CODE:
1008 default_font = self; 1273 default_font = self;
1009 1274
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1275MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1276
1012PROTOTYPES: DISABLE 1277PROTOTYPES: DISABLE
1013 1278
1014void 1279void
1015reset_glyph_cache () 1280glyph_cache_backup ()
1016 PROTOTYPE: 1281 PROTOTYPE:
1017 CODE: 1282 CODE:
1283 tc_backup ();
1284
1285void
1286glyph_cache_restore ()
1287 PROTOTYPE:
1288 CODE:
1018 tc_clear (); 1289 tc_restore ();
1019 1290
1020CFPlus::Layout 1291DC::Layout
1021new (SV *class) 1292new (SV *class)
1022 CODE: 1293 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1294 New (0, RETVAL, 1, struct cf_layout);
1024 1295
1025 RETVAL->pl = pango_layout_new (opengl_context); 1296 RETVAL->pl = pango_layout_new (opengl_context);
… …
1027 RETVAL->g = 1.; 1298 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1299 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1300 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1301 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1302 RETVAL->font = 0;
1303 RETVAL->rc = rc_alloc ();
1032 1304
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1305 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1306 layout_update_font (RETVAL);
1035 OUTPUT: 1307 OUTPUT:
1036 RETVAL 1308 RETVAL
1037 1309
1038void 1310void
1039DESTROY (CFPlus::Layout self) 1311DESTROY (DC::Layout self)
1040 CODE: 1312 CODE:
1041 g_object_unref (self->pl); 1313 g_object_unref (self->pl);
1314 rc_free (self->rc);
1042 Safefree (self); 1315 Safefree (self);
1043 1316
1044void 1317void
1045set_text (CFPlus::Layout self, SV *text_) 1318set_text (DC::Layout self, SV *text_)
1046 CODE: 1319 CODE:
1047{ 1320{
1048 STRLEN textlen; 1321 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1322 char *text = SvPVutf8 (text_, textlen);
1050 1323
1051 pango_layout_set_text (self->pl, text, textlen); 1324 pango_layout_set_text (self->pl, text, textlen);
1052} 1325}
1053 1326
1054void 1327void
1055set_markup (CFPlus::Layout self, SV *text_) 1328set_markup (DC::Layout self, SV *text_)
1056 CODE: 1329 CODE:
1057{ 1330{
1058 STRLEN textlen; 1331 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1332 char *text = SvPVutf8 (text_, textlen);
1060 1333
1061 pango_layout_set_markup (self->pl, text, textlen); 1334 pango_layout_set_markup (self->pl, text, textlen);
1062} 1335}
1063 1336
1064void 1337void
1065set_shapes (CFPlus::Layout self, ...) 1338set_shapes (DC::Layout self, ...)
1066 CODE: 1339 CODE:
1067{ 1340{
1068 PangoAttrList *attrs = 0; 1341 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1342 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1343 const char *pos = text;
… …
1105 if (attrs) 1378 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1379 pango_layout_set_attributes (self->pl, attrs);
1107} 1380}
1108 1381
1109void 1382void
1110get_shapes (CFPlus::Layout self) 1383get_shapes (DC::Layout self)
1111 PPCODE: 1384 PPCODE:
1112{ 1385{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1386 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1387
1115 do 1388 do
1116 { 1389 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1390 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1391
1119 if (run && shape_attr_p (run)) 1392 if (run && shape_attr_p (run))
1120 { 1393 {
1121 PangoRectangle extents; 1394 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1395 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1130 1403
1131 pango_layout_iter_free (iter); 1404 pango_layout_iter_free (iter);
1132} 1405}
1133 1406
1134int 1407int
1135has_wrapped (CFPlus::Layout self) 1408has_wrapped (DC::Layout self)
1136 CODE: 1409 CODE:
1137{ 1410{
1138 int lines = 1; 1411 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1412 const char *text = pango_layout_get_text (self->pl);
1140 1413
… …
1145} 1418}
1146 OUTPUT: 1419 OUTPUT:
1147 RETVAL 1420 RETVAL
1148 1421
1149SV * 1422SV *
1150get_text (CFPlus::Layout self) 1423get_text (DC::Layout self)
1151 CODE: 1424 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1425 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1426 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1427 OUTPUT:
1155 RETVAL 1428 RETVAL
1156 1429
1157void 1430void
1158set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1431set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1159 CODE: 1432 CODE:
1160 self->r = r; 1433 self->r = r;
1161 self->g = g; 1434 self->g = g;
1162 self->b = b; 1435 self->b = b;
1163 self->a = a; 1436 self->a = a;
1164 1437
1165void 1438void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1439set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1440 CODE:
1168 if (self->font != font) 1441 if (self->font != font)
1169 { 1442 {
1170 self->font = font; 1443 self->font = font;
1171 layout_update_font (self); 1444 layout_update_font (self);
1172 } 1445 }
1173 1446
1174void 1447void
1175set_height (CFPlus::Layout self, int base_height) 1448set_height (DC::Layout self, int base_height)
1176 CODE: 1449 CODE:
1177 if (self->base_height != base_height) 1450 if (self->base_height != base_height)
1178 { 1451 {
1179 self->base_height = base_height; 1452 self->base_height = base_height;
1180 layout_update_font (self); 1453 layout_update_font (self);
1181 } 1454 }
1182 1455
1183void 1456void
1184set_width (CFPlus::Layout self, int max_width = -1) 1457set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1458 CODE:
1186 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1459 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1187 1460
1188void 1461void
1189set_indent (CFPlus::Layout self, int indent) 1462set_indent (DC::Layout self, int indent)
1190 CODE: 1463 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1464 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1465
1193void 1466void
1194set_spacing (CFPlus::Layout self, int spacing) 1467set_spacing (DC::Layout self, int spacing)
1195 CODE: 1468 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1469 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1470
1198void 1471void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1472set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1473 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1474 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1475 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1476 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1477 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1478 : PANGO_ELLIPSIZE_NONE
1206 ); 1479 );
1207 1480
1208void 1481void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1482set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1483 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1484 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1485
1213void 1486void
1214size (CFPlus::Layout self) 1487size (DC::Layout self)
1215 PPCODE: 1488 PPCODE:
1216{ 1489{
1217 int w, h; 1490 int w, h;
1218 1491
1219 layout_get_pixel_size (self, &w, &h); 1492 layout_get_pixel_size (self, &w, &h);
… …
1222 PUSHs (sv_2mortal (newSViv (w))); 1495 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1496 PUSHs (sv_2mortal (newSViv (h)));
1224} 1497}
1225 1498
1226int 1499int
1227descent (CFPlus::Layout self) 1500descent (DC::Layout self)
1228 CODE: 1501 CODE:
1229{ 1502{
1230 PangoRectangle rect; 1503 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1504 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1505 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1506 RETVAL = PANGO_DESCENT (rect);
1234} 1507}
1235 OUTPUT: 1508 OUTPUT:
1236 RETVAL 1509 RETVAL
1237 1510
1238int 1511int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1512xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1513 CODE:
1241{ 1514{
1242 int index, trailing; 1515 int index, trailing;
1243 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1516 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1244 RETVAL = index + trailing; 1517 RETVAL = index + trailing;
1245} 1518}
1246 OUTPUT: 1519 OUTPUT:
1247 RETVAL 1520 RETVAL
1248 1521
1249void 1522void
1250cursor_pos (CFPlus::Layout self, int index) 1523cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1524 PPCODE:
1252{ 1525{
1253 PangoRectangle strong_pos; 1526 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1527 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1528
1256 EXTEND (SP, 3); 1529 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1530 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1531 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1532 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1533}
1261 1534
1262void 1535void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1536index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1537 PPCODE:
1265{ 1538{
1266 int line, x; 1539 int line, x;
1267 1540
1268 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1541 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1542#if !PANGO_VERSION_CHECK (1, 17, 3)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1543 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1544 --line;
1545#endif
1271 EXTEND (SP, 2); 1546 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1547 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1548 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1549}
1275 1550
1276void 1551void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1552line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1553 PPCODE:
1279{ 1554{
1280 PangoLayoutLine *lp; 1555 PangoLayoutLine *lp;
1281 int index, trailing; 1556 int index, trailing;
1282 1557
1283 if (line < 0) 1558 if (line < 0)
1284 XSRETURN_EMPTY; 1559 XSRETURN_EMPTY;
1285 1560
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1561 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1562 XSRETURN_EMPTY; /* do better */
1288 1563
1289 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1564 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290 1565
1291 EXTEND (SP, 2); 1566 EXTEND (SP, 2);
… …
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1572 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1573 }
1299} 1574}
1300 1575
1301void 1576void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1577render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1578 CODE:
1579 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1580 pango_opengl_render_layout_subpixel (
1305 self->pl, 1581 self->pl,
1582 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1583 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1584 self->r, self->g, self->b, self->a,
1308 flags 1585 flags
1309 ); 1586 );
1587 // we assume that context_change actually clears/frees stuff
1588 // and does not do any recomputation...
1589 pango_layout_context_changed (self->pl);
1310 1590
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1591void
1592draw (DC::Layout self)
1593 CODE:
1594{
1595 glEnable (GL_TEXTURE_2D);
1596 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1597 glEnable (GL_BLEND);
1598 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1599 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1600 glEnable (GL_ALPHA_TEST);
1601 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1602
1603 rc_draw (self->rc);
1604
1605 glDisable (GL_ALPHA_TEST);
1606 glDisable (GL_BLEND);
1607 glDisable (GL_TEXTURE_2D);
1608}
1609
1610MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1611
1313PROTOTYPES: ENABLE 1612PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1613
1317void 1614void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1615pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1616 CODE:
1320{ 1617{
… …
1347 HV *hv = (HV *)SvRV (self); 1644 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1645 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1646 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1647 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1648
1649 if (name <= 0)
1650 XSRETURN_EMPTY;
1651
1352 if (items < 5) 1652 if (items < 5)
1353 { 1653 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1654 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1655 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1656 }
… …
1383 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1385 } 1685 }
1386} 1686}
1387 1687
1688void
1689draw_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)
1690 PROTOTYPE: @
1691 CODE:
1692{
1693 glEnable (GL_BLEND);
1694 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1695 glEnable (GL_TEXTURE_2D);
1696 glBindTexture (GL_TEXTURE_2D, name1);
1697
1698 glColor3f (intensity, intensity, intensity);
1699 glPushMatrix ();
1700 glScalef (1./3, 1./3, 1.);
1701
1702 if (blend > 0.f)
1703 {
1704 float dx3 = dx * -3.f / w;
1705 float dy3 = dy * -3.f / h;
1706 GLfloat env_color[4] = { 0., 0., 0., blend };
1707
1708 /* interpolate the two shadow textures */
1709 /* stage 0 == rgb(glcolor) + alpha(t0) */
1710 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1711
1712 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1713 gl.ActiveTexture (GL_TEXTURE1);
1714 glEnable (GL_TEXTURE_2D);
1715 glBindTexture (GL_TEXTURE_2D, name2);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1717
1718 /* rgb == rgb(glcolor) */
1719 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1720 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1721 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1722
1723 /* alpha = interpolate t0, t1 by env_alpha */
1724 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1725
1726 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1727 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1728 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1729
1730 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1731 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1732
1733 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1734 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1735
1736 glBegin (GL_QUADS);
1737 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1738 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1739 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1740 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1741 glEnd ();
1742
1743 glDisable (GL_TEXTURE_2D);
1744 gl.ActiveTexture (GL_TEXTURE0);
1745 }
1746 else
1747 {
1748 /* simple blending of one texture, also opengl <1.3 path */
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1750
1751 glBegin (GL_QUADS);
1752 glTexCoord2f (0, 0); glVertex2f (0, 0);
1753 glTexCoord2f (0, t); glVertex2f (0, h);
1754 glTexCoord2f (s, t); glVertex2f (w, h);
1755 glTexCoord2f (s, 0); glVertex2f (w, 0);
1756 glEnd ();
1757 }
1758
1759 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1760 {
1761 int x, y;
1762 int dx3 = dx * 3;
1763 int dy3 = dy * 3;
1764
1765 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1766 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1767 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1768 glTranslatef (-1., -1., 0);
1769 glBegin (GL_QUADS);
1770
1771 for (y = 1; y < h; y += 3)
1772 {
1773 int y1 = y - dy3;
1774 int y1valid = y1 >= 0 && y1 < h;
1775
1776 for (x = 1; x < w; x += 3)
1777 {
1778 int x1 = x - dx3;
1779 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1780 uint8_t h2;
1781
1782 if (y1valid && x1 >= 0 && x1 < w)
1783 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1784 else
1785 h2 = 1; /* out of range == invisible */
1786
1787 if (h1 || h2)
1788 {
1789 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1790 glColor4f (1., 1., 1., alpha);
1791
1792 glTexCoord2f (0, 0.); glVertex2i (x , y );
1793 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1794 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1795 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1796 }
1797 }
1798 }
1799 }
1800
1801 glEnd ();
1802
1803 glPopMatrix ();
1804
1805 glDisable (GL_TEXTURE_2D);
1806 glDisable (GL_BLEND);
1807}
1808
1388IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1809IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1389 CODE: 1810 CODE:
1390{ 1811{
1391 GLint width; 1812 GLint width;
1392 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1813 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1394 RETVAL = width > 0; 1815 RETVAL = width > 0;
1395} 1816}
1396 OUTPUT: 1817 OUTPUT:
1397 RETVAL 1818 RETVAL
1398 1819
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1820MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1821
1401PROTOTYPES: DISABLE 1822PROTOTYPES: DISABLE
1402 1823
1403CFPlus::Map 1824DC::Map
1404new (SV *class) 1825new (SV *class)
1405 CODE: 1826 CODE:
1406 New (0, RETVAL, 1, struct map); 1827 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1828 RETVAL->x = 0;
1408 RETVAL->y = 0; 1829 RETVAL->y = 0;
… …
1416 RETVAL->row = 0; 1837 RETVAL->row = 0;
1417 OUTPUT: 1838 OUTPUT:
1418 RETVAL 1839 RETVAL
1419 1840
1420void 1841void
1421DESTROY (CFPlus::Map self) 1842DESTROY (DC::Map self)
1422 CODE: 1843 CODE:
1423{ 1844{
1424 map_clear (self); 1845 map_clear (self);
1425 Safefree (self->face2tile); 1846 Safefree (self->face2tile);
1426 Safefree (self->tex); 1847 Safefree (self->tex);
1427 Safefree (self); 1848 Safefree (self);
1428} 1849}
1429 1850
1430void 1851void
1431resize (CFPlus::Map self, int map_width, int map_height) 1852resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1853 CODE:
1433 self->w = map_width; 1854 self->w = map_width;
1434 self->h = map_height; 1855 self->h = map_height;
1435 1856
1436void 1857void
1437clear (CFPlus::Map self) 1858clear (DC::Map self)
1438 CODE: 1859 CODE:
1439 map_clear (self); 1860 map_clear (self);
1440 1861
1441void 1862void
1442set_tileid (CFPlus::Map self, int face, int tile) 1863set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1864 CODE:
1444{ 1865{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1866 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1867 need_texid (self, tile);
1447} 1868}
1448 1869
1449void 1870void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1871set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1872 CODE:
1452{ 1873{
1453 tileid texid; 1874 tileid texid;
1454 maptex *tex; 1875 maptex *tex;
1455 1876
… …
1468 tex->smoothtile = self->face2tile [smooth]; 1889 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1890 tex->smoothlevel = level;
1470} 1891}
1471 1892
1472void 1893void
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) 1894set_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: 1895 CODE:
1475{ 1896{
1476 need_texid (self, texid); 1897 need_texid (self, texid);
1477 1898
1478 { 1899 {
… …
1497 // use uglier nearest interpolation because linear suffers 1918 // use uglier nearest interpolation because linear suffers
1498 // from transparent color bleeding and ugly wrapping effects. 1919 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1920 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1921}
1501 1922
1923void
1924expire_textures (DC::Map self, int texid, int count)
1925 PPCODE:
1926 for (; texid < self->texs && count; ++texid, --count)
1927 {
1928 maptex *tex = self->tex + texid;
1929
1930 if (tex->name)
1931 {
1932 if (tex->unused)
1933 {
1934 tex->name = 0;
1935 tex->unused = 0;
1936 XPUSHs (sv_2mortal (newSViv (texid)));
1937 }
1938 else
1939 tex->unused = 1;
1940 }
1941 }
1942
1502int 1943int
1503ox (CFPlus::Map self) 1944ox (DC::Map self)
1504 ALIAS: 1945 ALIAS:
1505 oy = 1 1946 oy = 1
1506 x = 2 1947 x = 2
1507 y = 3 1948 y = 3
1508 w = 4 1949 w = 4
… …
1519 } 1960 }
1520 OUTPUT: 1961 OUTPUT:
1521 RETVAL 1962 RETVAL
1522 1963
1523void 1964void
1524scroll (CFPlus::Map self, int dx, int dy) 1965scroll (DC::Map self, int dx, int dy)
1525 CODE: 1966 CODE:
1526{ 1967{
1527 if (dx > 0) 1968 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1969 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1970 else if (dx < 0)
… …
1544 self->rows += MAP_EXTEND_Y; 1985 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1986 self->y += MAP_EXTEND_Y;
1546 } 1987 }
1547} 1988}
1548 1989
1549void 1990SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1991map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1992 CODE:
1552{ 1993{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1994 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1995 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1996 mapcell *cell;
1556 int x, y, flags; 1997 int x, y, z, flags;
1998 AV *missing = newAV ();
1999 RETVAL = newRV_noinc ((SV *)missing);
1557 2000
1558 while (data < data_end - 1) 2001 while (data < data_end - 1)
1559 { 2002 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 2003 flags = (data [0] << 8) + data [1]; data += 2;
1561 2004
… …
1581 uint8_t ext, cmd; 2024 uint8_t ext, cmd;
1582 2025
1583 do 2026 do
1584 { 2027 {
1585 ext = *data++; 2028 ext = *data++;
1586 cmd = ext & 0x3f; 2029 cmd = ext & 0x7f;
1587 2030
1588 if (cmd < 4) 2031 if (cmd < 4)
1589 cell->darkness = 255 - ext * 64 + 1; 2032 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1590 else if (cmd == 5) // health 2033 else if (cmd == 5) // health
1591 { 2034 {
1592 cell->stat_width = 1; 2035 cell->stat_width = 1;
1593 cell->stat_hp = *data++; 2036 cell->stat_hp = *data++;
1594 } 2037 }
1595 else if (cmd == 6) // monster width 2038 else if (cmd == 6) // monster width
1596 cell->stat_width = *data++ + 1; 2039 cell->stat_width = *data++ + 1;
1597 else if (cmd == 0x47) 2040 else if (cmd == 0x47)
1598 { 2041 {
1599 if (*data == 4) 2042 if (*data == 1) cell->player = data [1];
1600 ; // decode player count 2043 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2044 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2045 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1601 2046
1602 data += *data + 1; 2047 data += *data + 1;
1603 } 2048 }
1604 else if (cmd == 8) // cell flags 2049 else if (cmd == 8) // cell flags
1605 cell->flags = *data++; 2050 cell->flags = *data++;
… …
1612 } 2057 }
1613 else 2058 else
1614 cell->darkness = *data++ + 1; 2059 cell->darkness = *data++ + 1;
1615 } 2060 }
1616 2061
2062 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 2063 if (flags & (4 >> z))
1618 { 2064 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 2065 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 2066 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 2067 cell->tile [z] = self->face2tile [face];
2068
2069 if (cell->tile [z])
2070 {
2071 maptex *tex = self->tex + cell->tile [z];
2072 tex->unused = 0;
2073 if (!tex->name)
2074 av_push (missing, newSViv (cell->tile [z]));
2075
2076 if (tex->smoothtile)
2077 {
2078 maptex *smooth = self->tex + tex->smoothtile;
2079 smooth->unused = 0;
2080 if (!smooth->name)
2081 av_push (missing, newSViv (tex->smoothtile));
2082 }
2083 }
1622 } 2084 }
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 } 2085 }
1638 else 2086 else
1639 cell->darkness = 0; 2087 CELL_CLEAR (cell);
1640 } 2088 }
1641} 2089}
2090 OUTPUT:
2091 RETVAL
1642 2092
1643SV * 2093SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2094mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 2095 CODE:
1646{ 2096{
1647 int x1, x; 2097 int x1, x;
1648 int y1, y; 2098 int y1, y;
1649 int z; 2099 int z;
… …
1694} 2144}
1695 OUTPUT: 2145 OUTPUT:
1696 RETVAL 2146 RETVAL
1697 2147
1698void 2148void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2149draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1700 CODE: 2150 CODE:
1701{ 2151{
2152 int x, y, z;
2153
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2154 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2155 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) 2156 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 2157 smooth_key skey;
1706 int x, y, z; 2158 int pl_x, pl_y;
1707 int last_name; 2159 maptex pl_tex;
2160 rc_t *rc = rc_alloc ();
2161 rc_t *rc_ov = rc_alloc ();
2162 rc_key_t key;
2163 rc_array_t *arr;
1708 2164
2165 pl_tex.name = 0;
2166
1709 // thats current max. sorry. 2167 // that's current max. sorry.
1710 if (sw > 255) sw = 255; 2168 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 2169 if (sh > 255) sh = 255;
1712 2170
1713 // clear key, in case of extra padding 2171 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 2172 memset (&skey, 0, sizeof (skey));
1715 2173
1716 glColor4ub (255, 255, 255, 255); 2174 memset (&key, 0, sizeof (key));
1717 2175 key.r = 255;
1718 glEnable (GL_BLEND); 2176 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2177 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 2178 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2179 key.mode = GL_QUADS;
1722 2180 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS);
1724
1725 last_name = 0;
1726 2181
1727 mx += self->x; 2182 mx += self->x;
1728 my += self->y; 2183 my += self->y;
1729 2184
1730 // first pass: determine smooth_max 2185 // first pass: determine smooth_max
… …
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 2202 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 2203 self->tex [cell->tile [2]].smoothlevel));
1749 } 2204 }
1750 } 2205 }
1751 2206
2207 glEnable (GL_BLEND);
2208 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2209 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2210
1752 for (z = 0; z <= 2; z++) 2211 for (z = 0; z <= 2; z++)
1753 { 2212 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 2213 memset (smooth_level, 0, sizeof (smooth_level));
2214 key.texname = -1;
1755 2215
1756 for (y = 0; y < sh; y++) 2216 for (y = 0; y < sh; y++)
1757 if (0 <= y + my && y + my < self->rows) 2217 if (0 <= y + my && y + my < self->rows)
1758 { 2218 {
1759 maprow *row = self->row + (y + my); 2219 maprow *row = self->row + (y + my);
… …
1765 tileid tile = cell->tile [z]; 2225 tileid tile = cell->tile [z];
1766 2226
1767 if (tile) 2227 if (tile)
1768 { 2228 {
1769 maptex tex = self->tex [tile]; 2229 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 2230 int px, py;
1771 int py = (y + 1) * T - tex.h;
1772 2231
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 2232 if (key.texname != tex.name)
1776 { 2233 {
2234 self->tex [tile].unused = 0;
2235
1777 if (!tex.name) 2236 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 2237 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1779 2238
1780 glEnd (); 2239 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2240 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 2241 }
1784 2242
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2243 px = (x + 1) * T - tex.w;
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2244 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 2245
1790 if (cell->flags && z == 2) 2246 if (expect_false (cell->player == player) && expect_false (z == 2))
1791 { 2247 {
1792 if (cell->flags & 1) 2248 pl_x = px;
2249 pl_y = py;
2250 pl_tex = tex;
1793 { 2251 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 } 2252 }
2253
2254 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2255 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2256 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2257 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1808 2258
1809 // update smooth hash 2259 // update smooth hash
1810 if (tex.smoothtile) 2260 if (tex.smoothtile)
1811 { 2261 {
1812 skey.tile = tex.smoothtile; 2262 skey.tile = tex.smoothtile;
… …
1843 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2293 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); 2294 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); 2295 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1846 } 2296 }
1847 } 2297 }
2298
2299 if (expect_false (z == 2) && expect_false (cell->flags))
2300 {
2301 // overlays such as the speech bubble, probably more to come
2302 if (cell->flags & 1)
2303 {
2304 rc_key_t key_ov = key;
2305 maptex tex = self->tex [TEXID_SPEECH];
2306 rc_array_t *arr;
2307 int px = x * T + T * 2 / 32;
2308 int py = y * T - T * 6 / 32;
2309
2310 key_ov.texname = tex.name;
2311 arr = rc_array (rc_ov, &key_ov);
2312
2313 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2314 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2315 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2316 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2317 }
2318 }
1848 } 2319 }
1849 } 2320 }
2321
2322 rc_draw (rc);
2323 rc_clear (rc);
1850 2324
1851 // go through all smoothlevels, lowest to highest, then draw. 2325 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 2326 // this is basically counting sort
1853 { 2327 {
1854 int w, b; 2328 int w, b;
1855 2329
2330 glEnable (GL_TEXTURE_2D);
2331 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 2332 for (w = 0; w < 256 / 32; ++w)
1857 { 2333 {
1858 uint32_t smask = smooth_level [w]; 2334 uint32_t smask = smooth_level [w];
1859 if (smask) 2335 if (smask)
1860 for (b = 0; b < 32; ++b) 2336 for (b = 0; b < 32; ++b)
… …
1879 int border = bits & 15; 2355 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2356 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 2357 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 2358 float dy = tex.t * .5f ; // 2 images/column
1883 2359
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 2360 if (tex.name)
1887 { 2361 {
2362 // this time avoiding texture state changes
2363 // save gobs of state changes.
1888 if (!tex.name) 2364 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2365 {
2366 self->tex [skey->tile].unused = 0;
1890 2367
1891 glEnd (); 2368 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2369 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2370 glBegin (GL_QUADS);
1894 } 2371 }
1895 2372
1896 if (border) 2373 if (border)
1897 { 2374 {
1898 float ox = border * dx; 2375 float ox = border * dx;
1899 2376
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2377 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2378 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2379 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2380 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2381 }
1905 2382
1906 if (corner) 2383 if (corner)
1907 { 2384 {
1908 float ox = corner * dx; 2385 float ox = corner * dx;
1909 2386
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2387 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2388 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2389 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2390 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2391 }
1914 } 2392 }
1915 } 2393 }
1916 } 2394 }
1917 } 2395 }
1918 } 2396 }
2397
2398 glEnd ();
2399 glDisable (GL_TEXTURE_2D);
2400 key.texname = -1;
1919 } 2401 }
1920 2402
1921 hv_clear (smooth); 2403 hv_clear (smooth);
1922 } 2404 }
1923 2405
1924 glEnd (); 2406 if (pl_tex.name)
2407 {
2408 maptex tex = pl_tex;
2409 int px = pl_x + sdx;
2410 int py = pl_y + sdy;
1925 2411
1926 glDisable (GL_TEXTURE_2D); 2412 key.texname = tex.name;
2413 arr = rc_array (rc, &key);
2414
2415 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2416 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2417 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2418 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2419
2420 rc_draw (rc);
2421 }
2422
2423 rc_draw (rc_ov);
2424 rc_clear (rc_ov);
2425
1927 glDisable (GL_BLEND); 2426 glDisable (GL_BLEND);
2427 rc_free (rc);
2428 rc_free (rc_ov);
1928 2429
1929 // top layer: overlays such as the health bar 2430 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2431 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2432 if (0 <= y + my && y + my < self->rows)
1932 { 2433 {
… …
1937 { 2438 {
1938 mapcell *cell = row->col + (x + mx - row->c0); 2439 mapcell *cell = row->col + (x + mx - row->c0);
1939 2440
1940 int px = x * T; 2441 int px = x * T;
1941 int py = y * T; 2442 int py = y * T;
2443
2444 if (expect_false (cell->player == player))
2445 {
2446 px += sdx;
2447 py += sdy;
2448 }
1942 2449
1943 if (cell->stat_hp) 2450 if (cell->stat_hp)
1944 { 2451 {
1945 int width = cell->stat_width * T; 2452 int width = cell->stat_width * T;
1946 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2453 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
1957 } 2464 }
1958 } 2465 }
1959} 2466}
1960 2467
1961void 2468void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2469draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1963 CODE: 2470 CODE:
1964{ 2471{
1965 static float color[16][3] = { 2472 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2473 { 0.00f, 0.00f, 0.00f },
1967 { 1.00F, 1.00F, 1.00F }, 2474 { 1.00f, 1.00f, 1.00f },
1968 { 0.00F, 0.00F, 0.55F }, 2475 { 0.00f, 0.00f, 0.55f },
1969 { 1.00F, 0.00F, 0.00F }, 2476 { 1.00f, 0.00f, 0.00f },
1970 2477
1971 { 1.00F, 0.54F, 0.00F }, 2478 { 1.00f, 0.54f, 0.00f },
1972 { 0.11F, 0.56F, 1.00F }, 2479 { 0.11f, 0.56f, 1.00f },
1973 { 0.93F, 0.46F, 0.00F }, 2480 { 0.93f, 0.46f, 0.00f },
1974 { 0.18F, 0.54F, 0.34F }, 2481 { 0.18f, 0.54f, 0.34f },
1975 2482
1976 { 0.56F, 0.73F, 0.56F }, 2483 { 0.56f, 0.73f, 0.56f },
1977 { 0.80F, 0.80F, 0.80F }, 2484 { 0.80f, 0.80f, 0.80f },
1978 { 0.55F, 0.41F, 0.13F }, 2485 { 0.55f, 0.41f, 0.13f },
1979 { 0.99F, 0.77F, 0.26F }, 2486 { 0.99f, 0.77f, 0.26f },
1980 2487
1981 { 0.74F, 0.65F, 0.41F }, 2488 { 0.74f, 0.65f, 0.41f },
1982 2489
1983 { 0.00F, 1.00F, 1.00F }, 2490 { 0.00f, 1.00f, 1.00f },
1984 { 1.00F, 0.00F, 1.00F }, 2491 { 1.00f, 0.00f, 1.00f },
1985 { 1.00F, 1.00F, 0.00F }, 2492 { 1.00f, 1.00f, 0.00f },
1986 }; 2493 };
1987 2494
1988 int x, y; 2495 int x, y;
1989 2496
1990 glEnable (GL_TEXTURE_2D); 2497 glEnable (GL_TEXTURE_2D);
2498 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2499 * but the nvidia driver (185.18.14) mishandles alpha textures
2500 * and takes the colour from god knows where instead of using
2501 * Cp. MODULATE results in the same colour, but slightly different
2502 * alpha, but atcually gives us the correct colour with nvidia.
2503 */
1991 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2504 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1992 glEnable (GL_BLEND); 2505 glEnable (GL_BLEND);
1993 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2506 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1994 glBegin (GL_QUADS); 2507 glBegin (GL_QUADS);
1995 2508
1996 for (y = 0; y < h; y++) 2509 for (y = 0; y < h; y++)
… …
2000 2513
2001 if (m) 2514 if (m)
2002 { 2515 {
2003 float *c = color [m & 15]; 2516 float *c = color [m & 15];
2004 2517
2005 float tx1 = m & 0x40 ? 0.5 : 0.; 2518 float tx1 = m & 0x40 ? 0.5f : 0.f;
2006 float tx2 = tx1 + 0.5; 2519 float tx2 = tx1 + 0.5f;
2007 2520
2008 glColor4f (c[0], c[1], c[2], 0.75); 2521 glColor4f (c[0], c[1], c[2], 1);
2009 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2522 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2010 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2523 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2011 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2524 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2012 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2525 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2013 } 2526 }
… …
2017 glDisable (GL_BLEND); 2530 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2531 glDisable (GL_TEXTURE_2D);
2019} 2532}
2020 2533
2021void 2534void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2535fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2536 PPCODE:
2024{ 2537{
2025 int x, y; 2538 int x, y;
2026 int sw1 = sw + 2; 2539 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2540 int sh1 = sh + 2;
2028 int sh3 = sh * 3; 2541 int sh3 = sh * 3;
2029 int sw34 = (sw * 3 + 3) & ~3; 2542 int sw3 = sw * 3;
2030 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2543 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2031 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2544 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2032 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2545 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2033 2546
2034 SvPOK_only (darkness3_sv); 2547 SvPOK_only (darkness3_sv);
2035 SvCUR_set (darkness3_sv, sw34 * sh3); 2548 SvCUR_set (darkness3_sv, sw3 * sh3);
2036 2549
2037 mx += self->x - 1; 2550 mx += self->x - 1;
2038 my += self->y - 1; 2551 my += self->y - 1;
2039
2040 memset (darkness1, 255, sw1 * sh1);
2041 2552
2042 for (y = 0; y < sh1; y++) 2553 for (y = 0; y < sh1; y++)
2043 if (0 <= y + my && y + my < self->rows) 2554 if (0 <= y + my && y + my < self->rows)
2044 { 2555 {
2045 maprow *row = self->row + (y + my); 2556 maprow *row = self->row + (y + my);
… …
2048 if (row->c0 <= x + mx && x + mx < row->c1) 2559 if (row->c0 <= x + mx && x + mx < row->c1)
2049 { 2560 {
2050 mapcell *cell = row->col + (x + mx - row->c0); 2561 mapcell *cell = row->col + (x + mx - row->c0);
2051 2562
2052 darkness1 [y * sw1 + x] = cell->darkness 2563 darkness1 [y * sw1 + x] = cell->darkness
2053 ? 255 - (cell->darkness - 1) 2564 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2054 : 255 - FOW_DARKNESS; 2565 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2055 } 2566 }
2056 } 2567 }
2057 2568
2058 for (y = 0; y < sh; ++y) 2569 for (y = 0; y < sh; ++y)
2059 for (x = 0; x < sw; ++x) 2570 for (x = 0; x < sw; ++x)
… …
2078 2589
2079 uint8_t r13 = (d13 + d23 + d12) / 3; 2590 uint8_t r13 = (d13 + d23 + d12) / 3;
2080 uint8_t r23 = d23; 2591 uint8_t r23 = d23;
2081 uint8_t r33 = (d23 + d33 + d32) / 3; 2592 uint8_t r33 = (d23 + d33 + d32) / 3;
2082 2593
2083 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2594 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2084 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2595 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2085 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2596 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2086 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2597 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2087 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2598 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); 2599 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2089 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2600 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2090 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2601 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2091 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2602 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2092 } 2603 }
2093 2604
2094 free (darkness1); 2605 free (darkness1);
2095 2606
2096 EXTEND (SP, 3); 2607 EXTEND (SP, 3);
2097 PUSHs (sv_2mortal (newSViv (sw34))); 2608 PUSHs (sv_2mortal (newSViv (sw3)));
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2609 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2610 PUSHs (darkness3_sv);
2100} 2611}
2101 2612
2102SV * 2613SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2614get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2615 CODE:
2105{ 2616{
2106 int x, y, x1, y1; 2617 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2618 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2619 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2165 else 2676 else
2166 *data++ = 0; 2677 *data++ = 0;
2167 } 2678 }
2168 } 2679 }
2169 2680
2681 /* if size is w*h + 5 then no data has been found */
2682 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2683 {
2170 SvPOK_only (data_sv); 2684 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2685 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2686 }
2687
2172 RETVAL = data_sv; 2688 RETVAL = data_sv;
2173} 2689}
2174 OUTPUT: 2690 OUTPUT:
2175 RETVAL 2691 RETVAL
2176 2692
2177void 2693void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2694set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2695 PPCODE:
2180{ 2696{
2181 int x, y, z; 2697 int x, y, z;
2182 int w, h; 2698 int w, h;
2183 int x1, y1; 2699 int x1, y1;
2700 STRLEN len;
2701 uint8_t *data, *end;
2702
2703 len = SvLEN (data_sv);
2704 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2705 data = SvPVbyte_nolen (data_sv);
2706 end = data + len + 8;
2707
2708 if (len < 5)
2709 XSRETURN_EMPTY;
2184 2710
2185 if (*data++ != 0) 2711 if (*data++ != 0)
2186 return; /* version mismatch */ 2712 XSRETURN_EMPTY; /* version mismatch */
2187 2713
2188 w = *data++ << 8; w |= *data++; 2714 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2715 h = *data++ << 8; h |= *data++;
2190 2716
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2717 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2203 { 2729 {
2204 maprow *row = map_get_row (self, y); 2730 maprow *row = map_get_row (self, y);
2205 2731
2206 for (x = x0; x < x1; x++) 2732 for (x = x0; x < x1; x++)
2207 { 2733 {
2734 uint8_t flags;
2735
2736 if (data + 7 >= end)
2737 XSRETURN_EMPTY;
2738
2208 uint8_t flags = *data++; 2739 flags = *data++;
2209 2740
2210 if (flags) 2741 if (flags)
2211 { 2742 {
2212 mapcell *cell = row_get_cell (row, x); 2743 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2744 tileid tile[3] = { 0, 0, 0 };
… …
2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2747 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2748 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2218 2749
2219 if (cell->darkness == 0) 2750 if (cell->darkness == 0)
2220 { 2751 {
2221 cell->darkness = 0; 2752 /*cell->darkness = 0;*/
2753 EXTEND (SP, 3);
2222 2754
2223 for (z = 0; z <= 2; z++) 2755 for (z = 0; z <= 2; z++)
2224 { 2756 {
2225 tileid t = tile [z]; 2757 tileid t = tile [z];
2226 2758
2227 if (t >= self->texs || (t && !self->tex [t].name)) 2759 if (t >= self->texs || (t && !self->tex [t].name))
2228 { 2760 {
2229 XPUSHs (sv_2mortal (newSViv (t))); 2761 PUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t); 2762 need_texid (self, t);
2231 } 2763 }
2232 2764
2233 cell->tile [z] = t; 2765 cell->tile [z] = t;
2234 } 2766 }
… …
2236 } 2768 }
2237 } 2769 }
2238 } 2770 }
2239} 2771}
2240 2772
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2773MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2774
2243CFPlus::RW 2775DC::RW
2244new (SV *class, SV *data_sv) 2776new (SV *class, SV *data_sv)
2245 CODE: 2777 CODE:
2246{ 2778{
2247 STRLEN datalen; 2779 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2780 char *data = SvPVbyte (data_sv, datalen);
… …
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2782 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2783}
2252 OUTPUT: 2784 OUTPUT:
2253 RETVAL 2785 RETVAL
2254 2786
2255CFPlus::RW 2787DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2788new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2789 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2790 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2791 OUTPUT:
2260 RETVAL 2792 RETVAL
2261 2793
2794# fails on win32:
2795# dc.xs(2268) : error C2059: syntax error : '('
2262void 2796#void
2263close (CFPlus::RW self) 2797#close (DC::RW self)
2264 CODE: 2798# CODE:
2265 SDL_RWclose (self); 2799# (self->(close)) (self);
2266 2800
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2801MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2802
2269PROTOTYPES: DISABLE 2803PROTOTYPES: DISABLE
2270 2804
2805DC::Channel
2806find ()
2807 CODE:
2808{
2809 RETVAL = Mix_GroupAvailable (-1);
2810
2811 if (RETVAL < 0)
2812 {
2813 RETVAL = Mix_GroupOldest (-1);
2814
2815 if (RETVAL < 0)
2816 {
2817 // happens sometimes, maybe it just stopped playing(?)
2818 RETVAL = Mix_GroupAvailable (-1);
2819
2820 if (RETVAL < 0)
2821 XSRETURN_UNDEF;
2822 }
2823 else
2824 Mix_HaltChannel (RETVAL);
2825 }
2826
2827 Mix_UnregisterAllEffects (RETVAL);
2828 Mix_Volume (RETVAL, 128);
2829}
2830 OUTPUT:
2831 RETVAL
2832
2271void 2833void
2272halt (CFPlus::Channel self) 2834halt (DC::Channel self)
2273 CODE: 2835 CODE:
2274 Mix_HaltChannel (self); 2836 Mix_HaltChannel (self);
2275 2837
2276void 2838void
2277expire (CFPlus::Channel self, int ticks = -1) 2839expire (DC::Channel self, int ticks = -1)
2278 CODE: 2840 CODE:
2279 Mix_ExpireChannel (self, ticks); 2841 Mix_ExpireChannel (self, ticks);
2280 2842
2281void 2843void
2282fade_out (CFPlus::Channel self, int ticks = -1) 2844fade_out (DC::Channel self, int ticks = -1)
2283 CODE: 2845 CODE:
2284 Mix_FadeOutChannel (self, ticks); 2846 Mix_FadeOutChannel (self, ticks);
2285 2847
2286int 2848int
2287volume (CFPlus::Channel self, int volume) 2849volume (DC::Channel self, int volume)
2288 CODE: 2850 CODE:
2289 RETVAL = Mix_Volume (self, volume); 2851 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2290 OUTPUT: 2852 OUTPUT:
2291 RETVAL 2853 RETVAL
2292 2854
2293void 2855void
2294unregister_all_effects (CFPlus::Channel self) 2856unregister_all_effects (DC::Channel self)
2295 CODE: 2857 CODE:
2296 Mix_UnregisterAllEffects (self); 2858 Mix_UnregisterAllEffects (self);
2297 2859
2298void 2860void
2299set_panning (CFPlus::Channel self, int left, int right) 2861set_panning (DC::Channel self, int left, int right)
2300 CODE: 2862 CODE:
2863 left = CLAMP (left , 0, 255);
2864 right = CLAMP (right, 0, 255);
2301 Mix_SetPanning (self, left, right); 2865 Mix_SetPanning (self, left, right);
2302 2866
2303void 2867void
2304set_distance (CFPlus::Channel self, int distance) 2868set_distance (DC::Channel self, int distance)
2305 CODE: 2869 CODE:
2306 Mix_SetDistance (self, distance); 2870 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2307 2871
2308void 2872void
2309set_position (CFPlus::Channel self, int angle, int distance) 2873set_position (DC::Channel self, int angle, int distance)
2310 CODE: 2874 CODE:
2875
2876void
2877set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2878 CODE:
2879{
2880 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2881 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2311 Mix_SetPosition (self, angle, distance); 2882 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2883}
2312 2884
2313void 2885void
2314set_reverse_stereo (CFPlus::Channel self, int flip) 2886set_reverse_stereo (DC::Channel self, int flip)
2315 CODE: 2887 CODE:
2316 Mix_SetReverseStereo (self, flip); 2888 Mix_SetReverseStereo (self, flip);
2317 2889
2318MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2890MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2319 2891
2320PROTOTYPES: DISABLE 2892PROTOTYPES: DISABLE
2321 2893
2894void
2895decoders ()
2896 PPCODE:
2897#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2898 int i, num = Mix_GetNumChunkDecoders ();
2899 EXTEND (SP, num);
2900 for (i = 0; i < num; ++i)
2901 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2902#else
2903 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2904#endif
2905
2322CFPlus::MixChunk 2906DC::MixChunk
2323new (SV *class, CFPlus::RW rwops) 2907new (SV *class, DC::RW rwops)
2324 CODE: 2908 CODE:
2325 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2909 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2326 OUTPUT: 2910 OUTPUT:
2327 RETVAL 2911 RETVAL
2328 2912
2329void 2913void
2330DESTROY (CFPlus::MixChunk self) 2914DESTROY (DC::MixChunk self)
2331 CODE: 2915 CODE:
2332 Mix_FreeChunk (self); 2916 Mix_FreeChunk (self);
2333 2917
2334int 2918int
2335volume (CFPlus::MixChunk self, int volume = -1) 2919volume (DC::MixChunk self, int volume = -1)
2336 CODE: 2920 CODE:
2921 if (items > 1)
2922 volume = CLAMP (volume, 0, 128);
2337 RETVAL = Mix_VolumeChunk (self, volume); 2923 RETVAL = Mix_VolumeChunk (self, volume);
2338 OUTPUT: 2924 OUTPUT:
2339 RETVAL 2925 RETVAL
2340 2926
2341CFPlus::Channel 2927DC::Channel
2342play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2928play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2343 CODE: 2929 CODE:
2930{
2344 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2931 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2932
2933 if (RETVAL < 0)
2934 XSRETURN_UNDEF;
2935
2936 if (channel < 0)
2937 {
2345 Mix_UnregisterAllEffects (RETVAL); 2938 Mix_UnregisterAllEffects (RETVAL);
2939 Mix_Volume (RETVAL, 128);
2940 }
2941}
2346 OUTPUT: 2942 OUTPUT:
2347 RETVAL 2943 RETVAL
2348 2944
2349MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2945MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2946
2947void
2948decoders ()
2949 PPCODE:
2950#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2951 int i, num = Mix_GetNumMusicDecoders ();
2952 EXTEND (SP, num);
2953 for (i = 0; i < num; ++i)
2954 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2955#else
2956 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2957#endif
2350 2958
2351int 2959int
2352volume (int volume = -1) 2960volume (int volume = -1)
2353 PROTOTYPE: ;$ 2961 PROTOTYPE: ;$
2354 CODE: 2962 CODE:
2963 if (items > 0)
2964 volume = CLAMP (volume, 0, 128);
2355 RETVAL = Mix_VolumeMusic (volume); 2965 RETVAL = Mix_VolumeMusic (volume);
2356 OUTPUT: 2966 OUTPUT:
2357 RETVAL 2967 RETVAL
2358 2968
2359void 2969void
… …
2364void 2974void
2365halt () 2975halt ()
2366 CODE: 2976 CODE:
2367 Mix_HaltMusic (); 2977 Mix_HaltMusic ();
2368 2978
2979int
2980playing ()
2981 CODE:
2982 RETVAL = Mix_PlayingMusic ();
2983 OUTPUT:
2984 RETVAL
2985
2369CFPlus::MixMusic 2986DC::MixMusic
2370new (SV *class, CFPlus::RW rwops) 2987new (SV *class, DC::RW rwops)
2371 CODE: 2988 CODE:
2372 RETVAL = Mix_LoadMUS_RW (rwops); 2989 RETVAL = Mix_LoadMUS_RW (rwops);
2373 OUTPUT: 2990 OUTPUT:
2374 RETVAL 2991 RETVAL
2375 2992
2376void 2993void
2377DESTROY (CFPlus::MixMusic self) 2994DESTROY (DC::MixMusic self)
2378 CODE: 2995 CODE:
2379 Mix_FreeMusic (self); 2996 Mix_FreeMusic (self);
2380 2997
2381int 2998int
2382play (CFPlus::MixMusic self, int loops = -1) 2999play (DC::MixMusic self, int loops = -1)
2383 CODE: 3000 CODE:
2384 RETVAL = Mix_PlayMusic (self, loops); 3001 RETVAL = Mix_PlayMusic (self, loops);
2385 OUTPUT: 3002 OUTPUT:
2386 RETVAL 3003 RETVAL
2387 3004
2388void 3005void
2389fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3006fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2390 CODE: 3007 CODE:
2391 Mix_FadeInMusicPos (self, loops, ms, position); 3008 Mix_FadeInMusicPos (self, loops, ms, position);
2392 3009
2393MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3010MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2394 3011
2395PROTOTYPES: ENABLE 3012PROTOTYPES: ENABLE
2396 3013
2397BOOT: 3014BOOT:
2398{ 3015{
2399 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3016 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2400 static const struct { 3017 static const struct {
2401 const char *name; 3018 const char *name;
2402 IV iv; 3019 IV iv;
2403 } *civ, const_iv[] = { 3020 } *civ, const_iv[] = {
2404# define const_iv(name) { # name, (IV)name } 3021# define const_iv(name) { # name, (IV)name }
2405 const_iv (GL_VENDOR), 3022 const_iv (GL_VENDOR),
2406 const_iv (GL_VERSION), 3023 const_iv (GL_VERSION),
2407 const_iv (GL_EXTENSIONS), 3024 const_iv (GL_EXTENSIONS),
3025 const_iv (GL_MAX_TEXTURE_UNITS),
2408 const_iv (GL_COLOR_MATERIAL), 3026 const_iv (GL_COLOR_MATERIAL),
2409 const_iv (GL_SMOOTH), 3027 const_iv (GL_SMOOTH),
2410 const_iv (GL_FLAT), 3028 const_iv (GL_FLAT),
2411 const_iv (GL_DITHER), 3029 const_iv (GL_DITHER),
2412 const_iv (GL_BLEND), 3030 const_iv (GL_BLEND),
… …
2424 const_iv (GL_ZERO), 3042 const_iv (GL_ZERO),
2425 const_iv (GL_SRC_ALPHA), 3043 const_iv (GL_SRC_ALPHA),
2426 const_iv (GL_DST_ALPHA), 3044 const_iv (GL_DST_ALPHA),
2427 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3045 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2428 const_iv (GL_ONE_MINUS_DST_ALPHA), 3046 const_iv (GL_ONE_MINUS_DST_ALPHA),
3047 const_iv (GL_SRC_COLOR),
3048 const_iv (GL_DST_COLOR),
3049 const_iv (GL_ONE_MINUS_SRC_COLOR),
3050 const_iv (GL_ONE_MINUS_DST_COLOR),
2429 const_iv (GL_SRC_ALPHA_SATURATE), 3051 const_iv (GL_SRC_ALPHA_SATURATE),
2430 const_iv (GL_RGB), 3052 const_iv (GL_RGB),
2431 const_iv (GL_RGBA), 3053 const_iv (GL_RGBA),
2432 const_iv (GL_RGBA4), 3054 const_iv (GL_RGBA4),
2433 const_iv (GL_RGBA8), 3055 const_iv (GL_RGBA8),
… …
2439 const_iv (GL_INTENSITY), 3061 const_iv (GL_INTENSITY),
2440 const_iv (GL_LUMINANCE), 3062 const_iv (GL_LUMINANCE),
2441 const_iv (GL_LUMINANCE_ALPHA), 3063 const_iv (GL_LUMINANCE_ALPHA),
2442 const_iv (GL_FLOAT), 3064 const_iv (GL_FLOAT),
2443 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3065 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3066 const_iv (GL_COMPRESSED_ALPHA_ARB),
3067 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3068 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3069 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3070 const_iv (GL_COMPRESSED_RGB_ARB),
3071 const_iv (GL_COMPRESSED_RGBA_ARB),
2444 const_iv (GL_COMPILE), 3072 const_iv (GL_COMPILE),
2445 const_iv (GL_PROXY_TEXTURE_1D), 3073 const_iv (GL_PROXY_TEXTURE_1D),
2446 const_iv (GL_PROXY_TEXTURE_2D), 3074 const_iv (GL_PROXY_TEXTURE_2D),
2447 const_iv (GL_TEXTURE_1D), 3075 const_iv (GL_TEXTURE_1D),
2448 const_iv (GL_TEXTURE_2D), 3076 const_iv (GL_TEXTURE_2D),
… …
2487 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3115 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2488 const_iv (GL_POINT_SMOOTH_HINT), 3116 const_iv (GL_POINT_SMOOTH_HINT),
2489 const_iv (GL_LINE_SMOOTH_HINT), 3117 const_iv (GL_LINE_SMOOTH_HINT),
2490 const_iv (GL_POLYGON_SMOOTH_HINT), 3118 const_iv (GL_POLYGON_SMOOTH_HINT),
2491 const_iv (GL_GENERATE_MIPMAP_HINT), 3119 const_iv (GL_GENERATE_MIPMAP_HINT),
3120 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2492 const_iv (GL_FASTEST), 3121 const_iv (GL_FASTEST),
2493 const_iv (GL_DONT_CARE), 3122 const_iv (GL_DONT_CARE),
2494 const_iv (GL_NICEST), 3123 const_iv (GL_NICEST),
2495 const_iv (GL_V2F), 3124 const_iv (GL_V2F),
2496 const_iv (GL_V3F), 3125 const_iv (GL_V3F),
2497 const_iv (GL_T2F_V3F), 3126 const_iv (GL_T2F_V3F),
2498 const_iv (GL_T2F_N3F_V3F), 3127 const_iv (GL_T2F_N3F_V3F),
3128 const_iv (GL_FUNC_ADD),
3129 const_iv (GL_FUNC_SUBTRACT),
3130 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2499# undef const_iv 3131# undef const_iv
2500 }; 3132 };
2501 3133
2502 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3134 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2503 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3135 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2504 3136
2505 texture_av = newAV (); 3137 texture_av = newAV ();
2506 AvREAL_off (texture_av); 3138 AvREAL_off (texture_av);
2507} 3139}
2508 3140
3141void
3142disable_GL_EXT_blend_func_separate ()
3143 CODE:
3144 gl.BlendFuncSeparate = 0;
3145 gl.BlendFuncSeparateEXT = 0;
3146
3147void
3148apple_nvidia_bug (int enable)
3149
2509char * 3150char *
2510gl_vendor () 3151gl_vendor ()
2511 CODE: 3152 CODE:
2512 RETVAL = (char *)glGetString (GL_VENDOR); 3153 RETVAL = (char *)glGetString (GL_VENDOR);
2513 OUTPUT: 3154 OUTPUT:
… …
2561void glBlendFunc (int sfactor, int dfactor) 3202void glBlendFunc (int sfactor, int dfactor)
2562 3203
2563void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3204void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2564 CODE: 3205 CODE:
2565 gl_BlendFuncSeparate (sa, da, saa, daa); 3206 gl_BlendFuncSeparate (sa, da, saa, daa);
3207
3208# void glBlendEquation (int se)
2566 3209
2567void glDepthMask (int flag) 3210void glDepthMask (int flag)
2568 3211
2569void glLogicOp (int opcode) 3212void glLogicOp (int opcode)
2570 3213
… …
2605void glRotate (float angle, float x, float y, float z) 3248void glRotate (float angle, float x, float y, float z)
2606 CODE: 3249 CODE:
2607 glRotatef (angle, x, y, z); 3250 glRotatef (angle, x, y, z);
2608 3251
2609void glColor (float r, float g, float b, float a = 1.0) 3252void glColor (float r, float g, float b, float a = 1.0)
3253 PROTOTYPE: @
2610 ALIAS: 3254 ALIAS:
2611 glColor_premultiply = 1 3255 glColor_premultiply = 1
2612 CODE: 3256 CODE:
2613 if (ix) 3257 if (ix)
2614 { 3258 {
… …
2634 3278
2635void glRect (float x1, float y1, float x2, float y2) 3279void glRect (float x1, float y1, float x2, float y2)
2636 CODE: 3280 CODE:
2637 glRectf (x1, y1, x2, y2); 3281 glRectf (x1, y1, x2, y2);
2638 3282
3283void glRect_lineloop (float x1, float y1, float x2, float y2)
3284 CODE:
3285 glBegin (GL_LINE_LOOP);
3286 glVertex2f (x1, y1);
3287 glVertex2f (x2, y1);
3288 glVertex2f (x2, y2);
3289 glVertex2f (x1, y2);
3290 glEnd ();
3291
2639PROTOTYPES: ENABLE 3292PROTOTYPES: ENABLE
2640 3293
2641void glBegin (int mode) 3294void glBegin (int mode)
2642 3295
2643void glEnd () 3296void glEnd ()
… …
2675void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3328void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2676 CODE: 3329 CODE:
2677 if (gl.SeparableFilter2D) 3330 if (gl.SeparableFilter2D)
2678 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3331 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2679 3332
2680void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3333void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2681 3334
2682void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3335void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2683 3336
2684void glDrawPixels (int width, int height, int format, int type, char *pixels) 3337void glDrawPixels (int width, int height, int format, int type, char *pixels)
2685 3338
… …
2711 3364
2712void glEndList () 3365void glEndList ()
2713 3366
2714void glCallList (int list) 3367void glCallList (int list)
2715 3368
2716MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3369void c_init ()
3370 CODE:
3371 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3372 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3373
3374MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2717 3375
2718PROTOTYPES: DISABLE 3376PROTOTYPES: DISABLE
2719 3377
2720void 3378void
2721find_widget (SV *self, NV x, NV y) 3379find_widget (SV *self, NV x, NV y)
… …
2725 XPUSHs (self); 3383 XPUSHs (self);
2726} 3384}
2727 3385
2728BOOT: 3386BOOT:
2729{ 3387{
2730 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3388 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2731 3389
2732 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3390 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); 3391 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); 3392 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); 3393 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2736} 3394}
2737 3395
2738void 3396void
2739draw (SV *self) 3397draw (SV *self)
2740 CODE: 3398 CODE:
… …
2744 NV x, y, w, h; 3402 NV x, y, w, h;
2745 SV *draw_x_sv = GvSV (draw_x_gv); 3403 SV *draw_x_sv = GvSV (draw_x_gv);
2746 SV *draw_y_sv = GvSV (draw_y_gv); 3404 SV *draw_y_sv = GvSV (draw_y_gv);
2747 SV *draw_w_sv = GvSV (draw_w_gv); 3405 SV *draw_w_sv = GvSV (draw_w_gv);
2748 SV *draw_h_sv = GvSV (draw_h_gv); 3406 SV *draw_h_sv = GvSV (draw_h_gv);
2749 SV *hover;
2750 double draw_x, draw_y, draw_w, draw_h; 3407 double draw_x, draw_y;
2751 3408
2752 if (!SvROK (self)) 3409 if (!SvROK (self))
2753 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3410 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2754 3411
2755 hv = (HV *)SvRV (self); 3412 hv = (HV *)SvRV (self);
2756 3413
2757 if (SvTYPE (hv) != SVt_PVHV) 3414 if (SvTYPE (hv) != SVt_PVHV)
2758 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3415 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2759 3416
2760 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3417 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.; 3418 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2762 3419
2763 if (!h || !w) 3420 if (!h || !w)
… …
2783 { 3440 {
2784 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3441 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2785 3442
2786 if (svp && SvTRUE (*svp)) 3443 if (svp && SvTRUE (*svp))
2787 { 3444 {
2788 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3445 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2789 glEnable (GL_BLEND); 3446 glEnable (GL_BLEND);
2790 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3447 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2791 glBegin (GL_QUADS); 3448 glBegin (GL_QUADS);
2792 glVertex2f (0, 0); 3449 glVertex2f (0, 0);
2793 glVertex2f (w, 0); 3450 glVertex2f (w, 0);
… …
2796 glEnd (); 3453 glEnd ();
2797 glDisable (GL_BLEND); 3454 glDisable (GL_BLEND);
2798 } 3455 }
2799 } 3456 }
2800#if 0 3457#if 0
2801 if ($ENV{CFPLUS_DEBUG} & 1) { 3458 // draw borders, for debugging
2802 glPushMatrix; 3459 glPushMatrix ();
2803 glColor 1, 1, 0, 1; 3460 glColor4f (1., 1., 0., 1.);
2804 glTranslate 0.375, 0.375; 3461 glTranslatef (.5, .5, 0.);
2805 glBegin GL_LINE_LOOP; 3462 glBegin (GL_LINE_LOOP);
2806 glVertex 0 , 0; 3463 glVertex2f (0 , 0);
2807 glVertex $self->{w} - 1, 0; 3464 glVertex2f (w - 1, 0);
2808 glVertex $self->{w} - 1, $self->{h} - 1; 3465 glVertex2f (w - 1, h - 1);
2809 glVertex 0 , $self->{h} - 1; 3466 glVertex2f (0 , h - 1);
2810 glEnd; 3467 glEnd ();
2811 glPopMatrix; 3468 glPopMatrix ();
2812 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2813 }
2814#endif 3469#endif
2815 PUSHMARK (SP); 3470 PUSHMARK (SP);
2816 XPUSHs (self); 3471 XPUSHs (self);
2817 PUTBACK; 3472 PUTBACK;
2818 call_method ("_draw", G_VOID | G_DISCARD); 3473 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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