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.198 by root, Sun Jul 15 21:42:02 2007 UTC vs.
Revision 1.296 by root, Mon Dec 21 23:52:34 2009 UTC

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

Diff Legend

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