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.209 by root, Sat Jul 21 22:54:52 2007 UTC vs.
Revision 1.297 by root, Tue Dec 22 00:08:11 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines