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.192 by root, Fri Apr 27 21:27:51 2007 UTC vs.
Revision 1.295 by root, Mon Dec 21 03:30:22 2009 UTC

… …
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
15#ifdef _WIN32 20#ifdef _WIN32
16# 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
17#endif 26#endif
18 27
19#include <assert.h> 28#include <assert.h>
20#include <math.h> 29#include <math.h>
21#include <string.h> 30#include <string.h>
22#include <stdio.h> 31#include <stdio.h>
23#include <stdlib.h> 32#include <stdlib.h>
24 33
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35
25#include <SDL.h> 36#include <SDL.h>
37#include <SDL_thread.h>
26#include <SDL_endian.h> 38#include <SDL_endian.h>
27#include <SDL_image.h> 39#include <SDL_image.h>
28#include <SDL_mixer.h> 40#include <SDL_mixer.h>
29#include <SDL_opengl.h> 41#include <SDL_opengl.h>
30 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
31#define PANGO_ENABLE_BACKEND 48#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS 49#define G_DISABLE_CAST_CHECKS
33 50
34#include <glib/gmacros.h> 51#include <glib/gmacros.h>
35 52
36#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
37 65
38#ifndef _WIN32 66#ifndef _WIN32
39# include <sys/types.h> 67# include <sys/types.h>
40# include <sys/socket.h> 68# include <sys/socket.h>
41# include <netinet/in.h> 69# include <netinet/in.h>
42# include <netinet/tcp.h> 70# include <netinet/tcp.h>
43# include <inttypes.h> 71# include <inttypes.h>
44#endif 72#endif
45 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
46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
47 84
48#define FOW_DARKNESS 32 85#define FOW_DARKNESS 64
86#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */
49 87
50#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
51#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
52 90
53#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
54 92
55#if 0 93/* mask out modifiers we are not interested in */
56# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
57#else 95
58# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
59#endif 97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
60 101
61static AV *texture_av; 102static AV *texture_av;
62 103
63static struct 104static struct
64{ 105{
… …
101 av_push (texture_av, (SV *)(size_t)name); 142 av_push (texture_av, (SV *)(size_t)name);
102 glDeleteTextures (1, &name); 143 glDeleteTextures (1, &name);
103} 144}
104 145
105#include "texcache.c" 146#include "texcache.c"
147#include "rendercache.c"
106 148
107#include "pango-font.c" 149#include "pango-font.c"
108#include "pango-fontmap.c" 150#include "pango-fontmap.c"
109#include "pango-render.c" 151#include "pango-render.c"
110 152
153typedef IV DC__Channel;
154typedef SDL_RWops *DC__RW;
111typedef Mix_Chunk *CFPlus__MixChunk; 155typedef Mix_Chunk *DC__MixChunk;
112typedef Mix_Music *CFPlus__MixMusic; 156typedef Mix_Music *DC__MixMusic;
113 157
114typedef PangoFontDescription *CFPlus__Font; 158typedef PangoFontDescription *DC__Font;
115 159
116static int 160static int
117shape_attr_p (PangoLayoutRun *run) 161shape_attr_p (PangoLayoutRun *run)
118{ 162{
119 GSList *attrs = run->item->analysis.extra_attrs; 163 GSList *attrs = run->item->analysis.extra_attrs;
… …
133 177
134typedef struct cf_layout { 178typedef struct cf_layout {
135 PangoLayout *pl; 179 PangoLayout *pl;
136 float r, g, b, a; // default color for rgba mode 180 float r, g, b, a; // default color for rgba mode
137 int base_height; 181 int base_height;
138 CFPlus__Font font; 182 DC__Font font;
183 rc_t *rc;
139} *CFPlus__Layout; 184} *DC__Layout;
140 185
141static CFPlus__Font default_font; 186static DC__Font default_font;
142static PangoContext *opengl_context; 187static PangoContext *opengl_context;
143static PangoFontMap *opengl_fontmap; 188static PangoFontMap *opengl_fontmap;
144 189
145static void 190static void
146substitute_func (FcPattern *pattern, gpointer data) 191substitute_func (FcPattern *pattern, gpointer data)
… …
151#endif 196#endif
152 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 197 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
153} 198}
154 199
155static void 200static void
156layout_update_font (CFPlus__Layout self) 201layout_update_font (DC__Layout self)
157{ 202{
158 /* 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
159 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
160 */ 205 */
161 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
162 207
163 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
164 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
165 210
166 pango_layout_set_font_description (self->pl, font); 211 pango_layout_set_font_description (self->pl, font);
167} 212}
168 213
169static void 214static void
170layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 215layout_get_pixel_size (DC__Layout self, int *w, int *h)
171{ 216{
172 PangoRectangle rect; 217 PangoRectangle rect;
173 218
174 // get_pixel_* wrongly rounds down 219 // get_pixel_* wrongly rounds down
175 pango_layout_get_extents (self->pl, 0, &rect); 220 pango_layout_get_extents (self->pl, 0, &rect);
… …
186 231
187typedef uint16_t tileid; 232typedef uint16_t tileid;
188typedef uint16_t faceid; 233typedef uint16_t faceid;
189 234
190typedef struct { 235typedef struct {
191 int name; 236 GLuint name;
192 int w, h; 237 int w, h;
193 float s, t; 238 float s, t;
194 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
195 tileid smoothtile; 240 tileid smoothtile;
196 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
197} maptex; 243} maptex;
198 244
199typedef struct { 245typedef struct {
200 uint32_t player; 246 uint32_t player;
201 tileid tile[3]; 247 tileid tile[3];
… …
214 int faces; tileid *face2tile; // [faceid] 260 int faces; tileid *face2tile; // [faceid]
215 int texs; maptex *tex; // [tileid] 261 int texs; maptex *tex; // [tileid]
216 262
217 int32_t rows; 263 int32_t rows;
218 maprow *row; 264 maprow *row;
219} *CFPlus__Map; 265} *DC__Map;
220 266
221static char * 267static char *
222prepend (char *ptr, int sze, int inc) 268prepend (char *ptr, int sze, int inc)
223{ 269{
224 char *p; 270 char *p;
… …
262 self->texs *= 2; 308 self->texs *= 2;
263 } 309 }
264} 310}
265 311
266static maprow * 312static maprow *
267map_get_row (CFPlus__Map self, int y) 313map_get_row (DC__Map self, int y)
268{ 314{
269 if (0 > y) 315 if (0 > y)
270 { 316 {
271 int extend = - y + MAP_EXTEND_Y; 317 int extend = - y + MAP_EXTEND_Y;
272 Prepend (maprow, self->row, self->rows, extend); 318 Prepend (maprow, self->row, self->rows, extend);
… …
310 356
311 return row->col + (x - row->c0); 357 return row->col + (x - row->c0);
312} 358}
313 359
314static mapcell * 360static mapcell *
315map_get_cell (CFPlus__Map self, int x, int y) 361map_get_cell (DC__Map self, int x, int y)
316{ 362{
317 return row_get_cell (map_get_row (self, y), x); 363 return row_get_cell (map_get_row (self, y), x);
318} 364}
319 365
320static void 366static void
321map_clear (CFPlus__Map self) 367map_clear (DC__Map self)
322{ 368{
323 int r; 369 int r;
324 370
325 for (r = 0; r < self->rows; r++) 371 for (r = 0; r < self->rows; r++)
326 Safefree (self->row[r].col); 372 Safefree (self->row[r].col);
… …
333 self->oy = 0; 379 self->oy = 0;
334 self->row = 0; 380 self->row = 0;
335 self->rows = 0; 381 self->rows = 0;
336} 382}
337 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
338static void 394static void
339map_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)
340{ 396{
341 int x, y; 397 int x, y;
342 maprow *row; 398 maprow *row;
343 mapcell *cell; 399 mapcell *cell;
344 400
… …
356 if (x >= row->c1) 412 if (x >= row->c1)
357 break; 413 break;
358 414
359 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
360 416
361 cell->darkness = 0; 417 CELL_CLEAR (cell);
362 cell->stat_hp = 0;
363 cell->flags = 0;
364 cell->player = 0;
365 } 418 }
366 } 419 }
367} 420}
368 421
369typedef struct { 422typedef struct {
… …
423 n |= n >> 16; 476 n |= n >> 16;
424 477
425 return n + 1; 478 return n + 1;
426} 479}
427 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
428/* SDL should provide this, really. */ 492/* SDL should provide this, really. */
429#define SDLK_MODIFIER_MIN 300 493#define SDLK_MODIFIER_MIN 300
430#define SDLK_MODIFIER_MAX 314 494#define SDLK_MODIFIER_MAX 314
431 495
432MODULE = 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
433 592
434PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
435 594
436BOOT: 595BOOT:
437{ 596{
438 HV *stash = gv_stashpv ("CFPlus", 1); 597 HV *stash = gv_stashpv ("DC", 1);
439 static const struct { 598 static const struct {
440 const char *name; 599 const char *name;
441 IV iv; 600 IV iv;
442 } *civ, const_iv[] = { 601 } *civ, const_iv[] = {
443# define const_iv(name) { # name, (IV)name } 602# define const_iv(name) { # name, (IV)name }
… …
465 624
466 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
467 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
468 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
469 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),
470 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
471 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
472 const_iv (SDLK_KP2), 683 const_iv (SDLK_KP2),
473 const_iv (SDLK_KP3), 684 const_iv (SDLK_KP3),
474 const_iv (SDLK_KP4), 685 const_iv (SDLK_KP4),
… …
546 const_iv (KMOD_LMETA), 757 const_iv (KMOD_LMETA),
547 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
548 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
549 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
550 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)
551# undef const_iv 795# undef const_iv
552 }; 796 };
553 797
554 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; )
555 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
573 817
574NV floor (NV x) 818NV floor (NV x)
575 819
576NV ceil (NV x) 820NV ceil (NV x)
577 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
578void 832void
579pango_init () 833pango_init ()
580 CODE: 834 CODE:
581{ 835{
582 opengl_fontmap = pango_opengl_font_map_new (); 836 opengl_fontmap = pango_opengl_font_map_new ();
583 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);
584 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
585} 844}
586 845
587int 846char *SDL_GetError ()
588SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
589 847
590void 848void SDL_braino ()
849
850int SDL_Init (U32 flags)
851
852int SDL_InitSubSystem (U32 flags)
853
854void SDL_QuitSubSystem (U32 flags)
855
591SDL_Quit () 856void SDL_Quit ()
592 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
866
593void 867void
594SDL_ListModes () 868SDL_ListModes (int rgb, int alpha)
595 PPCODE: 869 PPCODE:
596{ 870{
597 SDL_Rect **m; 871 SDL_Rect **m;
598 872
599 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 873 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
600 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 874 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
601 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 875 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
602 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 876 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
603 877
604 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 878 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
605 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 879 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
606 880
607 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 881 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
608 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 882 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
609 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 883 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
610 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
611 885
612 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 886 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
613#if SDL_VERSION_ATLEAST(1,2,10)
614 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
615 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 887 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
616#endif
617
618 SDL_EnableUNICODE (1);
619 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
620 888
621 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 889 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
622 890
623 if (m && m != (SDL_Rect **)-1) 891 if (m && m != (SDL_Rect **)-1)
624 while (*m) 892 while (*m)
625 { 893 {
894 if ((*m)->w >= 400 && (*m)->h >= 300)
895 {
626 AV *av = newAV (); 896 AV *av = newAV ();
627 av_push (av, newSViv ((*m)->w)); 897 av_push (av, newSViv ((*m)->w));
628 av_push (av, newSViv ((*m)->h)); 898 av_push (av, newSViv ((*m)->h));
899 av_push (av, newSViv (rgb));
900 av_push (av, newSViv (alpha));
629 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 901 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
902 }
630 903
631 ++m; 904 ++m;
632 } 905 }
633} 906}
634 907
635char *
636SDL_GetError ()
637
638int 908int
639SDL_SetVideoMode (int w, int h, int fullscreen) 909SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
640 CODE: 910 CODE:
911{
912 SDL_EnableUNICODE (1);
913 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
914
915 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
916 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
917 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
918 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
919
641 RETVAL = !!SDL_SetVideoMode ( 920 RETVAL = !!SDL_SetVideoMode (
642 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 921 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
643 ); 922 );
923
644 if (RETVAL) 924 if (RETVAL)
645 { 925 {
646 av_clear (texture_av); 926 av_clear (texture_av);
647 927
648 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 928 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
649# 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);
650# include "glfunc.h" 930#include "glfunc.h"
651# undef GL_FUNC 931#undef GL_FUNC
652
653 } 932 }
933}
654 OUTPUT: 934 OUTPUT:
655 RETVAL 935 RETVAL
656 936
657void 937void
658SDL_GL_SwapBuffers () 938SDL_GL_SwapBuffers ()
659 939
660char * 940char *
661SDL_GetKeyName (int sym) 941SDL_GetKeyName (int sym)
662 942
943int
944SDL_GetAppState ()
945
946int
947SDL_GetModState ()
948
663void 949void
664SDL_PollEvent () 950poll_events ()
665 PPCODE: 951 PPCODE:
666{ 952{
667 SDL_Event ev; 953 SDL_Event ev;
668 954
669 while (SDL_PollEvent (&ev)) 955 SDL_PumpEvents ();
956 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
670 { 957 {
671 HV *hv = newHV (); 958 HV *hv = newHV ();
672 hv_store (hv, "type", 4, newSViv (ev.type), 0); 959 hv_store (hv, "type", 4, newSViv (ev.type), 0);
673 960
674 switch (ev.type) 961 switch (ev.type)
675 { 962 {
676 case SDL_KEYDOWN: 963 case SDL_KEYDOWN:
677 case SDL_KEYUP: 964 case SDL_KEYUP:
678 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 965 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
679 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 966 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
680 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);
681 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 */
682 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 969 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
683 break; 970 break;
684 971
685 case SDL_ACTIVEEVENT: 972 case SDL_ACTIVEEVENT:
686 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 973 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
687 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 974 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
688 break; 975 break;
689 976
690 case SDL_MOUSEMOTION: 977 case SDL_MOUSEMOTION:
978 {
979 int state = ev.motion.state;
980 int x = ev.motion.x;
981 int y = ev.motion.y;
982 int xrel = ev.motion.xrel;
983 int yrel = ev.motion.yrel;
984
985 /* do simplistic event compression */
986 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
987 && state == ev.motion.state)
988 {
989 xrel += ev.motion.xrel;
990 yrel += ev.motion.yrel;
991 x = ev.motion.x;
992 y = ev.motion.y;
993 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
994 }
995
691 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
692
693 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 997 hv_store (hv, "state", 5, newSViv (state), 0);
694 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 998 hv_store (hv, "x", 1, newSViv (x), 0);
695 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 999 hv_store (hv, "y", 1, newSViv (y), 0);
696 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 1000 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
697 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 1001 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
1002 }
698 break; 1003 break;
699 1004
700 case SDL_MOUSEBUTTONDOWN: 1005 case SDL_MOUSEBUTTONDOWN:
701 case SDL_MOUSEBUTTONUP: 1006 case SDL_MOUSEBUTTONUP:
702 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1007 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
703 1008
704 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1009 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
705 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
706 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1011 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
707 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1012 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
712 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1017 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
713 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1018 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
714 break; 1019 break;
715 } 1020 }
716 1021
717 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))));
718 } 1023 }
719} 1024}
720 1025
721int 1026int
722Mix_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)
723 POSTCALL: 1028 POSTCALL:
724 Mix_HookMusicFinished (music_finished); 1029 Mix_HookMusicFinished (music_finished);
725 Mix_ChannelFinished (channel_finished); 1030 Mix_ChannelFinished (channel_finished);
726 1031
727void 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
728Mix_CloseAudio () 1049Mix_CloseAudio ()
729 1050
730int 1051int
731Mix_AllocateChannels (int numchans = -1) 1052Mix_AllocateChannels (int numchans = -1)
1053
1054const char *
1055Mix_GetError ()
732 1056
733void 1057void
734lowdelay (int fd, int val = 1) 1058lowdelay (int fd, int val = 1)
735 CODE: 1059 CODE:
736 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1060 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
762 } 1086 }
763 } 1087 }
764#endif 1088#endif
765} 1089}
766 1090
767void 1091int
768add_font (char *file) 1092add_font (char *file)
769 CODE: 1093 CODE:
770 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT:
1096 RETVAL
771 1097
772void 1098void
773load_image_inline (SV *image_) 1099load_image_inline (SV *image_)
774 ALIAS: 1100 ALIAS:
775 load_image_file = 1 1101 load_image_file = 1
… …
778 STRLEN image_len; 1104 STRLEN image_len;
779 char *image = (char *)SvPVbyte (image_, image_len); 1105 char *image = (char *)SvPVbyte (image_, image_len);
780 SDL_Surface *surface, *surface2; 1106 SDL_Surface *surface, *surface2;
781 SDL_PixelFormat fmt; 1107 SDL_PixelFormat fmt;
782 SDL_RWops *rw = ix 1108 SDL_RWops *rw = ix
783 ? SDL_RWFromFile (image, "r") 1109 ? SDL_RWFromFile (image, "rb")
784 : SDL_RWFromConstMem (image, image_len); 1110 : SDL_RWFromConstMem (image, image_len);
785 1111
786 if (!rw) 1112 if (!rw)
787 croak ("load_image: %s", SDL_GetError ()); 1113 croak ("load_image: %s", SDL_GetError ());
788 1114
… …
861void 1187void
862error (char *message) 1188error (char *message)
863 CODE: 1189 CODE:
864 fprintf (stderr, "ERROR: %s\n", message); 1190 fprintf (stderr, "ERROR: %s\n", message);
865#ifdef _WIN32 1191#ifdef _WIN32
866 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1192 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
867#endif 1193#endif
868 1194
869void 1195void
870fatal (char *message) 1196fatal (char *message)
871 CODE: 1197 CODE:
872 fprintf (stderr, "FATAL: %s\n", message); 1198 fprintf (stderr, "FATAL: %s\n", message);
873#ifdef _WIN32 1199#ifdef _WIN32
874 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1200 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
875#endif 1201#endif
876 _exit (1); 1202 _exit (1);
877 1203
878void 1204void
879_exit (int retval = 0) 1205_exit (int retval = 0)
… …
882 ExitThread (retval); // unclean, please beam me up 1208 ExitThread (retval); // unclean, please beam me up
883#else 1209#else
884 _exit (retval); 1210 _exit (retval);
885#endif 1211#endif
886 1212
887MODULE = CFPlus PACKAGE = CFPlus::Font 1213void
1214debug ()
1215 CODE:
1216{
1217#if DEBUG
1218 VALGRIND_DO_LEAK_CHECK;
1219#endif
1220}
888 1221
889CFPlus::Font 1222int
1223SvREFCNT (SV *sv)
1224 CODE:
1225 RETVAL = SvREFCNT (sv);
1226 OUTPUT:
1227 RETVAL
1228
1229MODULE = Deliantra::Client PACKAGE = DC::Font
1230
1231PROTOTYPES: DISABLE
1232
1233DC::Font
890new_from_file (SV *class, char *path, int id = 0) 1234new_from_file (SV *class, char *path, int id = 0)
891 CODE: 1235 CODE:
892{ 1236{
893 int count; 1237 int count;
894 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1238 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
897} 1241}
898 OUTPUT: 1242 OUTPUT:
899 RETVAL 1243 RETVAL
900 1244
901void 1245void
902DESTROY (CFPlus::Font self) 1246DESTROY (DC::Font self)
903 CODE: 1247 CODE:
904 pango_font_description_free (self); 1248 pango_font_description_free (self);
905 1249
906void 1250void
907make_default (CFPlus::Font self) 1251make_default (DC::Font self)
1252 PROTOTYPE: $
908 CODE: 1253 CODE:
909 default_font = self; 1254 default_font = self;
910 1255
911MODULE = CFPlus PACKAGE = CFPlus::Layout 1256MODULE = Deliantra::Client PACKAGE = DC::Layout
912 1257
1258PROTOTYPES: DISABLE
1259
913void 1260void
914reset_glyph_cache () 1261glyph_cache_backup ()
1262 PROTOTYPE:
915 CODE: 1263 CODE:
1264 tc_backup ();
1265
1266void
1267glyph_cache_restore ()
1268 PROTOTYPE:
1269 CODE:
916 tc_clear (); 1270 tc_restore ();
917 1271
918CFPlus::Layout 1272DC::Layout
919new (SV *class) 1273new (SV *class)
920 CODE: 1274 CODE:
921 New (0, RETVAL, 1, struct cf_layout); 1275 New (0, RETVAL, 1, struct cf_layout);
922 1276
923 RETVAL->pl = pango_layout_new (opengl_context); 1277 RETVAL->pl = pango_layout_new (opengl_context);
… …
925 RETVAL->g = 1.; 1279 RETVAL->g = 1.;
926 RETVAL->b = 1.; 1280 RETVAL->b = 1.;
927 RETVAL->a = 1.; 1281 RETVAL->a = 1.;
928 RETVAL->base_height = MIN_FONT_HEIGHT; 1282 RETVAL->base_height = MIN_FONT_HEIGHT;
929 RETVAL->font = 0; 1283 RETVAL->font = 0;
1284 RETVAL->rc = rc_alloc ();
930 1285
931 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1286 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
932 layout_update_font (RETVAL); 1287 layout_update_font (RETVAL);
933 OUTPUT: 1288 OUTPUT:
934 RETVAL 1289 RETVAL
935 1290
936void 1291void
937DESTROY (CFPlus::Layout self) 1292DESTROY (DC::Layout self)
938 CODE: 1293 CODE:
939 g_object_unref (self->pl); 1294 g_object_unref (self->pl);
1295 rc_free (self->rc);
940 Safefree (self); 1296 Safefree (self);
941 1297
942void 1298void
943set_text (CFPlus::Layout self, SV *text_) 1299set_text (DC::Layout self, SV *text_)
944 CODE: 1300 CODE:
945{ 1301{
946 STRLEN textlen; 1302 STRLEN textlen;
947 char *text = SvPVutf8 (text_, textlen); 1303 char *text = SvPVutf8 (text_, textlen);
948 1304
949 pango_layout_set_text (self->pl, text, textlen); 1305 pango_layout_set_text (self->pl, text, textlen);
950} 1306}
951 1307
952void 1308void
953set_markup (CFPlus::Layout self, SV *text_) 1309set_markup (DC::Layout self, SV *text_)
954 CODE: 1310 CODE:
955{ 1311{
956 STRLEN textlen; 1312 STRLEN textlen;
957 char *text = SvPVutf8 (text_, textlen); 1313 char *text = SvPVutf8 (text_, textlen);
958 1314
959 pango_layout_set_markup (self->pl, text, textlen); 1315 pango_layout_set_markup (self->pl, text, textlen);
960} 1316}
961 1317
962void 1318void
963set_shapes (CFPlus::Layout self, ...) 1319set_shapes (DC::Layout self, ...)
964 CODE: 1320 CODE:
965{ 1321{
966 PangoAttrList *attrs = 0; 1322 PangoAttrList *attrs = 0;
967 const char *text = pango_layout_get_text (self->pl); 1323 const char *text = pango_layout_get_text (self->pl);
968 const char *pos = text; 1324 const char *pos = text;
… …
1003 if (attrs) 1359 if (attrs)
1004 pango_layout_set_attributes (self->pl, attrs); 1360 pango_layout_set_attributes (self->pl, attrs);
1005} 1361}
1006 1362
1007void 1363void
1008get_shapes (CFPlus::Layout self) 1364get_shapes (DC::Layout self)
1009 PPCODE: 1365 PPCODE:
1010{ 1366{
1011 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1367 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1012 1368
1013 do 1369 do
1014 { 1370 {
1015 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1371 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1016 1372
1017 if (run && shape_attr_p (run)) 1373 if (run && shape_attr_p (run))
1018 { 1374 {
1019 PangoRectangle extents; 1375 PangoRectangle extents;
1020 pango_layout_iter_get_run_extents (iter, 0, &extents); 1376 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1028 1384
1029 pango_layout_iter_free (iter); 1385 pango_layout_iter_free (iter);
1030} 1386}
1031 1387
1032int 1388int
1033has_wrapped (CFPlus::Layout self) 1389has_wrapped (DC::Layout self)
1034 CODE: 1390 CODE:
1035{ 1391{
1036 int lines = 1; 1392 int lines = 1;
1037 const char *text = pango_layout_get_text (self->pl); 1393 const char *text = pango_layout_get_text (self->pl);
1038 1394
… …
1043} 1399}
1044 OUTPUT: 1400 OUTPUT:
1045 RETVAL 1401 RETVAL
1046 1402
1047SV * 1403SV *
1048get_text (CFPlus::Layout self) 1404get_text (DC::Layout self)
1049 CODE: 1405 CODE:
1050 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1406 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1051 sv_utf8_decode (RETVAL); 1407 sv_utf8_decode (RETVAL);
1052 OUTPUT: 1408 OUTPUT:
1053 RETVAL 1409 RETVAL
1054 1410
1055void 1411void
1056set_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.)
1057 CODE: 1413 CODE:
1058 self->r = r; 1414 self->r = r;
1059 self->g = g; 1415 self->g = g;
1060 self->b = b; 1416 self->b = b;
1061 self->a = a; 1417 self->a = a;
1062 1418
1063void 1419void
1064set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1420set_font (DC::Layout self, DC::Font font = 0)
1065 CODE: 1421 CODE:
1066 if (self->font != font) 1422 if (self->font != font)
1067 { 1423 {
1068 self->font = font; 1424 self->font = font;
1069 layout_update_font (self); 1425 layout_update_font (self);
1070 } 1426 }
1071 1427
1072void 1428void
1073set_height (CFPlus::Layout self, int base_height) 1429set_height (DC::Layout self, int base_height)
1074 CODE: 1430 CODE:
1075 if (self->base_height != base_height) 1431 if (self->base_height != base_height)
1076 { 1432 {
1077 self->base_height = base_height; 1433 self->base_height = base_height;
1078 layout_update_font (self); 1434 layout_update_font (self);
1079 } 1435 }
1080 1436
1081void 1437void
1082set_width (CFPlus::Layout self, int max_width = -1) 1438set_width (DC::Layout self, int max_width = -1)
1083 CODE: 1439 CODE:
1084 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);
1085 1441
1086void 1442void
1087set_indent (CFPlus::Layout self, int indent) 1443set_indent (DC::Layout self, int indent)
1088 CODE: 1444 CODE:
1089 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1445 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1090 1446
1091void 1447void
1092set_spacing (CFPlus::Layout self, int spacing) 1448set_spacing (DC::Layout self, int spacing)
1093 CODE: 1449 CODE:
1094 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1450 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1095 1451
1096void 1452void
1097set_ellipsise (CFPlus::Layout self, int ellipsise) 1453set_ellipsise (DC::Layout self, int ellipsise)
1098 CODE: 1454 CODE:
1099 pango_layout_set_ellipsize (self->pl, 1455 pango_layout_set_ellipsize (self->pl,
1100 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1456 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1101 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1457 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1102 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1458 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1103 : PANGO_ELLIPSIZE_NONE 1459 : PANGO_ELLIPSIZE_NONE
1104 ); 1460 );
1105 1461
1106void 1462void
1107set_single_paragraph_mode (CFPlus::Layout self, int spm) 1463set_single_paragraph_mode (DC::Layout self, int spm)
1108 CODE: 1464 CODE:
1109 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1465 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1110 1466
1111void 1467void
1112size (CFPlus::Layout self) 1468size (DC::Layout self)
1113 PPCODE: 1469 PPCODE:
1114{ 1470{
1115 int w, h; 1471 int w, h;
1116 1472
1117 layout_get_pixel_size (self, &w, &h); 1473 layout_get_pixel_size (self, &w, &h);
… …
1120 PUSHs (sv_2mortal (newSViv (w))); 1476 PUSHs (sv_2mortal (newSViv (w)));
1121 PUSHs (sv_2mortal (newSViv (h))); 1477 PUSHs (sv_2mortal (newSViv (h)));
1122} 1478}
1123 1479
1124int 1480int
1125descent (CFPlus::Layout self) 1481descent (DC::Layout self)
1126 CODE: 1482 CODE:
1127{ 1483{
1128 PangoRectangle rect; 1484 PangoRectangle rect;
1129 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1485 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1130 pango_layout_line_get_pixel_extents (line, 0, &rect); 1486 pango_layout_line_get_pixel_extents (line, 0, &rect);
1131 RETVAL = PANGO_DESCENT (rect); 1487 RETVAL = PANGO_DESCENT (rect);
1132} 1488}
1133 OUTPUT: 1489 OUTPUT:
1134 RETVAL 1490 RETVAL
1135 1491
1136int 1492int
1137xy_to_index (CFPlus::Layout self, int x, int y) 1493xy_to_index (DC::Layout self, int x, int y)
1138 CODE: 1494 CODE:
1139{ 1495{
1140 int index, trailing; 1496 int index, trailing;
1141 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);
1142 RETVAL = index + trailing; 1498 RETVAL = index + trailing;
1143} 1499}
1144 OUTPUT: 1500 OUTPUT:
1145 RETVAL 1501 RETVAL
1146 1502
1147void 1503void
1148cursor_pos (CFPlus::Layout self, int index) 1504cursor_pos (DC::Layout self, int index)
1149 PPCODE: 1505 PPCODE:
1150{ 1506{
1151 PangoRectangle strong_pos; 1507 PangoRectangle pos;
1152 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1508 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1153 1509
1154 EXTEND (SP, 3); 1510 EXTEND (SP, 3);
1155 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1156 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1512 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1157 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1158} 1514}
1159 1515
1160void 1516void
1161index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1517index_to_line_x (DC::Layout self, int index, int trailing = 0)
1162 PPCODE: 1518 PPCODE:
1163{ 1519{
1164 int line, x; 1520 int line, x;
1165 1521
1166 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)
1167 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1524 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1168 1525 --line;
1526#endif
1169 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
1170 PUSHs (sv_2mortal (newSViv (line - 1))); 1528 PUSHs (sv_2mortal (newSViv (line)));
1171 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1529 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1172} 1530}
1173 1531
1174void 1532void
1175line_x_to_index (CFPlus::Layout self, int line, int x) 1533line_x_to_index (DC::Layout self, int line, int x)
1176 PPCODE: 1534 PPCODE:
1177{ 1535{
1178 PangoLayoutLine *lp; 1536 PangoLayoutLine *lp;
1179 int index, trailing; 1537 int index, trailing;
1180 1538
1181 if (line < 0) 1539 if (line < 0)
1182 XSRETURN_EMPTY; 1540 XSRETURN_EMPTY;
1183 1541
1184 if (!(lp = pango_layout_get_line (self->pl, line))) 1542 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1185 XSRETURN_EMPTY; /* do better */ 1543 XSRETURN_EMPTY; /* do better */
1186 1544
1187 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);
1188 1546
1189 EXTEND (SP, 2); 1547 EXTEND (SP, 2);
… …
1195 PUSHs (sv_2mortal (newSViv (trailing))); 1553 PUSHs (sv_2mortal (newSViv (trailing)));
1196 } 1554 }
1197} 1555}
1198 1556
1199void 1557void
1200render (CFPlus::Layout self, float x, float y, int flags = 0) 1558render (DC::Layout self, float x, float y, int flags = 0)
1201 PPCODE: 1559 CODE:
1560 rc_clear (self->rc);
1202 pango_opengl_render_layout_subpixel ( 1561 pango_opengl_render_layout_subpixel (
1203 self->pl, 1562 self->pl,
1563 self->rc,
1204 x * PANGO_SCALE, y * PANGO_SCALE, 1564 x * PANGO_SCALE, y * PANGO_SCALE,
1205 self->r, self->g, self->b, self->a, 1565 self->r, self->g, self->b, self->a,
1206 flags 1566 flags
1207 ); 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);
1208 1571
1209MODULE = CFPlus PACKAGE = CFPlus::Texture
1210
1211void 1572void
1212pad2pot (SV *data_, SV *w_, SV *h_) 1573draw (DC::Layout self)
1213 CODE: 1574 CODE:
1214{ 1575{
1215 int ow = SvIV (w_); 1576 glEnable (GL_TEXTURE_2D);
1216 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);
1217 1583
1218 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_))
1219 { 1600 {
1220 int nw = minpot (ow);
1221 int nh = minpot (oh);
1222
1223 if (nw != ow || nh != oh)
1224 {
1225 if (SvOK (data_))
1226 {
1227 STRLEN datalen; 1601 STRLEN datalen;
1228 char *data = SvPVbyte (data_, datalen); 1602 char *data = SvPVbyte (data_, datalen);
1229 int bpp = datalen / (ow * oh); 1603 int bpp = datalen / (ow * oh);
1230 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1604 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1231 1605
1232 SvPOK_only (result_); 1606 SvPOK_only (result_);
1233 SvCUR_set (result_, nw * nh * bpp); 1607 SvCUR_set (result_, nw * nh * bpp);
1234 1608
1235 memset (SvPVX (result_), 0, nw * nh * bpp); 1609 memset (SvPVX (result_), 0, nw * nh * bpp);
1236 while (oh--) 1610 while (oh--)
1237 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);
1238 1612
1239 sv_setsv (data_, result_); 1613 sv_setsv (data_, result_);
1240 }
1241
1242 sv_setiv (w_, nw);
1243 sv_setiv (h_, nh);
1244 }
1245 } 1614 }
1246} 1615}
1247 1616
1248void 1617void
1249draw_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.)
… …
1255{ 1624{
1256 HV *hv = (HV *)SvRV (self); 1625 HV *hv = (HV *)SvRV (self);
1257 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1626 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1258 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1627 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1259 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;
1260 1632
1261 if (items < 5) 1633 if (items < 5)
1262 { 1634 {
1263 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1635 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1264 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1636 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1292 glDisable (GL_ALPHA_TEST); 1664 glDisable (GL_ALPHA_TEST);
1293 glDisable (GL_BLEND); 1665 glDisable (GL_BLEND);
1294 } 1666 }
1295} 1667}
1296 1668
1297MODULE = CFPlus PACKAGE = CFPlus::Map 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);
1298 1678
1299CFPlus::Map 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
1758IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1759 CODE:
1760{
1761 GLint width;
1762 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1763 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1764 RETVAL = width > 0;
1765}
1766 OUTPUT:
1767 RETVAL
1768
1769MODULE = Deliantra::Client PACKAGE = DC::Map
1770
1771PROTOTYPES: DISABLE
1772
1773DC::Map
1300new (SV *class) 1774new (SV *class)
1301 CODE: 1775 CODE:
1302 New (0, RETVAL, 1, struct map); 1776 New (0, RETVAL, 1, struct map);
1303 RETVAL->x = 0; 1777 RETVAL->x = 0;
1304 RETVAL->y = 0; 1778 RETVAL->y = 0;
… …
1312 RETVAL->row = 0; 1786 RETVAL->row = 0;
1313 OUTPUT: 1787 OUTPUT:
1314 RETVAL 1788 RETVAL
1315 1789
1316void 1790void
1317DESTROY (CFPlus::Map self) 1791DESTROY (DC::Map self)
1318 CODE: 1792 CODE:
1319{ 1793{
1320 map_clear (self); 1794 map_clear (self);
1321 Safefree (self->face2tile); 1795 Safefree (self->face2tile);
1322 Safefree (self->tex); 1796 Safefree (self->tex);
1323 Safefree (self); 1797 Safefree (self);
1324} 1798}
1325 1799
1326void 1800void
1327resize (CFPlus::Map self, int map_width, int map_height) 1801resize (DC::Map self, int map_width, int map_height)
1328 CODE: 1802 CODE:
1329 self->w = map_width; 1803 self->w = map_width;
1330 self->h = map_height; 1804 self->h = map_height;
1331 1805
1332void 1806void
1333clear (CFPlus::Map self) 1807clear (DC::Map self)
1334 CODE: 1808 CODE:
1335 map_clear (self); 1809 map_clear (self);
1336 1810
1337void 1811void
1338set_tileid (CFPlus::Map self, int face, int tile) 1812set_tileid (DC::Map self, int face, int tile)
1339 CODE: 1813 CODE:
1340{ 1814{
1341 need_facenum (self, face); self->face2tile [face] = tile; 1815 need_facenum (self, face); self->face2tile [face] = tile;
1342 need_texid (self, tile); 1816 need_texid (self, tile);
1343} 1817}
1344 1818
1345void 1819void
1346set_smooth (CFPlus::Map self, int face, int smooth, int level) 1820set_smooth (DC::Map self, int face, int smooth, int level)
1347 CODE: 1821 CODE:
1348{ 1822{
1349 tileid texid; 1823 tileid texid;
1350 maptex *tex; 1824 maptex *tex;
1351 1825
… …
1364 tex->smoothtile = self->face2tile [smooth]; 1838 tex->smoothtile = self->face2tile [smooth];
1365 tex->smoothlevel = level; 1839 tex->smoothlevel = level;
1366} 1840}
1367 1841
1368void 1842void
1369set_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)
1370 CODE: 1844 CODE:
1371{ 1845{
1372 need_texid (self, texid); 1846 need_texid (self, texid);
1373 1847
1374 { 1848 {
… …
1393 // use uglier nearest interpolation because linear suffers 1867 // use uglier nearest interpolation because linear suffers
1394 // from transparent color bleeding and ugly wrapping effects. 1868 // from transparent color bleeding and ugly wrapping effects.
1395 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1869 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1396} 1870}
1397 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
1398int 1892int
1399ox (CFPlus::Map self) 1893ox (DC::Map self)
1400 ALIAS: 1894 ALIAS:
1401 oy = 1 1895 oy = 1
1402 x = 2 1896 x = 2
1403 y = 3 1897 y = 3
1404 w = 4 1898 w = 4
… …
1415 } 1909 }
1416 OUTPUT: 1910 OUTPUT:
1417 RETVAL 1911 RETVAL
1418 1912
1419void 1913void
1420scroll (CFPlus::Map self, int dx, int dy) 1914scroll (DC::Map self, int dx, int dy)
1421 CODE: 1915 CODE:
1422{ 1916{
1423 if (dx > 0) 1917 if (dx > 0)
1424 map_blank (self, self->x, self->y, dx, self->h); 1918 map_blank (self, self->x, self->y, dx, self->h);
1425 else if (dx < 0) 1919 else if (dx < 0)
… …
1440 self->rows += MAP_EXTEND_Y; 1934 self->rows += MAP_EXTEND_Y;
1441 self->y += MAP_EXTEND_Y; 1935 self->y += MAP_EXTEND_Y;
1442 } 1936 }
1443} 1937}
1444 1938
1445void 1939SV *
1446map1a_update (CFPlus::Map self, SV *data_, int extmap) 1940map1a_update (DC::Map self, SV *data_, int extmap)
1447 CODE: 1941 CODE:
1448{ 1942{
1449 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1943 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1450 uint8_t *data_end = (uint8_t *)SvEND (data_); 1944 uint8_t *data_end = (uint8_t *)SvEND (data_);
1451 mapcell *cell; 1945 mapcell *cell;
1452 int x, y, flags; 1946 int x, y, z, flags;
1947 AV *missing = newAV ();
1948 RETVAL = newRV_noinc ((SV *)missing);
1453 1949
1454 while (data < data_end - 1) 1950 while (data < data_end - 1)
1455 { 1951 {
1456 flags = (data [0] << 8) + data [1]; data += 2; 1952 flags = (data [0] << 8) + data [1]; data += 2;
1457 1953
… …
1477 uint8_t ext, cmd; 1973 uint8_t ext, cmd;
1478 1974
1479 do 1975 do
1480 { 1976 {
1481 ext = *data++; 1977 ext = *data++;
1482 cmd = ext & 0x3f; 1978 cmd = ext & 0x7f;
1483 1979
1484 if (cmd < 4) 1980 if (cmd < 4)
1485 cell->darkness = 255 - ext * 64 + 1; 1981 cell->darkness = 255 - ext * 64 + 1;
1486 else if (cmd == 5) // health 1982 else if (cmd == 5) // health
1487 { 1983 {
… …
1490 } 1986 }
1491 else if (cmd == 6) // monster width 1987 else if (cmd == 6) // monster width
1492 cell->stat_width = *data++ + 1; 1988 cell->stat_width = *data++ + 1;
1493 else if (cmd == 0x47) 1989 else if (cmd == 0x47)
1494 { 1990 {
1495 if (*data == 4) 1991 if (*data == 1) cell->player = data [1];
1496 ; // 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);
1497 1995
1498 data += *data + 1; 1996 data += *data + 1;
1499 } 1997 }
1500 else if (cmd == 8) // cell flags 1998 else if (cmd == 8) // cell flags
1501 cell->flags = *data++; 1999 cell->flags = *data++;
… …
1508 } 2006 }
1509 else 2007 else
1510 cell->darkness = *data++ + 1; 2008 cell->darkness = *data++ + 1;
1511 } 2009 }
1512 2010
2011 for (z = 0; z <= 2; ++z)
1513 if (flags & 4) 2012 if (flags & (4 >> z))
1514 { 2013 {
1515 faceid face = (data [0] << 8) + data [1]; data += 2; 2014 faceid face = (data [0] << 8) + data [1]; data += 2;
1516 need_facenum (self, face); 2015 need_facenum (self, face);
1517 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 }
1518 } 2033 }
1519
1520 if (flags & 2)
1521 {
1522 faceid face = (data [0] << 8) + data [1]; data += 2;
1523 need_facenum (self, face);
1524 cell->tile [1] = self->face2tile [face];
1525 }
1526
1527 if (flags & 1)
1528 {
1529 faceid face = (data [0] << 8) + data [1]; data += 2;
1530 need_facenum (self, face);
1531 cell->tile [2] = self->face2tile [face];
1532 }
1533 } 2034 }
1534 else 2035 else
1535 cell->darkness = 0; 2036 CELL_CLEAR (cell);
1536 } 2037 }
1537} 2038}
2039 OUTPUT:
2040 RETVAL
1538 2041
1539SV * 2042SV *
1540mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2043mapmap (DC::Map self, int x0, int y0, int w, int h)
1541 CODE: 2044 CODE:
1542{ 2045{
1543 int x1, x; 2046 int x1, x;
1544 int y1, y; 2047 int y1, y;
1545 int z; 2048 int z;
… …
1590} 2093}
1591 OUTPUT: 2094 OUTPUT:
1592 RETVAL 2095 RETVAL
1593 2096
1594void 2097void
1595draw (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)
1596 CODE: 2099 CODE:
1597{ 2100{
2101 int x, y, z;
2102
1598 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1599 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
1600 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)
1601 smooth_key skey; 2106 smooth_key skey;
1602 int x, y, z; 2107 int pl_x, pl_y;
1603 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;
1604 2113
2114 pl_tex.name = 0;
2115
1605 // thats current max. sorry. 2116 // that's current max. sorry.
1606 if (sw > 255) sw = 255; 2117 if (sw > 255) sw = 255;
1607 if (sh > 255) sh = 255; 2118 if (sh > 255) sh = 255;
1608 2119
1609 // clear key, in case of extra padding 2120 // clear key, in case of extra padding
1610 memset (&skey, 0, sizeof (skey)); 2121 memset (&skey, 0, sizeof (skey));
1611 2122
1612 glColor4ub (255, 255, 255, 255); 2123 memset (&key, 0, sizeof (key));
1613 2124 key.r = 255;
1614 glEnable (GL_BLEND); 2125 key.g = 255;
1615 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2126 key.b = 255;
1616 glEnable (GL_TEXTURE_2D); 2127 key.a = 255;
1617 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2128 key.mode = GL_QUADS;
1618 2129 key.format = GL_T2F_V3F;
1619 glBegin (GL_QUADS);
1620
1621 last_name = 0;
1622 2130
1623 mx += self->x; 2131 mx += self->x;
1624 my += self->y; 2132 my += self->y;
1625 2133
1626 // first pass: determine smooth_max 2134 // first pass: determine smooth_max
… …
1643 MAX (self->tex [cell->tile [1]].smoothlevel, 2151 MAX (self->tex [cell->tile [1]].smoothlevel,
1644 self->tex [cell->tile [2]].smoothlevel)); 2152 self->tex [cell->tile [2]].smoothlevel));
1645 } 2153 }
1646 } 2154 }
1647 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
1648 for (z = 0; z <= 2; z++) 2163 for (z = 0; z <= 2; z++)
1649 { 2164 {
1650 memset (smooth_level, 0, sizeof (smooth_level)); 2165 memset (smooth_level, 0, sizeof (smooth_level));
2166 key.texname = -1;
1651 2167
1652 for (y = 0; y < sh; y++) 2168 for (y = 0; y < sh; y++)
1653 if (0 <= y + my && y + my < self->rows) 2169 if (0 <= y + my && y + my < self->rows)
1654 { 2170 {
1655 maprow *row = self->row + (y + my); 2171 maprow *row = self->row + (y + my);
… …
1661 tileid tile = cell->tile [z]; 2177 tileid tile = cell->tile [z];
1662 2178
1663 if (tile) 2179 if (tile)
1664 { 2180 {
1665 maptex tex = self->tex [tile]; 2181 maptex tex = self->tex [tile];
1666 int px = (x + 1) * T - tex.w; 2182 int px, py;
1667 int py = (y + 1) * T - tex.h;
1668 2183
1669 // suppressing texture state switches here
1670 // is only moderately effective, but worth the extra effort
1671 if (last_name != tex.name) 2184 if (key.texname != tex.name)
1672 { 2185 {
2186 self->tex [tile].unused = 0;
2187
1673 if (!tex.name) 2188 if (!tex.name)
1674 tex = self->tex [2]; /* missing, replace by noface */ 2189 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1675 2190
1676 glEnd (); 2191 key.texname = tex.name;
1677 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2192 arr = rc_array (rc, &key);
1678 glBegin (GL_QUADS);
1679 } 2193 }
1680 2194
1681 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2195 px = (x + 1) * T - tex.w;
1682 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2196 py = (y + 1) * T - tex.h;
1683 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1684 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1685 2197
1686 if (cell->flags && z == 2) 2198 if (expect_false (cell->player == player) && expect_false (z == 2))
1687 { 2199 {
1688 if (cell->flags & 1) 2200 pl_x = px;
2201 pl_y = py;
2202 pl_tex = tex;
1689 { 2203 continue;
1690 maptex tex = self->tex [1];
1691 int px = x * T + T * 2 / 32;
1692 int py = y * T - T * 6 / 32;
1693
1694 glEnd ();
1695 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1696 glBegin (GL_QUADS);
1697
1698 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1699 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1700 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1701 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1702 }
1703 } 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);
1704 2210
1705 // update smooth hash 2211 // update smooth hash
1706 if (tex.smoothtile) 2212 if (tex.smoothtile)
1707 { 2213 {
1708 skey.tile = tex.smoothtile; 2214 skey.tile = tex.smoothtile;
… …
1739 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);
1740 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);
1741 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);
1742 } 2248 }
1743 } 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 }
1744 } 2287 }
1745 } 2288 }
2289
2290 rc_draw (rc);
2291 rc_clear (rc);
1746 2292
1747 // go through all smoothlevels, lowest to highest, then draw. 2293 // go through all smoothlevels, lowest to highest, then draw.
1748 // this is basically counting sort 2294 // this is basically counting sort
1749 { 2295 {
1750 int w, b; 2296 int w, b;
1751 2297
2298 glEnable (GL_TEXTURE_2D);
2299 glBegin (GL_QUADS);
1752 for (w = 0; w < 256 / 32; ++w) 2300 for (w = 0; w < 256 / 32; ++w)
1753 { 2301 {
1754 uint32_t smask = smooth_level [w]; 2302 uint32_t smask = smooth_level [w];
1755 if (smask) 2303 if (smask)
1756 for (b = 0; b < 32; ++b) 2304 for (b = 0; b < 32; ++b)
… …
1775 int border = bits & 15; 2323 int border = bits & 15;
1776 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2324 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1777 float dx = tex.s * .0625f; // 16 images/row 2325 float dx = tex.s * .0625f; // 16 images/row
1778 float dy = tex.t * .5f ; // 2 images/column 2326 float dy = tex.t * .5f ; // 2 images/column
1779 2327
1780 // this time naively avoiding texture state changes
1781 // save gobs of state changes.
1782 if (last_name != tex.name) 2328 if (tex.name)
1783 { 2329 {
2330 // this time avoiding texture state changes
2331 // save gobs of state changes.
1784 if (!tex.name) 2332 if (key.texname != tex.name)
1785 continue; // smoothing not yet available 2333 {
2334 self->tex [skey->tile].unused = 0;
1786 2335
1787 glEnd (); 2336 glEnd ();
1788 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2337 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1789 glBegin (GL_QUADS); 2338 glBegin (GL_QUADS);
1790 } 2339 }
1791 2340
1792 if (border) 2341 if (border)
1793 { 2342 {
1794 float ox = border * dx; 2343 float ox = border * dx;
1795 2344
1796 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2345 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1797 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2346 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1798 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2347 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1799 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2348 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1800 } 2349 }
1801 2350
1802 if (corner) 2351 if (corner)
1803 { 2352 {
1804 float ox = corner * dx; 2353 float ox = corner * dx;
1805 2354
1806 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2355 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1807 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2356 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1808 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2357 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1809 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2358 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2359 }
1810 } 2360 }
1811 } 2361 }
1812 } 2362 }
1813 } 2363 }
1814 } 2364 }
2365
2366 glEnd ();
2367 glDisable (GL_TEXTURE_2D);
2368 key.texname = -1;
1815 } 2369 }
1816 2370
1817 hv_clear (smooth); 2371 hv_clear (smooth);
1818 } 2372 }
1819 2373
1820 glEnd (); 2374 if (pl_tex.name)
2375 {
2376 maptex tex = pl_tex;
2377 int px = pl_x + sdx;
2378 int py = pl_y + sdy;
1821 2379
1822 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
1823 glDisable (GL_BLEND); 2394 glDisable (GL_BLEND);
2395 rc_free (rc);
2396 rc_free (rc_ov);
1824 2397
1825 // top layer: overlays such as the health bar 2398 // top layer: overlays such as the health bar
1826 for (y = 0; y < sh; y++) 2399 for (y = 0; y < sh; y++)
1827 if (0 <= y + my && y + my < self->rows) 2400 if (0 <= y + my && y + my < self->rows)
1828 { 2401 {
… …
1833 { 2406 {
1834 mapcell *cell = row->col + (x + mx - row->c0); 2407 mapcell *cell = row->col + (x + mx - row->c0);
1835 2408
1836 int px = x * T; 2409 int px = x * T;
1837 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 }
1838 2417
1839 if (cell->stat_hp) 2418 if (cell->stat_hp)
1840 { 2419 {
1841 int width = cell->stat_width * T; 2420 int width = cell->stat_width * T;
1842 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
1853 } 2432 }
1854 } 2433 }
1855} 2434}
1856 2435
1857void 2436void
1858draw_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)
1859 CODE: 2438 CODE:
1860{ 2439{
1861 static float color[16][3] = { 2440 static float color[16][3] = {
1862 { 0.00F, 0.00F, 0.00F }, 2441 { 0.00f, 0.00f, 0.00f },
1863 { 1.00F, 1.00F, 1.00F }, 2442 { 1.00f, 1.00f, 1.00f },
1864 { 0.00F, 0.00F, 0.55F }, 2443 { 0.00f, 0.00f, 0.55f },
1865 { 1.00F, 0.00F, 0.00F }, 2444 { 1.00f, 0.00f, 0.00f },
1866 2445
1867 { 1.00F, 0.54F, 0.00F }, 2446 { 1.00f, 0.54f, 0.00f },
1868 { 0.11F, 0.56F, 1.00F }, 2447 { 0.11f, 0.56f, 1.00f },
1869 { 0.93F, 0.46F, 0.00F }, 2448 { 0.93f, 0.46f, 0.00f },
1870 { 0.18F, 0.54F, 0.34F }, 2449 { 0.18f, 0.54f, 0.34f },
1871 2450
1872 { 0.56F, 0.73F, 0.56F }, 2451 { 0.56f, 0.73f, 0.56f },
1873 { 0.80F, 0.80F, 0.80F }, 2452 { 0.80f, 0.80f, 0.80f },
1874 { 0.55F, 0.41F, 0.13F }, 2453 { 0.55f, 0.41f, 0.13f },
1875 { 0.99F, 0.77F, 0.26F }, 2454 { 0.99f, 0.77f, 0.26f },
1876 2455
1877 { 0.74F, 0.65F, 0.41F }, 2456 { 0.74f, 0.65f, 0.41f },
1878 2457
1879 { 0.00F, 1.00F, 1.00F }, 2458 { 0.00f, 1.00f, 1.00f },
1880 { 1.00F, 0.00F, 1.00F }, 2459 { 1.00f, 0.00f, 1.00f },
1881 { 1.00F, 1.00F, 0.00F }, 2460 { 1.00f, 1.00f, 0.00f },
1882 }; 2461 };
1883 2462
1884 int x, y; 2463 int x, y;
1885 2464
1886 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 */
1887 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1888 glEnable (GL_BLEND); 2473 glEnable (GL_BLEND);
1889 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2474 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1890 glBegin (GL_QUADS); 2475 glBegin (GL_QUADS);
1891 2476
1892 for (y = 0; y < h; y++) 2477 for (y = 0; y < h; y++)
… …
1896 2481
1897 if (m) 2482 if (m)
1898 { 2483 {
1899 float *c = color [m & 15]; 2484 float *c = color [m & 15];
1900 2485
1901 float tx1 = m & 0x40 ? 0.5 : 0.; 2486 float tx1 = m & 0x40 ? 0.5f : 0.f;
1902 float tx2 = tx1 + 0.5; 2487 float tx2 = tx1 + 0.5f;
1903 2488
1904 glColor4f (c[0], c[1], c[2], 0.75); 2489 glColor4f (c[0], c[1], c[2], 1);
1905 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2490 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1906 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2491 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1907 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2492 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1908 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2493 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1909 } 2494 }
… …
1913 glDisable (GL_BLEND); 2498 glDisable (GL_BLEND);
1914 glDisable (GL_TEXTURE_2D); 2499 glDisable (GL_TEXTURE_2D);
1915} 2500}
1916 2501
1917void 2502void
1918fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2503fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1919 PPCODE: 2504 PPCODE:
1920{ 2505{
1921 int x, y; 2506 int x, y;
2507 int sw1 = sw + 2;
2508 int sh1 = sh + 2;
2509 int sh3 = sh * 3;
1922 int sw4 = (sw + 3) & ~3; 2510 int sw34 = (sw * 3 + 3) & ~3;
2511 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1923 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2512 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1924 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2513 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1925 2514
1926 memset (darkness, 255, sw4 * sh);
1927 SvPOK_only (darkness_sv); 2515 SvPOK_only (darkness3_sv);
1928 SvCUR_set (darkness_sv, sw4 * sh); 2516 SvCUR_set (darkness3_sv, sw34 * sh3);
1929 2517
1930 mx += self->x; 2518 mx += self->x - 1;
1931 my += self->y; 2519 my += self->y - 1;
1932 2520
2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2522
1933 for (y = 0; y < sh; y++) 2523 for (y = 0; y < sh1; y++)
1934 if (0 <= y + my && y + my < self->rows) 2524 if (0 <= y + my && y + my < self->rows)
1935 { 2525 {
1936 maprow *row = self->row + (y + my); 2526 maprow *row = self->row + (y + my);
1937 2527
1938 for (x = 0; x < sw; x++) 2528 for (x = 0; x < sw1; x++)
1939 if (row->c0 <= x + mx && x + mx < row->c1) 2529 if (row->c0 <= x + mx && x + mx < row->c1)
1940 { 2530 {
1941 mapcell *cell = row->col + (x + mx - row->c0); 2531 mapcell *cell = row->col + (x + mx - row->c0);
1942 2532
1943 darkness[y * sw4 + x] = cell->darkness 2533 darkness1 [y * sw1 + x] = cell->darkness
1944 ? 255 - (cell->darkness - 1) 2534 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
1945 : 255 - FOW_DARKNESS; 2535 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
1946 } 2536 }
1947 } 2537 }
1948 2538
2539 for (y = 0; y < sh; ++y)
2540 for (x = 0; x < sw; ++x)
2541 {
2542 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2543 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
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];
2551
2552 uint8_t r11 = (d11 + d21 + d12) / 3;
2553 uint8_t r21 = d21;
2554 uint8_t r31 = (d21 + d31 + d32) / 3;
2555
2556 uint8_t r12 = d12;
2557 uint8_t r22 = d22;
2558 uint8_t r32 = d32;
2559
2560 uint8_t r13 = (d13 + d23 + d12) / 3;
2561 uint8_t r23 = d23;
2562 uint8_t r33 = (d23 + d33 + d32) / 3;
2563
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);
2573 }
2574
2575 free (darkness1);
2576
1949 EXTEND (SP, 3); 2577 EXTEND (SP, 3);
1950 PUSHs (sv_2mortal (newSViv (sw4))); 2578 PUSHs (sv_2mortal (newSViv (sw34)));
1951 PUSHs (sv_2mortal (newSViv (sh))); 2579 PUSHs (sv_2mortal (newSViv (sh3)));
1952 PUSHs (darkness_sv); 2580 PUSHs (darkness3_sv);
1953} 2581}
1954 2582
1955SV * 2583SV *
1956get_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)
1957 CODE: 2585 CODE:
1958{ 2586{
1959 int x, y, x1, y1; 2587 int x, y, x1, y1;
1960 SV *data_sv = newSV (w * h * 7 + 5); 2588 SV *data_sv = newSV (w * h * 7 + 5);
1961 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2589 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2018 else 2646 else
2019 *data++ = 0; 2647 *data++ = 0;
2020 } 2648 }
2021 } 2649 }
2022 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 {
2023 SvPOK_only (data_sv); 2654 SvPOK_only (data_sv);
2024 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2655 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656 }
2657
2025 RETVAL = data_sv; 2658 RETVAL = data_sv;
2026} 2659}
2027 OUTPUT: 2660 OUTPUT:
2028 RETVAL 2661 RETVAL
2029 2662
2030void 2663void
2031set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2664set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2032 PPCODE: 2665 PPCODE:
2033{ 2666{
2034 int x, y, z; 2667 int x, y, z;
2035 int w, h; 2668 int w, h;
2036 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;
2037 2680
2038 if (*data++ != 0) 2681 if (*data++ != 0)
2039 return; /* version mismatch */ 2682 XSRETURN_EMPTY; /* version mismatch */
2040 2683
2041 w = *data++ << 8; w |= *data++; 2684 w = *data++ << 8; w |= *data++;
2042 h = *data++ << 8; h |= *data++; 2685 h = *data++ << 8; h |= *data++;
2043 2686
2044 // 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
… …
2056 { 2699 {
2057 maprow *row = map_get_row (self, y); 2700 maprow *row = map_get_row (self, y);
2058 2701
2059 for (x = x0; x < x1; x++) 2702 for (x = x0; x < x1; x++)
2060 { 2703 {
2704 uint8_t flags;
2705
2706 if (data + 7 >= end)
2707 XSRETURN_EMPTY;
2708
2061 uint8_t flags = *data++; 2709 flags = *data++;
2062 2710
2063 if (flags) 2711 if (flags)
2064 { 2712 {
2065 mapcell *cell = row_get_cell (row, x); 2713 mapcell *cell = row_get_cell (row, x);
2066 tileid tile[3] = { 0, 0, 0 }; 2714 tileid tile[3] = { 0, 0, 0 };
… …
2069 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2717 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2070 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2718 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2071 2719
2072 if (cell->darkness == 0) 2720 if (cell->darkness == 0)
2073 { 2721 {
2074 cell->darkness = 0; 2722 /*cell->darkness = 0;*/
2723 EXTEND (SP, 3);
2075 2724
2076 for (z = 0; z <= 2; z++) 2725 for (z = 0; z <= 2; z++)
2077 { 2726 {
2078 tileid t = tile [z]; 2727 tileid t = tile [z];
2079 2728
2080 if (t >= self->texs || (t && !self->tex [t].name)) 2729 if (t >= self->texs || (t && !self->tex [t].name))
2081 { 2730 {
2082 XPUSHs (sv_2mortal (newSViv (t))); 2731 PUSHs (sv_2mortal (newSViv (t)));
2083 need_texid (self, t); 2732 need_texid (self, t);
2084 } 2733 }
2085 2734
2086 cell->tile [z] = t; 2735 cell->tile [z] = t;
2087 } 2736 }
… …
2089 } 2738 }
2090 } 2739 }
2091 } 2740 }
2092} 2741}
2093 2742
2094MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2743MODULE = Deliantra::Client PACKAGE = DC::RW
2095 2744
2096CFPlus::MixChunk 2745DC::RW
2097new_from_file (SV *class, char *path) 2746new (SV *class, SV *data_sv)
2098 CODE: 2747 CODE:
2099 RETVAL = Mix_LoadWAV (path); 2748{
2749 STRLEN datalen;
2750 char *data = SvPVbyte (data_sv, datalen);
2751
2752 RETVAL = SDL_RWFromConstMem (data, datalen);
2753}
2100 OUTPUT: 2754 OUTPUT:
2101 RETVAL 2755 RETVAL
2102 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 : '('
2103void 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
2104DESTROY (CFPlus::MixChunk self) 2866DESTROY (DC::MixChunk self)
2105 CODE: 2867 CODE:
2106 Mix_FreeChunk (self); 2868 Mix_FreeChunk (self);
2107 2869
2108int 2870int
2109volume (CFPlus::MixChunk self, int volume = -1) 2871volume (DC::MixChunk self, int volume = -1)
2110 CODE: 2872 CODE:
2873 if (items > 1)
2874 volume = CLAMP (volume, 0, 128);
2111 RETVAL = Mix_VolumeChunk (self, volume); 2875 RETVAL = Mix_VolumeChunk (self, volume);
2112 OUTPUT: 2876 OUTPUT:
2113 RETVAL 2877 RETVAL
2114 2878
2115int 2879DC::Channel
2116play (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)
2117 CODE: 2881 CODE:
2882{
2118 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}
2119 OUTPUT: 2894 OUTPUT:
2120 RETVAL 2895 RETVAL
2121 2896
2122MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2897MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2123 2898
2124int 2899int
2125volume (int volume = -1) 2900volume (int volume = -1)
2901 PROTOTYPE: ;$
2126 CODE: 2902 CODE:
2903 if (items > 0)
2904 volume = CLAMP (volume, 0, 128);
2127 RETVAL = Mix_VolumeMusic (volume); 2905 RETVAL = Mix_VolumeMusic (volume);
2128 OUTPUT: 2906 OUTPUT:
2129 RETVAL 2907 RETVAL
2130 2908
2909void
2910fade_out (int ms)
2911 CODE:
2912 Mix_FadeOutMusic (ms);
2913
2914void
2915halt ()
2916 CODE:
2917 Mix_HaltMusic ();
2918
2131CFPlus::MixMusic 2919DC::MixMusic
2132new_from_file (SV *class, char *path) 2920new (SV *class, DC::RW rwops)
2133 CODE: 2921 CODE:
2134 RETVAL = Mix_LoadMUS (path); 2922 RETVAL = Mix_LoadMUS_RW (rwops);
2135 OUTPUT: 2923 OUTPUT:
2136 RETVAL 2924 RETVAL
2137 2925
2138void 2926void
2139DESTROY (CFPlus::MixMusic self) 2927DESTROY (DC::MixMusic self)
2140 CODE: 2928 CODE:
2141 Mix_FreeMusic (self); 2929 Mix_FreeMusic (self);
2142 2930
2143int 2931int
2144play (CFPlus::MixMusic self, int loops = -1) 2932play (DC::MixMusic self, int loops = -1)
2145 CODE: 2933 CODE:
2146 RETVAL = Mix_PlayMusic (self, loops); 2934 RETVAL = Mix_PlayMusic (self, loops);
2147 OUTPUT: 2935 OUTPUT:
2148 RETVAL 2936 RETVAL
2149 2937
2150MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2938void
2939fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2940 CODE:
2941 Mix_FadeInMusicPos (self, loops, ms, position);
2942
2943MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2944
2945PROTOTYPES: ENABLE
2151 2946
2152BOOT: 2947BOOT:
2153{ 2948{
2154 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2949 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2155 static const struct { 2950 static const struct {
2156 const char *name; 2951 const char *name;
2157 IV iv; 2952 IV iv;
2158 } *civ, const_iv[] = { 2953 } *civ, const_iv[] = {
2159# define const_iv(name) { # name, (IV)name } 2954# define const_iv(name) { # name, (IV)name }
2955 const_iv (GL_VENDOR),
2956 const_iv (GL_VERSION),
2957 const_iv (GL_EXTENSIONS),
2958 const_iv (GL_MAX_TEXTURE_UNITS),
2160 const_iv (GL_COLOR_MATERIAL), 2959 const_iv (GL_COLOR_MATERIAL),
2161 const_iv (GL_SMOOTH), 2960 const_iv (GL_SMOOTH),
2162 const_iv (GL_FLAT), 2961 const_iv (GL_FLAT),
2163 const_iv (GL_DITHER), 2962 const_iv (GL_DITHER),
2164 const_iv (GL_BLEND), 2963 const_iv (GL_BLEND),
… …
2168 const_iv (GL_ALPHA_TEST), 2967 const_iv (GL_ALPHA_TEST),
2169 const_iv (GL_NORMALIZE), 2968 const_iv (GL_NORMALIZE),
2170 const_iv (GL_RESCALE_NORMAL), 2969 const_iv (GL_RESCALE_NORMAL),
2171 const_iv (GL_FRONT), 2970 const_iv (GL_FRONT),
2172 const_iv (GL_BACK), 2971 const_iv (GL_BACK),
2972 const_iv (GL_AUX0),
2173 const_iv (GL_AND), 2973 const_iv (GL_AND),
2174 const_iv (GL_ONE), 2974 const_iv (GL_ONE),
2175 const_iv (GL_ZERO), 2975 const_iv (GL_ZERO),
2176 const_iv (GL_SRC_ALPHA), 2976 const_iv (GL_SRC_ALPHA),
2177 const_iv (GL_DST_ALPHA), 2977 const_iv (GL_DST_ALPHA),
2178 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2978 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2179 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),
2180 const_iv (GL_SRC_ALPHA_SATURATE), 2984 const_iv (GL_SRC_ALPHA_SATURATE),
2181 const_iv (GL_RGB), 2985 const_iv (GL_RGB),
2182 const_iv (GL_RGBA), 2986 const_iv (GL_RGBA),
2183 const_iv (GL_RGBA4), 2987 const_iv (GL_RGBA4),
2184 const_iv (GL_RGBA8), 2988 const_iv (GL_RGBA8),
… …
2190 const_iv (GL_INTENSITY), 2994 const_iv (GL_INTENSITY),
2191 const_iv (GL_LUMINANCE), 2995 const_iv (GL_LUMINANCE),
2192 const_iv (GL_LUMINANCE_ALPHA), 2996 const_iv (GL_LUMINANCE_ALPHA),
2193 const_iv (GL_FLOAT), 2997 const_iv (GL_FLOAT),
2194 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),
2195 const_iv (GL_COMPILE), 3005 const_iv (GL_COMPILE),
3006 const_iv (GL_PROXY_TEXTURE_1D),
3007 const_iv (GL_PROXY_TEXTURE_2D),
2196 const_iv (GL_TEXTURE_1D), 3008 const_iv (GL_TEXTURE_1D),
2197 const_iv (GL_TEXTURE_2D), 3009 const_iv (GL_TEXTURE_2D),
2198 const_iv (GL_TEXTURE_ENV), 3010 const_iv (GL_TEXTURE_ENV),
2199 const_iv (GL_TEXTURE_MAG_FILTER), 3011 const_iv (GL_TEXTURE_MAG_FILTER),
2200 const_iv (GL_TEXTURE_MIN_FILTER), 3012 const_iv (GL_TEXTURE_MIN_FILTER),
… …
2221 const_iv (GL_COLOR_LOGIC_OP), 3033 const_iv (GL_COLOR_LOGIC_OP),
2222 const_iv (GL_SEPARABLE_2D), 3034 const_iv (GL_SEPARABLE_2D),
2223 const_iv (GL_CONVOLUTION_2D), 3035 const_iv (GL_CONVOLUTION_2D),
2224 const_iv (GL_CONVOLUTION_BORDER_MODE), 3036 const_iv (GL_CONVOLUTION_BORDER_MODE),
2225 const_iv (GL_CONSTANT_BORDER), 3037 const_iv (GL_CONSTANT_BORDER),
3038 const_iv (GL_POINTS),
2226 const_iv (GL_LINES), 3039 const_iv (GL_LINES),
2227 const_iv (GL_LINE_STRIP), 3040 const_iv (GL_LINE_STRIP),
2228 const_iv (GL_LINE_LOOP), 3041 const_iv (GL_LINE_LOOP),
2229 const_iv (GL_QUADS), 3042 const_iv (GL_QUADS),
2230 const_iv (GL_QUAD_STRIP), 3043 const_iv (GL_QUAD_STRIP),
2231 const_iv (GL_TRIANGLES), 3044 const_iv (GL_TRIANGLES),
2232 const_iv (GL_TRIANGLE_STRIP), 3045 const_iv (GL_TRIANGLE_STRIP),
2233 const_iv (GL_TRIANGLE_FAN), 3046 const_iv (GL_TRIANGLE_FAN),
3047 const_iv (GL_POLYGON),
2234 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),
2235 const_iv (GL_FASTEST), 3054 const_iv (GL_FASTEST),
3055 const_iv (GL_DONT_CARE),
3056 const_iv (GL_NICEST),
2236 const_iv (GL_V2F), 3057 const_iv (GL_V2F),
2237 const_iv (GL_V3F), 3058 const_iv (GL_V3F),
2238 const_iv (GL_T2F_V3F), 3059 const_iv (GL_T2F_V3F),
2239 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),
2240# undef const_iv 3064# undef const_iv
2241 }; 3065 };
2242 3066
2243 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; )
2244 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2245 3069
2246 texture_av = newAV (); 3070 texture_av = newAV ();
2247 AvREAL_off (texture_av); 3071 AvREAL_off (texture_av);
2248} 3072}
2249 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
2250char * 3083char *
2251gl_vendor () 3084gl_vendor ()
2252 CODE: 3085 CODE:
2253 RETVAL = (char *)glGetString (GL_VENDOR); 3086 RETVAL = (char *)glGetString (GL_VENDOR);
2254 OUTPUT: 3087 OUTPUT:
… …
2266 CODE: 3099 CODE:
2267 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3100 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2268 OUTPUT: 3101 OUTPUT:
2269 RETVAL 3102 RETVAL
2270 3103
3104const char *glGetString (GLenum pname)
3105
3106GLint glGetInteger (GLenum pname)
3107 CODE:
3108 glGetIntegerv (pname, &RETVAL);
3109 OUTPUT:
3110 RETVAL
3111
3112GLdouble glGetDouble (GLenum pname)
3113 CODE:
3114 glGetDoublev (pname, &RETVAL);
3115 OUTPUT:
3116 RETVAL
3117
2271int glGetError () 3118int glGetError ()
2272 3119
2273void glFinish () 3120void glFinish ()
2274 3121
2275void glClear (int mask) 3122void glClear (int mask)
… …
2289 3136
2290void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3137void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2291 CODE: 3138 CODE:
2292 gl_BlendFuncSeparate (sa, da, saa, daa); 3139 gl_BlendFuncSeparate (sa, da, saa, daa);
2293 3140
3141# void glBlendEquation (int se)
3142
2294void glDepthMask (int flag) 3143void glDepthMask (int flag)
2295 3144
2296void glLogicOp (int opcode) 3145void glLogicOp (int opcode)
2297 3146
2298void glColorMask (int red, int green, int blue, int alpha) 3147void glColorMask (int red, int green, int blue, int alpha)
… …
2312# near_ and far_ are due to microsofts buggy "c" compiler 3161# near_ and far_ are due to microsofts buggy "c" compiler
2313void 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_)
2314 3163
2315# near_ and far_ are due to microsofts buggy "c" compiler 3164# near_ and far_ are due to microsofts buggy "c" compiler
2316void 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
2317 3168
2318void glViewport (int x, int y, int width, int height) 3169void glViewport (int x, int y, int width, int height)
2319 3170
2320void glScissor (int x, int y, int width, int height) 3171void glScissor (int x, int y, int width, int height)
2321 3172
… …
2329 3180
2330void glRotate (float angle, float x, float y, float z) 3181void glRotate (float angle, float x, float y, float z)
2331 CODE: 3182 CODE:
2332 glRotatef (angle, x, y, z); 3183 glRotatef (angle, x, y, z);
2333 3184
2334void glBegin (int mode)
2335
2336void glEnd ()
2337
2338void glColor (float r, float g, float b, float a = 1.0) 3185void glColor (float r, float g, float b, float a = 1.0)
2339 PROTOTYPE: @ 3186 PROTOTYPE: @
2340 ALIAS: 3187 ALIAS:
2341 glColor_premultiply = 1 3188 glColor_premultiply = 1
2342 CODE: 3189 CODE:
2343 if (ix) 3190 if (ix)
2344 { 3191 {
… …
2347 b *= a; 3194 b *= a;
2348 } 3195 }
2349 // microsoft visual "c" rounds instead of truncating... 3196 // microsoft visual "c" rounds instead of truncating...
2350 glColor4f (r, g, b, a); 3197 glColor4f (r, g, b, a);
2351 3198
2352void glInterleavedArrays (int format, int stride, char *data)
2353
2354void glDrawElements (int mode, int count, int type, char *indices)
2355
2356# 1.2 void glDrawRangeElements (int mode, int start, int end
2357
2358void glRasterPos (float x, float y, float z = 0.) 3199void glRasterPos (float x, float y, float z = 0.)
2359 CODE: 3200 CODE:
2360 glRasterPos3f (0, 0, z); 3201 glRasterPos3f (0, 0, z);
2361 glBitmap (0, 0, 0, 0, x, y, 0); 3202 glBitmap (0, 0, 0, 0, x, y, 0);
2362 3203
… …
2366 3207
2367void glTexCoord (float s, float t) 3208void glTexCoord (float s, float t)
2368 CODE: 3209 CODE:
2369 glTexCoord2f (s, t); 3210 glTexCoord2f (s, t);
2370 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
2371void glTexEnv (int target, int pname, float param) 3241void glTexEnv (int target, int pname, float param)
2372 CODE: 3242 CODE:
2373 glTexEnvf (target, pname, param); 3243 glTexEnvf (target, pname, param);
2374 3244
2375void glTexParameter (int target, int pname, float param) 3245void glTexParameter (int target, int pname, float param)
… …
2391void 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)
2392 CODE: 3262 CODE:
2393 if (gl.SeparableFilter2D) 3263 if (gl.SeparableFilter2D)
2394 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3264 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2395 3265
2396void 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)
2397 3267
2398void 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)
2399 3269
2400void glDrawPixels (int width, int height, int format, int type, char *pixels) 3270void glDrawPixels (int width, int height, int format, int type, char *pixels)
3271
3272void glPixelZoom (float x, float y)
2401 3273
2402void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 3274void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2403 3275
2404int glGenTexture () 3276int glGenTexture ()
2405 CODE: 3277 CODE:
… …
2425 3297
2426void glEndList () 3298void glEndList ()
2427 3299
2428void glCallList (int list) 3300void glCallList (int list)
2429 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