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.220 by root, Thu Aug 9 11:02:08 2007 UTC vs.
Revision 1.308 by root, Fri Jul 29 08:35:35 2011 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
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
68 123
69static AV *texture_av; 124static AV *texture_av;
70 125
71static struct 126static struct
72{ 127{
109 av_push (texture_av, (SV *)(size_t)name); 164 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 165 glDeleteTextures (1, &name);
111} 166}
112 167
113#include "texcache.c" 168#include "texcache.c"
169#include "rendercache.c"
114 170
115#include "pango-font.c" 171#include "pango-font.c"
116#include "pango-fontmap.c" 172#include "pango-fontmap.c"
117#include "pango-render.c" 173#include "pango-render.c"
118 174
119typedef IV CFPlus__Channel; 175typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 176typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 177typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 178typedef Mix_Music *DC__MixMusic;
123 179
124typedef PangoFontDescription *CFPlus__Font; 180typedef PangoFontDescription *DC__Font;
125 181
126static int 182static int
127shape_attr_p (PangoLayoutRun *run) 183shape_attr_p (PangoLayoutRun *run)
128{ 184{
129 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
143 199
144typedef struct cf_layout { 200typedef struct cf_layout {
145 PangoLayout *pl; 201 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 202 float r, g, b, a; // default color for rgba mode
147 int base_height; 203 int base_height;
148 CFPlus__Font font; 204 DC__Font font;
205 rc_t *rc;
149} *CFPlus__Layout; 206} *DC__Layout;
150 207
151static CFPlus__Font default_font; 208static DC__Font default_font;
152static PangoContext *opengl_context; 209static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
154 211
155static void 212static void
156substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
161#endif 218#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 220}
164 221
165static void 222static void
166layout_update_font (CFPlus__Layout self) 223layout_update_font (DC__Layout self)
167{ 224{
168 /* use a random scale factor to account for unknown descenders, 0.8 works 225 /* use a random scale factor to account for unknown descenders, 0.8 works
169 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
170 */ 227 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
172 229
173 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 232
176 pango_layout_set_font_description (self->pl, font); 233 pango_layout_set_font_description (self->pl, font);
177} 234}
178 235
179static void 236static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 237layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 238{
182 PangoRectangle rect; 239 PangoRectangle rect;
183 240
184 // get_pixel_* wrongly rounds down 241 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 242 pango_layout_get_extents (self->pl, 0, &rect);
196 253
197typedef uint16_t tileid; 254typedef uint16_t tileid;
198typedef uint16_t faceid; 255typedef uint16_t faceid;
199 256
200typedef struct { 257typedef struct {
201 int name; 258 GLuint name;
202 int w, h; 259 int w, h;
203 float s, t; 260 float s, t;
204 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
205 tileid smoothtile; 262 tileid smoothtile;
206 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
207} maptex; 265} maptex;
208 266
209typedef struct { 267typedef struct {
210 uint32_t player; 268 uint32_t player;
211 tileid tile[3]; 269 tileid tile[3];
224 int faces; tileid *face2tile; // [faceid] 282 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 283 int texs; maptex *tex; // [tileid]
226 284
227 int32_t rows; 285 int32_t rows;
228 maprow *row; 286 maprow *row;
229} *CFPlus__Map; 287} *DC__Map;
230 288
231static char * 289static char *
232prepend (char *ptr, int sze, int inc) 290prepend (char *ptr, int sze, int inc)
233{ 291{
234 char *p; 292 char *p;
272 self->texs *= 2; 330 self->texs *= 2;
273 } 331 }
274} 332}
275 333
276static maprow * 334static maprow *
277map_get_row (CFPlus__Map self, int y) 335map_get_row (DC__Map self, int y)
278{ 336{
279 if (0 > y) 337 if (0 > y)
280 { 338 {
281 int extend = - y + MAP_EXTEND_Y; 339 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 340 Prepend (maprow, self->row, self->rows, extend);
320 378
321 return row->col + (x - row->c0); 379 return row->col + (x - row->c0);
322} 380}
323 381
324static mapcell * 382static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 383map_get_cell (DC__Map self, int x, int y)
326{ 384{
327 return row_get_cell (map_get_row (self, y), x); 385 return row_get_cell (map_get_row (self, y), x);
328} 386}
329 387
330static void 388static void
331map_clear (CFPlus__Map self) 389map_clear (DC__Map self)
332{ 390{
333 int r; 391 int r;
334 392
335 for (r = 0; r < self->rows; r++) 393 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 394 Safefree (self->row[r].col);
343 self->oy = 0; 401 self->oy = 0;
344 self->row = 0; 402 self->row = 0;
345 self->rows = 0; 403 self->rows = 0;
346} 404}
347 405
406#define CELL_CLEAR(cell) \
407 do { \
408 if ((cell)->player) \
409 (cell)->tile [2] = 0; \
410 (cell)->darkness = 0; \
411 (cell)->stat_hp = 0; \
412 (cell)->flags = 0; \
413 (cell)->player = 0; \
414 } while (0)
415
348static void 416static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 417map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 418{
351 int x, y; 419 int x, y;
352 maprow *row; 420 maprow *row;
353 mapcell *cell; 421 mapcell *cell;
354 422
366 if (x >= row->c1) 434 if (x >= row->c1)
367 break; 435 break;
368 436
369 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
370 438
371 cell->darkness = 0; 439 CELL_CLEAR (cell);
372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
375 } 440 }
376 } 441 }
377} 442}
378 443
379typedef struct { 444typedef struct {
414 ev.code = 1; 479 ev.code = 1;
415 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
416 ev.data2 = 0; 481 ev.data2 = 0;
417 482
418 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
484}
485
486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
419} 490}
420 491
421static unsigned int 492static unsigned int
422minpot (unsigned int n) 493minpot (unsigned int n)
423{ 494{
433 n |= n >> 16; 504 n |= n >> 16;
434 505
435 return n + 1; 506 return n + 1;
436} 507}
437 508
509static unsigned int
510popcount (unsigned int n)
511{
512 n -= (n >> 1) & 0x55555555U;
513 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
514 n = ((n >> 4) + n) & 0x0f0f0f0fU;
515 n *= 0x01010101U;
516
517 return n >> 24;
518}
519
438/* SDL should provide this, really. */ 520/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 521#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 522#define SDLK_MODIFIER_MAX 314
441 523
442/******************************************************************************/ 524/******************************************************************************/
480 return 0; 562 return 0;
481 563
482 return 1; 564 return 1;
483} 565}
484 566
485MODULE = CFPlus PACKAGE = CFPlus 567/******************************************************************************/
568
569/* process keyboard modifiers */
570static int
571mod_munge (int mod)
572{
573 mod &= MOD_MASK;
574
575 if (mod & (KMOD_META | KMOD_ALT))
576 mod |= KMOD_LRAM;
577
578 return mod;
579}
580
581static void
582deliantra_main ()
583{
584 char *argv[] = { 0 };
585 call_argv ("::main", G_DISCARD | G_VOID, argv);
586}
587
588#ifdef __MACOSX__
589 /* to due surprising braindamage on the side of SDL design, we
590 * do some mind-boggling hack here: SDL requires a custom main()
591 * on OS X, so... we provide one and call the original main(), which,
592 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
593 * and which calls our main (== SDL_main) back.
594 */
595 extern C_LINKAGE int
596 main (int argc, char *argv[])
597 {
598 deliantra_main ();
599 }
600
601 #undef main
602
603 extern C_LINKAGE int main (int argc, char *argv[]);
604
605 static void
606 SDL_braino (void)
607 {
608 char *argv[] = { "deliantra client", 0 };
609 (main) (1, argv);
610 }
611#else
612 static void
613 SDL_braino (void)
614 {
615 deliantra_main ();
616 }
617#endif
618
619MODULE = Deliantra::Client PACKAGE = DC
486 620
487PROTOTYPES: ENABLE 621PROTOTYPES: ENABLE
488 622
489BOOT: 623BOOT:
490{ 624{
491 HV *stash = gv_stashpv ("CFPlus", 1); 625 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 626 static const struct {
493 const char *name; 627 const char *name;
494 IV iv; 628 IV iv;
495 } *civ, const_iv[] = { 629 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 630# define const_iv(name) { # name, (IV)name }
518 652
519 const_iv (SDL_APPINPUTFOCUS), 653 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 654 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 655 const_iv (SDL_APPACTIVE),
522 656
657
658 const_iv (SDLK_UNKNOWN),
659 const_iv (SDLK_FIRST),
660 const_iv (SDLK_BACKSPACE),
661 const_iv (SDLK_TAB),
662 const_iv (SDLK_CLEAR),
663 const_iv (SDLK_RETURN),
664 const_iv (SDLK_PAUSE),
665 const_iv (SDLK_ESCAPE),
666 const_iv (SDLK_SPACE),
667 const_iv (SDLK_EXCLAIM),
668 const_iv (SDLK_QUOTEDBL),
669 const_iv (SDLK_HASH),
670 const_iv (SDLK_DOLLAR),
671 const_iv (SDLK_AMPERSAND),
672 const_iv (SDLK_QUOTE),
673 const_iv (SDLK_LEFTPAREN),
674 const_iv (SDLK_RIGHTPAREN),
675 const_iv (SDLK_ASTERISK),
676 const_iv (SDLK_PLUS),
677 const_iv (SDLK_COMMA),
678 const_iv (SDLK_MINUS),
679 const_iv (SDLK_PERIOD),
680 const_iv (SDLK_SLASH),
681 const_iv (SDLK_0),
682 const_iv (SDLK_1),
683 const_iv (SDLK_2),
684 const_iv (SDLK_3),
685 const_iv (SDLK_4),
686 const_iv (SDLK_5),
687 const_iv (SDLK_6),
688 const_iv (SDLK_7),
689 const_iv (SDLK_8),
690 const_iv (SDLK_9),
691 const_iv (SDLK_COLON),
692 const_iv (SDLK_SEMICOLON),
693 const_iv (SDLK_LESS),
694 const_iv (SDLK_EQUALS),
695 const_iv (SDLK_GREATER),
696 const_iv (SDLK_QUESTION),
697 const_iv (SDLK_AT),
698
699 const_iv (SDLK_LEFTBRACKET),
700 const_iv (SDLK_BACKSLASH),
701 const_iv (SDLK_RIGHTBRACKET),
702 const_iv (SDLK_CARET),
703 const_iv (SDLK_UNDERSCORE),
704 const_iv (SDLK_BACKQUOTE),
705 const_iv (SDLK_DELETE),
706
707 const_iv (SDLK_FIRST),
708 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 709 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 710 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 711 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 712 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 713 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 785 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 786 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 787 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 788 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 789 const_iv (KMOD_MODE),
790
791 const_iv (KMOD_LRAM),
792
793 const_iv (MIX_DEFAULT_FORMAT),
794
795 const_iv (SDL_INIT_TIMER),
796 const_iv (SDL_INIT_AUDIO),
797 const_iv (SDL_INIT_VIDEO),
798 const_iv (SDL_INIT_CDROM),
799 const_iv (SDL_INIT_JOYSTICK),
800 const_iv (SDL_INIT_EVERYTHING),
801 const_iv (SDL_INIT_NOPARACHUTE),
802 const_iv (SDL_INIT_EVENTTHREAD),
803
804 const_iv (SDL_GL_RED_SIZE),
805 const_iv (SDL_GL_GREEN_SIZE),
806 const_iv (SDL_GL_BLUE_SIZE),
807 const_iv (SDL_GL_ALPHA_SIZE),
808 const_iv (SDL_GL_DOUBLEBUFFER),
809 const_iv (SDL_GL_BUFFER_SIZE),
810 const_iv (SDL_GL_DEPTH_SIZE),
811 const_iv (SDL_GL_STENCIL_SIZE),
812 const_iv (SDL_GL_ACCUM_RED_SIZE),
813 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
814 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
815 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
816 const_iv (SDL_GL_STEREO),
817 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
818 const_iv (SDL_GL_MULTISAMPLESAMPLES),
819 const_iv (SDL_GL_ACCELERATED_VISUAL),
820 const_iv (SDL_GL_SWAP_CONTROL),
821
822 const_iv (FOW_DARKNESS)
604# undef const_iv 823# undef const_iv
605 }; 824 };
606 825
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 826 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
609 828
610 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
611 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
612} 831}
613 832
626 845
627NV floor (NV x) 846NV floor (NV x)
628 847
629NV ceil (NV x) 848NV ceil (NV x)
630 849
850IV minpot (UV n)
851
852IV popcount (UV n)
853
854NV distance (NV dx, NV dy)
855 CODE:
856 RETVAL = pow (dx * dx + dy * dy, 0.5);
857 OUTPUT:
858 RETVAL
859
631void 860void
632pango_init () 861pango_init ()
633 CODE: 862 CODE:
634{ 863{
635 opengl_fontmap = pango_opengl_font_map_new (); 864 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 865 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); 866 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
867 /*pango_context_set_font_description (opengl_context, default_font);*/
868#if PANGO_VERSION_CHECK (1, 15, 2)
869 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
870 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
871#endif
638} 872}
639 873
640char *
641SDL_GetError () 874char *SDL_GetError ()
642 875
643int 876void SDL_braino ()
644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645 877
646void 878int SDL_Init (U32 flags)
879
880int SDL_InitSubSystem (U32 flags)
881
882void SDL_QuitSubSystem (U32 flags)
883
647SDL_Quit () 884void SDL_Quit ()
885
886int SDL_GL_SetAttribute (int attr, int value)
887
888int SDL_GL_GetAttribute (int attr)
889 CODE:
890 if (SDL_GL_GetAttribute (attr, &RETVAL))
891 XSRETURN_UNDEF;
892 OUTPUT:
893 RETVAL
648 894
649void 895void
650SDL_ListModes (int rgb, int alpha) 896SDL_ListModes (int rgb, int alpha)
651 PPCODE: 897 PPCODE:
652{ 898{
664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 910 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 911 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 912 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667 913
668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 914 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); 915 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
673 916
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 917 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 918
676 if (m && m != (SDL_Rect **)-1) 919 if (m && m != (SDL_Rect **)-1)
677 while (*m) 920 while (*m)
678 { 921 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 922 if ((*m)->w >= 400 && (*m)->h >= 300)
680 { 923 {
681 AV *av = newAV (); 924 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 925 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 926 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 927 av_push (av, newSViv (rgb));
708 951
709 if (RETVAL) 952 if (RETVAL)
710 { 953 {
711 av_clear (texture_av); 954 av_clear (texture_av);
712 955
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 957#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 958#include "glfunc.h"
716#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
717 } 963 }
718} 964}
719 OUTPUT: 965 OUTPUT:
720 RETVAL 966 RETVAL
721 967
725char * 971char *
726SDL_GetKeyName (int sym) 972SDL_GetKeyName (int sym)
727 973
728int 974int
729SDL_GetAppState () 975SDL_GetAppState ()
976
977int
978SDL_GetModState ()
730 979
731void 980void
732poll_events () 981poll_events ()
733 PPCODE: 982 PPCODE:
734{ 983{
744 { 993 {
745 case SDL_KEYDOWN: 994 case SDL_KEYDOWN:
746 case SDL_KEYUP: 995 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 996 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 997 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 998 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 */ 999 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); 1000 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 1001 break;
753 1002
754 case SDL_ACTIVEEVENT: 1003 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1004 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 1022 x = ev.motion.x;
774 y = ev.motion.y; 1023 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1024 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 1025 }
777 1026
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1027 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 1028 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 1029 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 1030 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1031 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1032 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 1033 }
785 break; 1034 break;
786 1035
787 case SDL_MOUSEBUTTONDOWN: 1036 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 1037 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1038 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 1039
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1040 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1041 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1042 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1043 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1048 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1049 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 1050 break;
802 } 1051 }
803 1052
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1053 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 1054 }
806} 1055}
807 1056
1057char *
1058SDL_AudioDriverName ()
1059 CODE:
1060{
1061 char buf [256];
1062 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1063 XSRETURN_UNDEF;
1064
1065 RETVAL = buf;
1066}
1067 OUTPUT:
1068 RETVAL
1069
808int 1070int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1071Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 1072 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 1073 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 1074 Mix_ChannelFinished (channel_finished);
1075
1076void
1077Mix_QuerySpec ()
1078 PPCODE:
1079{
1080 int freq, channels;
1081 Uint16 format;
1082
1083 if (Mix_QuerySpec (&freq, &format, &channels))
1084 {
1085 EXTEND (SP, 3);
1086 PUSHs (sv_2mortal (newSViv (freq)));
1087 PUSHs (sv_2mortal (newSViv (format)));
1088 PUSHs (sv_2mortal (newSViv (channels)));
1089 }
1090}
813 1091
814void 1092void
815Mix_CloseAudio () 1093Mix_CloseAudio ()
816 1094
817int 1095int
852 } 1130 }
853 } 1131 }
854#endif 1132#endif
855} 1133}
856 1134
857void 1135int
858add_font (char *file) 1136add_font (char *file)
859 CODE: 1137 CODE:
860 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1138 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1139 OUTPUT:
1140 RETVAL
1141
1142void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
861 1144
862void 1145void
863load_image_inline (SV *image_) 1146load_image_inline (SV *image_)
864 ALIAS: 1147 ALIAS:
865 load_image_file = 1 1148 load_image_file = 1
951void 1234void
952error (char *message) 1235error (char *message)
953 CODE: 1236 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 1237 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 1238#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1239 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 1240#endif
958 1241
959void 1242void
960fatal (char *message) 1243fatal (char *message)
961 CODE: 1244 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1245 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1246#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1247 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1248#endif
966 _exit (1); 1249 _exit (1);
967 1250
968void 1251void
969_exit (int retval = 0) 1252_exit (int retval = 0)
981#if DEBUG 1264#if DEBUG
982 VALGRIND_DO_LEAK_CHECK; 1265 VALGRIND_DO_LEAK_CHECK;
983#endif 1266#endif
984} 1267}
985 1268
986MODULE = CFPlus PACKAGE = CFPlus::Font 1269int
1270SvREFCNT (SV *sv)
1271 CODE:
1272 RETVAL = SvREFCNT (sv);
1273 OUTPUT:
1274 RETVAL
1275
1276MODULE = Deliantra::Client PACKAGE = DC::Font
987 1277
988PROTOTYPES: DISABLE 1278PROTOTYPES: DISABLE
989 1279
990CFPlus::Font 1280DC::Font
991new_from_file (SV *class, char *path, int id = 0) 1281new_from_file (SV *class, char *path, int id = 0)
992 CODE: 1282 CODE:
993{ 1283{
994 int count; 1284 int count;
995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1285 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
998} 1288}
999 OUTPUT: 1289 OUTPUT:
1000 RETVAL 1290 RETVAL
1001 1291
1002void 1292void
1003DESTROY (CFPlus::Font self) 1293DESTROY (DC::Font self)
1004 CODE: 1294 CODE:
1005 pango_font_description_free (self); 1295 pango_font_description_free (self);
1006 1296
1007void 1297void
1008make_default (CFPlus::Font self) 1298make_default (DC::Font self)
1009 PROTOTYPE: $ 1299 PROTOTYPE: $
1010 CODE: 1300 CODE:
1011 default_font = self; 1301 default_font = self;
1012 1302
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1303MODULE = Deliantra::Client PACKAGE = DC::Layout
1014 1304
1015PROTOTYPES: DISABLE 1305PROTOTYPES: DISABLE
1016 1306
1017void 1307void
1018reset_glyph_cache () 1308glyph_cache_backup ()
1019 PROTOTYPE: 1309 PROTOTYPE:
1020 CODE: 1310 CODE:
1311 tc_backup ();
1312
1313void
1314glyph_cache_restore ()
1315 PROTOTYPE:
1316 CODE:
1021 tc_clear (); 1317 tc_restore ();
1022 1318
1023CFPlus::Layout 1319DC::Layout
1024new (SV *class) 1320new (SV *class)
1025 CODE: 1321 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1322 New (0, RETVAL, 1, struct cf_layout);
1027 1323
1028 RETVAL->pl = pango_layout_new (opengl_context); 1324 RETVAL->pl = pango_layout_new (opengl_context);
1030 RETVAL->g = 1.; 1326 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1327 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1328 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1329 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1330 RETVAL->font = 0;
1331 RETVAL->rc = rc_alloc ();
1035 1332
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1333 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1334 layout_update_font (RETVAL);
1038 OUTPUT: 1335 OUTPUT:
1039 RETVAL 1336 RETVAL
1040 1337
1041void 1338void
1042DESTROY (CFPlus::Layout self) 1339DESTROY (DC::Layout self)
1043 CODE: 1340 CODE:
1044 g_object_unref (self->pl); 1341 g_object_unref (self->pl);
1342 rc_free (self->rc);
1045 Safefree (self); 1343 Safefree (self);
1046 1344
1047void 1345void
1048set_text (CFPlus::Layout self, SV *text_) 1346set_text (DC::Layout self, SV *text_)
1049 CODE: 1347 CODE:
1050{ 1348{
1051 STRLEN textlen; 1349 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1350 char *text = SvPVutf8 (text_, textlen);
1053 1351
1054 pango_layout_set_text (self->pl, text, textlen); 1352 pango_layout_set_text (self->pl, text, textlen);
1055} 1353}
1056 1354
1057void 1355void
1058set_markup (CFPlus::Layout self, SV *text_) 1356set_markup (DC::Layout self, SV *text_)
1059 CODE: 1357 CODE:
1060{ 1358{
1061 STRLEN textlen; 1359 STRLEN textlen;
1062 char *text = SvPVutf8 (text_, textlen); 1360 char *text = SvPVutf8 (text_, textlen);
1063 1361
1064 pango_layout_set_markup (self->pl, text, textlen); 1362 pango_layout_set_markup (self->pl, text, textlen);
1065} 1363}
1066 1364
1067void 1365void
1068set_shapes (CFPlus::Layout self, ...) 1366set_shapes (DC::Layout self, ...)
1069 CODE: 1367 CODE:
1070{ 1368{
1071 PangoAttrList *attrs = 0; 1369 PangoAttrList *attrs = 0;
1072 const char *text = pango_layout_get_text (self->pl); 1370 const char *text = pango_layout_get_text (self->pl);
1073 const char *pos = text; 1371 const char *pos = text;
1108 if (attrs) 1406 if (attrs)
1109 pango_layout_set_attributes (self->pl, attrs); 1407 pango_layout_set_attributes (self->pl, attrs);
1110} 1408}
1111 1409
1112void 1410void
1113get_shapes (CFPlus::Layout self) 1411get_shapes (DC::Layout self)
1114 PPCODE: 1412 PPCODE:
1115{ 1413{
1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1414 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117 1415
1118 do 1416 do
1119 { 1417 {
1120 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1418 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121 1419
1122 if (run && shape_attr_p (run)) 1420 if (run && shape_attr_p (run))
1123 { 1421 {
1124 PangoRectangle extents; 1422 PangoRectangle extents;
1125 pango_layout_iter_get_run_extents (iter, 0, &extents); 1423 pango_layout_iter_get_run_extents (iter, 0, &extents);
1133 1431
1134 pango_layout_iter_free (iter); 1432 pango_layout_iter_free (iter);
1135} 1433}
1136 1434
1137int 1435int
1138has_wrapped (CFPlus::Layout self) 1436has_wrapped (DC::Layout self)
1139 CODE: 1437 CODE:
1140{ 1438{
1141 int lines = 1; 1439 int lines = 1;
1142 const char *text = pango_layout_get_text (self->pl); 1440 const char *text = pango_layout_get_text (self->pl);
1143 1441
1148} 1446}
1149 OUTPUT: 1447 OUTPUT:
1150 RETVAL 1448 RETVAL
1151 1449
1152SV * 1450SV *
1153get_text (CFPlus::Layout self) 1451get_text (DC::Layout self)
1154 CODE: 1452 CODE:
1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1453 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156 sv_utf8_decode (RETVAL); 1454 sv_utf8_decode (RETVAL);
1157 OUTPUT: 1455 OUTPUT:
1158 RETVAL 1456 RETVAL
1159 1457
1160void 1458void
1161set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1459set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1162 CODE: 1460 CODE:
1163 self->r = r; 1461 self->r = r;
1164 self->g = g; 1462 self->g = g;
1165 self->b = b; 1463 self->b = b;
1166 self->a = a; 1464 self->a = a;
1167 1465
1168void 1466void
1169set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1467set_font (DC::Layout self, DC::Font font = 0)
1170 CODE: 1468 CODE:
1171 if (self->font != font) 1469 if (self->font != font)
1172 { 1470 {
1173 self->font = font; 1471 self->font = font;
1174 layout_update_font (self); 1472 layout_update_font (self);
1175 } 1473 }
1176 1474
1177void 1475void
1178set_height (CFPlus::Layout self, int base_height) 1476set_height (DC::Layout self, int base_height)
1179 CODE: 1477 CODE:
1180 if (self->base_height != base_height) 1478 if (self->base_height != base_height)
1181 { 1479 {
1182 self->base_height = base_height; 1480 self->base_height = base_height;
1183 layout_update_font (self); 1481 layout_update_font (self);
1184 } 1482 }
1185 1483
1186void 1484void
1187set_width (CFPlus::Layout self, int max_width = -1) 1485set_width (DC::Layout self, int max_width = -1)
1188 CODE: 1486 CODE:
1189 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1487 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1190 1488
1191void 1489void
1192set_indent (CFPlus::Layout self, int indent) 1490set_indent (DC::Layout self, int indent)
1193 CODE: 1491 CODE:
1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1492 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195 1493
1196void 1494void
1197set_spacing (CFPlus::Layout self, int spacing) 1495set_spacing (DC::Layout self, int spacing)
1198 CODE: 1496 CODE:
1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1497 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200 1498
1201void 1499void
1202set_ellipsise (CFPlus::Layout self, int ellipsise) 1500set_ellipsise (DC::Layout self, int ellipsise)
1203 CODE: 1501 CODE:
1204 pango_layout_set_ellipsize (self->pl, 1502 pango_layout_set_ellipsize (self->pl,
1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1503 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1504 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1505 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208 : PANGO_ELLIPSIZE_NONE 1506 : PANGO_ELLIPSIZE_NONE
1209 ); 1507 );
1210 1508
1211void 1509void
1212set_single_paragraph_mode (CFPlus::Layout self, int spm) 1510set_single_paragraph_mode (DC::Layout self, int spm)
1213 CODE: 1511 CODE:
1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1512 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215 1513
1216void 1514void
1217size (CFPlus::Layout self) 1515size (DC::Layout self)
1218 PPCODE: 1516 PPCODE:
1219{ 1517{
1220 int w, h; 1518 int w, h;
1221 1519
1222 layout_get_pixel_size (self, &w, &h); 1520 layout_get_pixel_size (self, &w, &h);
1225 PUSHs (sv_2mortal (newSViv (w))); 1523 PUSHs (sv_2mortal (newSViv (w)));
1226 PUSHs (sv_2mortal (newSViv (h))); 1524 PUSHs (sv_2mortal (newSViv (h)));
1227} 1525}
1228 1526
1229int 1527int
1230descent (CFPlus::Layout self) 1528descent (DC::Layout self)
1231 CODE: 1529 CODE:
1232{ 1530{
1233 PangoRectangle rect; 1531 PangoRectangle rect;
1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1532 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235 pango_layout_line_get_pixel_extents (line, 0, &rect); 1533 pango_layout_line_get_pixel_extents (line, 0, &rect);
1236 RETVAL = PANGO_DESCENT (rect); 1534 RETVAL = PANGO_DESCENT (rect);
1237} 1535}
1238 OUTPUT: 1536 OUTPUT:
1239 RETVAL 1537 RETVAL
1240 1538
1241int 1539int
1242xy_to_index (CFPlus::Layout self, int x, int y) 1540xy_to_index (DC::Layout self, int x, int y)
1243 CODE: 1541 CODE:
1244{ 1542{
1245 int index, trailing; 1543 int index, trailing;
1246 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1544 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1247 RETVAL = index + trailing; 1545 RETVAL = index + trailing;
1248} 1546}
1249 OUTPUT: 1547 OUTPUT:
1250 RETVAL 1548 RETVAL
1251 1549
1252void 1550void
1253cursor_pos (CFPlus::Layout self, int index) 1551cursor_pos (DC::Layout self, int index)
1254 PPCODE: 1552 PPCODE:
1255{ 1553{
1256 PangoRectangle strong_pos; 1554 PangoRectangle pos;
1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1555 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258 1556
1259 EXTEND (SP, 3); 1557 EXTEND (SP, 3);
1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1558 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1559 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1560 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263} 1561}
1264 1562
1265void 1563void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1564index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267 PPCODE: 1565 PPCODE:
1268{ 1566{
1269 int line, x; 1567 int line, x;
1270 1568
1271 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1569 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1570#if !PANGO_VERSION_CHECK (1, 17, 3)
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1571 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273 1572 --line;
1573#endif
1274 EXTEND (SP, 2); 1574 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1))); 1575 PUSHs (sv_2mortal (newSViv (line)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1576 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277} 1577}
1278 1578
1279void 1579void
1280line_x_to_index (CFPlus::Layout self, int line, int x) 1580line_x_to_index (DC::Layout self, int line, int x)
1281 PPCODE: 1581 PPCODE:
1282{ 1582{
1283 PangoLayoutLine *lp; 1583 PangoLayoutLine *lp;
1284 int index, trailing; 1584 int index, trailing;
1285 1585
1286 if (line < 0) 1586 if (line < 0)
1287 XSRETURN_EMPTY; 1587 XSRETURN_EMPTY;
1288 1588
1289 if (!(lp = pango_layout_get_line (self->pl, line))) 1589 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */ 1590 XSRETURN_EMPTY; /* do better */
1291 1591
1292 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1592 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1293 1593
1294 EXTEND (SP, 2); 1594 EXTEND (SP, 2);
1300 PUSHs (sv_2mortal (newSViv (trailing))); 1600 PUSHs (sv_2mortal (newSViv (trailing)));
1301 } 1601 }
1302} 1602}
1303 1603
1304void 1604void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1605render (DC::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1606 CODE:
1607 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1608 pango_opengl_render_layout_subpixel (
1308 self->pl, 1609 self->pl,
1610 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1611 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1612 self->r, self->g, self->b, self->a,
1311 flags 1613 flags
1312 ); 1614 );
1615 // we assume that context_change actually clears/frees stuff
1616 // and does not do any recomputation...
1617 pango_layout_context_changed (self->pl);
1313 1618
1314MODULE = CFPlus PACKAGE = CFPlus::Texture 1619void
1620draw (DC::Layout self)
1621 CODE:
1622{
1623 glEnable (GL_TEXTURE_2D);
1624 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1625 glEnable (GL_BLEND);
1626 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1627 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1628 glEnable (GL_ALPHA_TEST);
1629 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1630
1631 rc_draw (self->rc);
1632
1633 glDisable (GL_ALPHA_TEST);
1634 glDisable (GL_BLEND);
1635 glDisable (GL_TEXTURE_2D);
1636}
1637
1638MODULE = Deliantra::Client PACKAGE = DC::Texture
1315 1639
1316PROTOTYPES: ENABLE 1640PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1641
1320void 1642void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1643pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1644 CODE:
1323{ 1645{
1389 glDisable (GL_ALPHA_TEST); 1711 glDisable (GL_ALPHA_TEST);
1390 glDisable (GL_BLEND); 1712 glDisable (GL_BLEND);
1391 } 1713 }
1392} 1714}
1393 1715
1716void
1717draw_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)
1718 PROTOTYPE: @
1719 CODE:
1720{
1721 glEnable (GL_BLEND);
1722 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1723 glEnable (GL_TEXTURE_2D);
1724 glBindTexture (GL_TEXTURE_2D, name1);
1725
1726 glColor3f (intensity, intensity, intensity);
1727 glPushMatrix ();
1728 glScalef (1./3, 1./3, 1.);
1729
1730 if (blend > 0.f)
1731 {
1732 float dx3 = dx * -3.f / w;
1733 float dy3 = dy * -3.f / h;
1734 GLfloat env_color[4] = { 0., 0., 0., blend };
1735
1736 /* interpolate the two shadow textures */
1737 /* stage 0 == rgb(glcolor) + alpha(t0) */
1738 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1739
1740 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1741 gl.ActiveTexture (GL_TEXTURE1);
1742 glEnable (GL_TEXTURE_2D);
1743 glBindTexture (GL_TEXTURE_2D, name2);
1744 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1745
1746 /* rgb == rgb(glcolor) */
1747 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1748 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1749 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1750
1751 /* alpha = interpolate t0, t1 by env_alpha */
1752 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1753
1754 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1755 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1756 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1757
1758 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1760
1761 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1763
1764 glBegin (GL_QUADS);
1765 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1766 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1767 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1768 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1769 glEnd ();
1770
1771 glDisable (GL_TEXTURE_2D);
1772 gl.ActiveTexture (GL_TEXTURE0);
1773 }
1774 else
1775 {
1776 /* simple blending of one texture, also opengl <1.3 path */
1777 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1778
1779 glBegin (GL_QUADS);
1780 glTexCoord2f (0, 0); glVertex2f (0, 0);
1781 glTexCoord2f (0, t); glVertex2f (0, h);
1782 glTexCoord2f (s, t); glVertex2f (w, h);
1783 glTexCoord2f (s, 0); glVertex2f (w, 0);
1784 glEnd ();
1785 }
1786
1787 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1788 {
1789 int x, y;
1790 int dx3 = dx * 3;
1791 int dy3 = dy * 3;
1792
1793 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1794 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1795 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1796 glTranslatef (-1., -1., 0);
1797 glBegin (GL_QUADS);
1798
1799 for (y = 1; y < h; y += 3)
1800 {
1801 int y1 = y - dy3;
1802 int y1valid = y1 >= 0 && y1 < h;
1803
1804 for (x = 1; x < w; x += 3)
1805 {
1806 int x1 = x - dx3;
1807 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1808 uint8_t h2;
1809
1810 if (y1valid && x1 >= 0 && x1 < w)
1811 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1812 else
1813 h2 = 1; /* out of range == invisible */
1814
1815 if (h1 || h2)
1816 {
1817 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1818 glColor4f (1., 1., 1., alpha);
1819
1820 glTexCoord2f (0, 0.); glVertex2i (x , y );
1821 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1822 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1823 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1824 }
1825 }
1826 }
1827 }
1828
1829 glEnd ();
1830
1831 glPopMatrix ();
1832
1833 glDisable (GL_TEXTURE_2D);
1834 glDisable (GL_BLEND);
1835}
1836
1394IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1837IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1395 CODE: 1838 CODE:
1396{ 1839{
1397 GLint width; 1840 GLint width;
1398 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1841 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1400 RETVAL = width > 0; 1843 RETVAL = width > 0;
1401} 1844}
1402 OUTPUT: 1845 OUTPUT:
1403 RETVAL 1846 RETVAL
1404 1847
1405MODULE = CFPlus PACKAGE = CFPlus::Map 1848MODULE = Deliantra::Client PACKAGE = DC::Map
1406 1849
1407PROTOTYPES: DISABLE 1850PROTOTYPES: DISABLE
1408 1851
1409CFPlus::Map 1852DC::Map
1410new (SV *class) 1853new (SV *class)
1411 CODE: 1854 CODE:
1412 New (0, RETVAL, 1, struct map); 1855 New (0, RETVAL, 1, struct map);
1413 RETVAL->x = 0; 1856 RETVAL->x = 0;
1414 RETVAL->y = 0; 1857 RETVAL->y = 0;
1422 RETVAL->row = 0; 1865 RETVAL->row = 0;
1423 OUTPUT: 1866 OUTPUT:
1424 RETVAL 1867 RETVAL
1425 1868
1426void 1869void
1427DESTROY (CFPlus::Map self) 1870DESTROY (DC::Map self)
1428 CODE: 1871 CODE:
1429{ 1872{
1430 map_clear (self); 1873 map_clear (self);
1431 Safefree (self->face2tile); 1874 Safefree (self->face2tile);
1432 Safefree (self->tex); 1875 Safefree (self->tex);
1433 Safefree (self); 1876 Safefree (self);
1434} 1877}
1435 1878
1436void 1879void
1437resize (CFPlus::Map self, int map_width, int map_height) 1880resize (DC::Map self, int map_width, int map_height)
1438 CODE: 1881 CODE:
1439 self->w = map_width; 1882 self->w = map_width;
1440 self->h = map_height; 1883 self->h = map_height;
1441 1884
1442void 1885void
1443clear (CFPlus::Map self) 1886clear (DC::Map self)
1444 CODE: 1887 CODE:
1445 map_clear (self); 1888 map_clear (self);
1446 1889
1447void 1890void
1448set_tileid (CFPlus::Map self, int face, int tile) 1891set_tileid (DC::Map self, int face, int tile)
1449 CODE: 1892 CODE:
1450{ 1893{
1451 need_facenum (self, face); self->face2tile [face] = tile; 1894 need_facenum (self, face); self->face2tile [face] = tile;
1452 need_texid (self, tile); 1895 need_texid (self, tile);
1453} 1896}
1454 1897
1455void 1898void
1456set_smooth (CFPlus::Map self, int face, int smooth, int level) 1899set_smooth (DC::Map self, int face, int smooth, int level)
1457 CODE: 1900 CODE:
1458{ 1901{
1459 tileid texid; 1902 tileid texid;
1460 maptex *tex; 1903 maptex *tex;
1461 1904
1474 tex->smoothtile = self->face2tile [smooth]; 1917 tex->smoothtile = self->face2tile [smooth];
1475 tex->smoothlevel = level; 1918 tex->smoothlevel = level;
1476} 1919}
1477 1920
1478void 1921void
1479set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1922set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1480 CODE: 1923 CODE:
1481{ 1924{
1482 need_texid (self, texid); 1925 need_texid (self, texid);
1483 1926
1484 { 1927 {
1503 // use uglier nearest interpolation because linear suffers 1946 // use uglier nearest interpolation because linear suffers
1504 // from transparent color bleeding and ugly wrapping effects. 1947 // from transparent color bleeding and ugly wrapping effects.
1505 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1948 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1506} 1949}
1507 1950
1951void
1952expire_textures (DC::Map self, int texid, int count)
1953 PPCODE:
1954 for (; texid < self->texs && count; ++texid, --count)
1955 {
1956 maptex *tex = self->tex + texid;
1957
1958 if (tex->name)
1959 {
1960 if (tex->unused)
1961 {
1962 tex->name = 0;
1963 tex->unused = 0;
1964 XPUSHs (sv_2mortal (newSViv (texid)));
1965 }
1966 else
1967 tex->unused = 1;
1968 }
1969 }
1970
1508int 1971int
1509ox (CFPlus::Map self) 1972ox (DC::Map self)
1510 ALIAS: 1973 ALIAS:
1511 oy = 1 1974 oy = 1
1512 x = 2 1975 x = 2
1513 y = 3 1976 y = 3
1514 w = 4 1977 w = 4
1525 } 1988 }
1526 OUTPUT: 1989 OUTPUT:
1527 RETVAL 1990 RETVAL
1528 1991
1529void 1992void
1530scroll (CFPlus::Map self, int dx, int dy) 1993scroll (DC::Map self, int dx, int dy)
1531 CODE: 1994 CODE:
1532{ 1995{
1533 if (dx > 0) 1996 if (dx > 0)
1534 map_blank (self, self->x, self->y, dx, self->h); 1997 map_blank (self, self->x, self->y, dx, self->h);
1535 else if (dx < 0) 1998 else if (dx < 0)
1550 self->rows += MAP_EXTEND_Y; 2013 self->rows += MAP_EXTEND_Y;
1551 self->y += MAP_EXTEND_Y; 2014 self->y += MAP_EXTEND_Y;
1552 } 2015 }
1553} 2016}
1554 2017
1555void 2018SV *
1556map1a_update (CFPlus::Map self, SV *data_, int extmap) 2019map1a_update (DC::Map self, SV *data_, int extmap)
1557 CODE: 2020 CODE:
1558{ 2021{
1559 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2022 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1560 uint8_t *data_end = (uint8_t *)SvEND (data_); 2023 uint8_t *data_end = (uint8_t *)SvEND (data_);
1561 mapcell *cell; 2024 mapcell *cell;
1562 int x, y, flags; 2025 int x, y, z, flags;
2026 AV *missing = newAV ();
2027 RETVAL = newRV_noinc ((SV *)missing);
1563 2028
1564 while (data < data_end - 1) 2029 while (data < data_end - 1)
1565 { 2030 {
1566 flags = (data [0] << 8) + data [1]; data += 2; 2031 flags = (data [0] << 8) + data [1]; data += 2;
1567 2032
1587 uint8_t ext, cmd; 2052 uint8_t ext, cmd;
1588 2053
1589 do 2054 do
1590 { 2055 {
1591 ext = *data++; 2056 ext = *data++;
1592 cmd = ext & 0x3f; 2057 cmd = ext & 0x7f;
1593 2058
1594 if (cmd < 4) 2059 if (cmd < 4)
1595 cell->darkness = 255 - ext * 64 + 1; 2060 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1596 else if (cmd == 5) // health 2061 else if (cmd == 5) // health
1597 { 2062 {
1598 cell->stat_width = 1; 2063 cell->stat_width = 1;
1599 cell->stat_hp = *data++; 2064 cell->stat_hp = *data++;
1600 } 2065 }
1601 else if (cmd == 6) // monster width 2066 else if (cmd == 6) // monster width
1602 cell->stat_width = *data++ + 1; 2067 cell->stat_width = *data++ + 1;
1603 else if (cmd == 0x47) 2068 else if (cmd == 0x47)
1604 { 2069 {
1605 if (*data == 4) 2070 if (*data == 1) cell->player = data [1];
1606 ; // decode player count 2071 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2072 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2073 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1607 2074
1608 data += *data + 1; 2075 data += *data + 1;
1609 } 2076 }
1610 else if (cmd == 8) // cell flags 2077 else if (cmd == 8) // cell flags
1611 cell->flags = *data++; 2078 cell->flags = *data++;
1618 } 2085 }
1619 else 2086 else
1620 cell->darkness = *data++ + 1; 2087 cell->darkness = *data++ + 1;
1621 } 2088 }
1622 2089
2090 for (z = 0; z <= 2; ++z)
1623 if (flags & 4) 2091 if (flags & (4 >> z))
1624 { 2092 {
1625 faceid face = (data [0] << 8) + data [1]; data += 2; 2093 faceid face = (data [0] << 8) + data [1]; data += 2;
1626 need_facenum (self, face); 2094 need_facenum (self, face);
1627 cell->tile [0] = self->face2tile [face]; 2095 cell->tile [z] = self->face2tile [face];
2096
2097 if (cell->tile [z])
2098 {
2099 maptex *tex = self->tex + cell->tile [z];
2100 tex->unused = 0;
2101 if (!tex->name)
2102 av_push (missing, newSViv (cell->tile [z]));
2103
2104 if (tex->smoothtile)
2105 {
2106 maptex *smooth = self->tex + tex->smoothtile;
2107 smooth->unused = 0;
2108 if (!smooth->name)
2109 av_push (missing, newSViv (tex->smoothtile));
2110 }
2111 }
1628 } 2112 }
1629
1630 if (flags & 2)
1631 {
1632 faceid face = (data [0] << 8) + data [1]; data += 2;
1633 need_facenum (self, face);
1634 cell->tile [1] = self->face2tile [face];
1635 }
1636
1637 if (flags & 1)
1638 {
1639 faceid face = (data [0] << 8) + data [1]; data += 2;
1640 need_facenum (self, face);
1641 cell->tile [2] = self->face2tile [face];
1642 }
1643 } 2113 }
1644 else 2114 else
1645 cell->darkness = 0; 2115 CELL_CLEAR (cell);
1646 } 2116 }
1647} 2117}
2118 OUTPUT:
2119 RETVAL
1648 2120
1649SV * 2121SV *
1650mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2122mapmap (DC::Map self, int x0, int y0, int w, int h)
1651 CODE: 2123 CODE:
1652{ 2124{
1653 int x1, x; 2125 int x1, x;
1654 int y1, y; 2126 int y1, y;
1655 int z; 2127 int z;
1668 ? self->row + y 2140 ? self->row + y
1669 : 0; 2141 : 0;
1670 2142
1671 for (x = x0; x < x1; x++) 2143 for (x = x0; x < x1; x++)
1672 { 2144 {
1673 int r = 32, g = 32, b = 32, a = 192; 2145 unsigned int r = 32, g = 32, b = 32, a = 192;
1674 2146
1675 if (row && row->c0 <= x && x < row->c1) 2147 if (row && row->c0 <= x && x < row->c1)
1676 { 2148 {
1677 mapcell *cell = row->col + (x - row->c0); 2149 mapcell *cell = row->col + (x - row->c0);
1678 2150
1680 { 2152 {
1681 maptex tex = self->tex [cell->tile [z]]; 2153 maptex tex = self->tex [cell->tile [z]];
1682 int a0 = 255 - tex.a; 2154 int a0 = 255 - tex.a;
1683 int a1 = tex.a; 2155 int a1 = tex.a;
1684 2156
1685 r = (r * a0 + tex.r * a1) / 255; 2157 r = div255 (r * a0 + tex.r * a1);
1686 g = (g * a0 + tex.g * a1) / 255; 2158 g = div255 (g * a0 + tex.g * a1);
1687 b = (b * a0 + tex.b * a1) / 255; 2159 b = div255 (b * a0 + tex.b * a1);
1688 a = (a * a0 + tex.a * a1) / 255; 2160 a = div255 (a * a0 + tex.a * a1);
1689 } 2161 }
1690 } 2162 }
1691 2163
1692 *map++ = (r ) 2164 *map++ = (r )
1693 | (g << 8) 2165 | (g << 8)
1699 RETVAL = map_sv; 2171 RETVAL = map_sv;
1700} 2172}
1701 OUTPUT: 2173 OUTPUT:
1702 RETVAL 2174 RETVAL
1703 2175
1704SV * 2176void
1705draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2177draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1706 CODE: 2178 CODE:
1707{ 2179{
2180 int x, y, z;
2181
1708 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2182 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1709 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2183 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1710 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2184 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1711 smooth_key skey; 2185 smooth_key skey;
1712 int x, y, z; 2186 int pl_x, pl_y;
1713 int last_name; 2187 maptex pl_tex;
1714 AV *missing = newAV (); 2188 rc_t *rc = rc_alloc ();
1715 RETVAL = newRV_noinc ((SV *)missing); 2189 rc_t *rc_ov = rc_alloc ();
2190 rc_key_t key;
2191 rc_array_t *arr;
1716 2192
2193 pl_tex.name = 0;
2194
1717 // thats current max. sorry. 2195 // that's current max. sorry.
1718 if (sw > 255) sw = 255; 2196 if (sw > 255) sw = 255;
1719 if (sh > 255) sh = 255; 2197 if (sh > 255) sh = 255;
1720 2198
1721 // clear key, in case of extra padding 2199 // clear key, in case of extra padding
1722 memset (&skey, 0, sizeof (skey)); 2200 memset (&skey, 0, sizeof (skey));
1723 2201
1724 glColor4ub (255, 255, 255, 255); 2202 memset (&key, 0, sizeof (key));
1725 2203 key.r = 255;
1726 glEnable (GL_BLEND); 2204 key.g = 255;
1727 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2205 key.b = 255;
1728 glEnable (GL_TEXTURE_2D); 2206 key.a = 255;
1729 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2207 key.mode = GL_QUADS;
1730 2208 key.format = GL_T2F_V3F;
1731 glBegin (GL_QUADS);
1732
1733 last_name = -1;
1734 2209
1735 mx += self->x; 2210 mx += self->x;
1736 my += self->y; 2211 my += self->y;
1737 2212
1738 // first pass: determine smooth_max 2213 // first pass: determine smooth_max
1755 MAX (self->tex [cell->tile [1]].smoothlevel, 2230 MAX (self->tex [cell->tile [1]].smoothlevel,
1756 self->tex [cell->tile [2]].smoothlevel)); 2231 self->tex [cell->tile [2]].smoothlevel));
1757 } 2232 }
1758 } 2233 }
1759 2234
2235 glEnable (GL_BLEND);
2236 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2238
1760 for (z = 0; z <= 2; z++) 2239 for (z = 0; z <= 2; z++)
1761 { 2240 {
1762 memset (smooth_level, 0, sizeof (smooth_level)); 2241 memset (smooth_level, 0, sizeof (smooth_level));
2242 key.texname = -1;
1763 2243
1764 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
1765 if (0 <= y + my && y + my < self->rows) 2245 if (0 <= y + my && y + my < self->rows)
1766 { 2246 {
1767 maprow *row = self->row + (y + my); 2247 maprow *row = self->row + (y + my);
1775 if (tile) 2255 if (tile)
1776 { 2256 {
1777 maptex tex = self->tex [tile]; 2257 maptex tex = self->tex [tile];
1778 int px, py; 2258 int px, py;
1779 2259
1780 // suppressing texture state switches here
1781 // is only moderately effective, but worth the extra effort
1782 if (last_name != tex.name) 2260 if (key.texname != tex.name)
1783 { 2261 {
2262 self->tex [tile].unused = 0;
2263
1784 if (!tex.name) 2264 if (!tex.name)
1785 {
1786 av_push (missing, newSViv (tile));
1787 tex = self->tex [2]; /* missing, replace by noface */ 2265 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1788 }
1789 2266
1790 glEnd (); 2267 key.texname = tex.name;
1791 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2268 arr = rc_array (rc, &key);
1792 glBegin (GL_QUADS);
1793 } 2269 }
1794 2270
1795 px = (x + 1) * T - tex.w; 2271 px = (x + 1) * Th - tex.w;
1796 py = (y + 1) * T - tex.h; 2272 py = (y + 1) * Tw - tex.h;
1797 2273
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2274 if (expect_false (cell->player == player) && expect_false (z == 2))
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1802
1803 if (cell->flags && z == 2)
1804 { 2275 {
1805 if (cell->flags & 1) 2276 pl_x = px;
2277 pl_y = py;
2278 pl_tex = tex;
1806 { 2279 continue;
1807 maptex tex = self->tex [1];
1808 int px = x * T + T * 2 / 32;
1809 int py = y * T - T * 6 / 32;
1810
1811 glEnd ();
1812 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1813 glBegin (GL_QUADS);
1814
1815 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1816 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1817 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1818 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1819 }
1820 } 2280 }
2281
2282 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2283 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2284 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2285 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1821 2286
1822 // update smooth hash 2287 // update smooth hash
1823 if (tex.smoothtile) 2288 if (tex.smoothtile)
1824 { 2289 {
1825 skey.tile = tex.smoothtile; 2290 skey.tile = tex.smoothtile;
1856 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2321 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1857 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2322 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1858 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2323 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1859 } 2324 }
1860 } 2325 }
2326
2327 if (expect_false (z == 2) && expect_false (cell->flags))
2328 {
2329 // overlays such as the speech bubble, probably more to come
2330 if (cell->flags & 1)
2331 {
2332 rc_key_t key_ov = key;
2333 maptex tex = self->tex [TEXID_SPEECH];
2334 rc_array_t *arr;
2335 int px = x * Tw + Tw * 2 / 32;
2336 int py = y * Th - Th * 6 / 32;
2337
2338 key_ov.texname = tex.name;
2339 arr = rc_array (rc_ov, &key_ov);
2340
2341 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2342 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2343 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2344 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2345 }
2346 }
1861 } 2347 }
1862 } 2348 }
2349
2350 rc_draw (rc);
2351 rc_clear (rc);
1863 2352
1864 // go through all smoothlevels, lowest to highest, then draw. 2353 // go through all smoothlevels, lowest to highest, then draw.
1865 // this is basically counting sort 2354 // this is basically counting sort
1866 { 2355 {
1867 int w, b; 2356 int w, b;
1868 2357
2358 glEnable (GL_TEXTURE_2D);
2359 glBegin (GL_QUADS);
1869 for (w = 0; w < 256 / 32; ++w) 2360 for (w = 0; w < 256 / 32; ++w)
1870 { 2361 {
1871 uint32_t smask = smooth_level [w]; 2362 uint32_t smask = smooth_level [w];
1872 if (smask) 2363 if (smask)
1873 for (b = 0; b < 32; ++b) 2364 for (b = 0; b < 32; ++b)
1885 if (!(bits & 0x1000) 2376 if (!(bits & 0x1000)
1886 && skey->level == level 2377 && skey->level == level
1887 && level > smooth_max [skey->x][skey->y]) 2378 && level > smooth_max [skey->x][skey->y])
1888 { 2379 {
1889 maptex tex = self->tex [skey->tile]; 2380 maptex tex = self->tex [skey->tile];
1890 int px = (((int)skey->x) - 1) * T; 2381 int px = (((int)skey->x) - 1) * Tw;
1891 int py = (((int)skey->y) - 1) * T; 2382 int py = (((int)skey->y) - 1) * Th;
1892 int border = bits & 15; 2383 int border = bits & 15;
1893 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2384 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1894 float dx = tex.s * .0625f; // 16 images/row 2385 float dx = tex.s * .0625f; // 16 images/row
1895 float dy = tex.t * .5f ; // 2 images/column 2386 float dy = tex.t * .5f ; // 2 images/column
1896 2387
1897 // this time naively avoiding texture state changes
1898 // save gobs of state changes.
1899 if (last_name != tex.name) 2388 if (tex.name)
1900 { 2389 {
2390 // this time avoiding texture state changes
2391 // save gobs of state changes.
1901 if (!tex.name) 2392 if (key.texname != tex.name)
1902 { 2393 {
1903 av_push (missing, newSViv (skey->tile)); 2394 self->tex [skey->tile].unused = 0;
1904 continue; // smoothing not yet available 2395
2396 glEnd ();
2397 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2398 glBegin (GL_QUADS);
1905 } 2399 }
1906 2400
1907 glEnd ();
1908 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1909 glBegin (GL_QUADS);
1910 }
1911
1912 if (border) 2401 if (border)
1913 { 2402 {
1914 float ox = border * dx; 2403 float ox = border * dx;
1915 2404
1916 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2405 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1917 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2406 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1918 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2407 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1919 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2408 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1920 } 2409 }
1921 2410
1922 if (corner) 2411 if (corner)
1923 { 2412 {
1924 float ox = corner * dx; 2413 float ox = corner * dx;
1925 2414
1926 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2415 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1927 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2416 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1928 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1929 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2418 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2419 }
1930 } 2420 }
1931 } 2421 }
1932 } 2422 }
1933 } 2423 }
1934 } 2424 }
2425
2426 glEnd ();
2427 glDisable (GL_TEXTURE_2D);
2428 key.texname = -1;
1935 } 2429 }
1936 2430
1937 hv_clear (smooth); 2431 hv_clear (smooth);
1938 } 2432 }
1939 2433
1940 glEnd (); 2434 if (pl_tex.name)
2435 {
2436 maptex tex = pl_tex;
2437 int px = pl_x + sdx;
2438 int py = pl_y + sdy;
1941 2439
1942 glDisable (GL_TEXTURE_2D); 2440 key.texname = tex.name;
2441 arr = rc_array (rc, &key);
2442
2443 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2444 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2445 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2446 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2447
2448 rc_draw (rc);
2449 }
2450
2451 rc_draw (rc_ov);
2452 rc_clear (rc_ov);
2453
1943 glDisable (GL_BLEND); 2454 glDisable (GL_BLEND);
2455 rc_free (rc);
2456 rc_free (rc_ov);
1944 2457
1945 // top layer: overlays such as the health bar 2458 // top layer: overlays such as the health bar
1946 for (y = 0; y < sh; y++) 2459 for (y = 0; y < sh; y++)
1947 if (0 <= y + my && y + my < self->rows) 2460 if (0 <= y + my && y + my < self->rows)
1948 { 2461 {
1951 for (x = 0; x < sw; x++) 2464 for (x = 0; x < sw; x++)
1952 if (row->c0 <= x + mx && x + mx < row->c1) 2465 if (row->c0 <= x + mx && x + mx < row->c1)
1953 { 2466 {
1954 mapcell *cell = row->col + (x + mx - row->c0); 2467 mapcell *cell = row->col + (x + mx - row->c0);
1955 2468
1956 int px = x * T; 2469 int px = x * Tw;
1957 int py = y * T; 2470 int py = y * Th;
2471
2472 if (expect_false (cell->player == player))
2473 {
2474 px += sdx;
2475 py += sdy;
2476 }
1958 2477
1959 if (cell->stat_hp) 2478 if (cell->stat_hp)
1960 { 2479 {
1961 int width = cell->stat_width * T; 2480 int width = cell->stat_width * Tw;
1962 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2481 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1963 2482
1964 glColor3ub (0, 0, 0); 2483 glColor3ub (0, 0, 0);
1965 glRectf (px + 1, py - thick - 2, 2484 glRectf (px + 1, py - thick - 2,
1966 px + width - 1, py); 2485 px + width - 1, py);
1967 2486
1971 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1); 2490 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1972 } 2491 }
1973 } 2492 }
1974 } 2493 }
1975} 2494}
1976 OUTPUT:
1977 RETVAL
1978 2495
1979void 2496void
1980draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2497draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1981 CODE: 2498 CODE:
1982{ 2499{
1983 static float color[16][3] = { 2500 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2501 { 0.00f, 0.00f, 0.00f },
1985 { 1.00F, 1.00F, 1.00F }, 2502 { 1.00f, 1.00f, 1.00f },
1986 { 0.00F, 0.00F, 0.55F }, 2503 { 0.00f, 0.00f, 0.55f },
1987 { 1.00F, 0.00F, 0.00F }, 2504 { 1.00f, 0.00f, 0.00f },
1988 2505
1989 { 1.00F, 0.54F, 0.00F }, 2506 { 1.00f, 0.54f, 0.00f },
1990 { 0.11F, 0.56F, 1.00F }, 2507 { 0.11f, 0.56f, 1.00f },
1991 { 0.93F, 0.46F, 0.00F }, 2508 { 0.93f, 0.46f, 0.00f },
1992 { 0.18F, 0.54F, 0.34F }, 2509 { 0.18f, 0.54f, 0.34f },
1993 2510
1994 { 0.56F, 0.73F, 0.56F }, 2511 { 0.56f, 0.73f, 0.56f },
1995 { 0.80F, 0.80F, 0.80F }, 2512 { 0.80f, 0.80f, 0.80f },
1996 { 0.55F, 0.41F, 0.13F }, 2513 { 0.55f, 0.41f, 0.13f },
1997 { 0.99F, 0.77F, 0.26F }, 2514 { 0.99f, 0.77f, 0.26f },
1998 2515
1999 { 0.74F, 0.65F, 0.41F }, 2516 { 0.74f, 0.65f, 0.41f },
2000 2517
2001 { 0.00F, 1.00F, 1.00F }, 2518 { 0.00f, 1.00f, 1.00f },
2002 { 1.00F, 0.00F, 1.00F }, 2519 { 1.00f, 0.00f, 1.00f },
2003 { 1.00F, 1.00F, 0.00F }, 2520 { 1.00f, 1.00f, 0.00f },
2004 }; 2521 };
2005 2522
2006 int x, y; 2523 int x, y;
2007 2524
2008 glEnable (GL_TEXTURE_2D); 2525 glEnable (GL_TEXTURE_2D);
2526 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2527 * but the nvidia driver (185.18.14) mishandles alpha textures
2528 * and takes the colour from god knows where instead of using
2529 * Cp. MODULATE results in the same colour, but slightly different
2530 * alpha, but atcually gives us the correct colour with nvidia.
2531 */
2009 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2532 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2010 glEnable (GL_BLEND); 2533 glEnable (GL_BLEND);
2011 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2534 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2012 glBegin (GL_QUADS); 2535 glBegin (GL_QUADS);
2013 2536
2014 for (y = 0; y < h; y++) 2537 for (y = 0; y < h; y++)
2018 2541
2019 if (m) 2542 if (m)
2020 { 2543 {
2021 float *c = color [m & 15]; 2544 float *c = color [m & 15];
2022 2545
2023 float tx1 = m & 0x40 ? 0.5 : 0.; 2546 float tx1 = m & 0x40 ? 0.5f : 0.f;
2024 float tx2 = tx1 + 0.5; 2547 float tx2 = tx1 + 0.5f;
2025 2548
2026 glColor4f (c[0], c[1], c[2], 0.75); 2549 glColor4f (c[0], c[1], c[2], 1);
2027 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2550 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2028 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2551 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2029 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2552 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2030 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2553 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2031 } 2554 }
2035 glDisable (GL_BLEND); 2558 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2559 glDisable (GL_TEXTURE_2D);
2037} 2560}
2038 2561
2039void 2562void
2040fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2563fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2041 PPCODE: 2564 PPCODE:
2042{ 2565{
2043 int x, y; 2566 int x, y;
2044 int sw1 = sw + 2; 2567 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2568 int sh1 = sh + 2;
2046 int sh3 = sh * 3; 2569 int sh3 = sh * 3;
2047 int sw34 = (sw * 3 + 3) & ~3; 2570 int sw3 = sw * 3;
2571 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2572 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2048 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2573 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2049 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2574 memset (darkness1, 0, sw1*sh1);
2050 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2051 2575
2052 SvPOK_only (darkness3_sv); 2576 SvPOK_only (darkness3_sv);
2053 SvCUR_set (darkness3_sv, sw34 * sh3); 2577 SvCUR_set (darkness3_sv, sw3 * sh3);
2054 2578
2055 mx += self->x - 1; 2579 mx += self->x - 1;
2056 my += self->y - 1; 2580 my += self->y - 1;
2057
2058 memset (darkness1, 255, sw1 * sh1);
2059 2581
2060 for (y = 0; y < sh1; y++) 2582 for (y = 0; y < sh1; y++)
2061 if (0 <= y + my && y + my < self->rows) 2583 if (0 <= y + my && y + my < self->rows)
2062 { 2584 {
2063 maprow *row = self->row + (y + my); 2585 maprow *row = self->row + (y + my);
2066 if (row->c0 <= x + mx && x + mx < row->c1) 2588 if (row->c0 <= x + mx && x + mx < row->c1)
2067 { 2589 {
2068 mapcell *cell = row->col + (x + mx - row->c0); 2590 mapcell *cell = row->col + (x + mx - row->c0);
2069 2591
2070 darkness1 [y * sw1 + x] = cell->darkness 2592 darkness1 [y * sw1 + x] = cell->darkness
2071 ? 255 - (cell->darkness - 1) 2593 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2072 : 255 - FOW_DARKNESS; 2594 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2073 } 2595 }
2074 } 2596 }
2075 2597
2076 for (y = 0; y < sh; ++y) 2598 for (y = 0; y < sh; ++y)
2077 for (x = 0; x < sw; ++x) 2599 for (x = 0; x < sw; ++x)
2096 2618
2097 uint8_t r13 = (d13 + d23 + d12) / 3; 2619 uint8_t r13 = (d13 + d23 + d12) / 3;
2098 uint8_t r23 = d23; 2620 uint8_t r23 = d23;
2099 uint8_t r33 = (d23 + d33 + d32) / 3; 2621 uint8_t r33 = (d23 + d33 + d32) / 3;
2100 2622
2101 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2623 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2102 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2624 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2103 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2625 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2104 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2626 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2105 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2627 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2106 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2628 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2107 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2629 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2108 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2630 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2109 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2631 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2110 } 2632 }
2111 2633
2112 free (darkness1); 2634 free (darkness1);
2113 2635
2114 EXTEND (SP, 3); 2636 EXTEND (SP, 3);
2115 PUSHs (sv_2mortal (newSViv (sw34))); 2637 PUSHs (sv_2mortal (newSViv (sw3)));
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2638 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2639 PUSHs (darkness3_sv);
2118} 2640}
2119 2641
2120SV * 2642SV *
2121get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2643get_rect (DC::Map self, int x0, int y0, int w, int h)
2122 CODE: 2644 CODE:
2123{ 2645{
2124 int x, y, x1, y1; 2646 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2647 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2648 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2183 else 2705 else
2184 *data++ = 0; 2706 *data++ = 0;
2185 } 2707 }
2186 } 2708 }
2187 2709
2710 /* if size is w*h + 5 then no data has been found */
2711 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2712 {
2188 SvPOK_only (data_sv); 2713 SvPOK_only (data_sv);
2189 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2714 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2715 }
2716
2190 RETVAL = data_sv; 2717 RETVAL = data_sv;
2191} 2718}
2192 OUTPUT: 2719 OUTPUT:
2193 RETVAL 2720 RETVAL
2194 2721
2195void 2722void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2723set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197 PPCODE: 2724 PPCODE:
2198{ 2725{
2199 int x, y, z; 2726 int x, y, z;
2200 int w, h; 2727 int w, h;
2201 int x1, y1; 2728 int x1, y1;
2729 STRLEN len;
2730 uint8_t *data, *end;
2731
2732 len = SvLEN (data_sv);
2733 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2734 data = SvPVbyte_nolen (data_sv);
2735 end = data + len + 8;
2736
2737 if (len < 5)
2738 XSRETURN_EMPTY;
2202 2739
2203 if (*data++ != 0) 2740 if (*data++ != 0)
2204 return; /* version mismatch */ 2741 XSRETURN_EMPTY; /* version mismatch */
2205 2742
2206 w = *data++ << 8; w |= *data++; 2743 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2744 h = *data++ << 8; h |= *data++;
2208 2745
2209 // we need to do this 'cause we don't keep an absolute coord system for rows 2746 // we need to do this 'cause we don't keep an absolute coord system for rows
2221 { 2758 {
2222 maprow *row = map_get_row (self, y); 2759 maprow *row = map_get_row (self, y);
2223 2760
2224 for (x = x0; x < x1; x++) 2761 for (x = x0; x < x1; x++)
2225 { 2762 {
2763 uint8_t flags;
2764
2765 if (data + 7 >= end)
2766 XSRETURN_EMPTY;
2767
2226 uint8_t flags = *data++; 2768 flags = *data++;
2227 2769
2228 if (flags) 2770 if (flags)
2229 { 2771 {
2230 mapcell *cell = row_get_cell (row, x); 2772 mapcell *cell = row_get_cell (row, x);
2231 tileid tile[3] = { 0, 0, 0 }; 2773 tileid tile[3] = { 0, 0, 0 };
2234 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2776 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2235 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2777 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2236 2778
2237 if (cell->darkness == 0) 2779 if (cell->darkness == 0)
2238 { 2780 {
2239 cell->darkness = 0; 2781 /*cell->darkness = 0;*/
2782 EXTEND (SP, 3);
2240 2783
2241 for (z = 0; z <= 2; z++) 2784 for (z = 0; z <= 2; z++)
2242 { 2785 {
2243 tileid t = tile [z]; 2786 tileid t = tile [z];
2244 2787
2245 if (t >= self->texs || (t && !self->tex [t].name)) 2788 if (t >= self->texs || (t && !self->tex [t].name))
2246 { 2789 {
2247 XPUSHs (sv_2mortal (newSViv (t))); 2790 PUSHs (sv_2mortal (newSViv (t)));
2248 need_texid (self, t); 2791 need_texid (self, t);
2249 } 2792 }
2250 2793
2251 cell->tile [z] = t; 2794 cell->tile [z] = t;
2252 } 2795 }
2254 } 2797 }
2255 } 2798 }
2256 } 2799 }
2257} 2800}
2258 2801
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2802MODULE = Deliantra::Client PACKAGE = DC::RW
2260 2803
2261CFPlus::RW 2804DC::RW
2262new (SV *class, SV *data_sv) 2805new (SV *class, SV *data_sv)
2263 CODE: 2806 CODE:
2264{ 2807{
2265 STRLEN datalen; 2808 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2809 char *data = SvPVbyte (data_sv, datalen);
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2811 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2812}
2270 OUTPUT: 2813 OUTPUT:
2271 RETVAL 2814 RETVAL
2272 2815
2273CFPlus::RW 2816DC::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2817new_from_file (SV *class, const char *path, const char *mode = "rb")
2275 CODE: 2818 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2819 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2820 OUTPUT:
2278 RETVAL 2821 RETVAL
2279 2822
2280# fails on win32: 2823# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2824# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2825#void
2283#close (CFPlus::RW self) 2826#close (DC::RW self)
2284# CODE: 2827# CODE:
2285# (self->(close)) (self); 2828# (self->(close)) (self);
2286 2829
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2830MODULE = Deliantra::Client PACKAGE = DC::Channel
2288 2831
2289PROTOTYPES: DISABLE 2832PROTOTYPES: DISABLE
2290 2833
2291CFPlus::Channel 2834DC::Channel
2292find () 2835find ()
2293 CODE: 2836 CODE:
2294{ 2837{
2295 RETVAL = Mix_GroupAvailable (-1); 2838 RETVAL = Mix_GroupAvailable (-1);
2296 2839
2297 if (RETVAL < 0) 2840 if (RETVAL < 0)
2298 { 2841 {
2299 RETVAL = Mix_GroupOldest (-1); 2842 RETVAL = Mix_GroupOldest (-1);
2300 2843
2301 if (RETVAL < 0) 2844 if (RETVAL < 0)
2845 {
2846 // happens sometimes, maybe it just stopped playing(?)
2847 RETVAL = Mix_GroupAvailable (-1);
2848
2849 if (RETVAL < 0)
2302 XSRETURN_UNDEF; 2850 XSRETURN_UNDEF;
2303 2851 }
2852 else
2304 Mix_HaltChannel (RETVAL); 2853 Mix_HaltChannel (RETVAL);
2305 } 2854 }
2306 2855
2307 Mix_UnregisterAllEffects (RETVAL); 2856 Mix_UnregisterAllEffects (RETVAL);
2308 Mix_Volume (RETVAL, 128); 2857 Mix_Volume (RETVAL, 128);
2309} 2858}
2310 OUTPUT: 2859 OUTPUT:
2311 RETVAL 2860 RETVAL
2312 2861
2313void 2862void
2314halt (CFPlus::Channel self) 2863halt (DC::Channel self)
2315 CODE: 2864 CODE:
2316 Mix_HaltChannel (self); 2865 Mix_HaltChannel (self);
2317 2866
2318void 2867void
2319expire (CFPlus::Channel self, int ticks = -1) 2868expire (DC::Channel self, int ticks = -1)
2320 CODE: 2869 CODE:
2321 Mix_ExpireChannel (self, ticks); 2870 Mix_ExpireChannel (self, ticks);
2322 2871
2323void 2872void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2873fade_out (DC::Channel self, int ticks = -1)
2325 CODE: 2874 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2875 Mix_FadeOutChannel (self, ticks);
2327 2876
2328int 2877int
2329volume (CFPlus::Channel self, int volume) 2878volume (DC::Channel self, int volume)
2330 CODE: 2879 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2880 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2881 OUTPUT:
2333 RETVAL 2882 RETVAL
2334 2883
2335void 2884void
2336unregister_all_effects (CFPlus::Channel self) 2885unregister_all_effects (DC::Channel self)
2337 CODE: 2886 CODE:
2338 Mix_UnregisterAllEffects (self); 2887 Mix_UnregisterAllEffects (self);
2339 2888
2340void 2889void
2341set_panning (CFPlus::Channel self, int left, int right) 2890set_panning (DC::Channel self, int left, int right)
2342 CODE: 2891 CODE:
2343 left = CLAMP (left , 0, 255); 2892 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2893 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2894 Mix_SetPanning (self, left, right);
2346 2895
2347void 2896void
2348set_distance (CFPlus::Channel self, int distance) 2897set_distance (DC::Channel self, int distance)
2349 CODE: 2898 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2899 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2900
2352void 2901void
2353set_position (CFPlus::Channel self, int angle, int distance) 2902set_position (DC::Channel self, int angle, int distance)
2354 CODE: 2903 CODE:
2355 2904
2356void 2905void
2357set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2906set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358 CODE: 2907 CODE:
2359{ 2908{
2360 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2909 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2910 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2362 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2911 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363} 2912}
2364 2913
2365void 2914void
2366set_reverse_stereo (CFPlus::Channel self, int flip) 2915set_reverse_stereo (DC::Channel self, int flip)
2367 CODE: 2916 CODE:
2368 Mix_SetReverseStereo (self, flip); 2917 Mix_SetReverseStereo (self, flip);
2369 2918
2370MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2919MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371 2920
2372PROTOTYPES: DISABLE 2921PROTOTYPES: DISABLE
2373 2922
2923void
2924decoders ()
2925 PPCODE:
2926#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2927 int i, num = Mix_GetNumChunkDecoders ();
2928 EXTEND (SP, num);
2929 for (i = 0; i < num; ++i)
2930 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2931#else
2932 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2933#endif
2934
2374CFPlus::MixChunk 2935DC::MixChunk
2375new (SV *class, CFPlus::RW rwops) 2936new (SV *class, DC::RW rwops)
2376 CODE: 2937 CODE:
2377 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2938 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378 OUTPUT: 2939 OUTPUT:
2379 RETVAL 2940 RETVAL
2380 2941
2381void 2942void
2382DESTROY (CFPlus::MixChunk self) 2943DESTROY (DC::MixChunk self)
2383 CODE: 2944 CODE:
2384 Mix_FreeChunk (self); 2945 Mix_FreeChunk (self);
2385 2946
2386int 2947int
2387volume (CFPlus::MixChunk self, int volume = -1) 2948volume (DC::MixChunk self, int volume = -1)
2388 CODE: 2949 CODE:
2389 if (items > 1) 2950 if (items > 1)
2390 volume = CLAMP (volume, 0, 128); 2951 volume = CLAMP (volume, 0, 128);
2391 RETVAL = Mix_VolumeChunk (self, volume); 2952 RETVAL = Mix_VolumeChunk (self, volume);
2392 OUTPUT: 2953 OUTPUT:
2393 RETVAL 2954 RETVAL
2394 2955
2395CFPlus::Channel 2956DC::Channel
2396play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2957play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2397 CODE: 2958 CODE:
2398{ 2959{
2399 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2960 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400 2961
2401 if (RETVAL < 0) 2962 if (RETVAL < 0)
2408 } 2969 }
2409} 2970}
2410 OUTPUT: 2971 OUTPUT:
2411 RETVAL 2972 RETVAL
2412 2973
2413MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2974MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2975
2976void
2977decoders ()
2978 PPCODE:
2979#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2980 int i, num = Mix_GetNumMusicDecoders ();
2981 EXTEND (SP, num);
2982 for (i = 0; i < num; ++i)
2983 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2984#else
2985 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2986#endif
2414 2987
2415int 2988int
2416volume (int volume = -1) 2989volume (int volume = -1)
2417 PROTOTYPE: ;$ 2990 PROTOTYPE: ;$
2418 CODE: 2991 CODE:
2430void 3003void
2431halt () 3004halt ()
2432 CODE: 3005 CODE:
2433 Mix_HaltMusic (); 3006 Mix_HaltMusic ();
2434 3007
3008int
3009playing ()
3010 CODE:
3011 RETVAL = Mix_PlayingMusic ();
3012 OUTPUT:
3013 RETVAL
3014
2435CFPlus::MixMusic 3015DC::MixMusic
2436new (SV *class, CFPlus::RW rwops) 3016new (SV *class, DC::RW rwops)
2437 CODE: 3017 CODE:
2438 RETVAL = Mix_LoadMUS_RW (rwops); 3018 RETVAL = Mix_LoadMUS_RW (rwops);
2439 OUTPUT: 3019 OUTPUT:
2440 RETVAL 3020 RETVAL
2441 3021
2442void 3022void
2443DESTROY (CFPlus::MixMusic self) 3023DESTROY (DC::MixMusic self)
2444 CODE: 3024 CODE:
2445 Mix_FreeMusic (self); 3025 Mix_FreeMusic (self);
2446 3026
2447int 3027int
2448play (CFPlus::MixMusic self, int loops = -1) 3028play (DC::MixMusic self, int loops = -1)
2449 CODE: 3029 CODE:
2450 RETVAL = Mix_PlayMusic (self, loops); 3030 RETVAL = Mix_PlayMusic (self, loops);
2451 OUTPUT: 3031 OUTPUT:
2452 RETVAL 3032 RETVAL
2453 3033
2454void 3034void
2455fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3035fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456 CODE: 3036 CODE:
2457 Mix_FadeInMusicPos (self, loops, ms, position); 3037 Mix_FadeInMusicPos (self, loops, ms, position);
2458 3038
2459MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3039MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460 3040
2461PROTOTYPES: ENABLE 3041PROTOTYPES: ENABLE
2462 3042
2463BOOT: 3043BOOT:
2464{ 3044{
2465 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3045 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466 static const struct { 3046 static const struct {
2467 const char *name; 3047 const char *name;
2468 IV iv; 3048 IV iv;
2469 } *civ, const_iv[] = { 3049 } *civ, const_iv[] = {
2470# define const_iv(name) { # name, (IV)name } 3050# define const_iv(name) { # name, (IV)name }
2471 const_iv (GL_VENDOR), 3051 const_iv (GL_VENDOR),
2472 const_iv (GL_VERSION), 3052 const_iv (GL_VERSION),
2473 const_iv (GL_EXTENSIONS), 3053 const_iv (GL_EXTENSIONS),
3054 const_iv (GL_MAX_TEXTURE_UNITS),
2474 const_iv (GL_COLOR_MATERIAL), 3055 const_iv (GL_COLOR_MATERIAL),
2475 const_iv (GL_SMOOTH), 3056 const_iv (GL_SMOOTH),
2476 const_iv (GL_FLAT), 3057 const_iv (GL_FLAT),
2477 const_iv (GL_DITHER), 3058 const_iv (GL_DITHER),
2478 const_iv (GL_BLEND), 3059 const_iv (GL_BLEND),
2490 const_iv (GL_ZERO), 3071 const_iv (GL_ZERO),
2491 const_iv (GL_SRC_ALPHA), 3072 const_iv (GL_SRC_ALPHA),
2492 const_iv (GL_DST_ALPHA), 3073 const_iv (GL_DST_ALPHA),
2493 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3074 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2494 const_iv (GL_ONE_MINUS_DST_ALPHA), 3075 const_iv (GL_ONE_MINUS_DST_ALPHA),
3076 const_iv (GL_SRC_COLOR),
3077 const_iv (GL_DST_COLOR),
3078 const_iv (GL_ONE_MINUS_SRC_COLOR),
3079 const_iv (GL_ONE_MINUS_DST_COLOR),
2495 const_iv (GL_SRC_ALPHA_SATURATE), 3080 const_iv (GL_SRC_ALPHA_SATURATE),
2496 const_iv (GL_RGB), 3081 const_iv (GL_RGB),
2497 const_iv (GL_RGBA), 3082 const_iv (GL_RGBA),
2498 const_iv (GL_RGBA4), 3083 const_iv (GL_RGBA4),
2499 const_iv (GL_RGBA8), 3084 const_iv (GL_RGBA8),
2505 const_iv (GL_INTENSITY), 3090 const_iv (GL_INTENSITY),
2506 const_iv (GL_LUMINANCE), 3091 const_iv (GL_LUMINANCE),
2507 const_iv (GL_LUMINANCE_ALPHA), 3092 const_iv (GL_LUMINANCE_ALPHA),
2508 const_iv (GL_FLOAT), 3093 const_iv (GL_FLOAT),
2509 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3094 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3095 const_iv (GL_COMPRESSED_ALPHA_ARB),
3096 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3097 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3098 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3099 const_iv (GL_COMPRESSED_RGB_ARB),
3100 const_iv (GL_COMPRESSED_RGBA_ARB),
2510 const_iv (GL_COMPILE), 3101 const_iv (GL_COMPILE),
2511 const_iv (GL_PROXY_TEXTURE_1D), 3102 const_iv (GL_PROXY_TEXTURE_1D),
2512 const_iv (GL_PROXY_TEXTURE_2D), 3103 const_iv (GL_PROXY_TEXTURE_2D),
2513 const_iv (GL_TEXTURE_1D), 3104 const_iv (GL_TEXTURE_1D),
2514 const_iv (GL_TEXTURE_2D), 3105 const_iv (GL_TEXTURE_2D),
2553 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3144 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554 const_iv (GL_POINT_SMOOTH_HINT), 3145 const_iv (GL_POINT_SMOOTH_HINT),
2555 const_iv (GL_LINE_SMOOTH_HINT), 3146 const_iv (GL_LINE_SMOOTH_HINT),
2556 const_iv (GL_POLYGON_SMOOTH_HINT), 3147 const_iv (GL_POLYGON_SMOOTH_HINT),
2557 const_iv (GL_GENERATE_MIPMAP_HINT), 3148 const_iv (GL_GENERATE_MIPMAP_HINT),
3149 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558 const_iv (GL_FASTEST), 3150 const_iv (GL_FASTEST),
2559 const_iv (GL_DONT_CARE), 3151 const_iv (GL_DONT_CARE),
2560 const_iv (GL_NICEST), 3152 const_iv (GL_NICEST),
2561 const_iv (GL_V2F), 3153 const_iv (GL_V2F),
2562 const_iv (GL_V3F), 3154 const_iv (GL_V3F),
2563 const_iv (GL_T2F_V3F), 3155 const_iv (GL_T2F_V3F),
2564 const_iv (GL_T2F_N3F_V3F), 3156 const_iv (GL_T2F_N3F_V3F),
3157 const_iv (GL_FUNC_ADD),
3158 const_iv (GL_FUNC_SUBTRACT),
3159 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2565# undef const_iv 3160# undef const_iv
2566 }; 3161 };
2567 3162
2568 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3163 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2569 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3164 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2570 3165
2571 texture_av = newAV (); 3166 texture_av = newAV ();
2572 AvREAL_off (texture_av); 3167 AvREAL_off (texture_av);
2573} 3168}
3169
3170void
3171disable_GL_EXT_blend_func_separate ()
3172 CODE:
3173 gl.BlendFuncSeparate = 0;
3174 gl.BlendFuncSeparateEXT = 0;
3175
3176void
3177apple_nvidia_bug (int enable)
2574 3178
2575char * 3179char *
2576gl_vendor () 3180gl_vendor ()
2577 CODE: 3181 CODE:
2578 RETVAL = (char *)glGetString (GL_VENDOR); 3182 RETVAL = (char *)glGetString (GL_VENDOR);
2609 3213
2610int glGetError () 3214int glGetError ()
2611 3215
2612void glFinish () 3216void glFinish ()
2613 3217
3218void glFlush ()
3219
2614void glClear (int mask) 3220void glClear (int mask)
2615 3221
2616void glClearColor (float r, float g, float b, float a = 1.0) 3222void glClearColor (float r, float g, float b, float a = 1.0)
2617 PROTOTYPE: @ 3223 PROTOTYPE: @
2618 3224
2627void glBlendFunc (int sfactor, int dfactor) 3233void glBlendFunc (int sfactor, int dfactor)
2628 3234
2629void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3235void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2630 CODE: 3236 CODE:
2631 gl_BlendFuncSeparate (sa, da, saa, daa); 3237 gl_BlendFuncSeparate (sa, da, saa, daa);
3238
3239# void glBlendEquation (int se)
2632 3240
2633void glDepthMask (int flag) 3241void glDepthMask (int flag)
2634 3242
2635void glLogicOp (int opcode) 3243void glLogicOp (int opcode)
2636 3244
2671void glRotate (float angle, float x, float y, float z) 3279void glRotate (float angle, float x, float y, float z)
2672 CODE: 3280 CODE:
2673 glRotatef (angle, x, y, z); 3281 glRotatef (angle, x, y, z);
2674 3282
2675void glColor (float r, float g, float b, float a = 1.0) 3283void glColor (float r, float g, float b, float a = 1.0)
3284 PROTOTYPE: @
2676 ALIAS: 3285 ALIAS:
2677 glColor_premultiply = 1 3286 glColor_premultiply = 1
2678 CODE: 3287 CODE:
2679 if (ix) 3288 if (ix)
2680 { 3289 {
2700 3309
2701void glRect (float x1, float y1, float x2, float y2) 3310void glRect (float x1, float y1, float x2, float y2)
2702 CODE: 3311 CODE:
2703 glRectf (x1, y1, x2, y2); 3312 glRectf (x1, y1, x2, y2);
2704 3313
3314void glRect_lineloop (float x1, float y1, float x2, float y2)
3315 CODE:
3316 glBegin (GL_LINE_LOOP);
3317 glVertex2f (x1, y1);
3318 glVertex2f (x2, y1);
3319 glVertex2f (x2, y2);
3320 glVertex2f (x1, y2);
3321 glEnd ();
3322
2705PROTOTYPES: ENABLE 3323PROTOTYPES: ENABLE
2706 3324
2707void glBegin (int mode) 3325void glBegin (int mode)
2708 3326
2709void glEnd () 3327void glEnd ()
2741void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3359void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2742 CODE: 3360 CODE:
2743 if (gl.SeparableFilter2D) 3361 if (gl.SeparableFilter2D)
2744 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3362 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745 3363
2746void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3364void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2747 3365
2748void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3366void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2749 3367
2750void glDrawPixels (int width, int height, int format, int type, char *pixels) 3368void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751 3369
2777 3395
2778void glEndList () 3396void glEndList ()
2779 3397
2780void glCallList (int list) 3398void glCallList (int list)
2781 3399
2782MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3400void c_init ()
3401 CODE:
3402 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3403 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3404
3405MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783 3406
2784PROTOTYPES: DISABLE 3407PROTOTYPES: DISABLE
2785 3408
2786void 3409void
2787find_widget (SV *self, NV x, NV y) 3410find_widget (SV *self, NV x, NV y)
2791 XPUSHs (self); 3414 XPUSHs (self);
2792} 3415}
2793 3416
2794BOOT: 3417BOOT:
2795{ 3418{
2796 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3419 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797 3420
2798 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3421 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2799 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3422 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2800 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3423 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2801 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3424 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2802} 3425}
2803 3426
2804void 3427void
2805draw (SV *self) 3428draw (SV *self)
2806 CODE: 3429 CODE:
2810 NV x, y, w, h; 3433 NV x, y, w, h;
2811 SV *draw_x_sv = GvSV (draw_x_gv); 3434 SV *draw_x_sv = GvSV (draw_x_gv);
2812 SV *draw_y_sv = GvSV (draw_y_gv); 3435 SV *draw_y_sv = GvSV (draw_y_gv);
2813 SV *draw_w_sv = GvSV (draw_w_gv); 3436 SV *draw_w_sv = GvSV (draw_w_gv);
2814 SV *draw_h_sv = GvSV (draw_h_gv); 3437 SV *draw_h_sv = GvSV (draw_h_gv);
2815 SV *hover;
2816 double draw_x, draw_y, draw_w, draw_h; 3438 double draw_x, draw_y;
2817 3439
2818 if (!SvROK (self)) 3440 if (!SvROK (self))
2819 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3441 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820 3442
2821 hv = (HV *)SvRV (self); 3443 hv = (HV *)SvRV (self);
2822 3444
2823 if (SvTYPE (hv) != SVt_PVHV) 3445 if (SvTYPE (hv) != SVt_PVHV)
2824 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3446 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825 3447
2826 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3448 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2827 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3449 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2828 3450
2829 if (!h || !w) 3451 if (!h || !w)
2849 { 3471 {
2850 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3472 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851 3473
2852 if (svp && SvTRUE (*svp)) 3474 if (svp && SvTRUE (*svp))
2853 { 3475 {
2854 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3476 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2855 glEnable (GL_BLEND); 3477 glEnable (GL_BLEND);
2856 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3478 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857 glBegin (GL_QUADS); 3479 glBegin (GL_QUADS);
2858 glVertex2f (0, 0); 3480 glVertex2f (0, 0);
2859 glVertex2f (w, 0); 3481 glVertex2f (w, 0);
2862 glEnd (); 3484 glEnd ();
2863 glDisable (GL_BLEND); 3485 glDisable (GL_BLEND);
2864 } 3486 }
2865 } 3487 }
2866#if 0 3488#if 0
2867 if ($ENV{CFPLUS_DEBUG} & 1) { 3489 // draw borders, for debugging
2868 glPushMatrix; 3490 glPushMatrix ();
2869 glColor 1, 1, 0, 1; 3491 glColor4f (1., 1., 0., 1.);
2870 glTranslate 0.375, 0.375; 3492 glTranslatef (.5, .5, 0.);
2871 glBegin GL_LINE_LOOP; 3493 glBegin (GL_LINE_LOOP);
2872 glVertex 0 , 0; 3494 glVertex2f (0 , 0);
2873 glVertex $self->{w} - 1, 0; 3495 glVertex2f (w - 1, 0);
2874 glVertex $self->{w} - 1, $self->{h} - 1; 3496 glVertex2f (w - 1, h - 1);
2875 glVertex 0 , $self->{h} - 1; 3497 glVertex2f (0 , h - 1);
2876 glEnd; 3498 glEnd ();
2877 glPopMatrix; 3499 glPopMatrix ();
2878 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879 }
2880#endif 3500#endif
2881 PUSHMARK (SP); 3501 PUSHMARK (SP);
2882 XPUSHs (self); 3502 XPUSHs (self);
2883 PUTBACK; 3503 PUTBACK;
2884 call_method ("_draw", G_VOID | G_DISCARD); 3504 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines