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

Diff Legend

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