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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.192 by root, Fri Apr 27 21:27:51 2007 UTC vs.
Revision 1.279 by root, Thu Oct 2 15:59:40 2008 UTC

6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
15#ifdef _WIN32 20#ifdef _WIN32
16# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
17#endif 27#endif
18 28
19#include <assert.h> 29#include <assert.h>
20#include <math.h> 30#include <math.h>
21#include <string.h> 31#include <string.h>
22#include <stdio.h> 32#include <stdio.h>
23#include <stdlib.h> 33#include <stdlib.h>
24 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
25#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
26#include <SDL_endian.h> 39#include <SDL_endian.h>
27#include <SDL_image.h> 40#include <SDL_image.h>
28#include <SDL_mixer.h> 41#include <SDL_mixer.h>
29#include <SDL_opengl.h> 42#include <SDL_opengl.h>
30 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
31#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
33 51
34#include <glib/gmacros.h> 52#include <glib/gmacros.h>
35 53
36#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
37 66
38#ifndef _WIN32 67#ifndef _WIN32
39# include <sys/types.h> 68# include <sys/types.h>
40# include <sys/socket.h> 69# include <sys/socket.h>
41# include <netinet/in.h> 70# include <netinet/in.h>
42# include <netinet/tcp.h> 71# include <netinet/tcp.h>
43# include <inttypes.h> 72# include <inttypes.h>
44#endif 73#endif
45 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
47 85
48#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
49 87
50#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
51#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
52 90
53#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
54 92
55#if 0 93/* mask out modifiers we are not interested in */
56# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
57#else 95
58# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
59#endif
60 97
61static AV *texture_av; 98static AV *texture_av;
62 99
63static struct 100static struct
64{ 101{
101 av_push (texture_av, (SV *)(size_t)name); 138 av_push (texture_av, (SV *)(size_t)name);
102 glDeleteTextures (1, &name); 139 glDeleteTextures (1, &name);
103} 140}
104 141
105#include "texcache.c" 142#include "texcache.c"
143#include "rendercache.c"
106 144
107#include "pango-font.c" 145#include "pango-font.c"
108#include "pango-fontmap.c" 146#include "pango-fontmap.c"
109#include "pango-render.c" 147#include "pango-render.c"
110 148
149typedef IV DC__Channel;
150typedef SDL_RWops *DC__RW;
111typedef Mix_Chunk *CFPlus__MixChunk; 151typedef Mix_Chunk *DC__MixChunk;
112typedef Mix_Music *CFPlus__MixMusic; 152typedef Mix_Music *DC__MixMusic;
113 153
114typedef PangoFontDescription *CFPlus__Font; 154typedef PangoFontDescription *DC__Font;
115 155
116static int 156static int
117shape_attr_p (PangoLayoutRun *run) 157shape_attr_p (PangoLayoutRun *run)
118{ 158{
119 GSList *attrs = run->item->analysis.extra_attrs; 159 GSList *attrs = run->item->analysis.extra_attrs;
133 173
134typedef struct cf_layout { 174typedef struct cf_layout {
135 PangoLayout *pl; 175 PangoLayout *pl;
136 float r, g, b, a; // default color for rgba mode 176 float r, g, b, a; // default color for rgba mode
137 int base_height; 177 int base_height;
138 CFPlus__Font font; 178 DC__Font font;
179 rc_t *rc;
139} *CFPlus__Layout; 180} *DC__Layout;
140 181
141static CFPlus__Font default_font; 182static DC__Font default_font;
142static PangoContext *opengl_context; 183static PangoContext *opengl_context;
143static PangoFontMap *opengl_fontmap; 184static PangoFontMap *opengl_fontmap;
144 185
145static void 186static void
146substitute_func (FcPattern *pattern, gpointer data) 187substitute_func (FcPattern *pattern, gpointer data)
151#endif 192#endif
152 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 193 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
153} 194}
154 195
155static void 196static void
156layout_update_font (CFPlus__Layout self) 197layout_update_font (DC__Layout self)
157{ 198{
158 /* use a random scale factor to account for unknown descenders, 0.8 works 199 /* use a random scale factor to account for unknown descenders, 0.8 works
159 * reasonably well with bitstream vera 200 * reasonably well with dejavu/bistream fonts
160 */ 201 */
161 PangoFontDescription *font = self->font ? self->font : default_font; 202 PangoFontDescription *font = self->font ? self->font : default_font;
162 203
163 pango_font_description_set_absolute_size (font, 204 pango_font_description_set_absolute_size (font,
164 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 205 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
165 206
166 pango_layout_set_font_description (self->pl, font); 207 pango_layout_set_font_description (self->pl, font);
167} 208}
168 209
169static void 210static void
170layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 211layout_get_pixel_size (DC__Layout self, int *w, int *h)
171{ 212{
172 PangoRectangle rect; 213 PangoRectangle rect;
173 214
174 // get_pixel_* wrongly rounds down 215 // get_pixel_* wrongly rounds down
175 pango_layout_get_extents (self->pl, 0, &rect); 216 pango_layout_get_extents (self->pl, 0, &rect);
186 227
187typedef uint16_t tileid; 228typedef uint16_t tileid;
188typedef uint16_t faceid; 229typedef uint16_t faceid;
189 230
190typedef struct { 231typedef struct {
191 int name; 232 GLuint name;
192 int w, h; 233 int w, h;
193 float s, t; 234 float s, t;
194 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
195 tileid smoothtile; 236 tileid smoothtile;
196 uint8_t smoothlevel; 237 uint8_t smoothlevel;
214 int faces; tileid *face2tile; // [faceid] 255 int faces; tileid *face2tile; // [faceid]
215 int texs; maptex *tex; // [tileid] 256 int texs; maptex *tex; // [tileid]
216 257
217 int32_t rows; 258 int32_t rows;
218 maprow *row; 259 maprow *row;
219} *CFPlus__Map; 260} *DC__Map;
220 261
221static char * 262static char *
222prepend (char *ptr, int sze, int inc) 263prepend (char *ptr, int sze, int inc)
223{ 264{
224 char *p; 265 char *p;
262 self->texs *= 2; 303 self->texs *= 2;
263 } 304 }
264} 305}
265 306
266static maprow * 307static maprow *
267map_get_row (CFPlus__Map self, int y) 308map_get_row (DC__Map self, int y)
268{ 309{
269 if (0 > y) 310 if (0 > y)
270 { 311 {
271 int extend = - y + MAP_EXTEND_Y; 312 int extend = - y + MAP_EXTEND_Y;
272 Prepend (maprow, self->row, self->rows, extend); 313 Prepend (maprow, self->row, self->rows, extend);
310 351
311 return row->col + (x - row->c0); 352 return row->col + (x - row->c0);
312} 353}
313 354
314static mapcell * 355static mapcell *
315map_get_cell (CFPlus__Map self, int x, int y) 356map_get_cell (DC__Map self, int x, int y)
316{ 357{
317 return row_get_cell (map_get_row (self, y), x); 358 return row_get_cell (map_get_row (self, y), x);
318} 359}
319 360
320static void 361static void
321map_clear (CFPlus__Map self) 362map_clear (DC__Map self)
322{ 363{
323 int r; 364 int r;
324 365
325 for (r = 0; r < self->rows; r++) 366 for (r = 0; r < self->rows; r++)
326 Safefree (self->row[r].col); 367 Safefree (self->row[r].col);
333 self->oy = 0; 374 self->oy = 0;
334 self->row = 0; 375 self->row = 0;
335 self->rows = 0; 376 self->rows = 0;
336} 377}
337 378
379#define CELL_CLEAR(cell) \
380 do { \
381 if ((cell)->player) \
382 (cell)->tile [2] = 0; \
383 (cell)->darkness = 0; \
384 (cell)->stat_hp = 0; \
385 (cell)->flags = 0; \
386 (cell)->player = 0; \
387 } while (0)
388
338static void 389static void
339map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 390map_blank (DC__Map self, int x0, int y0, int w, int h)
340{ 391{
341 int x, y; 392 int x, y;
342 maprow *row; 393 maprow *row;
343 mapcell *cell; 394 mapcell *cell;
344 395
356 if (x >= row->c1) 407 if (x >= row->c1)
357 break; 408 break;
358 409
359 cell = row->col + x - row->c0; 410 cell = row->col + x - row->c0;
360 411
361 cell->darkness = 0; 412 CELL_CLEAR (cell);
362 cell->stat_hp = 0;
363 cell->flags = 0;
364 cell->player = 0;
365 } 413 }
366 } 414 }
367} 415}
368 416
369typedef struct { 417typedef struct {
423 n |= n >> 16; 471 n |= n >> 16;
424 472
425 return n + 1; 473 return n + 1;
426} 474}
427 475
476static unsigned int
477popcount (unsigned int n)
478{
479 n -= (n >> 1) & 0x55555555U;
480 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
481 n = ((n >> 4) + n) & 0x0f0f0f0fU;
482 n *= 0x01010101U;
483
484 return n >> 24;
485}
486
428/* SDL should provide this, really. */ 487/* SDL should provide this, really. */
429#define SDLK_MODIFIER_MIN 300 488#define SDLK_MODIFIER_MIN 300
430#define SDLK_MODIFIER_MAX 314 489#define SDLK_MODIFIER_MAX 314
431 490
432MODULE = CFPlus PACKAGE = CFPlus 491/******************************************************************************/
492
493static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
494static GV *hover_gv;
495
496static int
497within_widget (SV *widget, NV x, NV y)
498{
499 HV *self;
500 SV **svp;
501 NV wx, ww, wy, wh;
502
503 if (!SvROK (widget))
504 return 0;
505
506 self = (HV *)SvRV (widget);
507
508 if (SvTYPE (self) != SVt_PVHV)
509 return 0;
510
511 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
512 if (y < wy)
513 return 0;
514
515 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
516 if (y >= wy + wh)
517 return 0;
518
519 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
520 if (x < wx)
521 return 0;
522
523 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
524 if (x >= wx + ww)
525 return 0;
526
527 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
528 if (!svp || !SvTRUE (*svp))
529 return 0;
530
531 return 1;
532}
533
534/******************************************************************************/
535
536/* process keyboard modifiers */
537static int
538mod_munge (int mod)
539{
540 mod &= MOD_MASK;
541
542 if (mod & (KMOD_META | KMOD_ALT))
543 mod |= KMOD_LRAM;
544
545 return mod;
546}
547
548static void
549deliantra_main ()
550{
551 char *argv[] = { 0 };
552 call_argv ("::main", G_DISCARD | G_VOID, argv);
553}
554
555#ifdef __MACOSX__
556 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main()
558 * on OS X, so... we provide one and call the original main(), which,
559 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
560 * and which calls our main (== SDL_main) back.
561 */
562 extern C_LINKAGE int
563 main (int argc, char *argv[])
564 {
565 deliantra_main ();
566 }
567
568 #undef main
569
570 extern C_LINKAGE int main (int argc, char *argv[]);
571
572 static void
573 SDL_braino (void)
574 {
575 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv);
577 }
578#else
579 static void
580 SDL_braino (void)
581 {
582 deliantra_main ();
583 }
584#endif
585
586MODULE = Deliantra::Client PACKAGE = DC
433 587
434PROTOTYPES: ENABLE 588PROTOTYPES: ENABLE
435 589
436BOOT: 590BOOT:
437{ 591{
438 HV *stash = gv_stashpv ("CFPlus", 1); 592 HV *stash = gv_stashpv ("DC", 1);
439 static const struct { 593 static const struct {
440 const char *name; 594 const char *name;
441 IV iv; 595 IV iv;
442 } *civ, const_iv[] = { 596 } *civ, const_iv[] = {
443# define const_iv(name) { # name, (IV)name } 597# define const_iv(name) { # name, (IV)name }
465 619
466 const_iv (SDL_APPINPUTFOCUS), 620 const_iv (SDL_APPINPUTFOCUS),
467 const_iv (SDL_APPMOUSEFOCUS), 621 const_iv (SDL_APPMOUSEFOCUS),
468 const_iv (SDL_APPACTIVE), 622 const_iv (SDL_APPACTIVE),
469 623
624
625 const_iv (SDLK_UNKNOWN),
626 const_iv (SDLK_FIRST),
627 const_iv (SDLK_BACKSPACE),
628 const_iv (SDLK_TAB),
629 const_iv (SDLK_CLEAR),
630 const_iv (SDLK_RETURN),
631 const_iv (SDLK_PAUSE),
632 const_iv (SDLK_ESCAPE),
633 const_iv (SDLK_SPACE),
634 const_iv (SDLK_EXCLAIM),
635 const_iv (SDLK_QUOTEDBL),
636 const_iv (SDLK_HASH),
637 const_iv (SDLK_DOLLAR),
638 const_iv (SDLK_AMPERSAND),
639 const_iv (SDLK_QUOTE),
640 const_iv (SDLK_LEFTPAREN),
641 const_iv (SDLK_RIGHTPAREN),
642 const_iv (SDLK_ASTERISK),
643 const_iv (SDLK_PLUS),
644 const_iv (SDLK_COMMA),
645 const_iv (SDLK_MINUS),
646 const_iv (SDLK_PERIOD),
647 const_iv (SDLK_SLASH),
648 const_iv (SDLK_0),
649 const_iv (SDLK_1),
650 const_iv (SDLK_2),
651 const_iv (SDLK_3),
652 const_iv (SDLK_4),
653 const_iv (SDLK_5),
654 const_iv (SDLK_6),
655 const_iv (SDLK_7),
656 const_iv (SDLK_8),
657 const_iv (SDLK_9),
658 const_iv (SDLK_COLON),
659 const_iv (SDLK_SEMICOLON),
660 const_iv (SDLK_LESS),
661 const_iv (SDLK_EQUALS),
662 const_iv (SDLK_GREATER),
663 const_iv (SDLK_QUESTION),
664 const_iv (SDLK_AT),
665
666 const_iv (SDLK_LEFTBRACKET),
667 const_iv (SDLK_BACKSLASH),
668 const_iv (SDLK_RIGHTBRACKET),
669 const_iv (SDLK_CARET),
670 const_iv (SDLK_UNDERSCORE),
671 const_iv (SDLK_BACKQUOTE),
672 const_iv (SDLK_DELETE),
673
674 const_iv (SDLK_FIRST),
675 const_iv (SDLK_LAST),
470 const_iv (SDLK_KP0), 676 const_iv (SDLK_KP0),
471 const_iv (SDLK_KP1), 677 const_iv (SDLK_KP1),
472 const_iv (SDLK_KP2), 678 const_iv (SDLK_KP2),
473 const_iv (SDLK_KP3), 679 const_iv (SDLK_KP3),
474 const_iv (SDLK_KP4), 680 const_iv (SDLK_KP4),
546 const_iv (KMOD_LMETA), 752 const_iv (KMOD_LMETA),
547 const_iv (KMOD_RMETA), 753 const_iv (KMOD_RMETA),
548 const_iv (KMOD_NUM), 754 const_iv (KMOD_NUM),
549 const_iv (KMOD_CAPS), 755 const_iv (KMOD_CAPS),
550 const_iv (KMOD_MODE), 756 const_iv (KMOD_MODE),
757
758 const_iv (KMOD_LRAM),
759
760 const_iv (MIX_DEFAULT_FORMAT),
761
762 const_iv (SDL_INIT_TIMER),
763 const_iv (SDL_INIT_AUDIO),
764 const_iv (SDL_INIT_VIDEO),
765 const_iv (SDL_INIT_CDROM),
766 const_iv (SDL_INIT_JOYSTICK),
767 const_iv (SDL_INIT_EVERYTHING),
768 const_iv (SDL_INIT_NOPARACHUTE),
769 const_iv (SDL_INIT_EVENTTHREAD),
770
771 const_iv (SDL_GL_RED_SIZE),
772 const_iv (SDL_GL_GREEN_SIZE),
773 const_iv (SDL_GL_BLUE_SIZE),
774 const_iv (SDL_GL_ALPHA_SIZE),
775 const_iv (SDL_GL_DOUBLEBUFFER),
776 const_iv (SDL_GL_BUFFER_SIZE),
777 const_iv (SDL_GL_DEPTH_SIZE),
778 const_iv (SDL_GL_STENCIL_SIZE),
779 const_iv (SDL_GL_ACCUM_RED_SIZE),
780 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
781 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
782 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
783 const_iv (SDL_GL_STEREO),
784 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
785 const_iv (SDL_GL_MULTISAMPLESAMPLES),
786 const_iv (SDL_GL_ACCELERATED_VISUAL),
787 const_iv (SDL_GL_SWAP_CONTROL),
788
789 const_iv (FOW_DARKNESS)
551# undef const_iv 790# undef const_iv
552 }; 791 };
553 792
554 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 793 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
555 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
573 812
574NV floor (NV x) 813NV floor (NV x)
575 814
576NV ceil (NV x) 815NV ceil (NV x)
577 816
817IV minpot (UV n)
818
819IV popcount (UV n)
820
578void 821void
579pango_init () 822pango_init ()
580 CODE: 823 CODE:
581{ 824{
582 opengl_fontmap = pango_opengl_font_map_new (); 825 opengl_fontmap = pango_opengl_font_map_new ();
583 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 826 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
584 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 827 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
828 /*pango_context_set_font_description (opengl_context, default_font);*/
829#if PANGO_VERSION_CHECK (1, 15, 2)
830 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
831 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
832#endif
585} 833}
586 834
587int 835char *SDL_GetError ()
588SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
589 836
590void 837void SDL_braino ()
838
839int SDL_Init (U32 flags)
840
841int SDL_InitSubSystem (U32 flags)
842
843void SDL_QuitSubSystem (U32 flags)
844
591SDL_Quit () 845void SDL_Quit ()
592 846
847int SDL_GL_SetAttribute (int attr, int value)
848
849int SDL_GL_GetAttribute (int attr)
850 CODE:
851 if (SDL_GL_GetAttribute (attr, &RETVAL))
852 XSRETURN_UNDEF;
853 OUTPUT:
854 RETVAL
855
593void 856void
594SDL_ListModes () 857SDL_ListModes (int rgb, int alpha)
595 PPCODE: 858 PPCODE:
596{ 859{
597 SDL_Rect **m; 860 SDL_Rect **m;
598 861
599 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 862 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
600 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 863 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
601 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 864 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
602 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 865 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
603 866
604 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 867 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
605 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 868 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
606 869
607 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 870 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
608 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
609 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
610 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
611 874
612 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 875 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
613#if SDL_VERSION_ATLEAST(1,2,10)
614 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
615 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 876 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
616#endif
617
618 SDL_EnableUNICODE (1);
619 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
620 877
621 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 878 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
622 879
623 if (m && m != (SDL_Rect **)-1) 880 if (m && m != (SDL_Rect **)-1)
624 while (*m) 881 while (*m)
625 { 882 {
883 if ((*m)->w >= 400 && (*m)->h >= 300)
884 {
626 AV *av = newAV (); 885 AV *av = newAV ();
627 av_push (av, newSViv ((*m)->w)); 886 av_push (av, newSViv ((*m)->w));
628 av_push (av, newSViv ((*m)->h)); 887 av_push (av, newSViv ((*m)->h));
888 av_push (av, newSViv (rgb));
889 av_push (av, newSViv (alpha));
629 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 890 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
891 }
630 892
631 ++m; 893 ++m;
632 } 894 }
633} 895}
634 896
635char *
636SDL_GetError ()
637
638int 897int
639SDL_SetVideoMode (int w, int h, int fullscreen) 898SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
640 CODE: 899 CODE:
900{
901 SDL_EnableUNICODE (1);
902 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
903
904 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
905 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
906 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
907 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
908
641 RETVAL = !!SDL_SetVideoMode ( 909 RETVAL = !!SDL_SetVideoMode (
642 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 910 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
643 ); 911 );
912
644 if (RETVAL) 913 if (RETVAL)
645 { 914 {
646 av_clear (texture_av); 915 av_clear (texture_av);
647 916
648 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 917 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
649# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 918#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
650# include "glfunc.h" 919#include "glfunc.h"
651# undef GL_FUNC 920#undef GL_FUNC
652
653 } 921 }
922}
654 OUTPUT: 923 OUTPUT:
655 RETVAL 924 RETVAL
656 925
657void 926void
658SDL_GL_SwapBuffers () 927SDL_GL_SwapBuffers ()
659 928
660char * 929char *
661SDL_GetKeyName (int sym) 930SDL_GetKeyName (int sym)
662 931
932int
933SDL_GetAppState ()
934
935int
936SDL_GetModState ()
937
663void 938void
664SDL_PollEvent () 939poll_events ()
665 PPCODE: 940 PPCODE:
666{ 941{
667 SDL_Event ev; 942 SDL_Event ev;
668 943
669 while (SDL_PollEvent (&ev)) 944 SDL_PumpEvents ();
945 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
670 { 946 {
671 HV *hv = newHV (); 947 HV *hv = newHV ();
672 hv_store (hv, "type", 4, newSViv (ev.type), 0); 948 hv_store (hv, "type", 4, newSViv (ev.type), 0);
673 949
674 switch (ev.type) 950 switch (ev.type)
675 { 951 {
676 case SDL_KEYDOWN: 952 case SDL_KEYDOWN:
677 case SDL_KEYUP: 953 case SDL_KEYUP:
678 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 954 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
679 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 955 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
680 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 956 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
681 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 957 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
682 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 958 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
683 break; 959 break;
684 960
685 case SDL_ACTIVEEVENT: 961 case SDL_ACTIVEEVENT:
686 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 962 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
687 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 963 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
688 break; 964 break;
689 965
690 case SDL_MOUSEMOTION: 966 case SDL_MOUSEMOTION:
967 {
968 int state = ev.motion.state;
969 int x = ev.motion.x;
970 int y = ev.motion.y;
971 int xrel = ev.motion.xrel;
972 int yrel = ev.motion.yrel;
973
974 /* do simplistic event compression */
975 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
976 && state == ev.motion.state)
977 {
978 xrel += ev.motion.xrel;
979 yrel += ev.motion.yrel;
980 x = ev.motion.x;
981 y = ev.motion.y;
982 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
983 }
984
691 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 985 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
692
693 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 986 hv_store (hv, "state", 5, newSViv (state), 0);
694 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 987 hv_store (hv, "x", 1, newSViv (x), 0);
695 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 988 hv_store (hv, "y", 1, newSViv (y), 0);
696 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 989 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
697 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 990 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
991 }
698 break; 992 break;
699 993
700 case SDL_MOUSEBUTTONDOWN: 994 case SDL_MOUSEBUTTONDOWN:
701 case SDL_MOUSEBUTTONUP: 995 case SDL_MOUSEBUTTONUP:
702 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
703 997
704 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 998 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
705 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 999 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
706 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1000 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
707 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1001 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
712 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1006 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
713 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1007 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
714 break; 1008 break;
715 } 1009 }
716 1010
717 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1011 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
718 } 1012 }
719} 1013}
720 1014
721int 1015int
722Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1016Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
723 POSTCALL: 1017 POSTCALL:
724 Mix_HookMusicFinished (music_finished); 1018 Mix_HookMusicFinished (music_finished);
725 Mix_ChannelFinished (channel_finished); 1019 Mix_ChannelFinished (channel_finished);
726 1020
727void 1021void
1022Mix_QuerySpec ()
1023 PPCODE:
1024{
1025 int freq, channels;
1026 Uint16 format;
1027
1028 if (Mix_QuerySpec (&freq, &format, &channels))
1029 {
1030 EXTEND (SP, 3);
1031 PUSHs (sv_2mortal (newSViv (freq)));
1032 PUSHs (sv_2mortal (newSViv (format)));
1033 PUSHs (sv_2mortal (newSViv (channels)));
1034 }
1035}
1036
1037void
728Mix_CloseAudio () 1038Mix_CloseAudio ()
729 1039
730int 1040int
731Mix_AllocateChannels (int numchans = -1) 1041Mix_AllocateChannels (int numchans = -1)
1042
1043const char *
1044Mix_GetError ()
732 1045
733void 1046void
734lowdelay (int fd, int val = 1) 1047lowdelay (int fd, int val = 1)
735 CODE: 1048 CODE:
736 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1049 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
762 } 1075 }
763 } 1076 }
764#endif 1077#endif
765} 1078}
766 1079
767void 1080int
768add_font (char *file) 1081add_font (char *file)
769 CODE: 1082 CODE:
770 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT:
1085 RETVAL
771 1086
772void 1087void
773load_image_inline (SV *image_) 1088load_image_inline (SV *image_)
774 ALIAS: 1089 ALIAS:
775 load_image_file = 1 1090 load_image_file = 1
778 STRLEN image_len; 1093 STRLEN image_len;
779 char *image = (char *)SvPVbyte (image_, image_len); 1094 char *image = (char *)SvPVbyte (image_, image_len);
780 SDL_Surface *surface, *surface2; 1095 SDL_Surface *surface, *surface2;
781 SDL_PixelFormat fmt; 1096 SDL_PixelFormat fmt;
782 SDL_RWops *rw = ix 1097 SDL_RWops *rw = ix
783 ? SDL_RWFromFile (image, "r") 1098 ? SDL_RWFromFile (image, "rb")
784 : SDL_RWFromConstMem (image, image_len); 1099 : SDL_RWFromConstMem (image, image_len);
785 1100
786 if (!rw) 1101 if (!rw)
787 croak ("load_image: %s", SDL_GetError ()); 1102 croak ("load_image: %s", SDL_GetError ());
788 1103
861void 1176void
862error (char *message) 1177error (char *message)
863 CODE: 1178 CODE:
864 fprintf (stderr, "ERROR: %s\n", message); 1179 fprintf (stderr, "ERROR: %s\n", message);
865#ifdef _WIN32 1180#ifdef _WIN32
866 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1181 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
867#endif 1182#endif
868 1183
869void 1184void
870fatal (char *message) 1185fatal (char *message)
871 CODE: 1186 CODE:
872 fprintf (stderr, "FATAL: %s\n", message); 1187 fprintf (stderr, "FATAL: %s\n", message);
873#ifdef _WIN32 1188#ifdef _WIN32
874 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1189 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
875#endif 1190#endif
876 _exit (1); 1191 _exit (1);
877 1192
878void 1193void
879_exit (int retval = 0) 1194_exit (int retval = 0)
882 ExitThread (retval); // unclean, please beam me up 1197 ExitThread (retval); // unclean, please beam me up
883#else 1198#else
884 _exit (retval); 1199 _exit (retval);
885#endif 1200#endif
886 1201
887MODULE = CFPlus PACKAGE = CFPlus::Font 1202void
1203debug ()
1204 CODE:
1205{
1206#if DEBUG
1207 VALGRIND_DO_LEAK_CHECK;
1208#endif
1209}
888 1210
889CFPlus::Font 1211MODULE = Deliantra::Client PACKAGE = DC::Font
1212
1213PROTOTYPES: DISABLE
1214
1215DC::Font
890new_from_file (SV *class, char *path, int id = 0) 1216new_from_file (SV *class, char *path, int id = 0)
891 CODE: 1217 CODE:
892{ 1218{
893 int count; 1219 int count;
894 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1220 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
897} 1223}
898 OUTPUT: 1224 OUTPUT:
899 RETVAL 1225 RETVAL
900 1226
901void 1227void
902DESTROY (CFPlus::Font self) 1228DESTROY (DC::Font self)
903 CODE: 1229 CODE:
904 pango_font_description_free (self); 1230 pango_font_description_free (self);
905 1231
906void 1232void
907make_default (CFPlus::Font self) 1233make_default (DC::Font self)
1234 PROTOTYPE: $
908 CODE: 1235 CODE:
909 default_font = self; 1236 default_font = self;
910 1237
911MODULE = CFPlus PACKAGE = CFPlus::Layout 1238MODULE = Deliantra::Client PACKAGE = DC::Layout
912 1239
1240PROTOTYPES: DISABLE
1241
913void 1242void
914reset_glyph_cache () 1243glyph_cache_backup ()
1244 PROTOTYPE:
915 CODE: 1245 CODE:
1246 tc_backup ();
1247
1248void
1249glyph_cache_restore ()
1250 PROTOTYPE:
1251 CODE:
916 tc_clear (); 1252 tc_restore ();
917 1253
918CFPlus::Layout 1254DC::Layout
919new (SV *class) 1255new (SV *class)
920 CODE: 1256 CODE:
921 New (0, RETVAL, 1, struct cf_layout); 1257 New (0, RETVAL, 1, struct cf_layout);
922 1258
923 RETVAL->pl = pango_layout_new (opengl_context); 1259 RETVAL->pl = pango_layout_new (opengl_context);
925 RETVAL->g = 1.; 1261 RETVAL->g = 1.;
926 RETVAL->b = 1.; 1262 RETVAL->b = 1.;
927 RETVAL->a = 1.; 1263 RETVAL->a = 1.;
928 RETVAL->base_height = MIN_FONT_HEIGHT; 1264 RETVAL->base_height = MIN_FONT_HEIGHT;
929 RETVAL->font = 0; 1265 RETVAL->font = 0;
1266 RETVAL->rc = rc_alloc ();
930 1267
931 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1268 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
932 layout_update_font (RETVAL); 1269 layout_update_font (RETVAL);
933 OUTPUT: 1270 OUTPUT:
934 RETVAL 1271 RETVAL
935 1272
936void 1273void
937DESTROY (CFPlus::Layout self) 1274DESTROY (DC::Layout self)
938 CODE: 1275 CODE:
939 g_object_unref (self->pl); 1276 g_object_unref (self->pl);
1277 rc_free (self->rc);
940 Safefree (self); 1278 Safefree (self);
941 1279
942void 1280void
943set_text (CFPlus::Layout self, SV *text_) 1281set_text (DC::Layout self, SV *text_)
944 CODE: 1282 CODE:
945{ 1283{
946 STRLEN textlen; 1284 STRLEN textlen;
947 char *text = SvPVutf8 (text_, textlen); 1285 char *text = SvPVutf8 (text_, textlen);
948 1286
949 pango_layout_set_text (self->pl, text, textlen); 1287 pango_layout_set_text (self->pl, text, textlen);
950} 1288}
951 1289
952void 1290void
953set_markup (CFPlus::Layout self, SV *text_) 1291set_markup (DC::Layout self, SV *text_)
954 CODE: 1292 CODE:
955{ 1293{
956 STRLEN textlen; 1294 STRLEN textlen;
957 char *text = SvPVutf8 (text_, textlen); 1295 char *text = SvPVutf8 (text_, textlen);
958 1296
959 pango_layout_set_markup (self->pl, text, textlen); 1297 pango_layout_set_markup (self->pl, text, textlen);
960} 1298}
961 1299
962void 1300void
963set_shapes (CFPlus::Layout self, ...) 1301set_shapes (DC::Layout self, ...)
964 CODE: 1302 CODE:
965{ 1303{
966 PangoAttrList *attrs = 0; 1304 PangoAttrList *attrs = 0;
967 const char *text = pango_layout_get_text (self->pl); 1305 const char *text = pango_layout_get_text (self->pl);
968 const char *pos = text; 1306 const char *pos = text;
1003 if (attrs) 1341 if (attrs)
1004 pango_layout_set_attributes (self->pl, attrs); 1342 pango_layout_set_attributes (self->pl, attrs);
1005} 1343}
1006 1344
1007void 1345void
1008get_shapes (CFPlus::Layout self) 1346get_shapes (DC::Layout self)
1009 PPCODE: 1347 PPCODE:
1010{ 1348{
1011 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1349 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1012 1350
1013 do 1351 do
1014 { 1352 {
1015 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1353 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1016 1354
1017 if (run && shape_attr_p (run)) 1355 if (run && shape_attr_p (run))
1018 { 1356 {
1019 PangoRectangle extents; 1357 PangoRectangle extents;
1020 pango_layout_iter_get_run_extents (iter, 0, &extents); 1358 pango_layout_iter_get_run_extents (iter, 0, &extents);
1028 1366
1029 pango_layout_iter_free (iter); 1367 pango_layout_iter_free (iter);
1030} 1368}
1031 1369
1032int 1370int
1033has_wrapped (CFPlus::Layout self) 1371has_wrapped (DC::Layout self)
1034 CODE: 1372 CODE:
1035{ 1373{
1036 int lines = 1; 1374 int lines = 1;
1037 const char *text = pango_layout_get_text (self->pl); 1375 const char *text = pango_layout_get_text (self->pl);
1038 1376
1043} 1381}
1044 OUTPUT: 1382 OUTPUT:
1045 RETVAL 1383 RETVAL
1046 1384
1047SV * 1385SV *
1048get_text (CFPlus::Layout self) 1386get_text (DC::Layout self)
1049 CODE: 1387 CODE:
1050 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1388 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1051 sv_utf8_decode (RETVAL); 1389 sv_utf8_decode (RETVAL);
1052 OUTPUT: 1390 OUTPUT:
1053 RETVAL 1391 RETVAL
1054 1392
1055void 1393void
1056set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1394set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1057 CODE: 1395 CODE:
1058 self->r = r; 1396 self->r = r;
1059 self->g = g; 1397 self->g = g;
1060 self->b = b; 1398 self->b = b;
1061 self->a = a; 1399 self->a = a;
1062 1400
1063void 1401void
1064set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1402set_font (DC::Layout self, DC::Font font = 0)
1065 CODE: 1403 CODE:
1066 if (self->font != font) 1404 if (self->font != font)
1067 { 1405 {
1068 self->font = font; 1406 self->font = font;
1069 layout_update_font (self); 1407 layout_update_font (self);
1070 } 1408 }
1071 1409
1072void 1410void
1073set_height (CFPlus::Layout self, int base_height) 1411set_height (DC::Layout self, int base_height)
1074 CODE: 1412 CODE:
1075 if (self->base_height != base_height) 1413 if (self->base_height != base_height)
1076 { 1414 {
1077 self->base_height = base_height; 1415 self->base_height = base_height;
1078 layout_update_font (self); 1416 layout_update_font (self);
1079 } 1417 }
1080 1418
1081void 1419void
1082set_width (CFPlus::Layout self, int max_width = -1) 1420set_width (DC::Layout self, int max_width = -1)
1083 CODE: 1421 CODE:
1084 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1422 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1085 1423
1086void 1424void
1087set_indent (CFPlus::Layout self, int indent) 1425set_indent (DC::Layout self, int indent)
1088 CODE: 1426 CODE:
1089 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1427 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1090 1428
1091void 1429void
1092set_spacing (CFPlus::Layout self, int spacing) 1430set_spacing (DC::Layout self, int spacing)
1093 CODE: 1431 CODE:
1094 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1432 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1095 1433
1096void 1434void
1097set_ellipsise (CFPlus::Layout self, int ellipsise) 1435set_ellipsise (DC::Layout self, int ellipsise)
1098 CODE: 1436 CODE:
1099 pango_layout_set_ellipsize (self->pl, 1437 pango_layout_set_ellipsize (self->pl,
1100 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1438 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1101 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1439 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1102 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1440 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1103 : PANGO_ELLIPSIZE_NONE 1441 : PANGO_ELLIPSIZE_NONE
1104 ); 1442 );
1105 1443
1106void 1444void
1107set_single_paragraph_mode (CFPlus::Layout self, int spm) 1445set_single_paragraph_mode (DC::Layout self, int spm)
1108 CODE: 1446 CODE:
1109 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1447 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1110 1448
1111void 1449void
1112size (CFPlus::Layout self) 1450size (DC::Layout self)
1113 PPCODE: 1451 PPCODE:
1114{ 1452{
1115 int w, h; 1453 int w, h;
1116 1454
1117 layout_get_pixel_size (self, &w, &h); 1455 layout_get_pixel_size (self, &w, &h);
1120 PUSHs (sv_2mortal (newSViv (w))); 1458 PUSHs (sv_2mortal (newSViv (w)));
1121 PUSHs (sv_2mortal (newSViv (h))); 1459 PUSHs (sv_2mortal (newSViv (h)));
1122} 1460}
1123 1461
1124int 1462int
1125descent (CFPlus::Layout self) 1463descent (DC::Layout self)
1126 CODE: 1464 CODE:
1127{ 1465{
1128 PangoRectangle rect; 1466 PangoRectangle rect;
1129 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1467 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1130 pango_layout_line_get_pixel_extents (line, 0, &rect); 1468 pango_layout_line_get_pixel_extents (line, 0, &rect);
1131 RETVAL = PANGO_DESCENT (rect); 1469 RETVAL = PANGO_DESCENT (rect);
1132} 1470}
1133 OUTPUT: 1471 OUTPUT:
1134 RETVAL 1472 RETVAL
1135 1473
1136int 1474int
1137xy_to_index (CFPlus::Layout self, int x, int y) 1475xy_to_index (DC::Layout self, int x, int y)
1138 CODE: 1476 CODE:
1139{ 1477{
1140 int index, trailing; 1478 int index, trailing;
1141 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1479 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1142 RETVAL = index + trailing; 1480 RETVAL = index + trailing;
1143} 1481}
1144 OUTPUT: 1482 OUTPUT:
1145 RETVAL 1483 RETVAL
1146 1484
1147void 1485void
1148cursor_pos (CFPlus::Layout self, int index) 1486cursor_pos (DC::Layout self, int index)
1149 PPCODE: 1487 PPCODE:
1150{ 1488{
1151 PangoRectangle strong_pos; 1489 PangoRectangle pos;
1152 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1490 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1153 1491
1154 EXTEND (SP, 3); 1492 EXTEND (SP, 3);
1155 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1156 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1494 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1157 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1495 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1158} 1496}
1159 1497
1160void 1498void
1161index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1499index_to_line_x (DC::Layout self, int index, int trailing = 0)
1162 PPCODE: 1500 PPCODE:
1163{ 1501{
1164 int line, x; 1502 int line, x;
1165 1503
1166 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1504 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1505#if !PANGO_VERSION_CHECK (1, 17, 3)
1167 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1506 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1168 1507 --line;
1508#endif
1169 EXTEND (SP, 2); 1509 EXTEND (SP, 2);
1170 PUSHs (sv_2mortal (newSViv (line - 1))); 1510 PUSHs (sv_2mortal (newSViv (line)));
1171 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1172} 1512}
1173 1513
1174void 1514void
1175line_x_to_index (CFPlus::Layout self, int line, int x) 1515line_x_to_index (DC::Layout self, int line, int x)
1176 PPCODE: 1516 PPCODE:
1177{ 1517{
1178 PangoLayoutLine *lp; 1518 PangoLayoutLine *lp;
1179 int index, trailing; 1519 int index, trailing;
1180 1520
1181 if (line < 0) 1521 if (line < 0)
1182 XSRETURN_EMPTY; 1522 XSRETURN_EMPTY;
1183 1523
1184 if (!(lp = pango_layout_get_line (self->pl, line))) 1524 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1185 XSRETURN_EMPTY; /* do better */ 1525 XSRETURN_EMPTY; /* do better */
1186 1526
1187 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1527 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1188 1528
1189 EXTEND (SP, 2); 1529 EXTEND (SP, 2);
1195 PUSHs (sv_2mortal (newSViv (trailing))); 1535 PUSHs (sv_2mortal (newSViv (trailing)));
1196 } 1536 }
1197} 1537}
1198 1538
1199void 1539void
1200render (CFPlus::Layout self, float x, float y, int flags = 0) 1540render (DC::Layout self, float x, float y, int flags = 0)
1201 PPCODE: 1541 CODE:
1542 rc_clear (self->rc);
1202 pango_opengl_render_layout_subpixel ( 1543 pango_opengl_render_layout_subpixel (
1203 self->pl, 1544 self->pl,
1545 self->rc,
1204 x * PANGO_SCALE, y * PANGO_SCALE, 1546 x * PANGO_SCALE, y * PANGO_SCALE,
1205 self->r, self->g, self->b, self->a, 1547 self->r, self->g, self->b, self->a,
1206 flags 1548 flags
1207 ); 1549 );
1550 // we assume that context_change actually clears/frees stuff
1551 // and does not do any recomputation...
1552 pango_layout_context_changed (self->pl);
1208 1553
1209MODULE = CFPlus PACKAGE = CFPlus::Texture
1210
1211void 1554void
1212pad2pot (SV *data_, SV *w_, SV *h_) 1555draw (DC::Layout self)
1213 CODE: 1556 CODE:
1214{ 1557{
1215 int ow = SvIV (w_); 1558 glEnable (GL_TEXTURE_2D);
1216 int oh = SvIV (h_); 1559 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1560 glEnable (GL_BLEND);
1561 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1562 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1563 glEnable (GL_ALPHA_TEST);
1564 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1217 1565
1218 if (ow && oh) 1566 rc_draw (self->rc);
1567
1568 glDisable (GL_ALPHA_TEST);
1569 glDisable (GL_BLEND);
1570 glDisable (GL_TEXTURE_2D);
1571}
1572
1573MODULE = Deliantra::Client PACKAGE = DC::Texture
1574
1575PROTOTYPES: ENABLE
1576
1577void
1578pad (SV *data_, int ow, int oh, int nw, int nh)
1579 CODE:
1580{
1581 if ((nw != ow || nh != oh) && SvOK (data_))
1219 { 1582 {
1220 int nw = minpot (ow);
1221 int nh = minpot (oh);
1222
1223 if (nw != ow || nh != oh)
1224 {
1225 if (SvOK (data_))
1226 {
1227 STRLEN datalen; 1583 STRLEN datalen;
1228 char *data = SvPVbyte (data_, datalen); 1584 char *data = SvPVbyte (data_, datalen);
1229 int bpp = datalen / (ow * oh); 1585 int bpp = datalen / (ow * oh);
1230 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1586 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1231 1587
1232 SvPOK_only (result_); 1588 SvPOK_only (result_);
1233 SvCUR_set (result_, nw * nh * bpp); 1589 SvCUR_set (result_, nw * nh * bpp);
1234 1590
1235 memset (SvPVX (result_), 0, nw * nh * bpp); 1591 memset (SvPVX (result_), 0, nw * nh * bpp);
1236 while (oh--) 1592 while (oh--)
1237 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1593 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1238 1594
1239 sv_setsv (data_, result_); 1595 sv_setsv (data_, result_);
1240 }
1241
1242 sv_setiv (w_, nw);
1243 sv_setiv (h_, nh);
1244 }
1245 } 1596 }
1246} 1597}
1247 1598
1248void 1599void
1249draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1600draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1255{ 1606{
1256 HV *hv = (HV *)SvRV (self); 1607 HV *hv = (HV *)SvRV (self);
1257 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1608 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1258 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1609 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1259 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1610 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1611
1612 if (name <= 0)
1613 XSRETURN_EMPTY;
1260 1614
1261 if (items < 5) 1615 if (items < 5)
1262 { 1616 {
1263 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1617 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1264 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1618 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1292 glDisable (GL_ALPHA_TEST); 1646 glDisable (GL_ALPHA_TEST);
1293 glDisable (GL_BLEND); 1647 glDisable (GL_BLEND);
1294 } 1648 }
1295} 1649}
1296 1650
1297MODULE = CFPlus PACKAGE = CFPlus::Map 1651IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1652 CODE:
1653{
1654 GLint width;
1655 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1656 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1657 RETVAL = width > 0;
1658}
1659 OUTPUT:
1660 RETVAL
1298 1661
1299CFPlus::Map 1662MODULE = Deliantra::Client PACKAGE = DC::Map
1663
1664PROTOTYPES: DISABLE
1665
1666DC::Map
1300new (SV *class) 1667new (SV *class)
1301 CODE: 1668 CODE:
1302 New (0, RETVAL, 1, struct map); 1669 New (0, RETVAL, 1, struct map);
1303 RETVAL->x = 0; 1670 RETVAL->x = 0;
1304 RETVAL->y = 0; 1671 RETVAL->y = 0;
1312 RETVAL->row = 0; 1679 RETVAL->row = 0;
1313 OUTPUT: 1680 OUTPUT:
1314 RETVAL 1681 RETVAL
1315 1682
1316void 1683void
1317DESTROY (CFPlus::Map self) 1684DESTROY (DC::Map self)
1318 CODE: 1685 CODE:
1319{ 1686{
1320 map_clear (self); 1687 map_clear (self);
1321 Safefree (self->face2tile); 1688 Safefree (self->face2tile);
1322 Safefree (self->tex); 1689 Safefree (self->tex);
1323 Safefree (self); 1690 Safefree (self);
1324} 1691}
1325 1692
1326void 1693void
1327resize (CFPlus::Map self, int map_width, int map_height) 1694resize (DC::Map self, int map_width, int map_height)
1328 CODE: 1695 CODE:
1329 self->w = map_width; 1696 self->w = map_width;
1330 self->h = map_height; 1697 self->h = map_height;
1331 1698
1332void 1699void
1333clear (CFPlus::Map self) 1700clear (DC::Map self)
1334 CODE: 1701 CODE:
1335 map_clear (self); 1702 map_clear (self);
1336 1703
1337void 1704void
1338set_tileid (CFPlus::Map self, int face, int tile) 1705set_tileid (DC::Map self, int face, int tile)
1339 CODE: 1706 CODE:
1340{ 1707{
1341 need_facenum (self, face); self->face2tile [face] = tile; 1708 need_facenum (self, face); self->face2tile [face] = tile;
1342 need_texid (self, tile); 1709 need_texid (self, tile);
1343} 1710}
1344 1711
1345void 1712void
1346set_smooth (CFPlus::Map self, int face, int smooth, int level) 1713set_smooth (DC::Map self, int face, int smooth, int level)
1347 CODE: 1714 CODE:
1348{ 1715{
1349 tileid texid; 1716 tileid texid;
1350 maptex *tex; 1717 maptex *tex;
1351 1718
1364 tex->smoothtile = self->face2tile [smooth]; 1731 tex->smoothtile = self->face2tile [smooth];
1365 tex->smoothlevel = level; 1732 tex->smoothlevel = level;
1366} 1733}
1367 1734
1368void 1735void
1369set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1736set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1370 CODE: 1737 CODE:
1371{ 1738{
1372 need_texid (self, texid); 1739 need_texid (self, texid);
1373 1740
1374 { 1741 {
1394 // from transparent color bleeding and ugly wrapping effects. 1761 // from transparent color bleeding and ugly wrapping effects.
1395 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1396} 1763}
1397 1764
1398int 1765int
1399ox (CFPlus::Map self) 1766ox (DC::Map self)
1400 ALIAS: 1767 ALIAS:
1401 oy = 1 1768 oy = 1
1402 x = 2 1769 x = 2
1403 y = 3 1770 y = 3
1404 w = 4 1771 w = 4
1415 } 1782 }
1416 OUTPUT: 1783 OUTPUT:
1417 RETVAL 1784 RETVAL
1418 1785
1419void 1786void
1420scroll (CFPlus::Map self, int dx, int dy) 1787scroll (DC::Map self, int dx, int dy)
1421 CODE: 1788 CODE:
1422{ 1789{
1423 if (dx > 0) 1790 if (dx > 0)
1424 map_blank (self, self->x, self->y, dx, self->h); 1791 map_blank (self, self->x, self->y, dx, self->h);
1425 else if (dx < 0) 1792 else if (dx < 0)
1440 self->rows += MAP_EXTEND_Y; 1807 self->rows += MAP_EXTEND_Y;
1441 self->y += MAP_EXTEND_Y; 1808 self->y += MAP_EXTEND_Y;
1442 } 1809 }
1443} 1810}
1444 1811
1445void 1812SV *
1446map1a_update (CFPlus::Map self, SV *data_, int extmap) 1813map1a_update (DC::Map self, SV *data_, int extmap)
1447 CODE: 1814 CODE:
1448{ 1815{
1449 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1450 uint8_t *data_end = (uint8_t *)SvEND (data_); 1817 uint8_t *data_end = (uint8_t *)SvEND (data_);
1451 mapcell *cell; 1818 mapcell *cell;
1452 int x, y, flags; 1819 int x, y, z, flags;
1820 AV *missing = newAV ();
1821 RETVAL = newRV_noinc ((SV *)missing);
1453 1822
1454 while (data < data_end - 1) 1823 while (data < data_end - 1)
1455 { 1824 {
1456 flags = (data [0] << 8) + data [1]; data += 2; 1825 flags = (data [0] << 8) + data [1]; data += 2;
1457 1826
1477 uint8_t ext, cmd; 1846 uint8_t ext, cmd;
1478 1847
1479 do 1848 do
1480 { 1849 {
1481 ext = *data++; 1850 ext = *data++;
1482 cmd = ext & 0x3f; 1851 cmd = ext & 0x7f;
1483 1852
1484 if (cmd < 4) 1853 if (cmd < 4)
1485 cell->darkness = 255 - ext * 64 + 1; 1854 cell->darkness = 255 - ext * 64 + 1;
1486 else if (cmd == 5) // health 1855 else if (cmd == 5) // health
1487 { 1856 {
1490 } 1859 }
1491 else if (cmd == 6) // monster width 1860 else if (cmd == 6) // monster width
1492 cell->stat_width = *data++ + 1; 1861 cell->stat_width = *data++ + 1;
1493 else if (cmd == 0x47) 1862 else if (cmd == 0x47)
1494 { 1863 {
1495 if (*data == 4) 1864 if (*data == 1) cell->player = data [1];
1496 ; // decode player count 1865 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1866 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1867 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1497 1868
1498 data += *data + 1; 1869 data += *data + 1;
1499 } 1870 }
1500 else if (cmd == 8) // cell flags 1871 else if (cmd == 8) // cell flags
1501 cell->flags = *data++; 1872 cell->flags = *data++;
1508 } 1879 }
1509 else 1880 else
1510 cell->darkness = *data++ + 1; 1881 cell->darkness = *data++ + 1;
1511 } 1882 }
1512 1883
1884 for (z = 0; z <= 2; ++z)
1513 if (flags & 4) 1885 if (flags & (4 >> z))
1514 { 1886 {
1515 faceid face = (data [0] << 8) + data [1]; data += 2; 1887 faceid face = (data [0] << 8) + data [1]; data += 2;
1516 need_facenum (self, face); 1888 need_facenum (self, face);
1517 cell->tile [0] = self->face2tile [face]; 1889 cell->tile [z] = self->face2tile [face];
1890
1891 if (cell->tile [z])
1892 {
1893 maptex *tex = self->tex + cell->tile [z];
1894 if (!tex->name)
1895 av_push (missing, newSViv (cell->tile [z]));
1896
1897 if (tex->smoothtile)
1898 {
1899 maptex *smooth = self->tex + tex->smoothtile;
1900 if (!smooth->name)
1901 av_push (missing, newSViv (tex->smoothtile));
1902 }
1903 }
1518 } 1904 }
1519
1520 if (flags & 2)
1521 {
1522 faceid face = (data [0] << 8) + data [1]; data += 2;
1523 need_facenum (self, face);
1524 cell->tile [1] = self->face2tile [face];
1525 }
1526
1527 if (flags & 1)
1528 {
1529 faceid face = (data [0] << 8) + data [1]; data += 2;
1530 need_facenum (self, face);
1531 cell->tile [2] = self->face2tile [face];
1532 }
1533 } 1905 }
1534 else 1906 else
1535 cell->darkness = 0; 1907 CELL_CLEAR (cell);
1536 } 1908 }
1537} 1909}
1910 OUTPUT:
1911 RETVAL
1538 1912
1539SV * 1913SV *
1540mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1914mapmap (DC::Map self, int x0, int y0, int w, int h)
1541 CODE: 1915 CODE:
1542{ 1916{
1543 int x1, x; 1917 int x1, x;
1544 int y1, y; 1918 int y1, y;
1545 int z; 1919 int z;
1590} 1964}
1591 OUTPUT: 1965 OUTPUT:
1592 RETVAL 1966 RETVAL
1593 1967
1594void 1968void
1595draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1596 CODE: 1970 CODE:
1597{ 1971{
1972 int x, y, z;
1973
1598 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1599 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1975 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1600 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1976 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1601 smooth_key skey; 1977 smooth_key skey;
1602 int x, y, z; 1978 int pl_x, pl_y;
1603 int last_name; 1979 maptex pl_tex;
1980 rc_t *rc = rc_alloc ();
1981 rc_key_t key;
1982 rc_array_t *arr;
1983
1984 pl_tex.name = 0;
1604 1985
1605 // thats current max. sorry. 1986 // thats current max. sorry.
1606 if (sw > 255) sw = 255; 1987 if (sw > 255) sw = 255;
1607 if (sh > 255) sh = 255; 1988 if (sh > 255) sh = 255;
1608 1989
1609 // clear key, in case of extra padding 1990 // clear key, in case of extra padding
1610 memset (&skey, 0, sizeof (skey)); 1991 memset (&skey, 0, sizeof (skey));
1611 1992
1612 glColor4ub (255, 255, 255, 255); 1993 memset (&key, 0, sizeof (key));
1613 1994 key.r = 255;
1614 glEnable (GL_BLEND); 1995 key.g = 255;
1615 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1996 key.b = 255;
1616 glEnable (GL_TEXTURE_2D); 1997 key.a = 255;
1617 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1998 key.mode = GL_QUADS;
1618 1999 key.format = GL_T2F_V3F;
1619 glBegin (GL_QUADS); 2000 key.texname = -1;
1620
1621 last_name = 0;
1622 2001
1623 mx += self->x; 2002 mx += self->x;
1624 my += self->y; 2003 my += self->y;
1625 2004
1626 // first pass: determine smooth_max 2005 // first pass: determine smooth_max
1642 MAX (self->tex [cell->tile [0]].smoothlevel, 2021 MAX (self->tex [cell->tile [0]].smoothlevel,
1643 MAX (self->tex [cell->tile [1]].smoothlevel, 2022 MAX (self->tex [cell->tile [1]].smoothlevel,
1644 self->tex [cell->tile [2]].smoothlevel)); 2023 self->tex [cell->tile [2]].smoothlevel));
1645 } 2024 }
1646 } 2025 }
2026
2027 glEnable (GL_BLEND);
2028 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2029 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1647 2030
1648 for (z = 0; z <= 2; z++) 2031 for (z = 0; z <= 2; z++)
1649 { 2032 {
1650 memset (smooth_level, 0, sizeof (smooth_level)); 2033 memset (smooth_level, 0, sizeof (smooth_level));
1651 2034
1664 { 2047 {
1665 maptex tex = self->tex [tile]; 2048 maptex tex = self->tex [tile];
1666 int px = (x + 1) * T - tex.w; 2049 int px = (x + 1) * T - tex.w;
1667 int py = (y + 1) * T - tex.h; 2050 int py = (y + 1) * T - tex.h;
1668 2051
1669 // suppressing texture state switches here
1670 // is only moderately effective, but worth the extra effort
1671 if (last_name != tex.name) 2052 if (key.texname != tex.name)
1672 { 2053 {
1673 if (!tex.name) 2054 if (!tex.name)
1674 tex = self->tex [2]; /* missing, replace by noface */ 2055 tex = self->tex [2]; /* missing, replace by noface */
1675 2056
1676 glEnd (); 2057 key.texname = tex.name;
1677 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2058 arr = rc_array (rc, &key);
1678 glBegin (GL_QUADS);
1679 } 2059 }
1680 2060
1681 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2061 if (expect_false (cell->player == player) && expect_false (z == 2))
1682 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1683 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1684 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1685
1686 if (cell->flags && z == 2)
1687 { 2062 {
2063 pl_x = px;
2064 pl_y = py;
2065 pl_tex = tex;
2066 continue;
2067 }
2068
2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2071 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2073
2074 if (expect_false (cell->flags) && expect_false (z == 2))
2075 {
2076 // overlays such as the speech bubble, probably more to come
1688 if (cell->flags & 1) 2077 if (cell->flags & 1)
1689 { 2078 {
1690 maptex tex = self->tex [1]; 2079 maptex tex = self->tex [1];
1691 int px = x * T + T * 2 / 32; 2080 int px = x * T + T * 2 / 32;
1692 int py = y * T - T * 6 / 32; 2081 int py = y * T - T * 6 / 32;
1693 2082
2083 if (tex.name)
1694 glEnd (); 2084 {
1695 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2085 if (key.texname != tex.name)
2086 {
2087 key.texname = tex.name;
2088 arr = rc_array (rc, &key);
2089 }
2090
2091 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2092 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2093 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2094 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1696 glBegin (GL_QUADS); 2095 }
1697
1698 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1699 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1700 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1701 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1702 } 2096 }
1703 } 2097 }
1704 2098
1705 // update smooth hash 2099 // update smooth hash
1706 if (tex.smoothtile) 2100 if (tex.smoothtile)
1742 } 2136 }
1743 } 2137 }
1744 } 2138 }
1745 } 2139 }
1746 2140
2141 rc_draw (rc);
2142 rc_clear (rc);
2143
1747 // go through all smoothlevels, lowest to highest, then draw. 2144 // go through all smoothlevels, lowest to highest, then draw.
1748 // this is basically counting sort 2145 // this is basically counting sort
1749 { 2146 {
1750 int w, b; 2147 int w, b;
1751 2148
2149 glEnable (GL_TEXTURE_2D);
2150 glBegin (GL_QUADS);
1752 for (w = 0; w < 256 / 32; ++w) 2151 for (w = 0; w < 256 / 32; ++w)
1753 { 2152 {
1754 uint32_t smask = smooth_level [w]; 2153 uint32_t smask = smooth_level [w];
1755 if (smask) 2154 if (smask)
1756 for (b = 0; b < 32; ++b) 2155 for (b = 0; b < 32; ++b)
1775 int border = bits & 15; 2174 int border = bits & 15;
1776 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2175 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1777 float dx = tex.s * .0625f; // 16 images/row 2176 float dx = tex.s * .0625f; // 16 images/row
1778 float dy = tex.t * .5f ; // 2 images/column 2177 float dy = tex.t * .5f ; // 2 images/column
1779 2178
1780 // this time naively avoiding texture state changes
1781 // save gobs of state changes.
1782 if (last_name != tex.name) 2179 if (tex.name)
1783 { 2180 {
2181 // this time avoiding texture state changes
2182 // save gobs of state changes.
1784 if (!tex.name) 2183 if (key.texname != tex.name)
1785 continue; // smoothing not yet available 2184 {
1786
1787 glEnd (); 2185 glEnd ();
1788 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1789 glBegin (GL_QUADS); 2187 glBegin (GL_QUADS);
1790 } 2188 }
1791 2189
1792 if (border) 2190 if (border)
1793 { 2191 {
1794 float ox = border * dx; 2192 float ox = border * dx;
1795 2193
1796 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1797 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1798 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1799 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1800 } 2198 }
1801 2199
1802 if (corner) 2200 if (corner)
1803 { 2201 {
1804 float ox = corner * dx; 2202 float ox = corner * dx;
1805 2203
1806 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2204 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1807 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1808 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1809 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2208 }
1810 } 2209 }
1811 } 2210 }
1812 } 2211 }
1813 } 2212 }
1814 } 2213 }
2214
2215 glEnd ();
2216 glDisable (GL_TEXTURE_2D);
2217 key.texname = -1;
1815 } 2218 }
1816 2219
1817 hv_clear (smooth); 2220 hv_clear (smooth);
1818 } 2221 }
1819 2222
1820 glEnd (); 2223 if (pl_tex.name)
2224 {
2225 maptex tex = pl_tex;
2226 int px = pl_x + sdx;
2227 int py = pl_y + sdy;
1821 2228
1822 glDisable (GL_TEXTURE_2D); 2229 key.texname = tex.name;
2230 arr = rc_array (rc, &key);
2231
2232 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2233 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2234 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236
2237 rc_draw (rc);
2238 }
2239
1823 glDisable (GL_BLEND); 2240 glDisable (GL_BLEND);
2241 rc_free (rc);
1824 2242
1825 // top layer: overlays such as the health bar 2243 // top layer: overlays such as the health bar
1826 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
1827 if (0 <= y + my && y + my < self->rows) 2245 if (0 <= y + my && y + my < self->rows)
1828 { 2246 {
1833 { 2251 {
1834 mapcell *cell = row->col + (x + mx - row->c0); 2252 mapcell *cell = row->col + (x + mx - row->c0);
1835 2253
1836 int px = x * T; 2254 int px = x * T;
1837 int py = y * T; 2255 int py = y * T;
2256
2257 if (expect_false (cell->player == player))
2258 {
2259 px += sdx;
2260 py += sdy;
2261 }
1838 2262
1839 if (cell->stat_hp) 2263 if (cell->stat_hp)
1840 { 2264 {
1841 int width = cell->stat_width * T; 2265 int width = cell->stat_width * T;
1842 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2266 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1853 } 2277 }
1854 } 2278 }
1855} 2279}
1856 2280
1857void 2281void
1858draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2282draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1859 CODE: 2283 CODE:
1860{ 2284{
1861 static float color[16][3] = { 2285 static float color[16][3] = {
1862 { 0.00F, 0.00F, 0.00F }, 2286 { 0.00F, 0.00F, 0.00F },
1863 { 1.00F, 1.00F, 1.00F }, 2287 { 1.00F, 1.00F, 1.00F },
1913 glDisable (GL_BLEND); 2337 glDisable (GL_BLEND);
1914 glDisable (GL_TEXTURE_2D); 2338 glDisable (GL_TEXTURE_2D);
1915} 2339}
1916 2340
1917void 2341void
1918fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2342fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1919 PPCODE: 2343 PPCODE:
1920{ 2344{
1921 int x, y; 2345 int x, y;
2346 int sw1 = sw + 2;
2347 int sh1 = sh + 2;
2348 int sh3 = sh * 3;
1922 int sw4 = (sw + 3) & ~3; 2349 int sw34 = (sw * 3 + 3) & ~3;
2350 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1923 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2351 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1924 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2352 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1925 2353
1926 memset (darkness, 255, sw4 * sh);
1927 SvPOK_only (darkness_sv); 2354 SvPOK_only (darkness3_sv);
1928 SvCUR_set (darkness_sv, sw4 * sh); 2355 SvCUR_set (darkness3_sv, sw34 * sh3);
1929 2356
1930 mx += self->x; 2357 mx += self->x - 1;
1931 my += self->y; 2358 my += self->y - 1;
1932 2359
2360 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2361
1933 for (y = 0; y < sh; y++) 2362 for (y = 0; y < sh1; y++)
1934 if (0 <= y + my && y + my < self->rows) 2363 if (0 <= y + my && y + my < self->rows)
1935 { 2364 {
1936 maprow *row = self->row + (y + my); 2365 maprow *row = self->row + (y + my);
1937 2366
1938 for (x = 0; x < sw; x++) 2367 for (x = 0; x < sw1; x++)
1939 if (row->c0 <= x + mx && x + mx < row->c1) 2368 if (row->c0 <= x + mx && x + mx < row->c1)
1940 { 2369 {
1941 mapcell *cell = row->col + (x + mx - row->c0); 2370 mapcell *cell = row->col + (x + mx - row->c0);
1942 2371
1943 darkness[y * sw4 + x] = cell->darkness 2372 darkness1 [y * sw1 + x] = cell->darkness
1944 ? 255 - (cell->darkness - 1) 2373 ? 255 - (cell->darkness - 1)
1945 : 255 - FOW_DARKNESS; 2374 : 255 - FOW_DARKNESS;
1946 } 2375 }
1947 } 2376 }
1948 2377
2378 for (y = 0; y < sh; ++y)
2379 for (x = 0; x < sw; ++x)
2380 {
2381 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2382 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2383 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2384 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2385 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2386 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2387 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2388 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2389 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2390
2391 uint8_t r11 = (d11 + d21 + d12) / 3;
2392 uint8_t r21 = d21;
2393 uint8_t r31 = (d21 + d31 + d32) / 3;
2394
2395 uint8_t r12 = d12;
2396 uint8_t r22 = d22;
2397 uint8_t r32 = d32;
2398
2399 uint8_t r13 = (d13 + d23 + d12) / 3;
2400 uint8_t r23 = d23;
2401 uint8_t r33 = (d23 + d33 + d32) / 3;
2402
2403 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2404 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2405 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2406 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2407 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2408 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2409 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2410 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2411 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2412 }
2413
2414 free (darkness1);
2415
1949 EXTEND (SP, 3); 2416 EXTEND (SP, 3);
1950 PUSHs (sv_2mortal (newSViv (sw4))); 2417 PUSHs (sv_2mortal (newSViv (sw34)));
1951 PUSHs (sv_2mortal (newSViv (sh))); 2418 PUSHs (sv_2mortal (newSViv (sh3)));
1952 PUSHs (darkness_sv); 2419 PUSHs (darkness3_sv);
1953} 2420}
1954 2421
1955SV * 2422SV *
1956get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2423get_rect (DC::Map self, int x0, int y0, int w, int h)
1957 CODE: 2424 CODE:
1958{ 2425{
1959 int x, y, x1, y1; 2426 int x, y, x1, y1;
1960 SV *data_sv = newSV (w * h * 7 + 5); 2427 SV *data_sv = newSV (w * h * 7 + 5);
1961 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2428 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2018 else 2485 else
2019 *data++ = 0; 2486 *data++ = 0;
2020 } 2487 }
2021 } 2488 }
2022 2489
2490 /* if size is w*h + 5 then no data has been found */
2491 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2492 {
2023 SvPOK_only (data_sv); 2493 SvPOK_only (data_sv);
2024 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2494 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2495 }
2496
2025 RETVAL = data_sv; 2497 RETVAL = data_sv;
2026} 2498}
2027 OUTPUT: 2499 OUTPUT:
2028 RETVAL 2500 RETVAL
2029 2501
2030void 2502void
2031set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2503set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2032 PPCODE: 2504 PPCODE:
2033{ 2505{
2034 int x, y, z; 2506 int x, y, z;
2035 int w, h; 2507 int w, h;
2036 int x1, y1; 2508 int x1, y1;
2509 STRLEN len;
2510 uint8_t *data, *end;
2511
2512 len = SvLEN (data_sv);
2513 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2514 data = SvPVbyte_nolen (data_sv);
2515 end = data + len + 8;
2516
2517 if (len < 5)
2518 XSRETURN_EMPTY;
2037 2519
2038 if (*data++ != 0) 2520 if (*data++ != 0)
2039 return; /* version mismatch */ 2521 XSRETURN_EMPTY; /* version mismatch */
2040 2522
2041 w = *data++ << 8; w |= *data++; 2523 w = *data++ << 8; w |= *data++;
2042 h = *data++ << 8; h |= *data++; 2524 h = *data++ << 8; h |= *data++;
2043 2525
2044 // we need to do this 'cause we don't keep an absolute coord system for rows 2526 // we need to do this 'cause we don't keep an absolute coord system for rows
2056 { 2538 {
2057 maprow *row = map_get_row (self, y); 2539 maprow *row = map_get_row (self, y);
2058 2540
2059 for (x = x0; x < x1; x++) 2541 for (x = x0; x < x1; x++)
2060 { 2542 {
2543 uint8_t flags;
2544
2545 if (data + 7 >= end)
2546 XSRETURN_EMPTY;
2547
2061 uint8_t flags = *data++; 2548 flags = *data++;
2062 2549
2063 if (flags) 2550 if (flags)
2064 { 2551 {
2065 mapcell *cell = row_get_cell (row, x); 2552 mapcell *cell = row_get_cell (row, x);
2066 tileid tile[3] = { 0, 0, 0 }; 2553 tileid tile[3] = { 0, 0, 0 };
2069 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2556 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2070 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2557 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2071 2558
2072 if (cell->darkness == 0) 2559 if (cell->darkness == 0)
2073 { 2560 {
2074 cell->darkness = 0; 2561 /*cell->darkness = 0;*/
2562 EXTEND (SP, 3);
2075 2563
2076 for (z = 0; z <= 2; z++) 2564 for (z = 0; z <= 2; z++)
2077 { 2565 {
2078 tileid t = tile [z]; 2566 tileid t = tile [z];
2079 2567
2080 if (t >= self->texs || (t && !self->tex [t].name)) 2568 if (t >= self->texs || (t && !self->tex [t].name))
2081 { 2569 {
2082 XPUSHs (sv_2mortal (newSViv (t))); 2570 PUSHs (sv_2mortal (newSViv (t)));
2083 need_texid (self, t); 2571 need_texid (self, t);
2084 } 2572 }
2085 2573
2086 cell->tile [z] = t; 2574 cell->tile [z] = t;
2087 } 2575 }
2089 } 2577 }
2090 } 2578 }
2091 } 2579 }
2092} 2580}
2093 2581
2094MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2582MODULE = Deliantra::Client PACKAGE = DC::RW
2095 2583
2096CFPlus::MixChunk 2584DC::RW
2097new_from_file (SV *class, char *path) 2585new (SV *class, SV *data_sv)
2098 CODE: 2586 CODE:
2099 RETVAL = Mix_LoadWAV (path); 2587{
2588 STRLEN datalen;
2589 char *data = SvPVbyte (data_sv, datalen);
2590
2591 RETVAL = SDL_RWFromConstMem (data, datalen);
2592}
2100 OUTPUT: 2593 OUTPUT:
2101 RETVAL 2594 RETVAL
2102 2595
2596DC::RW
2597new_from_file (SV *class, const char *path, const char *mode = "rb")
2598 CODE:
2599 RETVAL = SDL_RWFromFile (path, mode);
2600 OUTPUT:
2601 RETVAL
2602
2603# fails on win32:
2604# dc.xs(2268) : error C2059: syntax error : '('
2103void 2605#void
2606#close (DC::RW self)
2607# CODE:
2608# (self->(close)) (self);
2609
2610MODULE = Deliantra::Client PACKAGE = DC::Channel
2611
2612PROTOTYPES: DISABLE
2613
2614DC::Channel
2615find ()
2616 CODE:
2617{
2618 RETVAL = Mix_GroupAvailable (-1);
2619
2620 if (RETVAL < 0)
2621 {
2622 RETVAL = Mix_GroupOldest (-1);
2623
2624 if (RETVAL < 0)
2625 XSRETURN_UNDEF;
2626
2627 Mix_HaltChannel (RETVAL);
2628 }
2629
2630 Mix_UnregisterAllEffects (RETVAL);
2631 Mix_Volume (RETVAL, 128);
2632}
2633 OUTPUT:
2634 RETVAL
2635
2636void
2637halt (DC::Channel self)
2638 CODE:
2639 Mix_HaltChannel (self);
2640
2641void
2642expire (DC::Channel self, int ticks = -1)
2643 CODE:
2644 Mix_ExpireChannel (self, ticks);
2645
2646void
2647fade_out (DC::Channel self, int ticks = -1)
2648 CODE:
2649 Mix_FadeOutChannel (self, ticks);
2650
2651int
2652volume (DC::Channel self, int volume)
2653 CODE:
2654 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2655 OUTPUT:
2656 RETVAL
2657
2658void
2659unregister_all_effects (DC::Channel self)
2660 CODE:
2661 Mix_UnregisterAllEffects (self);
2662
2663void
2664set_panning (DC::Channel self, int left, int right)
2665 CODE:
2666 left = CLAMP (left , 0, 255);
2667 right = CLAMP (right, 0, 255);
2668 Mix_SetPanning (self, left, right);
2669
2670void
2671set_distance (DC::Channel self, int distance)
2672 CODE:
2673 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2674
2675void
2676set_position (DC::Channel self, int angle, int distance)
2677 CODE:
2678
2679void
2680set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2681 CODE:
2682{
2683 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2684 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2685 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2686}
2687
2688void
2689set_reverse_stereo (DC::Channel self, int flip)
2690 CODE:
2691 Mix_SetReverseStereo (self, flip);
2692
2693MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2694
2695PROTOTYPES: DISABLE
2696
2697DC::MixChunk
2698new (SV *class, DC::RW rwops)
2699 CODE:
2700 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2701 OUTPUT:
2702 RETVAL
2703
2704void
2104DESTROY (CFPlus::MixChunk self) 2705DESTROY (DC::MixChunk self)
2105 CODE: 2706 CODE:
2106 Mix_FreeChunk (self); 2707 Mix_FreeChunk (self);
2107 2708
2108int 2709int
2109volume (CFPlus::MixChunk self, int volume = -1) 2710volume (DC::MixChunk self, int volume = -1)
2110 CODE: 2711 CODE:
2712 if (items > 1)
2713 volume = CLAMP (volume, 0, 128);
2111 RETVAL = Mix_VolumeChunk (self, volume); 2714 RETVAL = Mix_VolumeChunk (self, volume);
2112 OUTPUT: 2715 OUTPUT:
2113 RETVAL 2716 RETVAL
2114 2717
2115int 2718DC::Channel
2116play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2719play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2117 CODE: 2720 CODE:
2721{
2118 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2722 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2723
2724 if (RETVAL < 0)
2725 XSRETURN_UNDEF;
2726
2727 if (channel < 0)
2728 {
2729 Mix_UnregisterAllEffects (RETVAL);
2730 Mix_Volume (RETVAL, 128);
2731 }
2732}
2119 OUTPUT: 2733 OUTPUT:
2120 RETVAL 2734 RETVAL
2121 2735
2122MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2736MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2123 2737
2124int 2738int
2125volume (int volume = -1) 2739volume (int volume = -1)
2740 PROTOTYPE: ;$
2126 CODE: 2741 CODE:
2742 if (items > 0)
2743 volume = CLAMP (volume, 0, 128);
2127 RETVAL = Mix_VolumeMusic (volume); 2744 RETVAL = Mix_VolumeMusic (volume);
2128 OUTPUT: 2745 OUTPUT:
2129 RETVAL 2746 RETVAL
2130 2747
2748void
2749fade_out (int ms)
2750 CODE:
2751 Mix_FadeOutMusic (ms);
2752
2753void
2754halt ()
2755 CODE:
2756 Mix_HaltMusic ();
2757
2131CFPlus::MixMusic 2758DC::MixMusic
2132new_from_file (SV *class, char *path) 2759new (SV *class, DC::RW rwops)
2133 CODE: 2760 CODE:
2134 RETVAL = Mix_LoadMUS (path); 2761 RETVAL = Mix_LoadMUS_RW (rwops);
2135 OUTPUT: 2762 OUTPUT:
2136 RETVAL 2763 RETVAL
2137 2764
2138void 2765void
2139DESTROY (CFPlus::MixMusic self) 2766DESTROY (DC::MixMusic self)
2140 CODE: 2767 CODE:
2141 Mix_FreeMusic (self); 2768 Mix_FreeMusic (self);
2142 2769
2143int 2770int
2144play (CFPlus::MixMusic self, int loops = -1) 2771play (DC::MixMusic self, int loops = -1)
2145 CODE: 2772 CODE:
2146 RETVAL = Mix_PlayMusic (self, loops); 2773 RETVAL = Mix_PlayMusic (self, loops);
2147 OUTPUT: 2774 OUTPUT:
2148 RETVAL 2775 RETVAL
2149 2776
2150MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2777void
2778fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2779 CODE:
2780 Mix_FadeInMusicPos (self, loops, ms, position);
2781
2782MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2783
2784PROTOTYPES: ENABLE
2151 2785
2152BOOT: 2786BOOT:
2153{ 2787{
2154 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2788 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2155 static const struct { 2789 static const struct {
2156 const char *name; 2790 const char *name;
2157 IV iv; 2791 IV iv;
2158 } *civ, const_iv[] = { 2792 } *civ, const_iv[] = {
2159# define const_iv(name) { # name, (IV)name } 2793# define const_iv(name) { # name, (IV)name }
2794 const_iv (GL_VENDOR),
2795 const_iv (GL_VERSION),
2796 const_iv (GL_EXTENSIONS),
2160 const_iv (GL_COLOR_MATERIAL), 2797 const_iv (GL_COLOR_MATERIAL),
2161 const_iv (GL_SMOOTH), 2798 const_iv (GL_SMOOTH),
2162 const_iv (GL_FLAT), 2799 const_iv (GL_FLAT),
2163 const_iv (GL_DITHER), 2800 const_iv (GL_DITHER),
2164 const_iv (GL_BLEND), 2801 const_iv (GL_BLEND),
2168 const_iv (GL_ALPHA_TEST), 2805 const_iv (GL_ALPHA_TEST),
2169 const_iv (GL_NORMALIZE), 2806 const_iv (GL_NORMALIZE),
2170 const_iv (GL_RESCALE_NORMAL), 2807 const_iv (GL_RESCALE_NORMAL),
2171 const_iv (GL_FRONT), 2808 const_iv (GL_FRONT),
2172 const_iv (GL_BACK), 2809 const_iv (GL_BACK),
2810 const_iv (GL_AUX0),
2173 const_iv (GL_AND), 2811 const_iv (GL_AND),
2174 const_iv (GL_ONE), 2812 const_iv (GL_ONE),
2175 const_iv (GL_ZERO), 2813 const_iv (GL_ZERO),
2176 const_iv (GL_SRC_ALPHA), 2814 const_iv (GL_SRC_ALPHA),
2177 const_iv (GL_DST_ALPHA), 2815 const_iv (GL_DST_ALPHA),
2190 const_iv (GL_INTENSITY), 2828 const_iv (GL_INTENSITY),
2191 const_iv (GL_LUMINANCE), 2829 const_iv (GL_LUMINANCE),
2192 const_iv (GL_LUMINANCE_ALPHA), 2830 const_iv (GL_LUMINANCE_ALPHA),
2193 const_iv (GL_FLOAT), 2831 const_iv (GL_FLOAT),
2194 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2832 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2833 const_iv (GL_COMPRESSED_ALPHA_ARB),
2834 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2835 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2836 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2837 const_iv (GL_COMPRESSED_RGB_ARB),
2838 const_iv (GL_COMPRESSED_RGBA_ARB),
2195 const_iv (GL_COMPILE), 2839 const_iv (GL_COMPILE),
2840 const_iv (GL_PROXY_TEXTURE_1D),
2841 const_iv (GL_PROXY_TEXTURE_2D),
2196 const_iv (GL_TEXTURE_1D), 2842 const_iv (GL_TEXTURE_1D),
2197 const_iv (GL_TEXTURE_2D), 2843 const_iv (GL_TEXTURE_2D),
2198 const_iv (GL_TEXTURE_ENV), 2844 const_iv (GL_TEXTURE_ENV),
2199 const_iv (GL_TEXTURE_MAG_FILTER), 2845 const_iv (GL_TEXTURE_MAG_FILTER),
2200 const_iv (GL_TEXTURE_MIN_FILTER), 2846 const_iv (GL_TEXTURE_MIN_FILTER),
2221 const_iv (GL_COLOR_LOGIC_OP), 2867 const_iv (GL_COLOR_LOGIC_OP),
2222 const_iv (GL_SEPARABLE_2D), 2868 const_iv (GL_SEPARABLE_2D),
2223 const_iv (GL_CONVOLUTION_2D), 2869 const_iv (GL_CONVOLUTION_2D),
2224 const_iv (GL_CONVOLUTION_BORDER_MODE), 2870 const_iv (GL_CONVOLUTION_BORDER_MODE),
2225 const_iv (GL_CONSTANT_BORDER), 2871 const_iv (GL_CONSTANT_BORDER),
2872 const_iv (GL_POINTS),
2226 const_iv (GL_LINES), 2873 const_iv (GL_LINES),
2227 const_iv (GL_LINE_STRIP), 2874 const_iv (GL_LINE_STRIP),
2228 const_iv (GL_LINE_LOOP), 2875 const_iv (GL_LINE_LOOP),
2229 const_iv (GL_QUADS), 2876 const_iv (GL_QUADS),
2230 const_iv (GL_QUAD_STRIP), 2877 const_iv (GL_QUAD_STRIP),
2231 const_iv (GL_TRIANGLES), 2878 const_iv (GL_TRIANGLES),
2232 const_iv (GL_TRIANGLE_STRIP), 2879 const_iv (GL_TRIANGLE_STRIP),
2233 const_iv (GL_TRIANGLE_FAN), 2880 const_iv (GL_TRIANGLE_FAN),
2881 const_iv (GL_POLYGON),
2234 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2882 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2883 const_iv (GL_POINT_SMOOTH_HINT),
2884 const_iv (GL_LINE_SMOOTH_HINT),
2885 const_iv (GL_POLYGON_SMOOTH_HINT),
2886 const_iv (GL_GENERATE_MIPMAP_HINT),
2887 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2235 const_iv (GL_FASTEST), 2888 const_iv (GL_FASTEST),
2889 const_iv (GL_DONT_CARE),
2890 const_iv (GL_NICEST),
2236 const_iv (GL_V2F), 2891 const_iv (GL_V2F),
2237 const_iv (GL_V3F), 2892 const_iv (GL_V3F),
2238 const_iv (GL_T2F_V3F), 2893 const_iv (GL_T2F_V3F),
2239 const_iv (GL_T2F_N3F_V3F), 2894 const_iv (GL_T2F_N3F_V3F),
2240# undef const_iv 2895# undef const_iv
2245 2900
2246 texture_av = newAV (); 2901 texture_av = newAV ();
2247 AvREAL_off (texture_av); 2902 AvREAL_off (texture_av);
2248} 2903}
2249 2904
2905void
2906disable_GL_EXT_blend_func_separate ()
2907 CODE:
2908 gl.BlendFuncSeparate = 0;
2909 gl.BlendFuncSeparateEXT = 0;
2910
2250char * 2911char *
2251gl_vendor () 2912gl_vendor ()
2252 CODE: 2913 CODE:
2253 RETVAL = (char *)glGetString (GL_VENDOR); 2914 RETVAL = (char *)glGetString (GL_VENDOR);
2254 OUTPUT: 2915 OUTPUT:
2266 CODE: 2927 CODE:
2267 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2928 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2268 OUTPUT: 2929 OUTPUT:
2269 RETVAL 2930 RETVAL
2270 2931
2932const char *glGetString (GLenum pname)
2933
2934GLint glGetInteger (GLenum pname)
2935 CODE:
2936 glGetIntegerv (pname, &RETVAL);
2937 OUTPUT:
2938 RETVAL
2939
2940GLdouble glGetDouble (GLenum pname)
2941 CODE:
2942 glGetDoublev (pname, &RETVAL);
2943 OUTPUT:
2944 RETVAL
2945
2271int glGetError () 2946int glGetError ()
2272 2947
2273void glFinish () 2948void glFinish ()
2274 2949
2275void glClear (int mask) 2950void glClear (int mask)
2312# near_ and far_ are due to microsofts buggy "c" compiler 2987# near_ and far_ are due to microsofts buggy "c" compiler
2313void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2988void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2314 2989
2315# near_ and far_ are due to microsofts buggy "c" compiler 2990# near_ and far_ are due to microsofts buggy "c" compiler
2316void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2991void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2992
2993PROTOTYPES: DISABLE
2317 2994
2318void glViewport (int x, int y, int width, int height) 2995void glViewport (int x, int y, int width, int height)
2319 2996
2320void glScissor (int x, int y, int width, int height) 2997void glScissor (int x, int y, int width, int height)
2321 2998
2329 3006
2330void glRotate (float angle, float x, float y, float z) 3007void glRotate (float angle, float x, float y, float z)
2331 CODE: 3008 CODE:
2332 glRotatef (angle, x, y, z); 3009 glRotatef (angle, x, y, z);
2333 3010
2334void glBegin (int mode)
2335
2336void glEnd ()
2337
2338void glColor (float r, float g, float b, float a = 1.0) 3011void glColor (float r, float g, float b, float a = 1.0)
2339 PROTOTYPE: @ 3012 PROTOTYPE: @
2340 ALIAS: 3013 ALIAS:
2341 glColor_premultiply = 1 3014 glColor_premultiply = 1
2342 CODE: 3015 CODE:
2343 if (ix) 3016 if (ix)
2344 { 3017 {
2347 b *= a; 3020 b *= a;
2348 } 3021 }
2349 // microsoft visual "c" rounds instead of truncating... 3022 // microsoft visual "c" rounds instead of truncating...
2350 glColor4f (r, g, b, a); 3023 glColor4f (r, g, b, a);
2351 3024
2352void glInterleavedArrays (int format, int stride, char *data)
2353
2354void glDrawElements (int mode, int count, int type, char *indices)
2355
2356# 1.2 void glDrawRangeElements (int mode, int start, int end
2357
2358void glRasterPos (float x, float y, float z = 0.) 3025void glRasterPos (float x, float y, float z = 0.)
2359 CODE: 3026 CODE:
2360 glRasterPos3f (0, 0, z); 3027 glRasterPos3f (0, 0, z);
2361 glBitmap (0, 0, 0, 0, x, y, 0); 3028 glBitmap (0, 0, 0, 0, x, y, 0);
2362 3029
2366 3033
2367void glTexCoord (float s, float t) 3034void glTexCoord (float s, float t)
2368 CODE: 3035 CODE:
2369 glTexCoord2f (s, t); 3036 glTexCoord2f (s, t);
2370 3037
3038void glRect (float x1, float y1, float x2, float y2)
3039 CODE:
3040 glRectf (x1, y1, x2, y2);
3041
3042void glRect_lineloop (float x1, float y1, float x2, float y2)
3043 CODE:
3044 glBegin (GL_LINE_LOOP);
3045 glVertex2f (x1, y1);
3046 glVertex2f (x2, y1);
3047 glVertex2f (x2, y2);
3048 glVertex2f (x1, y2);
3049 glEnd ();
3050
3051PROTOTYPES: ENABLE
3052
3053void glBegin (int mode)
3054
3055void glEnd ()
3056
3057void glPointSize (GLfloat size)
3058
3059void glLineWidth (GLfloat width)
3060
3061void glInterleavedArrays (int format, int stride, char *data)
3062
3063void glDrawElements (int mode, int count, int type, char *indices)
3064
3065# 1.2 void glDrawRangeElements (int mode, int start, int end
3066
2371void glTexEnv (int target, int pname, float param) 3067void glTexEnv (int target, int pname, float param)
2372 CODE: 3068 CODE:
2373 glTexEnvf (target, pname, param); 3069 glTexEnvf (target, pname, param);
2374 3070
2375void glTexParameter (int target, int pname, float param) 3071void glTexParameter (int target, int pname, float param)
2391void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3087void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2392 CODE: 3088 CODE:
2393 if (gl.SeparableFilter2D) 3089 if (gl.SeparableFilter2D)
2394 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3090 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2395 3091
2396void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3092void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2397 3093
2398void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3094void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2399 3095
2400void glDrawPixels (int width, int height, int format, int type, char *pixels) 3096void glDrawPixels (int width, int height, int format, int type, char *pixels)
3097
3098void glPixelZoom (float x, float y)
2401 3099
2402void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 3100void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2403 3101
2404int glGenTexture () 3102int glGenTexture ()
2405 CODE: 3103 CODE:
2425 3123
2426void glEndList () 3124void glEndList ()
2427 3125
2428void glCallList (int list) 3126void glCallList (int list)
2429 3127
3128MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3129
3130PROTOTYPES: DISABLE
3131
3132void
3133find_widget (SV *self, NV x, NV y)
3134 PPCODE:
3135{
3136 if (within_widget (self, x, y))
3137 XPUSHs (self);
3138}
3139
3140BOOT:
3141{
3142 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3143
3144 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3145 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3146 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3147 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3148}
3149
3150void
3151draw (SV *self)
3152 CODE:
3153{
3154 HV *hv;
3155 SV **svp;
3156 NV x, y, w, h;
3157 SV *draw_x_sv = GvSV (draw_x_gv);
3158 SV *draw_y_sv = GvSV (draw_y_gv);
3159 SV *draw_w_sv = GvSV (draw_w_gv);
3160 SV *draw_h_sv = GvSV (draw_h_gv);
3161 double draw_x, draw_y;
3162
3163 if (!SvROK (self))
3164 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3165
3166 hv = (HV *)SvRV (self);
3167
3168 if (SvTYPE (hv) != SVt_PVHV)
3169 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3170
3171 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3172 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3173
3174 if (!h || !w)
3175 XSRETURN_EMPTY;
3176
3177 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3178 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3179
3180 draw_x = SvNV (draw_x_sv) + x;
3181 draw_y = SvNV (draw_y_sv) + y;
3182
3183 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3184 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3185 XSRETURN_EMPTY;
3186
3187 sv_setnv (draw_x_sv, draw_x);
3188 sv_setnv (draw_y_sv, draw_y);
3189
3190 glPushMatrix ();
3191 glTranslated (x, y, 0);
3192
3193 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3194 {
3195 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3196
3197 if (svp && SvTRUE (*svp))
3198 {
3199 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3200 glEnable (GL_BLEND);
3201 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3202 glBegin (GL_QUADS);
3203 glVertex2f (0, 0);
3204 glVertex2f (w, 0);
3205 glVertex2f (w, h);
3206 glVertex2f (0, h);
3207 glEnd ();
3208 glDisable (GL_BLEND);
3209 }
3210 }
3211#if 0
3212 // draw borders, for debugging
3213 glPushMatrix ();
3214 glColor4f (1., 1., 0., 1.);
3215 glTranslatef (.5, .5, 0.);
3216 glBegin (GL_LINE_LOOP);
3217 glVertex2f (0 , 0);
3218 glVertex2f (w - 1, 0);
3219 glVertex2f (w - 1, h - 1);
3220 glVertex2f (0 , h - 1);
3221 glEnd ();
3222 glPopMatrix ();
3223#endif
3224 PUSHMARK (SP);
3225 XPUSHs (self);
3226 PUTBACK;
3227 call_method ("_draw", G_VOID | G_DISCARD);
3228 SPAGAIN;
3229
3230 glPopMatrix ();
3231
3232 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3233 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3234}
3235

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines