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.299 by root, Tue Dec 22 01:37:41 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines