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.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.310 by root, Tue Dec 27 07:23:33 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines