ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.306 by root, Thu Oct 14 00:02:39 2010 UTC

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

Diff Legend

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