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.221 by root, Fri Aug 10 04:02:13 2007 UTC vs.
Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC

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

Diff Legend

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