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.211 by root, Sat Jul 28 00:45:28 2007 UTC vs.
Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines