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.218 by root, Mon Aug 6 02:11:45 2007 UTC vs.
Revision 1.303 by root, Thu Apr 22 11:18:04 2010 UTC

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

Diff Legend

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