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.201 by root, Tue Jul 17 17:39:06 2007 UTC vs.
Revision 1.295 by root, Mon Dec 21 03:30:22 2009 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>
29 33
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35
30#include <SDL.h> 36#include <SDL.h>
37#include <SDL_thread.h>
31#include <SDL_endian.h> 38#include <SDL_endian.h>
32#include <SDL_image.h> 39#include <SDL_image.h>
33#include <SDL_mixer.h> 40#include <SDL_mixer.h>
34#include <SDL_opengl.h> 41#include <SDL_opengl.h>
35 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46#endif
47
36#define PANGO_ENABLE_BACKEND 48#define PANGO_ENABLE_BACKEND
37#define G_DISABLE_CAST_CHECKS 49#define G_DISABLE_CAST_CHECKS
38 50
39#include <glib/gmacros.h> 51#include <glib/gmacros.h>
40 52
41#include <pango/pango.h> 53#include <pango/pango.h>
54
55#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0
57#endif
58
59#if !PANGO_VERSION_CHECK (1, 15, 2)
60# define pango_layout_get_line_readonly pango_layout_get_line
61# define pango_layout_get_lines_readonly pango_layout_get_lines
62# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
63# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
64#endif
42 65
43#ifndef _WIN32 66#ifndef _WIN32
44# include <sys/types.h> 67# include <sys/types.h>
45# include <sys/socket.h> 68# include <sys/socket.h>
46# include <netinet/in.h> 69# include <netinet/in.h>
47# include <netinet/tcp.h> 70# include <netinet/tcp.h>
48# include <inttypes.h> 71# include <inttypes.h>
49#endif 72#endif
50 73
74#if __GNUC__ >= 4
75# define expect(expr,value) __builtin_expect ((expr),(value))
76#else
77# define expect(expr,value) (expr)
78#endif
79
80#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1)
82
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 84
53#define FOW_DARKNESS 32 85#define FOW_DARKNESS 64
86#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */
54 87
55#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
57 90
58#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
59 92
60#if 0 93/* mask out modifiers we are not interested in */
61# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
62#else 95
63# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
64#endif 97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
65 101
66static AV *texture_av; 102static AV *texture_av;
67 103
68static struct 104static struct
69{ 105{
… …
106 av_push (texture_av, (SV *)(size_t)name); 142 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name); 143 glDeleteTextures (1, &name);
108} 144}
109 145
110#include "texcache.c" 146#include "texcache.c"
147#include "rendercache.c"
111 148
112#include "pango-font.c" 149#include "pango-font.c"
113#include "pango-fontmap.c" 150#include "pango-fontmap.c"
114#include "pango-render.c" 151#include "pango-render.c"
115 152
153typedef IV DC__Channel;
154typedef SDL_RWops *DC__RW;
116typedef Mix_Chunk *CFPlus__MixChunk; 155typedef Mix_Chunk *DC__MixChunk;
117typedef Mix_Music *CFPlus__MixMusic; 156typedef Mix_Music *DC__MixMusic;
118 157
119typedef PangoFontDescription *CFPlus__Font; 158typedef PangoFontDescription *DC__Font;
120 159
121static int 160static int
122shape_attr_p (PangoLayoutRun *run) 161shape_attr_p (PangoLayoutRun *run)
123{ 162{
124 GSList *attrs = run->item->analysis.extra_attrs; 163 GSList *attrs = run->item->analysis.extra_attrs;
… …
138 177
139typedef struct cf_layout { 178typedef struct cf_layout {
140 PangoLayout *pl; 179 PangoLayout *pl;
141 float r, g, b, a; // default color for rgba mode 180 float r, g, b, a; // default color for rgba mode
142 int base_height; 181 int base_height;
143 CFPlus__Font font; 182 DC__Font font;
183 rc_t *rc;
144} *CFPlus__Layout; 184} *DC__Layout;
145 185
146static CFPlus__Font default_font; 186static DC__Font default_font;
147static PangoContext *opengl_context; 187static PangoContext *opengl_context;
148static PangoFontMap *opengl_fontmap; 188static PangoFontMap *opengl_fontmap;
149 189
150static void 190static void
151substitute_func (FcPattern *pattern, gpointer data) 191substitute_func (FcPattern *pattern, gpointer data)
… …
156#endif 196#endif
157 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 197 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
158} 198}
159 199
160static void 200static void
161layout_update_font (CFPlus__Layout self) 201layout_update_font (DC__Layout self)
162{ 202{
163 /* use a random scale factor to account for unknown descenders, 0.8 works 203 /* use a random scale factor to account for unknown descenders, 0.8 works
164 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
165 */ 205 */
166 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
167 207
168 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
169 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
170 210
171 pango_layout_set_font_description (self->pl, font); 211 pango_layout_set_font_description (self->pl, font);
172} 212}
173 213
174static void 214static void
175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 215layout_get_pixel_size (DC__Layout self, int *w, int *h)
176{ 216{
177 PangoRectangle rect; 217 PangoRectangle rect;
178 218
179 // get_pixel_* wrongly rounds down 219 // get_pixel_* wrongly rounds down
180 pango_layout_get_extents (self->pl, 0, &rect); 220 pango_layout_get_extents (self->pl, 0, &rect);
… …
191 231
192typedef uint16_t tileid; 232typedef uint16_t tileid;
193typedef uint16_t faceid; 233typedef uint16_t faceid;
194 234
195typedef struct { 235typedef struct {
196 int name; 236 GLuint name;
197 int w, h; 237 int w, h;
198 float s, t; 238 float s, t;
199 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
200 tileid smoothtile; 240 tileid smoothtile;
201 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
202} maptex; 243} maptex;
203 244
204typedef struct { 245typedef struct {
205 uint32_t player; 246 uint32_t player;
206 tileid tile[3]; 247 tileid tile[3];
… …
219 int faces; tileid *face2tile; // [faceid] 260 int faces; tileid *face2tile; // [faceid]
220 int texs; maptex *tex; // [tileid] 261 int texs; maptex *tex; // [tileid]
221 262
222 int32_t rows; 263 int32_t rows;
223 maprow *row; 264 maprow *row;
224} *CFPlus__Map; 265} *DC__Map;
225 266
226static char * 267static char *
227prepend (char *ptr, int sze, int inc) 268prepend (char *ptr, int sze, int inc)
228{ 269{
229 char *p; 270 char *p;
… …
267 self->texs *= 2; 308 self->texs *= 2;
268 } 309 }
269} 310}
270 311
271static maprow * 312static maprow *
272map_get_row (CFPlus__Map self, int y) 313map_get_row (DC__Map self, int y)
273{ 314{
274 if (0 > y) 315 if (0 > y)
275 { 316 {
276 int extend = - y + MAP_EXTEND_Y; 317 int extend = - y + MAP_EXTEND_Y;
277 Prepend (maprow, self->row, self->rows, extend); 318 Prepend (maprow, self->row, self->rows, extend);
… …
315 356
316 return row->col + (x - row->c0); 357 return row->col + (x - row->c0);
317} 358}
318 359
319static mapcell * 360static mapcell *
320map_get_cell (CFPlus__Map self, int x, int y) 361map_get_cell (DC__Map self, int x, int y)
321{ 362{
322 return row_get_cell (map_get_row (self, y), x); 363 return row_get_cell (map_get_row (self, y), x);
323} 364}
324 365
325static void 366static void
326map_clear (CFPlus__Map self) 367map_clear (DC__Map self)
327{ 368{
328 int r; 369 int r;
329 370
330 for (r = 0; r < self->rows; r++) 371 for (r = 0; r < self->rows; r++)
331 Safefree (self->row[r].col); 372 Safefree (self->row[r].col);
… …
338 self->oy = 0; 379 self->oy = 0;
339 self->row = 0; 380 self->row = 0;
340 self->rows = 0; 381 self->rows = 0;
341} 382}
342 383
384#define CELL_CLEAR(cell) \
385 do { \
386 if ((cell)->player) \
387 (cell)->tile [2] = 0; \
388 (cell)->darkness = 0; \
389 (cell)->stat_hp = 0; \
390 (cell)->flags = 0; \
391 (cell)->player = 0; \
392 } while (0)
393
343static void 394static void
344map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 395map_blank (DC__Map self, int x0, int y0, int w, int h)
345{ 396{
346 int x, y; 397 int x, y;
347 maprow *row; 398 maprow *row;
348 mapcell *cell; 399 mapcell *cell;
349 400
… …
361 if (x >= row->c1) 412 if (x >= row->c1)
362 break; 413 break;
363 414
364 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
365 416
366 cell->darkness = 0; 417 CELL_CLEAR (cell);
367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
370 } 418 }
371 } 419 }
372} 420}
373 421
374typedef struct { 422typedef struct {
… …
428 n |= n >> 16; 476 n |= n >> 16;
429 477
430 return n + 1; 478 return n + 1;
431} 479}
432 480
481static unsigned int
482popcount (unsigned int n)
483{
484 n -= (n >> 1) & 0x55555555U;
485 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
486 n = ((n >> 4) + n) & 0x0f0f0f0fU;
487 n *= 0x01010101U;
488
489 return n >> 24;
490}
491
433/* SDL should provide this, really. */ 492/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300 493#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314 494#define SDLK_MODIFIER_MAX 314
436 495
437MODULE = CFPlus PACKAGE = CFPlus 496/******************************************************************************/
497
498static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
499static GV *hover_gv;
500
501static int
502within_widget (SV *widget, NV x, NV y)
503{
504 HV *self;
505 SV **svp;
506 NV wx, ww, wy, wh;
507
508 if (!SvROK (widget))
509 return 0;
510
511 self = (HV *)SvRV (widget);
512
513 if (SvTYPE (self) != SVt_PVHV)
514 return 0;
515
516 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
517 if (y < wy)
518 return 0;
519
520 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
521 if (y >= wy + wh)
522 return 0;
523
524 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
525 if (x < wx)
526 return 0;
527
528 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
529 if (x >= wx + ww)
530 return 0;
531
532 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
533 if (!svp || !SvTRUE (*svp))
534 return 0;
535
536 return 1;
537}
538
539/******************************************************************************/
540
541/* process keyboard modifiers */
542static int
543mod_munge (int mod)
544{
545 mod &= MOD_MASK;
546
547 if (mod & (KMOD_META | KMOD_ALT))
548 mod |= KMOD_LRAM;
549
550 return mod;
551}
552
553static void
554deliantra_main ()
555{
556 char *argv[] = { 0 };
557 call_argv ("::main", G_DISCARD | G_VOID, argv);
558}
559
560#ifdef __MACOSX__
561 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back.
566 */
567 extern C_LINKAGE int
568 main (int argc, char *argv[])
569 {
570 deliantra_main ();
571 }
572
573 #undef main
574
575 extern C_LINKAGE int main (int argc, char *argv[]);
576
577 static void
578 SDL_braino (void)
579 {
580 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv);
582 }
583#else
584 static void
585 SDL_braino (void)
586 {
587 deliantra_main ();
588 }
589#endif
590
591MODULE = Deliantra::Client PACKAGE = DC
438 592
439PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
440 594
441BOOT: 595BOOT:
442{ 596{
443 HV *stash = gv_stashpv ("CFPlus", 1); 597 HV *stash = gv_stashpv ("DC", 1);
444 static const struct { 598 static const struct {
445 const char *name; 599 const char *name;
446 IV iv; 600 IV iv;
447 } *civ, const_iv[] = { 601 } *civ, const_iv[] = {
448# define const_iv(name) { # name, (IV)name } 602# define const_iv(name) { # name, (IV)name }
… …
470 624
471 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
474 628
629
630 const_iv (SDLK_UNKNOWN),
631 const_iv (SDLK_FIRST),
632 const_iv (SDLK_BACKSPACE),
633 const_iv (SDLK_TAB),
634 const_iv (SDLK_CLEAR),
635 const_iv (SDLK_RETURN),
636 const_iv (SDLK_PAUSE),
637 const_iv (SDLK_ESCAPE),
638 const_iv (SDLK_SPACE),
639 const_iv (SDLK_EXCLAIM),
640 const_iv (SDLK_QUOTEDBL),
641 const_iv (SDLK_HASH),
642 const_iv (SDLK_DOLLAR),
643 const_iv (SDLK_AMPERSAND),
644 const_iv (SDLK_QUOTE),
645 const_iv (SDLK_LEFTPAREN),
646 const_iv (SDLK_RIGHTPAREN),
647 const_iv (SDLK_ASTERISK),
648 const_iv (SDLK_PLUS),
649 const_iv (SDLK_COMMA),
650 const_iv (SDLK_MINUS),
651 const_iv (SDLK_PERIOD),
652 const_iv (SDLK_SLASH),
653 const_iv (SDLK_0),
654 const_iv (SDLK_1),
655 const_iv (SDLK_2),
656 const_iv (SDLK_3),
657 const_iv (SDLK_4),
658 const_iv (SDLK_5),
659 const_iv (SDLK_6),
660 const_iv (SDLK_7),
661 const_iv (SDLK_8),
662 const_iv (SDLK_9),
663 const_iv (SDLK_COLON),
664 const_iv (SDLK_SEMICOLON),
665 const_iv (SDLK_LESS),
666 const_iv (SDLK_EQUALS),
667 const_iv (SDLK_GREATER),
668 const_iv (SDLK_QUESTION),
669 const_iv (SDLK_AT),
670
671 const_iv (SDLK_LEFTBRACKET),
672 const_iv (SDLK_BACKSLASH),
673 const_iv (SDLK_RIGHTBRACKET),
674 const_iv (SDLK_CARET),
675 const_iv (SDLK_UNDERSCORE),
676 const_iv (SDLK_BACKQUOTE),
677 const_iv (SDLK_DELETE),
678
679 const_iv (SDLK_FIRST),
680 const_iv (SDLK_LAST),
475 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
476 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
477 const_iv (SDLK_KP2), 683 const_iv (SDLK_KP2),
478 const_iv (SDLK_KP3), 684 const_iv (SDLK_KP3),
479 const_iv (SDLK_KP4), 685 const_iv (SDLK_KP4),
… …
551 const_iv (KMOD_LMETA), 757 const_iv (KMOD_LMETA),
552 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
553 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
554 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
555 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
762
763 const_iv (KMOD_LRAM),
764
765 const_iv (MIX_DEFAULT_FORMAT),
766
767 const_iv (SDL_INIT_TIMER),
768 const_iv (SDL_INIT_AUDIO),
769 const_iv (SDL_INIT_VIDEO),
770 const_iv (SDL_INIT_CDROM),
771 const_iv (SDL_INIT_JOYSTICK),
772 const_iv (SDL_INIT_EVERYTHING),
773 const_iv (SDL_INIT_NOPARACHUTE),
774 const_iv (SDL_INIT_EVENTTHREAD),
775
776 const_iv (SDL_GL_RED_SIZE),
777 const_iv (SDL_GL_GREEN_SIZE),
778 const_iv (SDL_GL_BLUE_SIZE),
779 const_iv (SDL_GL_ALPHA_SIZE),
780 const_iv (SDL_GL_DOUBLEBUFFER),
781 const_iv (SDL_GL_BUFFER_SIZE),
782 const_iv (SDL_GL_DEPTH_SIZE),
783 const_iv (SDL_GL_STENCIL_SIZE),
784 const_iv (SDL_GL_ACCUM_RED_SIZE),
785 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
786 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
787 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
788 const_iv (SDL_GL_STEREO),
789 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
790 const_iv (SDL_GL_MULTISAMPLESAMPLES),
791 const_iv (SDL_GL_ACCELERATED_VISUAL),
792 const_iv (SDL_GL_SWAP_CONTROL),
793
794 const_iv (FOW_DARKNESS)
556# undef const_iv 795# undef const_iv
557 }; 796 };
558 797
559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
578 817
579NV floor (NV x) 818NV floor (NV x)
580 819
581NV ceil (NV x) 820NV ceil (NV x)
582 821
822IV minpot (UV n)
823
824IV popcount (UV n)
825
826NV distance (NV dx, NV dy)
827 CODE:
828 RETVAL = pow (dx * dx + dy * dy, 0.5);
829 OUTPUT:
830 RETVAL
831
583void 832void
584pango_init () 833pango_init ()
585 CODE: 834 CODE:
586{ 835{
587 opengl_fontmap = pango_opengl_font_map_new (); 836 opengl_fontmap = pango_opengl_font_map_new ();
588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 837 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 838 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
839 /*pango_context_set_font_description (opengl_context, default_font);*/
840#if PANGO_VERSION_CHECK (1, 15, 2)
841 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
842 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
843#endif
590} 844}
591 845
592char *
593SDL_GetError () 846char *SDL_GetError ()
594 847
595int 848void SDL_braino ()
596SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
597 849
598void 850int SDL_Init (U32 flags)
851
852int SDL_InitSubSystem (U32 flags)
853
854void SDL_QuitSubSystem (U32 flags)
855
599SDL_Quit () 856void SDL_Quit ()
857
858int SDL_GL_SetAttribute (int attr, int value)
859
860int SDL_GL_GetAttribute (int attr)
861 CODE:
862 if (SDL_GL_GetAttribute (attr, &RETVAL))
863 XSRETURN_UNDEF;
864 OUTPUT:
865 RETVAL
600 866
601void 867void
602SDL_ListModes (int rgb, int alpha) 868SDL_ListModes (int rgb, int alpha)
603 PPCODE: 869 PPCODE:
604{ 870{
… …
616 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 882 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
617 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 883 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
618 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
619 885
620 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 886 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
621#if SDL_VERSION_ATLEAST(1,2,10)
622 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
623 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 887 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
624#endif
625 888
626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 889 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
627 890
628 if (m && m != (SDL_Rect **)-1) 891 if (m && m != (SDL_Rect **)-1)
629 while (*m) 892 while (*m)
630 { 893 {
631 if ((*m)->w >= 640 && (*m)->h >= 480) 894 if ((*m)->w >= 400 && (*m)->h >= 300)
632 { 895 {
633 AV *av = newAV (); 896 AV *av = newAV ();
634 av_push (av, newSViv ((*m)->w)); 897 av_push (av, newSViv ((*m)->w));
635 av_push (av, newSViv ((*m)->h)); 898 av_push (av, newSViv ((*m)->h));
636 av_push (av, newSViv (rgb)); 899 av_push (av, newSViv (rgb));
… …
660 923
661 if (RETVAL) 924 if (RETVAL)
662 { 925 {
663 av_clear (texture_av); 926 av_clear (texture_av);
664 927
665 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 928 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
666#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 929#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
667#include "glfunc.h" 930#include "glfunc.h"
668#undef GL_FUNC 931#undef GL_FUNC
669 } 932 }
670} 933}
… …
677char * 940char *
678SDL_GetKeyName (int sym) 941SDL_GetKeyName (int sym)
679 942
680int 943int
681SDL_GetAppState () 944SDL_GetAppState ()
945
946int
947SDL_GetModState ()
682 948
683void 949void
684poll_events () 950poll_events ()
685 PPCODE: 951 PPCODE:
686{ 952{
… …
696 { 962 {
697 case SDL_KEYDOWN: 963 case SDL_KEYDOWN:
698 case SDL_KEYUP: 964 case SDL_KEYUP:
699 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 965 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
700 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 966 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
701 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 967 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
702 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 968 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
703 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 969 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
704 break; 970 break;
705 971
706 case SDL_ACTIVEEVENT: 972 case SDL_ACTIVEEVENT:
707 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 973 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
725 x = ev.motion.x; 991 x = ev.motion.x;
726 y = ev.motion.y; 992 y = ev.motion.y;
727 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 993 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
728 } 994 }
729 995
730 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
731 hv_store (hv, "state", 5, newSViv (state), 0); 997 hv_store (hv, "state", 5, newSViv (state), 0);
732 hv_store (hv, "x", 1, newSViv (x), 0); 998 hv_store (hv, "x", 1, newSViv (x), 0);
733 hv_store (hv, "y", 1, newSViv (y), 0); 999 hv_store (hv, "y", 1, newSViv (y), 0);
734 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1000 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
735 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1001 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
736 } 1002 }
737 break; 1003 break;
738 1004
739 case SDL_MOUSEBUTTONDOWN: 1005 case SDL_MOUSEBUTTONDOWN:
740 case SDL_MOUSEBUTTONUP: 1006 case SDL_MOUSEBUTTONUP:
741 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1007 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
742 1008
743 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1009 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
744 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
745 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1011 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
746 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1012 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
751 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1017 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
752 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1018 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
753 break; 1019 break;
754 } 1020 }
755 1021
756 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1022 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
757 } 1023 }
758} 1024}
759 1025
760int 1026int
761Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1027Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
762 POSTCALL: 1028 POSTCALL:
763 Mix_HookMusicFinished (music_finished); 1029 Mix_HookMusicFinished (music_finished);
764 Mix_ChannelFinished (channel_finished); 1030 Mix_ChannelFinished (channel_finished);
765 1031
766void 1032void
1033Mix_QuerySpec ()
1034 PPCODE:
1035{
1036 int freq, channels;
1037 Uint16 format;
1038
1039 if (Mix_QuerySpec (&freq, &format, &channels))
1040 {
1041 EXTEND (SP, 3);
1042 PUSHs (sv_2mortal (newSViv (freq)));
1043 PUSHs (sv_2mortal (newSViv (format)));
1044 PUSHs (sv_2mortal (newSViv (channels)));
1045 }
1046}
1047
1048void
767Mix_CloseAudio () 1049Mix_CloseAudio ()
768 1050
769int 1051int
770Mix_AllocateChannels (int numchans = -1) 1052Mix_AllocateChannels (int numchans = -1)
1053
1054const char *
1055Mix_GetError ()
771 1056
772void 1057void
773lowdelay (int fd, int val = 1) 1058lowdelay (int fd, int val = 1)
774 CODE: 1059 CODE:
775 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1060 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
801 } 1086 }
802 } 1087 }
803#endif 1088#endif
804} 1089}
805 1090
806void 1091int
807add_font (char *file) 1092add_font (char *file)
808 CODE: 1093 CODE:
809 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT:
1096 RETVAL
810 1097
811void 1098void
812load_image_inline (SV *image_) 1099load_image_inline (SV *image_)
813 ALIAS: 1100 ALIAS:
814 load_image_file = 1 1101 load_image_file = 1
… …
817 STRLEN image_len; 1104 STRLEN image_len;
818 char *image = (char *)SvPVbyte (image_, image_len); 1105 char *image = (char *)SvPVbyte (image_, image_len);
819 SDL_Surface *surface, *surface2; 1106 SDL_Surface *surface, *surface2;
820 SDL_PixelFormat fmt; 1107 SDL_PixelFormat fmt;
821 SDL_RWops *rw = ix 1108 SDL_RWops *rw = ix
822 ? SDL_RWFromFile (image, "r") 1109 ? SDL_RWFromFile (image, "rb")
823 : SDL_RWFromConstMem (image, image_len); 1110 : SDL_RWFromConstMem (image, image_len);
824 1111
825 if (!rw) 1112 if (!rw)
826 croak ("load_image: %s", SDL_GetError ()); 1113 croak ("load_image: %s", SDL_GetError ());
827 1114
… …
900void 1187void
901error (char *message) 1188error (char *message)
902 CODE: 1189 CODE:
903 fprintf (stderr, "ERROR: %s\n", message); 1190 fprintf (stderr, "ERROR: %s\n", message);
904#ifdef _WIN32 1191#ifdef _WIN32
905 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1192 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
906#endif 1193#endif
907 1194
908void 1195void
909fatal (char *message) 1196fatal (char *message)
910 CODE: 1197 CODE:
911 fprintf (stderr, "FATAL: %s\n", message); 1198 fprintf (stderr, "FATAL: %s\n", message);
912#ifdef _WIN32 1199#ifdef _WIN32
913 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1200 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
914#endif 1201#endif
915 _exit (1); 1202 _exit (1);
916 1203
917void 1204void
918_exit (int retval = 0) 1205_exit (int retval = 0)
… …
930#if DEBUG 1217#if DEBUG
931 VALGRIND_DO_LEAK_CHECK; 1218 VALGRIND_DO_LEAK_CHECK;
932#endif 1219#endif
933} 1220}
934 1221
935MODULE = CFPlus PACKAGE = CFPlus::Font 1222int
1223SvREFCNT (SV *sv)
1224 CODE:
1225 RETVAL = SvREFCNT (sv);
1226 OUTPUT:
1227 RETVAL
936 1228
937CFPlus::Font 1229MODULE = Deliantra::Client PACKAGE = DC::Font
1230
1231PROTOTYPES: DISABLE
1232
1233DC::Font
938new_from_file (SV *class, char *path, int id = 0) 1234new_from_file (SV *class, char *path, int id = 0)
939 CODE: 1235 CODE:
940{ 1236{
941 int count; 1237 int count;
942 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1238 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
945} 1241}
946 OUTPUT: 1242 OUTPUT:
947 RETVAL 1243 RETVAL
948 1244
949void 1245void
950DESTROY (CFPlus::Font self) 1246DESTROY (DC::Font self)
951 CODE: 1247 CODE:
952 pango_font_description_free (self); 1248 pango_font_description_free (self);
953 1249
954void 1250void
955make_default (CFPlus::Font self) 1251make_default (DC::Font self)
1252 PROTOTYPE: $
956 CODE: 1253 CODE:
957 default_font = self; 1254 default_font = self;
958 1255
959MODULE = CFPlus PACKAGE = CFPlus::Layout 1256MODULE = Deliantra::Client PACKAGE = DC::Layout
960 1257
1258PROTOTYPES: DISABLE
1259
961void 1260void
962reset_glyph_cache () 1261glyph_cache_backup ()
1262 PROTOTYPE:
963 CODE: 1263 CODE:
1264 tc_backup ();
1265
1266void
1267glyph_cache_restore ()
1268 PROTOTYPE:
1269 CODE:
964 tc_clear (); 1270 tc_restore ();
965 1271
966CFPlus::Layout 1272DC::Layout
967new (SV *class) 1273new (SV *class)
968 CODE: 1274 CODE:
969 New (0, RETVAL, 1, struct cf_layout); 1275 New (0, RETVAL, 1, struct cf_layout);
970 1276
971 RETVAL->pl = pango_layout_new (opengl_context); 1277 RETVAL->pl = pango_layout_new (opengl_context);
… …
973 RETVAL->g = 1.; 1279 RETVAL->g = 1.;
974 RETVAL->b = 1.; 1280 RETVAL->b = 1.;
975 RETVAL->a = 1.; 1281 RETVAL->a = 1.;
976 RETVAL->base_height = MIN_FONT_HEIGHT; 1282 RETVAL->base_height = MIN_FONT_HEIGHT;
977 RETVAL->font = 0; 1283 RETVAL->font = 0;
1284 RETVAL->rc = rc_alloc ();
978 1285
979 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1286 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
980 layout_update_font (RETVAL); 1287 layout_update_font (RETVAL);
981 OUTPUT: 1288 OUTPUT:
982 RETVAL 1289 RETVAL
983 1290
984void 1291void
985DESTROY (CFPlus::Layout self) 1292DESTROY (DC::Layout self)
986 CODE: 1293 CODE:
987 g_object_unref (self->pl); 1294 g_object_unref (self->pl);
1295 rc_free (self->rc);
988 Safefree (self); 1296 Safefree (self);
989 1297
990void 1298void
991set_text (CFPlus::Layout self, SV *text_) 1299set_text (DC::Layout self, SV *text_)
992 CODE: 1300 CODE:
993{ 1301{
994 STRLEN textlen; 1302 STRLEN textlen;
995 char *text = SvPVutf8 (text_, textlen); 1303 char *text = SvPVutf8 (text_, textlen);
996 1304
997 pango_layout_set_text (self->pl, text, textlen); 1305 pango_layout_set_text (self->pl, text, textlen);
998} 1306}
999 1307
1000void 1308void
1001set_markup (CFPlus::Layout self, SV *text_) 1309set_markup (DC::Layout self, SV *text_)
1002 CODE: 1310 CODE:
1003{ 1311{
1004 STRLEN textlen; 1312 STRLEN textlen;
1005 char *text = SvPVutf8 (text_, textlen); 1313 char *text = SvPVutf8 (text_, textlen);
1006 1314
1007 pango_layout_set_markup (self->pl, text, textlen); 1315 pango_layout_set_markup (self->pl, text, textlen);
1008} 1316}
1009 1317
1010void 1318void
1011set_shapes (CFPlus::Layout self, ...) 1319set_shapes (DC::Layout self, ...)
1012 CODE: 1320 CODE:
1013{ 1321{
1014 PangoAttrList *attrs = 0; 1322 PangoAttrList *attrs = 0;
1015 const char *text = pango_layout_get_text (self->pl); 1323 const char *text = pango_layout_get_text (self->pl);
1016 const char *pos = text; 1324 const char *pos = text;
… …
1051 if (attrs) 1359 if (attrs)
1052 pango_layout_set_attributes (self->pl, attrs); 1360 pango_layout_set_attributes (self->pl, attrs);
1053} 1361}
1054 1362
1055void 1363void
1056get_shapes (CFPlus::Layout self) 1364get_shapes (DC::Layout self)
1057 PPCODE: 1365 PPCODE:
1058{ 1366{
1059 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1367 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1060 1368
1061 do 1369 do
1062 { 1370 {
1063 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1371 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1064 1372
1065 if (run && shape_attr_p (run)) 1373 if (run && shape_attr_p (run))
1066 { 1374 {
1067 PangoRectangle extents; 1375 PangoRectangle extents;
1068 pango_layout_iter_get_run_extents (iter, 0, &extents); 1376 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1076 1384
1077 pango_layout_iter_free (iter); 1385 pango_layout_iter_free (iter);
1078} 1386}
1079 1387
1080int 1388int
1081has_wrapped (CFPlus::Layout self) 1389has_wrapped (DC::Layout self)
1082 CODE: 1390 CODE:
1083{ 1391{
1084 int lines = 1; 1392 int lines = 1;
1085 const char *text = pango_layout_get_text (self->pl); 1393 const char *text = pango_layout_get_text (self->pl);
1086 1394
… …
1091} 1399}
1092 OUTPUT: 1400 OUTPUT:
1093 RETVAL 1401 RETVAL
1094 1402
1095SV * 1403SV *
1096get_text (CFPlus::Layout self) 1404get_text (DC::Layout self)
1097 CODE: 1405 CODE:
1098 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1406 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1099 sv_utf8_decode (RETVAL); 1407 sv_utf8_decode (RETVAL);
1100 OUTPUT: 1408 OUTPUT:
1101 RETVAL 1409 RETVAL
1102 1410
1103void 1411void
1104set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1412set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1105 CODE: 1413 CODE:
1106 self->r = r; 1414 self->r = r;
1107 self->g = g; 1415 self->g = g;
1108 self->b = b; 1416 self->b = b;
1109 self->a = a; 1417 self->a = a;
1110 1418
1111void 1419void
1112set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1420set_font (DC::Layout self, DC::Font font = 0)
1113 CODE: 1421 CODE:
1114 if (self->font != font) 1422 if (self->font != font)
1115 { 1423 {
1116 self->font = font; 1424 self->font = font;
1117 layout_update_font (self); 1425 layout_update_font (self);
1118 } 1426 }
1119 1427
1120void 1428void
1121set_height (CFPlus::Layout self, int base_height) 1429set_height (DC::Layout self, int base_height)
1122 CODE: 1430 CODE:
1123 if (self->base_height != base_height) 1431 if (self->base_height != base_height)
1124 { 1432 {
1125 self->base_height = base_height; 1433 self->base_height = base_height;
1126 layout_update_font (self); 1434 layout_update_font (self);
1127 } 1435 }
1128 1436
1129void 1437void
1130set_width (CFPlus::Layout self, int max_width = -1) 1438set_width (DC::Layout self, int max_width = -1)
1131 CODE: 1439 CODE:
1132 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1440 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1133 1441
1134void 1442void
1135set_indent (CFPlus::Layout self, int indent) 1443set_indent (DC::Layout self, int indent)
1136 CODE: 1444 CODE:
1137 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1445 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1138 1446
1139void 1447void
1140set_spacing (CFPlus::Layout self, int spacing) 1448set_spacing (DC::Layout self, int spacing)
1141 CODE: 1449 CODE:
1142 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1450 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1143 1451
1144void 1452void
1145set_ellipsise (CFPlus::Layout self, int ellipsise) 1453set_ellipsise (DC::Layout self, int ellipsise)
1146 CODE: 1454 CODE:
1147 pango_layout_set_ellipsize (self->pl, 1455 pango_layout_set_ellipsize (self->pl,
1148 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1456 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1149 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1457 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1150 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1458 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1151 : PANGO_ELLIPSIZE_NONE 1459 : PANGO_ELLIPSIZE_NONE
1152 ); 1460 );
1153 1461
1154void 1462void
1155set_single_paragraph_mode (CFPlus::Layout self, int spm) 1463set_single_paragraph_mode (DC::Layout self, int spm)
1156 CODE: 1464 CODE:
1157 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1465 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1158 1466
1159void 1467void
1160size (CFPlus::Layout self) 1468size (DC::Layout self)
1161 PPCODE: 1469 PPCODE:
1162{ 1470{
1163 int w, h; 1471 int w, h;
1164 1472
1165 layout_get_pixel_size (self, &w, &h); 1473 layout_get_pixel_size (self, &w, &h);
… …
1168 PUSHs (sv_2mortal (newSViv (w))); 1476 PUSHs (sv_2mortal (newSViv (w)));
1169 PUSHs (sv_2mortal (newSViv (h))); 1477 PUSHs (sv_2mortal (newSViv (h)));
1170} 1478}
1171 1479
1172int 1480int
1173descent (CFPlus::Layout self) 1481descent (DC::Layout self)
1174 CODE: 1482 CODE:
1175{ 1483{
1176 PangoRectangle rect; 1484 PangoRectangle rect;
1177 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1485 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1178 pango_layout_line_get_pixel_extents (line, 0, &rect); 1486 pango_layout_line_get_pixel_extents (line, 0, &rect);
1179 RETVAL = PANGO_DESCENT (rect); 1487 RETVAL = PANGO_DESCENT (rect);
1180} 1488}
1181 OUTPUT: 1489 OUTPUT:
1182 RETVAL 1490 RETVAL
1183 1491
1184int 1492int
1185xy_to_index (CFPlus::Layout self, int x, int y) 1493xy_to_index (DC::Layout self, int x, int y)
1186 CODE: 1494 CODE:
1187{ 1495{
1188 int index, trailing; 1496 int index, trailing;
1189 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1497 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1190 RETVAL = index + trailing; 1498 RETVAL = index + trailing;
1191} 1499}
1192 OUTPUT: 1500 OUTPUT:
1193 RETVAL 1501 RETVAL
1194 1502
1195void 1503void
1196cursor_pos (CFPlus::Layout self, int index) 1504cursor_pos (DC::Layout self, int index)
1197 PPCODE: 1505 PPCODE:
1198{ 1506{
1199 PangoRectangle strong_pos; 1507 PangoRectangle pos;
1200 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1508 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1201 1509
1202 EXTEND (SP, 3); 1510 EXTEND (SP, 3);
1203 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1204 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1512 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1205 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1206} 1514}
1207 1515
1208void 1516void
1209index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1517index_to_line_x (DC::Layout self, int index, int trailing = 0)
1210 PPCODE: 1518 PPCODE:
1211{ 1519{
1212 int line, x; 1520 int line, x;
1213 1521
1214 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1522 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1523#if !PANGO_VERSION_CHECK (1, 17, 3)
1215 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1524 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1216 1525 --line;
1526#endif
1217 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
1218 PUSHs (sv_2mortal (newSViv (line - 1))); 1528 PUSHs (sv_2mortal (newSViv (line)));
1219 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1529 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1220} 1530}
1221 1531
1222void 1532void
1223line_x_to_index (CFPlus::Layout self, int line, int x) 1533line_x_to_index (DC::Layout self, int line, int x)
1224 PPCODE: 1534 PPCODE:
1225{ 1535{
1226 PangoLayoutLine *lp; 1536 PangoLayoutLine *lp;
1227 int index, trailing; 1537 int index, trailing;
1228 1538
1229 if (line < 0) 1539 if (line < 0)
1230 XSRETURN_EMPTY; 1540 XSRETURN_EMPTY;
1231 1541
1232 if (!(lp = pango_layout_get_line (self->pl, line))) 1542 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1233 XSRETURN_EMPTY; /* do better */ 1543 XSRETURN_EMPTY; /* do better */
1234 1544
1235 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1545 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1236 1546
1237 EXTEND (SP, 2); 1547 EXTEND (SP, 2);
… …
1243 PUSHs (sv_2mortal (newSViv (trailing))); 1553 PUSHs (sv_2mortal (newSViv (trailing)));
1244 } 1554 }
1245} 1555}
1246 1556
1247void 1557void
1248render (CFPlus::Layout self, float x, float y, int flags = 0) 1558render (DC::Layout self, float x, float y, int flags = 0)
1249 PPCODE: 1559 CODE:
1560 rc_clear (self->rc);
1250 pango_opengl_render_layout_subpixel ( 1561 pango_opengl_render_layout_subpixel (
1251 self->pl, 1562 self->pl,
1563 self->rc,
1252 x * PANGO_SCALE, y * PANGO_SCALE, 1564 x * PANGO_SCALE, y * PANGO_SCALE,
1253 self->r, self->g, self->b, self->a, 1565 self->r, self->g, self->b, self->a,
1254 flags 1566 flags
1255 ); 1567 );
1568 // we assume that context_change actually clears/frees stuff
1569 // and does not do any recomputation...
1570 pango_layout_context_changed (self->pl);
1256 1571
1257MODULE = CFPlus PACKAGE = CFPlus::Texture
1258
1259int minpot (int n)
1260
1261void 1572void
1262pad2pot (SV *data_, SV *w_, SV *h_) 1573draw (DC::Layout self)
1263 CODE: 1574 CODE:
1264{ 1575{
1265 int ow = SvIV (w_); 1576 glEnable (GL_TEXTURE_2D);
1266 int oh = SvIV (h_); 1577 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1578 glEnable (GL_BLEND);
1579 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1580 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1581 glEnable (GL_ALPHA_TEST);
1582 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1267 1583
1268 if (ow && oh) 1584 rc_draw (self->rc);
1585
1586 glDisable (GL_ALPHA_TEST);
1587 glDisable (GL_BLEND);
1588 glDisable (GL_TEXTURE_2D);
1589}
1590
1591MODULE = Deliantra::Client PACKAGE = DC::Texture
1592
1593PROTOTYPES: ENABLE
1594
1595void
1596pad (SV *data_, int ow, int oh, int nw, int nh)
1597 CODE:
1598{
1599 if ((nw != ow || nh != oh) && SvOK (data_))
1269 { 1600 {
1270 int nw = minpot (ow);
1271 int nh = minpot (oh);
1272
1273 if (nw != ow || nh != oh)
1274 {
1275 if (SvOK (data_))
1276 {
1277 STRLEN datalen; 1601 STRLEN datalen;
1278 char *data = SvPVbyte (data_, datalen); 1602 char *data = SvPVbyte (data_, datalen);
1279 int bpp = datalen / (ow * oh); 1603 int bpp = datalen / (ow * oh);
1280 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1604 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1281 1605
1282 SvPOK_only (result_); 1606 SvPOK_only (result_);
1283 SvCUR_set (result_, nw * nh * bpp); 1607 SvCUR_set (result_, nw * nh * bpp);
1284 1608
1285 memset (SvPVX (result_), 0, nw * nh * bpp); 1609 memset (SvPVX (result_), 0, nw * nh * bpp);
1286 while (oh--) 1610 while (oh--)
1287 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1611 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1288 1612
1289 sv_setsv (data_, result_); 1613 sv_setsv (data_, result_);
1290 }
1291
1292 sv_setiv (w_, nw);
1293 sv_setiv (h_, nh);
1294 }
1295 } 1614 }
1296} 1615}
1297 1616
1298void 1617void
1299draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1618draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1305{ 1624{
1306 HV *hv = (HV *)SvRV (self); 1625 HV *hv = (HV *)SvRV (self);
1307 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1626 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1308 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1627 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1309 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1628 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1629
1630 if (name <= 0)
1631 XSRETURN_EMPTY;
1310 1632
1311 if (items < 5) 1633 if (items < 5)
1312 { 1634 {
1313 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1635 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1314 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1636 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1342 glDisable (GL_ALPHA_TEST); 1664 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1665 glDisable (GL_BLEND);
1344 } 1666 }
1345} 1667}
1346 1668
1669void
1670draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)
1671 PROTOTYPE: @
1672 CODE:
1673{
1674 glEnable (GL_TEXTURE_2D);
1675 glEnable (GL_BLEND);
1676 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glBindTexture (GL_TEXTURE_2D, name1);
1678
1679 glColor3f (intensity, intensity, intensity);
1680 glPushMatrix ();
1681 glScalef (1./3, 1./3, 1.);
1682
1683 if (blend > 0.f)
1684 {
1685 float S2, T2; /* 0. 0. for texture 2 */
1686 float w = w1 > w2 ? w1 : w2;
1687 float h = h1 > h2 ? h1 : h2;
1688 GLfloat env_color[4] = { 0., 0., 0., blend };
1689
1690 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1693
1694 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1695 gl.ActiveTexture (GL_TEXTURE1);
1696 glEnable (GL_TEXTURE_2D);
1697 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699
1700 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704
1705 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707
1708 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1709 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1710 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1711
1712 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717
1718 s1 *= w / w1;
1719 t1 *= h / h1;
1720
1721 dx *= -3.f / w2;
1722 dy *= -3.f / h2;
1723 dx *= w / w2;
1724 dy *= h / h2;
1725
1726 s2 *= w / w2;
1727 t2 *= h / h2;
1728
1729 glBegin (GL_QUADS);
1730 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);
1731 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);
1732 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);
1733 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);
1734 glEnd ();
1735
1736 glDisable (GL_TEXTURE_2D);
1737 gl.ActiveTexture (GL_TEXTURE0);
1738 }
1739 else
1740 {
1741 /* simple blending of one texture, also opengl <1.3 path */
1742 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743
1744 glBegin (GL_QUADS);
1745 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1746 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1747 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1748 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1749 glEnd ();
1750 }
1751
1752 glPopMatrix ();
1753
1754 glDisable (GL_TEXTURE_2D);
1755 glDisable (GL_BLEND);
1756}
1757
1347IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1758IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1348 CODE: 1759 CODE:
1349{ 1760{
1350 GLint width; 1761 GLint width;
1351 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1762 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1353 RETVAL = width > 0; 1764 RETVAL = width > 0;
1354} 1765}
1355 OUTPUT: 1766 OUTPUT:
1356 RETVAL 1767 RETVAL
1357 1768
1358MODULE = CFPlus PACKAGE = CFPlus::Map 1769MODULE = Deliantra::Client PACKAGE = DC::Map
1359 1770
1360CFPlus::Map 1771PROTOTYPES: DISABLE
1772
1773DC::Map
1361new (SV *class) 1774new (SV *class)
1362 CODE: 1775 CODE:
1363 New (0, RETVAL, 1, struct map); 1776 New (0, RETVAL, 1, struct map);
1364 RETVAL->x = 0; 1777 RETVAL->x = 0;
1365 RETVAL->y = 0; 1778 RETVAL->y = 0;
… …
1373 RETVAL->row = 0; 1786 RETVAL->row = 0;
1374 OUTPUT: 1787 OUTPUT:
1375 RETVAL 1788 RETVAL
1376 1789
1377void 1790void
1378DESTROY (CFPlus::Map self) 1791DESTROY (DC::Map self)
1379 CODE: 1792 CODE:
1380{ 1793{
1381 map_clear (self); 1794 map_clear (self);
1382 Safefree (self->face2tile); 1795 Safefree (self->face2tile);
1383 Safefree (self->tex); 1796 Safefree (self->tex);
1384 Safefree (self); 1797 Safefree (self);
1385} 1798}
1386 1799
1387void 1800void
1388resize (CFPlus::Map self, int map_width, int map_height) 1801resize (DC::Map self, int map_width, int map_height)
1389 CODE: 1802 CODE:
1390 self->w = map_width; 1803 self->w = map_width;
1391 self->h = map_height; 1804 self->h = map_height;
1392 1805
1393void 1806void
1394clear (CFPlus::Map self) 1807clear (DC::Map self)
1395 CODE: 1808 CODE:
1396 map_clear (self); 1809 map_clear (self);
1397 1810
1398void 1811void
1399set_tileid (CFPlus::Map self, int face, int tile) 1812set_tileid (DC::Map self, int face, int tile)
1400 CODE: 1813 CODE:
1401{ 1814{
1402 need_facenum (self, face); self->face2tile [face] = tile; 1815 need_facenum (self, face); self->face2tile [face] = tile;
1403 need_texid (self, tile); 1816 need_texid (self, tile);
1404} 1817}
1405 1818
1406void 1819void
1407set_smooth (CFPlus::Map self, int face, int smooth, int level) 1820set_smooth (DC::Map self, int face, int smooth, int level)
1408 CODE: 1821 CODE:
1409{ 1822{
1410 tileid texid; 1823 tileid texid;
1411 maptex *tex; 1824 maptex *tex;
1412 1825
… …
1425 tex->smoothtile = self->face2tile [smooth]; 1838 tex->smoothtile = self->face2tile [smooth];
1426 tex->smoothlevel = level; 1839 tex->smoothlevel = level;
1427} 1840}
1428 1841
1429void 1842void
1430set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1843set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1431 CODE: 1844 CODE:
1432{ 1845{
1433 need_texid (self, texid); 1846 need_texid (self, texid);
1434 1847
1435 { 1848 {
… …
1454 // use uglier nearest interpolation because linear suffers 1867 // use uglier nearest interpolation because linear suffers
1455 // from transparent color bleeding and ugly wrapping effects. 1868 // from transparent color bleeding and ugly wrapping effects.
1456 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1869 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1457} 1870}
1458 1871
1872void
1873expire_textures (DC::Map self, int texid, int count)
1874 PPCODE:
1875 for (; texid < self->texs && count; ++texid, --count)
1876 {
1877 maptex *tex = self->tex + texid;
1878
1879 if (tex->name)
1880 {
1881 if (tex->unused)
1882 {
1883 tex->name = 0;
1884 tex->unused = 0;
1885 XPUSHs (sv_2mortal (newSViv (texid)));
1886 }
1887 else
1888 tex->unused = 1;
1889 }
1890 }
1891
1459int 1892int
1460ox (CFPlus::Map self) 1893ox (DC::Map self)
1461 ALIAS: 1894 ALIAS:
1462 oy = 1 1895 oy = 1
1463 x = 2 1896 x = 2
1464 y = 3 1897 y = 3
1465 w = 4 1898 w = 4
… …
1476 } 1909 }
1477 OUTPUT: 1910 OUTPUT:
1478 RETVAL 1911 RETVAL
1479 1912
1480void 1913void
1481scroll (CFPlus::Map self, int dx, int dy) 1914scroll (DC::Map self, int dx, int dy)
1482 CODE: 1915 CODE:
1483{ 1916{
1484 if (dx > 0) 1917 if (dx > 0)
1485 map_blank (self, self->x, self->y, dx, self->h); 1918 map_blank (self, self->x, self->y, dx, self->h);
1486 else if (dx < 0) 1919 else if (dx < 0)
… …
1501 self->rows += MAP_EXTEND_Y; 1934 self->rows += MAP_EXTEND_Y;
1502 self->y += MAP_EXTEND_Y; 1935 self->y += MAP_EXTEND_Y;
1503 } 1936 }
1504} 1937}
1505 1938
1506void 1939SV *
1507map1a_update (CFPlus::Map self, SV *data_, int extmap) 1940map1a_update (DC::Map self, SV *data_, int extmap)
1508 CODE: 1941 CODE:
1509{ 1942{
1510 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1943 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1511 uint8_t *data_end = (uint8_t *)SvEND (data_); 1944 uint8_t *data_end = (uint8_t *)SvEND (data_);
1512 mapcell *cell; 1945 mapcell *cell;
1513 int x, y, flags; 1946 int x, y, z, flags;
1947 AV *missing = newAV ();
1948 RETVAL = newRV_noinc ((SV *)missing);
1514 1949
1515 while (data < data_end - 1) 1950 while (data < data_end - 1)
1516 { 1951 {
1517 flags = (data [0] << 8) + data [1]; data += 2; 1952 flags = (data [0] << 8) + data [1]; data += 2;
1518 1953
… …
1538 uint8_t ext, cmd; 1973 uint8_t ext, cmd;
1539 1974
1540 do 1975 do
1541 { 1976 {
1542 ext = *data++; 1977 ext = *data++;
1543 cmd = ext & 0x3f; 1978 cmd = ext & 0x7f;
1544 1979
1545 if (cmd < 4) 1980 if (cmd < 4)
1546 cell->darkness = 255 - ext * 64 + 1; 1981 cell->darkness = 255 - ext * 64 + 1;
1547 else if (cmd == 5) // health 1982 else if (cmd == 5) // health
1548 { 1983 {
… …
1551 } 1986 }
1552 else if (cmd == 6) // monster width 1987 else if (cmd == 6) // monster width
1553 cell->stat_width = *data++ + 1; 1988 cell->stat_width = *data++ + 1;
1554 else if (cmd == 0x47) 1989 else if (cmd == 0x47)
1555 { 1990 {
1556 if (*data == 4) 1991 if (*data == 1) cell->player = data [1];
1557 ; // decode player count 1992 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1993 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1994 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1558 1995
1559 data += *data + 1; 1996 data += *data + 1;
1560 } 1997 }
1561 else if (cmd == 8) // cell flags 1998 else if (cmd == 8) // cell flags
1562 cell->flags = *data++; 1999 cell->flags = *data++;
… …
1569 } 2006 }
1570 else 2007 else
1571 cell->darkness = *data++ + 1; 2008 cell->darkness = *data++ + 1;
1572 } 2009 }
1573 2010
2011 for (z = 0; z <= 2; ++z)
1574 if (flags & 4) 2012 if (flags & (4 >> z))
1575 { 2013 {
1576 faceid face = (data [0] << 8) + data [1]; data += 2; 2014 faceid face = (data [0] << 8) + data [1]; data += 2;
1577 need_facenum (self, face); 2015 need_facenum (self, face);
1578 cell->tile [0] = self->face2tile [face]; 2016 cell->tile [z] = self->face2tile [face];
2017
2018 if (cell->tile [z])
2019 {
2020 maptex *tex = self->tex + cell->tile [z];
2021 tex->unused = 0;
2022 if (!tex->name)
2023 av_push (missing, newSViv (cell->tile [z]));
2024
2025 if (tex->smoothtile)
2026 {
2027 maptex *smooth = self->tex + tex->smoothtile;
2028 smooth->unused = 0;
2029 if (!smooth->name)
2030 av_push (missing, newSViv (tex->smoothtile));
2031 }
2032 }
1579 } 2033 }
1580
1581 if (flags & 2)
1582 {
1583 faceid face = (data [0] << 8) + data [1]; data += 2;
1584 need_facenum (self, face);
1585 cell->tile [1] = self->face2tile [face];
1586 }
1587
1588 if (flags & 1)
1589 {
1590 faceid face = (data [0] << 8) + data [1]; data += 2;
1591 need_facenum (self, face);
1592 cell->tile [2] = self->face2tile [face];
1593 }
1594 } 2034 }
1595 else 2035 else
1596 cell->darkness = 0; 2036 CELL_CLEAR (cell);
1597 } 2037 }
1598} 2038}
2039 OUTPUT:
2040 RETVAL
1599 2041
1600SV * 2042SV *
1601mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2043mapmap (DC::Map self, int x0, int y0, int w, int h)
1602 CODE: 2044 CODE:
1603{ 2045{
1604 int x1, x; 2046 int x1, x;
1605 int y1, y; 2047 int y1, y;
1606 int z; 2048 int z;
… …
1651} 2093}
1652 OUTPUT: 2094 OUTPUT:
1653 RETVAL 2095 RETVAL
1654 2096
1655void 2097void
1656draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2098draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1657 CODE: 2099 CODE:
1658{ 2100{
2101 int x, y, z;
2102
1659 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1660 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2104 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1661 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2105 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1662 smooth_key skey; 2106 smooth_key skey;
1663 int x, y, z; 2107 int pl_x, pl_y;
1664 int last_name; 2108 maptex pl_tex;
2109 rc_t *rc = rc_alloc ();
2110 rc_t *rc_ov = rc_alloc ();
2111 rc_key_t key;
2112 rc_array_t *arr, *arr_hidden;
1665 2113
2114 pl_tex.name = 0;
2115
1666 // thats current max. sorry. 2116 // that's current max. sorry.
1667 if (sw > 255) sw = 255; 2117 if (sw > 255) sw = 255;
1668 if (sh > 255) sh = 255; 2118 if (sh > 255) sh = 255;
1669 2119
1670 // clear key, in case of extra padding 2120 // clear key, in case of extra padding
1671 memset (&skey, 0, sizeof (skey)); 2121 memset (&skey, 0, sizeof (skey));
1672 2122
1673 glColor4ub (255, 255, 255, 255); 2123 memset (&key, 0, sizeof (key));
1674 2124 key.r = 255;
1675 glEnable (GL_BLEND); 2125 key.g = 255;
1676 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2126 key.b = 255;
1677 glEnable (GL_TEXTURE_2D); 2127 key.a = 255;
1678 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2128 key.mode = GL_QUADS;
1679 2129 key.format = GL_T2F_V3F;
1680 glBegin (GL_QUADS);
1681
1682 last_name = 0;
1683 2130
1684 mx += self->x; 2131 mx += self->x;
1685 my += self->y; 2132 my += self->y;
1686 2133
1687 // first pass: determine smooth_max 2134 // first pass: determine smooth_max
… …
1704 MAX (self->tex [cell->tile [1]].smoothlevel, 2151 MAX (self->tex [cell->tile [1]].smoothlevel,
1705 self->tex [cell->tile [2]].smoothlevel)); 2152 self->tex [cell->tile [2]].smoothlevel));
1706 } 2153 }
1707 } 2154 }
1708 2155
2156 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2159
2160 key.texname = self->tex [TEXID_HIDDEN].name;
2161 arr_hidden = rc_array (rc_ov, &key);
2162
1709 for (z = 0; z <= 2; z++) 2163 for (z = 0; z <= 2; z++)
1710 { 2164 {
1711 memset (smooth_level, 0, sizeof (smooth_level)); 2165 memset (smooth_level, 0, sizeof (smooth_level));
2166 key.texname = -1;
1712 2167
1713 for (y = 0; y < sh; y++) 2168 for (y = 0; y < sh; y++)
1714 if (0 <= y + my && y + my < self->rows) 2169 if (0 <= y + my && y + my < self->rows)
1715 { 2170 {
1716 maprow *row = self->row + (y + my); 2171 maprow *row = self->row + (y + my);
… …
1722 tileid tile = cell->tile [z]; 2177 tileid tile = cell->tile [z];
1723 2178
1724 if (tile) 2179 if (tile)
1725 { 2180 {
1726 maptex tex = self->tex [tile]; 2181 maptex tex = self->tex [tile];
1727 int px = (x + 1) * T - tex.w; 2182 int px, py;
1728 int py = (y + 1) * T - tex.h;
1729 2183
1730 // suppressing texture state switches here
1731 // is only moderately effective, but worth the extra effort
1732 if (last_name != tex.name) 2184 if (key.texname != tex.name)
1733 { 2185 {
2186 self->tex [tile].unused = 0;
2187
1734 if (!tex.name) 2188 if (!tex.name)
1735 tex = self->tex [2]; /* missing, replace by noface */ 2189 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1736 2190
1737 glEnd (); 2191 key.texname = tex.name;
1738 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2192 arr = rc_array (rc, &key);
1739 glBegin (GL_QUADS);
1740 } 2193 }
1741 2194
1742 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2195 px = (x + 1) * T - tex.w;
1743 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2196 py = (y + 1) * T - tex.h;
1744 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1745 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1746 2197
1747 if (cell->flags && z == 2) 2198 if (expect_false (cell->player == player) && expect_false (z == 2))
1748 { 2199 {
1749 if (cell->flags & 1) 2200 pl_x = px;
2201 pl_y = py;
2202 pl_tex = tex;
1750 { 2203 continue;
1751 maptex tex = self->tex [1];
1752 int px = x * T + T * 2 / 32;
1753 int py = y * T - T * 6 / 32;
1754
1755 glEnd ();
1756 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1757 glBegin (GL_QUADS);
1758
1759 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1760 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1761 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1762 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1763 }
1764 } 2204 }
2205
2206 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2207 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2208 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2209 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1765 2210
1766 // update smooth hash 2211 // update smooth hash
1767 if (tex.smoothtile) 2212 if (tex.smoothtile)
1768 { 2213 {
1769 skey.tile = tex.smoothtile; 2214 skey.tile = tex.smoothtile;
… …
1800 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2245 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1801 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2246 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1802 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2247 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1803 } 2248 }
1804 } 2249 }
2250
2251 if (expect_false (z == 2))
2252 {
2253 /* draw question marks on top of hidden spaces */
2254 if (!cell->darkness)
2255 {
2256 maptex tex = self->tex [TEXID_HIDDEN];
2257 int px = (x + 1) * T - tex.w;
2258 int py = (y + 1) * T - tex.h;
2259
2260 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264 }
2265
2266 if (expect_false (cell->flags))
2267 {
2268 // overlays such as the speech bubble, probably more to come
2269 if (cell->flags & 1)
2270 {
2271 rc_key_t key_ov = key;
2272 maptex tex = self->tex [TEXID_SPEECH];
2273 rc_array_t *arr;
2274 int px = x * T + T * 2 / 32;
2275 int py = y * T - T * 6 / 32;
2276
2277 key_ov.texname = tex.name;
2278 arr = rc_array (rc_ov, &key_ov);
2279
2280 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2281 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2282 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2283 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2284 }
2285 }
2286 }
1805 } 2287 }
1806 } 2288 }
2289
2290 rc_draw (rc);
2291 rc_clear (rc);
1807 2292
1808 // go through all smoothlevels, lowest to highest, then draw. 2293 // go through all smoothlevels, lowest to highest, then draw.
1809 // this is basically counting sort 2294 // this is basically counting sort
1810 { 2295 {
1811 int w, b; 2296 int w, b;
1812 2297
2298 glEnable (GL_TEXTURE_2D);
2299 glBegin (GL_QUADS);
1813 for (w = 0; w < 256 / 32; ++w) 2300 for (w = 0; w < 256 / 32; ++w)
1814 { 2301 {
1815 uint32_t smask = smooth_level [w]; 2302 uint32_t smask = smooth_level [w];
1816 if (smask) 2303 if (smask)
1817 for (b = 0; b < 32; ++b) 2304 for (b = 0; b < 32; ++b)
… …
1836 int border = bits & 15; 2323 int border = bits & 15;
1837 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2324 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1838 float dx = tex.s * .0625f; // 16 images/row 2325 float dx = tex.s * .0625f; // 16 images/row
1839 float dy = tex.t * .5f ; // 2 images/column 2326 float dy = tex.t * .5f ; // 2 images/column
1840 2327
1841 // this time naively avoiding texture state changes
1842 // save gobs of state changes.
1843 if (last_name != tex.name) 2328 if (tex.name)
1844 { 2329 {
2330 // this time avoiding texture state changes
2331 // save gobs of state changes.
1845 if (!tex.name) 2332 if (key.texname != tex.name)
1846 continue; // smoothing not yet available 2333 {
2334 self->tex [skey->tile].unused = 0;
1847 2335
1848 glEnd (); 2336 glEnd ();
1849 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2337 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1850 glBegin (GL_QUADS); 2338 glBegin (GL_QUADS);
1851 } 2339 }
1852 2340
1853 if (border) 2341 if (border)
1854 { 2342 {
1855 float ox = border * dx; 2343 float ox = border * dx;
1856 2344
1857 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2345 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1858 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2346 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1859 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2347 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1860 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2348 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1861 } 2349 }
1862 2350
1863 if (corner) 2351 if (corner)
1864 { 2352 {
1865 float ox = corner * dx; 2353 float ox = corner * dx;
1866 2354
1867 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2355 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1868 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2356 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1869 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2357 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1870 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2358 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2359 }
1871 } 2360 }
1872 } 2361 }
1873 } 2362 }
1874 } 2363 }
1875 } 2364 }
2365
2366 glEnd ();
2367 glDisable (GL_TEXTURE_2D);
2368 key.texname = -1;
1876 } 2369 }
1877 2370
1878 hv_clear (smooth); 2371 hv_clear (smooth);
1879 } 2372 }
1880 2373
1881 glEnd (); 2374 if (pl_tex.name)
2375 {
2376 maptex tex = pl_tex;
2377 int px = pl_x + sdx;
2378 int py = pl_y + sdy;
1882 2379
1883 glDisable (GL_TEXTURE_2D); 2380 key.texname = tex.name;
2381 arr = rc_array (rc, &key);
2382
2383 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2384 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2385 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2386 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2387
2388 rc_draw (rc);
2389 }
2390
2391 rc_draw (rc_ov);
2392 rc_clear (rc_ov);
2393
1884 glDisable (GL_BLEND); 2394 glDisable (GL_BLEND);
2395 rc_free (rc);
2396 rc_free (rc_ov);
1885 2397
1886 // top layer: overlays such as the health bar 2398 // top layer: overlays such as the health bar
1887 for (y = 0; y < sh; y++) 2399 for (y = 0; y < sh; y++)
1888 if (0 <= y + my && y + my < self->rows) 2400 if (0 <= y + my && y + my < self->rows)
1889 { 2401 {
… …
1894 { 2406 {
1895 mapcell *cell = row->col + (x + mx - row->c0); 2407 mapcell *cell = row->col + (x + mx - row->c0);
1896 2408
1897 int px = x * T; 2409 int px = x * T;
1898 int py = y * T; 2410 int py = y * T;
2411
2412 if (expect_false (cell->player == player))
2413 {
2414 px += sdx;
2415 py += sdy;
2416 }
1899 2417
1900 if (cell->stat_hp) 2418 if (cell->stat_hp)
1901 { 2419 {
1902 int width = cell->stat_width * T; 2420 int width = cell->stat_width * T;
1903 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
1914 } 2432 }
1915 } 2433 }
1916} 2434}
1917 2435
1918void 2436void
1919draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2437draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1920 CODE: 2438 CODE:
1921{ 2439{
1922 static float color[16][3] = { 2440 static float color[16][3] = {
1923 { 0.00F, 0.00F, 0.00F }, 2441 { 0.00f, 0.00f, 0.00f },
1924 { 1.00F, 1.00F, 1.00F }, 2442 { 1.00f, 1.00f, 1.00f },
1925 { 0.00F, 0.00F, 0.55F }, 2443 { 0.00f, 0.00f, 0.55f },
1926 { 1.00F, 0.00F, 0.00F }, 2444 { 1.00f, 0.00f, 0.00f },
1927 2445
1928 { 1.00F, 0.54F, 0.00F }, 2446 { 1.00f, 0.54f, 0.00f },
1929 { 0.11F, 0.56F, 1.00F }, 2447 { 0.11f, 0.56f, 1.00f },
1930 { 0.93F, 0.46F, 0.00F }, 2448 { 0.93f, 0.46f, 0.00f },
1931 { 0.18F, 0.54F, 0.34F }, 2449 { 0.18f, 0.54f, 0.34f },
1932 2450
1933 { 0.56F, 0.73F, 0.56F }, 2451 { 0.56f, 0.73f, 0.56f },
1934 { 0.80F, 0.80F, 0.80F }, 2452 { 0.80f, 0.80f, 0.80f },
1935 { 0.55F, 0.41F, 0.13F }, 2453 { 0.55f, 0.41f, 0.13f },
1936 { 0.99F, 0.77F, 0.26F }, 2454 { 0.99f, 0.77f, 0.26f },
1937 2455
1938 { 0.74F, 0.65F, 0.41F }, 2456 { 0.74f, 0.65f, 0.41f },
1939 2457
1940 { 0.00F, 1.00F, 1.00F }, 2458 { 0.00f, 1.00f, 1.00f },
1941 { 1.00F, 0.00F, 1.00F }, 2459 { 1.00f, 0.00f, 1.00f },
1942 { 1.00F, 1.00F, 0.00F }, 2460 { 1.00f, 1.00f, 0.00f },
1943 }; 2461 };
1944 2462
1945 int x, y; 2463 int x, y;
1946 2464
1947 glEnable (GL_TEXTURE_2D); 2465 glEnable (GL_TEXTURE_2D);
2466 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467 * but the nvidia driver (185.18.14) mishandles alpha textures
2468 * ansd takes the colour from god knows where instead of using
2469 * Cp. MODULATE results in the same colour, but slightly different
2470 * alpha, but atcually gives us the correct colour with nvidia.
2471 */
1948 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1949 glEnable (GL_BLEND); 2473 glEnable (GL_BLEND);
1950 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2474 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1951 glBegin (GL_QUADS); 2475 glBegin (GL_QUADS);
1952 2476
1953 for (y = 0; y < h; y++) 2477 for (y = 0; y < h; y++)
… …
1957 2481
1958 if (m) 2482 if (m)
1959 { 2483 {
1960 float *c = color [m & 15]; 2484 float *c = color [m & 15];
1961 2485
1962 float tx1 = m & 0x40 ? 0.5 : 0.; 2486 float tx1 = m & 0x40 ? 0.5f : 0.f;
1963 float tx2 = tx1 + 0.5; 2487 float tx2 = tx1 + 0.5f;
1964 2488
1965 glColor4f (c[0], c[1], c[2], 0.75); 2489 glColor4f (c[0], c[1], c[2], 1);
1966 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2490 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1967 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2491 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1968 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2492 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1969 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2493 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1970 } 2494 }
… …
1974 glDisable (GL_BLEND); 2498 glDisable (GL_BLEND);
1975 glDisable (GL_TEXTURE_2D); 2499 glDisable (GL_TEXTURE_2D);
1976} 2500}
1977 2501
1978void 2502void
1979fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix) 2503fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1980 PPCODE: 2504 PPCODE:
1981{ 2505{
1982 int x, y; 2506 int x, y;
2507 int sw1 = sw + 2;
2508 int sh1 = sh + 2;
2509 int sh3 = sh * 3;
1983 int sw4 = (sw + 3) & ~3; 2510 int sw34 = (sw * 3 + 3) & ~3;
2511 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1984 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2512 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1985 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2513 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1986 2514
1987 memset (darkness, 255, sw4 * sh);
1988 SvPOK_only (darkness_sv); 2515 SvPOK_only (darkness3_sv);
1989 SvCUR_set (darkness_sv, sw4 * sh); 2516 SvCUR_set (darkness3_sv, sw34 * sh3);
1990 2517
1991 mx += self->x; 2518 mx += self->x - 1;
1992 my += self->y; 2519 my += self->y - 1;
1993 2520
2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2522
1994 for (y = 0; y < sh; y++) 2523 for (y = 0; y < sh1; y++)
1995 if (0 <= y + my && y + my < self->rows) 2524 if (0 <= y + my && y + my < self->rows)
1996 { 2525 {
1997 maprow *row = self->row + (y + my); 2526 maprow *row = self->row + (y + my);
1998 2527
1999 for (x = 0; x < sw; x++) 2528 for (x = 0; x < sw1; x++)
2000 if (row->c0 <= x + mx && x + mx < row->c1) 2529 if (row->c0 <= x + mx && x + mx < row->c1)
2001 { 2530 {
2002 mapcell *cell = row->col + (x + mx - row->c0); 2531 mapcell *cell = row->col + (x + mx - row->c0);
2003 2532
2004 darkness[y * sw4 + x] = cell->darkness 2533 darkness1 [y * sw1 + x] = cell->darkness
2005 ? 255 - (cell->darkness - 1) 2534 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2006 : 255 - FOW_DARKNESS; 2535 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2007 } 2536 }
2008 } 2537 }
2009 2538
2010 if (smoothing)
2011 {
2012 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
2013 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2014
2015 SvPOK_only (darkness2_sv);
2016 SvCUR_set (darkness2_sv, sw4 * sh);
2017
2018 for (y = 0; y < sh; ++y) 2539 for (y = 0; y < sh; ++y)
2019 for (x = 0; x < sw4; ++x) 2540 for (x = 0; x < sw; ++x)
2020 { 2541 {
2021 float *f = (float *)matrix; 2542 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2022 int dx, dy; 2543 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2023 float sum = 0.f; 2544 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2545 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2546 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2547 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2548 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2549 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2550 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2024 2551
2025 for (dy = -1; dy <= 1; ++dy) 2552 uint8_t r11 = (d11 + d21 + d12) / 3;
2026 for (dx = -1; dx <= 1; ++dx) 2553 uint8_t r21 = d21;
2027 { 2554 uint8_t r31 = (d21 + d31 + d32) / 3;
2028 unsigned int x2 = x + dx;
2029 unsigned int y2 = y + dy;
2030 2555
2031 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++; 2556 uint8_t r12 = d12;
2032 } 2557 uint8_t r22 = d22;
2558 uint8_t r32 = d32;
2033 2559
2034 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum; 2560 uint8_t r13 = (d13 + d23 + d12) / 3;
2035 } 2561 uint8_t r23 = d23;
2562 uint8_t r33 = (d23 + d33 + d32) / 3;
2036 2563
2037 darkness_sv = darkness2_sv; 2564 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2565 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2566 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2567 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2568 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2569 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2570 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2571 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2572 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2038 } 2573 }
2574
2575 free (darkness1);
2039 2576
2040 EXTEND (SP, 3); 2577 EXTEND (SP, 3);
2041 PUSHs (sv_2mortal (newSViv (sw4))); 2578 PUSHs (sv_2mortal (newSViv (sw34)));
2042 PUSHs (sv_2mortal (newSViv (sh))); 2579 PUSHs (sv_2mortal (newSViv (sh3)));
2043 PUSHs (darkness_sv); 2580 PUSHs (darkness3_sv);
2044} 2581}
2045 2582
2046SV * 2583SV *
2047get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2584get_rect (DC::Map self, int x0, int y0, int w, int h)
2048 CODE: 2585 CODE:
2049{ 2586{
2050 int x, y, x1, y1; 2587 int x, y, x1, y1;
2051 SV *data_sv = newSV (w * h * 7 + 5); 2588 SV *data_sv = newSV (w * h * 7 + 5);
2052 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2589 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2109 else 2646 else
2110 *data++ = 0; 2647 *data++ = 0;
2111 } 2648 }
2112 } 2649 }
2113 2650
2651 /* if size is w*h + 5 then no data has been found */
2652 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2653 {
2114 SvPOK_only (data_sv); 2654 SvPOK_only (data_sv);
2115 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2655 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656 }
2657
2116 RETVAL = data_sv; 2658 RETVAL = data_sv;
2117} 2659}
2118 OUTPUT: 2660 OUTPUT:
2119 RETVAL 2661 RETVAL
2120 2662
2121void 2663void
2122set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2664set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2123 PPCODE: 2665 PPCODE:
2124{ 2666{
2125 int x, y, z; 2667 int x, y, z;
2126 int w, h; 2668 int w, h;
2127 int x1, y1; 2669 int x1, y1;
2670 STRLEN len;
2671 uint8_t *data, *end;
2672
2673 len = SvLEN (data_sv);
2674 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2675 data = SvPVbyte_nolen (data_sv);
2676 end = data + len + 8;
2677
2678 if (len < 5)
2679 XSRETURN_EMPTY;
2128 2680
2129 if (*data++ != 0) 2681 if (*data++ != 0)
2130 return; /* version mismatch */ 2682 XSRETURN_EMPTY; /* version mismatch */
2131 2683
2132 w = *data++ << 8; w |= *data++; 2684 w = *data++ << 8; w |= *data++;
2133 h = *data++ << 8; h |= *data++; 2685 h = *data++ << 8; h |= *data++;
2134 2686
2135 // we need to do this 'cause we don't keep an absolute coord system for rows 2687 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2147 { 2699 {
2148 maprow *row = map_get_row (self, y); 2700 maprow *row = map_get_row (self, y);
2149 2701
2150 for (x = x0; x < x1; x++) 2702 for (x = x0; x < x1; x++)
2151 { 2703 {
2704 uint8_t flags;
2705
2706 if (data + 7 >= end)
2707 XSRETURN_EMPTY;
2708
2152 uint8_t flags = *data++; 2709 flags = *data++;
2153 2710
2154 if (flags) 2711 if (flags)
2155 { 2712 {
2156 mapcell *cell = row_get_cell (row, x); 2713 mapcell *cell = row_get_cell (row, x);
2157 tileid tile[3] = { 0, 0, 0 }; 2714 tileid tile[3] = { 0, 0, 0 };
… …
2160 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2717 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2161 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2718 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2162 2719
2163 if (cell->darkness == 0) 2720 if (cell->darkness == 0)
2164 { 2721 {
2165 cell->darkness = 0; 2722 /*cell->darkness = 0;*/
2723 EXTEND (SP, 3);
2166 2724
2167 for (z = 0; z <= 2; z++) 2725 for (z = 0; z <= 2; z++)
2168 { 2726 {
2169 tileid t = tile [z]; 2727 tileid t = tile [z];
2170 2728
2171 if (t >= self->texs || (t && !self->tex [t].name)) 2729 if (t >= self->texs || (t && !self->tex [t].name))
2172 { 2730 {
2173 XPUSHs (sv_2mortal (newSViv (t))); 2731 PUSHs (sv_2mortal (newSViv (t)));
2174 need_texid (self, t); 2732 need_texid (self, t);
2175 } 2733 }
2176 2734
2177 cell->tile [z] = t; 2735 cell->tile [z] = t;
2178 } 2736 }
… …
2180 } 2738 }
2181 } 2739 }
2182 } 2740 }
2183} 2741}
2184 2742
2185MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2743MODULE = Deliantra::Client PACKAGE = DC::RW
2186 2744
2187CFPlus::MixChunk 2745DC::RW
2188new_from_file (SV *class, char *path) 2746new (SV *class, SV *data_sv)
2189 CODE: 2747 CODE:
2190 RETVAL = Mix_LoadWAV (path); 2748{
2749 STRLEN datalen;
2750 char *data = SvPVbyte (data_sv, datalen);
2751
2752 RETVAL = SDL_RWFromConstMem (data, datalen);
2753}
2191 OUTPUT: 2754 OUTPUT:
2192 RETVAL 2755 RETVAL
2193 2756
2757DC::RW
2758new_from_file (SV *class, const char *path, const char *mode = "rb")
2759 CODE:
2760 RETVAL = SDL_RWFromFile (path, mode);
2761 OUTPUT:
2762 RETVAL
2763
2764# fails on win32:
2765# dc.xs(2268) : error C2059: syntax error : '('
2194void 2766#void
2767#close (DC::RW self)
2768# CODE:
2769# (self->(close)) (self);
2770
2771MODULE = Deliantra::Client PACKAGE = DC::Channel
2772
2773PROTOTYPES: DISABLE
2774
2775DC::Channel
2776find ()
2777 CODE:
2778{
2779 RETVAL = Mix_GroupAvailable (-1);
2780
2781 if (RETVAL < 0)
2782 {
2783 RETVAL = Mix_GroupOldest (-1);
2784
2785 if (RETVAL < 0)
2786 XSRETURN_UNDEF;
2787
2788 Mix_HaltChannel (RETVAL);
2789 }
2790
2791 Mix_UnregisterAllEffects (RETVAL);
2792 Mix_Volume (RETVAL, 128);
2793}
2794 OUTPUT:
2795 RETVAL
2796
2797void
2798halt (DC::Channel self)
2799 CODE:
2800 Mix_HaltChannel (self);
2801
2802void
2803expire (DC::Channel self, int ticks = -1)
2804 CODE:
2805 Mix_ExpireChannel (self, ticks);
2806
2807void
2808fade_out (DC::Channel self, int ticks = -1)
2809 CODE:
2810 Mix_FadeOutChannel (self, ticks);
2811
2812int
2813volume (DC::Channel self, int volume)
2814 CODE:
2815 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2816 OUTPUT:
2817 RETVAL
2818
2819void
2820unregister_all_effects (DC::Channel self)
2821 CODE:
2822 Mix_UnregisterAllEffects (self);
2823
2824void
2825set_panning (DC::Channel self, int left, int right)
2826 CODE:
2827 left = CLAMP (left , 0, 255);
2828 right = CLAMP (right, 0, 255);
2829 Mix_SetPanning (self, left, right);
2830
2831void
2832set_distance (DC::Channel self, int distance)
2833 CODE:
2834 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2835
2836void
2837set_position (DC::Channel self, int angle, int distance)
2838 CODE:
2839
2840void
2841set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2842 CODE:
2843{
2844 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2845 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2846 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2847}
2848
2849void
2850set_reverse_stereo (DC::Channel self, int flip)
2851 CODE:
2852 Mix_SetReverseStereo (self, flip);
2853
2854MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2855
2856PROTOTYPES: DISABLE
2857
2858DC::MixChunk
2859new (SV *class, DC::RW rwops)
2860 CODE:
2861 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2862 OUTPUT:
2863 RETVAL
2864
2865void
2195DESTROY (CFPlus::MixChunk self) 2866DESTROY (DC::MixChunk self)
2196 CODE: 2867 CODE:
2197 Mix_FreeChunk (self); 2868 Mix_FreeChunk (self);
2198 2869
2199int 2870int
2200volume (CFPlus::MixChunk self, int volume = -1) 2871volume (DC::MixChunk self, int volume = -1)
2201 CODE: 2872 CODE:
2873 if (items > 1)
2874 volume = CLAMP (volume, 0, 128);
2202 RETVAL = Mix_VolumeChunk (self, volume); 2875 RETVAL = Mix_VolumeChunk (self, volume);
2203 OUTPUT: 2876 OUTPUT:
2204 RETVAL 2877 RETVAL
2205 2878
2206int 2879DC::Channel
2207play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2880play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2208 CODE: 2881 CODE:
2882{
2209 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2883 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2884
2885 if (RETVAL < 0)
2886 XSRETURN_UNDEF;
2887
2888 if (channel < 0)
2889 {
2890 Mix_UnregisterAllEffects (RETVAL);
2891 Mix_Volume (RETVAL, 128);
2892 }
2893}
2210 OUTPUT: 2894 OUTPUT:
2211 RETVAL 2895 RETVAL
2212 2896
2213MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2897MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2214 2898
2215int 2899int
2216volume (int volume = -1) 2900volume (int volume = -1)
2901 PROTOTYPE: ;$
2217 CODE: 2902 CODE:
2903 if (items > 0)
2904 volume = CLAMP (volume, 0, 128);
2218 RETVAL = Mix_VolumeMusic (volume); 2905 RETVAL = Mix_VolumeMusic (volume);
2219 OUTPUT: 2906 OUTPUT:
2220 RETVAL 2907 RETVAL
2221 2908
2222int 2909void
2223fade_out (int ms) 2910fade_out (int ms)
2224 CODE: 2911 CODE:
2225 RETVAL = Mix_FadeOutMusic (ms); 2912 Mix_FadeOutMusic (ms);
2913
2914void
2915halt ()
2916 CODE:
2917 Mix_HaltMusic ();
2918
2919DC::MixMusic
2920new (SV *class, DC::RW rwops)
2921 CODE:
2922 RETVAL = Mix_LoadMUS_RW (rwops);
2226 OUTPUT: 2923 OUTPUT:
2227 RETVAL 2924 RETVAL
2228 2925
2229CFPlus::MixMusic
2230new_from_file (SV *class, char *path)
2231 CODE:
2232 RETVAL = Mix_LoadMUS (path);
2233 OUTPUT:
2234 RETVAL
2235
2236void 2926void
2237DESTROY (CFPlus::MixMusic self) 2927DESTROY (DC::MixMusic self)
2238 CODE: 2928 CODE:
2239 Mix_FreeMusic (self); 2929 Mix_FreeMusic (self);
2240 2930
2241int 2931int
2242play (CFPlus::MixMusic self, int loops = -1) 2932play (DC::MixMusic self, int loops = -1)
2243 CODE: 2933 CODE:
2244 RETVAL = Mix_PlayMusic (self, loops); 2934 RETVAL = Mix_PlayMusic (self, loops);
2245 OUTPUT: 2935 OUTPUT:
2246 RETVAL 2936 RETVAL
2247 2937
2248int 2938void
2249fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2939fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2250 CODE: 2940 CODE:
2251 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2941 Mix_FadeInMusicPos (self, loops, ms, position);
2252 OUTPUT:
2253 RETVAL
2254 2942
2255MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2943MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2944
2945PROTOTYPES: ENABLE
2256 2946
2257BOOT: 2947BOOT:
2258{ 2948{
2259 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2949 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2260 static const struct { 2950 static const struct {
2261 const char *name; 2951 const char *name;
2262 IV iv; 2952 IV iv;
2263 } *civ, const_iv[] = { 2953 } *civ, const_iv[] = {
2264# define const_iv(name) { # name, (IV)name } 2954# define const_iv(name) { # name, (IV)name }
2265 const_iv (GL_VENDOR), 2955 const_iv (GL_VENDOR),
2266 const_iv (GL_VERSION), 2956 const_iv (GL_VERSION),
2267 const_iv (GL_EXTENSIONS), 2957 const_iv (GL_EXTENSIONS),
2958 const_iv (GL_MAX_TEXTURE_UNITS),
2268 const_iv (GL_COLOR_MATERIAL), 2959 const_iv (GL_COLOR_MATERIAL),
2269 const_iv (GL_SMOOTH), 2960 const_iv (GL_SMOOTH),
2270 const_iv (GL_FLAT), 2961 const_iv (GL_FLAT),
2271 const_iv (GL_DITHER), 2962 const_iv (GL_DITHER),
2272 const_iv (GL_BLEND), 2963 const_iv (GL_BLEND),
… …
2276 const_iv (GL_ALPHA_TEST), 2967 const_iv (GL_ALPHA_TEST),
2277 const_iv (GL_NORMALIZE), 2968 const_iv (GL_NORMALIZE),
2278 const_iv (GL_RESCALE_NORMAL), 2969 const_iv (GL_RESCALE_NORMAL),
2279 const_iv (GL_FRONT), 2970 const_iv (GL_FRONT),
2280 const_iv (GL_BACK), 2971 const_iv (GL_BACK),
2972 const_iv (GL_AUX0),
2281 const_iv (GL_AND), 2973 const_iv (GL_AND),
2282 const_iv (GL_ONE), 2974 const_iv (GL_ONE),
2283 const_iv (GL_ZERO), 2975 const_iv (GL_ZERO),
2284 const_iv (GL_SRC_ALPHA), 2976 const_iv (GL_SRC_ALPHA),
2285 const_iv (GL_DST_ALPHA), 2977 const_iv (GL_DST_ALPHA),
2286 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2978 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2287 const_iv (GL_ONE_MINUS_DST_ALPHA), 2979 const_iv (GL_ONE_MINUS_DST_ALPHA),
2980 const_iv (GL_SRC_COLOR),
2981 const_iv (GL_DST_COLOR),
2982 const_iv (GL_ONE_MINUS_SRC_COLOR),
2983 const_iv (GL_ONE_MINUS_DST_COLOR),
2288 const_iv (GL_SRC_ALPHA_SATURATE), 2984 const_iv (GL_SRC_ALPHA_SATURATE),
2289 const_iv (GL_RGB), 2985 const_iv (GL_RGB),
2290 const_iv (GL_RGBA), 2986 const_iv (GL_RGBA),
2291 const_iv (GL_RGBA4), 2987 const_iv (GL_RGBA4),
2292 const_iv (GL_RGBA8), 2988 const_iv (GL_RGBA8),
… …
2298 const_iv (GL_INTENSITY), 2994 const_iv (GL_INTENSITY),
2299 const_iv (GL_LUMINANCE), 2995 const_iv (GL_LUMINANCE),
2300 const_iv (GL_LUMINANCE_ALPHA), 2996 const_iv (GL_LUMINANCE_ALPHA),
2301 const_iv (GL_FLOAT), 2997 const_iv (GL_FLOAT),
2302 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2998 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2999 const_iv (GL_COMPRESSED_ALPHA_ARB),
3000 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3001 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3002 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3003 const_iv (GL_COMPRESSED_RGB_ARB),
3004 const_iv (GL_COMPRESSED_RGBA_ARB),
2303 const_iv (GL_COMPILE), 3005 const_iv (GL_COMPILE),
2304 const_iv (GL_PROXY_TEXTURE_1D), 3006 const_iv (GL_PROXY_TEXTURE_1D),
2305 const_iv (GL_PROXY_TEXTURE_2D), 3007 const_iv (GL_PROXY_TEXTURE_2D),
2306 const_iv (GL_TEXTURE_1D), 3008 const_iv (GL_TEXTURE_1D),
2307 const_iv (GL_TEXTURE_2D), 3009 const_iv (GL_TEXTURE_2D),
… …
2331 const_iv (GL_COLOR_LOGIC_OP), 3033 const_iv (GL_COLOR_LOGIC_OP),
2332 const_iv (GL_SEPARABLE_2D), 3034 const_iv (GL_SEPARABLE_2D),
2333 const_iv (GL_CONVOLUTION_2D), 3035 const_iv (GL_CONVOLUTION_2D),
2334 const_iv (GL_CONVOLUTION_BORDER_MODE), 3036 const_iv (GL_CONVOLUTION_BORDER_MODE),
2335 const_iv (GL_CONSTANT_BORDER), 3037 const_iv (GL_CONSTANT_BORDER),
3038 const_iv (GL_POINTS),
2336 const_iv (GL_LINES), 3039 const_iv (GL_LINES),
2337 const_iv (GL_LINE_STRIP), 3040 const_iv (GL_LINE_STRIP),
2338 const_iv (GL_LINE_LOOP), 3041 const_iv (GL_LINE_LOOP),
2339 const_iv (GL_QUADS), 3042 const_iv (GL_QUADS),
2340 const_iv (GL_QUAD_STRIP), 3043 const_iv (GL_QUAD_STRIP),
2341 const_iv (GL_TRIANGLES), 3044 const_iv (GL_TRIANGLES),
2342 const_iv (GL_TRIANGLE_STRIP), 3045 const_iv (GL_TRIANGLE_STRIP),
2343 const_iv (GL_TRIANGLE_FAN), 3046 const_iv (GL_TRIANGLE_FAN),
3047 const_iv (GL_POLYGON),
2344 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3048 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
3049 const_iv (GL_POINT_SMOOTH_HINT),
3050 const_iv (GL_LINE_SMOOTH_HINT),
3051 const_iv (GL_POLYGON_SMOOTH_HINT),
3052 const_iv (GL_GENERATE_MIPMAP_HINT),
3053 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2345 const_iv (GL_FASTEST), 3054 const_iv (GL_FASTEST),
3055 const_iv (GL_DONT_CARE),
3056 const_iv (GL_NICEST),
2346 const_iv (GL_V2F), 3057 const_iv (GL_V2F),
2347 const_iv (GL_V3F), 3058 const_iv (GL_V3F),
2348 const_iv (GL_T2F_V3F), 3059 const_iv (GL_T2F_V3F),
2349 const_iv (GL_T2F_N3F_V3F), 3060 const_iv (GL_T2F_N3F_V3F),
3061 const_iv (GL_FUNC_ADD),
3062 const_iv (GL_FUNC_SUBTRACT),
3063 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2350# undef const_iv 3064# undef const_iv
2351 }; 3065 };
2352 3066
2353 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3067 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2354 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2355 3069
2356 texture_av = newAV (); 3070 texture_av = newAV ();
2357 AvREAL_off (texture_av); 3071 AvREAL_off (texture_av);
2358} 3072}
2359 3073
3074void
3075disable_GL_EXT_blend_func_separate ()
3076 CODE:
3077 gl.BlendFuncSeparate = 0;
3078 gl.BlendFuncSeparateEXT = 0;
3079
3080void
3081apple_nvidia_bug (int enable)
3082
2360char * 3083char *
2361gl_vendor () 3084gl_vendor ()
2362 CODE: 3085 CODE:
2363 RETVAL = (char *)glGetString (GL_VENDOR); 3086 RETVAL = (char *)glGetString (GL_VENDOR);
2364 OUTPUT: 3087 OUTPUT:
… …
2413 3136
2414void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3137void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2415 CODE: 3138 CODE:
2416 gl_BlendFuncSeparate (sa, da, saa, daa); 3139 gl_BlendFuncSeparate (sa, da, saa, daa);
2417 3140
3141# void glBlendEquation (int se)
3142
2418void glDepthMask (int flag) 3143void glDepthMask (int flag)
2419 3144
2420void glLogicOp (int opcode) 3145void glLogicOp (int opcode)
2421 3146
2422void glColorMask (int red, int green, int blue, int alpha) 3147void glColorMask (int red, int green, int blue, int alpha)
… …
2436# near_ and far_ are due to microsofts buggy "c" compiler 3161# near_ and far_ are due to microsofts buggy "c" compiler
2437void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 3162void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2438 3163
2439# near_ and far_ are due to microsofts buggy "c" compiler 3164# near_ and far_ are due to microsofts buggy "c" compiler
2440void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 3165void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
3166
3167PROTOTYPES: DISABLE
2441 3168
2442void glViewport (int x, int y, int width, int height) 3169void glViewport (int x, int y, int width, int height)
2443 3170
2444void glScissor (int x, int y, int width, int height) 3171void glScissor (int x, int y, int width, int height)
2445 3172
… …
2453 3180
2454void glRotate (float angle, float x, float y, float z) 3181void glRotate (float angle, float x, float y, float z)
2455 CODE: 3182 CODE:
2456 glRotatef (angle, x, y, z); 3183 glRotatef (angle, x, y, z);
2457 3184
2458void glBegin (int mode)
2459
2460void glEnd ()
2461
2462void glColor (float r, float g, float b, float a = 1.0) 3185void glColor (float r, float g, float b, float a = 1.0)
2463 PROTOTYPE: @ 3186 PROTOTYPE: @
2464 ALIAS: 3187 ALIAS:
2465 glColor_premultiply = 1 3188 glColor_premultiply = 1
2466 CODE: 3189 CODE:
2467 if (ix) 3190 if (ix)
2468 { 3191 {
… …
2471 b *= a; 3194 b *= a;
2472 } 3195 }
2473 // microsoft visual "c" rounds instead of truncating... 3196 // microsoft visual "c" rounds instead of truncating...
2474 glColor4f (r, g, b, a); 3197 glColor4f (r, g, b, a);
2475 3198
2476void glInterleavedArrays (int format, int stride, char *data)
2477
2478void glDrawElements (int mode, int count, int type, char *indices)
2479
2480# 1.2 void glDrawRangeElements (int mode, int start, int end
2481
2482void glRasterPos (float x, float y, float z = 0.) 3199void glRasterPos (float x, float y, float z = 0.)
2483 CODE: 3200 CODE:
2484 glRasterPos3f (0, 0, z); 3201 glRasterPos3f (0, 0, z);
2485 glBitmap (0, 0, 0, 0, x, y, 0); 3202 glBitmap (0, 0, 0, 0, x, y, 0);
2486 3203
… …
2490 3207
2491void glTexCoord (float s, float t) 3208void glTexCoord (float s, float t)
2492 CODE: 3209 CODE:
2493 glTexCoord2f (s, t); 3210 glTexCoord2f (s, t);
2494 3211
3212void glRect (float x1, float y1, float x2, float y2)
3213 CODE:
3214 glRectf (x1, y1, x2, y2);
3215
3216void glRect_lineloop (float x1, float y1, float x2, float y2)
3217 CODE:
3218 glBegin (GL_LINE_LOOP);
3219 glVertex2f (x1, y1);
3220 glVertex2f (x2, y1);
3221 glVertex2f (x2, y2);
3222 glVertex2f (x1, y2);
3223 glEnd ();
3224
3225PROTOTYPES: ENABLE
3226
3227void glBegin (int mode)
3228
3229void glEnd ()
3230
3231void glPointSize (GLfloat size)
3232
3233void glLineWidth (GLfloat width)
3234
3235void glInterleavedArrays (int format, int stride, char *data)
3236
3237void glDrawElements (int mode, int count, int type, char *indices)
3238
3239# 1.2 void glDrawRangeElements (int mode, int start, int end
3240
2495void glTexEnv (int target, int pname, float param) 3241void glTexEnv (int target, int pname, float param)
2496 CODE: 3242 CODE:
2497 glTexEnvf (target, pname, param); 3243 glTexEnvf (target, pname, param);
2498 3244
2499void glTexParameter (int target, int pname, float param) 3245void glTexParameter (int target, int pname, float param)
… …
2515void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3261void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2516 CODE: 3262 CODE:
2517 if (gl.SeparableFilter2D) 3263 if (gl.SeparableFilter2D)
2518 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3264 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2519 3265
2520void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3266void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2521 3267
2522void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3268void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2523 3269
2524void glDrawPixels (int width, int height, int format, int type, char *pixels) 3270void glDrawPixels (int width, int height, int format, int type, char *pixels)
2525 3271
… …
2551 3297
2552void glEndList () 3298void glEndList ()
2553 3299
2554void glCallList (int list) 3300void glCallList (int list)
2555 3301
3302MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3303
3304PROTOTYPES: DISABLE
3305
3306void
3307find_widget (SV *self, NV x, NV y)
3308 PPCODE:
3309{
3310 if (within_widget (self, x, y))
3311 XPUSHs (self);
3312}
3313
3314BOOT:
3315{
3316 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3317
3318 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3319 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3320 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3321 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3322}
3323
3324void
3325draw (SV *self)
3326 CODE:
3327{
3328 HV *hv;
3329 SV **svp;
3330 NV x, y, w, h;
3331 SV *draw_x_sv = GvSV (draw_x_gv);
3332 SV *draw_y_sv = GvSV (draw_y_gv);
3333 SV *draw_w_sv = GvSV (draw_w_gv);
3334 SV *draw_h_sv = GvSV (draw_h_gv);
3335 double draw_x, draw_y;
3336
3337 if (!SvROK (self))
3338 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3339
3340 hv = (HV *)SvRV (self);
3341
3342 if (SvTYPE (hv) != SVt_PVHV)
3343 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3344
3345 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3346 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3347
3348 if (!h || !w)
3349 XSRETURN_EMPTY;
3350
3351 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3352 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3353
3354 draw_x = SvNV (draw_x_sv) + x;
3355 draw_y = SvNV (draw_y_sv) + y;
3356
3357 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3358 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3359 XSRETURN_EMPTY;
3360
3361 sv_setnv (draw_x_sv, draw_x);
3362 sv_setnv (draw_y_sv, draw_y);
3363
3364 glPushMatrix ();
3365 glTranslated (x, y, 0);
3366
3367 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3368 {
3369 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3370
3371 if (svp && SvTRUE (*svp))
3372 {
3373 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3374 glEnable (GL_BLEND);
3375 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3376 glBegin (GL_QUADS);
3377 glVertex2f (0, 0);
3378 glVertex2f (w, 0);
3379 glVertex2f (w, h);
3380 glVertex2f (0, h);
3381 glEnd ();
3382 glDisable (GL_BLEND);
3383 }
3384 }
3385#if 0
3386 // draw borders, for debugging
3387 glPushMatrix ();
3388 glColor4f (1., 1., 0., 1.);
3389 glTranslatef (.5, .5, 0.);
3390 glBegin (GL_LINE_LOOP);
3391 glVertex2f (0 , 0);
3392 glVertex2f (w - 1, 0);
3393 glVertex2f (w - 1, h - 1);
3394 glVertex2f (0 , h - 1);
3395 glEnd ();
3396 glPopMatrix ();
3397#endif
3398 PUSHMARK (SP);
3399 XPUSHs (self);
3400 PUTBACK;
3401 call_method ("_draw", G_VOID | G_DISCARD);
3402 SPAGAIN;
3403
3404 glPopMatrix ();
3405
3406 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3407 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3408}
3409

Diff Legend

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