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.215 by root, Tue Jul 31 00:50:04 2007 UTC vs.
Revision 1.305 by root, Sun May 2 21:22:20 2010 UTC

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

Diff Legend

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